diff --git a/.hgtags b/.hgtags
index 80a05d1444a..dd49fb5ce19 100644
--- a/.hgtags
+++ b/.hgtags
@@ -487,3 +487,5 @@ e1e60f75cd39312a7f59d2a4f91d624e5aecc95e jdk-11+11
 758deedaae8406ae60147486107a54e9864aa7b0 jdk-11+13
 3595bd343b65f8c37818ebe6a4c343ddeb1a5f88 jdk-11+14
 a11c1cb542bbd1671d25b85efe7d09b983c48525 jdk-11+15
+02934b0d661b82b7fe1052a04998d2091352e08d jdk-11+16
+64e4b1686141e57a681936a8283983341484676e jdk-11+17
diff --git a/doc/building.html b/doc/building.html
index 520c91a407f..3c982e9d4ca 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -505,7 +505,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <ul>
 <li><code>hotspot</code> - Build all of hotspot (but only hotspot)</li>
 <li><code>hotspot-&lt;variant&gt;</code> - Build just the specified jvm variant</li>
-<li><code>images</code> or <code>product-images</code> - Build the JRE and JDK images</li>
+<li><code>images</code> or <code>product-images</code> - Build the JDK image</li>
 <li><code>docs</code> or <code>docs-image</code> - Build the documentation image</li>
 <li><code>test-image</code> - Build the test image</li>
 <li><code>all</code> or <code>all-images</code> - Build all images (product, docs and test)</li>
@@ -639,7 +639,7 @@ cp: cannot stat `arm-linux-gnueabihf/libXt.so&#39;: No such file or directory</c
 <p>OpenJDK contains two different ports for the aarch64 platform, one is the original aarch64 port from the <a href="http://openjdk.java.net/projects/aarch64-port">AArch64 Port Project</a> and one is a 64-bit version of the Oracle contributed ARM port. When targeting aarch64, by the default the original aarch64 port is used. To select the Oracle ARM 64 port, use <code>--with-cpu-port=arm64</code>. Also set the corresponding value (<code>aarch64</code> or <code>arm64</code>) to --with-abi-profile, to ensure a consistent build.</p>
 <h3 id="verifying-the-build">Verifying the Build</h3>
 <p>The build will end up in a directory named like <code>build/linux-arm-normal-server-release</code>.</p>
-<p>Inside this build output directory, the <code>images/jdk</code> and <code>images/jre</code> will contain the newly built JDK and JRE, respectively, for your <em>target</em> system.</p>
+<p>Inside this build output directory, the <code>images/jdk</code> will contain the newly built JDK, for your <em>target</em> system.</p>
 <p>Copy these folders to your <em>target</em> system. Then you can run e.g. <code>images/jdk/bin/java -version</code>.</p>
 <h2 id="build-performance">Build Performance</h2>
 <p>Building OpenJDK requires a lot of horsepower. Some of the build tools can be adjusted to utilize more or less of resources such as parallel threads and memory. The <code>configure</code> script analyzes your system and selects reasonable values for such options based on your hardware. If you encounter resource problems, such as out of memory conditions, you can modify the detected values with:</p>
diff --git a/doc/building.md b/doc/building.md
index 6fff221da9c..8b9b81391c7 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -747,7 +747,7 @@ Apart from the default target, here are some common make targets:
 
   * `hotspot` - Build all of hotspot (but only hotspot)
   * `hotspot-<variant>` - Build just the specified jvm variant
-  * `images` or `product-images` - Build the JRE and JDK images
+  * `images` or `product-images` - Build the JDK image
   * `docs` or `docs-image` - Build the documentation image
   * `test-image` - Build the test image
   * `all` or `all-images` - Build all images (product, docs and test)
@@ -1039,8 +1039,8 @@ original aarch64 port is used. To select the Oracle ARM 64 port, use
 The build will end up in a directory named like
 `build/linux-arm-normal-server-release`.
 
-Inside this build output directory, the `images/jdk` and `images/jre` will
-contain the newly built JDK and JRE, respectively, for your *target* system.
+Inside this build output directory, the `images/jdk` will contain the newly
+built JDK, for your *target* system.
 
 Copy these folders to your *target* system. Then you can run e.g.
 `images/jdk/bin/java -version`.
diff --git a/make/BuildNashorn.gmk b/make/BuildNashorn.gmk
deleted file mode 100644
index c9e31433cf2..00000000000
--- a/make/BuildNashorn.gmk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Copyright (c) 2010, 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
-# 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.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JarArchive.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-include TextFileProcessing.gmk
-include Modules.gmk
-
-JDK_CLASSES := $(call PathList, $(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \
-      java.base java.logging java.scripting jdk.dynalink)))
-
-# Need to use source and target 8 for nasgen to work.
-$(eval $(call SetupJavaCompiler, GENERATE_NEWBYTECODE_DEBUG, \
-    JVM := $(JAVA_JAVAC), \
-    JAVAC := $(NEW_JAVAC), \
-    FLAGS := -g -source 10 -target 10 --upgrade-module-path "$(JDK_OUTPUTDIR)/modules/" \
-         --system none --module-source-path $(call GetModuleSrcPath), \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-# Build nashorn into intermediate directory
-# Name the compilation setup the same as the module, as is done in the global
-# CompileJavaModules.gmk, to make dependency checking with other modules work
-# seamlessly.
-$(eval $(call SetupJavaCompilation, jdk.scripting.nashorn, \
-    SETUP := GENERATE_NEWBYTECODE_DEBUG, \
-    MODULE := jdk.scripting.nashorn, \
-    SRC := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
-    COPY := .properties .js, \
-    BIN := $(SUPPORT_OUTPUTDIR)/special_classes, \
-    CREATE_API_DIGEST := true, \
-))
-
-# Declare dependencies between java compilations of different modules.
-# Since the other modules are declared in different invocations of this file,
-# use the macro to find the correct target file to depend on.
-# Only the javac compilation actually depends on other modules so limit
-# dependency declaration to that by using the *_COMPILE_TARGET variable.
-$(jdk.scripting.nashorn_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, jdk.scripting.nashorn), \
-    $(call SetupJavaCompilationApiTarget, $d, \
-        $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
-
-NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src
-ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
-
-# Build nasgen
-$(eval $(call SetupJavaCompilation, BUILD_NASGEN, \
-    SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(NASGEN_SRC) $(ASM_SRC), \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes))
-
-NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn
-NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
-
-NASGEN_OPTIONS := \
-    -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
-    --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
-    --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
-    --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
-    #
-
-# Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
-$(NASGEN_RUN_FILE): $(BUILD_NASGEN) $(jdk.scripting.nashorn)
-	$(ECHO) Running nasgen
-	$(MKDIR) -p $(@D)
-	$(RM) -rf $(@D)/jdk $(@D)/netscape
-	$(CP) -R -p $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/* $(@D)/
-	$(JAVA_SMALL) $(NASGEN_OPTIONS) \
-	    jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
-	$(TOUCH) $@
-
-# Version file needs to be processed with version numbers
-$(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \
-  SOURCE_FILES := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \
-  OUTPUT_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties, \
-  REPLACEMENTS := \
-      @@VERSION_STRING@@ => $(VERSION_STRING) ; \
-      @@VERSION_SHORT@@ => $(VERSION_SHORT) , \
-))
-
-# Version processing needs to happen after nasgen run since nasgen run deletes it
-$(BUILD_VERSION_FILE): $(NASGEN_RUN_FILE)
-
-compile: $(NASGEN_RUN_FILE) $(BUILD_VERSION_FILE)
-all: compile
-
-.PHONY: compile all
diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index e447eb51c54..de9508b767c 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -146,19 +146,13 @@ endef
 # correct base directories.
 ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
   JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
-  JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
   JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
-  JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
   JDK_BUNDLE_SUBDIR :=
-  JRE_BUNDLE_SUBDIR :=
 else
   JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
-  JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
   JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
-  JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
-    JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
 endif
 
@@ -204,26 +198,6 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
 
-  ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
-
-  # Create special filter rules when dealing with unzipped .dSYM directories on
-  # macosx
-  ifeq ($(OPENJDK_TARGET_OS), macosx)
-    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
-      JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
-    endif
-  endif
-
-  JRE_BUNDLE_FILES := $(filter-out \
-      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
-      $(SYMBOLS_EXCLUDE_PATTERN), \
-      $(ALL_JRE_FILES))
-  JRE_SYMBOLS_BUNDLE_FILES := $(filter \
-      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
-      $(SYMBOLS_EXCLUDE_PATTERN), \
-      $(ALL_JRE_FILES))
-
   $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
       BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
       FILES := $(JDK_BUNDLE_FILES), \
@@ -234,15 +208,6 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
 
   PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
 
-  $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
-      BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
-      FILES := $(JRE_BUNDLE_FILES), \
-      BASE_DIRS := $(JRE_IMAGE_DIR), \
-      SUBDIR := $(JRE_BUNDLE_SUBDIR), \
-  ))
-
-  PRODUCT_TARGETS += $(BUILD_JRE_BUNDLE)
-
   $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
       BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
       FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
@@ -253,16 +218,6 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
 
   PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE)
 
-  $(eval $(call SetupBundleFile, BUILD_JRE_SYMBOLS_BUNDLE, \
-      BUNDLE_NAME := $(JRE_SYMBOLS_BUNDLE_NAME), \
-      FILES := $(JRE_SYMBOLS_BUNDLE_FILES), \
-      BASE_DIRS := $(JRE_IMAGE_DIR), \
-      SUBDIR := $(JRE_BUNDLE_SUBDIR), \
-      UNZIP_DEBUGINFO := true, \
-  ))
-
-  PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE)
-
   # The demo bundle is only created to support client tests. Ideally it should
   # be built with the main test bundle, but since the prerequisites match
   # better with the product build, it makes more sense to keep it there for now.
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 72c7391d45d..058f9a58eb8 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -325,6 +325,10 @@ jdk.internal.le_COPY += .properties
 
 ################################################################################
 
+jdk.internal.opt_COPY += .properties
+
+################################################################################
+
 jdk.jcmd_COPY += _options
 
 ################################################################################
@@ -341,6 +345,10 @@ jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline
 
 ################################################################################
 
+jdk.scripting.nashorn_COPY := .properties .js
+
+################################################################################
+
 jdk.scripting.nashorn.shell_COPY += .js .properties
 
 ################################################################################
@@ -440,11 +448,13 @@ jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
 
 jdk.internal.vm.compiler_EXCLUDES += \
     jdk.internal.vm.compiler.collections.test \
+    org.graalvm.compiler.processor \
     org.graalvm.compiler.core.match.processor \
     org.graalvm.compiler.nodeinfo.processor \
     org.graalvm.compiler.options.processor \
     org.graalvm.compiler.serviceprovider.processor \
-    org.graalvm.compiler.replacements.verifier \
+    org.graalvm.compiler.replacements.processor \
+    org.graalvm.compiler.replacements.jdk9.test \
     org.graalvm.compiler.api.directives.test \
     org.graalvm.compiler.api.test \
     org.graalvm.compiler.asm.aarch64.test \
@@ -642,6 +652,12 @@ endif
 
 ################################################################################
 
+ifeq ($(MODULE), jdk.scripting.nashorn)
+  include CompileJavaModulesNashorn.gmk
+endif
+
+################################################################################
+
 $(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
 
 ################################################################################
diff --git a/make/CompileJavaModulesNashorn.gmk b/make/CompileJavaModulesNashorn.gmk
new file mode 100644
index 00000000000..cc09a88b3bf
--- /dev/null
+++ b/make/CompileJavaModulesNashorn.gmk
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2010, 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.
+#
+
+NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src
+ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
+
+# Build nasgen
+$(eval $(call SetupJavaCompilation, BUILD_NASGEN, \
+    SETUP := GENERATE_OLDBYTECODE, \
+    SRC := $(NASGEN_SRC) $(ASM_SRC), \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \
+))
+
+NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)
+NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
+
+NASGEN_OPTIONS := \
+    -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
+    --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
+    --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
+    #
+
+# Run nasgen to modify classes in jdk.nashorn.internal.objects package
+$(NASGEN_RUN_FILE): $(BUILD_NASGEN) $($(MODULE))
+	$(ECHO) Running nasgen
+	$(JAVA_SMALL) $(NASGEN_OPTIONS) \
+	    jdk.nashorn.internal.tools.nasgen.Main $(@D) \
+	    jdk.nashorn.internal.objects $(@D)
+	$(TOUCH) $@
+
+TARGETS += $(NASGEN_RUN_FILE)
diff --git a/make/CompileToolsHotspot.gmk b/make/CompileToolsHotspot.gmk
index f0eb30cbd1d..7180658c2b3 100644
--- a/make/CompileToolsHotspot.gmk
+++ b/make/CompileToolsHotspot.gmk
@@ -47,34 +47,8 @@ ifeq ($(INCLUDE_GRAAL), true)
   $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_MATCH_PROCESSOR, \
       SETUP := GENERATE_OLDBYTECODE, \
       SRC := \
-          $(SRC_DIR)/jdk.internal.vm.compiler.word/src \
-          $(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
-          $(SRC_DIR)/org.graalvm.compiler.core/src \
-          $(SRC_DIR)/org.graalvm.compiler.core.common/src \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
           $(SRC_DIR)/org.graalvm.compiler.core.match.processor/src \
-          $(SRC_DIR)/org.graalvm.compiler.api.replacements/src \
-          $(SRC_DIR)/org.graalvm.compiler.asm/src \
-          $(SRC_DIR)/org.graalvm.compiler.bytecode/src \
-          $(SRC_DIR)/org.graalvm.compiler.code/src \
-          $(SRC_DIR)/org.graalvm.compiler.debug/src \
-          $(SRC_DIR)/org.graalvm.compiler.graph/src \
-          $(SRC_DIR)/org.graalvm.compiler.lir/src \
-          $(SRC_DIR)/org.graalvm.compiler.loop/src \
-          $(SRC_DIR)/org.graalvm.compiler.loop.phases/src \
-          $(SRC_DIR)/org.graalvm.compiler.nodeinfo/src \
-          $(SRC_DIR)/org.graalvm.compiler.nodes/src \
-          $(SRC_DIR)/org.graalvm.compiler.options/src \
-          $(SRC_DIR)/org.graalvm.compiler.phases/src \
-          $(SRC_DIR)/org.graalvm.compiler.phases.common/src \
-          $(SRC_DIR)/org.graalvm.compiler.serviceprovider/src \
-          $(SRC_DIR)/org.graalvm.compiler.virtual/src \
-          $(SRC_DIR)/org.graalvm.graphio/src \
-          $(SRC_DIR)/org.graalvm.util/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.code/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.common/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.meta/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.runtime/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.services/src \
           , \
       EXCLUDE_FILES := $(EXCLUDE_FILES), \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor, \
@@ -88,7 +62,7 @@ ifeq ($(INCLUDE_GRAAL), true)
   $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_NODEINFO_PROCESSOR, \
       SETUP := GENERATE_OLDBYTECODE, \
       SRC := \
-          $(SRC_DIR)/org.graalvm.compiler.nodeinfo/src \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
           $(SRC_DIR)/org.graalvm.compiler.nodeinfo.processor/src \
           , \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor, \
@@ -102,10 +76,8 @@ ifeq ($(INCLUDE_GRAAL), true)
   $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_OPTIONS_PROCESSOR, \
       SETUP := GENERATE_OLDBYTECODE, \
       SRC := \
-          $(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
-          $(SRC_DIR)/org.graalvm.compiler.options/src \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
           $(SRC_DIR)/org.graalvm.compiler.options.processor/src \
-          $(SRC_DIR)/org.graalvm.util/src \
           , \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor, \
       JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor.jar, \
@@ -115,44 +87,26 @@ ifeq ($(INCLUDE_GRAAL), true)
 
   ##############################################################################
 
-  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_VERIFIER, \
+  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR, \
       SETUP := GENERATE_OLDBYTECODE, \
       SRC := \
-          $(SRC_DIR)/jdk.internal.vm.compiler.word/src \
-          $(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
-          $(SRC_DIR)/org.graalvm.compiler.bytecode/src \
-          $(SRC_DIR)/org.graalvm.compiler.replacements.verifier/src \
-          $(SRC_DIR)/org.graalvm.compiler.api.replacements/src \
-          $(SRC_DIR)/org.graalvm.compiler.code/src \
-          $(SRC_DIR)/org.graalvm.compiler.core.common/src \
-          $(SRC_DIR)/org.graalvm.compiler.debug/src \
-          $(SRC_DIR)/org.graalvm.compiler.graph/src \
-          $(SRC_DIR)/org.graalvm.compiler.nodeinfo/src \
-          $(SRC_DIR)/org.graalvm.compiler.options/src \
-          $(SRC_DIR)/org.graalvm.compiler.serviceprovider/src \
-          $(SRC_DIR)/org.graalvm.graphio/src \
-          $(SRC_DIR)/org.graalvm.util/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.code/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.common/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.meta/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.runtime/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.services/src \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
+          $(SRC_DIR)/org.graalvm.compiler.replacements.processor/src \
           , \
       EXCLUDE_FILES := $(EXCLUDE_FILES), \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier, \
       JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar, \
   ))
 
-  TARGETS += $(BUILD_VM_COMPILER_REPLACEMENTS_VERIFIER)
+  TARGETS += $(BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR)
 
   ##############################################################################
 
   $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR, \
       SETUP := GENERATE_OLDBYTECODE, \
       SRC := \
-          $(SRC_DIR)/org.graalvm.compiler.serviceprovider/src \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
           $(SRC_DIR)/org.graalvm.compiler.serviceprovider.processor/src \
-          $(VM_CI_SRC_DIR)/jdk.vm.ci.services/src \
           , \
       EXCLUDE_FILES := $(EXCLUDE_FILES), \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor, \
diff --git a/make/Help.gmk b/make/Help.gmk
index e839fb81d42..461d3431a62 100644
--- a/make/Help.gmk
+++ b/make/Help.gmk
@@ -40,10 +40,10 @@ help:
 	$(info $(_)                        # image (alias for jdk or exploded-image))
 	$(info $(_) make all               # Create all images: product, test, docs)
 	$(info $(_)                        # (alias for all-images))
-	$(info $(_) make images            # Create complete jdk and jre images)
+	$(info $(_) make images            # Create a complete jdk image)
 	$(info $(_)                        # (alias for product-images))
 	$(info $(_) make <name>-image      # Build just the image for any of: )
-	$(info $(_)                        # jdk, jre, test, docs, symbols)
+	$(info $(_)                        # jdk, test, docs, symbols, legacy-jre)
 	$(info $(_) make <phase>           # Build the specified phase and everything it depends on)
 	$(info $(_)                        # (gensrc, java, copy, libs, launchers, gendata, rmic))
 	$(info $(_) make *-only            # Applies to most targets and disables building the)
diff --git a/make/Images.gmk b/make/Images.gmk
index 1f67472418d..83b692ee650 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -90,7 +90,7 @@ endif
 
 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
-	$(ECHO) Creating jdk jimage
+	$(ECHO) Creating jdk image
 	$(RM) -r $(JDK_IMAGE_DIR)
 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jdk, \
 	    $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
@@ -101,7 +101,7 @@ $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
-	$(ECHO) Creating jre jimage
+	$(ECHO) Creating legacy jre image
 	$(RM) -r $(JRE_IMAGE_DIR)
 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre, \
 	    $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index 37bb7ebdd2f..e885e0fb1a3 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -34,6 +34,9 @@ _INITSUPPORT_GMK := 1
 
 ifeq ($(HAS_SPEC),)
 
+  # COMMA is defined in spec.gmk, but that is not included yet
+  COMMA := ,
+
   # Include the corresponding closed file, if present.
   ifneq ($(CUSTOM_MAKE_DIR), )
     -include $(CUSTOM_MAKE_DIR)/InitSupport.gmk
@@ -531,8 +534,6 @@ endif # HAS_SPEC
 define ParseLogOption
   ifneq ($$(findstring $1, $$(LOG)),)
     override $2 := true
-    # COMMA is defined in spec.gmk, but that is not included yet
-    COMMA := ,
     # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
     LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$$(strip $1),, $$(LOG)))
     # We might have ended up with a leading comma. Remove it. Need override
@@ -550,8 +551,6 @@ define ParseLogValue
     # Make words of out comma-separated list and find the one with opt=val
     value := $$(strip $$(subst $$(strip $1)=,, $$(filter $$(strip $1)=%, $$(subst $$(COMMA), , $$(LOG)))))
     override $2 := $$(value)
-    # COMMA is defined in spec.gmk, but that is not included yet
-    COMMA := ,
     # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
     LOG_STRIPPED := $$(subst $$(strip $1)=$$(value),, \
         $$(subst $$(COMMA)$$(strip $1)=$$(value),, $$(LOG)))
diff --git a/make/Main.gmk b/make/Main.gmk
index dd5f3a1c9de..81626672c55 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -98,13 +98,10 @@ ALL_TARGETS += buildtools-langtools interim-langtools \
 ################################################################################
 # Special targets for certain modules
 
-unpack-sec:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
-
 generate-exported-symbols:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
 
-ALL_TARGETS += unpack-sec generate-exported-symbols
+ALL_TARGETS += generate-exported-symbols
 
 ################################################################################
 # Gensrc targets, generating source before java compilation can be done
@@ -189,7 +186,7 @@ $(foreach m, $(IMPORT_COPY_MODULES), $(eval $(call DeclareImportCopyRecipe,$m)))
 ALL_TARGETS += $(ALL_COPY_TARGETS)
 
 ################################################################################
-# Targets for compiling all java modules. Nashorn is treated separately.
+# Targets for compiling all java modules.
 JAVA_MODULES := $(ALL_MODULES)
 JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
 
@@ -199,14 +196,7 @@ define DeclareCompileJavaRecipe
 	    -f CompileJavaModules.gmk MODULE=$1)
 endef
 
-$(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
-    $(eval $(call DeclareCompileJavaRecipe,$m)))
-
-# Build nashorn. Needs to be compiled separately from the rest of the modules
-# due to nasgen.
-jdk.scripting.nashorn-java:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	    -f BuildNashorn.gmk compile)
+$(foreach m, $(JAVA_MODULES), $(eval $(call DeclareCompileJavaRecipe,$m)))
 
 ALL_TARGETS += $(JAVA_TARGETS)
 
@@ -338,14 +328,17 @@ jrtfs-jar:
 jdk-image:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
 
-jre-image:
+legacy-jre-image:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
 
 symbols-image:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
 
-mac-bundles-jdk:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
+mac-jdk-bundle:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle)
+
+mac-legacy-jre-bundle:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jre-bundle)
 
 release-file:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
@@ -354,8 +347,8 @@ exploded-image-optimize:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
 
 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
-    zip-source jrtfs-jar jdk-image jre-image \
-    symbols-image mac-bundles-jdk \
+    zip-source jrtfs-jar jdk-image legacy-jre-image \
+    symbols-image mac-jdk-bundle mac-legacy-jre-bundle \
     release-file exploded-image-optimize
 
 ################################################################################
@@ -700,9 +693,6 @@ else
   # file to be processed by the gensrc-moduleinfo target.
   jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
 
-  # Explicitly add dependencies for special targets
-  java.base-java: unpack-sec
-
   jdk.jdeps-gendata: java rmic
 
   # The ct.sym generation uses all the moduleinfos as input
@@ -789,16 +779,17 @@ else
     generate-link-opt-data: buildtools-jdk
 
     # The generated classlist needs to go into java.base-jmod.
-    java.base-jmod jdk.jlink-jmod jdk-image jre-image: generate-link-opt-data
+    java.base-jmod jdk.jlink-jmod jdk-image legacy-jre-image: generate-link-opt-data
   endif
 
   release-file: create-source-revision-tracker
 
   jdk-image: jmods zip-source demos release-file
-  jre-image: jmods release-file
+  legacy-jre-image: jmods release-file
   symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
 
-  mac-bundles-jdk: jdk-image jre-image
+  mac-jdk-bundle: jdk-image
+  mac-legacy-jre-bundle: legacy-jre-image
 
   # The optimize target can run as soon as the modules dir has been completely
   # populated (java, copy and gendata targets) and the basic libs and launchers
@@ -969,14 +960,14 @@ docs-reference: docs-reference-api
 # alias for backwards compatibility
 docs-javadoc: docs-jdk-api
 
-mac-bundles: mac-bundles-jdk
+mac-bundles: mac-jdk-bundle
 
 # The $(OUTPUTDIR)/images directory contain the resulting deliverables,
 # and in line with this, our targets for creating these are named *-image[s].
 
-# This target builds the product images, e.g. the JRE and JDK image
+# This target builds the product images, e.g. the JDK image
 # (and possibly other, more specific versions)
-product-images: jdk-image jre-image symbols-image exploded-image
+product-images: jdk-image symbols-image exploded-image
 
 # zip-security is actually a bundle, but for now it needs to be considered
 # an image until this can be cleaned up properly.
@@ -993,7 +984,7 @@ ifneq ($(CREATE_BUILDJDK), true)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  product-images: mac-bundles
+  product-images: mac-jdk-bundle
 endif
 
 # This target builds the documentation image
diff --git a/make/UnpackSecurity.gmk b/make/UnpackSecurity.gmk
deleted file mode 100644
index 0a3b2d0e443..00000000000
--- a/make/UnpackSecurity.gmk
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright (c) 2012, 2014, 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.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-################################################################################
-# Unpack the binary distributions of the crypto classes if they exist.
-SEC_FILES_ZIP := $(TOPDIR)/make/tools/crypto/sec-bin.zip
-SEC_FILES_WIN_ZIP := $(TOPDIR)/make/tools/crypto/sec-windows-bin.zip
-JGSS_WIN32_FILES_ZIP := $(TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
-JGSS_WIN64_FILES_ZIP := $(TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
-
-define unzip-sec-file
-	$(ECHO) Unzipping $(<F)
-	$(MKDIR) -p $(@D) $(JDK_OUTPUTDIR)
-	$(RM) $@
-	($(CD) $(JDK_OUTPUTDIR) && $(UNZIP) -q -o $< > $@.tmp)
-	$(MV) $@.tmp $@
-endef
-
-define unzip-native-sec-file
-	$(ECHO) Unzipping $(<F)
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	($(CD) $(SUPPORT_OUTPUTDIR) && $(UNZIP) -q -o $< > $@.tmp)
-	$(MV) $@.tmp $@
-endef
-
-$(SUPPORT_OUTPUTDIR)/_the.sec-bin.unzipped: $(SEC_FILES_ZIP)
-	$(call unzip-sec-file)
-
-# Trying to unzip both of the sec files at the same time may cause a race
-# when creating directories common to both files.
-$(SUPPORT_OUTPUTDIR)/_the.sec-windows-bin.unzipped: $(SEC_FILES_WIN_ZIP) \
-    | $(SUPPORT_OUTPUTDIR)/_the.sec-bin.unzipped
-	$(call unzip-sec-file)
-
-$(SUPPORT_OUTPUTDIR)/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES_ZIP)
-	$(call unzip-native-sec-file)
-
-$(SUPPORT_OUTPUTDIR)/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP)
-	$(call unzip-native-sec-file)
-
-ifneq ($(wildcard $(SEC_FILES_ZIP)), )
-  IMPORT_TARGET_FILES += $(SUPPORT_OUTPUTDIR)/_the.sec-bin.unzipped
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    IMPORT_TARGET_FILES += $(SUPPORT_OUTPUTDIR)/_the.sec-windows-bin.unzipped
-    ifeq ($(OPENJDK_TARGET_CPU), x86)
-      IMPORT_TARGET_FILES += $(SUPPORT_OUTPUTDIR)/_the.jgss-windows-i586-bin.unzipped
-    endif
-    ifeq ($(OPENJDK_TARGET_CPU), x86_64)
-      IMPORT_TARGET_FILES += $(SUPPORT_OUTPUTDIR)/_the.jgss-windows-x64-bin.unzipped
-    endif
-  endif
-endif
-
-################################################################################
-
-sec: $(IMPORT_TARGET_FILES)
-
-all: sec
-
-.PHONY: sec all
diff --git a/make/autoconf/build-aux/config.guess b/make/autoconf/build-aux/config.guess
index 148a61a8ab8..ec17740edd4 100644
--- a/make/autoconf/build-aux/config.guess
+++ b/make/autoconf/build-aux/config.guess
@@ -86,6 +86,17 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
+# Test and fix little endian MIPS.
+if [ "x$OUT" = x ]; then
+  if [ `uname -s` = Linux ]; then
+    if [ `uname -m` = mipsel ]; then
+      OUT=mipsel-unknown-linux-gnu
+    elif [ `uname -m` = mips64el ]; then
+      OUT=mips64el-unknown-linux-gnu
+    fi
+  fi
+fi
+
 # Test and fix cpu on Macosx when C preprocessor is not on the path
 echo $OUT | grep i386-apple-darwin > /dev/null 2> /dev/null
 if test $? = 0; then
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 24a1de8bc40..c56b4d7e052 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -25,7 +25,7 @@
 
 # All valid JVM features, regardless of platform
 VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \
-    graal vm-structs jni-check services management cmsgc g1gc parallelgc serialgc nmt cds \
+    graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc zgc nmt cds \
     static-build link-time-opt aot jfr"
 
 # Deprecated JVM features (these are ignored, but with a warning)
@@ -328,6 +328,19 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     fi
   fi
 
+  # Only enable ZGC on Linux x86_64
+  AC_MSG_CHECKING([if zgc should be built])
+  if HOTSPOT_CHECK_JVM_FEATURE(zgc); then
+    if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+      AC_MSG_RESULT([yes])
+    else
+      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
+      AC_MSG_RESULT([no, platform not supported])
+    fi
+  else
+    AC_MSG_RESULT([no])
+  fi
+
   # Turn on additional features based on other parts of configure
   if test "x$INCLUDE_DTRACE" = "xtrue"; then
     JVM_FEATURES="$JVM_FEATURES dtrace"
@@ -410,7 +423,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   fi
 
   # All variants but minimal (and custom) get these features
-  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs"
+  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs"
   if test "x$ENABLE_CDS" = "xtrue"; then
     NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
   fi
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 4e437265604..8de0abeee81 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -858,18 +858,19 @@ ifeq ($(DEBUG_LEVEL), fastdebug)
 else ifneq ($(DEBUG_LEVEL), release)
   DEBUG_PART := -$(DEBUG_LEVEL)
 endif
-JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz
-JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  JDK_BUNDLE_EXTENSION := zip
+else
+  JDK_BUNDLE_EXTENSION := tar.gz
+endif
+JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
-JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 
 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
-JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
 JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
-JRE_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
 DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk
index 49b0f3e795c..c1bd70350dd 100644
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@@ -32,6 +32,36 @@ endif
 
 include NativeCompilation.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, common/JdkNativeCompilation.gmk))
+
+FindSrcDirsForLib += \
+  $(call uniq, $(wildcard \
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
+
+FindSrcDirsForComponent += \
+  $(call uniq, $(wildcard \
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
+
+GetJavaHeaderDir = \
+  $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
+
+# Process a dir description such as "java.base:headers" into a set of proper absolute paths.
+ProcessDir = \
+  $(if $(findstring :, $1), \
+    $(call FindSrcDirsForComponent, $(firstword $(subst :, , $1)), $(lastword $(subst :, , $1))) \
+  , \
+    $(if $(filter /%, $1), \
+      $1 \
+    , \
+      $(call FindSrcDirsForComponent, $(MODULE), $1) \
+    ) \
+  )
+
 # Setup make rules for creating a native shared library with suitable defaults
 # for the OpenJDK project.
 #
@@ -39,8 +69,16 @@ include NativeCompilation.gmk
 # and the targets generated are listed in a variable by that name.
 #
 # Remaining parameters are named arguments. These are all passed on to
-# SetupNativeCompilation, except for 
+# SetupNativeCompilation, except for
 #   EXTRA_RC_FLAGS -- additional RC_FLAGS to append.
+#   EXTRA_HEADER_DIRS -- additional directories to look for headers in
+#   EXTRA_SRC -- additional directories to look for source in
+#   EXCLUDE_SRC_PATTERNS -- exclude source dirs matching these patterns from
+#     appearing in SRC.
+#   HEADERS_FROM_SRC -- if false, does not add source dirs automatically as
+#     header include dirs. (Defaults to true.)
+#   SRC -- this is passed on, but preprocessed to accept source dir designations
+#     such as "java.base:headers".
 SetupJdkLibrary = $(NamedParamsMacroTemplate)
 define SetupJdkLibraryBody
   ifeq ($$($1_OUTPUT_DIR), )
@@ -51,6 +89,20 @@ define SetupJdkLibraryBody
     $1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/lib$$($1_NAME)
   endif
 
+  ifeq ($$($1_SRC), )
+    $1_SRC := $$(call FindSrcDirsForLib, $$(MODULE), $$($1_NAME))
+  else
+    $1_SRC := $$(foreach dir, $$($1_SRC), $$(call ProcessDir, $$(dir)))
+  endif
+  ifneq ($$($1_EXTRA_SRC), )
+    $1_SRC += $$(foreach dir, $$($1_EXTRA_SRC), $$(call ProcessDir, $$(dir)))
+  endif
+
+  ifneq ($$($1_EXCLUDE_SRC_PATTERNS), )
+    $1_EXCLUDE_SRC := $$(call containing, $$($1_EXCLUDE_SRC_PATTERNS), $$($1_SRC))
+    $1_SRC := $$(filter-out $$($1_EXCLUDE_SRC), $$($1_SRC))
+  endif
+
   ifeq ($$($1_VERSIONINFO_RESOURCE), )
     $1_VERSIONINFO_RESOURCE := $$(GLOBAL_VERSION_INFO_RESOURCE)
   else ifeq ($$($1_VERSIONINFO_RESOURCE), DISABLE)
@@ -66,6 +118,25 @@ define SetupJdkLibraryBody
     $1_RC_FLAGS :=
   endif
 
+  ifneq ($$($1_HEADERS_FROM_SRC), false)
+    $1_SRC_HEADER_FLAGS := $$(foreach dir, $$(wildcard $$($1_SRC) \
+        $$(call GetJavaHeaderDir, $$(MODULE))), -I$$(dir))
+  endif
+  ifneq ($$($1_EXTRA_HEADER_DIRS), )
+    $1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), \
+        $$(call ProcessDir, $$(dir)))
+    $1_EXTRA_HEADER_FLAGS := $$(addprefix -I, $$($1_PROCESSED_EXTRA_HEADER_DIRS))
+  endif
+
+  ifneq ($$($1_CFLAGS), )
+    $1_CFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
+  endif
+  ifneq ($$($1_CXXFLAGS), )
+    $1_CXXFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
+  endif
+  ifeq ($$($1_CFLAGS)$$($1_CXXFLAGS), )
+    $1_CFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
+  endif
   $1_RC_FLAGS += $$($1_EXTRA_RC_FLAGS)
 
   # Since we reuse the rule name ($1), all our arguments will pass through.
@@ -80,7 +151,7 @@ endef
 # and the targets generated are listed in a variable by that name.
 #
 # Remaining parameters are named arguments. These are all passed on to
-# SetupNativeCompilation, except for 
+# SetupNativeCompilation, except for
 #   EXTRA_RC_FLAGS -- additional RC_FLAGS to append.
 SetupJdkExecutable = $(NamedParamsMacroTemplate)
 define SetupJdkExecutableBody
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 960e9985206..b3a59e14aa1 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -634,7 +634,7 @@ endef
 ################################################################################
 # Filter out duplicate sub strings while preserving order. Keeps the first occurance.
 uniq = \
-    $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
+    $(strip $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))))
 
 # Returns all whitespace-separated words in $2 where at least one of the
 # whitespace-separated words in $1 is a substring.
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 90bb74f470f..9324ccb6722 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -233,7 +233,7 @@ var getJibProfilesCommon = function (input, data) {
     common.main_profile_names = [
         "linux-x64", "linux-x86", "macosx-x64", "solaris-x64",
         "solaris-sparcv9", "windows-x64", "windows-x86",
-        "linux-aarch64", "linux-arm64", "linux-arm-vfp-hflt",
+        "linux-aarch64", "linux-arm32", "linux-arm64", "linux-arm-vfp-hflt",
         "linux-arm-vfp-hflt-dyn"
     ];
 
@@ -272,28 +272,19 @@ var getJibProfilesCommon = function (input, data) {
      */
     common.main_profile_artifacts = function (o) {
         var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
-        var jre_subdir = (o.jre_subdir != null ? o.jre_subdir : "jre-" + data.version);
+        var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
         var pf = o.platform
         return {
             artifacts: {
                 jdk: {
-                    local: "bundles/\\(jdk.*bin.tar.gz\\)",
+                    local: "bundles/\\(jdk.*bin." + jdk_suffix + "\\)",
                     remote: [
-                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin.tar.gz",
+                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin." + jdk_suffix,
                         "bundles/" + pf + "/\\1"
                     ],
                     subdir: jdk_subdir,
                     exploded: "images/jdk"
                 },
-                jre: {
-                    local: "bundles/\\(jre.*bin.tar.gz\\)",
-                    remote: [
-                        "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin.tar.gz",
-                        "bundles/" + pf + "/\\1"
-                    ],
-                    subdir: jre_subdir,
-                    exploded: "images/jre"
-                },
                 test: {
                     local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
                     remote: [
@@ -319,15 +310,6 @@ var getJibProfilesCommon = function (input, data) {
                     subdir: jdk_subdir,
                     exploded: "images/jdk"
                 },
-                jre_symbols: {
-                    local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
-                    remote: [
-                        "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-symbols.tar.gz",
-                        "bundles/" + pf + "/\\1"
-                    ],
-                    subdir: jre_subdir,
-                    exploded: "images/jre"
-                }
             }
         };
     };
@@ -339,28 +321,19 @@ var getJibProfilesCommon = function (input, data) {
      */
     common.debug_profile_artifacts = function (o) {
         var jdk_subdir = "jdk-" + data.version + "/fastdebug";
-        var jre_subdir = "jre-" + data.version + "/fastdebug";
+        var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
         var pf = o.platform
         return {
             artifacts: {
                 jdk: {
-                    local: "bundles/\\(jdk.*bin-debug.tar.gz\\)",
+                    local: "bundles/\\(jdk.*bin-debug." + jdk_suffix + "\\)",
                     remote: [
-                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug.tar.gz",
+                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug." + jdk_suffix,
                         "bundles/" + pf + "/\\1"
                     ],
                     subdir: jdk_subdir,
                     exploded: "images/jdk"
                 },
-                jre: {
-                    local: "bundles/\\(jre.*bin-debug.tar.gz\\)",
-                    remote: [
-                        "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug.tar.gz",
-                        "bundles/" + pf + "/\\1"
-                    ],
-                    subdir: jre_subdir,
-                    exploded: "images/jre"
-                },
                 test: {
                     local: "bundles/\\(jdk.*bin-tests-debug.tar.gz\\)",
                     remote: [
@@ -378,15 +351,6 @@ var getJibProfilesCommon = function (input, data) {
                     subdir: jdk_subdir,
                     exploded: "images/jdk"
                 },
-                jre_symbols: {
-                    local: "bundles/\\(jre.*bin-debug-symbols.tar.gz\\)",
-                    remote: [
-                        "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz",
-                        "bundles/" + pf + "/\\1"
-                    ],
-                    subdir: jre_subdir,
-                    exploded: "images/jre"
-                }
             }
         };
     };
@@ -490,6 +454,17 @@ var getJibProfilesProfiles = function (input, common, data) {
             ],
         },
 
+        "linux-arm32": {
+            target_os: "linux",
+            target_cpu: "arm",
+            build_cpu: "x64",
+            dependencies: ["devkit", "autoconf", "build_devkit", "cups"],
+            configure_args: [
+                "--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
+                "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
+            ],
+        },
+
         "linux-arm-vfp-hflt": {
             target_os: "linux",
             target_cpu: "arm",
@@ -608,7 +583,6 @@ var getJibProfilesProfiles = function (input, common, data) {
         "macosx-x64": {
             platform: "osx-x64",
             jdk_subdir: "jdk-" + data.version +  ".jdk/Contents/Home",
-            jre_subdir: "jre-" + data.version +  ".jre/Contents/Home"
         },
         "solaris-x64": {
             platform: "solaris-x64",
@@ -618,13 +592,18 @@ var getJibProfilesProfiles = function (input, common, data) {
         },
         "windows-x64": {
             platform: "windows-x64",
+            jdk_suffix: "zip",
         },
         "windows-x86": {
             platform: "windows-x86",
+            jdk_suffix: "zip",
         },
        "linux-aarch64": {
             platform: "linux-aarch64",
         },
+       "linux-arm32": {
+            platform: "linux-arm32",
+        },
        "linux-arm64": {
             platform: "linux-arm64-vfp-hflt",
         },
@@ -715,6 +694,14 @@ var getJibProfilesProfiles = function (input, common, data) {
                        profiles[openName].artifacts["jdk"].remote));
     });
 
+    // Enable ZGC in linux-x64-open builds
+    [ "linux-x64-open" ].forEach(function (name) {
+        var configureArgs = { configure_args: [ "--with-jvm-features=zgc" ] };
+        var debugName = name + common.debug_suffix;
+        profiles[name] = concatObjects(profiles[name], configureArgs);
+        profiles[debugName] = concatObjects(profiles[debugName], configureArgs);
+    });
+
     // Profiles used to run tests. Used in JPRT and Mach 5.
     var testOnlyProfiles = {
         "run-test-jprt": {
@@ -829,7 +816,11 @@ var getJibProfilesDependencies = function (input, common) {
                     : "gcc7.3.0-Fedora27+1.0"),
         linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0
                     ? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0"
-                    : "arm-linaro-4.7+1.0")
+                    : (input.profile.indexOf("arm32") >= 0
+                       ? "gcc7.3.0-Fedora27+1.0"
+                       : "arm-linaro-4.7+1.0"
+                       )
+                    )
     };
 
     var devkit_platform = (input.target_cpu == "x86"
diff --git a/make/data/currency/CurrencyData.properties b/make/data/currency/CurrencyData.properties
index 64b0bc3839d..60a2ae893f4 100644
--- a/make/data/currency/CurrencyData.properties
+++ b/make/data/currency/CurrencyData.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=164
+dataVersion=167
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -47,7 +47,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     HRK191-HTG332-HUF348-IDR360-IEP372-ILS376-INR356-IQD368-IRR364-ISK352-\
     ITL380-JMD388-JOD400-JPY392-KES404-KGS417-KHR116-KMF174-KPW408-KRW410-\
     KWD414-KYD136-KZT398-LAK418-LBP422-LKR144-LRD430-LSL426-LTL440-LUF442-\
-    LVL428-LYD434-MAD504-MDL498-MGA969-MGF450-MKD807-MMK104-MNT496-MOP446-MRO478-\
+    LVL428-LYD434-MAD504-MDL498-MGA969-MGF450-MKD807-MMK104-MNT496-MOP446-MRO478-MRU929-\
     MTL470-MUR480-MVR462-MWK454-MXN484-MXV979-MYR458-MZM508-MZN943-NAD516-NGN566-\
     NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
     PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
@@ -324,7 +324,7 @@ KG=KGS
 # LAO PEOPLE'S DEMOCRATIC REPUBLIC (THE)
 LA=LAK
 # LATVIA
-LV=LVL;2013-12-31-22-00-00;EUR
+LV=EUR
 # LEBANON
 LB=LBP
 # LESOTHO
@@ -336,7 +336,7 @@ LY=LYD
 # LIECHTENSTEIN
 LI=CHF
 # LITHUANIA
-LT=LTL;2014-12-31-22-00-00;EUR
+LT=EUR
 # LUXEMBOURG
 LU=EUR
 # MACAU
@@ -360,7 +360,7 @@ MH=USD
 # MARTINIQUE
 MQ=EUR
 # MAURITANIA
-MR=MRO
+MR=MRU
 # MAURITIUS
 MU=MUR
 # MAYOTTE
diff --git a/make/data/fontconfig/macosx.fontconfig.properties b/make/data/fontconfig/macosx.fontconfig.properties
index 7e3c2fd1731..e1b8cdcc44a 100644
--- a/make/data/fontconfig/macosx.fontconfig.properties
+++ b/make/data/fontconfig/macosx.fontconfig.properties
@@ -34,9 +34,7 @@ allfonts.chinese-gb18030=SimSun-18030
 allfonts.chinese-hkscs=MingLiU_HKSCS
 allfonts.devanagari=Mangal
 allfonts.dingbats=Wingdings
-allfonts.lucida=Lucida Sans Regular
 allfonts.symbol=Symbol
-allfonts.thai=Lucida Sans Regular
 
 serif.plain.alphabetic=Times New Roman
 serif.plain.chinese-ms950=MingLiU
@@ -202,10 +200,9 @@ sequence.monospaced.x-windows-949=korean,alphabetic,dingbats,symbol
 sequence.dialog.x-windows-949=alphabetic,korean,dingbats,symbol
 sequence.dialoginput.x-windows-949=alphabetic,korean,dingbats,symbol
 
-sequence.allfonts.x-windows-874=alphabetic,thai,dingbats,symbol
+sequence.allfonts.x-windows-874=alphabetic,dingbats,symbol
 
-sequence.fallback=lucida,\
-                  chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
+sequence.fallback=chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
                   japanese,korean
 
 # Exclusion Ranges
@@ -256,7 +253,6 @@ filename.Gulim=gulim.TTC
 filename.Batang=batang.TTC
 filename.GulimChe=gulim.TTC
 
-filename.Lucida_Sans_Regular=LucidaSansRegular.ttf
 filename.Mangal=MANGAL.TTF
 filename.Symbol=SYMBOL.TTF
 filename.Wingdings=WINGDING.TTF
diff --git a/make/data/fontconfig/solaris.fontconfig.properties b/make/data/fontconfig/solaris.fontconfig.properties
index 03f61e7709d..4b3d48b56dd 100644
--- a/make/data/fontconfig/solaris.fontconfig.properties
+++ b/make/data/fontconfig/solaris.fontconfig.properties
@@ -43,7 +43,6 @@ allfonts.dingbats=-microsoft-wingdings-medium-r-normal--*-%d-*-*-p-*-adobe-fonts
 allfonts.japanese-x0212=-misc-ipagothic-medium-r-normal--*-%d-*-*-m-*-iso10646-1
 allfonts.korean=-hanyang-gothic-medium-r-normal--*-%d-*-*-m-*-iso10646-1
 allfonts.korean-johab=-hanyang-gothic-medium-r-normal--*-%d-*-*-m-*-iso10646-1
-allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
 allfonts.symbol=-monotype-symbol-medium-r-normal--*-%d-*-*-p-*-adobe-symbol
 allfonts.bengali=-misc-lohit bengali-medium-r-normal--0-0-0-0-p-0-iso10646-1
 allfonts.gujarati=-misc-lohit gujarati-medium-r-normal--0-0-0-0-p-0-iso10646-1
@@ -426,7 +425,7 @@ sequence.allfonts.UTF-8.zh.TW=latin-1,chinese-big5,chinese-hkscs,chinese-gb18030
 # - japanese-x0212: same files as japanese-x0201
 # - korean: same file as korean-johab
 sequence.fallback=latin-1,latin-2,latin-7,cyrillic-iso8859-5,greek,latin-5,latin-9,\
-        arabic,hebrew,thai,lucida,\
+        arabic,hebrew,thai,\
         chinese-gb18030-0,\
         japanese-x0201,korean-johab,\
         hindi,bengali,telugu,marathi,tamil,gujarati,kannada,malayalam,\
@@ -466,7 +465,6 @@ filename.-hanyang-gothic-medium-r-normal--*-%d-*-*-m-*-iso10646-1=/usr/share/fon
 filename.-arphic-uming-medium-r-normal--*-%d-*-*-m-*-iso10646-1=/usr/share/fonts/TrueType/arphic/uming.ttf
 filename.-monotype-symbol-medium-r-normal--*-%d-*-*-p-*-adobe-symbol=/usr/share/fonts/TrueType/core/symbol.ttf
 filename.-microsoft-wingdings-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific=/usr/share/fonts/TrueType/core/wingdings.ttf
-filename.-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1=$JRE_LIB_FONTS/LucidaSansRegular.ttf
 filename.-misc-lohit_bengali-medium-r-normal--0-0-0-0-p-0-iso10646-1=/usr/share/fonts/TrueType/lohit/Lohit-Bengali.ttf
 filename.-misc-lohit_gujarati-medium-r-normal--0-0-0-0-p-0-iso10646-1=/usr/share/fonts/TrueType/lohit/Lohit-Gujarati.ttf
 filename.-misc-lohit_hindi-medium-r-normal--0-0-0-0-p-0-iso10646-1=/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
diff --git a/make/data/fontconfig/windows.fontconfig.properties b/make/data/fontconfig/windows.fontconfig.properties
index fcfcb8f5190..95c35b5526b 100644
--- a/make/data/fontconfig/windows.fontconfig.properties
+++ b/make/data/fontconfig/windows.fontconfig.properties
@@ -39,10 +39,9 @@ allfonts.chinese-ms950-extb=MingLiU-ExtB
 allfonts.devanagari=Mangal
 allfonts.kannada=Tunga
 allfonts.dingbats=Wingdings
-allfonts.lucida=Lucida Sans Regular
 allfonts.symbol=Symbol
 allfonts.symbols=Segoe UI Symbol
-allfonts.thai=Lucida Sans Regular
+allfonts.thai=DokChampa
 allfonts.georgian=Sylfaen
 
 serif.plain.alphabetic=Times New Roman
@@ -238,7 +237,7 @@ sequence.dialoginput.x-windows-949=alphabetic,korean,dingbats,symbol
 
 sequence.allfonts.x-windows-874=alphabetic,thai,dingbats,symbol
 
-sequence.fallback=lucida,symbols,\
+sequence.fallback=symbols,\
                   chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
                   japanese,korean,chinese-ms950-extb,chinese-ms936-extb,georgian,kannada
 
@@ -294,7 +293,7 @@ filename.Gulim=gulim.TTC
 filename.Batang=batang.TTC
 filename.GulimChe=gulim.TTC
 
-filename.Lucida_Sans_Regular=LucidaSansRegular.ttf
+filename.DokChampa=dokchamp.ttf
 filename.Mangal=MANGAL.TTF
 filename.Tunga=TUNGA.TTF
 filename.Symbol=SYMBOL.TTF
diff --git a/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec
index a33f31ed41c..e701a404398 100644
--- a/make/data/jdwp/jdwp.spec
+++ b/make/data/jdwp/jdwp.spec
@@ -1997,8 +1997,7 @@ JDWP "Java(tm) Debug Wire Protocol"
         )
     )
     (Command Stop=10
-        "Stops the thread with an asynchronous exception, as if done by "
-        "java.lang.Thread.stop "
+        "Stops the thread with an asynchronous exception. "
         (Out
             (threadObject thread "The thread object ID. ")
             (object throwable "Asynchronous exception. This object must "
diff --git a/make/data/lsrdata/language-subtag-registry.txt b/make/data/lsrdata/language-subtag-registry.txt
index b38d2c82319..dc532a20197 100644
--- a/make/data/lsrdata/language-subtag-registry.txt
+++ b/make/data/lsrdata/language-subtag-registry.txt
@@ -1,4 +1,4 @@
-File-Date: 2017-08-15
+File-Date: 2018-04-23
 %%
 Type: language
 Subtag: aa
@@ -378,6 +378,7 @@ Subtag: hy
 Description: Armenian
 Added: 2005-10-16
 Suppress-Script: Armn
+Comments: see also hyw
 %%
 Type: language
 Subtag: hz
@@ -525,6 +526,7 @@ Suppress-Script: Latn
 %%
 Type: language
 Subtag: km
+Description: Khmer
 Description: Central Khmer
 Added: 2005-10-16
 Suppress-Script: Khmr
@@ -957,6 +959,7 @@ Subtag: sr
 Description: Serbian
 Added: 2005-10-16
 Macrolanguage: sh
+Comments: see cnr for Montenegrin
 %%
 Type: language
 Subtag: ss
@@ -1531,6 +1534,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: add
+Description: Lidzonka
 Description: Dzodinka
 Added: 2009-07-29
 %%
@@ -2114,7 +2118,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: aja
-Description: Aja (Sudan)
+Description: Aja (South Sudan)
 Added: 2009-07-29
 %%
 Type: language
@@ -3097,6 +3101,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: asf
+Description: Auslan
 Description: Australian Sign Language
 Added: 2009-07-29
 %%
@@ -4240,7 +4245,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: bdh
-Description: Baka (Sudan)
+Description: Baka (South Sudan)
 Added: 2009-07-29
 %%
 Type: language
@@ -4250,6 +4255,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: bdj
+Description: Bai (South Sudan)
 Description: Bai
 Added: 2009-07-29
 %%
@@ -5293,7 +5299,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: blm
-Description: Beli (Sudan)
+Description: Beli (South Sudan)
 Added: 2009-07-29
 %%
 Type: language
@@ -8104,6 +8110,13 @@ Description: Con
 Added: 2009-07-29
 %%
 Type: language
+Subtag: cnr
+Description: Montenegrin
+Added: 2018-01-23
+Macrolanguage: sh
+Comments: see sr for Serbian
+%%
+Type: language
 Subtag: cns
 Description: Central Asmat
 Added: 2009-07-29
@@ -8768,6 +8781,11 @@ Description: Tepeuxila Cuicatec
 Added: 2009-07-29
 %%
 Type: language
+Subtag: cuy
+Description: Cuitlatec
+Added: 2018-03-08
+%%
+Type: language
 Subtag: cvg
 Description: Chug
 Added: 2009-07-29
@@ -11089,7 +11107,7 @@ Added: 2005-10-16
 %%
 Type: language
 Subtag: fap
-Description: Palor
+Description: Paloor
 Added: 2009-07-29
 %%
 Type: language
@@ -12282,6 +12300,11 @@ Description: Guya
 Added: 2009-07-29
 %%
 Type: language
+Subtag: gkd
+Description: Magɨ (Madang Province)
+Added: 2018-03-08
+%%
+Type: language
 Subtag: gke
 Description: Ndai
 Added: 2009-07-29
@@ -12494,6 +12517,11 @@ Description: Gooniyandi
 Added: 2009-07-29
 %%
 Type: language
+Subtag: gnj
+Description: Ngen
+Added: 2018-03-08
+%%
+Type: language
 Subtag: gnk
 Description: //Gana
 Description: ǁGana
@@ -13224,6 +13252,11 @@ Description: Guyanese Creole English
 Added: 2009-07-29
 %%
 Type: language
+Subtag: gyo
+Description: Gyalsumdo
+Added: 2018-03-08
+%%
+Type: language
 Subtag: gyr
 Description: Guarayu
 Added: 2009-07-29
@@ -13584,6 +13617,11 @@ Description: Hunjara-Kaina Ke
 Added: 2009-07-29
 %%
 Type: language
+Subtag: hkn
+Description: Mel-Khaonh
+Added: 2018-03-08
+%%
+Type: language
 Subtag: hks
 Description: Hong Kong Sign Language
 Description: Heung Kong Sau Yue
@@ -14238,6 +14276,12 @@ Description: Hya
 Added: 2009-07-29
 %%
 Type: language
+Subtag: hyw
+Description: Western Armenian
+Added: 2018-03-08
+Comments: see also hy
+%%
+Type: language
 Subtag: hyx
 Description: Armenian (family)
 Added: 2009-07-29
@@ -14860,6 +14904,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: iri
+Description: Rigwe
 Description: Irigwe
 Added: 2009-07-29
 %%
@@ -20313,7 +20358,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: lno
-Description: Lango (Sudan)
+Description: Lango (South Sudan)
 Added: 2009-07-29
 %%
 Type: language
@@ -20579,6 +20624,7 @@ Type: language
 Subtag: lsg
 Description: Lyons Sign Language
 Added: 2009-07-29
+Deprecated: 2018-03-08
 %%
 Type: language
 Subtag: lsh
@@ -20850,6 +20896,11 @@ Description: Luwo
 Added: 2009-07-29
 %%
 Type: language
+Subtag: lws
+Description: Malawian Sign Language
+Added: 2018-03-08
+%%
+Type: language
 Subtag: lwt
 Description: Lewotobi
 Added: 2009-07-29
@@ -20904,6 +20955,7 @@ Type: language
 Subtag: maa
 Description: San Jerónimo Tecóatl Mazatec
 Added: 2009-07-29
+Comments: see also pbm
 %%
 Type: language
 Subtag: mab
@@ -23799,11 +23851,13 @@ Type: language
 Subtag: mwx
 Description: Mediak
 Added: 2009-07-29
+Deprecated: 2018-03-08
 %%
 Type: language
 Subtag: mwy
 Description: Mosiro
 Added: 2009-07-29
+Deprecated: 2018-03-08
 %%
 Type: language
 Subtag: mwz
@@ -24527,6 +24581,8 @@ Type: language
 Subtag: ncp
 Description: Ndaktup
 Added: 2009-07-29
+Deprecated: 2018-03-08
+Preferred-Value: kdz
 %%
 Type: language
 Subtag: ncq
@@ -25458,6 +25514,11 @@ Description: Nihali
 Added: 2009-07-29
 %%
 Type: language
+Subtag: nlm
+Description: Mankiyali
+Added: 2018-03-08
+%%
+Type: language
 Subtag: nln
 Description: Durango Nahuatl
 Added: 2009-07-29
@@ -26693,6 +26754,11 @@ Description: Njebi
 Added: 2009-07-29
 %%
 Type: language
+Subtag: nzd
+Description: Nzadi
+Added: 2018-03-08
+%%
+Type: language
 Subtag: nzi
 Description: Nzima
 Added: 2005-10-16
@@ -27757,6 +27823,12 @@ Description: Mak (Nigeria)
 Added: 2009-07-29
 %%
 Type: language
+Subtag: pbm
+Description: Puebla Mazatec
+Added: 2018-03-08
+Comments: see also maa
+%%
+Type: language
 Subtag: pbn
 Description: Kpasam
 Added: 2009-07-29
@@ -30902,6 +30974,7 @@ Added: 2005-10-16
 %%
 Type: language
 Subtag: scp
+Description: Hyolmo
 Description: Helambu Sherpa
 Added: 2009-07-29
 %%
@@ -33049,6 +33122,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: sxg
+Description: Shuhi
 Description: Shixing
 Added: 2009-07-29
 %%
@@ -33835,6 +33909,11 @@ Description: Tulishi
 Added: 2009-07-29
 %%
 Type: language
+Subtag: tez
+Description: Tetserret
+Added: 2018-03-08
+%%
+Type: language
 Subtag: tfi
 Description: Tofin Gbe
 Added: 2009-07-29
@@ -34399,7 +34478,7 @@ Added: 2009-07-29
 Type: language
 Subtag: tlh
 Description: Klingon
-Description: tlhIngan-Hol
+Description: tlhIngan Hol
 Added: 2005-10-16
 %%
 Type: language
@@ -42199,6 +42278,7 @@ Prefix: sgn
 %%
 Type: extlang
 Subtag: asf
+Description: Auslan
 Description: Australian Sign Language
 Added: 2009-07-29
 Preferred-Value: asf
@@ -42927,7 +43007,7 @@ Type: extlang
 Subtag: lsg
 Description: Lyons Sign Language
 Added: 2009-07-29
-Preferred-Value: lsg
+Deprecated: 2018-03-08
 Prefix: sgn
 %%
 Type: extlang
@@ -42983,6 +43063,13 @@ Prefix: lv
 Macrolanguage: lv
 %%
 Type: extlang
+Subtag: lws
+Description: Malawian Sign Language
+Added: 2018-03-08
+Preferred-Value: lws
+Prefix: sgn
+%%
+Type: extlang
 Subtag: lzh
 Description: Literary Chinese
 Added: 2009-07-29
@@ -44493,6 +44580,11 @@ Description: Kaganga
 Added: 2006-10-17
 %%
 Type: script
+Subtag: Rohg
+Description: Hanifi Rohingya
+Added: 2017-12-13
+%%
+Type: script
 Subtag: Roro
 Description: Rongorongo
 Added: 2005-10-16
@@ -44563,6 +44655,16 @@ Description: Sinhala
 Added: 2005-10-16
 %%
 Type: script
+Subtag: Sogd
+Description: Sogdian
+Added: 2017-12-13
+%%
+Type: script
+Subtag: Sogo
+Description: Old Sogdian
+Added: 2017-12-13
+%%
+Type: script
 Subtag: Sora
 Description: Sora Sompeng
 Added: 2011-01-07
@@ -46412,15 +46514,26 @@ Comments: Portuguese orthography conventions established in 1990 but
   not brought into effect until 2009
 %%
 Type: variant
+Subtag: aranes
+Description: Aranese
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in the Val d'Aran
+%%
+Type: variant
 Subtag: arevela
 Description: Eastern Armenian
 Added: 2006-09-18
+Deprecated: 2018-03-24
+Preferred-Value: hy
 Prefix: hy
 %%
 Type: variant
 Subtag: arevmda
 Description: Western Armenian
 Added: 2006-09-18
+Deprecated: 2018-03-24
+Preferred-Value: hyw
 Prefix: hy
 %%
 Type: variant
@@ -46431,6 +46544,13 @@ Added: 2017-06-05
 Prefix: tw
 %%
 Type: variant
+Subtag: auvern
+Description: Auvergnat
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in Auvergne
+%%
+Type: variant
 Subtag: baku1926
 Description: Unified Turkic Latin Alphabet (Historical)
 Added: 2007-04-18
@@ -46510,6 +46630,13 @@ Prefix: en
 Comments: Jargon embedded in American English
 %%
 Type: variant
+Subtag: cisaup
+Description: Cisalpine
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in northwestern Italy
+%%
+Type: variant
 Subtag: colb1945
 Description: Portuguese-Brazilian Orthographic Convention of 1945
   (Convenção Ortográfica Luso-Brasileira de 1945)
@@ -46528,6 +46655,12 @@ Added: 2015-12-07
 Prefix: en
 %%
 Type: variant
+Subtag: creiss
+Description: Occitan variants of the Croissant area
+Added: 2018-04-22
+Prefix: oc
+%%
+Type: variant
 Subtag: dajnko
 Description: Slovene in Dajnko alphabet
 Added: 2012-06-27
@@ -46556,6 +46689,11 @@ Description: International Phonetic Alphabet
 Added: 2006-12-11
 %%
 Type: variant
+Subtag: fonkirsh
+Description: Kirshenbaum Phonetic Alphabet
+Added: 2018-04-22
+%%
+Type: variant
 Subtag: fonnapa
 Description: North American Phonetic Alphabet
 Description: Americanist Phonetic Notation
@@ -46573,6 +46711,36 @@ Added: 2010-10-23
 Comments: Indicates that the content is transcribed according to X-SAMPA
 %%
 Type: variant
+Subtag: gascon
+Description: Gascon
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in Gascony
+%%
+Type: variant
+Subtag: grclass
+Description: Classical Occitan orthography
+Added: 2018-04-22
+Prefix: oc
+Comments: Classical written standard for Occitan developed in 1935 by
+  Alibèrt
+%%
+Type: variant
+Subtag: grital
+Description: Italian-inspired Occitan orthography
+Added: 2018-04-22
+Prefix: oc
+%%
+Type: variant
+Subtag: grmistr
+Description: Mistralian or Mistralian-inspired Occitan orthography
+Added: 2018-04-22
+Prefix: oc
+Comments: Written standard developed by Romanilha in 1853 and used by
+  Mistral and the Félibres, including derived standards such as Escolo
+  dóu Po, Escolo Gaston Febus, and others
+%%
+Type: variant
 Subtag: hepburn
 Description: Hepburn romanization
 Added: 2009-10-01
@@ -46617,6 +46785,13 @@ Added: 2010-07-28
 Prefix: sa
 %%
 Type: variant
+Subtag: ivanchov
+Description: Bulgarian in 1899 orthography
+Added: 2017-12-13
+Prefix: bg
+Comments: Bulgarian orthography introduced by Todor Ivanchov in 1899
+%%
+Type: variant
 Subtag: jauer
 Description: Jauer dialect of Romansh
 Added: 2010-06-29
@@ -46659,6 +46834,20 @@ Added: 2010-07-28
 Prefix: sa
 %%
 Type: variant
+Subtag: lemosin
+Description: Limousin
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in Limousin
+%%
+Type: variant
+Subtag: lengadoc
+Description: Languedocien
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in Languedoc
+%%
+Type: variant
 Subtag: lipaw
 Description: The Lipovaz dialect of Resian
 Description: The Lipovec dialect of Resian
@@ -46712,6 +46901,13 @@ Added: 2015-11-25
 Prefix: en-CA
 %%
 Type: variant
+Subtag: nicard
+Description: Niçard
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in Nice
+%%
+Type: variant
 Subtag: njiva
 Description: The Gniva dialect of Resian
 Description: The Njiva dialect of Resian
@@ -46798,6 +46994,13 @@ Added: 2006-12-11
 Prefix: el
 %%
 Type: variant
+Subtag: provenc
+Description: Provençal
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in Provence
+%%
+Type: variant
 Subtag: puter
 Description: Puter idiom of Romansh
 Added: 2010-06-29
@@ -46959,6 +47162,13 @@ Comments: Vallader is one of the five traditional written standards or
   "idioms" of the Romansh language.
 %%
 Type: variant
+Subtag: vivaraup
+Description: Vivaro-Alpine
+Added: 2018-04-22
+Prefix: oc
+Comments: Occitan variant spoken in northeastern Occitania
+%%
+Type: variant
 Subtag: wadegile
 Description: Wade-Giles romanization
 Added: 2008-10-03
diff --git a/make/devkit/Makefile b/make/devkit/Makefile
index 1bd37951fd3..d0464fbecd9 100644
--- a/make/devkit/Makefile
+++ b/make/devkit/Makefile
@@ -42,6 +42,8 @@
 # line looking like this:
 #
 # make cross_compile_target="aarch64-linux-gnu" BASE_OS=Fedora27
+# or
+# make cross_compile_target="arm-linux-gnueabihf" BASE_OS=Fedora27
 #
 # This is the makefile which iterates over all host and target platforms.
 #
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
index 5bc63448111..5e87a848e68 100644
--- a/make/devkit/Tools.gmk
+++ b/make/devkit/Tools.gmk
@@ -44,13 +44,23 @@ $(info HOST=$(HOST))
 $(info BUILD=$(BUILD))
 
 ARCH := $(word 1,$(subst -, ,$(TARGET)))
+
+ifeq ($(TARGET), arm-linux-gnueabihf)
+  ARCH=armhfp
+endif
+
 $(info ARCH=$(ARCH))
 
 ifeq ($(BASE_OS), OEL6)
   OEL_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
   LINUX_VERSION := OEL6.4
 else ifeq ($(BASE_OS), Fedora27)
-  OEL_URL := https://dl.fedoraproject.org/pub/fedora-secondary/releases/27/Everything/$(ARCH)/os/Packages/
+  ifeq ($(ARCH), aarch64)
+    FEDORA_TYPE=fedora-secondary
+  else
+    FEDORA_TYPE=fedora/linux
+  endif
+  OEL_URL := https://dl.fedoraproject.org/pub/$(FEDORA_TYPE)/releases/27/Everything/$(ARCH)/os/Packages/
   LINUX_VERSION := Fedora 27
 else
   $(error Unknown base OS $(BASE_OS))
@@ -189,6 +199,8 @@ ifeq ($(ARCH),x86_64)
   endif
 else ifeq ($(ARCH),i686)
   RPM_ARCHS := i386 i686 noarch
+else ifeq ($(ARCH), armhfp)
+  RPM_ARCHS := $(ARCH) armv7hl noarch
 else
   RPM_ARCHS := $(ARCH) noarch
 endif
@@ -410,6 +422,10 @@ ifneq (,$(findstring linux,$(TARGET)))
   $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
 endif
 
+ifeq ($(ARCH), armhfp)
+  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG +=  --with-float=hard
+endif
+
 # Want:
 # c,c++
 # shared libs
diff --git a/make/devkit/createWindowsDevkit2017.sh b/make/devkit/createWindowsDevkit2017.sh
index bd9993965cc..4f208dad8b9 100644
--- a/make/devkit/createWindowsDevkit2017.sh
+++ b/make/devkit/createWindowsDevkit2017.sh
@@ -108,8 +108,8 @@ if [ ! -d $DEVKIT_ROOT/VC ]; then
 
     # The redist runtime libs are needed to run the compiler but may not be
     # installed on the machine where the devkit will be used.
-    cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x86
-    cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
+    cp $DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x86
+    cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
     cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
     cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
 fi
diff --git a/make/gendata/GendataFontConfig.gmk b/make/gendata/GendataFontConfig.gmk
index 52ee37c1880..50a3bcd49d0 100644
--- a/make/gendata/GendataFontConfig.gmk
+++ b/make/gendata/GendataFontConfig.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, gendata/GendataFontConfig.gmk))
-
 GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
 
 GENDATA_FONT_CONFIG_DATA_DIR ?= $(TOPDIR)/make/data/fontconfig
diff --git a/make/gensrc/Gensrc-java.desktop.gmk b/make/gensrc/Gensrc-java.desktop.gmk
index 62197ad6b13..aca529c8134 100644
--- a/make/gensrc/Gensrc-java.desktop.gmk
+++ b/make/gensrc/Gensrc-java.desktop.gmk
@@ -78,13 +78,6 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
 
 GENSRC_JAVA_DESKTOP += $(COMPILE_PROPERTIES)
 
-# Some resources bundles are already present as java files but still need to be
-# copied to zh_HK locale.
-$(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
-
-GENSRC_JAVA_DESKTOP += $(COPY_ZH_HK)
-
 ################################################################################
 
 java.desktop: $(GENSRC_JAVA_DESKTOP)
diff --git a/make/gensrc/Gensrc-jdk.compiler.gmk b/make/gensrc/Gensrc-jdk.compiler.gmk
index 24be68e89c1..e5a299f7970 100644
--- a/make/gensrc/Gensrc-jdk.compiler.gmk
+++ b/make/gensrc/Gensrc-jdk.compiler.gmk
@@ -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
@@ -32,6 +32,7 @@ $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
     $(JAVAC_VERSION)))
 
 $(eval $(call SetupParseProperties,PARSE_PROPERTIES, \
-	com/sun/tools/javac/resources/compiler.properties))
+	com/sun/tools/javac/resources/compiler.properties \
+	com/sun/tools/javac/resources/launcher.properties))
 
 all: $(COMPILE_PROPERTIES) $(PARSE_PROPERTIES)
diff --git a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
index 7d90a974060..c88862ea721 100644
--- a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+++ b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
@@ -103,7 +103,7 @@ ADD_EXPORTS := \
 $(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
 	$(call MakeDir, $(@D))
 	$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
-	$(JAVA_SMALL) $(NEW_JAVAC) \
+	$(JAVA) $(NEW_JAVAC) \
 	    -XDignore.symbol.file \
 	    --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \
 	    $(ADD_EXPORTS) \
diff --git a/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk b/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk
new file mode 100644
index 00000000000..9dec093eede
--- /dev/null
+++ b/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk
@@ -0,0 +1,51 @@
+#
+# 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.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include TextFileProcessing.gmk
+
+################################################################################
+
+# Version file needs to be processed with version numbers
+VERSION_FILE := jdk/nashorn/internal/runtime/resources/version.properties
+
+$(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \
+    SOURCE_FILES := $(TOPDIR)/src/$(MODULE)/share/classes/$(VERSION_FILE).template, \
+    OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$(VERSION_FILE), \
+    REPLACEMENTS := \
+        @@VERSION_STRING@@ => $(VERSION_STRING) ; \
+        @@VERSION_SHORT@@ => $(VERSION_SHORT) , \
+))
+
+TARGETS += $(NASGEN_RUN_FILE) $(BUILD_VERSION_FILE)
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default
diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 428a1bbc737..d4f0891532e 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -155,6 +155,16 @@ ifneq ($(call check-jvm-feature, serialgc), true)
   JVM_EXCLUDE_FILES += psMarkSweep.cpp psMarkSweepDecorator.cpp
 endif
 
+ifneq ($(call check-jvm-feature, epsilongc), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_EPSILONGC=0
+  JVM_EXCLUDE_PATTERNS += gc/epsilon
+endif
+
+ifneq ($(call check-jvm-feature, zgc), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_ZGC=0
+  JVM_EXCLUDE_PATTERNS += gc/z
+endif
+
 ifneq ($(call check-jvm-feature, jfr), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
   JVM_EXCLUDE_PATTERNS += jfr
diff --git a/make/langtools/build.properties b/make/langtools/build.properties
index 53260739538..30ca441558c 100644
--- a/make/langtools/build.properties
+++ b/make/langtools/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
@@ -38,7 +38,8 @@ module.names = java.compiler \
                jdk.jshell
 
 langtools.resource.includes = \
-        com/sun/tools/javac/resources/compiler.properties
+        com/sun/tools/javac/resources/compiler.properties \
+        com/sun/tools/javac/resources/launcher.properties
 
 # Version info -- override as needed
 jdk.version = 9
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index b492120a36d..8a138b2e788 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -27,37 +27,38 @@ $(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
 
 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
 
+LIBAWT_DEFAULT_HEADER_DIRS := \
+    libawt/awt/image \
+    libawt/awt/image/cvutils \
+    libawt/java2d \
+    libawt/java2d/loops \
+    libawt/java2d/pipe \
+    #
+
 ################################################################################
 
-BUILD_LIBMLIB_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
-    $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
-BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
-    $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
-    -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
+# We must not include java.desktop/unix/native/libmlib_image, which is only
+# for usage by solaris-sparc in libmlib_image_v.
+BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix
 
-BUILD_LIBMLIB_LDLIBS :=
-
-BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
+BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
 
 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
 endif
 
-ifneq ($(OPENJDK_TARGET_OS), windows)
-  BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
     NAME := mlib_image, \
-    SRC := $(BUILD_LIBMLIB_SRC), \
+    EXTRA_SRC := common/awt/medialib, \
     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
+    EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(BUILD_LIBMLIB_CFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LIBS := $(BUILD_LIBMLIB_LDLIBS) \
-        $(JDKLIB_LIBS), \
+    LIBS := $(JDKLIB_LIBS), \
+    LIBS_unix := $(LIBM) $(LIBDL), \
 ))
 
 $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
@@ -68,14 +69,19 @@ TARGETS += $(BUILD_LIBMLIB_IMAGE)
 
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
 
-  LIBMLIB_IMAGE_V_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
-      $(TOPDIR)/src/java.desktop/unix/native/libmlib_image \
-      $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
-      $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
-      #
-  LIBMLIB_IMAGE_V_CFLAGS := $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
-      $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
-      #
+  # libmlib_image_v is basically built from mlib_image sources, with some additions
+  # and some exclusions.
+  LIBMLIB_IMAGE_V_SRC := \
+     libmlib_image \
+     common/awt/medialib \
+     #
+
+  LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
+      $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
+
+  ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+    LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
+  endif
 
   BUILD_LIBMLIB_IMAGE_V_EXFILES := \
       awt_ImagingLib.c \
@@ -95,19 +101,16 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
       mlib_c_ImageLookUp_f.c \
       #
 
-  LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \
       NAME := mlib_image_v, \
       SRC := $(LIBMLIB_IMAGE_V_SRC), \
       EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
       OPTIMIZATION := HIGHEST, \
-      CFLAGS := -xarch=sparcvis \
-          $(LIBMLIB_IMAGE_V_CFLAGS) \
-          $(CFLAGS_JDKLIB), \
+      CFLAGS := $(CFLAGS_JDKLIB) \
+          $(LIBMLIB_IMAGE_V_CFLAGS), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \
+      LIBS := -ljava -ljvm $(LIBM) $(LIBDL), \
   ))
 
   $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
@@ -118,18 +121,22 @@ endif
 
 ################################################################################
 
-LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \
-    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
-    $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+LIBAWT_EXTRA_SRC := \
+    common/awt/debug \
+    $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
     #
 
-ifeq ($(OPENJDK_TARGET_OS), aix)
-  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+  LIBAWT_EXTRA_SRC += $(TOPDIR)/src/$(MODULE)/share/native/common/awt/medialib
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/utility
+  LIBAWT_EXTRA_SRC += \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/awt/utility \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/font \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
+      $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
+      #
 endif
 
 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
@@ -140,33 +147,45 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
 endif
 
-LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-    $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
-    $(LIBJAVA_HEADER_FLAGS) \
-    $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  LIBAWT_EXFILES += \
+      java2d/d3d/D3DShaderGen.c \
+      awt/image/cvutils/img_colors.c \
+      #
+endif
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
+  LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
+else
+  LIBAWT_EXCLUDES += \
+      $(TOPDIR)/src/$(MODULE)/unix/native/libawt/awt/medialib \
+      $(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \
+      $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
+      #
+endif
+
+LIBAWT_EXTRA_HEADER_DIRS := \
+    $(LIBAWT_DEFAULT_HEADER_DIRS) \
+    $(call GetJavaHeaderDir, java.base) \
+    libawt/awt/medialib \
+    libawt/java2d/d3d \
+    libawt/java2d/opengl \
+    libawt/java2d/windows \
+    libawt/windows \
+    common/awt/medialib \
+    libmlib_image \
+    include \
+    java.base:libjava \
+    java.base:include \
     #
 
 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
 
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
-  LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
-  LIBAWT_CFLAGS += -xarch=sparcvis
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
+  LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
+      $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
 
-  LIBAWT_CFLAGS += $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
-  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
-  LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
-
-  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
-    LIBAWT_ASFLAGS = -P -xarch=v9a
-  else
-    LIBAWT_ASFLAGS = -P -xarch=v8plusa
-  endif
-else
-  LIBAWT_EXCLUDES += \
-      $(TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
-      $(TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
-      $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
-      #
+  LIBAWT_ASFLAGS = -P -xarch=v9a
 endif
 
 ifneq ($(OPENJDK_TARGET_OS), solaris)
@@ -174,29 +193,13 @@ ifneq ($(OPENJDK_TARGET_OS), solaris)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/font \
-      $(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
-  # Why does libawt need java.base headers?
-  LIBAWT_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/common/font \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
-      -I$(TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/include \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-      #
-  LIBAWT_EXFILES += \
-      java2d/d3d/D3DShaderGen.c \
-      awt/image/cvutils/img_colors.c \
-      #
-
   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
     LIBAWT_CFLAGS += -DMLIB_OS64BIT
   endif
 
   LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
-  LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
+  LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
@@ -215,16 +218,17 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     NAME := awt, \
-    SRC := $(LIBAWT_DIRS), \
+    EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
     EXCLUDES := $(LIBAWT_EXCLUDES), \
     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
+    EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
     DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
         format-nonliteral parentheses, \
     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
     DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
-    DISABLED_WARNINGS_microsoft := 4297 4244 4267 4291 4302 4311 4996, \
+    DISABLED_WARNINGS_microsoft := 4244 4267 4996, \
     ASFLAGS := $(LIBAWT_ASFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
@@ -265,38 +269,26 @@ TARGETS += $(BUILD_LIBAWT)
 
 ################################################################################
 
-ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
+ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx), )
   ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
-    LIBAWT_XAWT_DIRS := \
-        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
-        $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-        $(TOPDIR)/src/java.desktop/share/native/common/awt/utility \
-        $(TOPDIR)/src/java.desktop/share/native/common/font \
-        $(TOPDIR)/src/java.desktop/share/native/common/java2d \
-        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
-        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+    LIBAWT_XAWT_EXTRA_SRC := \
+        common/awt \
+        common/java2d \
+        common/font \
         #
 
-    ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
-      LIBAWT_XAWT_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
-    endif
-
     LIBAWT_XAWT_EXCLUDES := medialib
 
-    LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-        -I$(TOPDIR)/src/java.desktop/share/native/include \
-        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
-        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
-        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
-        $(LIBJAVA_HEADER_FLAGS)
+    LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
+        $(LIBAWT_DEFAULT_HEADER_DIRS) \
+        libawt_xawt/awt \
+        include \
+        common/awt/debug \
+        common/awt/systemscale \
+        common/font \
+        common/java2d/opengl \
+        common/java2d/x11 \
         #
 
     LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
@@ -329,11 +321,12 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
       BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
       # initializing a declared 'extern'
       BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
-   endif
+    endif
 
     $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
         NAME := awt_xawt, \
-        SRC := $(LIBAWT_XAWT_DIRS), \
+        EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
+        EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
         EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
@@ -349,10 +342,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
             $(call SET_SHARED_LIBRARY_ORIGIN) \
             -L$(INSTALL_LIBRARIES_HERE), \
         LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
-        RC_FLAGS := $(RC_FLAGS) \
-            -D "JDK_FNAME=xawt.dll" \
-            -D "JDK_INTERNAL_NAME=xawt" \
-            -D "JDK_FTYPE=0x2L", \
     ))
 
     $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
@@ -366,36 +355,34 @@ endif
 
 ################################################################################
 
-LIBLCMS_SRC := $(TOPDIR)/src/java.desktop/share/native/liblcms
-LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-    -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-    -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-    $(LIBJAVA_HEADER_FLAGS) \
-    #
 # The fast floor code loses precision.
 LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR
 
+LCMS_CFLAGS_JDKLIB := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB))
+
 ifeq ($(USE_EXTERNAL_LCMS), true)
   # If we're using an external library, we'll just need the wrapper part.
   # By including it explicitly, all other files will be excluded.
   BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
+  # If we're using an external library, we can't include our own SRC path
+  # as includes, instead the system headers should be used.
+  LIBLCMS_HEADERS_FROM_SRC := false
 else
   BUILD_LIBLCMS_INCLUDE_FILES :=
-  # If we're using the bundled library, we'll need to include it in the
-  # include path explicitly. Otherwise the system headers will be used.
-  LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
 endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
     NAME := lcms, \
-    SRC := $(LIBLCMS_SRC), \
     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
     OPTIMIZATION := HIGHEST, \
-    CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
-        $(LIBLCMS_CPPFLAGS) \
+    CFLAGS := $(LCMS_CFLAGS_JDKLIB) \
         $(LCMS_CFLAGS), \
     CFLAGS_solaris := -xc99=no_lib, \
     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+    EXTRA_HEADER_DIRS := \
+        common/awt/debug \
+        libawt/java2d, \
+    HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
     DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \
     DISABLED_WARNINGS_clang := tautological-compare, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
@@ -413,8 +400,6 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
 
 ################################################################################
 
-LIBJAVAJPEG_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
-
 # "DISABLED_WARNINGS_gcc := clobbered" rationale:
 # Suppress gcc warnings like "variable might be clobbered by 'longjmp'
 # or 'vfork'": this warning indicates that some variable is placed to
@@ -428,21 +413,20 @@ ifeq ($(USE_EXTERNAL_LIBJPEG), true)
   BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
       imageioJPEG.c \
       jpegdecoder.c
-  BUILD_LIBJAVAJPEG_HEADERS :=
+  # If we're using an external library, we can't include our own SRC path
+  # as includes, instead the system headers should be used.
+  LIBJPEG_HEADERS_FROM_SRC := false
 else
   LIBJPEG_LIBS :=
   BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
-  BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
 endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
     NAME := javajpeg, \
-    SRC := $(LIBJAVAJPEG_SRC), \
     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
     OPTIMIZATION := HIGHEST, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
-        $(LIBJAVA_HEADER_FLAGS) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
+    CFLAGS := $(CFLAGS_JDKLIB), \
+    HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
     DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -459,42 +443,32 @@ TARGETS += $(BUILD_LIBJAVAJPEG)
 # Mac and Windows only use the native AWT lib, do not build libawt_headless
 ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
 
-  LIBAWT_HEADLESS_DIRS := $(TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
-      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
-      $(TOPDIR)/src/java.desktop/share/native/common/java2d \
-      $(TOPDIR)/src/java.desktop/share/native/common/font \
+  LIBAWT_HEADLESS_EXTRA_SRC := \
+      common/font \
+      common/java2d \
+      $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
       #
 
   LIBAWT_HEADLESS_EXCLUDES := medialib
-  LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-      $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/font \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
-      $(LIBJAVA_HEADER_FLAGS) \
+
+  LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
+      common/awt/debug \
+      common/font \
+      common/java2d/opengl \
       #
 
+  LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
+      -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
       NAME := awt_headless, \
-      SRC := $(LIBAWT_HEADLESS_DIRS), \
+      EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
-          -DHEADLESS=true \
-          -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
-          $(CUPS_CFLAGS) \
-          $(FONTCONFIG_CFLAGS) \
-          $(X_CFLAGS) \
           $(LIBAWT_HEADLESS_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
       DISABLED_WARNINGS_xlc := 1506-356, \
       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -518,12 +492,15 @@ endif
 ################################################################################
 
 ifeq ($(FREETYPE_TO_USE), system)
+  # For use by libfontmanager:
   LIBFREETYPE_CFLAGS := $(FREETYPE_CFLAGS)
   LIBFREETYPE_LIBS := $(FREETYPE_LIBS)
 else
-  LIBFREETYPE_SRC := $(TOPDIR)/src/java.desktop/share/native/libfreetype
-  BUILD_LIBFREETYPE_HEADERS := $(addprefix -I, $(LIBFREETYPE_SRC)/include)
-  LIBFREETYPE_CFLAGS := $(BUILD_LIBFREETYPE_HEADERS)
+  BUILD_LIBFREETYPE_HEADER_DIRS := $(TOPDIR)/src/$(MODULE)/share/native/libfreetype/include
+  BUILD_LIBFREETYPE_CFLAGS := -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS)
+
+  # For use by libfontmanager:
+  LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS)
   ifeq ($(OPENJDK_TARGET_OS), windows)
     LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
   else
@@ -532,14 +509,15 @@ else
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
       NAME := freetype, \
-      SRC := $(LIBFREETYPE_SRC)/src, \
       OPTIMIZATION := HIGHEST, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFREETYPE_HEADERS) \
-          -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS), \
+      CFLAGS := $(CFLAGS_JDKLIB) \
+          $(BUILD_LIBFREETYPE_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
       DISABLED_WARNINGS_microsoft := 4267 4244 4312, \
+      DISABLED_WARNINGS_gcc := implicit-fallthrough, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
   ))
@@ -549,19 +527,6 @@ endif
 
 ###########################################################################
 
-LIBFONTMANAGER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \
-    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
-LIBFONTMANAGER_CFLAGS := \
-    $(addprefix -I, $(shell $(FIND) \
-      $(LIBFONTMANAGER_SRC) \
-      $(TOPDIR)/src/java.desktop/share/native/libawt \
-      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
-      $(TOPDIR)/src/java.desktop/share/native/common \
-      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-    $(LIBJAVA_HEADER_FLAGS) \
-    #
-
 #### Begin harfbuzz configuration
 
 HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN
@@ -589,6 +554,16 @@ LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
 
 #### End harfbuzz configuration
 
+LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
+    libfontmanager/harfbuzz \
+    libfontmanager/harfbuzz/hb-ucdn \
+    common/awt \
+    common/font \
+    libawt/java2d \
+    libawt/java2d/pipe \
+    libawt/java2d/loops \
+    #
+
 LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
 BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
 
@@ -598,7 +573,6 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c
   LIBFONTMANAGER_OPTIMIZATION := HIGHEST
-  LIBFONTMANAGER_CFLAGS += -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c \
@@ -609,7 +583,7 @@ else
       lcdglyph.c
 endif
 
-LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
+LIBFONTMANAGER_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
 
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   # Turn off all warnings for sunFont.c. This is needed because the specific warning
@@ -625,7 +599,6 @@ endif
 #   libawt_xawt). See JDK-8196516 for details.
 $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     NAME := fontmanager, \
-    SRC := $(LIBFONTMANAGER_SRC), \
     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
         AccelGlyphCache.c, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
@@ -633,6 +606,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
     CFLAGS_windows = -DCC_NOEX, \
+    EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
         type-limits missing-field-initializers implicit-fallthrough, \
@@ -664,7 +638,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  $(BUILD_LIBFONTMANAGER): $(call FindLib, java.desktop, awt_lwawt)
+  $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
 endif
 
 ifeq ($(FREETYPE_TO_USE), bundled)
@@ -676,29 +650,30 @@ TARGETS += $(BUILD_LIBFONTMANAGER)
 ################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
-  LIBJAWT_CFLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-      -I$(TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/include \
-      $(LIBJAVA_HEADER_FLAGS) \
+
+  LIBJAWT_CFLAGS := -EHsc -DUNICODE -D_UNICODE
+
+  LIBJAWT_EXTRA_HEADER_DIRS := \
+      include \
+      common/awt/debug \
+      libawt/awt/image/cvutils \
+      libawt/java2d \
+      libawt/java2d/windows \
+      libawt/windows \
+      java.base:include \
+      java.base:libjava \
       #
 
   ifeq ($(OPENJDK_TARGET_CPU), x86)
     KERNEL32_LIB := kernel32.lib
   endif
+
   $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
       NAME := jawt, \
-      SRC := $(LIBJAWT_SRC), \
-      INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CXXFLAGS_JDKLIB) \
-          -EHsc -DUNICODE -D_UNICODE \
           $(LIBJAWT_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
       LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
   ))
@@ -717,17 +692,9 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 else # OPENJDK_TARGET_OS not windows
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libjawt
-  else
-    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
+    # libjawt on macosx do not use the unix code
+    LIBJAWT_EXCLUDE_SRC_PATTERNS := unix
   endif
-  LIBJAWT_CFLAGS := \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/include \
-      $(LIBJAVA_HEADER_FLAGS) \
-      #
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     JAWT_LIBS := -lawt_lwawt
@@ -740,19 +707,22 @@ else # OPENJDK_TARGET_OS not windows
       JAWT_LIBS += -lawt_xawt
     else
       JAWT_LIBS += -lawt_headless
-      HEADLESS_CFLAG += -DHEADLESS
+      ifeq ($(OPENJDK_TARGET_OS), linux)
+        JAWT_CFLAGS += -DHEADLESS
+      endif
     endif
   endif
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
       NAME := jawt, \
-      SRC := $(LIBJAWT_SRC), \
+      EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \
       INCLUDE_FILES := $(JAWT_FILES), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
-          $(LIBJAWT_CFLAGS), \
-      CFLAGS_linux := $(HEADLESS_CFLAG), \
-      CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
+          $(JAWT_CFLAGS), \
+      EXTRA_HEADER_DIRS := \
+          include \
+          common/awt, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -780,52 +750,56 @@ TARGETS += $(BUILD_LIBJAWT)
 
 ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
-  LIBSPLASHSCREEN_DIRS := \
-      $(TOPDIR)/src/java.desktop/share/native/libjavajpeg \
-      $(TOPDIR)/src/java.desktop/share/native/libsplashscreen \
+  LIBSPLASHSCREEN_EXTRA_SRC := \
+      common/awt/systemscale \
       #
 
-  ifeq ($(USE_EXTERNAL_LIBGIF), true)
-    GIFLIB_LIBS := -lgif
-    LIBSPLASHSCREEN_EXCLUDES := giflib
+  ifeq ($(USE_EXTERNAL_LIBGIF), false)
+    LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib
   else
-    LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
+    LIBSPLASHSCREEN_EXCLUDES := giflib
+    GIFLIB_LIBS := -lgif
   endif
 
-  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-    LIBJPEG_LIBS := -ljpeg
+  ifeq ($(USE_EXTERNAL_LIBJPEG), false)
+    # While the following ought to work, it will currently pull in the closed
+    # additions to this library, and this was not done previously in the build.
+    # LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg
+    LIBSPLASHSCREEN_EXTRA_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
   else
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
-    LIBJPEG_CFLAGS := -I$(TOPDIR)/src/java.desktop/share/native/libjavajpeg
+    LIBJPEG_LIBS := -ljpeg
   endif
 
   ifeq ($(USE_EXTERNAL_LIBPNG), false)
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
+    LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/libpng
+
+    ifeq ($(OPENJDK_TARGET_OS), macosx)
+      ifeq ($(USE_EXTERNAL_LIBZ), true)
+        # When building our own libpng and using an external libz, we need to
+        # inject our own libz.h to tweak the exported ZLIB_VERNUM macro. See
+        # $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
+        # for details. This must be specified with -iquote, not -I to avoid a
+        # circular include.
+        LIBSPLASHSCREEN_CFLAGS += -iquote $(TOPDIR)/src/$(MODULE)/macosx/native/libsplashscreen/libpng/zlibwrapper
+      endif
+    endif
   else
     LIBSPLASHSCREEN_EXCLUDES += libpng
   endif
 
-  ifneq ($(OPENJDK_TARGET_OS), macosx)
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
-  else
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
+  ifeq ($(USE_EXTERNAL_LIBZ), false)
+    LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
   endif
 
-  ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
+  ifeq ($(OPENJDK_TARGET_OS), macosx)
+    # libsplashscreen on macosx do not use the unix code
+    LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix
   endif
 
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale
-  endif
-  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
-      $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
-      $(LIBJAVA_HEADER_FLAGS) \
-      #
+  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
-    LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp
 
     BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
     BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
@@ -843,20 +817,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
   LIBSPLASHSCREEN_LIBS :=
 
-  ifeq ($(USE_EXTERNAL_LIBZ), false)
-    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.base/share/native/libzip/zlib
-  else
-    ifeq ($(OPENJDK_TARGET_OS), macosx)
-      ifeq ($(USE_EXTERNAL_LIBPNG), false)
-        # When building our own libpng and using an external libz, we need to
-        # inject our own libz.h to tweak the exported ZLIB_VERNUM macro. See
-        # $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
-        # for details.
-        LIBSPLASHSCREEN_CFLAGS += -iquote $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng
-      endif
-    endif
-  endif
-
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     LIBSPLASHSCREEN_LIBS += \
         $(LIBM) -lpthread -liconv -losxapp \
@@ -870,14 +830,22 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
     LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
   endif
 
+  LIBSPLASHSCREEN_HEADER_DIRS += \
+      libosxapp \
+      java.base:include \
+      java.base:libjava \
+      #
+
   $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
       NAME := splashscreen, \
-      SRC := $(LIBSPLASHSCREEN_DIRS), \
+      EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
+      EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
+      CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
       DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
           maybe-uninitialized shift-negative-value implicit-fallthrough, \
       DISABLED_WARNINGS_clang := incompatible-pointer-types, \
@@ -896,7 +864,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
   TARGETS += $(BUILD_LIBSPLASHSCREEN)
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    $(BUILD_LIBSPLASHSCREEN): $(call FindLib, java.desktop, osxapp)
+    $(BUILD_LIBSPLASHSCREEN): $(call FindLib, $(MODULE), osxapp)
   endif
 
 endif
@@ -905,49 +873,38 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
-  LIBAWT_LWAWT_DIRS := \
-      $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
-      $(TOPDIR)/src/java.desktop/unix/native/common/awt \
-      $(TOPDIR)/src/java.desktop/share/native/common/font \
-      $(TOPDIR)/src/java.desktop/share/native/common/java2d \
+  LIBAWT_LWAWT_EXTRA_SRC := \
+      $(TOPDIR)/src/$(MODULE)/unix/native/common/awt \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/font \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/java2d \
       #
 
-  LIBAWT_LWAWT_CFLAGS := \
-      $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
-      -I$(TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
-      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
-      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      -I$(TOPDIR)/src/java.desktop/macosx/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-      -I$(TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-      -I$(TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
-      -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-      $(LIBJAVA_HEADER_FLAGS) \
+  LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
+      libawt_lwawt/awt \
+      libawt_lwawt/font \
+      libawt_lwawt/java2d/opengl \
+      include \
+      common/awt/debug \
+      common/java2d/opengl \
+      libosxapp \
       #
 
+  LIBAWT_LWAWT_CFLAGS := $(X_CFLAGS) $(X_LIBS)
+
   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
-  LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
+  LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
       NAME := awt_lwawt, \
-      SRC := $(LIBAWT_LWAWT_DIRS), \
+      EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \
       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
       EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
       EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
-          $(X_CFLAGS) \
-          $(X_LIBS) \
           $(LIBAWT_LWAWT_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \
       DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
           deprecated-declarations objc-method-access bitwise-op-parentheses \
           incompatible-pointer-types parentheses-equality extra-tokens, \
@@ -974,7 +931,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
 
-  $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.desktop, osxapp)
+  $(BUILD_LIBAWT_LWAWT): $(call FindLib, $(MODULE), osxapp)
 
   $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
 
@@ -986,15 +943,11 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
       NAME := osxui, \
-      SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxui, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxui \
-          -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
-          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-          -I$(TOPDIR)/src/java.base/share/native/libjava \
-          -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop,  \
+      CFLAGS := $(CFLAGS_JDKLIB), \
+      EXTRA_HEADER_DIRS := \
+          libawt_lwawt/awt \
+          libosxapp, \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN) \
@@ -1013,7 +966,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
 
-  $(BUILD_LIBOSXUI): $(call FindLib, java.desktop, osxapp)
+  $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp)
 
   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
 
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
index 4a7dae1b7e6..df5c0191f61 100644
--- a/make/lib/CoreLibraries.gmk
+++ b/make/lib/CoreLibraries.gmk
@@ -104,7 +104,6 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
     NAME := verify, \
-    SRC := $(TOPDIR)/src/java.base/share/native/libverify, \
     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
@@ -119,13 +118,7 @@ TARGETS += $(BUILD_LIBVERIFY)
 
 ##########################################################################################
 
-# Allow a custom makefile to add extra src dirs
-LIBJAVA_SRC_DIRS += $(call FindSrcDirsForLib, java.base, java)
-
-LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \
-    -I$(TOPDIR)/src/java.base/share/native/libfdlibm \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-    -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
+LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
@@ -134,12 +127,12 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
     NAME := java, \
-    SRC := $(LIBJAVA_SRC_DIRS), \
     OPTIMIZATION := HIGH, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(LIBJAVA_CFLAGS), \
     System.c_CFLAGS := $(VERSION_CFLAGS), \
     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
+    EXTRA_HEADER_DIRS := libfdlibm, \
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := unused-result, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
@@ -180,13 +173,9 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
     NAME := zip, \
     OPTIMIZATION := LOW, \
-    SRC := $(TOPDIR)/src/java.base/share/native/libzip, \
     EXCLUDES := $(LIBZIP_EXCLUDES), \
     CFLAGS := $(CFLAGS_JDKLIB) \
-        $(LIBZ_CFLAGS) \
-        -I$(TOPDIR)/src/java.base/share/native/libjava \
-        -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+        $(LIBZ_CFLAGS), \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -200,22 +189,12 @@ TARGETS += $(BUILD_LIBZIP)
 
 ##########################################################################################
 
-JIMAGELIB_CPPFLAGS := \
-    -I$(TOPDIR)/src/java.base/share/native/libjava \
-    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-    -I$(TOPDIR)/src/java.base/share/native/libjimage \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-    #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
     NAME := jimage, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
-    SRC := $(TOPDIR)/src/java.base/share/native/libjimage \
-        $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
-    EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
-    CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
-    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
+    CXXFLAGS := $(CXXFLAGS_JDKLIB), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     CFLAGS_unix := -UDEBUG, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
@@ -231,10 +210,6 @@ TARGETS += $(BUILD_LIBJIMAGE)
 
 ##########################################################################################
 
-LIBJLI_SRC_DIRS := $(call FindSrcDirsForLib, java.base, jli)
-
-LIBJLI_CFLAGS := $(CFLAGS_JDKLIB)
-
 ifeq ($(call check-jvm-variant, zero), true)
   ERGO_FAMILY := zero
 else
@@ -263,7 +238,7 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   # Staticically link with c runtime on windows.
-  LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
+  LIBJLI_CFLAGS_JDKLIB := $(filter-out -MD, $(CFLAGS_JDKLIB))
   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
   # Supply the name of the C runtime lib.
   LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"'
@@ -271,11 +246,10 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
     LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"'
   endif
 else
+  LIBJLI_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB)
   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
 endif
 
-LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS))
-
 LIBJLI_CFLAGS += $(LIBZ_CFLAGS)
 
 ifneq ($(USE_EXTERNAL_LIBZ), true)
@@ -293,12 +267,10 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
     NAME := jli, \
     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
-    SRC := $(LIBJLI_SRC_DIRS), \
     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
     EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
     OPTIMIZATION := HIGH, \
-    CFLAGS := $(LIBJLI_CFLAGS), \
-    DISABLED_WARNINGS_gcc := maybe-uninitialized, \
+    CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
     DISABLED_WARNINGS_solstudio := \
         E_ASM_DISABLES_OPTIMIZATION \
         E_STATEMENT_NOT_REACHED, \
@@ -316,6 +288,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
 
 TARGETS += $(BUILD_LIBJLI)
 
+LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
+
 # On windows, the static library has the same suffix as the import library created by
 # with the shared library, so the static library is given a different name. No harm
 # in doing it for all platform to reduce complexity.
@@ -328,7 +302,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
       OPTIMIZATION := HIGH, \
-      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
+      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
+          $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
       ARFLAGS := $(ARFLAGS), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   ))
@@ -347,7 +322,8 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
       OPTIMIZATION := HIGH, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
+      CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
+          $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
       LDFLAGS := -nostdlib $(ARFLAGS), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   ))
@@ -371,7 +347,8 @@ else ifeq ($(OPENJDK_TARGET_OS), aix)
       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
       OPTIMIZATION := HIGH, \
-      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
+      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
+          $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
       ARFLAGS := $(ARFLAGS), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static))
 
diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
index 1d29fb9e820..66327271dd1 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -29,9 +29,7 @@ include LibCommon.gmk
 $(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
 
 # Prepare the find cache.
-LIB_java.base_SRC_DIRS += $(TOPDIR)/src/java.base/*/native
-
-$(eval $(call FillCacheFind, $(wildcard $(LIB_java.base_SRC_DIRS))))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native)))
 
 ################################################################################
 # Create all the core libraries
@@ -41,14 +39,10 @@ include CoreLibraries.gmk
 ################################################################################
 # Create the network library
 
-LIBNET_SRC_DIRS := $(call FindSrcDirsForLib, java.base, net)
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
     NAME := net, \
-    SRC := $(LIBNET_SRC_DIRS), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-        $(LIBJAVA_HEADER_FLAGS) $(addprefix -I, $(LIBNET_SRC_DIRS)), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     DISABLED_WARNINGS_gcc := format-nonliteral, \
     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
@@ -72,31 +66,15 @@ TARGETS += $(BUILD_LIBNET)
 ################################################################################
 # Create the nio library
 
-BUILD_LIBNIO_SRC := \
-    $(TOPDIR)/src/java.base/share/native/libnio \
-    $(TOPDIR)/src/java.base/share/native/libnio/ch \
-    $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio \
-    $(sort $(wildcard \
-      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/fs \
-      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/ch \
-      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/fs)) \
-    #
-
-BUILD_LIBNIO_CFLAGS := \
-    $(addprefix -I, $(BUILD_LIBNIO_SRC)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-    $(LIBJAVA_HEADER_FLAGS) \
-    $(addprefix -I, $(BUILD_LIBNET_SRC))
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     NAME := nio, \
-    SRC := $(BUILD_LIBNIO_SRC), \
-    EXCLUDE_FILES := $(BUILD_LIBNIO_EXFILES), \
     OPTIMIZATION := HIGH, \
     WARNINGS_AS_ERRORS_xlc := false, \
-    CFLAGS := $(CFLAGS_JDKLIB) \
-        $(BUILD_LIBNIO_CFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
+    EXTRA_HEADER_DIRS := \
+        libnio/ch \
+        libnio/fs \
+        libnet, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljava -lnet, \
@@ -122,17 +100,10 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
   # JavaNativeFoundation framework not supported in static builds
   ifneq ($(STATIC_BUILD), true)
 
-    LIBOSXSECURITY_DIRS := $(TOPDIR)/src/java.base/macosx/native/libosxsecurity
-    LIBOSXSECURITY_CFLAGS := -I$(LIBOSXSECURITY_DIRS) \
-        $(LIBJAVA_HEADER_FLAGS) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-
     $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \
         NAME := osxsecurity, \
-        SRC := $(LIBOSXSECURITY_DIRS), \
         OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
-            $(LIBOSXSECURITY_CFLAGS), \
+        CFLAGS := $(CFLAGS_JDKLIB), \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
@@ -158,7 +129,6 @@ endif
 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
   ifeq ($(STATIC_BUILD), false)
 
-    LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjsig
     LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
 
     ifeq ($(OPENJDK_TARGET_OS), linux)
@@ -168,7 +138,6 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
 
     $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
         NAME := jsig, \
-        SRC := $(LIBJSIG_SRC_DIR), \
         CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk
index 5a2f77f878b..81f85fe28f0 100644
--- a/make/lib/Lib-java.desktop.gmk
+++ b/make/lib/Lib-java.desktop.gmk
@@ -29,9 +29,7 @@ include LibCommon.gmk
 $(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
 
 # Prepare the find cache.
-LIB_java.desktop_SRC_DIRS += $(TOPDIR)/src/java.desktop/*/native
-
-$(eval $(call FillCacheFind, $(wildcard $(LIB_java.desktop_SRC_DIRS))))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native)))
 
 ################################################################################
 # Create the AWT/2D libraries
@@ -43,16 +41,8 @@ include Awt2dLibraries.gmk
 
 ifneq ($(OPENJDK_TARGET_OS), aix)
 
-  LIBJSOUND_SRC_DIRS := $(wildcard \
-      $(TOPDIR)/src/java.desktop/share/native/libjsound \
-      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libjsound \
-      )
-
   LIBJSOUND_CFLAGS := \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
       $(ALSA_CFLAGS) \
-      $(LIBJAVA_HEADER_FLAGS) \
-      $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
       -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \
       -DUSE_PORTS=TRUE \
       -DUSE_DAUDIO=TRUE \
@@ -71,7 +61,6 @@ ifneq ($(OPENJDK_TARGET_OS), aix)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
       NAME := jsound, \
-      SRC := $(LIBJSOUND_SRC_DIRS), \
       TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
@@ -97,15 +86,11 @@ endif
 # Create the macosx specific osxapp and osx libraries
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
       NAME := osxapp, \
-      SRC := $(LIBOSXAPP_SRC), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          $(addprefix -I, $(LIBOSXAPP_SRC)) \
-          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
+      CFLAGS := $(CFLAGS_JDKLIB), \
       DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
           deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -129,19 +114,11 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   ##############################################################################
 
-  LIBOSX_DIRS := $(TOPDIR)/src/java.desktop/macosx/native/libosx
-  LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \
-      -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-      $(LIBJAVA_HEADER_FLAGS) \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-      #
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \
       NAME := osx, \
-      SRC := $(LIBOSX_DIRS), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          $(LIBOSX_CFLAGS), \
+      CFLAGS := $(CFLAGS_JDKLIB), \
+      EXTRA_HEADER_DIRS := libosxapp, \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
diff --git a/make/lib/Lib-java.instrument.gmk b/make/lib/Lib-java.instrument.gmk
index 3ec153ef462..7e625e3a036 100644
--- a/make/lib/Lib-java.instrument.gmk
+++ b/make/lib/Lib-java.instrument.gmk
@@ -30,32 +30,24 @@ $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
 
 ################################################################################
 
-LIBINSTRUMENT_SRC := $(TOPDIR)/src/java.instrument/share/native/libinstrument \
-    $(TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
-    #
-LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
-    $(addprefix -I, $(LIBINSTRUMENT_SRC)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \
-    -I$(TOPDIR)/src/java.base/share/native/libjli \
-    -I$(TOPDIR)/src/java.base/share/native/libjava \
-    #
-
 ifeq ($(OPENJDK_TARGET_OS), windows)
   # Statically link the C runtime so that there are not dependencies on modules
   # not on the search patch when invoked from the Windows system directory
   # (or elsewhere).
-  LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
+  LIBINSTRUMENT_CFLAGS_JDKLIB := $(filter-out -MD, $(CFLAGS_JDKLIB))
   # equivalent of strcasecmp is stricmp on Windows
-  LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
+  LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp
+else
+  LIBINSTRUMENT_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB)
 endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
     NAME := instrument, \
-    SRC := $(LIBINSTRUMENT_SRC), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
+    CFLAGS := $(LIBINSTRUMENT_CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
+    EXTRA_HEADER_DIRS := java.base:libjli, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \
diff --git a/make/lib/Lib-java.management.gmk b/make/lib/Lib-java.management.gmk
index 6444feaa2f5..a70a3ccf45a 100644
--- a/make/lib/Lib-java.management.gmk
+++ b/make/lib/Lib-java.management.gmk
@@ -30,13 +30,6 @@ $(eval $(call IncludeCustomExtension, lib/Lib-java.management.gmk))
 
 ################################################################################
 
-LIBMANAGEMENT_SRC += $(TOPDIR)/src/java.management/share/native/libmanagement
-LIBMANAGEMENT_CFLAGS := -I$(TOPDIR)/src/hotspot/share/include \
-    $(addprefix -I,$(LIBMANAGEMENT_SRC)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.management \
-    $(LIBJAVA_HEADER_FLAGS) \
-    #
-
 LIBMANAGEMENT_OPTIMIZATION := HIGH
 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
   ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
@@ -46,9 +39,8 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     NAME := management, \
-    SRC := $(LIBMANAGEMENT_SRC), \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
-    CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_CFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-java.prefs.gmk b/make/lib/Lib-java.prefs.gmk
index 6d72189d563..cac3b17e26a 100644
--- a/make/lib/Lib-java.prefs.gmk
+++ b/make/lib/Lib-java.prefs.gmk
@@ -27,18 +27,16 @@ include LibCommon.gmk
 
 ################################################################################
 
+# libprefs on macosx do not use the unix code
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/macosx/native/libprefs
-else
-  LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_TYPE)/native/libprefs
+  LIBPREFS_EXCLUDE_SRC_PATTERNS := unix
 endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBPREFS, \
     NAME := prefs, \
-    SRC := $(LIBPREF_SRC_DIRS), \
+    EXCLUDE_SRC_PATTERNS := $(LIBPREFS_EXCLUDE_SRC_PATTERNS), \
     OPTIMIZATION := HIGH, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBPREF_SRC_DIRS)) \
-        $(LIBJAVA_HEADER_FLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
diff --git a/make/lib/Lib-java.rmi.gmk b/make/lib/Lib-java.rmi.gmk
index f2c09c01829..56b60905603 100644
--- a/make/lib/Lib-java.rmi.gmk
+++ b/make/lib/Lib-java.rmi.gmk
@@ -29,9 +29,8 @@ include LibCommon.gmk
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBRMI, \
     NAME := rmi, \
-    SRC := $(TOPDIR)/src/java.rmi/share/native/librmi, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
diff --git a/make/lib/Lib-java.security.jgss.gmk b/make/lib/Lib-java.security.jgss.gmk
index 89752deef9f..b130671efd6 100644
--- a/make/lib/Lib-java.security.jgss.gmk
+++ b/make/lib/Lib-java.security.jgss.gmk
@@ -27,16 +27,10 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBJ2GSS_SRC := $(TOPDIR)/src/java.security.jgss/share/native/libj2gss \
-  #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
     NAME := j2gss, \
-    SRC := $(LIBJ2GSS_SRC), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
-        $(LIBJAVA_HEADER_FLAGS) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBDL), \
@@ -49,15 +43,10 @@ TARGETS += $(BUILD_LIBJ2GSS)
 ifneq ($(BUILD_CRYPTO), false)
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
-    BUILD_LIBW2K_LSA_AUTH_SRC := $(call FindSrcDirsForLib, $(MODULE), w2k_lsa_auth)
-
     $(eval $(call SetupJdkLibrary, BUILD_LIBW2K_LSA_AUTH, \
         NAME := w2k_lsa_auth, \
-        SRC := $(BUILD_LIBW2K_LSA_AUTH_SRC), \
         OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
-            $(addprefix -I, $(BUILD_LIBW2K_LSA_AUTH_SRC)) \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+        CFLAGS := $(CFLAGS_JDKLIB), \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
@@ -69,17 +58,12 @@ ifneq ($(BUILD_CRYPTO), false)
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    BUILD_LIBOSXKRB5_SRC := $(call FindSrcDirsForLib, $(MODULE), osxkrb5)
-
     # libosxkrb5 needs to call deprecated krb5 APIs so that java
     # can use the native credentials cache.
     $(eval $(call SetupJdkLibrary, BUILD_LIBOSXKRB5, \
         NAME := osxkrb5, \
-        SRC := $(BUILD_LIBOSXKRB5_SRC), \
         OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
-            $(addprefix -I, $(BUILD_LIBOSXKRB5_SRC)) \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+        CFLAGS := $(CFLAGS_JDKLIB), \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/make/lib/Lib-java.smartcardio.gmk b/make/lib/Lib-java.smartcardio.gmk
index 337daa48e1e..a8c65061521 100644
--- a/make/lib/Lib-java.smartcardio.gmk
+++ b/make/lib/Lib-java.smartcardio.gmk
@@ -27,18 +27,12 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBJ2PCSC_SRC := $(TOPDIR)/src/java.smartcardio/share/native/libj2pcsc \
-    $(TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc
-LIBJ2PCSC_CPPFLAGS := $(addprefix -I,$(LIBJ2PCSC_SRC)) \
-    -I$(TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc/MUSCLE \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.smartcardio
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PCSC, \
     NAME := j2pcsc, \
-    SRC := $(LIBJ2PCSC_SRC), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     CFLAGS_unix := -D__sun_jdk, \
+    EXTRA_HEADER_DIRS := libj2pcsc/MUSCLE, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(LIBJ2PCSC_CPPFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
diff --git a/make/lib/Lib-jdk.accessibility.gmk b/make/lib/Lib-jdk.accessibility.gmk
index ea35ab39293..b7f820b8ba3 100644
--- a/make/lib/Lib-jdk.accessibility.gmk
+++ b/make/lib/Lib-jdk.accessibility.gmk
@@ -30,12 +30,6 @@ include LibCommon.gmk
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
   ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
-  JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common
-  WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common
-  SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo
-  ACCESSBRIDGE_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \
-      -I$(TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/include
 
   define SetupJavaDLL
     # Parameter 1 Suffix
@@ -43,13 +37,16 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 
     $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
         NAME := javaaccessbridge$1, \
-        SRC := $(JAVA_AB_SRCDIR), \
+        SRC := libjavaaccessbridge, \
+        EXTRA_SRC := common, \
         OPTIMIZATION := LOW, \
         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
-        CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
-            $(addprefix -I,$(JAVA_AB_SRCDIR)) \
-            -I$(ROOT_SRCDIR)/include/bridge \
+        CFLAGS := $(CFLAGS_JDKLIB) \
             -DACCESSBRIDGE_ARCH_$2, \
+        EXTRA_HEADER_DIRS := \
+            include/bridge \
+            java.base:include \
+            java.desktop:include, \
         LDFLAGS := $(LDFLAGS_JDKLIB), \
         LIBS := kernel32.lib user32.lib gdi32.lib \
             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
@@ -68,13 +65,15 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
     $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
         NAME := windowsaccessbridge$1, \
-        SRC := $(WIN_AB_SRCDIR), \
+        SRC := libwindowsaccessbridge, \
+        EXTRA_SRC := common, \
         OPTIMIZATION := LOW, \
         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
-        CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \
-            $(addprefix -I,$(WIN_AB_SRCDIR)) \
-            -I$(ROOT_SRCDIR)/include/bridge \
+        CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
             -DACCESSBRIDGE_ARCH_$2, \
+        EXTRA_HEADER_DIRS := \
+            include/bridge \
+            java.base:include, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
         LIBS := kernel32.lib user32.lib gdi32.lib \
@@ -91,9 +90,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 
     $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
         NAME := jabsysinfo, \
-        SRC := $(SYSINFO_SRCDIR), \
         OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \
+        CFLAGS := $(CFLAGS_JDKLIB), \
         LDFLAGS := $(LDFLAGS_JDKLIB), \
         VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
     )
diff --git a/make/lib/Lib-jdk.attach.gmk b/make/lib/Lib-jdk.attach.gmk
index 827f1bf723e..1c24e554037 100644
--- a/make/lib/Lib-jdk.attach.gmk
+++ b/make/lib/Lib-jdk.attach.gmk
@@ -36,11 +36,8 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
     NAME := attach, \
-    SRC := $(call FindSrcDirsForLib, jdk.attach, attach), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
-        $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := /Gy, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/make/lib/Lib-jdk.crypto.cryptoki.gmk b/make/lib/Lib-jdk.crypto.cryptoki.gmk
index 847d5b356be..3f25d7c04fd 100644
--- a/make/lib/Lib-jdk.crypto.cryptoki.gmk
+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk
@@ -27,16 +27,10 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBJ2PKCS11_SRC := $(TOPDIR)/src/jdk.crypto.cryptoki/share/native/libj2pkcs11 \
-    $(TOPDIR)/src/jdk.crypto.cryptoki/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PKCS11, \
     NAME := j2pkcs11, \
-    SRC := $(LIBJ2PKCS11_SRC), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \
-        $(LIBJAVA_HEADER_FLAGS) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.cryptoki, \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
index e30b57d4341..dfecc1d3cbd 100644
--- a/make/lib/Lib-jdk.crypto.ec.gmk
+++ b/make/lib/Lib-jdk.crypto.ec.gmk
@@ -28,31 +28,23 @@ include LibCommon.gmk
 ################################################################################
 
 ifeq ($(ENABLE_INTREE_EC), true)
-
-  LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
-  BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
-
-  #
   # On sol-sparc...all libraries are compiled with -xregs=no%appl
-  # (set in CFLAGS_REQUIRED_sparc)
-  #
-  # except!!! libsunec.so
-  #
-  ECC_JNI_SOLSPARC_FILTER :=
+  # (set in CFLAGS_REQUIRED_sparc) except libsunec.so
   ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
-    ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
+    BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(filter-out -xregs=no%appl, $(CFLAGS_JDKLIB))
+    BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(filter-out -xregs=no%appl, $(CXXFLAGS_JDKLIB))
+  else
+    BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB)
+    BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB)
   endif
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
       NAME := sunec, \
-      SRC := $(LIBSUNEC_SRC), \
       TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
-          $(BUILD_LIBSUNEC_FLAGS) \
+      CFLAGS := $(BUILD_LIBSUNEC_CFLAGS_JDKLIB) \
           -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
-      CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
-          $(BUILD_LIBSUNEC_FLAGS), \
+      CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
       DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
       DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
diff --git a/make/lib/Lib-jdk.crypto.mscapi.gmk b/make/lib/Lib-jdk.crypto.mscapi.gmk
index 3bd4eb9e357..e28e428f49e 100644
--- a/make/lib/Lib-jdk.crypto.mscapi.gmk
+++ b/make/lib/Lib-jdk.crypto.mscapi.gmk
@@ -29,14 +29,10 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  LIBSUNMSCAPI_SRC := $(TOPDIR)/src/jdk.crypto.mscapi/$(OPENJDK_TARGET_OS_TYPE)/native/libsunmscapi
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBSUNMSCAPI, \
       NAME := sunmscapi, \
-      SRC := $(LIBSUNMSCAPI_SRC), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          -I$(LIBSUNMSCAPI_SRC), \
+      CFLAGS := $(CFLAGS_JDKLIB), \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := crypt32.lib advapi32.lib, \
diff --git a/make/lib/Lib-jdk.crypto.ucrypto.gmk b/make/lib/Lib-jdk.crypto.ucrypto.gmk
index 758491007d3..c00e543737b 100644
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk
@@ -29,14 +29,10 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
-  LIBJ2UCRYPTO_SRC := $(TOPDIR)/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBJ2UCRYPTO, \
       NAME := j2ucrypto, \
-      SRC := $(LIBJ2UCRYPTO_SRC), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          $(addprefix -I, $(LIBJ2UCRYPTO_SRC)), \
+      CFLAGS := $(CFLAGS_JDKLIB), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
   ))
diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
index 3f023dbd772..2f805c438e8 100644
--- a/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
@@ -29,19 +29,6 @@ $(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
 
 ################################################################################
 
-SA_TOPDIR := $(TOPDIR)/src/jdk.hotspot.agent
-
-SA_SRC += \
-    $(SA_TOPDIR)/share/native/libsaproc \
-    $(SA_TOPDIR)/$(OPENJDK_TARGET_OS)/native/libsaproc \
-    #
-
-SA_INCLUDES := \
-    $(addprefix -I, $(SA_SRC)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
-    -I$(TOPDIR)/src/hotspot/os/$(OPENJDK_TARGET_OS) \
-    #
-
 ifeq ($(OPENJDK_TARGET_OS), linux)
   SA_CFLAGS := -D_FILE_OFFSET_BITS=64
 
@@ -68,9 +55,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
     DISABLED_WARNINGS_microsoft := 4267, \
     DISABLED_WARNINGS_gcc := sign-compare, \
     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
-    SRC := $(SA_SRC), \
-    CFLAGS := $(CFLAGS_JDKLIB) $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CUSTOM_CFLAGS), \
-    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CXXFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \
+    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
     LIBS_linux := -lthread_db $(LIBDL), \
     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
diff --git a/make/lib/Lib-jdk.internal.le.gmk b/make/lib/Lib-jdk.internal.le.gmk
index 62f69bcadd3..0aa7bb273f5 100644
--- a/make/lib/Lib-jdk.internal.le.gmk
+++ b/make/lib/Lib-jdk.internal.le.gmk
@@ -29,19 +29,10 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  LIBLE_SRC := $(TOPDIR)/src/jdk.internal.le/$(OPENJDK_TARGET_OS_TYPE)/native/lible \
-      #
-  LIBLE_CPPFLAGS := \
-      $(addprefix -I, $(LIBLE_SRC)) \
-      -I$(SUPPORT_OUTPUTDIR)/headers/jdk.internal.le \
-      #
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
       NAME := le, \
-      SRC := $(LIBLE_SRC), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(LIBJAVA_HEADER_FLAGS)\
-          $(LIBLE_CPPFLAGS), \
+      CFLAGS := $(CFLAGS_JDKLIB), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(JDKLIB_LIBS) user32.lib, \
   ))
diff --git a/make/lib/Lib-jdk.jdi.gmk b/make/lib/Lib-jdk.jdi.gmk
index ff0cd954b75..197b95c2e20 100644
--- a/make/lib/Lib-jdk.jdi.gmk
+++ b/make/lib/Lib-jdk.jdi.gmk
@@ -29,22 +29,13 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  LIBDT_SHMEM_SRC := $(TOPDIR)/src/jdk.jdi/share/native/libdt_shmem \
-      $(TOPDIR)/src/jdk.jdi/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_shmem \
-      #
-  LIBDT_SHMEM_CPPFLAGS := -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
-      $(addprefix -I, $(LIBDT_SHMEM_SRC)) \
-      -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-      -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
-      -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdi \
-      #
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SHMEM, \
       NAME := dt_shmem, \
-      SRC := $(LIBDT_SHMEM_SRC), \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
-          $(LIBDT_SHMEM_CPPFLAGS), \
+      CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP, \
+      EXTRA_HEADER_DIRS := \
+          jdk.jdwp.agent:include \
+          jdk.jdwp.agent:libjdwp/export, \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(JDKLIB_LIBS), \
   ))
diff --git a/make/lib/Lib-jdk.jdwp.agent.gmk b/make/lib/Lib-jdk.jdwp.agent.gmk
index f0dc9f3d01c..0bc93e0d352 100644
--- a/make/lib/Lib-jdk.jdwp.agent.gmk
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk
@@ -27,21 +27,14 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBDT_SOCKET_SRC := $(TOPDIR)/src/jdk.jdwp.agent/share/native/libdt_socket \
-    $(TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_socket
-LIBDT_SOCKET_CPPFLAGS := \
-    $(addprefix -I, $(LIBDT_SOCKET_SRC)) \
-    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
-    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
-    #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
     NAME := dt_socket, \
-    SRC := $(LIBDT_SOCKET_SRC), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
         $(LIBDT_SOCKET_CPPFLAGS), \
+    EXTRA_HEADER_DIRS := \
+        include \
+        libjdwp/export, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_linux := -lpthread, \
@@ -56,21 +49,14 @@ TARGETS += $(BUILD_LIBDT_SOCKET)
 
 ################################################################################
 
-LIBJDWP_SRC := $(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
-    $(TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libjdwp
-LIBJDWP_CPPFLAGS := \
-    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
-    $(addprefix -I, $(LIBJDWP_SRC))
-
 # JDWP_LOGGING causes log messages to be compiled into the library.
 $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     NAME := jdwp, \
-    SRC := $(LIBJDWP_SRC), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
-        $(LIBJDWP_CPPFLAGS) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
+    CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING, \
+    EXTRA_HEADER_DIRS := \
+      include \
+      libjdwp/export, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-jdk.management.agent.gmk b/make/lib/Lib-jdk.management.agent.gmk
index 426e84d30d3..35bf7ea21c8 100644
--- a/make/lib/Lib-jdk.management.agent.gmk
+++ b/make/lib/Lib-jdk.management.agent.gmk
@@ -27,17 +27,10 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBMANAGEMENT_AGENT_SRC += $(TOPDIR)/src/jdk.management.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_agent
-LIBMANAGEMENT_AGENT_CFLAGS := $(addprefix -I,$(LIBMANAGEMENT_AGENT_SRC)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management.agent \
-    $(LIBJAVA_HEADER_FLAGS) \
-    #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_AGENT, \
     NAME := management_agent, \
-    SRC := $(LIBMANAGEMENT_AGENT_SRC), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_AGENT_CFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-jdk.management.gmk b/make/lib/Lib-jdk.management.gmk
index 22a167e23b5..29bfc7a5aa2 100644
--- a/make/lib/Lib-jdk.management.gmk
+++ b/make/lib/Lib-jdk.management.gmk
@@ -30,15 +30,6 @@ $(eval $(call IncludeCustomExtension, lib/Lib-jdk.management.gmk))
 
 ################################################################################
 
-LIBMANAGEMENT_EXT_SRC += $(TOPDIR)/src/jdk.management/share/native/libmanagement_ext \
-    $(TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_ext       \
-    $(TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS)/native/libmanagement_ext
-LIBMANAGEMENT_EXT_CFLAGS := -I$(TOPDIR)/src/java.management/share/native/include \
-    $(addprefix -I,$(LIBMANAGEMENT_EXT_SRC)) \
-    -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management \
-    $(LIBJAVA_HEADER_FLAGS) \
-    #
-
 ifeq ($(OPENJDK_TARGET_OS), windows)
   # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
   # a binary that is compatible with windows versions older than 7/2008R2.
@@ -55,8 +46,6 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     NAME := management_ext, \
-    SRC := $(LIBMANAGEMENT_EXT_SRC), \
-    LANG := C, \
     OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
diff --git a/make/lib/Lib-jdk.net.gmk b/make/lib/Lib-jdk.net.gmk
index 1ea1c2f543a..b202c6373f7 100644
--- a/make/lib/Lib-jdk.net.gmk
+++ b/make/lib/Lib-jdk.net.gmk
@@ -27,13 +27,12 @@ include LibCommon.gmk
 
 ################################################################################
 
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx), )
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
       NAME := extnet, \
-      SRC := $(TOPDIR)/src/jdk.net/$(OPENJDK_TARGET_OS)/native/libextnet, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
+      CFLAGS := $(CFLAGS_JDKLIB), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := -ljava, \
diff --git a/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk
index 9884818852c..f401e03e7c0 100644
--- a/make/lib/Lib-jdk.pack.gmk
+++ b/make/lib/Lib-jdk.pack.gmk
@@ -29,16 +29,13 @@ include LibCommon.gmk
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
     NAME := unpack, \
-    SRC := $(TOPDIR)/src/jdk.pack/share/native/libunpack \
-        $(TOPDIR)/src/jdk.pack/share/native/common-unpack, \
+    EXTRA_SRC := common-unpack, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CXXFLAGS_JDKLIB) \
-        -DNO_ZLIB -DUNPACK_JNI -DFULL \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-        -I$(TOPDIR)/src/jdk.pack/share/native/common-unpack \
-        $(LIBJAVA_HEADER_FLAGS), \
+        -DNO_ZLIB -DUNPACK_JNI -DFULL, \
     CFLAGS_release := -DPRODUCT, \
+    EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/make/lib/Lib-jdk.sctp.gmk b/make/lib/Lib-jdk.sctp.gmk
index c1d2e468e86..2676102021e 100644
--- a/make/lib/Lib-jdk.sctp.gmk
+++ b/make/lib/Lib-jdk.sctp.gmk
@@ -29,18 +29,15 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
 
-  ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix))
+  ifeq ($(filter $(OPENJDK_TARGET_OS), macosx aix), )
     $(eval $(call SetupJdkLibrary, BUILD_LIBSCTP, \
         NAME := sctp, \
-        SRC := $(TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
         OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
-            -I $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-            -I $(TOPDIR)/src/java.base/share/native/libnio/ch \
-            $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
-            $(LIBJAVA_HEADER_FLAGS) \
-            -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+        CFLAGS := $(CFLAGS_JDKLIB), \
+        EXTRA_HEADER_DIRS := \
+            $(call GetJavaHeaderDir, java.base) \
+            java.base:libnet \
+            java.base:libnio/ch, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS_unix := -lnio -lnet -ljava -ljvm, \
diff --git a/make/lib/Lib-jdk.security.auth.gmk b/make/lib/Lib-jdk.security.auth.gmk
index de3332f1522..12c26ca3758 100644
--- a/make/lib/Lib-jdk.security.auth.gmk
+++ b/make/lib/Lib-jdk.security.auth.gmk
@@ -29,9 +29,8 @@ include LibCommon.gmk
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
     NAME := jaas, \
-    SRC := $(call FindSrcDirsForLib, jdk.security.auth, jaas), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \
+    CFLAGS := $(CFLAGS_JDKLIB), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib $(JDKLIB_LIBS), \
diff --git a/make/lib/LibCommon.gmk b/make/lib/LibCommon.gmk
index 57993303829..7e25925c7d1 100644
--- a/make/lib/LibCommon.gmk
+++ b/make/lib/LibCommon.gmk
@@ -25,9 +25,6 @@
 
 include JdkNativeCompilation.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/LibCommon.gmk))
-
 ################################################################################
 
 GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
@@ -66,16 +63,6 @@ else ifeq ($(TOOLCHAIN_TYPE), xlc)
   endif
 endif
 
-################################################################################
-# Find the default set of src dirs for a native library.
-# Param 1 - module name
-# Param 2 - library name
-FindSrcDirsForLib += \
-  $(call uniq, $(wildcard \
-      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
-      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
-      $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
-
 ################################################################################
 # Find a library
 # Param 1 - module name
@@ -94,10 +81,6 @@ FindStaticLib = \
     $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
         $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
 
-################################################################################
-# Define the header include flags needed to compile against it.
-LIBJAVA_HEADER_FLAGS := $(addprefix -I, $(call FindSrcDirsForLib, java.base, java))
-
 # Put the libraries here.
 INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))
 
diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh
index d0ad63f5a7f..8db1ae02c2c 100644
--- a/make/scripts/compare.sh
+++ b/make/scripts/compare.sh
@@ -1300,35 +1300,10 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
         THIS_JDK="$THIS/install/jdk"
         OTHER_JDK="$OTHER/install/jdk"
         echo "Selecting install images for JDK compare"
-        if [ -d "$THIS/install/jre" ] && [ -d "$OTHER/install/jre" ]; then
-            THIS_JRE="$THIS/install/jre"
-            OTHER_JRE="$OTHER/install/jre"
-            echo "Also selecting install images for JRE compare"
-        else
-            echo "No install JRE image found"
-        fi
-    elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
-        THIS_JDK="$THIS/images/jdk"
-        OTHER_JDK="$OTHER/deploy/images/jdk"
-        echo "Selecting deploy images for JDK compare"
-        if [ -d "$THIS/images/jre" ] && [ -d "$OTHER/deploy/images/jre" ]; then
-            THIS_JRE="$THIS/images/jre"
-            OTHER_JRE="$OTHER/deploy/images/jre"
-            echo "Selecting deploy images for JRE compare"
-        else
-            echo "No deploy JRE image found"
-        fi
     elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
         THIS_JDK="$THIS/images/jdk"
         OTHER_JDK="$OTHER/images/jdk"
         echo "Selecting normal images for JDK compare"
-        if [ -d "$THIS/images/jre" ] && [ -d "$OTHER/images/jre" ]; then
-            THIS_JRE="$THIS/images/jre"
-            OTHER_JRE="$OTHER/images/jre"
-            echo "Selecting normal images for JRE compare"
-        else
-            echo "No normal JRE image found"
-        fi
     elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk 2> /dev/null)" ] \
         && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk 2> /dev/null)" ]
     then
@@ -1341,9 +1316,7 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
         THIS="$(ls -d $THIS/licensee-src/build/*)"
         OTHER="$(ls -d $OTHER/licensee-src/build/*)"
         THIS_JDK="$THIS/images/jdk"
-        THIS_JRE="$THIS/images/jre"
         OTHER_JDK="$OTHER/images/jdk"
-        OTHER_JRE="$OTHER/images/jre"
         # Rewrite the path to tools that are used from the build
         JIMAGE="$(echo "$JIMAGE" | $SED "s|$OLD_THIS|$THIS|g")"
         JAVAP="$(echo "$JAVAP" | $SED "s|$OLD_THIS|$THIS|g")"
@@ -1358,17 +1331,13 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
 	     && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
 	if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
             THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
-            THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle"
 	else
             THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
-            THIS_JRE_BUNDLE="$THIS/images/jre-bundle"
 	fi
 	if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
             OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
-            OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle"
 	else
             OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
-            OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
 	fi
         echo "Also comparing jdk macosx bundles"
         echo "  $THIS_JDK_BUNDLE"
@@ -1457,22 +1426,12 @@ if [ "$CMP_NAMES" = "true" ]; then
         echo -n "JDK "
         compare_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
     fi
-    if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
-        echo -n "JRE "
-        compare_dirs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
-        echo -n "JRE "
-        compare_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
-    fi
     if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
         echo -n "JDK Bundle "
         compare_dirs $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
-        echo -n "JRE Bundle "
-        compare_dirs $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
 
         echo -n "JDK Bundle "
         compare_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
-        echo -n "JRE Bundle "
-        compare_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
     fi
     if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
         echo -n "Docs "
@@ -1538,15 +1497,9 @@ if [ "$CMP_GENERAL" = "true" ]; then
         echo -n "JDK "
         compare_general_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
     fi
-    if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
-        echo -n "JRE "
-        compare_general_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
-    fi
     if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
         echo -n "JDK Bundle "
         compare_general_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
-        echo -n "JRE Bundle "
-        compare_general_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
     fi
     if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
         echo -n "Docs "
@@ -1615,10 +1568,6 @@ if [ "$CMP_PERMS" = "true" ]; then
         echo -n "JDK "
         compare_permissions $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
     fi
-    if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
-        echo -n "JRE "
-        compare_permissions $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
-    fi
     if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
         compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
     fi
@@ -1637,15 +1586,9 @@ if [ "$CMP_TYPES" = "true" ]; then
         echo -n "JDK "
         compare_file_types $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
     fi
-    if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
-        echo -n "JRE "
-        compare_file_types $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
-    fi
     if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
         echo -n "JDK Bundle "
         compare_file_types $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
-        echo -n "JRE Bundle "
-        compare_file_types $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
     fi
     if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
         compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 73b2d9d247c..1312d102a4d 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -134,6 +134,11 @@ NSK_JVMTI_AOD_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
     -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/aod
 
+NSK_AOD_INCLUDES := \
+    -I$(VM_TESTBASE_DIR)/nsk/share/aod \
+    -I$(VM_TESTBASE_DIR)/nsk/share/native \
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libProcessUtils := $(VM_SHARE_INCLUDES)
 
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libThreadController := $(NSK_MONITORING_INCLUDES)
@@ -823,6 +828,12 @@ BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach021Agent00 := $(NSK_JVMTI_AOD_INCL
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach050Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
 
+BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent00 := $(NSK_AOD_INCLUDES)
+BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent01 := $(NSK_AOD_INCLUDES)
+BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent02 := $(NSK_AOD_INCLUDES)
+BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent03 := $(NSK_AOD_INCLUDES)
+BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine09agent00 := $(NSK_AOD_INCLUDES)
+
 ################################################################################
 
 # Platform specific setup
@@ -851,8 +862,6 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
     BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c
 
-    # Disable warning until JDK-8203802 is fixed
-    BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtimers += -wd4477
 else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index 1d2a6045b6b..2969173f7cc 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -64,6 +64,14 @@ else
   endif
 endif
 
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
+  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework JavaVM \
+      -framework Cocoa -framework JavaNativeFoundation
+else
+  BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
+endif
+
 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
     TYPE := LIBRARY, \
     SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
diff --git a/src/demo/share/java2d/J2DBench/options/default.opt b/src/demo/share/java2d/J2DBench/options/default.opt
index 52cae6c31a7..e188354f3fc 100644
--- a/src/demo/share/java2d/J2DBench/options/default.opt
+++ b/src/demo/share/java2d/J2DBench/options/default.opt
@@ -151,7 +151,7 @@ pixel.dbtests.getelem=disabled
 pixel.dbtests.setelem=disabled
 text.opts.data.tlength=32
 text.opts.data.tscript=english
-text.opts.font.fname=lucida
+text.opts.font.fname=dialog
 text.opts.font.fstyle=0
 text.opts.font.fsize=13.0
 text.opts.font.ftx=Identity
diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 90d51f4bf0e..31e99213e8c 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -3792,69 +3792,7 @@ bool Matcher::clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, Ve
   return false;
 }
 
-// Transform:
-// (AddP base (AddP base address (LShiftL index con)) offset)
-// into:
-// (AddP base (AddP base offset) (LShiftL index con))
-// to take full advantage of ARM's addressing modes
 void Compile::reshape_address(AddPNode* addp) {
-  Node *addr = addp->in(AddPNode::Address);
-  if (addr->is_AddP() && addr->in(AddPNode::Base) == addp->in(AddPNode::Base)) {
-    const AddPNode *addp2 = addr->as_AddP();
-    if ((addp2->in(AddPNode::Offset)->Opcode() == Op_LShiftL &&
-         addp2->in(AddPNode::Offset)->in(2)->is_Con() &&
-         size_fits_all_mem_uses(addp, addp2->in(AddPNode::Offset)->in(2)->get_int())) ||
-        addp2->in(AddPNode::Offset)->Opcode() == Op_ConvI2L) {
-
-      // Any use that can't embed the address computation?
-      for (DUIterator_Fast imax, i = addp->fast_outs(imax); i < imax; i++) {
-        Node* u = addp->fast_out(i);
-        if (!u->is_Mem()) {
-          return;
-        }
-        if (u->is_LoadVector() || u->is_StoreVector() || u->Opcode() == Op_StoreCM) {
-          return;
-        }
-        if (addp2->in(AddPNode::Offset)->Opcode() != Op_ConvI2L) {
-          int scale = 1 << addp2->in(AddPNode::Offset)->in(2)->get_int();
-          if (VM_Version::expensive_load(u->as_Mem()->memory_size(), scale)) {
-            return;
-          }
-        }
-      }
-
-      Node* off = addp->in(AddPNode::Offset);
-      Node* addr2 = addp2->in(AddPNode::Address);
-      Node* base = addp->in(AddPNode::Base);
-
-      Node* new_addr = NULL;
-      // Check whether the graph already has the new AddP we need
-      // before we create one (no GVN available here).
-      for (DUIterator_Fast imax, i = addr2->fast_outs(imax); i < imax; i++) {
-        Node* u = addr2->fast_out(i);
-        if (u->is_AddP() &&
-            u->in(AddPNode::Base) == base &&
-            u->in(AddPNode::Address) == addr2 &&
-            u->in(AddPNode::Offset) == off) {
-          new_addr = u;
-          break;
-        }
-      }
-
-      if (new_addr == NULL) {
-        new_addr = new AddPNode(base, addr2, off);
-      }
-      Node* new_off = addp2->in(AddPNode::Offset);
-      addp->set_req(AddPNode::Address, new_addr);
-      if (addr->outcnt() == 0) {
-        addr->disconnect_inputs(NULL, this);
-      }
-      addp->set_req(AddPNode::Offset, new_off);
-      if (off->outcnt() == 0) {
-        off->disconnect_inputs(NULL, this);
-      }
-    }
-  }
 }
 
 // helper for encoding java_to_runtime calls on sim
diff --git a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
index b4b49e68633..fca142f9552 100644
--- a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
@@ -72,19 +73,20 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   }
 
   if (_index->is_cpu_register()) {
-    __ mov(r22, _index->as_register());
+    __ mov(rscratch1, _index->as_register());
   } else {
-    __ mov(r22, _index->as_jint());
+    __ mov(rscratch1, _index->as_jint());
   }
   Runtime1::StubID stub_id;
   if (_throw_index_out_of_bounds_exception) {
     stub_id = Runtime1::throw_index_exception_id;
   } else {
     assert(_array != NULL, "sanity");
-    __ mov(r23, _array->as_pointer_register());
+    __ mov(rscratch2, _array->as_pointer_register());
     stub_id = Runtime1::throw_range_check_failed_id;
   }
-  __ far_call(RuntimeAddress(Runtime1::entry_for(stub_id)), NULL, rscratch2);
+  __ lea(lr, RuntimeAddress(Runtime1::entry_for(stub_id)));
+  __ blr(lr);
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
   debug_only(__ should_not_reach_here());
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 0f92f54df2f..e785a74f3e0 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "asm/assembler.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_Compilation.hpp"
diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
index 0eaf007db7f..dbb30907674 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index 1fa3e3d8f44..27a426b0f42 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -323,7 +323,7 @@ void Runtime1::initialize_pd() {
 
 
 // target: the entry point of the method that creates and posts the exception oop
-// has_argument: true if the exception needs arguments (passed in r22 and r23)
+// has_argument: true if the exception needs arguments (passed in rscratch1 and rscratch2)
 
 OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
   // make a frame and preserve the caller's caller-save registers
@@ -332,7 +332,9 @@ OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address targe
   if (!has_argument) {
     call_offset = __ call_RT(noreg, noreg, target);
   } else {
-    call_offset = __ call_RT(noreg, noreg, target, r22, r23);
+    __ mov(c_rarg1, rscratch1);
+    __ mov(c_rarg2, rscratch2);
+    call_offset = __ call_RT(noreg, noreg, target);
   }
   OopMapSet* oop_maps = new OopMapSet();
   oop_maps->add_gc_map(call_offset, oop_map);
diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
index 9738d9be7a3..b112992939b 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
@@ -29,6 +29,7 @@
 #include "gc/g1/c1/g1BarrierSetC1.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -60,9 +61,9 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
       __ mov(c_rarg1, count);
     }
     if (UseCompressedOops) {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_narrow_oop_entry), 2);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry), 2);
     } else {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry), 2);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry), 2);
     }
     __ pop(saved_regs, sp);
   }
@@ -78,7 +79,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   __ lsr(scratch, scratch, LogBytesPerHeapOop);  // convert to element count
   __ mov(c_rarg0, start);
   __ mov(c_rarg1, scratch);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry), 2);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry), 2);
   __ pop(saved_regs, sp);
 }
 
@@ -161,9 +162,9 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
 
   if (expand_call) {
     assert(pre_val != c_rarg1, "smashed arg");
-    __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), pre_val, thread);
+    __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
   } else {
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), pre_val, thread);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
   }
 
   __ pop(saved, sp);
@@ -245,7 +246,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
   // save the live input values
   RegSet saved = RegSet::of(store_addr, new_val);
   __ push(saved, sp);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
   __ pop(saved, sp);
 
   __ bind(done);
@@ -398,7 +399,7 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
   __ bind(runtime);
   __ push_call_clobbered_registers();
   __ load_parameter(0, pre_val);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), pre_val, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
   __ pop_call_clobbered_registers();
   __ bind(done);
 
@@ -468,7 +469,7 @@ void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler*
 
   __ bind(runtime);
   __ push_call_clobbered_registers();
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
   __ pop_call_clobbered_registers();
   __ bind(done);
   __ epilogue();
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
index a20ba4d84ca..f7745c0e656 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
@@ -56,6 +56,15 @@ void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators,
     }
     break;
   }
+  case T_BOOLEAN: __ load_unsigned_byte (dst, src); break;
+  case T_BYTE:    __ load_signed_byte   (dst, src); break;
+  case T_CHAR:    __ load_unsigned_short(dst, src); break;
+  case T_SHORT:   __ load_signed_short  (dst, src); break;
+  case T_INT:     __ ldrw               (dst, src); break;
+  case T_LONG:    __ ldr                (dst, src); break;
+  case T_ADDRESS: __ ldr                (dst, src); break;
+  case T_FLOAT:   __ ldrs               (v0, src);  break;
+  case T_DOUBLE:  __ ldrd               (v0, src);  break;
   default: Unimplemented();
   }
 }
@@ -84,6 +93,18 @@ void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators
     }
     break;
   }
+  case T_BOOLEAN:
+    __ andw(val, val, 0x1);  // boolean is true if LSB is 1
+    __ strb(val, dst);
+    break;
+  case T_BYTE:    __ strb(val, dst); break;
+  case T_CHAR:    __ strh(val, dst); break;
+  case T_SHORT:   __ strh(val, dst); break;
+  case T_INT:     __ strw(val, dst); break;
+  case T_LONG:    __ str (val, dst); break;
+  case T_ADDRESS: __ str (val, dst); break;
+  case T_FLOAT:   __ strs(v0,  dst); break;
+  case T_DOUBLE:  __ strd(v0,  dst); break;
   default: Unimplemented();
   }
 }
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index fc39908a2ee..fc9aa31eba1 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interp_masm_aarch64.hpp"
@@ -267,9 +268,6 @@ void InterpreterMacroAssembler::get_method_counters(Register method,
 void InterpreterMacroAssembler::load_resolved_reference_at_index(
                                            Register result, Register index, Register tmp) {
   assert_different_registers(result, index);
-  // convert from field index to resolved_references() index and from
-  // word index to byte offset. Since this is a java object, it can be compressed
-  lslw(index, index, LogBytesPerHeapOop);
 
   get_constant_pool(result);
   // load pointer for resolved_references[] objArray
@@ -277,8 +275,8 @@ void InterpreterMacroAssembler::load_resolved_reference_at_index(
   ldr(result, Address(result, ConstantPoolCache::resolved_references_offset_in_bytes()));
   resolve_oop_handle(result, tmp);
   // Add in the index
-  add(result, result, index);
-  load_heap_oop(result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)));
+  add(index, index, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
+  load_heap_oop(result, Address(result, index, Address::uxtw(LogBytesPerHeapOop)));
 }
 
 void InterpreterMacroAssembler::load_resolved_klass_at_offset(
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index d94860d37fa..1143f6b3c70 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -27,7 +27,6 @@
 #define CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/frame.hpp"
 
diff --git a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
index 913590c930d..86a74782278 100644
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 96ef3f9763f..b8dc219a1bb 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -37,6 +37,7 @@
 #include "compiler/disassembler.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_aarch64.hpp"
+#include "oops/accessDecorators.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/oop.hpp"
@@ -2112,7 +2113,6 @@ void MacroAssembler::verify_heapbase(const char* msg) {
 #endif
 
 void MacroAssembler::resolve_jobject(Register value, Register thread, Register tmp) {
-  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
   Label done, not_weak;
   cbz(value, done);           // Use NULL as-is.
 
@@ -2120,15 +2120,15 @@ void MacroAssembler::resolve_jobject(Register value, Register thread, Register t
   tbz(r0, 0, not_weak);    // Test for jweak tag.
 
   // Resolve jweak.
-  bs->load_at(this, IN_ROOT | ON_PHANTOM_OOP_REF, T_OBJECT,
-                    value, Address(value, -JNIHandles::weak_tag_value), tmp, thread);
+  access_load_at(T_OBJECT, IN_ROOT | ON_PHANTOM_OOP_REF, value,
+                 Address(value, -JNIHandles::weak_tag_value), tmp, thread);
   verify_oop(value);
   b(done);
 
   bind(not_weak);
   // Resolve (untagged) jobject.
-  bs->load_at(this, IN_ROOT | IN_CONCURRENT_ROOT, T_OBJECT,
-                    value, Address(value, 0), tmp, thread);
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT, value, Address(value, 0), tmp,
+                 thread);
   verify_oop(value);
   bind(done);
 }
@@ -3663,9 +3663,8 @@ void MacroAssembler::load_klass(Register dst, Register src) {
 // ((OopHandle)result).resolve();
 void MacroAssembler::resolve_oop_handle(Register result, Register tmp) {
   // OopHandle::resolve is an indirection.
-  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  bs->load_at(this, IN_ROOT | IN_CONCURRENT_ROOT, T_OBJECT,
-                    result, Address(result, 0), tmp, rthread);
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT,
+                 result, Address(result, 0), tmp, noreg);
 }
 
 void MacroAssembler::load_mirror(Register dst, Register method, Register tmp) {
@@ -3983,6 +3982,7 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
                                     Register dst, Address src,
                                     Register tmp1, Register thread_tmp) {
   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::load_at(this, decorators, type, dst, src, tmp1, thread_tmp);
@@ -3995,6 +3995,7 @@ void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
                                      Address dst, Register src,
                                      Register tmp1, Register thread_tmp) {
   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, thread_tmp);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index c064e150d55..5c977eb3261 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1020,7 +1020,7 @@ public:
   address trampoline_call(Address entry, CodeBuffer *cbuf = NULL);
 
   static bool far_branches() {
-    return ReservedCodeCacheSize > branch_range;
+    return ReservedCodeCacheSize > branch_range || UseAOT;
   }
 
   // Jumps that can reach anywhere in the code cache.
diff --git a/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
index 8e1eae23185..9e92b2d2f90 100644
--- a/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
@@ -141,7 +141,7 @@ void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm,
   __ verify_oop(method_temp);
   __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes())), temp2);
   __ verify_oop(method_temp);
-  __ ldr(method_temp, Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes())));
+  __ access_load_at(T_ADDRESS, IN_HEAP, method_temp, Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes())), noreg, noreg);
 
   if (VerifyMethodHandles && !for_compiler_entry) {
     // make sure recv is already on stack
@@ -340,7 +340,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
         verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3);
       }
       __ load_heap_oop(rmethod, member_vmtarget);
-      __ ldr(rmethod, vmtarget_method);
+      __ access_load_at(T_ADDRESS, IN_HEAP, rmethod, vmtarget_method, noreg, noreg);
       break;
 
     case vmIntrinsics::_linkToStatic:
@@ -348,7 +348,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
         verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3);
       }
       __ load_heap_oop(rmethod, member_vmtarget);
-      __ ldr(rmethod, vmtarget_method);
+      __ access_load_at(T_ADDRESS, IN_HEAP, rmethod, vmtarget_method, noreg, noreg);
       break;
 
     case vmIntrinsics::_linkToVirtual:
@@ -362,7 +362,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
 
       // pick out the vtable index from the MemberName, and then we can discard it:
       Register temp2_index = temp2;
-      __ ldr(temp2_index, member_vmindex);
+      __ access_load_at(T_ADDRESS, IN_HEAP, temp2_index, member_vmindex, noreg, noreg);
 
       if (VerifyMethodHandles) {
         Label L_index_ok;
@@ -394,7 +394,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
       __ verify_klass_ptr(temp3_intf);
 
       Register rindex = rmethod;
-      __ ldr(rindex, member_vmindex);
+      __ access_load_at(T_ADDRESS, IN_HEAP, rindex, member_vmindex, noreg, noreg);
       if (VerifyMethodHandles) {
         Label L;
         __ cmpw(rindex, 0U);
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index f988a361d4d..5cda3e0e240 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -234,8 +234,12 @@ class NativeCall: public NativeInstruction {
   }
 
 #if INCLUDE_AOT
+  // Return true iff a call from instr to target is out of range.
+  // Used for calls from JIT- to AOT-compiled code.
   static bool is_far_call(address instr, address target) {
-    return !Assembler::reachable_from_branch_at(instr, target);
+    // On AArch64 we use trampolines which can reach anywhere in the
+    // address space, so calls are never out of range.
+    return false;
   }
 #endif
 
diff --git a/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp b/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp
index 5411d06e12a..c18109087e1 100644
--- a/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,6 +25,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "asm/register.hpp"
 #include "register_aarch64.hpp"
 # include "interp_masm_aarch64.hpp"
diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index 372bdfb83f9..b0752e9a7ad 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index 507a652b88a..632ab3a0313 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
@@ -760,8 +760,8 @@ void TemplateTable::iaload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1, Address(r0, r1, Address::uxtw(2)));
-  __ ldrw(r0, Address(r1, arrayOopDesc::base_offset_in_bytes(T_INT)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_INT) >> 2);
+  __ access_load_at(T_INT, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(2)), noreg, noreg);
 }
 
 void TemplateTable::laload()
@@ -772,8 +772,8 @@ void TemplateTable::laload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1, Address(r0, r1, Address::uxtw(3)));
-  __ ldr(r0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_LONG)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_LONG) >> 3);
+  __ access_load_at(T_LONG, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(3)), noreg, noreg);
 }
 
 void TemplateTable::faload()
@@ -784,8 +784,8 @@ void TemplateTable::faload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1,  Address(r0, r1, Address::uxtw(2)));
-  __ ldrs(v0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_FLOAT)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_FLOAT) >> 2);
+  __ access_load_at(T_FLOAT, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(2)), noreg, noreg);
 }
 
 void TemplateTable::daload()
@@ -796,8 +796,8 @@ void TemplateTable::daload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1,  Address(r0, r1, Address::uxtw(3)));
-  __ ldrd(v0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_DOUBLE)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_DOUBLE) >> 3);
+  __ access_load_at(T_DOUBLE, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(3)), noreg, noreg);
 }
 
 void TemplateTable::aaload()
@@ -808,12 +808,11 @@ void TemplateTable::aaload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  int s = (UseCompressedOops ? 2 : 3);
-  __ lea(r1, Address(r0, r1, Address::uxtw(s)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
   do_oop_load(_masm,
-              Address(r1, arrayOopDesc::base_offset_in_bytes(T_OBJECT)),
+              Address(r0, r1, Address::uxtw(LogBytesPerHeapOop)),
               r0,
-              IN_HEAP | IN_HEAP_ARRAY);
+              IN_HEAP_ARRAY);
 }
 
 void TemplateTable::baload()
@@ -824,8 +823,8 @@ void TemplateTable::baload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1,  Address(r0, r1, Address::uxtw(0)));
-  __ load_signed_byte(r0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_BYTE)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_BYTE) >> 0);
+  __ access_load_at(T_BYTE, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(0)), noreg, noreg);
 }
 
 void TemplateTable::caload()
@@ -836,8 +835,8 @@ void TemplateTable::caload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1,  Address(r0, r1, Address::uxtw(1)));
-  __ load_unsigned_short(r0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_CHAR)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_CHAR) >> 1);
+  __ access_load_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(1)), noreg, noreg);
 }
 
 // iload followed by caload frequent pair
@@ -853,8 +852,8 @@ void TemplateTable::fast_icaload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1,  Address(r0, r1, Address::uxtw(1)));
-  __ load_unsigned_short(r0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_CHAR)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_CHAR) >> 1);
+  __ access_load_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(1)), noreg, noreg);
 }
 
 void TemplateTable::saload()
@@ -865,8 +864,8 @@ void TemplateTable::saload()
   // r0: array
   // r1: index
   index_check(r0, r1); // leaves index in r1, kills rscratch1
-  __ lea(r1,  Address(r0, r1, Address::uxtw(1)));
-  __ load_signed_short(r0, Address(r1,  arrayOopDesc::base_offset_in_bytes(T_SHORT)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_SHORT) >> 1);
+  __ access_load_at(T_SHORT, IN_HEAP | IN_HEAP_ARRAY, r0, Address(r0, r1, Address::uxtw(1)), noreg, noreg);
 }
 
 void TemplateTable::iload(int n)
@@ -1059,9 +1058,8 @@ void TemplateTable::iastore() {
   // r1: index
   // r3: array
   index_check(r3, r1); // prefer index in r1
-  __ lea(rscratch1, Address(r3, r1, Address::uxtw(2)));
-  __ strw(r0, Address(rscratch1,
-                      arrayOopDesc::base_offset_in_bytes(T_INT)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_INT) >> 2);
+  __ access_store_at(T_INT, IN_HEAP | IN_HEAP_ARRAY, Address(r3, r1, Address::uxtw(2)), r0, noreg, noreg);
 }
 
 void TemplateTable::lastore() {
@@ -1072,9 +1070,8 @@ void TemplateTable::lastore() {
   // r1: index
   // r3: array
   index_check(r3, r1); // prefer index in r1
-  __ lea(rscratch1, Address(r3, r1, Address::uxtw(3)));
-  __ str(r0, Address(rscratch1,
-                      arrayOopDesc::base_offset_in_bytes(T_LONG)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_LONG) >> 3);
+  __ access_store_at(T_LONG, IN_HEAP | IN_HEAP_ARRAY, Address(r3, r1, Address::uxtw(3)), r0, noreg, noreg);
 }
 
 void TemplateTable::fastore() {
@@ -1085,9 +1082,8 @@ void TemplateTable::fastore() {
   // r1:  index
   // r3:  array
   index_check(r3, r1); // prefer index in r1
-  __ lea(rscratch1, Address(r3, r1, Address::uxtw(2)));
-  __ strs(v0, Address(rscratch1,
-                      arrayOopDesc::base_offset_in_bytes(T_FLOAT)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_FLOAT) >> 2);
+  __ access_store_at(T_FLOAT, IN_HEAP | IN_HEAP_ARRAY, Address(r3, r1, Address::uxtw(2)), noreg /* ftos */, noreg, noreg);
 }
 
 void TemplateTable::dastore() {
@@ -1098,9 +1094,8 @@ void TemplateTable::dastore() {
   // r1:  index
   // r3:  array
   index_check(r3, r1); // prefer index in r1
-  __ lea(rscratch1, Address(r3, r1, Address::uxtw(3)));
-  __ strd(v0, Address(rscratch1,
-                      arrayOopDesc::base_offset_in_bytes(T_DOUBLE)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_DOUBLE) >> 3);
+  __ access_store_at(T_DOUBLE, IN_HEAP | IN_HEAP_ARRAY, Address(r3, r1, Address::uxtw(3)), noreg /* dtos */, noreg, noreg);
 }
 
 void TemplateTable::aastore() {
@@ -1111,10 +1106,10 @@ void TemplateTable::aastore() {
   __ ldr(r2, at_tos_p1()); // index
   __ ldr(r3, at_tos_p2()); // array
 
-  Address element_address(r4, arrayOopDesc::base_offset_in_bytes(T_OBJECT));
+  Address element_address(r3, r4, Address::uxtw(LogBytesPerHeapOop));
 
   index_check(r3, r2);     // kills r1
-  __ lea(r4, Address(r3, r2, Address::uxtw(UseCompressedOops? 2 : 3)));
+  __ add(r4, r2, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
 
   // do array store check - check for NULL value first
   __ cbz(r0, is_null);
@@ -1141,7 +1136,7 @@ void TemplateTable::aastore() {
   // Get the value we will store
   __ ldr(r0, at_tos());
   // Now store using the appropriate barrier
-  do_oop_store(_masm, element_address, r0, IN_HEAP | IN_HEAP_ARRAY);
+  do_oop_store(_masm, element_address, r0, IN_HEAP_ARRAY);
   __ b(done);
 
   // Have a NULL in r0, r3=array, r2=index.  Store NULL at ary[idx]
@@ -1149,7 +1144,7 @@ void TemplateTable::aastore() {
   __ profile_null_seen(r2);
 
   // Store a NULL
-  do_oop_store(_masm, element_address, noreg, IN_HEAP | IN_HEAP_ARRAY);
+  do_oop_store(_masm, element_address, noreg, IN_HEAP_ARRAY);
 
   // Pop stack arguments
   __ bind(done);
@@ -1176,9 +1171,8 @@ void TemplateTable::bastore()
   __ andw(r0, r0, 1);  // if it is a T_BOOLEAN array, mask the stored value to 0/1
   __ bind(L_skip);
 
-  __ lea(rscratch1, Address(r3, r1, Address::uxtw(0)));
-  __ strb(r0, Address(rscratch1,
-                      arrayOopDesc::base_offset_in_bytes(T_BYTE)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_BYTE) >> 0);
+  __ access_store_at(T_BYTE, IN_HEAP | IN_HEAP_ARRAY, Address(r3, r1, Address::uxtw(0)), r0, noreg, noreg);
 }
 
 void TemplateTable::castore()
@@ -1190,9 +1184,8 @@ void TemplateTable::castore()
   // r1: index
   // r3: array
   index_check(r3, r1); // prefer index in r1
-  __ lea(rscratch1, Address(r3, r1, Address::uxtw(1)));
-  __ strh(r0, Address(rscratch1,
-                      arrayOopDesc::base_offset_in_bytes(T_CHAR)));
+  __ add(r1, r1, arrayOopDesc::base_offset_in_bytes(T_CHAR) >> 1);
+  __ access_store_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, Address(r3, r1, Address::uxtw(1)), r0, noreg, noreg);
 }
 
 void TemplateTable::sastore()
@@ -2513,7 +2506,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   if (is_static) rc = may_not_rewrite;
 
   // btos
-  __ load_signed_byte(r0, field);
+  __ access_load_at(T_BYTE, IN_HEAP, r0, field, noreg, noreg);
   __ push(btos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2526,7 +2519,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ br(Assembler::NE, notBool);
 
   // ztos (same code as btos)
-  __ ldrsb(r0, field);
+  __ access_load_at(T_BOOLEAN, IN_HEAP, r0, field, noreg, noreg);
   __ push(ztos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2550,7 +2543,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmp(flags, itos);
   __ br(Assembler::NE, notInt);
   // itos
-  __ ldrw(r0, field);
+  __ access_load_at(T_INT, IN_HEAP, r0, field, noreg, noreg);
   __ push(itos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2562,7 +2555,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmp(flags, ctos);
   __ br(Assembler::NE, notChar);
   // ctos
-  __ load_unsigned_short(r0, field);
+  __ access_load_at(T_CHAR, IN_HEAP, r0, field, noreg, noreg);
   __ push(ctos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2574,7 +2567,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmp(flags, stos);
   __ br(Assembler::NE, notShort);
   // stos
-  __ load_signed_short(r0, field);
+  __ access_load_at(T_SHORT, IN_HEAP, r0, field, noreg, noreg);
   __ push(stos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2586,7 +2579,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmp(flags, ltos);
   __ br(Assembler::NE, notLong);
   // ltos
-  __ ldr(r0, field);
+  __ access_load_at(T_LONG, IN_HEAP, r0, field, noreg, noreg);
   __ push(ltos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2598,7 +2591,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmp(flags, ftos);
   __ br(Assembler::NE, notFloat);
   // ftos
-  __ ldrs(v0, field);
+  __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
   __ push(ftos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2612,7 +2605,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ br(Assembler::NE, notDouble);
 #endif
   // dtos
-  __ ldrd(v0, field);
+  __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
   __ push(dtos);
   // Rewrite bytecode to be faster
   if (rc == may_rewrite) {
@@ -2750,7 +2743,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(btos);
     if (!is_static) pop_and_check_object(obj);
-    __ strb(r0, field);
+    __ access_store_at(T_BYTE, IN_HEAP, field, r0, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_bputfield, bc, r1, true, byte_no);
     }
@@ -2765,8 +2758,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ztos);
     if (!is_static) pop_and_check_object(obj);
-    __ andw(r0, r0, 0x1);
-    __ strb(r0, field);
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, r0, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_zputfield, bc, r1, true, byte_no);
     }
@@ -2797,7 +2789,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(itos);
     if (!is_static) pop_and_check_object(obj);
-    __ strw(r0, field);
+    __ access_store_at(T_INT, IN_HEAP, field, r0, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_iputfield, bc, r1, true, byte_no);
     }
@@ -2812,7 +2804,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ctos);
     if (!is_static) pop_and_check_object(obj);
-    __ strh(r0, field);
+    __ access_store_at(T_CHAR, IN_HEAP, field, r0, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_cputfield, bc, r1, true, byte_no);
     }
@@ -2827,7 +2819,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(stos);
     if (!is_static) pop_and_check_object(obj);
-    __ strh(r0, field);
+    __ access_store_at(T_SHORT, IN_HEAP, field, r0, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_sputfield, bc, r1, true, byte_no);
     }
@@ -2842,7 +2834,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ltos);
     if (!is_static) pop_and_check_object(obj);
-    __ str(r0, field);
+    __ access_store_at(T_LONG, IN_HEAP, field, r0, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_lputfield, bc, r1, true, byte_no);
     }
@@ -2857,7 +2849,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ftos);
     if (!is_static) pop_and_check_object(obj);
-    __ strs(v0, field);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_fputfield, bc, r1, true, byte_no);
     }
@@ -2874,7 +2866,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(dtos);
     if (!is_static) pop_and_check_object(obj);
-    __ strd(v0, field);
+    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos */, noreg, noreg);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_dputfield, bc, r1, true, byte_no);
     }
@@ -3005,27 +2997,28 @@ void TemplateTable::fast_storefield(TosState state)
     do_oop_store(_masm, field, r0, IN_HEAP);
     break;
   case Bytecodes::_fast_lputfield:
-    __ str(r0, field);
+    __ access_store_at(T_LONG, IN_HEAP, field, r0, noreg, noreg);
     break;
   case Bytecodes::_fast_iputfield:
-    __ strw(r0, field);
+    __ access_store_at(T_INT, IN_HEAP, field, r0, noreg, noreg);
     break;
   case Bytecodes::_fast_zputfield:
-    __ andw(r0, r0, 0x1);  // boolean is true if LSB is 1
-    // fall through to bputfield
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, r0, noreg, noreg);
+    break;
   case Bytecodes::_fast_bputfield:
-    __ strb(r0, field);
+    __ access_store_at(T_BYTE, IN_HEAP, field, r0, noreg, noreg);
     break;
   case Bytecodes::_fast_sputfield:
-    // fall through
+    __ access_store_at(T_SHORT, IN_HEAP, field, r0, noreg, noreg);
+    break;
   case Bytecodes::_fast_cputfield:
-    __ strh(r0, field);
+    __ access_store_at(T_CHAR, IN_HEAP, field, r0, noreg, noreg);
     break;
   case Bytecodes::_fast_fputfield:
-    __ strs(v0, field);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg);
     break;
   case Bytecodes::_fast_dputfield:
-    __ strd(v0, field);
+    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos */, noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
@@ -3098,25 +3091,25 @@ void TemplateTable::fast_accessfield(TosState state)
     __ verify_oop(r0);
     break;
   case Bytecodes::_fast_lgetfield:
-    __ ldr(r0, field);
+    __ access_load_at(T_LONG, IN_HEAP, r0, field, noreg, noreg);
     break;
   case Bytecodes::_fast_igetfield:
-    __ ldrw(r0, field);
+    __ access_load_at(T_INT, IN_HEAP, r0, field, noreg, noreg);
     break;
   case Bytecodes::_fast_bgetfield:
-    __ load_signed_byte(r0, field);
+    __ access_load_at(T_BYTE, IN_HEAP, r0, field, noreg, noreg);
     break;
   case Bytecodes::_fast_sgetfield:
-    __ load_signed_short(r0, field);
+    __ access_load_at(T_SHORT, IN_HEAP, r0, field, noreg, noreg);
     break;
   case Bytecodes::_fast_cgetfield:
-    __ load_unsigned_short(r0, field);
+    __ access_load_at(T_CHAR, IN_HEAP, r0, field, noreg, noreg);
     break;
   case Bytecodes::_fast_fgetfield:
-    __ ldrs(v0, field);
+    __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
     break;
   case Bytecodes::_fast_dgetfield:
-    __ ldrd(v0, field);
+    __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* dtos */, field, noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
@@ -3161,14 +3154,14 @@ void TemplateTable::fast_xaccess(TosState state)
   __ null_check(r0);
   switch (state) {
   case itos:
-    __ ldrw(r0, Address(r0, r1, Address::lsl(0)));
+    __ access_load_at(T_INT, IN_HEAP, r0, Address(r0, r1, Address::lsl(0)), noreg, noreg);
     break;
   case atos:
     do_oop_load(_masm, Address(r0, r1, Address::lsl(0)), r0, IN_HEAP);
     __ verify_oop(r0);
     break;
   case ftos:
-    __ ldrs(v0, Address(r0, r1, Address::lsl(0)));
+    __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, Address(r0, r1, Address::lsl(0)), noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
diff --git a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
index e2280b07836..0d40f1d2edc 100644
--- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "assembler_aarch64.inline.hpp"
 #include "code/vtableStubs.hpp"
 #include "interp_masm_aarch64.hpp"
diff --git a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
index 6e9b285d9b9..4a2a09393ac 100644
--- a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index abdcfc18541..b358a9fadfa 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
index ae89efbd3d5..342c1c3474c 100644
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
diff --git a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
index c1fe04f5f0a..af8a8f4682e 100644
--- a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
index 7801d1d2c9e..f9b629b35b0 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
@@ -26,6 +26,7 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
@@ -74,7 +75,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
       __ mov(R0, addr);
     }
 #ifdef AARCH64
-    __ zero_extend(R1, count, 32); // G1BarrierSet::write_ref_array_pre_*_entry takes size_t
+    __ zero_extend(R1, count, 32); // G1BarrierSetRuntime::write_ref_array_pre_*_entry takes size_t
 #else
     if (count != R1) {
       __ mov(R1, count);
@@ -82,9 +83,9 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
 #endif // AARCH64
 
     if (UseCompressedOops) {
-      __ call(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_narrow_oop_entry));
+      __ call(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry));
     } else {
-      __ call(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry));
+      __ call(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry));
     }
 
 #ifdef AARCH64
@@ -106,7 +107,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
     __ mov(R0, addr);
   }
 #ifdef AARCH64
-  __ zero_extend(R1, count, 32); // G1BarrierSet::write_ref_array_post_entry takes size_t
+  __ zero_extend(R1, count, 32); // G1BarrierSetRuntime::write_ref_array_post_entry takes size_t
 #else
   if (count != R1) {
     __ mov(R1, count);
@@ -120,7 +121,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   __ push(R9);
 #endif // !R9_IS_SCRATCHED
 #endif // !AARCH64
-  __ call(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry));
+  __ call(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry));
 #ifndef AARCH64
 #if R9_IS_SCRATCHED
   __ pop(R9);
@@ -205,7 +206,7 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   }
   __ mov(R1, Rthread);
 
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), R0, R1);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), R0, R1);
 
 #ifdef AARCH64
   if (store_addr != noreg) {
@@ -296,7 +297,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
     __ mov(R0, card_addr);
   }
   __ mov(R1, Rthread);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), R0, R1);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), R0, R1);
 
   __ bind(done);
 }
@@ -467,7 +468,7 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
 
   assert(r_pre_val_0 == c_rarg0, "pre_val should be in R0");
   __ mov(c_rarg1, Rthread);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), c_rarg0, c_rarg1);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), c_rarg0, c_rarg1);
 
   __ restore_live_registers_without_return();
 
@@ -574,7 +575,7 @@ void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler*
 
   assert(r_card_addr_0 == c_rarg0, "card_addr should be in R0");
   __ mov(c_rarg1, Rthread);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), c_rarg0, c_rarg1);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), c_rarg0, c_rarg1);
 
   __ restore_live_registers_without_return();
 
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.cpp b/src/hotspot/cpu/arm/interp_masm_arm.cpp
index 178a7c1cc9f..273f92bdf1a 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.hpp b/src/hotspot/cpu/arm/interp_masm_arm.hpp
index ad77b632254..70d694ae494 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp
@@ -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
@@ -26,7 +26,6 @@
 #define CPU_ARM_VM_INTERP_MASM_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/frame.hpp"
 #include "prims/jvmtiExport.hpp"
diff --git a/src/hotspot/cpu/arm/interpreterRT_arm.cpp b/src/hotspot/cpu/arm/interpreterRT_arm.cpp
index 1de15da112a..47c0227e8e0 100644
--- a/src/hotspot/cpu/arm/interpreterRT_arm.cpp
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.cpp b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
index 1bca5dc5134..61628e4679e 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
@@ -36,6 +36,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "oops/accessDecorators.hpp"
 #include "oops/klass.inline.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/biasedLocking.hpp"
@@ -1366,9 +1367,12 @@ void MacroAssembler::incr_allocated_bytes(RegisterOrConstant size_in_bytes, Regi
   // Bump total bytes allocated by this thread
   Label done;
 
-  ldr(tmp, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset())));
+  // Borrow the Rthread for alloc counter
+  Register Ralloc = Rthread;
+  add(Ralloc, Ralloc, in_bytes(JavaThread::allocated_bytes_offset()));
+  ldr(tmp, Address(Ralloc));
   adds(tmp, tmp, size_in_bytes);
-  str(tmp, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset())), cc);
+  str(tmp, Address(Ralloc), cc);
   b(done, cc);
 
   // Increment the high word and store single-copy atomically (that is an unlikely scenario on typical embedded systems as it means >4GB has been allocated)
@@ -1386,14 +1390,17 @@ void MacroAssembler::incr_allocated_bytes(RegisterOrConstant size_in_bytes, Regi
   }
   push(RegisterSet(low, high));
 
-  ldrd(low, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset())));
+  ldrd(low, Address(Ralloc));
   adds(low, low, size_in_bytes);
   adc(high, high, 0);
-  strd(low, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset())));
+  strd(low, Address(Ralloc));
 
   pop(RegisterSet(low, high));
 
   bind(done);
+
+  // Unborrow the Rthread
+  sub(Rthread, Ralloc, in_bytes(JavaThread::allocated_bytes_offset()));
 #endif // AARCH64
 }
 
@@ -2133,7 +2140,7 @@ void MacroAssembler::resolve_jobject(Register value,
   b(done);
   bind(not_weak);
   // Resolve (untagged) jobject.
-  access_load_at(T_OBJECT, IN_ROOT | IN_CONCURRENT_ROOT,
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT,
                  Address(value, 0), value, tmp1, tmp2, noreg);
   verify_oop(value);
   bind(done);
@@ -2700,6 +2707,7 @@ void MacroAssembler::store_heap_oop_null(Address obj, Register new_val, Register
 void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
                                     Address src, Register dst, Register tmp1, Register tmp2, Register tmp3) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::load_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
@@ -2711,6 +2719,7 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
 void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
                                      Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::store_at(this, decorators, type, obj, new_val, tmp1, tmp2, tmp3, is_null);
diff --git a/src/hotspot/cpu/arm/relocInfo_arm.cpp b/src/hotspot/cpu/arm/relocInfo_arm.cpp
index f11c1b8201b..6d38ab8fd3b 100644
--- a/src/hotspot/cpu/arm/relocInfo_arm.cpp
+++ b/src/hotspot/cpu/arm/relocInfo_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -29,7 +29,7 @@
 #include "nativeInst_arm.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 
 void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
diff --git a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
index fcc66fe4192..8dcfe2839c6 100644
--- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
diff --git a/src/hotspot/cpu/arm/templateTable_arm.cpp b/src/hotspot/cpu/arm/templateTable_arm.cpp
index 353500c7660..a17cdb38dac 100644
--- a/src/hotspot/cpu/arm/templateTable_arm.cpp
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
diff --git a/src/hotspot/cpu/arm/vtableStubs_arm.cpp b/src/hotspot/cpu/arm/vtableStubs_arm.cpp
index f2cd16a3ce7..4e08b9c39cd 100644
--- a/src/hotspot/cpu/arm/vtableStubs_arm.cpp
+++ b/src/hotspot/cpu/arm/vtableStubs_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "assembler_arm.inline.hpp"
 #include "code/vtableStubs.hpp"
 #include "interp_masm_arm.hpp"
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.cpp b/src/hotspot/cpu/ppc/assembler_ppc.cpp
index 17cc095b08b..b646371b6d6 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.cpp
@@ -486,7 +486,7 @@ int Assembler::add_const_optimized(Register d, Register s, long x, Register tmp,
   // Case 2: Can use addis.
   if (xd == 0) {
     short xc = rem & 0xFFFF; // 2nd 16-bit chunk.
-    rem = (rem >> 16) + ((unsigned short)xd >> 15);
+    rem = (rem >> 16) + ((unsigned short)xc >> 15);
     if (rem == 0) {
       addis(d, s, xc);
       return 0;
diff --git a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
index 1078114ec2c..6a0150315f2 100644
--- a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 8defa95eab2..2a5851b5911 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
diff --git a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
index 01627e3b118..fd743a164b4 100644
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
index 9a6494b2ae2..0be72906049 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
diff --git a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
index 7af90fbf2a3..925b5d8d206 100644
--- a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
index 4c5aba0dd76..e6b163e46be 100644
--- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
@@ -27,6 +27,7 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -72,9 +73,9 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
     if (preserve2 != noreg) { __ std(preserve2, frame_size - (++slot_nr) * wordSize, R1_SP); }
 
     if (UseCompressedOops) {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_narrow_oop_entry), to, count);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry), to, count);
     } else {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry), to, count);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry), to, count);
     }
 
     slot_nr = 0;
@@ -98,7 +99,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   __ save_LR_CR(R0);
   __ push_frame(frame_size, R0);
   if (preserve != noreg) { __ std(preserve, frame_size - 1 * wordSize, R1_SP); }
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry), addr, count);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry), addr, count);
   if (preserve != noreg) { __ ld(preserve, frame_size - 1 * wordSize, R1_SP); }
   __ addi(R1_SP, R1_SP, frame_size); // pop_frame();
   __ restore_LR_CR(R0);
@@ -191,7 +192,7 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, Decorator
   }
 
   if (pre_val->is_volatile() && preloaded) { __ mr(nv_save, pre_val); } // Save pre_val across C call if it was preloaded.
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), pre_val, R16_thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, R16_thread);
   if (pre_val->is_volatile() && preloaded) { __ mr(pre_val, nv_save); } // restore
 
   if (needs_frame) {
@@ -213,11 +214,9 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Decorato
   assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
 
   // Does store cross heap regions?
-  if (G1RSBarrierRegionFilter) {
-    __ xorr(tmp1, store_addr, new_val);
-    __ srdi_(tmp1, tmp1, HeapRegion::LogOfHRGrainBytes);
-    __ beq(CCR0, filtered);
-  }
+  __ xorr(tmp1, store_addr, new_val);
+  __ srdi_(tmp1, tmp1, HeapRegion::LogOfHRGrainBytes);
+  __ beq(CCR0, filtered);
 
   // Crosses regions, storing NULL?
   if (not_null) {
@@ -272,7 +271,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Decorato
   __ bind(runtime);
 
   // Save the live input values.
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), Rcard_addr, R16_thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), Rcard_addr, R16_thread);
 
   __ bind(filtered);
 }
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
index 10a006cabc4..8466ebb958b 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -32,6 +32,7 @@
 #include "code/codeCache.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "oops/accessDecorators.hpp"
 #include "runtime/safepointMechanism.hpp"
 
 inline bool MacroAssembler::is_ld_largeoffset(address a) {
@@ -332,6 +333,7 @@ inline void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorat
                          ON_UNKNOWN_OOP_REF)) == 0, "unsupported decorator");
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bool as_raw = (decorators & AS_RAW) != 0;
+  decorators = AccessInternal::decorator_fixup(decorators);
   if (as_raw) {
     bs->BarrierSetAssembler::store_at(this, decorators, type,
                                       base, ind_or_offs, val,
@@ -349,6 +351,7 @@ inline void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorato
   assert((decorators & ~(AS_RAW | IN_HEAP | IN_HEAP_ARRAY | IN_ROOT | OOP_NOT_NULL |
                          ON_PHANTOM_OOP_REF | ON_WEAK_OOP_REF)) == 0, "unsupported decorator");
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::load_at(this, decorators, type,
diff --git a/src/hotspot/cpu/ppc/nativeInst_ppc.cpp b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
index f962545702c..67289e91238 100644
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
@@ -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.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,7 +30,7 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
 #include "runtime/handles.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/ostream.hpp"
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index d22b0d50f94..4b15fb04e0c 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -688,7 +688,7 @@ void TemplateTable::aaload() {
                  Rtemp2     = R31;
   __ index_check(Rarray, R17_tos /* index */, UseCompressedOops ? 2 : LogBytesPerWord, Rtemp, Rload_addr);
   do_oop_load(_masm, Rload_addr, arrayOopDesc::base_offset_in_bytes(T_OBJECT), R17_tos, Rtemp, Rtemp2,
-              IN_HEAP | IN_HEAP_ARRAY);
+              IN_HEAP_ARRAY);
   __ verify_oop(R17_tos);
   //__ dcbt(R17_tos); // prefetch
 }
@@ -1015,14 +1015,14 @@ void TemplateTable::aastore() {
 
   __ bind(Lis_null);
   do_oop_store(_masm, Rstore_addr, arrayOopDesc::base_offset_in_bytes(T_OBJECT), noreg /* 0 */,
-               Rscratch, Rscratch2, Rscratch3, IN_HEAP | IN_HEAP_ARRAY);
+               Rscratch, Rscratch2, Rscratch3, IN_HEAP_ARRAY);
   __ profile_null_seen(Rscratch, Rscratch2);
   __ b(Ldone);
 
   // Store is OK.
   __ bind(Lstore_ok);
   do_oop_store(_masm, Rstore_addr, arrayOopDesc::base_offset_in_bytes(T_OBJECT), R17_tos /* value */,
-               Rscratch, Rscratch2, Rscratch3, IN_HEAP | IN_HEAP_ARRAY | OOP_NOT_NULL);
+               Rscratch, Rscratch2, Rscratch3, IN_HEAP_ARRAY | OOP_NOT_NULL);
 
   __ bind(Ldone);
   // Adjust sp (pops array, index and value).
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 1e5ede1a92c..4104b3d77f2 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -131,7 +131,7 @@ void VM_Version::initialize() {
   // Create and print feature-string.
   char buf[(num_features+1) * 16]; // Max 16 chars per feature.
   jio_snprintf(buf, sizeof(buf),
-               "ppc64%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+               "ppc64%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                (has_fsqrt()   ? " fsqrt"   : ""),
                (has_isel()    ? " isel"    : ""),
                (has_lxarxeh() ? " lxarxeh" : ""),
@@ -148,7 +148,8 @@ void VM_Version::initialize() {
                (has_vsx()     ? " vsx"     : ""),
                (has_ldbrx()   ? " ldbrx"   : ""),
                (has_stdbrx()  ? " stdbrx"  : ""),
-               (has_vshasig() ? " sha"     : "")
+               (has_vshasig() ? " sha"     : ""),
+               (has_tm()      ? " rtm"     : "")
                // Make sure number of %s matches num_features!
               );
   _features_string = os::strdup(buf);
@@ -319,47 +320,14 @@ void VM_Version::initialize() {
     if (PowerArchitecturePPC64 < 8) {
       vm_exit_during_initialization("RTM instructions are not available on this CPU.");
     }
-    bool os_support_tm = false;
-#ifdef AIX
-    // Actually, this is supported since AIX 7.1.. Unfortunately, this first
-    // contained bugs, so that it can only be enabled after AIX 7.1.3.30.
-    // The Java property os.version, which is used in RTM tests to decide
-    // whether the feature is available, only knows major and minor versions.
-    // We don't want to change this property, as user code might depend on it.
-    // So the tests can not check on subversion 3.30, and we only enable RTM
-    // with AIX 7.2.
-    if (os::Aix::os_version() >= 0x07020000) { // At least AIX 7.2.
-      os_support_tm = true;
-    }
-#endif
-#if defined(LINUX) && defined(VM_LITTLE_ENDIAN)
-    unsigned long auxv = getauxval(AT_HWCAP2);
 
-    if (auxv & PPC_FEATURE2_HTM_NOSC) {
-      if (auxv & PPC_FEATURE2_HAS_HTM) {
-        // TM on POWER8 and POWER9 in compat mode (VM) is supported by the JVM.
-        // TM on POWER9 DD2.1 NV (baremetal) is not supported by the JVM (TM on
-        // POWER9 DD2.1 NV has a few issues that need a couple of firmware
-        // and kernel workarounds, so there is a new mode only supported
-        // on non-virtualized P9 machines called HTM with no Suspend Mode).
-        // TM on POWER9 D2.2+ NV is not supported at all by Linux.
-        os_support_tm = true;
-      }
-    }
-#endif
-    if (!os_support_tm) {
+    if (!has_tm()) {
       vm_exit_during_initialization("RTM is not supported on this OS version.");
     }
   }
 
   if (UseRTMLocking) {
 #if INCLUDE_RTM_OPT
-    if (!UnlockExperimentalVMOptions) {
-      vm_exit_during_initialization("UseRTMLocking is only available as experimental option on this platform. "
-                                    "It must be enabled via -XX:+UnlockExperimentalVMOptions flag.");
-    } else {
-      warning("UseRTMLocking is only available as experimental option on this platform.");
-    }
     if (!FLAG_IS_CMDLINE(UseRTMLocking)) {
       // RTM locking should be used only for applications with
       // high lock contention. For now we do not use it by default.
@@ -755,6 +723,37 @@ void VM_Version::determine_features() {
   }
 
   _features = features;
+
+#ifdef AIX
+  // To enable it on AIX it's necessary POWER8 or above and at least AIX 7.2.
+  // Actually, this is supported since AIX 7.1.. Unfortunately, this first
+  // contained bugs, so that it can only be enabled after AIX 7.1.3.30.
+  // The Java property os.version, which is used in RTM tests to decide
+  // whether the feature is available, only knows major and minor versions.
+  // We don't want to change this property, as user code might depend on it.
+  // So the tests can not check on subversion 3.30, and we only enable RTM
+  // with AIX 7.2.
+  if (has_lqarx()) { // POWER8 or above
+    if (os::Aix::os_version() >= 0x07020000) { // At least AIX 7.2.
+      _features |= rtm_m;
+    }
+  }
+#endif
+#if defined(LINUX) && defined(VM_LITTLE_ENDIAN)
+  unsigned long auxv = getauxval(AT_HWCAP2);
+
+  if (auxv & PPC_FEATURE2_HTM_NOSC) {
+    if (auxv & PPC_FEATURE2_HAS_HTM) {
+      // TM on POWER8 and POWER9 in compat mode (VM) is supported by the JVM.
+      // TM on POWER9 DD2.1 NV (baremetal) is not supported by the JVM (TM on
+      // POWER9 DD2.1 NV has a few issues that need a couple of firmware
+      // and kernel workarounds, so there is a new mode only supported
+      // on non-virtualized P9 machines called HTM with no Suspend Mode).
+      // TM on POWER9 D2.2+ NV is not supported at all by Linux.
+      _features |= rtm_m;
+    }
+  }
+#endif
 }
 
 // Power 8: Configure Data Stream Control Register.
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
index 8e8eb43ab50..b4b6c8390c7 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
@@ -49,6 +49,7 @@ protected:
     ldbrx,
     stdbrx,
     vshasig,
+    rtm,
     num_features // last entry to count features
   };
   enum Feature_Flag_Set {
@@ -64,12 +65,13 @@ protected:
     vand_m                = (1 << vand   ),
     lqarx_m               = (1 << lqarx  ),
     vcipher_m             = (1 << vcipher),
-    vshasig_m             = (1 << vshasig),
     vpmsumb_m             = (1 << vpmsumb),
     mfdscr_m              = (1 << mfdscr ),
     vsx_m                 = (1 << vsx    ),
     ldbrx_m               = (1 << ldbrx  ),
     stdbrx_m              = (1 << stdbrx ),
+    vshasig_m             = (1 << vshasig),
+    rtm_m                 = (1 << rtm    ),
     all_features_m        = (unsigned long)-1
   };
 
@@ -107,6 +109,8 @@ public:
   static bool has_stdbrx()  { return (_features & stdbrx_m) != 0; }
   static bool has_vshasig() { return (_features & vshasig_m) != 0; }
   static bool has_mtfprd()  { return has_vpmsumb(); } // alias for P8
+  // OS feature support
+  static bool has_tm()      { return (_features & rtm_m) != 0; }
 
   // Assembler testing
   static void allow_all();
diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index 0a133896936..8c2ba158a1d 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -2967,6 +2967,7 @@ class Assembler : public AbstractAssembler {
 
   // branch never (nop)
   inline void z_nop();
+  inline void nop(); // Used by shared code.
 
   // ===============================================================================================
 
diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
index 230c01ac116..b96bd17fc92 100644
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
@@ -1311,6 +1311,7 @@ inline void Assembler::z_clgij(Register r1, int64_t i2, branch_condition m3, Lab
 
 // branch never (nop), branch always
 inline void Assembler::z_nop() { z_bcr(bcondNop, Z_R0); }
+inline void Assembler::nop() { z_nop(); }
 inline void Assembler::z_br(Register r2) { assert(r2 != Z_R0, "nop if target is Z_R0, use z_nop() instead"); z_bcr(bcondAlways, r2 ); }
 
 inline void Assembler::z_exrl(Register r1, Label& L) { z_exrl(r1, target(L)); }  // z10
diff --git a/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
index 113f5701f67..f7ae2510506 100644
--- a/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index 72b92780c52..996c255e8a8 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
index d65d0ea9baa..3f6d7eee689 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
index e4e03af35d3..b8b63c9db59 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
@@ -95,8 +95,6 @@
   void invalidate_registers(Register preserve1 = noreg, Register preserve2 = noreg,
                             Register preserve3 = noreg) PRODUCT_RETURN;
 
-  void nop() { z_nop(); }
-
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
 
diff --git a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
index b2c5cc1fa3e..c5be06a90c9 100644
--- a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
index 06224db34d8..c039838953b 100644
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
@@ -29,6 +29,7 @@
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "interpreter/interp_masm.hpp"
@@ -66,9 +67,9 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
     RegisterSaver::save_live_registers(masm, RegisterSaver::arg_registers); // Creates frame.
 
     if (UseCompressedOops) {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_narrow_oop_entry), addr, count);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry), addr, count);
     } else {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry), addr, count);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry), addr, count);
     }
 
     RegisterSaver::restore_live_registers(masm, RegisterSaver::arg_registers);
@@ -79,7 +80,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
 
 void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                              Register addr, Register count, bool do_return) {
-  address entry_point = CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry);
+  address entry_point = CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry);
   if (!do_return) {
     assert_different_registers(addr,  Z_R0_scratch);  // would be destroyed by push_frame()
     assert_different_registers(count, Z_R0_scratch);  // would be destroyed by push_frame()
@@ -234,7 +235,7 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, Decorator
   __ push_frame_abi160(0); // Will use Z_R0 as tmp.
 
   // Rpre_val may be destroyed by push_frame().
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), Rpre_save, Z_thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), Rpre_save, Z_thread);
 
   __ pop_frame();
   __ restore_return_pc();
@@ -272,16 +273,14 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Decorato
 
   // Does store cross heap regions?
   // It does if the two addresses specify different grain addresses.
-  if (G1RSBarrierRegionFilter) {
-    if (VM_Version::has_DistinctOpnds()) {
-      __ z_xgrk(Rtmp1, Rstore_addr, Rnew_val);
-    } else {
-      __ z_lgr(Rtmp1, Rstore_addr);
-      __ z_xgr(Rtmp1, Rnew_val);
-    }
-    __ z_srag(Rtmp1, Rtmp1, HeapRegion::LogOfHRGrainBytes);
-    __ z_bre(filtered);
+  if (VM_Version::has_DistinctOpnds()) {
+    __ z_xgrk(Rtmp1, Rstore_addr, Rnew_val);
+  } else {
+    __ z_lgr(Rtmp1, Rstore_addr);
+    __ z_xgr(Rtmp1, Rnew_val);
   }
+  __ z_srag(Rtmp1, Rtmp1, HeapRegion::LogOfHRGrainBytes);
+  __ z_bre(filtered);
 
   // Crosses regions, storing NULL?
   if (not_null) {
@@ -359,7 +358,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Decorato
   }
 
   // Save the live input values.
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), Rcard_addr, Z_thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), Rcard_addr, Z_thread);
 
   if (needs_frame) {
     __ pop_frame();
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 6186428d533..f76720156ae 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -34,6 +34,7 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "oops/accessDecorators.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "opto/compile.hpp"
@@ -4053,6 +4054,7 @@ void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
   assert((decorators & ~(AS_RAW | IN_HEAP | IN_HEAP_ARRAY | IN_ROOT | OOP_NOT_NULL |
                          ON_UNKNOWN_OOP_REF)) == 0, "unsupported decorator");
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::store_at(this, decorators, type,
@@ -4071,6 +4073,7 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
   assert((decorators & ~(AS_RAW | IN_HEAP | IN_HEAP_ARRAY | IN_ROOT | OOP_NOT_NULL |
                          ON_PHANTOM_OOP_REF | ON_WEAK_OOP_REF)) == 0, "unsupported decorator");
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::load_at(this, decorators, type,
diff --git a/src/hotspot/cpu/s390/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp
index ac8a06c73b5..994e2e36e1f 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp
@@ -853,7 +853,7 @@ void TemplateTable::aaload() {
   index_check(Z_tmp_1, index, shift);
   // Now load array element.
   do_oop_load(_masm, Address(Z_tmp_1, index, arrayOopDesc::base_offset_in_bytes(T_OBJECT)), Z_tos,
-              Z_tmp_2, Z_tmp_3, IN_HEAP | IN_HEAP_ARRAY);
+              Z_tmp_2, Z_tmp_3, IN_HEAP_ARRAY);
   __ verify_oop(Z_tos);
 }
 
@@ -1197,7 +1197,7 @@ void TemplateTable::aastore() {
 
   // Store a NULL.
   do_oop_store(_masm, Address(Rstore_addr, (intptr_t)0), noreg,
-               tmp3, tmp2, tmp1, IN_HEAP | IN_HEAP_ARRAY);
+               tmp3, tmp2, tmp1, IN_HEAP_ARRAY);
   __ z_bru(done);
 
   // Come here on success.
@@ -1205,7 +1205,7 @@ void TemplateTable::aastore() {
 
   // Now store using the appropriate barrier.
   do_oop_store(_masm, Address(Rstore_addr, (intptr_t)0), Rvalue,
-               tmp3, tmp2, tmp1, IN_HEAP | IN_HEAP_ARRAY | OOP_NOT_NULL);
+               tmp3, tmp2, tmp1, IN_HEAP_ARRAY | OOP_NOT_NULL);
 
   // Pop stack arguments.
   __ bind(done);
diff --git a/src/hotspot/cpu/sparc/assembler_sparc.hpp b/src/hotspot/cpu/sparc/assembler_sparc.hpp
index f8f5b11c9a6..01f0121bb42 100644
--- a/src/hotspot/cpu/sparc/assembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/assembler_sparc.hpp
@@ -783,7 +783,9 @@ class Assembler : public AbstractAssembler {
   void flush() {
 #ifdef VALIDATE_PIPELINE
     assert(_delay_state == NoDelay, "Ending code with a delay-slot.");
+#ifdef COMPILER2
     validate_no_pipeline_hazards();
+#endif
 #endif
     AbstractAssembler::flush();
   }
diff --git a/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp b/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp
index b818c7a825b..6f9624c054c 100644
--- a/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp
+++ b/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
diff --git a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp
index 14a59271792..987fe52389a 100644
--- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp
+++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
diff --git a/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp b/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp
index abafd0fb958..81630deaaec 100644
--- a/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp
+++ b/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
diff --git a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp
index 1e068db5527..27c525aad15 100644
--- a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp
+++ b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
diff --git a/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp b/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp
index d5cd533c2a9..889662728d9 100644
--- a/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp
+++ b/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
diff --git a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp
index 1de5dfea13e..90bc2b6d801 100644
--- a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp
+++ b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp
@@ -26,6 +26,7 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -68,8 +69,8 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
     }
     __ mov(addr->after_save(), O0);
     // Get the count into O1
-    address slowpath = UseCompressedOops ? CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_narrow_oop_entry)
-                                         : CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry);
+    address slowpath = UseCompressedOops ? CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry)
+                                         : CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry);
     __ call(slowpath);
     __ delayed()->mov(count->after_save(), O1);
     if (addr->is_global()) {
@@ -90,7 +91,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   // Get some new fresh output registers.
   __ save_frame(0);
   __ mov(addr->after_save(), O0);
-  __ call(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry));
+  __ call(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry));
   __ delayed()->mov(count->after_save(), O1);
   __ restore();
 }
@@ -368,12 +369,10 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Register
 
   G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
 
-  if (G1RSBarrierRegionFilter) {
-    __ xor3(store_addr, new_val, tmp);
-    __ srlx(tmp, HeapRegion::LogOfHRGrainBytes, tmp);
+  __ xor3(store_addr, new_val, tmp);
+  __ srlx(tmp, HeapRegion::LogOfHRGrainBytes, tmp);
 
-    __ cmp_and_brx_short(tmp, G0, Assembler::equal, Assembler::pt, filtered);
-  }
+  __ cmp_and_brx_short(tmp, G0, Assembler::equal, Assembler::pt, filtered);
 
   // If the "store_addr" register is an "in" or "local" register, move it to
   // a scratch reg so we can pass it as an argument.
diff --git a/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp b/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp
index 9c8afd26d2d..3a99f4b04ac 100644
--- a/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp
+++ b/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/jniHandles.hpp"
diff --git a/src/hotspot/cpu/sparc/interp_masm_sparc.cpp b/src/hotspot/cpu/sparc/interp_masm_sparc.cpp
index 5e14d32ba17..d6ff62c118b 100644
--- a/src/hotspot/cpu/sparc/interp_masm_sparc.cpp
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interp_masm_sparc.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
diff --git a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp
index 8ba7144dc3d..da3d920e1d4 100644
--- a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp
@@ -25,7 +25,7 @@
 #ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
 #define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
 
-#include "asm/macroAssembler.inline.hpp"
+#include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
 
 // This file specializes the assember with interpreter-specific macros
diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp
index f2e1c901b02..17a28f36259 100644
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp
@@ -32,6 +32,7 @@
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "oops/accessDecorators.hpp"
 #include "oops/klass.inline.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/biasedLocking.hpp"
@@ -181,7 +182,7 @@ void MacroAssembler::resolve_jobject(Register value, Register tmp) {
   br (Assembler::always, true, Assembler::pt, done);
   delayed()->nop();
   bind(not_weak);
-  access_load_at(T_OBJECT, IN_ROOT | IN_CONCURRENT_ROOT,
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT,
                  Address(value, 0), value, tmp);
   verify_oop(value);
   bind(done);
@@ -3338,6 +3339,12 @@ SkipIfEqual::~SkipIfEqual() {
   _masm->bind(_label);
 }
 
+void MacroAssembler::bang_stack_with_offset(int offset) {
+  // stack grows down, caller passes positive offset
+  assert(offset > 0, "must bang with negative offset");
+  set((-offset)+STACK_BIAS, G3_scratch);
+  st(G0, SP, G3_scratch);
+}
 
 // Writes to stack successive pages until offset reached to check for
 // stack overflow + shadow pages.  This clobbers tsp and scratch.
@@ -3395,7 +3402,7 @@ void MacroAssembler::reserved_stack_check() {
 // ((OopHandle)result).resolve();
 void MacroAssembler::resolve_oop_handle(Register result, Register tmp) {
   // OopHandle::resolve is an indirection.
-  access_load_at(T_OBJECT, IN_ROOT | IN_CONCURRENT_ROOT,
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT,
                  Address(result, 0), result, tmp);
 }
 
@@ -3440,6 +3447,7 @@ void MacroAssembler::store_klass_gap(Register s, Register d) {
 void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
                                      Register src, Address dst, Register tmp) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::store_at(this, decorators, type, src, dst, tmp);
@@ -3451,6 +3459,7 @@ void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
 void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
                                     Address src, Register dst, Register tmp) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::load_at(this, decorators, type, src, dst, tmp);
diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
index 33dff6edb83..0918e234eaa 100644
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
@@ -1303,7 +1303,7 @@ public:
   // Stack overflow checking
 
   // Note: this clobbers G3_scratch
-  inline void bang_stack_with_offset(int offset);
+  void bang_stack_with_offset(int offset);
 
   // Writes to stack successive pages until offset reached to check for
   // stack overflow + shadow pages.  Clobbers tsp and scratch registers.
diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
index 16871d98629..60f3e713496 100644
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
@@ -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
@@ -724,12 +724,4 @@ inline void MacroAssembler::swap(const Address& a, Register d, int offset) {
   if (a.has_index()) { assert(offset == 0, ""); swap(a.base(), a.index(), d        ); }
   else               {                          swap(a.base(), a.disp() + offset, d); }
 }
-
-inline void MacroAssembler::bang_stack_with_offset(int offset) {
-  // stack grows down, caller passes positive offset
-  assert(offset > 0, "must bang with negative offset");
-  set((-offset)+STACK_BIAS, G3_scratch);
-  st(G0, SP, G3_scratch);
-}
-
 #endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
diff --git a/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp b/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp
index 19871c6ab86..9e1674592ab 100644
--- a/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp
+++ b/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "utilities/align.hpp"
diff --git a/src/hotspot/cpu/sparc/methodHandles_sparc.cpp b/src/hotspot/cpu/sparc/methodHandles_sparc.cpp
index f84ba5d0021..5232313c3db 100644
--- a/src/hotspot/cpu/sparc/methodHandles_sparc.cpp
+++ b/src/hotspot/cpu/sparc/methodHandles_sparc.cpp
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interp_masm.hpp"
diff --git a/src/hotspot/cpu/sparc/relocInfo_sparc.cpp b/src/hotspot/cpu/sparc/relocInfo_sparc.cpp
index 102ce1bd90e..b8f0107af55 100644
--- a/src/hotspot/cpu/sparc/relocInfo_sparc.cpp
+++ b/src/hotspot/cpu/sparc/relocInfo_sparc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "code/relocInfo.hpp"
 #include "nativeInst_sparc.hpp"
 #include "oops/compressedOops.inline.hpp"
diff --git a/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp b/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp
index 81611e0fb7c..cc5a527aa81 100644
--- a/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp
+++ b/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
diff --git a/src/hotspot/cpu/sparc/templateTable_sparc.cpp b/src/hotspot/cpu/sparc/templateTable_sparc.cpp
index e569b6f37a6..0286db431fc 100644
--- a/src/hotspot/cpu/sparc/templateTable_sparc.cpp
+++ b/src/hotspot/cpu/sparc/templateTable_sparc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index d915f3fda4d..281490d6b99 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -1346,7 +1346,11 @@ void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
       __ decode_heap_oop(dest->as_register());
     }
 #endif
-    __ verify_oop(dest->as_register());
+
+    // Load barrier has not yet been applied, so ZGC can't verify the oop here
+    if (!UseZGC) {
+      __ verify_oop(dest->as_register());
+    }
   } else if (type == T_ADDRESS && addr->disp() == oopDesc::klass_offset_in_bytes()) {
 #ifdef _LP64
     if (UseCompressedClassPointers) {
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index f4082dbc6d8..e59fad963fb 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -26,6 +26,7 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -80,12 +81,12 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
       __ movptr(c_rarg1, count);
     }
     if (UseCompressedOops) {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_narrow_oop_entry), 2);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry), 2);
     } else {
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry), 2);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry), 2);
     }
 #else
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_pre_oop_entry),
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry),
                     addr, count);
 #endif
     __ popa();
@@ -107,9 +108,9 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
     __ mov(c_rarg0, addr);
     __ mov(c_rarg1, count);
   }
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry), 2);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry), 2);
 #else
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry),
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry),
                   addr, count);
 #endif
   __ popa();
@@ -238,9 +239,9 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
     __ push(thread);
     __ push(pre_val);
 #endif
-    __ MacroAssembler::call_VM_leaf_base(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), 2);
+    __ MacroAssembler::call_VM_leaf_base(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), 2);
   } else {
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), pre_val, thread);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
   }
 
   NOT_LP64( __ pop(thread); )
@@ -333,10 +334,10 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
   __ push(store_addr);
   __ push(new_val);
 #ifdef _LP64
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, r15_thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, r15_thread);
 #else
   __ push(thread);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
   __ pop(thread);
 #endif
   __ pop(new_val);
@@ -500,7 +501,7 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
 
   // load the pre-value
   __ load_parameter(0, rcx);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), rcx, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), rcx, thread);
 
   __ restore_live_registers(true);
 
@@ -577,7 +578,7 @@ void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler*
 
   __ save_live_registers_no_oop_map(true);
 
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
 
   __ restore_live_registers(true);
 
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index 93cb4e946e2..df57d637d72 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -34,6 +34,7 @@ void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators,
   bool on_heap = (decorators & IN_HEAP) != 0;
   bool on_root = (decorators & IN_ROOT) != 0;
   bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
+  bool atomic = (decorators & MO_RELAXED) != 0;
 
   switch (type) {
   case T_OBJECT:
@@ -58,6 +59,37 @@ void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators,
     }
     break;
   }
+  case T_BOOLEAN: __ load_unsigned_byte(dst, src);  break;
+  case T_BYTE:    __ load_signed_byte(dst, src);    break;
+  case T_CHAR:    __ load_unsigned_short(dst, src); break;
+  case T_SHORT:   __ load_signed_short(dst, src);   break;
+  case T_INT:     __ movl  (dst, src);              break;
+  case T_ADDRESS: __ movptr(dst, src);              break;
+  case T_FLOAT:
+    assert(dst == noreg, "only to ftos");
+    __ load_float(src);
+    break;
+  case T_DOUBLE:
+    assert(dst == noreg, "only to dtos");
+    __ load_double(src);
+    break;
+  case T_LONG:
+    assert(dst == noreg, "only to ltos");
+#ifdef _LP64
+    __ movq(rax, src);
+#else
+    if (atomic) {
+      __ fild_d(src);               // Must load atomically
+      __ subptr(rsp,2*wordSize);    // Make space for store
+      __ fistp_d(Address(rsp,0));
+      __ pop(rax);
+      __ pop(rdx);
+    } else {
+      __ movl(rax, src);
+      __ movl(rdx, src.plus_disp(wordSize));
+    }
+#endif
+    break;
   default: Unimplemented();
   }
 }
@@ -67,6 +99,7 @@ void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators
   bool on_heap = (decorators & IN_HEAP) != 0;
   bool on_root = (decorators & IN_ROOT) != 0;
   bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
+  bool atomic = (decorators & MO_RELAXED) != 0;
 
   switch (type) {
   case T_OBJECT:
@@ -106,6 +139,50 @@ void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators
     }
     break;
   }
+  case T_BOOLEAN:
+    __ andl(val, 0x1);  // boolean is true if LSB is 1
+    __ movb(dst, val);
+    break;
+  case T_BYTE:
+    __ movb(dst, val);
+    break;
+  case T_SHORT:
+    __ movw(dst, val);
+    break;
+  case T_CHAR:
+    __ movw(dst, val);
+    break;
+  case T_INT:
+    __ movl(dst, val);
+    break;
+  case T_LONG:
+    assert(val == noreg, "only tos");
+#ifdef _LP64
+    __ movq(dst, rax);
+#else
+    if (atomic) {
+      __ push(rdx);
+      __ push(rax);                 // Must update atomically with FIST
+      __ fild_d(Address(rsp,0));    // So load into FPU register
+      __ fistp_d(dst);              // and put into memory atomically
+      __ addptr(rsp, 2*wordSize);
+    } else {
+      __ movptr(dst, rax);
+      __ movptr(dst.plus_disp(wordSize), rdx);
+    }
+#endif
+    break;
+  case T_FLOAT:
+    assert(val == noreg, "only tos");
+    __ store_float(dst);
+    break;
+  case T_DOUBLE:
+    assert(val == noreg, "only tos");
+    __ store_double(dst);
+    break;
+  case T_ADDRESS:
+    __ movptr(dst, val);
+    break;
   default: Unimplemented();
   }
 }
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
new file mode 100644
index 00000000000..e8b4b7414d0
--- /dev/null
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -0,0 +1,458 @@
+/*
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "gc/z/zBarrierSetAssembler.hpp"
+#include "gc/z/zBarrierSetRuntime.hpp"
+#include "runtime/stubCodeGenerator.hpp"
+#include "utilities/macros.hpp"
+#ifdef COMPILER1
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "gc/z/c1/zBarrierSetC1.hpp"
+#endif // COMPILER1
+
+#undef __
+#define __ masm->
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#else
+#define BLOCK_COMMENT(str) __ block_comment(str)
+#endif
+
+static void call_vm(MacroAssembler* masm,
+                    address entry_point,
+                    Register arg0,
+                    Register arg1) {
+  // Setup arguments
+  if (arg1 == c_rarg0) {
+    if (arg0 == c_rarg1) {
+      __ xchgptr(c_rarg1, c_rarg0);
+    } else {
+      __ movptr(c_rarg1, arg1);
+      __ movptr(c_rarg0, arg0);
+    }
+  } else {
+    if (arg0 != c_rarg0) {
+      __ movptr(c_rarg0, arg0);
+    }
+    if (arg1 != c_rarg1) {
+      __ movptr(c_rarg1, arg1);
+    }
+  }
+
+  // Call VM
+  __ MacroAssembler::call_VM_leaf_base(entry_point, 2);
+}
+
+void ZBarrierSetAssembler::load_at(MacroAssembler* masm,
+                                   DecoratorSet decorators,
+                                   BasicType type,
+                                   Register dst,
+                                   Address src,
+                                   Register tmp1,
+                                   Register tmp_thread) {
+  if (!ZBarrierSet::barrier_needed(decorators, type)) {
+    // Barrier not needed
+    BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread);
+    return;
+  }
+
+  BLOCK_COMMENT("ZBarrierSetAssembler::load_at {");
+
+  // Allocate scratch register
+  Register scratch = tmp1;
+  if (tmp1 == noreg) {
+    scratch = r12;
+    __ push(scratch);
+  }
+
+  assert_different_registers(dst, scratch);
+
+  Label done;
+
+  //
+  // Fast Path
+  //
+
+  // Load address
+  __ lea(scratch, src);
+
+  // Load oop at address
+  __ movptr(dst, Address(scratch, 0));
+
+  // Test address bad mask
+  __ testptr(dst, address_bad_mask_from_thread(r15_thread));
+  __ jcc(Assembler::zero, done);
+
+  //
+  // Slow path
+  //
+
+  // Save registers
+  __ push(rax);
+  __ push(rcx);
+  __ push(rdx);
+  __ push(rdi);
+  __ push(rsi);
+  __ push(r8);
+  __ push(r9);
+  __ push(r10);
+  __ push(r11);
+
+  // We may end up here from generate_native_wrapper, then the method may have
+  // floats as arguments, and we must spill them before calling the VM runtime
+  // leaf. From the interpreter all floats are passed on the stack.
+  assert(Argument::n_float_register_parameters_j == 8, "Assumption");
+  const int xmm_size = wordSize * 2;
+  const int xmm_spill_size = xmm_size * Argument::n_float_register_parameters_j;
+  __ subptr(rsp, xmm_spill_size);
+  __ movdqu(Address(rsp, xmm_size * 7), xmm7);
+  __ movdqu(Address(rsp, xmm_size * 6), xmm6);
+  __ movdqu(Address(rsp, xmm_size * 5), xmm5);
+  __ movdqu(Address(rsp, xmm_size * 4), xmm4);
+  __ movdqu(Address(rsp, xmm_size * 3), xmm3);
+  __ movdqu(Address(rsp, xmm_size * 2), xmm2);
+  __ movdqu(Address(rsp, xmm_size * 1), xmm1);
+  __ movdqu(Address(rsp, xmm_size * 0), xmm0);
+
+  // Call VM
+  call_vm(masm, ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(decorators), dst, scratch);
+
+  // Restore registers
+  __ movdqu(xmm0, Address(rsp, xmm_size * 0));
+  __ movdqu(xmm1, Address(rsp, xmm_size * 1));
+  __ movdqu(xmm2, Address(rsp, xmm_size * 2));
+  __ movdqu(xmm3, Address(rsp, xmm_size * 3));
+  __ movdqu(xmm4, Address(rsp, xmm_size * 4));
+  __ movdqu(xmm5, Address(rsp, xmm_size * 5));
+  __ movdqu(xmm6, Address(rsp, xmm_size * 6));
+  __ movdqu(xmm7, Address(rsp, xmm_size * 7));
+  __ addptr(rsp, xmm_spill_size);
+
+  __ pop(r11);
+  __ pop(r10);
+  __ pop(r9);
+  __ pop(r8);
+  __ pop(rsi);
+  __ pop(rdi);
+  __ pop(rdx);
+  __ pop(rcx);
+
+  if (dst == rax) {
+    __ addptr(rsp, wordSize);
+  } else {
+    __ movptr(dst, rax);
+    __ pop(rax);
+  }
+
+  __ bind(done);
+
+  // Restore scratch register
+  if (tmp1 == noreg) {
+    __ pop(scratch);
+  }
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::load_at");
+}
+
+#ifdef ASSERT
+
+void ZBarrierSetAssembler::store_at(MacroAssembler* masm,
+                                    DecoratorSet decorators,
+                                    BasicType type,
+                                    Address dst,
+                                    Register src,
+                                    Register tmp1,
+                                    Register tmp2) {
+  BLOCK_COMMENT("ZBarrierSetAssembler::store_at {");
+
+  // Verify oop store
+  if (type == T_OBJECT || type == T_ARRAY) {
+    // Note that src could be noreg, which means we
+    // are storing null and can skip verification.
+    if (src != noreg) {
+      Label done;
+      __ testptr(src, address_bad_mask_from_thread(r15_thread));
+      __ jcc(Assembler::zero, done);
+      __ stop("Verify oop store failed");
+      __ should_not_reach_here();
+      __ bind(done);
+    }
+  }
+
+  // Store value
+  BarrierSetAssembler::store_at(masm, decorators, type, dst, src, tmp1, tmp2);
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::store_at");
+}
+
+#endif // ASSERT
+
+void ZBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm,
+                                              DecoratorSet decorators,
+                                              BasicType type,
+                                              Register src,
+                                              Register dst,
+                                              Register count) {
+  if (!ZBarrierSet::barrier_needed(decorators, type)) {
+    // Barrier not needed
+    return;
+  }
+
+  BLOCK_COMMENT("ZBarrierSetAssembler::arraycopy_prologue {");
+
+  // Save registers
+  __ pusha();
+
+  // Call VM
+  call_vm(masm, ZBarrierSetRuntime::load_barrier_on_oop_array_addr(), src, count);
+
+  // Restore registers
+  __ popa();
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::arraycopy_prologue");
+}
+
+void ZBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm,
+                                                         Register jni_env,
+                                                         Register obj,
+                                                         Register tmp,
+                                                         Label& slowpath) {
+  BLOCK_COMMENT("ZBarrierSetAssembler::try_resolve_jobject_in_native {");
+
+  // Resolve jobject
+  BarrierSetAssembler::try_resolve_jobject_in_native(masm, jni_env, obj, tmp, slowpath);
+
+  // Test address bad mask
+  __ testptr(obj, address_bad_mask_from_jni_env(jni_env));
+  __ jcc(Assembler::notZero, slowpath);
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::try_resolve_jobject_in_native");
+}
+
+#ifdef COMPILER1
+
+#undef __
+#define __ ce->masm()->
+
+void ZBarrierSetAssembler::generate_c1_load_barrier_test(LIR_Assembler* ce,
+                                                         LIR_Opr ref) const {
+  __ testptr(ref->as_register(), address_bad_mask_from_thread(r15_thread));
+}
+
+void ZBarrierSetAssembler::generate_c1_load_barrier_stub(LIR_Assembler* ce,
+                                                         ZLoadBarrierStubC1* stub) const {
+  // Stub entry
+  __ bind(*stub->entry());
+
+  Register ref = stub->ref()->as_register();
+  Register ref_addr = noreg;
+
+  if (stub->ref_addr()->is_register()) {
+    // Address already in register
+    ref_addr = stub->ref_addr()->as_pointer_register();
+  } else {
+    // Load address into tmp register
+    ce->leal(stub->ref_addr(), stub->tmp(), stub->patch_code(), stub->patch_info());
+    ref_addr = stub->tmp()->as_pointer_register();
+  }
+
+  assert_different_registers(ref, ref_addr, noreg);
+
+  // Save rax unless it is the result register
+  if (ref != rax) {
+    __ push(rax);
+  }
+
+  // Setup arguments and call runtime stub
+  __ subptr(rsp, 2 * BytesPerWord);
+  ce->store_parameter(ref_addr, 1);
+  ce->store_parameter(ref, 0);
+  __ call(RuntimeAddress(stub->runtime_stub()));
+  __ addptr(rsp, 2 * BytesPerWord);
+
+  // Verify result
+  __ verify_oop(rax, "Bad oop");
+
+  // Restore rax unless it is the result register
+  if (ref != rax) {
+    __ movptr(ref, rax);
+    __ pop(rax);
+  }
+
+  // Stub exit
+  __ jmp(*stub->continuation());
+}
+
+#undef __
+#define __ sasm->
+
+void ZBarrierSetAssembler::generate_c1_load_barrier_runtime_stub(StubAssembler* sasm,
+                                                                 DecoratorSet decorators) const {
+  // Enter and save registers
+  __ enter();
+  __ save_live_registers_no_oop_map(true /* save_fpu_registers */);
+
+  // Setup arguments
+  __ load_parameter(1, c_rarg1);
+  __ load_parameter(0, c_rarg0);
+
+  // Call VM
+  __ call_VM_leaf(ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(decorators), c_rarg0, c_rarg1);
+
+  // Restore registers and return
+  __ restore_live_registers_except_rax(true /* restore_fpu_registers */);
+  __ leave();
+  __ ret(0);
+}
+
+#endif // COMPILER1
+
+#undef __
+#define __ cgen->assembler()->
+
+// Generates a register specific stub for calling
+// ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded() or
+// ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded().
+//
+// The raddr register serves as both input and output for this stub. When the stub is
+// called the raddr register contains the object field address (oop*) where the bad oop
+// was loaded from, which caused the slow path to be taken. On return from the stub the
+// raddr register contains the good/healed oop returned from
+// ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded() or
+// ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded().
+static address generate_load_barrier_stub(StubCodeGenerator* cgen, Register raddr, DecoratorSet decorators) {
+  // Don't generate stub for invalid registers
+  if (raddr == rsp || raddr == r12 || raddr == r15) {
+    return NULL;
+  }
+
+  // Create stub name
+  char name[64];
+  const bool weak = (decorators & ON_WEAK_OOP_REF) != 0;
+  os::snprintf(name, sizeof(name), "load_barrier%s_stub_%s", weak ? "_weak" : "", raddr->name());
+
+  __ align(CodeEntryAlignment);
+  StubCodeMark mark(cgen, "StubRoutines", os::strdup(name, mtCode));
+  address start = __ pc();
+
+  // Save live registers
+  if (raddr != rax) {
+    __ push(rax);
+  }
+  if (raddr != rcx) {
+    __ push(rcx);
+  }
+  if (raddr != rdx) {
+    __ push(rdx);
+  }
+  if (raddr != rsi) {
+    __ push(rsi);
+  }
+  if (raddr != rdi) {
+    __ push(rdi);
+  }
+  if (raddr != r8) {
+    __ push(r8);
+  }
+  if (raddr != r9) {
+    __ push(r9);
+  }
+  if (raddr != r10) {
+    __ push(r10);
+  }
+  if (raddr != r11) {
+    __ push(r11);
+  }
+
+  // Setup arguments
+  if (c_rarg1 != raddr) {
+    __ movq(c_rarg1, raddr);
+  }
+  __ movq(c_rarg0, Address(raddr, 0));
+
+  // Call barrier function
+  __ call_VM_leaf(ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(decorators), c_rarg0, c_rarg1);
+
+  // Move result returned in rax to raddr, if needed
+  if (raddr != rax) {
+    __ movq(raddr, rax);
+  }
+
+  // Restore saved registers
+  if (raddr != r11) {
+    __ pop(r11);
+  }
+  if (raddr != r10) {
+    __ pop(r10);
+  }
+  if (raddr != r9) {
+    __ pop(r9);
+  }
+  if (raddr != r8) {
+    __ pop(r8);
+  }
+  if (raddr != rdi) {
+    __ pop(rdi);
+  }
+  if (raddr != rsi) {
+    __ pop(rsi);
+  }
+  if (raddr != rdx) {
+    __ pop(rdx);
+  }
+  if (raddr != rcx) {
+    __ pop(rcx);
+  }
+  if (raddr != rax) {
+    __ pop(rax);
+  }
+
+  __ ret(0);
+
+  return start;
+}
+
+#undef __
+
+void ZBarrierSetAssembler::barrier_stubs_init() {
+  // Load barrier stubs
+  int stub_code_size = 256 * 16; // Rough estimate of code size
+
+  ResourceMark rm;
+  BufferBlob* bb = BufferBlob::create("zgc_load_barrier_stubs", stub_code_size);
+  CodeBuffer buf(bb);
+  StubCodeGenerator cgen(&buf);
+
+  Register rr = as_Register(0);
+  for (int i = 0; i < RegisterImpl::number_of_registers; i++) {
+    _load_barrier_slow_stub[i] = generate_load_barrier_stub(&cgen, rr, ON_STRONG_OOP_REF);
+    _load_barrier_weak_slow_stub[i] = generate_load_barrier_stub(&cgen, rr, ON_WEAK_OOP_REF);
+    rr = rr->successor();
+  }
+}
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
new file mode 100644
index 00000000000..3687754e71a
--- /dev/null
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+
+#ifndef CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP
+#define CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP
+
+#ifdef COMPILER1
+class LIR_Assembler;
+class LIR_OprDesc;
+typedef LIR_OprDesc* LIR_Opr;
+class StubAssembler;
+class ZLoadBarrierStubC1;
+#endif // COMPILER1
+
+class ZBarrierSetAssembler : public ZBarrierSetAssemblerBase {
+  address _load_barrier_slow_stub[RegisterImpl::number_of_registers];
+  address _load_barrier_weak_slow_stub[RegisterImpl::number_of_registers];
+
+public:
+  ZBarrierSetAssembler() :
+    _load_barrier_slow_stub(),
+    _load_barrier_weak_slow_stub() {}
+
+  address load_barrier_slow_stub(Register reg) { return _load_barrier_slow_stub[reg->encoding()]; }
+  address load_barrier_weak_slow_stub(Register reg) { return _load_barrier_weak_slow_stub[reg->encoding()]; }
+
+  virtual void load_at(MacroAssembler* masm,
+                       DecoratorSet decorators,
+                       BasicType type,
+                       Register dst,
+                       Address src,
+                       Register tmp1,
+                       Register tmp_thread);
+
+#ifdef ASSERT
+  virtual void store_at(MacroAssembler* masm,
+                        DecoratorSet decorators,
+                        BasicType type,
+                        Address dst,
+                        Register src,
+                        Register tmp1,
+                        Register tmp2);
+#endif // ASSERT
+
+  virtual void arraycopy_prologue(MacroAssembler* masm,
+                                  DecoratorSet decorators,
+                                  BasicType type,
+                                  Register src,
+                                  Register dst,
+                                  Register count);
+
+  virtual void try_resolve_jobject_in_native(MacroAssembler* masm,
+                                             Register jni_env,
+                                             Register obj,
+                                             Register tmp,
+                                             Label& slowpath);
+
+#ifdef COMPILER1
+  void generate_c1_load_barrier_test(LIR_Assembler* ce,
+                                     LIR_Opr ref) const;
+
+  void generate_c1_load_barrier_stub(LIR_Assembler* ce,
+                                     ZLoadBarrierStubC1* stub) const;
+
+  void generate_c1_load_barrier_runtime_stub(StubAssembler* sasm,
+                                             DecoratorSet decorators) const;
+#endif // COMPILER1
+
+  virtual void barrier_stubs_init();
+};
+
+#endif // CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index a7ce2d966fc..ca50de919e9 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -26,7 +26,6 @@
 #define CPU_X86_VM_INTERP_MASM_X86_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/frame.hpp"
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 7830873de17..df90ffbfbe8 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -33,7 +33,7 @@
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "oops/access.hpp"
+#include "oops/accessDecorators.hpp"
 #include "oops/klass.inline.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/biasedLocking.hpp"
@@ -5259,7 +5259,7 @@ void MacroAssembler::resolve_jobject(Register value,
   jmp(done);
   bind(not_weak);
   // Resolve (untagged) jobject.
-  access_load_at(T_OBJECT, IN_ROOT | IN_CONCURRENT_ROOT,
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT,
                  value, Address(value, 0), tmp, thread);
   verify_oop(value);
   bind(done);
@@ -6281,7 +6281,7 @@ void MacroAssembler::resolve_oop_handle(Register result, Register tmp) {
   // Only 64 bit platforms support GCs that require a tmp register
   // Only IN_HEAP loads require a thread_tmp register
   // OopHandle::resolve is an indirection like jobject.
-  access_load_at(T_OBJECT, IN_ROOT | IN_CONCURRENT_ROOT,
+  access_load_at(T_OBJECT, IN_CONCURRENT_ROOT,
                  result, Address(result, 0), tmp, /*tmp_thread*/noreg);
 }
 
@@ -6323,6 +6323,7 @@ void MacroAssembler::store_klass(Register dst, Register src) {
 void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                                     Register tmp1, Register thread_tmp) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::load_at(this, decorators, type, dst, src, tmp1, thread_tmp);
@@ -6334,6 +6335,7 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Reg
 void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
                                      Register tmp1, Register tmp2) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
     bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2);
diff --git a/src/hotspot/cpu/x86/methodHandles_x86.cpp b/src/hotspot/cpu/x86/methodHandles_x86.cpp
index dc53107c735..5b2bdba733c 100644
--- a/src/hotspot/cpu/x86/methodHandles_x86.cpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.cpp
@@ -175,7 +175,9 @@ void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm,
   __ verify_oop(method_temp);
   __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes())), temp2);
   __ verify_oop(method_temp);
-  __ movptr(method_temp, Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes())));
+  __ access_load_at(T_ADDRESS, IN_HEAP, method_temp,
+                    Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes())),
+                    noreg, noreg);
 
   if (VerifyMethodHandles && !for_compiler_entry) {
     // make sure recv is already on stack
@@ -390,7 +392,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
         verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3);
       }
       __ load_heap_oop(rbx_method, member_vmtarget);
-      __ movptr(rbx_method, vmtarget_method);
+      __ access_load_at(T_ADDRESS, IN_HEAP, rbx_method, vmtarget_method, noreg, noreg);
       break;
 
     case vmIntrinsics::_linkToStatic:
@@ -398,7 +400,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
         verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3);
       }
       __ load_heap_oop(rbx_method, member_vmtarget);
-      __ movptr(rbx_method, vmtarget_method);
+      __ access_load_at(T_ADDRESS, IN_HEAP, rbx_method, vmtarget_method, noreg, noreg);
       break;
 
     case vmIntrinsics::_linkToVirtual:
@@ -412,7 +414,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
 
       // pick out the vtable index from the MemberName, and then we can discard it:
       Register temp2_index = temp2;
-      __ movptr(temp2_index, member_vmindex);
+      __ access_load_at(T_ADDRESS, IN_HEAP, temp2_index, member_vmindex, noreg, noreg);
 
       if (VerifyMethodHandles) {
         Label L_index_ok;
@@ -446,7 +448,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
       __ verify_klass_ptr(temp3_intf);
 
       Register rbx_index = rbx_method;
-      __ movptr(rbx_index, member_vmindex);
+      __ access_load_at(T_ADDRESS, IN_HEAP, rbx_index, member_vmindex, noreg, noreg);
       if (VerifyMethodHandles) {
         Label L;
         __ cmpl(rbx_index, 0);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 712e706c132..0b86577f98c 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -44,6 +44,9 @@
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
+#if INCLUDE_ZGC
+#include "gc/z/zThreadLocalData.hpp"
+#endif
 
 // Declaration and definition of StubGenerator (no .hpp file).
 // For a more detailed description of the stub routine structure
@@ -1026,6 +1029,15 @@ class StubGenerator: public StubCodeGenerator {
     // make sure object is 'reasonable'
     __ testptr(rax, rax);
     __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
+
+#if INCLUDE_ZGC
+    if (UseZGC) {
+      // Check if metadata bits indicate a bad oop
+      __ testptr(rax, Address(r15_thread, ZThreadLocalData::address_bad_mask_offset()));
+      __ jcc(Assembler::notZero, error);
+    }
+#endif
+
     // Check if the oop is in the right area of memory
     __ movptr(c_rarg2, rax);
     __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_mask());
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 8997c4b1ea4..5f1e7ba46c2 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -770,9 +770,10 @@ void TemplateTable::iaload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ movl(rax, Address(rdx, rax,
-                       Address::times_4,
-                       arrayOopDesc::base_offset_in_bytes(T_INT)));
+  __ access_load_at(T_INT, IN_HEAP | IN_HEAP_ARRAY, rax,
+                    Address(rdx, rax, Address::times_4,
+                            arrayOopDesc::base_offset_in_bytes(T_INT)),
+                    noreg, noreg);
 }
 
 void TemplateTable::laload() {
@@ -782,8 +783,10 @@ void TemplateTable::laload() {
   index_check(rdx, rax); // kills rbx
   NOT_LP64(__ mov(rbx, rax));
   // rbx,: index
-  __ movptr(rax, Address(rdx, rbx, Address::times_8, arrayOopDesc::base_offset_in_bytes(T_LONG) + 0 * wordSize));
-  NOT_LP64(__ movl(rdx, Address(rdx, rbx, Address::times_8, arrayOopDesc::base_offset_in_bytes(T_LONG) + 1 * wordSize)));
+  __ access_load_at(T_LONG, IN_HEAP | IN_HEAP_ARRAY, noreg /* ltos */,
+                    Address(rdx, rbx, Address::times_8,
+                            arrayOopDesc::base_offset_in_bytes(T_LONG)),
+                    noreg, noreg);
 }
 
 
@@ -793,9 +796,11 @@ void TemplateTable::faload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ load_float(Address(rdx, rax,
-                        Address::times_4,
-                        arrayOopDesc::base_offset_in_bytes(T_FLOAT)));
+  __ access_load_at(T_FLOAT, IN_HEAP | IN_HEAP_ARRAY, noreg /* ftos */,
+                    Address(rdx, rax,
+                            Address::times_4,
+                            arrayOopDesc::base_offset_in_bytes(T_FLOAT)),
+                    noreg, noreg);
 }
 
 void TemplateTable::daload() {
@@ -803,9 +808,11 @@ void TemplateTable::daload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ load_double(Address(rdx, rax,
-                         Address::times_8,
-                         arrayOopDesc::base_offset_in_bytes(T_DOUBLE)));
+  __ access_load_at(T_DOUBLE, IN_HEAP | IN_HEAP_ARRAY, noreg /* dtos */,
+                    Address(rdx, rax,
+                            Address::times_8,
+                            arrayOopDesc::base_offset_in_bytes(T_DOUBLE)),
+                    noreg, noreg);
 }
 
 void TemplateTable::aaload() {
@@ -826,7 +833,9 @@ void TemplateTable::baload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ load_signed_byte(rax, Address(rdx, rax, Address::times_1, arrayOopDesc::base_offset_in_bytes(T_BYTE)));
+  __ access_load_at(T_BYTE, IN_HEAP | IN_HEAP_ARRAY, rax,
+                    Address(rdx, rax, Address::times_1, arrayOopDesc::base_offset_in_bytes(T_BYTE)),
+                    noreg, noreg);
 }
 
 void TemplateTable::caload() {
@@ -834,7 +843,9 @@ void TemplateTable::caload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ load_unsigned_short(rax, Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_CHAR)));
+  __ access_load_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, rax,
+                    Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_CHAR)),
+                    noreg, noreg);
 }
 
 // iload followed by caload frequent pair
@@ -847,10 +858,9 @@ void TemplateTable::fast_icaload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ load_unsigned_short(rax,
-                         Address(rdx, rax,
-                                 Address::times_2,
-                                 arrayOopDesc::base_offset_in_bytes(T_CHAR)));
+  __ access_load_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, rax,
+                    Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_CHAR)),
+                    noreg, noreg);
 }
 
 
@@ -859,7 +869,9 @@ void TemplateTable::saload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  __ load_signed_short(rax, Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_SHORT)));
+  __ access_load_at(T_SHORT, IN_HEAP | IN_HEAP_ARRAY, rax,
+                    Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_SHORT)),
+                    noreg, noreg);
 }
 
 void TemplateTable::iload(int n) {
@@ -1051,10 +1063,10 @@ void TemplateTable::iastore() {
   // rbx: index
   // rdx: array
   index_check(rdx, rbx); // prefer index in rbx
-  __ movl(Address(rdx, rbx,
-                  Address::times_4,
-                  arrayOopDesc::base_offset_in_bytes(T_INT)),
-          rax);
+  __ access_store_at(T_INT, IN_HEAP | IN_HEAP_ARRAY,
+                     Address(rdx, rbx, Address::times_4,
+                             arrayOopDesc::base_offset_in_bytes(T_INT)),
+                     rax, noreg, noreg);
 }
 
 void TemplateTable::lastore() {
@@ -1065,8 +1077,10 @@ void TemplateTable::lastore() {
   // rdx: high(value)
   index_check(rcx, rbx);  // prefer index in rbx,
   // rbx,: index
-  __ movptr(Address(rcx, rbx, Address::times_8, arrayOopDesc::base_offset_in_bytes(T_LONG) + 0 * wordSize), rax);
-  NOT_LP64(__ movl(Address(rcx, rbx, Address::times_8, arrayOopDesc::base_offset_in_bytes(T_LONG) + 1 * wordSize), rdx));
+  __ access_store_at(T_LONG, IN_HEAP | IN_HEAP_ARRAY,
+                     Address(rcx, rbx, Address::times_8,
+                             arrayOopDesc::base_offset_in_bytes(T_LONG)),
+                     noreg /* ltos */, noreg, noreg);
 }
 
 
@@ -1077,7 +1091,10 @@ void TemplateTable::fastore() {
   // rbx:  index
   // rdx:  array
   index_check(rdx, rbx); // prefer index in rbx
-  __ store_float(Address(rdx, rbx, Address::times_4, arrayOopDesc::base_offset_in_bytes(T_FLOAT)));
+  __ access_store_at(T_FLOAT, IN_HEAP | IN_HEAP_ARRAY,
+                     Address(rdx, rbx, Address::times_4,
+                             arrayOopDesc::base_offset_in_bytes(T_FLOAT)),
+                     noreg /* ftos */, noreg, noreg);
 }
 
 void TemplateTable::dastore() {
@@ -1087,7 +1104,10 @@ void TemplateTable::dastore() {
   // rbx:  index
   // rdx:  array
   index_check(rdx, rbx); // prefer index in rbx
-  __ store_double(Address(rdx, rbx, Address::times_8, arrayOopDesc::base_offset_in_bytes(T_DOUBLE)));
+  __ access_store_at(T_DOUBLE, IN_HEAP | IN_HEAP_ARRAY,
+                     Address(rdx, rbx, Address::times_8,
+                             arrayOopDesc::base_offset_in_bytes(T_DOUBLE)),
+                     noreg /* dtos */, noreg, noreg);
 }
 
 void TemplateTable::aastore() {
@@ -1160,10 +1180,10 @@ void TemplateTable::bastore() {
   __ jccb(Assembler::zero, L_skip);
   __ andl(rax, 1);  // if it is a T_BOOLEAN array, mask the stored value to 0/1
   __ bind(L_skip);
-  __ movb(Address(rdx, rbx,
-                  Address::times_1,
-                  arrayOopDesc::base_offset_in_bytes(T_BYTE)),
-          rax);
+  __ access_store_at(T_BYTE, IN_HEAP | IN_HEAP_ARRAY,
+                     Address(rdx, rbx,Address::times_1,
+                             arrayOopDesc::base_offset_in_bytes(T_BYTE)),
+                     rax, noreg, noreg);
 }
 
 void TemplateTable::castore() {
@@ -1173,10 +1193,10 @@ void TemplateTable::castore() {
   // rbx: index
   // rdx: array
   index_check(rdx, rbx);  // prefer index in rbx
-  __ movw(Address(rdx, rbx,
-                  Address::times_2,
-                  arrayOopDesc::base_offset_in_bytes(T_CHAR)),
-          rax);
+  __ access_store_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY,
+                     Address(rdx, rbx, Address::times_2,
+                             arrayOopDesc::base_offset_in_bytes(T_CHAR)),
+                     rax, noreg, noreg);
 }
 
 
@@ -2852,7 +2872,6 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   if (!is_static) pop_and_check_object(obj);
 
   const Address field(obj, off, Address::times_1, 0*wordSize);
-  NOT_LP64(const Address hi(obj, off, Address::times_1, 1*wordSize));
 
   Label Done, notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj, notDouble;
 
@@ -2864,7 +2883,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
 
   __ jcc(Assembler::notZero, notByte);
   // btos
-  __ load_signed_byte(rax, field);
+  __ access_load_at(T_BYTE, IN_HEAP, rax, field, noreg, noreg);
   __ push(btos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -2877,7 +2896,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ jcc(Assembler::notEqual, notBool);
 
   // ztos (same code as btos)
-  __ load_signed_byte(rax, field);
+  __ access_load_at(T_BOOLEAN, IN_HEAP, rax, field, noreg, noreg);
   __ push(ztos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -2901,7 +2920,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmpl(flags, itos);
   __ jcc(Assembler::notEqual, notInt);
   // itos
-  __ movl(rax, field);
+  __ access_load_at(T_INT, IN_HEAP, rax, field, noreg, noreg);
   __ push(itos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -2913,7 +2932,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmpl(flags, ctos);
   __ jcc(Assembler::notEqual, notChar);
   // ctos
-  __ load_unsigned_short(rax, field);
+  __ access_load_at(T_CHAR, IN_HEAP, rax, field, noreg, noreg);
   __ push(ctos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -2925,7 +2944,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmpl(flags, stos);
   __ jcc(Assembler::notEqual, notShort);
   // stos
-  __ load_signed_short(rax, field);
+  __ access_load_at(T_SHORT, IN_HEAP, rax, field, noreg, noreg);
   __ push(stos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -2937,19 +2956,9 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ cmpl(flags, ltos);
   __ jcc(Assembler::notEqual, notLong);
   // ltos
-
-#ifndef _LP64
-  // Generate code as if volatile.  There just aren't enough registers to
-  // save that information and this code is faster than the test.
-  __ fild_d(field);                // Must load atomically
-  __ subptr(rsp,2*wordSize);    // Make space for store
-  __ fistp_d(Address(rsp,0));
-  __ pop(rax);
-  __ pop(rdx);
-#else
-  __ movq(rax, field);
-#endif
-
+    // Generate code as if volatile (x86_32).  There just aren't enough registers to
+    // save that information and this code is faster than the test.
+  __ access_load_at(T_LONG, IN_HEAP | MO_RELAXED, noreg /* ltos */, field, noreg, noreg);
   __ push(ltos);
   // Rewrite bytecode to be faster
   LP64_ONLY(if (!is_static && rc == may_rewrite) patch_bytecode(Bytecodes::_fast_lgetfield, bc, rbx));
@@ -2960,7 +2969,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ jcc(Assembler::notEqual, notFloat);
   // ftos
 
-  __ load_float(field);
+  __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
   __ push(ftos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -2974,7 +2983,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ jcc(Assembler::notEqual, notDouble);
 #endif
   // dtos
-  __ load_double(field);
+  __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* dtos */, field, noreg, noreg);
   __ push(dtos);
   // Rewrite bytecode to be faster
   if (!is_static && rc == may_rewrite) {
@@ -3133,7 +3142,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(btos);
     if (!is_static) pop_and_check_object(obj);
-    __ movb(field, rax);
+    __ access_store_at(T_BYTE, IN_HEAP, field, rax, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_bputfield, bc, rbx, true, byte_no);
     }
@@ -3148,8 +3157,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ztos);
     if (!is_static) pop_and_check_object(obj);
-    __ andl(rax, 0x1);
-    __ movb(field, rax);
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, rax, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_zputfield, bc, rbx, true, byte_no);
     }
@@ -3180,7 +3188,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(itos);
     if (!is_static) pop_and_check_object(obj);
-    __ movl(field, rax);
+    __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_iputfield, bc, rbx, true, byte_no);
     }
@@ -3195,7 +3203,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ctos);
     if (!is_static) pop_and_check_object(obj);
-    __ movw(field, rax);
+    __ access_store_at(T_CHAR, IN_HEAP, field, rax, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_cputfield, bc, rbx, true, byte_no);
     }
@@ -3210,7 +3218,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(stos);
     if (!is_static) pop_and_check_object(obj);
-    __ movw(field, rax);
+    __ access_store_at(T_SHORT, IN_HEAP, field, rax, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_sputfield, bc, rbx, true, byte_no);
     }
@@ -3226,7 +3234,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ltos);
     if (!is_static) pop_and_check_object(obj);
-    __ movq(field, rax);
+    __ access_store_at(T_LONG, IN_HEAP, field, noreg /* ltos*/, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_lputfield, bc, rbx, true, byte_no);
     }
@@ -3242,11 +3250,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
     if (!is_static) pop_and_check_object(obj);
 
     // Replace with real volatile test
-    __ push(rdx);
-    __ push(rax);                 // Must update atomically with FIST
-    __ fild_d(Address(rsp,0));    // So load into FPU register
-    __ fistp_d(field);            // and put into memory atomically
-    __ addptr(rsp, 2*wordSize);
+    __ access_store_at(T_LONG, IN_HEAP | MO_RELAXED, field, noreg /* ltos */, noreg, noreg);
     // volatile_barrier();
     volatile_barrier(Assembler::Membar_mask_bits(Assembler::StoreLoad |
                                                  Assembler::StoreStore));
@@ -3257,8 +3261,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
 
     __ pop(ltos);  // overwrites rdx
     if (!is_static) pop_and_check_object(obj);
-    __ movptr(hi, rdx);
-    __ movptr(field, rax);
+    __ access_store_at(T_LONG, IN_HEAP, field, noreg /* ltos */, noreg, noreg);
     // Don't rewrite to _fast_lputfield for potential volatile case.
     __ jmp(notVolatile);
   }
@@ -3272,7 +3275,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(ftos);
     if (!is_static) pop_and_check_object(obj);
-    __ store_float(field);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_fputfield, bc, rbx, true, byte_no);
     }
@@ -3289,7 +3292,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
   {
     __ pop(dtos);
     if (!is_static) pop_and_check_object(obj);
-    __ store_double(field);
+    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos */, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_dputfield, bc, rbx, true, byte_no);
     }
@@ -3422,30 +3425,31 @@ void TemplateTable::fast_storefield(TosState state) {
     break;
   case Bytecodes::_fast_lputfield:
 #ifdef _LP64
-  __ movq(field, rax);
+    __ access_store_at(T_LONG, IN_HEAP, field, noreg /* ltos */, noreg, noreg);
 #else
   __ stop("should not be rewritten");
 #endif
     break;
   case Bytecodes::_fast_iputfield:
-    __ movl(field, rax);
+    __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg);
     break;
   case Bytecodes::_fast_zputfield:
-    __ andl(rax, 0x1);  // boolean is true if LSB is 1
-    // fall through to bputfield
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, rax, noreg, noreg);
+    break;
   case Bytecodes::_fast_bputfield:
-    __ movb(field, rax);
+    __ access_store_at(T_BYTE, IN_HEAP, field, rax, noreg, noreg);
     break;
   case Bytecodes::_fast_sputfield:
-    // fall through
+    __ access_store_at(T_SHORT, IN_HEAP, field, rax, noreg, noreg);
+    break;
   case Bytecodes::_fast_cputfield:
-    __ movw(field, rax);
+    __ access_store_at(T_CHAR, IN_HEAP, field, rax, noreg, noreg);
     break;
   case Bytecodes::_fast_fputfield:
-    __ store_float(field);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos*/, noreg, noreg);
     break;
   case Bytecodes::_fast_dputfield:
-    __ store_double(field);
+    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos*/, noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
@@ -3512,28 +3516,28 @@ void TemplateTable::fast_accessfield(TosState state) {
     break;
   case Bytecodes::_fast_lgetfield:
 #ifdef _LP64
-  __ movq(rax, field);
+    __ access_load_at(T_LONG, IN_HEAP, noreg /* ltos */, field, noreg, noreg);
 #else
   __ stop("should not be rewritten");
 #endif
     break;
   case Bytecodes::_fast_igetfield:
-    __ movl(rax, field);
+    __ access_load_at(T_INT, IN_HEAP, rax, field, noreg, noreg);
     break;
   case Bytecodes::_fast_bgetfield:
-    __ movsbl(rax, field);
+    __ access_load_at(T_BYTE, IN_HEAP, rax, field, noreg, noreg);
     break;
   case Bytecodes::_fast_sgetfield:
-    __ load_signed_short(rax, field);
+    __ access_load_at(T_SHORT, IN_HEAP, rax, field, noreg, noreg);
     break;
   case Bytecodes::_fast_cgetfield:
-    __ load_unsigned_short(rax, field);
+    __ access_load_at(T_CHAR, IN_HEAP, rax, field, noreg, noreg);
     break;
   case Bytecodes::_fast_fgetfield:
-    __ load_float(field);
+    __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
     break;
   case Bytecodes::_fast_dgetfield:
-    __ load_double(field);
+    __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* dtos */, field, noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
@@ -3566,14 +3570,14 @@ void TemplateTable::fast_xaccess(TosState state) {
   const Address field = Address(rax, rbx, Address::times_1, 0*wordSize);
   switch (state) {
   case itos:
-    __ movl(rax, field);
+    __ access_load_at(T_INT, IN_HEAP, rax, field, noreg, noreg);
     break;
   case atos:
     do_oop_load(_masm, field, rax);
     __ verify_oop(rax);
     break;
   case ftos:
-    __ load_float(field);
+    __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 726796aa452..3fd148bceda 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1067,6 +1067,138 @@ reg_class vectorz_reg(XMM0,  XMM0b,  XMM0c,  XMM0d,  XMM0e,  XMM0f,  XMM0g,  XMM
 #endif
                       );
 
+reg_class xmm0_reg(XMM0, XMM0b, XMM0c, XMM0d);
+reg_class ymm0_reg(XMM0, XMM0b, XMM0c, XMM0d, XMM0e, XMM0f, XMM0g, XMM0h);
+reg_class zmm0_reg(XMM0, XMM0b, XMM0c, XMM0d, XMM0e, XMM0f, XMM0g, XMM0h, XMM0i, XMM0j, XMM0k, XMM0l, XMM0m, XMM0n, XMM0o, XMM0p);
+
+reg_class xmm1_reg(XMM1, XMM1b, XMM1c, XMM1d);
+reg_class ymm1_reg(XMM1, XMM1b, XMM1c, XMM1d, XMM1e, XMM1f, XMM1g, XMM1h);
+reg_class zmm1_reg(XMM1, XMM1b, XMM1c, XMM1d, XMM1e, XMM1f, XMM1g, XMM1h, XMM1i, XMM1j, XMM1k, XMM1l, XMM1m, XMM1n, XMM1o, XMM1p);
+
+reg_class xmm2_reg(XMM2, XMM2b, XMM2c, XMM2d);
+reg_class ymm2_reg(XMM2, XMM2b, XMM2c, XMM2d, XMM2e, XMM2f, XMM2g, XMM2h);
+reg_class zmm2_reg(XMM2, XMM2b, XMM2c, XMM2d, XMM2e, XMM2f, XMM2g, XMM2h, XMM2i, XMM2j, XMM2k, XMM2l, XMM2m, XMM2n, XMM2o, XMM2p);
+
+reg_class xmm3_reg(XMM3, XMM3b, XMM3c, XMM3d);
+reg_class ymm3_reg(XMM3, XMM3b, XMM3c, XMM3d, XMM3e, XMM3f, XMM3g, XMM3h);
+reg_class zmm3_reg(XMM3, XMM3b, XMM3c, XMM3d, XMM3e, XMM3f, XMM3g, XMM3h, XMM3i, XMM3j, XMM3k, XMM3l, XMM3m, XMM3n, XMM3o, XMM3p);
+
+reg_class xmm4_reg(XMM4, XMM4b, XMM4c, XMM4d);
+reg_class ymm4_reg(XMM4, XMM4b, XMM4c, XMM4d, XMM4e, XMM4f, XMM4g, XMM4h);
+reg_class zmm4_reg(XMM4, XMM4b, XMM4c, XMM4d, XMM4e, XMM4f, XMM4g, XMM4h, XMM4i, XMM4j, XMM4k, XMM4l, XMM4m, XMM4n, XMM4o, XMM4p);
+
+reg_class xmm5_reg(XMM5, XMM5b, XMM5c, XMM5d);
+reg_class ymm5_reg(XMM5, XMM5b, XMM5c, XMM5d, XMM5e, XMM5f, XMM5g, XMM5h);
+reg_class zmm5_reg(XMM5, XMM5b, XMM5c, XMM5d, XMM5e, XMM5f, XMM5g, XMM5h, XMM5i, XMM5j, XMM5k, XMM5l, XMM5m, XMM5n, XMM5o, XMM5p);
+
+reg_class xmm6_reg(XMM6, XMM6b, XMM6c, XMM6d);
+reg_class ymm6_reg(XMM6, XMM6b, XMM6c, XMM6d, XMM6e, XMM6f, XMM6g, XMM6h);
+reg_class zmm6_reg(XMM6, XMM6b, XMM6c, XMM6d, XMM6e, XMM6f, XMM6g, XMM6h, XMM6i, XMM6j, XMM6k, XMM6l, XMM6m, XMM6n, XMM6o, XMM6p);
+
+reg_class xmm7_reg(XMM7, XMM7b, XMM7c, XMM7d);
+reg_class ymm7_reg(XMM7, XMM7b, XMM7c, XMM7d, XMM7e, XMM7f, XMM7g, XMM7h);
+reg_class zmm7_reg(XMM7, XMM7b, XMM7c, XMM7d, XMM7e, XMM7f, XMM7g, XMM7h, XMM7i, XMM7j, XMM7k, XMM7l, XMM7m, XMM7n, XMM7o, XMM7p);
+
+#ifdef _LP64
+
+reg_class xmm8_reg(XMM8, XMM8b, XMM8c, XMM8d);
+reg_class ymm8_reg(XMM8, XMM8b, XMM8c, XMM8d, XMM8e, XMM8f, XMM8g, XMM8h);
+reg_class zmm8_reg(XMM8, XMM8b, XMM8c, XMM8d, XMM8e, XMM8f, XMM8g, XMM8h, XMM8i, XMM8j, XMM8k, XMM8l, XMM8m, XMM8n, XMM8o, XMM8p);
+
+reg_class xmm9_reg(XMM9, XMM9b, XMM9c, XMM9d);
+reg_class ymm9_reg(XMM9, XMM9b, XMM9c, XMM9d, XMM9e, XMM9f, XMM9g, XMM9h);
+reg_class zmm9_reg(XMM9, XMM9b, XMM9c, XMM9d, XMM9e, XMM9f, XMM9g, XMM9h, XMM9i, XMM9j, XMM9k, XMM9l, XMM9m, XMM9n, XMM9o, XMM9p);
+
+reg_class xmm10_reg(XMM10, XMM10b, XMM10c, XMM10d);
+reg_class ymm10_reg(XMM10, XMM10b, XMM10c, XMM10d, XMM10e, XMM10f, XMM10g, XMM10h);
+reg_class zmm10_reg(XMM10, XMM10b, XMM10c, XMM10d, XMM10e, XMM10f, XMM10g, XMM10h, XMM10i, XMM10j, XMM10k, XMM10l, XMM10m, XMM10n, XMM10o, XMM10p);
+
+reg_class xmm11_reg(XMM11, XMM11b, XMM11c, XMM11d);
+reg_class ymm11_reg(XMM11, XMM11b, XMM11c, XMM11d, XMM11e, XMM11f, XMM11g, XMM11h);
+reg_class zmm11_reg(XMM11, XMM11b, XMM11c, XMM11d, XMM11e, XMM11f, XMM11g, XMM11h, XMM11i, XMM11j, XMM11k, XMM11l, XMM11m, XMM11n, XMM11o, XMM11p);
+
+reg_class xmm12_reg(XMM12, XMM12b, XMM12c, XMM12d);
+reg_class ymm12_reg(XMM12, XMM12b, XMM12c, XMM12d, XMM12e, XMM12f, XMM12g, XMM12h);
+reg_class zmm12_reg(XMM12, XMM12b, XMM12c, XMM12d, XMM12e, XMM12f, XMM12g, XMM12h, XMM12i, XMM12j, XMM12k, XMM12l, XMM12m, XMM12n, XMM12o, XMM12p);
+
+reg_class xmm13_reg(XMM13, XMM13b, XMM13c, XMM13d);
+reg_class ymm13_reg(XMM13, XMM13b, XMM13c, XMM13d, XMM13e, XMM13f, XMM13g, XMM13h);
+reg_class zmm13_reg(XMM13, XMM13b, XMM13c, XMM13d, XMM13e, XMM13f, XMM13g, XMM13h, XMM13i, XMM13j, XMM13k, XMM13l, XMM13m, XMM13n, XMM13o, XMM13p);
+
+reg_class xmm14_reg(XMM14, XMM14b, XMM14c, XMM14d);
+reg_class ymm14_reg(XMM14, XMM14b, XMM14c, XMM14d, XMM14e, XMM14f, XMM14g, XMM14h);
+reg_class zmm14_reg(XMM14, XMM14b, XMM14c, XMM14d, XMM14e, XMM14f, XMM14g, XMM14h, XMM14i, XMM14j, XMM14k, XMM14l, XMM14m, XMM14n, XMM14o, XMM14p);
+
+reg_class xmm15_reg(XMM15, XMM15b, XMM15c, XMM15d);
+reg_class ymm15_reg(XMM15, XMM15b, XMM15c, XMM15d, XMM15e, XMM15f, XMM15g, XMM15h);
+reg_class zmm15_reg(XMM15, XMM15b, XMM15c, XMM15d, XMM15e, XMM15f, XMM15g, XMM15h, XMM15i, XMM15j, XMM15k, XMM15l, XMM15m, XMM15n, XMM15o, XMM15p);
+
+reg_class xmm16_reg(XMM16, XMM16b, XMM16c, XMM16d);
+reg_class ymm16_reg(XMM16, XMM16b, XMM16c, XMM16d, XMM16e, XMM16f, XMM16g, XMM16h);
+reg_class zmm16_reg(XMM16, XMM16b, XMM16c, XMM16d, XMM16e, XMM16f, XMM16g, XMM16h, XMM16i, XMM16j, XMM16k, XMM16l, XMM16m, XMM16n, XMM16o, XMM16p);
+
+reg_class xmm17_reg(XMM17, XMM17b, XMM17c, XMM17d);
+reg_class ymm17_reg(XMM17, XMM17b, XMM17c, XMM17d, XMM17e, XMM17f, XMM17g, XMM17h);
+reg_class zmm17_reg(XMM17, XMM17b, XMM17c, XMM17d, XMM17e, XMM17f, XMM17g, XMM17h, XMM17i, XMM17j, XMM17k, XMM17l, XMM17m, XMM17n, XMM17o, XMM17p);
+
+reg_class xmm18_reg(XMM18, XMM18b, XMM18c, XMM18d);
+reg_class ymm18_reg(XMM18, XMM18b, XMM18c, XMM18d, XMM18e, XMM18f, XMM18g, XMM18h);
+reg_class zmm18_reg(XMM18, XMM18b, XMM18c, XMM18d, XMM18e, XMM18f, XMM18g, XMM18h, XMM18i, XMM18j, XMM18k, XMM18l, XMM18m, XMM18n, XMM18o, XMM18p);
+
+reg_class xmm19_reg(XMM19, XMM19b, XMM19c, XMM19d);
+reg_class ymm19_reg(XMM19, XMM19b, XMM19c, XMM19d, XMM19e, XMM19f, XMM19g, XMM19h);
+reg_class zmm19_reg(XMM19, XMM19b, XMM19c, XMM19d, XMM19e, XMM19f, XMM19g, XMM19h, XMM19i, XMM19j, XMM19k, XMM19l, XMM19m, XMM19n, XMM19o, XMM19p);
+
+reg_class xmm20_reg(XMM20, XMM20b, XMM20c, XMM20d);
+reg_class ymm20_reg(XMM20, XMM20b, XMM20c, XMM20d, XMM20e, XMM20f, XMM20g, XMM20h);
+reg_class zmm20_reg(XMM20, XMM20b, XMM20c, XMM20d, XMM20e, XMM20f, XMM20g, XMM20h, XMM20i, XMM20j, XMM20k, XMM20l, XMM20m, XMM20n, XMM20o, XMM20p);
+
+reg_class xmm21_reg(XMM21, XMM21b, XMM21c, XMM21d);
+reg_class ymm21_reg(XMM21, XMM21b, XMM21c, XMM21d, XMM21e, XMM21f, XMM21g, XMM21h);
+reg_class zmm21_reg(XMM21, XMM21b, XMM21c, XMM21d, XMM21e, XMM21f, XMM21g, XMM21h, XMM21i, XMM21j, XMM21k, XMM21l, XMM21m, XMM21n, XMM21o, XMM21p);
+
+reg_class xmm22_reg(XMM22, XMM22b, XMM22c, XMM22d);
+reg_class ymm22_reg(XMM22, XMM22b, XMM22c, XMM22d, XMM22e, XMM22f, XMM22g, XMM22h);
+reg_class zmm22_reg(XMM22, XMM22b, XMM22c, XMM22d, XMM22e, XMM22f, XMM22g, XMM22h, XMM22i, XMM22j, XMM22k, XMM22l, XMM22m, XMM22n, XMM22o, XMM22p);
+
+reg_class xmm23_reg(XMM23, XMM23b, XMM23c, XMM23d);
+reg_class ymm23_reg(XMM23, XMM23b, XMM23c, XMM23d, XMM23e, XMM23f, XMM23g, XMM23h);
+reg_class zmm23_reg(XMM23, XMM23b, XMM23c, XMM23d, XMM23e, XMM23f, XMM23g, XMM23h, XMM23i, XMM23j, XMM23k, XMM23l, XMM23m, XMM23n, XMM23o, XMM23p);
+
+reg_class xmm24_reg(XMM24, XMM24b, XMM24c, XMM24d);
+reg_class ymm24_reg(XMM24, XMM24b, XMM24c, XMM24d, XMM24e, XMM24f, XMM24g, XMM24h);
+reg_class zmm24_reg(XMM24, XMM24b, XMM24c, XMM24d, XMM24e, XMM24f, XMM24g, XMM24h, XMM24i, XMM24j, XMM24k, XMM24l, XMM24m, XMM24n, XMM24o, XMM24p);
+
+reg_class xmm25_reg(XMM25, XMM25b, XMM25c, XMM25d);
+reg_class ymm25_reg(XMM25, XMM25b, XMM25c, XMM25d, XMM25e, XMM25f, XMM25g, XMM25h);
+reg_class zmm25_reg(XMM25, XMM25b, XMM25c, XMM25d, XMM25e, XMM25f, XMM25g, XMM25h, XMM25i, XMM25j, XMM25k, XMM25l, XMM25m, XMM25n, XMM25o, XMM25p);
+
+reg_class xmm26_reg(XMM26, XMM26b, XMM26c, XMM26d);
+reg_class ymm26_reg(XMM26, XMM26b, XMM26c, XMM26d, XMM26e, XMM26f, XMM26g, XMM26h);
+reg_class zmm26_reg(XMM26, XMM26b, XMM26c, XMM26d, XMM26e, XMM26f, XMM26g, XMM26h, XMM26i, XMM26j, XMM26k, XMM26l, XMM26m, XMM26n, XMM26o, XMM26p);
+
+reg_class xmm27_reg(XMM27, XMM27b, XMM27c, XMM27d);
+reg_class ymm27_reg(XMM27, XMM27b, XMM27c, XMM27d, XMM27e, XMM27f, XMM27g, XMM27h);
+reg_class zmm27_reg(XMM27, XMM27b, XMM27c, XMM27d, XMM27e, XMM27f, XMM27g, XMM27h, XMM27i, XMM27j, XMM27k, XMM27l, XMM27m, XMM27n, XMM27o, XMM27p);
+
+reg_class xmm28_reg(XMM28, XMM28b, XMM28c, XMM28d);
+reg_class ymm28_reg(XMM28, XMM28b, XMM28c, XMM28d, XMM28e, XMM28f, XMM28g, XMM28h);
+reg_class zmm28_reg(XMM28, XMM28b, XMM28c, XMM28d, XMM28e, XMM28f, XMM28g, XMM28h, XMM28i, XMM28j, XMM28k, XMM28l, XMM28m, XMM28n, XMM28o, XMM28p);
+
+reg_class xmm29_reg(XMM29, XMM29b, XMM29c, XMM29d);
+reg_class ymm29_reg(XMM29, XMM29b, XMM29c, XMM29d, XMM29e, XMM29f, XMM29g, XMM29h);
+reg_class zmm29_reg(XMM29, XMM29b, XMM29c, XMM29d, XMM29e, XMM29f, XMM29g, XMM29h, XMM29i, XMM29j, XMM29k, XMM29l, XMM29m, XMM29n, XMM29o, XMM29p);
+
+reg_class xmm30_reg(XMM30, XMM30b, XMM30c, XMM30d);
+reg_class ymm30_reg(XMM30, XMM30b, XMM30c, XMM30d, XMM30e, XMM30f, XMM30g, XMM30h);
+reg_class zmm30_reg(XMM30, XMM30b, XMM30c, XMM30d, XMM30e, XMM30f, XMM30g, XMM30h, XMM30i, XMM30j, XMM30k, XMM30l, XMM30m, XMM30n, XMM30o, XMM30p);
+
+reg_class xmm31_reg(XMM31, XMM31b, XMM31c, XMM31d);
+reg_class ymm31_reg(XMM31, XMM31b, XMM31c, XMM31d, XMM31e, XMM31f, XMM31g, XMM31h);
+reg_class zmm31_reg(XMM31, XMM31b, XMM31c, XMM31d, XMM31e, XMM31f, XMM31g, XMM31h, XMM31i, XMM31j, XMM31k, XMM31l, XMM31m, XMM31n, XMM31o, XMM31p);
+
+#endif
+
 %}
 
 
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index ea0f16ac18c..368a5b03faf 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -538,6 +538,12 @@ reg_class int_rdi_reg(RDI);
 
 %}
 
+source_hpp %{
+#if INCLUDE_ZGC
+#include "gc/z/zBarrierSetAssembler.hpp"
+#endif
+%}
+
 //----------SOURCE BLOCK-------------------------------------------------------
 // This is a block of C++ code which provides values, functions, and
 // definitions necessary in the rest of the architecture description
@@ -4221,6 +4227,135 @@ operand cmpOpUCF2() %{
   %}
 %}
 
+// Operands for bound floating pointer register arguments
+operand rxmm0() %{
+  constraint(ALLOC_IN_RC(xmm0_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX<= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm1() %{
+  constraint(ALLOC_IN_RC(xmm1_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm2() %{
+  constraint(ALLOC_IN_RC(xmm2_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm3() %{
+  constraint(ALLOC_IN_RC(xmm3_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm4() %{
+  constraint(ALLOC_IN_RC(xmm4_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm5() %{
+  constraint(ALLOC_IN_RC(xmm5_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm6() %{
+  constraint(ALLOC_IN_RC(xmm6_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm7() %{
+  constraint(ALLOC_IN_RC(xmm7_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm8() %{
+  constraint(ALLOC_IN_RC(xmm8_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm9() %{
+  constraint(ALLOC_IN_RC(xmm9_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm10() %{
+  constraint(ALLOC_IN_RC(xmm10_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm11() %{
+  constraint(ALLOC_IN_RC(xmm11_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm12() %{
+  constraint(ALLOC_IN_RC(xmm12_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm13() %{
+  constraint(ALLOC_IN_RC(xmm13_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm14() %{
+  constraint(ALLOC_IN_RC(xmm14_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm15() %{
+  constraint(ALLOC_IN_RC(xmm15_reg));  match(VecX);
+  predicate((UseSSE > 0) && (UseAVX <= 2));  format%{%}  interface(REG_INTER);
+%}
+operand rxmm16() %{
+  constraint(ALLOC_IN_RC(xmm16_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm17() %{
+  constraint(ALLOC_IN_RC(xmm17_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm18() %{
+  constraint(ALLOC_IN_RC(xmm18_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm19() %{
+  constraint(ALLOC_IN_RC(xmm19_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm20() %{
+  constraint(ALLOC_IN_RC(xmm20_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm21() %{
+  constraint(ALLOC_IN_RC(xmm21_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm22() %{
+  constraint(ALLOC_IN_RC(xmm22_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm23() %{
+  constraint(ALLOC_IN_RC(xmm23_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm24() %{
+  constraint(ALLOC_IN_RC(xmm24_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm25() %{
+  constraint(ALLOC_IN_RC(xmm25_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm26() %{
+  constraint(ALLOC_IN_RC(xmm26_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm27() %{
+  constraint(ALLOC_IN_RC(xmm27_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm28() %{
+  constraint(ALLOC_IN_RC(xmm28_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm29() %{
+  constraint(ALLOC_IN_RC(xmm29_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm30() %{
+  constraint(ALLOC_IN_RC(xmm30_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
+operand rxmm31() %{
+  constraint(ALLOC_IN_RC(xmm31_reg));  match(VecX);
+  predicate(UseAVX == 3);  format%{%}  interface(REG_INTER);
+%}
 
 //----------OPERAND CLASSES----------------------------------------------------
 // Operand Classes are groups of operands that are used as to simplify
@@ -11547,6 +11682,16 @@ instruct testL_reg_mem(rFlagsReg cr, rRegL src, memory mem, immL0 zero)
   ins_pipe(ialu_cr_reg_mem);
 %}
 
+instruct testL_reg_mem2(rFlagsReg cr, rRegP src, memory mem, immL0 zero)
+%{
+  match(Set cr (CmpL (AndL (CastP2X src) (LoadL mem)) zero));
+
+  format %{ "testq   $src, $mem" %}
+  opcode(0x85);
+  ins_encode(REX_reg_mem_wide(src, mem), OpcP, reg_mem(src, mem));
+  ins_pipe(ialu_cr_reg_mem);
+%}
+
 // Manifest a CmpL result in an integer register.  Very painful.
 // This is the test to avoid.
 instruct cmpL3_reg_reg(rRegI dst, rRegL src1, rRegL src2, rFlagsReg flags)
@@ -11607,16 +11752,6 @@ instruct testUL_reg(rFlagsRegU cr, rRegL src, immL0 zero)
   ins_pipe(ialu_cr_reg_imm);
 %}
 
-instruct compUB_mem_imm(rFlagsReg cr, memory mem, immU8 imm)
-%{
-  match(Set cr (CmpI (LoadUB mem) imm));
-
-  ins_cost(125);
-  format %{ "cmpb    $mem, $imm" %}
-  ins_encode %{ __ cmpb($mem$$Address, $imm$$constant); %}
-  ins_pipe(ialu_cr_reg_mem);
-%}
-
 instruct compB_mem_imm(rFlagsReg cr, memory mem, immI8 imm)
 %{
   match(Set cr (CmpI (LoadB mem) imm));
@@ -11627,16 +11762,6 @@ instruct compB_mem_imm(rFlagsReg cr, memory mem, immI8 imm)
   ins_pipe(ialu_cr_reg_mem);
 %}
 
-instruct testUB_mem_imm(rFlagsReg cr, memory mem, immU8 imm, immI0 zero)
-%{
-  match(Set cr (CmpI (AndI (LoadUB mem) imm) zero));
-
-  ins_cost(125);
-  format %{ "testb   $mem, $imm" %}
-  ins_encode %{ __ testb($mem$$Address, $imm$$constant); %}
-  ins_pipe(ialu_cr_reg_mem);
-%}
-
 instruct testB_mem_imm(rFlagsReg cr, memory mem, immI8 imm, immI0 zero)
 %{
   match(Set cr (CmpI (AndI (LoadB mem) imm) zero));
@@ -12340,6 +12465,223 @@ instruct RethrowException()
   ins_pipe(pipe_jmp);
 %}
 
+//
+// Execute ZGC load barrier (strong) slow path
+//
+
+// When running without XMM regs
+instruct loadBarrierSlowRegNoVec(rRegP dst, memory mem, rFlagsReg cr) %{
+
+  match(Set dst (LoadBarrierSlowReg mem));
+  predicate(MaxVectorSize < 16);
+
+  effect(DEF dst, KILL cr);
+
+  format %{"LoadBarrierSlowRegNoVec $dst, $mem" %}
+  ins_encode %{
+#if INCLUDE_ZGC
+    Register d = $dst$$Register;
+    ZBarrierSetAssembler* bs = (ZBarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
+
+    assert(d != r12, "Can't be R12!");
+    assert(d != r15, "Can't be R15!");
+    assert(d != rsp, "Can't be RSP!");
+
+    __ lea(d, $mem$$Address);
+    __ call(RuntimeAddress(bs->load_barrier_slow_stub(d)));
+#else
+    ShouldNotReachHere();
+#endif
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// For XMM and YMM enabled processors
+instruct loadBarrierSlowRegXmmAndYmm(rRegP dst, memory mem, rFlagsReg cr,
+                                     rxmm0 x0, rxmm1 x1, rxmm2 x2,rxmm3 x3,
+                                     rxmm4 x4, rxmm5 x5, rxmm6 x6, rxmm7 x7,
+                                     rxmm8 x8, rxmm9 x9, rxmm10 x10, rxmm11 x11,
+                                     rxmm12 x12, rxmm13 x13, rxmm14 x14, rxmm15 x15) %{
+
+  match(Set dst (LoadBarrierSlowReg mem));
+  predicate((UseSSE > 0) && (UseAVX <= 2) && (MaxVectorSize >= 16));
+
+  effect(DEF dst, KILL cr,
+         KILL x0, KILL x1, KILL x2, KILL x3,
+         KILL x4, KILL x5, KILL x6, KILL x7,
+         KILL x8, KILL x9, KILL x10, KILL x11,
+         KILL x12, KILL x13, KILL x14, KILL x15);
+
+  format %{"LoadBarrierSlowRegXmm $dst, $mem" %}
+  ins_encode %{
+#if INCLUDE_ZGC
+    Register d = $dst$$Register;
+    ZBarrierSetAssembler* bs = (ZBarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
+
+    assert(d != r12, "Can't be R12!");
+    assert(d != r15, "Can't be R15!");
+    assert(d != rsp, "Can't be RSP!");
+
+    __ lea(d, $mem$$Address);
+    __ call(RuntimeAddress(bs->load_barrier_slow_stub(d)));
+#else
+    ShouldNotReachHere();
+#endif
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// For ZMM enabled processors
+instruct loadBarrierSlowRegZmm(rRegP dst, memory mem, rFlagsReg cr,
+                               rxmm0 x0, rxmm1 x1, rxmm2 x2,rxmm3 x3,
+                               rxmm4 x4, rxmm5 x5, rxmm6 x6, rxmm7 x7,
+                               rxmm8 x8, rxmm9 x9, rxmm10 x10, rxmm11 x11,
+                               rxmm12 x12, rxmm13 x13, rxmm14 x14, rxmm15 x15,
+                               rxmm16 x16, rxmm17 x17, rxmm18 x18, rxmm19 x19,
+                               rxmm20 x20, rxmm21 x21, rxmm22 x22, rxmm23 x23,
+                               rxmm24 x24, rxmm25 x25, rxmm26 x26, rxmm27 x27,
+                               rxmm28 x28, rxmm29 x29, rxmm30 x30, rxmm31 x31) %{
+
+  match(Set dst (LoadBarrierSlowReg mem));
+  predicate((UseAVX == 3) && (MaxVectorSize >= 16));
+
+  effect(DEF dst, KILL cr,
+         KILL x0, KILL x1, KILL x2, KILL x3,
+         KILL x4, KILL x5, KILL x6, KILL x7,
+         KILL x8, KILL x9, KILL x10, KILL x11,
+         KILL x12, KILL x13, KILL x14, KILL x15,
+         KILL x16, KILL x17, KILL x18, KILL x19,
+         KILL x20, KILL x21, KILL x22, KILL x23,
+         KILL x24, KILL x25, KILL x26, KILL x27,
+         KILL x28, KILL x29, KILL x30, KILL x31);
+
+  format %{"LoadBarrierSlowRegZmm $dst, $mem" %}
+  ins_encode %{
+#if INCLUDE_ZGC
+    Register d = $dst$$Register;
+    ZBarrierSetAssembler* bs = (ZBarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
+
+    assert(d != r12, "Can't be R12!");
+    assert(d != r15, "Can't be R15!");
+    assert(d != rsp, "Can't be RSP!");
+
+    __ lea(d, $mem$$Address);
+    __ call(RuntimeAddress(bs->load_barrier_slow_stub(d)));
+#else
+    ShouldNotReachHere();
+#endif
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+//
+// Execute ZGC load barrier (weak) slow path
+//
+
+// When running without XMM regs
+instruct loadBarrierWeakSlowRegNoVec(rRegP dst, memory mem, rFlagsReg cr) %{
+
+  match(Set dst (LoadBarrierSlowReg mem));
+  predicate(MaxVectorSize < 16);
+
+  effect(DEF dst, KILL cr);
+
+  format %{"LoadBarrierSlowRegNoVec $dst, $mem" %}
+  ins_encode %{
+#if INCLUDE_ZGC
+    Register d = $dst$$Register;
+    ZBarrierSetAssembler* bs = (ZBarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
+
+    assert(d != r12, "Can't be R12!");
+    assert(d != r15, "Can't be R15!");
+    assert(d != rsp, "Can't be RSP!");
+
+    __ lea(d, $mem$$Address);
+    __ call(RuntimeAddress(bs->load_barrier_weak_slow_stub(d)));
+#else
+    ShouldNotReachHere();
+#endif
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// For XMM and YMM enabled processors
+instruct loadBarrierWeakSlowRegXmmAndYmm(rRegP dst, memory mem, rFlagsReg cr,
+                                         rxmm0 x0, rxmm1 x1, rxmm2 x2,rxmm3 x3,
+                                         rxmm4 x4, rxmm5 x5, rxmm6 x6, rxmm7 x7,
+                                         rxmm8 x8, rxmm9 x9, rxmm10 x10, rxmm11 x11,
+                                         rxmm12 x12, rxmm13 x13, rxmm14 x14, rxmm15 x15) %{
+
+  match(Set dst (LoadBarrierWeakSlowReg mem));
+  predicate((UseSSE > 0) && (UseAVX <= 2) && (MaxVectorSize >= 16));
+
+  effect(DEF dst, KILL cr,
+         KILL x0, KILL x1, KILL x2, KILL x3,
+         KILL x4, KILL x5, KILL x6, KILL x7,
+         KILL x8, KILL x9, KILL x10, KILL x11,
+         KILL x12, KILL x13, KILL x14, KILL x15);
+
+  format %{"LoadBarrierWeakSlowRegXmm $dst, $mem" %}
+  ins_encode %{
+#if INCLUDE_ZGC
+    Register d = $dst$$Register;
+    ZBarrierSetAssembler* bs = (ZBarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
+
+    assert(d != r12, "Can't be R12!");
+    assert(d != r15, "Can't be R15!");
+    assert(d != rsp, "Can't be RSP!");
+
+    __ lea(d,$mem$$Address);
+    __ call(RuntimeAddress(bs->load_barrier_weak_slow_stub(d)));
+#else
+    ShouldNotReachHere();
+#endif
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// For ZMM enabled processors
+instruct loadBarrierWeakSlowRegZmm(rRegP dst, memory mem, rFlagsReg cr,
+                                   rxmm0 x0, rxmm1 x1, rxmm2 x2,rxmm3 x3,
+                                   rxmm4 x4, rxmm5 x5, rxmm6 x6, rxmm7 x7,
+                                   rxmm8 x8, rxmm9 x9, rxmm10 x10, rxmm11 x11,
+                                   rxmm12 x12, rxmm13 x13, rxmm14 x14, rxmm15 x15,
+                                   rxmm16 x16, rxmm17 x17, rxmm18 x18, rxmm19 x19,
+                                   rxmm20 x20, rxmm21 x21, rxmm22 x22, rxmm23 x23,
+                                   rxmm24 x24, rxmm25 x25, rxmm26 x26, rxmm27 x27,
+                                   rxmm28 x28, rxmm29 x29, rxmm30 x30, rxmm31 x31) %{
+
+  match(Set dst (LoadBarrierWeakSlowReg mem));
+  predicate((UseAVX == 3) && (MaxVectorSize >= 16));
+
+  effect(DEF dst, KILL cr,
+         KILL x0, KILL x1, KILL x2, KILL x3,
+         KILL x4, KILL x5, KILL x6, KILL x7,
+         KILL x8, KILL x9, KILL x10, KILL x11,
+         KILL x12, KILL x13, KILL x14, KILL x15,
+         KILL x16, KILL x17, KILL x18, KILL x19,
+         KILL x20, KILL x21, KILL x22, KILL x23,
+         KILL x24, KILL x25, KILL x26, KILL x27,
+         KILL x28, KILL x29, KILL x30, KILL x31);
+
+  format %{"LoadBarrierWeakSlowRegZmm $dst, $mem" %}
+  ins_encode %{
+#if INCLUDE_ZGC
+    Register d = $dst$$Register;
+    ZBarrierSetAssembler* bs = (ZBarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
+
+    assert(d != r12, "Can't be R12!");
+    assert(d != r15, "Can't be R15!");
+    assert(d != rsp, "Can't be RSP!");
+
+    __ lea(d,$mem$$Address);
+    __ call(RuntimeAddress(bs->load_barrier_weak_slow_stub(d)));
+#else
+    ShouldNotReachHere();
+#endif
+  %}
+  ins_pipe(pipe_slow);
+%}
 
 // ============================================================================
 // This name is KNOWN by the ADLC and cannot be changed.
diff --git a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
index 43e03b74224..0d2ef9ff73a 100644
--- a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
+++ b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
@@ -43,7 +43,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/synchronizer.hpp"
diff --git a/src/hotspot/cpu/zero/interp_masm_zero.hpp b/src/hotspot/cpu/zero/interp_masm_zero.hpp
index ccba37b249f..296bdb68a36 100644
--- a/src/hotspot/cpu/zero/interp_masm_zero.hpp
+++ b/src/hotspot/cpu/zero/interp_masm_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,7 +26,8 @@
 #ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
 #define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
 
-#include "assembler_zero.inline.hpp"
+#include "asm/codeBuffer.hpp"
+#include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
 
 // This file specializes the assember with interpreter-specific macros
diff --git a/src/hotspot/cpu/zero/relocInfo_zero.cpp b/src/hotspot/cpu/zero/relocInfo_zero.cpp
index 8482e53d37b..e908f796136 100644
--- a/src/hotspot/cpu/zero/relocInfo_zero.cpp
+++ b/src/hotspot/cpu/zero/relocInfo_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.inline.hpp"
-#include "assembler_zero.inline.hpp"
+#include "asm/codeBuffer.hpp"
 #include "code/relocInfo.hpp"
 #include "nativeInst_zero.hpp"
 #include "oops/oop.inline.hpp"
diff --git a/src/hotspot/cpu/zero/vtableStubs_zero.cpp b/src/hotspot/cpu/zero/vtableStubs_zero.cpp
index 4e52a4ed125..f3c6c1f01bc 100644
--- a/src/hotspot/cpu/zero/vtableStubs_zero.cpp
+++ b/src/hotspot/cpu/zero/vtableStubs_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,18 +24,8 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
-#include "assembler_zero.inline.hpp"
 #include "code/vtableStubs.hpp"
-#include "interp_masm_zero.hpp"
-#include "memory/resourceArea.hpp"
-#include "oops/instanceKlass.hpp"
-#include "oops/klassVtable.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "vmreg_zero.inline.hpp"
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
+#include "utilities/debug.hpp"
 
 VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
   ShouldNotCallThis();
diff --git a/src/hotspot/os/aix/attachListener_aix.cpp b/src/hotspot/os/aix/attachListener_aix.cpp
index b738d328f3e..18c7f574653 100644
--- a/src/hotspot/os/aix/attachListener_aix.cpp
+++ b/src/hotspot/os/aix/attachListener_aix.cpp
@@ -386,11 +386,10 @@ AixAttachOperation* AixAttachListener::dequeue() {
       ::close(s);
       continue;
     }
-    uid_t euid = geteuid();
-    gid_t egid = getegid();
 
-    if (cred_info.euid != euid || cred_info.egid != egid) {
-      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)", cred_info.euid, cred_info.egid, euid, egid);
+    if (!os::Posix::matches_effective_uid_and_gid_or_root(cred_info.euid, cred_info.egid)) {
+      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)",
+              cred_info.euid, cred_info.egid, geteuid(), getegid());
       ::close(s);
       continue;
     }
@@ -548,8 +547,8 @@ bool AttachListener::is_init_trigger() {
   }
   if (ret == 0) {
     // simple check to avoid starting the attach mechanism when
-    // a bogus user creates the file
-    if (st.st_uid == geteuid()) {
+    // a bogus non-root user creates the file
+    if (os::Posix::matches_effective_uid_or_root(st.st_uid)) {
       init();
       log_trace(attach)("Attach triggered by %s", fn);
       return true;
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 08da5392a7d..b5827a05354 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -59,7 +59,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
@@ -899,8 +899,12 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   // guard pages might not fit on the tiny stack created.
   int ret = pthread_attr_setstacksize(&attr, stack_size);
   if (ret != 0) {
-    log_warning(os, thread)("The thread stack size specified is invalid: " SIZE_FORMAT "k",
+    log_warning(os, thread)("The %sthread stack size specified is invalid: " SIZE_FORMAT "k",
+                            (thr_type == compiler_thread) ? "compiler " : ((thr_type == java_thread) ? "" : "VM "),
                             stack_size / K);
+    thread->set_osthread(NULL);
+    delete osthread;
+    return false;
   }
 
   // Save some cycles and a page by disabling OS guard pages where we have our own
diff --git a/src/hotspot/os/bsd/attachListener_bsd.cpp b/src/hotspot/os/bsd/attachListener_bsd.cpp
index 12c097631ee..503a4d72a30 100644
--- a/src/hotspot/os/bsd/attachListener_bsd.cpp
+++ b/src/hotspot/os/bsd/attachListener_bsd.cpp
@@ -357,11 +357,10 @@ BsdAttachOperation* BsdAttachListener::dequeue() {
       ::close(s);
       continue;
     }
-    uid_t euid = geteuid();
-    gid_t egid = getegid();
 
-    if (puid != euid || pgid != egid) {
-      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)", puid, pgid, euid, egid);
+    if (!os::Posix::matches_effective_uid_and_gid_or_root(puid, pgid)) {
+      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)", puid, pgid,
+              geteuid(), getegid());
       ::close(s);
       continue;
     }
@@ -513,8 +512,8 @@ bool AttachListener::is_init_trigger() {
   }
   if (ret == 0) {
     // simple check to avoid starting the attach mechanism when
-    // a bogus user creates the file
-    if (st.st_uid == geteuid()) {
+    // a bogus non-root user creates the file
+    if (os::Posix::matches_effective_uid_or_root(st.st_uid)) {
       init();
       log_trace(attach)("Attach triggered by %s", fn);
       return true;
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index f33ed42d75e..ba11ba4a48c 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -49,7 +49,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/semaphore.hpp"
diff --git a/src/hotspot/os/linux/attachListener_linux.cpp b/src/hotspot/os/linux/attachListener_linux.cpp
index 93ae6ab58ea..d79bd1bac85 100644
--- a/src/hotspot/os/linux/attachListener_linux.cpp
+++ b/src/hotspot/os/linux/attachListener_linux.cpp
@@ -357,11 +357,10 @@ LinuxAttachOperation* LinuxAttachListener::dequeue() {
       ::close(s);
       continue;
     }
-    uid_t euid = geteuid();
-    gid_t egid = getegid();
 
-    if (cred_info.uid != euid || cred_info.gid != egid) {
-      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)", cred_info.uid, cred_info.gid, euid, egid);
+    if (!os::Posix::matches_effective_uid_and_gid_or_root(cred_info.uid, cred_info.gid)) {
+      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)",
+              cred_info.uid, cred_info.gid, geteuid(), getegid());
       ::close(s);
       continue;
     }
@@ -518,8 +517,8 @@ bool AttachListener::is_init_trigger() {
   }
   if (ret == 0) {
     // simple check to avoid starting the attach mechanism when
-    // a bogus user creates the file
-    if (st.st_uid == geteuid()) {
+    // a bogus non-root user creates the file
+    if (os::Posix::matches_effective_uid_or_root(st.st_uid)) {
       init();
       log_trace(attach)("Attach triggered by %s", fn);
       return true;
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index ab19d1da824..b3d07ade19f 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -51,7 +51,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -1988,6 +1988,8 @@ void os::print_os_info(outputStream* st) {
 
   os::Linux::print_full_memory_info(st);
 
+  os::Linux::print_proc_sys_info(st);
+
   os::Linux::print_container_info(st);
 }
 
@@ -2120,6 +2122,24 @@ void os::Linux::print_libversion_info(outputStream* st) {
   st->cr();
 }
 
+void os::Linux::print_proc_sys_info(outputStream* st) {
+  st->cr();
+  st->print_cr("/proc/sys/kernel/threads-max (system-wide limit on the number of threads):");
+  _print_ascii_file("/proc/sys/kernel/threads-max", st);
+  st->cr();
+  st->cr();
+
+  st->print_cr("/proc/sys/vm/max_map_count (maximum number of memory map areas a process may have):");
+  _print_ascii_file("/proc/sys/vm/max_map_count", st);
+  st->cr();
+  st->cr();
+
+  st->print_cr("/proc/sys/kernel/pid_max (system-wide limit on number of process identifiers):");
+  _print_ascii_file("/proc/sys/kernel/pid_max", st);
+  st->cr();
+  st->cr();
+}
+
 void os::Linux::print_full_memory_info(outputStream* st) {
   st->print("\n/proc/meminfo:\n");
   _print_ascii_file("/proc/meminfo", st);
@@ -3106,7 +3126,10 @@ static address get_stack_commited_bottom(address bottom, size_t size) {
 bool os::committed_in_range(address start, size_t size, address& committed_start, size_t& committed_size) {
   int mincore_return_value;
   const size_t stripe = 1024;  // query this many pages each time
-  unsigned char vec[stripe];
+  unsigned char vec[stripe + 1];
+  // set a guard
+  vec[stripe] = 'X';
+
   const size_t page_sz = os::vm_page_size();
   size_t pages = size / page_sz;
 
@@ -3118,7 +3141,9 @@ bool os::committed_in_range(address start, size_t size, address& committed_start
   int loops = (pages + stripe - 1) / stripe;
   int committed_pages = 0;
   address loop_base = start;
-  for (int index = 0; index < loops; index ++) {
+  bool found_range = false;
+
+  for (int index = 0; index < loops && !found_range; index ++) {
     assert(pages > 0, "Nothing to do");
     int pages_to_query = (pages >= stripe) ? stripe : pages;
     pages -= pages_to_query;
@@ -3133,12 +3158,14 @@ bool os::committed_in_range(address start, size_t size, address& committed_start
       return false;
     }
 
+    assert(vec[stripe] == 'X', "overflow guard");
     assert(mincore_return_value == 0, "Range must be valid");
     // Process this stripe
     for (int vecIdx = 0; vecIdx < pages_to_query; vecIdx ++) {
       if ((vec[vecIdx] & 0x01) == 0) { // not committed
         // End of current contiguous region
         if (committed_start != NULL) {
+          found_range = true;
           break;
         }
       } else { // committed
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index b97f66627ca..14c3484d29a 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -113,6 +113,7 @@ class Linux {
   static void print_container_info(outputStream* st);
   static void print_distro_info(outputStream* st);
   static void print_libversion_info(outputStream* st);
+  static void print_proc_sys_info(outputStream* st);
 
  public:
   static bool _stack_is_executable;
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 623a0e39404..074499a16d3 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -51,6 +51,8 @@
 #endif
 #define IS_VALID_PID(p) (p > 0 && p < MAX_PID)
 
+#define ROOT_UID 0
+
 #ifndef MAP_ANONYMOUS
   #define MAP_ANONYMOUS MAP_ANON
 #endif
@@ -1454,6 +1456,18 @@ size_t os::Posix::get_initial_stack_size(ThreadType thr_type, size_t req_stack_s
   return stack_size;
 }
 
+bool os::Posix::is_root(uid_t uid){
+    return ROOT_UID == uid;
+}
+
+bool os::Posix::matches_effective_uid_or_root(uid_t uid) {
+    return is_root(uid) || geteuid() == uid;
+}
+
+bool os::Posix::matches_effective_uid_and_gid_or_root(uid_t uid, gid_t gid) {
+    return is_root(uid) || (geteuid() == uid && getegid() == gid);
+}
+
 Thread* os::ThreadCrashProtection::_protected_thread = NULL;
 os::ThreadCrashProtection* os::ThreadCrashProtection::_crash_protection = NULL;
 volatile intptr_t os::ThreadCrashProtection::_crash_mux = 0;
diff --git a/src/hotspot/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp
index 7ce25c2a616..ef6f4b6b1bd 100644
--- a/src/hotspot/os/posix/os_posix.hpp
+++ b/src/hotspot/os/posix/os_posix.hpp
@@ -106,6 +106,16 @@ public:
   // On error, it will return NULL and set errno. The content of 'outbuf' is undefined.
   // On truncation error ('outbuf' too small), it will return NULL and set errno to ENAMETOOLONG.
   static char* realpath(const char* filename, char* outbuf, size_t outbuflen);
+
+  // Returns true if given uid is root.
+  static bool is_root(uid_t uid);
+
+  // Returns true if given uid is effective or root uid.
+  static bool matches_effective_uid_or_root(uid_t uid);
+
+  // Returns true if either given uid is effective uid and given gid is
+  // effective gid, or if given uid is root.
+  static bool matches_effective_uid_and_gid_or_root(uid_t uid, gid_t gid);
 };
 
 // On POSIX platforms the signal handler is global so we just do the write.
diff --git a/src/hotspot/os/solaris/attachListener_solaris.cpp b/src/hotspot/os/solaris/attachListener_solaris.cpp
index 521d5e7c686..3f1a68a7122 100644
--- a/src/hotspot/os/solaris/attachListener_solaris.cpp
+++ b/src/hotspot/os/solaris/attachListener_solaris.cpp
@@ -213,16 +213,12 @@ static int check_credentials() {
     return -1; // unable to get them, deny
   }
 
-  // get our euid/eguid (probably could cache these)
-  uid_t euid = geteuid();
-  gid_t egid = getegid();
-
   // get euid/egid from ucred_free
   uid_t ucred_euid = ucred_geteuid(cred_info);
   gid_t ucred_egid = ucred_getegid(cred_info);
 
   // check that the effective uid/gid matches
-  if (ucred_euid == euid && ucred_egid == egid) {
+  if (os::Posix::matches_effective_uid_and_gid_or_root(ucred_euid, ucred_egid)) {
     ret =  0;  // allow
   }
 
@@ -664,8 +660,8 @@ bool AttachListener::is_init_trigger() {
   }
   if (ret == 0) {
     // simple check to avoid starting the attach mechanism when
-    // a bogus user creates the file
-    if (st.st_uid == geteuid()) {
+    // a bogus non-root user creates the file
+    if (os::Posix::matches_effective_uid_or_root(st.st_uid)) {
       init();
       log_trace(attach)("Attach triggered by %s", fn);
       return true;
diff --git a/src/hotspot/os/solaris/os_solaris.cpp b/src/hotspot/os/solaris/os_solaris.cpp
index 01a3c292d1b..d8c56353760 100644
--- a/src/hotspot/os/solaris/os_solaris.cpp
+++ b/src/hotspot/os/solaris/os_solaris.cpp
@@ -49,7 +49,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/sharedRuntime.hpp"
diff --git a/src/hotspot/os/windows/os_perf_windows.cpp b/src/hotspot/os/windows/os_perf_windows.cpp
index 88d3f314f22..03df2941abc 100644
--- a/src/hotspot/os/windows/os_perf_windows.cpp
+++ b/src/hotspot/os/windows/os_perf_windows.cpp
@@ -118,6 +118,11 @@ typedef struct {
   bool               initialized;
 } MultiCounterQuerySetS, *MultiCounterQuerySetP;
 
+typedef struct {
+  MultiCounterQuerySetS set;
+  int                   process_index;
+} ProcessQueryS, *ProcessQueryP;
+
 static void pdh_cleanup(HQUERY* const query, HCOUNTER* const counter) {
   if (counter != NULL && *counter != NULL) {
     PdhDll::PdhRemoveCounter(*counter);
@@ -158,7 +163,7 @@ static void destroy_counter_query(MultiCounterQueryP counter_query) {
   }
 }
 
-static void destroy_counter_query(MultiCounterQuerySetP counter_query_set) {
+static void destroy_multi_counter_query(MultiCounterQuerySetP counter_query_set) {
   for (int i = 0; i < counter_query_set->size; i++) {
     for (int j = 0; j < counter_query_set->queries[i].noOfCounters; ++j) {
       pdh_cleanup(NULL, &counter_query_set->queries[i].counters[j]);
@@ -167,9 +172,18 @@ static void destroy_counter_query(MultiCounterQuerySetP counter_query_set) {
     pdh_cleanup(&counter_query_set->queries[i].query.query, NULL);
   }
   FREE_C_HEAP_ARRAY(MultiCounterQueryS, counter_query_set->queries);
+}
+
+static void destroy_counter_query(MultiCounterQuerySetP counter_query_set) {
+  destroy_multi_counter_query(counter_query_set);
   FREE_C_HEAP_ARRAY(MultiCounterQuerySetS, counter_query_set);
 }
 
+static void destroy_counter_query(ProcessQueryP process_query) {
+  destroy_multi_counter_query(&process_query->set);
+  FREE_C_HEAP_ARRAY(ProcessQueryS, process_query);
+}
+
 static int open_query(HQUERY* query) {
   return PdhDll::PdhOpenQuery(NULL, 0, query);
 }
@@ -204,6 +218,11 @@ static int allocate_counters(MultiCounterQuerySetP query_set, size_t nofCounters
   return OS_OK;
 }
 
+static int allocate_counters(ProcessQueryP process_query, size_t nofCounters) {
+  assert(process_query != NULL, "invariant");
+  return allocate_counters(&process_query->set, nofCounters);
+}
+
 static void deallocate_counters(MultiCounterQueryP query) {
   if (query->counters != NULL) {
     FREE_C_HEAP_ARRAY(char, query->counters);
@@ -261,7 +280,6 @@ static OSReturn add_counter(CounterQueryP counter_query, const char* path, bool
 }
 
 static OSReturn add_process_counter(MultiCounterQueryP query, int slot_index, const char* path, bool first_sample_on_init) {
-  assert(query != NULL, "invariant");
   assert(query != NULL, "invariant");
   assert(slot_index < query->noOfCounters, "invariant");
   assert(query->counters[slot_index] == NULL, "invariant");
@@ -326,13 +344,15 @@ static int formatted_counter_value(HCOUNTER counter, DWORD format, PDH_FMT_COUNT
 * (in order to keep this index valid when the list resets from underneath,
 * ensure to call current_query_index_for_process() before every query involving
 * Process object instance data).
+*
+* if unable to query, returns OS_ERR(-1)
 */
 static int current_query_index_for_process() {
   assert(process_image_name != NULL, "invariant");
   assert(pdh_IDProcess_counter_fmt != NULL, "invariant");
   HQUERY tmpQuery = NULL;
   if (open_query(&tmpQuery) != ERROR_SUCCESS) {
-    return 0;
+    return OS_ERR;
   }
   char counter[512];
   HCOUNTER handle_counter = NULL;
@@ -342,12 +362,12 @@ static int current_query_index_for_process() {
     assert(strlen(counter) < sizeof(counter), "invariant");
     if (PdhDll::PdhAddCounter(tmpQuery, counter, 0, &handle_counter) != ERROR_SUCCESS) {
       pdh_cleanup(&tmpQuery, &handle_counter);
-      return 0;
+      return OS_ERR;
     }
     const PDH_STATUS res = PdhDll::PdhCollectQueryData(tmpQuery);
     if (res == PDH_INVALID_HANDLE || res == PDH_NO_DATA) {
       pdh_cleanup(&tmpQuery, &handle_counter);
-      return 0;
+      return OS_ERR;
     } else {
       PDH_FMT_COUNTERVALUE counter_value;
       formatted_counter_value(handle_counter, PDH_FMT_LONG, &counter_value);
@@ -359,24 +379,28 @@ static int current_query_index_for_process() {
     }
   }
   pdh_cleanup(&tmpQuery, NULL);
-  return 0;
+  return OS_ERR;
 }
 
-static MultiCounterQuerySetP create_process_counter_query() {
-  MultiCounterQuerySetP const query = NEW_C_HEAP_ARRAY(MultiCounterQuerySetS, 1, mtInternal);
-  memset(query, 0, sizeof(MultiCounterQuerySetS));
+static ProcessQueryP create_process_query() {
   const int current_process_idx = current_query_index_for_process();
-  query->queries = NEW_C_HEAP_ARRAY(MultiCounterQueryS, current_process_idx + 1, mtInternal);
-  memset(query->queries, 0, sizeof(MultiCounterQueryS) * (current_process_idx + 1));
-  query->size = current_process_idx + 1;
-  return query;
+  if (OS_ERR == current_process_idx) {
+    return NULL;
+  }
+  ProcessQueryP const process_query = NEW_C_HEAP_ARRAY(ProcessQueryS, 1, mtInternal);
+  memset(process_query, 0, sizeof(ProcessQueryS));
+  process_query->set.queries = NEW_C_HEAP_ARRAY(MultiCounterQueryS, current_process_idx + 1, mtInternal);
+  memset(process_query->set.queries, 0, sizeof(MultiCounterQueryS) * (current_process_idx + 1));
+  process_query->process_index = current_process_idx;
+  process_query->set.size = current_process_idx + 1;
+  assert(process_query->set.size > process_query->process_index, "invariant");
+  return process_query;
 }
 
-static MultiCounterQueryP current_process_counter_query(MultiCounterQuerySetP process_query_set) {
-  assert(process_query_set != NULL, "invariant");
-  const int current_query_index = current_query_index_for_process();
-  assert(current_query_index < process_query_set->size, "invariant");
-  return &process_query_set->queries[current_query_index];
+static MultiCounterQueryP current_process_counter_query(ProcessQueryP process_query) {
+  assert(process_query != NULL, "invariant");
+  assert(process_query->process_index < process_query->set.size, "invariant");
+  return &process_query->set.queries[process_query->process_index];
 }
 
 static void clear_multi_counter(MultiCounterQueryP query) {
@@ -384,19 +408,46 @@ static void clear_multi_counter(MultiCounterQueryP query) {
     pdh_cleanup(NULL, &query->counters[i]);
   }
   pdh_cleanup(&query->query.query, NULL);
+  query->initialized = false;
 }
 
-static int collect_process_query_data(MultiCounterQuerySetP counter_query_set) {
-  const int current_process_idx = current_query_index_for_process();
-  while (current_process_idx < counter_query_set->size - 1) {
-    const int new_size = --counter_query_set->size;
-    clear_multi_counter(&counter_query_set->queries[new_size]);
+static int ensure_valid_process_query_index(ProcessQueryP process_query) {
+  assert(process_query != NULL, "invariant");
+  const int previous_process_idx = process_query->process_index;
+  if (previous_process_idx == 0) {
+    return previous_process_idx;
   }
-  return collect_query_data(&counter_query_set->queries[current_process_idx]);
+  const int current_process_idx = current_query_index_for_process();
+  if (current_process_idx == previous_process_idx || OS_ERR == current_process_idx ||
+    current_process_idx >= process_query->set.size) {
+    return previous_process_idx;
+  }
+
+  assert(current_process_idx >= 0 && current_process_idx < process_query->set.size, "out of bounds!");
+  while (current_process_idx < process_query->set.size - 1) {
+    const int new_size = --process_query->set.size;
+    clear_multi_counter(&process_query->set.queries[new_size]);
+  }
+  assert(current_process_idx < process_query->set.size, "invariant");
+  process_query->process_index = current_process_idx;
+  return current_process_idx;
 }
 
-static int query_process_counter(MultiCounterQuerySetP process_query_set, int slot_index, DWORD format, PDH_FMT_COUNTERVALUE* const value) {
-  MultiCounterQueryP const current_query = current_process_counter_query(process_query_set);
+static MultiCounterQueryP current_process_query(ProcessQueryP process_query) {
+  assert(process_query != NULL, "invariant");
+  const int current_process_idx = ensure_valid_process_query_index(process_query);
+  assert(current_process_idx == process_query->process_index, "invariant");
+  assert(current_process_idx < process_query->set.size, "invariant");
+  return &process_query->set.queries[current_process_idx];
+}
+
+static int collect_process_query_data(ProcessQueryP process_query) {
+  assert(process_query != NULL, "invariant");
+  return collect_query_data(current_process_query(process_query));
+}
+
+static int query_process_counter(ProcessQueryP process_query, int slot_index, DWORD format, PDH_FMT_COUNTERVALUE* const value) {
+  MultiCounterQueryP const current_query = current_process_counter_query(process_query);
   assert(current_query != NULL, "invariant");
   assert(slot_index < current_query->noOfCounters, "invariant");
   assert(current_query->counters[slot_index] != NULL, "invariant");
@@ -810,7 +861,7 @@ static int initialize_cpu_query(MultiCounterQueryP cpu_query, DWORD pdh_counter_
   return initialize_cpu_query_counters(cpu_query, pdh_counter_idx);
 }
 
-static int initialize_process_counter(MultiCounterQuerySetP query_set, int slot_index, DWORD pdh_counter_index) {
+static int initialize_process_counter(ProcessQueryP process_query, int slot_index, DWORD pdh_counter_index) {
   char* localized_process_object;
   if (lookup_name_by_index(PDH_PROCESS_IDX, &localized_process_object) != OS_OK) {
     return OS_ERR;
@@ -821,7 +872,7 @@ static int initialize_process_counter(MultiCounterQuerySetP query_set, int slot_
     return OS_ERR;
   }
   assert(localized_counter_name != NULL, "invariant");
-  for (int i = 0; i < query_set->size; ++i) {
+  for (int i = 0; i < process_query->set.size; ++i) {
     char instanceIndexBuffer[32];
     const char* counter_path = make_fully_qualified_counter_path(localized_process_object,
                                                                  localized_counter_name,
@@ -830,7 +881,7 @@ static int initialize_process_counter(MultiCounterQuerySetP query_set, int slot_
     if (counter_path == NULL) {
       return OS_ERR;
     }
-    MultiCounterQueryP const query = &query_set->queries[i];
+    MultiCounterQueryP const query = &process_query->set.queries[i];
     if (add_process_counter(query, slot_index, counter_path, true)) {
       return OS_ERR;
     }
@@ -839,8 +890,9 @@ static int initialize_process_counter(MultiCounterQuerySetP query_set, int slot_
 }
 
 static CounterQueryP create_counter_query(DWORD pdh_object_idx, DWORD pdh_counter_idx) {
-  assert(is_valid_pdh_index(pdh_object_idx), "invariant");
-  assert(is_valid_pdh_index(pdh_counter_idx), "invariant");
+  if (!((is_valid_pdh_index(pdh_object_idx) && is_valid_pdh_index(pdh_counter_idx)))) {
+    return NULL;
+  }
   CounterQueryP const query = create_counter_query();
   const char* object = pdh_localized_artifact(pdh_object_idx);
   assert(object != NULL, "invariant");
@@ -917,7 +969,7 @@ class CPUPerformanceInterface::CPUPerformance : public CHeapObj<mtInternal> {
   friend class CPUPerformanceInterface;
  private:
   CounterQueryP _context_switches;
-  MultiCounterQuerySetP _process_cpu_load;
+  ProcessQueryP _process_cpu_load;
   MultiCounterQueryP _machine_cpu_load;
 
   int cpu_load(int which_logical_cpu, double* cpu_load);
@@ -963,34 +1015,28 @@ CPUPerformanceInterface::CPUPerformance::CPUPerformance() : _context_switches(NU
 
 bool CPUPerformanceInterface::CPUPerformance::initialize() {
   if (!pdh_acquire()) {
-    return false;
+    return true;
   }
   _context_switches = create_counter_query(PDH_SYSTEM_IDX, PDH_CONTEXT_SWITCH_RATE_IDX);
-  if (_context_switches == NULL) {
-    return false;
-  }
-  _process_cpu_load = create_process_counter_query();
+  _process_cpu_load = create_process_query();
   if (_process_cpu_load == NULL) {
-    return false;
+    return true;
   }
   if (allocate_counters(_process_cpu_load, 2) != OS_OK) {
-    return false;
+    return true;
   }
   if (initialize_process_counter(_process_cpu_load, 0, PDH_PROCESSOR_TIME_IDX) != OS_OK) {
-    return false;
+    return true;
   }
   if (initialize_process_counter(_process_cpu_load, 1, PDH_PRIV_PROCESSOR_TIME_IDX) != OS_OK) {
-    return false;
+    return true;
   }
-  _process_cpu_load->initialized = true;
-
+  _process_cpu_load->set.initialized = true;
   _machine_cpu_load = create_multi_counter_query();
   if (_machine_cpu_load == NULL) {
-    return false;
-  }
-  if (initialize_cpu_query(_machine_cpu_load, PDH_PROCESSOR_TIME_IDX) != OS_OK) {
-    return false;
+    return true;
   }
+  initialize_cpu_query(_machine_cpu_load, PDH_PROCESSOR_TIME_IDX);
   return true;
 }
 
@@ -1044,12 +1090,13 @@ int CPUPerformanceInterface::cpu_loads_process(double* pjvmUserLoad,
 }
 
 int CPUPerformanceInterface::CPUPerformance::cpu_load(int which_logical_cpu, double* cpu_load) {
-  assert(_machine_cpu_load != NULL, "invariant");
-  assert(which_logical_cpu < _machine_cpu_load->noOfCounters, "invariant");
   *cpu_load = .0;
-  if (!_machine_cpu_load->initialized) {
+  if (_machine_cpu_load == NULL || !_machine_cpu_load->initialized) {
     return OS_ERR;
   }
+  assert(_machine_cpu_load != NULL, "invariant");
+  assert(which_logical_cpu < _machine_cpu_load->noOfCounters, "invariant");
+
   if (collect_query_data(_machine_cpu_load)) {
     return OS_ERR;
   }
@@ -1062,11 +1109,11 @@ int CPUPerformanceInterface::CPUPerformance::cpu_load(int which_logical_cpu, dou
 }
 
 int CPUPerformanceInterface::CPUPerformance::cpu_load_total_process(double* cpu_load) {
-  assert(_process_cpu_load != NULL, "invariant");
   *cpu_load = .0;
-  if (!_process_cpu_load->initialized) {
+  if (_process_cpu_load == NULL || !_process_cpu_load->set.initialized) {
     return OS_ERR;
   }
+  assert(_process_cpu_load != NULL, "invariant");
   if (collect_process_query_data(_process_cpu_load)) {
     return OS_ERR;
   }
@@ -1090,9 +1137,11 @@ int CPUPerformanceInterface::CPUPerformance::cpu_loads_process(double* pjvmUserL
   *pjvmUserLoad = .0;
   *pjvmKernelLoad = .0;
   *psystemTotalLoad = .0;
-  if (!_process_cpu_load->initialized) {
+
+  if (_process_cpu_load == NULL || !_process_cpu_load->set.initialized) {
     return OS_ERR;
   }
+  assert(_process_cpu_load != NULL, "invariant");
   if (collect_process_query_data(_process_cpu_load)) {
     return OS_ERR;
   }
@@ -1138,9 +1187,10 @@ int CPUPerformanceInterface::CPUPerformance::cpu_loads_process(double* pjvmUserL
 int CPUPerformanceInterface::CPUPerformance::context_switch_rate(double* rate) {
   assert(rate != NULL, "invariant");
   *rate = .0;
-  if (!_context_switches->initialized) {
+  if (_context_switches == NULL || !_context_switches->initialized) {
     return OS_ERR;
   }
+  assert(_context_switches != NULL, "invariant");
   if (collect_query_data(_context_switches) != OS_OK) {
     return OS_ERR;
   }
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 81adb9e32e4..00fc92384ac 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -52,7 +52,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/sharedRuntime.hpp"
diff --git a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
similarity index 94%
rename from src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp
rename to src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
index 070c2169461..81427eb8ca5 100644
--- a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_INLINE_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_INLINE_HPP
+#ifndef OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
+#define OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
 
-#include "runtime/orderAccess.hpp"
+// Included in orderAccess.hpp header file.
 
 // Compiler version last used for testing: xlc 12
 // Please update this information when this file changes
@@ -90,4 +90,4 @@ struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
 #undef inlasm_eieio
 #undef inlasm_isync
 
-#endif // OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_INLINE_HPP
+#endif // OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
similarity index 86%
rename from src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp
rename to src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
index 0e13f1c75c3..7a59abe3a80 100644
--- a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
@@ -22,12 +22,10 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
 
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
+// Included in orderAccess.hpp header file.
 
 // Compiler version last used for testing: clang 5.1
 // Please update this information when this file changes
@@ -52,14 +50,12 @@ inline void OrderAccess::acquire()    { compiler_barrier(); }
 inline void OrderAccess::release()    { compiler_barrier(); }
 
 inline void OrderAccess::fence() {
-  if (os::is_MP()) {
-    // always use locked addl since mfence is sometimes expensive
+  // always use locked addl since mfence is sometimes expensive
 #ifdef AMD64
-    __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
+  __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
 #else
-    __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
+  __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
 #endif
-  }
   compiler_barrier();
 }
 
@@ -113,4 +109,4 @@ struct OrderAccess::PlatformOrderedStore<8, RELEASE_X_FENCE>
 };
 #endif // AMD64
 
-#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
similarity index 89%
rename from src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp
rename to src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
index 96ea19a4a70..532b48be46d 100644
--- a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP
-#define OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP
+#ifndef OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
 
-#include "runtime/orderAccess.hpp"
+// Included in orderAccess.hpp header file.
 
 #ifdef ARM
 
@@ -74,4 +74,4 @@ inline void OrderAccess::acquire()    { LIGHT_MEM_BARRIER; }
 inline void OrderAccess::release()    { LIGHT_MEM_BARRIER; }
 inline void OrderAccess::fence()      { FULL_MEM_BARRIER;  }
 
-#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP
+#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
similarity index 88%
rename from src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp
rename to src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
index ac065069ebe..b733db19577 100644
--- a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
@@ -23,12 +23,11 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
+
+// Included in orderAccess.hpp header file.
 
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
 #include "vm_version_aarch64.hpp"
 
 // Implementation of class OrderAccess.
@@ -71,4 +70,4 @@ struct OrderAccess::PlatformOrderedStore<byte_size, RELEASE_X_FENCE>
   void operator()(T v, volatile T* p) const { release_store(p, v); fence(); }
 };
 
-#endif // OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
similarity index 95%
rename from src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
rename to src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
index 3784b640c2a..9e6bda2654f 100644
--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
@@ -22,16 +22,17 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
+
+// Included in orderAccess.hpp header file.
 
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "vm_version_arm.hpp"
 
 // Implementation of class OrderAccess.
 // - we define the high level barriers below and use the general
-//   implementation in orderAccess.inline.hpp, with customizations
+//   implementation in orderAccess.hpp, with customizations
 //   on AARCH64 via the specialized_* template functions
 
 // Memory Ordering on ARM is weak.
@@ -53,7 +54,7 @@
 //      __asm__ volatile (
 //        "mcr p15, 0, %0, c7, c10, 4"
 //        : : "r" (dummy) : "memory");
-//   }
+//    }
 // }
 
 inline static void dmb_sy() {
@@ -244,4 +245,4 @@ struct OrderAccess::PlatformOrderedStore<8, RELEASE_X_FENCE>
 
 #endif // AARCH64
 
-#endif // OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
similarity index 94%
rename from src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp
rename to src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
index 12139ce2f7b..92ce8261fd2 100644
--- a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_INLINE_HPP
-#define OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_INLINE_HPP
+#ifndef OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
 
-#include "runtime/orderAccess.hpp"
+// Included in orderAccess.hpp header file.
 
 #ifndef PPC64
 #error "OrderAccess currently only implemented for PPC64"
@@ -94,4 +94,4 @@ struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
 #undef inlasm_isync
 #undef inlasm_acquire_reg
 
-#endif // OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_INLINE_HPP
+#endif // OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
similarity index 93%
rename from src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp
rename to src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
index 067878501f6..daa13cec655 100644
--- a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp
+++ b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
@@ -23,10 +23,11 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
+
+// Included in orderAccess.hpp header file.
 
-#include "runtime/orderAccess.hpp"
 #include "vm_version_s390.hpp"
 
 // Implementation of class OrderAccess.
@@ -87,4 +88,4 @@ struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
 #undef inlasm_zarch_acquire
 #undef inlasm_zarch_fence
 
-#endif // OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
similarity index 85%
rename from src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp
rename to src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
index c9fde925f7e..5ac28841849 100644
--- a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP
-#define OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP
+#ifndef OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
 
-#include "runtime/orderAccess.hpp"
+// Included in orderAccess.hpp header file.
 
 // Implementation of class OrderAccess.
 
@@ -48,4 +48,4 @@ inline void OrderAccess::fence() {
   __asm__ volatile ("membar  #StoreLoad" : : : "memory");
 }
 
-#endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP
+#endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
new file mode 100644
index 00000000000..3dfea712969
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+#ifndef OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
+
+inline uintptr_t ZAddress::address(uintptr_t value) {
+  return value;
+}
+
+#endif // OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.cpp
new file mode 100644
index 00000000000..90c8f425a10
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.cpp
@@ -0,0 +1,360 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zArray.inline.hpp"
+#include "gc/z/zBackingFile_linux_x86.hpp"
+#include "gc/z/zBackingPath_linux_x86.hpp"
+#include "gc/z/zErrno.hpp"
+#include "gc/z/zLargePages.inline.hpp"
+#include "logging/log.hpp"
+#include "runtime/init.hpp"
+#include "runtime/os.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+// Filesystem names
+#define ZFILESYSTEM_TMPFS                "tmpfs"
+#define ZFILESYSTEM_HUGETLBFS            "hugetlbfs"
+
+// Sysfs file for transparent huge page on tmpfs
+#define ZFILENAME_SHMEM_ENABLED          "/sys/kernel/mm/transparent_hugepage/shmem_enabled"
+
+// Default mount points
+#define ZMOUNTPOINT_TMPFS                "/dev/shm"
+#define ZMOUNTPOINT_HUGETLBFS            "/hugepages"
+
+// Java heap filename
+#define ZFILENAME_HEAP                   "java_heap"
+
+// Support for building on older Linux systems
+#ifndef __NR_memfd_create
+#define __NR_memfd_create                319
+#endif
+#ifndef MFD_CLOEXEC
+#define MFD_CLOEXEC                      0x0001U
+#endif
+#ifndef MFD_HUGETLB
+#define MFD_HUGETLB                      0x0004U
+#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC                        02000000
+#endif
+#ifndef O_TMPFILE
+#define O_TMPFILE                        (020000000 | O_DIRECTORY)
+#endif
+
+// Filesystem types, see statfs(2)
+#ifndef TMPFS_MAGIC
+#define TMPFS_MAGIC                      0x01021994
+#endif
+#ifndef HUGETLBFS_MAGIC
+#define HUGETLBFS_MAGIC                  0x958458f6
+#endif
+
+static int z_memfd_create(const char *name, unsigned int flags) {
+  return syscall(__NR_memfd_create, name, flags);
+}
+
+ZBackingFile::ZBackingFile() :
+    _fd(-1),
+    _filesystem(0),
+    _initialized(false) {
+
+  // Create backing file
+  _fd = create_fd(ZFILENAME_HEAP);
+  if (_fd == -1) {
+    return;
+  }
+
+  // Get filesystem type
+  struct statfs statfs_buf;
+  if (fstatfs(_fd, &statfs_buf) == -1) {
+    ZErrno err;
+    log_error(gc, init)("Failed to determine filesystem type for backing file (%s)", err.to_string());
+    return;
+  }
+  _filesystem = statfs_buf.f_type;
+
+  // Make sure we're on a supported filesystem
+  if (!is_tmpfs() && !is_hugetlbfs()) {
+    log_error(gc, init)("Backing file must be located on a %s or a %s filesystem", ZFILESYSTEM_TMPFS, ZFILESYSTEM_HUGETLBFS);
+    return;
+  }
+
+  // Make sure the filesystem type matches requested large page type
+  if (ZLargePages::is_transparent() && !is_tmpfs()) {
+    log_error(gc, init)("-XX:+UseTransparentHugePages can only be enable when using a %s filesystem", ZFILESYSTEM_TMPFS);
+    return;
+  }
+
+  if (ZLargePages::is_transparent() && !tmpfs_supports_transparent_huge_pages()) {
+    log_error(gc, init)("-XX:+UseTransparentHugePages on a %s filesystem not supported by kernel", ZFILESYSTEM_TMPFS);
+    return;
+  }
+
+  if (ZLargePages::is_explicit() && !is_hugetlbfs()) {
+    log_error(gc, init)("-XX:+UseLargePages (without -XX:+UseTransparentHugePages) can only be enabled when using a %s filesystem", ZFILESYSTEM_HUGETLBFS);
+    return;
+  }
+
+  if (!ZLargePages::is_explicit() && is_hugetlbfs()) {
+    log_error(gc, init)("-XX:+UseLargePages must be enabled when using a %s filesystem", ZFILESYSTEM_HUGETLBFS);
+    return;
+  }
+
+  // Successfully initialized
+  _initialized = true;
+}
+
+int ZBackingFile::create_mem_fd(const char* name) const {
+  // Create file name
+  char filename[PATH_MAX];
+  snprintf(filename, sizeof(filename), "%s%s", name, ZLargePages::is_explicit() ? ".hugetlb" : "");
+
+  // Create file
+  const int extra_flags = ZLargePages::is_explicit() ? MFD_HUGETLB : 0;
+  const int fd = z_memfd_create(filename, MFD_CLOEXEC | extra_flags);
+  if (fd == -1) {
+    ZErrno err;
+    log_debug(gc, init)("Failed to create memfd file (%s)",
+                        ((UseLargePages && err == EINVAL) ? "Hugepages not supported" : err.to_string()));
+    return -1;
+  }
+
+  log_debug(gc, init)("Heap backed by file /memfd:%s", filename);
+
+  return fd;
+}
+
+int ZBackingFile::create_file_fd(const char* name) const {
+  const char* const filesystem = ZLargePages::is_explicit() ? ZFILESYSTEM_HUGETLBFS : ZFILESYSTEM_TMPFS;
+  const char* const mountpoint = ZLargePages::is_explicit() ? ZMOUNTPOINT_HUGETLBFS : ZMOUNTPOINT_TMPFS;
+
+  // Find mountpoint
+  ZBackingPath path(filesystem, mountpoint);
+  if (path.get() == NULL) {
+    log_error(gc, init)("Use -XX:ZPath to specify the path to a %s filesystem", filesystem);
+    return -1;
+  }
+
+  // Try to create an anonymous file using the O_TMPFILE flag. Note that this
+  // flag requires kernel >= 3.11. If this fails we fall back to open/unlink.
+  const int fd_anon = open(path.get(), O_TMPFILE|O_EXCL|O_RDWR|O_CLOEXEC, S_IRUSR|S_IWUSR);
+  if (fd_anon == -1) {
+    ZErrno err;
+    log_debug(gc, init)("Failed to create anonymouns file in %s (%s)", path.get(),
+                        (err == EINVAL ? "Not supported" : err.to_string()));
+  } else {
+    // Get inode number for anonymous file
+    struct stat stat_buf;
+    if (fstat(fd_anon, &stat_buf) == -1) {
+      ZErrno err;
+      log_error(gc, init)("Failed to determine inode number for anonymous file (%s)", err.to_string());
+      return -1;
+    }
+
+    log_debug(gc, init)("Heap backed by file %s/#" UINT64_FORMAT, path.get(), (uint64_t)stat_buf.st_ino);
+
+    return fd_anon;
+  }
+
+  log_debug(gc, init)("Falling back to open/unlink");
+
+  // Create file name
+  char filename[PATH_MAX];
+  snprintf(filename, sizeof(filename), "%s/%s.%d", path.get(), name, os::current_process_id());
+
+  // Create file
+  const int fd = open(filename, O_CREAT|O_EXCL|O_RDWR|O_CLOEXEC, S_IRUSR|S_IWUSR);
+  if (fd == -1) {
+    ZErrno err;
+    log_error(gc, init)("Failed to create file %s (%s)", filename, err.to_string());
+    return -1;
+  }
+
+  // Unlink file
+  if (unlink(filename) == -1) {
+    ZErrno err;
+    log_error(gc, init)("Failed to unlink file %s (%s)", filename, err.to_string());
+    return -1;
+  }
+
+  log_debug(gc, init)("Heap backed by file %s", filename);
+
+  return fd;
+}
+
+int ZBackingFile::create_fd(const char* name) const {
+  if (ZPath == NULL) {
+    // If the path is not explicitly specified, then we first try to create a memfd file
+    // instead of looking for a tmpfd/hugetlbfs mount point. Note that memfd_create() might
+    // not be supported at all (requires kernel >= 3.17), or it might not support large
+    // pages (requires kernel >= 4.14). If memfd_create() fails, then we try to create a
+    // file on an accessible tmpfs or hugetlbfs mount point.
+    const int fd = create_mem_fd(name);
+    if (fd != -1) {
+      return fd;
+    }
+
+    log_debug(gc, init)("Falling back to searching for an accessible moint point");
+  }
+
+  return create_file_fd(name);
+}
+
+bool ZBackingFile::is_initialized() const {
+  return _initialized;
+}
+
+int ZBackingFile::fd() const {
+  return _fd;
+}
+
+bool ZBackingFile::is_tmpfs() const {
+  return _filesystem == TMPFS_MAGIC;
+}
+
+bool ZBackingFile::is_hugetlbfs() const {
+  return _filesystem == HUGETLBFS_MAGIC;
+}
+
+bool ZBackingFile::tmpfs_supports_transparent_huge_pages() const {
+  // If the shmem_enabled file exists and is readable then we
+  // know the kernel supports transparent huge pages for tmpfs.
+  return access(ZFILENAME_SHMEM_ENABLED, R_OK) == 0;
+}
+
+bool ZBackingFile::try_split_and_expand_tmpfs(size_t offset, size_t length, size_t alignment) const {
+  // Try first smaller part.
+  const size_t offset0 = offset;
+  const size_t length0 = align_up(length / 2, alignment);
+  if (!try_expand_tmpfs(offset0, length0, alignment)) {
+    return false;
+  }
+
+  // Try second smaller part.
+  const size_t offset1 = offset0 + length0;
+  const size_t length1 = length - length0;
+  if (!try_expand_tmpfs(offset1, length1, alignment)) {
+    return false;
+  }
+
+  return true;
+}
+
+bool ZBackingFile::try_expand_tmpfs(size_t offset, size_t length, size_t alignment) const {
+  assert(length > 0, "Invalid length");
+  assert(is_aligned(length, alignment), "Invalid length");
+
+  ZErrno err = posix_fallocate(_fd, offset, length);
+
+  if (err == EINTR && length > alignment) {
+    // Calling posix_fallocate() with a large length can take a long
+    // time to complete. When running profilers, such as VTune, this
+    // syscall will be constantly interrupted by signals. Expanding
+    // the file in smaller steps avoids this problem.
+    return try_split_and_expand_tmpfs(offset, length, alignment);
+  }
+
+  if (err) {
+    log_error(gc)("Failed to allocate backing file (%s)", err.to_string());
+    return false;
+  }
+
+  return true;
+}
+
+bool ZBackingFile::expand_tmpfs(size_t offset, size_t length) const {
+  assert(is_tmpfs(), "Wrong filesystem");
+  return try_expand_tmpfs(offset, length, os::vm_page_size());
+}
+
+bool ZBackingFile::expand_hugetlbfs(size_t offset, size_t length) const {
+  assert(is_hugetlbfs(), "Wrong filesystem");
+
+  // Prior to kernel 4.3, hugetlbfs did not support posix_fallocate().
+  // Instead of posix_fallocate() we can use a well-known workaround,
+  // which involves truncating the file to requested size and then try
+  // to map it to verify that there are enough huge pages available to
+  // back it.
+  while (ftruncate(_fd, offset + length) == -1) {
+    ZErrno err;
+    if (err != EINTR) {
+      log_error(gc)("Failed to truncate backing file (%s)", err.to_string());
+      return false;
+    }
+  }
+
+  // If we fail mapping during initialization, i.e. when we are pre-mapping
+  // the heap, then we wait and retry a few times before giving up. Otherwise
+  // there is a risk that running JVMs back-to-back will fail, since there
+  // is a delay between process termination and the huge pages owned by that
+  // process being returned to the huge page pool and made available for new
+  // allocations.
+  void* addr = MAP_FAILED;
+  const int max_attempts = 3;
+  for (int attempt = 1; attempt <= max_attempts; attempt++) {
+    addr = mmap(0, length, PROT_READ|PROT_WRITE, MAP_SHARED, _fd, offset);
+    if (addr != MAP_FAILED || is_init_completed()) {
+      // Mapping was successful or initialization phase has completed
+      break;
+    }
+
+    ZErrno err;
+    log_debug(gc)("Failed to map backing file (%s), attempt %d of %d",
+                  err.to_string(), attempt, max_attempts);
+
+    // Wait and retry in one second, in the hope that
+    // huge pages will be available by then.
+    sleep(1);
+  }
+
+  if (addr == MAP_FAILED) {
+    // Not enough huge pages left
+    ZErrno err;
+    log_error(gc)("Failed to map backing file (%s)", err.to_string());
+    return false;
+  }
+
+  // Successful mapping, unmap again. From now on the pages we mapped
+  // will be reserved for this file.
+  if (munmap(addr, length) == -1) {
+    ZErrno err;
+    log_error(gc)("Failed to unmap backing file (%s)", err.to_string());
+    return false;
+  }
+
+  return true;
+}
+
+bool ZBackingFile::expand(size_t offset, size_t length) const {
+  return is_hugetlbfs() ? expand_hugetlbfs(offset, length) : expand_tmpfs(offset, length);
+}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
new file mode 100644
index 00000000000..cbc75982833
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
+
+#include "memory/allocation.hpp"
+
+class ZBackingFile {
+private:
+  int      _fd;
+  uint64_t _filesystem;
+  bool     _initialized;
+
+  int create_mem_fd(const char* name) const;
+  int create_file_fd(const char* name) const;
+  int create_fd(const char* name) const;
+
+  bool is_tmpfs() const;
+  bool is_hugetlbfs() const;
+  bool tmpfs_supports_transparent_huge_pages() const;
+
+  bool try_split_and_expand_tmpfs(size_t offset, size_t length, size_t alignment) const;
+  bool try_expand_tmpfs(size_t offset, size_t length, size_t alignment) const;
+  bool expand_tmpfs(size_t offset, size_t length) const;
+
+  bool expand_hugetlbfs(size_t offset, size_t length) const;
+
+public:
+  ZBackingFile();
+
+  bool is_initialized() const;
+
+  int fd() const;
+  bool expand(size_t offset, size_t length) const;
+};
+
+#endif // OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.cpp
new file mode 100644
index 00000000000..b5bd39a7f86
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.cpp
@@ -0,0 +1,141 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zArray.inline.hpp"
+#include "gc/z/zBackingPath_linux_x86.hpp"
+#include "gc/z/zErrno.hpp"
+#include "logging/log.hpp"
+
+#include <stdio.h>
+#include <unistd.h>
+
+// Mount information, see proc(5) for more details.
+#define PROC_SELF_MOUNTINFO        "/proc/self/mountinfo"
+
+ZBackingPath::ZBackingPath(const char* filesystem, const char* preferred_path) {
+  if (ZPath != NULL) {
+    // Use specified path
+    _path = strdup(ZPath);
+  } else {
+    // Find suitable path
+    _path = find_mountpoint(filesystem, preferred_path);
+  }
+}
+
+ZBackingPath::~ZBackingPath() {
+  free(_path);
+  _path = NULL;
+}
+
+char* ZBackingPath::get_mountpoint(const char* line, const char* filesystem) const {
+  char* line_mountpoint = NULL;
+  char* line_filesystem = NULL;
+
+  // Parse line and return a newly allocated string containing the mountpoint if
+  // the line contains a matching filesystem and the mountpoint is accessible by
+  // the current user.
+  if (sscanf(line, "%*u %*u %*u:%*u %*s %ms %*[^-]- %ms", &line_mountpoint, &line_filesystem) != 2 ||
+      strcmp(line_filesystem, filesystem) != 0 ||
+      access(line_mountpoint, R_OK|W_OK|X_OK) != 0) {
+    // Not a matching or accessible filesystem
+    free(line_mountpoint);
+    line_mountpoint = NULL;
+  }
+
+  free(line_filesystem);
+
+  return line_mountpoint;
+}
+
+void ZBackingPath::get_mountpoints(ZArray<char*>* mountpoints, const char* filesystem) const {
+  FILE* fd = fopen(PROC_SELF_MOUNTINFO, "r");
+  if (fd == NULL) {
+    ZErrno err;
+    log_error(gc, init)("Failed to open %s: %s", PROC_SELF_MOUNTINFO, err.to_string());
+    return;
+  }
+
+  char* line = NULL;
+  size_t length = 0;
+
+  while (getline(&line, &length, fd) != -1) {
+    char* const mountpoint = get_mountpoint(line, filesystem);
+    if (mountpoint != NULL) {
+      mountpoints->add(mountpoint);
+    }
+  }
+
+  free(line);
+  fclose(fd);
+}
+
+void ZBackingPath::free_mountpoints(ZArray<char*>* mountpoints) const {
+  ZArrayIterator<char*> iter(mountpoints);
+  for (char* mountpoint; iter.next(&mountpoint);) {
+    free(mountpoint);
+  }
+  mountpoints->clear();
+}
+
+char* ZBackingPath::find_mountpoint(const char* filesystem, const char* preferred_mountpoint) const {
+  char* path = NULL;
+  ZArray<char*> mountpoints;
+
+  get_mountpoints(&mountpoints, filesystem);
+
+  if (mountpoints.size() == 0) {
+    // No filesystem found
+    log_error(gc, init)("Failed to find an accessible %s filesystem", filesystem);
+  } else if (mountpoints.size() == 1) {
+    // One filesystem found
+    path = strdup(mountpoints.at(0));
+  } else if (mountpoints.size() > 1) {
+    // More than one filesystem found
+    ZArrayIterator<char*> iter(&mountpoints);
+    for (char* mountpoint; iter.next(&mountpoint);) {
+      if (!strcmp(mountpoint, preferred_mountpoint)) {
+        // Preferred mount point found
+        path = strdup(mountpoint);
+        break;
+      }
+    }
+
+    if (path == NULL) {
+      // Preferred mount point not found
+      log_error(gc, init)("More than one %s filesystem found:", filesystem);
+      ZArrayIterator<char*> iter2(&mountpoints);
+      for (char* mountpoint; iter2.next(&mountpoint);) {
+        log_error(gc, init)("  %s", mountpoint);
+      }
+    }
+  }
+
+  free_mountpoints(&mountpoints);
+
+  return path;
+}
+
+const char* ZBackingPath::get() const {
+  return _path;
+}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
new file mode 100644
index 00000000000..51d393a1d16
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
@@ -0,0 +1,46 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
+
+#include "gc/z/zArray.hpp"
+#include "memory/allocation.hpp"
+
+class ZBackingPath : public StackObj {
+private:
+  char* _path;
+
+  char* get_mountpoint(const char* line, const char* filesystem) const;
+  void get_mountpoints(ZArray<char*>* mountpoints, const char* filesystem) const;
+  void free_mountpoints(ZArray<char*>* mountpoints) const;
+  char* find_mountpoint(const char* filesystem, const char* preferred_mountpoint) const;
+
+public:
+  ZBackingPath(const char* filesystem, const char* preferred_path);
+  ~ZBackingPath();
+
+  const char* get() const;
+};
+
+#endif // OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp
new file mode 100644
index 00000000000..5d248099379
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zGlobals.hpp"
+
+uintptr_t ZAddressReservedStart() {
+  return ZAddressMetadataMarked0;
+}
+
+uintptr_t ZAddressReservedEnd() {
+  return ZAddressMetadataRemapped + ZAddressOffsetMax;
+}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
new file mode 100644
index 00000000000..2b0fa83c1ad
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
+
+//
+// Page Allocation Tiers
+// ---------------------
+//
+//  Page Type     Page Size     Object Size Limit     Object Alignment
+//  ------------------------------------------------------------------
+//  Small         2M            <= 265K               <MinObjAlignmentInBytes>
+//  Medium        32M           <= 4M                 4K
+//  Large         X*M           > 4M                  2M
+//  ------------------------------------------------------------------
+//
+//
+// Address Space & Pointer Layout
+// ------------------------------
+//
+//  +--------------------------------+ 0x00007FFFFFFFFFFF (127TB)
+//  .                                .
+//  .                                .
+//  .                                .
+//  +--------------------------------+ 0x0000140000000000 (20TB)
+//  |         Remapped View          |
+//  +--------------------------------+ 0x0000100000000000 (16TB)
+//  |     (Reserved, but unused)     |
+//  +--------------------------------+ 0x00000c0000000000 (12TB)
+//  |         Marked1 View           |
+//  +--------------------------------+ 0x0000080000000000 (8TB)
+//  |         Marked0 View           |
+//  +--------------------------------+ 0x0000040000000000 (4TB)
+//  .                                .
+//  +--------------------------------+ 0x0000000000000000
+//
+//
+//   6                 4 4 4  4 4                                             0
+//   3                 7 6 5  2 1                                             0
+//  +-------------------+-+----+-----------------------------------------------+
+//  |00000000 00000000 0|0|1111|11 11111111 11111111 11111111 11111111 11111111|
+//  +-------------------+-+----+-----------------------------------------------+
+//  |                   | |    |
+//  |                   | |    * 41-0 Object Offset (42-bits, 4TB address space)
+//  |                   | |
+//  |                   | * 45-42 Metadata Bits (4-bits)  0001 = Marked0      (Address view 4-8TB)
+//  |                   |                                 0010 = Marked1      (Address view 8-12TB)
+//  |                   |                                 0100 = Remapped     (Address view 16-20TB)
+//  |                   |                                 1000 = Finalizable  (Address view N/A)
+//  |                   |
+//  |                   * 46-46 Unused (1-bit, always zero)
+//  |
+//  * 63-47 Fixed (17-bits, always zero)
+//
+
+const size_t    ZPlatformPageSizeSmallShift   = 21; // 2M
+
+const size_t    ZPlatformAddressOffsetBits    = 42; // 4TB
+
+const uintptr_t ZPlatformAddressMetadataShift = ZPlatformAddressOffsetBits;
+
+const uintptr_t ZPlatformAddressSpaceStart    = (uintptr_t)1 << ZPlatformAddressOffsetBits;
+const uintptr_t ZPlatformAddressSpaceSize     = ((uintptr_t)1 << ZPlatformAddressOffsetBits) * 4;
+
+const size_t    ZPlatformCacheLineSize        = 64;
+
+#endif // OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zLargePages_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zLargePages_linux_x86.cpp
new file mode 100644
index 00000000000..c79195cd118
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zLargePages_linux_x86.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zLargePages.hpp"
+#include "runtime/globals.hpp"
+
+void ZLargePages::initialize_platform() {
+  if (UseLargePages) {
+    if (UseTransparentHugePages) {
+      _state = Transparent;
+    } else {
+      _state = Explicit;
+    }
+  } else {
+    _state = Disabled;
+  }
+}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zNUMA_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zNUMA_linux_x86.cpp
new file mode 100644
index 00000000000..1fc2dc2c0b8
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zNUMA_linux_x86.cpp
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "gc/z/zErrno.hpp"
+#include "gc/z/zCPU.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "runtime/os.hpp"
+#include "utilities/debug.hpp"
+
+#include <unistd.h>
+#include <sys/syscall.h>
+
+#ifndef MPOL_F_NODE
+#define MPOL_F_NODE     (1<<0)  /* return next IL mode instead of node mask */
+#endif
+
+#ifndef MPOL_F_ADDR
+#define MPOL_F_ADDR     (1<<1)  /* look up vma using address */
+#endif
+
+static int z_get_mempolicy(uint32_t* mode, const unsigned long *nmask, unsigned long maxnode, uintptr_t addr, int flags) {
+  return syscall(__NR_get_mempolicy, mode, nmask, maxnode, addr, flags);
+}
+
+void ZNUMA::initialize_platform() {
+  _enabled = UseNUMA;
+}
+
+uint32_t ZNUMA::count() {
+  if (!_enabled) {
+    // NUMA support not enabled
+    return 1;
+  }
+
+  return os::Linux::numa_max_node() + 1;
+}
+
+uint32_t ZNUMA::id() {
+  if (!_enabled) {
+    // NUMA support not enabled
+    return 0;
+  }
+
+  return os::Linux::get_node_by_cpu(ZCPU::id());
+}
+
+uint32_t ZNUMA::memory_id(uintptr_t addr) {
+  if (!_enabled) {
+    // NUMA support not enabled, assume everything belongs to node zero
+    return 0;
+  }
+
+  uint32_t id = (uint32_t)-1;
+
+  if (z_get_mempolicy(&id, NULL, 0, addr, MPOL_F_NODE | MPOL_F_ADDR) == -1) {
+    ZErrno err;
+    fatal("Failed to get NUMA id for memory at " PTR_FORMAT " (%s)", addr, err.to_string());
+  }
+
+  assert(id < count(), "Invalid NUMA id");
+
+  return id;
+}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp
new file mode 100644
index 00000000000..549ca9d3dbf
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zBackingFile_linux_x86.hpp"
+#include "gc/z/zErrno.hpp"
+#include "gc/z/zLargePages.inline.hpp"
+#include "gc/z/zMemory.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "gc/z/zPhysicalMemory.inline.hpp"
+#include "gc/z/zPhysicalMemoryBacking_linux_x86.hpp"
+#include "logging/log.hpp"
+#include "runtime/os.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+
+// Support for building on older Linux systems
+#ifndef MADV_HUGEPAGE
+#define MADV_HUGEPAGE                        14
+#endif
+
+// Proc file entry for max map mount
+#define ZFILENAME_PROC_MAX_MAP_COUNT         "/proc/sys/vm/max_map_count"
+
+ZPhysicalMemoryBacking::ZPhysicalMemoryBacking(size_t max_capacity, size_t granule_size) :
+    _manager(),
+    _file(),
+    _granule_size(granule_size) {
+
+  // Check and warn if max map count seems too low
+  check_max_map_count(max_capacity, granule_size);
+}
+
+void ZPhysicalMemoryBacking::check_max_map_count(size_t max_capacity, size_t granule_size) const {
+  const char* const filename = ZFILENAME_PROC_MAX_MAP_COUNT;
+  FILE* const file = fopen(filename, "r");
+  if (file == NULL) {
+    // Failed to open file, skip check
+    log_debug(gc)("Failed to open %s", filename);
+    return;
+  }
+
+  size_t actual_max_map_count = 0;
+  const int result = fscanf(file, SIZE_FORMAT, &actual_max_map_count);
+  fclose(file);
+  if (result != 1) {
+    // Failed to read file, skip check
+    log_debug(gc)("Failed to read %s", filename);
+    return;
+  }
+
+  // The required max map count is impossible to calculate exactly since subsystems
+  // other than ZGC are also creating memory mappings, and we have no control over that.
+  // However, ZGC tends to create the most mappings and dominate the total count.
+  // In the worst cases, ZGC will map each granule three times, i.e. once per heap view.
+  // We speculate that we need another 20% to allow for non-ZGC subsystems to map memory.
+  const size_t required_max_map_count = (max_capacity / granule_size) * 3 * 1.2;
+  if (actual_max_map_count < required_max_map_count) {
+    log_warning(gc)("The system limit on number of memory mappings "
+                    "per process might be too low for the given");
+    log_warning(gc)("Java heap size (" SIZE_FORMAT "M). Please "
+                    "adjust %s to allow for at least", max_capacity / M, filename);
+    log_warning(gc)(SIZE_FORMAT " mappings (current limit is " SIZE_FORMAT "). "
+                    "Continuing execution with the current limit could",
+                    required_max_map_count, actual_max_map_count);
+    log_warning(gc)("lead to a fatal error down the line, due to failed "
+                    "attempts to map memory.");
+  }
+}
+
+bool ZPhysicalMemoryBacking::is_initialized() const {
+  return _file.is_initialized();
+}
+
+bool ZPhysicalMemoryBacking::expand(size_t from, size_t to) {
+  const size_t size = to - from;
+
+  // Expand
+  if (!_file.expand(from, size)) {
+    return false;
+  }
+
+  // Add expanded space to free list
+  _manager.free(from, size);
+
+  return true;
+}
+
+ZPhysicalMemory ZPhysicalMemoryBacking::alloc(size_t size) {
+  assert(is_aligned(size, _granule_size), "Invalid size");
+
+  ZPhysicalMemory pmem;
+
+  // Allocate segments
+  for (size_t allocated = 0; allocated < size; allocated += _granule_size) {
+    const uintptr_t start = _manager.alloc_from_front(_granule_size);
+    assert(start != UINTPTR_MAX, "Allocation should never fail");
+    pmem.add_segment(ZPhysicalMemorySegment(start, _granule_size));
+  }
+
+  return pmem;
+}
+
+void ZPhysicalMemoryBacking::free(ZPhysicalMemory pmem) {
+  const size_t nsegments = pmem.nsegments();
+
+  // Free segments
+  for (size_t i = 0; i < nsegments; i++) {
+    const ZPhysicalMemorySegment segment = pmem.segment(i);
+    _manager.free(segment.start(), segment.size());
+  }
+}
+
+void ZPhysicalMemoryBacking::map_failed(ZErrno err) const {
+  if (err == ENOMEM) {
+    fatal("Failed to map memory. Please check the system limit on number of "
+          "memory mappings allowed per process (see %s)", ZFILENAME_PROC_MAX_MAP_COUNT);
+  } else {
+    fatal("Failed to map memory (%s)", err.to_string());
+  }
+}
+
+void ZPhysicalMemoryBacking::advise_view(uintptr_t addr, size_t size) const {
+  if (madvise((void*)addr, size, MADV_HUGEPAGE) == -1) {
+    ZErrno err;
+    log_error(gc)("Failed to advise use of transparent huge pages (%s)", err.to_string());
+  }
+}
+
+void ZPhysicalMemoryBacking::pretouch_view(uintptr_t addr, size_t size) const {
+  const size_t page_size = ZLargePages::is_explicit() ? os::large_page_size() : os::vm_page_size();
+  os::pretouch_memory((void*)addr, (void*)(addr + size), page_size);
+}
+
+void ZPhysicalMemoryBacking::map_view(ZPhysicalMemory pmem, uintptr_t addr, bool pretouch) const {
+  const size_t nsegments = pmem.nsegments();
+
+  // Map segments
+  for (size_t i = 0; i < nsegments; i++) {
+    const ZPhysicalMemorySegment segment = pmem.segment(i);
+    const size_t size = segment.size();
+    const void* const res = mmap((void*)addr, size, PROT_READ|PROT_WRITE, MAP_FIXED|MAP_SHARED, _file.fd(), segment.start());
+    if (res == MAP_FAILED) {
+      ZErrno err;
+      map_failed(err);
+    }
+
+    // Advise on use of transparent huge pages before touching it
+    if (ZLargePages::is_transparent()) {
+      advise_view(addr, size);
+    }
+
+    // NUMA interleave memory before touching it
+    ZNUMA::memory_interleave(addr, size);
+
+    if (pretouch) {
+      pretouch_view(addr, size);
+    }
+
+    addr += size;
+  }
+}
+
+void ZPhysicalMemoryBacking::unmap_view(ZPhysicalMemory pmem, uintptr_t addr) const {
+  // Note that we must keep the address space reservation intact and just detach
+  // the backing memory. For this reason we map a new anonymous, non-accessible
+  // and non-reserved page over the mapping instead of actually unmapping.
+  const size_t size = pmem.size();
+  const void* const res = mmap((void*)addr, size, PROT_NONE, MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
+  if (res == MAP_FAILED) {
+    ZErrno err;
+    map_failed(err);
+  }
+}
+
+uintptr_t ZPhysicalMemoryBacking::nmt_address(uintptr_t offset) const {
+  // From an NMT point of view we treat the first heap mapping (marked0) as committed
+  return ZAddress::marked0(offset);
+}
+
+void ZPhysicalMemoryBacking::map(ZPhysicalMemory pmem, uintptr_t offset) const {
+  if (ZUnmapBadViews) {
+    // Only map the good view, for debugging only
+    map_view(pmem, ZAddress::good(offset), AlwaysPreTouch);
+  } else {
+    // Map all views
+    map_view(pmem, ZAddress::marked0(offset), AlwaysPreTouch);
+    map_view(pmem, ZAddress::marked1(offset), AlwaysPreTouch);
+    map_view(pmem, ZAddress::remapped(offset), AlwaysPreTouch);
+  }
+}
+
+void ZPhysicalMemoryBacking::unmap(ZPhysicalMemory pmem, uintptr_t offset) const {
+  if (ZUnmapBadViews) {
+    // Only map the good view, for debugging only
+    unmap_view(pmem, ZAddress::good(offset));
+  } else {
+    // Unmap all views
+    unmap_view(pmem, ZAddress::marked0(offset));
+    unmap_view(pmem, ZAddress::marked1(offset));
+    unmap_view(pmem, ZAddress::remapped(offset));
+  }
+}
+
+void ZPhysicalMemoryBacking::flip(ZPhysicalMemory pmem, uintptr_t offset) const {
+  assert(ZUnmapBadViews, "Should be enabled");
+  const uintptr_t addr_good = ZAddress::good(offset);
+  const uintptr_t addr_bad = ZAddress::is_marked(ZAddressGoodMask) ? ZAddress::remapped(offset) : ZAddress::marked(offset);
+  // Map/Unmap views
+  map_view(pmem, addr_good, false /* pretouch */);
+  unmap_view(pmem, addr_bad);
+}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
new file mode 100644
index 00000000000..71c6dc1d9bb
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+
+#include "gc/z/zBackingFile_linux_x86.hpp"
+#include "gc/z/zMemory.hpp"
+
+class ZErrno;
+class ZPhysicalMemory;
+
+class ZPhysicalMemoryBacking {
+private:
+  ZMemoryManager _manager;
+  ZBackingFile   _file;
+  const size_t   _granule_size;
+
+  void check_max_map_count(size_t max_capacity, size_t granule_size) const;
+  void map_failed(ZErrno err) const;
+
+  void advise_view(uintptr_t addr, size_t size) const;
+  void pretouch_view(uintptr_t addr, size_t size) const;
+  void map_view(ZPhysicalMemory pmem, uintptr_t addr, bool pretouch) const;
+  void unmap_view(ZPhysicalMemory pmem, uintptr_t addr) const;
+
+public:
+  ZPhysicalMemoryBacking(size_t max_capacity, size_t granule_size);
+
+  bool is_initialized() const;
+
+  bool expand(size_t from, size_t to);
+  ZPhysicalMemory alloc(size_t size);
+  void free(ZPhysicalMemory pmem);
+
+  uintptr_t nmt_address(uintptr_t offset) const;
+
+  void map(ZPhysicalMemory pmem, uintptr_t offset) const;
+  void unmap(ZPhysicalMemory pmem, uintptr_t offset) const;
+  void flip(ZPhysicalMemory pmem, uintptr_t offset) const;
+};
+
+#endif // OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zVirtualMemory_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zVirtualMemory_linux_x86.cpp
new file mode 100644
index 00000000000..68df40191a5
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zVirtualMemory_linux_x86.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zVirtualMemory.hpp"
+#include "logging/log.hpp"
+
+#include <sys/mman.h>
+#include <sys/types.h>
+
+bool ZVirtualMemoryManager::reserve(uintptr_t start, size_t size) {
+  // Reserve address space
+  const uintptr_t actual_start = (uintptr_t)mmap((void*)start, size, PROT_NONE,
+                                                 MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
+  if (actual_start != start) {
+    log_error(gc)("Failed to reserve address space for Java heap");
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
similarity index 85%
rename from src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp
rename to src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
index 2a6d587a2ac..0cf302992c1 100644
--- a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp
+++ b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
@@ -22,12 +22,10 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
 
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
+// Included in orderAccess.hpp header file.
 
 // Compiler version last used for testing: gcc 4.8.2
 // Please update this information when this file changes
@@ -48,14 +46,12 @@ inline void OrderAccess::acquire()    { compiler_barrier(); }
 inline void OrderAccess::release()    { compiler_barrier(); }
 
 inline void OrderAccess::fence() {
-  if (os::is_MP()) {
-    // always use locked addl since mfence is sometimes expensive
+   // always use locked addl since mfence is sometimes expensive
 #ifdef AMD64
-    __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
+  __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
 #else
-    __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
+  __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
 #endif
-  }
   compiler_barrier();
 }
 
@@ -109,4 +105,4 @@ struct OrderAccess::PlatformOrderedStore<8, RELEASE_X_FENCE>
 };
 #endif // AMD64
 
-#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
similarity index 89%
rename from src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp
rename to src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
index 8c4cd1c7a1c..950a4819f36 100644
--- a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp
+++ b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_INLINE_HPP
-#define OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_INLINE_HPP
+#ifndef OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
 
-#include "runtime/orderAccess.hpp"
+// Included in orderAccess.hpp header file.
 
 #ifdef ARM
 
@@ -83,4 +83,4 @@ inline void OrderAccess::release()    { LIGHT_MEM_BARRIER; }
 
 inline void OrderAccess::fence()      { FULL_MEM_BARRIER;  }
 
-#endif // OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_INLINE_HPP
+#endif // OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
similarity index 84%
rename from src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp
rename to src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
index b60cd092c50..14422eb1252 100644
--- a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -22,11 +22,10 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
 
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
+// Included in orderAccess.hpp header file.
 
 // Compiler version last used for testing: solaris studio 12u3
 // Please update this information when this file changes
@@ -52,4 +51,4 @@ inline void OrderAccess::fence() {
   __asm__ volatile ("membar  #StoreLoad" : : : "memory");
 }
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP
+#endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
similarity index 77%
rename from src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp
rename to src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
index bd676dbe62f..ad18c0f349c 100644
--- a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -22,12 +22,10 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
 
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
+// Included in orderAccess.hpp header file.
 
 // Compiler version last used for testing: solaris studio 12u3
 // Please update this information when this file changes
@@ -48,14 +46,12 @@ inline void OrderAccess::acquire()    { compiler_barrier(); }
 inline void OrderAccess::release()    { compiler_barrier(); }
 
 inline void OrderAccess::fence() {
-  if (os::is_MP()) {
 #ifdef AMD64
-    __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
+  __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
 #else
-    __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
+  __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
 #endif
-  }
   compiler_barrier();
 }
 
-#endif // OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
similarity index 90%
rename from src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp
rename to src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
index d2f39ee21bd..0f06f1b58bd 100644
--- a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp
+++ b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
@@ -22,13 +22,12 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+
+// Included in orderAccess.hpp header file.
 
 #include <intrin.h>
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
-#include "runtime/os.hpp"
 
 // Compiler version last used for testing: Microsoft Visual Studio 2010
 // Please update this information when this file changes
@@ -63,10 +62,8 @@ inline void OrderAccess::fence() {
 #ifdef AMD64
   StubRoutines_fence();
 #else
-  if (os::is_MP()) {
-    __asm {
-      lock add dword ptr [esp], 0;
-    }
+  __asm {
+    lock add dword ptr [esp], 0;
   }
 #endif // AMD64
   compiler_barrier();
@@ -113,4 +110,4 @@ struct OrderAccess::PlatformOrderedStore<4, RELEASE_X_FENCE>
 };
 #endif // AMD64
 
-#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index 60f8c18b39f..cb0c0798325 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -2282,6 +2282,9 @@ bool OperandForm::is_bound_register() const {
   if (strcmp(name, "RegD") == 0) size = 2;
   if (strcmp(name, "RegL") == 0) size = 2;
   if (strcmp(name, "RegN") == 0) size = 1;
+  if (strcmp(name, "VecX") == 0) size = 4;
+  if (strcmp(name, "VecY") == 0) size = 8;
+  if (strcmp(name, "VecZ") == 0) size = 16;
   if (strcmp(name, "RegP") == 0) size = globalAD->get_preproc_def("_LP64") ? 2 : 1;
   if (size == 0) {
     return false;
@@ -3509,6 +3512,7 @@ int MatchNode::needs_ideal_memory_edge(FormDict &globals) const {
     "ClearArray",
     "GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP",
     "GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN",
+    "LoadBarrierSlowReg", "LoadBarrierWeakSlowReg"
   };
   int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*);
   if( strcmp(_opType,"PrefetchAllocation")==0 )
diff --git a/src/hotspot/share/aot/aotCompiledMethod.cpp b/src/hotspot/share/aot/aotCompiledMethod.cpp
index 619f215eb9c..4c6d47aa801 100644
--- a/src/hotspot/share/aot/aotCompiledMethod.cpp
+++ b/src/hotspot/share/aot/aotCompiledMethod.cpp
@@ -75,7 +75,7 @@ address* AOTCompiledMethod::orig_pc_addr(const frame* fr) {
   return (address*) ((address)fr->unextended_sp() + _meta->orig_pc_offset());
 }
 
-bool AOTCompiledMethod::do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive, bool unloading_occurred) {
+bool AOTCompiledMethod::do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive) {
   return false;
 }
 
@@ -245,7 +245,7 @@ bool AOTCompiledMethod::make_entrant() {
 // more conservative than for nmethods.
 void AOTCompiledMethod::flush_evol_dependents_on(InstanceKlass* dependee) {
   if (is_java_method()) {
-    cleanup_inline_caches();
+    clear_inline_caches();
     mark_for_deoptimization();
     make_not_entrant();
   }
diff --git a/src/hotspot/share/aot/aotCompiledMethod.hpp b/src/hotspot/share/aot/aotCompiledMethod.hpp
index 9e9a19f0c15..aff03e5db7c 100644
--- a/src/hotspot/share/aot/aotCompiledMethod.hpp
+++ b/src/hotspot/share/aot/aotCompiledMethod.hpp
@@ -284,8 +284,8 @@ private:
   bool is_aot_runtime_stub() const { return _method == NULL; }
 
 protected:
-  virtual bool do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive, bool unloading_occurred);
-  virtual bool do_unloading_jvmci(bool unloading_occurred) { return false; }
+  virtual bool do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive);
+  virtual bool do_unloading_jvmci() { return false; }
 
 };
 
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index f72b00ce090..c7f056fcf3c 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -337,6 +337,7 @@ public:
 
 class CodeBuffer: public StackObj {
   friend class CodeSection;
+  friend class StubCodeGenerator;
 
  private:
   // CodeBuffers must be allocated on the stack except for a single
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp
index dcca623dabe..a687a07856f 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/assembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_Instruction.hpp"
 #include "c1/c1_InstructionPrinter.hpp"
diff --git a/src/hotspot/share/c1/c1_MacroAssembler.hpp b/src/hotspot/share/c1/c1_MacroAssembler.hpp
index c3c4114ee14..0f73a54f0c8 100644
--- a/src/hotspot/share/c1/c1_MacroAssembler.hpp
+++ b/src/hotspot/share/c1/c1_MacroAssembler.hpp
@@ -26,7 +26,6 @@
 #define SHARE_VM_C1_C1_MACROASSEMBLER_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "utilities/macros.hpp"
 
 class CodeEmitInfo;
diff --git a/src/hotspot/share/classfile/classLoader.inline.hpp b/src/hotspot/share/classfile/classLoader.inline.hpp
index f32493d80bb..731dc0cb1e8 100644
--- a/src/hotspot/share/classfile/classLoader.inline.hpp
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
 
 #include "classfile/classLoader.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 // Next entry in class path
 inline ClassPathEntry* ClassPathEntry::next() const { return OrderAccess::load_acquire(&_next); }
diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
index e88f77ecebf..c44ccc5f4e5 100644
--- a/src/hotspot/share/classfile/classLoaderData.hpp
+++ b/src/hotspot/share/classfile/classLoaderData.hpp
@@ -400,9 +400,16 @@ class ClassLoaderData : public CHeapObj<mtClass> {
   static ClassLoaderData* class_loader_data_or_null(oop loader);
   static ClassLoaderData* anonymous_class_loader_data(Handle loader);
 
-
+  // Returns Klass* of associated class loader, or NULL if associated loader is <bootstrap>.
+  // Also works if unloading.
   Klass* class_loader_klass() const { return _class_loader_klass; }
+
+  // Returns Name of associated class loader.
+  // Returns NULL if associated class loader is <bootstrap> or if no name has been set for
+  //   this loader.
+  // Also works if unloading.
   Symbol* class_loader_name() const { return _class_loader_name; }
+
   JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
 };
 
diff --git a/src/hotspot/share/classfile/classLoaderExt.cpp b/src/hotspot/share/classfile/classLoaderExt.cpp
index b620f4b3abb..31544c6437b 100644
--- a/src/hotspot/share/classfile/classLoaderExt.cpp
+++ b/src/hotspot/share/classfile/classLoaderExt.cpp
@@ -55,8 +55,10 @@ bool ClassLoaderExt::_has_platform_classes = false;
 
 void ClassLoaderExt::append_boot_classpath(ClassPathEntry* new_entry) {
 #if INCLUDE_CDS
-  warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
-  FileMapInfo::current_info()->header()->set_has_platform_or_app_classes(false);
+  if (UseSharedSpaces) {
+    warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
+    FileMapInfo::current_info()->header()->set_has_platform_or_app_classes(false);
+  }
 #endif
   ClassLoader::add_to_boot_append_entries(new_entry);
 }
diff --git a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp
new file mode 100644
index 00000000000..4a5fc402d1a
--- /dev/null
+++ b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018 SAP SE. 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.
+ *
+ */
+
+#include "precompiled.hpp"
+
+#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderHierarchyDCmd.hpp"
+#include "memory/allocation.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/safepoint.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
+
+
+ClassLoaderHierarchyDCmd::ClassLoaderHierarchyDCmd(outputStream* output, bool heap)
+  : DCmdWithParser(output, heap)
+  , _show_classes("show-classes", "Print loaded classes.", "BOOLEAN", false, "false")
+  , _verbose("verbose", "Print detailed information.", "BOOLEAN", false, "false") {
+  _dcmdparser.add_dcmd_option(&_show_classes);
+  _dcmdparser.add_dcmd_option(&_verbose);
+}
+
+
+int ClassLoaderHierarchyDCmd::num_arguments() {
+  ResourceMark rm;
+  ClassLoaderHierarchyDCmd* dcmd = new ClassLoaderHierarchyDCmd(NULL, false);
+  if (dcmd != NULL) {
+    DCmdMark mark(dcmd);
+    return dcmd->_dcmdparser.num_arguments();
+  } else {
+    return 0;
+  }
+}
+
+// Helper class for drawing the branches to the left of a node.
+class BranchTracker : public StackObj {
+  //       "<x>"
+  //       " |---<y>"
+  //       " |    |
+  //       " |   <z>"
+  //       " |    |---<z1>
+  //       " |    |---<z2>
+  //       ^^^^^^^ ^^^
+  //        A       B
+
+  // Some terms for the graphics:
+  // - branch: vertical connection between a node's ancestor to a later sibling.
+  // - branchwork: (A) the string to print as a prefix at the start of each line, contains all branches.
+  // - twig (B): Length of the dashed line connecting a node to its branch.
+  // - branch spacing: how many spaces between branches are printed.
+
+public:
+
+  enum { max_depth = 64, twig_len = 2, branch_spacing = 5 };
+
+private:
+
+  char _branches[max_depth];
+  int _pos;
+
+public:
+  BranchTracker()
+    : _pos(0) {}
+
+  void push(bool has_branch) {
+    if (_pos < max_depth) {
+      _branches[_pos] = has_branch ? '|' : ' ';
+    }
+    _pos ++; // beyond max depth, omit branch drawing but do count on.
+  }
+
+  void pop() {
+    assert(_pos > 0, "must be");
+    _pos --;
+  }
+
+  void print(outputStream* st) {
+    for (int i = 0; i < _pos; i ++) {
+      st->print("%c%.*s", _branches[i], branch_spacing, "          ");
+    }
+  }
+
+  class Mark {
+    BranchTracker& _tr;
+  public:
+    Mark(BranchTracker& tr, bool has_branch_here)
+      : _tr(tr)  { _tr.push(has_branch_here); }
+    ~Mark() { _tr.pop(); }
+  };
+
+}; // end: BranchTracker
+
+struct LoadedClassInfo : public ResourceObj {
+public:
+  LoadedClassInfo* _next;
+  Klass* const _klass;
+  const ClassLoaderData* const _cld;
+
+  LoadedClassInfo(Klass* klass, const ClassLoaderData* cld)
+    : _klass(klass), _cld(cld) {}
+
+};
+
+class LoaderTreeNode : public ResourceObj {
+
+  // We walk the CLDG and, for each CLD which is non-anonymous, add
+  // a tree node. To add a node we need its parent node; if it itself
+  // does not exist yet, we add a preliminary node for it. This preliminary
+  // node just contains its loader oop; later, when encountering its CLD in
+  // our CLDG walk, we complete the missing information in this node.
+
+  const oop _loader_oop;
+  const ClassLoaderData* _cld;
+
+  LoaderTreeNode* _child;
+  LoaderTreeNode* _next;
+
+  LoadedClassInfo* _classes;
+  int _num_classes;
+
+  LoadedClassInfo* _anon_classes;
+  int _num_anon_classes;
+
+  void print_with_childs(outputStream* st, BranchTracker& branchtracker,
+      bool print_classes, bool verbose) const {
+
+    ResourceMark rm;
+
+    if (_cld == NULL) {
+      // Not sure how this could happen: we added a preliminary node for a parent but then never encountered
+      // its CLD?
+      return;
+    }
+
+    // Retrieve information.
+    const Klass* const loader_klass = _cld->class_loader_klass();
+    const Symbol* const loader_name = _cld->class_loader_name();
+
+    branchtracker.print(st);
+
+    // e.g. "+--- jdk.internal.reflect.DelegatingClassLoader"
+    st->print("+%.*s", BranchTracker::twig_len, "----------");
+    if (_cld->is_the_null_class_loader_data()) {
+      st->print(" <bootstrap>");
+    } else {
+      if (loader_name != NULL) {
+        st->print(" \"%s\",", loader_name->as_C_string());
+      }
+      st->print(" %s", loader_klass != NULL ? loader_klass->external_name() : "??");
+      st->print(" {" PTR_FORMAT "}", p2i(_loader_oop));
+    }
+    st->cr();
+
+    // Output following this node (node details and child nodes) - up to the next sibling node
+    // needs to be prefixed with "|" if there is a follow up sibling.
+    const bool have_sibling = _next != NULL;
+    BranchTracker::Mark trm(branchtracker, have_sibling);
+
+    {
+      // optional node details following this node needs to be prefixed with "|"
+      // if there are follow up child nodes.
+      const bool have_child = _child != NULL;
+      BranchTracker::Mark trm(branchtracker, have_child);
+
+      // Empty line
+      branchtracker.print(st);
+      st->cr();
+
+      const int indentation = 18;
+
+      if (verbose) {
+        branchtracker.print(st);
+        st->print_cr("%*s " PTR_FORMAT, indentation, "Loader Data:", p2i(_cld));
+        branchtracker.print(st);
+        st->print_cr("%*s " PTR_FORMAT, indentation, "Loader Klass:", p2i(loader_klass));
+
+        // Empty line
+        branchtracker.print(st);
+        st->cr();
+      }
+
+      if (print_classes) {
+
+        if (_classes != NULL) {
+          for (LoadedClassInfo* lci = _classes; lci; lci = lci->_next) {
+            branchtracker.print(st);
+            if (lci == _classes) { // first iteration
+              st->print("%*s ", indentation, "Classes:");
+            } else {
+              st->print("%*s ", indentation, "");
+            }
+            st->print("%s", lci->_klass->external_name());
+            st->cr();
+            // Non-anonymous classes should live in the primary CLD of its loader
+            assert(lci->_cld == _cld, "must be");
+          }
+          branchtracker.print(st);
+          st->print("%*s ", indentation, "");
+          st->print_cr("(%u class%s)", _num_classes, (_num_classes == 1) ? "" : "es");
+
+          // Empty line
+          branchtracker.print(st);
+          st->cr();
+        }
+
+        if (_anon_classes != NULL) {
+          for (LoadedClassInfo* lci = _anon_classes; lci; lci = lci->_next) {
+            branchtracker.print(st);
+            if (lci == _anon_classes) { // first iteration
+              st->print("%*s ", indentation, "Anonymous Classes:");
+            } else {
+              st->print("%*s ", indentation, "");
+            }
+            st->print("%s", lci->_klass->external_name());
+            // For anonymous classes, also print CLD if verbose. Should be a different one than the primary CLD.
+            assert(lci->_cld != _cld, "must be");
+            if (verbose) {
+              st->print("  (CLD: " PTR_FORMAT ")", p2i(lci->_cld));
+            }
+            st->cr();
+          }
+          branchtracker.print(st);
+          st->print("%*s ", indentation, "");
+          st->print_cr("(%u anonymous class%s)", _num_anon_classes, (_num_anon_classes == 1) ? "" : "es");
+
+          // Empty line
+          branchtracker.print(st);
+          st->cr();
+        }
+
+      } // end: print_classes
+
+    } // Pop branchtracker mark
+
+    // Print children, recursively
+    LoaderTreeNode* c = _child;
+    while (c != NULL) {
+      c->print_with_childs(st, branchtracker, print_classes, verbose);
+      c = c->_next;
+    }
+
+  }
+
+public:
+
+  LoaderTreeNode(const oop loader_oop)
+    : _loader_oop(loader_oop), _cld(NULL)
+    , _child(NULL), _next(NULL)
+    , _classes(NULL), _anon_classes(NULL)
+    , _num_classes(0), _num_anon_classes(0) {}
+
+  void set_cld(const ClassLoaderData* cld) {
+    _cld = cld;
+  }
+
+  void add_child(LoaderTreeNode* info) {
+    info->_next = _child;
+    _child = info;
+  }
+
+  void add_sibling(LoaderTreeNode* info) {
+    assert(info->_next == NULL, "must be");
+    info->_next = _next;
+    _next = info;
+  }
+
+  void add_classes(LoadedClassInfo* first_class, int num_classes, bool anonymous) {
+    LoadedClassInfo** p_list_to_add_to = anonymous ? &_anon_classes : &_classes;
+    // Search tail.
+    while ((*p_list_to_add_to) != NULL) {
+      p_list_to_add_to = &(*p_list_to_add_to)->_next;
+    }
+    *p_list_to_add_to = first_class;
+    if (anonymous) {
+      _num_anon_classes += num_classes;
+    } else {
+      _num_classes += num_classes;
+    }
+  }
+
+  const ClassLoaderData* cld() const {
+    return _cld;
+  }
+
+  const oop loader_oop() const {
+    return _loader_oop;
+  }
+
+  LoaderTreeNode* find(const oop loader_oop) {
+    LoaderTreeNode* result = NULL;
+    if (_loader_oop == loader_oop) {
+      result = this;
+    } else {
+      LoaderTreeNode* c = _child;
+      while (c != NULL && result == NULL) {
+        result = c->find(loader_oop);
+        c = c->_next;
+      }
+    }
+    return result;
+  }
+
+  void print_with_childs(outputStream* st, bool print_classes, bool print_add_info) const {
+    BranchTracker bwt;
+    print_with_childs(st, bwt, print_classes, print_add_info);
+  }
+
+};
+
+class LoadedClassCollectClosure : public KlassClosure {
+public:
+  LoadedClassInfo* _list;
+  const ClassLoaderData* _cld;
+  int _num_classes;
+  LoadedClassCollectClosure(const ClassLoaderData* cld)
+    : _list(NULL), _cld(cld), _num_classes(0) {}
+  void do_klass(Klass* k) {
+    LoadedClassInfo* lki = new LoadedClassInfo(k, _cld);
+    lki->_next = _list;
+    _list = lki;
+    _num_classes ++;
+  }
+};
+
+class LoaderInfoScanClosure : public CLDClosure {
+
+  const bool _print_classes;
+  const bool _verbose;
+  LoaderTreeNode* _root;
+
+  static void fill_in_classes(LoaderTreeNode* info, const ClassLoaderData* cld) {
+    assert(info != NULL && cld != NULL, "must be");
+    LoadedClassCollectClosure lccc(cld);
+    const_cast<ClassLoaderData*>(cld)->classes_do(&lccc);
+    if (lccc._num_classes > 0) {
+      info->add_classes(lccc._list, lccc._num_classes, cld->is_anonymous());
+    }
+  }
+
+  LoaderTreeNode* find_node_or_add_empty_node(oop loader_oop) {
+
+    assert(_root != NULL, "root node must exist");
+
+    if (loader_oop == NULL) {
+      return _root;
+    }
+
+    // Check if a node for this oop already exists.
+    LoaderTreeNode* info = _root->find(loader_oop);
+
+    if (info == NULL) {
+      // It does not. Create a node.
+      info = new LoaderTreeNode(loader_oop);
+
+      // Add it to tree.
+      LoaderTreeNode* parent_info = NULL;
+
+      // Recursively add parent nodes if needed.
+      const oop parent_oop = java_lang_ClassLoader::parent(loader_oop);
+      if (parent_oop == NULL) {
+        parent_info = _root;
+      } else {
+        parent_info = find_node_or_add_empty_node(parent_oop);
+      }
+      assert(parent_info != NULL, "must be");
+
+      parent_info->add_child(info);
+    }
+    return info;
+  }
+
+
+public:
+  LoaderInfoScanClosure(bool print_classes, bool verbose)
+    : _print_classes(print_classes), _verbose(verbose), _root(NULL) {
+    _root = new LoaderTreeNode(NULL);
+  }
+
+  void print_results(outputStream* st) const {
+    _root->print_with_childs(st, _print_classes, _verbose);
+  }
+
+  void do_cld (ClassLoaderData* cld) {
+
+    // We do not display unloading loaders, for now.
+    if (cld->is_unloading()) {
+      return;
+    }
+
+    const oop loader_oop = cld->class_loader();
+
+    LoaderTreeNode* info = find_node_or_add_empty_node(loader_oop);
+    assert(info != NULL, "must be");
+
+    // Update CLD in node, but only if this is the primary CLD for this loader.
+    if (cld->is_anonymous() == false) {
+      assert(info->cld() == NULL, "there should be only one primary CLD per loader");
+      info->set_cld(cld);
+    }
+
+    // Add classes.
+    fill_in_classes(info, cld);
+  }
+
+};
+
+
+class ClassLoaderHierarchyVMOperation : public VM_Operation {
+  outputStream* const _out;
+  const bool _show_classes;
+  const bool _verbose;
+public:
+  ClassLoaderHierarchyVMOperation(outputStream* out, bool show_classes, bool verbose) :
+    _out(out), _show_classes(show_classes), _verbose(verbose)
+  {}
+
+  VMOp_Type type() const {
+    return VMOp_ClassLoaderHierarchyOperation;
+  }
+
+  void doit() {
+    assert(SafepointSynchronize::is_at_safepoint(), "must be a safepoint");
+    ResourceMark rm;
+    LoaderInfoScanClosure cl (_show_classes, _verbose);
+    ClassLoaderDataGraph::cld_do(&cl);
+    cl.print_results(_out);
+  }
+};
+
+// This command needs to be executed at a safepoint.
+void ClassLoaderHierarchyDCmd::execute(DCmdSource source, TRAPS) {
+  ClassLoaderHierarchyVMOperation op(output(), _show_classes.value(), _verbose.value());
+  VMThread::execute(&op);
+}
diff --git a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp
new file mode 100644
index 00000000000..0db0eccf4dc
--- /dev/null
+++ b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018 SAP SE. 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.
+ *
+ */
+
+#ifndef HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_
+#define HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_
+
+#include "services/diagnosticCommand.hpp"
+
+class ClassLoaderHierarchyDCmd: public DCmdWithParser {
+  DCmdArgument<bool> _show_classes;
+  DCmdArgument<bool> _verbose;
+public:
+
+  ClassLoaderHierarchyDCmd(outputStream* output, bool heap);
+
+  static const char* name() {
+    return "VM.classloaders";
+  }
+
+  static const char* description() {
+    return "Prints classloader hierarchy.";
+  }
+  static const char* impact() {
+      return "Medium: Depends on number of class loaders and classes loaded.";
+  }
+  static const JavaPermission permission() {
+    JavaPermission p = {"java.lang.management.ManagementPermission",
+                        "monitor", NULL};
+    return p;
+  }
+  static int num_arguments();
+  virtual void execute(DCmdSource source, TRAPS);
+
+};
+
+#endif /* HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_ */
diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
index db35510398d..b422bb68530 100644
--- a/src/hotspot/share/classfile/dictionary.cpp
+++ b/src/hotspot/share/classfile/dictionary.cpp
@@ -35,7 +35,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "utilities/hashtable.inline.hpp"
 
diff --git a/src/hotspot/share/classfile/dictionary.inline.hpp b/src/hotspot/share/classfile/dictionary.inline.hpp
index 4a24fb00c78..4e1c73bbb5b 100644
--- a/src/hotspot/share/classfile/dictionary.inline.hpp
+++ b/src/hotspot/share/classfile/dictionary.inline.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
 
 #include "classfile/dictionary.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 inline ProtectionDomainEntry* DictionaryEntry::pd_set_acquire() const {
   return OrderAccess::load_acquire(&_pd_set);
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index bde2253b6af..ff31188b685 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -63,7 +63,6 @@
 #include "runtime/vframe.inline.hpp"
 #include "utilities/align.hpp"
 #include "utilities/preserveException.hpp"
-
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciJavaClasses.hpp"
 #endif
@@ -310,7 +309,8 @@ Handle java_lang_String::create_from_str(const char* utf8_str, TRAPS) {
   Handle h_obj = basic_create(length, is_latin1, CHECK_NH);
   if (length > 0) {
     if (!has_multibyte) {
-      strncpy((char*)value(h_obj())->byte_at_addr(0), utf8_str, length);
+      const jbyte* src = reinterpret_cast<const jbyte*>(utf8_str);
+      ArrayAccess<>::arraycopy_from_native(src, value(h_obj()), typeArrayOopDesc::element_offset<jbyte>(0), length);
     } else if (is_latin1) {
       UTF8::convert_to_unicode(utf8_str, value(h_obj())->byte_at_addr(0), length);
     } else {
@@ -356,7 +356,8 @@ Handle java_lang_String::create_from_symbol(Symbol* symbol, TRAPS) {
   Handle h_obj = basic_create(length, is_latin1, CHECK_NH);
   if (length > 0) {
     if (!has_multibyte) {
-      strncpy((char*)value(h_obj())->byte_at_addr(0), utf8_str, length);
+      const jbyte* src = reinterpret_cast<const jbyte*>(utf8_str);
+      ArrayAccess<>::arraycopy_from_native(src, value(h_obj()), typeArrayOopDesc::element_offset<jbyte>(0), length);
     } else if (is_latin1) {
       UTF8::convert_to_unicode(utf8_str, value(h_obj())->byte_at_addr(0), length);
     } else {
@@ -796,7 +797,7 @@ void java_lang_Class::fixup_mirror(Klass* k, TRAPS) {
       // During bootstrap, java.lang.Class wasn't loaded so static field
       // offsets were computed without the size added it.  Go back and
       // update all the static field offsets to included the size.
-        for (JavaFieldStream fs(InstanceKlass::cast(k)); !fs.done(); fs.next()) {
+      for (JavaFieldStream fs(InstanceKlass::cast(k)); !fs.done(); fs.next()) {
         if (fs.access_flags().is_static()) {
           int real_offset = fs.offset() + InstanceMirrorKlass::offset_of_static_fields();
           fs.set_offset(real_offset);
@@ -807,12 +808,8 @@ void java_lang_Class::fixup_mirror(Klass* k, TRAPS) {
 
   if (k->is_shared() && k->has_raw_archived_mirror()) {
     if (MetaspaceShared::open_archive_heap_region_mapped()) {
-      oop m = k->archived_java_mirror();
-      assert(m != NULL, "archived mirror is NULL");
-      assert(MetaspaceShared::is_archive_object(m), "must be archived mirror object");
-      Handle m_h(THREAD, m);
-      // restore_archived_mirror() clears the klass' _has_raw_archived_mirror flag
-      restore_archived_mirror(k, m_h, Handle(), Handle(), Handle(), CHECK);
+      bool present = restore_archived_mirror(k, Handle(), Handle(), Handle(), CHECK);
+      assert(present, "Missing archived mirror for %s", k->external_name());
       return;
     } else {
       k->set_java_mirror_handle(NULL);
@@ -1205,11 +1202,23 @@ oop java_lang_Class::process_archived_mirror(Klass* k, oop mirror,
   return archived_mirror;
 }
 
-// After the archived mirror object is restored, the shared klass'
-// _has_raw_archived_mirror flag is cleared
-void java_lang_Class::restore_archived_mirror(Klass *k, Handle mirror,
+// Returns true if the mirror is updated, false if no archived mirror
+// data is present. After the archived mirror object is restored, the
+// shared klass' _has_raw_archived_mirror flag is cleared.
+bool java_lang_Class::restore_archived_mirror(Klass *k,
                                               Handle class_loader, Handle module,
                                               Handle protection_domain, TRAPS) {
+  oop m = MetaspaceShared::materialize_archived_object(k->archived_java_mirror_raw());
+
+  if (m == NULL) {
+    return false;
+  }
+
+  log_debug(cds, mirror)("Archived mirror is: " PTR_FORMAT, p2i(m));
+
+  // mirror is archived, restore
+  assert(MetaspaceShared::is_archive_object(m), "must be archived mirror object");
+  Handle mirror(THREAD, m);
 
   // The java.lang.Class field offsets were archived and reloaded from archive.
   // No need to put classes on the fixup_mirror_list before java.lang.Class
@@ -1219,7 +1228,7 @@ void java_lang_Class::restore_archived_mirror(Klass *k, Handle mirror,
     // - local static final fields with initial values were initialized at dump time
 
     // create the init_lock
-    typeArrayOop r = oopFactory::new_typeArray(T_INT, 0, CHECK);
+    typeArrayOop r = oopFactory::new_typeArray(T_INT, 0, CHECK_(false));
     set_init_lock(mirror(), r);
 
     if (protection_domain.not_null()) {
@@ -1239,6 +1248,8 @@ void java_lang_Class::restore_archived_mirror(Klass *k, Handle mirror,
 
   ResourceMark rm;
   log_trace(cds, mirror)("Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror()));
+
+  return true;
 }
 #endif // INCLUDE_CDS_JAVA_HEAP
 
@@ -4255,7 +4266,7 @@ int java_lang_AssertionStatusDirectives::packages_offset;
 int java_lang_AssertionStatusDirectives::packageEnabled_offset;
 int java_lang_AssertionStatusDirectives::deflt_offset;
 int java_nio_Buffer::_limit_offset;
-int java_util_concurrent_locks_AbstractOwnableSynchronizer::_owner_offset = 0;
+int java_util_concurrent_locks_AbstractOwnableSynchronizer::_owner_offset;
 int reflect_ConstantPool::_oop_offset;
 int reflect_UnsafeStaticFieldAccessorImpl::_base_offset;
 
@@ -4397,13 +4408,12 @@ void java_nio_Buffer::serialize(SerializeClosure* f) {
 }
 #endif
 
-void java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(TRAPS) {
-  if (_owner_offset != 0) return;
+#define AOS_FIELDS_DO(macro) \
+  macro(_owner_offset, k, "exclusiveOwnerThread", thread_signature, false)
 
-  SystemDictionary::load_abstract_ownable_synchronizer_klass(CHECK);
-  InstanceKlass* k = SystemDictionary::abstract_ownable_synchronizer_klass();
-  compute_offset(_owner_offset, k,
-                 "exclusiveOwnerThread", vmSymbols::thread_signature());
+void java_util_concurrent_locks_AbstractOwnableSynchronizer::compute_offsets() {
+  InstanceKlass* k = SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass();
+  AOS_FIELDS_DO(FIELD_COMPUTE_OFFSET);
 }
 
 oop java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(oop obj) {
@@ -4471,6 +4481,7 @@ void JavaClasses::compute_offsets() {
   java_lang_StackTraceElement::compute_offsets();
   java_lang_StackFrameInfo::compute_offsets();
   java_lang_LiveStackFrameInfo::compute_offsets();
+  java_util_concurrent_locks_AbstractOwnableSynchronizer::compute_offsets();
 
   // generated interpreter code wants to know about the offsets we just computed:
   AbstractAssembler::update_delayed_values();
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 40e63f289bd..7f1d7cc9b12 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -229,8 +229,9 @@ class java_lang_Class : AllStatic {
   static oop  archive_mirror(Klass* k, TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(NULL);
   static oop  process_archived_mirror(Klass* k, oop mirror, oop archived_mirror, Thread *THREAD)
                                       NOT_CDS_JAVA_HEAP_RETURN_(NULL);
-  static void restore_archived_mirror(Klass *k, Handle mirror, Handle class_loader, Handle module,
-                                      Handle protection_domain, TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
+  static bool restore_archived_mirror(Klass *k, Handle class_loader, Handle module,
+                                      Handle protection_domain,
+                                      TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(false);
 
   static void fixup_module_field(Klass* k, Handle module);
 
@@ -1483,7 +1484,7 @@ class java_util_concurrent_locks_AbstractOwnableSynchronizer : AllStatic {
  private:
   static int  _owner_offset;
  public:
-  static void initialize(TRAPS);
+  static void compute_offsets();
   static oop  get_owner_threadObj(oop obj);
 };
 
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index 1a64a6e6a58..987a0fe7eaa 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "jni.h"
 #include "classfile/classLoaderData.inline.hpp"
-#include "classfile/javaClasses.hpp"
+#include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
@@ -236,10 +236,17 @@ ModuleEntry* ModuleEntry::create_unnamed_module(ClassLoaderData* cld) {
   // The java.lang.Module for this loader's
   // corresponding unnamed module can be found in the java.lang.ClassLoader object.
   oop module = java_lang_ClassLoader::unnamedModule(cld->class_loader());
+
+  // Ensure that the unnamed module was correctly set when the class loader was constructed.
+  // Guarantee will cause a recognizable crash if the user code has circumvented calling the ClassLoader constructor.
+  ResourceMark rm;
+  guarantee(java_lang_Module::is_instance(module),
+            "The unnamed module for ClassLoader %s, is null or not an instance of java.lang.Module. The class loader has not been initialized correctly.",
+            cld->loader_name());
+
   ModuleEntry* unnamed_module = new_unnamed_module_entry(Handle(Thread::current(), module), cld);
 
-  // Store pointer to the ModuleEntry in the unnamed module's java.lang.Module
-  // object.
+  // Store pointer to the ModuleEntry in the unnamed module's java.lang.Module object.
   java_lang_Module::set_module_entry(module, unnamed_module);
 
   return unnamed_module;
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index 96e3f858563..fc696792e7d 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -29,7 +29,10 @@
 #include "classfile/stringTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/oopStorage.inline.hpp"
+#include "gc/shared/oopStorageParState.inline.hpp"
 #include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/filemap.hpp"
 #include "memory/metaspaceShared.hpp"
@@ -38,171 +41,196 @@
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
+#include "oops/weakHandle.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepointVerifiers.hpp"
+#include "runtime/timerTrace.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "services/diagnosticCommand.hpp"
-#include "utilities/hashtable.inline.hpp"
+#include "utilities/concurrentHashTable.inline.hpp"
+#include "utilities/concurrentHashTableTasks.inline.hpp"
 #include "utilities/macros.hpp"
 
-// the number of buckets a thread claims
-const int ClaimChunkSize = 32;
-
-#ifdef ASSERT
-class StableMemoryChecker : public StackObj {
-  enum { _bufsize = wordSize*4 };
-
-  address _region;
-  jint    _size;
-  u1      _save_buf[_bufsize];
-
-  int sample(u1* save_buf) {
-    if (_size <= _bufsize) {
-      memcpy(save_buf, _region, _size);
-      return _size;
-    } else {
-      // copy head and tail
-      memcpy(&save_buf[0],          _region,                      _bufsize/2);
-      memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2);
-      return (_bufsize/2)*2;
-    }
-  }
-
- public:
-  StableMemoryChecker(const void* region, jint size) {
-    _region = (address) region;
-    _size   = size;
-    sample(_save_buf);
-  }
-
-  bool verify() {
-    u1 check_buf[sizeof(_save_buf)];
-    int check_size = sample(check_buf);
-    return (0 == memcmp(_save_buf, check_buf, check_size));
-  }
-
-  void set_region(const void* region) { _region = (address) region; }
-};
-#endif
-
+// We prefer short chains of avg 2
+#define PREF_AVG_LIST_LEN   2
+// 2^24 is max size
+#define END_SIZE           24
+// If a chain gets to 32 something might be wrong
+#define REHASH_LEN         32
+// If we have as many dead items as 50% of the number of bucket
+#define CLEAN_DEAD_HIGH_WATER_MARK 0.5
 
 // --------------------------------------------------------------------------
 StringTable* StringTable::_the_table = NULL;
 bool StringTable::_shared_string_mapped = false;
-bool StringTable::_needs_rehashing = false;
-
-volatile int StringTable::_parallel_claimed_idx = 0;
-
 CompactHashtable<oop, char> StringTable::_shared_table;
+bool StringTable::_alt_hash = false;
 
-// Pick hashing algorithm
-unsigned int StringTable::hash_string(const jchar* s, int len) {
-  return use_alternate_hashcode() ? alt_hash_string(s, len) :
-                                    java_lang_String::hash_code(s, len);
+static juint murmur_seed = 0;
+
+uintx hash_string(const jchar* s, int len, bool useAlt) {
+  return  useAlt ?
+    AltHashing::murmur3_32(murmur_seed, s, len) :
+    java_lang_String::hash_code(s, len);
 }
 
-unsigned int StringTable::alt_hash_string(const jchar* s, int len) {
-  return AltHashing::murmur3_32(seed(), s, len);
-}
-
-unsigned int StringTable::hash_string(oop string) {
-  EXCEPTION_MARK;
-  if (string == NULL) {
-    return hash_string((jchar*)NULL, 0);
-  }
-  ResourceMark rm(THREAD);
-  // All String oops are hashed as unicode
-  int length;
-  jchar* chars = java_lang_String::as_unicode_string(string, length, THREAD);
-  if (chars != NULL) {
-    return hash_string(chars, length);
-  } else {
-    vm_exit_out_of_memory(length, OOM_MALLOC_ERROR, "unable to create Unicode string for verification");
+class StringTableConfig : public StringTableHash::BaseConfig {
+ private:
+ public:
+  static uintx get_hash(WeakHandle<vm_string_table_data> const& value,
+                        bool* is_dead) {
+    EXCEPTION_MARK;
+    oop val_oop = value.peek();
+    if (val_oop == NULL) {
+      *is_dead = true;
+      return 0;
+    }
+    *is_dead = false;
+    ResourceMark rm(THREAD);
+    // All String oops are hashed as unicode
+    int length;
+    jchar* chars = java_lang_String::as_unicode_string(val_oop, length, THREAD);
+    if (chars != NULL) {
+      return hash_string(chars, length, StringTable::_alt_hash);
+    }
+    vm_exit_out_of_memory(length, OOM_MALLOC_ERROR, "get hash from oop");
     return 0;
   }
-}
+  // We use default allocation/deallocation but counted
+  static void* allocate_node(size_t size,
+                             WeakHandle<vm_string_table_data> const& value) {
+    StringTable::item_added();
+    return StringTableHash::BaseConfig::allocate_node(size, value);
+  }
+  static void free_node(void* memory,
+                        WeakHandle<vm_string_table_data> const& value) {
+    value.release();
+    StringTableHash::BaseConfig::free_node(memory, value);
+    StringTable::item_removed();
+  }
+};
 
-oop StringTable::string_object(HashtableEntry<oop, mtSymbol>* entry) {
-  return RootAccess<ON_PHANTOM_OOP_REF>::oop_load(entry->literal_addr());
-}
+class StringTableLookupJchar : StackObj {
+ private:
+  Thread* _thread;
+  uintx _hash;
+  int _len;
+  const jchar* _str;
+  Handle _found;
 
-oop StringTable::string_object_no_keepalive(HashtableEntry<oop, mtSymbol>* entry) {
-  // The AS_NO_KEEPALIVE peeks at the oop without keeping it alive.
-  // This is *very dangerous* in general but is okay in this specific
-  // case. The subsequent oop_load keeps the oop alive if it it matched
-  // the jchar* string.
-  return RootAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(entry->literal_addr());
-}
-
-void StringTable::set_string_object(HashtableEntry<oop, mtSymbol>* entry, oop string) {
-  RootAccess<ON_PHANTOM_OOP_REF>::oop_store(entry->literal_addr(), string);
-}
-
-oop StringTable::lookup_shared(jchar* name, int len, unsigned int hash) {
-  assert(hash == java_lang_String::hash_code(name, len),
-         "hash must be computed using java_lang_String::hash_code");
-  return _shared_table.lookup((const char*)name, hash, len);
-}
-
-oop StringTable::lookup_in_main_table(int index, jchar* name,
-                                      int len, unsigned int hash) {
-  int count = 0;
-  for (HashtableEntry<oop, mtSymbol>* l = bucket(index); l != NULL; l = l->next()) {
-    count++;
-    if (l->hash() == hash) {
-      if (java_lang_String::equals(string_object_no_keepalive(l), name, len)) {
-        // We must perform a new load with string_object() that keeps the string
-        // alive as we must expose the oop as strongly reachable when exiting
-        // this context, in case the oop gets published.
-        return string_object(l);
-      }
+ public:
+  StringTableLookupJchar(Thread* thread, uintx hash, const jchar* key, int len)
+    : _thread(thread), _hash(hash), _str(key), _len(len) {
+  }
+  uintx get_hash() const {
+    return _hash;
+  }
+  bool equals(WeakHandle<vm_string_table_data>* value, bool* is_dead) {
+    oop val_oop = value->peek();
+    if (val_oop == NULL) {
+      // dead oop, mark this hash dead for cleaning
+      *is_dead = true;
+      return false;
     }
+    bool equals = java_lang_String::equals(val_oop, (jchar*)_str, _len);
+    if (!equals) {
+      return false;
+    }
+    // Need to resolve weak handle and Handleize through possible safepoint.
+     _found = Handle(_thread, value->resolve());
+    return true;
   }
-  // If the bucket size is too deep check if this hash code is insufficient.
-  if (count >= rehash_count && !needs_rehashing()) {
-    _needs_rehashing = check_rehash_table(count);
+};
+
+class StringTableLookupOop : public StackObj {
+ private:
+  Thread* _thread;
+  uintx _hash;
+  Handle _find;
+  Handle _found;  // Might be a different oop with the same value that's already
+                  // in the table, which is the point.
+ public:
+  StringTableLookupOop(Thread* thread, uintx hash, Handle handle)
+    : _thread(thread), _hash(hash), _find(handle) { }
+
+  uintx get_hash() const {
+    return _hash;
   }
-  return NULL;
+
+  bool equals(WeakHandle<vm_string_table_data>* value, bool* is_dead) {
+    oop val_oop = value->peek();
+    if (val_oop == NULL) {
+      // dead oop, mark this hash dead for cleaning
+      *is_dead = true;
+      return false;
+    }
+    bool equals = java_lang_String::equals(_find(), val_oop);
+    if (!equals) {
+      return false;
+    }
+    // Need to resolve weak handle and Handleize through possible safepoint.
+    _found = Handle(_thread, value->resolve());
+    return true;
+  }
+};
+
+static size_t ceil_pow_2(uintx val) {
+  size_t ret;
+  for (ret = 1; ((size_t)1 << ret) < val; ++ret);
+  return ret;
 }
 
-
-oop StringTable::basic_add(int index_arg, Handle string, jchar* name,
-                           int len, unsigned int hashValue_arg, TRAPS) {
-
-  assert(java_lang_String::equals(string(), name, len),
-         "string must be properly initialized");
-  // Cannot hit a safepoint in this function because the "this" pointer can move.
-  NoSafepointVerifier nsv;
-
-  // Check if the symbol table has been rehashed, if so, need to recalculate
-  // the hash value and index before second lookup.
-  unsigned int hashValue;
-  int index;
-  if (use_alternate_hashcode()) {
-    hashValue = alt_hash_string(name, len);
-    index = hash_to_index(hashValue);
-  } else {
-    hashValue = hashValue_arg;
-    index = index_arg;
-  }
-
-  // Since look-up was done lock-free, we need to check if another
-  // thread beat us in the race to insert the symbol.
-
-  // No need to lookup the shared table from here since the caller (intern()) already did
-  oop test = lookup_in_main_table(index, name, len, hashValue); // calls lookup(u1*, int)
-  if (test != NULL) {
-    // Entry already added
-    return test;
-  }
-
-  HashtableEntry<oop, mtSymbol>* entry = new_entry(hashValue, string());
-  add_entry(index, entry);
-  return string();
+StringTable::StringTable() : _local_table(NULL), _current_size(0), _has_work(0),
+  _needs_rehashing(false), _weak_handles(NULL), _items(0), _uncleaned_items(0) {
+  _weak_handles = new OopStorage("StringTable weak",
+                                 StringTableWeakAlloc_lock,
+                                 StringTableWeakActive_lock);
+  size_t start_size_log_2 = ceil_pow_2(StringTableSize);
+  _current_size = ((size_t)1) << start_size_log_2;
+  log_trace(stringtable)("Start size: " SIZE_FORMAT " (" SIZE_FORMAT ")",
+                         _current_size, start_size_log_2);
+  _local_table = new StringTableHash(start_size_log_2, END_SIZE, REHASH_LEN);
 }
 
+size_t StringTable::item_added() {
+  return Atomic::add((size_t)1, &(the_table()->_items));
+}
 
+size_t StringTable::items_to_clean(size_t ncl) {
+  size_t total = Atomic::add((size_t)ncl, &(the_table()->_uncleaned_items));
+  log_trace(stringtable)(
+     "Uncleaned items:" SIZE_FORMAT " added: " SIZE_FORMAT " total:" SIZE_FORMAT,
+     the_table()->_uncleaned_items, ncl, total);
+  return total;
+}
+
+void StringTable::item_removed() {
+  Atomic::add((size_t)-1, &(the_table()->_items));
+  Atomic::add((size_t)-1, &(the_table()->_uncleaned_items));
+}
+
+double StringTable::get_load_factor() {
+  return (_items*1.0)/_current_size;
+}
+
+double StringTable::get_dead_factor() {
+  return (_uncleaned_items*1.0)/_current_size;
+}
+
+size_t StringTable::table_size(Thread* thread) {
+  return ((size_t)(1)) << _local_table->get_size_log2(thread != NULL ? thread
+                                                      : Thread::current());
+}
+
+void StringTable::trigger_concurrent_work() {
+  MutexLockerEx ml(Service_lock, Mutex::_no_safepoint_check_flag);
+  the_table()->_has_work = true;
+  Service_lock->notify_all();
+}
+
+// Probing
 oop StringTable::lookup(Symbol* symbol) {
   ResourceMark rm;
   int length;
@@ -211,71 +239,45 @@ oop StringTable::lookup(Symbol* symbol) {
 }
 
 oop StringTable::lookup(jchar* name, int len) {
-  // shared table always uses java_lang_String::hash_code
   unsigned int hash = java_lang_String::hash_code(name, len);
-  oop string = lookup_shared(name, len, hash);
+  oop string = StringTable::the_table()->lookup_shared(name, len, hash);
   if (string != NULL) {
     return string;
   }
-  if (use_alternate_hashcode()) {
-    hash = alt_hash_string(name, len);
+  if (StringTable::_alt_hash) {
+    hash = hash_string(name, len, true);
   }
-  int index = the_table()->hash_to_index(hash);
-  string = the_table()->lookup_in_main_table(index, name, len, hash);
-
-  return string;
+  return StringTable::the_table()->do_lookup(name, len, hash);
 }
 
-oop StringTable::intern(Handle string_or_null, jchar* name,
-                        int len, TRAPS) {
-  // shared table always uses java_lang_String::hash_code
-  unsigned int hashValue = java_lang_String::hash_code(name, len);
-  oop found_string = lookup_shared(name, len, hashValue);
-  if (found_string != NULL) {
-    return found_string;
+class StringTableGet : public StackObj {
+  Thread* _thread;
+  Handle  _return;
+ public:
+  StringTableGet(Thread* thread) : _thread(thread) {}
+  void operator()(WeakHandle<vm_string_table_data>* val) {
+    oop result = val->resolve();
+    assert(result != NULL, "Result should be reachable");
+    _return = Handle(_thread, result);
   }
-  if (use_alternate_hashcode()) {
-    hashValue = alt_hash_string(name, len);
+  oop get_res_oop() {
+    return _return();
   }
-  int index = the_table()->hash_to_index(hashValue);
-  found_string = the_table()->lookup_in_main_table(index, name, len, hashValue);
+};
 
-  // Found
-  if (found_string != NULL) {
-    return found_string;
+oop StringTable::do_lookup(jchar* name, int len, uintx hash) {
+  Thread* thread = Thread::current();
+  StringTableLookupJchar lookup(thread, hash, name, len);
+  StringTableGet stg(thread);
+  bool rehash_warning;
+  _local_table->get(thread, lookup, stg, &rehash_warning);
+  if (rehash_warning) {
+    _needs_rehashing = true;
   }
-
-  debug_only(StableMemoryChecker smc(name, len * sizeof(name[0])));
-  assert(!Universe::heap()->is_in_reserved(name),
-         "proposed name of symbol must be stable");
-
-  HandleMark hm(THREAD);  // cleanup strings created
-  Handle string;
-  // try to reuse the string if possible
-  if (!string_or_null.is_null()) {
-    string = string_or_null;
-  } else {
-    string = java_lang_String::create_from_unicode(name, len, CHECK_NULL);
-  }
-
-  // Deduplicate the string before it is interned. Note that we should never
-  // deduplicate a string after it has been interned. Doing so will counteract
-  // compiler optimizations done on e.g. interned string literals.
-  Universe::heap()->deduplicate_string(string());
-
-  // Grab the StringTable_lock before getting the_table() because it could
-  // change at safepoint.
-  oop added_or_found;
-  {
-    MutexLocker ml(StringTable_lock, THREAD);
-    // Otherwise, add to symbol to table
-    added_or_found = the_table()->basic_add(index, string, name, len,
-                                  hashValue, CHECK_NULL);
-  }
-
-  return added_or_found;
+  return stg.get_res_oop();
 }
 
+// Interning
 oop StringTable::intern(Symbol* symbol, TRAPS) {
   if (symbol == NULL) return NULL;
   ResourceMark rm(THREAD);
@@ -286,19 +288,17 @@ oop StringTable::intern(Symbol* symbol, TRAPS) {
   return result;
 }
 
-
-oop StringTable::intern(oop string, TRAPS)
-{
+oop StringTable::intern(oop string, TRAPS) {
   if (string == NULL) return NULL;
   ResourceMark rm(THREAD);
   int length;
   Handle h_string (THREAD, string);
-  jchar* chars = java_lang_String::as_unicode_string(string, length, CHECK_NULL);
+  jchar* chars = java_lang_String::as_unicode_string(string, length,
+                                                     CHECK_NULL);
   oop result = intern(h_string, chars, length, CHECK_NULL);
   return result;
 }
 
-
 oop StringTable::intern(const char* utf8_string, TRAPS) {
   if (utf8_string == NULL) return NULL;
   ResourceMark rm(THREAD);
@@ -310,342 +310,451 @@ oop StringTable::intern(const char* utf8_string, TRAPS) {
   return result;
 }
 
-void StringTable::unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) {
-  BucketUnlinkContext context;
-  buckets_unlink_or_oops_do(is_alive, f, 0, the_table()->table_size(), &context);
-  _the_table->bulk_free_entries(&context);
-  *processed = context._num_processed;
-  *removed = context._num_removed;
-}
-
-void StringTable::possibly_parallel_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) {
-  // Readers of the table are unlocked, so we should only be removing
-  // entries at a safepoint.
-  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
-  const int limit = the_table()->table_size();
-
-  BucketUnlinkContext context;
-  for (;;) {
-    // Grab next set of buckets to scan
-    int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
-    if (start_idx >= limit) {
-      // End of table
-      break;
-    }
-
-    int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-    buckets_unlink_or_oops_do(is_alive, f, start_idx, end_idx, &context);
+oop StringTable::intern(Handle string_or_null_h, jchar* name, int len, TRAPS) {
+  // shared table always uses java_lang_String::hash_code
+  unsigned int hash = java_lang_String::hash_code(name, len);
+  oop found_string = StringTable::the_table()->lookup_shared(name, len, hash);
+  if (found_string != NULL) {
+    return found_string;
   }
-  _the_table->bulk_free_entries(&context);
-  *processed = context._num_processed;
-  *removed = context._num_removed;
-}
-
-void StringTable::buckets_oops_do(OopClosure* f, int start_idx, int end_idx) {
-  const int limit = the_table()->table_size();
-
-  assert(0 <= start_idx && start_idx <= limit,
-         "start_idx (%d) is out of bounds", start_idx);
-  assert(0 <= end_idx && end_idx <= limit,
-         "end_idx (%d) is out of bounds", end_idx);
-  assert(start_idx <= end_idx,
-         "Index ordering: start_idx=%d, end_idx=%d",
-         start_idx, end_idx);
-
-  for (int i = start_idx; i < end_idx; i += 1) {
-    HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
-    while (entry != NULL) {
-      assert(!entry->is_shared(), "CDS not used for the StringTable");
-
-      f->do_oop((oop*)entry->literal_addr());
-
-      entry = entry->next();
-    }
+  if (StringTable::_alt_hash) {
+    hash = hash_string(name, len, true);
   }
+  return StringTable::the_table()->do_intern(string_or_null_h, name, len,
+                                             hash, CHECK_NULL);
 }
 
-void StringTable::buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, BucketUnlinkContext* context) {
-  const int limit = the_table()->table_size();
+class StringTableCreateEntry : public StackObj {
+ private:
+   Thread* _thread;
+   Handle  _return;
+   Handle  _store;
+ public:
+  StringTableCreateEntry(Thread* thread, Handle store)
+    : _thread(thread), _store(store) {}
 
-  assert(0 <= start_idx && start_idx <= limit,
-         "start_idx (%d) is out of bounds", start_idx);
-  assert(0 <= end_idx && end_idx <= limit,
-         "end_idx (%d) is out of bounds", end_idx);
-  assert(start_idx <= end_idx,
-         "Index ordering: start_idx=%d, end_idx=%d",
-         start_idx, end_idx);
+  WeakHandle<vm_string_table_data> operator()() { // No dups found
+    WeakHandle<vm_string_table_data> wh =
+      WeakHandle<vm_string_table_data>::create(_store);
+    return wh;
+  }
+  void operator()(bool inserted, WeakHandle<vm_string_table_data>* val) {
+    oop result = val->resolve();
+    assert(result != NULL, "Result should be reachable");
+    _return = Handle(_thread, result);
+  }
+  oop get_return() const {
+    return _return();
+  }
+};
 
-  for (int i = start_idx; i < end_idx; ++i) {
-    HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i);
-    HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
-    while (entry != NULL) {
-      assert(!entry->is_shared(), "CDS not used for the StringTable");
+oop StringTable::do_intern(Handle string_or_null_h, jchar* name,
+                           int len, uintx hash, TRAPS) {
+  HandleMark hm(THREAD);  // cleanup strings created
+  Handle string_h;
 
-      if (is_alive->do_object_b(string_object_no_keepalive(entry))) {
-        if (f != NULL) {
-          f->do_oop(entry->literal_addr());
-        }
-        p = entry->next_addr();
-      } else {
-        *p = entry->next();
-        context->free_entry(entry);
-      }
-      context->_num_processed++;
-      entry = *p;
+  if (!string_or_null_h.is_null()) {
+    string_h = string_or_null_h;
+  } else {
+    string_h = java_lang_String::create_from_unicode(name, len, CHECK_NULL);
+  }
+
+  // Deduplicate the string before it is interned. Note that we should never
+  // deduplicate a string after it has been interned. Doing so will counteract
+  // compiler optimizations done on e.g. interned string literals.
+  Universe::heap()->deduplicate_string(string_h());
+
+  assert(java_lang_String::equals(string_h(), name, len),
+         "string must be properly initialized");
+  assert(len == java_lang_String::length(string_h()), "Must be same length");
+  StringTableLookupOop lookup(THREAD, hash, string_h);
+  StringTableCreateEntry stc(THREAD, string_h);
+
+  bool rehash_warning;
+  _local_table->get_insert_lazy(THREAD, lookup, stc, stc, &rehash_warning);
+  if (rehash_warning) {
+    _needs_rehashing = true;
+  }
+  return stc.get_return();
+}
+
+// GC support
+class StringTableIsAliveCounter : public BoolObjectClosure {
+  BoolObjectClosure* _real_boc;
+ public:
+  size_t _count;
+  size_t _count_total;
+  StringTableIsAliveCounter(BoolObjectClosure* boc) : _real_boc(boc), _count(0),
+                                                      _count_total(0) {}
+  bool do_object_b(oop obj) {
+    bool ret = _real_boc->do_object_b(obj);
+    if (!ret) {
+      ++_count;
     }
+    ++_count_total;
+    return ret;
+  }
+};
+
+void StringTable::unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f,
+                                    int* processed, int* removed) {
+  DoNothingClosure dnc;
+  assert(is_alive != NULL, "No closure");
+  StringTableIsAliveCounter stiac(is_alive);
+  OopClosure* tmp = f != NULL ? f : &dnc;
+
+  StringTable::the_table()->_weak_handles->weak_oops_do(&stiac, tmp);
+
+  StringTable::the_table()->items_to_clean(stiac._count);
+  StringTable::the_table()->check_concurrent_work();
+  if (processed != NULL) {
+    *processed = (int) stiac._count_total;
+  }
+  if (removed != NULL) {
+    *removed = (int) stiac._count;
   }
 }
 
 void StringTable::oops_do(OopClosure* f) {
-  buckets_oops_do(f, 0, the_table()->table_size());
+  assert(f != NULL, "No closure");
+  StringTable::the_table()->_weak_handles->oops_do(f);
 }
 
-void StringTable::possibly_parallel_oops_do(OopClosure* f) {
-  const int limit = the_table()->table_size();
+void StringTable::possibly_parallel_unlink(
+   OopStorage::ParState<false, false>* _par_state_string, BoolObjectClosure* cl,
+   int* processed, int* removed)
+{
+  DoNothingClosure dnc;
+  assert(cl != NULL, "No closure");
+  StringTableIsAliveCounter stiac(cl);
 
-  for (;;) {
-    // Grab next set of buckets to scan
-    int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
-    if (start_idx >= limit) {
-      // End of table
-      break;
+  _par_state_string->weak_oops_do(&stiac, &dnc);
+
+  StringTable::the_table()->items_to_clean(stiac._count);
+  StringTable::the_table()->check_concurrent_work();
+  *processed = (int) stiac._count_total;
+  *removed = (int) stiac._count;
+}
+
+void StringTable::possibly_parallel_oops_do(
+   OopStorage::ParState<false /* concurrent */, false /* const */>*
+   _par_state_string, OopClosure* f)
+{
+  assert(f != NULL, "No closure");
+  _par_state_string->oops_do(f);
+}
+
+// Concurrent work
+void StringTable::grow(JavaThread* jt) {
+  StringTableHash::GrowTask gt(_local_table);
+  if (!gt.prepare(jt)) {
+    return;
+  }
+  log_trace(stringtable)("Started to grow");
+  {
+    TraceTime timer("Grow", TRACETIME_LOG(Debug, stringtable, perf));
+    while (gt.doTask(jt)) {
+      gt.pause(jt);
+      {
+        ThreadBlockInVM tbivm(jt);
+      }
+      gt.cont(jt);
     }
+  }
+  gt.done(jt);
+  _current_size = table_size(jt);
+  log_debug(stringtable)("Grown to size:" SIZE_FORMAT, _current_size);
+}
 
-    int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-    buckets_oops_do(f, start_idx, end_idx);
+struct StringTableDoDelete : StackObj {
+  long _count;
+  StringTableDoDelete() : _count(0) {}
+  void operator()(WeakHandle<vm_string_table_data>* val) {
+    ++_count;
+  }
+};
+
+struct StringTableDeleteCheck : StackObj {
+  long _count;
+  long _item;
+  StringTableDeleteCheck() : _count(0), _item(0) {}
+  bool operator()(WeakHandle<vm_string_table_data>* val) {
+    ++_item;
+    oop tmp = val->peek();
+    if (tmp == NULL) {
+      ++_count;
+      return true;
+    } else {
+      return false;
+    }
+  }
+};
+
+void StringTable::clean_dead_entries(JavaThread* jt) {
+  StringTableHash::BulkDeleteTask bdt(_local_table);
+  if (!bdt.prepare(jt)) {
+    return;
+  }
+
+  StringTableDeleteCheck stdc;
+  StringTableDoDelete stdd;
+  bool interrupted = false;
+  {
+    TraceTime timer("Clean", TRACETIME_LOG(Debug, stringtable, perf));
+    while(bdt.doTask(jt, stdc, stdd)) {
+      bdt.pause(jt);
+      {
+        ThreadBlockInVM tbivm(jt);
+      }
+      if (!bdt.cont(jt)) {
+        interrupted = true;
+        break;
+      }
+    }
+  }
+  if (interrupted) {
+    _has_work = true;
+  } else {
+    bdt.done(jt);
+  }
+  log_debug(stringtable)("Cleaned %ld of %ld", stdc._count, stdc._item);
+}
+
+void StringTable::check_concurrent_work() {
+  if (_has_work) {
+    return;
+  }
+  double load_factor = StringTable::get_load_factor();
+  double dead_factor = StringTable::get_dead_factor();
+  // We should clean/resize if we have more dead than alive,
+  // more items than preferred load factor or
+  // more dead items than water mark.
+  if ((dead_factor > load_factor) ||
+      (load_factor > PREF_AVG_LIST_LEN) ||
+      (dead_factor > CLEAN_DEAD_HIGH_WATER_MARK)) {
+    log_debug(stringtable)("Concurrent work triggered, live factor:%g dead factor:%g",
+                           load_factor, dead_factor);
+    trigger_concurrent_work();
   }
 }
 
+void StringTable::concurrent_work(JavaThread* jt) {
+  _has_work = false;
+  double load_factor = get_load_factor();
+  log_debug(stringtable, perf)("Concurrent work, live factor: %g", load_factor);
+  // We prefer growing, since that also removes dead items
+  if (load_factor > PREF_AVG_LIST_LEN && !_local_table->is_max_size_reached()) {
+    grow(jt);
+  } else {
+    clean_dead_entries(jt);
+  }
+}
+
+void StringTable::do_concurrent_work(JavaThread* jt) {
+  StringTable::the_table()->concurrent_work(jt);
+}
+
+// Rehash
+bool StringTable::do_rehash() {
+  if (!_local_table->is_safepoint_safe()) {
+    return false;
+  }
+
+  // We use max size
+  StringTableHash* new_table = new StringTableHash(END_SIZE, END_SIZE, REHASH_LEN);
+  // Use alt hash from now on
+  _alt_hash = true;
+  if (!_local_table->try_move_nodes_to(Thread::current(), new_table)) {
+    _alt_hash = false;
+    delete new_table;
+    return false;
+  }
+
+  // free old table
+  delete _local_table;
+  _local_table = new_table;
+
+  return true;
+}
+
+void StringTable::try_rehash_table() {
+  static bool rehashed = false;
+  log_debug(stringtable)("Table imbalanced, rehashing called.");
+
+  // Grow instead of rehash.
+  if (get_load_factor() > PREF_AVG_LIST_LEN &&
+      !_local_table->is_max_size_reached()) {
+    log_debug(stringtable)("Choosing growing over rehashing.");
+    trigger_concurrent_work();
+    _needs_rehashing = false;
+    return;
+  }
+  // Already rehashed.
+  if (rehashed) {
+    log_warning(stringtable)("Rehashing already done, still long lists.");
+    trigger_concurrent_work();
+    _needs_rehashing = false;
+    return;
+  }
+
+  murmur_seed = AltHashing::compute_seed();
+  {
+    if (do_rehash()) {
+      rehashed = true;
+    } else {
+      log_info(stringtable)("Resizes in progress rehashing skipped.");
+    }
+  }
+  _needs_rehashing = false;
+}
+
+void StringTable::rehash_table() {
+  StringTable::the_table()->try_rehash_table();
+}
+
+// Statistics
+static int literal_size(oop obj) {
+  // NOTE: this would over-count if (pre-JDK8)
+  // java_lang_Class::has_offset_field() is true and the String.value array is
+  // shared by several Strings. However, starting from JDK8, the String.value
+  // array is not shared anymore.
+  if (obj == NULL) {
+    return 0;
+  } else if (obj->klass() == SystemDictionary::String_klass()) {
+    return (obj->size() + java_lang_String::value(obj)->size()) * HeapWordSize;
+  } else {
+    return obj->size();
+  }
+}
+
+struct SizeFunc : StackObj {
+  size_t operator()(WeakHandle<vm_string_table_data>* val) {
+    oop s = val->peek();
+    if (s == NULL) {
+      // Dead
+      return 0;
+    }
+    return literal_size(s);
+  };
+};
+
+void StringTable::print_table_statistics(outputStream* st,
+                                         const char* table_name) {
+  SizeFunc sz;
+  _local_table->statistics_to(Thread::current(), sz, st, table_name);
+}
+
+// Verification
+class VerifyStrings : StackObj {
+ public:
+  bool operator()(WeakHandle<vm_string_table_data>* val) {
+    oop s = val->peek();
+    if (s != NULL) {
+      assert(java_lang_String::length(s) >= 0, "Length on string must work.");
+    }
+    return true;
+  };
+};
+
 // This verification is part of Universe::verify() and needs to be quick.
-// See StringTable::verify_and_compare() below for exhaustive verification.
 void StringTable::verify() {
-  for (int i = 0; i < the_table()->table_size(); ++i) {
-    HashtableEntry<oop, mtSymbol>* p = the_table()->bucket(i);
-    for ( ; p != NULL; p = p->next()) {
-      oop s = string_object_no_keepalive(p);
-      guarantee(s != NULL, "interned string is NULL");
-      unsigned int h = hash_string(s);
-      guarantee(p->hash() == h, "broken hash in string table entry");
-      guarantee(the_table()->hash_to_index(h) == i,
-                "wrong index in string table");
-    }
+  Thread* thr = Thread::current();
+  VerifyStrings vs;
+  if (!the_table()->_local_table->try_scan(thr, vs)) {
+    log_info(stringtable)("verify unavailable at this moment");
   }
 }
 
+// Verification and comp
+class VerifyCompStrings : StackObj {
+  GrowableArray<oop>* _oops;
+ public:
+  size_t _errors;
+  VerifyCompStrings(GrowableArray<oop>* oops) : _oops(oops), _errors(0) {}
+  bool operator()(WeakHandle<vm_string_table_data>* val) {
+    oop s = val->resolve();
+    if (s == NULL) {
+      return true;
+    }
+    int len = _oops->length();
+    for (int i = 0; i < len; i++) {
+      bool eq = java_lang_String::equals(s, _oops->at(i));
+      assert(!eq, "Duplicate strings");
+      if (eq) {
+        _errors++;
+      }
+    }
+    _oops->push(s);
+    return true;
+  };
+};
+
+size_t StringTable::verify_and_compare_entries() {
+  Thread* thr = Thread::current();
+  GrowableArray<oop>* oops =
+    new (ResourceObj::C_HEAP, mtInternal)
+      GrowableArray<oop>((int)the_table()->_current_size, true);
+
+  VerifyCompStrings vcs(oops);
+  if (!the_table()->_local_table->try_scan(thr, vcs)) {
+    log_info(stringtable)("verify unavailable at this moment");
+  }
+  delete oops;
+  return vcs._errors;
+}
+
+// Dumping
+class PrintString : StackObj {
+  Thread* _thr;
+  outputStream* _st;
+ public:
+  PrintString(Thread* thr, outputStream* st) : _thr(thr), _st(st) {}
+  bool operator()(WeakHandle<vm_string_table_data>* val) {
+    oop s = val->peek();
+    if (s == NULL) {
+      return true;
+    }
+    typeArrayOop value     = java_lang_String::value_no_keepalive(s);
+    int          length    = java_lang_String::length(s);
+    bool         is_latin1 = java_lang_String::is_latin1(s);
+
+    if (length <= 0) {
+      _st->print("%d: ", length);
+    } else {
+      ResourceMark rm(_thr);
+      int utf8_length = length;
+      char* utf8_string;
+
+      if (!is_latin1) {
+        jchar* chars = value->char_at_addr(0);
+        utf8_string = UNICODE::as_utf8(chars, utf8_length);
+      } else {
+        jbyte* bytes = value->byte_at_addr(0);
+        utf8_string = UNICODE::as_utf8(bytes, utf8_length);
+      }
+
+      _st->print("%d: ", utf8_length);
+      HashtableTextDump::put_utf8(_st, utf8_string, utf8_length);
+    }
+    _st->cr();
+    return true;
+  };
+};
+
 void StringTable::dump(outputStream* st, bool verbose) {
   if (!verbose) {
-    the_table()->print_table_statistics(st, "StringTable", string_object_no_keepalive);
+    the_table()->print_table_statistics(st, "StringTable");
   } else {
-    Thread* THREAD = Thread::current();
+    Thread* thr = Thread::current();
+    ResourceMark rm(thr);
     st->print_cr("VERSION: 1.1");
-    for (int i = 0; i < the_table()->table_size(); ++i) {
-      HashtableEntry<oop, mtSymbol>* p = the_table()->bucket(i);
-      for ( ; p != NULL; p = p->next()) {
-        oop s = string_object_no_keepalive(p);
-        typeArrayOop value     = java_lang_String::value_no_keepalive(s);
-        int          length    = java_lang_String::length(s);
-        bool         is_latin1 = java_lang_String::is_latin1(s);
-
-        if (length <= 0) {
-          st->print("%d: ", length);
-        } else {
-          ResourceMark rm(THREAD);
-          int utf8_length = length;
-          char* utf8_string;
-
-          if (!is_latin1) {
-            jchar* chars = value->char_at_addr(0);
-            utf8_string = UNICODE::as_utf8(chars, utf8_length);
-          } else {
-            jbyte* bytes = value->byte_at_addr(0);
-            utf8_string = UNICODE::as_utf8(bytes, utf8_length);
-          }
-
-          st->print("%d: ", utf8_length);
-          HashtableTextDump::put_utf8(st, utf8_string, utf8_length);
-        }
-        st->cr();
-      }
+    PrintString ps(thr, st);
+    if (!the_table()->_local_table->try_scan(thr, ps)) {
+      st->print_cr("dump unavailable at this moment");
     }
   }
 }
 
-StringTable::VerifyRetTypes StringTable::compare_entries(
-                                      int bkt1, int e_cnt1,
-                                      HashtableEntry<oop, mtSymbol>* e_ptr1,
-                                      int bkt2, int e_cnt2,
-                                      HashtableEntry<oop, mtSymbol>* e_ptr2) {
-  // These entries are sanity checked by verify_and_compare_entries()
-  // before this function is called.
-  oop str1 = string_object_no_keepalive(e_ptr1);
-  oop str2 = string_object_no_keepalive(e_ptr2);
-
-  if (str1 == str2) {
-    tty->print_cr("ERROR: identical oop values (0x" PTR_FORMAT ") "
-                  "in entry @ bucket[%d][%d] and entry @ bucket[%d][%d]",
-                  p2i(str1), bkt1, e_cnt1, bkt2, e_cnt2);
-    return _verify_fail_continue;
-  }
-
-  if (java_lang_String::equals(str1, str2)) {
-    tty->print_cr("ERROR: identical String values in entry @ "
-                  "bucket[%d][%d] and entry @ bucket[%d][%d]",
-                  bkt1, e_cnt1, bkt2, e_cnt2);
-    return _verify_fail_continue;
-  }
-
-  return _verify_pass;
-}
-
-StringTable::VerifyRetTypes StringTable::verify_entry(int bkt, int e_cnt,
-                                                      HashtableEntry<oop, mtSymbol>* e_ptr,
-                                                      StringTable::VerifyMesgModes mesg_mode) {
-
-  VerifyRetTypes ret = _verify_pass;  // be optimistic
-
-  oop str = string_object_no_keepalive(e_ptr);
-  if (str == NULL) {
-    if (mesg_mode == _verify_with_mesgs) {
-      tty->print_cr("ERROR: NULL oop value in entry @ bucket[%d][%d]", bkt,
-                    e_cnt);
-    }
-    // NULL oop means no more verifications are possible
-    return _verify_fail_done;
-  }
-
-  if (str->klass() != SystemDictionary::String_klass()) {
-    if (mesg_mode == _verify_with_mesgs) {
-      tty->print_cr("ERROR: oop is not a String in entry @ bucket[%d][%d]",
-                    bkt, e_cnt);
-    }
-    // not a String means no more verifications are possible
-    return _verify_fail_done;
-  }
-
-  unsigned int h = hash_string(str);
-  if (e_ptr->hash() != h) {
-    if (mesg_mode == _verify_with_mesgs) {
-      tty->print_cr("ERROR: broken hash value in entry @ bucket[%d][%d], "
-                    "bkt_hash=%d, str_hash=%d", bkt, e_cnt, e_ptr->hash(), h);
-    }
-    ret = _verify_fail_continue;
-  }
-
-  if (the_table()->hash_to_index(h) != bkt) {
-    if (mesg_mode == _verify_with_mesgs) {
-      tty->print_cr("ERROR: wrong index value for entry @ bucket[%d][%d], "
-                    "str_hash=%d, hash_to_index=%d", bkt, e_cnt, h,
-                    the_table()->hash_to_index(h));
-    }
-    ret = _verify_fail_continue;
-  }
-
-  return ret;
-}
-
-// See StringTable::verify() above for the quick verification that is
-// part of Universe::verify(). This verification is exhaustive and
-// reports on every issue that is found. StringTable::verify() only
-// reports on the first issue that is found.
-//
-// StringTable::verify_entry() checks:
-// - oop value != NULL (same as verify())
-// - oop value is a String
-// - hash(String) == hash in entry (same as verify())
-// - index for hash == index of entry (same as verify())
-//
-// StringTable::compare_entries() checks:
-// - oops are unique across all entries
-// - String values are unique across all entries
-//
-int StringTable::verify_and_compare_entries() {
-  assert(StringTable_lock->is_locked(), "sanity check");
-
-  int  fail_cnt = 0;
-
-  // first, verify all the entries individually:
-  for (int bkt = 0; bkt < the_table()->table_size(); bkt++) {
-    HashtableEntry<oop, mtSymbol>* e_ptr = the_table()->bucket(bkt);
-    for (int e_cnt = 0; e_ptr != NULL; e_ptr = e_ptr->next(), e_cnt++) {
-      VerifyRetTypes ret = verify_entry(bkt, e_cnt, e_ptr, _verify_with_mesgs);
-      if (ret != _verify_pass) {
-        fail_cnt++;
-      }
-    }
-  }
-
-  // Optimization: if the above check did not find any failures, then
-  // the comparison loop below does not need to call verify_entry()
-  // before calling compare_entries(). If there were failures, then we
-  // have to call verify_entry() to see if the entry can be passed to
-  // compare_entries() safely. When we call verify_entry() in the loop
-  // below, we do so quietly to void duplicate messages and we don't
-  // increment fail_cnt because the failures have already been counted.
-  bool need_entry_verify = (fail_cnt != 0);
-
-  // second, verify all entries relative to each other:
-  for (int bkt1 = 0; bkt1 < the_table()->table_size(); bkt1++) {
-    HashtableEntry<oop, mtSymbol>* e_ptr1 = the_table()->bucket(bkt1);
-    for (int e_cnt1 = 0; e_ptr1 != NULL; e_ptr1 = e_ptr1->next(), e_cnt1++) {
-      if (need_entry_verify) {
-        VerifyRetTypes ret = verify_entry(bkt1, e_cnt1, e_ptr1,
-                                          _verify_quietly);
-        if (ret == _verify_fail_done) {
-          // cannot use the current entry to compare against other entries
-          continue;
-        }
-      }
-
-      for (int bkt2 = bkt1; bkt2 < the_table()->table_size(); bkt2++) {
-        HashtableEntry<oop, mtSymbol>* e_ptr2 = the_table()->bucket(bkt2);
-        int e_cnt2;
-        for (e_cnt2 = 0; e_ptr2 != NULL; e_ptr2 = e_ptr2->next(), e_cnt2++) {
-          if (bkt1 == bkt2 && e_cnt2 <= e_cnt1) {
-            // skip the entries up to and including the one that
-            // we're comparing against
-            continue;
-          }
-
-          if (need_entry_verify) {
-            VerifyRetTypes ret = verify_entry(bkt2, e_cnt2, e_ptr2,
-                                              _verify_quietly);
-            if (ret == _verify_fail_done) {
-              // cannot compare against this entry
-              continue;
-            }
-          }
-
-          // compare two entries, report and count any failures:
-          if (compare_entries(bkt1, e_cnt1, e_ptr1, bkt2, e_cnt2, e_ptr2)
-              != _verify_pass) {
-            fail_cnt++;
-          }
-        }
-      }
-    }
-  }
-  return fail_cnt;
-}
-
-// Create a new table and using alternate hash code, populate the new table
-// with the existing strings.   Set flag to use the alternate hash code afterwards.
-void StringTable::rehash_table() {
-  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
-  // This should never happen with -Xshare:dump but it might in testing mode.
-  if (DumpSharedSpaces) return;
-  StringTable* new_table = new StringTable();
-
-  // Rehash the table
-  the_table()->move_to(new_table);
-
-  // Delete the table and buckets (entries are reused in new table).
-  delete _the_table;
-  // Don't check if we need rehashing until the table gets unbalanced again.
-  // Then rehash with a new global seed.
-  _needs_rehashing = false;
-  _the_table = new_table;
-}
-
 // Utility for dumping strings
 StringtableDCmd::StringtableDCmd(outputStream* output, bool heap) :
                                  DCmdWithParser(output, heap),
@@ -671,14 +780,21 @@ int StringtableDCmd::num_arguments() {
   }
 }
 
-#if INCLUDE_CDS_JAVA_HEAP
 // Sharing
+#if INCLUDE_CDS_JAVA_HEAP
+oop StringTable::lookup_shared(jchar* name, int len, unsigned int hash) {
+  assert(hash == java_lang_String::hash_code(name, len),
+         "hash must be computed using java_lang_String::hash_code");
+  return _shared_table.lookup((const char*)name, hash, len);
+}
+
 oop StringTable::create_archived_string(oop s, Thread* THREAD) {
   assert(DumpSharedSpaces, "this function is only used with -Xshare:dump");
 
   oop new_s = NULL;
   typeArrayOop v = java_lang_String::value_no_keepalive(s);
-  typeArrayOop new_v = (typeArrayOop)MetaspaceShared::archive_heap_object(v, THREAD);
+  typeArrayOop new_v =
+    (typeArrayOop)MetaspaceShared::archive_heap_object(v, THREAD);
   if (new_v == NULL) {
     return NULL;
   }
@@ -692,51 +808,51 @@ oop StringTable::create_archived_string(oop s, Thread* THREAD) {
   return new_s;
 }
 
-bool StringTable::copy_shared_string(GrowableArray<MemRegion> *string_space,
-                                     CompactStringTableWriter* writer) {
+struct CopyToArchive : StackObj {
+  CompactStringTableWriter* _writer;
+  CopyToArchive(CompactStringTableWriter* writer) : _writer(writer) {}
+  bool operator()(WeakHandle<vm_string_table_data>* val) {
+    oop s = val->peek();
+    if (s == NULL) {
+      return true;
+    }
+    unsigned int hash = java_lang_String::hash_code(s);
+    if (hash == 0) {
+      return true;
+    }
+
+    java_lang_String::set_hash(s, hash);
+    oop new_s = StringTable::create_archived_string(s, Thread::current());
+    if (new_s == NULL) {
+      return true;
+    }
+
+    val->replace(new_s);
+    // add to the compact table
+    _writer->add(hash, new_s);
+    return true;
+  }
+};
+
+void StringTable::copy_shared_string_table(CompactStringTableWriter* writer) {
   assert(MetaspaceShared::is_heap_object_archiving_allowed(), "must be");
 
-  Thread* THREAD = Thread::current();
-  for (int i = 0; i < the_table()->table_size(); ++i) {
-    HashtableEntry<oop, mtSymbol>* bucket = the_table()->bucket(i);
-    for ( ; bucket != NULL; bucket = bucket->next()) {
-      oop s = string_object_no_keepalive(bucket);
-      unsigned int hash = java_lang_String::hash_code(s);
-      if (hash == 0) {
-        continue;
-      }
-
-      java_lang_String::set_hash(s, hash);
-      oop new_s = create_archived_string(s, THREAD);
-      if (new_s == NULL) {
-        continue;
-      }
-
-      // set the archived string in bucket
-      set_string_object(bucket, new_s);
-
-      // add to the compact table
-      writer->add(hash, new_s);
-    }
-  }
-
-  return true;
+  CopyToArchive copy(writer);
+  StringTable::the_table()->_local_table->do_scan(Thread::current(), copy);
 }
 
-void StringTable::write_to_archive(GrowableArray<MemRegion> *string_space) {
+void StringTable::write_to_archive() {
   assert(MetaspaceShared::is_heap_object_archiving_allowed(), "must be");
 
   _shared_table.reset();
-  int num_buckets = the_table()->number_of_entries() /
-                         SharedSymbolTableBucketSize;
+  int num_buckets = the_table()->_items / SharedSymbolTableBucketSize;
   // calculation of num_buckets can result in zero buckets, we need at least one
   CompactStringTableWriter writer(num_buckets > 1 ? num_buckets : 1,
                                   &MetaspaceShared::stats()->string);
 
   // Copy the interned strings into the "string space" within the java heap
-  if (copy_shared_string(string_space, &writer)) {
-    writer.dump(&_shared_table);
-  }
+  copy_shared_string_table(&writer);
+  writer.dump(&_shared_table);
 }
 
 void StringTable::serialize(SerializeClosure* soc) {
@@ -744,7 +860,8 @@ void StringTable::serialize(SerializeClosure* soc) {
   _shared_table.serialize(soc);
 
   if (soc->writing()) {
-    _shared_table.reset(); // Sanity. Make sure we don't use the shared table at dump time
+    // Sanity. Make sure we don't use the shared table at dump time
+    _shared_table.reset();
   } else if (!_shared_string_mapped) {
     _shared_table.reset();
   }
diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp
index fa99e4f32cd..ca056949930 100644
--- a/src/hotspot/share/classfile/stringTable.hpp
+++ b/src/hotspot/share/classfile/stringTable.hpp
@@ -25,109 +25,111 @@
 #ifndef SHARE_VM_CLASSFILE_STRINGTABLE_HPP
 #define SHARE_VM_CLASSFILE_STRINGTABLE_HPP
 
-#include "utilities/hashtable.hpp"
+#include "gc/shared/oopStorage.hpp"
+#include "gc/shared/oopStorageParState.hpp"
+#include "memory/allocation.hpp"
+#include "memory/padded.hpp"
+#include "oops/oop.hpp"
+#include "oops/weakHandle.hpp"
+#include "utilities/concurrentHashTable.hpp"
 
 template <class T, class N> class CompactHashtable;
 class CompactStringTableWriter;
-class FileMapInfo;
 class SerializeClosure;
 
-class StringTable : public RehashableHashtable<oop, mtSymbol> {
+class StringTable;
+class StringTableConfig;
+typedef ConcurrentHashTable<WeakHandle<vm_string_table_data>,
+                            StringTableConfig, mtSymbol> StringTableHash;
+
+class StringTableCreateEntry;
+
+class StringTable : public CHeapObj<mtSymbol>{
   friend class VMStructs;
   friend class Symbol;
+  friend class StringTableConfig;
+  friend class StringTableCreateEntry;
 
 private:
+  void grow(JavaThread* jt);
+  void clean_dead_entries(JavaThread* jt);
+
   // The string table
   static StringTable* _the_table;
-
   // Shared string table
   static CompactHashtable<oop, char> _shared_table;
   static bool _shared_string_mapped;
+  static bool _alt_hash;
+private:
 
-  // Set if one bucket is out of balance due to hash algorithm deficiency
-  static bool _needs_rehashing;
+   // Set if one bucket is out of balance due to hash algorithm deficiency
+  StringTableHash* _local_table;
+  size_t _current_size;
+  volatile bool _has_work;
+  volatile bool _needs_rehashing;
 
-  // Claimed high water mark for parallel chunked scanning
-  static volatile int _parallel_claimed_idx;
+  OopStorage* _weak_handles;
 
-  static oop intern(Handle string_or_null, jchar* chars, int length, TRAPS);
-  oop basic_add(int index, Handle string_or_null, jchar* name, int len,
-                unsigned int hashValue, TRAPS);
+  volatile size_t _items;
+  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile size_t));
+  volatile size_t _uncleaned_items;
+  DEFINE_PAD_MINUS_SIZE(2, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile size_t));
 
-  oop lookup_in_main_table(int index, jchar* chars, int length, unsigned int hashValue);
-  static oop lookup_shared(jchar* name, int len, unsigned int hash);
+  double get_load_factor();
+  double get_dead_factor();
 
-  // Apply the give oop closure to the entries to the buckets
-  // in the range [start_idx, end_idx).
-  static void buckets_oops_do(OopClosure* f, int start_idx, int end_idx);
+  void check_concurrent_work();
+  void trigger_concurrent_work();
 
-  typedef StringTable::BucketUnlinkContext BucketUnlinkContext;
-  // Unlink or apply the give oop closure to the entries to the buckets
-  // in the range [start_idx, end_idx). Unlinked bucket entries are collected in the given
-  // context to be freed later.
-  // This allows multiple threads to work on the table at once.
-  static void buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, BucketUnlinkContext* context);
+  static uintx item_added();
+  static void item_removed();
+  static size_t items_to_clean(size_t ncl);
 
-  // Hashing algorithm, used as the hash value used by the
-  //     StringTable for bucket selection and comparison (stored in the
-  //     HashtableEntry structures).  This is used in the String.intern() method.
-  static unsigned int hash_string(const jchar* s, int len);
-  static unsigned int hash_string(oop string);
-  static unsigned int alt_hash_string(const jchar* s, int len);
+  StringTable();
 
-  // Accessors for the string roots in the hashtable entries.
-  // Use string_object_no_keepalive() only when the value is not returned
-  // outside of a scope where a thread transition is possible.
-  static oop string_object(HashtableEntry<oop, mtSymbol>* entry);
-  static oop string_object_no_keepalive(HashtableEntry<oop, mtSymbol>* entry);
-  static void set_string_object(HashtableEntry<oop, mtSymbol>* entry, oop string);
+  static oop intern(Handle string_or_null_h, jchar* name, int len, TRAPS);
+  oop do_intern(Handle string_or_null, jchar* name, int len, uintx hash, TRAPS);
+  oop do_lookup(jchar* name, int len, uintx hash);
 
-  StringTable() : RehashableHashtable<oop, mtSymbol>((int)StringTableSize,
-                              sizeof (HashtableEntry<oop, mtSymbol>)) {}
+  void concurrent_work(JavaThread* jt);
+  void print_table_statistics(outputStream* st, const char* table_name);
 
-  StringTable(HashtableBucket<mtSymbol>* t, int number_of_entries)
-    : RehashableHashtable<oop, mtSymbol>((int)StringTableSize, sizeof (HashtableEntry<oop, mtSymbol>), t,
-                     number_of_entries) {}
-public:
+  void try_rehash_table();
+  bool do_rehash();
+
+ public:
   // The string table
   static StringTable* the_table() { return _the_table; }
+  size_t table_size(Thread* thread = NULL);
 
-  // Size of one bucket in the string table.  Used when checking for rollover.
-  static uint bucket_size() { return sizeof(HashtableBucket<mtSymbol>); }
+  static OopStorage* weak_storage() { return the_table()->_weak_handles; }
 
   static void create_table() {
     assert(_the_table == NULL, "One string table allowed.");
     _the_table = new StringTable();
   }
 
+  static void do_concurrent_work(JavaThread* jt);
+  static bool has_work() { return the_table()->_has_work; }
+
   // GC support
   //   Delete pointers to otherwise-unreachable objects.
-  static void unlink_or_oops_do(BoolObjectClosure* cl, OopClosure* f) {
-    int processed = 0;
-    int removed = 0;
-    unlink_or_oops_do(cl, f, &processed, &removed);
-  }
   static void unlink(BoolObjectClosure* cl) {
-    int processed = 0;
-    int removed = 0;
-    unlink_or_oops_do(cl, NULL, &processed, &removed);
-  }
-  static void unlink_or_oops_do(BoolObjectClosure* cl, OopClosure* f, int* processed, int* removed);
-  static void unlink(BoolObjectClosure* cl, int* processed, int* removed) {
-    unlink_or_oops_do(cl, NULL, processed, removed);
+    unlink_or_oops_do(cl);
   }
+  static void unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f = NULL,
+                                int* processed = NULL, int* removed = NULL);
+
   // Serially invoke "f->do_oop" on the locations of all oops in the table.
   static void oops_do(OopClosure* f);
 
   // Possibly parallel versions of the above
-  static void possibly_parallel_unlink_or_oops_do(BoolObjectClosure* cl, OopClosure* f, int* processed, int* removed);
-  static void possibly_parallel_unlink(BoolObjectClosure* cl, int* processed, int* removed) {
-    possibly_parallel_unlink_or_oops_do(cl, NULL, processed, removed);
-  }
-  static void possibly_parallel_oops_do(OopClosure* f);
-
-  // Internal test.
-  static void test_alt_hash() PRODUCT_RETURN;
+  static void possibly_parallel_unlink(
+     OopStorage::ParState<false /* concurrent */, false /* const*/>* par_state_string,
+     BoolObjectClosure* cl, int* processed, int* removed);
+  static void possibly_parallel_oops_do(
+     OopStorage::ParState<false /* concurrent */, false /* const*/>* par_state_string,
+     OopClosure* f);
 
   // Probing
   static oop lookup(Symbol* symbol);
@@ -138,46 +140,28 @@ public:
   static oop intern(oop string, TRAPS);
   static oop intern(const char *utf8_string, TRAPS);
 
-  // Debugging
-  static void verify();
-  static void dump(outputStream* st, bool verbose=false);
-
-  enum VerifyMesgModes {
-    _verify_quietly    = 0,
-    _verify_with_mesgs = 1
-  };
-
-  enum VerifyRetTypes {
-    _verify_pass          = 0,
-    _verify_fail_continue = 1,
-    _verify_fail_done     = 2
-  };
-
-  static VerifyRetTypes compare_entries(int bkt1, int e_cnt1,
-                                        HashtableEntry<oop, mtSymbol>* e_ptr1,
-                                        int bkt2, int e_cnt2,
-                                        HashtableEntry<oop, mtSymbol>* e_ptr2);
-  static VerifyRetTypes verify_entry(int bkt, int e_cnt,
-                                     HashtableEntry<oop, mtSymbol>* e_ptr,
-                                     VerifyMesgModes mesg_mode);
-  static int verify_and_compare_entries();
+  // Rehash the string table if it gets out of balance
+  static void rehash_table();
+  static bool needs_rehashing()
+    { return StringTable::the_table()->_needs_rehashing; }
 
   // Sharing
+ private:
+  oop lookup_shared(jchar* name, int len, unsigned int hash) NOT_CDS_JAVA_HEAP_RETURN_(NULL);
+  static void copy_shared_string_table(CompactStringTableWriter* ch_table) NOT_CDS_JAVA_HEAP_RETURN;
+ public:
+  static oop create_archived_string(oop s, Thread* THREAD);
   static void set_shared_string_mapped() { _shared_string_mapped = true; }
   static bool shared_string_mapped()       { return _shared_string_mapped; }
   static void shared_oops_do(OopClosure* f) NOT_CDS_JAVA_HEAP_RETURN;
-  static bool copy_shared_string(GrowableArray<MemRegion> *string_space,
-                                 CompactStringTableWriter* ch_table) NOT_CDS_JAVA_HEAP_RETURN_(false);
-  static oop  create_archived_string(oop s, Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN_(NULL);
-  static void write_to_archive(GrowableArray<MemRegion> *string_space) NOT_CDS_JAVA_HEAP_RETURN;
+  static void write_to_archive() NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
 
-  // Rehash the symbol table if it gets out of balance
-  static void rehash_table();
-  static bool needs_rehashing() { return _needs_rehashing; }
-
-  // Parallel chunked scanning
-  static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
-  static int parallel_claimed_index() { return _parallel_claimed_idx; }
+  // Jcmd
+  static void dump(outputStream* st, bool verbose=false);
+  // Debugging
+  static size_t verify_and_compare_entries();
+  static void verify();
 };
+
 #endif // SHARE_VM_CLASSFILE_STRINGTABLE_HPP
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 27c5bd39dff..e8a99f00f70 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -76,7 +76,7 @@
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "services/classLoadingService.hpp"
@@ -110,9 +110,6 @@ oop         SystemDictionary::_java_platform_loader       =  NULL;
 
 bool        SystemDictionary::_has_checkPackageAccess     =  false;
 
-// lazily initialized klass variables
-InstanceKlass* volatile SystemDictionary::_abstract_ownable_synchronizer_klass = NULL;
-
 // Default ProtectionDomainCacheSize value
 
 const int defaultProtectionDomainCacheSize = 1009;
@@ -1817,22 +1814,11 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
 // ----------------------------------------------------------------------------
 // GC support
 
-void SystemDictionary::always_strong_oops_do(OopClosure* blk) {
-  roots_oops_do(blk, NULL);
-}
-
-
 // Assumes classes in the SystemDictionary are only unloaded at a safepoint
 // Note: anonymous classes are not in the SD.
-bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive,
-                                    GCTimer* gc_timer,
+bool SystemDictionary::do_unloading(GCTimer* gc_timer,
                                     bool do_cleaning) {
 
-  {
-    GCTraceTime(Debug, gc, phases) t("SystemDictionary WeakHandle cleaning", gc_timer);
-    vm_weak_oop_storage()->weak_oops_do(is_alive, &do_nothing_cl);
-  }
-
   bool unloading_occurred;
   {
     GCTraceTime(Debug, gc, phases) t("ClassLoaderData", gc_timer);
@@ -1863,27 +1849,6 @@ bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive,
   return unloading_occurred;
 }
 
-void SystemDictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) {
-  strong->do_oop(&_java_system_loader);
-  strong->do_oop(&_java_platform_loader);
-  strong->do_oop(&_system_loader_lock_obj);
-  CDS_ONLY(SystemDictionaryShared::roots_oops_do(strong);)
-
-  // Do strong roots marking if the closures are the same.
-  if (strong == weak || !ClassUnloading) {
-    // Only the protection domain oops contain references into the heap. Iterate
-    // over all of them.
-    vm_weak_oop_storage()->oops_do(strong);
-  } else {
-   if (weak != NULL) {
-     vm_weak_oop_storage()->oops_do(weak);
-   }
-  }
-
-  // Visit extra methods
-  invoke_method_table()->oops_do(strong);
-}
-
 void SystemDictionary::oops_do(OopClosure* f) {
   f->do_oop(&_java_system_loader);
   f->do_oop(&_java_platform_loader);
@@ -1892,8 +1857,6 @@ void SystemDictionary::oops_do(OopClosure* f) {
 
   // Visit extra methods
   invoke_method_table()->oops_do(f);
-
-  vm_weak_oop_storage()->oops_do(f);
 }
 
 // CDS: scan and relocate all classes in the system dictionary.
@@ -1930,22 +1893,6 @@ void SystemDictionary::remove_classes_in_error_state() {
   ClassLoaderDataGraph::cld_do(&rcc);
 }
 
-// ----------------------------------------------------------------------------
-// Lazily load klasses
-
-void SystemDictionary::load_abstract_ownable_synchronizer_klass(TRAPS) {
-  // if multiple threads calling this function, only one thread will load
-  // the class.  The other threads will find the loaded version once the
-  // class is loaded.
-  Klass* aos = _abstract_ownable_synchronizer_klass;
-  if (aos == NULL) {
-    Klass* k = resolve_or_fail(vmSymbols::java_util_concurrent_locks_AbstractOwnableSynchronizer(), true, CHECK);
-    // Force a fence to prevent any read before the write completes
-    OrderAccess::fence();
-    _abstract_ownable_synchronizer_klass = InstanceKlass::cast(k);
-  }
-}
-
 // ----------------------------------------------------------------------------
 // Initialization
 
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 6c9f203fa2c..90d1b11ac75 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -199,6 +199,9 @@ class OopStorage;
   do_klass(StackFrameInfo_klass,                        java_lang_StackFrameInfo,                  Opt                 ) \
   do_klass(LiveStackFrameInfo_klass,                    java_lang_LiveStackFrameInfo,              Opt                 ) \
                                                                                                                          \
+  /* support for stack dump lock analysis */                                                                             \
+  do_klass(java_util_concurrent_locks_AbstractOwnableSynchronizer_klass, java_util_concurrent_locks_AbstractOwnableSynchronizer, Pre ) \
+                                                                                                                         \
   /* Preload boxing klasses */                                                                                           \
   do_klass(Boolean_klass,                               java_lang_Boolean,                         Pre                 ) \
   do_klass(Character_klass,                             java_lang_Character,                       Pre                 ) \
@@ -357,14 +360,9 @@ public:
 
   // Garbage collection support
 
-  // This method applies "blk->do_oop" to all the pointers to "system"
-  // classes and loaders.
-  static void always_strong_oops_do(OopClosure* blk);
-
   // Unload (that is, break root links to) all unmarked classes and
   // loaders.  Returns "true" iff something was unloaded.
-  static bool do_unloading(BoolObjectClosure* is_alive,
-                           GCTimer* gc_timer,
+  static bool do_unloading(GCTimer* gc_timer,
                            bool do_cleaning = true);
 
   // Used by DumpSharedSpaces only to remove classes that failed verification
@@ -374,7 +372,6 @@ public:
 
   // Applies "f->do_oop" to all root oops in the system dictionary.
   static void oops_do(OopClosure* f);
-  static void roots_oops_do(OopClosure* strong, OopClosure* weak);
 
   // System loader lock
   static oop system_loader_lock()           { return _system_loader_lock_obj; }
@@ -455,12 +452,6 @@ public:
   }
   static BasicType box_klass_type(Klass* k);  // inverse of box_klass
 
-  // methods returning lazily loaded klasses
-  // The corresponding method to load the class must be called before calling them.
-  static InstanceKlass* abstract_ownable_synchronizer_klass() { return check_klass(_abstract_ownable_synchronizer_klass); }
-
-  static void load_abstract_ownable_synchronizer_klass(TRAPS);
-
 protected:
   // Returns the class loader data to be used when looking up/updating the
   // system dictionary.
@@ -735,9 +726,6 @@ protected:
   // Variables holding commonly used klasses (preloaded)
   static InstanceKlass* _well_known_klasses[];
 
-  // Lazily loaded klasses
-  static InstanceKlass* volatile _abstract_ownable_synchronizer_klass;
-
   // table of box klasses (int_klass, etc.)
   static InstanceKlass* _box_klasses[T_VOID+1];
 
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 3be54622cdf..2d6a29941b7 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -87,8 +87,8 @@ Handle SystemDictionaryShared::get_shared_jar_manifest(int shared_path_index, TR
     assert(src != NULL, "No Manifest data");
     typeArrayOop buf = oopFactory::new_byteArray(size, CHECK_NH);
     typeArrayHandle bufhandle(THREAD, buf);
-    char* dst = (char*)(buf->byte_at_addr(0));
-    memcpy(dst, src, (size_t)size);
+    ArrayAccess<>::arraycopy_from_native(reinterpret_cast<const jbyte*>(src),
+                                         buf, typeArrayOopDesc::element_offset<jbyte>(0), size);
 
     Handle bais = JavaCalls::construct_new_instance(SystemDictionary::ByteArrayInputStream_klass(),
                       vmSymbols::byte_array_void_signature(),
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 8685f408417..2e76c0ecd95 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -47,7 +47,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/thread.hpp"
diff --git a/src/hotspot/share/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp
index ebbf66f8ab0..d225e68ada7 100644
--- a/src/hotspot/share/classfile/vmSymbols.cpp
+++ b/src/hotspot/share/classfile/vmSymbols.cpp
@@ -756,6 +756,9 @@ bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
 #endif // COMPILER1
 #ifdef COMPILER2
   case vmIntrinsics::_clone:
+#if INCLUDE_ZGC
+    if (UseZGC) return true;
+#endif
   case vmIntrinsics::_copyOf:
   case vmIntrinsics::_copyOfRange:
     // These intrinsics use both the objectcopy and the arraycopy
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 8c3438210c2..1d1846869df 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -685,8 +685,15 @@ void CodeCache::do_unloading(BoolObjectClosure* is_alive, bool unloading_occurre
   assert_locked_or_safepoint(CodeCache_lock);
   CompiledMethodIterator iter;
   while(iter.next_alive()) {
-    iter.method()->do_unloading(is_alive, unloading_occurred);
+    iter.method()->do_unloading(is_alive);
   }
+
+  // Now that all the unloaded nmethods are known, cleanup caches
+  // before CLDG is purged.
+  // This is another code cache walk but it is moved from gc_epilogue.
+  // G1 does a parallel walk of the nmethods so cleans them up
+  // as it goes and doesn't call this.
+  do_unloading_nmethod_caches(unloading_occurred);
 }
 
 void CodeCache::blobs_do(CodeBlobClosure* f) {
@@ -720,8 +727,11 @@ void CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure* f) {
     assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
 
     bool is_live = (!cur->is_zombie() && !cur->is_unloaded());
-    if (TraceScavenge) {
-      cur->print_on(tty, is_live ? "scavenge root" : "dead scavenge root"); tty->cr();
+    LogTarget(Trace, gc, nmethod) lt;
+    if (lt.is_enabled()) {
+      LogStream ls(lt);
+      CompileTask::print(&ls, cur,
+        is_live ? "scavenge root " : "dead scavenge root", /*short_form:*/ true);
     }
     if (is_live) {
       // Perform cur->oops_do(f), maybe just once per nmethod.
@@ -892,18 +902,26 @@ void CodeCache::verify_icholder_relocations() {
 #endif
 }
 
-void CodeCache::gc_prologue() {
-}
+void CodeCache::gc_prologue() { }
 
 void CodeCache::gc_epilogue() {
+  prune_scavenge_root_nmethods();
+}
+
+
+void CodeCache::do_unloading_nmethod_caches(bool class_unloading_occurred) {
   assert_locked_or_safepoint(CodeCache_lock);
-  NOT_DEBUG(if (needs_cache_clean())) {
+  // Even if classes are not unloaded, there may have been some nmethods that are
+  // unloaded because oops in them are no longer reachable.
+  NOT_DEBUG(if (needs_cache_clean() || class_unloading_occurred)) {
     CompiledMethodIterator iter;
     while(iter.next_alive()) {
       CompiledMethod* cm = iter.method();
       assert(!cm->is_unloaded(), "Tautology");
-      DEBUG_ONLY(if (needs_cache_clean())) {
-        cm->cleanup_inline_caches();
+      DEBUG_ONLY(if (needs_cache_clean() || class_unloading_occurred)) {
+        // Clean up both unloaded klasses from nmethods and unloaded nmethods
+        // from inline caches.
+        cm->unload_nmethod_caches(/*parallel*/false, class_unloading_occurred);
       }
       DEBUG_ONLY(cm->verify());
       DEBUG_ONLY(cm->verify_oop_relocations());
@@ -911,8 +929,6 @@ void CodeCache::gc_epilogue() {
   }
 
   set_needs_cache_clean(false);
-  prune_scavenge_root_nmethods();
-
   verify_icholder_relocations();
 }
 
@@ -1593,6 +1609,7 @@ void CodeCache::print() {
 }
 
 void CodeCache::print_summary(outputStream* st, bool detailed) {
+  int full_count = 0;
   FOR_ALL_HEAPS(heap_iterator) {
     CodeHeap* heap = (*heap_iterator);
     size_t total = (heap->high_boundary() - heap->low_boundary());
@@ -1611,6 +1628,8 @@ void CodeCache::print_summary(outputStream* st, bool detailed) {
                    p2i(heap->low_boundary()),
                    p2i(heap->high()),
                    p2i(heap->high_boundary()));
+
+      full_count += get_codemem_full_count(heap->code_blob_type());
     }
   }
 
@@ -1622,6 +1641,10 @@ void CodeCache::print_summary(outputStream* st, bool detailed) {
                  "enabled" : Arguments::mode() == Arguments::_int ?
                  "disabled (interpreter mode)" :
                  "disabled (not enough contiguous free space left)");
+    st->print_cr("              stopped_count=%d, restarted_count=%d",
+                 CompileBroker::get_total_compiler_stopped_count(),
+                 CompileBroker::get_total_compiler_restarted_count());
+    st->print_cr(" full_count=%d", full_count);
   }
 }
 
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index 5f1d7d8d832..fcf6cb404c0 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -168,9 +168,10 @@ class CodeCache : AllStatic {
   static void gc_epilogue();
   static void gc_prologue();
   static void verify_oops();
-  // If "unloading_occurred" is true, then unloads (i.e., breaks root links
+  // If any oops are not marked this method unloads (i.e., breaks root links
   // to) any unmarked codeBlobs in the cache.  Sets "marked_for_unloading"
   // to "true" iff some code got unloaded.
+  // "unloading_occurred" controls whether metadata should be cleaned because of class unloading.
   static void do_unloading(BoolObjectClosure* is_alive, bool unloading_occurred);
   static void asserted_non_scavengable_nmethods_do(CodeBlobClosure* f = NULL) PRODUCT_RETURN;
 
@@ -223,8 +224,10 @@ class CodeCache : AllStatic {
 
   static bool needs_cache_clean()                     { return _needs_cache_clean; }
   static void set_needs_cache_clean(bool v)           { _needs_cache_clean = v;    }
+
   static void clear_inline_caches();                  // clear all inline caches
-  static void cleanup_inline_caches();
+  static void cleanup_inline_caches();                // clean unloaded/zombie nmethods from inline caches
+  static void do_unloading_nmethod_caches(bool class_unloading_occurred);  // clean all nmethod caches for unloading, including inline caches
 
   // Returns true if an own CodeHeap for the given CodeBlobType is available
   static bool heap_available(int code_blob_type);
diff --git a/src/hotspot/share/code/compiledIC.cpp b/src/hotspot/share/code/compiledIC.cpp
index afb4bc8c1c5..ab94626d112 100644
--- a/src/hotspot/share/code/compiledIC.cpp
+++ b/src/hotspot/share/code/compiledIC.cpp
@@ -552,7 +552,8 @@ void CompiledIC::cleanup_call_site(virtual_call_Relocation* call_site, const Com
 
 // ----------------------------------------------------------------------------
 
-void CompiledStaticCall::set_to_clean() {
+void CompiledStaticCall::set_to_clean(bool in_use) {
+  // in_use is unused but needed to match template function in CompiledMethod
   assert (CompiledIC_lock->is_locked() || SafepointSynchronize::is_at_safepoint(), "mt unsafe call");
   // Reset call site
   MutexLockerEx pl(SafepointSynchronize::is_at_safepoint() ? NULL : Patching_lock, Mutex::_no_safepoint_check_flag);
diff --git a/src/hotspot/share/code/compiledIC.hpp b/src/hotspot/share/code/compiledIC.hpp
index 4f967957d29..09790efc241 100644
--- a/src/hotspot/share/code/compiledIC.hpp
+++ b/src/hotspot/share/code/compiledIC.hpp
@@ -358,7 +358,7 @@ public:
   virtual address destination() const = 0;
 
   // Clean static call (will force resolving on next use)
-  void set_to_clean();
+  void set_to_clean(bool in_use = true);
 
   // Set state. The entry must be the same, as computed by compute_entry.
   // Computation and setting is split up, since the actions are separate during
diff --git a/src/hotspot/share/code/compiledMethod.cpp b/src/hotspot/share/code/compiledMethod.cpp
index 4e77ee3bcdb..ae2a1110cfe 100644
--- a/src/hotspot/share/code/compiledMethod.cpp
+++ b/src/hotspot/share/code/compiledMethod.cpp
@@ -28,6 +28,8 @@
 #include "code/scopeDesc.hpp"
 #include "code/codeCache.hpp"
 #include "interpreter/bytecode.inline.hpp"
+#include "logging/log.hpp"
+#include "logging/logTag.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/methodData.hpp"
 #include "oops/method.inline.hpp"
@@ -222,9 +224,7 @@ ScopeDesc* CompiledMethod::scope_desc_near(address pc) {
                        pd->return_oop());
 }
 
-void CompiledMethod::cleanup_inline_caches(bool clean_all/*=false*/) {
-  assert_locked_or_safepoint(CompiledIC_lock);
-
+address CompiledMethod::oops_reloc_begin() const {
   // If the method is not entrant or zombie then a JMP is plastered over the
   // first few bytes.  If an oop in the old code was there, that oop
   // should not get GC'd.  Skip the first few bytes of oops on
@@ -237,41 +237,7 @@ void CompiledMethod::cleanup_inline_caches(bool clean_all/*=false*/) {
     // This shouldn't matter, since oops of non-entrant methods are never used.
     // In fact, why are we bothering to look at oops in a non-entrant method??
   }
-
-  // Find all calls in an nmethod and clear the ones that point to non-entrant,
-  // zombie and unloaded nmethods.
-  ResourceMark rm;
-  RelocIterator iter(this, low_boundary);
-  while(iter.next()) {
-    switch(iter.type()) {
-      case relocInfo::virtual_call_type:
-      case relocInfo::opt_virtual_call_type: {
-        CompiledIC *ic = CompiledIC_at(&iter);
-        // Ok, to lookup references to zombies here
-        CodeBlob *cb = CodeCache::find_blob_unsafe(ic->ic_destination());
-        if( cb != NULL && cb->is_compiled() ) {
-          CompiledMethod* nm = cb->as_compiled_method();
-          // Clean inline caches pointing to zombie, non-entrant and unloaded methods
-          if (clean_all || !nm->is_in_use() || (nm->method()->code() != nm)) ic->set_to_clean(is_alive());
-        }
-        break;
-      }
-      case relocInfo::static_call_type: {
-          CompiledStaticCall *csc = compiledStaticCall_at(iter.reloc());
-          CodeBlob *cb = CodeCache::find_blob_unsafe(csc->destination());
-          if( cb != NULL && cb->is_compiled() ) {
-            CompiledMethod* cm = cb->as_compiled_method();
-            // Clean inline caches pointing to zombie, non-entrant and unloaded methods
-            if (clean_all || !cm->is_in_use() || (cm->method()->code() != cm)) {
-              csc->set_to_clean();
-            }
-          }
-        break;
-      }
-      default:
-        break;
-    }
-  }
+  return low_boundary;
 }
 
 int CompiledMethod::verify_icholder_relocations() {
@@ -437,17 +403,15 @@ unsigned char CompiledMethod::unloading_clock() {
   return OrderAccess::load_acquire(&_unloading_clock);
 }
 
-// Processing of oop references should have been sufficient to keep
-// all strong references alive.  Any weak references should have been
-// cleared as well.  Visit all the metadata and ensure that it's
-// really alive.
-void CompiledMethod::verify_metadata_loaders(address low_boundary) {
+
+// static_stub_Relocations may have dangling references to
+// nmethods so trim them out here.  Otherwise it looks like
+// compiled code is maintaining a link to dead metadata.
+void CompiledMethod::clean_ic_stubs() {
 #ifdef ASSERT
-    RelocIterator iter(this, low_boundary);
-    while (iter.next()) {
-    // static_stub_Relocations may have dangling references to
-    // Method*s so trim them out here.  Otherwise it looks like
-    // compiled code is maintaining a link to dead metadata.
+  address low_boundary = oops_reloc_begin();
+  RelocIterator iter(this, low_boundary);
+  while (iter.next()) {
     address static_call_addr = NULL;
     if (iter.type() == relocInfo::opt_virtual_call_type) {
       CompiledIC* cic = CompiledIC_at(&iter);
@@ -470,8 +434,6 @@ void CompiledMethod::verify_metadata_loaders(address low_boundary) {
       }
     }
   }
-  // Check that the metadata embedded in the nmethod is alive
-  metadata_do(check_class);
 #endif
 }
 
@@ -479,67 +441,43 @@ void CompiledMethod::verify_metadata_loaders(address low_boundary) {
 // GC to unload an nmethod if it contains otherwise unreachable
 // oops.
 
-void CompiledMethod::do_unloading(BoolObjectClosure* is_alive, bool unloading_occurred) {
+void CompiledMethod::do_unloading(BoolObjectClosure* is_alive) {
   // Make sure the oop's ready to receive visitors
   assert(!is_zombie() && !is_unloaded(),
          "should not call follow on zombie or unloaded nmethod");
 
-  // If the method is not entrant then a JMP is plastered over the
-  // first few bytes.  If an oop in the old code was there, that oop
-  // should not get GC'd.  Skip the first few bytes of oops on
-  // not-entrant methods.
-  address low_boundary = verified_entry_point();
-  if (is_not_entrant()) {
-    low_boundary += NativeJump::instruction_size;
-    // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
-    // (See comment above.)
-  }
+  address low_boundary = oops_reloc_begin();
 
-  // Exception cache
-  clean_exception_cache();
-
-  // If class unloading occurred we first iterate over all inline caches and
-  // clear ICs where the cached oop is referring to an unloaded klass or method.
-  // The remaining live cached oops will be traversed in the relocInfo::oop_type
-  // iteration below.
-  if (unloading_occurred) {
-    RelocIterator iter(this, low_boundary);
-    while(iter.next()) {
-      if (iter.type() == relocInfo::virtual_call_type) {
-        CompiledIC *ic = CompiledIC_at(&iter);
-        clean_ic_if_metadata_is_dead(ic);
-      }
-    }
-  }
-
-  if (do_unloading_oops(low_boundary, is_alive, unloading_occurred)) {
+  if (do_unloading_oops(low_boundary, is_alive)) {
     return;
   }
 
 #if INCLUDE_JVMCI
-  if (do_unloading_jvmci(unloading_occurred)) {
+  if (do_unloading_jvmci()) {
     return;
   }
 #endif
 
-  // Ensure that all metadata is still alive
-  verify_metadata_loaders(low_boundary);
+  // Cleanup exception cache and inline caches happens
+  // after all the unloaded methods are found.
 }
 
+// Clean references to unloaded nmethods at addr from this one, which is not unloaded.
 template <class CompiledICorStaticCall>
-static bool clean_if_nmethod_is_unloaded(CompiledICorStaticCall *ic, address addr, CompiledMethod* from) {
+static bool clean_if_nmethod_is_unloaded(CompiledICorStaticCall *ic, address addr, CompiledMethod* from,
+                                         bool parallel, bool clean_all) {
   // Ok, to lookup references to zombies here
   CodeBlob *cb = CodeCache::find_blob_unsafe(addr);
   CompiledMethod* nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL;
   if (nm != NULL) {
-    if (nm->unloading_clock() != CompiledMethod::global_unloading_clock()) {
+    if (parallel && nm->unloading_clock() != CompiledMethod::global_unloading_clock()) {
       // The nmethod has not been processed yet.
       return true;
     }
 
     // Clean inline caches pointing to both zombie and not_entrant methods
-    if (!nm->is_in_use() || (nm->method()->code() != nm)) {
-      ic->set_to_clean();
+    if (clean_all || !nm->is_in_use() || (nm->method()->code() != nm)) {
+      ic->set_to_clean(from->is_alive());
       assert(ic->is_clean(), "nmethod " PTR_FORMAT "not clean %s", p2i(from), from->method()->name_and_sig_as_C_string());
     }
   }
@@ -547,12 +485,14 @@ static bool clean_if_nmethod_is_unloaded(CompiledICorStaticCall *ic, address add
   return false;
 }
 
-static bool clean_if_nmethod_is_unloaded(CompiledIC *ic, CompiledMethod* from) {
-  return clean_if_nmethod_is_unloaded(ic, ic->ic_destination(), from);
+static bool clean_if_nmethod_is_unloaded(CompiledIC *ic, CompiledMethod* from,
+                                         bool parallel, bool clean_all = false) {
+  return clean_if_nmethod_is_unloaded(ic, ic->ic_destination(), from, parallel, clean_all);
 }
 
-static bool clean_if_nmethod_is_unloaded(CompiledStaticCall *csc, CompiledMethod* from) {
-  return clean_if_nmethod_is_unloaded(csc, csc->destination(), from);
+static bool clean_if_nmethod_is_unloaded(CompiledStaticCall *csc, CompiledMethod* from,
+                                         bool parallel, bool clean_all = false) {
+  return clean_if_nmethod_is_unloaded(csc, csc->destination(), from, parallel, clean_all);
 }
 
 bool CompiledMethod::do_unloading_parallel(BoolObjectClosure* is_alive, bool unloading_occurred) {
@@ -562,47 +502,79 @@ bool CompiledMethod::do_unloading_parallel(BoolObjectClosure* is_alive, bool unl
   assert(!is_zombie() && !is_unloaded(),
          "should not call follow on zombie or unloaded nmethod");
 
-  // If the method is not entrant then a JMP is plastered over the
-  // first few bytes.  If an oop in the old code was there, that oop
-  // should not get GC'd.  Skip the first few bytes of oops on
-  // not-entrant methods.
-  address low_boundary = verified_entry_point();
-  if (is_not_entrant()) {
-    low_boundary += NativeJump::instruction_size;
-    // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
-    // (See comment above.)
+  address low_boundary = oops_reloc_begin();
+
+  if (do_unloading_oops(low_boundary, is_alive)) {
+    return false;
   }
 
-  // Exception cache
-  clean_exception_cache();
+#if INCLUDE_JVMCI
+  if (do_unloading_jvmci()) {
+    return false;
+  }
+#endif
 
+  return unload_nmethod_caches(/*parallel*/true, unloading_occurred);
+}
+
+// Cleans caches in nmethods that point to either classes that are unloaded
+// or nmethods that are unloaded.
+//
+// Can be called either in parallel by G1 currently or after all
+// nmethods are unloaded.  Return postponed=true in the parallel case for
+// inline caches found that point to nmethods that are not yet visited during
+// the do_unloading walk.
+bool CompiledMethod::unload_nmethod_caches(bool parallel, bool unloading_occurred) {
+
+  // Exception cache only needs to be called if unloading occurred
+  if (unloading_occurred) {
+    clean_exception_cache();
+  }
+
+  bool postponed = cleanup_inline_caches_impl(parallel, unloading_occurred, /*clean_all*/false);
+
+  // All static stubs need to be cleaned.
+  clean_ic_stubs();
+
+  // Check that the metadata embedded in the nmethod is alive
+  DEBUG_ONLY(metadata_do(check_class));
+
+  return postponed;
+}
+
+// Called to clean up after class unloading for live nmethods and from the sweeper
+// for all methods.
+bool CompiledMethod::cleanup_inline_caches_impl(bool parallel, bool unloading_occurred, bool clean_all) {
+  assert_locked_or_safepoint(CompiledIC_lock);
   bool postponed = false;
 
-  RelocIterator iter(this, low_boundary);
+  // Find all calls in an nmethod and clear the ones that point to non-entrant,
+  // zombie and unloaded nmethods.
+  RelocIterator iter(this, oops_reloc_begin());
   while(iter.next()) {
 
     switch (iter.type()) {
 
     case relocInfo::virtual_call_type:
       if (unloading_occurred) {
-        // If class unloading occurred we first iterate over all inline caches and
-        // clear ICs where the cached oop is referring to an unloaded klass or method.
+        // If class unloading occurred we first clear ICs where the cached metadata
+        // is referring to an unloaded klass or method.
         clean_ic_if_metadata_is_dead(CompiledIC_at(&iter));
       }
 
-      postponed |= clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this);
+      postponed |= clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this, parallel, clean_all);
       break;
 
     case relocInfo::opt_virtual_call_type:
-      postponed |= clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this);
+      postponed |= clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this, parallel, clean_all);
       break;
 
     case relocInfo::static_call_type:
-      postponed |= clean_if_nmethod_is_unloaded(compiledStaticCall_at(iter.reloc()), this);
+      postponed |= clean_if_nmethod_is_unloaded(compiledStaticCall_at(iter.reloc()), this, parallel, clean_all);
       break;
 
     case relocInfo::oop_type:
-      // handled by do_unloading_oops below
+      // handled by do_unloading_oops already
       break;
 
     case relocInfo::metadata_type:
@@ -613,19 +585,6 @@ bool CompiledMethod::do_unloading_parallel(BoolObjectClosure* is_alive, bool unl
     }
   }
 
-  if (do_unloading_oops(low_boundary, is_alive, unloading_occurred)) {
-    return postponed;
-  }
-
-#if INCLUDE_JVMCI
-  if (do_unloading_jvmci(unloading_occurred)) {
-    return postponed;
-  }
-#endif
-
-  // Ensure that all metadata is still alive
-  verify_metadata_loaders(low_boundary);
-
   return postponed;
 }
 
@@ -636,32 +595,21 @@ void CompiledMethod::do_unloading_parallel_postponed() {
   assert(!is_zombie(),
          "should not call follow on zombie nmethod");
 
-  // If the method is not entrant then a JMP is plastered over the
-  // first few bytes.  If an oop in the old code was there, that oop
-  // should not get GC'd.  Skip the first few bytes of oops on
-  // not-entrant methods.
-  address low_boundary = verified_entry_point();
-  if (is_not_entrant()) {
-    low_boundary += NativeJump::instruction_size;
-    // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
-    // (See comment above.)
-  }
-
-  RelocIterator iter(this, low_boundary);
+  RelocIterator iter(this, oops_reloc_begin());
   while(iter.next()) {
 
     switch (iter.type()) {
 
     case relocInfo::virtual_call_type:
-      clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this);
+      clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this, true);
       break;
 
     case relocInfo::opt_virtual_call_type:
-      clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this);
+      clean_if_nmethod_is_unloaded(CompiledIC_at(&iter), this, true);
       break;
 
     case relocInfo::static_call_type:
-      clean_if_nmethod_is_unloaded(compiledStaticCall_at(iter.reloc()), this);
+      clean_if_nmethod_is_unloaded(compiledStaticCall_at(iter.reloc()), this, true);
       break;
 
     default:
diff --git a/src/hotspot/share/code/compiledMethod.hpp b/src/hotspot/share/code/compiledMethod.hpp
index d281405ee0c..6291c6804b1 100644
--- a/src/hotspot/share/code/compiledMethod.hpp
+++ b/src/hotspot/share/code/compiledMethod.hpp
@@ -331,8 +331,19 @@ public:
 
   static address get_deopt_original_pc(const frame* fr);
 
-  // Inline cache support
-  void cleanup_inline_caches(bool clean_all = false);
+  // GC unloading support
+  // Cleans unloaded klasses and unloaded nmethods in inline caches
+  bool unload_nmethod_caches(bool parallel, bool class_unloading_occurred);
+
+  // Inline cache support for class unloading and nmethod unloading
+ private:
+  bool cleanup_inline_caches_impl(bool parallel, bool unloading_occurred, bool clean_all);
+ public:
+  bool cleanup_inline_caches(bool clean_all = false) {
+    // Serial version used by sweeper and whitebox test
+    return cleanup_inline_caches_impl(false, false, clean_all);
+  }
+
   virtual void clear_inline_caches();
   void clear_ic_stubs();
 
@@ -364,12 +375,15 @@ public:
   void set_unloading_next(CompiledMethod* next) { _unloading_next = next; }
   CompiledMethod* unloading_next()              { return _unloading_next; }
 
+ protected:
+  address oops_reloc_begin() const;
+ private:
   void static clean_ic_if_metadata_is_dead(CompiledIC *ic);
 
-  // Check that all metadata is still alive
-  void verify_metadata_loaders(address low_boundary);
+  void clean_ic_stubs();
 
-  virtual void do_unloading(BoolObjectClosure* is_alive, bool unloading_occurred);
+ public:
+  virtual void do_unloading(BoolObjectClosure* is_alive);
   //  The parallel versions are used by G1.
   virtual bool do_unloading_parallel(BoolObjectClosure* is_alive, bool unloading_occurred);
   virtual void do_unloading_parallel_postponed();
@@ -381,9 +395,9 @@ public:
   unsigned char unloading_clock();
 
 protected:
-  virtual bool do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive, bool unloading_occurred) = 0;
+  virtual bool do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive) = 0;
 #if INCLUDE_JVMCI
-  virtual bool do_unloading_jvmci(bool unloading_occurred) = 0;
+  virtual bool do_unloading_jvmci() = 0;
 #endif
 
 private:
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 30b76407897..98a7bdbeed3 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -51,7 +51,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -946,21 +946,8 @@ void nmethod::fix_oop_relocations(address begin, address end, bool initialize_im
 void nmethod::verify_clean_inline_caches() {
   assert_locked_or_safepoint(CompiledIC_lock);
 
-  // If the method is not entrant or zombie then a JMP is plastered over the
-  // first few bytes.  If an oop in the old code was there, that oop
-  // should not get GC'd.  Skip the first few bytes of oops on
-  // not-entrant methods.
-  address low_boundary = verified_entry_point();
-  if (!is_in_use()) {
-    low_boundary += NativeJump::instruction_size;
-    // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
-    // This means that the low_boundary is going to be a little too high.
-    // This shouldn't matter, since oops of non-entrant methods are never used.
-    // In fact, why are we bothering to look at oops in a non-entrant method??
-  }
-
   ResourceMark rm;
-  RelocIterator iter(this, low_boundary);
+  RelocIterator iter(this, oops_reloc_begin());
   while(iter.next()) {
     switch(iter.type()) {
       case relocInfo::virtual_call_type:
@@ -1041,13 +1028,17 @@ void nmethod::make_unloaded(oop cause) {
   flush_dependencies(/*delete_immediately*/false);
 
   // Break cycle between nmethod & method
-  LogTarget(Trace, class, unload) lt;
+  LogTarget(Trace, class, unload, nmethod) lt;
   if (lt.is_enabled()) {
     LogStream ls(lt);
-    ls.print_cr("making nmethod " INTPTR_FORMAT
-                  " unloadable, Method*(" INTPTR_FORMAT
-                  "), cause(" INTPTR_FORMAT ")",
-                  p2i(this), p2i(_method), p2i(cause));
+    ls.print("making nmethod " INTPTR_FORMAT
+             " unloadable, Method*(" INTPTR_FORMAT
+             "), cause(" INTPTR_FORMAT ") ",
+             p2i(this), p2i(_method), p2i(cause));
+     if (cause != NULL) {
+       cause->print_value_on(&ls);
+     }
+     ls.cr();
   }
   // Unlink the osr method, so we do not look this up again
   if (is_osr_method()) {
@@ -1378,17 +1369,15 @@ void nmethod::flush_dependencies(bool delete_immediately) {
 
 
 // If this oop is not live, the nmethod can be unloaded.
-bool nmethod::can_unload(BoolObjectClosure* is_alive, oop* root, bool unloading_occurred) {
+bool nmethod::can_unload(BoolObjectClosure* is_alive, oop* root) {
   assert(root != NULL, "just checking");
   oop obj = *root;
   if (obj == NULL || is_alive->do_object_b(obj)) {
       return false;
   }
 
-  // If ScavengeRootsInCode is true, an nmethod might be unloaded
-  // simply because one of its constant oops has gone dead.
+  // An nmethod might be unloaded simply because one of its constant oops has gone dead.
   // No actual classes need to be unloaded in order for this to occur.
-  assert(unloading_occurred || ScavengeRootsInCode, "Inconsistency in unloading");
   make_unloaded(obj);
   return true;
 }
@@ -1466,7 +1455,7 @@ void nmethod::post_compiled_method_unload() {
   set_unload_reported();
 }
 
-bool nmethod::unload_if_dead_at(RelocIterator* iter_at_oop, BoolObjectClosure *is_alive, bool unloading_occurred) {
+bool nmethod::unload_if_dead_at(RelocIterator* iter_at_oop, BoolObjectClosure *is_alive) {
   assert(iter_at_oop->type() == relocInfo::oop_type, "Wrong relocation type");
 
   oop_Relocation* r = iter_at_oop->oop_reloc();
@@ -1477,7 +1466,7 @@ bool nmethod::unload_if_dead_at(RelocIterator* iter_at_oop, BoolObjectClosure *i
          "oop must be found in exactly one place");
   if (r->oop_is_immediate() && r->oop_value() != NULL) {
     // Unload this nmethod if the oop is dead.
-    if (can_unload(is_alive, r->oop_addr(), unloading_occurred)) {
+    if (can_unload(is_alive, r->oop_addr())) {
       return true;;
     }
   }
@@ -1485,18 +1474,18 @@ bool nmethod::unload_if_dead_at(RelocIterator* iter_at_oop, BoolObjectClosure *i
   return false;
 }
 
-bool nmethod::do_unloading_scopes(BoolObjectClosure* is_alive, bool unloading_occurred) {
+bool nmethod::do_unloading_scopes(BoolObjectClosure* is_alive) {
   // Scopes
   for (oop* p = oops_begin(); p < oops_end(); p++) {
     if (*p == Universe::non_oop_word())  continue;  // skip non-oops
-    if (can_unload(is_alive, p, unloading_occurred)) {
+    if (can_unload(is_alive, p)) {
       return true;
     }
   }
   return false;
 }
 
-bool nmethod::do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive, bool unloading_occurred) {
+bool nmethod::do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive) {
   // Compiled code
 
   // Prevent extra code cache walk for platforms that don't have immediate oops.
@@ -1504,18 +1493,18 @@ bool nmethod::do_unloading_oops(address low_boundary, BoolObjectClosure* is_aliv
     RelocIterator iter(this, low_boundary);
     while (iter.next()) {
       if (iter.type() == relocInfo::oop_type) {
-        if (unload_if_dead_at(&iter, is_alive, unloading_occurred)) {
+        if (unload_if_dead_at(&iter, is_alive)) {
           return true;
         }
       }
     }
   }
 
-  return do_unloading_scopes(is_alive, unloading_occurred);
+  return do_unloading_scopes(is_alive);
 }
 
 #if INCLUDE_JVMCI
-bool nmethod::do_unloading_jvmci(bool unloading_occurred) {
+bool nmethod::do_unloading_jvmci() {
   if (_jvmci_installed_code != NULL) {
     if (JNIHandles::is_global_weak_cleared(_jvmci_installed_code)) {
       if (_jvmci_installed_code_triggers_unloading) {
@@ -1533,15 +1522,9 @@ bool nmethod::do_unloading_jvmci(bool unloading_occurred) {
 
 // Iterate over metadata calling this function.   Used by RedefineClasses
 void nmethod::metadata_do(void f(Metadata*)) {
-  address low_boundary = verified_entry_point();
-  if (is_not_entrant()) {
-    low_boundary += NativeJump::instruction_size;
-    // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
-    // (See comment above.)
-  }
   {
     // Visit all immediate references that are embedded in the instruction stream.
-    RelocIterator iter(this, low_boundary);
+    RelocIterator iter(this, oops_reloc_begin());
     while (iter.next()) {
       if (iter.type() == relocInfo::metadata_type ) {
         metadata_Relocation* r = iter.metadata_reloc();
@@ -1588,20 +1571,9 @@ void nmethod::oops_do(OopClosure* f, bool allow_zombie) {
   assert(allow_zombie || !is_zombie(), "should not call follow on zombie nmethod");
   assert(!is_unloaded(), "should not call follow on unloaded nmethod");
 
-  // If the method is not entrant or zombie then a JMP is plastered over the
-  // first few bytes.  If an oop in the old code was there, that oop
-  // should not get GC'd.  Skip the first few bytes of oops on
-  // not-entrant methods.
-  address low_boundary = verified_entry_point();
-  if (is_not_entrant()) {
-    low_boundary += NativeJump::instruction_size;
-    // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
-    // (See comment above.)
-  }
-
   // Prevent extra code cache walk for platforms that don't have immediate oops.
   if (relocInfo::mustIterateImmediateOopsInCode()) {
-    RelocIterator iter(this, low_boundary);
+    RelocIterator iter(this, oops_reloc_begin());
 
     while (iter.next()) {
       if (iter.type() == relocInfo::oop_type ) {
@@ -1650,7 +1622,11 @@ bool nmethod::test_set_oops_do_mark() {
           break;
       }
       // Mark was clear when we first saw this guy.
-      if (TraceScavenge) { print_on(tty, "oops_do, mark"); }
+      LogTarget(Trace, gc, nmethod) lt;
+      if (lt.is_enabled()) {
+        LogStream ls(lt);
+        CompileTask::print(&ls, this, "oops_do, mark", /*short_form:*/ true);
+      }
       return false;
     }
   }
@@ -1659,7 +1635,7 @@ bool nmethod::test_set_oops_do_mark() {
 }
 
 void nmethod::oops_do_marking_prologue() {
-  if (TraceScavenge) { tty->print_cr("[oops_do_marking_prologue"); }
+  log_trace(gc, nmethod)("oops_do_marking_prologue");
   assert(_oops_do_mark_nmethods == NULL, "must not call oops_do_marking_prologue twice in a row");
   // We use cmpxchg instead of regular assignment here because the user
   // may fork a bunch of threads, and we need them all to see the same state.
@@ -1675,20 +1651,26 @@ void nmethod::oops_do_marking_epilogue() {
     nmethod* next = cur->_oops_do_mark_link;
     cur->_oops_do_mark_link = NULL;
     DEBUG_ONLY(cur->verify_oop_relocations());
-    NOT_PRODUCT(if (TraceScavenge)  cur->print_on(tty, "oops_do, unmark"));
+
+    LogTarget(Trace, gc, nmethod) lt;
+    if (lt.is_enabled()) {
+      LogStream ls(lt);
+      CompileTask::print(&ls, cur, "oops_do, unmark", /*short_form:*/ true);
+    }
     cur = next;
   }
   nmethod* required = _oops_do_mark_nmethods;
   nmethod* observed = Atomic::cmpxchg((nmethod*)NULL, &_oops_do_mark_nmethods, required);
   guarantee(observed == required, "no races in this sequential code");
-  if (TraceScavenge) { tty->print_cr("oops_do_marking_epilogue]"); }
+  log_trace(gc, nmethod)("oops_do_marking_epilogue");
 }
 
 class DetectScavengeRoot: public OopClosure {
   bool     _detected_scavenge_root;
+  nmethod* _print_nm;
 public:
-  DetectScavengeRoot() : _detected_scavenge_root(false)
-  { NOT_PRODUCT(_print_nm = NULL); }
+  DetectScavengeRoot(nmethod* nm) : _detected_scavenge_root(false), _print_nm(nm) {}
+
   bool detected_scavenge_root() { return _detected_scavenge_root; }
   virtual void do_oop(oop* p) {
     if ((*p) != NULL && Universe::heap()->is_scavengable(*p)) {
@@ -1699,21 +1681,25 @@ public:
   virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
 
 #ifndef PRODUCT
-  nmethod* _print_nm;
   void maybe_print(oop* p) {
-    if (_print_nm == NULL)  return;
-    if (!_detected_scavenge_root)  _print_nm->print_on(tty, "new scavenge root");
-    tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")",
-                  p2i(_print_nm), (int)((intptr_t)p - (intptr_t)_print_nm),
-                  p2i(*p), p2i(p));
-    (*p)->print();
+    LogTarget(Trace, gc, nmethod) lt;
+    if (lt.is_enabled()) {
+      LogStream ls(lt);
+      if (!_detected_scavenge_root) {
+        CompileTask::print(&ls, _print_nm, "new scavenge root", /*short_form:*/ true);
+      }
+      ls.print("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ") ",
+               p2i(_print_nm), (int)((intptr_t)p - (intptr_t)_print_nm),
+               p2i(*p), p2i(p));
+      (*p)->print_value_on(&ls);
+      ls.cr();
+    }
   }
 #endif //PRODUCT
 };
 
 bool nmethod::detect_scavenge_root_oops() {
-  DetectScavengeRoot detect_scavenge_root;
-  NOT_PRODUCT(if (TraceScavenge)  detect_scavenge_root._print_nm = this);
+  DetectScavengeRoot detect_scavenge_root(this);
   oops_do(&detect_scavenge_root);
   return detect_scavenge_root.detected_scavenge_root();
 }
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index ed37c129ce2..a33688d893f 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -484,18 +484,18 @@ public:
 #endif
 
  protected:
-  virtual bool do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive, bool unloading_occurred);
+  virtual bool do_unloading_oops(address low_boundary, BoolObjectClosure* is_alive);
 #if INCLUDE_JVMCI
   // See comment for _jvmci_installed_code_triggers_unloading field.
   // Returns whether this nmethod was unloaded.
-  virtual bool do_unloading_jvmci(bool unloading_occurred);
+  virtual bool do_unloading_jvmci();
 #endif
 
  private:
-  bool do_unloading_scopes(BoolObjectClosure* is_alive, bool unloading_occurred);
+  bool do_unloading_scopes(BoolObjectClosure* is_alive);
   //  Unload a nmethod if the *root object is dead.
-  bool can_unload(BoolObjectClosure* is_alive, oop* root, bool unloading_occurred);
-  bool unload_if_dead_at(RelocIterator *iter_at_oop, BoolObjectClosure* is_alive, bool unloading_occurred);
+  bool can_unload(BoolObjectClosure* is_alive, oop* root);
+  bool unload_if_dead_at(RelocIterator *iter_at_oop, BoolObjectClosure* is_alive);
 
  public:
   void oops_do(OopClosure* f) { oops_do(f, false); }
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 3bcad4d97fc..91c19dd23bf 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -170,21 +170,23 @@ elapsedTimer CompileBroker::_t_standard_compilation;
 elapsedTimer CompileBroker::_t_invalidated_compilation;
 elapsedTimer CompileBroker::_t_bailedout_compilation;
 
-int CompileBroker::_total_bailout_count          = 0;
-int CompileBroker::_total_invalidated_count      = 0;
-int CompileBroker::_total_compile_count          = 0;
-int CompileBroker::_total_osr_compile_count      = 0;
-int CompileBroker::_total_standard_compile_count = 0;
+int CompileBroker::_total_bailout_count            = 0;
+int CompileBroker::_total_invalidated_count        = 0;
+int CompileBroker::_total_compile_count            = 0;
+int CompileBroker::_total_osr_compile_count        = 0;
+int CompileBroker::_total_standard_compile_count   = 0;
+int CompileBroker::_total_compiler_stopped_count   = 0;
+int CompileBroker::_total_compiler_restarted_count = 0;
 
-int CompileBroker::_sum_osr_bytes_compiled       = 0;
-int CompileBroker::_sum_standard_bytes_compiled  = 0;
-int CompileBroker::_sum_nmethod_size             = 0;
-int CompileBroker::_sum_nmethod_code_size        = 0;
+int CompileBroker::_sum_osr_bytes_compiled         = 0;
+int CompileBroker::_sum_standard_bytes_compiled    = 0;
+int CompileBroker::_sum_nmethod_size               = 0;
+int CompileBroker::_sum_nmethod_code_size          = 0;
 
-long CompileBroker::_peak_compilation_time       = 0;
+long CompileBroker::_peak_compilation_time         = 0;
 
-CompileQueue* CompileBroker::_c2_compile_queue   = NULL;
-CompileQueue* CompileBroker::_c1_compile_queue   = NULL;
+CompileQueue* CompileBroker::_c2_compile_queue     = NULL;
+CompileQueue* CompileBroker::_c1_compile_queue     = NULL;
 
 
 
diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
index 312a4a5c526..87589025725 100644
--- a/src/hotspot/share/compiler/compileBroker.hpp
+++ b/src/hotspot/share/compiler/compileBroker.hpp
@@ -219,6 +219,8 @@ class CompileBroker: AllStatic {
   static int _total_native_compile_count;
   static int _total_osr_compile_count;
   static int _total_standard_compile_count;
+  static int _total_compiler_stopped_count;
+  static int _total_compiler_restarted_count;
   static int _sum_osr_bytes_compiled;
   static int _sum_standard_bytes_compiled;
   static int _sum_nmethod_size;
@@ -338,7 +340,15 @@ public:
   static bool set_should_compile_new_jobs(jint new_state) {
     // Return success if the current caller set it
     jint old = Atomic::cmpxchg(new_state, &_should_compile_new_jobs, 1-new_state);
-    return (old == (1-new_state));
+    bool success = (old == (1-new_state));
+    if (success) {
+      if (new_state == run_compilation) {
+        _total_compiler_restarted_count++;
+      } else {
+        _total_compiler_stopped_count++;
+      }
+    }
+    return success;
   }
 
   static void disable_compilation_forever() {
@@ -393,18 +403,20 @@ public:
 
   static CompileLog* get_log(CompilerThread* ct);
 
-  static int get_total_compile_count() {          return _total_compile_count; }
-  static int get_total_bailout_count() {          return _total_bailout_count; }
-  static int get_total_invalidated_count() {      return _total_invalidated_count; }
-  static int get_total_native_compile_count() {   return _total_native_compile_count; }
-  static int get_total_osr_compile_count() {      return _total_osr_compile_count; }
-  static int get_total_standard_compile_count() { return _total_standard_compile_count; }
-  static int get_sum_osr_bytes_compiled() {       return _sum_osr_bytes_compiled; }
-  static int get_sum_standard_bytes_compiled() {  return _sum_standard_bytes_compiled; }
-  static int get_sum_nmethod_size() {             return _sum_nmethod_size;}
-  static int get_sum_nmethod_code_size() {        return _sum_nmethod_code_size; }
-  static long get_peak_compilation_time() {       return _peak_compilation_time; }
-  static long get_total_compilation_time() {      return _t_total_compilation.milliseconds(); }
+  static int get_total_compile_count() {            return _total_compile_count; }
+  static int get_total_bailout_count() {            return _total_bailout_count; }
+  static int get_total_invalidated_count() {        return _total_invalidated_count; }
+  static int get_total_native_compile_count() {     return _total_native_compile_count; }
+  static int get_total_osr_compile_count() {        return _total_osr_compile_count; }
+  static int get_total_standard_compile_count() {   return _total_standard_compile_count; }
+  static int get_total_compiler_stopped_count() {   return _total_compiler_stopped_count; }
+  static int get_total_compiler_restarted_count() { return _total_compiler_restarted_count; }
+  static int get_sum_osr_bytes_compiled() {         return _sum_osr_bytes_compiled; }
+  static int get_sum_standard_bytes_compiled() {    return _sum_standard_bytes_compiled; }
+  static int get_sum_nmethod_size() {               return _sum_nmethod_size;}
+  static int get_sum_nmethod_code_size() {          return _sum_nmethod_code_size; }
+  static long get_peak_compilation_time() {         return _peak_compilation_time; }
+  static long get_total_compilation_time() {        return _t_total_compilation.milliseconds(); }
 
   // Log that compilation profiling is skipped because metaspace is full.
   static void log_metaspace_failure();
diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index edb815c962f..c06d6b89919 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -66,7 +66,8 @@ NOT_PRODUCT(cflags(TraceOptoOutput,     bool, TraceOptoOutput, TraceOptoOutput))
     cflags(VectorizeDebug,          uintx, 0, VectorizeDebug) \
     cflags(CloneMapDebug,           bool, false, CloneMapDebug) \
     cflags(IGVPrintLevel,           intx, PrintIdealGraphLevel, IGVPrintLevel) \
-    cflags(MaxNodeLimit,            intx, MaxNodeLimit, MaxNodeLimit)
+    cflags(MaxNodeLimit,            intx, MaxNodeLimit, MaxNodeLimit) \
+ZGC_ONLY(cflags(ZOptimizeLoadBarriers, bool, ZOptimizeLoadBarriers, ZOptimizeLoadBarriers))
 #else
   #define compilerdirectives_c2_flags(cflags)
 #endif
diff --git a/src/hotspot/share/compiler/disassembler.cpp b/src/hotspot/share/compiler/disassembler.cpp
index d98b9ce67d4..3a1b145acdb 100644
--- a/src/hotspot/share/compiler/disassembler.cpp
+++ b/src/hotspot/share/compiler/disassembler.cpp
@@ -155,6 +155,7 @@ class decode_env {
   CodeStrings   _strings;
   outputStream* _output;
   address       _start, _end;
+  ptrdiff_t     _offset;
 
   char          _option_buf[512];
   char          _print_raw;
@@ -191,7 +192,8 @@ class decode_env {
   void print_address(address value);
 
  public:
-  decode_env(CodeBlob* code, outputStream* output, CodeStrings c = CodeStrings());
+  decode_env(CodeBlob* code, outputStream* output,
+             CodeStrings c = CodeStrings(), ptrdiff_t offset = 0);
 
   address decode_instructions(address start, address end);
 
@@ -221,13 +223,15 @@ class decode_env {
   const char* options() { return _option_buf; }
 };
 
-decode_env::decode_env(CodeBlob* code, outputStream* output, CodeStrings c) {
+decode_env::decode_env(CodeBlob* code, outputStream* output, CodeStrings c,
+                       ptrdiff_t offset) {
   memset(this, 0, sizeof(*this)); // Beware, this zeroes bits of fields.
   _output = output ? output : tty;
   _code = code;
   if (code != NULL && code->is_nmethod())
     _nm = (nmethod*) code;
   _strings.copy(c);
+  _offset = offset;
 
   // by default, output pc but not bytes:
   _print_pc       = true;
@@ -354,7 +358,7 @@ void decode_env::print_insn_labels() {
   if (cb != NULL) {
     cb->print_block_comment(st, p);
   }
-  _strings.print_block_comment(st, (intptr_t)(p - _start));
+  _strings.print_block_comment(st, (intptr_t)(p - _start + _offset));
   if (_print_pc) {
     st->print("  " PTR_FORMAT ": ", p2i(p));
   }
@@ -507,10 +511,11 @@ void Disassembler::decode(CodeBlob* cb, outputStream* st) {
   env.decode_instructions(cb->code_begin(), cb->code_end());
 }
 
-void Disassembler::decode(address start, address end, outputStream* st, CodeStrings c) {
+void Disassembler::decode(address start, address end, outputStream* st, CodeStrings c,
+                          ptrdiff_t offset) {
   ttyLocker ttyl;
   if (!load_library())  return;
-  decode_env env(CodeCache::find_blob_unsafe(start), st, c);
+  decode_env env(CodeCache::find_blob_unsafe(start), st, c, offset);
   env.decode_instructions(start, end);
 }
 
diff --git a/src/hotspot/share/compiler/disassembler.hpp b/src/hotspot/share/compiler/disassembler.hpp
index 4755ce7c8a4..6220da4175f 100644
--- a/src/hotspot/share/compiler/disassembler.hpp
+++ b/src/hotspot/share/compiler/disassembler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -75,7 +75,8 @@ class Disassembler {
   }
   static void decode(CodeBlob *cb,               outputStream* st = NULL);
   static void decode(nmethod* nm,                outputStream* st = NULL);
-  static void decode(address begin, address end, outputStream* st = NULL, CodeStrings c = CodeStrings());
+  static void decode(address begin, address end, outputStream* st = NULL,
+                     CodeStrings c = CodeStrings(), ptrdiff_t offset = 0);
 };
 
 #endif // SHARE_VM_COMPILER_DISASSEMBLER_HPP
diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp
index 1c228b6aa8b..5c0828b10a5 100644
--- a/src/hotspot/share/compiler/oopMap.cpp
+++ b/src/hotspot/share/compiler/oopMap.cpp
@@ -380,8 +380,12 @@ void OopMapSet::all_do(const frame *fr, const RegisterMap *reg_map,
           continue;
         }
 #ifdef ASSERT
-        if ((((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
-            !Universe::heap()->is_in_or_null(*loc)) {
+        // We can not verify the oop here if we are using ZGC, the oop
+        // will be bad in case we had a safepoint between a load and a
+        // load barrier.
+        if (!UseZGC &&
+            ((((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
+             !Universe::heap()->is_in_or_null(*loc))) {
           tty->print_cr("# Found non oop pointer.  Dumping state at failure");
           // try to dump out some helpful debugging information
           trace_codeblob_maps(fr, reg_map);
diff --git a/src/hotspot/share/gc/cms/adaptiveFreeList.cpp b/src/hotspot/share/gc/cms/adaptiveFreeList.cpp
index 753cc8a8dee..f0319ed6041 100644
--- a/src/hotspot/share/gc/cms/adaptiveFreeList.cpp
+++ b/src/hotspot/share/gc/cms/adaptiveFreeList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -29,7 +29,7 @@
 #include "memory/freeList.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/mutex.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/vmThread.hpp"
 
 template <>
diff --git a/src/hotspot/share/gc/cms/cmsCardTable.cpp b/src/hotspot/share/gc/cms/cmsCardTable.cpp
index e0a96cf9daf..b823a079b2a 100644
--- a/src/hotspot/share/gc/cms/cmsCardTable.cpp
+++ b/src/hotspot/share/gc/cms/cmsCardTable.cpp
@@ -34,7 +34,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/vmThread.hpp"
 
 CMSCardTable::CMSCardTable(MemRegion whole_heap) :
diff --git a/src/hotspot/share/gc/cms/cmsHeap.cpp b/src/hotspot/share/gc/cms/cmsHeap.cpp
index 408775114b0..b2c426967cf 100644
--- a/src/hotspot/share/gc/cms/cmsHeap.cpp
+++ b/src/hotspot/share/gc/cms/cmsHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -220,14 +220,14 @@ void CMSHeap::cms_process_roots(StrongRootsScope* scope,
                                 ScanningOption so,
                                 bool only_strong_roots,
                                 OopsInGenClosure* root_closure,
-                                CLDClosure* cld_closure) {
+                                CLDClosure* cld_closure,
+                                OopStorage::ParState<false, false>* par_state_string) {
   MarkingCodeBlobClosure mark_code_closure(root_closure, !CodeBlobToOopClosure::FixRelocations);
-  OopsInGenClosure* weak_roots = only_strong_roots ? NULL : root_closure;
   CLDClosure* weak_cld_closure = only_strong_roots ? NULL : cld_closure;
 
-  process_roots(scope, so, root_closure, weak_roots, cld_closure, weak_cld_closure, &mark_code_closure);
+  process_roots(scope, so, root_closure, cld_closure, weak_cld_closure, &mark_code_closure);
   if (!only_strong_roots) {
-    process_string_table_roots(scope, root_closure);
+    process_string_table_roots(scope, root_closure, par_state_string);
   }
 
   if (young_gen_as_roots &&
diff --git a/src/hotspot/share/gc/cms/cmsHeap.hpp b/src/hotspot/share/gc/cms/cmsHeap.hpp
index ee800fff7f8..93f177aadec 100644
--- a/src/hotspot/share/gc/cms/cmsHeap.hpp
+++ b/src/hotspot/share/gc/cms/cmsHeap.hpp
@@ -30,6 +30,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/oopStorageParState.hpp"
 #include "utilities/growableArray.hpp"
 
 class CLDClosure;
@@ -90,7 +91,8 @@ public:
                          ScanningOption so,
                          bool only_strong_roots,
                          OopsInGenClosure* root_closure,
-                         CLDClosure* cld_closure);
+                         CLDClosure* cld_closure,
+                         OopStorage::ParState<false, false>* par_state_string = NULL);
 
   GCMemoryManager* old_manager() const { return _old_manager; }
 
diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
index 53b54cd3476..0b6c7c380fc 100644
--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
@@ -45,7 +45,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
 #include "runtime/java.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
index 934aa42d124..422ba66bcae 100644
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
@@ -54,6 +54,7 @@
 #include "gc/shared/genCollectedHeap.hpp"
 #include "gc/shared/genOopClosures.inline.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
+#include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/space.inline.hpp"
 #include "gc/shared/strongRootsScope.hpp"
@@ -74,7 +75,7 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vmThread.hpp"
 #include "services/memoryService.hpp"
@@ -2769,10 +2770,12 @@ class CMSParMarkTask : public AbstractGangTask {
  protected:
   CMSCollector*     _collector;
   uint              _n_workers;
+  OopStorage::ParState<false, false> _par_state_string;
   CMSParMarkTask(const char* name, CMSCollector* collector, uint n_workers) :
       AbstractGangTask(name),
       _collector(collector),
-      _n_workers(n_workers) {}
+      _n_workers(n_workers),
+      _par_state_string(StringTable::weak_storage()) {}
   // Work method in support of parallel rescan ... of young gen spaces
   void do_young_space_rescan(OopsInGenClosure* cl,
                              ContiguousSpace* space,
@@ -4274,7 +4277,9 @@ void CMSParInitialMarkTask::work(uint worker_id) {
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mri_cl,
-                          &cld_closure);
+                          &cld_closure,
+                          &_par_state_string);
+
   assert(_collector->should_unload_classes()
          || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
          "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
@@ -4403,7 +4408,8 @@ void CMSParRemarkTask::work(uint worker_id) {
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mrias_cl,
-                          NULL);     // The dirty klasses will be handled below
+                          NULL,     // The dirty klasses will be handled below
+                          &_par_state_string);
 
   assert(_collector->should_unload_classes()
          || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
@@ -5142,7 +5148,7 @@ void CMSCollector::refProcessingWork() {
   rp->setup_policy(false);
   verify_work_stacks_empty();
 
-  ReferenceProcessorPhaseTimes pt(_gc_timer_cm, rp->num_queues());
+  ReferenceProcessorPhaseTimes pt(_gc_timer_cm, rp->max_num_queues());
   {
     GCTraceTime(Debug, gc, phases) t("Reference Processing", _gc_timer_cm);
 
@@ -5201,7 +5207,7 @@ void CMSCollector::refProcessingWork() {
       GCTraceTime(Debug, gc, phases) t("Class Unloading", _gc_timer_cm);
 
       // Unload classes and purge the SystemDictionary.
-      bool purged_class = SystemDictionary::do_unloading(&_is_alive_closure, _gc_timer_cm);
+      bool purged_class = SystemDictionary::do_unloading(_gc_timer_cm);
 
       // Unload nmethods.
       CodeCache::do_unloading(&_is_alive_closure, purged_class);
diff --git a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.cpp b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.cpp
index bb3282634ce..9c22c29a107 100644
--- a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.cpp
+++ b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.cpp
@@ -30,17 +30,16 @@
 #include "gc/shared/genCollectedHeap.hpp"
 #include "gc/shared/jvmFlagConstraintsGC.hpp"
 #include "memory/universe.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 static JVMFlag::Error ParallelGCThreadsAndCMSWorkQueueDrainThreshold(uint threads, uintx threshold, bool verbose) {
   // CMSWorkQueueDrainThreshold is verified to be less than max_juint
   if (UseConcMarkSweepGC && (threads > (uint)(max_jint / (uint)threshold))) {
-    CommandLineError::print(verbose,
-                            "ParallelGCThreads (" UINT32_FORMAT ") or CMSWorkQueueDrainThreshold ("
-                            UINTX_FORMAT ") is too large\n",
-                            threads, threshold);
+    JVMFlag::printError(verbose,
+                        "ParallelGCThreads (" UINT32_FORMAT ") or CMSWorkQueueDrainThreshold ("
+                        UINTX_FORMAT ") is too large\n",
+                        threads, threshold);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -49,20 +48,20 @@ static JVMFlag::Error ParallelGCThreadsAndCMSWorkQueueDrainThreshold(uint thread
 JVMFlag::Error ParallelGCThreadsConstraintFuncCMS(uint value, bool verbose) {
   // To avoid overflow at ParScanClosure::do_oop_work.
   if (UseConcMarkSweepGC && (value > (max_jint / 10))) {
-    CommandLineError::print(verbose,
-                            "ParallelGCThreads (" UINT32_FORMAT ") must be "
-                            "less than or equal to " UINT32_FORMAT " for CMS GC\n",
-                            value, (max_jint / 10));
+    JVMFlag::printError(verbose,
+                        "ParallelGCThreads (" UINT32_FORMAT ") must be "
+                        "less than or equal to " UINT32_FORMAT " for CMS GC\n",
+                        value, (max_jint / 10));
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return ParallelGCThreadsAndCMSWorkQueueDrainThreshold(value, CMSWorkQueueDrainThreshold, verbose);
 }
 JVMFlag::Error ParGCStridesPerThreadConstraintFunc(uintx value, bool verbose) {
   if (UseConcMarkSweepGC && (value > ((uintx)max_jint / (uintx)ParallelGCThreads))) {
-    CommandLineError::print(verbose,
-                            "ParGCStridesPerThread (" UINTX_FORMAT ") must be "
-                            "less than or equal to ergonomic maximum (" UINTX_FORMAT ")\n",
-                            value, ((uintx)max_jint / (uintx)ParallelGCThreads));
+    JVMFlag::printError(verbose,
+                        "ParGCStridesPerThread (" UINTX_FORMAT ") must be "
+                        "less than or equal to ergonomic maximum (" UINTX_FORMAT ")\n",
+                        value, ((uintx)max_jint / (uintx)ParallelGCThreads));
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -76,10 +75,10 @@ JVMFlag::Error ParGCCardsPerStrideChunkConstraintFunc(intx value, bool verbose)
     size_t card_table_size = ct->cards_required(heap_size) - 1; // Valid card table size
 
     if ((size_t)value > card_table_size) {
-      CommandLineError::print(verbose,
-                              "ParGCCardsPerStrideChunk (" INTX_FORMAT ") is too large for the heap size and "
-                              "must be less than or equal to card table size (" SIZE_FORMAT ")\n",
-                              value, card_table_size);
+      JVMFlag::printError(verbose,
+                          "ParGCCardsPerStrideChunk (" INTX_FORMAT ") is too large for the heap size and "
+                          "must be less than or equal to card table size (" SIZE_FORMAT ")\n",
+                          value, card_table_size);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
 
@@ -89,10 +88,10 @@ JVMFlag::Error ParGCCardsPerStrideChunkConstraintFunc(intx value, bool verbose)
     uintx n_strides = ParallelGCThreads * ParGCStridesPerThread;
     uintx ergo_max = max_uintx / n_strides;
     if ((uintx)value > ergo_max) {
-      CommandLineError::print(verbose,
-                              "ParGCCardsPerStrideChunk (" INTX_FORMAT ") must be "
-                              "less than or equal to ergonomic maximum (" UINTX_FORMAT ")\n",
-                              value, ergo_max);
+      JVMFlag::printError(verbose,
+                          "ParGCCardsPerStrideChunk (" INTX_FORMAT ") must be "
+                          "less than or equal to ergonomic maximum (" UINTX_FORMAT ")\n",
+                          value, ergo_max);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -104,10 +103,10 @@ JVMFlag::Error CMSOldPLABMinConstraintFunc(size_t value, bool verbose) {
 
   if (UseConcMarkSweepGC) {
     if (value > CMSOldPLABMax) {
-      CommandLineError::print(verbose,
-                              "CMSOldPLABMin (" SIZE_FORMAT ") must be "
-                              "less than or equal to CMSOldPLABMax (" SIZE_FORMAT ")\n",
-                              value, CMSOldPLABMax);
+      JVMFlag::printError(verbose,
+                          "CMSOldPLABMin (" SIZE_FORMAT ") must be "
+                          "less than or equal to CMSOldPLABMax (" SIZE_FORMAT ")\n",
+                          value, CMSOldPLABMax);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
     status = MaxPLABSizeBounds("CMSOldPLABMin", value, verbose);
@@ -129,11 +128,11 @@ static JVMFlag::Error CMSReservedAreaConstraintFunc(const char* name, size_t val
     ConcurrentMarkSweepGeneration* cms = CMSHeap::heap()->old_gen();
     const size_t ergo_max = cms->cmsSpace()->max_flag_size_for_task_size();
     if (value > ergo_max) {
-      CommandLineError::print(verbose,
-                              "%s (" SIZE_FORMAT ") must be "
-                              "less than or equal to ergonomic maximum (" SIZE_FORMAT ") "
-                              "which is based on the maximum size of the old generation of the Java heap\n",
-                              name, value, ergo_max);
+      JVMFlag::printError(verbose,
+                          "%s (" SIZE_FORMAT ") must be "
+                          "less than or equal to ergonomic maximum (" SIZE_FORMAT ") "
+                          "which is based on the maximum size of the old generation of the Java heap\n",
+                          name, value, ergo_max);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -150,10 +149,10 @@ JVMFlag::Error CMSRescanMultipleConstraintFunc(size_t value, bool verbose) {
     // Note that rescan_task_size() will be aligned if CMSRescanMultiple is a multiple of 'HeapWordSize'
     // because rescan_task_size() is CardTable::card_size / HeapWordSize * BitsPerWord.
     if (value % HeapWordSize != 0) {
-      CommandLineError::print(verbose,
-                              "CMSRescanMultiple (" SIZE_FORMAT ") must be "
-                              "a multiple of " SIZE_FORMAT "\n",
-                              value, HeapWordSize);
+      JVMFlag::printError(verbose,
+                          "CMSRescanMultiple (" SIZE_FORMAT ") must be "
+                          "a multiple of " SIZE_FORMAT "\n",
+                          value, HeapWordSize);
       status = JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -167,10 +166,10 @@ JVMFlag::Error CMSConcMarkMultipleConstraintFunc(size_t value, bool verbose) {
 
 JVMFlag::Error CMSPrecleanDenominatorConstraintFunc(uintx value, bool verbose) {
   if (UseConcMarkSweepGC && (value <= CMSPrecleanNumerator)) {
-    CommandLineError::print(verbose,
-                            "CMSPrecleanDenominator (" UINTX_FORMAT ") must be "
-                            "strickly greater than CMSPrecleanNumerator (" UINTX_FORMAT ")\n",
-                            value, CMSPrecleanNumerator);
+    JVMFlag::printError(verbose,
+                        "CMSPrecleanDenominator (" UINTX_FORMAT ") must be "
+                        "strickly greater than CMSPrecleanNumerator (" UINTX_FORMAT ")\n",
+                        value, CMSPrecleanNumerator);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -178,10 +177,10 @@ JVMFlag::Error CMSPrecleanDenominatorConstraintFunc(uintx value, bool verbose) {
 
 JVMFlag::Error CMSPrecleanNumeratorConstraintFunc(uintx value, bool verbose) {
   if (UseConcMarkSweepGC && (value >= CMSPrecleanDenominator)) {
-    CommandLineError::print(verbose,
-                            "CMSPrecleanNumerator (" UINTX_FORMAT ") must be "
-                            "less than CMSPrecleanDenominator (" UINTX_FORMAT ")\n",
-                            value, CMSPrecleanDenominator);
+    JVMFlag::printError(verbose,
+                        "CMSPrecleanNumerator (" UINTX_FORMAT ") must be "
+                        "less than CMSPrecleanDenominator (" UINTX_FORMAT ")\n",
+                        value, CMSPrecleanDenominator);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -191,10 +190,10 @@ JVMFlag::Error CMSSamplingGrainConstraintFunc(uintx value, bool verbose) {
   if (UseConcMarkSweepGC) {
     size_t max_capacity = CMSHeap::heap()->young_gen()->max_capacity();
     if (value > max_uintx - max_capacity) {
-    CommandLineError::print(verbose,
-                            "CMSSamplingGrain (" UINTX_FORMAT ") must be "
-                            "less than or equal to ergonomic maximum (" SIZE_FORMAT ")\n",
-                            value, max_uintx - max_capacity);
+    JVMFlag::printError(verbose,
+                        "CMSSamplingGrain (" UINTX_FORMAT ") must be "
+                        "less than or equal to ergonomic maximum (" SIZE_FORMAT ")\n",
+                        value, max_uintx - max_capacity);
     return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -216,11 +215,11 @@ JVMFlag::Error CMSBitMapYieldQuantumConstraintFunc(size_t value, bool verbose) {
     size_t bitmap_size = cms->collector()->markBitMap()->sizeInWords();
 
     if (value > bitmap_size) {
-      CommandLineError::print(verbose,
-                              "CMSBitMapYieldQuantum (" SIZE_FORMAT ") must "
-                              "be less than or equal to bitmap size (" SIZE_FORMAT ") "
-                              "whose size corresponds to the size of old generation of the Java heap\n",
-                              value, bitmap_size);
+      JVMFlag::printError(verbose,
+                          "CMSBitMapYieldQuantum (" SIZE_FORMAT ") must "
+                          "be less than or equal to bitmap size (" SIZE_FORMAT ") "
+                          "whose size corresponds to the size of old generation of the Java heap\n",
+                          value, bitmap_size);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -229,9 +228,9 @@ JVMFlag::Error CMSBitMapYieldQuantumConstraintFunc(size_t value, bool verbose) {
 
 JVMFlag::Error OldPLABSizeConstraintFuncCMS(size_t value, bool verbose) {
   if (value == 0) {
-    CommandLineError::print(verbose,
-                            "OldPLABSize (" SIZE_FORMAT ") must be greater than 0",
-                            value);
+    JVMFlag::printError(verbose,
+                        "OldPLABSize (" SIZE_FORMAT ") must be greater than 0",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   // For CMS, OldPLABSize is the number of free blocks of a given size that are used when
diff --git a/src/hotspot/share/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp
index 86025d7bafe..4e625ed1ec3 100644
--- a/src/hotspot/share/gc/cms/parNewGeneration.cpp
+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/stringTable.hpp"
 #include "gc/cms/cmsHeap.inline.hpp"
 #include "gc/cms/compactibleFreeListSpace.hpp"
 #include "gc/cms/concurrentMarkSweepGeneration.hpp"
@@ -589,7 +590,8 @@ ParNewGenTask::ParNewGenTask(ParNewGeneration* young_gen,
     _young_gen(young_gen), _old_gen(old_gen),
     _young_old_boundary(young_old_boundary),
     _state_set(state_set),
-    _strong_roots_scope(strong_roots_scope)
+    _strong_roots_scope(strong_roots_scope),
+    _par_state_string(StringTable::weak_storage())
 {}
 
 void ParNewGenTask::work(uint worker_id) {
@@ -611,7 +613,8 @@ void ParNewGenTask::work(uint worker_id) {
   heap->young_process_roots(_strong_roots_scope,
                            &par_scan_state.to_space_root_closure(),
                            &par_scan_state.older_gen_closure(),
-                           &cld_scan_closure);
+                           &cld_scan_closure,
+                           &_par_state_string);
 
   par_scan_state.end_strong_roots();
 
@@ -958,7 +961,7 @@ void ParNewGeneration::collect(bool   full,
   // Can  the mt_degree be set later (at run_task() time would be best)?
   rp->set_active_mt_degree(active_workers);
   ReferenceProcessorStats stats;
-  ReferenceProcessorPhaseTimes pt(_gc_timer, rp->num_queues());
+  ReferenceProcessorPhaseTimes pt(_gc_timer, rp->max_num_queues());
   if (rp->processing_is_mt()) {
     ParNewRefProcTaskExecutor task_executor(*this, *_old_gen, thread_state_set);
     stats = rp->process_discovered_references(&is_alive, &keep_alive,
diff --git a/src/hotspot/share/gc/cms/parNewGeneration.hpp b/src/hotspot/share/gc/cms/parNewGeneration.hpp
index 92b74004876..3ccd16224d6 100644
--- a/src/hotspot/share/gc/cms/parNewGeneration.hpp
+++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp
@@ -29,6 +29,7 @@
 #include "gc/serial/defNewGeneration.hpp"
 #include "gc/shared/copyFailedInfo.hpp"
 #include "gc/shared/gcTrace.hpp"
+#include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/plab.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/taskqueue.hpp"
@@ -236,6 +237,7 @@ class ParNewGenTask: public AbstractGangTask {
   HeapWord*                    _young_old_boundary;
   class ParScanThreadStateSet* _state_set;
   StrongRootsScope*            _strong_roots_scope;
+  OopStorage::ParState<false, false> _par_state_string;
 
 public:
   ParNewGenTask(ParNewGeneration*      young_gen,
diff --git a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
new file mode 100644
index 00000000000..b323ef32f85
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/epsilon/epsilonArguments.hpp"
+#include "gc/epsilon/epsilonHeap.hpp"
+#include "gc/epsilon/epsilonCollectorPolicy.hpp"
+#include "gc/shared/gcArguments.inline.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/globals_extension.hpp"
+#include "runtime/vm_version.hpp"
+#include "utilities/macros.hpp"
+
+size_t EpsilonArguments::conservative_max_heap_alignment() {
+  return UseLargePages ? os::large_page_size() : os::vm_page_size();
+}
+
+void EpsilonArguments::initialize() {
+  GCArguments::initialize();
+
+  assert(UseEpsilonGC, "Sanity");
+
+  // Forcefully exit when OOME is detected. Nothing we can do at that point.
+  if (FLAG_IS_DEFAULT(ExitOnOutOfMemoryError)) {
+    FLAG_SET_DEFAULT(ExitOnOutOfMemoryError, true);
+  }
+
+  if (EpsilonMaxTLABSize < MinTLABSize) {
+    warning("EpsilonMaxTLABSize < MinTLABSize, adjusting it to " SIZE_FORMAT, MinTLABSize);
+    EpsilonMaxTLABSize = MinTLABSize;
+  }
+
+  if (!EpsilonElasticTLAB && EpsilonElasticTLABDecay) {
+    warning("Disabling EpsilonElasticTLABDecay because EpsilonElasticTLAB is disabled");
+    FLAG_SET_DEFAULT(EpsilonElasticTLABDecay, false);
+  }
+
+#ifdef COMPILER2
+  // Enable loop strip mining: there are still non-GC safepoints, no need to make it worse
+  if (FLAG_IS_DEFAULT(UseCountedLoopSafepoints)) {
+    FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
+    if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
+      FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
+    }
+  }
+#endif
+}
+
+CollectedHeap* EpsilonArguments::create_heap() {
+  return create_heap_with_policy<EpsilonHeap, EpsilonCollectorPolicy>();
+}
diff --git a/src/hotspot/share/gc/epsilon/epsilonArguments.hpp b/src/hotspot/share/gc/epsilon/epsilonArguments.hpp
new file mode 100644
index 00000000000..865c2f1c412
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.hpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_GC_EPSILON_EPSILONARGUMENTS_HPP
+#define SHARE_GC_EPSILON_EPSILONARGUMENTS_HPP
+
+#include "gc/shared/gcArguments.hpp"
+
+class CollectedHeap;
+
+class EpsilonArguments : public GCArguments {
+public:
+  virtual void initialize();
+  virtual size_t conservative_max_heap_alignment();
+  virtual CollectedHeap* create_heap();
+};
+
+#endif // SHARE_GC_EPSILON_EPSILONARGUMENTS_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
new file mode 100644
index 00000000000..e53297828e0
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/thread.hpp"
+#include "gc/epsilon/epsilonBarrierSet.hpp"
+#include "gc/epsilon/epsilonThreadLocalData.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "utilities/macros.hpp"
+#ifdef COMPILER1
+#include "gc/shared/c1/barrierSetC1.hpp"
+#endif
+#ifdef COMPILER2
+#include "gc/shared/c2/barrierSetC2.hpp"
+#endif
+
+EpsilonBarrierSet::EpsilonBarrierSet() : BarrierSet(
+          make_barrier_set_assembler<BarrierSetAssembler>(),
+          make_barrier_set_c1<BarrierSetC1>(),
+          make_barrier_set_c2<BarrierSetC2>(),
+          BarrierSet::FakeRtti(BarrierSet::EpsilonBarrierSet)) {};
+
+void EpsilonBarrierSet::on_thread_create(Thread *thread) {
+  EpsilonThreadLocalData::create(thread);
+}
+
+void EpsilonBarrierSet::on_thread_destroy(Thread *thread) {
+  EpsilonThreadLocalData::destroy(thread);
+}
diff --git a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
new file mode 100644
index 00000000000..420e38fd13e
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_BARRIERSET_HPP
+#define SHARE_VM_GC_EPSILON_BARRIERSET_HPP
+
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/barrierSet.hpp"
+
+// No interaction with application is required for Epsilon, and therefore
+// the barrier set is empty.
+class EpsilonBarrierSet: public BarrierSet {
+  friend class VMStructs;
+
+public:
+  EpsilonBarrierSet();
+
+  virtual void print_on(outputStream *st) const {}
+
+  virtual void on_thread_create(Thread* thread);
+  virtual void on_thread_destroy(Thread* thread);
+
+  template <DecoratorSet decorators, typename BarrierSetT = EpsilonBarrierSet>
+  class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {};
+};
+
+template<>
+struct BarrierSet::GetName<EpsilonBarrierSet> {
+  static const BarrierSet::Name value = BarrierSet::EpsilonBarrierSet;
+};
+
+template<>
+struct BarrierSet::GetType<BarrierSet::EpsilonBarrierSet> {
+  typedef ::EpsilonBarrierSet type;
+};
+
+#endif // SHARE_VM_GC_EPSILON_BARRIERSET_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
new file mode 100644
index 00000000000..855395e51e7
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
+#define SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
+
+#include "gc/shared/collectorPolicy.hpp"
+
+class EpsilonCollectorPolicy: public CollectorPolicy {
+protected:
+  virtual void initialize_alignments() {
+    size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
+    size_t align = MAX2((size_t)os::vm_allocation_granularity(), page_size);
+    _space_alignment = align;
+    _heap_alignment  = align;
+  }
+
+public:
+  EpsilonCollectorPolicy() : CollectorPolicy() {};
+};
+
+#endif // SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
new file mode 100644
index 00000000000..612914b9747
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/epsilon/epsilonHeap.hpp"
+#include "gc/epsilon/epsilonMemoryPool.hpp"
+#include "gc/epsilon/epsilonThreadLocalData.hpp"
+#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
+
+jint EpsilonHeap::initialize() {
+  size_t align = _policy->heap_alignment();
+  size_t init_byte_size = align_up(_policy->initial_heap_byte_size(), align);
+  size_t max_byte_size  = align_up(_policy->max_heap_byte_size(), align);
+
+  // Initialize backing storage
+  ReservedSpace heap_rs = Universe::reserve_heap(max_byte_size, align);
+  _virtual_space.initialize(heap_rs, init_byte_size);
+
+  MemRegion committed_region((HeapWord*)_virtual_space.low(),          (HeapWord*)_virtual_space.high());
+  MemRegion  reserved_region((HeapWord*)_virtual_space.low_boundary(), (HeapWord*)_virtual_space.high_boundary());
+
+  initialize_reserved_region(reserved_region.start(), reserved_region.end());
+
+  _space = new ContiguousSpace();
+  _space->initialize(committed_region, /* clear_space = */ true, /* mangle_space = */ true);
+
+  // Precompute hot fields
+  _max_tlab_size = MIN2(CollectedHeap::max_tlab_size(), EpsilonMaxTLABSize / HeapWordSize);
+  _step_counter_update = MIN2<size_t>(max_byte_size / 16, EpsilonUpdateCountersStep);
+  _step_heap_print = (EpsilonPrintHeapSteps == 0) ? SIZE_MAX : (max_byte_size / EpsilonPrintHeapSteps);
+  _decay_time_ns = (int64_t) EpsilonTLABDecayTime * NANOSECS_PER_MILLISEC;
+
+  // Enable monitoring
+  _monitoring_support = new EpsilonMonitoringSupport(this);
+  _last_counter_update = 0;
+  _last_heap_print = 0;
+
+  // Install barrier set
+  BarrierSet::set_barrier_set(new EpsilonBarrierSet());
+
+  // All done, print out the configuration
+  if (init_byte_size != max_byte_size) {
+    log_info(gc)("Resizeable heap; starting at " SIZE_FORMAT "M, max: " SIZE_FORMAT "M, step: " SIZE_FORMAT "M",
+                 init_byte_size / M, max_byte_size / M, EpsilonMinHeapExpand / M);
+  } else {
+    log_info(gc)("Non-resizeable heap; start/max: " SIZE_FORMAT "M", init_byte_size / M);
+  }
+
+  if (UseTLAB) {
+    log_info(gc)("Using TLAB allocation; max: " SIZE_FORMAT "K", _max_tlab_size * HeapWordSize / K);
+    if (EpsilonElasticTLAB) {
+      log_info(gc)("Elastic TLABs enabled; elasticity: %.2fx", EpsilonTLABElasticity);
+    }
+    if (EpsilonElasticTLABDecay) {
+      log_info(gc)("Elastic TLABs decay enabled; decay time: " SIZE_FORMAT "ms", EpsilonTLABDecayTime);
+    }
+  } else {
+    log_info(gc)("Not using TLAB allocation");
+  }
+
+  return JNI_OK;
+}
+
+void EpsilonHeap::post_initialize() {
+  CollectedHeap::post_initialize();
+}
+
+void EpsilonHeap::initialize_serviceability() {
+  _pool = new EpsilonMemoryPool(this);
+  _memory_manager.add_pool(_pool);
+}
+
+GrowableArray<GCMemoryManager*> EpsilonHeap::memory_managers() {
+  GrowableArray<GCMemoryManager*> memory_managers(1);
+  memory_managers.append(&_memory_manager);
+  return memory_managers;
+}
+
+GrowableArray<MemoryPool*> EpsilonHeap::memory_pools() {
+  GrowableArray<MemoryPool*> memory_pools(1);
+  memory_pools.append(_pool);
+  return memory_pools;
+}
+
+size_t EpsilonHeap::unsafe_max_tlab_alloc(Thread* thr) const {
+  // Return max allocatable TLAB size, and let allocation path figure out
+  // the actual TLAB allocation size.
+  return _max_tlab_size;
+}
+
+EpsilonHeap* EpsilonHeap::heap() {
+  CollectedHeap* heap = Universe::heap();
+  assert(heap != NULL, "Uninitialized access to EpsilonHeap::heap()");
+  assert(heap->kind() == CollectedHeap::Epsilon, "Not an Epsilon heap");
+  return (EpsilonHeap*)heap;
+}
+
+HeapWord* EpsilonHeap::allocate_work(size_t size) {
+  HeapWord* res = _space->par_allocate(size);
+
+  while (res == NULL) {
+    // Allocation failed, attempt expansion, and retry:
+    MutexLockerEx ml(Heap_lock);
+
+    size_t space_left = max_capacity() - capacity();
+    size_t want_space = MAX2(size, EpsilonMinHeapExpand);
+
+    if (want_space < space_left) {
+      // Enough space to expand in bulk:
+      bool expand = _virtual_space.expand_by(want_space);
+      assert(expand, "Should be able to expand");
+    } else if (size < space_left) {
+      // No space to expand in bulk, and this allocation is still possible,
+      // take all the remaining space:
+      bool expand = _virtual_space.expand_by(space_left);
+      assert(expand, "Should be able to expand");
+    } else {
+      // No space left:
+      return NULL;
+    }
+
+    _space->set_end((HeapWord *) _virtual_space.high());
+    res = _space->par_allocate(size);
+  }
+
+  size_t used = _space->used();
+
+  // Allocation successful, update counters
+  {
+    size_t last = _last_counter_update;
+    if ((used - last >= _step_counter_update) && Atomic::cmpxchg(used, &_last_counter_update, last) == last) {
+      _monitoring_support->update_counters();
+    }
+  }
+
+  // ...and print the occupancy line, if needed
+  {
+    size_t last = _last_heap_print;
+    if ((used - last >= _step_heap_print) && Atomic::cmpxchg(used, &_last_heap_print, last) == last) {
+      log_info(gc)("Heap: " SIZE_FORMAT "M reserved, " SIZE_FORMAT "M (%.2f%%) committed, " SIZE_FORMAT "M (%.2f%%) used",
+                   max_capacity() / M,
+                   capacity() / M,
+                   capacity() * 100.0 / max_capacity(),
+                   used / M,
+                   used * 100.0 / max_capacity());
+    }
+  }
+
+  return res;
+}
+
+HeapWord* EpsilonHeap::allocate_new_tlab(size_t min_size,
+                                         size_t requested_size,
+                                         size_t* actual_size) {
+  Thread* thread = Thread::current();
+
+  // Defaults in case elastic paths are not taken
+  bool fits = true;
+  size_t size = requested_size;
+  size_t ergo_tlab = requested_size;
+  int64_t time = 0;
+
+  if (EpsilonElasticTLAB) {
+    ergo_tlab = EpsilonThreadLocalData::ergo_tlab_size(thread);
+
+    if (EpsilonElasticTLABDecay) {
+      int64_t last_time = EpsilonThreadLocalData::last_tlab_time(thread);
+      time = (int64_t) os::javaTimeNanos();
+
+      assert(last_time <= time, "time should be monotonic");
+
+      // If the thread had not allocated recently, retract the ergonomic size.
+      // This conserves memory when the thread had initial burst of allocations,
+      // and then started allocating only sporadically.
+      if (last_time != 0 && (time - last_time > _decay_time_ns)) {
+        ergo_tlab = 0;
+        EpsilonThreadLocalData::set_ergo_tlab_size(thread, 0);
+      }
+    }
+
+    // If we can fit the allocation under current TLAB size, do so.
+    // Otherwise, we want to elastically increase the TLAB size.
+    fits = (requested_size <= ergo_tlab);
+    if (!fits) {
+      size = (size_t) (ergo_tlab * EpsilonTLABElasticity);
+    }
+  }
+
+  // Always honor boundaries
+  size = MAX2(min_size, MIN2(_max_tlab_size, size));
+
+  if (log_is_enabled(Trace, gc)) {
+    ResourceMark rm;
+    log_trace(gc)("TLAB size for \"%s\" (Requested: " SIZE_FORMAT "K, Min: " SIZE_FORMAT
+                          "K, Max: " SIZE_FORMAT "K, Ergo: " SIZE_FORMAT "K) -> " SIZE_FORMAT "K",
+                  thread->name(),
+                  requested_size * HeapWordSize / K,
+                  min_size * HeapWordSize / K,
+                  _max_tlab_size * HeapWordSize / K,
+                  ergo_tlab * HeapWordSize / K,
+                  size * HeapWordSize / K);
+  }
+
+  // All prepared, let's do it!
+  HeapWord* res = allocate_work(size);
+
+  if (res != NULL) {
+    // Allocation successful
+    *actual_size = size;
+    if (EpsilonElasticTLABDecay) {
+      EpsilonThreadLocalData::set_last_tlab_time(thread, time);
+    }
+    if (EpsilonElasticTLAB && !fits) {
+      // If we requested expansion, this is our new ergonomic TLAB size
+      EpsilonThreadLocalData::set_ergo_tlab_size(thread, size);
+    }
+  } else {
+    // Allocation failed, reset ergonomics to try and fit smaller TLABs
+    if (EpsilonElasticTLAB) {
+      EpsilonThreadLocalData::set_ergo_tlab_size(thread, 0);
+    }
+  }
+
+  return res;
+}
+
+HeapWord* EpsilonHeap::mem_allocate(size_t size, bool *gc_overhead_limit_was_exceeded) {
+  *gc_overhead_limit_was_exceeded = false;
+  return allocate_work(size);
+}
+
+void EpsilonHeap::collect(GCCause::Cause cause) {
+  log_info(gc)("GC request for \"%s\" is ignored", GCCause::to_string(cause));
+  _monitoring_support->update_counters();
+}
+
+void EpsilonHeap::do_full_collection(bool clear_all_soft_refs) {
+  log_info(gc)("Full GC request for \"%s\" is ignored", GCCause::to_string(gc_cause()));
+  _monitoring_support->update_counters();
+}
+
+void EpsilonHeap::safe_object_iterate(ObjectClosure *cl) {
+  _space->safe_object_iterate(cl);
+}
+
+void EpsilonHeap::print_on(outputStream *st) const {
+  st->print_cr("Epsilon Heap");
+
+  // Cast away constness:
+  ((VirtualSpace)_virtual_space).print_on(st);
+
+  st->print_cr("Allocation space:");
+  _space->print_on(st);
+}
+
+void EpsilonHeap::print_tracing_info() const {
+  Log(gc) log;
+  size_t allocated_kb = used() / K;
+  log.info("Total allocated: " SIZE_FORMAT " KB",
+           allocated_kb);
+  log.info("Average allocation rate: " SIZE_FORMAT " KB/sec",
+           (size_t)(allocated_kb * NANOSECS_PER_SEC / os::elapsed_counter()));
+}
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
new file mode 100644
index 00000000000..f58fe522c98
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
+#define SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
+
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/softRefPolicy.hpp"
+#include "gc/shared/space.hpp"
+#include "services/memoryManager.hpp"
+#include "gc/epsilon/epsilonCollectorPolicy.hpp"
+#include "gc/epsilon/epsilonMonitoringSupport.hpp"
+#include "gc/epsilon/epsilonBarrierSet.hpp"
+#include "gc/epsilon/epsilon_globals.hpp"
+
+class EpsilonHeap : public CollectedHeap {
+  friend class VMStructs;
+private:
+  EpsilonCollectorPolicy* _policy;
+  SoftRefPolicy _soft_ref_policy;
+  EpsilonMonitoringSupport* _monitoring_support;
+  MemoryPool* _pool;
+  GCMemoryManager _memory_manager;
+  ContiguousSpace* _space;
+  VirtualSpace _virtual_space;
+  size_t _max_tlab_size;
+  size_t _step_counter_update;
+  size_t _step_heap_print;
+  int64_t _decay_time_ns;
+  volatile size_t _last_counter_update;
+  volatile size_t _last_heap_print;
+
+public:
+  static EpsilonHeap* heap();
+
+  EpsilonHeap(EpsilonCollectorPolicy* p) :
+          _policy(p),
+          _memory_manager("Epsilon Heap", "") {};
+
+  virtual Name kind() const {
+    return CollectedHeap::Epsilon;
+  }
+
+  virtual const char* name() const {
+    return "Epsilon";
+  }
+
+  virtual CollectorPolicy* collector_policy() const {
+    return _policy;
+  }
+
+  virtual SoftRefPolicy* soft_ref_policy() {
+    return &_soft_ref_policy;
+  }
+
+  virtual jint initialize();
+  virtual void post_initialize();
+  virtual void initialize_serviceability();
+
+  virtual GrowableArray<GCMemoryManager*> memory_managers();
+  virtual GrowableArray<MemoryPool*> memory_pools();
+
+  virtual size_t max_capacity() const { return _virtual_space.reserved_size();  }
+  virtual size_t capacity()     const { return _virtual_space.committed_size(); }
+  virtual size_t used()         const { return _space->used(); }
+
+  virtual bool is_in(const void* p) const {
+    return _space->is_in(p);
+  }
+
+  virtual bool is_scavengable(oop obj) {
+    // No GC is going to happen, therefore no objects ever move.
+    return false;
+  }
+
+  virtual bool is_maximal_no_gc() const {
+    // No GC is going to happen. Return "we are at max", when we are about to fail.
+    return used() == capacity();
+  }
+
+  // Allocation
+  HeapWord* allocate_work(size_t size);
+  virtual HeapWord* mem_allocate(size_t size, bool* gc_overhead_limit_was_exceeded);
+  virtual HeapWord* allocate_new_tlab(size_t min_size,
+                                      size_t requested_size,
+                                      size_t* actual_size);
+
+  // TLAB allocation
+  virtual bool supports_tlab_allocation()           const { return true;           }
+  virtual size_t tlab_capacity(Thread* thr)         const { return capacity();     }
+  virtual size_t tlab_used(Thread* thr)             const { return used();         }
+  virtual size_t max_tlab_size()                    const { return _max_tlab_size; }
+  virtual size_t unsafe_max_tlab_alloc(Thread* thr) const;
+
+  virtual void collect(GCCause::Cause cause);
+  virtual void do_full_collection(bool clear_all_soft_refs);
+
+  // Heap walking support
+  virtual void safe_object_iterate(ObjectClosure* cl);
+  virtual void object_iterate(ObjectClosure* cl) {
+    safe_object_iterate(cl);
+  }
+
+  // No support for block parsing.
+  virtual HeapWord* block_start(const void* addr) const { return NULL;  }
+  virtual size_t block_size(const HeapWord* addr) const { return 0;     }
+  virtual bool block_is_obj(const HeapWord* addr) const { return false; }
+
+  // No GC threads
+  virtual void print_gc_threads_on(outputStream* st) const {}
+  virtual void gc_threads_do(ThreadClosure* tc) const {}
+
+  // No heap verification
+  virtual void prepare_for_verify() {}
+  virtual void verify(VerifyOption option) {}
+
+  virtual jlong millis_since_last_gc() {
+    // Report time since the VM start
+    return os::elapsed_counter() / NANOSECS_PER_MILLISEC;
+  }
+
+  virtual void print_on(outputStream* st) const;
+  virtual void print_tracing_info() const;
+
+};
+
+#endif // SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp
new file mode 100644
index 00000000000..4896e2d7a21
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/epsilon/epsilonHeap.hpp"
+#include "gc/epsilon/epsilonMemoryPool.hpp"
+
+EpsilonMemoryPool::EpsilonMemoryPool(EpsilonHeap* heap) :
+        _heap(heap),
+        CollectedMemoryPool("Epsilon Heap",
+                            heap->capacity(),
+                            heap->max_capacity(),
+                            false) {
+  assert(UseEpsilonGC, "sanity");
+}
+
+MemoryUsage EpsilonMemoryPool::get_memory_usage() {
+  size_t initial_sz = initial_size();
+  size_t max_sz     = max_size();
+  size_t used       = used_in_bytes();
+  size_t committed  = committed_in_bytes();
+
+  return MemoryUsage(initial_sz, used, committed, max_sz);
+}
diff --git a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp
new file mode 100644
index 00000000000..97f85b036fb
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#define SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+
+#include "gc/epsilon/epsilonHeap.hpp"
+#include "services/memoryPool.hpp"
+#include "services/memoryUsage.hpp"
+#include "utilities/macros.hpp"
+
+class EpsilonMemoryPool : public CollectedMemoryPool {
+private:
+  EpsilonHeap* _heap;
+
+public:
+  EpsilonMemoryPool(EpsilonHeap* heap);
+  size_t committed_in_bytes() { return _heap->capacity();     }
+  size_t used_in_bytes()      { return _heap->used();         }
+  size_t max_size()     const { return _heap->max_capacity(); }
+  MemoryUsage get_memory_usage();
+};
+
+#endif // SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
new file mode 100644
index 00000000000..5fc19ee5beb
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/epsilon/epsilonMonitoringSupport.hpp"
+#include "gc/epsilon/epsilonHeap.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/metaspaceCounters.hpp"
+#include "memory/resourceArea.hpp"
+#include "services/memoryService.hpp"
+
+class EpsilonSpaceCounters: public CHeapObj<mtGC> {
+  friend class VMStructs;
+
+private:
+  PerfVariable* _capacity;
+  PerfVariable* _used;
+  char*         _name_space;
+
+public:
+  EpsilonSpaceCounters(const char* name,
+                 int ordinal,
+                 size_t max_size,
+                 size_t initial_capacity,
+                 GenerationCounters* gc) {
+    if (UsePerfData) {
+      EXCEPTION_MARK;
+      ResourceMark rm;
+
+      const char* cns = PerfDataManager::name_space(gc->name_space(), "space", ordinal);
+
+      _name_space = NEW_C_HEAP_ARRAY(char, strlen(cns)+1, mtGC);
+      strcpy(_name_space, cns);
+
+      const char* cname = PerfDataManager::counter_name(_name_space, "name");
+      PerfDataManager::create_string_constant(SUN_GC, cname, name, CHECK);
+
+      cname = PerfDataManager::counter_name(_name_space, "maxCapacity");
+      PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes, (jlong)max_size, CHECK);
+
+      cname = PerfDataManager::counter_name(_name_space, "capacity");
+      _capacity = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, initial_capacity, CHECK);
+
+      cname = PerfDataManager::counter_name(_name_space, "used");
+      _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, (jlong) 0, CHECK);
+
+      cname = PerfDataManager::counter_name(_name_space, "initCapacity");
+      PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes, initial_capacity, CHECK);
+    }
+  }
+
+  ~EpsilonSpaceCounters() {
+    if (_name_space != NULL) {
+      FREE_C_HEAP_ARRAY(char, _name_space);
+    }
+  }
+
+  inline void update_all(size_t capacity, size_t used) {
+    _capacity->set_value(capacity);
+    _used->set_value(used);
+  }
+};
+
+class EpsilonGenerationCounters : public GenerationCounters {
+private:
+  EpsilonHeap* _heap;
+public:
+  EpsilonGenerationCounters(EpsilonHeap* heap) :
+          GenerationCounters("Heap", 1, 1, 0, heap->max_capacity(), heap->capacity()),
+          _heap(heap)
+  {};
+
+  virtual void update_all() {
+    _current_size->set_value(_heap->capacity());
+  }
+};
+
+EpsilonMonitoringSupport::EpsilonMonitoringSupport(EpsilonHeap* heap) {
+  _heap_counters  = new EpsilonGenerationCounters(heap);
+  _space_counters = new EpsilonSpaceCounters("Heap", 0, heap->max_capacity(), 0, _heap_counters);
+}
+
+void EpsilonMonitoringSupport::update_counters() {
+  MemoryService::track_memory_usage();
+
+  if (UsePerfData) {
+    EpsilonHeap* heap = EpsilonHeap::heap();
+    size_t used = heap->used();
+    size_t capacity = heap->capacity();
+    _heap_counters->update_all();
+    _space_counters->update_all(capacity, used);
+    MetaspaceCounters::update_performance_counters();
+    CompressedClassSpaceCounters::update_performance_counters();
+  }
+}
+
diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
new file mode 100644
index 00000000000..5747bcaaaa1
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+#define SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+
+#include "memory/allocation.hpp"
+
+class GenerationCounters;
+class EpsilonSpaceCounters;
+class EpsilonHeap;
+
+class EpsilonMonitoringSupport : public CHeapObj<mtGC> {
+private:
+  GenerationCounters*   _heap_counters;
+  EpsilonSpaceCounters* _space_counters;
+
+public:
+  EpsilonMonitoringSupport(EpsilonHeap* heap);
+  void update_counters();
+};
+
+#endif // SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+
diff --git a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
new file mode 100644
index 00000000000..5d614b86c0d
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#define SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+
+#include "runtime/thread.hpp"
+#include "utilities/debug.hpp"
+
+class EpsilonThreadLocalData {
+private:
+  size_t _ergo_tlab_size;
+  int64_t _last_tlab_time;
+
+  EpsilonThreadLocalData() :
+          _ergo_tlab_size(0),
+          _last_tlab_time(0) {}
+
+  static EpsilonThreadLocalData* data(Thread* thread) {
+    assert(UseEpsilonGC, "Sanity");
+    return thread->gc_data<EpsilonThreadLocalData>();
+  }
+
+public:
+  static void create(Thread* thread) {
+    new (data(thread)) EpsilonThreadLocalData();
+  }
+
+  static void destroy(Thread* thread) {
+    data(thread)->~EpsilonThreadLocalData();
+  }
+
+  static size_t ergo_tlab_size(Thread *thread) {
+    return data(thread)->_ergo_tlab_size;
+  }
+
+  static int64_t last_tlab_time(Thread *thread) {
+    return data(thread)->_last_tlab_time;
+  }
+
+  static void set_ergo_tlab_size(Thread *thread, size_t val) {
+    data(thread)->_ergo_tlab_size = val;
+  }
+
+  static void set_last_tlab_time(Thread *thread, int64_t time) {
+    data(thread)->_last_tlab_time = time;
+  }
+};
+
+#endif // SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp
new file mode 100644
index 00000000000..6d0f314752b
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_EPSILON_GLOBALS_HPP
+#define SHARE_VM_GC_EPSILON_GLOBALS_HPP
+
+#include "runtime/globals.hpp"
+//
+// Defines all globals flags used by the Epsilon GC.
+//
+
+#define GC_EPSILON_FLAGS(develop,                                           \
+                    develop_pd,                                             \
+                    product,                                                \
+                    product_pd,                                             \
+                    diagnostic,                                             \
+                    diagnostic_pd,                                          \
+                    experimental,                                           \
+                    notproduct,                                             \
+                    manageable,                                             \
+                    product_rw,                                             \
+                    lp64_product,                                           \
+                    range,                                                  \
+                    constraint,                                             \
+                    writeable)                                              \
+                                                                            \
+  experimental(size_t, EpsilonPrintHeapSteps, 20,                           \
+          "Print heap occupancy stats with this number of steps. "          \
+          "0 turns the printing off.")                                      \
+          range(0, max_intx)                                                \
+                                                                            \
+  experimental(size_t, EpsilonUpdateCountersStep, 1 * M,                    \
+          "Update heap occupancy counters after allocating this much "      \
+          "memory. Higher values would make allocations faster at "         \
+          "the expense of lower resolution in heap counters.")              \
+          range(1, max_intx)                                                \
+                                                                            \
+  experimental(size_t, EpsilonMaxTLABSize, 4 * M,                           \
+          "Max TLAB size to use with Epsilon GC. Larger value improves "    \
+          "performance at the expense of per-thread memory waste. This "    \
+          "asks TLAB machinery to cap TLAB sizes at this value.")           \
+          range(1, max_intx)                                                \
+                                                                            \
+  experimental(bool, EpsilonElasticTLAB, true,                              \
+          "Use elastic policy to manage TLAB sizes. This conserves memory " \
+          "for non-actively allocating threads, even when they request "    \
+          "large TLABs for themselves. Active threads would experience "    \
+          "smaller TLABs until policy catches up.")                         \
+                                                                            \
+  experimental(bool, EpsilonElasticTLABDecay, true,                         \
+          "Use timed decays to shrik TLAB sizes. This conserves memory "    \
+          "for the threads that allocate in bursts of different sizes, "    \
+          "for example the small/rare allocations coming after the initial "\
+          "large burst.")                                                   \
+                                                                            \
+  experimental(double, EpsilonTLABElasticity, 1.1,                          \
+          "Multiplier to use when deciding on next TLAB size. Larger value "\
+          "improves performance at the expense of per-thread memory waste. "\
+          "Lower value improves memory footprint, but penalizes actively "  \
+          "allocating threads.")                                            \
+          range(1, max_intx)                                                \
+                                                                            \
+  experimental(size_t, EpsilonTLABDecayTime, 1000,                          \
+          "TLAB sizing policy decays to initial size after thread had not " \
+          "allocated for this long. Time is in milliseconds. Lower value "  \
+          "improves memory footprint, but penalizes actively allocating "   \
+          "threads.")                                                       \
+          range(1, max_intx)                                                \
+                                                                            \
+  experimental(size_t, EpsilonMinHeapExpand, 128 * M,                       \
+          "Min expansion step for heap. Larger value improves performance " \
+          "at the potential expense of memory waste.")                      \
+          range(1, max_intx)
+
+#endif // SHARE_VM_GC_EPSILON_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp
new file mode 100644
index 00000000000..39072ad649e
--- /dev/null
+++ b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018, Red Hat 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.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SHARE_GC_EPSILON_VMSTRUCTS_HPP
+#define SHARE_GC_EPSILON_VMSTRUCTS_HPP
+
+#include "gc/epsilon/epsilonHeap.hpp"
+#include "gc/shared/space.hpp"
+#include "memory/virtualspace.hpp"
+
+#define VM_STRUCTS_EPSILONGC(nonstatic_field,                       \
+                            volatile_nonstatic_field,               \
+                            static_field)                           \
+  nonstatic_field(EpsilonHeap, _virtual_space, VirtualSpace)        \
+  nonstatic_field(EpsilonHeap, _space, ContiguousSpace*)
+
+#define VM_TYPES_EPSILONGC(declare_type,                            \
+                          declare_toplevel_type,                    \
+                          declare_integer_type)                     \
+  declare_type(EpsilonHeap, CollectedHeap)
+
+#define VM_INT_CONSTANTS_EPSILONGC(declare_constant,                \
+                                  declare_constant_with_value)
+
+#endif // SHARE_GC_EPSILON_VMSTRUCTS_HPP
diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 844e2440c33..66f4f64499e 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/c2/g1BarrierSetC2.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -33,10 +34,9 @@
 #include "opto/idealKit.hpp"
 #include "opto/macro.hpp"
 #include "opto/type.hpp"
-#include "runtime/sharedRuntime.hpp"
 #include "utilities/macros.hpp"
 
-const TypeFunc *G1BarrierSetC2::g1_wb_pre_Type() {
+const TypeFunc *G1BarrierSetC2::write_ref_field_pre_entry_Type() {
   const Type **fields = TypeTuple::fields(2);
   fields[TypeFunc::Parms+0] = TypeInstPtr::NOTNULL; // original field value
   fields[TypeFunc::Parms+1] = TypeRawPtr::NOTNULL; // thread
@@ -49,7 +49,7 @@ const TypeFunc *G1BarrierSetC2::g1_wb_pre_Type() {
   return TypeFunc::make(domain, range);
 }
 
-const TypeFunc *G1BarrierSetC2::g1_wb_post_Type() {
+const TypeFunc *G1BarrierSetC2::write_ref_field_post_entry_Type() {
   const Type **fields = TypeTuple::fields(2);
   fields[TypeFunc::Parms+0] = TypeRawPtr::NOTNULL;  // Card addr
   fields[TypeFunc::Parms+1] = TypeRawPtr::NOTNULL;  // thread
@@ -264,8 +264,8 @@ void G1BarrierSetC2::pre_barrier(GraphKit* kit,
       } __ else_(); {
 
         // logging buffer is full, call the runtime
-        const TypeFunc *tf = g1_wb_pre_Type();
-        __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), "g1_wb_pre", pre_val, tls);
+        const TypeFunc *tf = write_ref_field_pre_entry_Type();
+        __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), "write_ref_field_pre_entry", pre_val, tls);
       } __ end_if();  // (!index)
     } __ end_if();  // (pre_val != NULL)
   } __ end_if();  // (!marking)
@@ -364,7 +364,7 @@ void G1BarrierSetC2::g1_mark_card(GraphKit* kit,
     __ store(__ ctrl(), index_adr, next_index, TypeX_X->basic_type(), Compile::AliasIdxRaw, MemNode::unordered);
 
   } __ else_(); {
-    __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), "g1_wb_post", card_adr, __ thread());
+    __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), "write_ref_field_post_entry", card_adr, __ thread());
   } __ end_if();
 
 }
@@ -419,7 +419,7 @@ void G1BarrierSetC2::post_barrier(GraphKit* kit,
   Node* dirty_card = __ ConI((jint)G1CardTable::dirty_card_val());
   Node* zeroX = __ ConX(0);
 
-  const TypeFunc *tf = g1_wb_post_Type();
+  const TypeFunc *tf = write_ref_field_post_entry_Type();
 
   // Offsets into the thread
   const int index_offset  = in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset());
@@ -652,7 +652,7 @@ bool G1BarrierSetC2::is_gc_barrier_node(Node* node) const {
     return false;
   }
 
-  return strcmp(call->_name, "g1_wb_pre") == 0 || strcmp(call->_name, "g1_wb_post") == 0;
+  return strcmp(call->_name, "write_ref_field_pre_entry") == 0 || strcmp(call->_name, "write_ref_field_post_entry") == 0;
 }
 
 void G1BarrierSetC2::eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const {
@@ -747,7 +747,7 @@ Node* G1BarrierSetC2::step_over_gc_barrier(Node* c) const {
           if (r->in(j) != NULL && r->in(j)->is_Proj() &&
               r->in(j)->in(0) != NULL &&
               r->in(j)->in(0)->Opcode() == Op_CallLeaf &&
-              r->in(j)->in(0)->as_Call()->entry_point() == CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post)) {
+              r->in(j)->in(0)->as_Call()->entry_point() == CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry)) {
             Node* call = r->in(j)->in(0);
             c = c->in(i == 1 ? 2 : 1);
             if (c != NULL) {
diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
index 6a3f1ccb169..4f8efa3a461 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
@@ -79,8 +79,8 @@ protected:
   // Unsafe.getObject should be recorded in an SATB log buffer.
   void insert_pre_barrier(GraphKit* kit, Node* base_oop, Node* offset, Node* pre_val, bool need_mem_bar) const;
 
-  static const TypeFunc* g1_wb_pre_Type();
-  static const TypeFunc* g1_wb_post_Type();
+  static const TypeFunc* write_ref_field_pre_entry_Type();
+  static const TypeFunc* write_ref_field_post_entry_Type();
 
   virtual Node* load_at_resolved(C2Access& access, const Type* val_type) const;
 
diff --git a/src/hotspot/share/gc/g1/collectionSetChooser.cpp b/src/hotspot/share/gc/g1/collectionSetChooser.cpp
index f9aa2423e02..9d2c90b546c 100644
--- a/src/hotspot/share/gc/g1/collectionSetChooser.cpp
+++ b/src/hotspot/share/gc/g1/collectionSetChooser.cpp
@@ -147,7 +147,7 @@ void CollectionSetChooser::sort_regions() {
 void CollectionSetChooser::add_region(HeapRegion* hr) {
   assert(!hr->is_pinned(),
          "Pinned region shouldn't be added to the collection set (index %u)", hr->hrm_index());
-  assert(!hr->is_young(), "should not be young!");
+  assert(hr->is_old(), "should be old but is %s", hr->get_type_str());
   assert(hr->rem_set()->is_complete(),
          "Trying to add region %u to the collection set with incomplete remembered set", hr->hrm_index());
   _regions.append(hr);
@@ -185,7 +185,7 @@ uint CollectionSetChooser::claim_array_chunk(uint chunk_size) {
 
 void CollectionSetChooser::set_region(uint index, HeapRegion* hr) {
   assert(regions_at(index) == NULL, "precondition");
-  assert(!hr->is_young(), "should not be young!");
+  assert(hr->is_old(), "should be old but is %s", hr->get_type_str());
   regions_at_put(index, hr);
   hr->calc_gc_efficiency();
 }
@@ -233,18 +233,19 @@ public:
     _cset_updater(hrSorted, true /* parallel */, chunk_size) { }
 
   bool do_heap_region(HeapRegion* r) {
-    // Do we have any marking information for this region?
-    if (r->is_marked()) {
-      // We will skip any region that's currently used as an old GC
-      // alloc region (we should not consider those for collection
-      // before we fill them up).
-      if (_cset_updater.should_add(r) && !_g1h->is_old_gc_alloc_region(r)) {
-        _cset_updater.add_region(r);
-      } else if (r->is_old()) {
-        // Can clean out the remembered sets of all regions that we did not choose but
-        // we created the remembered set for.
-        r->rem_set()->clear(true);
-      }
+    // We will skip any region that's currently used as an old GC
+    // alloc region (we should not consider those for collection
+    // before we fill them up).
+    if (_cset_updater.should_add(r) && !_g1h->is_old_gc_alloc_region(r)) {
+      _cset_updater.add_region(r);
+    } else if (r->is_old()) {
+      // Keep remembered sets for humongous regions, otherwise clean out remembered
+      // sets for old regions.
+      r->rem_set()->clear(true /* only_cardset */);
+    } else {
+      assert(!r->is_old() || !r->rem_set()->is_tracked(),
+             "Missed to clear unused remembered set of region %u (%s) that is %s",
+             r->hrm_index(), r->get_type_str(), r->rem_set()->get_state_str());
     }
     return false;
   }
@@ -280,11 +281,10 @@ bool CollectionSetChooser::region_occupancy_low_enough_for_evac(size_t live_byte
 }
 
 bool CollectionSetChooser::should_add(HeapRegion* hr) const {
-  assert(hr->is_marked(), "pre-condition");
-  assert(!hr->is_young(), "should never consider young regions");
-  return !hr->is_pinned() &&
-          region_occupancy_low_enough_for_evac(hr->live_bytes()) &&
-          hr->rem_set()->is_complete();
+  return !hr->is_young() &&
+         !hr->is_pinned() &&
+         region_occupancy_low_enough_for_evac(hr->live_bytes()) &&
+         hr->rem_set()->is_complete();
 }
 
 void CollectionSetChooser::rebuild(WorkGang* workers, uint n_regions) {
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index 73a5bdb6a11..174ddcd4e3f 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -29,7 +29,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 
 G1CollectedHeap* G1AllocRegion::_g1h = NULL;
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index ecd1d174d44..8531d36e13c 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -72,21 +72,6 @@ void G1BarrierSet::enqueue(oop pre_val) {
   }
 }
 
-void G1BarrierSet::write_ref_array_pre_oop_entry(oop* dst, size_t length) {
-  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
-  bs->write_ref_array_pre(dst, length, false);
-}
-
-void G1BarrierSet::write_ref_array_pre_narrow_oop_entry(narrowOop* dst, size_t length) {
-  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
-  bs->write_ref_array_pre(dst, length, false);
-}
-
-void G1BarrierSet::write_ref_array_post_entry(HeapWord* dst, size_t length) {
-  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
-  bs->G1BarrierSet::write_ref_array(dst, length);
-}
-
 template <class T> void
 G1BarrierSet::write_ref_array_pre_work(T* dst, size_t count) {
   if (!_satb_mark_queue_set.is_active()) return;
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index 3f4af78bcbd..7a789226041 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -50,16 +50,12 @@ class G1BarrierSet: public CardTableBarrierSet {
   // pre-marking object graph.
   static void enqueue(oop pre_val);
 
-  static void enqueue_if_weak_or_archive(DecoratorSet decorators, oop value);
+  static void enqueue_if_weak(DecoratorSet decorators, oop value);
 
   template <class T> void write_ref_array_pre_work(T* dst, size_t count);
   virtual void write_ref_array_pre(oop* dst, size_t count, bool dest_uninitialized);
   virtual void write_ref_array_pre(narrowOop* dst, size_t count, bool dest_uninitialized);
 
-  static void write_ref_array_pre_oop_entry(oop* dst, size_t length);
-  static void write_ref_array_pre_narrow_oop_entry(narrowOop* dst, size_t length);
-  static void write_ref_array_post_entry(HeapWord* dst, size_t length);
-
   template <DecoratorSet decorators, typename T>
   void write_ref_field_pre(T* field);
 
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index 759684da212..f16f2e56cd8 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -54,15 +54,14 @@ inline void G1BarrierSet::write_ref_field_post(T* field, oop new_val) {
   }
 }
 
-inline void G1BarrierSet::enqueue_if_weak_or_archive(DecoratorSet decorators, oop value) {
+inline void G1BarrierSet::enqueue_if_weak(DecoratorSet decorators, oop value) {
   assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known");
-  // Archive roots need to be enqueued since they add subgraphs to the
-  // Java heap that were not there at the snapshot when marking started.
-  // Weak and phantom references also need enqueueing for similar reasons.
-  const bool in_archive_root   = (decorators & IN_ARCHIVE_ROOT) != 0;
+  // Loading from a weak or phantom reference needs enqueueing, as
+  // the object may not have been reachable (part of the snapshot)
+  // when marking started.
   const bool on_strong_oop_ref = (decorators & ON_STRONG_OOP_REF) != 0;
   const bool peek              = (decorators & AS_NO_KEEPALIVE) != 0;
-  const bool needs_enqueue     = in_archive_root || (!peek && !on_strong_oop_ref);
+  const bool needs_enqueue     = (!peek && !on_strong_oop_ref);
 
   if (needs_enqueue && value != NULL) {
     enqueue(value);
@@ -74,7 +73,7 @@ template <typename T>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_not_in_heap(T* addr) {
   oop value = ModRef::oop_load_not_in_heap(addr);
-  enqueue_if_weak_or_archive(decorators, value);
+  enqueue_if_weak(decorators, value);
   return value;
 }
 
@@ -83,7 +82,7 @@ template <typename T>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_in_heap(T* addr) {
   oop value = ModRef::oop_load_in_heap(addr);
-  enqueue_if_weak_or_archive(decorators, value);
+  enqueue_if_weak(decorators, value);
   return value;
 }
 
@@ -91,7 +90,7 @@ template <DecoratorSet decorators, typename BarrierSetT>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_in_heap_at(oop base, ptrdiff_t offset) {
   oop value = ModRef::oop_load_in_heap_at(base, offset);
-  enqueue_if_weak_or_archive(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), value);
+  enqueue_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), value);
   return value;
 }
 
diff --git a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
new file mode 100644
index 00000000000..37a05346881
--- /dev/null
+++ b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/g1/g1BarrierSet.inline.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
+#include "gc/g1/g1ThreadLocalData.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "utilities/macros.hpp"
+
+void G1BarrierSetRuntime::write_ref_array_pre_oop_entry(oop* dst, size_t length) {
+  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
+  bs->write_ref_array_pre(dst, length, false);
+}
+
+void G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry(narrowOop* dst, size_t length) {
+  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
+  bs->write_ref_array_pre(dst, length, false);
+}
+
+void G1BarrierSetRuntime::write_ref_array_post_entry(HeapWord* dst, size_t length) {
+  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
+  bs->G1BarrierSet::write_ref_array(dst, length);
+}
+
+// G1 pre write barrier slowpath
+JRT_LEAF(void, G1BarrierSetRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread))
+  if (orig == NULL) {
+    assert(false, "should be optimized out");
+    return;
+  }
+  assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error");
+  // store the original value that was in the field reference
+  G1ThreadLocalData::satb_mark_queue(thread).enqueue(orig);
+JRT_END
+
+// G1 post write barrier slowpath
+JRT_LEAF(void, G1BarrierSetRuntime::write_ref_field_post_entry(void* card_addr, JavaThread* thread))
+  G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
+JRT_END
diff --git a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp
new file mode 100644
index 00000000000..89be1d9c3f5
--- /dev/null
+++ b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_GC_G1_G1BARRIERSETRUNTIME_HPP
+#define SHARE_GC_G1_G1BARRIERSETRUNTIME_HPP
+
+#include "memory/allocation.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+class oopDesc;
+class JavaThread;
+
+class G1BarrierSetRuntime: public AllStatic {
+public:
+  // Arraycopy stub generator
+  static void write_ref_array_pre_oop_entry(oop* dst, size_t length);
+  static void write_ref_array_pre_narrow_oop_entry(narrowOop* dst, size_t length);
+  static void write_ref_array_post_entry(HeapWord* dst, size_t length);
+
+  // C2 slow-path runtime calls.
+  static void write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread);
+  static void write_ref_field_post_entry(void* card_addr, JavaThread* thread);
+};
+
+#endif // SHARE_GC_G1_G1BARRIERSETRUNTIME_HPP
diff --git a/src/hotspot/share/gc/g1/g1CardTable.cpp b/src/hotspot/share/gc/g1/g1CardTable.cpp
index 3a68f4a7c46..b66ddd28a5b 100644
--- a/src/hotspot/share/gc/g1/g1CardTable.cpp
+++ b/src/hotspot/share/gc/g1/g1CardTable.cpp
@@ -28,7 +28,7 @@
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 bool G1CardTable::mark_card_deferred(size_t card_index) {
   jbyte val = _byte_map[card_index];
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 63a11e86d8a..e3256ddbecf 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -69,6 +69,7 @@
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/generationSpec.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
+#include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
@@ -77,6 +78,7 @@
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
+#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
@@ -86,7 +88,7 @@
 #include "runtime/flags/flagSetting.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/align.hpp"
@@ -822,6 +824,18 @@ void G1CollectedHeap::dealloc_archive_regions(MemRegion* ranges, size_t count) {
   decrease_used(size_used);
 }
 
+oop G1CollectedHeap::materialize_archived_object(oop obj) {
+  assert(obj != NULL, "archived obj is NULL");
+  assert(MetaspaceShared::is_archive_object(obj), "must be archived object");
+
+  // Loading an archived object makes it strongly reachable. If it is
+  // loaded during concurrent marking, it must be enqueued to the SATB
+  // queue, shading the previously white object gray.
+  G1BarrierSet::enqueue(obj);
+
+  return obj;
+}
+
 HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size) {
   ResourceMark rm; // For retrieving the thread names in log messages.
 
@@ -3218,6 +3232,7 @@ class G1StringAndSymbolCleaningTask : public AbstractGangTask {
 private:
   BoolObjectClosure* _is_alive;
   G1StringDedupUnlinkOrOopsDoClosure _dedup_closure;
+  OopStorage::ParState<false /* concurrent */, false /* const */> _par_state_string;
 
   int _initial_string_table_size;
   int _initial_symbol_table_size;
@@ -3237,24 +3252,19 @@ public:
     AbstractGangTask("String/Symbol Unlinking"),
     _is_alive(is_alive),
     _dedup_closure(is_alive, NULL, false),
+    _par_state_string(StringTable::weak_storage()),
     _process_strings(process_strings), _strings_processed(0), _strings_removed(0),
     _process_symbols(process_symbols), _symbols_processed(0), _symbols_removed(0),
     _process_string_dedup(process_string_dedup) {
 
-    _initial_string_table_size = StringTable::the_table()->table_size();
+    _initial_string_table_size = (int) StringTable::the_table()->table_size();
     _initial_symbol_table_size = SymbolTable::the_table()->table_size();
-    if (process_strings) {
-      StringTable::clear_parallel_claimed_index();
-    }
     if (process_symbols) {
       SymbolTable::clear_parallel_claimed_index();
     }
   }
 
   ~G1StringAndSymbolCleaningTask() {
-    guarantee(!_process_strings || StringTable::parallel_claimed_index() >= _initial_string_table_size,
-              "claim value %d after unlink less than initial string table size %d",
-              StringTable::parallel_claimed_index(), _initial_string_table_size);
     guarantee(!_process_symbols || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size,
               "claim value %d after unlink less than initial symbol table size %d",
               SymbolTable::parallel_claimed_index(), _initial_symbol_table_size);
@@ -3273,7 +3283,7 @@ public:
     int symbols_processed = 0;
     int symbols_removed = 0;
     if (_process_strings) {
-      StringTable::possibly_parallel_unlink(_is_alive, &strings_processed, &strings_removed);
+      StringTable::possibly_parallel_unlink(&_par_state_string, _is_alive, &strings_processed, &strings_removed);
       Atomic::add(strings_processed, &_strings_processed);
       Atomic::add(strings_removed, &_strings_removed);
     }
@@ -3355,7 +3365,7 @@ private:
       add_to_postponed_list(nm);
     }
 
-    // Mark that this thread has been cleaned/unloaded.
+    // Mark that this nmethod has been cleaned/unloaded.
     // After this call, it will be safe to ask if this nmethod was unloaded or not.
     nm->set_unloading_clock(CompiledMethod::global_unloading_clock());
   }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 2d9c042bced..31cf2d99764 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -699,6 +699,8 @@ public:
   // mapping failed, with the same non-overlapping and sorted MemRegion array.
   void dealloc_archive_regions(MemRegion* range, size_t count);
 
+  oop materialize_archived_object(oop obj);
+
 private:
 
   // Shrink the garbage-first heap by at most the given size (in bytes!).
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
index afd5f5f19a0..30000fd5b34 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -32,7 +32,7 @@
 #include "gc/g1/heapRegionManager.inline.hpp"
 #include "gc/g1/heapRegionSet.inline.hpp"
 #include "gc/shared/taskqueue.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 G1EvacStats* G1CollectedHeap::alloc_buffer_stats(InCSetState dest) {
   switch (dest.value()) {
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 028fb8e2a1e..37ed91d9c73 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1625,7 +1625,7 @@ void G1ConcurrentMark::weak_refs_work(bool clear_all_soft_refs) {
     // Reference lists are balanced (see balance_all_queues() and balance_queues()).
     rp->set_active_mt_degree(active_workers);
 
-    ReferenceProcessorPhaseTimes pt(_gc_timer_cm, rp->num_queues());
+    ReferenceProcessorPhaseTimes pt(_gc_timer_cm, rp->max_num_queues());
 
     // Process the weak references.
     const ReferenceProcessorStats& stats =
@@ -1651,7 +1651,11 @@ void G1ConcurrentMark::weak_refs_work(bool clear_all_soft_refs) {
   }
 
   if (has_overflown()) {
-    // We can not trust g1_is_alive if the marking stack overflowed
+    // We can not trust g1_is_alive and the contents of the heap if the marking stack
+    // overflowed while processing references. Exit the VM.
+    fatal("Overflow during reference processing, can not continue. Please "
+          "increase MarkStackSizeMax (current value: " SIZE_FORMAT ") and "
+          "restart.", MarkStackSizeMax);
     return;
   }
 
@@ -1665,7 +1669,7 @@ void G1ConcurrentMark::weak_refs_work(bool clear_all_soft_refs) {
   // Unload Klasses, String, Symbols, Code Cache, etc.
   if (ClassUnloadingWithConcurrentMark) {
     GCTraceTime(Debug, gc, phases) debug("Class Unloading", _gc_timer_cm);
-    bool purged_classes = SystemDictionary::do_unloading(&g1_is_alive, _gc_timer_cm, false /* Defer cleaning */);
+    bool purged_classes = SystemDictionary::do_unloading(_gc_timer_cm, false /* Defer cleaning */);
     _g1h->complete_cleaning(&g1_is_alive, purged_classes);
   } else {
     GCTraceTime(Debug, gc, phases) debug("Cleanup", _gc_timer_cm);
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
index cebcef28d9f..4362ee87e30 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp
@@ -222,7 +222,7 @@ void G1FullCollector::phase1_mark_live_objects() {
   if (ClassUnloading) {
     GCTraceTime(Debug, gc, phases) debug("Phase 1: Class Unloading and Cleanup", scope()->timer());
     // Unload classes and purge the SystemDictionary.
-    bool purged_class = SystemDictionary::do_unloading(&_is_alive, scope()->timer());
+    bool purged_class = SystemDictionary::do_unloading(scope()->timer());
     _heap->complete_cleaning(&_is_alive, purged_class);
   } else {
     GCTraceTime(Debug, gc, phases) debug("Phase 1: String and Symbol Tables Cleanup", scope()->timer());
diff --git a/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp b/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp
index eb1931fdfbf..43eeddfaedf 100644
--- a/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp
@@ -78,7 +78,7 @@ void G1FullGCReferenceProcessingExecutor::execute(STWGCTimer* timer, G1FullGCTra
   G1FullGCMarker* marker = _collector->marker(0);
   G1IsAliveClosure is_alive(_collector->mark_bitmap());
   G1FullKeepAliveClosure keep_alive(marker);
-  ReferenceProcessorPhaseTimes pt(timer, _reference_processor->num_queues());
+  ReferenceProcessorPhaseTimes pt(timer, _reference_processor->max_num_queues());
   AbstractRefProcTaskExecutor* executor = _reference_processor->processing_is_mt() ? this : NULL;
 
   // Process discovered references, use this executor if multi-threaded
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 5aeb4baa453..8d70c0fe108 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -468,15 +468,24 @@ G1EvacPhaseWithTrimTimeTracker::G1EvacPhaseWithTrimTimeTracker(G1ParScanThreadSt
   _pss(pss),
   _start(Ticks::now()),
   _total_time(total_time),
-  _trim_time(trim_time) {
+  _trim_time(trim_time),
+  _stopped(false) {
 
   assert(_pss->trim_ticks().value() == 0, "Possibly remaining trim ticks left over from previous use");
 }
 
 G1EvacPhaseWithTrimTimeTracker::~G1EvacPhaseWithTrimTimeTracker() {
+  if (!_stopped) {
+    stop();
+  }
+}
+
+void G1EvacPhaseWithTrimTimeTracker::stop() {
+  assert(!_stopped, "Should only be called once");
   _total_time += (Ticks::now() - _start) - _pss->trim_ticks();
   _trim_time += _pss->trim_ticks();
   _pss->reset_trim_ticks();
+  _stopped = true;
 }
 
 G1GCParPhaseTimesTracker::G1GCParPhaseTimesTracker(G1GCPhaseTimes* phase_times, G1GCPhaseTimes::GCParPhases phase, uint worker_id) :
@@ -504,6 +513,8 @@ G1EvacPhaseTimesTracker::G1EvacPhaseTimesTracker(G1GCPhaseTimes* phase_times,
 
 G1EvacPhaseTimesTracker::~G1EvacPhaseTimesTracker() {
   if (_phase_times != NULL) {
+    // Explicitly stop the trim tracker since it's not yet destructed.
+    _trim_tracker.stop();
     // Exclude trim time by increasing the start time.
     _start_time += _trim_time;
     _phase_times->record_or_add_objcopy_time_secs(_worker_id, _trim_time.seconds());
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
index d5ec33400c0..3b20cfe4d2d 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
@@ -373,9 +373,13 @@ class G1EvacPhaseWithTrimTimeTracker : public StackObj {
 
   Tickspan& _total_time;
   Tickspan& _trim_time;
+
+  bool _stopped;
 public:
   G1EvacPhaseWithTrimTimeTracker(G1ParScanThreadState* pss, Tickspan& total_time, Tickspan& trim_time);
   ~G1EvacPhaseWithTrimTimeTracker();
+
+  void stop();
 };
 
 class G1GCParPhaseTimesTracker : public CHeapObj<mtGC> {
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 4f882a1fb20..d94a1173208 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -825,10 +825,10 @@ double G1Policy::predict_base_elapsed_time_ms(size_t pending_cards) const {
 
 size_t G1Policy::predict_bytes_to_copy(HeapRegion* hr) const {
   size_t bytes_to_copy;
-  if (hr->is_marked())
+  if (!hr->is_young()) {
     bytes_to_copy = hr->max_live_bytes();
-  else {
-    assert(hr->is_young() && hr->age_in_surv_rate_group() != -1, "invariant");
+  } else {
+    assert(hr->age_in_surv_rate_group() != -1, "invariant");
     int age = hr->age_in_surv_rate_group();
     double yg_surv_rate = predict_yg_surv_rate(age, hr->surv_rate_group());
     bytes_to_copy = (size_t) (hr->used() * yg_surv_rate);
diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp
index a2c4d07b714..e47c9f7baea 100644
--- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp
@@ -38,6 +38,7 @@
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
+#include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "memory/allocation.inline.hpp"
@@ -72,6 +73,7 @@ G1RootProcessor::G1RootProcessor(G1CollectedHeap* g1h, uint n_workers) :
     _process_strong_tasks(G1RP_PS_NumElements),
     _srs(n_workers),
     _lock(Mutex::leaf, "G1 Root Scanning barrier lock", false, Monitor::_safepoint_check_never),
+    _par_state_string(StringTable::weak_storage()),
     _n_workers_discovered_strong_classes(0) {}
 
 void G1RootProcessor::evacuate_roots(G1ParScanThreadState* pss, uint worker_i) {
@@ -241,7 +243,6 @@ void G1RootProcessor::process_vm_roots(G1RootClosures* closures,
                                        G1GCPhaseTimes* phase_times,
                                        uint worker_i) {
   OopClosure* strong_roots = closures->strong_oops();
-  OopClosure* weak_roots = closures->weak_oops();
 
   {
     G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::UniverseRoots, worker_i);
@@ -290,7 +291,7 @@ void G1RootProcessor::process_vm_roots(G1RootClosures* closures,
   {
     G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::SystemDictionaryRoots, worker_i);
     if (!_process_strong_tasks.is_task_claimed(G1RP_PS_SystemDictionary_oops_do)) {
-      SystemDictionary::roots_oops_do(strong_roots, weak_roots);
+      SystemDictionary::oops_do(strong_roots);
     }
   }
 }
@@ -302,7 +303,7 @@ void G1RootProcessor::process_string_table_roots(G1RootClosures* closures,
   G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::StringTableRoots, worker_i);
   // All threads execute the following. A specific chunk of buckets
   // from the StringTable are the individual tasks.
-  StringTable::possibly_parallel_oops_do(closures->weak_oops());
+  StringTable::possibly_parallel_oops_do(&_par_state_string, closures->weak_oops());
 }
 
 void G1RootProcessor::process_code_cache_roots(CodeBlobClosure* code_closure,
diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
index c4b5f03016e..3c2e811cb80 100644
--- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
 #define SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
 
+#include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/mutex.hpp"
@@ -49,6 +50,7 @@ class G1RootProcessor : public StackObj {
   G1CollectedHeap* _g1h;
   SubTasksDone _process_strong_tasks;
   StrongRootsScope _srs;
+  OopStorage::ParState<false, false> _par_state_string;
 
   // Used to implement the Thread work barrier.
   Monitor _lock;
diff --git a/src/hotspot/share/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp
index 6c2263586e6..8c7aec8472e 100644
--- a/src/hotspot/share/gc/g1/g1_globals.hpp
+++ b/src/hotspot/share/gc/g1/g1_globals.hpp
@@ -108,9 +108,6 @@
           "When expanding, % of uncommitted space to claim.")               \
           range(0, 100)                                                     \
                                                                             \
-  develop(bool, G1RSBarrierRegionFilter, true,                              \
-          "If true, generate region filtering code in RS barrier")          \
-                                                                            \
   product(size_t, G1UpdateBufferSize, 256,                                  \
           "Size of an update buffer")                                       \
           range(1, NOT_LP64(32*M) LP64_ONLY(1*G))                           \
diff --git a/src/hotspot/share/gc/g1/heapRegion.cpp b/src/hotspot/share/gc/g1/heapRegion.cpp
index 057e7cb4a67..783a4ebcbdb 100644
--- a/src/hotspot/share/gc/g1/heapRegion.cpp
+++ b/src/hotspot/share/gc/g1/heapRegion.cpp
@@ -43,7 +43,7 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/growableArray.hpp"
 
 int    HeapRegion::LogOfHRGrainBytes = 0;
diff --git a/src/hotspot/share/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/heapRegion.hpp
index 3bb6049332d..01d3c4d8758 100644
--- a/src/hotspot/share/gc/g1/heapRegion.hpp
+++ b/src/hotspot/share/gc/g1/heapRegion.hpp
@@ -541,10 +541,6 @@ class HeapRegion: public G1ContiguousSpace {
   // objects during evac failure handling.
   void note_self_forwarding_removal_end(size_t marked_bytes);
 
-  // Returns "false" iff no object in the region was allocated when the
-  // last mark phase ended.
-  bool is_marked() { return _prev_top_at_mark_start != bottom(); }
-
   void reset_during_compaction() {
     assert(is_humongous(),
            "should only be called for humongous regions");
diff --git a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
index 43de961a1f6..a5e10c4b674 100644
--- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
+++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/heapRegionBounds.inline.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
+#include "gc/g1/jvmFlagConstraintsG1.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -34,10 +34,10 @@ JVMFlag::Error G1RSetRegionEntriesConstraintFunc(intx value, bool verbose) {
   // Default value of G1RSetRegionEntries=0 means will be set ergonomically.
   // Minimum value is 1.
   if (FLAG_IS_CMDLINE(G1RSetRegionEntries) && (value < 1)) {
-    CommandLineError::print(verbose,
-                            "G1RSetRegionEntries (" INTX_FORMAT ") must be "
-                            "greater than or equal to 1\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "G1RSetRegionEntries (" INTX_FORMAT ") must be "
+                        "greater than or equal to 1\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -50,10 +50,10 @@ JVMFlag::Error G1RSetSparseRegionEntriesConstraintFunc(intx value, bool verbose)
   // Default value of G1RSetSparseRegionEntries=0 means will be set ergonomically.
   // Minimum value is 1.
   if (FLAG_IS_CMDLINE(G1RSetSparseRegionEntries) && (value < 1)) {
-    CommandLineError::print(verbose,
-                            "G1RSetSparseRegionEntries (" INTX_FORMAT ") must be "
-                            "greater than or equal to 1\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "G1RSetSparseRegionEntries (" INTX_FORMAT ") must be "
+                        "greater than or equal to 1\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -65,10 +65,10 @@ JVMFlag::Error G1HeapRegionSizeConstraintFunc(size_t value, bool verbose) {
 
   // Default value of G1HeapRegionSize=0 means will be set ergonomically.
   if (FLAG_IS_CMDLINE(G1HeapRegionSize) && (value < HeapRegionBounds::min_size())) {
-    CommandLineError::print(verbose,
-                            "G1HeapRegionSize (" SIZE_FORMAT ") must be "
-                            "greater than or equal to ergonomic heap region minimum size\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "G1HeapRegionSize (" SIZE_FORMAT ") must be "
+                        "greater than or equal to ergonomic heap region minimum size\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -79,10 +79,10 @@ JVMFlag::Error G1NewSizePercentConstraintFunc(uintx value, bool verbose) {
   if (!UseG1GC) return JVMFlag::SUCCESS;
 
   if (value > G1MaxNewSizePercent) {
-    CommandLineError::print(verbose,
-                            "G1NewSizePercent (" UINTX_FORMAT ") must be "
-                            "less than or equal to G1MaxNewSizePercent (" UINTX_FORMAT ")\n",
-                            value, G1MaxNewSizePercent);
+    JVMFlag::printError(verbose,
+                        "G1NewSizePercent (" UINTX_FORMAT ") must be "
+                        "less than or equal to G1MaxNewSizePercent (" UINTX_FORMAT ")\n",
+                        value, G1MaxNewSizePercent);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -93,10 +93,10 @@ JVMFlag::Error G1MaxNewSizePercentConstraintFunc(uintx value, bool verbose) {
   if (!UseG1GC) return JVMFlag::SUCCESS;
 
   if (value < G1NewSizePercent) {
-    CommandLineError::print(verbose,
-                            "G1MaxNewSizePercent (" UINTX_FORMAT ") must be "
-                            "greater than or equal to G1NewSizePercent (" UINTX_FORMAT ")\n",
-                            value, G1NewSizePercent);
+    JVMFlag::printError(verbose,
+                        "G1MaxNewSizePercent (" UINTX_FORMAT ") must be "
+                        "greater than or equal to G1NewSizePercent (" UINTX_FORMAT ")\n",
+                        value, G1NewSizePercent);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -105,10 +105,10 @@ JVMFlag::Error G1MaxNewSizePercentConstraintFunc(uintx value, bool verbose) {
 
 JVMFlag::Error MaxGCPauseMillisConstraintFuncG1(uintx value, bool verbose) {
   if (UseG1GC && FLAG_IS_CMDLINE(MaxGCPauseMillis) && (value >= GCPauseIntervalMillis)) {
-    CommandLineError::print(verbose,
-                            "MaxGCPauseMillis (" UINTX_FORMAT ") must be "
-                            "less than GCPauseIntervalMillis (" UINTX_FORMAT ")\n",
-                            value, GCPauseIntervalMillis);
+    JVMFlag::printError(verbose,
+                        "MaxGCPauseMillis (" UINTX_FORMAT ") must be "
+                        "less than GCPauseIntervalMillis (" UINTX_FORMAT ")\n",
+                        value, GCPauseIntervalMillis);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -119,25 +119,25 @@ JVMFlag::Error GCPauseIntervalMillisConstraintFuncG1(uintx value, bool verbose)
   if (UseG1GC) {
     if (FLAG_IS_CMDLINE(GCPauseIntervalMillis)) {
       if (value < 1) {
-        CommandLineError::print(verbose,
-                                "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
-                                "greater than or equal to 1\n",
-                                value);
+        JVMFlag::printError(verbose,
+                            "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
+                            "greater than or equal to 1\n",
+                            value);
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
 
       if (FLAG_IS_DEFAULT(MaxGCPauseMillis)) {
-        CommandLineError::print(verbose,
-                                "GCPauseIntervalMillis cannot be set "
-                                "without setting MaxGCPauseMillis\n");
+        JVMFlag::printError(verbose,
+                            "GCPauseIntervalMillis cannot be set "
+                            "without setting MaxGCPauseMillis\n");
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
 
       if (value <= MaxGCPauseMillis) {
-        CommandLineError::print(verbose,
-                                "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
-                                "greater than MaxGCPauseMillis (" UINTX_FORMAT ")\n",
-                                value, MaxGCPauseMillis);
+        JVMFlag::printError(verbose,
+                            "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
+                            "greater than MaxGCPauseMillis (" UINTX_FORMAT ")\n",
+                            value, MaxGCPauseMillis);
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
     }
@@ -153,9 +153,9 @@ JVMFlag::Error NewSizeConstraintFuncG1(size_t value, bool verbose) {
   // i.e. result of '(uint)(NewSize / region size(1~32MB))'
   // So maximum of NewSize should be 'max_juint * 1M'
   if (UseG1GC && (value > (max_juint * 1 * M))) {
-    CommandLineError::print(verbose,
-                            "NewSize (" SIZE_FORMAT ") must be less than ergonomic maximum value\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "NewSize (" SIZE_FORMAT ") must be less than ergonomic maximum value\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 #endif // _LP64
diff --git a/src/hotspot/share/gc/parallel/gcTaskManager.cpp b/src/hotspot/share/gc/parallel/gcTaskManager.cpp
index f01608626f9..54e706a3569 100644
--- a/src/hotspot/share/gc/parallel/gcTaskManager.cpp
+++ b/src/hotspot/share/gc/parallel/gcTaskManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -34,7 +34,7 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 
 //
diff --git a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp
index ab95428b26e..e951014fd96 100644
--- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp
+++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
+#include "gc/parallel/jvmFlagConstraintsParallel.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -32,10 +32,10 @@ JVMFlag::Error ParallelGCThreadsConstraintFuncParallel(uint value, bool verbose)
   // So can't exceed with "max_jint"
 
   if (UseParallelGC && (value > (uint)max_jint)) {
-    CommandLineError::print(verbose,
-                            "ParallelGCThreads (" UINT32_FORMAT ") must be "
-                            "less than or equal to " UINT32_FORMAT " for Parallel GC\n",
-                            value, max_jint);
+    JVMFlag::printError(verbose,
+                        "ParallelGCThreads (" UINT32_FORMAT ") must be "
+                        "less than or equal to " UINT32_FORMAT " for Parallel GC\n",
+                        value, max_jint);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -44,10 +44,10 @@ JVMFlag::Error ParallelGCThreadsConstraintFuncParallel(uint value, bool verbose)
 JVMFlag::Error InitialTenuringThresholdConstraintFuncParallel(uintx value, bool verbose) {
   // InitialTenuringThreshold is only used for ParallelGC.
   if (UseParallelGC && (value > MaxTenuringThreshold)) {
-      CommandLineError::print(verbose,
-                              "InitialTenuringThreshold (" UINTX_FORMAT ") must be "
-                              "less than or equal to MaxTenuringThreshold (" UINTX_FORMAT ")\n",
-                              value, MaxTenuringThreshold);
+      JVMFlag::printError(verbose,
+                          "InitialTenuringThreshold (" UINTX_FORMAT ") must be "
+                          "less than or equal to MaxTenuringThreshold (" UINTX_FORMAT ")\n",
+                          value, MaxTenuringThreshold);
       return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -57,10 +57,10 @@ JVMFlag::Error MaxTenuringThresholdConstraintFuncParallel(uintx value, bool verb
   // As only ParallelGC uses InitialTenuringThreshold,
   // we don't need to compare InitialTenuringThreshold with MaxTenuringThreshold.
   if (UseParallelGC && (value < InitialTenuringThreshold)) {
-    CommandLineError::print(verbose,
-                            "MaxTenuringThreshold (" UINTX_FORMAT ") must be "
-                            "greater than or equal to InitialTenuringThreshold (" UINTX_FORMAT ")\n",
-                            value, InitialTenuringThreshold);
+    JVMFlag::printError(verbose,
+                        "MaxTenuringThreshold (" UINTX_FORMAT ") must be "
+                        "greater than or equal to InitialTenuringThreshold (" UINTX_FORMAT ")\n",
+                        value, InitialTenuringThreshold);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
diff --git a/src/hotspot/share/gc/parallel/pcTasks.cpp b/src/hotspot/share/gc/parallel/pcTasks.cpp
index 33d9dfaf8a1..fc155a992fd 100644
--- a/src/hotspot/share/gc/parallel/pcTasks.cpp
+++ b/src/hotspot/share/gc/parallel/pcTasks.cpp
@@ -104,7 +104,7 @@ void MarkFromRootsTask::do_it(GCTaskManager* manager, uint which) {
       break;
 
     case system_dictionary:
-      SystemDictionary::always_strong_oops_do(&mark_and_push_closure);
+      SystemDictionary::oops_do(&mark_and_push_closure);
       break;
 
     case class_loader_data:
@@ -149,19 +149,16 @@ void RefProcTaskProxy::do_it(GCTaskManager* manager, uint which)
 void RefProcTaskExecutor::execute(ProcessTask& task)
 {
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
-  uint parallel_gc_threads = heap->gc_task_manager()->workers();
   uint active_gc_threads = heap->gc_task_manager()->active_workers();
   OopTaskQueueSet* qset = ParCompactionManager::stack_array();
   ParallelTaskTerminator terminator(active_gc_threads, qset);
   GCTaskQueue* q = GCTaskQueue::create();
-  for(uint i=0; i<parallel_gc_threads; i++) {
+  for(uint i=0; i<active_gc_threads; i++) {
     q->enqueue(new RefProcTaskProxy(task, i));
   }
-  if (task.marks_oops_alive()) {
-    if (parallel_gc_threads>1) {
-      for (uint j=0; j<active_gc_threads; j++) {
-        q->enqueue(new StealMarkingTask(&terminator));
-      }
+  if (task.marks_oops_alive() && (active_gc_threads>1)) {
+    for (uint j=0; j<active_gc_threads; j++) {
+      q->enqueue(new StealMarkingTask(&terminator));
     }
   }
   PSParallelCompact::gc_task_manager()->execute_and_wait(q);
diff --git a/src/hotspot/share/gc/parallel/psMarkSweep.cpp b/src/hotspot/share/gc/parallel/psMarkSweep.cpp
index c8dc766cc6b..b2fd9b15c29 100644
--- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp
@@ -521,7 +521,7 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
     ObjectSynchronizer::oops_do(mark_and_push_closure());
     Management::oops_do(mark_and_push_closure());
     JvmtiExport::oops_do(mark_and_push_closure());
-    SystemDictionary::always_strong_oops_do(mark_and_push_closure());
+    SystemDictionary::oops_do(mark_and_push_closure());
     ClassLoaderDataGraph::always_strong_cld_do(follow_cld_closure());
     // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
     //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
@@ -536,7 +536,7 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
     GCTraceTime(Debug, gc, phases) t("Reference Processing", _gc_timer);
 
     ref_processor()->setup_policy(clear_all_softrefs);
-    ReferenceProcessorPhaseTimes pt(_gc_timer, ref_processor()->num_queues());
+    ReferenceProcessorPhaseTimes pt(_gc_timer, ref_processor()->max_num_queues());
     const ReferenceProcessorStats& stats =
       ref_processor()->process_discovered_references(
         is_alive_closure(), mark_and_push_closure(), follow_stack_closure(), NULL, &pt);
@@ -556,7 +556,7 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
     GCTraceTime(Debug, gc, phases) t("Class Unloading", _gc_timer);
 
     // Unload classes and purge the SystemDictionary.
-    bool purged_class = SystemDictionary::do_unloading(is_alive_closure(), _gc_timer);
+    bool purged_class = SystemDictionary::do_unloading(_gc_timer);
 
     // Unload nmethods.
     CodeCache::do_unloading(is_alive_closure(), purged_class);
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index a67dae68017..2fffd5b05ac 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -2111,8 +2111,11 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
     GCTraceTime(Debug, gc, phases) tm("Reference Processing", &_gc_timer);
 
     ReferenceProcessorStats stats;
-    ReferenceProcessorPhaseTimes pt(&_gc_timer, ref_processor()->num_queues());
+    ReferenceProcessorPhaseTimes pt(&_gc_timer, ref_processor()->max_num_queues());
+
     if (ref_processor()->processing_is_mt()) {
+      ref_processor()->set_active_mt_degree(active_gc_threads);
+
       RefProcTaskExecutor task_executor;
       stats = ref_processor()->process_discovered_references(
         is_alive_closure(), &mark_and_push_closure, &follow_stack_closure,
@@ -2139,7 +2142,7 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
     GCTraceTime(Debug, gc, phases) tm_m("Class Unloading", &_gc_timer);
 
     // Follow system dictionary roots and unload classes.
-    bool purged_class = SystemDictionary::do_unloading(is_alive_closure(), &_gc_timer);
+    bool purged_class = SystemDictionary::do_unloading(&_gc_timer);
 
     // Unload nmethods.
     CodeCache::do_unloading(is_alive_closure(), purged_class);
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index 7f94c12bd84..c492df60ecd 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -213,7 +213,8 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
     Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size);
 
     // Now we have to CAS in the header.
-    if (o->cas_forward_to(new_obj, test_mark)) {
+    // Make copy visible to threads reading the forwardee.
+    if (o->cas_forward_to(new_obj, test_mark, memory_order_release)) {
       // We won any races, we "own" this object.
       assert(new_obj == o->forwardee(), "Sanity");
 
@@ -256,11 +257,12 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
       }
 
       // don't update this before the unallocation!
-      new_obj = o->forwardee();
+      // Using acquire though consume would be accurate for accessing new_obj.
+      new_obj = o->forwardee_acquire();
     }
   } else {
     assert(o->is_forwarded(), "Sanity");
-    new_obj = o->forwardee();
+    new_obj = o->forwardee_acquire();
   }
 
   // This code must come after the CAS test, or it will print incorrect
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index b81fe6ed58a..43c0c8576ca 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -399,7 +399,7 @@ bool PSScavenge::invoke_no_policy() {
       PSKeepAliveClosure keep_alive(promotion_manager);
       PSEvacuateFollowersClosure evac_followers(promotion_manager);
       ReferenceProcessorStats stats;
-      ReferenceProcessorPhaseTimes pt(&_gc_timer, reference_processor()->num_queues());
+      ReferenceProcessorPhaseTimes pt(&_gc_timer, reference_processor()->max_num_queues());
       if (reference_processor()->processing_is_mt()) {
         PSRefProcTaskExecutor task_executor;
         stats = reference_processor()->process_discovered_references(
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 0413e9c71ac..935a3f5617d 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -629,7 +629,7 @@ void DefNewGeneration::collect(bool   full,
   FastKeepAliveClosure keep_alive(this, &scan_weak_ref);
   ReferenceProcessor* rp = ref_processor();
   rp->setup_policy(clear_all_soft_refs);
-  ReferenceProcessorPhaseTimes pt(_gc_timer, rp->num_queues());
+  ReferenceProcessorPhaseTimes pt(_gc_timer, rp->max_num_queues());
   const ReferenceProcessorStats& stats =
   rp->process_discovered_references(&is_alive, &keep_alive, &evacuate_followers,
                                     NULL, &pt);
diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp
index 72f84d3d392..0090007466f 100644
--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
+++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
@@ -208,7 +208,7 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
     GCTraceTime(Debug, gc, phases) tm_m("Reference Processing", gc_timer());
 
     ref_processor()->setup_policy(clear_all_softrefs);
-    ReferenceProcessorPhaseTimes pt(_gc_timer, ref_processor()->num_queues());
+    ReferenceProcessorPhaseTimes pt(_gc_timer, ref_processor()->max_num_queues());
     const ReferenceProcessorStats& stats =
       ref_processor()->process_discovered_references(
         &is_alive, &keep_alive, &follow_stack_closure, NULL, &pt);
@@ -228,7 +228,7 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
     GCTraceTime(Debug, gc, phases) tm_m("Class Unloading", gc_timer());
 
     // Unload classes and purge the SystemDictionary.
-    bool purged_class = SystemDictionary::do_unloading(&is_alive, gc_timer());
+    bool purged_class = SystemDictionary::do_unloading(gc_timer());
 
     // Unload nmethods.
     CodeCache::do_unloading(&is_alive, purged_class);
diff --git a/src/hotspot/share/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp
index 748f33b323e..bf1c1e395ae 100644
--- a/src/hotspot/share/gc/shared/barrierSet.hpp
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp
@@ -103,17 +103,17 @@ protected:
   ~BarrierSet() { }
 
   template <class BarrierSetAssemblerT>
-  BarrierSetAssembler* make_barrier_set_assembler() {
+  static BarrierSetAssembler* make_barrier_set_assembler() {
     return NOT_ZERO(new BarrierSetAssemblerT()) ZERO_ONLY(NULL);
   }
 
   template <class BarrierSetC1T>
-  BarrierSetC1* make_barrier_set_c1() {
+  static BarrierSetC1* make_barrier_set_c1() {
     return COMPILER1_PRESENT(new BarrierSetC1T()) NOT_COMPILER1(NULL);
   }
 
   template <class BarrierSetC2T>
-  BarrierSetC2* make_barrier_set_c2() {
+  static BarrierSetC2* make_barrier_set_c2() {
     return COMPILER2_PRESENT(new BarrierSetC2T()) NOT_COMPILER2(NULL);
   }
 
@@ -213,8 +213,12 @@ public:
     }
 
     template <typename T>
-    static void arraycopy_in_heap(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-      Raw::arraycopy(src_obj, dst_obj, src, dst, length);
+    static void arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                  arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                  size_t length) {
+      Raw::arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                     dst_obj, dst_offset_in_bytes, dst_raw,
+                     length);
     }
 
     // Heap oop accesses. These accessors get resolved when
@@ -257,8 +261,12 @@ public:
     }
 
     template <typename T>
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-      return Raw::oop_arraycopy(src_obj, dst_obj, src, dst, length);
+    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                      size_t length) {
+      return Raw::oop_arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                                dst_obj, dst_offset_in_bytes, dst_raw,
+                                length);
     }
 
     // Off-heap oop accesses. These accessors get resolved when
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
index fee39c7d579..afef9759687 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
@@ -30,7 +30,9 @@
 // Do something for each concrete barrier set part of the build.
 #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
   f(CardTableBarrierSet)                             \
-  G1GC_ONLY(f(G1BarrierSet))
+  EPSILONGC_ONLY(f(EpsilonBarrierSet))               \
+  G1GC_ONLY(f(G1BarrierSet))                         \
+  ZGC_ONLY(f(ZBarrierSet))
 
 #define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f)          \
   f(ModRef)
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
index 5f4f502b2e9..5030975100a 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
@@ -30,8 +30,14 @@
 #include "gc/shared/modRefBarrierSet.inline.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
 
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilonBarrierSet.hpp"
+#endif
 #if INCLUDE_G1GC
-#include "gc/g1/g1BarrierSet.inline.hpp" // G1 support
+#include "gc/g1/g1BarrierSet.inline.hpp"
+#endif
+#if INCLUDE_ZGC
+#include "gc/z/zBarrierSet.inline.hpp"
 #endif
 
 #endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
index b0eb89bd342..b92f89399e3 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 template <DecoratorSet decorators, typename T>
 inline void CardTableBarrierSet::write_ref_field_post(T* field, oop newVal) {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 7fbe469a4d1..75af999fc0b 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -365,20 +365,33 @@ void CollectedHeap::check_for_valid_allocation_state() {
 }
 #endif
 
-HeapWord* CollectedHeap::allocate_from_tlab_slow(Klass* klass, Thread* thread, size_t size) {
+HeapWord* CollectedHeap::obj_allocate_raw(Klass* klass, size_t size,
+                                          bool* gc_overhead_limit_was_exceeded, TRAPS) {
+  if (UseTLAB) {
+    HeapWord* result = allocate_from_tlab(klass, size, THREAD);
+    if (result != NULL) {
+      return result;
+    }
+  }
+
+  return allocate_outside_tlab(klass, size, gc_overhead_limit_was_exceeded, THREAD);
+}
+
+HeapWord* CollectedHeap::allocate_from_tlab_slow(Klass* klass, size_t size, TRAPS) {
+  ThreadLocalAllocBuffer& tlab = THREAD->tlab();
 
   // Retain tlab and allocate object in shared space if
   // the amount free in the tlab is too large to discard.
-  if (thread->tlab().free() > thread->tlab().refill_waste_limit()) {
-    thread->tlab().record_slow_allocation(size);
+  if (tlab.free() > tlab.refill_waste_limit()) {
+    tlab.record_slow_allocation(size);
     return NULL;
   }
 
   // Discard tlab and allocate a new one.
   // To minimize fragmentation, the last TLAB may be smaller than the rest.
-  size_t new_tlab_size = thread->tlab().compute_size(size);
+  size_t new_tlab_size = tlab.compute_size(size);
 
-  thread->tlab().clear_before_allocation();
+  tlab.clear_before_allocation();
 
   if (new_tlab_size == 0) {
     return NULL;
@@ -397,7 +410,7 @@ HeapWord* CollectedHeap::allocate_from_tlab_slow(Klass* klass, Thread* thread, s
   assert(actual_tlab_size != 0, "Allocation succeeded but actual size not updated. obj at: " PTR_FORMAT " min: " SIZE_FORMAT ", desired: " SIZE_FORMAT,
          p2i(obj), min_tlab_size, new_tlab_size);
 
-  AllocTracer::send_allocation_in_new_tlab(klass, obj, actual_tlab_size * HeapWordSize, size * HeapWordSize, thread);
+  AllocTracer::send_allocation_in_new_tlab(klass, obj, actual_tlab_size * HeapWordSize, size * HeapWordSize, THREAD);
 
   if (ZeroTLAB) {
     // ..and clear it.
@@ -412,7 +425,7 @@ HeapWord* CollectedHeap::allocate_from_tlab_slow(Klass* klass, Thread* thread, s
     Copy::fill_to_words(obj + hdr_size, actual_tlab_size - hdr_size, badHeapWordVal);
 #endif // ASSERT
   }
-  thread->tlab().fill(obj, obj + size, actual_tlab_size);
+  tlab.fill(obj, obj + size, actual_tlab_size);
   return obj;
 }
 
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index e61f6c23ae6..ecd8301624e 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -89,6 +89,7 @@ class GCHeapLog : public EventLogBase<GCMessage> {
 //     CMSHeap
 //   G1CollectedHeap
 //   ParallelScavengeHeap
+//   ZCollectedHeap
 //
 class CollectedHeap : public CHeapObj<mtInternal> {
   friend class VMStructs;
@@ -141,8 +142,18 @@ class CollectedHeap : public CHeapObj<mtInternal> {
   virtual void resize_all_tlabs();
 
   // Allocate from the current thread's TLAB, with broken-out slow path.
-  inline static HeapWord* allocate_from_tlab(Klass* klass, Thread* thread, size_t size);
-  static HeapWord* allocate_from_tlab_slow(Klass* klass, Thread* thread, size_t size);
+  inline static HeapWord* allocate_from_tlab(Klass* klass, size_t size, TRAPS);
+  static HeapWord* allocate_from_tlab_slow(Klass* klass, size_t size, TRAPS);
+
+  inline static HeapWord* allocate_outside_tlab(Klass* klass, size_t size,
+                                                bool* gc_overhead_limit_was_exceeded, TRAPS);
+
+  // Raw memory allocation facilities
+  // The obj and array allocate methods are covers for these methods.
+  // mem_allocate() should never be
+  // called to allocate TLABs, only individual objects.
+  virtual HeapWord* mem_allocate(size_t size,
+                                 bool* gc_overhead_limit_was_exceeded) = 0;
 
   // Allocate an uninitialized block of the given size, or returns NULL if
   // this is impossible.
@@ -196,7 +207,9 @@ class CollectedHeap : public CHeapObj<mtInternal> {
     Serial,
     Parallel,
     CMS,
-    G1
+    G1,
+    Epsilon,
+    Z
   };
 
   static inline size_t filler_array_max_size() {
@@ -309,12 +322,12 @@ class CollectedHeap : public CHeapObj<mtInternal> {
   inline static oop array_allocate_nozero(Klass* klass, int size, int length, TRAPS);
   inline static oop class_allocate(Klass* klass, int size, TRAPS);
 
-  // Raw memory allocation facilities
-  // The obj and array allocate methods are covers for these methods.
-  // mem_allocate() should never be
-  // called to allocate TLABs, only individual objects.
-  virtual HeapWord* mem_allocate(size_t size,
-                                 bool* gc_overhead_limit_was_exceeded) = 0;
+  // Raw memory allocation. This may or may not use TLAB allocations to satisfy the
+  // allocation. A GC implementation may override this function to satisfy the allocation
+  // in any way. But the default is to try a TLAB allocation, and otherwise perform
+  // mem_allocate.
+  virtual HeapWord* obj_allocate_raw(Klass* klass, size_t size,
+                                     bool* gc_overhead_limit_was_exceeded, TRAPS);
 
   // Utilities for turning raw memory into filler objects.
   //
diff --git a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
index ee9f5089a94..08c8131333f 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
@@ -137,31 +137,14 @@ HeapWord* CollectedHeap::common_mem_allocate_noinit(Klass* klass, size_t size, T
     return NULL;  // caller does a CHECK_0 too
   }
 
-  HeapWord* result = NULL;
-  if (UseTLAB) {
-    result = allocate_from_tlab(klass, THREAD, size);
-    if (result != NULL) {
-      assert(!HAS_PENDING_EXCEPTION,
-             "Unexpected exception, will result in uninitialized storage");
-      return result;
-    }
-  }
   bool gc_overhead_limit_was_exceeded = false;
-  result = Universe::heap()->mem_allocate(size,
-                                          &gc_overhead_limit_was_exceeded);
+  CollectedHeap* heap = Universe::heap();
+  HeapWord* result = heap->obj_allocate_raw(klass, size, &gc_overhead_limit_was_exceeded, THREAD);
+
   if (result != NULL) {
-    NOT_PRODUCT(Universe::heap()->
-      check_for_non_bad_heap_word_value(result, size));
-    assert(!HAS_PENDING_EXCEPTION,
-           "Unexpected exception, will result in uninitialized storage");
-    THREAD->incr_allocated_bytes(size * HeapWordSize);
-
-    AllocTracer::send_allocation_outside_tlab(klass, result, size * HeapWordSize, THREAD);
-
     return result;
   }
 
-
   if (!gc_overhead_limit_was_exceeded) {
     // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support
     report_java_out_of_memory("Java heap space");
@@ -193,15 +176,34 @@ HeapWord* CollectedHeap::common_mem_allocate_init(Klass* klass, size_t size, TRA
   return obj;
 }
 
-HeapWord* CollectedHeap::allocate_from_tlab(Klass* klass, Thread* thread, size_t size) {
+HeapWord* CollectedHeap::allocate_from_tlab(Klass* klass, size_t size, TRAPS) {
   assert(UseTLAB, "should use UseTLAB");
 
-  HeapWord* obj = thread->tlab().allocate(size);
+  HeapWord* obj = THREAD->tlab().allocate(size);
   if (obj != NULL) {
     return obj;
   }
   // Otherwise...
-  return allocate_from_tlab_slow(klass, thread, size);
+  obj = allocate_from_tlab_slow(klass, size, THREAD);
+  assert(obj == NULL || !HAS_PENDING_EXCEPTION,
+         "Unexpected exception, will result in uninitialized storage");
+  return obj;
+}
+
+HeapWord* CollectedHeap::allocate_outside_tlab(Klass* klass, size_t size,
+                                               bool* gc_overhead_limit_was_exceeded, TRAPS) {
+  HeapWord* result = Universe::heap()->mem_allocate(size, gc_overhead_limit_was_exceeded);
+  if (result == NULL) {
+    return result;
+  }
+
+  NOT_PRODUCT(Universe::heap()->check_for_non_bad_heap_word_value(result, size));
+  assert(!HAS_PENDING_EXCEPTION,
+         "Unexpected exception, will result in uninitialized storage");
+  THREAD->incr_allocated_bytes(size * HeapWordSize);
+
+  AllocTracer::send_allocation_outside_tlab(klass, result, size * HeapWordSize, THREAD);
+  return result;
 }
 
 void CollectedHeap::init_obj(HeapWord* obj, size_t size) {
diff --git a/src/hotspot/share/gc/shared/gcCause.cpp b/src/hotspot/share/gc/shared/gcCause.cpp
index cc8b216ff7c..3a7c3e1a9e7 100644
--- a/src/hotspot/share/gc/shared/gcCause.cpp
+++ b/src/hotspot/share/gc/shared/gcCause.cpp
@@ -105,6 +105,21 @@ const char* GCCause::to_string(GCCause::Cause cause) {
     case _dcmd_gc_run:
       return "Diagnostic Command";
 
+    case _z_timer:
+      return "Timer";
+
+    case _z_warmup:
+      return "Warmup";
+
+    case _z_allocation_rate:
+      return "Allocation Rate";
+
+    case _z_allocation_stall:
+      return "Allocation Stall";
+
+    case _z_proactive:
+      return "Proactive";
+
     case _last_gc_cause:
       return "ILLEGAL VALUE - last gc cause - ILLEGAL VALUE";
 
diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index 7bedce85a49..5bf68b4c1f0 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -78,6 +78,12 @@ class GCCause : public AllStatic {
 
     _dcmd_gc_run,
 
+    _z_timer,
+    _z_warmup,
+    _z_allocation_rate,
+    _z_allocation_stall,
+    _z_proactive,
+
     _last_gc_cause
   };
 
diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
index c5f49b90e89..ff8a78e226b 100644
--- a/src/hotspot/share/gc/shared/gcConfig.cpp
+++ b/src/hotspot/share/gc/shared/gcConfig.cpp
@@ -31,6 +31,9 @@
 #if INCLUDE_CMSGC
 #include "gc/cms/cmsArguments.hpp"
 #endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilonArguments.hpp"
+#endif
 #if INCLUDE_G1GC
 #include "gc/g1/g1Arguments.hpp"
 #endif
@@ -40,6 +43,9 @@
 #if INCLUDE_SERIALGC
 #include "gc/serial/serialArguments.hpp"
 #endif
+#if INCLUDE_ZGC
+#include "gc/z/zArguments.hpp"
+#endif
 
 struct SupportedGC {
   bool&               _flag;
@@ -52,18 +58,22 @@ struct SupportedGC {
 };
 
      CMSGC_ONLY(static CMSArguments      cmsArguments;)
+ EPSILONGC_ONLY(static EpsilonArguments  epsilonArguments;)
       G1GC_ONLY(static G1Arguments       g1Arguments;)
 PARALLELGC_ONLY(static ParallelArguments parallelArguments;)
   SERIALGC_ONLY(static SerialArguments   serialArguments;)
+       ZGC_ONLY(static ZArguments        zArguments;)
 
 // Table of supported GCs, for translating between command
 // line flag, CollectedHeap::Name and GCArguments instance.
 static const SupportedGC SupportedGCs[] = {
        CMSGC_ONLY_ARG(SupportedGC(UseConcMarkSweepGC, CollectedHeap::CMS,      cmsArguments,      "concurrent mark sweep gc"))
+   EPSILONGC_ONLY_ARG(SupportedGC(UseEpsilonGC,       CollectedHeap::Epsilon,  epsilonArguments,  "epsilon gc"))
         G1GC_ONLY_ARG(SupportedGC(UseG1GC,            CollectedHeap::G1,       g1Arguments,       "g1 gc"))
   PARALLELGC_ONLY_ARG(SupportedGC(UseParallelGC,      CollectedHeap::Parallel, parallelArguments, "parallel gc"))
   PARALLELGC_ONLY_ARG(SupportedGC(UseParallelOldGC,   CollectedHeap::Parallel, parallelArguments, "parallel gc"))
     SERIALGC_ONLY_ARG(SupportedGC(UseSerialGC,        CollectedHeap::Serial,   serialArguments,   "serial gc"))
+         ZGC_ONLY_ARG(SupportedGC(UseZGC,             CollectedHeap::Z,        zArguments,        "z gc"))
 };
 
 #define FOR_EACH_SUPPORTED_GC(var) \
@@ -88,10 +98,12 @@ void GCConfig::select_gc_ergonomically() {
   }
 
   NOT_CMSGC(     UNSUPPORTED_OPTION(UseConcMarkSweepGC));
+  NOT_EPSILONGC( UNSUPPORTED_OPTION(UseEpsilonGC);)
   NOT_G1GC(      UNSUPPORTED_OPTION(UseG1GC);)
   NOT_PARALLELGC(UNSUPPORTED_OPTION(UseParallelGC);)
   NOT_PARALLELGC(UNSUPPORTED_OPTION(UseParallelOldGC));
   NOT_SERIALGC(  UNSUPPORTED_OPTION(UseSerialGC);)
+  NOT_ZGC(       UNSUPPORTED_OPTION(UseZGC);)
 }
 
 bool GCConfig::is_no_gc_selected() {
diff --git a/src/hotspot/share/gc/shared/gcConfiguration.cpp b/src/hotspot/share/gc/shared/gcConfiguration.cpp
index 453d8c633c2..f37387dd73c 100644
--- a/src/hotspot/share/gc/shared/gcConfiguration.cpp
+++ b/src/hotspot/share/gc/shared/gcConfiguration.cpp
@@ -43,6 +43,10 @@ GCName GCConfiguration::young_collector() const {
     return ParNew;
   }
 
+  if (UseZGC) {
+    return NA;
+  }
+
   return DefNew;
 }
 
@@ -59,6 +63,10 @@ GCName GCConfiguration::old_collector() const {
     return ParallelOld;
   }
 
+  if (UseZGC) {
+    return Z;
+  }
+
   return SerialOld;
 }
 
diff --git a/src/hotspot/share/gc/shared/gcName.hpp b/src/hotspot/share/gc/shared/gcName.hpp
index 35cb58b1512..bc21fa6ccaa 100644
--- a/src/hotspot/share/gc/shared/gcName.hpp
+++ b/src/hotspot/share/gc/shared/gcName.hpp
@@ -38,6 +38,8 @@ enum GCName {
   ConcurrentMarkSweep,
   G1Old,
   G1Full,
+  Z,
+  NA,
   GCNameEndSentinel
 };
 
@@ -55,6 +57,8 @@ class GCNameHelper {
       case ConcurrentMarkSweep: return "ConcurrentMarkSweep";
       case G1Old: return "G1Old";
       case G1Full: return "G1Full";
+      case Z: return "Z";
+      case NA: return "N/A";
       default: ShouldNotReachHere(); return NULL;
     }
   }
diff --git a/src/hotspot/share/gc/shared/gcThreadLocalData.hpp b/src/hotspot/share/gc/shared/gcThreadLocalData.hpp
index b8251fdf963..7599a7f6821 100644
--- a/src/hotspot/share/gc/shared/gcThreadLocalData.hpp
+++ b/src/hotspot/share/gc/shared/gcThreadLocalData.hpp
@@ -40,6 +40,6 @@
 // should consider placing frequently accessed fields first in
 // T, so that field offsets relative to Thread are small, which
 // often allows for a more compact instruction encoding.
-typedef uint64_t GCThreadLocalData[14]; // 112 bytes
+typedef uint64_t GCThreadLocalData[18]; // 144 bytes
 
 #endif // SHARE_GC_SHARED_GCTHREADLOCALDATA_HPP
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index e37526ccf24..686d46c87fd 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -29,6 +29,9 @@
 #if INCLUDE_CMSGC
 #include "gc/cms/cms_globals.hpp"
 #endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilon_globals.hpp"
+#endif
 #if INCLUDE_G1GC
 #include "gc/g1/g1_globals.hpp"
 #endif
@@ -38,6 +41,9 @@
 #if INCLUDE_SERIALGC
 #include "gc/serial/serial_globals.hpp"
 #endif
+#if INCLUDE_ZGC
+#include "gc/z/z_globals.hpp"
+#endif
 
 #define GC_FLAGS(develop,                                                   \
                  develop_pd,                                                \
@@ -70,6 +76,22 @@
     constraint,                                                             \
     writeable))                                                             \
                                                                             \
+  EPSILONGC_ONLY(GC_EPSILON_FLAGS(                                          \
+    develop,                                                                \
+    develop_pd,                                                             \
+    product,                                                                \
+    product_pd,                                                             \
+    diagnostic,                                                             \
+    diagnostic_pd,                                                          \
+    experimental,                                                           \
+    notproduct,                                                             \
+    manageable,                                                             \
+    product_rw,                                                             \
+    lp64_product,                                                           \
+    range,                                                                  \
+    constraint,                                                             \
+    writeable))                                                             \
+                                                                            \
   G1GC_ONLY(GC_G1_FLAGS(                                                    \
     develop,                                                                \
     develop_pd,                                                             \
@@ -118,6 +140,22 @@
     constraint,                                                             \
     writeable))                                                             \
                                                                             \
+  ZGC_ONLY(GC_Z_FLAGS(                                                      \
+    develop,                                                                \
+    develop_pd,                                                             \
+    product,                                                                \
+    product_pd,                                                             \
+    diagnostic,                                                             \
+    diagnostic_pd,                                                          \
+    experimental,                                                           \
+    notproduct,                                                             \
+    manageable,                                                             \
+    product_rw,                                                             \
+    lp64_product,                                                           \
+    range,                                                                  \
+    constraint,                                                             \
+    writeable))                                                             \
+                                                                            \
   /* gc */                                                                  \
                                                                             \
   product(bool, UseConcMarkSweepGC, false,                                  \
@@ -135,6 +173,12 @@
   product(bool, UseParallelOldGC, false,                                    \
           "Use the Parallel Old garbage collector")                         \
                                                                             \
+  experimental(bool, UseEpsilonGC, false,                                   \
+          "Use the Epsilon (no-op) garbage collector")                      \
+                                                                            \
+  experimental(bool, UseZGC, false,                                         \
+          "Use the Z garbage collector")                                    \
+                                                                            \
   product(uint, ParallelGCThreads, 0,                                       \
           "Number of parallel threads parallel gc will use")                \
           constraint(ParallelGCThreadsConstraintFunc,AfterErgo)             \
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
index 1936b0c1e2a..5a5804f053e 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
@@ -44,6 +44,7 @@
 #include "gc/shared/genCollectedHeap.hpp"
 #include "gc/shared/genOopClosures.inline.hpp"
 #include "gc/shared/generationSpec.hpp"
+#include "gc/shared/oopStorageParState.inline.hpp"
 #include "gc/shared/space.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/vmGCOperations.hpp"
@@ -783,7 +784,6 @@ static AssertNonScavengableClosure assert_is_non_scavengable_closure;
 void GenCollectedHeap::process_roots(StrongRootsScope* scope,
                                      ScanningOption so,
                                      OopClosure* strong_roots,
-                                     OopClosure* weak_roots,
                                      CLDClosure* strong_cld_closure,
                                      CLDClosure* weak_cld_closure,
                                      CodeBlobToOopClosure* code_roots) {
@@ -827,7 +827,7 @@ void GenCollectedHeap::process_roots(StrongRootsScope* scope,
   }
 
   if (!_process_strong_tasks->is_task_claimed(GCH_PS_SystemDictionary_oops_do)) {
-    SystemDictionary::roots_oops_do(strong_roots, weak_roots);
+    SystemDictionary::oops_do(strong_roots);
   }
 
   if (!_process_strong_tasks->is_task_claimed(GCH_PS_CodeCache_oops_do)) {
@@ -852,12 +852,17 @@ void GenCollectedHeap::process_roots(StrongRootsScope* scope,
 }
 
 void GenCollectedHeap::process_string_table_roots(StrongRootsScope* scope,
-                                                  OopClosure* root_closure) {
+                                                  OopClosure* root_closure,
+                                                  OopStorage::ParState<false, false>* par_state_string) {
   assert(root_closure != NULL, "Must be set");
   // All threads execute the following. A specific chunk of buckets
   // from the StringTable are the individual tasks.
+
+  // Either we should be single threaded or have a ParState
+  assert((scope->n_threads() <= 1) || par_state_string != NULL, "Parallel but no ParState");
+
   if (scope->n_threads() > 1) {
-    StringTable::possibly_parallel_oops_do(root_closure);
+    StringTable::possibly_parallel_oops_do(par_state_string, root_closure);
   } else {
     StringTable::oops_do(root_closure);
   }
@@ -866,12 +871,13 @@ void GenCollectedHeap::process_string_table_roots(StrongRootsScope* scope,
 void GenCollectedHeap::young_process_roots(StrongRootsScope* scope,
                                            OopsInGenClosure* root_closure,
                                            OopsInGenClosure* old_gen_closure,
-                                           CLDClosure* cld_closure) {
+                                           CLDClosure* cld_closure,
+                                           OopStorage::ParState<false, false>* par_state_string) {
   MarkingCodeBlobClosure mark_code_closure(root_closure, CodeBlobToOopClosure::FixRelocations);
 
-  process_roots(scope, SO_ScavengeCodeCache, root_closure, root_closure,
+  process_roots(scope, SO_ScavengeCodeCache, root_closure,
                 cld_closure, cld_closure, &mark_code_closure);
-  process_string_table_roots(scope, root_closure);
+  process_string_table_roots(scope, root_closure, par_state_string);
 
   if (!_process_strong_tasks->is_task_claimed(GCH_PS_younger_gens)) {
     root_closure->reset_generation();
@@ -891,17 +897,17 @@ void GenCollectedHeap::full_process_roots(StrongRootsScope* scope,
                                           ScanningOption so,
                                           bool only_strong_roots,
                                           OopsInGenClosure* root_closure,
-                                          CLDClosure* cld_closure) {
+                                          CLDClosure* cld_closure,
+                                          OopStorage::ParState<false, false>* par_state_string) {
   MarkingCodeBlobClosure mark_code_closure(root_closure, is_adjust_phase);
-  OopsInGenClosure* weak_roots = only_strong_roots ? NULL : root_closure;
   CLDClosure* weak_cld_closure = only_strong_roots ? NULL : cld_closure;
 
-  process_roots(scope, so, root_closure, weak_roots, cld_closure, weak_cld_closure, &mark_code_closure);
+  process_roots(scope, so, root_closure, cld_closure, weak_cld_closure, &mark_code_closure);
   if (is_adjust_phase) {
     // We never treat the string table as roots during marking
     // for the full gc, so we only need to process it during
     // the adjust phase.
-    process_string_table_roots(scope, root_closure);
+    process_string_table_roots(scope, root_closure, par_state_string);
   }
 
   _process_strong_tasks->all_tasks_completed(scope->n_threads());
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
index a8b4dd704f9..a250fcd8a14 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
@@ -28,6 +28,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorPolicy.hpp"
 #include "gc/shared/generation.hpp"
+#include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/softRefGenPolicy.hpp"
 
 class AdaptiveSizePolicy;
@@ -396,13 +397,13 @@ public:
   void process_roots(StrongRootsScope* scope,
                      ScanningOption so,
                      OopClosure* strong_roots,
-                     OopClosure* weak_roots,
                      CLDClosure* strong_cld_closure,
                      CLDClosure* weak_cld_closure,
                      CodeBlobToOopClosure* code_roots);
 
   void process_string_table_roots(StrongRootsScope* scope,
-                                  OopClosure* root_closure);
+                                  OopClosure* root_closure,
+                                  OopStorage::ParState<false, false>* par_state_string);
 
   // Accessor for memory state verification support
   NOT_PRODUCT(
@@ -416,14 +417,16 @@ public:
   void young_process_roots(StrongRootsScope* scope,
                            OopsInGenClosure* root_closure,
                            OopsInGenClosure* old_gen_closure,
-                           CLDClosure* cld_closure);
+                           CLDClosure* cld_closure,
+                           OopStorage::ParState<false, false>* par_state_string = NULL);
 
   void full_process_roots(StrongRootsScope* scope,
                           bool is_adjust_phase,
                           ScanningOption so,
                           bool only_strong_roots,
                           OopsInGenClosure* root_closure,
-                          CLDClosure* cld_closure);
+                          CLDClosure* cld_closure,
+                          OopStorage::ParState<false, false>* par_state_string = NULL);
 
   // Apply "root_closure" to all the weak roots of the system.
   // These include JNI weak roots, string table,
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
index ba522dbb4f3..0cdbdedf198 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
@@ -30,12 +30,10 @@
 #include "gc/shared/plab.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
 #include "runtime/arguments.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/align.hpp"
-#include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_CMSGC
 #include "gc/cms/jvmFlagConstraintsCMS.hpp"
@@ -88,10 +86,10 @@ JVMFlag::Error ConcGCThreadsConstraintFunc(uint value, bool verbose) {
   // CMS and G1 GCs use ConcGCThreads.
   if ((GCConfig::is_gc_selected(CollectedHeap::CMS) ||
        GCConfig::is_gc_selected(CollectedHeap::G1)) && (value > ParallelGCThreads)) {
-    CommandLineError::print(verbose,
-                            "ConcGCThreads (" UINT32_FORMAT ") must be "
-                            "less than or equal to ParallelGCThreads (" UINT32_FORMAT ")\n",
-                            value, ParallelGCThreads);
+    JVMFlag::printError(verbose,
+                        "ConcGCThreads (" UINT32_FORMAT ") must be "
+                        "less than or equal to ParallelGCThreads (" UINT32_FORMAT ")\n",
+                        value, ParallelGCThreads);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -102,10 +100,10 @@ static JVMFlag::Error MinPLABSizeBounds(const char* name, size_t value, bool ver
   if ((GCConfig::is_gc_selected(CollectedHeap::CMS) ||
        GCConfig::is_gc_selected(CollectedHeap::G1)  ||
        GCConfig::is_gc_selected(CollectedHeap::Parallel)) && (value < PLAB::min_size())) {
-    CommandLineError::print(verbose,
-                            "%s (" SIZE_FORMAT ") must be "
-                            "greater than or equal to ergonomic PLAB minimum size (" SIZE_FORMAT ")\n",
-                            name, value, PLAB::min_size());
+    JVMFlag::printError(verbose,
+                        "%s (" SIZE_FORMAT ") must be "
+                        "greater than or equal to ergonomic PLAB minimum size (" SIZE_FORMAT ")\n",
+                        name, value, PLAB::min_size());
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -116,10 +114,10 @@ JVMFlag::Error MaxPLABSizeBounds(const char* name, size_t value, bool verbose) {
   if ((GCConfig::is_gc_selected(CollectedHeap::CMS) ||
        GCConfig::is_gc_selected(CollectedHeap::G1)  ||
        GCConfig::is_gc_selected(CollectedHeap::Parallel)) && (value > PLAB::max_size())) {
-    CommandLineError::print(verbose,
-                            "%s (" SIZE_FORMAT ") must be "
-                            "less than or equal to ergonomic PLAB maximum size (" SIZE_FORMAT ")\n",
-                            name, value, PLAB::max_size());
+    JVMFlag::printError(verbose,
+                        "%s (" SIZE_FORMAT ") must be "
+                        "less than or equal to ergonomic PLAB maximum size (" SIZE_FORMAT ")\n",
+                        name, value, PLAB::max_size());
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -156,10 +154,10 @@ JVMFlag::Error OldPLABSizeConstraintFunc(size_t value, bool verbose) {
 
 JVMFlag::Error MinHeapFreeRatioConstraintFunc(uintx value, bool verbose) {
   if (value > MaxHeapFreeRatio) {
-    CommandLineError::print(verbose,
-                            "MinHeapFreeRatio (" UINTX_FORMAT ") must be "
-                            "less than or equal to MaxHeapFreeRatio (" UINTX_FORMAT ")\n",
-                            value, MaxHeapFreeRatio);
+    JVMFlag::printError(verbose,
+                        "MinHeapFreeRatio (" UINTX_FORMAT ") must be "
+                        "less than or equal to MaxHeapFreeRatio (" UINTX_FORMAT ")\n",
+                        value, MaxHeapFreeRatio);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -168,10 +166,10 @@ JVMFlag::Error MinHeapFreeRatioConstraintFunc(uintx value, bool verbose) {
 
 JVMFlag::Error MaxHeapFreeRatioConstraintFunc(uintx value, bool verbose) {
   if (value < MinHeapFreeRatio) {
-    CommandLineError::print(verbose,
-                            "MaxHeapFreeRatio (" UINTX_FORMAT ") must be "
-                            "greater than or equal to MinHeapFreeRatio (" UINTX_FORMAT ")\n",
-                            value, MinHeapFreeRatio);
+    JVMFlag::printError(verbose,
+                        "MaxHeapFreeRatio (" UINTX_FORMAT ") must be "
+                        "greater than or equal to MinHeapFreeRatio (" UINTX_FORMAT ")\n",
+                        value, MinHeapFreeRatio);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -180,11 +178,11 @@ JVMFlag::Error MaxHeapFreeRatioConstraintFunc(uintx value, bool verbose) {
 
 static JVMFlag::Error CheckMaxHeapSizeAndSoftRefLRUPolicyMSPerMB(size_t maxHeap, intx softRef, bool verbose) {
   if ((softRef > 0) && ((maxHeap / M) > (max_uintx / softRef))) {
-    CommandLineError::print(verbose,
-                            "Desired lifetime of SoftReferences cannot be expressed correctly. "
-                            "MaxHeapSize (" SIZE_FORMAT ") or SoftRefLRUPolicyMSPerMB "
-                            "(" INTX_FORMAT ") is too large\n",
-                            maxHeap, softRef);
+    JVMFlag::printError(verbose,
+                        "Desired lifetime of SoftReferences cannot be expressed correctly. "
+                        "MaxHeapSize (" SIZE_FORMAT ") or SoftRefLRUPolicyMSPerMB "
+                        "(" INTX_FORMAT ") is too large\n",
+                        maxHeap, softRef);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -197,10 +195,10 @@ JVMFlag::Error SoftRefLRUPolicyMSPerMBConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error MarkStackSizeConstraintFunc(size_t value, bool verbose) {
   if (value > MarkStackSizeMax) {
-    CommandLineError::print(verbose,
-                            "MarkStackSize (" SIZE_FORMAT ") must be "
-                            "less than or equal to MarkStackSizeMax (" SIZE_FORMAT ")\n",
-                            value, MarkStackSizeMax);
+    JVMFlag::printError(verbose,
+                        "MarkStackSize (" SIZE_FORMAT ") must be "
+                        "less than or equal to MarkStackSizeMax (" SIZE_FORMAT ")\n",
+                        value, MarkStackSizeMax);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -209,10 +207,10 @@ JVMFlag::Error MarkStackSizeConstraintFunc(size_t value, bool verbose) {
 
 JVMFlag::Error MinMetaspaceFreeRatioConstraintFunc(uintx value, bool verbose) {
   if (value > MaxMetaspaceFreeRatio) {
-    CommandLineError::print(verbose,
-                            "MinMetaspaceFreeRatio (" UINTX_FORMAT ") must be "
-                            "less than or equal to MaxMetaspaceFreeRatio (" UINTX_FORMAT ")\n",
-                            value, MaxMetaspaceFreeRatio);
+    JVMFlag::printError(verbose,
+                        "MinMetaspaceFreeRatio (" UINTX_FORMAT ") must be "
+                        "less than or equal to MaxMetaspaceFreeRatio (" UINTX_FORMAT ")\n",
+                        value, MaxMetaspaceFreeRatio);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -221,10 +219,10 @@ JVMFlag::Error MinMetaspaceFreeRatioConstraintFunc(uintx value, bool verbose) {
 
 JVMFlag::Error MaxMetaspaceFreeRatioConstraintFunc(uintx value, bool verbose) {
   if (value < MinMetaspaceFreeRatio) {
-    CommandLineError::print(verbose,
-                            "MaxMetaspaceFreeRatio (" UINTX_FORMAT ") must be "
-                            "greater than or equal to MinMetaspaceFreeRatio (" UINTX_FORMAT ")\n",
-                            value, MinMetaspaceFreeRatio);
+    JVMFlag::printError(verbose,
+                        "MaxMetaspaceFreeRatio (" UINTX_FORMAT ") must be "
+                        "greater than or equal to MinMetaspaceFreeRatio (" UINTX_FORMAT ")\n",
+                        value, MinMetaspaceFreeRatio);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -252,12 +250,12 @@ JVMFlag::Error MaxTenuringThresholdConstraintFunc(uintx value, bool verbose) {
 
   // MaxTenuringThreshold=0 means NeverTenure=false && AlwaysTenure=true
   if ((value == 0) && (NeverTenure || !AlwaysTenure)) {
-    CommandLineError::print(verbose,
-                            "MaxTenuringThreshold (0) should match to NeverTenure=false "
-                            "&& AlwaysTenure=true. But we have NeverTenure=%s "
-                            "AlwaysTenure=%s\n",
-                            NeverTenure ? "true" : "false",
-                            AlwaysTenure ? "true" : "false");
+    JVMFlag::printError(verbose,
+                        "MaxTenuringThreshold (0) should match to NeverTenure=false "
+                        "&& AlwaysTenure=true. But we have NeverTenure=%s "
+                        "AlwaysTenure=%s\n",
+                        NeverTenure ? "true" : "false",
+                        AlwaysTenure ? "true" : "false");
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -288,10 +286,10 @@ JVMFlag::Error GCPauseIntervalMillisConstraintFunc(uintx value, bool verbose) {
 JVMFlag::Error InitialBootClassLoaderMetaspaceSizeConstraintFunc(size_t value, bool verbose) {
   size_t aligned_max = align_down(max_uintx/2, Metaspace::reserve_alignment_words());
   if (value > aligned_max) {
-    CommandLineError::print(verbose,
-                            "InitialBootClassLoaderMetaspaceSize (" SIZE_FORMAT ") must be "
-                            "less than or equal to aligned maximum value (" SIZE_FORMAT ")\n",
-                            value, aligned_max);
+    JVMFlag::printError(verbose,
+                        "InitialBootClassLoaderMetaspaceSize (" SIZE_FORMAT ") must be "
+                        "less than or equal to aligned maximum value (" SIZE_FORMAT ")\n",
+                        value, aligned_max);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -301,10 +299,10 @@ JVMFlag::Error InitialBootClassLoaderMetaspaceSizeConstraintFunc(size_t value, b
 static JVMFlag::Error MaxSizeForAlignment(const char* name, size_t value, size_t alignment, bool verbose) {
   size_t aligned_max = ((max_uintx - alignment) & ~(alignment-1));
   if (value > aligned_max) {
-    CommandLineError::print(verbose,
-                            "%s (" SIZE_FORMAT ") must be "
-                            "less than or equal to aligned maximum value (" SIZE_FORMAT ")\n",
-                            name, value, aligned_max);
+    JVMFlag::printError(verbose,
+                        "%s (" SIZE_FORMAT ") must be "
+                        "less than or equal to aligned maximum value (" SIZE_FORMAT ")\n",
+                        name, value, aligned_max);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -343,10 +341,10 @@ JVMFlag::Error HeapBaseMinAddressConstraintFunc(size_t value, bool verbose) {
   // If an overflow happened in Arguments::set_heap_size(), MaxHeapSize will have too large a value.
   // Check for this by ensuring that MaxHeapSize plus the requested min base address still fit within max_uintx.
   if (UseCompressedOops && FLAG_IS_ERGO(MaxHeapSize) && (value > (max_uintx - MaxHeapSize))) {
-    CommandLineError::print(verbose,
-                            "HeapBaseMinAddress (" SIZE_FORMAT ") or MaxHeapSize (" SIZE_FORMAT ") is too large. "
-                            "Sum of them must be less than or equal to maximum of size_t (" SIZE_FORMAT ")\n",
-                            value, MaxHeapSize, max_uintx);
+    JVMFlag::printError(verbose,
+                        "HeapBaseMinAddress (" SIZE_FORMAT ") or MaxHeapSize (" SIZE_FORMAT ") is too large. "
+                        "Sum of them must be less than or equal to maximum of size_t (" SIZE_FORMAT ")\n",
+                        value, MaxHeapSize, max_uintx);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -367,17 +365,17 @@ JVMFlag::Error NewSizeConstraintFunc(size_t value, bool verbose) {
 JVMFlag::Error MinTLABSizeConstraintFunc(size_t value, bool verbose) {
   // At least, alignment reserve area is needed.
   if (value < ThreadLocalAllocBuffer::alignment_reserve_in_bytes()) {
-    CommandLineError::print(verbose,
-                            "MinTLABSize (" SIZE_FORMAT ") must be "
-                            "greater than or equal to reserved area in TLAB (" SIZE_FORMAT ")\n",
-                            value, ThreadLocalAllocBuffer::alignment_reserve_in_bytes());
+    JVMFlag::printError(verbose,
+                        "MinTLABSize (" SIZE_FORMAT ") must be "
+                        "greater than or equal to reserved area in TLAB (" SIZE_FORMAT ")\n",
+                        value, ThreadLocalAllocBuffer::alignment_reserve_in_bytes());
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   if (value > (ThreadLocalAllocBuffer::max_size() * HeapWordSize)) {
-    CommandLineError::print(verbose,
-                            "MinTLABSize (" SIZE_FORMAT ") must be "
-                            "less than or equal to ergonomic TLAB maximum (" SIZE_FORMAT ")\n",
-                            value, ThreadLocalAllocBuffer::max_size() * HeapWordSize);
+    JVMFlag::printError(verbose,
+                        "MinTLABSize (" SIZE_FORMAT ") must be "
+                        "less than or equal to ergonomic TLAB maximum (" SIZE_FORMAT ")\n",
+                        value, ThreadLocalAllocBuffer::max_size() * HeapWordSize);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -387,17 +385,17 @@ JVMFlag::Error TLABSizeConstraintFunc(size_t value, bool verbose) {
   // Skip for default value of zero which means set ergonomically.
   if (FLAG_IS_CMDLINE(TLABSize)) {
     if (value < MinTLABSize) {
-      CommandLineError::print(verbose,
-                              "TLABSize (" SIZE_FORMAT ") must be "
-                              "greater than or equal to MinTLABSize (" SIZE_FORMAT ")\n",
-                              value, MinTLABSize);
+      JVMFlag::printError(verbose,
+                          "TLABSize (" SIZE_FORMAT ") must be "
+                          "greater than or equal to MinTLABSize (" SIZE_FORMAT ")\n",
+                          value, MinTLABSize);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
     if (value > (ThreadLocalAllocBuffer::max_size() * HeapWordSize)) {
-      CommandLineError::print(verbose,
-                              "TLABSize (" SIZE_FORMAT ") must be "
-                              "less than or equal to ergonomic TLAB maximum size (" SIZE_FORMAT ")\n",
-                              value, (ThreadLocalAllocBuffer::max_size() * HeapWordSize));
+      JVMFlag::printError(verbose,
+                          "TLABSize (" SIZE_FORMAT ") must be "
+                          "less than or equal to ergonomic TLAB maximum size (" SIZE_FORMAT ")\n",
+                          value, (ThreadLocalAllocBuffer::max_size() * HeapWordSize));
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -412,10 +410,10 @@ JVMFlag::Error TLABWasteIncrementConstraintFunc(uintx value, bool verbose) {
 
     // Compare with 'max_uintx' as ThreadLocalAllocBuffer::_refill_waste_limit is 'size_t'.
     if (refill_waste_limit > (max_uintx - value)) {
-      CommandLineError::print(verbose,
-                              "TLABWasteIncrement (" UINTX_FORMAT ") must be "
-                              "less than or equal to ergonomic TLAB waste increment maximum size(" SIZE_FORMAT ")\n",
-                              value, (max_uintx - refill_waste_limit));
+      JVMFlag::printError(verbose,
+                          "TLABWasteIncrement (" UINTX_FORMAT ") must be "
+                          "less than or equal to ergonomic TLAB waste increment maximum size(" SIZE_FORMAT ")\n",
+                          value, (max_uintx - refill_waste_limit));
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -425,11 +423,11 @@ JVMFlag::Error TLABWasteIncrementConstraintFunc(uintx value, bool verbose) {
 JVMFlag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
   if (FLAG_IS_CMDLINE(SurvivorRatio) &&
       (value > (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()))) {
-    CommandLineError::print(verbose,
-                            "SurvivorRatio (" UINTX_FORMAT ") must be "
-                            "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
-                            value,
-                            (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()));
+    JVMFlag::printError(verbose,
+                        "SurvivorRatio (" UINTX_FORMAT ") must be "
+                        "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
+                        value,
+                        (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()));
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -438,10 +436,10 @@ JVMFlag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
 
 JVMFlag::Error MetaspaceSizeConstraintFunc(size_t value, bool verbose) {
   if (value > MaxMetaspaceSize) {
-    CommandLineError::print(verbose,
-                            "MetaspaceSize (" SIZE_FORMAT ") must be "
-                            "less than or equal to MaxMetaspaceSize (" SIZE_FORMAT ")\n",
-                            value, MaxMetaspaceSize);
+    JVMFlag::printError(verbose,
+                        "MetaspaceSize (" SIZE_FORMAT ") must be "
+                        "less than or equal to MaxMetaspaceSize (" SIZE_FORMAT ")\n",
+                        value, MaxMetaspaceSize);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -450,10 +448,10 @@ JVMFlag::Error MetaspaceSizeConstraintFunc(size_t value, bool verbose) {
 
 JVMFlag::Error MaxMetaspaceSizeConstraintFunc(size_t value, bool verbose) {
   if (value < MetaspaceSize) {
-    CommandLineError::print(verbose,
-                            "MaxMetaspaceSize (" SIZE_FORMAT ") must be "
-                            "greater than or equal to MetaspaceSize (" SIZE_FORMAT ")\n",
-                            value, MaxMetaspaceSize);
+    JVMFlag::printError(verbose,
+                        "MaxMetaspaceSize (" SIZE_FORMAT ") must be "
+                        "greater than or equal to MetaspaceSize (" SIZE_FORMAT ")\n",
+                        value, MaxMetaspaceSize);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -463,17 +461,17 @@ JVMFlag::Error MaxMetaspaceSizeConstraintFunc(size_t value, bool verbose) {
 JVMFlag::Error SurvivorAlignmentInBytesConstraintFunc(intx value, bool verbose) {
   if (value != 0) {
     if (!is_power_of_2(value)) {
-      CommandLineError::print(verbose,
-                              "SurvivorAlignmentInBytes (" INTX_FORMAT ") must be "
-                              "power of 2\n",
-                              value);
+      JVMFlag::printError(verbose,
+                          "SurvivorAlignmentInBytes (" INTX_FORMAT ") must be "
+                          "power of 2\n",
+                          value);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
     if (value < ObjectAlignmentInBytes) {
-      CommandLineError::print(verbose,
-                              "SurvivorAlignmentInBytes (" INTX_FORMAT ") must be "
-                              "greater than or equal to ObjectAlignmentInBytes (" INTX_FORMAT ")\n",
-                              value, ObjectAlignmentInBytes);
+      JVMFlag::printError(verbose,
+                          "SurvivorAlignmentInBytes (" INTX_FORMAT ") must be "
+                          "greater than or equal to ObjectAlignmentInBytes (" INTX_FORMAT ")\n",
+                          value, ObjectAlignmentInBytes);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index fd86292a396..72b6fd4c197 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -83,7 +83,9 @@ public:
     static oop oop_atomic_xchg_in_heap(oop new_value, T* addr);
 
     template <typename T>
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length);
+    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                      size_t length);
 
     static void clone_in_heap(oop src, oop dst, size_t size);
 
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
index 8c0db7dff66..d84f1aa892f 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
@@ -91,35 +91,41 @@ oop_atomic_xchg_in_heap(oop new_value, T* addr) {
 template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
 inline bool ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
-oop_arraycopy_in_heap(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                      size_t length) {
   BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
 
+  src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+  dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
   if (!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
     // Optimized covariant case
-    bs->write_ref_array_pre(dst, length,
+    bs->write_ref_array_pre(dst_raw, length,
                             HasDecorator<decorators, AS_DEST_NOT_INITIALIZED>::value);
-    Raw::oop_arraycopy(src_obj, dst_obj, src, dst, length);
-    bs->write_ref_array((HeapWord*)dst, length);
+    Raw::oop_arraycopy(NULL, 0, src_raw, NULL, 0, dst_raw, length);
+    bs->write_ref_array((HeapWord*)dst_raw, length);
   } else {
+    assert(dst_obj != NULL, "better have an actual oop");
     Klass* bound = objArrayOop(dst_obj)->element_klass();
-    T* from = src;
+    T* from = const_cast<T*>(src_raw);
     T* end = from + length;
-    for (T* p = dst; from < end; from++, p++) {
+    for (T* p = dst_raw; from < end; from++, p++) {
       T element = *from;
       if (oopDesc::is_instanceof_or_null(CompressedOops::decode(element), bound)) {
         bs->template write_ref_field_pre<decorators>(p);
         *p = element;
       } else {
         // We must do a barrier to cover the partial copy.
-        const size_t pd = pointer_delta(p, dst, (size_t)heapOopSize);
+        const size_t pd = pointer_delta(p, dst_raw, (size_t)heapOopSize);
         // pointer delta is scaled to number of elements (length field in
         // objArrayOop) which we assume is 32 bit.
         assert(pd == (size_t)(int)pd, "length field overflow");
-        bs->write_ref_array((HeapWord*)dst, pd);
+        bs->write_ref_array((HeapWord*)dst_raw, pd);
         return false;
       }
     }
-    bs->write_ref_array((HeapWord*)dst, length);
+    bs->write_ref_array((HeapWord*)dst_raw, length);
   }
   return true;
 }
diff --git a/src/hotspot/share/gc/shared/oopStorage.cpp b/src/hotspot/share/gc/shared/oopStorage.cpp
index 9feada8a266..b3389255ab7 100644
--- a/src/hotspot/share/gc/shared/oopStorage.cpp
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp
@@ -33,7 +33,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.hpp"
@@ -52,9 +52,7 @@ OopStorage::AllocateEntry::~AllocateEntry() {
   assert(_next == NULL, "deleting attached block");
 }
 
-OopStorage::AllocateList::AllocateList(const AllocateEntry& (*get_entry)(const Block& block)) :
-  _head(NULL), _tail(NULL), _get_entry(get_entry)
-{}
+OopStorage::AllocateList::AllocateList() : _head(NULL), _tail(NULL) {}
 
 OopStorage::AllocateList::~AllocateList() {
   // ~OopStorage() empties its lists before destroying them.
@@ -68,8 +66,8 @@ void OopStorage::AllocateList::push_front(const Block& block) {
     assert(_tail == NULL, "invariant");
     _head = _tail = &block;
   } else {
-    _get_entry(block)._next = old;
-    _get_entry(*old)._prev = &block;
+    block.allocate_entry()._next = old;
+    old->allocate_entry()._prev = &block;
     _head = &block;
   }
 }
@@ -80,14 +78,14 @@ void OopStorage::AllocateList::push_back(const Block& block) {
     assert(_head == NULL, "invariant");
     _head = _tail = &block;
   } else {
-    _get_entry(*old)._next = &block;
-    _get_entry(block)._prev = old;
+    old->allocate_entry()._next = &block;
+    block.allocate_entry()._prev = old;
     _tail = &block;
   }
 }
 
 void OopStorage::AllocateList::unlink(const Block& block) {
-  const AllocateEntry& block_entry = _get_entry(block);
+  const AllocateEntry& block_entry = block.allocate_entry();
   const Block* prev_blk = block_entry._prev;
   const Block* next_blk = block_entry._next;
   block_entry._prev = NULL;
@@ -98,15 +96,15 @@ void OopStorage::AllocateList::unlink(const Block& block) {
     _head = _tail = NULL;
   } else if (prev_blk == NULL) {
     assert(_head == &block, "invariant");
-    _get_entry(*next_blk)._prev = NULL;
+    next_blk->allocate_entry()._prev = NULL;
     _head = next_blk;
   } else if (next_blk == NULL) {
     assert(_tail == &block, "invariant");
-    _get_entry(*prev_blk)._next = NULL;
+    prev_blk->allocate_entry()._next = NULL;
     _tail = prev_blk;
   } else {
-    _get_entry(*next_blk)._prev = prev_blk;
-    _get_entry(*prev_blk)._next = next_blk;
+    next_blk->allocate_entry()._prev = prev_blk;
+    prev_blk->allocate_entry()._next = next_blk;
   }
 }
 
@@ -232,10 +230,6 @@ OopStorage::Block::~Block() {
   const_cast<OopStorage* volatile&>(_owner) = NULL;
 }
 
-const OopStorage::AllocateEntry& OopStorage::Block::get_allocate_entry(const Block& block) {
-  return block._allocate_entry;
-}
-
 size_t OopStorage::Block::allocation_size() {
   // _data must be first member, so aligning Block aligns _data.
   STATIC_ASSERT(_data_pos == 0);
@@ -769,7 +763,7 @@ OopStorage::OopStorage(const char* name,
                        Mutex* active_mutex) :
   _name(dup_name(name)),
   _active_array(ActiveArray::create(initial_active_array_size)),
-  _allocate_list(&Block::get_allocate_entry),
+  _allocate_list(),
   _deferred_updates(NULL),
   _allocate_mutex(allocate_mutex),
   _active_mutex(active_mutex),
@@ -907,7 +901,8 @@ size_t OopStorage::total_memory_usage() const {
 // Parallel iteration support
 
 uint OopStorage::BasicParState::default_estimated_thread_count(bool concurrent) {
-  return concurrent ? ConcGCThreads : ParallelGCThreads;
+  uint configured = concurrent ? ConcGCThreads : ParallelGCThreads;
+  return MAX2(1u, configured);  // Never estimate zero threads.
 }
 
 OopStorage::BasicParState::BasicParState(const OopStorage* storage,
diff --git a/src/hotspot/share/gc/shared/oopStorage.hpp b/src/hotspot/share/gc/shared/oopStorage.hpp
index ff2b0c18e0d..5479945275e 100644
--- a/src/hotspot/share/gc/shared/oopStorage.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.hpp
@@ -178,14 +178,13 @@ NOT_AIX( private: )
   class AllocateList {
     const Block* _head;
     const Block* _tail;
-    const AllocateEntry& (*_get_entry)(const Block& block);
 
     // Noncopyable.
     AllocateList(const AllocateList&);
     AllocateList& operator=(const AllocateList&);
 
   public:
-    AllocateList(const AllocateEntry& (*get_entry)(const Block& block));
+    AllocateList();
     ~AllocateList();
 
     Block* head();
diff --git a/src/hotspot/share/gc/shared/oopStorage.inline.hpp b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
index 08ead02fc2d..20f9750f1e9 100644
--- a/src/hotspot/share/gc/shared/oopStorage.inline.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
@@ -158,7 +158,7 @@ class OopStorage::Block /* No base class, to avoid messing up alignment. */ {
   Block& operator=(const Block&);
 
 public:
-  static const AllocateEntry& get_allocate_entry(const Block& block);
+  const AllocateEntry& allocate_entry() const;
 
   static size_t allocation_size();
   static size_t allocation_alignment_shift();
@@ -214,19 +214,19 @@ inline const OopStorage::Block* OopStorage::AllocateList::ctail() const {
 }
 
 inline OopStorage::Block* OopStorage::AllocateList::prev(Block& block) {
-  return const_cast<Block*>(_get_entry(block)._prev);
+  return const_cast<Block*>(block.allocate_entry()._prev);
 }
 
 inline OopStorage::Block* OopStorage::AllocateList::next(Block& block) {
-  return const_cast<Block*>(_get_entry(block)._next);
+  return const_cast<Block*>(block.allocate_entry()._next);
 }
 
 inline const OopStorage::Block* OopStorage::AllocateList::prev(const Block& block) const {
-  return _get_entry(block)._prev;
+  return block.allocate_entry()._prev;
 }
 
 inline const OopStorage::Block* OopStorage::AllocateList::next(const Block& block) const {
-  return _get_entry(block)._next;
+  return block.allocate_entry()._next;
 }
 
 template<typename Closure>
@@ -296,7 +296,11 @@ inline OopStorage::SkipNullFn<F> OopStorage::skip_null_fn(F f) {
   return SkipNullFn<F>(f);
 }
 
-// Inline Block accesses for use in iteration inner loop.
+// Inline Block accesses for use in iteration loops.
+
+inline const OopStorage::AllocateEntry& OopStorage::Block::allocate_entry() const {
+  return _allocate_entry;
+}
 
 inline void OopStorage::Block::check_index(unsigned index) const {
   assert(index < ARRAY_SIZE(_data), "Index out of bounds: %u", index);
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp
index 4b8de99ce46..02ef4930af7 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp
@@ -592,6 +592,28 @@ void ReferenceProcessor::set_active_mt_degree(uint v) {
   _next_id = 0;
 }
 
+bool ReferenceProcessor::need_balance_queues(DiscoveredList refs_lists[]) {
+  assert(_processing_is_mt, "why balance non-mt processing?");
+  // _num_queues is the processing degree.  Only list entries up to
+  // _num_queues will be processed, so any non-empty lists beyond
+  // that must be redistributed to lists in that range.  Even if not
+  // needed for that, balancing may be desirable to eliminate poor
+  // distribution of references among the lists.
+  if (ParallelRefProcBalancingEnabled) {
+    return true;                // Configuration says do it.
+  } else {
+    // Configuration says don't balance, but if there are non-empty
+    // lists beyond the processing degree, then must ignore the
+    // configuration and balance anyway.
+    for (uint i = _num_queues; i < _max_num_queues; ++i) {
+      if (!refs_lists[i].is_empty()) {
+        return true;            // Must balance despite configuration.
+      }
+    }
+    return false;               // Safe to obey configuration and not balance.
+  }
+}
+
 // Balances reference queues.
 // Move entries from all queues[0, 1, ..., _max_num_q-1] to
 // queues[0, 1, ..., _num_q-1] because only the first _num_q
@@ -690,7 +712,7 @@ void ReferenceProcessor::process_discovered_reflist(
 
   phase_times->set_processing_is_mt(mt_processing);
 
-  if (mt_processing && ParallelRefProcBalancingEnabled) {
+  if (mt_processing && need_balance_queues(refs_lists)) {
     RefProcBalanceQueuesTimeTracker tt(phase_times);
     balance_queues(refs_lists);
   }
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp
index 65791c55441..bbdefd53bf9 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp
@@ -320,7 +320,8 @@ private:
   void log_reflist_counts(DiscoveredList ref_lists[], uint num_active_queues) PRODUCT_RETURN;
 
   // Balances reference queues.
-  void balance_queues(DiscoveredList ref_lists[]);
+  void balance_queues(DiscoveredList refs_lists[]);
+  bool need_balance_queues(DiscoveredList refs_lists[]);
 
   // Update (advance) the soft ref master clock field.
   void update_soft_ref_master_clock();
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index 5fa1ec8cae1..b8659e57f63 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -36,7 +36,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/java.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
diff --git a/src/hotspot/share/gc/shared/specialized_oop_closures.hpp b/src/hotspot/share/gc/shared/specialized_oop_closures.hpp
index af2ab821563..7f38678fd7b 100644
--- a/src/hotspot/share/gc/shared/specialized_oop_closures.hpp
+++ b/src/hotspot/share/gc/shared/specialized_oop_closures.hpp
@@ -35,6 +35,9 @@
 #if INCLUDE_SERIALGC
 #include "gc/serial/serial_specialized_oop_closures.hpp"
 #endif
+#if INCLUDE_ZGC
+#include "gc/z/z_specialized_oop_closures.hpp"
+#endif
 
 // The following OopClosure types get specialized versions of
 // "oop_oop_iterate" that invoke the closures' do_oop methods
@@ -67,7 +70,8 @@ class OopsInGenClosure;
   SERIALGC_ONLY(SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_MS(f))       \
      CMSGC_ONLY(SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_CMS(f))      \
       G1GC_ONLY(SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_G1(f))       \
-      G1GC_ONLY(SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_G1FULL(f))
+      G1GC_ONLY(SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_G1FULL(f))   \
+       ZGC_ONLY(SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_Z(f))
 
 // We separate these out, because sometime the general one has
 // a different definition from the specialized ones, and sometimes it
diff --git a/src/hotspot/share/gc/shared/strongRootsScope.cpp b/src/hotspot/share/gc/shared/strongRootsScope.cpp
index 43a697f8cda..a167ba48958 100644
--- a/src/hotspot/share/gc/shared/strongRootsScope.cpp
+++ b/src/hotspot/share/gc/shared/strongRootsScope.cpp
@@ -38,8 +38,6 @@ MarkScope::~MarkScope() {
 
 StrongRootsScope::StrongRootsScope(uint n_threads) : _n_threads(n_threads) {
   Threads::change_thread_claim_parity();
-  // Zero the claimed high water mark in the StringTable
-  StringTable::clear_parallel_claimed_index();
 }
 
 StrongRootsScope::~StrongRootsScope() {
diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
index 476098d57aa..214bb3f222f 100644
--- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
@@ -29,7 +29,7 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/stack.inline.hpp"
 
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index 6594ed03c50..92c03d4f2bf 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -37,6 +37,9 @@
 #if INCLUDE_CMSGC
 #include "gc/cms/vmStructs_cms.hpp"
 #endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/vmStructs_epsilon.hpp"
+#endif
 #if INCLUDE_G1GC
 #include "gc/g1/vmStructs_g1.hpp"
 #endif
@@ -47,6 +50,9 @@
 #include "gc/serial/defNewGeneration.hpp"
 #include "gc/serial/vmStructs_serial.hpp"
 #endif
+#if INCLUDE_ZGC
+#include "gc/z/vmStructs_z.hpp"
+#endif
 
 #define VM_STRUCTS_GC(nonstatic_field,                                                                                               \
                       volatile_nonstatic_field,                                                                                      \
@@ -55,6 +61,9 @@
   CMSGC_ONLY(VM_STRUCTS_CMSGC(nonstatic_field,                                                                                       \
                               volatile_nonstatic_field,                                                                              \
                               static_field))                                                                                         \
+  EPSILONGC_ONLY(VM_STRUCTS_EPSILONGC(nonstatic_field,                                                                               \
+                                      volatile_nonstatic_field,                                                                      \
+                                      static_field))                                                                                 \
   G1GC_ONLY(VM_STRUCTS_G1GC(nonstatic_field,                                                                                         \
                             volatile_nonstatic_field,                                                                                \
                             static_field))                                                                                           \
@@ -64,6 +73,10 @@
   SERIALGC_ONLY(VM_STRUCTS_SERIALGC(nonstatic_field,                                                                                 \
                                     volatile_nonstatic_field,                                                                        \
                                     static_field))                                                                                   \
+  ZGC_ONLY(VM_STRUCTS_ZGC(nonstatic_field,                                                                                           \
+                          volatile_nonstatic_field,                                                                                  \
+                          static_field))                                                                                             \
+                                                                                                                                     \
   /**********************************************************************************/                                               \
   /* Generation and Space hierarchies                                               */                                               \
   /**********************************************************************************/                                               \
@@ -153,6 +166,9 @@
   CMSGC_ONLY(VM_TYPES_CMSGC(declare_type,                                 \
                             declare_toplevel_type,                        \
                             declare_integer_type))                        \
+  EPSILONGC_ONLY(VM_TYPES_EPSILONGC(declare_type,                         \
+                                    declare_toplevel_type,                \
+                                    declare_integer_type))                \
   G1GC_ONLY(VM_TYPES_G1GC(declare_type,                                   \
                           declare_toplevel_type,                          \
                           declare_integer_type))                          \
@@ -162,6 +178,10 @@
   SERIALGC_ONLY(VM_TYPES_SERIALGC(declare_type,                           \
                                   declare_toplevel_type,                  \
                                   declare_integer_type))                  \
+  ZGC_ONLY(VM_TYPES_ZGC(declare_type,                                     \
+                        declare_toplevel_type,                            \
+                        declare_integer_type))                            \
+                                                                          \
   /******************************************/                            \
   /* Generation and space hierarchies       */                            \
   /* (needed for run-time type information) */                            \
@@ -225,12 +245,16 @@
                             declare_constant_with_value)                    \
   CMSGC_ONLY(VM_INT_CONSTANTS_CMSGC(declare_constant,                       \
                                     declare_constant_with_value))           \
+  EPSILONGC_ONLY(VM_INT_CONSTANTS_EPSILONGC(declare_constant,               \
+                                            declare_constant_with_value))   \
   G1GC_ONLY(VM_INT_CONSTANTS_G1GC(declare_constant,                         \
                                   declare_constant_with_value))             \
   PARALLELGC_ONLY(VM_INT_CONSTANTS_PARALLELGC(declare_constant,             \
                                               declare_constant_with_value)) \
   SERIALGC_ONLY(VM_INT_CONSTANTS_SERIALGC(declare_constant,                 \
                                           declare_constant_with_value))     \
+  ZGC_ONLY(VM_INT_CONSTANTS_ZGC(declare_constant,                           \
+                                declare_constant_with_value))               \
                                                                             \
   /********************************************/                            \
   /* Generation and Space Hierarchy Constants */                            \
@@ -274,5 +298,7 @@
   declare_constant(Generation::LogOfGenGrain)                               \
   declare_constant(Generation::GenGrain)                                    \
 
+#define VM_LONG_CONSTANTS_GC(declare_constant)                              \
+  ZGC_ONLY(VM_LONG_CONSTANTS_ZGC(declare_constant))
 
 #endif // SHARE_GC_SHARED_VMSTRUCTS_GC_HPP
diff --git a/src/hotspot/share/gc/shared/weakProcessor.cpp b/src/hotspot/share/gc/shared/weakProcessor.cpp
index 6be1bd2d96d..381863456c5 100644
--- a/src/hotspot/share/gc/shared/weakProcessor.cpp
+++ b/src/hotspot/share/gc/shared/weakProcessor.cpp
@@ -23,6 +23,8 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/jniHandles.hpp"
@@ -34,6 +36,7 @@
 void WeakProcessor::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* keep_alive) {
   JNIHandles::weak_oops_do(is_alive, keep_alive);
   JvmtiExport::weak_oops_do(is_alive, keep_alive);
+  SystemDictionary::vm_weak_oop_storage()->weak_oops_do(is_alive, keep_alive);
   JFR_ONLY(Jfr::weak_oops_do(is_alive, keep_alive);)
 }
 
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
new file mode 100644
index 00000000000..a1b43005cf0
--- /dev/null
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "c1/c1_LIR.hpp"
+#include "c1/c1_LIRGenerator.hpp"
+#include "c1/c1_CodeStubs.hpp"
+#include "gc/z/c1/zBarrierSetC1.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "gc/z/zBarrierSetAssembler.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "utilities/macros.hpp"
+
+ZLoadBarrierStubC1::ZLoadBarrierStubC1(LIRAccess& access, LIR_Opr ref, address runtime_stub) :
+    _decorators(access.decorators()),
+    _ref_addr(access.resolved_addr()),
+    _ref(ref),
+    _tmp(LIR_OprFact::illegalOpr),
+    _patch_info(access.patch_emit_info()),
+    _runtime_stub(runtime_stub) {
+
+  // Allocate tmp register if needed
+  if (!_ref_addr->is_register()) {
+    assert(_ref_addr->is_address(), "Must be an address");
+    if (_ref_addr->as_address_ptr()->index()->is_valid() ||
+        _ref_addr->as_address_ptr()->disp() != 0) {
+      // Has index or displacement, need tmp register to load address into
+      _tmp = access.gen()->new_pointer_register();
+    } else {
+      // No index or displacement, address available in base register
+      _ref_addr = _ref_addr->as_address_ptr()->base();
+    }
+  }
+
+  assert(_ref->is_register(), "Must be a register");
+  assert(_ref_addr->is_register() != _tmp->is_register(), "Only one should be a register");
+}
+
+DecoratorSet ZLoadBarrierStubC1::decorators() const {
+  return _decorators;
+}
+
+LIR_Opr ZLoadBarrierStubC1::ref() const {
+  return _ref;
+}
+
+LIR_Opr ZLoadBarrierStubC1::ref_addr() const {
+  return _ref_addr;
+}
+
+LIR_Opr ZLoadBarrierStubC1::tmp() const {
+  return _tmp;
+}
+
+LIR_PatchCode ZLoadBarrierStubC1::patch_code() const {
+  return (_decorators & C1_NEEDS_PATCHING) != 0 ? lir_patch_normal : lir_patch_none;
+}
+
+CodeEmitInfo*& ZLoadBarrierStubC1::patch_info() {
+  return _patch_info;
+}
+
+address ZLoadBarrierStubC1::runtime_stub() const {
+  return _runtime_stub;
+}
+
+void ZLoadBarrierStubC1::visit(LIR_OpVisitState* visitor) {
+  if (_patch_info != NULL) {
+    visitor->do_slow_case(_patch_info);
+  } else {
+    visitor->do_slow_case();
+  }
+
+  visitor->do_input(_ref_addr);
+  visitor->do_output(_ref);
+
+  if (_tmp->is_valid()) {
+    visitor->do_temp(_tmp);
+  }
+}
+
+void ZLoadBarrierStubC1::emit_code(LIR_Assembler* ce) {
+  ZBarrierSet::assembler()->generate_c1_load_barrier_stub(ce, this);
+}
+
+#ifndef PRODUCT
+void ZLoadBarrierStubC1::print_name(outputStream* out) const {
+  out->print("ZLoadBarrierStubC1");
+}
+#endif // PRODUCT
+
+class LIR_OpZLoadBarrierTest : public LIR_Op {
+private:
+  LIR_Opr _opr;
+
+public:
+  LIR_OpZLoadBarrierTest(LIR_Opr opr) :
+      LIR_Op(),
+      _opr(opr) {}
+
+  virtual void visit(LIR_OpVisitState* state) {
+    state->do_input(_opr);
+  }
+
+  virtual void emit_code(LIR_Assembler* ce) {
+    ZBarrierSet::assembler()->generate_c1_load_barrier_test(ce, _opr);
+  }
+
+  virtual void print_instr(outputStream* out) const {
+    _opr->print(out);
+    out->print(" ");
+  }
+
+#ifndef PRODUCT
+  virtual const char* name() const {
+    return "lir_z_load_barrier_test";
+  }
+#endif // PRODUCT
+};
+
+static bool barrier_needed(LIRAccess& access) {
+  return ZBarrierSet::barrier_needed(access.decorators(), access.type());
+}
+
+ZBarrierSetC1::ZBarrierSetC1() :
+    _load_barrier_on_oop_field_preloaded_runtime_stub(NULL),
+    _load_barrier_on_weak_oop_field_preloaded_runtime_stub(NULL) {}
+
+address ZBarrierSetC1::load_barrier_on_oop_field_preloaded_runtime_stub(DecoratorSet decorators) const {
+  assert((decorators & ON_PHANTOM_OOP_REF) == 0, "Unsupported decorator");
+  //assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Unsupported decorator");
+
+  if ((decorators & ON_WEAK_OOP_REF) != 0) {
+    return _load_barrier_on_weak_oop_field_preloaded_runtime_stub;
+  } else {
+    return _load_barrier_on_oop_field_preloaded_runtime_stub;
+  }
+}
+
+#ifdef ASSERT
+#define __ access.gen()->lir(__FILE__, __LINE__)->
+#else
+#define __ access.gen()->lir()->
+#endif
+
+void ZBarrierSetC1::load_barrier(LIRAccess& access, LIR_Opr result) const {
+  // Fast path
+  __ append(new LIR_OpZLoadBarrierTest(result));
+
+  // Slow path
+  const address runtime_stub = load_barrier_on_oop_field_preloaded_runtime_stub(access.decorators());
+  CodeStub* const stub = new ZLoadBarrierStubC1(access, result, runtime_stub);
+  __ branch(lir_cond_notEqual, T_ADDRESS, stub);
+  __ branch_destination(stub->continuation());
+}
+
+#undef __
+
+void ZBarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result) {
+  BarrierSetC1::load_at_resolved(access, result);
+
+  if (barrier_needed(access)) {
+    load_barrier(access, result);
+  }
+}
+
+static void pre_load_barrier(LIRAccess& access) {
+  DecoratorSet decorators = access.decorators();
+
+  // Downgrade access to MO_UNORDERED
+  decorators = (decorators & ~MO_DECORATOR_MASK) | MO_UNORDERED;
+
+  // Remove C1_WRITE_ACCESS
+  decorators = (decorators & ~C1_WRITE_ACCESS);
+
+  // Generate synthetic load at
+  access.gen()->access_load_at(decorators,
+                               access.type(),
+                               access.base().item(),
+                               access.offset().opr(),
+                               access.gen()->new_register(access.type()),
+                               NULL /* patch_emit_info */,
+                               NULL /* load_emit_info */);
+}
+
+LIR_Opr ZBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value) {
+  if (barrier_needed(access)) {
+    pre_load_barrier(access);
+  }
+
+  return BarrierSetC1::atomic_xchg_at_resolved(access, value);
+}
+
+LIR_Opr ZBarrierSetC1::atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value) {
+  if (barrier_needed(access)) {
+    pre_load_barrier(access);
+  }
+
+  return BarrierSetC1::atomic_cmpxchg_at_resolved(access, cmp_value, new_value);
+}
+
+class ZLoadBarrierRuntimeStubCodeGenClosure : public StubAssemblerCodeGenClosure {
+private:
+  const DecoratorSet _decorators;
+
+public:
+  ZLoadBarrierRuntimeStubCodeGenClosure(DecoratorSet decorators) :
+      _decorators(decorators) {}
+
+  virtual OopMapSet* generate_code(StubAssembler* sasm) {
+    ZBarrierSet::assembler()->generate_c1_load_barrier_runtime_stub(sasm, _decorators);
+    return NULL;
+  }
+};
+
+static address generate_c1_runtime_stub(BufferBlob* blob, DecoratorSet decorators, const char* name) {
+  ZLoadBarrierRuntimeStubCodeGenClosure cl(decorators);
+  CodeBlob* const code_blob = Runtime1::generate_blob(blob, -1 /* stub_id */, name, false /* expect_oop_map*/, &cl);
+  return code_blob->code_begin();
+}
+
+void ZBarrierSetC1::generate_c1_runtime_stubs(BufferBlob* blob) {
+  _load_barrier_on_oop_field_preloaded_runtime_stub =
+    generate_c1_runtime_stub(blob, ON_STRONG_OOP_REF, "load_barrier_on_oop_field_preloaded_runtime_stub");
+  _load_barrier_on_weak_oop_field_preloaded_runtime_stub =
+    generate_c1_runtime_stub(blob, ON_WEAK_OOP_REF, "load_barrier_on_weak_oop_field_preloaded_runtime_stub");
+}
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
new file mode 100644
index 00000000000..4f1514f988c
--- /dev/null
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_C1_ZBARRIERSETC1_HPP
+#define SHARE_GC_Z_C1_ZBARRIERSETC1_HPP
+
+#include "c1/c1_CodeStubs.hpp"
+#include "c1/c1_IR.hpp"
+#include "c1/c1_LIR.hpp"
+#include "gc/shared/c1/barrierSetC1.hpp"
+#include "oops/accessDecorators.hpp"
+
+class ZLoadBarrierStubC1 : public CodeStub {
+private:
+  DecoratorSet  _decorators;
+  LIR_Opr       _ref_addr;
+  LIR_Opr       _ref;
+  LIR_Opr       _tmp;
+  CodeEmitInfo* _patch_info;
+  address       _runtime_stub;
+
+public:
+  ZLoadBarrierStubC1(LIRAccess& access, LIR_Opr ref, address runtime_stub);
+
+  DecoratorSet decorators() const;
+  LIR_Opr ref() const;
+  LIR_Opr ref_addr() const;
+  LIR_Opr tmp() const;
+  LIR_PatchCode patch_code() const;
+  CodeEmitInfo*& patch_info();
+  address runtime_stub() const;
+
+  virtual void emit_code(LIR_Assembler* ce);
+  virtual void visit(LIR_OpVisitState* visitor);
+
+#ifndef PRODUCT
+  virtual void print_name(outputStream* out) const;
+#endif // PRODUCT
+};
+
+class ZBarrierSetC1 : public BarrierSetC1 {
+private:
+  address _load_barrier_on_oop_field_preloaded_runtime_stub;
+  address _load_barrier_on_weak_oop_field_preloaded_runtime_stub;
+
+  address load_barrier_on_oop_field_preloaded_runtime_stub(DecoratorSet decorators) const;
+  void load_barrier(LIRAccess& access, LIR_Opr result) const;
+
+protected:
+  virtual void load_at_resolved(LIRAccess& access, LIR_Opr result);
+  virtual LIR_Opr atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value);
+  virtual LIR_Opr atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value);
+
+public:
+  ZBarrierSetC1();
+
+  virtual void generate_c1_runtime_stubs(BufferBlob* blob);
+};
+
+#endif // SHARE_GC_Z_C1_ZBARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
new file mode 100644
index 00000000000..d63fd33d69f
--- /dev/null
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -0,0 +1,1480 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "opto/compile.hpp"
+#include "opto/castnode.hpp"
+#include "opto/graphKit.hpp"
+#include "opto/idealKit.hpp"
+#include "opto/loopnode.hpp"
+#include "opto/macro.hpp"
+#include "opto/node.hpp"
+#include "opto/type.hpp"
+#include "utilities/macros.hpp"
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "gc/z/zBarrierSetRuntime.hpp"
+
+ZBarrierSetC2State::ZBarrierSetC2State(Arena* comp_arena)
+  : _load_barrier_nodes(new (comp_arena) GrowableArray<LoadBarrierNode*>(comp_arena, 8,  0, NULL)) {}
+
+int ZBarrierSetC2State::load_barrier_count() const {
+  return _load_barrier_nodes->length();
+}
+
+void ZBarrierSetC2State::add_load_barrier_node(LoadBarrierNode * n) {
+  assert(!_load_barrier_nodes->contains(n), " duplicate entry in expand list");
+  _load_barrier_nodes->append(n);
+}
+
+void ZBarrierSetC2State::remove_load_barrier_node(LoadBarrierNode * n) {
+  // this function may be called twice for a node so check
+  // that the node is in the array before attempting to remove it
+  if (_load_barrier_nodes->contains(n)) {
+    _load_barrier_nodes->remove(n);
+  }
+}
+
+LoadBarrierNode* ZBarrierSetC2State::load_barrier_node(int idx) const {
+  return _load_barrier_nodes->at(idx);
+}
+
+void* ZBarrierSetC2::create_barrier_state(Arena* comp_arena) const {
+  return new(comp_arena) ZBarrierSetC2State(comp_arena);
+}
+
+ZBarrierSetC2State* ZBarrierSetC2::state() const {
+  return reinterpret_cast<ZBarrierSetC2State*>(Compile::current()->barrier_set_state());
+}
+
+bool ZBarrierSetC2::is_gc_barrier_node(Node* node) const {
+  return node->is_LoadBarrier();
+}
+
+void ZBarrierSetC2::register_potential_barrier_node(Node* node) const {
+  if (node->is_LoadBarrier()) {
+    state()->add_load_barrier_node(node->as_LoadBarrier());
+  }
+}
+
+void ZBarrierSetC2::unregister_potential_barrier_node(Node* node) const {
+  if (node->is_LoadBarrier()) {
+    state()->remove_load_barrier_node(node->as_LoadBarrier());
+  }
+}
+
+void ZBarrierSetC2::eliminate_useless_gc_barriers(Unique_Node_List &useful) const {
+  // Remove useless LoadBarrier nodes
+  ZBarrierSetC2State* s = state();
+  for (int i = s->load_barrier_count()-1; i >= 0; i--) {
+    LoadBarrierNode* n = s->load_barrier_node(i);
+    if (!useful.member(n)) {
+      unregister_potential_barrier_node(n);
+    }
+  }
+}
+
+void ZBarrierSetC2::enqueue_useful_gc_barrier(Unique_Node_List &worklist, Node* node) const {
+  if (node->is_LoadBarrier() && !node->as_LoadBarrier()->has_true_uses()) {
+    worklist.push(node);
+  }
+}
+
+void ZBarrierSetC2::find_dominating_barriers(PhaseIterGVN& igvn) {
+  // Look for dominating barriers on the same address only once all
+  // other loop opts are over: loop opts may cause a safepoint to be
+  // inserted between a barrier and its dominating barrier.
+  Compile* C = Compile::current();
+  ZBarrierSetC2* bs = (ZBarrierSetC2*)BarrierSet::barrier_set()->barrier_set_c2();
+  ZBarrierSetC2State* s = bs->state();
+  if (s->load_barrier_count() >= 2) {
+    Compile::TracePhase tp("idealLoop", &C->timers[Phase::_t_idealLoop]);
+    PhaseIdealLoop ideal_loop(igvn, true, false, true);
+    if (C->major_progress()) C->print_method(PHASE_PHASEIDEALLOOP_ITERATIONS, 2);
+  }
+}
+
+void ZBarrierSetC2::add_users_to_worklist(Unique_Node_List* worklist) const {
+  // Permanent temporary workaround
+  // Loadbarriers may have non-obvious dead uses keeping them alive during parsing. The use is
+  // removed by RemoveUseless (after parsing, before optimize) but the barriers won't be added to
+  // the worklist. Unless we add them explicitly they are not guaranteed to end up there.
+  ZBarrierSetC2State* s = state();
+
+  for (int i = 0; i < s->load_barrier_count(); i++) {
+    LoadBarrierNode* n = s->load_barrier_node(i);
+    worklist->push(n);
+  }
+}
+
+const TypeFunc* ZBarrierSetC2::load_barrier_Type() const {
+  const Type** fields;
+
+  // Create input types (domain)
+  fields = TypeTuple::fields(2);
+  fields[TypeFunc::Parms+0] = TypeInstPtr::NOTNULL;
+  fields[TypeFunc::Parms+1] = TypeOopPtr::BOTTOM;
+  const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+2, fields);
+
+  // Create result type (range)
+  fields = TypeTuple::fields(1);
+  fields[TypeFunc::Parms+0] = TypeInstPtr::BOTTOM;
+  const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
+
+  return TypeFunc::make(domain, range);
+}
+
+// == LoadBarrierNode ==
+
+LoadBarrierNode::LoadBarrierNode(Compile* C,
+                                 Node* c,
+                                 Node* mem,
+                                 Node* val,
+                                 Node* adr,
+                                 bool weak,
+                                 bool writeback,
+                                 bool oop_reload_allowed) :
+    MultiNode(Number_of_Inputs),
+    _weak(weak),
+    _writeback(writeback),
+    _oop_reload_allowed(oop_reload_allowed) {
+  init_req(Control, c);
+  init_req(Memory, mem);
+  init_req(Oop, val);
+  init_req(Address, adr);
+  init_req(Similar, C->top());
+
+  init_class_id(Class_LoadBarrier);
+  BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
+  bs->register_potential_barrier_node(this);
+}
+
+const Type *LoadBarrierNode::bottom_type() const {
+  const Type** floadbarrier = (const Type **)(Compile::current()->type_arena()->Amalloc_4((Number_of_Outputs)*sizeof(Type*)));
+  Node* in_oop = in(Oop);
+  floadbarrier[Control] = Type::CONTROL;
+  floadbarrier[Memory] = Type::MEMORY;
+  floadbarrier[Oop] = in_oop == NULL ? Type::TOP : in_oop->bottom_type();
+  return TypeTuple::make(Number_of_Outputs, floadbarrier);
+}
+
+const Type *LoadBarrierNode::Value(PhaseGVN *phase) const {
+  const Type** floadbarrier = (const Type **)(phase->C->type_arena()->Amalloc_4((Number_of_Outputs)*sizeof(Type*)));
+  const Type* val_t = phase->type(in(Oop));
+  floadbarrier[Control] = Type::CONTROL;
+  floadbarrier[Memory] = Type::MEMORY;
+  floadbarrier[Oop] = val_t;
+  return TypeTuple::make(Number_of_Outputs, floadbarrier);
+}
+
+bool LoadBarrierNode::is_dominator(PhaseIdealLoop* phase, bool linear_only, Node *d, Node *n) {
+  if (phase != NULL) {
+    return phase->is_dominator(d, n);
+  }
+
+  for (int i = 0; i < 10 && n != NULL; i++) {
+    n = IfNode::up_one_dom(n, linear_only);
+    if (n == d) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+LoadBarrierNode* LoadBarrierNode::has_dominating_barrier(PhaseIdealLoop* phase, bool linear_only, bool look_for_similar) {
+  Node* val = in(LoadBarrierNode::Oop);
+  if (in(Similar)->is_Proj() && in(Similar)->in(0)->is_LoadBarrier()) {
+    LoadBarrierNode* lb = in(Similar)->in(0)->as_LoadBarrier();
+    assert(lb->in(Address) == in(Address), "");
+    // Load barrier on Similar edge dominates so if it now has the Oop field it can replace this barrier.
+    if (lb->in(Oop) == in(Oop)) {
+      return lb;
+    }
+    // Follow chain of load barrier through Similar edges
+    while (!lb->in(Similar)->is_top()) {
+      lb = lb->in(Similar)->in(0)->as_LoadBarrier();
+      assert(lb->in(Address) == in(Address), "");
+    }
+    if (lb != in(Similar)->in(0)) {
+      return lb;
+    }
+  }
+  for (DUIterator_Fast imax, i = val->fast_outs(imax); i < imax; i++) {
+    Node* u = val->fast_out(i);
+    if (u != this && u->is_LoadBarrier() && u->in(Oop) == val && u->as_LoadBarrier()->has_true_uses()) {
+      Node* this_ctrl = in(LoadBarrierNode::Control);
+      Node* other_ctrl = u->in(LoadBarrierNode::Control);
+      if (is_dominator(phase, linear_only, other_ctrl, this_ctrl)) {
+        return u->as_LoadBarrier();
+      }
+    }
+  }
+
+  if (ZVerifyLoadBarriers || can_be_eliminated()) {
+    return NULL;
+  }
+
+  if (!look_for_similar) {
+    return NULL;
+  }
+
+  Node* addr = in(LoadBarrierNode::Address);
+  for (DUIterator_Fast imax, i = addr->fast_outs(imax); i < imax; i++) {
+    Node* u = addr->fast_out(i);
+    if (u != this && u->is_LoadBarrier() && u->as_LoadBarrier()->has_true_uses()) {
+      Node* this_ctrl = in(LoadBarrierNode::Control);
+      Node* other_ctrl = u->in(LoadBarrierNode::Control);
+      if (is_dominator(phase, linear_only, other_ctrl, this_ctrl)) {
+        ResourceMark rm;
+        Unique_Node_List wq;
+        wq.push(in(LoadBarrierNode::Control));
+        bool ok = true;
+        bool dom_found = false;
+        for (uint next = 0; next < wq.size(); ++next) {
+          Node *n = wq.at(next);
+          if (n->is_top()) {
+            return NULL;
+          }
+          assert(n->is_CFG(), "");
+          if (n->is_SafePoint()) {
+            ok = false;
+            break;
+          }
+          if (n == u) {
+            dom_found = true;
+            continue;
+          }
+          if (n->is_Region()) {
+            for (uint i = 1; i < n->req(); i++) {
+              Node* m = n->in(i);
+              if (m != NULL) {
+                wq.push(m);
+              }
+            }
+          } else {
+            Node* m = n->in(0);
+            if (m != NULL) {
+              wq.push(m);
+            }
+          }
+        }
+        if (ok) {
+          assert(dom_found, "");
+          return u->as_LoadBarrier();;
+        }
+        break;
+      }
+    }
+  }
+
+  return NULL;
+}
+
+void LoadBarrierNode::push_dominated_barriers(PhaseIterGVN* igvn) const {
+  // change to that barrier may affect a dominated barrier so re-push those
+  Node* val = in(LoadBarrierNode::Oop);
+
+  for (DUIterator_Fast imax, i = val->fast_outs(imax); i < imax; i++) {
+    Node* u = val->fast_out(i);
+    if (u != this && u->is_LoadBarrier() && u->in(Oop) == val) {
+      Node* this_ctrl = in(Control);
+      Node* other_ctrl = u->in(Control);
+      if (is_dominator(NULL, false, this_ctrl, other_ctrl)) {
+        igvn->_worklist.push(u);
+      }
+    }
+
+    Node* addr = in(LoadBarrierNode::Address);
+    for (DUIterator_Fast imax, i = addr->fast_outs(imax); i < imax; i++) {
+      Node* u = addr->fast_out(i);
+      if (u != this && u->is_LoadBarrier() && u->in(Similar)->is_top()) {
+        Node* this_ctrl = in(Control);
+        Node* other_ctrl = u->in(Control);
+        if (is_dominator(NULL, false, this_ctrl, other_ctrl)) {
+          igvn->_worklist.push(u);
+        }
+      }
+    }
+  }
+}
+
+Node *LoadBarrierNode::Identity(PhaseGVN *phase) {
+  if (!phase->C->directive()->ZOptimizeLoadBarriersOption) {
+    return this;
+  }
+
+  bool redundant_addr = false;
+  LoadBarrierNode* dominating_barrier = has_dominating_barrier(NULL, true, false);
+  if (dominating_barrier != NULL) {
+    assert(dominating_barrier->in(Oop) == in(Oop), "");
+    return dominating_barrier;
+  }
+
+  return this;
+}
+
+Node *LoadBarrierNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+  if (remove_dead_region(phase, can_reshape)) {
+    return this;
+  }
+
+  Node* val = in(Oop);
+  Node* mem = in(Memory);
+  Node* ctrl = in(Control);
+  Node* adr = in(Address);
+  assert(val->Opcode() != Op_LoadN, "");
+
+  if (mem->is_MergeMem()) {
+    Node* new_mem = mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw);
+    set_req(Memory, new_mem);
+    if (mem->outcnt() == 0 && can_reshape) {
+      phase->is_IterGVN()->_worklist.push(mem);
+    }
+
+    return this;
+  }
+
+  bool optimizeLoadBarriers = phase->C->directive()->ZOptimizeLoadBarriersOption;
+  LoadBarrierNode* dominating_barrier = optimizeLoadBarriers ? has_dominating_barrier(NULL, !can_reshape, !phase->C->major_progress()) : NULL;
+  if (dominating_barrier != NULL && dominating_barrier->in(Oop) != in(Oop)) {
+    assert(in(Address) == dominating_barrier->in(Address), "");
+    set_req(Similar, dominating_barrier->proj_out(Oop));
+    return this;
+  }
+
+  bool eliminate = (optimizeLoadBarriers && !(val->is_Phi() || val->Opcode() == Op_LoadP || val->Opcode() == Op_GetAndSetP || val->is_DecodeN())) ||
+                   (can_reshape && (dominating_barrier != NULL || !has_true_uses()));
+
+  if (eliminate) {
+    if (can_reshape) {
+      PhaseIterGVN* igvn = phase->is_IterGVN();
+      Node* out_ctrl = proj_out_or_null(Control);
+      Node* out_res = proj_out_or_null(Oop);
+
+      if (out_ctrl != NULL) {
+        igvn->replace_node(out_ctrl, ctrl);
+      }
+
+      // That transformation may cause the Similar edge on the load barrier to be invalid
+      fix_similar_in_uses(igvn);
+      if (out_res != NULL) {
+        if (dominating_barrier != NULL) {
+          igvn->replace_node(out_res, dominating_barrier->proj_out(Oop));
+        } else {
+          igvn->replace_node(out_res, val);
+        }
+      }
+    }
+
+    return new ConINode(TypeInt::ZERO);
+  }
+
+  // If the Similar edge is no longer a load barrier, clear it
+  Node* similar = in(Similar);
+  if (!similar->is_top() && !(similar->is_Proj() && similar->in(0)->is_LoadBarrier())) {
+    set_req(Similar, phase->C->top());
+    return this;
+  }
+
+  if (can_reshape) {
+    // If this barrier is linked through the Similar edge by a
+    // dominated barrier and both barriers have the same Oop field,
+    // the dominated barrier can go away, so push it for reprocessing.
+    // We also want to avoid a barrier to depend on another dominating
+    // barrier through its Similar edge that itself depend on another
+    // barrier through its Similar edge and rather have the first
+    // depend on the third.
+    PhaseIterGVN* igvn = phase->is_IterGVN();
+    Node* out_res = proj_out(Oop);
+    for (DUIterator_Fast imax, i = out_res->fast_outs(imax); i < imax; i++) {
+      Node* u = out_res->fast_out(i);
+      if (u->is_LoadBarrier() && u->in(Similar) == out_res &&
+          (u->in(Oop) == val || !u->in(Similar)->is_top())) {
+        igvn->_worklist.push(u);
+      }
+    }
+
+    push_dominated_barriers(igvn);
+  }
+
+  return NULL;
+}
+
+void LoadBarrierNode::fix_similar_in_uses(PhaseIterGVN* igvn) {
+  Node* out_res = proj_out_or_null(Oop);
+  if (out_res == NULL) {
+    return;
+  }
+
+  for (DUIterator_Fast imax, i = out_res->fast_outs(imax); i < imax; i++) {
+    Node* u = out_res->fast_out(i);
+    if (u->is_LoadBarrier() && u->in(Similar) == out_res) {
+      igvn->replace_input_of(u, Similar, igvn->C->top());
+      --i;
+      --imax;
+    }
+  }
+}
+
+bool LoadBarrierNode::has_true_uses() const {
+  Node* out_res = proj_out_or_null(Oop);
+  if (out_res == NULL) {
+    return false;
+  }
+
+  for (DUIterator_Fast imax, i = out_res->fast_outs(imax); i < imax; i++) {
+    Node* u = out_res->fast_out(i);
+    if (!u->is_LoadBarrier() || u->in(Similar) != out_res) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+// == Accesses ==
+
+Node* ZBarrierSetC2::make_cas_loadbarrier(C2AtomicAccess& access) const {
+  assert(!UseCompressedOops, "Not allowed");
+  CompareAndSwapNode* cas = (CompareAndSwapNode*)access.raw_access();
+  PhaseGVN& gvn = access.kit()->gvn();
+  Compile* C = Compile::current();
+  GraphKit* kit = access.kit();
+
+  Node* in_ctrl     = cas->in(MemNode::Control);
+  Node* in_mem      = cas->in(MemNode::Memory);
+  Node* in_adr      = cas->in(MemNode::Address);
+  Node* in_val      = cas->in(MemNode::ValueIn);
+  Node* in_expected = cas->in(LoadStoreConditionalNode::ExpectedIn);
+
+  float likely                   = PROB_LIKELY(0.999);
+
+  const TypePtr *adr_type        = gvn.type(in_adr)->isa_ptr();
+  Compile::AliasType* alias_type = C->alias_type(adr_type);
+  int alias_idx                  = C->get_alias_index(adr_type);
+
+  // Outer check - true: continue, false: load and check
+  Node* region   = new RegionNode(3);
+  Node* phi      = new PhiNode(region, TypeInt::BOOL);
+  Node* phi_mem  = new PhiNode(region, Type::MEMORY, adr_type);
+
+  // Inner check - is the healed ref equal to the expected
+  Node* region2  = new RegionNode(3);
+  Node* phi2     = new PhiNode(region2, TypeInt::BOOL);
+  Node* phi_mem2 = new PhiNode(region2, Type::MEMORY, adr_type);
+
+  // CAS node returns 0 or 1
+  Node* cmp     = gvn.transform(new CmpINode(cas, kit->intcon(0)));
+  Node* bol     = gvn.transform(new BoolNode(cmp, BoolTest::ne))->as_Bool();
+  IfNode* iff   = gvn.transform(new IfNode(in_ctrl, bol, likely, COUNT_UNKNOWN))->as_If();
+  Node* then    = gvn.transform(new IfTrueNode(iff));
+  Node* elsen   = gvn.transform(new IfFalseNode(iff));
+
+  Node* scmemproj1   = gvn.transform(new SCMemProjNode(cas));
+
+  kit->set_memory(scmemproj1, alias_idx);
+  phi_mem->init_req(1, scmemproj1);
+  phi_mem2->init_req(2, scmemproj1);
+
+  // CAS fail - reload and heal oop
+  Node* reload      = kit->make_load(elsen, in_adr, TypeOopPtr::BOTTOM, T_OBJECT, MemNode::unordered);
+  Node* barrier     = gvn.transform(new LoadBarrierNode(C, elsen, scmemproj1, reload, in_adr, false, true, false));
+  Node* barrierctrl = gvn.transform(new ProjNode(barrier, LoadBarrierNode::Control));
+  Node* barrierdata = gvn.transform(new ProjNode(barrier, LoadBarrierNode::Oop));
+
+  // Check load
+  Node* tmpX    = gvn.transform(new CastP2XNode(NULL, barrierdata));
+  Node* in_expX = gvn.transform(new CastP2XNode(NULL, in_expected));
+  Node* cmp2    = gvn.transform(new CmpXNode(tmpX, in_expX));
+  Node *bol2    = gvn.transform(new BoolNode(cmp2, BoolTest::ne))->as_Bool();
+  IfNode* iff2  = gvn.transform(new IfNode(barrierctrl, bol2, likely, COUNT_UNKNOWN))->as_If();
+  Node* then2   = gvn.transform(new IfTrueNode(iff2));
+  Node* elsen2  = gvn.transform(new IfFalseNode(iff2));
+
+  // redo CAS
+  Node* cas2       = gvn.transform(new CompareAndSwapPNode(elsen2, kit->memory(alias_idx), in_adr, in_val, in_expected, cas->order()));
+  Node* scmemproj2 = gvn.transform(new SCMemProjNode(cas2));
+  kit->set_control(elsen2);
+  kit->set_memory(scmemproj2, alias_idx);
+
+  // Merge inner flow - check if healed oop was equal too expected.
+  region2->set_req(1, kit->control());
+  region2->set_req(2, then2);
+  phi2->set_req(1, cas2);
+  phi2->set_req(2, kit->intcon(0));
+  phi_mem2->init_req(1, scmemproj2);
+  kit->set_memory(phi_mem2, alias_idx);
+
+  // Merge outer flow - then check if first cas succeded
+  region->set_req(1, then);
+  region->set_req(2, region2);
+  phi->set_req(1, kit->intcon(1));
+  phi->set_req(2, phi2);
+  phi_mem->init_req(2, phi_mem2);
+  kit->set_memory(phi_mem, alias_idx);
+
+  gvn.transform(region2);
+  gvn.transform(phi2);
+  gvn.transform(phi_mem2);
+  gvn.transform(region);
+  gvn.transform(phi);
+  gvn.transform(phi_mem);
+
+  kit->set_control(region);
+  kit->insert_mem_bar(Op_MemBarCPUOrder);
+
+  return phi;
+}
+
+Node* ZBarrierSetC2::make_cmpx_loadbarrier(C2AtomicAccess& access) const {
+  CompareAndExchangePNode* cmpx = (CompareAndExchangePNode*)access.raw_access();
+  GraphKit* kit = access.kit();
+  PhaseGVN& gvn = kit->gvn();
+  Compile* C = Compile::current();
+
+  Node* in_ctrl     = cmpx->in(MemNode::Control);
+  Node* in_mem      = cmpx->in(MemNode::Memory);
+  Node* in_adr      = cmpx->in(MemNode::Address);
+  Node* in_val      = cmpx->in(MemNode::ValueIn);
+  Node* in_expected = cmpx->in(LoadStoreConditionalNode::ExpectedIn);
+
+  float likely                   = PROB_LIKELY(0.999);
+
+  const TypePtr *adr_type        = cmpx->get_ptr_type();
+  Compile::AliasType* alias_type = C->alias_type(adr_type);
+  int alias_idx                  = C->get_alias_index(adr_type);
+
+  // Outer check - true: continue, false: load and check
+  Node* region  = new RegionNode(3);
+  Node* phi     = new PhiNode(region, adr_type);
+
+  // Inner check - is the healed ref equal to the expected
+  Node* region2 = new RegionNode(3);
+  Node* phi2    = new PhiNode(region2, adr_type);
+
+  // Check if cmpx succeded
+  Node* cmp     = gvn.transform(new CmpPNode(cmpx, in_expected));
+  Node* bol     = gvn.transform(new BoolNode(cmp, BoolTest::eq))->as_Bool();
+  IfNode* iff   = gvn.transform(new IfNode(in_ctrl, bol, likely, COUNT_UNKNOWN))->as_If();
+  Node* then    = gvn.transform(new IfTrueNode(iff));
+  Node* elsen   = gvn.transform(new IfFalseNode(iff));
+
+  Node* scmemproj1  = gvn.transform(new SCMemProjNode(cmpx));
+  kit->set_memory(scmemproj1, alias_idx);
+
+  // CAS fail - reload and heal oop
+  Node* reload      = kit->make_load(elsen, in_adr, TypeOopPtr::BOTTOM, T_OBJECT, MemNode::unordered);
+  Node* barrier     = gvn.transform(new LoadBarrierNode(C, elsen, scmemproj1, reload, in_adr, false, true, false));
+  Node* barrierctrl = gvn.transform(new ProjNode(barrier, LoadBarrierNode::Control));
+  Node* barrierdata = gvn.transform(new ProjNode(barrier, LoadBarrierNode::Oop));
+
+  // Check load
+  Node* tmpX    = gvn.transform(new CastP2XNode(NULL, barrierdata));
+  Node* in_expX = gvn.transform(new CastP2XNode(NULL, in_expected));
+  Node* cmp2    = gvn.transform(new CmpXNode(tmpX, in_expX));
+  Node *bol2    = gvn.transform(new BoolNode(cmp2, BoolTest::ne))->as_Bool();
+  IfNode* iff2  = gvn.transform(new IfNode(barrierctrl, bol2, likely, COUNT_UNKNOWN))->as_If();
+  Node* then2   = gvn.transform(new IfTrueNode(iff2));
+  Node* elsen2  = gvn.transform(new IfFalseNode(iff2));
+
+  // Redo CAS
+  Node* cmpx2      = gvn.transform(new CompareAndExchangePNode(elsen2, kit->memory(alias_idx), in_adr, in_val, in_expected, adr_type, cmpx->get_ptr_type(), cmpx->order()));
+  Node* scmemproj2 = gvn.transform(new SCMemProjNode(cmpx2));
+  kit->set_control(elsen2);
+  kit->set_memory(scmemproj2, alias_idx);
+
+  // Merge inner flow - check if healed oop was equal too expected.
+  region2->set_req(1, kit->control());
+  region2->set_req(2, then2);
+  phi2->set_req(1, cmpx2);
+  phi2->set_req(2, barrierdata);
+
+  // Merge outer flow - then check if first cas succeded
+  region->set_req(1, then);
+  region->set_req(2, region2);
+  phi->set_req(1, cmpx);
+  phi->set_req(2, phi2);
+
+  gvn.transform(region2);
+  gvn.transform(phi2);
+  gvn.transform(region);
+  gvn.transform(phi);
+
+  kit->set_control(region);
+  kit->set_memory(in_mem, alias_idx);
+  kit->insert_mem_bar(Op_MemBarCPUOrder);
+
+  return phi;
+}
+
+Node* ZBarrierSetC2::load_barrier(GraphKit* kit, Node* val, Node* adr, bool weak, bool writeback, bool oop_reload_allowed) const {
+  PhaseGVN& gvn = kit->gvn();
+  Node* barrier = new LoadBarrierNode(Compile::current(), kit->control(), kit->memory(TypeRawPtr::BOTTOM), val, adr, weak, writeback, oop_reload_allowed);
+  Node* transformed_barrier = gvn.transform(barrier);
+
+  if (transformed_barrier->is_LoadBarrier()) {
+    if (barrier == transformed_barrier) {
+      kit->set_control(gvn.transform(new ProjNode(barrier, LoadBarrierNode::Control)));
+    }
+    return gvn.transform(new ProjNode(transformed_barrier, LoadBarrierNode::Oop));
+  } else {
+    return val;
+  }
+}
+
+static bool barrier_needed(C2Access access) {
+  return ZBarrierSet::barrier_needed(access.decorators(), access.type());
+}
+
+Node* ZBarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) const {
+  Node* p = BarrierSetC2::load_at_resolved(access, val_type);
+  if (!barrier_needed(access)) {
+    return p;
+  }
+
+  bool conc_root = (access.decorators() & IN_CONCURRENT_ROOT) != 0;
+  bool weak = (access.decorators() & ON_WEAK_OOP_REF) != 0;
+
+  GraphKit* kit = access.kit();
+  PhaseGVN& gvn = kit->gvn();
+  Node* adr = access.addr().node();
+  Node* heap_base_oop = access.base();
+  bool unsafe = (access.decorators() & C2_UNSAFE_ACCESS) != 0;
+  if (unsafe) {
+    if (!ZVerifyLoadBarriers) {
+      p = load_barrier(kit, p, adr);
+    } else {
+      if (!TypePtr::NULL_PTR->higher_equal(gvn.type(heap_base_oop))) {
+        p = load_barrier(kit, p, adr);
+      } else {
+        IdealKit ideal(kit);
+        IdealVariable res(ideal);
+#define __ ideal.
+        __ declarations_done();
+        __ set(res, p);
+        __ if_then(heap_base_oop, BoolTest::ne, kit->null(), PROB_UNLIKELY(0.999)); {
+          kit->sync_kit(ideal);
+          p = load_barrier(kit, p, adr);
+          __ set(res, p);
+          __ sync_kit(kit);
+        } __ end_if();
+        kit->final_sync(ideal);
+        p = __ value(res);
+#undef __
+      }
+    }
+    return p;
+  } else {
+    return load_barrier(access.kit(), p, access.addr().node(), weak, true, true);
+  }
+}
+
+Node* ZBarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicAccess& access, Node* expected_val,
+                                                    Node* new_val, const Type* val_type) const {
+  Node* result = BarrierSetC2::atomic_cmpxchg_val_at_resolved(access, expected_val, new_val, val_type);
+  if (!barrier_needed(access)) {
+    return result;
+  }
+
+  access.set_needs_pinning(false);
+  return make_cmpx_loadbarrier(access);
+}
+
+Node* ZBarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicAccess& access, Node* expected_val,
+                                                     Node* new_val, const Type* value_type) const {
+  Node* result = BarrierSetC2::atomic_cmpxchg_bool_at_resolved(access, expected_val, new_val, value_type);
+  if (!barrier_needed(access)) {
+    return result;
+  }
+
+  Node* load_store = access.raw_access();
+  bool weak_cas = (access.decorators() & C2_WEAK_CMPXCHG) != 0;
+  bool expected_is_null = (expected_val->get_ptr_type() == TypePtr::NULL_PTR);
+
+  if (!expected_is_null) {
+    if (weak_cas) {
+      access.set_needs_pinning(false);
+      load_store = make_cas_loadbarrier(access);
+    } else {
+      access.set_needs_pinning(false);
+      load_store = make_cas_loadbarrier(access);
+    }
+  }
+
+  return load_store;
+}
+
+Node* ZBarrierSetC2::atomic_xchg_at_resolved(C2AtomicAccess& access, Node* new_val, const Type* val_type) const {
+  Node* result = BarrierSetC2::atomic_xchg_at_resolved(access, new_val, val_type);
+  if (!barrier_needed(access)) {
+    return result;
+  }
+
+  Node* load_store = access.raw_access();
+  Node* adr = access.addr().node();
+
+  return load_barrier(access.kit(), load_store, adr, false, false, false);
+}
+
+// == Macro Expansion ==
+
+void ZBarrierSetC2::expand_loadbarrier_node(PhaseMacroExpand* phase, LoadBarrierNode* barrier) const {
+  Node* in_ctrl = barrier->in(LoadBarrierNode::Control);
+  Node* in_mem  = barrier->in(LoadBarrierNode::Memory);
+  Node* in_val  = barrier->in(LoadBarrierNode::Oop);
+  Node* in_adr  = barrier->in(LoadBarrierNode::Address);
+
+  Node* out_ctrl = barrier->proj_out(LoadBarrierNode::Control);
+  Node* out_res  = barrier->proj_out(LoadBarrierNode::Oop);
+
+  PhaseIterGVN &igvn = phase->igvn();
+
+  if (ZVerifyLoadBarriers) {
+    igvn.replace_node(out_res, in_val);
+    igvn.replace_node(out_ctrl, in_ctrl);
+    return;
+  }
+
+  if (barrier->can_be_eliminated()) {
+    // Clone and pin the load for this barrier below the dominating
+    // barrier: the load cannot be allowed to float above the
+    // dominating barrier
+    Node* load = in_val;
+
+    if (load->is_Load()) {
+      Node* new_load = load->clone();
+      Node* addp = new_load->in(MemNode::Address);
+      assert(addp->is_AddP() || addp->is_Phi() || addp->is_Load(), "bad address");
+      Node* cast = new CastPPNode(addp, igvn.type(addp), true);
+      Node* ctrl = NULL;
+      Node* similar = barrier->in(LoadBarrierNode::Similar);
+      if (similar->is_Phi()) {
+        // already expanded
+        ctrl = similar->in(0);
+      } else {
+        assert(similar->is_Proj() && similar->in(0)->is_LoadBarrier(), "unexpected graph shape");
+        ctrl = similar->in(0)->as_LoadBarrier()->proj_out(LoadBarrierNode::Control);
+      }
+      assert(ctrl != NULL, "bad control");
+      cast->set_req(0, ctrl);
+      igvn.transform(cast);
+      new_load->set_req(MemNode::Address, cast);
+      igvn.transform(new_load);
+
+      igvn.replace_node(out_res, new_load);
+      igvn.replace_node(out_ctrl, in_ctrl);
+      return;
+    }
+    // cannot eliminate
+  }
+
+  // There are two cases that require the basic loadbarrier
+  // 1) When the writeback of a healed oop must be avoided (swap)
+  // 2) When we must guarantee that no reload of is done (swap, cas, cmpx)
+  if (!barrier->is_writeback()) {
+    assert(!barrier->oop_reload_allowed(), "writeback barriers should be marked as requires oop");
+  }
+
+  if (!barrier->oop_reload_allowed()) {
+    expand_loadbarrier_basic(phase, barrier);
+  } else {
+    expand_loadbarrier_optimized(phase, barrier);
+  }
+}
+
+// Basic loadbarrier using conventional arg passing
+void ZBarrierSetC2::expand_loadbarrier_basic(PhaseMacroExpand* phase, LoadBarrierNode *barrier) const {
+  PhaseIterGVN &igvn = phase->igvn();
+
+  Node* in_ctrl = barrier->in(LoadBarrierNode::Control);
+  Node* in_mem  = barrier->in(LoadBarrierNode::Memory);
+  Node* in_val  = barrier->in(LoadBarrierNode::Oop);
+  Node* in_adr  = barrier->in(LoadBarrierNode::Address);
+
+  Node* out_ctrl = barrier->proj_out(LoadBarrierNode::Control);
+  Node* out_res  = barrier->proj_out(LoadBarrierNode::Oop);
+
+  float unlikely  = PROB_UNLIKELY(0.999);
+  const Type* in_val_maybe_null_t = igvn.type(in_val);
+
+  Node* jthread = igvn.transform(new ThreadLocalNode());
+  Node* adr = phase->basic_plus_adr(jthread, in_bytes(ZThreadLocalData::address_bad_mask_offset()));
+  Node* bad_mask = igvn.transform(LoadNode::make(igvn, in_ctrl, in_mem, adr, TypeRawPtr::BOTTOM, TypeX_X, TypeX_X->basic_type(), MemNode::unordered));
+  Node* cast = igvn.transform(new CastP2XNode(in_ctrl, in_val));
+  Node* obj_masked = igvn.transform(new AndXNode(cast, bad_mask));
+  Node* cmp = igvn.transform(new CmpXNode(obj_masked, igvn.zerocon(TypeX_X->basic_type())));
+  Node *bol = igvn.transform(new BoolNode(cmp, BoolTest::ne))->as_Bool();
+  IfNode* iff = igvn.transform(new IfNode(in_ctrl, bol, unlikely, COUNT_UNKNOWN))->as_If();
+  Node* then = igvn.transform(new IfTrueNode(iff));
+  Node* elsen = igvn.transform(new IfFalseNode(iff));
+
+  Node* result_region;
+  Node* result_val;
+
+  result_region = new RegionNode(3);
+  result_val = new PhiNode(result_region, TypeInstPtr::BOTTOM);
+
+  result_region->set_req(1, elsen);
+  Node* res = igvn.transform(new CastPPNode(in_val, in_val_maybe_null_t));
+  res->init_req(0, elsen);
+  result_val->set_req(1, res);
+
+  const TypeFunc *tf = load_barrier_Type();
+  Node* call;
+  if (barrier->is_weak()) {
+    call = new CallLeafNode(tf,
+                            ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded_addr(),
+                            "ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded",
+                            TypeRawPtr::BOTTOM);
+  } else {
+    call = new CallLeafNode(tf,
+                            ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(),
+                            "ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded",
+                            TypeRawPtr::BOTTOM);
+  }
+
+  call->init_req(TypeFunc::Control, then);
+  call->init_req(TypeFunc::I_O    , phase->top());
+  call->init_req(TypeFunc::Memory , in_mem);
+  call->init_req(TypeFunc::FramePtr, phase->top());
+  call->init_req(TypeFunc::ReturnAdr, phase->top());
+  call->init_req(TypeFunc::Parms+0, in_val);
+  if (barrier->is_writeback()) {
+    call->init_req(TypeFunc::Parms+1, in_adr);
+  } else {
+    // when slow path is called with a null adr, the healed oop will not be written back
+    call->init_req(TypeFunc::Parms+1, igvn.zerocon(T_OBJECT));
+  }
+  call = igvn.transform(call);
+
+  Node* ctrl = igvn.transform(new ProjNode(call, TypeFunc::Control));
+  res = igvn.transform(new ProjNode(call, TypeFunc::Parms));
+  res = igvn.transform(new CheckCastPPNode(ctrl, res, in_val_maybe_null_t));
+
+  result_region->set_req(2, ctrl);
+  result_val->set_req(2, res);
+
+  result_region = igvn.transform(result_region);
+  result_val = igvn.transform(result_val);
+
+  if (out_ctrl != NULL) { // added if cond
+    igvn.replace_node(out_ctrl, result_region);
+  }
+  igvn.replace_node(out_res, result_val);
+}
+
+// Optimized, low spill, loadbarrier variant using stub specialized on register used
+void ZBarrierSetC2::expand_loadbarrier_optimized(PhaseMacroExpand* phase, LoadBarrierNode *barrier) const {
+  PhaseIterGVN &igvn = phase->igvn();
+#ifdef PRINT_NODE_TRAVERSALS
+  Node* preceding_barrier_node = barrier->in(LoadBarrierNode::Oop);
+#endif
+
+  Node* in_ctrl = barrier->in(LoadBarrierNode::Control);
+  Node* in_mem = barrier->in(LoadBarrierNode::Memory);
+  Node* in_val = barrier->in(LoadBarrierNode::Oop);
+  Node* in_adr = barrier->in(LoadBarrierNode::Address);
+
+  Node* out_ctrl = barrier->proj_out(LoadBarrierNode::Control);
+  Node* out_res = barrier->proj_out(LoadBarrierNode::Oop);
+
+  assert(barrier->in(LoadBarrierNode::Oop) != NULL, "oop to loadbarrier node cannot be null");
+
+#ifdef PRINT_NODE_TRAVERSALS
+  tty->print("\n\n\nBefore barrier optimization:\n");
+  traverse(barrier, out_ctrl, out_res, -1);
+
+  tty->print("\nBefore barrier optimization:  preceding_barrier_node\n");
+  traverse(preceding_barrier_node, out_ctrl, out_res, -1);
+#endif
+
+  float unlikely  = PROB_UNLIKELY(0.999);
+
+  Node* jthread = igvn.transform(new ThreadLocalNode());
+  Node* adr = phase->basic_plus_adr(jthread, in_bytes(ZThreadLocalData::address_bad_mask_offset()));
+  Node* bad_mask = igvn.transform(LoadNode::make(igvn, in_ctrl, in_mem, adr,
+                                                 TypeRawPtr::BOTTOM, TypeX_X, TypeX_X->basic_type(),
+                                                 MemNode::unordered));
+  Node* cast = igvn.transform(new CastP2XNode(in_ctrl, in_val));
+  Node* obj_masked = igvn.transform(new AndXNode(cast, bad_mask));
+  Node* cmp = igvn.transform(new CmpXNode(obj_masked, igvn.zerocon(TypeX_X->basic_type())));
+  Node *bol = igvn.transform(new BoolNode(cmp, BoolTest::ne))->as_Bool();
+  IfNode* iff = igvn.transform(new IfNode(in_ctrl, bol, unlikely, COUNT_UNKNOWN))->as_If();
+  Node* then = igvn.transform(new IfTrueNode(iff));
+  Node* elsen = igvn.transform(new IfFalseNode(iff));
+
+  Node* slow_path_surrogate;
+  if (!barrier->is_weak()) {
+    slow_path_surrogate = igvn.transform(new LoadBarrierSlowRegNode(then, in_mem, in_adr, in_val->adr_type(),
+                                                                    (const TypePtr*) in_val->bottom_type(), MemNode::unordered));
+  } else {
+    slow_path_surrogate = igvn.transform(new LoadBarrierWeakSlowRegNode(then, in_mem, in_adr, in_val->adr_type(),
+                                                                        (const TypePtr*) in_val->bottom_type(), MemNode::unordered));
+  }
+
+  Node *new_loadp;
+  new_loadp = slow_path_surrogate;
+  // create the final region/phi pair to converge cntl/data paths to downstream code
+  Node* result_region = igvn.transform(new RegionNode(3));
+  result_region->set_req(1, then);
+  result_region->set_req(2, elsen);
+
+  Node* result_phi = igvn.transform(new PhiNode(result_region, TypeInstPtr::BOTTOM));
+  result_phi->set_req(1, new_loadp);
+  result_phi->set_req(2, barrier->in(LoadBarrierNode::Oop));
+
+  // finally, connect the original outputs to the barrier region and phi to complete the expansion/substitution
+  // igvn.replace_node(out_ctrl, result_region);
+  if (out_ctrl != NULL) { // added if cond
+    igvn.replace_node(out_ctrl, result_region);
+  }
+  igvn.replace_node(out_res, result_phi);
+
+  assert(barrier->outcnt() == 0,"LoadBarrier macro node has non-null outputs after expansion!");
+
+#ifdef PRINT_NODE_TRAVERSALS
+  tty->print("\nAfter barrier optimization:  old out_ctrl\n");
+  traverse(out_ctrl, out_ctrl, out_res, -1);
+  tty->print("\nAfter barrier optimization:  old out_res\n");
+  traverse(out_res, out_ctrl, out_res, -1);
+  tty->print("\nAfter barrier optimization:  old barrier\n");
+  traverse(barrier, out_ctrl, out_res, -1);
+  tty->print("\nAfter barrier optimization:  preceding_barrier_node\n");
+  traverse(preceding_barrier_node, result_region, result_phi, -1);
+#endif
+
+  return;
+}
+
+bool ZBarrierSetC2::expand_macro_nodes(PhaseMacroExpand* macro) const {
+  Compile* C = Compile::current();
+  PhaseIterGVN &igvn = macro->igvn();
+  ZBarrierSetC2State* s = state();
+  if (s->load_barrier_count() > 0) {
+#ifdef ASSERT
+    verify_gc_barriers(false);
+#endif
+    igvn.set_delay_transform(true);
+    int skipped = 0;
+    while (s->load_barrier_count() > skipped) {
+      int load_barrier_count = s->load_barrier_count();
+      LoadBarrierNode * n = s->load_barrier_node(load_barrier_count-1-skipped);
+      if (igvn.type(n) == Type::TOP || (n->in(0) != NULL && n->in(0)->is_top())) {
+        // node is unreachable, so don't try to expand it
+        s->remove_load_barrier_node(n);
+        continue;
+      }
+      if (!n->can_be_eliminated()) {
+        skipped++;
+        continue;
+      }
+      expand_loadbarrier_node(macro, n);
+      assert(s->load_barrier_count() < load_barrier_count, "must have deleted a node from load barrier list");
+      if (C->failing())  return true;
+    }
+    while (s->load_barrier_count() > 0) {
+      int load_barrier_count = s->load_barrier_count();
+      LoadBarrierNode* n = s->load_barrier_node(load_barrier_count - 1);
+      assert(!(igvn.type(n) == Type::TOP || (n->in(0) != NULL && n->in(0)->is_top())), "should have been processed already");
+      assert(!n->can_be_eliminated(), "should have been processed already");
+      expand_loadbarrier_node(macro, n);
+      assert(s->load_barrier_count() < load_barrier_count, "must have deleted a node from load barrier list");
+      if (C->failing())  return true;
+    }
+    igvn.set_delay_transform(false);
+    igvn.optimize();
+    if (C->failing())  return true;
+  }
+  return false;
+}
+
+// == Loop optimization ==
+
+static bool replace_with_dominating_barrier(PhaseIdealLoop* phase, LoadBarrierNode* lb, bool last_round) {
+  PhaseIterGVN &igvn = phase->igvn();
+  Compile* C = Compile::current();
+
+  LoadBarrierNode* lb2 = lb->has_dominating_barrier(phase, false, last_round);
+  if (lb2 != NULL) {
+    if (lb->in(LoadBarrierNode::Oop) != lb2->in(LoadBarrierNode::Oop)) {
+      assert(lb->in(LoadBarrierNode::Address) == lb2->in(LoadBarrierNode::Address), "");
+      igvn.replace_input_of(lb, LoadBarrierNode::Similar, lb2->proj_out(LoadBarrierNode::Oop));
+      C->set_major_progress();
+    } else  {
+      // That transformation may cause the Similar edge on dominated load barriers to be invalid
+      lb->fix_similar_in_uses(&igvn);
+
+      Node* val = lb->proj_out(LoadBarrierNode::Oop);
+      assert(lb2->has_true_uses(), "");
+      assert(lb2->in(LoadBarrierNode::Oop) == lb->in(LoadBarrierNode::Oop), "");
+
+      phase->lazy_update(lb, lb->in(LoadBarrierNode::Control));
+      phase->lazy_replace(lb->proj_out(LoadBarrierNode::Control), lb->in(LoadBarrierNode::Control));
+      igvn.replace_node(val, lb2->proj_out(LoadBarrierNode::Oop));
+
+      return true;
+    }
+  }
+  return false;
+}
+
+static Node* find_dominating_memory(PhaseIdealLoop* phase, Node* mem, Node* dom, int i) {
+  assert(dom->is_Region() || i == -1, "");
+  Node* m = mem;
+  while(phase->is_dominator(dom, phase->has_ctrl(m) ? phase->get_ctrl(m) : m->in(0))) {
+    if (m->is_Mem()) {
+      assert(m->as_Mem()->adr_type() == TypeRawPtr::BOTTOM, "");
+      m = m->in(MemNode::Memory);
+    } else if (m->is_MergeMem()) {
+      m = m->as_MergeMem()->memory_at(Compile::AliasIdxRaw);
+    } else if (m->is_Phi()) {
+      if (m->in(0) == dom && i != -1) {
+        m = m->in(i);
+        break;
+      } else {
+        m = m->in(LoopNode::EntryControl);
+      }
+    } else if (m->is_Proj()) {
+      m = m->in(0);
+    } else if (m->is_SafePoint() || m->is_MemBar()) {
+      m = m->in(TypeFunc::Memory);
+    } else {
+#ifdef ASSERT
+      m->dump();
+#endif
+      ShouldNotReachHere();
+    }
+  }
+  return m;
+}
+
+static LoadBarrierNode* clone_load_barrier(PhaseIdealLoop* phase, LoadBarrierNode* lb, Node* ctl, Node* mem, Node* oop_in) {
+  PhaseIterGVN &igvn = phase->igvn();
+  Compile* C = Compile::current();
+  Node* the_clone = lb->clone();
+  the_clone->set_req(LoadBarrierNode::Control, ctl);
+  the_clone->set_req(LoadBarrierNode::Memory, mem);
+  if (oop_in != NULL) {
+    the_clone->set_req(LoadBarrierNode::Oop, oop_in);
+  }
+
+  LoadBarrierNode* new_lb = the_clone->as_LoadBarrier();
+  igvn.register_new_node_with_optimizer(new_lb);
+  IdealLoopTree *loop = phase->get_loop(new_lb->in(0));
+  phase->set_ctrl(new_lb, new_lb->in(0));
+  phase->set_loop(new_lb, loop);
+  phase->set_idom(new_lb, new_lb->in(0), phase->dom_depth(new_lb->in(0))+1);
+  if (!loop->_child) {
+    loop->_body.push(new_lb);
+  }
+
+  Node* proj_ctl = new ProjNode(new_lb, LoadBarrierNode::Control);
+  igvn.register_new_node_with_optimizer(proj_ctl);
+  phase->set_ctrl(proj_ctl, proj_ctl->in(0));
+  phase->set_loop(proj_ctl, loop);
+  phase->set_idom(proj_ctl, new_lb, phase->dom_depth(new_lb)+1);
+  if (!loop->_child) {
+    loop->_body.push(proj_ctl);
+  }
+
+  Node* proj_oop = new ProjNode(new_lb, LoadBarrierNode::Oop);
+  phase->register_new_node(proj_oop, new_lb);
+
+  if (!new_lb->in(LoadBarrierNode::Similar)->is_top()) {
+    LoadBarrierNode* similar = new_lb->in(LoadBarrierNode::Similar)->in(0)->as_LoadBarrier();
+    if (!phase->is_dominator(similar, ctl)) {
+      igvn.replace_input_of(new_lb, LoadBarrierNode::Similar, C->top());
+    }
+  }
+
+  return new_lb;
+}
+
+static void replace_barrier(PhaseIdealLoop* phase, LoadBarrierNode* lb, Node* new_val) {
+  PhaseIterGVN &igvn = phase->igvn();
+  Node* val = lb->proj_out(LoadBarrierNode::Oop);
+  igvn.replace_node(val, new_val);
+  phase->lazy_update(lb, lb->in(LoadBarrierNode::Control));
+  phase->lazy_replace(lb->proj_out(LoadBarrierNode::Control), lb->in(LoadBarrierNode::Control));
+}
+
+static bool split_barrier_thru_phi(PhaseIdealLoop* phase, LoadBarrierNode* lb) {
+  PhaseIterGVN &igvn = phase->igvn();
+  Compile* C = Compile::current();
+
+  if (lb->in(LoadBarrierNode::Oop)->is_Phi()) {
+    Node* oop_phi = lb->in(LoadBarrierNode::Oop);
+
+    if (oop_phi->in(2) == oop_phi) {
+      // Ignore phis with only one input
+      return false;
+    }
+
+    if (phase->is_dominator(phase->get_ctrl(lb->in(LoadBarrierNode::Address)),
+                            oop_phi->in(0)) && phase->get_ctrl(lb->in(LoadBarrierNode::Address)) != oop_phi->in(0)) {
+      // That transformation may cause the Similar edge on dominated load barriers to be invalid
+      lb->fix_similar_in_uses(&igvn);
+
+      RegionNode* region = oop_phi->in(0)->as_Region();
+
+      int backedge = LoopNode::LoopBackControl;
+      if (region->is_Loop() && region->in(backedge)->is_Proj() && region->in(backedge)->in(0)->is_If()) {
+        Node* c = region->in(backedge)->in(0)->in(0);
+        assert(c->unique_ctrl_out() == region->in(backedge)->in(0), "");
+        Node* oop = lb->in(LoadBarrierNode::Oop)->in(backedge);
+        Node* oop_c = phase->has_ctrl(oop) ? phase->get_ctrl(oop) : oop;
+        if (!phase->is_dominator(oop_c, c)) {
+          return false;
+        }
+      }
+
+      // If the node on the backedge above the phi is the node itself - we have a self loop.
+      // Don't clone - this will be folded later.
+      if (oop_phi->in(LoopNode::LoopBackControl) == lb->proj_out(LoadBarrierNode::Oop)) {
+        return false;
+      }
+
+      bool is_strip_mined = region->is_CountedLoop() && region->as_CountedLoop()->is_strip_mined();
+      Node *phi = oop_phi->clone();
+
+      for (uint i = 1; i < region->req(); i++) {
+        Node* ctrl = region->in(i);
+        if (ctrl != C->top()) {
+          assert(!phase->is_dominator(ctrl, region) || region->is_Loop(), "");
+
+          Node* mem = lb->in(LoadBarrierNode::Memory);
+          Node* m = find_dominating_memory(phase, mem, region, i);
+
+          if (region->is_Loop() && i == LoopNode::LoopBackControl && ctrl->is_Proj() && ctrl->in(0)->is_If()) {
+            ctrl = ctrl->in(0)->in(0);
+          } else if (region->is_Loop() && is_strip_mined) {
+            // If this is a strip mined loop, control must move above OuterStripMinedLoop
+            assert(i == LoopNode::EntryControl, "check");
+            assert(ctrl->is_OuterStripMinedLoop(), "sanity");
+            ctrl = ctrl->as_OuterStripMinedLoop()->in(LoopNode::EntryControl);
+          }
+
+          LoadBarrierNode* new_lb = clone_load_barrier(phase, lb, ctrl, m, lb->in(LoadBarrierNode::Oop)->in(i));
+          Node* out_ctrl = new_lb->proj_out(LoadBarrierNode::Control);
+
+          if (is_strip_mined && (i == LoopNode::EntryControl)) {
+            assert(region->in(i)->is_OuterStripMinedLoop(), "");
+            igvn.replace_input_of(region->in(i), i, out_ctrl);
+          } else if (ctrl == region->in(i)) {
+            igvn.replace_input_of(region, i, out_ctrl);
+          } else {
+            Node* iff = region->in(i)->in(0);
+            igvn.replace_input_of(iff, 0, out_ctrl);
+            phase->set_idom(iff, out_ctrl, phase->dom_depth(out_ctrl)+1);
+          }
+          phi->set_req(i, new_lb->proj_out(LoadBarrierNode::Oop));
+        }
+      }
+      phase->register_new_node(phi, region);
+      replace_barrier(phase, lb, phi);
+
+      if (region->is_Loop()) {
+        // Load barrier moved to the back edge of the Loop may now
+        // have a safepoint on the path to the barrier on the Similar
+        // edge
+        igvn.replace_input_of(phi->in(LoopNode::LoopBackControl)->in(0), LoadBarrierNode::Similar, C->top());
+        Node* head = region->in(LoopNode::EntryControl);
+        phase->set_idom(region, head, phase->dom_depth(head)+1);
+        phase->recompute_dom_depth();
+        if (head->is_CountedLoop() && head->as_CountedLoop()->is_main_loop()) {
+          head->as_CountedLoop()->set_normal_loop();
+        }
+      }
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static bool move_out_of_loop(PhaseIdealLoop* phase, LoadBarrierNode* lb) {
+  PhaseIterGVN &igvn = phase->igvn();
+  IdealLoopTree *lb_loop = phase->get_loop(lb->in(0));
+  if (lb_loop != phase->ltree_root() && !lb_loop->_irreducible) {
+    Node* oop_ctrl = phase->get_ctrl(lb->in(LoadBarrierNode::Oop));
+    IdealLoopTree *oop_loop = phase->get_loop(oop_ctrl);
+    IdealLoopTree* adr_loop = phase->get_loop(phase->get_ctrl(lb->in(LoadBarrierNode::Address)));
+    if (!lb_loop->is_member(oop_loop) && !lb_loop->is_member(adr_loop)) {
+      // That transformation may cause the Similar edge on dominated load barriers to be invalid
+      lb->fix_similar_in_uses(&igvn);
+
+      Node* head = lb_loop->_head;
+      assert(head->is_Loop(), "");
+
+      if (phase->is_dominator(head, oop_ctrl)) {
+        assert(oop_ctrl->Opcode() == Op_CProj && oop_ctrl->in(0)->Opcode() == Op_NeverBranch, "");
+        assert(lb_loop->is_member(phase->get_loop(oop_ctrl->in(0)->in(0))), "");
+        return false;
+      }
+
+      if (head->is_CountedLoop()) {
+        CountedLoopNode* cloop = head->as_CountedLoop();
+        if (cloop->is_main_loop()) {
+          cloop->set_normal_loop();
+        }
+        // When we are moving barrier out of a counted loop,
+        // make sure we move it all the way out of the strip mined outer loop.
+        if (cloop->is_strip_mined()) {
+          head = cloop->outer_loop();
+        }
+      }
+
+      Node* mem = lb->in(LoadBarrierNode::Memory);
+      Node* m = find_dominating_memory(phase, mem, head, -1);
+
+      LoadBarrierNode* new_lb = clone_load_barrier(phase, lb, head->in(LoopNode::EntryControl), m, NULL);
+
+      assert(phase->idom(head) == head->in(LoopNode::EntryControl), "");
+      Node* proj_ctl = new_lb->proj_out(LoadBarrierNode::Control);
+      igvn.replace_input_of(head, LoopNode::EntryControl, proj_ctl);
+      phase->set_idom(head, proj_ctl, phase->dom_depth(proj_ctl) + 1);
+
+      replace_barrier(phase, lb, new_lb->proj_out(LoadBarrierNode::Oop));
+
+      phase->recompute_dom_depth();
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static bool common_barriers(PhaseIdealLoop* phase, LoadBarrierNode* lb) {
+  PhaseIterGVN &igvn = phase->igvn();
+  Node* in_val = lb->in(LoadBarrierNode::Oop);
+  for (DUIterator_Fast imax, i = in_val->fast_outs(imax); i < imax; i++) {
+    Node* u = in_val->fast_out(i);
+    if (u != lb && u->is_LoadBarrier() && u->as_LoadBarrier()->has_true_uses()) {
+      Node* this_ctrl = lb->in(LoadBarrierNode::Control);
+      Node* other_ctrl = u->in(LoadBarrierNode::Control);
+
+      Node* lca = phase->dom_lca(this_ctrl, other_ctrl);
+      bool ok = true;
+
+      Node* proj1 = NULL;
+      Node* proj2 = NULL;
+
+      while (this_ctrl != lca && ok) {
+        if (this_ctrl->in(0) != NULL &&
+            this_ctrl->in(0)->is_MultiBranch()) {
+          if (this_ctrl->in(0)->in(0) == lca) {
+            assert(proj1 == NULL, "");
+            assert(this_ctrl->is_Proj(), "");
+            proj1 = this_ctrl;
+          } else if (!(this_ctrl->in(0)->is_If() && this_ctrl->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none))) {
+            ok = false;
+          }
+        }
+        this_ctrl = phase->idom(this_ctrl);
+      }
+      while (other_ctrl != lca && ok) {
+        if (other_ctrl->in(0) != NULL &&
+            other_ctrl->in(0)->is_MultiBranch()) {
+          if (other_ctrl->in(0)->in(0) == lca) {
+            assert(other_ctrl->is_Proj(), "");
+            assert(proj2 == NULL, "");
+            proj2 = other_ctrl;
+          } else if (!(other_ctrl->in(0)->is_If() && other_ctrl->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none))) {
+            ok = false;
+          }
+        }
+        other_ctrl = phase->idom(other_ctrl);
+      }
+      assert(proj1 == NULL || proj2 == NULL || proj1->in(0) == proj2->in(0), "");
+      if (ok && proj1 && proj2 && proj1 != proj2 && proj1->in(0)->is_If()) {
+        // That transformation may cause the Similar edge on dominated load barriers to be invalid
+        lb->fix_similar_in_uses(&igvn);
+        u->as_LoadBarrier()->fix_similar_in_uses(&igvn);
+
+        Node* split = lca->unique_ctrl_out();
+        assert(split->in(0) == lca, "");
+
+        Node* mem = lb->in(LoadBarrierNode::Memory);
+        Node* m = find_dominating_memory(phase, mem, split, -1);
+        LoadBarrierNode* new_lb = clone_load_barrier(phase, lb, lca, m, NULL);
+
+        Node* proj_ctl = new_lb->proj_out(LoadBarrierNode::Control);
+        igvn.replace_input_of(split, 0, new_lb->proj_out(LoadBarrierNode::Control));
+        phase->set_idom(split, proj_ctl, phase->dom_depth(proj_ctl)+1);
+
+        Node* proj_oop = new_lb->proj_out(LoadBarrierNode::Oop);
+        replace_barrier(phase, lb, proj_oop);
+        replace_barrier(phase, u->as_LoadBarrier(), proj_oop);
+
+        phase->recompute_dom_depth();
+
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+static void optimize_load_barrier(PhaseIdealLoop* phase, LoadBarrierNode* lb, bool last_round) {
+  Compile* C = Compile::current();
+
+  if (!C->directive()->ZOptimizeLoadBarriersOption) {
+    return;
+  }
+
+  if (lb->has_true_uses()) {
+    if (replace_with_dominating_barrier(phase, lb, last_round)) {
+      return;
+    }
+
+    if (split_barrier_thru_phi(phase, lb)) {
+      return;
+    }
+
+    if (move_out_of_loop(phase, lb)) {
+      return;
+    }
+
+    if (common_barriers(phase, lb)) {
+      return;
+    }
+  }
+}
+
+void ZBarrierSetC2::loop_optimize_gc_barrier(PhaseIdealLoop* phase, Node* node, bool last_round) {
+  if (node->is_LoadBarrier()) {
+    optimize_load_barrier(phase, node->as_LoadBarrier(), last_round);
+  }
+}
+
+// == Verification ==
+
+#ifdef ASSERT
+
+static bool look_for_barrier(Node* n, bool post_parse, VectorSet& visited) {
+  if (visited.test_set(n->_idx)) {
+    return true;
+  }
+
+  for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+    Node* u = n->fast_out(i);
+    if (u->is_LoadBarrier()) {
+    } else if ((u->is_Phi() || u->is_CMove()) && !post_parse) {
+      if (!look_for_barrier(u, post_parse, visited)) {
+        return false;
+      }
+    } else if (u->Opcode() == Op_EncodeP || u->Opcode() == Op_DecodeN) {
+      if (!look_for_barrier(u, post_parse, visited)) {
+        return false;
+      }
+    } else if (u->Opcode() != Op_SCMemProj) {
+      tty->print("bad use"); u->dump();
+      return false;
+    }
+  }
+
+  return true;
+}
+
+void ZBarrierSetC2::verify_gc_barriers(bool post_parse) const {
+  ZBarrierSetC2State* s = state();
+  Compile* C = Compile::current();
+  ResourceMark rm;
+  VectorSet visited(Thread::current()->resource_area());
+  for (int i = 0; i < s->load_barrier_count(); i++) {
+    LoadBarrierNode* n = s->load_barrier_node(i);
+
+    // The dominating barrier on the same address if it exists and
+    // this barrier must not be applied on the value from the same
+    // load otherwise the value is not reloaded before it's used the
+    // second time.
+    assert(n->in(LoadBarrierNode::Similar)->is_top() ||
+           (n->in(LoadBarrierNode::Similar)->in(0)->is_LoadBarrier() &&
+            n->in(LoadBarrierNode::Similar)->in(0)->in(LoadBarrierNode::Address) == n->in(LoadBarrierNode::Address) &&
+            n->in(LoadBarrierNode::Similar)->in(0)->in(LoadBarrierNode::Oop) != n->in(LoadBarrierNode::Oop)),
+           "broken similar edge");
+
+    assert(post_parse || n->as_LoadBarrier()->has_true_uses(),
+           "found unneeded load barrier");
+
+    // Several load barrier nodes chained through their Similar edge
+    // break the code that remove the barriers in final graph reshape.
+    assert(n->in(LoadBarrierNode::Similar)->is_top() ||
+           (n->in(LoadBarrierNode::Similar)->in(0)->is_LoadBarrier() &&
+            n->in(LoadBarrierNode::Similar)->in(0)->in(LoadBarrierNode::Similar)->is_top()),
+           "chain of Similar load barriers");
+
+    if (!n->in(LoadBarrierNode::Similar)->is_top()) {
+      ResourceMark rm;
+      Unique_Node_List wq;
+      Node* other = n->in(LoadBarrierNode::Similar)->in(0);
+      wq.push(n);
+      bool ok = true;
+      bool dom_found = false;
+      for (uint next = 0; next < wq.size(); ++next) {
+        Node *n = wq.at(next);
+        assert(n->is_CFG(), "");
+        assert(!n->is_SafePoint(), "");
+
+        if (n == other) {
+          continue;
+        }
+
+        if (n->is_Region()) {
+          for (uint i = 1; i < n->req(); i++) {
+            Node* m = n->in(i);
+            if (m != NULL) {
+              wq.push(m);
+            }
+          }
+        } else {
+          Node* m = n->in(0);
+          if (m != NULL) {
+            wq.push(m);
+          }
+        }
+      }
+    }
+
+    if (ZVerifyLoadBarriers) {
+      if ((n->is_Load() || n->is_LoadStore()) && n->bottom_type()->make_oopptr() != NULL) {
+        visited.Clear();
+        bool found = look_for_barrier(n, post_parse, visited);
+        if (!found) {
+          n->dump(1);
+          n->dump(-3);
+          stringStream ss;
+          C->method()->print_short_name(&ss);
+          tty->print_cr("-%s-", ss.as_string());
+          assert(found, "");
+        }
+      }
+    }
+  }
+}
+
+#endif
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
new file mode 100644
index 00000000000..666c7c24e85
--- /dev/null
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_C2_ZBARRIERSETC2_HPP
+#define SHARE_GC_Z_C2_ZBARRIERSETC2_HPP
+
+#include "gc/shared/c2/barrierSetC2.hpp"
+#include "memory/allocation.hpp"
+#include "opto/node.hpp"
+#include "utilities/growableArray.hpp"
+
+class LoadBarrierNode : public MultiNode {
+private:
+  bool _weak;
+  bool _writeback;          // Controls if the barrier writes the healed oop back to memory
+                            // A swap on a memory location must never write back the healed oop
+  bool _oop_reload_allowed; // Controls if the barrier are allowed to reload the oop from memory
+                            // before healing, otherwise both the oop and the address must be passed to the
+                            // barrier from the oop
+
+  static bool is_dominator(PhaseIdealLoop* phase, bool linear_only, Node *d, Node *n);
+  void push_dominated_barriers(PhaseIterGVN* igvn) const;
+
+public:
+  enum {
+    Control,
+    Memory,
+    Oop,
+    Address,
+    Number_of_Outputs = Address,
+    Similar,
+    Number_of_Inputs
+  };
+
+  LoadBarrierNode(Compile* C,
+                  Node* c,
+                  Node* mem,
+                  Node* val,
+                  Node* adr,
+                  bool weak,
+                  bool writeback,
+                  bool oop_reload_allowed);
+
+  virtual int Opcode() const;
+  virtual const Type *bottom_type() const;
+  virtual const Type *Value(PhaseGVN *phase) const;
+  virtual Node *Identity(PhaseGVN *phase);
+  virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+
+  LoadBarrierNode* has_dominating_barrier(PhaseIdealLoop* phase,
+                                          bool linear_only,
+                                          bool look_for_similar);
+
+  void fix_similar_in_uses(PhaseIterGVN* igvn);
+
+  bool has_true_uses() const;
+
+  bool can_be_eliminated() const {
+    return !in(Similar)->is_top();
+  }
+
+  bool is_weak() const {
+    return _weak;
+  }
+
+  bool is_writeback() const {
+    return _writeback;
+  }
+
+  bool oop_reload_allowed() const {
+    return _oop_reload_allowed;
+  }
+};
+
+class LoadBarrierSlowRegNode : public LoadPNode {
+public:
+  LoadBarrierSlowRegNode(Node *c,
+                         Node *mem,
+                         Node *adr,
+                         const TypePtr *at,
+                         const TypePtr* t,
+                         MemOrd mo,
+                         ControlDependency control_dependency = DependsOnlyOnTest)
+    : LoadPNode(c, mem, adr, at, t, mo, control_dependency) {}
+
+  virtual const char * name() {
+    return "LoadBarrierSlowRegNode";
+  }
+
+  virtual Node *Ideal(PhaseGVN *phase, bool can_reshape) {
+    return NULL;
+  }
+
+  virtual int Opcode() const;
+};
+
+class LoadBarrierWeakSlowRegNode : public LoadPNode {
+public:
+  LoadBarrierWeakSlowRegNode(Node *c,
+                             Node *mem,
+                             Node *adr,
+                             const TypePtr *at,
+                             const TypePtr* t,
+                             MemOrd mo,
+                             ControlDependency control_dependency = DependsOnlyOnTest)
+    : LoadPNode(c, mem, adr, at, t, mo, control_dependency) {}
+
+  virtual const char * name() {
+    return "LoadBarrierWeakSlowRegNode";
+  }
+
+  virtual Node *Ideal(PhaseGVN *phase, bool can_reshape) {
+    return NULL;
+  }
+
+  virtual int Opcode() const;
+};
+
+class ZBarrierSetC2State : public ResourceObj {
+private:
+  // List of load barrier nodes which need to be expanded before matching
+  GrowableArray<LoadBarrierNode*>* _load_barrier_nodes;
+
+public:
+  ZBarrierSetC2State(Arena* comp_arena);
+  int load_barrier_count() const;
+  void add_load_barrier_node(LoadBarrierNode* n);
+  void remove_load_barrier_node(LoadBarrierNode* n);
+  LoadBarrierNode* load_barrier_node(int idx) const;
+};
+
+class ZBarrierSetC2 : public BarrierSetC2 {
+private:
+  ZBarrierSetC2State* state() const;
+  Node* make_cas_loadbarrier(C2AtomicAccess& access) const;
+  Node* make_cmpx_loadbarrier(C2AtomicAccess& access) const;
+  void expand_loadbarrier_basic(PhaseMacroExpand* phase, LoadBarrierNode *barrier) const;
+  void expand_loadbarrier_node(PhaseMacroExpand* phase, LoadBarrierNode* barrier) const;
+  void expand_loadbarrier_optimized(PhaseMacroExpand* phase, LoadBarrierNode *barrier) const;
+  const TypeFunc* load_barrier_Type() const;
+
+protected:
+  virtual Node* load_at_resolved(C2Access& access, const Type* val_type) const;
+  virtual Node* atomic_cmpxchg_val_at_resolved(C2AtomicAccess& access,
+                                               Node* expected_val,
+                                               Node* new_val,
+                                               const Type* val_type) const;
+  virtual Node* atomic_cmpxchg_bool_at_resolved(C2AtomicAccess& access,
+                                                Node* expected_val,
+                                                Node* new_val,
+                                                const Type* value_type) const;
+  virtual Node* atomic_xchg_at_resolved(C2AtomicAccess& access,
+                                        Node* new_val,
+                                        const Type* val_type) const;
+
+public:
+  Node* load_barrier(GraphKit* kit,
+                     Node* val,
+                     Node* adr,
+                     bool weak = false,
+                     bool writeback = true,
+                     bool oop_reload_allowed = true) const;
+
+  virtual void* create_barrier_state(Arena* comp_arena) const;
+  virtual bool is_gc_barrier_node(Node* node) const;
+  virtual void eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const { }
+  virtual void eliminate_useless_gc_barriers(Unique_Node_List &useful) const;
+  virtual void add_users_to_worklist(Unique_Node_List* worklist) const;
+  virtual void enqueue_useful_gc_barrier(Unique_Node_List &worklist, Node* node) const;
+  virtual void register_potential_barrier_node(Node* node) const;
+  virtual void unregister_potential_barrier_node(Node* node) const;
+  virtual bool array_copy_requires_gc_barriers(BasicType type) const { return true; }
+  virtual Node* step_over_gc_barrier(Node* c) const { return c; }
+  // If the BarrierSetC2 state has kept macro nodes in its compilation unit state to be
+  // expanded later, then now is the time to do so.
+  virtual bool expand_macro_nodes(PhaseMacroExpand* macro) const;
+
+  static void find_dominating_barriers(PhaseIterGVN& igvn);
+  static void loop_optimize_gc_barrier(PhaseIdealLoop* phase, Node* node, bool last_round);
+
+#ifdef ASSERT
+  virtual void verify_gc_barriers(bool post_parse) const;
+#endif
+};
+
+#endif // SHARE_GC_Z_C2_ZBARRIERSETC2_HPP
diff --git a/src/hotspot/share/gc/z/vmStructs_z.cpp b/src/hotspot/share/gc/z/vmStructs_z.cpp
new file mode 100644
index 00000000000..5eacabfb0d9
--- /dev/null
+++ b/src/hotspot/share/gc/z/vmStructs_z.cpp
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/vmStructs_z.hpp"
+
+ZGlobalsForVMStructs::ZGlobalsForVMStructs() :
+    _ZGlobalPhase(&ZGlobalPhase),
+    _ZAddressGoodMask(&ZAddressGoodMask),
+    _ZAddressBadMask(&ZAddressBadMask),
+    _ZAddressWeakBadMask(&ZAddressWeakBadMask),
+    _ZObjectAlignmentSmallShift(&ZObjectAlignmentSmallShift),
+    _ZObjectAlignmentSmall(&ZObjectAlignmentSmall) {
+}
+
+ZGlobalsForVMStructs ZGlobalsForVMStructs::_instance;
+ZGlobalsForVMStructs* ZGlobalsForVMStructs::_instance_p = &ZGlobalsForVMStructs::_instance;
diff --git a/src/hotspot/share/gc/z/vmStructs_z.hpp b/src/hotspot/share/gc/z/vmStructs_z.hpp
new file mode 100644
index 00000000000..464f42f75a8
--- /dev/null
+++ b/src/hotspot/share/gc/z/vmStructs_z.hpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2017, 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
+#define SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
+
+#include "gc/z/zAddressRangeMap.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zHeap.hpp"
+#include "gc/z/zPageAllocator.hpp"
+#include "gc/z/zPhysicalMemory.hpp"
+#include "utilities/macros.hpp"
+
+// Expose some ZGC globals to the SA agent.
+class ZGlobalsForVMStructs {
+  static ZGlobalsForVMStructs _instance;
+
+public:
+  static ZGlobalsForVMStructs* _instance_p;
+
+  ZGlobalsForVMStructs();
+
+  uint32_t* _ZGlobalPhase;
+
+  uintptr_t* _ZAddressGoodMask;
+  uintptr_t* _ZAddressBadMask;
+  uintptr_t* _ZAddressWeakBadMask;
+
+  const int* _ZObjectAlignmentSmallShift;
+  const int* _ZObjectAlignmentSmall;
+};
+
+typedef ZAddressRangeMap<ZPageTableEntry, ZPageSizeMinShift> ZAddressRangeMapForPageTable;
+
+#define VM_STRUCTS_ZGC(nonstatic_field, volatile_nonstatic_field, static_field)                      \
+  static_field(ZGlobalsForVMStructs,            _instance_p,          ZGlobalsForVMStructs*)         \
+  nonstatic_field(ZGlobalsForVMStructs,         _ZGlobalPhase,        uint32_t*)                     \
+  nonstatic_field(ZGlobalsForVMStructs,         _ZAddressGoodMask,    uintptr_t*)                    \
+  nonstatic_field(ZGlobalsForVMStructs,         _ZAddressBadMask,     uintptr_t*)                    \
+  nonstatic_field(ZGlobalsForVMStructs,         _ZAddressWeakBadMask, uintptr_t*)                    \
+  nonstatic_field(ZGlobalsForVMStructs,         _ZObjectAlignmentSmallShift, const int*)             \
+  nonstatic_field(ZGlobalsForVMStructs,         _ZObjectAlignmentSmall, const int*)                  \
+                                                                                                     \
+  nonstatic_field(ZCollectedHeap,               _heap,                ZHeap)                         \
+                                                                                                     \
+  nonstatic_field(ZHeap,                        _page_allocator,      ZPageAllocator)                \
+  nonstatic_field(ZHeap,                        _pagetable,           ZPageTable)                    \
+                                                                                                     \
+  nonstatic_field(ZPage,                        _type,                const uint8_t)                 \
+  nonstatic_field(ZPage,                        _virtual,             const ZVirtualMemory)          \
+  nonstatic_field(ZPage,                        _forwarding,          ZForwardingTable)              \
+                                                                                                     \
+  nonstatic_field(ZPageAllocator,               _physical,            ZPhysicalMemoryManager)        \
+  nonstatic_field(ZPageAllocator,               _used,                size_t)                        \
+                                                                                                     \
+  nonstatic_field(ZPageTable,                   _map,                 ZAddressRangeMapForPageTable)  \
+                                                                                                     \
+  nonstatic_field(ZAddressRangeMapForPageTable, _map,                 ZPageTableEntry* const)        \
+                                                                                                     \
+  nonstatic_field(ZVirtualMemory,                _start,              uintptr_t)                     \
+  nonstatic_field(ZVirtualMemory,                _end,                uintptr_t)                     \
+                                                                                                     \
+  nonstatic_field(ZForwardingTable,              _table,              ZForwardingTableEntry*)        \
+  nonstatic_field(ZForwardingTable,              _size,               size_t)                        \
+                                                                                                     \
+  nonstatic_field(ZPhysicalMemoryManager,        _max_capacity,       const size_t)                  \
+  nonstatic_field(ZPhysicalMemoryManager,        _capacity,           size_t)
+
+#define VM_INT_CONSTANTS_ZGC(declare_constant, declare_constant_with_value)                          \
+  declare_constant(ZPhaseRelocate)                                                                   \
+  declare_constant(ZPageTypeSmall)                                                                   \
+  declare_constant(ZPageTypeMedium)                                                                  \
+  declare_constant(ZPageTypeLarge)                                                                   \
+  declare_constant(ZObjectAlignmentMediumShift)                                                      \
+  declare_constant(ZObjectAlignmentLargeShift)
+
+#define VM_LONG_CONSTANTS_ZGC(declare_constant)                                                      \
+  declare_constant(ZPageSizeSmallShift)                                                              \
+  declare_constant(ZPageSizeMediumShift)                                                             \
+  declare_constant(ZPageSizeMinShift)                                                                \
+  declare_constant(ZAddressOffsetShift)                                                              \
+  declare_constant(ZAddressOffsetBits)                                                               \
+  declare_constant(ZAddressOffsetMask)                                                               \
+  declare_constant(ZAddressSpaceStart)
+
+#define VM_TYPES_ZGC(declare_type, declare_toplevel_type, declare_integer_type)                      \
+  declare_toplevel_type(ZGlobalsForVMStructs)                                                        \
+  declare_type(ZCollectedHeap, CollectedHeap)                                                        \
+  declare_toplevel_type(ZHeap)                                                                       \
+  declare_toplevel_type(ZPage)                                                                       \
+  declare_toplevel_type(ZPageAllocator)                                                              \
+  declare_toplevel_type(ZPageTable)                                                                  \
+  declare_toplevel_type(ZPageTableEntry)                                                             \
+  declare_toplevel_type(ZAddressRangeMapForPageTable)                                                \
+  declare_toplevel_type(ZVirtualMemory)                                                              \
+  declare_toplevel_type(ZForwardingTable)                                                            \
+  declare_toplevel_type(ZForwardingTableEntry)                                                       \
+  declare_toplevel_type(ZPhysicalMemoryManager)
+
+#endif // SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
diff --git a/src/hotspot/share/gc/z/zAddress.cpp b/src/hotspot/share/gc/z/zAddress.cpp
new file mode 100644
index 00000000000..87200e18520
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddress.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "runtime/thread.hpp"
+
+void ZAddressMasks::set_good_mask(uintptr_t mask) {
+  uintptr_t old_bad_mask = ZAddressBadMask;
+  ZAddressGoodMask = mask;
+  ZAddressBadMask = ZAddressGoodMask ^ ZAddressMetadataMask;
+  ZAddressWeakBadMask = (ZAddressGoodMask | ZAddressMetadataRemapped | ZAddressMetadataFinalizable) ^ ZAddressMetadataMask;
+}
+
+void ZAddressMasks::initialize() {
+  ZAddressMetadataMarked = ZAddressMetadataMarked0;
+  set_good_mask(ZAddressMetadataRemapped);
+}
+
+void ZAddressMasks::flip_to_marked() {
+  ZAddressMetadataMarked ^= (ZAddressMetadataMarked0 | ZAddressMetadataMarked1);
+  set_good_mask(ZAddressMetadataMarked);
+}
+
+void ZAddressMasks::flip_to_remapped() {
+  set_good_mask(ZAddressMetadataRemapped);
+}
diff --git a/src/hotspot/share/gc/z/zAddress.hpp b/src/hotspot/share/gc/z/zAddress.hpp
new file mode 100644
index 00000000000..b2131eeb1df
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddress.hpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZADDRESS_HPP
+#define SHARE_GC_Z_ZADDRESS_HPP
+
+#include "memory/allocation.hpp"
+
+class ZAddress : public AllStatic {
+public:
+  static bool is_null(uintptr_t value);
+  static bool is_bad(uintptr_t value);
+  static bool is_good(uintptr_t value);
+  static bool is_good_or_null(uintptr_t value);
+  static bool is_weak_bad(uintptr_t value);
+  static bool is_weak_good(uintptr_t value);
+  static bool is_weak_good_or_null(uintptr_t value);
+  static bool is_marked(uintptr_t value);
+  static bool is_finalizable(uintptr_t value);
+  static bool is_remapped(uintptr_t value);
+
+  static uintptr_t address(uintptr_t value);
+  static uintptr_t offset(uintptr_t value);
+  static uintptr_t good(uintptr_t value);
+  static uintptr_t good_or_null(uintptr_t value);
+  static uintptr_t finalizable_good(uintptr_t value);
+  static uintptr_t marked(uintptr_t value);
+  static uintptr_t marked0(uintptr_t value);
+  static uintptr_t marked1(uintptr_t value);
+  static uintptr_t remapped(uintptr_t value);
+  static uintptr_t remapped_or_null(uintptr_t value);
+};
+
+class ZAddressMasks : public AllStatic {
+  friend class ZAddressTest;
+
+private:
+  static void set_good_mask(uintptr_t mask);
+
+public:
+  static void initialize();
+  static void flip_to_marked();
+  static void flip_to_remapped();
+};
+
+#endif // SHARE_GC_Z_ZADDRESS_HPP
diff --git a/src/hotspot/share/gc/z/zAddress.inline.hpp b/src/hotspot/share/gc/z/zAddress.inline.hpp
new file mode 100644
index 00000000000..ab227447b37
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddress.inline.hpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZADDRESS_INLINE_HPP
+#define SHARE_GC_Z_ZADDRESS_INLINE_HPP
+
+#include "gc/z/zAddress.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "utilities/macros.hpp"
+#include OS_CPU_HEADER_INLINE(gc/z/zAddress)
+
+inline bool ZAddress::is_null(uintptr_t value) {
+  return value == 0;
+}
+
+inline bool ZAddress::is_bad(uintptr_t value) {
+  return value & ZAddressBadMask;
+}
+
+inline bool ZAddress::is_good(uintptr_t value) {
+  return !is_bad(value) && !is_null(value);
+}
+
+inline bool ZAddress::is_good_or_null(uintptr_t value) {
+  // Checking if an address is "not bad" is an optimized version of
+  // checking if it's "good or null", which eliminates an explicit
+  // null check. However, the implicit null check only checks that
+  // the mask bits are zero, not that the entire address is zero.
+  // This means that an address without mask bits would pass through
+  // the barrier as if it was null. This should be harmless as such
+  // addresses should ever be passed through the barrier.
+  const bool result = !is_bad(value);
+  assert((is_good(value) || is_null(value)) == result, "Bad address");
+  return result;
+}
+
+inline bool ZAddress::is_weak_bad(uintptr_t value) {
+  return value & ZAddressWeakBadMask;
+}
+
+inline bool ZAddress::is_weak_good(uintptr_t value) {
+  return !is_weak_bad(value) && !is_null(value);
+}
+
+inline bool ZAddress::is_weak_good_or_null(uintptr_t value) {
+  return !is_weak_bad(value);
+}
+
+inline bool ZAddress::is_marked(uintptr_t value) {
+  return value & ZAddressMetadataMarked;
+}
+
+inline bool ZAddress::is_finalizable(uintptr_t value) {
+  return value & ZAddressMetadataFinalizable;
+}
+
+inline bool ZAddress::is_remapped(uintptr_t value) {
+  return value & ZAddressMetadataRemapped;
+}
+
+inline uintptr_t ZAddress::offset(uintptr_t value) {
+  return value & ZAddressOffsetMask;
+}
+
+inline uintptr_t ZAddress::good(uintptr_t value) {
+  return address(offset(value) | ZAddressGoodMask);
+}
+
+inline uintptr_t ZAddress::good_or_null(uintptr_t value) {
+  return is_null(value) ? 0 : good(value);
+}
+
+inline uintptr_t ZAddress::finalizable_good(uintptr_t value) {
+  return address(offset(value) | ZAddressMetadataFinalizable | ZAddressGoodMask);
+}
+
+inline uintptr_t ZAddress::marked(uintptr_t value) {
+  return address(offset(value) | ZAddressMetadataMarked);
+}
+
+inline uintptr_t ZAddress::marked0(uintptr_t value) {
+  return address(offset(value) | ZAddressMetadataMarked0);
+}
+
+inline uintptr_t ZAddress::marked1(uintptr_t value) {
+  return address(offset(value) | ZAddressMetadataMarked1);
+}
+
+inline uintptr_t ZAddress::remapped(uintptr_t value) {
+  return address(offset(value) | ZAddressMetadataRemapped);
+}
+
+inline uintptr_t ZAddress::remapped_or_null(uintptr_t value) {
+  return is_null(value) ? 0 : remapped(value);
+}
+
+#endif // SHARE_GC_Z_ZADDRESS_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zAddressRangeMap.hpp b/src/hotspot/share/gc/z/zAddressRangeMap.hpp
new file mode 100644
index 00000000000..0d441de626e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddressRangeMap.hpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZADDRESSRANGEMAP_HPP
+#define SHARE_GC_Z_ZADDRESSRANGEMAP_HPP
+
+#include "memory/allocation.hpp"
+
+template<typename T, size_t AddressRangeShift>
+class ZAddressRangeMapIterator;
+
+template <typename T, size_t AddressRangeShift>
+class ZAddressRangeMap {
+  friend class VMStructs;
+  friend class ZAddressRangeMapIterator<T, AddressRangeShift>;
+
+private:
+  T* const _map;
+
+  size_t index_for_addr(uintptr_t addr) const;
+  size_t size() const;
+
+public:
+  ZAddressRangeMap();
+  ~ZAddressRangeMap();
+
+  T get(uintptr_t addr) const;
+  void put(uintptr_t addr, T value);
+};
+
+template <typename T, size_t AddressRangeShift>
+class ZAddressRangeMapIterator : public StackObj {
+public:
+  const ZAddressRangeMap<T, AddressRangeShift>* const _map;
+  size_t                                              _next;
+
+public:
+  ZAddressRangeMapIterator(const ZAddressRangeMap<T, AddressRangeShift>* map);
+
+  bool next(T* value);
+};
+
+#endif // SHARE_GC_Z_ZADDRESSRANGEMAP_HPP
diff --git a/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp b/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp
new file mode 100644
index 00000000000..f091e0295dd
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP
+#define SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zAddressRangeMap.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "memory/allocation.inline.hpp"
+
+template <typename T, size_t AddressRangeShift>
+ZAddressRangeMap<T, AddressRangeShift>::ZAddressRangeMap() :
+    _map(MmapArrayAllocator<T>::allocate(size(), mtGC)) {}
+
+template <typename T, size_t AddressRangeShift>
+ZAddressRangeMap<T, AddressRangeShift>::~ZAddressRangeMap() {
+  MmapArrayAllocator<T>::free(_map, size());
+}
+
+template <typename T, size_t AddressRangeShift>
+size_t ZAddressRangeMap<T, AddressRangeShift>::index_for_addr(uintptr_t addr) const {
+  assert(!ZAddress::is_null(addr), "Invalid address");
+
+  const size_t index = ZAddress::offset(addr) >> AddressRangeShift;
+  assert(index < size(), "Invalid index");
+
+  return index;
+}
+
+template <typename T, size_t AddressRangeShift>
+size_t ZAddressRangeMap<T, AddressRangeShift>::size() const {
+  return ZAddressOffsetMax >> AddressRangeShift;
+}
+
+template <typename T, size_t AddressRangeShift>
+T ZAddressRangeMap<T, AddressRangeShift>::get(uintptr_t addr) const {
+  const uintptr_t index = index_for_addr(addr);
+  return _map[index];
+}
+
+template <typename T, size_t AddressRangeShift>
+void ZAddressRangeMap<T, AddressRangeShift>::put(uintptr_t addr, T value) {
+  const uintptr_t index = index_for_addr(addr);
+  _map[index] = value;
+}
+
+template <typename T, size_t AddressRangeShift>
+inline ZAddressRangeMapIterator<T, AddressRangeShift>::ZAddressRangeMapIterator(const ZAddressRangeMap<T, AddressRangeShift>* map) :
+    _map(map),
+    _next(0) {}
+
+template <typename T, size_t AddressRangeShift>
+inline bool ZAddressRangeMapIterator<T, AddressRangeShift>::next(T* value) {
+  if (_next < _map->size()) {
+    *value = _map->_map[_next++];
+    return true;
+  }
+
+  // End of map
+  return false;
+}
+
+#endif // SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zAllocationFlags.hpp b/src/hotspot/share/gc/z/zAllocationFlags.hpp
new file mode 100644
index 00000000000..3116a0fd189
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAllocationFlags.hpp
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZALLOCATIONFLAGS_HPP
+#define SHARE_GC_Z_ZALLOCATIONFLAGS_HPP
+
+#include "gc/z/zBitField.hpp"
+#include "memory/allocation.hpp"
+
+//
+// Allocation flags layout
+// -----------------------
+//
+//   7   4 3 2 1 0
+//  +---+-+-+-+-+-+
+//  |000|1|1|1|1|1|
+//  +---+-+-+-+-+-+
+//  |   | | | | |
+//  |   | | | | * 0-0 Java Thread Flag (1-bit)
+//  |   | | | |
+//  |   | | | * 1-1 Worker Thread Flag (1-bit)
+//  |   | | |
+//  |   | | * 2-2 Non-Blocking Flag (1-bit)
+//  |   | |
+//  |   | * 3-3 Relocation Flag (1-bit)
+//  |   |
+//  |   * 4-4 No Reserve Flag (1-bit)
+//  |
+//  * 7-5 Unused (3-bits)
+//
+
+class ZAllocationFlags {
+private:
+  typedef ZBitField<uint8_t, bool, 0, 1> field_java_thread;
+  typedef ZBitField<uint8_t, bool, 1, 1> field_worker_thread;
+  typedef ZBitField<uint8_t, bool, 2, 1> field_non_blocking;
+  typedef ZBitField<uint8_t, bool, 3, 1> field_relocation;
+  typedef ZBitField<uint8_t, bool, 4, 1> field_no_reserve;
+
+  uint8_t _flags;
+
+public:
+  ZAllocationFlags() :
+      _flags(0) {}
+
+  void set_java_thread() {
+    _flags |= field_java_thread::encode(true);
+  }
+
+  void set_worker_thread() {
+    _flags |= field_worker_thread::encode(true);
+  }
+
+  void set_non_blocking() {
+    _flags |= field_non_blocking::encode(true);
+  }
+
+  void set_relocation() {
+    _flags |= field_relocation::encode(true);
+  }
+
+  void set_no_reserve() {
+    _flags |= field_no_reserve::encode(true);
+  }
+
+  bool java_thread() const {
+    return field_java_thread::decode(_flags);
+  }
+
+  bool worker_thread() const {
+    return field_worker_thread::decode(_flags);
+  }
+
+  bool non_blocking() const {
+    return field_non_blocking::decode(_flags);
+  }
+
+  bool relocation() const {
+    return field_relocation::decode(_flags);
+  }
+
+  bool no_reserve() const {
+    return field_no_reserve::decode(_flags);
+  }
+};
+
+#endif // SHARE_GC_Z_ZALLOCATIONFLAGS_HPP
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
new file mode 100644
index 00000000000..19fd2898e20
--- /dev/null
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2017, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zArguments.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zCollectorPolicy.hpp"
+#include "gc/z/zWorkers.hpp"
+#include "gc/shared/gcArguments.inline.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/globals_extension.hpp"
+
+size_t ZArguments::conservative_max_heap_alignment() {
+  return 0;
+}
+
+void ZArguments::initialize() {
+  GCArguments::initialize();
+
+  // Enable NUMA by default
+  if (FLAG_IS_DEFAULT(UseNUMA)) {
+    FLAG_SET_DEFAULT(UseNUMA, true);
+  }
+
+  // Disable biased locking by default
+  if (FLAG_IS_DEFAULT(UseBiasedLocking)) {
+    FLAG_SET_DEFAULT(UseBiasedLocking, false);
+  }
+
+  // Select number of parallel threads
+  if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
+    FLAG_SET_DEFAULT(ParallelGCThreads, ZWorkers::calculate_nparallel());
+  }
+
+  if (ParallelGCThreads == 0) {
+    vm_exit_during_initialization("The flag -XX:+UseZGC can not be combined with -XX:ParallelGCThreads=0");
+  }
+
+  // Select number of concurrent threads
+  if (FLAG_IS_DEFAULT(ConcGCThreads)) {
+    FLAG_SET_DEFAULT(ConcGCThreads, ZWorkers::calculate_nconcurrent());
+  }
+
+  if (ConcGCThreads == 0) {
+    vm_exit_during_initialization("The flag -XX:+UseZGC can not be combined with -XX:ConcGCThreads=0");
+  }
+
+#ifdef COMPILER2
+  // Enable loop strip mining by default
+  if (FLAG_IS_DEFAULT(UseCountedLoopSafepoints)) {
+    FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
+    if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
+      FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
+    }
+  }
+#endif
+
+  // To avoid asserts in set_active_workers()
+  FLAG_SET_DEFAULT(UseDynamicNumberOfGCThreads, true);
+
+  // CompressedOops/UseCompressedClassPointers not supported
+  FLAG_SET_DEFAULT(UseCompressedOops, false);
+  FLAG_SET_DEFAULT(UseCompressedClassPointers, false);
+
+  // ClassUnloading not (yet) supported
+  FLAG_SET_DEFAULT(ClassUnloading, false);
+  FLAG_SET_DEFAULT(ClassUnloadingWithConcurrentMark, false);
+
+  // Verification before startup and after exit not (yet) supported
+  FLAG_SET_DEFAULT(VerifyDuringStartup, false);
+  FLAG_SET_DEFAULT(VerifyBeforeExit, false);
+
+  // Verification of stacks not (yet) supported, for the same reason
+  // we need fixup_partial_loads
+  DEBUG_ONLY(FLAG_SET_DEFAULT(VerifyStack, false));
+
+  // JVMCI not (yet) supported
+  if (EnableJVMCI) {
+    vm_exit_during_initialization("The flag -XX:+UseZGC can not be combined with -XX:+EnableJVMCI");
+  }
+}
+
+CollectedHeap* ZArguments::create_heap() {
+  return create_heap_with_policy<ZCollectedHeap, ZCollectorPolicy>();
+}
diff --git a/src/hotspot/share/gc/z/zArguments.hpp b/src/hotspot/share/gc/z/zArguments.hpp
new file mode 100644
index 00000000000..f85b1471a2b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zArguments.hpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZARGUMENTS_HPP
+#define SHARE_GC_Z_ZARGUMENTS_HPP
+
+#include "gc/shared/gcArguments.hpp"
+
+class CollectedHeap;
+
+class ZArguments : public GCArguments {
+public:
+  virtual void initialize();
+  virtual size_t conservative_max_heap_alignment();
+  virtual CollectedHeap* create_heap();
+};
+
+#endif // SHARE_GC_Z_ZARGUMENTS_HPP
diff --git a/src/hotspot/share/gc/z/zArray.hpp b/src/hotspot/share/gc/z/zArray.hpp
new file mode 100644
index 00000000000..d5e6e6f0fee
--- /dev/null
+++ b/src/hotspot/share/gc/z/zArray.hpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZARRAY_HPP
+#define SHARE_GC_Z_ZARRAY_HPP
+
+#include "memory/allocation.hpp"
+
+template <typename T>
+class ZArray {
+private:
+  static const size_t initial_capacity = 32;
+
+  T*     _array;
+  size_t _size;
+  size_t _capacity;
+
+  // Copy and assignment are not allowed
+  ZArray(const ZArray<T>& array);
+  ZArray<T>& operator=(const ZArray<T>& array);
+
+  void expand(size_t new_capacity);
+
+public:
+  ZArray();
+  ~ZArray();
+
+  size_t size() const;
+  bool is_empty() const;
+
+  T at(size_t index) const;
+
+  void add(T value);
+  void clear();
+};
+
+template <typename T, bool parallel>
+class ZArrayIteratorImpl : public StackObj {
+private:
+  ZArray<T>* const _array;
+  size_t           _next;
+
+public:
+  ZArrayIteratorImpl(ZArray<T>* array);
+
+  bool next(T* elem);
+};
+
+// Iterator types
+#define ZARRAY_SERIAL      false
+#define ZARRAY_PARALLEL    true
+
+template <typename T>
+class ZArrayIterator : public ZArrayIteratorImpl<T, ZARRAY_SERIAL> {
+public:
+  ZArrayIterator(ZArray<T>* array) :
+      ZArrayIteratorImpl<T, ZARRAY_SERIAL>(array) {}
+};
+
+template <typename T>
+class ZArrayParallelIterator : public ZArrayIteratorImpl<T, ZARRAY_PARALLEL> {
+public:
+  ZArrayParallelIterator(ZArray<T>* array) :
+      ZArrayIteratorImpl<T, ZARRAY_PARALLEL>(array) {}
+};
+
+#endif // SHARE_GC_Z_ZARRAY_HPP
diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp
new file mode 100644
index 00000000000..eb92b6be8da
--- /dev/null
+++ b/src/hotspot/share/gc/z/zArray.inline.hpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZARRAY_INLINE_HPP
+#define SHARE_GC_Z_ZARRAY_INLINE_HPP
+
+#include "gc/z/zArray.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
+
+template <typename T>
+inline ZArray<T>::ZArray() :
+    _array(NULL),
+    _size(0),
+    _capacity(0) {}
+
+template <typename T>
+inline ZArray<T>::~ZArray() {
+  if (_array != NULL) {
+    FREE_C_HEAP_ARRAY(T, _array);
+  }
+}
+
+template <typename T>
+inline size_t ZArray<T>::size() const {
+  return _size;
+}
+
+template <typename T>
+inline bool ZArray<T>::is_empty() const {
+  return size() == 0;
+}
+
+template <typename T>
+inline T ZArray<T>::at(size_t index) const {
+  assert(index < _size, "Index out of bounds");
+  return _array[index];
+}
+
+template <typename T>
+inline void ZArray<T>::expand(size_t new_capacity) {
+  T* new_array = NEW_C_HEAP_ARRAY(T, new_capacity, mtGC);
+  if (_array != NULL) {
+    memcpy(new_array, _array, sizeof(T) * _capacity);
+    FREE_C_HEAP_ARRAY(T, _array);
+  }
+
+  _array = new_array;
+  _capacity = new_capacity;
+}
+
+template <typename T>
+inline void ZArray<T>::add(T value) {
+  if (_size == _capacity) {
+    const size_t new_capacity = (_capacity > 0) ? _capacity * 2 : initial_capacity;
+    expand(new_capacity);
+  }
+
+  _array[_size++] = value;
+}
+
+template <typename T>
+inline void ZArray<T>::clear() {
+  _size = 0;
+}
+
+template <typename T, bool parallel>
+inline ZArrayIteratorImpl<T, parallel>::ZArrayIteratorImpl(ZArray<T>* array) :
+    _array(array),
+    _next(0) {}
+
+template <typename T, bool parallel>
+inline bool ZArrayIteratorImpl<T, parallel>::next(T* elem) {
+  if (parallel) {
+    const size_t next = Atomic::add(1u, &_next) - 1u;
+    if (next < _array->size()) {
+      *elem = _array->at(next);
+      return true;
+    }
+  } else {
+    if (_next < _array->size()) {
+      *elem = _array->at(_next++);
+      return true;
+    }
+  }
+
+  // No more elements
+  return false;
+}
+
+#endif // SHARE_GC_Z_ZARRAY_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zBarrier.cpp b/src/hotspot/share/gc/z/zBarrier.cpp
new file mode 100644
index 00000000000..21ccd36b688
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrier.cpp
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/safepoint.hpp"
+#include "utilities/debug.hpp"
+
+bool ZBarrier::during_mark() {
+  return ZGlobalPhase == ZPhaseMark;
+}
+
+bool ZBarrier::during_relocate() {
+  return ZGlobalPhase == ZPhaseRelocate;
+}
+
+template <bool finalizable>
+bool ZBarrier::should_mark_through(uintptr_t addr) {
+  // Finalizable marked oops can still exists on the heap after marking
+  // has completed, in which case we just want to convert this into a
+  // good oop and not push it on the mark stack.
+  if (!during_mark()) {
+    assert(ZAddress::is_marked(addr), "Should be marked");
+    assert(ZAddress::is_finalizable(addr), "Should be finalizable");
+    return false;
+  }
+
+  // During marking, we mark through already marked oops to avoid having
+  // some large part of the object graph hidden behind a pushed, but not
+  // yet flushed, entry on a mutator mark stack. Always marking through
+  // allows the GC workers to proceed through the object graph even if a
+  // mutator touched an oop first, which in turn will reduce the risk of
+  // having to flush mark stacks multiple times to terminate marking.
+  //
+  // However, when doing finalizable marking we don't always want to mark
+  // through. First, marking through an already strongly marked oop would
+  // be wasteful, since we will then proceed to do finalizable marking on
+  // an object which is, or will be, marked strongly. Second, marking
+  // through an already finalizable marked oop would also be wasteful,
+  // since such oops can never end up on a mutator mark stack and can
+  // therefore not hide some part of the object graph from GC workers.
+  if (finalizable) {
+    return !ZAddress::is_marked(addr);
+  }
+
+  // Mark through
+  return true;
+}
+
+template <bool finalizable, bool publish>
+uintptr_t ZBarrier::mark(uintptr_t addr) {
+  uintptr_t good_addr;
+
+  if (ZAddress::is_marked(addr)) {
+    // Already marked, but try to mark though anyway
+    good_addr = ZAddress::good(addr);
+  } else if (ZAddress::is_remapped(addr)) {
+    // Already remapped, but also needs to be marked
+    good_addr = ZAddress::good(addr);
+  } else {
+    // Needs to be both remapped and marked
+    good_addr = remap(addr);
+  }
+
+  // Mark
+  if (should_mark_through<finalizable>(addr)) {
+    ZHeap::heap()->mark_object<finalizable, publish>(good_addr);
+  }
+
+  return good_addr;
+}
+
+uintptr_t ZBarrier::remap(uintptr_t addr) {
+  assert(!ZAddress::is_good(addr), "Should not be good");
+  assert(!ZAddress::is_weak_good(addr), "Should not be weak good");
+
+  if (ZHeap::heap()->is_relocating(addr)) {
+    // Forward
+    return ZHeap::heap()->forward_object(addr);
+  }
+
+  // Remap
+  return ZAddress::good(addr);
+}
+
+uintptr_t ZBarrier::relocate(uintptr_t addr) {
+  assert(!ZAddress::is_good(addr), "Should not be good");
+  assert(!ZAddress::is_weak_good(addr), "Should not be weak good");
+
+  if (ZHeap::heap()->is_relocating(addr)) {
+    // Relocate
+    return ZHeap::heap()->relocate_object(addr);
+  }
+
+  // Remap
+  return ZAddress::good(addr);
+}
+
+uintptr_t ZBarrier::relocate_or_mark(uintptr_t addr) {
+  return during_relocate() ? relocate(addr) : mark<Strong, Publish>(addr);
+}
+
+uintptr_t ZBarrier::relocate_or_remap(uintptr_t addr) {
+  return during_relocate() ? relocate(addr) : remap(addr);
+}
+
+//
+// Load barrier
+//
+uintptr_t ZBarrier::load_barrier_on_oop_slow_path(uintptr_t addr) {
+  return relocate_or_mark(addr);
+}
+
+void ZBarrier::load_barrier_on_oop_fields(oop o) {
+  assert(ZOop::is_good(o), "Should be good");
+  ZLoadBarrierOopClosure cl;
+  o->oop_iterate(&cl);
+}
+
+//
+// Weak load barrier
+//
+uintptr_t ZBarrier::weak_load_barrier_on_oop_slow_path(uintptr_t addr) {
+  return ZAddress::is_weak_good(addr) ? ZAddress::good(addr) : relocate_or_remap(addr);
+}
+
+uintptr_t ZBarrier::weak_load_barrier_on_weak_oop_slow_path(uintptr_t addr) {
+  const uintptr_t good_addr = weak_load_barrier_on_oop_slow_path(addr);
+  if (ZHeap::heap()->is_object_strongly_live(good_addr)) {
+    return good_addr;
+  }
+
+  // Not strongly live
+  return 0;
+}
+
+uintptr_t ZBarrier::weak_load_barrier_on_phantom_oop_slow_path(uintptr_t addr) {
+  const uintptr_t good_addr = weak_load_barrier_on_oop_slow_path(addr);
+  if (ZHeap::heap()->is_object_live(good_addr)) {
+    return good_addr;
+  }
+
+  // Not live
+  return 0;
+}
+
+//
+// Keep alive barrier
+//
+uintptr_t ZBarrier::keep_alive_barrier_on_weak_oop_slow_path(uintptr_t addr) {
+  const uintptr_t good_addr = weak_load_barrier_on_oop_slow_path(addr);
+  assert(ZHeap::heap()->is_object_strongly_live(good_addr), "Should be live");
+  return good_addr;
+}
+
+uintptr_t ZBarrier::keep_alive_barrier_on_phantom_oop_slow_path(uintptr_t addr) {
+  const uintptr_t good_addr = weak_load_barrier_on_oop_slow_path(addr);
+  assert(ZHeap::heap()->is_object_live(good_addr), "Should be live");
+  return good_addr;
+}
+
+//
+// Mark barrier
+//
+uintptr_t ZBarrier::mark_barrier_on_oop_slow_path(uintptr_t addr) {
+  return mark<Strong, Overflow>(addr);
+}
+
+uintptr_t ZBarrier::mark_barrier_on_finalizable_oop_slow_path(uintptr_t addr) {
+  const uintptr_t good_addr = mark<Finalizable, Overflow>(addr);
+  if (ZAddress::is_good(addr)) {
+    // If the oop was already strongly marked/good, then we do
+    // not want to downgrade it to finalizable marked/good.
+    return good_addr;
+  }
+
+  // Make the oop finalizable marked/good, instead of normal marked/good.
+  // This is needed because an object might first becomes finalizable
+  // marked by the GC, and then loaded by a mutator thread. In this case,
+  // the mutator thread must be able to tell that the object needs to be
+  // strongly marked. The finalizable bit in the oop exists to make sure
+  // that a load of a finalizable marked oop will fall into the barrier
+  // slow path so that we can mark the object as strongly reachable.
+  return ZAddress::finalizable_good(good_addr);
+}
+
+uintptr_t ZBarrier::mark_barrier_on_root_oop_slow_path(uintptr_t addr) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  assert(during_mark(), "Invalid phase");
+
+  // Mark
+  return mark<Strong, Publish>(addr);
+}
+
+//
+// Relocate barrier
+//
+uintptr_t ZBarrier::relocate_barrier_on_root_oop_slow_path(uintptr_t addr) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  assert(during_relocate(), "Invalid phase");
+
+  // Relocate
+  return relocate(addr);
+}
+
+//
+// Narrow oop variants, never used.
+//
+oop ZBarrier::load_barrier_on_oop_field(volatile narrowOop* p) {
+  ShouldNotReachHere();
+  return NULL;
+}
+
+oop ZBarrier::load_barrier_on_oop_field_preloaded(volatile narrowOop* p, oop o) {
+  ShouldNotReachHere();
+  return NULL;
+}
+
+void ZBarrier::load_barrier_on_oop_array(volatile narrowOop* p, size_t length) {
+  ShouldNotReachHere();
+}
+
+oop ZBarrier::load_barrier_on_weak_oop_field_preloaded(volatile narrowOop* p, oop o) {
+  ShouldNotReachHere();
+  return NULL;
+}
+
+oop ZBarrier::load_barrier_on_phantom_oop_field_preloaded(volatile narrowOop* p, oop o) {
+  ShouldNotReachHere();
+  return NULL;
+}
+
+oop ZBarrier::weak_load_barrier_on_oop_field_preloaded(volatile narrowOop* p, oop o) {
+  ShouldNotReachHere();
+  return NULL;
+}
+
+oop ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(volatile narrowOop* p, oop o) {
+  ShouldNotReachHere();
+  return NULL;
+}
+
+oop ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(volatile narrowOop* p, oop o) {
+  ShouldNotReachHere();
+  return NULL;
+}
diff --git a/src/hotspot/share/gc/z/zBarrier.hpp b/src/hotspot/share/gc/z/zBarrier.hpp
new file mode 100644
index 00000000000..50ed9849c47
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrier.hpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBARRIER_HPP
+#define SHARE_GC_Z_ZBARRIER_HPP
+
+#include "memory/allocation.hpp"
+#include "oops/oop.hpp"
+
+typedef bool (*ZBarrierFastPath)(uintptr_t);
+typedef uintptr_t (*ZBarrierSlowPath)(uintptr_t);
+
+class ZBarrier : public AllStatic {
+private:
+  static const bool Strong      = false;
+  static const bool Finalizable = true;
+
+  static const bool Publish     = true;
+  static const bool Overflow    = false;
+
+  template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static oop barrier(volatile oop* p, oop o);
+  template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static oop weak_barrier(volatile oop* p, oop o);
+  template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static void root_barrier(oop* p, oop o);
+
+  static bool is_null_fast_path(uintptr_t addr);
+  static bool is_good_or_null_fast_path(uintptr_t addr);
+  static bool is_weak_good_or_null_fast_path(uintptr_t addr);
+
+  static bool is_resurrection_blocked(volatile oop* p, oop* o);
+
+  static bool during_mark();
+  static bool during_relocate();
+  template <bool finalizable> static bool should_mark_through(uintptr_t addr);
+  template <bool finalizable, bool publish> static uintptr_t mark(uintptr_t addr);
+  static uintptr_t remap(uintptr_t addr);
+  static uintptr_t relocate(uintptr_t addr);
+  static uintptr_t relocate_or_mark(uintptr_t addr);
+  static uintptr_t relocate_or_remap(uintptr_t addr);
+
+  static uintptr_t load_barrier_on_oop_slow_path(uintptr_t addr);
+
+  static uintptr_t weak_load_barrier_on_oop_slow_path(uintptr_t addr);
+  static uintptr_t weak_load_barrier_on_weak_oop_slow_path(uintptr_t addr);
+  static uintptr_t weak_load_barrier_on_phantom_oop_slow_path(uintptr_t addr);
+
+  static uintptr_t keep_alive_barrier_on_weak_oop_slow_path(uintptr_t addr);
+  static uintptr_t keep_alive_barrier_on_phantom_oop_slow_path(uintptr_t addr);
+
+  static uintptr_t mark_barrier_on_oop_slow_path(uintptr_t addr);
+  static uintptr_t mark_barrier_on_finalizable_oop_slow_path(uintptr_t addr);
+  static uintptr_t mark_barrier_on_root_oop_slow_path(uintptr_t addr);
+
+  static uintptr_t relocate_barrier_on_root_oop_slow_path(uintptr_t addr);
+
+public:
+  // Load barrier
+  static  oop load_barrier_on_oop(oop o);
+  static  oop load_barrier_on_oop_field(volatile oop* p);
+  static  oop load_barrier_on_oop_field_preloaded(volatile oop* p, oop o);
+  static void load_barrier_on_oop_array(volatile oop* p, size_t length);
+  static void load_barrier_on_oop_fields(oop o);
+  static  oop load_barrier_on_weak_oop_field_preloaded(volatile oop* p, oop o);
+  static  oop load_barrier_on_phantom_oop_field_preloaded(volatile oop* p, oop o);
+
+  // Weak load barrier
+  static oop weak_load_barrier_on_oop_field_preloaded(volatile oop* p, oop o);
+  static oop weak_load_barrier_on_weak_oop(oop o);
+  static oop weak_load_barrier_on_weak_oop_field(volatile oop* p);
+  static oop weak_load_barrier_on_weak_oop_field_preloaded(volatile oop* p, oop o);
+  static oop weak_load_barrier_on_phantom_oop(oop o);
+  static oop weak_load_barrier_on_phantom_oop_field(volatile oop* p);
+  static oop weak_load_barrier_on_phantom_oop_field_preloaded(volatile oop* p, oop o);
+
+  // Is alive barrier
+  static bool is_alive_barrier_on_weak_oop(oop o);
+  static bool is_alive_barrier_on_phantom_oop(oop o);
+
+  // Keep alive barrier
+  static void keep_alive_barrier_on_weak_oop_field(volatile oop* p);
+  static void keep_alive_barrier_on_phantom_oop_field(volatile oop* p);
+
+  // Mark barrier
+  static void mark_barrier_on_oop_field(volatile oop* p, bool finalizable);
+  static void mark_barrier_on_oop_array(volatile oop* p, size_t length, bool finalizable);
+  static void mark_barrier_on_root_oop_field(oop* p);
+
+  // Relocate barrier
+  static void relocate_barrier_on_root_oop_field(oop* p);
+
+  // Narrow oop variants, never used.
+  static oop  load_barrier_on_oop_field(volatile narrowOop* p);
+  static oop  load_barrier_on_oop_field_preloaded(volatile narrowOop* p, oop o);
+  static void load_barrier_on_oop_array(volatile narrowOop* p, size_t length);
+  static oop  load_barrier_on_weak_oop_field_preloaded(volatile narrowOop* p, oop o);
+  static oop  load_barrier_on_phantom_oop_field_preloaded(volatile narrowOop* p, oop o);
+  static oop  weak_load_barrier_on_oop_field_preloaded(volatile narrowOop* p, oop o);
+  static oop  weak_load_barrier_on_weak_oop_field_preloaded(volatile narrowOop* p, oop o);
+  static oop  weak_load_barrier_on_phantom_oop_field_preloaded(volatile narrowOop* p, oop o);
+};
+
+#endif // SHARE_GC_Z_ZBARRIER_HPP
diff --git a/src/hotspot/share/gc/z/zBarrier.inline.hpp b/src/hotspot/share/gc/z/zBarrier.inline.hpp
new file mode 100644
index 00000000000..577d19ba0e7
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrier.inline.hpp
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBARRIER_INLINE_HPP
+#define SHARE_GC_Z_ZBARRIER_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zBarrier.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zResurrection.inline.hpp"
+#include "runtime/atomic.hpp"
+
+template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path>
+inline oop ZBarrier::barrier(volatile oop* p, oop o) {
+  uintptr_t addr = ZOop::to_address(o);
+
+retry:
+  // Fast path
+  if (fast_path(addr)) {
+    return ZOop::to_oop(addr);
+  }
+
+  // Slow path
+  const uintptr_t good_addr = slow_path(addr);
+
+  // Self heal, but only if the address was actually updated by the slow path,
+  // which might not be the case, e.g. when marking through an already good oop.
+  if (p != NULL && good_addr != addr) {
+    const uintptr_t prev_addr = Atomic::cmpxchg(good_addr, (volatile uintptr_t*)p, addr);
+    if (prev_addr != addr) {
+      // Some other thread overwrote the oop. If this oop was updated by a
+      // weak barrier the new oop might not be good, in which case we need
+      // to re-apply this barrier.
+      addr = prev_addr;
+      goto retry;
+    }
+  }
+
+  return ZOop::to_oop(good_addr);
+}
+
+template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path>
+inline oop ZBarrier::weak_barrier(volatile oop* p, oop o) {
+  const uintptr_t addr = ZOop::to_address(o);
+
+  // Fast path
+  if (fast_path(addr)) {
+    // Return the good address instead of the weak good address
+    // to ensure that the currently active heap view is used.
+    return ZOop::to_oop(ZAddress::good_or_null(addr));
+  }
+
+  // Slow path
+  uintptr_t good_addr = slow_path(addr);
+
+  // Self heal unless the address returned from the slow path is null,
+  // in which case resurrection was blocked and we must let the reference
+  // processor clear the oop. Mutators are not allowed to clear oops in
+  // these cases, since that would be similar to calling Reference.clear(),
+  // which would make the reference non-discoverable or silently dropped
+  // by the reference processor.
+  if (p != NULL && good_addr != 0) {
+    // The slow path returns a good/marked address, but we never mark oops
+    // in a weak load barrier so we always self heal with the remapped address.
+    const uintptr_t weak_good_addr = ZAddress::remapped(good_addr);
+    const uintptr_t prev_addr = Atomic::cmpxchg(weak_good_addr, (volatile uintptr_t*)p, addr);
+    if (prev_addr != addr) {
+      // Some other thread overwrote the oop. The new
+      // oop is guaranteed to be weak good or null.
+      assert(ZAddress::is_weak_good_or_null(prev_addr), "Bad weak overwrite");
+
+      // Return the good address instead of the weak good address
+      // to ensure that the currently active heap view is used.
+      good_addr = ZAddress::good_or_null(prev_addr);
+    }
+  }
+
+  return ZOop::to_oop(good_addr);
+}
+
+template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path>
+inline void ZBarrier::root_barrier(oop* p, oop o) {
+  const uintptr_t addr = ZOop::to_address(o);
+
+  // Fast path
+  if (fast_path(addr)) {
+    return;
+  }
+
+  // Slow path
+  const uintptr_t good_addr = slow_path(addr);
+
+  // Non-atomic healing helps speed up root scanning. This is safe to do
+  // since we are always healing roots in a safepoint, which means we are
+  // never racing with mutators modifying roots while we are healing them.
+  // It's also safe in case multiple GC threads try to heal the same root,
+  // since they would always heal the root in the same way and it does not
+  // matter in which order it happens.
+  *p = ZOop::to_oop(good_addr);
+}
+
+inline bool ZBarrier::is_null_fast_path(uintptr_t addr) {
+  return ZAddress::is_null(addr);
+}
+
+inline bool ZBarrier::is_good_or_null_fast_path(uintptr_t addr) {
+  return ZAddress::is_good_or_null(addr);
+}
+
+inline bool ZBarrier::is_weak_good_or_null_fast_path(uintptr_t addr) {
+  return ZAddress::is_weak_good_or_null(addr);
+}
+
+inline bool ZBarrier::is_resurrection_blocked(volatile oop* p, oop* o) {
+  const bool is_blocked = ZResurrection::is_blocked();
+
+  // Reload oop after checking the resurrection blocked state. This is
+  // done to prevent a race where we first load an oop, which is logically
+  // null but not yet cleared, then this oop is cleared by the reference
+  // processor and resurrection is unblocked. At this point the mutator
+  // would see the unblocked state and pass this invalid oop through the
+  // normal barrier path, which would incorrectly try to mark this oop.
+  if (p != NULL) {
+    // First assign to reloaded_o to avoid compiler warning about
+    // implicit dereference of volatile oop.
+    const oop reloaded_o = *p;
+    *o = reloaded_o;
+  }
+
+  return is_blocked;
+}
+
+//
+// Load barrier
+//
+inline oop ZBarrier::load_barrier_on_oop(oop o) {
+  return load_barrier_on_oop_field_preloaded((oop*)NULL, o);
+}
+
+inline oop ZBarrier::load_barrier_on_oop_field(volatile oop* p) {
+  const oop o = *p;
+  return load_barrier_on_oop_field_preloaded(p, o);
+}
+
+inline oop ZBarrier::load_barrier_on_oop_field_preloaded(volatile oop* p, oop o) {
+  return barrier<is_good_or_null_fast_path, load_barrier_on_oop_slow_path>(p, o);
+}
+
+inline void ZBarrier::load_barrier_on_oop_array(volatile oop* p, size_t length) {
+  for (volatile const oop* const end = p + length; p < end; p++) {
+    load_barrier_on_oop_field(p);
+  }
+}
+
+inline oop ZBarrier::load_barrier_on_weak_oop_field_preloaded(volatile oop* p, oop o) {
+  if (is_resurrection_blocked(p, &o)) {
+    return weak_barrier<is_good_or_null_fast_path, weak_load_barrier_on_weak_oop_slow_path>(p, o);
+  }
+
+  return load_barrier_on_oop_field_preloaded(p, o);
+}
+
+inline oop ZBarrier::load_barrier_on_phantom_oop_field_preloaded(volatile oop* p, oop o) {
+  if (is_resurrection_blocked(p, &o)) {
+    return weak_barrier<is_good_or_null_fast_path, weak_load_barrier_on_phantom_oop_slow_path>(p, o);
+  }
+
+  return load_barrier_on_oop_field_preloaded(p, o);
+}
+
+//
+// Weak load barrier
+//
+inline oop ZBarrier::weak_load_barrier_on_oop_field_preloaded(volatile oop* p, oop o) {
+  return weak_barrier<is_weak_good_or_null_fast_path, weak_load_barrier_on_oop_slow_path>(p, o);
+}
+
+inline oop ZBarrier::weak_load_barrier_on_weak_oop(oop o) {
+  return weak_load_barrier_on_weak_oop_field_preloaded((oop*)NULL, o);
+}
+
+inline oop ZBarrier::weak_load_barrier_on_weak_oop_field(volatile oop* p) {
+  const oop o = *p;
+  return weak_load_barrier_on_weak_oop_field_preloaded(p, o);
+}
+
+inline oop ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(volatile oop* p, oop o) {
+  if (is_resurrection_blocked(p, &o)) {
+    return weak_barrier<is_good_or_null_fast_path, weak_load_barrier_on_weak_oop_slow_path>(p, o);
+  }
+
+  return weak_load_barrier_on_oop_field_preloaded(p, o);
+}
+
+inline oop ZBarrier::weak_load_barrier_on_phantom_oop(oop o) {
+  return weak_load_barrier_on_phantom_oop_field_preloaded((oop*)NULL, o);
+}
+
+inline oop ZBarrier::weak_load_barrier_on_phantom_oop_field(volatile oop* p) {
+  const oop o = *p;
+  return weak_load_barrier_on_phantom_oop_field_preloaded(p, o);
+}
+
+inline oop ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(volatile oop* p, oop o) {
+  if (is_resurrection_blocked(p, &o)) {
+    return weak_barrier<is_good_or_null_fast_path, weak_load_barrier_on_phantom_oop_slow_path>(p, o);
+  }
+
+  return weak_load_barrier_on_oop_field_preloaded(p, o);
+}
+
+//
+// Is alive barrier
+//
+inline bool ZBarrier::is_alive_barrier_on_weak_oop(oop o) {
+  // Check if oop is logically non-null. This operation
+  // is only valid when resurrection is blocked.
+  assert(ZResurrection::is_blocked(), "Invalid phase");
+  return weak_load_barrier_on_weak_oop(o) != NULL;
+}
+
+inline bool ZBarrier::is_alive_barrier_on_phantom_oop(oop o) {
+  // Check if oop is logically non-null. This operation
+  // is only valid when resurrection is blocked.
+  assert(ZResurrection::is_blocked(), "Invalid phase");
+  return weak_load_barrier_on_phantom_oop(o) != NULL;
+}
+
+//
+// Keep alive barrier
+//
+inline void ZBarrier::keep_alive_barrier_on_weak_oop_field(volatile oop* p) {
+  // This operation is only valid when resurrection is blocked.
+  assert(ZResurrection::is_blocked(), "Invalid phase");
+  const oop o = *p;
+  barrier<is_good_or_null_fast_path, keep_alive_barrier_on_weak_oop_slow_path>(p, o);
+}
+
+inline void ZBarrier::keep_alive_barrier_on_phantom_oop_field(volatile oop* p) {
+  // This operation is only valid when resurrection is blocked.
+  assert(ZResurrection::is_blocked(), "Invalid phase");
+  const oop o = *p;
+  barrier<is_good_or_null_fast_path, keep_alive_barrier_on_phantom_oop_slow_path>(p, o);
+}
+
+//
+// Mark barrier
+//
+inline void ZBarrier::mark_barrier_on_oop_field(volatile oop* p, bool finalizable) {
+  // The fast path only checks for null since the GC worker
+  // threads doing marking wants to mark through good oops.
+  const oop o = *p;
+
+  if (finalizable) {
+    barrier<is_null_fast_path, mark_barrier_on_finalizable_oop_slow_path>(p, o);
+  } else {
+    barrier<is_null_fast_path, mark_barrier_on_oop_slow_path>(p, o);
+  }
+}
+
+inline void ZBarrier::mark_barrier_on_oop_array(volatile oop* p, size_t length, bool finalizable) {
+  for (volatile const oop* const end = p + length; p < end; p++) {
+    mark_barrier_on_oop_field(p, finalizable);
+  }
+}
+
+inline void ZBarrier::mark_barrier_on_root_oop_field(oop* p) {
+  const oop o = *p;
+  root_barrier<is_good_or_null_fast_path, mark_barrier_on_root_oop_slow_path>(p, o);
+}
+
+//
+// Relocate barrier
+//
+inline void ZBarrier::relocate_barrier_on_root_oop_field(oop* p) {
+  const oop o = *p;
+  root_barrier<is_good_or_null_fast_path, relocate_barrier_on_root_oop_slow_path>(p, o);
+}
+
+#endif // SHARE_GC_Z_ZBARRIER_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp
new file mode 100644
index 00000000000..4c993b2df16
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/c1/zBarrierSetC1.hpp"
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "gc/z/zBarrierSetAssembler.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "runtime/thread.hpp"
+
+ZBarrierSet::ZBarrierSet() :
+    BarrierSet(make_barrier_set_assembler<ZBarrierSetAssembler>(),
+               make_barrier_set_c1<ZBarrierSetC1>(),
+               make_barrier_set_c2<ZBarrierSetC2>(),
+               BarrierSet::FakeRtti(BarrierSet::ZBarrierSet)) {}
+
+ZBarrierSetAssembler* ZBarrierSet::assembler() {
+  BarrierSetAssembler* const bsa = BarrierSet::barrier_set()->barrier_set_assembler();
+  return reinterpret_cast<ZBarrierSetAssembler*>(bsa);
+}
+
+bool ZBarrierSet::barrier_needed(DecoratorSet decorators, BasicType type) {
+  assert((decorators & AS_RAW) == 0, "Unexpected decorator");
+  assert((decorators & AS_NO_KEEPALIVE) == 0, "Unexpected decorator");
+  //assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Unexpected decorator");
+
+  if (type == T_OBJECT || type == T_ARRAY) {
+    if (((decorators & IN_HEAP) != 0) ||
+        ((decorators & IN_CONCURRENT_ROOT) != 0) ||
+        ((decorators & ON_PHANTOM_OOP_REF) != 0)) {
+      // Barrier needed
+      return true;
+    }
+  }
+
+  // Barrier not neeed
+  return false;
+}
+
+void ZBarrierSet::on_thread_create(Thread* thread) {
+  // Create thread local data
+  ZThreadLocalData::create(thread);
+}
+
+void ZBarrierSet::on_thread_destroy(Thread* thread) {
+  // Destroy thread local data
+  ZThreadLocalData::destroy(thread);
+}
+
+void ZBarrierSet::on_thread_attach(JavaThread* thread) {
+  // Set thread local address bad mask
+  ZThreadLocalData::set_address_bad_mask(thread, ZAddressBadMask);
+}
+
+void ZBarrierSet::on_thread_detach(JavaThread* thread) {
+  // Flush and free any remaining mark stacks
+  ZHeap::heap()->mark_flush_and_free(thread);
+}
diff --git a/src/hotspot/share/gc/z/zBarrierSet.hpp b/src/hotspot/share/gc/z/zBarrierSet.hpp
new file mode 100644
index 00000000000..22405c1ff99
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSet.hpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBARRIERSET_HPP
+#define SHARE_GC_Z_ZBARRIERSET_HPP
+
+#include "gc/shared/barrierSet.hpp"
+
+class ZBarrierSetAssembler;
+
+class ZBarrierSet : public BarrierSet {
+public:
+  ZBarrierSet();
+
+  static ZBarrierSetAssembler* assembler();
+  static bool barrier_needed(DecoratorSet decorators, BasicType type);
+
+  virtual void on_thread_create(Thread* thread);
+  virtual void on_thread_destroy(Thread* thread);
+  virtual void on_thread_attach(JavaThread* thread);
+  virtual void on_thread_detach(JavaThread* thread);
+
+  virtual void print_on(outputStream* st) const {}
+
+  template <DecoratorSet decorators, typename BarrierSetT = ZBarrierSet>
+  class AccessBarrier : public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
+  private:
+    typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
+
+    template <DecoratorSet expected>
+    static void verify_decorators_present();
+
+    template <DecoratorSet expected>
+    static void verify_decorators_absent();
+
+    static oop* field_addr(oop base, ptrdiff_t offset);
+
+    template <typename T>
+    static oop load_barrier_on_oop_field_preloaded(T* addr, oop o);
+
+    template <typename T>
+    static oop load_barrier_on_unknown_oop_field_preloaded(oop base, ptrdiff_t offset, T* addr, oop o);
+
+  public:
+    //
+    // In heap
+    //
+    template <typename T>
+    static oop oop_load_in_heap(T* addr);
+    static oop oop_load_in_heap_at(oop base, ptrdiff_t offset);
+
+    template <typename T>
+    static oop oop_atomic_cmpxchg_in_heap(oop new_value, T* addr, oop compare_value);
+    static oop oop_atomic_cmpxchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset, oop compare_value);
+
+    template <typename T>
+    static oop oop_atomic_xchg_in_heap(oop new_value, T* addr);
+    static oop oop_atomic_xchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset);
+
+    template <typename T>
+    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                      size_t length);
+
+    static void clone_in_heap(oop src, oop dst, size_t size);
+
+    //
+    // Not in heap
+    //
+    template <typename T>
+    static oop oop_load_not_in_heap(T* addr);
+
+    template <typename T>
+    static oop oop_atomic_cmpxchg_not_in_heap(oop new_value, T* addr, oop compare_value);
+
+    template <typename T>
+    static oop oop_atomic_xchg_not_in_heap(oop new_value, T* addr);
+  };
+};
+
+template<> struct BarrierSet::GetName<ZBarrierSet> {
+  static const BarrierSet::Name value = BarrierSet::ZBarrierSet;
+};
+
+template<> struct BarrierSet::GetType<BarrierSet::ZBarrierSet> {
+  typedef ::ZBarrierSet type;
+};
+
+#endif // SHARE_GC_Z_ZBARRIERSET_HPP
diff --git a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
new file mode 100644
index 00000000000..23bc97bc3f4
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBARRIERSET_INLINE_HPP
+#define SHARE_GC_Z_ZBARRIERSET_INLINE_HPP
+
+#include "gc/shared/accessBarrierSupport.inline.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "utilities/debug.hpp"
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <DecoratorSet expected>
+inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::verify_decorators_present() {
+  if ((decorators & expected) == 0) {
+    fatal("Using unsupported access decorators");
+  }
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <DecoratorSet expected>
+inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::verify_decorators_absent() {
+  if ((decorators & expected) != 0) {
+    fatal("Using unsupported access decorators");
+  }
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+inline oop* ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::field_addr(oop base, ptrdiff_t offset) {
+  assert(base != NULL, "Invalid base");
+  return reinterpret_cast<oop*>(reinterpret_cast<intptr_t>((void*)base) + offset);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::load_barrier_on_oop_field_preloaded(T* addr, oop o) {
+  verify_decorators_absent<ON_UNKNOWN_OOP_REF>();
+
+  if (HasDecorator<decorators, AS_NO_KEEPALIVE>::value) {
+    if (HasDecorator<decorators, ON_STRONG_OOP_REF>::value) {
+      return ZBarrier::weak_load_barrier_on_oop_field_preloaded(addr, o);
+    } else if (HasDecorator<decorators, ON_WEAK_OOP_REF>::value) {
+      return ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(addr, o);
+    } else {
+      return ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(addr, o);
+    }
+  } else {
+    if (HasDecorator<decorators, ON_STRONG_OOP_REF>::value) {
+      return ZBarrier::load_barrier_on_oop_field_preloaded(addr, o);
+    } else if (HasDecorator<decorators, ON_WEAK_OOP_REF>::value) {
+      return ZBarrier::load_barrier_on_weak_oop_field_preloaded(addr, o);
+    } else {
+      return ZBarrier::load_barrier_on_phantom_oop_field_preloaded(addr, o);
+    }
+  }
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::load_barrier_on_unknown_oop_field_preloaded(oop base, ptrdiff_t offset, T* addr, oop o) {
+  verify_decorators_present<ON_UNKNOWN_OOP_REF>();
+
+  const DecoratorSet decorators_known_strength =
+    AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset);
+
+  if (HasDecorator<decorators, AS_NO_KEEPALIVE>::value) {
+    if (decorators_known_strength & ON_STRONG_OOP_REF) {
+      return ZBarrier::weak_load_barrier_on_oop_field_preloaded(addr, o);
+    } else if (decorators_known_strength & ON_WEAK_OOP_REF) {
+      return ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(addr, o);
+    } else {
+      return ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(addr, o);
+    }
+  } else {
+    if (decorators_known_strength & ON_STRONG_OOP_REF) {
+      return ZBarrier::load_barrier_on_oop_field_preloaded(addr, o);
+    } else if (decorators_known_strength & ON_WEAK_OOP_REF) {
+      return ZBarrier::load_barrier_on_weak_oop_field_preloaded(addr, o);
+    } else {
+      return ZBarrier::load_barrier_on_phantom_oop_field_preloaded(addr, o);
+    }
+  }
+}
+
+//
+// In heap
+//
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_load_in_heap(T* addr) {
+  verify_decorators_absent<ON_UNKNOWN_OOP_REF>();
+
+  const oop o = Raw::oop_load_in_heap(addr);
+  return load_barrier_on_oop_field_preloaded(addr, o);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_load_in_heap_at(oop base, ptrdiff_t offset) {
+  oop* const addr = field_addr(base, offset);
+  const oop o = Raw::oop_load_in_heap(addr);
+
+  if (HasDecorator<decorators, ON_UNKNOWN_OOP_REF>::value) {
+    return load_barrier_on_unknown_oop_field_preloaded(base, offset, addr, o);
+  }
+
+  return load_barrier_on_oop_field_preloaded(addr, o);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_in_heap(oop new_value, T* addr, oop compare_value) {
+  verify_decorators_present<ON_STRONG_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  ZBarrier::load_barrier_on_oop_field(addr);
+  return Raw::oop_atomic_cmpxchg_in_heap(new_value, addr, compare_value);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset, oop compare_value) {
+  verify_decorators_present<ON_STRONG_OOP_REF | ON_UNKNOWN_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  // Through Unsafe.CompareAndExchangeObject()/CompareAndSetObject() we can recieve
+  // calls with ON_UNKNOWN_OOP_REF set. However, we treat these as ON_STRONG_OOP_REF,
+  // with the motivation that if you're doing Unsafe operations on a Reference.referent
+  // field, then you're on your own anyway.
+  ZBarrier::load_barrier_on_oop_field(field_addr(base, offset));
+  return Raw::oop_atomic_cmpxchg_in_heap_at(new_value, base, offset, compare_value);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(oop new_value, T* addr) {
+  verify_decorators_present<ON_STRONG_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  const oop o = Raw::oop_atomic_xchg_in_heap(new_value, addr);
+  return ZBarrier::load_barrier_on_oop(o);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset) {
+  verify_decorators_present<ON_STRONG_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  const oop o = Raw::oop_atomic_xchg_in_heap_at(new_value, base, offset);
+  return ZBarrier::load_barrier_on_oop(o);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                                                       arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                                                       size_t length) {
+  T* src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+  T* dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+  if (!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
+    // No check cast, bulk barrier and bulk copy
+    ZBarrier::load_barrier_on_oop_array(src, length);
+    return Raw::oop_arraycopy_in_heap(NULL, 0, src, NULL, 0, dst, length);
+  }
+
+  // Check cast and copy each elements
+  Klass* const dst_klass = objArrayOop(dst_obj)->element_klass();
+  for (const T* const end = src + length; src < end; src++, dst++) {
+    const oop elem = ZBarrier::load_barrier_on_oop_field(src);
+    if (!oopDesc::is_instanceof_or_null(elem, dst_klass)) {
+      // Check cast failed
+      return false;
+    }
+
+    // Cast is safe, since we know it's never a narrowOop
+    *(oop*)dst = elem;
+  }
+
+  return true;
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::clone_in_heap(oop src, oop dst, size_t size) {
+  ZBarrier::load_barrier_on_oop_fields(src);
+  Raw::clone_in_heap(src, dst, size);
+}
+
+//
+// Not in heap
+//
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_load_not_in_heap(T* addr) {
+  const oop o = Raw::oop_load_not_in_heap(addr);
+
+  if (HasDecorator<decorators, ON_PHANTOM_OOP_REF>::value) {
+    return load_barrier_on_oop_field_preloaded(addr, o);
+  }
+
+  verify_decorators_present<ON_STRONG_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  return o;
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_not_in_heap(oop new_value, T* addr, oop compare_value) {
+  verify_decorators_present<ON_STRONG_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  return Raw::oop_atomic_cmpxchg_not_in_heap(new_value, addr, compare_value);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(oop new_value, T* addr) {
+  verify_decorators_present<ON_STRONG_OOP_REF>();
+  verify_decorators_absent<AS_NO_KEEPALIVE>();
+
+  return Raw::oop_atomic_xchg_not_in_heap(new_value, addr);
+}
+
+#endif // SHARE_GC_Z_ZBARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp b/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp
new file mode 100644
index 00000000000..ace07bec98d
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zBarrierSetAssembler.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "runtime/thread.hpp"
+
+Address ZBarrierSetAssemblerBase::address_bad_mask_from_thread(Register thread) {
+  return Address(thread, ZThreadLocalData::address_bad_mask_offset());
+}
+
+Address ZBarrierSetAssemblerBase::address_bad_mask_from_jni_env(Register env) {
+  return Address(env, ZThreadLocalData::address_bad_mask_offset() - JavaThread::jni_environment_offset());
+}
diff --git a/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp b/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp
new file mode 100644
index 00000000000..52133c0737e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP
+#define SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "oops/accessDecorators.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+class ZBarrierSetAssemblerBase : public BarrierSetAssembler {
+public:
+  static Address address_bad_mask_from_thread(Register thread);
+  static Address address_bad_mask_from_jni_env(Register env);
+};
+
+#include CPU_HEADER(gc/z/zBarrierSetAssembler)
+
+#endif // SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP
diff --git a/src/hotspot/share/gc/z/zBarrierSetRuntime.cpp b/src/hotspot/share/gc/z/zBarrierSetRuntime.cpp
new file mode 100644
index 00000000000..c64ad7a987f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSetRuntime.cpp
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zBarrierSetRuntime.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+
+JRT_LEAF(oopDesc*, ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded(oopDesc* o, oop* p))
+  return ZBarrier::load_barrier_on_oop_field_preloaded(p, o);
+JRT_END
+
+JRT_LEAF(oopDesc*, ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded(oopDesc* o, oop* p))
+  return ZBarrier::load_barrier_on_weak_oop_field_preloaded(p, o);
+JRT_END
+
+JRT_LEAF(oopDesc*, ZBarrierSetRuntime::load_barrier_on_phantom_oop_field_preloaded(oopDesc* o, oop* p))
+  return ZBarrier::load_barrier_on_phantom_oop_field_preloaded(p, o);
+JRT_END
+
+JRT_LEAF(void, ZBarrierSetRuntime::load_barrier_on_oop_array(oop* p, size_t length))
+  ZBarrier::load_barrier_on_oop_array(p, length);
+JRT_END
+
+address ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(DecoratorSet decorators) {
+  if (decorators & ON_PHANTOM_OOP_REF) {
+    return load_barrier_on_phantom_oop_field_preloaded_addr();
+  } else if (decorators & ON_WEAK_OOP_REF) {
+    return load_barrier_on_weak_oop_field_preloaded_addr();
+  } else {
+    return load_barrier_on_oop_field_preloaded_addr();
+  }
+}
+
+address ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr() {
+  return reinterpret_cast<address>(load_barrier_on_oop_field_preloaded);
+}
+
+address ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded_addr() {
+  return reinterpret_cast<address>(load_barrier_on_weak_oop_field_preloaded);
+}
+
+address ZBarrierSetRuntime::load_barrier_on_phantom_oop_field_preloaded_addr() {
+  return reinterpret_cast<address>(load_barrier_on_phantom_oop_field_preloaded);
+}
+
+address ZBarrierSetRuntime::load_barrier_on_oop_array_addr() {
+  return reinterpret_cast<address>(load_barrier_on_oop_array);
+}
diff --git a/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp
new file mode 100644
index 00000000000..cfccb325855
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP
+#define SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP
+
+#include "memory/allocation.hpp"
+#include "oops/accessDecorators.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class oopDesc;
+
+class ZBarrierSetRuntime : public AllStatic {
+private:
+  static oopDesc* load_barrier_on_oop_field_preloaded(oopDesc* o, oop* p);
+  static oopDesc* load_barrier_on_weak_oop_field_preloaded(oopDesc* o, oop* p);
+  static oopDesc* load_barrier_on_phantom_oop_field_preloaded(oopDesc* o, oop* p);
+  static void load_barrier_on_oop_array(oop* p, size_t length);
+
+public:
+  static address load_barrier_on_oop_field_preloaded_addr(DecoratorSet decorators);
+  static address load_barrier_on_oop_field_preloaded_addr();
+  static address load_barrier_on_weak_oop_field_preloaded_addr();
+  static address load_barrier_on_phantom_oop_field_preloaded_addr();
+  static address load_barrier_on_oop_array_addr();
+};
+
+#endif // SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP
diff --git a/src/hotspot/share/gc/z/zBitField.hpp b/src/hotspot/share/gc/z/zBitField.hpp
new file mode 100644
index 00000000000..7114e4c097c
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBitField.hpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBITFIELD_HPP
+#define SHARE_GC_Z_ZBITFIELD_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
+
+//
+//  Example
+//  -------
+//
+//  typedef ZBitField<uint64_t, uint8_t,  0,  2, 3> field_word_aligned_size;
+//  typedef ZBitField<uint64_t, uint32_t, 2, 30>    field_length;
+//
+//
+//   6                                 3 3
+//   3                                 2 1                               2 10
+//  +-----------------------------------+---------------------------------+--+
+//  |11111111 11111111 11111111 11111111|11111111 11111111 11111111 111111|11|
+//  +-----------------------------------+---------------------------------+--+
+//  |                                   |                                 |
+//  |       31-2 field_length (30-bits) *                                 |
+//  |                                                                     |
+//  |                                1-0 field_word_aligned_size (2-bits) *
+//  |
+//  * 63-32 Unused (32-bits)
+//
+//
+//  field_word_aligned_size::encode(16) = 2
+//  field_length::encode(2342) = 9368
+//
+//  field_word_aligned_size::decode(9368 | 2) = 16
+//  field_length::decode(9368 | 2) = 2342
+//
+
+template <typename ContainerType, typename ValueType, int FieldShift, int FieldBits, int ValueShift = 0>
+class ZBitField : public AllStatic {
+private:
+  static const int ContainerBits = sizeof(ContainerType) * BitsPerByte;
+
+  STATIC_ASSERT(FieldBits < ContainerBits);
+  STATIC_ASSERT(FieldShift + FieldBits <= ContainerBits);
+  STATIC_ASSERT(ValueShift + FieldBits <= ContainerBits);
+
+  static const ContainerType FieldMask = (((ContainerType)1 << FieldBits) - 1);
+
+public:
+  static ValueType decode(ContainerType container) {
+    return (ValueType)(((container >> FieldShift) & FieldMask) << ValueShift);
+  }
+
+  static ContainerType encode(ValueType value) {
+    assert(((ContainerType)value & (FieldMask << ValueShift)) == (ContainerType)value, "Invalid value");
+    return ((ContainerType)value >> ValueShift) << FieldShift;
+  }
+};
+
+#endif // SHARE_GC_Z_ZBITFIELD_HPP
diff --git a/src/hotspot/share/gc/z/zBitMap.hpp b/src/hotspot/share/gc/z/zBitMap.hpp
new file mode 100644
index 00000000000..dc00fc19981
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBitMap.hpp
@@ -0,0 +1,42 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBITMAP_HPP
+#define SHARE_GC_Z_ZBITMAP_HPP
+
+#include "utilities/bitMap.hpp"
+
+class ZBitMap : public CHeapBitMap {
+private:
+  static bm_word_t bit_mask_pair(idx_t bit);
+
+  bool par_set_bit_pair_finalizable(idx_t bit, bool& inc_live);
+  bool par_set_bit_pair_strong(idx_t bit, bool& inc_live);
+
+public:
+  ZBitMap(idx_t size_in_bits);
+
+  bool par_set_bit_pair(idx_t bit, bool finalizable, bool& inc_live);
+};
+
+#endif // SHARE_GC_Z_ZBITMAP_HPP
diff --git a/src/hotspot/share/gc/z/zBitMap.inline.hpp b/src/hotspot/share/gc/z/zBitMap.inline.hpp
new file mode 100644
index 00000000000..7b67310dd73
--- /dev/null
+++ b/src/hotspot/share/gc/z/zBitMap.inline.hpp
@@ -0,0 +1,75 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZBITMAP_INLINE_HPP
+#define SHARE_GC_Z_ZBITMAP_INLINE_HPP
+
+#include "gc/z/zBitMap.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/bitMap.inline.hpp"
+#include "utilities/debug.hpp"
+
+inline ZBitMap::ZBitMap(idx_t size_in_bits) :
+    CHeapBitMap(size_in_bits, mtGC, false /* clear */) {}
+
+inline BitMap::bm_word_t ZBitMap::bit_mask_pair(idx_t bit) {
+  assert(bit_in_word(bit) < BitsPerWord - 1, "Invalid bit index");
+  return (bm_word_t)3 << bit_in_word(bit);
+}
+
+inline bool ZBitMap::par_set_bit_pair_finalizable(idx_t bit, bool& inc_live) {
+  inc_live = par_set_bit(bit);
+  return inc_live;
+}
+
+inline bool ZBitMap::par_set_bit_pair_strong(idx_t bit, bool& inc_live) {
+  verify_index(bit);
+  volatile bm_word_t* const addr = word_addr(bit);
+  const bm_word_t pair_mask = bit_mask_pair(bit);
+  bm_word_t old_val = *addr;
+
+  do {
+    const bm_word_t new_val = old_val | pair_mask;
+    if (new_val == old_val) {
+      inc_live = false;
+      return false;     // Someone else beat us to it.
+    }
+    const bm_word_t cur_val = Atomic::cmpxchg(new_val, addr, old_val);
+    if (cur_val == old_val) {
+      const bm_word_t marked_mask = bit_mask(bit);
+      inc_live = !(old_val & marked_mask);
+      return true;      // Success.
+    }
+    old_val = cur_val;  // The value changed, try again.
+  } while (true);
+}
+
+inline bool ZBitMap::par_set_bit_pair(idx_t bit, bool finalizable, bool& inc_live) {
+  if (finalizable) {
+    return par_set_bit_pair_finalizable(bit, inc_live);
+  } else {
+    return par_set_bit_pair_strong(bit, inc_live);
+  }
+}
+
+#endif // SHARE_GC_Z_ZBITMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zCPU.cpp b/src/hotspot/share/gc/z/zCPU.cpp
new file mode 100644
index 00000000000..3213d1cf38f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zCPU.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zCPU.hpp"
+#include "logging/log.hpp"
+#include "memory/padded.inline.hpp"
+#include "runtime/os.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/debug.hpp"
+
+#define ZCPU_UNKNOWN_AFFINITY (Thread*)-1;
+#define ZCPU_UNKNOWN_SELF     (Thread*)-2;
+
+PaddedEnd<ZCPU::ZCPUAffinity>* ZCPU::_affinity = NULL;
+__thread Thread*  ZCPU::_self                  = ZCPU_UNKNOWN_SELF;
+__thread uint32_t ZCPU::_cpu                   = 0;
+
+void ZCPU::initialize() {
+  assert(_affinity == NULL, "Already initialized");
+  const uint32_t ncpus = count();
+
+  _affinity = PaddedArray<ZCPUAffinity, mtGC>::create_unfreeable(ncpus);
+
+  for (uint32_t i = 0; i < ncpus; i++) {
+    _affinity[i]._thread = ZCPU_UNKNOWN_AFFINITY;
+  }
+
+  log_info(gc, init)("CPUs: %u total, %u available",
+                     os::processor_count(),
+                     os::initial_active_processor_count());
+}
+
+uint32_t ZCPU::count() {
+  return os::processor_count();
+}
+
+uint32_t ZCPU::id() {
+  assert(_affinity != NULL, "Not initialized");
+
+  // Fast path
+  if (_affinity[_cpu]._thread == _self) {
+    return _cpu;
+  }
+
+  // Slow path
+  _self = Thread::current();
+  _cpu = os::processor_id();
+
+  // Update affinity table
+  _affinity[_cpu]._thread = _self;
+
+  return _cpu;
+}
diff --git a/src/hotspot/share/gc/z/zCPU.hpp b/src/hotspot/share/gc/z/zCPU.hpp
new file mode 100644
index 00000000000..a92a175d0ab
--- /dev/null
+++ b/src/hotspot/share/gc/z/zCPU.hpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZCPU_HPP
+#define SHARE_GC_Z_ZCPU_HPP
+
+#include "memory/allocation.hpp"
+#include "memory/padded.hpp"
+
+class Thread;
+
+class ZCPU : public AllStatic {
+private:
+  struct ZCPUAffinity {
+    Thread* _thread;
+  };
+
+  static PaddedEnd<ZCPUAffinity>* _affinity;
+  static __thread Thread*         _self;
+  static __thread uint32_t        _cpu;
+
+public:
+  static void initialize();
+
+  static uint32_t count();
+  static uint32_t id();
+};
+
+#endif // SHARE_GC_Z_ZCPU_HPP
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
new file mode 100644
index 00000000000..0b26326468f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zNMethodTable.hpp"
+#include "gc/z/zServiceability.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+
+ZCollectedHeap* ZCollectedHeap::heap() {
+  CollectedHeap* heap = Universe::heap();
+  assert(heap != NULL, "Uninitialized access to ZCollectedHeap::heap()");
+  assert(heap->kind() == CollectedHeap::Z, "Invalid name");
+  return (ZCollectedHeap*)heap;
+}
+
+ZCollectedHeap::ZCollectedHeap(ZCollectorPolicy* policy) :
+    _collector_policy(policy),
+    _soft_ref_policy(),
+    _barrier_set(),
+    _initialize(&_barrier_set),
+    _heap(),
+    _director(new ZDirector()),
+    _driver(new ZDriver()),
+    _stat(new ZStat()),
+    _runtime_workers() {}
+
+CollectedHeap::Name ZCollectedHeap::kind() const {
+  return CollectedHeap::Z;
+}
+
+const char* ZCollectedHeap::name() const {
+  return ZGCName;
+}
+
+jint ZCollectedHeap::initialize() {
+  if (!_heap.is_initialized()) {
+    return JNI_ENOMEM;
+  }
+
+  initialize_reserved_region((HeapWord*)ZAddressReservedStart(),
+                             (HeapWord*)ZAddressReservedEnd());
+
+  return JNI_OK;
+}
+
+void ZCollectedHeap::initialize_serviceability() {
+  _heap.serviceability_initialize();
+}
+
+void ZCollectedHeap::stop() {
+  _director->stop();
+  _driver->stop();
+  _stat->stop();
+}
+
+CollectorPolicy* ZCollectedHeap::collector_policy() const {
+  return _collector_policy;
+}
+
+SoftRefPolicy* ZCollectedHeap::soft_ref_policy() {
+  return &_soft_ref_policy;
+}
+
+size_t ZCollectedHeap::max_capacity() const {
+  return _heap.max_capacity();
+}
+
+size_t ZCollectedHeap::capacity() const {
+  return _heap.capacity();
+}
+
+size_t ZCollectedHeap::used() const {
+  return _heap.used();
+}
+
+bool ZCollectedHeap::is_maximal_no_gc() const {
+  // Not supported
+  ShouldNotReachHere();
+  return false;
+}
+
+bool ZCollectedHeap::is_scavengable(oop obj) {
+  return false;
+}
+
+bool ZCollectedHeap::is_in(const void* p) const {
+  return is_in_reserved(p) && _heap.is_in((uintptr_t)p);
+}
+
+bool ZCollectedHeap::is_in_closed_subset(const void* p) const {
+  return is_in(p);
+}
+
+HeapWord* ZCollectedHeap::allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) {
+  const size_t size_in_bytes = ZUtils::words_to_bytes(align_object_size(requested_size));
+  const uintptr_t addr = _heap.alloc_tlab(size_in_bytes);
+
+  if (addr != 0) {
+    *actual_size = requested_size;
+  }
+
+  return (HeapWord*)addr;
+}
+
+HeapWord* ZCollectedHeap::mem_allocate(size_t size, bool* gc_overhead_limit_was_exceeded) {
+  const size_t size_in_bytes = ZUtils::words_to_bytes(align_object_size(size));
+  return (HeapWord*)_heap.alloc_object(size_in_bytes);
+}
+
+MetaWord* ZCollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
+                                                             size_t size,
+                                                             Metaspace::MetadataType mdtype) {
+  MetaWord* result;
+
+  // Start asynchronous GC
+  collect(GCCause::_metadata_GC_threshold);
+
+  // Expand and retry allocation
+  result = loader_data->metaspace_non_null()->expand_and_allocate(size, mdtype);
+  if (result != NULL) {
+    return result;
+  }
+
+  // Start synchronous GC
+  collect(GCCause::_metadata_GC_clear_soft_refs);
+
+  // Retry allocation
+  result = loader_data->metaspace_non_null()->allocate(size, mdtype);
+  if (result != NULL) {
+    return result;
+  }
+
+  // Expand and retry allocation
+  result = loader_data->metaspace_non_null()->expand_and_allocate(size, mdtype);
+  if (result != NULL) {
+    return result;
+  }
+
+  // Out of memory
+  return NULL;
+}
+
+void ZCollectedHeap::collect(GCCause::Cause cause) {
+  _driver->collect(cause);
+}
+
+void ZCollectedHeap::collect_as_vm_thread(GCCause::Cause cause) {
+  // These collection requests are ignored since ZGC can't run a synchronous
+  // GC cycle from within the VM thread. This is considered benign, since the
+  // only GC causes comming in here should be heap dumper and heap inspector.
+  // However, neither the heap dumper nor the heap inspector really need a GC
+  // to happen, but the result of their heap iterations might in that case be
+  // less accurate since they might include objects that would otherwise have
+  // been collected by a GC.
+  assert(Thread::current()->is_VM_thread(), "Should be the VM thread");
+  guarantee(cause == GCCause::_heap_dump ||
+            cause == GCCause::_heap_inspection, "Invalid cause");
+}
+
+void ZCollectedHeap::do_full_collection(bool clear_all_soft_refs) {
+  // Not supported
+  ShouldNotReachHere();
+}
+
+bool ZCollectedHeap::supports_tlab_allocation() const {
+  return true;
+}
+
+size_t ZCollectedHeap::tlab_capacity(Thread* ignored) const {
+  return _heap.tlab_capacity();
+}
+
+size_t ZCollectedHeap::tlab_used(Thread* ignored) const {
+  return _heap.tlab_used();
+}
+
+size_t ZCollectedHeap::max_tlab_size() const {
+  return _heap.max_tlab_size();
+}
+
+size_t ZCollectedHeap::unsafe_max_tlab_alloc(Thread* ignored) const {
+  return _heap.unsafe_max_tlab_alloc();
+}
+
+bool ZCollectedHeap::can_elide_tlab_store_barriers() const {
+  return false;
+}
+
+bool ZCollectedHeap::can_elide_initializing_store_barrier(oop new_obj) {
+  // Not supported
+  ShouldNotReachHere();
+  return true;
+}
+
+bool ZCollectedHeap::card_mark_must_follow_store() const {
+  // Not supported
+  ShouldNotReachHere();
+  return false;
+}
+
+GrowableArray<GCMemoryManager*> ZCollectedHeap::memory_managers() {
+  return GrowableArray<GCMemoryManager*>(1, 1, _heap.serviceability_memory_manager());
+}
+
+GrowableArray<MemoryPool*> ZCollectedHeap::memory_pools() {
+  return GrowableArray<MemoryPool*>(1, 1, _heap.serviceability_memory_pool());
+}
+
+void ZCollectedHeap::object_iterate(ObjectClosure* cl) {
+  _heap.object_iterate(cl);
+}
+
+void ZCollectedHeap::safe_object_iterate(ObjectClosure* cl) {
+  _heap.object_iterate(cl);
+}
+
+HeapWord* ZCollectedHeap::block_start(const void* addr) const {
+  return (HeapWord*)_heap.block_start((uintptr_t)addr);
+}
+
+size_t ZCollectedHeap::block_size(const HeapWord* addr) const {
+  size_t size_in_bytes = _heap.block_size((uintptr_t)addr);
+  return ZUtils::bytes_to_words(size_in_bytes);
+}
+
+bool ZCollectedHeap::block_is_obj(const HeapWord* addr) const {
+  return _heap.block_is_obj((uintptr_t)addr);
+}
+
+void ZCollectedHeap::register_nmethod(nmethod* nm) {
+  assert_locked_or_safepoint(CodeCache_lock);
+  ZNMethodTable::register_nmethod(nm);
+}
+
+void ZCollectedHeap::unregister_nmethod(nmethod* nm) {
+  assert_locked_or_safepoint(CodeCache_lock);
+  ZNMethodTable::unregister_nmethod(nm);
+}
+
+void ZCollectedHeap::verify_nmethod(nmethod* nm) {
+  // Does nothing
+}
+
+WorkGang* ZCollectedHeap::get_safepoint_workers() {
+  return _runtime_workers.workers();
+}
+
+jlong ZCollectedHeap::millis_since_last_gc() {
+  return ZStatCycle::time_since_last() / MILLIUNITS;
+}
+
+void ZCollectedHeap::gc_threads_do(ThreadClosure* tc) const {
+  tc->do_thread(_director);
+  tc->do_thread(_driver);
+  tc->do_thread(_stat);
+  _heap.worker_threads_do(tc);
+  _runtime_workers.threads_do(tc);
+}
+
+VirtualSpaceSummary ZCollectedHeap::create_heap_space_summary() {
+  const size_t capacity_in_words = capacity() / HeapWordSize;
+  const size_t max_capacity_in_words = max_capacity() / HeapWordSize;
+  return VirtualSpaceSummary(reserved_region().start(),
+                             reserved_region().start() + capacity_in_words,
+                             reserved_region().start() + max_capacity_in_words);
+}
+
+void ZCollectedHeap::prepare_for_verify() {
+  // Does nothing
+}
+
+void ZCollectedHeap::print_on(outputStream* st) const {
+  _heap.print_on(st);
+}
+
+void ZCollectedHeap::print_on_error(outputStream* st) const {
+  CollectedHeap::print_on_error(st);
+
+  st->print_cr("Address Space");
+  st->print_cr( "     Start:             " PTR_FORMAT, ZAddressSpaceStart);
+  st->print_cr( "     End:               " PTR_FORMAT, ZAddressSpaceEnd);
+  st->print_cr( "     Size:              " SIZE_FORMAT_W(-15) " (" PTR_FORMAT ")", ZAddressSpaceSize, ZAddressSpaceSize);
+  st->print_cr( "Heap");
+  st->print_cr( "     GlobalPhase:       %u", ZGlobalPhase);
+  st->print_cr( "     GlobalSeqNum:      %u", ZGlobalSeqNum);
+  st->print_cr( "     Offset Max:        " SIZE_FORMAT_W(-15) " (" PTR_FORMAT ")", ZAddressOffsetMax, ZAddressOffsetMax);
+  st->print_cr( "     Page Size Small:   " SIZE_FORMAT_W(-15) " (" PTR_FORMAT ")", ZPageSizeSmall, ZPageSizeSmall);
+  st->print_cr( "     Page Size Medium:  " SIZE_FORMAT_W(-15) " (" PTR_FORMAT ")", ZPageSizeMedium, ZPageSizeMedium);
+  st->print_cr( "Metadata Bits");
+  st->print_cr( "     Good:              " PTR_FORMAT, ZAddressGoodMask);
+  st->print_cr( "     Bad:               " PTR_FORMAT, ZAddressBadMask);
+  st->print_cr( "     WeakBad:           " PTR_FORMAT, ZAddressWeakBadMask);
+  st->print_cr( "     Marked:            " PTR_FORMAT, ZAddressMetadataMarked);
+  st->print_cr( "     Remapped:          " PTR_FORMAT, ZAddressMetadataRemapped);
+}
+
+void ZCollectedHeap::print_extended_on(outputStream* st) const {
+  _heap.print_extended_on(st);
+}
+
+void ZCollectedHeap::print_gc_threads_on(outputStream* st) const {
+  _director->print_on(st);
+  st->cr();
+  _driver->print_on(st);
+  st->cr();
+  _stat->print_on(st);
+  st->cr();
+  _heap.print_worker_threads_on(st);
+  _runtime_workers.print_threads_on(st);
+}
+
+void ZCollectedHeap::print_tracing_info() const {
+  // Does nothing
+}
+
+void ZCollectedHeap::verify(VerifyOption option /* ignored */) {
+  _heap.verify();
+}
+
+bool ZCollectedHeap::is_oop(oop object) const {
+  return CollectedHeap::is_oop(object) && _heap.is_oop(object);
+}
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp
new file mode 100644
index 00000000000..408ba51224a
--- /dev/null
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZCOLLECTEDHEAP_HPP
+#define SHARE_GC_Z_ZCOLLECTEDHEAP_HPP
+
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/softRefPolicy.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "gc/z/zCollectorPolicy.hpp"
+#include "gc/z/zDirector.hpp"
+#include "gc/z/zDriver.hpp"
+#include "gc/z/zInitialize.hpp"
+#include "gc/z/zHeap.hpp"
+#include "gc/z/zRuntimeWorkers.hpp"
+#include "gc/z/zStat.hpp"
+
+class ZCollectedHeap : public CollectedHeap {
+  friend class VMStructs;
+
+private:
+  ZCollectorPolicy* _collector_policy;
+  SoftRefPolicy     _soft_ref_policy;
+  ZBarrierSet       _barrier_set;
+  ZInitialize       _initialize;
+  ZHeap             _heap;
+  ZDirector*        _director;
+  ZDriver*          _driver;
+  ZStat*            _stat;
+  ZRuntimeWorkers   _runtime_workers;
+
+  virtual HeapWord* allocate_new_tlab(size_t min_size,
+                                      size_t requested_size,
+                                      size_t* actual_size);
+
+public:
+  static ZCollectedHeap* heap();
+
+  using CollectedHeap::ensure_parsability;
+  using CollectedHeap::accumulate_statistics_all_tlabs;
+  using CollectedHeap::resize_all_tlabs;
+
+  ZCollectedHeap(ZCollectorPolicy* policy);
+  virtual Name kind() const;
+  virtual const char* name() const;
+  virtual jint initialize();
+  virtual void initialize_serviceability();
+  virtual void stop();
+
+  virtual CollectorPolicy* collector_policy() const;
+  virtual SoftRefPolicy* soft_ref_policy();
+
+  virtual size_t max_capacity() const;
+  virtual size_t capacity() const;
+  virtual size_t used() const;
+
+  virtual bool is_maximal_no_gc() const;
+  virtual bool is_scavengable(oop obj);
+  virtual bool is_in(const void* p) const;
+  virtual bool is_in_closed_subset(const void* p) const;
+
+  virtual HeapWord* mem_allocate(size_t size, bool* gc_overhead_limit_was_exceeded);
+  virtual MetaWord* satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
+                                                       size_t size,
+                                                       Metaspace::MetadataType mdtype);
+  virtual void collect(GCCause::Cause cause);
+  virtual void collect_as_vm_thread(GCCause::Cause cause);
+  virtual void do_full_collection(bool clear_all_soft_refs);
+
+  virtual bool supports_tlab_allocation() const;
+  virtual size_t tlab_capacity(Thread* thr) const;
+  virtual size_t tlab_used(Thread* thr) const;
+  virtual size_t max_tlab_size() const;
+  virtual size_t unsafe_max_tlab_alloc(Thread* thr) const;
+
+  virtual bool can_elide_tlab_store_barriers() const;
+  virtual bool can_elide_initializing_store_barrier(oop new_obj);
+  virtual bool card_mark_must_follow_store() const;
+
+  virtual GrowableArray<GCMemoryManager*> memory_managers();
+  virtual GrowableArray<MemoryPool*> memory_pools();
+
+  virtual void object_iterate(ObjectClosure* cl);
+  virtual void safe_object_iterate(ObjectClosure* cl);
+
+  virtual HeapWord* block_start(const void* addr) const;
+  virtual size_t block_size(const HeapWord* addr) const;
+  virtual bool block_is_obj(const HeapWord* addr) const;
+
+  virtual void register_nmethod(nmethod* nm);
+  virtual void unregister_nmethod(nmethod* nm);
+  virtual void verify_nmethod(nmethod* nmethod);
+
+  virtual WorkGang* get_safepoint_workers();
+
+  virtual jlong millis_since_last_gc();
+
+  virtual void gc_threads_do(ThreadClosure* tc) const;
+
+  virtual VirtualSpaceSummary create_heap_space_summary();
+
+  virtual void print_on(outputStream* st) const;
+  virtual void print_on_error(outputStream* st) const;
+  virtual void print_extended_on(outputStream* st) const;
+  virtual void print_gc_threads_on(outputStream* st) const;
+  virtual void print_tracing_info() const;
+
+  virtual void prepare_for_verify();
+  virtual void verify(VerifyOption option /* ignored */);
+  virtual bool is_oop(oop object) const;
+};
+
+#endif // SHARE_GC_Z_ZCOLLECTEDHEAP_HPP
diff --git a/src/hotspot/share/gc/z/zCollectorPolicy.cpp b/src/hotspot/share/gc/z/zCollectorPolicy.cpp
new file mode 100644
index 00000000000..2845c791ae1
--- /dev/null
+++ b/src/hotspot/share/gc/z/zCollectorPolicy.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zCollectorPolicy.hpp"
+#include "gc/z/zGlobals.hpp"
+
+void ZCollectorPolicy::initialize_alignments() {
+  _space_alignment = ZPageSizeMin;
+  _heap_alignment = _space_alignment;
+}
diff --git a/src/hotspot/share/gc/z/zCollectorPolicy.hpp b/src/hotspot/share/gc/z/zCollectorPolicy.hpp
new file mode 100644
index 00000000000..d55c9ecde71
--- /dev/null
+++ b/src/hotspot/share/gc/z/zCollectorPolicy.hpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZCOLLECTORPOLICY_HPP
+#define SHARE_GC_Z_ZCOLLECTORPOLICY_HPP
+
+#include "gc/shared/collectorPolicy.hpp"
+
+class ZCollectorPolicy : public CollectorPolicy {
+public:
+  virtual void initialize_alignments();
+};
+
+#endif // SHARE_GC_Z_ZCOLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/z/zDebug.gdb b/src/hotspot/share/gc/z/zDebug.gdb
new file mode 100644
index 00000000000..74272ebdf58
--- /dev/null
+++ b/src/hotspot/share/gc/z/zDebug.gdb
@@ -0,0 +1,147 @@
+#
+# GDB functions for debugging the Z Garbage Collector
+#
+
+printf "Loading zDebug.gdb\n"
+
+# Print Klass*
+define zpk
+    printf "Klass: %s\n", (char*)((Klass*)($arg0))->_name->_body
+end
+
+# Print oop
+define zpo
+    set $obj = (oopDesc*)($arg0)
+
+    printf "Oop:   0x%016llx\tState: ", (uintptr_t)$obj
+    if ((uintptr_t)$obj & (uintptr_t)ZAddressGoodMask)
+        printf "Good "
+        if ((uintptr_t)$obj & (uintptr_t)ZAddressMetadataRemapped)
+            printf "(Remapped)"
+        else
+            if ((uintptr_t)$obj & (uintptr_t)ZAddressMetadataMarked)
+                printf "(Marked)"
+            else
+                printf "(Unknown)"
+            end
+        end
+    else
+        printf "Bad "
+        if ((uintptr_t)ZAddressGoodMask & (uintptr_t)ZAddressMetadataMarked)
+            # Should be marked
+            if ((uintptr_t)$obj & (uintptr_t)ZAddressMetadataRemapped)
+                printf "(Not Marked, Remapped)"
+            else
+                printf "(Not Marked, Not Remapped)"
+            end
+        else
+            if ((uintptr_t)ZAddressGoodMask & (uintptr_t)ZAddressMetadataRemapped)
+                # Should be remapped
+                if ((uintptr_t)$obj & (uintptr_t)ZAddressMetadataMarked)
+                    printf "(Marked, Not Remapped)"
+                else
+                    printf "(Not Marked, Not Remapped)"
+                end
+            else
+                # Unknown
+                printf "(Unknown)"
+            end
+        end
+    end
+    printf "\t Page: %llu\n", ((uintptr_t)$obj & ZAddressOffsetMask) >> ZPageSizeMinShift
+    x/16gx $obj
+    printf "Mark:  0x%016llx\tKlass: %s\n", (uintptr_t)$obj->_mark, (char*)$obj->_metadata->_klass->_name->_body
+end
+
+# Print heap page by pagetable index
+define zpp
+    set $page = (ZPage*)((uintptr_t)ZHeap::_heap._pagetable._map._map[($arg0)] & ~1)
+    printf "Page %p\n", $page
+    print *$page
+end
+
+# Print pagetable
+define zpt
+    printf "Pagetable (first 128 slots)\n"
+    x/128gx ZHeap::_heap._pagetable._map._map
+end
+
+# Print live map
+define __zmarked
+    set $livemap   = $arg0
+    set $bit        = $arg1
+    set $size       = $livemap._bitmap._size
+    set $segment    = $size / ZLiveMap::nsegments
+    set $segment_bit = 1 << $segment
+
+    printf "Segment is "
+    if !($livemap._segment_live_bits & $segment_bit)
+        printf "NOT "
+    end
+    printf "live (segment %d)\n", $segment
+
+    if $bit >= $size
+        print "Error: Bit %z out of bounds (bitmap size %z)\n", $bit, $size
+    else
+        set $word_index = $bit / 64
+        set $bit_index  = $bit % 64
+        set $word       = $livemap._bitmap._map[$word_index]
+        set $live_bit   = $word & (1 << $bit_index)
+
+        printf "Object is "
+        if $live_bit == 0
+            printf "NOT "
+        end
+        printf "live (word index %d, bit index %d)\n", $word_index, $bit_index
+    end
+end
+
+define zmarked
+    set $addr          = $arg0
+    set $obj           = ((uintptr_t)$addr & ZAddressOffsetMask)
+    set $page_index    = $obj >> ZPageSizeMinShift
+    set $page_entry    = (uintptr_t)ZHeap::_heap._pagetable._map._map[$page_index]
+    set $page          = (ZPage*)($page_entry & ~1)
+    set $page_start    = (uintptr_t)$page._virtual._start
+    set $page_end      = (uintptr_t)$page._virtual._end
+    set $page_seqnum   = $page._livemap._seqnum
+    set $global_seqnum = ZGlobalSeqNum
+
+    if $obj < $page_start || $obj >= $page_end
+        printf "Error: %p not in page %p (start %p, end %p)\n", $obj, $page, $page_start, $page_end
+    else
+        printf "Page is "
+        if $page_seqnum != $global_seqnum
+            printf "NOT "
+        end
+        printf "live (page %p, page seqnum %d, global seqnum %d)\n", $page, $page_seqnum, $global_seqnum
+
+        #if $page_seqnum == $global_seqnum
+            set $offset = $obj - $page_start
+            set $bit = $offset / 8
+            __zmarked $page._livemap $bit
+        #end
+    end
+end
+
+# Print heap information
+define zph
+    printf "Address Space\n"
+    printf "     Start:             0x%llx\n", ZAddressSpaceStart
+    printf "     End:               0x%llx\n", ZAddressSpaceEnd
+    printf "     Size:              %-15llu (0x%llx)\n", ZAddressSpaceSize, ZAddressSpaceSize
+    printf "Heap\n"
+    printf "     GlobalPhase:       %u\n", ZGlobalPhase
+    printf "     GlobalSeqNum:      %u\n", ZGlobalSeqNum
+    printf "     Offset Max:        %-15llu (0x%llx)\n", ZAddressOffsetMax, ZAddressOffsetMax
+    printf "     Page Size Small:   %-15llu (0x%llx)\n", ZPageSizeSmall, ZPageSizeSmall
+    printf "     Page Size Medium:  %-15llu (0x%llx)\n", ZPageSizeMedium, ZPageSizeMedium
+    printf "Metadata Bits\n"
+    printf "     Good:              0x%016llx\n", ZAddressGoodMask
+    printf "     Bad:               0x%016llx\n", ZAddressBadMask
+    printf "     WeakBad:           0x%016llx\n", ZAddressWeakBadMask
+    printf "     Marked:            0x%016llx\n", ZAddressMetadataMarked
+    printf "     Remapped:          0x%016llx\n", ZAddressMetadataRemapped
+end
+
+# End of file
diff --git a/src/hotspot/share/gc/z/zDirector.cpp b/src/hotspot/share/gc/z/zDirector.cpp
new file mode 100644
index 00000000000..46305c1c864
--- /dev/null
+++ b/src/hotspot/share/gc/z/zDirector.cpp
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zDirector.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zUtils.hpp"
+#include "logging/log.hpp"
+
+const double ZDirector::one_in_1000 = 3.290527;
+
+ZDirector::ZDirector() :
+    _metronome(ZStatAllocRate::sample_hz) {
+  set_name("ZDirector");
+  create_and_start();
+}
+
+void ZDirector::sample_allocation_rate() const {
+  // Sample allocation rate. This is needed by rule_allocation_rate()
+  // below to estimate the time we have until we run out of memory.
+  const double bytes_per_second = ZStatAllocRate::sample_and_reset();
+
+  log_debug(gc, alloc)("Allocation Rate: %.3fMB/s, Avg: %.3f(+/-%.3f)MB/s",
+                       bytes_per_second / M,
+                       ZStatAllocRate::avg() / M,
+                       ZStatAllocRate::avg_sd() / M);
+}
+
+bool ZDirector::is_first() const {
+  return ZStatCycle::ncycles() == 0;
+}
+
+bool ZDirector::is_warm() const {
+  return ZStatCycle::ncycles() >= 3;
+}
+
+bool ZDirector::rule_timer() const {
+  if (ZCollectionInterval == 0) {
+    // Rule disabled
+    return false;
+  }
+
+  // Perform GC if timer has expired.
+  const double time_since_last_gc = ZStatCycle::time_since_last();
+  const double time_until_gc = ZCollectionInterval - time_since_last_gc;
+
+  log_debug(gc, director)("Rule: Timer, Interval: %us, TimeUntilGC: %.3lfs",
+                          ZCollectionInterval, time_until_gc);
+
+  return time_until_gc <= 0;
+}
+
+bool ZDirector::rule_warmup() const {
+  if (is_warm()) {
+    // Rule disabled
+    return false;
+  }
+
+  // Perform GC if heap usage passes 10/20/30% and no other GC has been
+  // performed yet. This allows us to get some early samples of the GC
+  // duration, which is needed by the other rules.
+  const size_t max_capacity = ZHeap::heap()->max_capacity();
+  const size_t used = ZHeap::heap()->used();
+  const double used_threshold_percent = (ZStatCycle::ncycles() + 1) * 0.1;
+  const size_t used_threshold = max_capacity * used_threshold_percent;
+
+  log_debug(gc, director)("Rule: Warmup %.0f%%, Used: " SIZE_FORMAT "MB, UsedThreshold: " SIZE_FORMAT "MB",
+                          used_threshold_percent * 100, used / M, used_threshold / M);
+
+  return used >= used_threshold;
+}
+
+bool ZDirector::rule_allocation_rate() const {
+  if (is_first()) {
+    // Rule disabled
+    return false;
+  }
+
+  // Perform GC if the estimated max allocation rate indicates that we
+  // will run out of memory. The estimated max allocation rate is based
+  // on the moving average of the sampled allocation rate plus a safety
+  // margin based on variations in the allocation rate and unforseen
+  // allocation spikes.
+
+  // Calculate amount of free memory available to Java threads. Note that
+  // the heap reserve is not available to Java threads and is therefore not
+  // considered part of the free memory.
+  const size_t max_capacity = ZHeap::heap()->max_capacity();
+  const size_t max_reserve = ZHeap::heap()->max_reserve();
+  const size_t used = ZHeap::heap()->used();
+  const size_t free_with_reserve = max_capacity - used;
+  const size_t free = free_with_reserve - MIN2(free_with_reserve, max_reserve);
+
+  // Calculate time until OOM given the max allocation rate and the amount
+  // of free memory. The allocation rate is a moving average and we multiply
+  // that with an alllcation spike tolerance factor to guard against unforseen
+  // phase changes in the allocate rate. We then add ~3.3 sigma to account for
+  // the allocation rate variance, which means the probablility is 1 in 1000
+  // that a sample is outside of the confidence interval.
+  const double max_alloc_rate = (ZStatAllocRate::avg() * ZAllocationSpikeTolerance) + (ZStatAllocRate::avg_sd() * one_in_1000);
+  const double time_until_oom = free / (max_alloc_rate + 1.0); // Plus 1.0B/s to avoid division by zero
+
+  // Calculate max duration of a GC cycle. The duration of GC is a moving
+  // average, we add ~3.3 sigma to account for the GC duration variance.
+  const AbsSeq& duration_of_gc = ZStatCycle::normalized_duration();
+  const double max_duration_of_gc = duration_of_gc.davg() + (duration_of_gc.dsd() * one_in_1000);
+
+  // Calculate time until GC given the time until OOM and max duration of GC.
+  // We also deduct the sample interval, so that we don't overshoot the target
+  // time and end up starting the GC too late in the next interval.
+  const double sample_interval = 1.0 / ZStatAllocRate::sample_hz;
+  const double time_until_gc = time_until_oom - max_duration_of_gc - sample_interval;
+
+  log_debug(gc, director)("Rule: Allocation Rate, MaxAllocRate: %.3lfMB/s, Free: " SIZE_FORMAT "MB, MaxDurationOfGC: %.3lfs, TimeUntilGC: %.3lfs",
+                          max_alloc_rate / M, free / M, max_duration_of_gc, time_until_gc);
+
+  return time_until_gc <= 0;
+}
+
+bool ZDirector::rule_proactive() const {
+  if (!ZProactive || !is_warm()) {
+    // Rule disabled
+    return false;
+  }
+
+  // Perform GC if the impact of doing so, in terms of application throughput
+  // reduction, is considered acceptable. This rule allows us to keep the heap
+  // size down and allow reference processing to happen even when we have a lot
+  // of free space on the heap.
+
+  // Only consider doing a proactive GC if the heap usage has grown by at least
+  // 10% of the max capacity since the previous GC, or more than 5 minutes has
+  // passed since the previous GC. This helps avoid superfluous GCs when running
+  // applications with very low allocation rate.
+  const size_t used_after_last_gc = ZStatHeap::used_at_relocate_end();
+  const size_t used_increase_threshold = ZHeap::heap()->max_capacity() * 0.10; // 10%
+  const size_t used_threshold = used_after_last_gc + used_increase_threshold;
+  const size_t used = ZHeap::heap()->used();
+  const double time_since_last_gc = ZStatCycle::time_since_last();
+  const double time_since_last_gc_threshold = 5 * 60; // 5 minutes
+  if (used < used_threshold && time_since_last_gc < time_since_last_gc_threshold) {
+    // Don't even consider doing a proactive GC
+    log_debug(gc, director)("Rule: Proactive, UsedUntilEnabled: " SIZE_FORMAT "MB, TimeUntilEnabled: %.3lfs",
+                            (used_threshold - used) / M,
+                            time_since_last_gc_threshold - time_since_last_gc);
+    return false;
+  }
+
+  const double assumed_throughput_drop_during_gc = 0.50; // 50%
+  const double acceptable_throughput_drop = 0.01;        // 1%
+  const AbsSeq& duration_of_gc = ZStatCycle::normalized_duration();
+  const double max_duration_of_gc = duration_of_gc.davg() + (duration_of_gc.dsd() * one_in_1000);
+  const double acceptable_gc_interval = max_duration_of_gc * ((assumed_throughput_drop_during_gc / acceptable_throughput_drop) - 1.0);
+  const double time_until_gc = acceptable_gc_interval - time_since_last_gc;
+
+  log_debug(gc, director)("Rule: Proactive, AcceptableGCInterval: %.3lfs, TimeSinceLastGC: %.3lfs, TimeUntilGC: %.3lfs",
+                          acceptable_gc_interval, time_since_last_gc, time_until_gc);
+
+  return time_until_gc <= 0;
+}
+
+GCCause::Cause ZDirector::make_gc_decision() const {
+  // Rule 0: Timer
+  if (rule_timer()) {
+    return GCCause::_z_timer;
+  }
+
+  // Rule 1: Warmup
+  if (rule_warmup()) {
+    return GCCause::_z_warmup;
+  }
+
+  // Rule 2: Allocation rate
+  if (rule_allocation_rate()) {
+    return GCCause::_z_allocation_rate;
+  }
+
+  // Rule 3: Proactive
+  if (rule_proactive()) {
+    return GCCause::_z_proactive;
+  }
+
+  // No GC
+  return GCCause::_no_gc;
+}
+
+void ZDirector::run_service() {
+  // Main loop
+  while (_metronome.wait_for_tick()) {
+    sample_allocation_rate();
+    const GCCause::Cause cause = make_gc_decision();
+    if (cause != GCCause::_no_gc) {
+      ZCollectedHeap::heap()->collect(cause);
+    }
+  }
+}
+
+void ZDirector::stop_service() {
+  _metronome.stop();
+}
diff --git a/src/hotspot/share/gc/z/zDirector.hpp b/src/hotspot/share/gc/z/zDirector.hpp
new file mode 100644
index 00000000000..44a11be82de
--- /dev/null
+++ b/src/hotspot/share/gc/z/zDirector.hpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZDIRECTOR_HPP
+#define SHARE_GC_Z_ZDIRECTOR_HPP
+
+#include "gc/shared/concurrentGCThread.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/z/zMetronome.hpp"
+
+class ZDirector : public ConcurrentGCThread {
+private:
+  static const double one_in_1000;
+
+  ZMetronome _metronome;
+
+  void sample_allocation_rate() const;
+
+  bool is_first() const;
+  bool is_warm() const;
+
+  bool rule_timer() const;
+  bool rule_warmup() const;
+  bool rule_allocation_rate() const;
+  bool rule_proactive() const;
+  GCCause::Cause make_gc_decision() const;
+
+protected:
+  virtual void run_service();
+  virtual void stop_service();
+
+public:
+  ZDirector();
+};
+
+#endif // SHARE_GC_Z_ZDIRECTOR_HPP
diff --git a/src/hotspot/share/gc/z/zDriver.cpp b/src/hotspot/share/gc/z/zDriver.cpp
new file mode 100644
index 00000000000..fdefad97187
--- /dev/null
+++ b/src/hotspot/share/gc/z/zDriver.cpp
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/gcLocker.hpp"
+#include "gc/shared/isGCActiveMark.hpp"
+#include "gc/shared/vmGCOperations.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zDriver.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zMessagePort.inline.hpp"
+#include "gc/z/zServiceability.hpp"
+#include "gc/z/zStat.hpp"
+#include "logging/log.hpp"
+#include "runtime/vm_operations.hpp"
+#include "runtime/vmThread.hpp"
+
+static const ZStatPhaseCycle      ZPhaseCycle("Garbage Collection Cycle");
+static const ZStatPhasePause      ZPhasePauseMarkStart("Pause Mark Start");
+static const ZStatPhaseConcurrent ZPhaseConcurrentMark("Concurrent Mark");
+static const ZStatPhaseConcurrent ZPhaseConcurrentMarkContinue("Concurrent Mark Continue");
+static const ZStatPhasePause      ZPhasePauseMarkEnd("Pause Mark End");
+static const ZStatPhaseConcurrent ZPhaseConcurrentProcessNonStrongReferences("Concurrent Process Non-Strong References");
+static const ZStatPhaseConcurrent ZPhaseConcurrentResetRelocationSet("Concurrent Reset Relocation Set");
+static const ZStatPhaseConcurrent ZPhaseConcurrentDestroyDetachedPages("Concurrent Destroy Detached Pages");
+static const ZStatPhaseConcurrent ZPhaseConcurrentSelectRelocationSet("Concurrent Select Relocation Set");
+static const ZStatPhaseConcurrent ZPhaseConcurrentPrepareRelocationSet("Concurrent Prepare Relocation Set");
+static const ZStatPhasePause      ZPhasePauseRelocateStart("Pause Relocate Start");
+static const ZStatPhaseConcurrent ZPhaseConcurrentRelocated("Concurrent Relocate");
+static const ZStatCriticalPhase   ZCriticalPhaseGCLockerStall("GC Locker Stall", false /* verbose */);
+static const ZStatSampler         ZSamplerJavaThreads("System", "Java Threads", ZStatUnitThreads);
+
+class ZOperationClosure : public StackObj {
+public:
+  virtual const char* name() const = 0;
+
+  virtual bool needs_inactive_gc_locker() const {
+    // An inactive GC locker is needed in operations where we change the good
+    // mask or move objects. Changing the good mask will invalidate all oops,
+    // which makes it conceptually the same thing as moving all objects.
+    return false;
+  }
+
+  virtual bool do_operation() = 0;
+};
+
+class VM_ZOperation : public VM_Operation {
+private:
+  ZOperationClosure* _cl;
+  uint               _gc_id;
+  bool               _gc_locked;
+  bool               _success;
+
+public:
+  VM_ZOperation(ZOperationClosure* cl) :
+      _cl(cl),
+      _gc_id(GCId::current()),
+      _gc_locked(false),
+      _success(false) {}
+
+  virtual VMOp_Type type() const {
+    return VMOp_ZOperation;
+  }
+
+  virtual const char* name() const {
+    return _cl->name();
+  }
+
+  virtual bool doit_prologue() {
+    Heap_lock->lock();
+    return true;
+  }
+
+  virtual void doit() {
+    assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+    ZStatSample(ZSamplerJavaThreads, Threads::number_of_threads());
+
+    // JVMTI support
+    SvcGCMarker sgcm(SvcGCMarker::OTHER);
+
+    // Setup GC id
+    GCIdMark gcid(_gc_id);
+
+    if (_cl->needs_inactive_gc_locker() && GCLocker::check_active_before_gc()) {
+      // GC locker is active, bail out
+      _gc_locked = true;
+    } else {
+      // Execute operation
+      IsGCActiveMark mark;
+      _success = _cl->do_operation();
+    }
+  }
+
+  virtual void doit_epilogue() {
+    Heap_lock->unlock();
+  }
+
+  bool gc_locked() {
+    return _gc_locked;
+  }
+
+  bool success() const {
+    return _success;
+  }
+};
+
+class ZMarkStartClosure : public ZOperationClosure {
+public:
+  virtual const char* name() const {
+    return "ZMarkStart";
+  }
+
+  virtual bool needs_inactive_gc_locker() const {
+    return true;
+  }
+
+  virtual bool do_operation() {
+    ZStatTimer timer(ZPhasePauseMarkStart);
+    ZServiceabilityMarkStartTracer tracer;
+
+    ZCollectedHeap::heap()->increment_total_collections(true /* full */);
+
+    ZHeap::heap()->mark_start();
+    return true;
+  }
+};
+
+class ZMarkEndClosure : public ZOperationClosure {
+public:
+  virtual const char* name() const {
+    return "ZMarkEnd";
+  }
+
+  virtual bool do_operation() {
+    ZStatTimer timer(ZPhasePauseMarkEnd);
+    ZServiceabilityMarkEndTracer tracer;
+
+    return ZHeap::heap()->mark_end();
+  }
+};
+
+class ZRelocateStartClosure : public ZOperationClosure {
+public:
+  virtual const char* name() const {
+    return "ZRelocateStart";
+  }
+
+  virtual bool needs_inactive_gc_locker() const {
+    return true;
+  }
+
+  virtual bool do_operation() {
+    ZStatTimer timer(ZPhasePauseRelocateStart);
+    ZServiceabilityRelocateStartTracer tracer;
+
+    ZHeap::heap()->relocate_start();
+    return true;
+  }
+};
+
+ZDriver::ZDriver() :
+    _gc_cycle_port(),
+    _gc_locker_port() {
+  set_name("ZDriver");
+  create_and_start();
+}
+
+bool ZDriver::vm_operation(ZOperationClosure* cl) {
+  for (;;) {
+    VM_ZOperation op(cl);
+    VMThread::execute(&op);
+    if (op.gc_locked()) {
+      // Wait for GC to become unlocked and restart the VM operation
+      ZStatTimer timer(ZCriticalPhaseGCLockerStall);
+      _gc_locker_port.wait();
+      continue;
+    }
+
+    // Notify VM operation completed
+    _gc_locker_port.ack();
+
+    return op.success();
+  }
+}
+
+void ZDriver::collect(GCCause::Cause cause) {
+  switch (cause) {
+  case GCCause::_wb_young_gc:
+  case GCCause::_wb_conc_mark:
+  case GCCause::_wb_full_gc:
+  case GCCause::_dcmd_gc_run:
+  case GCCause::_java_lang_system_gc:
+  case GCCause::_full_gc_alot:
+  case GCCause::_scavenge_alot:
+  case GCCause::_jvmti_force_gc:
+  case GCCause::_metadata_GC_clear_soft_refs:
+    // Start synchronous GC
+    _gc_cycle_port.send_sync(cause);
+    break;
+
+  case GCCause::_z_timer:
+  case GCCause::_z_warmup:
+  case GCCause::_z_allocation_rate:
+  case GCCause::_z_allocation_stall:
+  case GCCause::_z_proactive:
+  case GCCause::_metadata_GC_threshold:
+    // Start asynchronous GC
+    _gc_cycle_port.send_async(cause);
+    break;
+
+  case GCCause::_gc_locker:
+    // Restart VM operation previously blocked by the GC locker
+    _gc_locker_port.signal();
+    break;
+
+  default:
+    // Other causes not supported
+    fatal("Unsupported GC cause (%s)", GCCause::to_string(cause));
+    break;
+  }
+}
+
+GCCause::Cause ZDriver::start_gc_cycle() {
+  // Wait for GC request
+  return _gc_cycle_port.receive();
+}
+
+class ZSoftReferencePolicyScope : public StackObj {
+private:
+  bool should_clear_soft_reference(GCCause::Cause cause) const {
+    const bool clear = ZCollectedHeap::heap()->soft_ref_policy()->should_clear_all_soft_refs();
+
+    // Clear all soft reference if the policy says so, or if
+    // the GC cause indicates that we're running low on memory.
+    return clear ||
+           cause == GCCause::_z_allocation_stall ||
+           cause == GCCause::_metadata_GC_clear_soft_refs;
+  }
+
+  void clear_should_clear_soft_reference() const {
+    ZCollectedHeap::heap()->soft_ref_policy()->set_should_clear_all_soft_refs(false);
+  }
+
+public:
+  ZSoftReferencePolicyScope(GCCause::Cause cause) {
+    const bool clear = should_clear_soft_reference(cause);
+    ZHeap::heap()->set_soft_reference_policy(clear);
+    clear_should_clear_soft_reference();
+  }
+
+  ~ZSoftReferencePolicyScope() {
+    Universe::update_heap_info_at_gc();
+  }
+};
+
+class ZDriverCycleScope : public StackObj {
+private:
+  GCIdMark                  _gc_id;
+  GCCauseSetter             _gc_cause_setter;
+  ZSoftReferencePolicyScope _soft_ref_policy;
+  ZStatTimer                _timer;
+
+  bool should_boost_worker_threads(GCCause::Cause cause) const {
+    return cause == GCCause::_java_lang_system_gc ||
+           cause == GCCause::_z_allocation_stall;
+  }
+
+public:
+  ZDriverCycleScope(GCCause::Cause cause) :
+      _gc_id(),
+      _gc_cause_setter(ZCollectedHeap::heap(), cause),
+      _soft_ref_policy(cause),
+      _timer(ZPhaseCycle) {
+    // Update statistics
+    ZStatCycle::at_start();
+
+    // Set boost mode
+    const bool boost = should_boost_worker_threads(cause);
+    ZHeap::heap()->set_boost_worker_threads(boost);
+  }
+
+  ~ZDriverCycleScope() {
+    // Calculate boost factor
+    const double boost_factor = (double)ZHeap::heap()->nconcurrent_worker_threads() /
+                                (double)ZHeap::heap()->nconcurrent_no_boost_worker_threads();
+
+    // Update statistics
+    ZStatCycle::at_end(boost_factor);
+  }
+};
+
+void ZDriver::run_gc_cycle(GCCause::Cause cause) {
+  ZDriverCycleScope scope(cause);
+
+  // Phase 1: Pause Mark Start
+  {
+    ZMarkStartClosure cl;
+    vm_operation(&cl);
+  }
+
+  // Phase 2: Concurrent Mark
+  {
+    ZStatTimer timer(ZPhaseConcurrentMark);
+    ZHeap::heap()->mark();
+  }
+
+  // Phase 3: Pause Mark End
+  {
+    ZMarkEndClosure cl;
+    while (!vm_operation(&cl)) {
+      // Phase 3.5: Concurrent Mark Continue
+      ZStatTimer timer(ZPhaseConcurrentMarkContinue);
+      ZHeap::heap()->mark();
+    }
+  }
+
+  // Phase 4: Concurrent Process Non-Strong References
+  {
+    ZStatTimer timer(ZPhaseConcurrentProcessNonStrongReferences);
+    ZHeap::heap()->process_non_strong_references();
+  }
+
+  // Phase 5: Concurrent Reset Relocation Set
+  {
+    ZStatTimer timer(ZPhaseConcurrentResetRelocationSet);
+    ZHeap::heap()->reset_relocation_set();
+  }
+
+  // Phase 6: Concurrent Destroy Detached Pages
+  {
+    ZStatTimer timer(ZPhaseConcurrentDestroyDetachedPages);
+    ZHeap::heap()->destroy_detached_pages();
+  }
+
+  // Phase 7: Concurrent Select Relocation Set
+  {
+    ZStatTimer timer(ZPhaseConcurrentSelectRelocationSet);
+    ZHeap::heap()->select_relocation_set();
+  }
+
+  // Phase 8: Prepare Relocation Set
+  {
+    ZStatTimer timer(ZPhaseConcurrentPrepareRelocationSet);
+    ZHeap::heap()->prepare_relocation_set();
+  }
+
+  // Phase 9: Pause Relocate Start
+  {
+    ZRelocateStartClosure cl;
+    vm_operation(&cl);
+  }
+
+  // Phase 10: Concurrent Relocate
+  {
+    ZStatTimer timer(ZPhaseConcurrentRelocated);
+    ZHeap::heap()->relocate();
+  }
+}
+
+void ZDriver::end_gc_cycle() {
+  // Notify GC cycle completed
+  _gc_cycle_port.ack();
+
+  // Check for out of memory condition
+  ZHeap::heap()->check_out_of_memory();
+}
+
+void ZDriver::run_service() {
+  // Main loop
+  while (!should_terminate()) {
+    const GCCause::Cause cause = start_gc_cycle();
+    if (cause != GCCause::_no_gc) {
+      run_gc_cycle(cause);
+      end_gc_cycle();
+    }
+  }
+}
+
+void ZDriver::stop_service() {
+  _gc_cycle_port.send_async(GCCause::_no_gc);
+}
diff --git a/src/hotspot/share/gc/z/zDriver.hpp b/src/hotspot/share/gc/z/zDriver.hpp
new file mode 100644
index 00000000000..b523412dc8b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zDriver.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZDRIVER_HPP
+#define SHARE_GC_Z_ZDRIVER_HPP
+
+#include "gc/shared/concurrentGCThread.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/z/zMessagePort.hpp"
+
+class ZOperationClosure;
+
+class ZDriver : public ConcurrentGCThread {
+private:
+  ZMessagePort<GCCause::Cause> _gc_cycle_port;
+  ZRendezvousPort              _gc_locker_port;
+
+  bool vm_operation(ZOperationClosure* cl);
+
+  GCCause::Cause start_gc_cycle();
+  void run_gc_cycle(GCCause::Cause cause);
+  void end_gc_cycle();
+
+protected:
+  virtual void run_service();
+  virtual void stop_service();
+
+public:
+  ZDriver();
+
+  void collect(GCCause::Cause cause);
+};
+
+#endif // SHARE_GC_Z_ZDRIVER_HPP
diff --git a/src/hotspot/share/gc/z/zErrno.cpp b/src/hotspot/share/gc/z/zErrno.cpp
new file mode 100644
index 00000000000..fede88df189
--- /dev/null
+++ b/src/hotspot/share/gc/z/zErrno.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zErrno.hpp"
+
+#include <errno.h>
+#include <string.h>
+
+ZErrno::ZErrno() :
+    _error(errno) {}
+
+ZErrno::ZErrno(int error) :
+    _error(error) {}
+
+ZErrno::operator bool() const {
+  return _error != 0;
+}
+
+bool ZErrno::operator==(int error) const {
+  return _error == error;
+}
+
+bool ZErrno::operator!=(int error) const {
+  return _error != error;
+}
+
+const char* ZErrno::to_string() const {
+  return strerror(_error);
+}
diff --git a/src/hotspot/share/gc/z/zErrno.hpp b/src/hotspot/share/gc/z/zErrno.hpp
new file mode 100644
index 00000000000..fd8fa6f8cf1
--- /dev/null
+++ b/src/hotspot/share/gc/z/zErrno.hpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZERRNO_HPP
+#define SHARE_GC_Z_ZERRNO_HPP
+
+#include "memory/allocation.hpp"
+
+class ZErrno : public StackObj {
+private:
+  const int _error;
+
+public:
+  ZErrno();
+  ZErrno(int error);
+
+  operator bool() const;
+  bool operator==(int error) const;
+  bool operator!=(int error) const;
+  const char* to_string() const;
+};
+
+#endif // SHARE_GC_Z_ZERRNO_HPP
diff --git a/src/hotspot/share/gc/z/zForwardingTable.cpp b/src/hotspot/share/gc/z/zForwardingTable.cpp
new file mode 100644
index 00000000000..e0b0c300ffe
--- /dev/null
+++ b/src/hotspot/share/gc/z/zForwardingTable.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zForwardingTable.inline.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "memory/allocation.inline.hpp"
+#include "utilities/debug.hpp"
+
+void ZForwardingTable::setup(size_t live_objects) {
+  assert(is_null(), "Should be empty");
+  assert(live_objects > 0, "Invalid size");
+
+  // Allocate table for linear probing. The size of the table must be
+  // a power of two to allow for quick and inexpensive indexing/masking.
+  // The table is sized to have a load factor of 50%, i.e. sized to have
+  // double the number of entries actuallly inserted.
+  _size = ZUtils::round_up_power_of_2(live_objects * 2);
+  _table = MallocArrayAllocator<ZForwardingTableEntry>::allocate(_size, mtGC);
+
+  // Clear table
+  memset(_table, ZForwardingTableEntry::empty(), _size * sizeof(ZForwardingTableEntry));
+}
+
+void ZForwardingTable::reset() {
+  // Free table
+  MallocArrayAllocator<ZForwardingTableEntry>::free(_table);
+  _table = NULL;
+  _size = 0;
+}
+
+void ZForwardingTable::verify(size_t object_max_count, size_t live_objects) const {
+  size_t count = 0;
+
+  for (size_t i = 0; i < _size; i++) {
+    const ZForwardingTableEntry entry = _table[i];
+    if (entry.is_empty()) {
+      // Skip empty entries
+      continue;
+    }
+
+    // Check from index
+    guarantee(entry.from_index() < object_max_count, "Invalid from index");
+
+    // Check for duplicates
+    for (size_t j = i + 1; j < _size; j++) {
+      const ZForwardingTableEntry other = _table[j];
+      guarantee(entry.from_index() != other.from_index(), "Duplicate from");
+      guarantee(entry.to_offset() != other.to_offset(), "Duplicate to");
+    }
+
+    count++;
+  }
+
+  // Check number of non-null entries
+  guarantee(live_objects == count, "Count mismatch");
+}
diff --git a/src/hotspot/share/gc/z/zForwardingTable.hpp b/src/hotspot/share/gc/z/zForwardingTable.hpp
new file mode 100644
index 00000000000..9a20ed4da5d
--- /dev/null
+++ b/src/hotspot/share/gc/z/zForwardingTable.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZFORWARDING_HPP
+#define SHARE_GC_Z_ZFORWARDING_HPP
+
+#include "gc/z/zForwardingTableEntry.hpp"
+#include "memory/allocation.hpp"
+
+typedef size_t ZForwardingTableCursor;
+
+class ZForwardingTable {
+  friend class VMStructs;
+  friend class ZForwardingTableTest;
+
+private:
+  ZForwardingTableEntry* _table;
+  size_t                 _size;
+
+  ZForwardingTableEntry at(ZForwardingTableCursor* cursor) const;
+  ZForwardingTableEntry first(uintptr_t from_index, ZForwardingTableCursor* cursor) const;
+  ZForwardingTableEntry next(ZForwardingTableCursor* cursor) const;
+
+public:
+  ZForwardingTable();
+  ~ZForwardingTable();
+
+  bool is_null() const;
+  void setup(size_t live_objects);
+  void reset();
+
+  ZForwardingTableEntry find(uintptr_t from_index) const;
+  ZForwardingTableEntry find(uintptr_t from_index, ZForwardingTableCursor* cursor) const;
+  uintptr_t insert(uintptr_t from_index, uintptr_t to_offset, ZForwardingTableCursor* cursor);
+
+  void verify(size_t object_max_count, size_t live_objects) const;
+};
+
+#endif // SHARE_GC_Z_ZFORWARDING_HPP
diff --git a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
new file mode 100644
index 00000000000..58a99a880ff
--- /dev/null
+++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZFORWARDING_INLINE_HPP
+#define SHARE_GC_Z_ZFORWARDING_INLINE_HPP
+
+#include "gc/z/zForwardingTable.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHash.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/debug.hpp"
+
+inline ZForwardingTable::ZForwardingTable() :
+    _table(NULL),
+    _size(0) {}
+
+inline ZForwardingTable::~ZForwardingTable() {
+  assert(is_null(), "Should be empty");
+}
+
+inline ZForwardingTableEntry ZForwardingTable::at(ZForwardingTableCursor* cursor) const {
+  return _table[*cursor];
+}
+
+inline ZForwardingTableEntry ZForwardingTable::first(uintptr_t from_index, ZForwardingTableCursor* cursor) const {
+  const size_t mask = _size - 1;
+  const size_t hash = ZHash::uint32_to_uint32((uint32_t)from_index);
+  *cursor = hash & mask;
+  return at(cursor);
+}
+
+inline ZForwardingTableEntry ZForwardingTable::next(ZForwardingTableCursor* cursor) const {
+  const size_t mask = _size - 1;
+  *cursor = (*cursor + 1) & mask;
+  return at(cursor);
+}
+
+inline bool ZForwardingTable::is_null() const {
+  return _table == NULL;
+}
+
+inline ZForwardingTableEntry ZForwardingTable::find(uintptr_t from_index) const {
+  ZForwardingTableCursor dummy;
+  return find(from_index, &dummy);
+}
+
+inline ZForwardingTableEntry ZForwardingTable::find(uintptr_t from_index, ZForwardingTableCursor* cursor) const {
+  // Reading entries in the table races with the atomic cas done for
+  // insertion into the table. This is safe because each entry is at
+  // most updated once (from -1 to something else).
+  ZForwardingTableEntry entry = first(from_index, cursor);
+  while (!entry.is_empty()) {
+    if (entry.from_index() == from_index) {
+      // Match found, return matching entry
+      return entry;
+    }
+
+    entry = next(cursor);
+  }
+
+  // Match not found, return empty entry
+  return entry;
+}
+
+inline uintptr_t ZForwardingTable::insert(uintptr_t from_index, uintptr_t to_offset, ZForwardingTableCursor* cursor) {
+  const ZForwardingTableEntry new_entry(from_index, to_offset);
+  const ZForwardingTableEntry old_entry; // empty
+
+  for (;;) {
+    const ZForwardingTableEntry prev_entry = Atomic::cmpxchg(new_entry, _table + *cursor, old_entry);
+    if (prev_entry.is_empty()) {
+      // Success
+      return to_offset;
+    }
+
+    // Find next empty or matching entry
+    ZForwardingTableEntry entry = at(cursor);
+    while (!entry.is_empty()) {
+      if (entry.from_index() == from_index) {
+        // Match found, return already inserted address
+        return entry.to_offset();
+      }
+
+      entry = next(cursor);
+    }
+  }
+}
+
+#endif // SHARE_GC_Z_ZFORWARDING_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zForwardingTableEntry.hpp b/src/hotspot/share/gc/z/zForwardingTableEntry.hpp
new file mode 100644
index 00000000000..c92f8767c53
--- /dev/null
+++ b/src/hotspot/share/gc/z/zForwardingTableEntry.hpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZFORWARDINGTABLEENTRY_HPP
+#define SHARE_GC_Z_ZFORWARDINGTABLEENTRY_HPP
+
+#include "gc/z/zBitField.hpp"
+#include "memory/allocation.hpp"
+#include "metaprogramming/primitiveConversions.hpp"
+
+//
+// Forwarding table entry layout
+// -----------------------------
+//
+//   6                      4 4                                             0
+//   3                      2 1                                             0
+//  +------------------------+-----------------------------------------------+
+//  |11111111 11111111 111111|11 11111111 11111111 11111111 11111111 11111111|
+//  +------------------------+-----------------------------------------------+
+//  |                        |
+//  |                        * 41-0 To Object Offset (42-bits)
+//  |
+//  * 63-42 From Object Index (22-bits)
+//
+
+class ZForwardingTableEntry {
+  friend struct PrimitiveConversions;
+
+private:
+  typedef ZBitField<uint64_t, size_t, 0,  42> field_to_offset;
+  typedef ZBitField<uint64_t, size_t, 42, 22> field_from_index;
+
+  uint64_t _entry;
+
+public:
+  ZForwardingTableEntry() :
+      _entry(empty()) {}
+
+  ZForwardingTableEntry(size_t from_index, size_t to_offset) :
+      _entry(field_from_index::encode(from_index) |
+             field_to_offset::encode(to_offset)) {}
+
+  static uintptr_t empty() {
+    return (uintptr_t)-1;
+  }
+
+  bool is_empty() const {
+    return _entry == empty();
+  }
+
+  size_t to_offset() const {
+    return field_to_offset::decode(_entry);
+  }
+
+  size_t from_index() const {
+    return field_from_index::decode(_entry);
+  }
+};
+
+// Needed to allow atomic operations on ZForwardingTableEntry
+template <>
+struct PrimitiveConversions::Translate<ZForwardingTableEntry> : public TrueType {
+  typedef ZForwardingTableEntry Value;
+  typedef uint64_t              Decayed;
+
+  static Decayed decay(Value v) {
+    return v._entry;
+  }
+
+  static Value recover(Decayed d) {
+    ZForwardingTableEntry entry;
+    entry._entry = d;
+    return entry;
+  }
+};
+
+#endif // SHARE_GC_Z_ZFORWARDINGTABLEENTRY_HPP
diff --git a/src/hotspot/share/gc/z/zFuture.hpp b/src/hotspot/share/gc/z/zFuture.hpp
new file mode 100644
index 00000000000..525dbb5ded5
--- /dev/null
+++ b/src/hotspot/share/gc/z/zFuture.hpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZFUTURE_HPP
+#define SHARE_GC_Z_ZFUTURE_HPP
+
+#include "memory/allocation.hpp"
+#include "runtime/semaphore.hpp"
+
+template <typename T>
+class ZFuture {
+private:
+  Semaphore _sema;
+  T         _value;
+
+public:
+  void set(T value);
+  T get();
+};
+
+#endif // SHARE_GC_Z_ZFUTURE_HPP
diff --git a/src/hotspot/share/gc/z/zFuture.inline.hpp b/src/hotspot/share/gc/z/zFuture.inline.hpp
new file mode 100644
index 00000000000..1d4fb04ad6b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zFuture.inline.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZFUTURE_INLINE_HPP
+#define SHARE_GC_Z_ZFUTURE_INLINE_HPP
+
+#include "gc/z/zFuture.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/semaphore.inline.hpp"
+#include "runtime/thread.hpp"
+
+template <typename T>
+inline void ZFuture<T>::set(T value) {
+  // Set value
+  _value = value;
+
+  // Notify waiter
+  _sema.signal();
+}
+
+template <typename T>
+inline T ZFuture<T>::get() {
+  // Wait for notification
+  Thread* const thread = Thread::current();
+  if (thread->is_Java_thread()) {
+    _sema.wait_with_safepoint_check((JavaThread*)thread);
+  } else {
+    _sema.wait();
+  }
+
+  // Return value
+  return _value;
+}
+
+#endif // SHARE_GC_Z_ZFUTURE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zGlobals.cpp b/src/hotspot/share/gc/z/zGlobals.cpp
new file mode 100644
index 00000000000..321aac3dec1
--- /dev/null
+++ b/src/hotspot/share/gc/z/zGlobals.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zGlobals.hpp"
+
+uint32_t ZGlobalPhase                 = ZPhaseRelocate;
+uint32_t ZGlobalSeqNum                = 1;
+
+const int& ZObjectAlignmentSmallShift = LogMinObjAlignmentInBytes;
+const int& ZObjectAlignmentSmall      = MinObjAlignmentInBytes;
+
+uintptr_t ZAddressGoodMask;
+uintptr_t ZAddressBadMask             = 0;
+uintptr_t ZAddressWeakBadMask;
+
+uintptr_t ZAddressMetadataMarked;
diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
new file mode 100644
index 00000000000..080ea5c0e42
--- /dev/null
+++ b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZGLOBALS_HPP
+#define SHARE_GC_Z_ZGLOBALS_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+#include OS_CPU_HEADER(gc/z/zGlobals)
+
+// Collector name
+const char* const ZGCName                       = "The Z Garbage Collector";
+
+// Global phase state
+extern uint32_t   ZGlobalPhase;
+const uint32_t    ZPhaseMark                    = 0;
+const uint32_t    ZPhaseMarkCompleted           = 1;
+const uint32_t    ZPhaseRelocate                = 2;
+
+// Global sequence number
+extern uint32_t   ZGlobalSeqNum;
+
+// Page types
+const uint8_t     ZPageTypeSmall                = 0;
+const uint8_t     ZPageTypeMedium               = 1;
+const uint8_t     ZPageTypeLarge                = 2;
+
+// Page size shifts
+const size_t      ZPageSizeSmallShift           = ZPlatformPageSizeSmallShift;
+const size_t      ZPageSizeMediumShift          = ZPageSizeSmallShift + 4;
+const size_t      ZPageSizeMinShift             = ZPageSizeSmallShift;
+
+// Page sizes
+const size_t      ZPageSizeSmall                = (size_t)1 << ZPageSizeSmallShift;
+const size_t      ZPageSizeMedium               = (size_t)1 << ZPageSizeMediumShift;
+const size_t      ZPageSizeMin                  = (size_t)1 << ZPageSizeMinShift;
+
+// Object size limits
+const size_t      ZObjectSizeLimitSmall         = (ZPageSizeSmall / 8);  // Allow 12.5% waste
+const size_t      ZObjectSizeLimitMedium        = (ZPageSizeMedium / 8); // Allow 12.5% waste
+
+// Object alignment shifts
+extern const int& ZObjectAlignmentSmallShift;
+const int         ZObjectAlignmentMediumShift   = ZPageSizeMediumShift - 13; // 8192 objects per page
+const int         ZObjectAlignmentLargeShift    = ZPageSizeSmallShift;
+
+// Object alignments
+extern const int& ZObjectAlignmentSmall;
+const int         ZObjectAlignmentMedium        = 1 << ZObjectAlignmentMediumShift;
+const int         ZObjectAlignmentLarge         = 1 << ZObjectAlignmentLargeShift;
+
+// Pointer part of address
+const uintptr_t   ZAddressOffsetShift           = 0;
+const uintptr_t   ZAddressOffsetBits            = ZPlatformAddressOffsetBits;
+const uintptr_t   ZAddressOffsetMask            = (((uintptr_t)1 << ZAddressOffsetBits) - 1) << ZAddressOffsetShift;
+const size_t      ZAddressOffsetMax             = (uintptr_t)1 << ZAddressOffsetBits;
+
+// Metadata part of address
+const uintptr_t   ZAddressMetadataShift         = ZPlatformAddressMetadataShift;
+const uintptr_t   ZAddressMetadataBits          = 4;
+const uintptr_t   ZAddressMetadataMask          = (((uintptr_t)1 << ZAddressMetadataBits) - 1) << ZAddressMetadataShift;
+
+// Metadata types
+const uintptr_t   ZAddressMetadataMarked0       = (uintptr_t)1 << (ZAddressMetadataShift + 0);
+const uintptr_t   ZAddressMetadataMarked1       = (uintptr_t)1 << (ZAddressMetadataShift + 1);
+const uintptr_t   ZAddressMetadataRemapped      = (uintptr_t)1 << (ZAddressMetadataShift + 2);
+const uintptr_t   ZAddressMetadataFinalizable   = (uintptr_t)1 << (ZAddressMetadataShift + 3);
+
+// Address space start/end/size
+const uintptr_t   ZAddressSpaceStart            = ZPlatformAddressSpaceStart;
+const uintptr_t   ZAddressSpaceSize             = ZPlatformAddressSpaceSize;
+const uintptr_t   ZAddressSpaceEnd              = ZAddressSpaceStart + ZAddressSpaceSize;
+
+// Cache line size
+const size_t      ZCacheLineSize                = ZPlatformCacheLineSize;
+
+// Reserved start/end
+uintptr_t ZAddressReservedStart();
+uintptr_t ZAddressReservedEnd();
+
+//
+// Good/Bad mask states
+// --------------------
+//
+//                 GoodMask         BadMask          WeakGoodMask     WeakBadMask
+//                 --------------------------------------------------------------
+//  Marked0        001              110              101              010
+//  Marked1        010              101              110              001
+//  Remapped       100              011              100              011
+//
+
+// Good/bad masks
+extern uintptr_t  ZAddressGoodMask;
+extern uintptr_t  ZAddressBadMask;
+extern uintptr_t  ZAddressWeakBadMask;
+
+// Marked state
+extern uintptr_t  ZAddressMetadataMarked;
+
+// Address space for mark stack allocations
+const size_t      ZMarkStackSpaceSizeShift      = 40; // 1TB
+const size_t      ZMarkStackSpaceSize           = (size_t)1 << ZMarkStackSpaceSizeShift;
+const uintptr_t   ZMarkStackSpaceStart          = ZAddressSpaceEnd + ZMarkStackSpaceSize;
+const uintptr_t   ZMarkStackSpaceEnd            = ZMarkStackSpaceStart + ZMarkStackSpaceSize;
+const size_t      ZMarkStackSpaceExpandSize     = (size_t)1 << 25; // 32M
+
+// Mark stack and magazine sizes
+const size_t      ZMarkStackSizeShift           = 11; // 2K
+const size_t      ZMarkStackSize                = (size_t)1 << ZMarkStackSizeShift;
+const size_t      ZMarkStackHeaderSize          = (size_t)1 << 4; // 16B
+const size_t      ZMarkStackSlots               = (ZMarkStackSize - ZMarkStackHeaderSize) / sizeof(uintptr_t);
+const size_t      ZMarkStackMagazineSize        = (size_t)1 << 15; // 32K
+const size_t      ZMarkStackMagazineSlots       = (ZMarkStackMagazineSize / ZMarkStackSize) - 1;
+
+// Mark stripe size
+const size_t      ZMarkStripeShift              = ZPageSizeMinShift;
+
+// Max number of mark stripes
+const size_t      ZMarkStripesMax               = 16; // Must be a power of two
+
+// Mark cache size
+const size_t      ZMarkCacheSize                = 1024; // Must be a power of two
+
+// Partial array minimum size
+const size_t      ZMarkPartialArrayMinSizeShift = 12; // 4K
+const size_t      ZMarkPartialArrayMinSize      = (size_t)1 << ZMarkPartialArrayMinSizeShift;
+
+// Max number of proactive/terminate flush attempts
+const size_t      ZMarkProactiveFlushMax        = 10;
+const size_t      ZMarkTerminateFlushMax        = 3;
+
+// Try complete mark timeout
+const uint64_t    ZMarkCompleteTimeout          = 1; // ms
+
+#endif // SHARE_GC_Z_ZGLOBALS_HPP
diff --git a/src/hotspot/share/gc/z/zHash.hpp b/src/hotspot/share/gc/z/zHash.hpp
new file mode 100644
index 00000000000..5752d2abee3
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHash.hpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZHASH_HPP
+#define SHARE_GC_Z_ZHASH_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class ZHash : public AllStatic {
+public:
+  static uint32_t uint32_to_uint32(uint32_t key);
+  static uint32_t address_to_uint32(uintptr_t key);
+};
+
+#endif // SHARE_GC_Z_ZHASH_HPP
diff --git a/src/hotspot/share/gc/z/zHash.inline.hpp b/src/hotspot/share/gc/z/zHash.inline.hpp
new file mode 100644
index 00000000000..a9397127b07
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHash.inline.hpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZHASH_INLINE_HPP
+#define SHARE_GC_Z_ZHASH_INLINE_HPP
+
+#include "gc/z/zHash.hpp"
+
+inline uint32_t ZHash::uint32_to_uint32(uint32_t key) {
+  key = ~key + (key << 15);
+  key = key ^ (key >> 12);
+  key = key + (key << 2);
+  key = key ^ (key >> 4);
+  key = key * 2057;
+  key = key ^ (key >> 16);
+  return key;
+}
+
+inline uint32_t ZHash::address_to_uint32(uintptr_t key) {
+  return uint32_to_uint32((uint32_t)(key >> 3));
+}
+
+#endif // SHARE_GC_Z_ZHASH_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
new file mode 100644
index 00000000000..58cde9e869a
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -0,0 +1,583 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/oopStorage.hpp"
+#include "gc/z/zAddress.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zHeapIterator.hpp"
+#include "gc/z/zList.inline.hpp"
+#include "gc/z/zLock.inline.hpp"
+#include "gc/z/zMark.inline.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPageTable.inline.hpp"
+#include "gc/z/zRelocationSet.inline.hpp"
+#include "gc/z/zResurrection.hpp"
+#include "gc/z/zRootsIterator.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zThread.hpp"
+#include "gc/z/zTracer.inline.hpp"
+#include "gc/z/zVirtualMemory.inline.hpp"
+#include "gc/z/zWorkers.inline.hpp"
+#include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+
+static const ZStatSampler  ZSamplerHeapUsedBeforeMark("Memory", "Heap Used Before Mark", ZStatUnitBytes);
+static const ZStatSampler  ZSamplerHeapUsedAfterMark("Memory", "Heap Used After Mark", ZStatUnitBytes);
+static const ZStatSampler  ZSamplerHeapUsedBeforeRelocation("Memory", "Heap Used Before Relocation", ZStatUnitBytes);
+static const ZStatSampler  ZSamplerHeapUsedAfterRelocation("Memory", "Heap Used After Relocation", ZStatUnitBytes);
+static const ZStatCounter  ZCounterUndoPageAllocation("Memory", "Undo Page Allocation", ZStatUnitOpsPerSecond);
+static const ZStatCounter  ZCounterOutOfMemory("Memory", "Out Of Memory", ZStatUnitOpsPerSecond);
+
+ZHeap* ZHeap::_heap = NULL;
+
+ZHeap::ZHeap() :
+    _workers(),
+    _object_allocator(_workers.nworkers()),
+    _page_allocator(heap_min_size(), heap_max_size(), heap_max_reserve_size()),
+    _pagetable(),
+    _mark(&_workers, &_pagetable),
+    _reference_processor(&_workers),
+    _weak_roots_processor(&_workers),
+    _relocate(&_workers),
+    _relocation_set(),
+    _serviceability(heap_min_size(), heap_max_size()) {
+  // Install global heap instance
+  assert(_heap == NULL, "Already initialized");
+  _heap = this;
+
+  // Update statistics
+  ZStatHeap::set_at_initialize(heap_max_size(), heap_max_reserve_size());
+}
+
+size_t ZHeap::heap_min_size() const {
+  const size_t aligned_min_size = align_up(InitialHeapSize, ZPageSizeMin);
+  return MIN2(aligned_min_size, heap_max_size());
+}
+
+size_t ZHeap::heap_max_size() const {
+  const size_t aligned_max_size = align_up(MaxHeapSize, ZPageSizeMin);
+  return MIN2(aligned_max_size, ZAddressOffsetMax);
+}
+
+size_t ZHeap::heap_max_reserve_size() const {
+  // Reserve one small page per worker plus one shared medium page. This is still just
+  // an estimate and doesn't guarantee that we can't run out of memory during relocation.
+  const size_t max_reserve_size = (_workers.nworkers() * ZPageSizeSmall) + ZPageSizeMedium;
+  return MIN2(max_reserve_size, heap_max_size());
+}
+
+bool ZHeap::is_initialized() const {
+  return _page_allocator.is_initialized();
+}
+
+size_t ZHeap::min_capacity() const {
+  return heap_min_size();
+}
+
+size_t ZHeap::max_capacity() const {
+  return _page_allocator.max_capacity();
+}
+
+size_t ZHeap::capacity() const {
+  return _page_allocator.capacity();
+}
+
+size_t ZHeap::max_reserve() const {
+  return _page_allocator.max_reserve();
+}
+
+size_t ZHeap::used_high() const {
+  return _page_allocator.used_high();
+}
+
+size_t ZHeap::used_low() const {
+  return _page_allocator.used_low();
+}
+
+size_t ZHeap::used() const {
+  return _page_allocator.used();
+}
+
+size_t ZHeap::allocated() const {
+  return _page_allocator.allocated();
+}
+
+size_t ZHeap::reclaimed() const {
+  return _page_allocator.reclaimed();
+}
+
+size_t ZHeap::tlab_capacity() const {
+  return capacity();
+}
+
+size_t ZHeap::tlab_used() const {
+  return _object_allocator.used();
+}
+
+size_t ZHeap::max_tlab_size() const {
+  return ZObjectSizeLimitSmall;
+}
+
+size_t ZHeap::unsafe_max_tlab_alloc() const {
+  size_t size = _object_allocator.remaining();
+
+  if (size < MinTLABSize) {
+    // The remaining space in the allocator is not enough to
+    // fit the smallest possible TLAB. This means that the next
+    // TLAB allocation will force the allocator to get a new
+    // backing page anyway, which in turn means that we can then
+    // fit the larges possible TLAB.
+    size = max_tlab_size();
+  }
+
+  return MIN2(size, max_tlab_size());
+}
+
+bool ZHeap::is_in(uintptr_t addr) const {
+  if (addr < ZAddressReservedStart() || addr >= ZAddressReservedEnd()) {
+    return false;
+  }
+
+  const ZPage* const page = _pagetable.get(addr);
+  if (page != NULL) {
+    return page->is_in(addr);
+  }
+
+  return false;
+}
+
+uintptr_t ZHeap::block_start(uintptr_t addr) const {
+  const ZPage* const page = _pagetable.get(addr);
+  return page->block_start(addr);
+}
+
+size_t ZHeap::block_size(uintptr_t addr) const {
+  const ZPage* const page = _pagetable.get(addr);
+  return page->block_size(addr);
+}
+
+bool ZHeap::block_is_obj(uintptr_t addr) const {
+  const ZPage* const page = _pagetable.get(addr);
+  return page->block_is_obj(addr);
+}
+
+uint ZHeap::nconcurrent_worker_threads() const {
+  return _workers.nconcurrent();
+}
+
+uint ZHeap::nconcurrent_no_boost_worker_threads() const {
+  return _workers.nconcurrent_no_boost();
+}
+
+void ZHeap::set_boost_worker_threads(bool boost) {
+  _workers.set_boost(boost);
+}
+
+void ZHeap::worker_threads_do(ThreadClosure* tc) const {
+  _workers.threads_do(tc);
+}
+
+void ZHeap::print_worker_threads_on(outputStream* st) const {
+  _workers.print_threads_on(st);
+}
+
+void ZHeap::out_of_memory() {
+  ResourceMark rm;
+
+  ZStatInc(ZCounterOutOfMemory);
+  log_info(gc)("Out Of Memory (%s)", Thread::current()->name());
+}
+
+ZPage* ZHeap::alloc_page(uint8_t type, size_t size, ZAllocationFlags flags) {
+  ZPage* const page = _page_allocator.alloc_page(type, size, flags);
+  if (page != NULL) {
+    // Update pagetable
+    _pagetable.insert(page);
+  }
+
+  return page;
+}
+
+void ZHeap::undo_alloc_page(ZPage* page) {
+  assert(page->is_allocating(), "Invalid page state");
+
+  ZStatInc(ZCounterUndoPageAllocation);
+  log_trace(gc)("Undo page allocation, thread: " PTR_FORMAT " (%s), page: " PTR_FORMAT ", size: " SIZE_FORMAT,
+                ZThread::id(), ZThread::name(), p2i(page), page->size());
+
+  release_page(page, false /* reclaimed */);
+}
+
+bool ZHeap::retain_page(ZPage* page) {
+  return page->inc_refcount();
+}
+
+void ZHeap::release_page(ZPage* page, bool reclaimed) {
+  if (page->dec_refcount()) {
+    _page_allocator.free_page(page, reclaimed);
+  }
+}
+
+void ZHeap::flip_views() {
+  // For debugging only
+  if (ZUnmapBadViews) {
+    // Flip pages
+    ZPageTableIterator iter(&_pagetable);
+    for (ZPage* page; iter.next(&page);) {
+      if (!page->is_detached()) {
+        _page_allocator.flip_page(page);
+      }
+    }
+
+    // Flip pre-mapped memory
+    _page_allocator.flip_pre_mapped();
+  }
+}
+
+void ZHeap::mark_start() {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+  // Update statistics
+  ZStatSample(ZSamplerHeapUsedBeforeMark, used());
+
+  // Retire TLABs
+  _object_allocator.retire_tlabs();
+
+  // Flip address view
+  ZAddressMasks::flip_to_marked();
+  flip_views();
+
+  // Reset allocated/reclaimed/used statistics
+  _page_allocator.reset_statistics();
+
+  // Reset encountered/dropped/enqueued statistics
+  _reference_processor.reset_statistics();
+
+  // Enter mark phase
+  ZGlobalPhase = ZPhaseMark;
+
+  // Reset marking information and mark roots
+  _mark.start();
+
+  // Update statistics
+  ZStatHeap::set_at_mark_start(capacity(), used());
+}
+
+void ZHeap::mark() {
+  _mark.mark();
+}
+
+void ZHeap::mark_flush_and_free(Thread* thread) {
+  _mark.flush_and_free(thread);
+}
+
+class ZFixupPartialLoadsTask : public ZTask {
+private:
+  ZThreadRootsIterator _thread_roots;
+
+public:
+  ZFixupPartialLoadsTask() :
+      ZTask("ZFixupPartialLoadsTask"),
+      _thread_roots() {}
+
+  virtual void work() {
+    ZMarkRootOopClosure cl;
+    _thread_roots.oops_do(&cl);
+  }
+};
+
+void ZHeap::fixup_partial_loads() {
+  ZFixupPartialLoadsTask task;
+  _workers.run_parallel(&task);
+}
+
+bool ZHeap::mark_end() {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+  // C2 can generate code where a safepoint poll is inserted
+  // between a load and the associated load barrier. To handle
+  // this case we need to rescan the thread stack here to make
+  // sure such oops are marked.
+  fixup_partial_loads();
+
+  // Try end marking
+  if (!_mark.end()) {
+    // Marking not completed, continue concurrent mark
+    return false;
+  }
+
+  // Enter mark completed phase
+  ZGlobalPhase = ZPhaseMarkCompleted;
+
+  // Resize metaspace
+  MetaspaceGC::compute_new_size();
+
+  // Update statistics
+  ZStatSample(ZSamplerHeapUsedAfterMark, used());
+  ZStatHeap::set_at_mark_end(capacity(), allocated(), used());
+
+  // Block resurrection of weak/phantom references
+  ZResurrection::block();
+
+  // Process weak roots
+  _weak_roots_processor.process_weak_roots();
+
+  // Verification
+  if (VerifyBeforeGC || VerifyDuringGC || VerifyAfterGC) {
+    Universe::verify();
+  }
+
+  return true;
+}
+
+void ZHeap::set_soft_reference_policy(bool clear) {
+  _reference_processor.set_soft_reference_policy(clear);
+}
+
+void ZHeap::process_non_strong_references() {
+  // Process Soft/Weak/Final/PhantomReferences
+  _reference_processor.process_references();
+
+  // Process concurrent weak roots
+  _weak_roots_processor.process_concurrent_weak_roots();
+
+  // Unblock resurrection of weak/phantom references
+  ZResurrection::unblock();
+
+  // Enqueue Soft/Weak/Final/PhantomReferences. Note that this
+  // must be done after unblocking resurrection. Otherwise the
+  // Finalizer thread could call Reference.get() on the Finalizers
+  // that were just enqueued, which would incorrectly return null
+  // during the resurrection block window, since such referents
+  // are only Finalizable marked.
+  _reference_processor.enqueue_references();
+}
+
+void ZHeap::destroy_detached_pages() {
+  ZList<ZPage> list;
+
+  _page_allocator.flush_detached_pages(&list);
+
+  for (ZPage* page = list.remove_first(); page != NULL; page = list.remove_first()) {
+    // Remove pagetable entry
+    _pagetable.remove(page);
+
+    // Delete the page
+    _page_allocator.destroy_page(page);
+  }
+}
+
+void ZHeap::select_relocation_set() {
+  // Register relocatable pages with selector
+  ZRelocationSetSelector selector;
+  ZPageTableIterator iter(&_pagetable);
+  for (ZPage* page; iter.next(&page);) {
+    if (!page->is_relocatable()) {
+      // Not relocatable, don't register
+      continue;
+    }
+
+    if (page->is_marked()) {
+      // Register live page
+      selector.register_live_page(page);
+    } else {
+      // Register garbage page
+      selector.register_garbage_page(page);
+
+      // Reclaim page immediately
+      release_page(page, true /* reclaimed */);
+    }
+  }
+
+  // Select pages to relocate
+  selector.select(&_relocation_set);
+
+  // Update statistics
+  ZStatRelocation::set_at_select_relocation_set(selector.relocating());
+  ZStatHeap::set_at_select_relocation_set(selector.live(),
+                                          selector.garbage(),
+                                          reclaimed());
+}
+
+void ZHeap::prepare_relocation_set() {
+  ZRelocationSetIterator iter(&_relocation_set);
+  for (ZPage* page; iter.next(&page);) {
+    // Prepare for relocation
+    page->set_forwarding();
+
+    // Update pagetable
+    _pagetable.set_relocating(page);
+  }
+}
+
+void ZHeap::reset_relocation_set() {
+  ZRelocationSetIterator iter(&_relocation_set);
+  for (ZPage* page; iter.next(&page);) {
+    // Reset relocation information
+    page->reset_forwarding();
+
+    // Update pagetable
+    _pagetable.clear_relocating(page);
+  }
+}
+
+void ZHeap::relocate_start() {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+  // Update statistics
+  ZStatSample(ZSamplerHeapUsedBeforeRelocation, used());
+
+  // Flip address view
+  ZAddressMasks::flip_to_remapped();
+  flip_views();
+
+  // Remap TLABs
+  _object_allocator.remap_tlabs();
+
+  // Enter relocate phase
+  ZGlobalPhase = ZPhaseRelocate;
+
+  // Update statistics
+  ZStatHeap::set_at_relocate_start(capacity(), allocated(), used());
+
+  // Remap/Relocate roots
+  _relocate.start();
+}
+
+uintptr_t ZHeap::relocate_object(uintptr_t addr) {
+  assert(ZGlobalPhase == ZPhaseRelocate, "Relocate not allowed");
+  ZPage* const page = _pagetable.get(addr);
+  const bool retained = retain_page(page);
+  const uintptr_t new_addr = page->relocate_object(addr);
+  if (retained) {
+    release_page(page, true /* reclaimed */);
+  }
+
+  return new_addr;
+}
+
+uintptr_t ZHeap::forward_object(uintptr_t addr) {
+  assert(ZGlobalPhase == ZPhaseMark ||
+         ZGlobalPhase == ZPhaseMarkCompleted, "Forward not allowed");
+  ZPage* const page = _pagetable.get(addr);
+  return page->forward_object(addr);
+}
+
+void ZHeap::relocate() {
+  // Relocate relocation set
+  const bool success = _relocate.relocate(&_relocation_set);
+
+  // Update statistics
+  ZStatSample(ZSamplerHeapUsedAfterRelocation, used());
+  ZStatRelocation::set_at_relocate_end(success);
+  ZStatHeap::set_at_relocate_end(capacity(), allocated(), reclaimed(),
+                                 used(), used_high(), used_low());
+}
+
+void ZHeap::object_iterate(ObjectClosure* cl) {
+  // Should only be called in a safepoint after mark end.
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+  ZHeapIterator iter;
+  iter.objects_do(cl);
+}
+
+void ZHeap::serviceability_initialize() {
+  _serviceability.initialize();
+}
+
+GCMemoryManager* ZHeap::serviceability_memory_manager() {
+  return _serviceability.memory_manager();
+}
+
+MemoryPool* ZHeap::serviceability_memory_pool() {
+  return _serviceability.memory_pool();
+}
+
+ZServiceabilityCounters* ZHeap::serviceability_counters() {
+  return _serviceability.counters();
+}
+
+void ZHeap::print_on(outputStream* st) const {
+  st->print_cr(" ZHeap           used " SIZE_FORMAT "M, capacity " SIZE_FORMAT "M, max capacity " SIZE_FORMAT "M",
+               used() / M,
+               capacity() / M,
+               max_capacity() / M);
+  MetaspaceUtils::print_on(st);
+}
+
+void ZHeap::print_extended_on(outputStream* st) const {
+  print_on(st);
+  st->cr();
+
+  ZPageTableIterator iter(&_pagetable);
+  for (ZPage* page; iter.next(&page);) {
+    page->print_on(st);
+  }
+
+  st->cr();
+}
+
+class ZVerifyRootsTask : public ZTask {
+private:
+  ZRootsIterator     _strong_roots;
+  ZWeakRootsIterator _weak_roots;
+
+public:
+  ZVerifyRootsTask() :
+      ZTask("ZVerifyRootsTask"),
+      _strong_roots(),
+      _weak_roots() {}
+
+  virtual void work() {
+    ZVerifyRootOopClosure cl;
+    _strong_roots.oops_do(&cl);
+    _weak_roots.oops_do(&cl);
+  }
+};
+
+void ZHeap::verify() {
+  // Heap verification can only be done between mark end and
+  // relocate start. This is the only window where all oop are
+  // good and the whole heap is in a consistent state.
+  guarantee(ZGlobalPhase == ZPhaseMarkCompleted, "Invalid phase");
+
+  {
+    ZVerifyRootsTask task;
+    _workers.run_parallel(&task);
+  }
+
+  {
+    ZVerifyObjectClosure cl;
+    object_iterate(&cl);
+  }
+}
diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
new file mode 100644
index 00000000000..575d753dd93
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZHEAP_HPP
+#define SHARE_GC_Z_ZHEAP_HPP
+
+#include "gc/shared/gcTimer.hpp"
+#include "gc/z/zAllocationFlags.hpp"
+#include "gc/z/zArray.hpp"
+#include "gc/z/zList.hpp"
+#include "gc/z/zLock.hpp"
+#include "gc/z/zMark.hpp"
+#include "gc/z/zObjectAllocator.hpp"
+#include "gc/z/zPage.hpp"
+#include "gc/z/zPageAllocator.hpp"
+#include "gc/z/zPageTable.hpp"
+#include "gc/z/zReferenceProcessor.hpp"
+#include "gc/z/zRelocate.hpp"
+#include "gc/z/zRelocationSet.hpp"
+#include "gc/z/zRelocationSetSelector.hpp"
+#include "gc/z/zRootsIterator.hpp"
+#include "gc/z/zWeakRootsProcessor.hpp"
+#include "gc/z/zServiceability.hpp"
+#include "gc/z/zWorkers.hpp"
+#include "memory/allocation.hpp"
+
+class ZHeap {
+  friend class VMStructs;
+
+private:
+  static ZHeap*       _heap;
+
+  ZWorkers            _workers;
+  ZObjectAllocator    _object_allocator;
+  ZPageAllocator      _page_allocator;
+  ZPageTable          _pagetable;
+  ZMark               _mark;
+  ZReferenceProcessor _reference_processor;
+  ZWeakRootsProcessor _weak_roots_processor;
+  ZRelocate           _relocate;
+  ZRelocationSet      _relocation_set;
+  ZServiceability     _serviceability;
+
+  size_t heap_min_size() const;
+  size_t heap_max_size() const;
+  size_t heap_max_reserve_size() const;
+
+  void out_of_memory();
+  void flip_views();
+  void fixup_partial_loads();
+
+public:
+  static ZHeap* heap();
+
+  ZHeap();
+
+  bool is_initialized() const;
+
+  // Heap metrics
+  size_t min_capacity() const;
+  size_t max_capacity() const;
+  size_t capacity() const;
+  size_t max_reserve() const;
+  size_t used_high() const;
+  size_t used_low() const;
+  size_t used() const;
+  size_t allocated() const;
+  size_t reclaimed() const;
+
+  size_t tlab_capacity() const;
+  size_t tlab_used() const;
+  size_t max_tlab_size() const;
+  size_t unsafe_max_tlab_alloc() const;
+
+  bool is_in(uintptr_t addr) const;
+
+  // Block
+  uintptr_t block_start(uintptr_t addr) const;
+  size_t block_size(uintptr_t addr) const;
+  bool block_is_obj(uintptr_t addr) const;
+
+  // Workers
+  uint nconcurrent_worker_threads() const;
+  uint nconcurrent_no_boost_worker_threads() const;
+  void set_boost_worker_threads(bool boost);
+  void worker_threads_do(ThreadClosure* tc) const;
+  void print_worker_threads_on(outputStream* st) const;
+
+  // Reference processing
+  ReferenceDiscoverer* reference_discoverer();
+  void set_soft_reference_policy(bool clear);
+
+  // Non-strong reference processing
+  void process_non_strong_references();
+
+  // Page allocation
+  ZPage* alloc_page(uint8_t type, size_t size, ZAllocationFlags flags);
+  void undo_alloc_page(ZPage* page);
+  bool retain_page(ZPage* page);
+  void release_page(ZPage* page, bool reclaimed);
+
+  // Object allocation
+  uintptr_t alloc_tlab(size_t size);
+  uintptr_t alloc_object(size_t size);
+  uintptr_t alloc_object_for_relocation(size_t size);
+  void undo_alloc_object_for_relocation(uintptr_t addr, size_t size);
+  void check_out_of_memory();
+
+  // Marking
+  bool is_object_live(uintptr_t addr) const;
+  bool is_object_strongly_live(uintptr_t addr) const;
+  template <bool finalizable, bool publish> void mark_object(uintptr_t addr);
+  void mark_start();
+  void mark();
+  void mark_flush_and_free(Thread* thread);
+  bool mark_end();
+
+  // Post-marking & Pre-relocation
+  void destroy_detached_pages();
+
+  // Relocation set
+  void select_relocation_set();
+  void prepare_relocation_set();
+  void reset_relocation_set();
+
+  // Relocation
+  bool is_relocating(uintptr_t addr) const;
+  void relocate_start();
+  uintptr_t relocate_object(uintptr_t addr);
+  uintptr_t forward_object(uintptr_t addr);
+  void relocate();
+
+  // Iteration
+  void object_iterate(ObjectClosure* cl);
+
+  // Serviceability
+  void serviceability_initialize();
+  GCMemoryManager* serviceability_memory_manager();
+  MemoryPool* serviceability_memory_pool();
+  ZServiceabilityCounters* serviceability_counters();
+
+  // Printing
+  void print_on(outputStream* st) const;
+  void print_extended_on(outputStream* st) const;
+
+  // Verification
+  bool is_oop(oop object) const;
+  void verify();
+};
+
+#endif // SHARE_GC_Z_ZHEAP_HPP
diff --git a/src/hotspot/share/gc/z/zHeap.inline.hpp b/src/hotspot/share/gc/z/zHeap.inline.hpp
new file mode 100644
index 00000000000..1e6beb2bf00
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHeap.inline.hpp
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZHEAP_INLINE_HPP
+#define SHARE_GC_Z_ZHEAP_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zHeap.hpp"
+#include "gc/z/zMark.inline.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPageTable.inline.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "utilities/debug.hpp"
+
+inline ZHeap* ZHeap::heap() {
+  assert(_heap != NULL, "Not initialized");
+  return _heap;
+}
+
+inline ReferenceDiscoverer* ZHeap::reference_discoverer() {
+  return &_reference_processor;
+}
+
+inline bool ZHeap::is_relocating(uintptr_t addr) const {
+  return _pagetable.is_relocating(addr);
+}
+
+inline bool ZHeap::is_object_live(uintptr_t addr) const {
+  ZPage* page = _pagetable.get(addr);
+  return page->is_object_live(addr);
+}
+
+inline bool ZHeap::is_object_strongly_live(uintptr_t addr) const {
+  ZPage* page = _pagetable.get(addr);
+  return page->is_object_strongly_live(addr);
+}
+
+template <bool finalizable, bool publish>
+inline void ZHeap::mark_object(uintptr_t addr) {
+  assert(ZGlobalPhase == ZPhaseMark, "Mark not allowed");
+  _mark.mark_object<finalizable, publish>(addr);
+}
+
+inline uintptr_t ZHeap::alloc_tlab(size_t size) {
+  guarantee(size <= max_tlab_size(), "TLAB too large");
+  return _object_allocator.alloc_object(size);
+}
+
+inline uintptr_t ZHeap::alloc_object(size_t size) {
+  uintptr_t addr = _object_allocator.alloc_object(size);
+  assert(ZAddress::is_good_or_null(addr), "Bad address");
+
+  if (addr == 0) {
+    out_of_memory();
+  }
+
+  return addr;
+}
+
+inline uintptr_t ZHeap::alloc_object_for_relocation(size_t size) {
+  uintptr_t addr = _object_allocator.alloc_object_for_relocation(size);
+  assert(ZAddress::is_good_or_null(addr), "Bad address");
+  return addr;
+}
+
+inline void ZHeap::undo_alloc_object_for_relocation(uintptr_t addr, size_t size) {
+  ZPage* const page = _pagetable.get(addr);
+  _object_allocator.undo_alloc_object_for_relocation(page, addr, size);
+}
+
+inline void ZHeap::check_out_of_memory() {
+  _page_allocator.check_out_of_memory();
+}
+
+inline bool ZHeap::is_oop(oop object) const {
+  return ZOop::is_good(object);
+}
+
+#endif // SHARE_GC_Z_ZHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
new file mode 100644
index 00000000000..03c4e16cfbb
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddressRangeMap.inline.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHeapIterator.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zRootsIterator.hpp"
+#include "oops/oop.inline.hpp"
+#include "utilities/bitMap.inline.hpp"
+#include "utilities/stack.inline.hpp"
+
+class ZHeapIteratorBitMap : public CHeapObj<mtGC> {
+private:
+  CHeapBitMap _map;
+
+public:
+  ZHeapIteratorBitMap(size_t size_in_bits) :
+      _map(size_in_bits) {}
+
+  bool try_set_bit(size_t index) {
+    if (_map.at(index)) {
+      return false;
+    }
+
+    _map.set_bit(index);
+    return true;
+  }
+};
+
+class ZHeapIteratorRootOopClosure : public OopClosure {
+private:
+  ZHeapIterator* const _iter;
+  ObjectClosure* const _cl;
+
+public:
+  ZHeapIteratorRootOopClosure(ZHeapIterator* iter, ObjectClosure* cl) :
+      _iter(iter),
+      _cl(cl) {}
+
+  virtual void do_oop(oop* p) {
+    // Load barrier needed here for the same reason we
+    // need fixup_partial_loads() in ZHeap::mark_end()
+    const oop obj = RootAccess<>::oop_load(p);
+    _iter->push(obj);
+    _iter->drain(_cl);
+  }
+
+  virtual void do_oop(narrowOop* p) {
+    ShouldNotReachHere();
+  }
+};
+
+class ZHeapIteratorPushOopClosure : public ExtendedOopClosure {
+private:
+  ZHeapIterator* const _iter;
+  const oop            _base;
+
+public:
+  ZHeapIteratorPushOopClosure(ZHeapIterator* iter, oop base) :
+      _iter(iter),
+      _base(base) {}
+
+  void do_oop_nv(oop* p) {
+    const oop obj = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(_base, _base->field_offset(p));
+    _iter->push(obj);
+  }
+
+  void do_oop_nv(narrowOop* p) {
+    ShouldNotReachHere();
+  }
+
+  virtual void do_oop(oop* p) {
+    do_oop_nv(p);
+  }
+
+  virtual void do_oop(narrowOop* p) {
+    do_oop_nv(p);
+  }
+
+#ifdef ASSERT
+  virtual bool should_verify_oops() {
+    return false;
+  }
+#endif
+};
+
+ZHeapIterator::ZHeapIterator() :
+    _visit_stack(),
+    _visit_map() {}
+
+ZHeapIterator::~ZHeapIterator() {
+  ZVisitMapIterator iter(&_visit_map);
+  for (ZHeapIteratorBitMap* map; iter.next(&map);) {
+    delete map;
+  }
+}
+
+size_t ZHeapIterator::object_index_max() const {
+  return ZPageSizeMin >> ZObjectAlignmentSmallShift;
+}
+
+size_t ZHeapIterator::object_index(oop obj) const {
+  const uintptr_t addr = ZOop::to_address(obj);
+  const uintptr_t offset = ZAddress::offset(addr);
+  const uintptr_t mask = (1 << ZPageSizeMinShift) - 1;
+  return (offset & mask) >> ZObjectAlignmentSmallShift;
+}
+
+ZHeapIteratorBitMap* ZHeapIterator::object_map(oop obj) {
+  const uintptr_t addr = ZOop::to_address(obj);
+  ZHeapIteratorBitMap* map = _visit_map.get(addr);
+  if (map == NULL) {
+    map = new ZHeapIteratorBitMap(object_index_max());
+    _visit_map.put(addr, map);
+  }
+
+  return map;
+}
+
+void ZHeapIterator::push(oop obj) {
+  if (obj == NULL) {
+    // Ignore
+    return;
+  }
+
+  ZHeapIteratorBitMap* const map = object_map(obj);
+  const size_t index = object_index(obj);
+  if (!map->try_set_bit(index)) {
+    // Already pushed
+    return;
+  }
+
+  // Push
+  _visit_stack.push(obj);
+}
+
+void ZHeapIterator::drain(ObjectClosure* cl) {
+  while (!_visit_stack.is_empty()) {
+    const oop obj = _visit_stack.pop();
+
+    // Visit
+    cl->do_object(obj);
+
+    // Push members to visit
+    ZHeapIteratorPushOopClosure push_cl(this, obj);
+    obj->oop_iterate(&push_cl);
+  }
+}
+
+void ZHeapIterator::objects_do(ObjectClosure* cl) {
+  ZHeapIteratorRootOopClosure root_cl(this, cl);
+  ZRootsIterator roots;
+
+  // Follow roots. Note that we also visit the JVMTI weak tag map
+  // as if they where strong roots to make sure we visit all tagged
+  // objects, even those that might now have become unreachable.
+  // If we didn't do this the user would have expected to see
+  // ObjectFree events for unreachable objects in the tag map.
+  roots.oops_do(&root_cl, true /* visit_jvmti_weak_export */);
+}
diff --git a/src/hotspot/share/gc/z/zHeapIterator.hpp b/src/hotspot/share/gc/z/zHeapIterator.hpp
new file mode 100644
index 00000000000..da38d295927
--- /dev/null
+++ b/src/hotspot/share/gc/z/zHeapIterator.hpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZHEAPITERATOR_HPP
+#define SHARE_GC_Z_ZHEAPITERATOR_HPP
+
+#include "gc/z/zAddressRangeMap.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/stack.hpp"
+
+class ZHeapIteratorBitMap;
+
+class ZHeapIterator : public StackObj {
+  friend class ZHeapIteratorRootOopClosure;
+  friend class ZHeapIteratorPushOopClosure;
+
+private:
+  typedef ZAddressRangeMap<ZHeapIteratorBitMap*, ZPageSizeMinShift>         ZVisitMap;
+  typedef ZAddressRangeMapIterator<ZHeapIteratorBitMap*, ZPageSizeMinShift> ZVisitMapIterator;
+  typedef Stack<oop, mtGC>                                                  ZVisitStack;
+
+  ZVisitStack _visit_stack;
+  ZVisitMap   _visit_map;
+
+  size_t object_index_max() const;
+  size_t object_index(oop obj) const;
+  ZHeapIteratorBitMap* object_map(oop obj);
+
+  void push(oop obj);
+  void drain(ObjectClosure* cl);
+
+public:
+  ZHeapIterator();
+  ~ZHeapIterator();
+
+  void objects_do(ObjectClosure* cl);
+};
+
+#endif // SHARE_GC_Z_ZHEAPITERATOR_HPP
diff --git a/src/hotspot/share/gc/z/zInitialize.cpp b/src/hotspot/share/gc/z/zInitialize.cpp
new file mode 100644
index 00000000000..91b9b06fbe7
--- /dev/null
+++ b/src/hotspot/share/gc/z/zInitialize.cpp
@@ -0,0 +1,51 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddress.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "gc/z/zCPU.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zInitialize.hpp"
+#include "gc/z/zLargePages.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTracer.hpp"
+#include "logging/log.hpp"
+#include "runtime/vm_version.hpp"
+
+ZInitialize::ZInitialize(ZBarrierSet* barrier_set) {
+  log_info(gc, init)("Initializing %s", ZGCName);
+  log_info(gc, init)("Version: %s (%s)",
+                     Abstract_VM_Version::vm_release(),
+                     Abstract_VM_Version::jdk_debug_level());
+
+  // Early initialization
+  ZAddressMasks::initialize();
+  ZNUMA::initialize();
+  ZCPU::initialize();
+  ZStatValue::initialize();
+  ZTracer::initialize();
+  ZLargePages::initialize();
+  ZBarrierSet::set_barrier_set(barrier_set);
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/jdk/dynalink/DynamicLinker.jasm b/src/hotspot/share/gc/z/zInitialize.hpp
similarity index 82%
rename from test/hotspot/jtreg/runtime/appcds/test-classes/jdk/dynalink/DynamicLinker.jasm
rename to src/hotspot/share/gc/z/zInitialize.hpp
index 88544dc74de..fb8bf1af2eb 100644
--- a/test/hotspot/jtreg/runtime/appcds/test-classes/jdk/dynalink/DynamicLinker.jasm
+++ b/src/hotspot/share/gc/z/zInitialize.hpp
@@ -19,19 +19,18 @@
  * 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/dynalink;
+#ifndef SHARE_GC_Z_ZINITIALIZE_HPP
+#define SHARE_GC_Z_ZINITIALIZE_HPP
 
-public class DynamicLinker
-    version 51:0
-{
+#include "memory/allocation.hpp"
 
-public Method thisClassIsDummy:"()V"
-    stack 0 locals 2
-{
-    return;
-}
+class ZBarrierSet;
 
-} // end class DynamicLinker
+class ZInitialize {
+public:
+  ZInitialize(ZBarrierSet* barrier_set);
+};
+
+#endif // SHARE_GC_Z_ZINITIALIZE_HPP
diff --git a/src/hotspot/share/gc/z/zLargePages.cpp b/src/hotspot/share/gc/z/zLargePages.cpp
new file mode 100644
index 00000000000..214bf82deae
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLargePages.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zLargePages.hpp"
+#include "logging/log.hpp"
+#include "runtime/os.hpp"
+
+ZLargePages::State ZLargePages::_state;
+
+void ZLargePages::initialize() {
+  initialize_platform();
+
+  log_info(gc, init)("Memory: " JULONG_FORMAT "M", os::physical_memory() / M);
+  log_info(gc, init)("Large Page Support: %s", to_string());
+}
+
+const char* ZLargePages::to_string() {
+  switch (_state) {
+  case Explicit:
+    return "Enabled (Explicit)";
+
+  case Transparent:
+    return "Enabled (Transparent)";
+
+  default:
+    return "Disabled";
+  }
+}
diff --git a/src/hotspot/share/gc/z/zLargePages.hpp b/src/hotspot/share/gc/z/zLargePages.hpp
new file mode 100644
index 00000000000..0c22e89026e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLargePages.hpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLARGEPAGES_HPP
+#define SHARE_GC_Z_ZLARGEPAGES_HPP
+
+#include "memory/allocation.hpp"
+
+class ZLargePages : public AllStatic {
+private:
+  enum State {
+    Disabled,
+    Explicit,
+    Transparent
+  };
+
+  static State _state;
+
+  static void initialize_platform();
+
+public:
+  static void initialize();
+
+  static bool is_enabled();
+  static bool is_explicit();
+  static bool is_transparent();
+
+  static const char* to_string();
+};
+
+#endif // SHARE_GC_Z_ZLARGEPAGES_HPP
diff --git a/src/hotspot/share/gc/z/zLargePages.inline.hpp b/src/hotspot/share/gc/z/zLargePages.inline.hpp
new file mode 100644
index 00000000000..d057553249e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLargePages.inline.hpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLARGEPAGES_INLINE_HPP
+#define SHARE_GC_Z_ZLARGEPAGES_INLINE_HPP
+
+#include "gc/z/zLargePages.hpp"
+
+inline bool ZLargePages::is_enabled() {
+  return _state != Disabled;
+}
+
+inline bool ZLargePages::is_explicit() {
+  return _state == Explicit;
+}
+
+inline bool ZLargePages::is_transparent() {
+  return _state == Transparent;
+}
+
+#endif // SHARE_GC_Z_ZLARGEPAGES_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zList.hpp b/src/hotspot/share/gc/z/zList.hpp
new file mode 100644
index 00000000000..c5a779c93ab
--- /dev/null
+++ b/src/hotspot/share/gc/z/zList.hpp
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLIST_HPP
+#define SHARE_GC_Z_ZLIST_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
+
+template <typename T> class ZList;
+
+// Element in a double linked list
+template <typename T>
+class ZListNode {
+  friend class ZList<T>;
+
+private:
+  ZListNode* _next;
+  ZListNode* _prev;
+
+  ZListNode(ZListNode* next, ZListNode* prev) :
+      _next(next),
+      _prev(prev) {}
+
+  void set_unused() {
+    _next = NULL;
+    _prev = NULL;
+  }
+
+public:
+  ZListNode() {
+    set_unused();
+  }
+
+  ~ZListNode() {
+    set_unused();
+  }
+
+  bool is_unused() const {
+    return _next == NULL && _prev == NULL;
+  }
+};
+
+// Double-linked list
+template <typename T>
+class ZList {
+private:
+  ZListNode<T> _head;
+  size_t       _size;
+
+  // Passing by value and assignment is not allowed
+  ZList(const ZList<T>& list);
+  ZList<T>& operator=(const ZList<T>& list);
+
+  void verify() const {
+    assert(_head._next->_prev == &_head, "List corrupt");
+    assert(_head._prev->_next == &_head, "List corrupt");
+  }
+
+  void insert(ZListNode<T>* before, ZListNode<T>* node) {
+    verify();
+
+    assert(node->is_unused(), "Already in a list");
+    node->_prev = before;
+    node->_next = before->_next;
+    before->_next = node;
+    node->_next->_prev = node;
+
+    _size++;
+  }
+
+  ZListNode<T>* cast_to_inner(T* elem) const {
+    return &elem->_node;
+  }
+
+  T* cast_to_outer(ZListNode<T>* node) const {
+    return (T*)((uintptr_t)node - offset_of(T, _node));
+  }
+
+public:
+  ZList() :
+      _head(&_head, &_head),
+      _size(0) {
+    verify();
+  }
+
+  size_t size() const {
+    verify();
+    return _size;
+  }
+
+  bool is_empty() const {
+    return _size == 0;
+  }
+
+  T* first() const {
+    return is_empty() ? NULL : cast_to_outer(_head._next);
+  }
+
+  T* last() const {
+    return is_empty() ? NULL : cast_to_outer(_head._prev);
+  }
+
+  T* next(T* elem) const {
+    verify();
+    ZListNode<T>* next = cast_to_inner(elem)->_next;
+    return (next == &_head) ? NULL : cast_to_outer(next);
+  }
+
+  T* prev(T* elem) const {
+    verify();
+    ZListNode<T>* prev = cast_to_inner(elem)->_prev;
+    return (prev == &_head) ? NULL : cast_to_outer(prev);
+  }
+
+  void insert_first(T* elem) {
+    insert(&_head, cast_to_inner(elem));
+  }
+
+  void insert_last(T* elem) {
+    insert(_head._prev, cast_to_inner(elem));
+  }
+
+  void insert_before(T* before, T* elem) {
+    insert(cast_to_inner(before)->_prev, cast_to_inner(elem));
+  }
+
+  void insert_after(T* after, T* elem) {
+    insert(cast_to_inner(after), cast_to_inner(elem));
+  }
+
+  void remove(T* elem) {
+    verify();
+
+    ZListNode<T>* const node = cast_to_inner(elem);
+    assert(!node->is_unused(), "Not in a list");
+
+    ZListNode<T>* const next = node->_next;
+    ZListNode<T>* const prev = node->_prev;
+    assert(next->_prev == node, "List corrupt");
+    assert(prev->_next == node, "List corrupt");
+
+    prev->_next = next;
+    next->_prev = prev;
+    node->set_unused();
+
+    _size--;
+  }
+
+  T* remove_first() {
+    T* elem = first();
+    if (elem != NULL) {
+      remove(elem);
+    }
+
+    return elem;
+  }
+
+  T* remove_last() {
+    T* elem = last();
+    if (elem != NULL) {
+      remove(elem);
+    }
+
+    return elem;
+  }
+
+  void transfer(ZList<T>* list) {
+    verify();
+
+    if (!list->is_empty()) {
+      list->_head._next->_prev = _head._prev;
+      list->_head._prev->_next = _head._prev->_next;
+
+      _head._prev->_next = list->_head._next;
+      _head._prev = list->_head._prev;
+
+      list->_head._next = &list->_head;
+      list->_head._prev = &list->_head;
+
+      _size += list->_size;
+      list->_size = 0;
+
+      list->verify();
+      verify();
+    }
+  }
+};
+
+template <typename T, bool forward>
+class ZListIteratorImpl : public StackObj {
+private:
+  ZList<T>* const _list;
+  T*              _next;
+
+public:
+  ZListIteratorImpl(ZList<T>* list);
+
+  bool next(T** elem);
+};
+
+// Iterator types
+#define ZLIST_FORWARD        true
+#define ZLIST_REVERSE        false
+
+template <typename T>
+class ZListIterator : public ZListIteratorImpl<T, ZLIST_FORWARD> {
+public:
+  ZListIterator(ZList<T>* list) :
+      ZListIteratorImpl<T, ZLIST_FORWARD>(list) {}
+};
+
+template <typename T>
+class ZListReverseIterator : public ZListIteratorImpl<T, ZLIST_REVERSE> {
+public:
+  ZListReverseIterator(ZList<T>* list) :
+      ZListIteratorImpl<T, ZLIST_REVERSE>(list) {}
+};
+
+#endif // SHARE_GC_Z_ZLIST_HPP
diff --git a/src/hotspot/share/gc/z/zList.inline.hpp b/src/hotspot/share/gc/z/zList.inline.hpp
new file mode 100644
index 00000000000..2b7bf6592f5
--- /dev/null
+++ b/src/hotspot/share/gc/z/zList.inline.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLIST_INLINE_HPP
+#define SHARE_GC_Z_ZLIST_INLINE_HPP
+
+#include "gc/z/zList.hpp"
+
+template <typename T, bool forward>
+ZListIteratorImpl<T, forward>::ZListIteratorImpl(ZList<T>* list) :
+    _list(list),
+    _next(forward ? list->first() : list->last()) {}
+
+template <typename T, bool forward>
+bool ZListIteratorImpl<T, forward>::next(T** elem) {
+  if (_next != NULL) {
+    *elem = _next;
+    _next = forward ? _list->next(_next) : _list->prev(_next);
+    return true;
+  }
+
+  // No more elements
+  return false;
+}
+
+#endif // SHARE_GC_Z_ZLIST_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zLiveMap.cpp b/src/hotspot/share/gc/z/zLiveMap.cpp
new file mode 100644
index 00000000000..91bcb24af39
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zLiveMap.inline.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zThread.hpp"
+#include "logging/log.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
+#include "utilities/debug.hpp"
+
+static const ZStatCounter ZCounterMarkSeqNumResetContention("Contention", "Mark SeqNum Reset Contention", ZStatUnitOpsPerSecond);
+static const ZStatCounter ZCounterMarkSegmentResetContention("Contention", "Mark Segment Reset Contention", ZStatUnitOpsPerSecond);
+
+ZLiveMap::ZLiveMap(uint32_t size) :
+    _seqnum(0),
+    _live_objects(0),
+    _live_bytes(0),
+    _segment_live_bits(0),
+    _segment_claim_bits(0),
+    // We need at least one bit per segment.
+    _bitmap(MAX2<size_t>(size, nsegments) * 2),
+    _shift(exact_log2(segment_size())) {}
+
+void ZLiveMap::reset(size_t index) {
+  const uint32_t seqnum_initializing = (uint32_t)-1;
+  bool contention = false;
+
+  // Multiple threads can enter here, make sure only one of them
+  // resets the marking information while the others busy wait.
+  for (uint32_t seqnum = _seqnum; seqnum != ZGlobalSeqNum; seqnum = _seqnum) {
+    if ((seqnum != seqnum_initializing) &&
+        (Atomic::cmpxchg(seqnum_initializing, &_seqnum, seqnum) == seqnum)) {
+      // Reset marking information
+      _live_bytes = 0;
+      _live_objects = 0;
+
+      // Clear segment claimed/live bits
+      segment_live_bits().clear();
+      segment_claim_bits().clear();
+
+      // Make sure the newly reset marking information is
+      // globally visible before updating the page seqnum.
+      OrderAccess::storestore();
+
+      // Update seqnum
+      assert(_seqnum == seqnum_initializing, "Invalid");
+      _seqnum = ZGlobalSeqNum;
+      break;
+    }
+
+    // Mark reset contention
+    if (!contention) {
+      // Count contention once, not every loop
+      ZStatInc(ZCounterMarkSeqNumResetContention);
+      contention = true;
+
+      log_trace(gc)("Mark seqnum reset contention, thread: " PTR_FORMAT " (%s), map: " PTR_FORMAT ", bit: " SIZE_FORMAT,
+                    ZThread::id(), ZThread::name(), p2i(this), index);
+    }
+  }
+}
+
+void ZLiveMap::reset_segment(BitMap::idx_t segment) {
+  bool contention = false;
+
+  if (!claim_segment(segment)) {
+    // Already claimed, wait for live bit to be set
+    while (!is_segment_live(segment)) {
+      // Busy wait. The loadload barrier is needed to make
+      // sure we re-read the live bit every time we loop.
+      OrderAccess::loadload();
+
+      // Mark reset contention
+      if (!contention) {
+        // Count contention once, not every loop
+        ZStatInc(ZCounterMarkSegmentResetContention);
+        contention = true;
+
+        log_trace(gc)("Mark segment reset contention, thread: " PTR_FORMAT " (%s), map: " PTR_FORMAT ", segment: " SIZE_FORMAT,
+                      ZThread::id(), ZThread::name(), p2i(this), segment);
+      }
+    }
+
+    // Segment is live
+    return;
+  }
+
+  // Segment claimed, clear it
+  const BitMap::idx_t start_index = segment_start(segment);
+  const BitMap::idx_t end_index   = segment_end(segment);
+  if (segment_size() / BitsPerWord >= 32) {
+    _bitmap.clear_large_range(start_index, end_index);
+  } else {
+    _bitmap.clear_range(start_index, end_index);
+  }
+
+  // Set live bit
+  const bool success = set_segment_live_atomic(segment);
+  assert(success, "Should never fail");
+}
diff --git a/src/hotspot/share/gc/z/zLiveMap.hpp b/src/hotspot/share/gc/z/zLiveMap.hpp
new file mode 100644
index 00000000000..a5bd1d618ac
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLiveMap.hpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLIVEMAP_HPP
+#define SHARE_GC_Z_ZLIVEMAP_HPP
+
+#include "gc/z/zBitMap.hpp"
+#include "memory/allocation.hpp"
+
+class ObjectClosure;
+
+class ZLiveMap {
+  friend class ZLiveMapTest;
+
+private:
+  static const size_t nsegments = 64;
+
+  volatile uint32_t _seqnum;              // Mark sequence number
+  volatile uint32_t _live_objects;        // Number of live objects
+  volatile size_t   _live_bytes;          // Number of live bytes
+  BitMap::bm_word_t _segment_live_bits;   // Segment live bits
+  BitMap::bm_word_t _segment_claim_bits;  // Segment claim bits
+  ZBitMap           _bitmap;              // Mark bitmap
+  const size_t      _shift;               // Segment shift
+
+  const BitMapView segment_live_bits() const;
+  const BitMapView segment_claim_bits() const;
+
+  BitMapView segment_live_bits();
+  BitMapView segment_claim_bits();
+
+  BitMap::idx_t segment_size() const;
+
+  BitMap::idx_t segment_start(BitMap::idx_t segment) const;
+  BitMap::idx_t segment_end(BitMap::idx_t segment) const;
+
+  bool is_segment_live(BitMap::idx_t segment) const;
+  bool set_segment_live_atomic(BitMap::idx_t segment);
+
+  BitMap::idx_t first_live_segment() const;
+  BitMap::idx_t next_live_segment(BitMap::idx_t segment) const;
+  BitMap::idx_t index_to_segment(BitMap::idx_t index) const;
+
+  bool claim_segment(BitMap::idx_t segment);
+
+  void reset(size_t index);
+  void reset_segment(BitMap::idx_t segment);
+
+  void iterate_segment(ObjectClosure* cl, BitMap::idx_t segment, uintptr_t page_start, size_t page_object_alignment_shift);
+
+public:
+  ZLiveMap(uint32_t size);
+
+  void reset();
+
+  bool is_marked() const;
+
+  uint32_t live_objects() const;
+  size_t live_bytes() const;
+
+  bool get(size_t index) const;
+  bool set_atomic(size_t index, bool finalizable, bool& inc_live);
+
+  void inc_live_atomic(uint32_t objects, size_t bytes);
+
+  void iterate(ObjectClosure* cl, uintptr_t page_start, size_t page_object_alignment_shift);
+};
+
+#endif // SHARE_GC_Z_ZLIVEMAP_HPP
diff --git a/src/hotspot/share/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
new file mode 100644
index 00000000000..87694907459
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLIVEMAP_INLINE_HPP
+#define SHARE_GC_Z_ZLIVEMAP_INLINE_HPP
+
+#include "gc/z/zBitMap.inline.hpp"
+#include "gc/z/zLiveMap.hpp"
+#include "gc/z/zMark.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/bitMap.inline.hpp"
+#include "utilities/debug.hpp"
+
+inline void ZLiveMap::reset() {
+  _seqnum = 0;
+}
+
+inline bool ZLiveMap::is_marked() const {
+  return _seqnum == ZGlobalSeqNum;
+}
+
+inline uint32_t ZLiveMap::live_objects() const {
+  assert(ZGlobalPhase != ZPhaseMark, "Invalid phase");
+  return _live_objects;
+}
+
+inline size_t ZLiveMap::live_bytes() const {
+  assert(ZGlobalPhase != ZPhaseMark, "Invalid phase");
+  return _live_bytes;
+}
+
+inline const BitMapView ZLiveMap::segment_live_bits() const {
+  return BitMapView(const_cast<BitMap::bm_word_t*>(&_segment_live_bits), nsegments);
+}
+
+inline const BitMapView ZLiveMap::segment_claim_bits() const {
+  return BitMapView(const_cast<BitMap::bm_word_t*>(&_segment_claim_bits), nsegments);
+}
+
+inline BitMapView ZLiveMap::segment_live_bits() {
+  return BitMapView(&_segment_live_bits, nsegments);
+}
+
+inline BitMapView ZLiveMap::segment_claim_bits() {
+  return BitMapView(&_segment_claim_bits, nsegments);
+}
+
+inline bool ZLiveMap::is_segment_live(BitMap::idx_t segment) const {
+  return segment_live_bits().at(segment);
+}
+
+inline bool ZLiveMap::set_segment_live_atomic(BitMap::idx_t segment) {
+  return segment_live_bits().par_set_bit(segment);
+}
+
+inline bool ZLiveMap::claim_segment(BitMap::idx_t segment) {
+  return segment_claim_bits().par_set_bit(segment);
+}
+
+inline BitMap::idx_t ZLiveMap::first_live_segment() const {
+  return segment_live_bits().get_next_one_offset(0, nsegments);
+}
+
+inline BitMap::idx_t ZLiveMap::next_live_segment(BitMap::idx_t segment) const {
+  return segment_live_bits().get_next_one_offset(segment + 1, nsegments);
+}
+
+inline BitMap::idx_t ZLiveMap::segment_size() const {
+  return _bitmap.size() / nsegments;
+}
+
+inline BitMap::idx_t ZLiveMap::index_to_segment(BitMap::idx_t index) const {
+  return index >> _shift;
+}
+
+inline bool ZLiveMap::get(size_t index) const {
+  BitMap::idx_t segment = index_to_segment(index);
+  return is_marked() &&               // Page is marked
+         is_segment_live(segment) &&  // Segment is marked
+         _bitmap.at(index);          // Object is marked
+}
+
+inline bool ZLiveMap::set_atomic(size_t index, bool finalizable, bool& inc_live) {
+  if (!is_marked()) {
+    // First object to be marked during this
+    // cycle, reset marking information.
+    reset(index);
+  }
+
+  const BitMap::idx_t segment = index_to_segment(index);
+  if (!is_segment_live(segment)) {
+    // First object to be marked in this segment during
+    // this cycle, reset segment bitmap.
+    reset_segment(segment);
+  }
+
+  return _bitmap.par_set_bit_pair(index, finalizable, inc_live);
+}
+
+inline void ZLiveMap::inc_live_atomic(uint32_t objects, size_t bytes) {
+  Atomic::add(objects, &_live_objects);
+  Atomic::add(bytes, &_live_bytes);
+}
+
+inline BitMap::idx_t ZLiveMap::segment_start(BitMap::idx_t segment) const {
+  return segment_size() * segment;
+}
+
+inline BitMap::idx_t ZLiveMap::segment_end(BitMap::idx_t segment) const {
+  return segment_start(segment) + segment_size();
+}
+
+inline void ZLiveMap::iterate_segment(ObjectClosure* cl, BitMap::idx_t segment, uintptr_t page_start, size_t page_object_alignment_shift) {
+  assert(is_segment_live(segment), "Must be");
+
+  const BitMap::idx_t start_index = segment_start(segment);
+  const BitMap::idx_t end_index   = segment_end(segment);
+  BitMap::idx_t index = _bitmap.get_next_one_offset(start_index, end_index);
+
+  while (index < end_index) {
+    // Calculate object address
+    const uintptr_t addr = page_start + ((index / 2) << page_object_alignment_shift);
+
+    // Apply closure
+    cl->do_object(ZOop::to_oop(addr));
+
+    // Find next bit after this object
+    const size_t size = ZUtils::object_size(addr);
+    const uintptr_t next_addr = align_up(addr + size, 1 << page_object_alignment_shift);
+    const BitMap::idx_t next_index = ((next_addr - page_start) >> page_object_alignment_shift) * 2;
+    if (next_index >= end_index) {
+      // End of live map
+      break;
+    }
+
+    index = _bitmap.get_next_one_offset(next_index, end_index);
+  }
+}
+
+inline void ZLiveMap::iterate(ObjectClosure* cl, uintptr_t page_start, size_t page_object_alignment_shift) {
+  if (is_marked()) {
+    for (BitMap::idx_t segment = first_live_segment(); segment < nsegments; segment = next_live_segment(segment)) {
+      // For each live segment
+      iterate_segment(cl, segment, page_start, page_object_alignment_shift);
+    }
+  }
+}
+
+#endif // SHARE_GC_Z_ZLIVEMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zLock.hpp b/src/hotspot/share/gc/z/zLock.hpp
new file mode 100644
index 00000000000..e25ffd2a1cb
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLock.hpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLOCK_HPP
+#define SHARE_GC_Z_ZLOCK_HPP
+
+#include "memory/allocation.hpp"
+#include <pthread.h>
+
+class ZLock {
+private:
+  pthread_mutex_t _lock;
+
+public:
+  ZLock();
+
+  void lock();
+  bool try_lock();
+  void unlock();
+};
+
+class ZLocker : public StackObj {
+private:
+  ZLock* const _lock;
+
+public:
+  ZLocker(ZLock* lock);
+  ~ZLocker();
+};
+
+#endif // SHARE_GC_Z_ZLOCK_HPP
diff --git a/src/hotspot/share/gc/z/zLock.inline.hpp b/src/hotspot/share/gc/z/zLock.inline.hpp
new file mode 100644
index 00000000000..2f1131523b0
--- /dev/null
+++ b/src/hotspot/share/gc/z/zLock.inline.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZLOCK_INLINE_HPP
+#define SHARE_GC_Z_ZLOCK_INLINE_HPP
+
+#include "gc/z/zLock.hpp"
+
+inline ZLock::ZLock() {
+  pthread_mutex_init(&_lock, NULL);
+}
+
+inline void ZLock::lock() {
+  pthread_mutex_lock(&_lock);
+}
+
+inline bool ZLock::try_lock() {
+  return pthread_mutex_trylock(&_lock) == 0;
+}
+
+inline void ZLock::unlock() {
+  pthread_mutex_unlock(&_lock);
+}
+
+inline ZLocker::ZLocker(ZLock* lock) :
+    _lock(lock) {
+  _lock->lock();
+}
+
+inline ZLocker::~ZLocker() {
+  _lock->unlock();
+}
+
+#endif // SHARE_GC_Z_ZLOCK_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp
new file mode 100644
index 00000000000..bb596f952b7
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMark.cpp
@@ -0,0 +1,684 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zMark.inline.hpp"
+#include "gc/z/zMarkCache.inline.hpp"
+#include "gc/z/zMarkStack.inline.hpp"
+#include "gc/z/zMarkTerminate.inline.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zPage.hpp"
+#include "gc/z/zPageTable.inline.hpp"
+#include "gc/z/zRootsIterator.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zThread.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "gc/z/zWorkers.inline.hpp"
+#include "logging/log.hpp"
+#include "oops/objArrayOop.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/handshake.hpp"
+#include "runtime/orderAccess.hpp"
+#include "runtime/prefetch.inline.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/align.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.hpp"
+
+static const ZStatSubPhase ZSubPhaseConcurrentMark("Concurrent Mark");
+static const ZStatSubPhase ZSubPhaseConcurrentMarkTryFlush("Concurrent Mark Try Flush");
+static const ZStatSubPhase ZSubPhaseConcurrentMarkIdle("Concurrent Mark Idle");
+static const ZStatSubPhase ZSubPhaseConcurrentMarkTryTerminate("Concurrent Mark Try Terminate");
+static const ZStatSubPhase ZSubPhaseMarkTryComplete("Pause Mark Try Complete");
+
+ZMark::ZMark(ZWorkers* workers, ZPageTable* pagetable) :
+    _workers(workers),
+    _pagetable(pagetable),
+    _allocator(),
+    _stripes(),
+    _terminate(),
+    _work_terminateflush(true),
+    _work_nproactiveflush(0),
+    _work_nterminateflush(0),
+    _nproactiveflush(0),
+    _nterminateflush(0),
+    _ntrycomplete(0),
+    _ncontinue(0),
+    _nworkers(0) {}
+
+size_t ZMark::calculate_nstripes(uint nworkers) const {
+  // Calculate the number of stripes from the number of workers we use,
+  // where the number of stripes must be a power of two and we want to
+  // have at least one worker per stripe.
+  const size_t nstripes = ZUtils::round_down_power_of_2(nworkers);
+  return MIN2(nstripes, ZMarkStripesMax);
+}
+
+void ZMark::prepare_mark() {
+  // Increment global sequence number to invalidate
+  // marking information for all pages.
+  ZGlobalSeqNum++;
+
+  // Reset flush/continue counters
+  _nproactiveflush = 0;
+  _nterminateflush = 0;
+  _ntrycomplete = 0;
+  _ncontinue = 0;
+
+  // Set number of workers to use
+  _nworkers = _workers->nconcurrent();
+
+  // Set number of mark stripes to use, based on number
+  // of workers we will use in the concurrent mark phase.
+  const size_t nstripes = calculate_nstripes(_nworkers);
+  _stripes.set_nstripes(nstripes);
+
+  // Update statistics
+  ZStatMark::set_at_mark_start(nstripes);
+
+  // Print worker/stripe distribution
+  LogTarget(Debug, gc, marking) log;
+  if (log.is_enabled()) {
+    log.print("Mark Worker/Stripe Distribution");
+    for (uint worker_id = 0; worker_id < _nworkers; worker_id++) {
+      const ZMarkStripe* const stripe = _stripes.stripe_for_worker(_nworkers, worker_id);
+      const size_t stripe_id = _stripes.stripe_id(stripe);
+      log.print("  Worker %u(%u) -> Stripe " SIZE_FORMAT "(" SIZE_FORMAT ")",
+                worker_id, _nworkers, stripe_id, nstripes);
+    }
+  }
+}
+
+class ZMarkRootsTask : public ZTask {
+private:
+  ZMark* const   _mark;
+  ZRootsIterator _roots;
+
+public:
+  ZMarkRootsTask(ZMark* mark) :
+      ZTask("ZMarkRootsTask"),
+      _mark(mark),
+      _roots() {}
+
+  virtual void work() {
+    ZMarkRootOopClosure cl;
+    _roots.oops_do(&cl);
+
+    // Flush and free worker stacks. Needed here since
+    // the set of workers executing during root scanning
+    // can be different from the set of workers executing
+    // during mark.
+    _mark->flush_and_free();
+  }
+};
+
+void ZMark::start() {
+  // Verification
+  if (ZVerifyMarking) {
+    verify_all_stacks_empty();
+  }
+
+  // Prepare for concurrent mark
+  prepare_mark();
+
+  // Mark roots
+  ZMarkRootsTask task(this);
+  _workers->run_parallel(&task);
+}
+
+void ZMark::prepare_work() {
+  assert(_nworkers == _workers->nconcurrent(), "Invalid number of workers");
+
+  // Set number of active workers
+  _terminate.reset(_nworkers);
+
+  // Reset flush counters
+  _work_nproactiveflush = _work_nterminateflush = 0;
+  _work_terminateflush = true;
+}
+
+void ZMark::finish_work() {
+  // Accumulate proactive/terminate flush counters
+  _nproactiveflush += _work_nproactiveflush;
+  _nterminateflush += _work_nterminateflush;
+}
+
+bool ZMark::is_array(uintptr_t addr) const {
+  return ZOop::to_oop(addr)->is_objArray();
+}
+
+void ZMark::push_partial_array(uintptr_t addr, size_t size, bool finalizable) {
+  assert(is_aligned(addr, ZMarkPartialArrayMinSize), "Address misaligned");
+  ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::stacks(Thread::current());
+  ZMarkStripe* const stripe = _stripes.stripe_for_addr(addr);
+  const uintptr_t offset = ZAddress::offset(addr) >> ZMarkPartialArrayMinSizeShift;
+  const uintptr_t length = size / oopSize;
+  const ZMarkStackEntry entry(offset, length, finalizable);
+
+  log_develop_trace(gc, marking)("Array push partial: " PTR_FORMAT " (" SIZE_FORMAT "), stripe: " SIZE_FORMAT,
+                                 addr, size, _stripes.stripe_id(stripe));
+
+  stacks->push(&_allocator, &_stripes, stripe, entry, false /* publish */);
+}
+
+void ZMark::follow_small_array(uintptr_t addr, size_t size, bool finalizable) {
+  assert(size <= ZMarkPartialArrayMinSize, "Too large, should be split");
+  const size_t length = size / oopSize;
+
+  log_develop_trace(gc, marking)("Array follow small: " PTR_FORMAT " (" SIZE_FORMAT ")", addr, size);
+
+  ZBarrier::mark_barrier_on_oop_array((oop*)addr, length, finalizable);
+}
+
+void ZMark::follow_large_array(uintptr_t addr, size_t size, bool finalizable) {
+  assert(size <= (size_t)arrayOopDesc::max_array_length(T_OBJECT) * oopSize, "Too large");
+  assert(size > ZMarkPartialArrayMinSize, "Too small, should not be split");
+  const uintptr_t start = addr;
+  const uintptr_t end = start + size;
+
+  // Calculate the aligned middle start/end/size, where the middle start
+  // should always be greater than the start (hence the +1 below) to make
+  // sure we always do some follow work, not just split the array into pieces.
+  const uintptr_t middle_start = align_up(start + 1, ZMarkPartialArrayMinSize);
+  const size_t    middle_size = align_down(end - middle_start, ZMarkPartialArrayMinSize);
+  const uintptr_t middle_end = middle_start + middle_size;
+
+  log_develop_trace(gc, marking)("Array follow large: " PTR_FORMAT "-" PTR_FORMAT" (" SIZE_FORMAT "), "
+                                 "middle: " PTR_FORMAT "-" PTR_FORMAT " (" SIZE_FORMAT ")",
+                                 start, end, size, middle_start, middle_end, middle_size);
+
+  // Push unaligned trailing part
+  if (end > middle_end) {
+    const uintptr_t trailing_addr = middle_end;
+    const size_t trailing_size = end - middle_end;
+    push_partial_array(trailing_addr, trailing_size, finalizable);
+  }
+
+  // Push aligned middle part(s)
+  uintptr_t partial_addr = middle_end;
+  while (partial_addr > middle_start) {
+    const size_t parts = 2;
+    const size_t partial_size = align_up((partial_addr - middle_start) / parts, ZMarkPartialArrayMinSize);
+    partial_addr -= partial_size;
+    push_partial_array(partial_addr, partial_size, finalizable);
+  }
+
+  // Follow leading part
+  assert(start < middle_start, "Miscalculated middle start");
+  const uintptr_t leading_addr = start;
+  const size_t leading_size = middle_start - start;
+  follow_small_array(leading_addr, leading_size, finalizable);
+}
+
+void ZMark::follow_array(uintptr_t addr, size_t size, bool finalizable) {
+  if (size <= ZMarkPartialArrayMinSize) {
+    follow_small_array(addr, size, finalizable);
+  } else {
+    follow_large_array(addr, size, finalizable);
+  }
+}
+
+void ZMark::follow_partial_array(ZMarkStackEntry entry, bool finalizable) {
+  const uintptr_t addr = ZAddress::good(entry.partial_array_offset() << ZMarkPartialArrayMinSizeShift);
+  const size_t size = entry.partial_array_length() * oopSize;
+
+  follow_array(addr, size, finalizable);
+}
+
+void ZMark::follow_array_object(objArrayOop obj, bool finalizable) {
+  const uintptr_t addr = (uintptr_t)obj->base();
+  const size_t size = (size_t)obj->length() * oopSize;
+
+  follow_array(addr, size, finalizable);
+}
+
+void ZMark::follow_object(oop obj, bool finalizable) {
+  if (finalizable) {
+    ZMarkBarrierOopClosure<true /* finalizable */> cl;
+    obj->oop_iterate(&cl);
+  } else {
+    ZMarkBarrierOopClosure<false /* finalizable */> cl;
+    obj->oop_iterate(&cl);
+  }
+}
+
+bool ZMark::try_mark_object(ZMarkCache* cache, uintptr_t addr, bool finalizable) {
+  ZPage* const page = _pagetable->get(addr);
+  if (page->is_allocating()) {
+    // Newly allocated objects are implicitly marked
+    return false;
+  }
+
+  // Try mark object
+  bool inc_live = false;
+  const bool success = page->mark_object(addr, finalizable, inc_live);
+  if (inc_live) {
+    // Update live objects/bytes for page. We use the aligned object
+    // size since that is the actual number of bytes used on the page
+    // and alignment paddings can never be reclaimed.
+    const size_t size = ZUtils::object_size(addr);
+    const size_t aligned_size = align_up(size, page->object_alignment());
+    cache->inc_live(page, aligned_size);
+  }
+
+  return success;
+}
+
+void ZMark::mark_and_follow(ZMarkCache* cache, ZMarkStackEntry entry) {
+  // Decode flags
+  const bool finalizable = entry.finalizable();
+  const bool partial_array = entry.partial_array();
+
+  if (partial_array) {
+    follow_partial_array(entry, finalizable);
+    return;
+  }
+
+  // Decode object address
+  const uintptr_t addr = entry.object_address();
+
+  if (!try_mark_object(cache, addr, finalizable)) {
+    // Already marked
+    return;
+  }
+
+  if (is_array(addr)) {
+    follow_array_object(objArrayOop(ZOop::to_oop(addr)), finalizable);
+  } else {
+    follow_object(ZOop::to_oop(addr), finalizable);
+  }
+}
+
+template <typename T>
+bool ZMark::drain(ZMarkStripe* stripe, ZMarkThreadLocalStacks* stacks, ZMarkCache* cache, T* timeout) {
+  ZMarkStackEntry entry;
+
+  // Drain stripe stacks
+  while (stacks->pop(&_allocator, &_stripes, stripe, entry)) {
+    mark_and_follow(cache, entry);
+
+    // Check timeout
+    if (timeout->has_expired()) {
+      // Timeout
+      return false;
+    }
+  }
+
+  // Success
+  return true;
+}
+
+template <typename T>
+bool ZMark::drain_and_flush(ZMarkStripe* stripe, ZMarkThreadLocalStacks* stacks, ZMarkCache* cache, T* timeout) {
+  const bool success = drain(stripe, stacks, cache, timeout);
+
+  // Flush and publish worker stacks
+  stacks->flush(&_allocator, &_stripes);
+
+  return success;
+}
+
+bool ZMark::try_steal(ZMarkStripe* stripe, ZMarkThreadLocalStacks* stacks) {
+  // Try to steal a stack from another stripe
+  for (ZMarkStripe* victim_stripe = _stripes.stripe_next(stripe);
+       victim_stripe != stripe;
+       victim_stripe = _stripes.stripe_next(victim_stripe)) {
+    ZMarkStack* const stack = victim_stripe->steal_stack();
+    if (stack != NULL) {
+      // Success, install the stolen stack
+      stacks->install(&_stripes, stripe, stack);
+      return true;
+    }
+  }
+
+  // Nothing to steal
+  return false;
+}
+
+void ZMark::idle() const {
+  ZStatTimer timer(ZSubPhaseConcurrentMarkIdle);
+  os::naked_short_sleep(1);
+}
+
+class ZMarkFlushAndFreeStacksClosure : public ThreadClosure {
+private:
+  ZMark* const _mark;
+  bool         _flushed;
+
+public:
+  ZMarkFlushAndFreeStacksClosure(ZMark* mark) :
+      _mark(mark),
+      _flushed(false) {}
+
+  void do_thread(Thread* thread) {
+    if (_mark->flush_and_free(thread)) {
+      _flushed = true;
+    }
+  }
+
+  bool flushed() const {
+    return _flushed;
+  }
+};
+
+bool ZMark::flush(bool at_safepoint) {
+  ZMarkFlushAndFreeStacksClosure cl(this);
+  if (at_safepoint) {
+    Threads::threads_do(&cl);
+  } else {
+    Handshake::execute(&cl);
+  }
+
+  // Returns true if more work is available
+  return cl.flushed() || !_stripes.is_empty();
+}
+
+bool ZMark::try_flush(volatile size_t* nflush) {
+  // Only flush if handhakes are enabled
+  if (!ThreadLocalHandshakes) {
+    return false;
+  }
+
+  Atomic::inc(nflush);
+
+  ZStatTimer timer(ZSubPhaseConcurrentMarkTryFlush);
+  return flush(false /* at_safepoint */);
+}
+
+bool ZMark::try_proactive_flush() {
+  // Only do proactive flushes from worker 0
+  if (ZThread::worker_id() != 0) {
+    return false;
+  }
+
+  if (Atomic::load(&_work_nproactiveflush) == ZMarkProactiveFlushMax ||
+      Atomic::load(&_work_nterminateflush) != 0) {
+    // Limit reached or we're trying to terminate
+    return false;
+  }
+
+  return try_flush(&_work_nproactiveflush);
+}
+
+bool ZMark::try_terminate() {
+  ZStatTimer timer(ZSubPhaseConcurrentMarkTryTerminate);
+
+  if (_terminate.enter_stage0()) {
+    // Last thread entered stage 0, flush
+    if (Atomic::load(&_work_terminateflush) &&
+        Atomic::load(&_work_nterminateflush) != ZMarkTerminateFlushMax) {
+      // Exit stage 0 to allow other threads to continue marking
+      _terminate.exit_stage0();
+
+      // Flush before termination
+      if (!try_flush(&_work_nterminateflush)) {
+        // No more work available, skip further flush attempts
+        Atomic::store(false, &_work_terminateflush);
+      }
+
+      // Don't terminate, regardless of whether we successfully
+      // flushed out more work or not. We've already exited
+      // termination stage 0, to allow other threads to continue
+      // marking, so this thread has to return false and also
+      // make another round of attempted marking.
+      return false;
+    }
+  }
+
+  for (;;) {
+    if (_terminate.enter_stage1()) {
+      // Last thread entered stage 1, terminate
+      return true;
+    }
+
+    // Idle to give the other threads
+    // a chance to enter termination.
+    idle();
+
+    if (!_terminate.try_exit_stage1()) {
+      // All workers in stage 1, terminate
+      return true;
+    }
+
+    if (_terminate.try_exit_stage0()) {
+      // More work available, don't terminate
+      return false;
+    }
+  }
+}
+
+class ZMarkNoTimeout : public StackObj {
+public:
+  bool has_expired() {
+    return false;
+  }
+};
+
+void ZMark::work_without_timeout(ZMarkCache* cache, ZMarkStripe* stripe, ZMarkThreadLocalStacks* stacks) {
+  ZStatTimer timer(ZSubPhaseConcurrentMark);
+  ZMarkNoTimeout no_timeout;
+
+  for (;;) {
+    drain_and_flush(stripe, stacks, cache, &no_timeout);
+
+    if (try_steal(stripe, stacks)) {
+      // Stole work
+      continue;
+    }
+
+    if (try_proactive_flush()) {
+      // Work available
+      continue;
+    }
+
+    if (try_terminate()) {
+      // Terminate
+      break;
+    }
+  }
+}
+
+class ZMarkTimeout : public StackObj {
+private:
+  const Ticks    _start;
+  const uint64_t _timeout;
+  const uint64_t _check_interval;
+  uint64_t       _check_at;
+  uint64_t       _check_count;
+  bool           _expired;
+
+public:
+  ZMarkTimeout(uint64_t timeout_in_millis) :
+      _start(Ticks::now()),
+      _timeout(_start.value() + TimeHelper::millis_to_counter(timeout_in_millis)),
+      _check_interval(200),
+      _check_at(_check_interval),
+      _check_count(0),
+      _expired(false) {}
+
+  ~ZMarkTimeout() {
+    const Tickspan duration = Ticks::now() - _start;
+    log_debug(gc, marking)("Mark With Timeout (%s): %s, " UINT64_FORMAT " oops, %.3fms",
+                           ZThread::name(), _expired ? "Expired" : "Completed",
+                           _check_count, TimeHelper::counter_to_millis(duration.value()));
+  }
+
+  bool has_expired() {
+    if (++_check_count == _check_at) {
+      _check_at += _check_interval;
+      if ((uint64_t)Ticks::now().value() >= _timeout) {
+        // Timeout
+        _expired = true;
+      }
+    }
+
+    return _expired;
+  }
+};
+
+void ZMark::work_with_timeout(ZMarkCache* cache, ZMarkStripe* stripe, ZMarkThreadLocalStacks* stacks, uint64_t timeout_in_millis) {
+  ZStatTimer timer(ZSubPhaseMarkTryComplete);
+  ZMarkTimeout timeout(timeout_in_millis);
+
+  for (;;) {
+    if (!drain_and_flush(stripe, stacks, cache, &timeout)) {
+      // Timed out
+      break;
+    }
+
+    if (try_steal(stripe, stacks)) {
+      // Stole work
+      continue;
+    }
+
+    // Terminate
+    break;
+  }
+}
+
+void ZMark::work(uint64_t timeout_in_millis) {
+  ZMarkCache cache(_stripes.nstripes());
+  ZMarkStripe* const stripe = _stripes.stripe_for_worker(_nworkers, ZThread::worker_id());
+  ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::stacks(Thread::current());
+
+  if (timeout_in_millis == 0) {
+    work_without_timeout(&cache, stripe, stacks);
+  } else {
+    work_with_timeout(&cache, stripe, stacks, timeout_in_millis);
+  }
+
+  // Make sure stacks have been flushed
+  assert(stacks->is_empty(&_stripes), "Should be empty");
+
+  // Free remaining stacks
+  stacks->free(&_allocator);
+}
+
+class ZMarkTask : public ZTask {
+private:
+  ZMark* const   _mark;
+  const uint64_t _timeout_in_millis;
+
+public:
+  ZMarkTask(ZMark* mark, uint64_t timeout_in_millis = 0) :
+      ZTask("ZMarkTask"),
+      _mark(mark),
+      _timeout_in_millis(timeout_in_millis) {
+    _mark->prepare_work();
+  }
+
+  ~ZMarkTask() {
+    _mark->finish_work();
+  }
+
+  virtual void work() {
+    _mark->work(_timeout_in_millis);
+  }
+};
+
+void ZMark::mark() {
+  ZMarkTask task(this);
+  _workers->run_concurrent(&task);
+}
+
+bool ZMark::try_complete() {
+  _ntrycomplete++;
+
+  // Use nconcurrent number of worker threads to maintain the
+  // worker/stripe distribution used during concurrent mark.
+  ZMarkTask task(this, ZMarkCompleteTimeout);
+  _workers->run_concurrent(&task);
+
+  // Successful if all stripes are empty
+  return _stripes.is_empty();
+}
+
+bool ZMark::try_end() {
+  // Flush all mark stacks
+  if (!flush(true /* at_safepoint */)) {
+    // Mark completed
+    return true;
+  }
+
+  // Try complete marking by doing a limited
+  // amount of mark work in this phase.
+  return try_complete();
+}
+
+bool ZMark::end() {
+  // Try end marking
+  if (!try_end()) {
+    // Mark not completed
+    _ncontinue++;
+    return false;
+  }
+
+  // Verification
+  if (ZVerifyMarking) {
+    verify_all_stacks_empty();
+  }
+
+  // Update statistics
+  ZStatMark::set_at_mark_end(_nproactiveflush, _nterminateflush, _ntrycomplete, _ncontinue);
+
+  // Mark completed
+  return true;
+}
+
+void ZMark::flush_and_free() {
+  Thread* const thread = Thread::current();
+  flush_and_free(thread);
+}
+
+bool ZMark::flush_and_free(Thread* thread) {
+  ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::stacks(thread);
+  const bool flushed = stacks->flush(&_allocator, &_stripes);
+  stacks->free(&_allocator);
+  return flushed;
+}
+
+class ZVerifyMarkStacksEmptyClosure : public ThreadClosure {
+private:
+  const ZMarkStripeSet* const _stripes;
+
+public:
+  ZVerifyMarkStacksEmptyClosure(const ZMarkStripeSet* stripes) :
+      _stripes(stripes) {}
+
+  void do_thread(Thread* thread) {
+    ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::stacks(thread);
+    guarantee(stacks->is_empty(_stripes), "Should be empty");
+  }
+};
+
+void ZMark::verify_all_stacks_empty() const {
+  // Verify thread stacks
+  ZVerifyMarkStacksEmptyClosure cl(&_stripes);
+  Threads::threads_do(&cl);
+
+  // Verify stripe stacks
+  guarantee(_stripes.is_empty(), "Should be emtpy");
+}
diff --git a/src/hotspot/share/gc/z/zMark.hpp b/src/hotspot/share/gc/z/zMark.hpp
new file mode 100644
index 00000000000..37695d36724
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMark.hpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARK_HPP
+#define SHARE_GC_Z_ZMARK_HPP
+
+#include "gc/z/zMarkStack.hpp"
+#include "gc/z/zMarkTerminate.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class Thread;
+class ZMarkCache;
+class ZPageTable;
+class ZWorkers;
+
+class ZMark {
+  friend class ZMarkRootsTask;
+  friend class ZMarkTask;
+  friend class ZMarkTryCompleteTask;
+
+private:
+  ZWorkers* const     _workers;
+  ZPageTable* const   _pagetable;
+  ZMarkStackAllocator _allocator;
+  ZMarkStripeSet      _stripes;
+  ZMarkTerminate      _terminate;
+  volatile bool       _work_terminateflush;
+  volatile size_t     _work_nproactiveflush;
+  volatile size_t     _work_nterminateflush;
+  size_t              _nproactiveflush;
+  size_t              _nterminateflush;
+  size_t              _ntrycomplete;
+  size_t              _ncontinue;
+  uint                _nworkers;
+
+  size_t calculate_nstripes(uint nworkers) const;
+  void prepare_mark();
+
+  bool is_array(uintptr_t addr) const;
+  void push_partial_array(uintptr_t addr, size_t size, bool finalizable);
+  void follow_small_array(uintptr_t addr, size_t size, bool finalizable);
+  void follow_large_array(uintptr_t addr, size_t size, bool finalizable);
+  void follow_array(uintptr_t addr, size_t size, bool finalizable);
+  void follow_partial_array(ZMarkStackEntry entry, bool finalizable);
+  void follow_array_object(objArrayOop obj, bool finalizable);
+  void follow_object(oop obj, bool finalizable);
+  bool try_mark_object(ZMarkCache* cache, uintptr_t addr, bool finalizable);
+  void mark_and_follow(ZMarkCache* cache, ZMarkStackEntry entry);
+
+  template <typename T> bool drain(ZMarkStripe* stripe,
+                                   ZMarkThreadLocalStacks* stacks,
+                                   ZMarkCache* cache,
+                                   T* timeout);
+  template <typename T> bool drain_and_flush(ZMarkStripe* stripe,
+                                             ZMarkThreadLocalStacks* stacks,
+                                             ZMarkCache* cache,
+                                             T* timeout);
+  bool try_steal(ZMarkStripe* stripe, ZMarkThreadLocalStacks* stacks);
+  void idle() const;
+  bool flush(bool at_safepoint);
+  bool try_proactive_flush();
+  bool try_flush(volatile size_t* nflush);
+  bool try_terminate();
+  bool try_complete();
+  bool try_end();
+
+  void prepare_work();
+  void finish_work();
+
+  void work_without_timeout(ZMarkCache* cache,
+                            ZMarkStripe* stripe,
+                            ZMarkThreadLocalStacks* stacks);
+  void work_with_timeout(ZMarkCache* cache,
+                         ZMarkStripe* stripe,
+                         ZMarkThreadLocalStacks* stacks,
+                         uint64_t timeout_in_millis);
+  void work(uint64_t timeout_in_millis);
+
+  void verify_all_stacks_empty() const;
+
+public:
+  ZMark(ZWorkers* workers, ZPageTable* pagetable);
+
+  template <bool finalizable, bool publish> void mark_object(uintptr_t addr);
+
+  void start();
+  void mark();
+  bool end();
+
+  void flush_and_free();
+  bool flush_and_free(Thread* thread);
+};
+
+#endif // SHARE_GC_Z_ZMARK_HPP
diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp
new file mode 100644
index 00000000000..2b9a5f5daf1
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMark.inline.hpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARK_INLINE_HPP
+#define SHARE_GC_Z_ZMARK_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zMark.hpp"
+#include "gc/z/zMarkStack.inline.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/debug.hpp"
+
+template <bool finalizable, bool publish>
+inline void ZMark::mark_object(uintptr_t addr) {
+  assert(ZAddress::is_marked(addr), "Should be marked");
+  ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::stacks(Thread::current());
+  ZMarkStripe* const stripe = _stripes.stripe_for_addr(addr);
+  ZMarkStackEntry entry(addr, finalizable);
+
+  stacks->push(&_allocator, &_stripes, stripe, entry, publish);
+}
+
+#endif // SHARE_GC_Z_ZMARK_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkCache.cpp b/src/hotspot/share/gc/z/zMarkCache.cpp
new file mode 100644
index 00000000000..91601ff8ad2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkCache.cpp
@@ -0,0 +1,41 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zMarkCache.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+ZMarkCacheEntry::ZMarkCacheEntry() :
+    _page(NULL),
+    _objects(0),
+    _bytes(0) {}
+
+ZMarkCache::ZMarkCache(size_t nstripes) :
+    _shift(ZMarkStripeShift + exact_log2(nstripes)) {}
+
+ZMarkCache::~ZMarkCache() {
+  // Evict all entries
+  for (size_t i = 0; i < ZMarkCacheSize; i++) {
+    _cache[i].evict();
+  }
+}
diff --git a/src/hotspot/share/gc/z/zMarkCache.hpp b/src/hotspot/share/gc/z/zMarkCache.hpp
new file mode 100644
index 00000000000..8d902088c05
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkCache.hpp
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKCACHE_HPP
+#define SHARE_GC_Z_ZMARKCACHE_HPP
+
+#include "gc/z/zGlobals.hpp"
+#include "memory/allocation.hpp"
+
+class ZPage;
+
+class ZMarkCacheEntry {
+private:
+  ZPage*   _page;
+  uint32_t _objects;
+  size_t   _bytes;
+
+public:
+  ZMarkCacheEntry();
+
+  void inc_live(ZPage* page, size_t bytes);
+  void evict();
+};
+
+class ZMarkCache : public StackObj {
+private:
+  const size_t    _shift;
+  ZMarkCacheEntry _cache[ZMarkCacheSize];
+
+public:
+  ZMarkCache(size_t nstripes);
+  ~ZMarkCache();
+
+  void inc_live(ZPage* page, size_t bytes);
+};
+
+#endif // SHARE_GC_Z_ZMARKCACHE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkCache.inline.hpp b/src/hotspot/share/gc/z/zMarkCache.inline.hpp
new file mode 100644
index 00000000000..f9c8599645f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkCache.inline.hpp
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKCACHE_INLINE_HPP
+#define SHARE_GC_Z_ZMARKCACHE_INLINE_HPP
+
+#include "gc/z/zMarkCache.hpp"
+#include "gc/z/zPage.inline.hpp"
+
+inline void ZMarkCacheEntry::inc_live(ZPage* page, size_t bytes) {
+  if (_page == page) {
+    // Cache hit
+    _objects++;
+    _bytes += bytes;
+  } else {
+    // Cache miss
+    evict();
+    _page = page;
+    _objects = 1;
+    _bytes = bytes;
+  }
+}
+
+inline void ZMarkCacheEntry::evict() {
+  if (_page != NULL) {
+    // Write cached data out to page
+    _page->inc_live_atomic(_objects, _bytes);
+    _page = NULL;
+  }
+}
+
+inline void ZMarkCache::inc_live(ZPage* page, size_t bytes) {
+  const size_t mask = ZMarkCacheSize - 1;
+  const size_t index = (page->start() >> _shift) & mask;
+  _cache[index].inc_live(page, bytes);
+}
+
+#endif // SHARE_GC_Z_ZMARKCACHE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkStack.cpp b/src/hotspot/share/gc/z/zMarkStack.cpp
new file mode 100644
index 00000000000..52fe51ecec2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkStack.cpp
@@ -0,0 +1,392 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zErrno.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zLock.inline.hpp"
+#include "gc/z/zMarkStack.inline.hpp"
+#include "logging/log.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/debug.hpp"
+
+#include <sys/mman.h>
+#include <sys/types.h>
+
+ZMarkStackSpace::ZMarkStackSpace() :
+    _expand_lock(),
+    _top(0),
+    _end(0) {
+  assert(ZMarkStacksMax >= ZMarkStackSpaceExpandSize, "ZMarkStacksMax too small");
+  assert(ZMarkStacksMax <= ZMarkStackSpaceSize, "ZMarkStacksMax too large");
+
+  // Reserve address space
+  const void* res = mmap((void*)ZMarkStackSpaceStart, ZMarkStackSpaceSize,
+                         PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
+  if (res != (void*)ZMarkStackSpaceStart) {
+    log_error(gc, marking)("Failed to reserve address space for marking stacks");
+    return;
+  }
+
+  // Successfully initialized
+  _top = _end = ZMarkStackSpaceStart;
+}
+
+bool ZMarkStackSpace::is_initialized() const {
+  return _top != 0;
+}
+
+bool ZMarkStackSpace::expand() {
+  const size_t max = ZMarkStackSpaceStart + ZMarkStacksMax;
+  if (_end + ZMarkStackSpaceExpandSize > max) {
+    // Expansion limit reached
+    return false;
+  }
+
+  void* const res = mmap((void*)_end, ZMarkStackSpaceExpandSize,
+                         PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE|MAP_FIXED, -1, 0);
+  if (res == MAP_FAILED) {
+    ZErrno err;
+    log_error(gc, marking)("Failed to map memory for marking stacks (%s)", err.to_string());
+    return false;
+  }
+
+  return true;
+}
+
+uintptr_t ZMarkStackSpace::alloc_space(size_t size) {
+  uintptr_t top = _top;
+
+  for (;;) {
+    const uintptr_t new_top = top + size;
+    if (new_top > _end) {
+      // Not enough space left
+      return 0;
+    }
+
+    const uintptr_t prev_top = Atomic::cmpxchg(new_top, &_top, top);
+    if (prev_top == top) {
+      // Success
+      return top;
+    }
+
+    // Retry
+    top = prev_top;
+  }
+}
+
+uintptr_t ZMarkStackSpace::expand_and_alloc_space(size_t size) {
+  ZLocker locker(&_expand_lock);
+
+  // Retry allocation before expanding
+  uintptr_t addr = alloc_space(size);
+  if (addr != 0) {
+    return addr;
+  }
+
+  // Expand stack space
+  if (!expand()) {
+    // We currently can't handle the situation where we
+    // are running out of mark stack space.
+    fatal("Mark stack overflow (allocated " SIZE_FORMAT "M, size " SIZE_FORMAT "M, max " SIZE_FORMAT "M),"
+          " use -XX:ZMarkStacksMax=? to increase this limit",
+          (_end - ZMarkStackSpaceStart) / M, size / M, ZMarkStacksMax / M);
+    return 0;
+  }
+
+  log_debug(gc, marking)("Expanding mark stack space: " SIZE_FORMAT "M->" SIZE_FORMAT "M",
+                         (_end - ZMarkStackSpaceStart) / M,
+                         (_end - ZMarkStackSpaceStart + ZMarkStackSpaceExpandSize) / M);
+
+  // Increment top before end to make sure another
+  // thread can't steal out newly expanded space.
+  addr = Atomic::add(size, &_top) - size;
+  _end += ZMarkStackSpaceExpandSize;
+
+  return addr;
+}
+
+uintptr_t ZMarkStackSpace::alloc(size_t size) {
+  const uintptr_t addr = alloc_space(size);
+  if (addr != 0) {
+    return addr;
+  }
+
+  return expand_and_alloc_space(size);
+}
+
+ZMarkStackAllocator::ZMarkStackAllocator() :
+    _freelist(),
+    _space() {
+  guarantee(sizeof(ZMarkStack) == ZMarkStackSize, "Size mismatch");
+  guarantee(sizeof(ZMarkStackMagazine) <= ZMarkStackSize, "Size mismatch");
+
+  // Prime free list to avoid an immediate space
+  // expansion when marking starts.
+  if (_space.is_initialized()) {
+    prime_freelist();
+  }
+}
+
+bool ZMarkStackAllocator::is_initialized() const {
+  return _space.is_initialized();
+}
+
+void ZMarkStackAllocator::prime_freelist() {
+  for (size_t size = 0; size < ZMarkStackSpaceExpandSize; size += ZMarkStackMagazineSize) {
+    const uintptr_t addr = _space.alloc(ZMarkStackMagazineSize);
+    ZMarkStackMagazine* const magazine = create_magazine_from_space(addr, ZMarkStackMagazineSize);
+    free_magazine(magazine);
+  }
+}
+
+ZMarkStackMagazine* ZMarkStackAllocator::create_magazine_from_space(uintptr_t addr, size_t size) {
+  assert(is_aligned(size, ZMarkStackSize), "Invalid size");
+
+  // Use first stack as magazine
+  ZMarkStackMagazine* const magazine = new ((void*)addr) ZMarkStackMagazine();
+  for (size_t i = ZMarkStackSize; i < size; i += ZMarkStackSize) {
+    ZMarkStack* const stack = new ((void*)(addr + i)) ZMarkStack();
+    const bool success = magazine->push(stack);
+    assert(success, "Magazine should never get full");
+  }
+
+  return magazine;
+}
+
+ZMarkStackMagazine* ZMarkStackAllocator::alloc_magazine() {
+  // Try allocating from the free list first
+  ZMarkStackMagazine* const magazine = _freelist.pop_atomic();
+  if (magazine != NULL) {
+    return magazine;
+  }
+
+  // Allocate new magazine
+  const uintptr_t addr = _space.alloc(ZMarkStackMagazineSize);
+  if (addr == 0) {
+    return NULL;
+  }
+
+  return create_magazine_from_space(addr, ZMarkStackMagazineSize);
+}
+
+void ZMarkStackAllocator::free_magazine(ZMarkStackMagazine* magazine) {
+  _freelist.push_atomic(magazine);
+}
+
+ZMarkStripe::ZMarkStripe() :
+    _published(),
+    _overflowed() {}
+
+ZMarkStripeSet::ZMarkStripeSet() :
+    _nstripes(0),
+    _nstripes_mask(0),
+    _stripes() {}
+
+void ZMarkStripeSet::set_nstripes(size_t nstripes) {
+  assert(is_power_of_2(nstripes), "Must be a power of two");
+  assert(is_power_of_2(ZMarkStripesMax), "Must be a power of two");
+  assert(nstripes >= 1, "Invalid number of stripes");
+  assert(nstripes <= ZMarkStripesMax, "Invalid number of stripes");
+
+  _nstripes = nstripes;
+  _nstripes_mask = nstripes - 1;
+
+  log_debug(gc, marking)("Using " SIZE_FORMAT " mark stripes", _nstripes);
+}
+
+bool ZMarkStripeSet::is_empty() const {
+  for (size_t i = 0; i < _nstripes; i++) {
+    if (!_stripes[i].is_empty()) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+ZMarkStripe* ZMarkStripeSet::stripe_for_worker(uint nworkers, uint worker_id) {
+  const size_t spillover_limit = (nworkers / _nstripes) * _nstripes;
+  size_t index;
+
+  if (worker_id < spillover_limit) {
+    // Not a spillover worker, use natural stripe
+    index = worker_id & _nstripes_mask;
+  } else {
+    // Distribute spillover workers evenly across stripes
+    const size_t spillover_nworkers = nworkers - spillover_limit;
+    const size_t spillover_worker_id = worker_id - spillover_limit;
+    const double spillover_chunk = (double)_nstripes / (double)spillover_nworkers;
+    index = spillover_worker_id * spillover_chunk;
+  }
+
+  assert(index < _nstripes, "Invalid index");
+  return &_stripes[index];
+}
+
+ZMarkThreadLocalStacks::ZMarkThreadLocalStacks() :
+    _magazine(NULL) {
+  for (size_t i = 0; i < ZMarkStripesMax; i++) {
+    _stacks[i] = NULL;
+  }
+}
+
+bool ZMarkThreadLocalStacks::is_empty(const ZMarkStripeSet* stripes) const {
+  for (size_t i = 0; i < stripes->nstripes(); i++) {
+    ZMarkStack* const stack = _stacks[i];
+    if (stack != NULL) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+ZMarkStack* ZMarkThreadLocalStacks::allocate_stack(ZMarkStackAllocator* allocator) {
+  if (_magazine == NULL) {
+    // Allocate new magazine
+    _magazine = allocator->alloc_magazine();
+    if (_magazine == NULL) {
+      return NULL;
+    }
+  }
+
+  ZMarkStack* stack = NULL;
+
+  if (!_magazine->pop(stack)) {
+    // Magazine is empty, convert magazine into a new stack
+    _magazine->~ZMarkStackMagazine();
+    stack = new ((void*)_magazine) ZMarkStack();
+    _magazine = NULL;
+  }
+
+  return stack;
+}
+
+void ZMarkThreadLocalStacks::free_stack(ZMarkStackAllocator* allocator, ZMarkStack* stack) {
+  for (;;) {
+    if (_magazine == NULL) {
+      // Convert stack into a new magazine
+      stack->~ZMarkStack();
+      _magazine = new ((void*)stack) ZMarkStackMagazine();
+      return;
+    }
+
+    if (_magazine->push(stack)) {
+      // Success
+      return;
+    }
+
+    // Free and uninstall full magazine
+    allocator->free_magazine(_magazine);
+    _magazine = NULL;
+  }
+}
+
+bool ZMarkThreadLocalStacks::push_slow(ZMarkStackAllocator* allocator,
+                                       ZMarkStripe* stripe,
+                                       ZMarkStack** stackp,
+                                       ZMarkStackEntry entry,
+                                       bool publish) {
+  ZMarkStack* stack = *stackp;
+
+  for (;;) {
+    if (stack == NULL) {
+      // Allocate and install new stack
+      *stackp = stack = allocate_stack(allocator);
+      if (stack == NULL) {
+        // Out of mark stack memory
+        return false;
+      }
+    }
+
+    if (stack->push(entry)) {
+      // Success
+      return true;
+    }
+
+    // Publish/Overflow and uninstall stack
+    stripe->publish_stack(stack, publish);
+    *stackp = stack = NULL;
+  }
+}
+
+bool ZMarkThreadLocalStacks::pop_slow(ZMarkStackAllocator* allocator,
+                                      ZMarkStripe* stripe,
+                                      ZMarkStack** stackp,
+                                      ZMarkStackEntry& entry) {
+  ZMarkStack* stack = *stackp;
+
+  for (;;) {
+    if (stack == NULL) {
+      // Try steal and install stack
+      *stackp = stack = stripe->steal_stack();
+      if (stack == NULL) {
+        // Nothing to steal
+        return false;
+      }
+    }
+
+    if (stack->pop(entry)) {
+      // Success
+      return true;
+    }
+
+    // Free and uninstall stack
+    free_stack(allocator, stack);
+    *stackp = stack = NULL;
+  }
+}
+
+bool ZMarkThreadLocalStacks::flush(ZMarkStackAllocator* allocator, ZMarkStripeSet* stripes) {
+  bool flushed = false;
+
+  // Flush all stacks
+  for (size_t i = 0; i < stripes->nstripes(); i++) {
+    ZMarkStripe* const stripe = stripes->stripe_at(i);
+    ZMarkStack** const stackp = &_stacks[i];
+    ZMarkStack* const stack = *stackp;
+    if (stack == NULL) {
+      continue;
+    }
+
+    // Free/Publish and uninstall stack
+    if (stack->is_empty()) {
+      free_stack(allocator, stack);
+    } else {
+      stripe->publish_stack(stack);
+      flushed = true;
+    }
+    *stackp = NULL;
+  }
+
+  return flushed;
+}
+
+void ZMarkThreadLocalStacks::free(ZMarkStackAllocator* allocator) {
+  // Free and uninstall magazine
+  if (_magazine != NULL) {
+    allocator->free_magazine(_magazine);
+    _magazine = NULL;
+  }
+}
diff --git a/src/hotspot/share/gc/z/zMarkStack.hpp b/src/hotspot/share/gc/z/zMarkStack.hpp
new file mode 100644
index 00000000000..b68b9faa37f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkStack.hpp
@@ -0,0 +1,192 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKSTACK_HPP
+#define SHARE_GC_Z_ZMARKSTACK_HPP
+
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zLock.hpp"
+#include "gc/z/zMarkStackEntry.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+template <typename T, size_t S>
+class ZStack {
+private:
+  size_t        _top;
+  ZStack<T, S>* _next;
+  T             _slots[S];
+
+  bool is_full() const;
+
+public:
+  ZStack();
+
+  bool is_empty() const;
+
+  bool push(T value);
+  bool pop(T& value);
+
+  ZStack<T, S>* next() const;
+  ZStack<T, S>** next_addr();
+};
+
+template <typename T>
+class ZStackList {
+private:
+  T* volatile _head;
+
+  T* encode_versioned_pointer(const T* stack, uint32_t version) const;
+  void decode_versioned_pointer(const T* vstack, T** stack, uint32_t* version) const;
+
+public:
+  ZStackList();
+
+  bool is_empty() const;
+
+  void push_atomic(T* stack);
+  T* pop_atomic();
+};
+
+typedef ZStack<ZMarkStackEntry, ZMarkStackSlots>     ZMarkStack;
+typedef ZStackList<ZMarkStack>                       ZMarkStackList;
+typedef ZStack<ZMarkStack*, ZMarkStackMagazineSlots> ZMarkStackMagazine;
+typedef ZStackList<ZMarkStackMagazine>               ZMarkStackMagazineList;
+
+class ZMarkStackSpace {
+private:
+  ZLock              _expand_lock;
+  volatile uintptr_t _top;
+  volatile uintptr_t _end;
+
+  bool expand();
+
+  uintptr_t alloc_space(size_t size);
+  uintptr_t expand_and_alloc_space(size_t size);
+
+public:
+  ZMarkStackSpace();
+
+  bool is_initialized() const;
+
+  uintptr_t alloc(size_t size);
+};
+
+class ZMarkStackAllocator {
+private:
+  ZMarkStackMagazineList _freelist ATTRIBUTE_ALIGNED(ZCacheLineSize);
+  ZMarkStackSpace        _space    ATTRIBUTE_ALIGNED(ZCacheLineSize);
+
+  void prime_freelist();
+  ZMarkStackMagazine* create_magazine_from_space(uintptr_t addr, size_t size);
+
+public:
+  ZMarkStackAllocator();
+
+  bool is_initialized() const;
+
+  ZMarkStackMagazine* alloc_magazine();
+  void free_magazine(ZMarkStackMagazine* magazine);
+};
+
+class ZMarkStripe {
+private:
+  ZMarkStackList _published  ATTRIBUTE_ALIGNED(ZCacheLineSize);
+  ZMarkStackList _overflowed ATTRIBUTE_ALIGNED(ZCacheLineSize);
+
+public:
+  ZMarkStripe();
+
+  bool is_empty() const;
+
+  void publish_stack(ZMarkStack* stack, bool publish = true);
+  ZMarkStack* steal_stack();
+};
+
+class ZMarkStripeSet {
+private:
+  size_t      _nstripes;
+  size_t      _nstripes_mask;
+  ZMarkStripe _stripes[ZMarkStripesMax];
+
+public:
+  ZMarkStripeSet();
+
+  size_t nstripes() const;
+  void set_nstripes(size_t nstripes);
+
+  bool is_empty() const;
+
+  size_t stripe_id(const ZMarkStripe* stripe) const;
+  ZMarkStripe* stripe_at(size_t index);
+  ZMarkStripe* stripe_next(ZMarkStripe* stripe);
+  ZMarkStripe* stripe_for_worker(uint nworkers, uint worker_id);
+  ZMarkStripe* stripe_for_addr(uintptr_t addr);
+};
+
+class ZMarkThreadLocalStacks {
+private:
+  ZMarkStackMagazine* _magazine;
+  ZMarkStack*         _stacks[ZMarkStripesMax];
+
+  ZMarkStack* allocate_stack(ZMarkStackAllocator* allocator);
+  void free_stack(ZMarkStackAllocator* allocator, ZMarkStack* stack);
+
+  bool push_slow(ZMarkStackAllocator* allocator,
+                 ZMarkStripe* stripe,
+                 ZMarkStack** stackp,
+                 ZMarkStackEntry entry,
+                 bool publish);
+
+  bool pop_slow(ZMarkStackAllocator* allocator,
+                ZMarkStripe* stripe,
+                ZMarkStack** stackp,
+                ZMarkStackEntry& entry);
+
+public:
+  ZMarkThreadLocalStacks();
+
+  bool is_empty(const ZMarkStripeSet* stripes) const;
+
+  void install(ZMarkStripeSet* stripes,
+               ZMarkStripe* stripe,
+               ZMarkStack* stack);
+
+  bool push(ZMarkStackAllocator* allocator,
+            ZMarkStripeSet* stripes,
+            ZMarkStripe* stripe,
+            ZMarkStackEntry entry,
+            bool publish);
+
+  bool pop(ZMarkStackAllocator* allocator,
+           ZMarkStripeSet* stripes,
+           ZMarkStripe* stripe,
+           ZMarkStackEntry& entry);
+
+  bool flush(ZMarkStackAllocator* allocator,
+             ZMarkStripeSet* stripes);
+
+  void free(ZMarkStackAllocator* allocator);
+};
+
+#endif // SHARE_GC_Z_ZMARKSTACK_HPP
diff --git a/src/hotspot/share/gc/z/zMarkStack.inline.hpp b/src/hotspot/share/gc/z/zMarkStack.inline.hpp
new file mode 100644
index 00000000000..ab06e422825
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkStack.inline.hpp
@@ -0,0 +1,249 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKSTACK_INLINE_HPP
+#define SHARE_GC_Z_ZMARKSTACK_INLINE_HPP
+
+#include "gc/z/zMarkStack.hpp"
+#include "utilities/debug.hpp"
+#include "runtime/atomic.hpp"
+
+template <typename T, size_t S>
+inline ZStack<T, S>::ZStack() :
+    _top(0),
+    _next(NULL) {}
+
+template <typename T, size_t S>
+inline bool ZStack<T, S>::is_empty() const {
+  return _top == 0;
+}
+
+template <typename T, size_t S>
+inline bool ZStack<T, S>::is_full() const {
+  return _top == S;
+}
+
+template <typename T, size_t S>
+inline bool ZStack<T, S>::push(T value) {
+  if (is_full()) {
+    return false;
+  }
+
+  _slots[_top++] = value;
+  return true;
+}
+
+template <typename T, size_t S>
+inline bool ZStack<T, S>::pop(T& value) {
+  if (is_empty()) {
+    return false;
+  }
+
+  value = _slots[--_top];
+  return true;
+}
+
+template <typename T, size_t S>
+inline ZStack<T, S>* ZStack<T, S>::next() const {
+  return _next;
+}
+
+template <typename T, size_t S>
+inline ZStack<T, S>** ZStack<T, S>::next_addr() {
+  return &_next;
+}
+
+template <typename T>
+inline ZStackList<T>::ZStackList() :
+    _head(encode_versioned_pointer(NULL, 0)) {}
+
+template <typename T>
+inline T* ZStackList<T>::encode_versioned_pointer(const T* stack, uint32_t version) const {
+  uint64_t addr;
+
+  if (stack == NULL) {
+    addr = (uint32_t)-1;
+  } else {
+    addr = ((uint64_t)stack - ZMarkStackSpaceStart) >> ZMarkStackSizeShift;
+  }
+
+  return (T*)((addr << 32) | (uint64_t)version);
+}
+
+template <typename T>
+inline void ZStackList<T>::decode_versioned_pointer(const T* vstack, T** stack, uint32_t* version) const {
+  const uint64_t addr = (uint64_t)vstack >> 32;
+
+  if (addr == (uint32_t)-1) {
+    *stack = NULL;
+  } else {
+    *stack = (T*)((addr << ZMarkStackSizeShift) + ZMarkStackSpaceStart);
+  }
+
+  *version = (uint32_t)(uint64_t)vstack;
+}
+
+template <typename T>
+inline bool ZStackList<T>::is_empty() const {
+  const T* vstack = _head;
+  T* stack = NULL;
+  uint32_t version = 0;
+
+  decode_versioned_pointer(vstack, &stack, &version);
+  return stack == NULL;
+}
+
+template <typename T>
+inline void ZStackList<T>::push_atomic(T* stack) {
+  T* vstack = _head;
+  uint32_t version = 0;
+
+  for (;;) {
+    decode_versioned_pointer(vstack, stack->next_addr(), &version);
+    T* const new_vstack = encode_versioned_pointer(stack, version + 1);
+    T* const prev_vstack = Atomic::cmpxchg(new_vstack, &_head, vstack);
+    if (prev_vstack == vstack) {
+      // Success
+      break;
+    }
+
+    // Retry
+    vstack = prev_vstack;
+  }
+}
+
+template <typename T>
+inline T* ZStackList<T>::pop_atomic() {
+  T* vstack = _head;
+  T* stack = NULL;
+  uint32_t version = 0;
+
+  for (;;) {
+    decode_versioned_pointer(vstack, &stack, &version);
+    if (stack == NULL) {
+      return NULL;
+    }
+
+    T* const new_vstack = encode_versioned_pointer(stack->next(), version + 1);
+    T* const prev_vstack = Atomic::cmpxchg(new_vstack, &_head, vstack);
+    if (prev_vstack == vstack) {
+      // Success
+      return stack;
+    }
+
+    // Retry
+    vstack = prev_vstack;
+  }
+}
+
+inline bool ZMarkStripe::is_empty() const {
+  return _published.is_empty() && _overflowed.is_empty();
+}
+
+inline void ZMarkStripe::publish_stack(ZMarkStack* stack, bool publish) {
+  // A stack is published either on the published list or the overflowed
+  // list. The published list is used by mutators publishing stacks for GC
+  // workers to work on, while the overflowed list is used by GC workers
+  // to publish stacks that overflowed. The intention here is to avoid
+  // contention between mutators and GC workers as much as possible, while
+  // still allowing GC workers to help out and steal work from each other.
+  if (publish) {
+    _published.push_atomic(stack);
+  } else {
+    _overflowed.push_atomic(stack);
+  }
+}
+
+inline ZMarkStack* ZMarkStripe::steal_stack() {
+  // Steal overflowed stacks first, then published stacks
+  ZMarkStack* const stack = _overflowed.pop_atomic();
+  if (stack != NULL) {
+    return stack;
+  }
+
+  return _published.pop_atomic();
+}
+
+inline size_t ZMarkStripeSet::nstripes() const {
+  return _nstripes;
+}
+
+inline size_t ZMarkStripeSet::stripe_id(const ZMarkStripe* stripe) const {
+  const size_t index = ((uintptr_t)stripe - (uintptr_t)_stripes) / sizeof(ZMarkStripe);
+  assert(index < _nstripes, "Invalid index");
+  return index;
+}
+
+inline ZMarkStripe* ZMarkStripeSet::stripe_at(size_t index) {
+  assert(index < _nstripes, "Invalid index");
+  return &_stripes[index];
+}
+
+inline ZMarkStripe* ZMarkStripeSet::stripe_next(ZMarkStripe* stripe) {
+  const size_t index = (stripe_id(stripe) + 1) & _nstripes_mask;
+  assert(index < _nstripes, "Invalid index");
+  return &_stripes[index];
+}
+
+inline ZMarkStripe* ZMarkStripeSet::stripe_for_addr(uintptr_t addr) {
+  const size_t index = (addr >> ZMarkStripeShift) & _nstripes_mask;
+  assert(index < _nstripes, "Invalid index");
+  return &_stripes[index];
+}
+
+inline void ZMarkThreadLocalStacks::install(ZMarkStripeSet* stripes,
+                                            ZMarkStripe* stripe,
+                                            ZMarkStack* stack) {
+  ZMarkStack** const stackp = &_stacks[stripes->stripe_id(stripe)];
+  assert(*stackp == NULL, "Should be empty");
+  *stackp = stack;
+}
+
+inline bool ZMarkThreadLocalStacks::push(ZMarkStackAllocator* allocator,
+                                         ZMarkStripeSet* stripes,
+                                         ZMarkStripe* stripe,
+                                         ZMarkStackEntry entry,
+                                         bool publish) {
+  ZMarkStack** const stackp = &_stacks[stripes->stripe_id(stripe)];
+  ZMarkStack* const stack = *stackp;
+  if (stack != NULL && stack->push(entry)) {
+    return true;
+  }
+
+  return push_slow(allocator, stripe, stackp, entry, publish);
+}
+
+inline bool ZMarkThreadLocalStacks::pop(ZMarkStackAllocator* allocator,
+                                        ZMarkStripeSet* stripes,
+                                        ZMarkStripe* stripe,
+                                        ZMarkStackEntry& entry) {
+  ZMarkStack** const stackp = &_stacks[stripes->stripe_id(stripe)];
+  ZMarkStack* const stack = *stackp;
+  if (stack != NULL && stack->pop(entry)) {
+    return true;
+  }
+
+  return pop_slow(allocator, stripe, stackp, entry);
+}
+
+#endif // SHARE_GC_Z_ZMARKSTACK_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkStackEntry.hpp b/src/hotspot/share/gc/z/zMarkStackEntry.hpp
new file mode 100644
index 00000000000..314749c1993
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkStackEntry.hpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKSTACKENTRY_HPP
+#define SHARE_GC_Z_ZMARKSTACKENTRY_HPP
+
+#include "gc/z/zBitField.hpp"
+#include "memory/allocation.hpp"
+
+//
+// Mark stack entry layout
+// -----------------------
+//
+//  Object entry
+//  ------------
+//
+//   6
+//   3                                                                   2 1 0
+//  +---------------------------------------------------------------------+-+-+
+//  |11111111 11111111 11111111 11111111 11111111 11111111 11111111 111111|1|1|
+//  +---------------------------------------------------------------------+-+-+
+//  |                                                                     | |
+//  |                                      1-1 Partial Array Flag (1-bit) * |
+//  |                                                                       |
+//  |                                                0-0 Final Flag (1-bit) *
+//  |
+//  * 63-2 Object Address (62-bits)
+//
+//
+//  Partial array entry
+//  -------------------
+//
+//   6                                 3  3
+//   3                                 2  1                               2 1 0
+//  +------------------------------------+---------------------------------+-+-+
+//  |11111111 11111111 11111111 11111111 |11111111 11111111 11111111 111111|1|1|
+//  +------------------------------------+---------------------------------+-+-+
+//  |                                    |                                 | |
+//  |                                    |  1-1 Partial Array Flag (1-bit) * |
+//  |                                    |                                   |
+//  |                                    |            0-0 Final Flag (1-bit) *
+//  |                                    |
+//  |                                    * 31-2 Partial Array Length (30-bits)
+//  |
+//  * 63-32 Partial Array Address Offset (32-bits)
+//
+
+class ZMarkStackEntry  {
+private:
+  typedef ZBitField<uint64_t, bool,      0,  1>  field_finalizable;
+  typedef ZBitField<uint64_t, bool,      1,  1>  field_partial_array;
+  typedef ZBitField<uint64_t, uintptr_t, 2,  62> field_object_address;
+  typedef ZBitField<uint64_t, size_t,    2,  30> field_partial_array_length;
+  typedef ZBitField<uint64_t, size_t,    32, 32> field_partial_array_offset;
+
+  uint64_t _entry;
+
+public:
+  ZMarkStackEntry() {
+    // This constructor is intentionally left emtpy and does not initialize
+    // _entry to allow it to be optimized out when instantiating ZMarkStack,
+    // which has a long array of ZMarkStackEntry elements, but doesn't care
+    // what _entry is initialized to.
+  }
+
+  ZMarkStackEntry(uintptr_t object_address, bool finalizable) :
+      _entry(field_object_address::encode(object_address) |
+             field_partial_array::encode(false) |
+             field_finalizable::encode(finalizable)) {}
+
+  ZMarkStackEntry(size_t partial_array_offset, size_t partial_array_length, bool finalizable) :
+      _entry(field_partial_array_offset::encode(partial_array_offset) |
+             field_partial_array_length::encode(partial_array_length) |
+             field_partial_array::encode(true) |
+             field_finalizable::encode(finalizable)) {}
+
+  bool finalizable() const {
+    return field_finalizable::decode(_entry);
+  }
+
+  bool partial_array() const {
+    return field_partial_array::decode(_entry);
+  }
+
+  size_t partial_array_offset() const {
+    return field_partial_array_offset::decode(_entry);
+  }
+
+  size_t partial_array_length() const {
+    return field_partial_array_length::decode(_entry);
+  }
+
+  uintptr_t object_address() const {
+    return field_object_address::decode(_entry);
+  }
+};
+
+#endif // SHARE_GC_Z_ZMARKSTACKENTRY_HPP
diff --git a/src/hotspot/share/gc/z/zMarkTerminate.hpp b/src/hotspot/share/gc/z/zMarkTerminate.hpp
new file mode 100644
index 00000000000..871d0d59fe2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkTerminate.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKTERMINATE_HPP
+#define SHARE_GC_Z_ZMARKTERMINATE_HPP
+
+#include "gc/z/zGlobals.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class ZMarkTerminate {
+private:
+  uint          _nworkers;
+  volatile uint _nworking_stage0 ATTRIBUTE_ALIGNED(ZCacheLineSize);
+  volatile uint _nworking_stage1;
+
+  bool enter_stage(volatile uint* nworking_stage);
+  void exit_stage(volatile uint* nworking_stage);
+  bool try_exit_stage(volatile uint* nworking_stage);
+
+public:
+  ZMarkTerminate();
+
+  void reset(uint nworkers);
+
+  bool enter_stage0();
+  void exit_stage0();
+  bool try_exit_stage0();
+
+  bool enter_stage1();
+  bool try_exit_stage1();
+};
+
+#endif // SHARE_GC_Z_ZMARKTERMINATE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
new file mode 100644
index 00000000000..cc60b373b4b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP
+#define SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP
+
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
+
+inline ZMarkTerminate::ZMarkTerminate() :
+    _nworkers(0),
+    _nworking_stage0(0),
+    _nworking_stage1(0) {}
+
+inline bool ZMarkTerminate::enter_stage(volatile uint* nworking_stage) {
+  return Atomic::sub(1u, nworking_stage) == 0;
+}
+
+inline void ZMarkTerminate::exit_stage(volatile uint* nworking_stage) {
+  Atomic::add(1u, nworking_stage);
+}
+
+inline bool ZMarkTerminate::try_exit_stage(volatile uint* nworking_stage) {
+  uint nworking = Atomic::load(nworking_stage);
+
+  for (;;) {
+    if (nworking == 0) {
+      return false;
+    }
+
+    const uint new_nworking = nworking + 1;
+    const uint prev_nworking = Atomic::cmpxchg(new_nworking, nworking_stage, nworking);
+    if (prev_nworking == nworking) {
+      // Success
+      return true;
+    }
+
+    // Retry
+    nworking = prev_nworking;
+  }
+}
+
+inline void ZMarkTerminate::reset(uint nworkers) {
+  _nworkers = _nworking_stage0 = _nworking_stage1 = nworkers;
+}
+
+inline bool ZMarkTerminate::enter_stage0() {
+  return enter_stage(&_nworking_stage0);
+}
+
+inline void ZMarkTerminate::exit_stage0() {
+  exit_stage(&_nworking_stage0);
+}
+
+inline bool ZMarkTerminate::try_exit_stage0() {
+  return try_exit_stage(&_nworking_stage0);
+}
+
+inline bool ZMarkTerminate::enter_stage1() {
+  return enter_stage(&_nworking_stage1);
+}
+
+inline bool ZMarkTerminate::try_exit_stage1() {
+  return try_exit_stage(&_nworking_stage1);
+}
+
+#endif // SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMemory.cpp b/src/hotspot/share/gc/z/zMemory.cpp
new file mode 100644
index 00000000000..672f79a4013
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMemory.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zList.inline.hpp"
+#include "gc/z/zMemory.inline.hpp"
+#include "memory/allocation.inline.hpp"
+
+uintptr_t ZMemoryManager::alloc_from_front(size_t size) {
+  ZListIterator<ZMemory> iter(&_freelist);
+  for (ZMemory* area; iter.next(&area);) {
+    if (area->size() >= size) {
+      if (area->size() == size) {
+        // Exact match, remove area
+        const uintptr_t start = area->start();
+        _freelist.remove(area);
+        delete area;
+        return start;
+      } else {
+        // Larger than requested, shrink area
+        const uintptr_t start = area->start();
+        area->shrink_from_front(size);
+        return start;
+      }
+    }
+  }
+
+  // Out of memory
+  return UINTPTR_MAX;
+}
+
+uintptr_t ZMemoryManager::alloc_from_back(size_t size) {
+  ZListReverseIterator<ZMemory> iter(&_freelist);
+  for (ZMemory* area; iter.next(&area);) {
+    if (area->size() >= size) {
+      if (area->size() == size) {
+        // Exact match, remove area
+        const uintptr_t start = area->start();
+        _freelist.remove(area);
+        delete area;
+        return start;
+      } else {
+        // Larger than requested, shrink area
+        area->shrink_from_back(size);
+        return area->end();
+      }
+    }
+  }
+
+  // Out of memory
+  return UINTPTR_MAX;
+}
+
+void ZMemoryManager::free(uintptr_t start, size_t size) {
+  assert(start != UINTPTR_MAX, "Invalid address");
+  const uintptr_t end = start + size;
+
+  ZListIterator<ZMemory> iter(&_freelist);
+  for (ZMemory* area; iter.next(&area);) {
+    if (start < area->start()) {
+      ZMemory* const prev = _freelist.prev(area);
+      if (prev != NULL && start == prev->end()) {
+        if (end == area->start()) {
+          // Merge with prev and current area
+          prev->grow_from_back(size + area->size());
+          _freelist.remove(area);
+          delete area;
+        } else {
+          // Merge with prev area
+          prev->grow_from_back(size);
+        }
+      } else if (end == area->start()) {
+        // Merge with current area
+        area->grow_from_front(size);
+      } else {
+        // Insert new area before current area
+        assert(end < area->start(), "Areas must not overlap");
+        ZMemory* new_area = new ZMemory(start, size);
+        _freelist.insert_before(area, new_area);
+      }
+
+      // Done
+      return;
+    }
+  }
+
+  // Insert last
+  ZMemory* const last = _freelist.last();
+  if (last != NULL && start == last->end()) {
+    // Merge with last area
+    last->grow_from_back(size);
+  } else {
+    // Insert new area last
+    ZMemory* new_area = new ZMemory(start, size);
+    _freelist.insert_last(new_area);
+  }
+}
diff --git a/src/hotspot/share/gc/z/zMemory.hpp b/src/hotspot/share/gc/z/zMemory.hpp
new file mode 100644
index 00000000000..94814cadabd
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMemory.hpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMEMORY_HPP
+#define SHARE_GC_Z_ZMEMORY_HPP
+
+#include "gc/z/zList.hpp"
+#include "memory/allocation.hpp"
+
+class ZMemory : public CHeapObj<mtGC> {
+  friend class ZList<ZMemory>;
+
+private:
+  uintptr_t          _start;
+  uintptr_t          _end;
+  ZListNode<ZMemory> _node;
+
+public:
+  ZMemory(uintptr_t start, size_t size);
+
+  uintptr_t start() const;
+  uintptr_t end() const;
+  size_t size() const;
+
+  void shrink_from_front(size_t size);
+  void shrink_from_back(size_t size);
+  void grow_from_front(size_t size);
+  void grow_from_back(size_t size);
+};
+
+class ZMemoryManager {
+private:
+  ZList<ZMemory> _freelist;
+
+public:
+  uintptr_t alloc_from_front(size_t size);
+  uintptr_t alloc_from_back(size_t size);
+  void free(uintptr_t start, size_t size);
+};
+
+#endif // SHARE_GC_Z_ZMEMORY_HPP
diff --git a/src/hotspot/share/gc/z/zMemory.inline.hpp b/src/hotspot/share/gc/z/zMemory.inline.hpp
new file mode 100644
index 00000000000..8bc27a2bf90
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMemory.inline.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMEMORY_INLINE_HPP
+#define SHARE_GC_Z_ZMEMORY_INLINE_HPP
+
+#include "gc/z/zMemory.hpp"
+#include "utilities/debug.hpp"
+
+inline ZMemory::ZMemory(uintptr_t start, size_t size) :
+    _start(start),
+    _end(start + size) {}
+
+inline uintptr_t ZMemory::start() const {
+  return _start;
+}
+
+inline uintptr_t ZMemory::end() const {
+  return _end;
+}
+
+inline size_t ZMemory::size() const {
+  return end() - start();
+}
+
+inline void ZMemory::shrink_from_front(size_t size) {
+  assert(this->size() > size, "Too small");
+  _start += size;
+}
+
+inline void ZMemory::shrink_from_back(size_t size) {
+  assert(this->size() > size, "Too small");
+  _end -= size;
+}
+
+inline void ZMemory::grow_from_front(size_t size) {
+  assert(start() >= size, "Too big");
+  _start -= size;
+}
+
+inline void ZMemory::grow_from_back(size_t size) {
+  _end += size;
+}
+
+#endif // SHARE_GC_Z_ZMEMORY_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMessagePort.hpp b/src/hotspot/share/gc/z/zMessagePort.hpp
new file mode 100644
index 00000000000..c48f10d554c
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMessagePort.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMESSAGEPORT_HPP
+#define SHARE_GC_Z_ZMESSAGEPORT_HPP
+
+#include "gc/z/zFuture.hpp"
+#include "gc/z/zList.hpp"
+#include "memory/allocation.hpp"
+#include "runtime/mutex.hpp"
+
+template <typename T> class ZMessageRequest;
+
+template <typename T>
+class ZMessagePort {
+private:
+  typedef ZMessageRequest<T> Request;
+
+  Monitor        _monitor;
+  bool           _has_message;
+  T              _message;
+  uint64_t       _seqnum;
+  ZList<Request> _queue;
+
+public:
+  ZMessagePort();
+
+  void send_sync(T message);
+  void send_async(T message);
+
+  T receive();
+  void ack();
+};
+
+class ZRendezvousPort {
+private:
+  ZMessagePort<bool> _port;
+
+public:
+  void signal();
+  void wait();
+  void ack();
+};
+
+#endif // SHARE_GC_Z_ZMESSAGEPORT_HPP
diff --git a/src/hotspot/share/gc/z/zMessagePort.inline.hpp b/src/hotspot/share/gc/z/zMessagePort.inline.hpp
new file mode 100644
index 00000000000..dce6f22fa18
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMessagePort.inline.hpp
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP
+#define SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP
+
+#include "gc/z/zMessagePort.hpp"
+#include "gc/z/zFuture.inline.hpp"
+#include "gc/z/zList.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+
+template <typename T>
+class ZMessageRequest : public StackObj {
+  friend class ZList<ZMessageRequest>;
+
+private:
+  T                          _message;
+  uint64_t                   _seqnum;
+  ZFuture<T>                 _result;
+  ZListNode<ZMessageRequest> _node;
+
+public:
+  void initialize(T message, uint64_t seqnum) {
+    _message = message;
+    _seqnum = seqnum;
+  }
+
+  T message() const {
+    return _message;
+  }
+
+  uint64_t seqnum() const {
+    return _seqnum;
+  }
+
+  void wait() {
+    const T message = _result.get();
+    assert(message == _message, "Message mismatch");
+  }
+
+  void satisfy(T message) {
+    _result.set(message);
+  }
+};
+
+template <typename T>
+inline ZMessagePort<T>::ZMessagePort() :
+    _monitor(Monitor::leaf,
+             "ZMessagePort",
+             Monitor::_allow_vm_block_flag,
+             Monitor::_safepoint_check_never),
+    _has_message(false),
+    _seqnum(0),
+    _queue() {}
+
+template <typename T>
+inline void ZMessagePort<T>::send_sync(T message) {
+  Request request;
+
+  {
+    // Enqueue message
+    MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+    request.initialize(message, _seqnum);
+    _queue.insert_last(&request);
+    ml.notify();
+  }
+
+  // Wait for completion
+  request.wait();
+}
+
+template <typename T>
+inline void ZMessagePort<T>::send_async(T message) {
+  MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+  if (!_has_message) {
+    // Post message
+    _message = message;
+    _has_message = true;
+    ml.notify();
+  }
+}
+
+template <typename T>
+inline T ZMessagePort<T>::receive() {
+  MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+
+  // Wait for message
+  while (!_has_message && _queue.is_empty()) {
+    ml.wait(Monitor::_no_safepoint_check_flag);
+  }
+
+  // Increment request sequence number
+  _seqnum++;
+
+  if (!_has_message) {
+    // Message available in the queue
+    _message = _queue.first()->message();
+    _has_message = true;
+  }
+
+  return _message;
+}
+
+template <typename T>
+inline void ZMessagePort<T>::ack() {
+  MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+
+  if (!_has_message) {
+    // Nothing to ack
+    return;
+  }
+
+  // Satisfy requests (and duplicates) in queue
+  ZListIterator<Request> iter(&_queue);
+  for (Request* request; iter.next(&request);) {
+    if (request->message() == _message && request->seqnum() < _seqnum) {
+      // Dequeue and satisfy request. Note that the dequeue operation must
+      // happen first, since the request will immediately be deallocated
+      // once it has been satisfied.
+      _queue.remove(request);
+      request->satisfy(_message);
+    }
+  }
+
+  if (_queue.is_empty()) {
+    // Queue is empty
+    _has_message = false;
+  } else {
+    // Post first message in queue
+    _message = _queue.first()->message();
+  }
+}
+
+inline void ZRendezvousPort::signal() {
+  _port.send_sync(true /* ignored */);
+}
+
+inline void ZRendezvousPort::wait() {
+  _port.receive();
+}
+
+inline void ZRendezvousPort::ack() {
+  _port.ack();
+}
+
+#endif // SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMetronome.cpp b/src/hotspot/share/gc/z/zMetronome.cpp
new file mode 100644
index 00000000000..8da668326ca
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMetronome.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zMetronome.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/timer.hpp"
+#include "utilities/ticks.hpp"
+
+ZMetronome::ZMetronome(uint64_t hz) :
+    _monitor(Monitor::leaf, "ZMetronome", false, Monitor::_safepoint_check_never),
+    _interval_ms(MILLIUNITS / hz),
+    _start_ms(0),
+    _nticks(0),
+    _stopped(false) {}
+
+uint64_t ZMetronome::nticks() const {
+  return _nticks;
+}
+
+bool ZMetronome::wait_for_tick() {
+  if (_nticks++ == 0) {
+    // First tick, set start time
+    const Ticks now = Ticks::now();
+    _start_ms = TimeHelper::counter_to_millis(now.value());
+  }
+
+  for (;;) {
+    // We might wake up spuriously from wait, so always recalculate
+    // the timeout after a wakeup to see if we need to wait again.
+    const Ticks now = Ticks::now();
+    const uint64_t now_ms = TimeHelper::counter_to_millis(now.value());
+    const uint64_t next_ms = _start_ms + (_interval_ms * _nticks);
+    const int64_t timeout_ms = next_ms - now_ms;
+
+    MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+    if (!_stopped && timeout_ms > 0) {
+      // Wait
+      ml.wait(Monitor::_no_safepoint_check_flag, timeout_ms);
+    } else {
+      // Tick
+      return !_stopped;
+    }
+  }
+}
+
+void ZMetronome::stop() {
+  MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+  _stopped = true;
+  ml.notify();
+}
diff --git a/src/hotspot/share/gc/z/zMetronome.hpp b/src/hotspot/share/gc/z/zMetronome.hpp
new file mode 100644
index 00000000000..f63462fbed1
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMetronome.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZMETRONOME_HPP
+#define SHARE_GC_Z_ZMETRONOME_HPP
+
+#include "memory/allocation.hpp"
+#include "runtime/mutex.hpp"
+
+class ZMetronome : public StackObj {
+private:
+  Monitor        _monitor;
+  const uint64_t _interval_ms;
+  uint64_t       _start_ms;
+  uint64_t       _nticks;
+  bool           _stopped;
+
+public:
+  ZMetronome(uint64_t hz);
+
+  uint64_t nticks() const;
+  bool wait_for_tick();
+  void stop();
+};
+
+#endif // SHARE_GC_Z_ZMETRONOME_HPP
diff --git a/src/hotspot/share/gc/z/zNMethodTable.cpp b/src/hotspot/share/gc/z/zNMethodTable.cpp
new file mode 100644
index 00000000000..5c409c1ddc0
--- /dev/null
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp
@@ -0,0 +1,465 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#include "precompiled.hpp"
+#include "code/relocInfo.hpp"
+#include "code/nativeInst.hpp"
+#include "code/nmethod.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHash.inline.hpp"
+#include "gc/z/zNMethodTable.hpp"
+#include "logging/log.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/debug.hpp"
+
+class ZNMethodWithImmediateOops {
+private:
+  nmethod* const _nm;
+  const size_t   _nimmediate_oops;
+
+  static size_t header_size();
+
+  ZNMethodWithImmediateOops(nmethod* nm, const GrowableArray<oop*>& immediate_oops);
+
+public:
+  static ZNMethodWithImmediateOops* create(nmethod* nm, const GrowableArray<oop*>& immediate_oops);
+  static void destroy(ZNMethodWithImmediateOops* nmi);
+
+  nmethod* method() const;
+  size_t immediate_oops_count() const;
+  oop** immediate_oops_begin() const;
+  oop** immediate_oops_begin_safe() const;
+  oop** immediate_oops_end() const;
+};
+
+size_t ZNMethodWithImmediateOops::header_size() {
+  const size_t size = sizeof(ZNMethodWithImmediateOops);
+  assert(is_aligned(size, sizeof(oop*)), "Header misaligned");
+  return size;
+}
+
+ZNMethodWithImmediateOops::ZNMethodWithImmediateOops(nmethod* nm, const GrowableArray<oop*>& immediate_oops) :
+    _nm(nm),
+    _nimmediate_oops(immediate_oops.length()) {
+  // Save all immediate oops
+  for (size_t i = 0; i < _nimmediate_oops; i++) {
+    immediate_oops_begin()[i] = immediate_oops.at(i);
+  }
+}
+
+ZNMethodWithImmediateOops* ZNMethodWithImmediateOops::create(nmethod* nm, const GrowableArray<oop*>& immediate_oops) {
+  // Allocate memory for the ZNMethodWithImmediateOops object
+  // plus the immediate oop* array that follows right after.
+  const size_t size = header_size() + (sizeof(oop*) * immediate_oops.length());
+  void* const method_with_immediate_oops = NEW_C_HEAP_ARRAY(uint8_t, size, mtGC);
+  return ::new (method_with_immediate_oops) ZNMethodWithImmediateOops(nm, immediate_oops);
+}
+
+void ZNMethodWithImmediateOops::destroy(ZNMethodWithImmediateOops* nmi) {
+  FREE_C_HEAP_ARRAY(uint8_t, nmi);
+}
+
+nmethod* ZNMethodWithImmediateOops::method() const {
+  return _nm;
+}
+
+size_t ZNMethodWithImmediateOops::immediate_oops_count() const {
+  return _nimmediate_oops;
+}
+
+oop** ZNMethodWithImmediateOops::immediate_oops_begin() const {
+  // The immediate oop* array starts immediately after this object
+  return (oop**)((uintptr_t)this + header_size());
+}
+
+oop** ZNMethodWithImmediateOops::immediate_oops_begin_safe() const {
+  // Non-entrant nmethods have a jump instruction patched into the beginning
+  // of the verified entry point, which could have overwritten an immediate
+  // oop. If so, make sure we skip over that oop.
+  if (_nm->is_not_entrant()) {
+    oop* const first_immediate_oop = *immediate_oops_begin();
+    oop* const safe_begin = (oop*)(_nm->verified_entry_point() + NativeJump::instruction_size);
+    if (first_immediate_oop < safe_begin) {
+      // First immediate oop overwritten, skip it
+      return immediate_oops_begin() + 1;
+    }
+  }
+
+  // First immediate oop not overwritten
+  return immediate_oops_begin();
+}
+
+
+oop** ZNMethodWithImmediateOops::immediate_oops_end() const {
+  return immediate_oops_begin() + immediate_oops_count();
+}
+
+ZNMethodTableEntry* ZNMethodTable::_table = NULL;
+size_t ZNMethodTable::_size = 0;
+size_t ZNMethodTable::_nregistered = 0;
+size_t ZNMethodTable::_nunregistered = 0;
+volatile size_t ZNMethodTable::_claimed = 0;
+
+ZNMethodTableEntry ZNMethodTable::create_entry(nmethod* nm) {
+  GrowableArray<oop*> immediate_oops;
+  bool non_immediate_oops = false;
+
+  // Find all oops relocations
+  RelocIterator iter(nm);
+  while (iter.next()) {
+    if (iter.type() != relocInfo::oop_type) {
+      // Not an oop
+      continue;
+    }
+
+    oop_Relocation* r = iter.oop_reloc();
+
+    if (!r->oop_is_immediate()) {
+      // Non-immediate oop found
+      non_immediate_oops = true;
+      continue;
+    }
+
+    if (r->oop_value() != NULL) {
+      // Non-NULL immediate oop found. NULL oops can safely be
+      // ignored since the method will be re-registered if they
+      // are later patched to be non-NULL.
+      immediate_oops.push(r->oop_addr());
+    }
+  }
+
+  // oops_count() returns the number of oops in the oop table plus one
+  if (immediate_oops.is_empty() && nm->oops_count() == 1) {
+    // No oops found, return empty entry
+    return ZNMethodTableEntry();
+  }
+
+  if (immediate_oops.is_empty()) {
+    // No immediate oops found, return entry without immediate oops
+    return ZNMethodTableEntry(nm, non_immediate_oops);
+  }
+
+  // Return entry with immediate oops
+  return ZNMethodTableEntry(ZNMethodWithImmediateOops::create(nm, immediate_oops), non_immediate_oops);
+}
+
+void ZNMethodTable::destroy_entry(ZNMethodTableEntry entry) {
+  if (entry.immediate_oops()) {
+    ZNMethodWithImmediateOops::destroy(entry.method_with_immediate_oops());
+  }
+}
+
+nmethod* ZNMethodTable::method(ZNMethodTableEntry entry) {
+  return entry.immediate_oops() ? entry.method_with_immediate_oops()->method() : entry.method();
+}
+
+size_t ZNMethodTable::first_index(const nmethod* nm, size_t size) {
+  assert(is_power_of_2(size), "Invalid size");
+  const size_t mask = size - 1;
+  const size_t hash = ZHash::address_to_uint32((uintptr_t)nm);
+  return hash & mask;
+}
+
+size_t ZNMethodTable::next_index(size_t prev_index, size_t size) {
+  assert(is_power_of_2(size), "Invalid size");
+  const size_t mask = size - 1;
+  return (prev_index + 1) & mask;
+}
+
+bool ZNMethodTable::register_entry(ZNMethodTableEntry* table, size_t size, ZNMethodTableEntry entry) {
+  const nmethod* const nm = method(entry);
+  size_t index = first_index(nm, size);
+
+  for (;;) {
+    const ZNMethodTableEntry table_entry = table[index];
+
+    if (!table_entry.registered() && !table_entry.unregistered()) {
+      // Insert new entry
+      table[index] = entry;
+      return true;
+    }
+
+    if (table_entry.registered() && method(table_entry) == nm) {
+      // Replace existing entry
+      destroy_entry(table_entry);
+      table[index] = entry;
+      return false;
+    }
+
+    index = next_index(index, size);
+  }
+}
+
+bool ZNMethodTable::unregister_entry(ZNMethodTableEntry* table, size_t size, const nmethod* nm) {
+  if (size == 0) {
+    // Table is empty
+    return false;
+  }
+
+  size_t index = first_index(nm, size);
+
+  for (;;) {
+    const ZNMethodTableEntry table_entry = table[index];
+
+    if (!table_entry.registered() && !table_entry.unregistered()) {
+      // Entry not found
+      return false;
+    }
+
+    if (table_entry.registered() && method(table_entry) == nm) {
+      // Remove entry
+      destroy_entry(table_entry);
+      table[index] = ZNMethodTableEntry(true /* unregistered */);
+      return true;
+    }
+
+    index = next_index(index, size);
+  }
+}
+
+void ZNMethodTable::rebuild(size_t new_size) {
+  assert(is_power_of_2(new_size), "Invalid size");
+
+  log_debug(gc, nmethod)("Rebuilding NMethod Table: "
+                         SIZE_FORMAT "->" SIZE_FORMAT " entries, "
+                         SIZE_FORMAT "(%.0lf%%->%.0lf%%) registered, "
+                         SIZE_FORMAT "(%.0lf%%->%.0lf%%) unregistered",
+                         _size, new_size,
+                         _nregistered, percent_of(_nregistered, _size), percent_of(_nregistered, new_size),
+                         _nunregistered, percent_of(_nunregistered, _size), 0.0);
+
+  // Allocate new table
+  ZNMethodTableEntry* const new_table = new ZNMethodTableEntry[new_size];
+
+  // Transfer all registered entries
+  for (size_t i = 0; i < _size; i++) {
+    const ZNMethodTableEntry entry = _table[i];
+    if (entry.registered()) {
+      register_entry(new_table, new_size, entry);
+    }
+  }
+
+  // Delete old table
+  delete [] _table;
+
+  // Install new table
+  _table = new_table;
+  _size = new_size;
+  _nunregistered = 0;
+}
+
+void ZNMethodTable::rebuild_if_needed() {
+  // The hash table uses linear probing. To avoid wasting memory while
+  // at the same time maintaining good hash collision behavior we want
+  // to keep the table occupancy between 30% and 70%. The table always
+  // grows/shrinks by doubling/halving its size. Pruning of unregistered
+  // entries is done by rebuilding the table with or without resizing it.
+  const size_t min_size = 1024;
+  const size_t shrink_threshold = _size * 0.30;
+  const size_t prune_threshold = _size * 0.65;
+  const size_t grow_threshold = _size * 0.70;
+
+  if (_size == 0) {
+    // Initialize table
+    rebuild(min_size);
+  } else if (_nregistered < shrink_threshold && _size > min_size) {
+    // Shrink table
+    rebuild(_size / 2);
+  } else if (_nregistered + _nunregistered > grow_threshold) {
+    // Prune or grow table
+    if (_nregistered < prune_threshold) {
+      // Prune table
+      rebuild(_size);
+    } else {
+      // Grow table
+      rebuild(_size * 2);
+    }
+  }
+}
+
+void ZNMethodTable::log_register(const nmethod* nm, ZNMethodTableEntry entry) {
+  LogTarget(Trace, gc, nmethod) log;
+  if (!log.is_enabled()) {
+    return;
+  }
+
+  log.print("Register NMethod: %s.%s (" PTR_FORMAT "), "
+            "Compiler: %s, Oops: %d, ImmediateOops: " SIZE_FORMAT ", NonImmediateOops: %s",
+            nm->method()->method_holder()->external_name(),
+            nm->method()->name()->as_C_string(),
+            p2i(nm),
+            nm->compiler_name(),
+            nm->oops_count() - 1,
+            entry.immediate_oops() ? entry.method_with_immediate_oops()->immediate_oops_count() : 0,
+            BOOL_TO_STR(entry.non_immediate_oops()));
+
+  LogTarget(Trace, gc, nmethod, oops) log_oops;
+  if (!log_oops.is_enabled()) {
+    return;
+  }
+
+  // Print nmethod oops table
+  oop* const begin = nm->oops_begin();
+  oop* const end = nm->oops_end();
+  for (oop* p = begin; p < end; p++) {
+    log_oops.print("           Oop[" SIZE_FORMAT "] " PTR_FORMAT " (%s)",
+                   (p - begin), p2i(*p), (*p)->klass()->external_name());
+  }
+
+  if (entry.immediate_oops()) {
+    // Print nmethod immediate oops
+    const ZNMethodWithImmediateOops* const nmi = entry.method_with_immediate_oops();
+    oop** const begin = nmi->immediate_oops_begin();
+    oop** const end = nmi->immediate_oops_end();
+    for (oop** p = begin; p < end; p++) {
+      log_oops.print("  ImmediateOop[" SIZE_FORMAT "] " PTR_FORMAT " @ " PTR_FORMAT " (%s)",
+                     (p - begin), p2i(**p), p2i(*p), (**p)->klass()->external_name());
+    }
+  }
+}
+
+void ZNMethodTable::log_unregister(const nmethod* nm) {
+  LogTarget(Debug, gc, nmethod) log;
+  if (!log.is_enabled()) {
+    return;
+  }
+
+  log.print("Unregister NMethod: %s.%s (" PTR_FORMAT ")",
+            nm->method()->method_holder()->external_name(),
+            nm->method()->name()->as_C_string(),
+            p2i(nm));
+}
+
+size_t ZNMethodTable::registered_nmethods() {
+  return _nregistered;
+}
+
+size_t ZNMethodTable::unregistered_nmethods() {
+  return _nunregistered;
+}
+
+void ZNMethodTable::register_nmethod(nmethod* nm) {
+  ResourceMark rm;
+
+  // Create entry
+  const ZNMethodTableEntry entry = create_entry(nm);
+
+  log_register(nm, entry);
+
+  if (!entry.registered()) {
+    // Method doesn't have any oops, ignore it
+    return;
+  }
+
+  // Grow/Shrink/Prune table if needed
+  rebuild_if_needed();
+
+  // Insert new entry
+  if (register_entry(_table, _size, entry)) {
+    // New entry registered. When register_entry() instead returns
+    // false the nmethod was already in the table so we do not want
+    // to increase number of registered entries in that case.
+    _nregistered++;
+  }
+}
+
+void ZNMethodTable::unregister_nmethod(nmethod* nm) {
+  ResourceMark rm;
+
+  log_unregister(nm);
+
+  // Remove entry
+  if (unregister_entry(_table, _size, nm)) {
+    // Entry was unregistered. When unregister_entry() instead returns
+    // false the nmethod was not in the table (because it didn't have
+    // any oops) so we do not want to decrease the number of registered
+    // entries in that case.
+    _nregistered--;
+    _nunregistered++;
+  }
+}
+
+void ZNMethodTable::gc_prologue() {
+  _claimed = 0;
+}
+
+void ZNMethodTable::gc_epilogue() {
+  assert(_claimed >= _size, "Failed to claim all table entries");
+}
+
+void ZNMethodTable::entry_oops_do(ZNMethodTableEntry entry, OopClosure* cl) {
+  nmethod* const nm = method(entry);
+  if (!nm->is_alive()) {
+    // No need to visit oops
+    return;
+  }
+
+  // Process oops table
+  oop* const begin = nm->oops_begin();
+  oop* const end = nm->oops_end();
+  for (oop* p = begin; p < end; p++) {
+    if (*p != Universe::non_oop_word()) {
+      cl->do_oop(p);
+    }
+  }
+
+  if (entry.immediate_oops()) {
+    // Process immediate oops
+    const ZNMethodWithImmediateOops* const nmi = entry.method_with_immediate_oops();
+    oop** const begin = nmi->immediate_oops_begin_safe();
+    oop** const end = nmi->immediate_oops_end();
+    for (oop** p = begin; p < end; p++) {
+      cl->do_oop(*p);
+    }
+  }
+
+  if (entry.non_immediate_oops()) {
+    // Process non-immediate oops
+    nm->fix_oop_relocations();
+  }
+}
+
+void ZNMethodTable::oops_do(OopClosure* cl) {
+  for (;;) {
+    // Claim table partition. Each partition is currently sized to span
+    // two cache lines. This number is just a guess, but seems to work well.
+    const size_t partition_size = (ZCacheLineSize * 2) / sizeof(ZNMethodTableEntry);
+    const size_t partition_start = MIN2(Atomic::add(partition_size, &_claimed) - partition_size, _size);
+    const size_t partition_end = MIN2(partition_start + partition_size, _size);
+    if (partition_start == partition_end) {
+      // End of table
+      break;
+    }
+
+    // Process table partition
+    for (size_t i = partition_start; i < partition_end; i++) {
+      const ZNMethodTableEntry entry = _table[i];
+      if (entry.registered()) {
+        entry_oops_do(entry, cl);
+      }
+    }
+  }
+}
diff --git a/src/hotspot/share/gc/z/zNMethodTable.hpp b/src/hotspot/share/gc/z/zNMethodTable.hpp
new file mode 100644
index 00000000000..ca7f7a98d8f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zNMethodTable.hpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZNMETHODTABLE_HPP
+#define SHARE_GC_Z_ZNMETHODTABLE_HPP
+
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zNMethodTableEntry.hpp"
+#include "memory/allocation.hpp"
+
+class ZNMethodTable : public AllStatic {
+private:
+  static ZNMethodTableEntry* _table;
+  static size_t              _size;
+  static size_t              _nregistered;
+  static size_t              _nunregistered;
+  static volatile size_t     _claimed ATTRIBUTE_ALIGNED(ZCacheLineSize);
+
+  static ZNMethodTableEntry create_entry(nmethod* nm);
+  static void destroy_entry(ZNMethodTableEntry entry);
+
+  static nmethod* method(ZNMethodTableEntry entry);
+
+  static size_t first_index(const nmethod* nm, size_t size);
+  static size_t next_index(size_t prev_index, size_t size);
+
+  static bool register_entry(ZNMethodTableEntry* table, size_t size, ZNMethodTableEntry entry);
+  static bool unregister_entry(ZNMethodTableEntry* table, size_t size, const nmethod* nm);
+
+  static void rebuild(size_t new_size);
+  static void rebuild_if_needed();
+
+  static void log_register(const nmethod* nm, ZNMethodTableEntry entry);
+  static void log_unregister(const nmethod* nm);
+
+  static void entry_oops_do(ZNMethodTableEntry entry, OopClosure* cl);
+
+public:
+  static size_t registered_nmethods();
+  static size_t unregistered_nmethods();
+
+  static void register_nmethod(nmethod* nm);
+  static void unregister_nmethod(nmethod* nm);
+
+  static void gc_prologue();
+  static void gc_epilogue();
+
+  static void oops_do(OopClosure* cl);
+};
+
+#endif // SHARE_GC_Z_ZNMETHODTABLE_HPP
diff --git a/src/hotspot/share/gc/z/zNMethodTableEntry.hpp b/src/hotspot/share/gc/z/zNMethodTableEntry.hpp
new file mode 100644
index 00000000000..d75482fe6b0
--- /dev/null
+++ b/src/hotspot/share/gc/z/zNMethodTableEntry.hpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZNMETHODTABLEENTRY_HPP
+#define SHARE_GC_Z_ZNMETHODTABLEENTRY_HPP
+
+#include "gc/z/zBitField.hpp"
+#include "memory/allocation.hpp"
+
+//
+// NMethod table entry layout
+// --------------------------
+//
+//   6
+//   3                                                                  3 2 1 0
+//  +--------------------------------------------------------------------+-+-+-+
+//  |11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111|1|1|1|
+//  +--------------------------------------------------------------------+-+-+-+
+//  |                                                                    | | |
+//  |                               2-2 Non-immediate Oops Flag (1-bits) * | |
+//  |                                                                      | |
+//  |                        1-1 Immediate Oops/Unregistered Flag (1-bits) * |
+//  |                                                                        |
+//  |                                           0-0 Registered Flag (1-bits) *
+//  |
+//  * 63-3 NMethod/ZNMethodWithImmediateOops Address (61-bits)
+//
+
+class nmethod;
+class ZNMethodWithImmediateOops;
+
+class ZNMethodTableEntry : public CHeapObj<mtGC> {
+private:
+  typedef ZBitField<uint64_t, bool,                       0,  1>    field_registered;
+  typedef ZBitField<uint64_t, bool,                       1,  1>    field_unregistered;
+  typedef ZBitField<uint64_t, bool,                       1,  1>    field_immediate_oops;
+  typedef ZBitField<uint64_t, bool,                       2,  1>    field_non_immediate_oops;
+  typedef ZBitField<uint64_t, nmethod*,                   3, 61, 3> field_method;
+  typedef ZBitField<uint64_t, ZNMethodWithImmediateOops*, 3, 61, 3> field_method_with_immediate_oops;
+
+  uint64_t _entry;
+
+public:
+  ZNMethodTableEntry(bool unregistered = false) :
+      _entry(field_unregistered::encode(unregistered) |
+             field_registered::encode(false)) {}
+
+  ZNMethodTableEntry(nmethod* method, bool non_immediate_oops) :
+      _entry(field_method::encode(method) |
+             field_non_immediate_oops::encode(non_immediate_oops) |
+             field_immediate_oops::encode(false) |
+             field_registered::encode(true)) {}
+
+  ZNMethodTableEntry(ZNMethodWithImmediateOops* method_with_immediate_oops, bool non_immediate_oops) :
+      _entry(field_method_with_immediate_oops::encode(method_with_immediate_oops) |
+             field_non_immediate_oops::encode(non_immediate_oops) |
+             field_immediate_oops::encode(true) |
+             field_registered::encode(true)) {}
+
+  bool registered() const {
+    return field_registered::decode(_entry);
+  }
+
+  bool unregistered() const {
+    return field_unregistered::decode(_entry);
+  }
+
+  bool immediate_oops() const {
+    return field_immediate_oops::decode(_entry);
+  }
+
+  bool non_immediate_oops() const {
+    return field_non_immediate_oops::decode(_entry);
+  }
+
+  nmethod* method() const {
+    return field_method::decode(_entry);
+  }
+
+  ZNMethodWithImmediateOops* method_with_immediate_oops() const {
+    return field_method_with_immediate_oops::decode(_entry);
+  }
+};
+
+#endif // SHARE_GC_Z_ZNMETHODTABLEENTRY_HPP
diff --git a/src/hotspot/share/gc/z/zNUMA.cpp b/src/hotspot/share/gc/z/zNUMA.cpp
new file mode 100644
index 00000000000..06bc97efc42
--- /dev/null
+++ b/src/hotspot/share/gc/z/zNUMA.cpp
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "gc/z/zNUMA.hpp"
+#include "logging/log.hpp"
+#include "runtime/os.hpp"
+
+bool ZNUMA::_enabled;
+
+void ZNUMA::initialize() {
+  initialize_platform();
+
+  log_info(gc, init)("NUMA Support: %s", to_string());
+  if (is_enabled()) {
+    log_info(gc, init)("NUMA Nodes: %u", count());
+  }
+}
+
+bool ZNUMA::is_enabled() {
+  return _enabled;
+}
+
+void ZNUMA::memory_interleave(uintptr_t addr, size_t size) {
+  if (!_enabled) {
+    // NUMA support not enabled
+    return;
+  }
+
+  os::numa_make_global((char*)addr, size);
+}
+
+const char* ZNUMA::to_string() {
+  return _enabled ? "Enabled" : "Disabled";
+}
diff --git a/src/hotspot/share/gc/z/zNUMA.hpp b/src/hotspot/share/gc/z/zNUMA.hpp
new file mode 100644
index 00000000000..1d9db3c90e2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zNUMA.hpp
@@ -0,0 +1,48 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZNUMA_HPP
+#define SHARE_GC_Z_ZNUMA_HPP
+
+#include "memory/allocation.hpp"
+
+class ZNUMA : public AllStatic {
+private:
+  static bool _enabled;
+
+  static void initialize_platform();
+
+public:
+  static void initialize();
+  static bool is_enabled();
+
+  static uint32_t count();
+  static uint32_t id();
+
+  static uint32_t memory_id(uintptr_t addr);
+  static void memory_interleave(uintptr_t addr, size_t size);
+
+  static const char* to_string();
+};
+
+#endif // SHARE_GC_Z_ZNUMA_HPP
diff --git a/src/hotspot/share/gc/z/zObjectAllocator.cpp b/src/hotspot/share/gc/z/zObjectAllocator.cpp
new file mode 100644
index 00000000000..4f662aa902d
--- /dev/null
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/threadLocalAllocBuffer.inline.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zObjectAllocator.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zThread.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "logging/log.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/thread.hpp"
+#include "runtime/threadSMR.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+
+static const ZStatCounter ZCounterUndoObjectAllocationSucceeded("Memory", "Undo Object Allocation Succeeded", ZStatUnitOpsPerSecond);
+static const ZStatCounter ZCounterUndoObjectAllocationFailed("Memory", "Undo Object Allocation Failed", ZStatUnitOpsPerSecond);
+static const ZStatSubPhase ZSubPhasePauseRetireTLABS("Pause Retire TLABS");
+static const ZStatSubPhase ZSubPhasePauseRemapTLABS("Pause Remap TLABS");
+
+ZObjectAllocator::ZObjectAllocator(uint nworkers) :
+    _nworkers(nworkers),
+    _used(0),
+    _shared_medium_page(NULL),
+    _shared_small_page(NULL),
+    _worker_small_page(NULL) {}
+
+ZPage* ZObjectAllocator::alloc_page(uint8_t type, size_t size, ZAllocationFlags flags) {
+  ZPage* const page = ZHeap::heap()->alloc_page(type, size, flags);
+  if (page != NULL) {
+    // Increment used bytes
+    Atomic::add(size, _used.addr());
+  }
+
+  return page;
+}
+
+uintptr_t ZObjectAllocator::alloc_object_in_shared_page(ZPage** shared_page,
+                                                        uint8_t page_type,
+                                                        size_t page_size,
+                                                        size_t size,
+                                                        ZAllocationFlags flags) {
+  uintptr_t addr = 0;
+  ZPage* page = *shared_page;
+
+  if (page != NULL) {
+    addr = page->alloc_object_atomic(size);
+  }
+
+  if (addr == 0) {
+    // Allocate new page
+    ZPage* const new_page = alloc_page(page_type, page_size, flags);
+    if (new_page != NULL) {
+      // Allocate object before installing the new page
+      addr = new_page->alloc_object(size);
+
+    retry:
+      // Install new page
+      ZPage* const prev_page = Atomic::cmpxchg(new_page, shared_page, page);
+      if (prev_page != page) {
+        if (prev_page == NULL) {
+          // Previous page was retired, retry installing the new page
+          page = prev_page;
+          goto retry;
+        }
+
+        // Another page already installed, try allocation there first
+        const uintptr_t prev_addr = prev_page->alloc_object_atomic(size);
+        if (prev_addr == 0) {
+          // Allocation failed, retry installing the new page
+          page = prev_page;
+          goto retry;
+        }
+
+        // Allocation succeeded in already installed page
+        addr = prev_addr;
+
+        // Undo new page allocation
+        ZHeap::heap()->undo_alloc_page(new_page);
+      }
+    }
+  }
+
+  return addr;
+}
+
+uintptr_t ZObjectAllocator::alloc_large_object(size_t size, ZAllocationFlags flags) {
+  assert(ZThread::is_java(), "Should be a Java thread");
+
+  uintptr_t addr = 0;
+
+  // Allocate new large page
+  const size_t page_size = align_up(size, ZPageSizeMin);
+  ZPage* const page = alloc_page(ZPageTypeLarge, page_size, flags);
+  if (page != NULL) {
+    // Allocate the object
+    addr = page->alloc_object(size);
+  }
+
+  return addr;
+}
+
+uintptr_t ZObjectAllocator::alloc_medium_object(size_t size, ZAllocationFlags flags) {
+  return alloc_object_in_shared_page(_shared_medium_page.addr(), ZPageTypeMedium, ZPageSizeMedium, size, flags);
+}
+
+uintptr_t ZObjectAllocator::alloc_small_object_from_nonworker(size_t size, ZAllocationFlags flags) {
+  assert(ZThread::is_java() || ZThread::is_vm(), "Should be a Java or VM thread");
+
+  if (flags.relocation() && flags.java_thread() && UseTLAB) {
+    // For relocations from Java threads, try TLAB allocation first
+    const uintptr_t addr = (uintptr_t)Thread::current()->tlab().allocate(ZUtils::bytes_to_words(size));
+    if (addr != 0) {
+      return addr;
+    }
+  }
+
+  // Non-worker small page allocation can never use the reserve
+  flags.set_no_reserve();
+
+  return alloc_object_in_shared_page(_shared_small_page.addr(), ZPageTypeSmall, ZPageSizeSmall, size, flags);
+}
+
+uintptr_t ZObjectAllocator::alloc_small_object_from_worker(size_t size, ZAllocationFlags flags) {
+  assert(ZThread::is_worker(), "Should be a worker thread");
+
+  ZPage* page = _worker_small_page.get();
+  uintptr_t addr = 0;
+
+  if (page != NULL) {
+    addr = page->alloc_object(size);
+  }
+
+  if (addr == 0) {
+    // Allocate new page
+    page = alloc_page(ZPageTypeSmall, ZPageSizeSmall, flags);
+    if (page != NULL) {
+      addr = page->alloc_object(size);
+    }
+    _worker_small_page.set(page);
+  }
+
+  return addr;
+}
+
+uintptr_t ZObjectAllocator::alloc_small_object(size_t size, ZAllocationFlags flags) {
+  if (flags.worker_thread()) {
+    return alloc_small_object_from_worker(size, flags);
+  } else {
+    return alloc_small_object_from_nonworker(size, flags);
+  }
+}
+
+uintptr_t ZObjectAllocator::alloc_object(size_t size, ZAllocationFlags flags) {
+  if (size <= ZObjectSizeLimitSmall) {
+    // Small
+    return alloc_small_object(size, flags);
+  } else if (size <= ZObjectSizeLimitMedium) {
+    // Medium
+    return alloc_medium_object(size, flags);
+  } else {
+    // Large
+    return alloc_large_object(size, flags);
+  }
+}
+
+uintptr_t ZObjectAllocator::alloc_object(size_t size) {
+  assert(ZThread::is_java(), "Must be a Java thread");
+
+  ZAllocationFlags flags;
+  flags.set_java_thread();
+  flags.set_no_reserve();
+
+  if (!ZStallOnOutOfMemory) {
+    flags.set_non_blocking();
+  }
+
+  return alloc_object(size, flags);
+}
+
+uintptr_t ZObjectAllocator::alloc_object_for_relocation(size_t size) {
+  assert(ZThread::is_java() || ZThread::is_worker() || ZThread::is_vm(), "Unknown thread");
+
+  ZAllocationFlags flags;
+  flags.set_relocation();
+  flags.set_non_blocking();
+
+  if (ZThread::is_worker()) {
+    flags.set_worker_thread();
+  } else if (ZThread::is_java()) {
+    flags.set_java_thread();
+  }
+
+  return alloc_object(size, flags);
+}
+
+bool ZObjectAllocator::undo_alloc_large_object(ZPage* page) {
+  assert(page->type() == ZPageTypeLarge, "Invalid page type");
+
+  // Undo page allocation
+  ZHeap::heap()->undo_alloc_page(page);
+  return true;
+}
+
+bool ZObjectAllocator::undo_alloc_medium_object(ZPage* page, uintptr_t addr, size_t size) {
+  assert(page->type() == ZPageTypeMedium, "Invalid page type");
+
+  // Try atomic undo on shared page
+  return page->undo_alloc_object_atomic(addr, size);
+}
+
+bool ZObjectAllocator::undo_alloc_small_object_from_nonworker(ZPage* page, uintptr_t addr, size_t size) {
+  assert(page->type() == ZPageTypeSmall, "Invalid page type");
+
+  if (ZThread::is_java()) {
+    // Try undo allocation in TLAB
+    if (Thread::current()->tlab().undo_allocate((HeapWord*)addr, ZUtils::bytes_to_words(size))) {
+      return true;
+    }
+  }
+
+  // Try atomic undo on shared page
+  return page->undo_alloc_object_atomic(addr, size);
+}
+
+bool ZObjectAllocator::undo_alloc_small_object_from_worker(ZPage* page, uintptr_t addr, size_t size) {
+  assert(page->type() == ZPageTypeSmall, "Invalid page type");
+  assert(page == _worker_small_page.get(), "Invalid page");
+
+  // Non-atomic undo on worker-local page
+  const bool success = page->undo_alloc_object(addr, size);
+  assert(success, "Should always succeed");
+  return success;
+}
+
+bool ZObjectAllocator::undo_alloc_small_object(ZPage* page, uintptr_t addr, size_t size) {
+  if (ZThread::is_worker()) {
+    return undo_alloc_small_object_from_worker(page, addr, size);
+  } else {
+    return undo_alloc_small_object_from_nonworker(page, addr, size);
+  }
+}
+
+bool ZObjectAllocator::undo_alloc_object(ZPage* page, uintptr_t addr, size_t size) {
+  const uint8_t type = page->type();
+
+  if (type == ZPageTypeSmall) {
+    return undo_alloc_small_object(page, addr, size);
+  } else if (type == ZPageTypeMedium) {
+    return undo_alloc_medium_object(page, addr, size);
+  } else {
+    return undo_alloc_large_object(page);
+  }
+}
+
+void ZObjectAllocator::undo_alloc_object_for_relocation(ZPage* page, uintptr_t addr, size_t size) {
+  if (undo_alloc_object(page, addr, size)) {
+    ZStatInc(ZCounterUndoObjectAllocationSucceeded);
+  } else {
+    ZStatInc(ZCounterUndoObjectAllocationFailed);
+    log_trace(gc)("Failed to undo object allocation: " PTR_FORMAT ", Size: " SIZE_FORMAT ", Thread: " PTR_FORMAT " (%s)",
+                  addr, size, ZThread::id(), ZThread::name());
+  }
+}
+
+size_t ZObjectAllocator::used() const {
+  size_t total_used = 0;
+
+  ZPerCPUConstIterator<size_t> iter(&_used);
+  for (const size_t* cpu_used; iter.next(&cpu_used);) {
+    total_used += *cpu_used;
+  }
+
+  return total_used;
+}
+
+size_t ZObjectAllocator::remaining() const {
+  assert(ZThread::is_java(), "Should be a Java thread");
+
+  ZPage* page = _shared_small_page.get();
+  if (page != NULL) {
+    return page->remaining();
+  }
+
+  return 0;
+}
+
+void ZObjectAllocator::retire_tlabs() {
+  ZStatTimer timer(ZSubPhasePauseRetireTLABS);
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+  // Retire TLABs
+  if (UseTLAB) {
+    ZCollectedHeap* heap = ZCollectedHeap::heap();
+    heap->accumulate_statistics_all_tlabs();
+    heap->ensure_parsability(true /* retire_tlabs */);
+    heap->resize_all_tlabs();
+  }
+
+  // Reset used
+  _used.set_all(0);
+
+  // Reset allocation pages
+  _shared_medium_page.set(NULL);
+  _shared_small_page.set_all(NULL);
+  _worker_small_page.set_all(NULL);
+}
+
+static void remap_tlab_address(HeapWord** p) {
+  *p = (HeapWord*)ZAddress::good_or_null((uintptr_t)*p);
+}
+
+void ZObjectAllocator::remap_tlabs() {
+  ZStatTimer timer(ZSubPhasePauseRemapTLABS);
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+
+  if (UseTLAB) {
+    for (JavaThreadIteratorWithHandle iter; JavaThread* thread = iter.next(); ) {
+      thread->tlab().addresses_do(remap_tlab_address);
+    }
+  }
+}
diff --git a/src/hotspot/share/gc/z/zObjectAllocator.hpp b/src/hotspot/share/gc/z/zObjectAllocator.hpp
new file mode 100644
index 00000000000..7ec4ceba0c2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZOBJECTALLOCATOR_HPP
+#define SHARE_GC_Z_ZOBJECTALLOCATOR_HPP
+
+#include "gc/z/zAllocationFlags.hpp"
+#include "gc/z/zPage.hpp"
+#include "gc/z/zValue.hpp"
+#include "memory/allocation.hpp"
+
+class ZObjectAllocator {
+private:
+  const uint         _nworkers;
+  ZPerCPU<size_t>    _used;
+  ZContended<ZPage*> _shared_medium_page;
+  ZPerCPU<ZPage*>    _shared_small_page;
+  ZPerWorker<ZPage*> _worker_small_page;
+
+  ZPage* alloc_page(uint8_t type, size_t size, ZAllocationFlags flags);
+
+  // Allocate an object in a shared page. Allocate and
+  // atomically install a new page if neccesary.
+  uintptr_t alloc_object_in_shared_page(ZPage** shared_page,
+                                        uint8_t page_type,
+                                        size_t page_size,
+                                        size_t size,
+                                        ZAllocationFlags flags);
+
+  uintptr_t alloc_large_object(size_t size, ZAllocationFlags flags);
+  uintptr_t alloc_medium_object(size_t size, ZAllocationFlags flags);
+  uintptr_t alloc_small_object_from_nonworker(size_t size, ZAllocationFlags flags);
+  uintptr_t alloc_small_object_from_worker(size_t size, ZAllocationFlags flags);
+  uintptr_t alloc_small_object(size_t size, ZAllocationFlags flags);
+  uintptr_t alloc_object(size_t size, ZAllocationFlags flags);
+
+  bool undo_alloc_large_object(ZPage* page);
+  bool undo_alloc_medium_object(ZPage* page, uintptr_t addr, size_t size);
+  bool undo_alloc_small_object_from_nonworker(ZPage* page, uintptr_t addr, size_t size);
+  bool undo_alloc_small_object_from_worker(ZPage* page, uintptr_t addr, size_t size);
+  bool undo_alloc_small_object(ZPage* page, uintptr_t addr, size_t size);
+  bool undo_alloc_object(ZPage* page, uintptr_t addr, size_t size);
+
+public:
+  ZObjectAllocator(uint nworkers);
+
+  uintptr_t alloc_object(size_t size);
+
+  uintptr_t alloc_object_for_relocation(size_t size);
+  void undo_alloc_object_for_relocation(ZPage* page, uintptr_t addr, size_t size);
+
+  size_t used() const;
+  size_t remaining() const;
+
+  void retire_tlabs();
+  void remap_tlabs();
+};
+
+#endif // SHARE_GC_Z_ZOBJECTALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/z/zOop.hpp b/src/hotspot/share/gc/z/zOop.hpp
new file mode 100644
index 00000000000..3ee8c1b2f59
--- /dev/null
+++ b/src/hotspot/share/gc/z/zOop.hpp
@@ -0,0 +1,41 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZOOP_HPP
+#define SHARE_GC_Z_ZOOP_HPP
+
+#include "memory/allocation.hpp"
+#include "oops/oopsHierarchy.hpp"
+
+class ZOop : public AllStatic {
+public:
+  static oop to_oop(uintptr_t value);
+  static uintptr_t to_address(oop o);
+
+  static bool is_good(oop o);
+  static bool is_good_or_null(oop o);
+
+  static oop good(oop);
+};
+
+#endif // SHARE_GC_Z_ZOOP_HPP
diff --git a/src/hotspot/share/gc/z/zOop.inline.hpp b/src/hotspot/share/gc/z/zOop.inline.hpp
new file mode 100644
index 00000000000..74895601547
--- /dev/null
+++ b/src/hotspot/share/gc/z/zOop.inline.hpp
@@ -0,0 +1,51 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZOOP_INLINE_HPP
+#define SHARE_GC_Z_ZOOP_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zOop.hpp"
+#include "oops/oopsHierarchy.hpp"
+
+inline oop ZOop::to_oop(uintptr_t value) {
+  return cast_to_oop(value);
+}
+
+inline uintptr_t ZOop::to_address(oop o) {
+  return cast_from_oop<uintptr_t>(o);
+}
+
+inline bool ZOop::is_good(oop o) {
+  return ZAddress::is_good(to_address(o));
+}
+
+inline bool ZOop::is_good_or_null(oop o) {
+  return ZAddress::is_good_or_null(to_address(o));
+}
+
+inline oop ZOop::good(oop o) {
+  return to_oop(ZAddress::good(to_address(o)));
+}
+
+#endif // SHARE_GC_Z_ZOOP_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zOopClosures.cpp b/src/hotspot/share/gc/z/zOopClosures.cpp
new file mode 100644
index 00000000000..ce43f160f8d
--- /dev/null
+++ b/src/hotspot/share/gc/z/zOopClosures.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zHeap.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "memory/iterator.inline.hpp"
+#include "oops/access.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+static void z_verify_loaded_object(const oop* p, const oop obj) {
+  guarantee(ZOop::is_good_or_null(obj),
+            "Bad oop " PTR_FORMAT " found at " PTR_FORMAT ", expected " PTR_FORMAT,
+            p2i(obj), p2i(p), p2i(ZOop::good(obj)));
+  guarantee(oopDesc::is_oop_or_null(obj),
+            "Bad object " PTR_FORMAT " found at " PTR_FORMAT,
+            p2i(obj), p2i(p));
+}
+
+ZVerifyHeapOopClosure::ZVerifyHeapOopClosure(oop base)
+    : _base(base) {}
+
+void ZVerifyHeapOopClosure::do_oop(oop* p) {
+  guarantee(ZHeap::heap()->is_in((uintptr_t)p), "oop* " PTR_FORMAT " not in heap", p2i(p));
+
+  const oop obj = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(_base, _base->field_offset(p));
+  z_verify_loaded_object(p, obj);
+}
+
+void ZVerifyHeapOopClosure::do_oop(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+void ZVerifyRootOopClosure::do_oop(oop* p) {
+  guarantee(!ZHeap::heap()->is_in((uintptr_t)p), "oop* " PTR_FORMAT " in heap", p2i(p));
+
+  const oop obj = RootAccess<>::oop_load(p);
+  z_verify_loaded_object(p, obj);
+}
+
+void ZVerifyRootOopClosure::do_oop(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+void ZVerifyObjectClosure::do_object(oop o) {
+  ZVerifyHeapOopClosure cl(o);
+  o->oop_iterate(&cl);
+}
+
+// Generate Z specialized oop_oop_iterate functions.
+SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_Z(ALL_KLASS_OOP_OOP_ITERATE_DEFN)
diff --git a/src/hotspot/share/gc/z/zOopClosures.hpp b/src/hotspot/share/gc/z/zOopClosures.hpp
new file mode 100644
index 00000000000..8eefdff67b6
--- /dev/null
+++ b/src/hotspot/share/gc/z/zOopClosures.hpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZOOPCLOSURES_HPP
+#define SHARE_GC_Z_ZOOPCLOSURES_HPP
+
+#include "memory/iterator.hpp"
+
+class ZLoadBarrierOopClosure : public ExtendedOopClosure {
+public:
+  void do_oop_nv(oop* p);
+  void do_oop_nv(narrowOop* p);
+
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+
+#ifdef ASSERT
+  virtual bool should_verify_oops() {
+    return false;
+  }
+#endif
+};
+
+class ZMarkRootOopClosure : public OopClosure {
+public:
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+};
+
+class ZRelocateRootOopClosure : public OopClosure {
+public:
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+};
+
+template <bool finalizable>
+class ZMarkBarrierOopClosure : public ExtendedOopClosure {
+public:
+  ZMarkBarrierOopClosure();
+
+  void do_oop_nv(oop* p);
+  void do_oop_nv(narrowOop* p);
+
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+
+#ifdef ASSERT
+  virtual bool should_verify_oops() {
+    return false;
+  }
+#endif
+};
+
+class ZPhantomIsAliveObjectClosure : public BoolObjectClosure {
+public:
+  virtual bool do_object_b(oop o);
+};
+
+class ZPhantomKeepAliveOopClosure : public OopClosure {
+public:
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+};
+
+class ZPhantomCleanOopClosure : public OopClosure {
+public:
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+};
+
+class ZVerifyHeapOopClosure : public ExtendedOopClosure {
+private:
+  const oop _base;
+
+public:
+  ZVerifyHeapOopClosure(oop base);
+
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+
+#ifdef ASSERT
+  // Verification handled by the closure itself.
+  virtual bool should_verify_oops() {
+    return false;
+  }
+#endif
+};
+
+class ZVerifyRootOopClosure : public OopClosure {
+public:
+  virtual void do_oop(oop* p);
+  virtual void do_oop(narrowOop* p);
+};
+
+class ZVerifyObjectClosure : public ObjectClosure {
+public:
+  virtual void do_object(oop o);
+};
+
+#endif // SHARE_GC_Z_ZOOPCLOSURES_HPP
diff --git a/src/hotspot/share/gc/z/zOopClosures.inline.hpp b/src/hotspot/share/gc/z/zOopClosures.inline.hpp
new file mode 100644
index 00000000000..89ddd265623
--- /dev/null
+++ b/src/hotspot/share/gc/z/zOopClosures.inline.hpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_Z_ZOOPCLOSURES_INLINE_HPP
+
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zOopClosures.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/debug.hpp"
+
+inline void ZLoadBarrierOopClosure::do_oop_nv(oop* p) {
+  ZBarrier::load_barrier_on_oop_field(p);
+}
+
+inline void ZLoadBarrierOopClosure::do_oop_nv(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+inline void ZLoadBarrierOopClosure::do_oop(oop* p) {
+  do_oop_nv(p);
+}
+
+inline void ZLoadBarrierOopClosure::do_oop(narrowOop* p) {
+  do_oop_nv(p);
+}
+
+inline void ZMarkRootOopClosure::do_oop(oop* p) {
+  ZBarrier::mark_barrier_on_root_oop_field(p);
+}
+
+inline void ZMarkRootOopClosure::do_oop(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+inline void ZRelocateRootOopClosure::do_oop(oop* p) {
+  ZBarrier::relocate_barrier_on_root_oop_field(p);
+}
+
+inline void ZRelocateRootOopClosure::do_oop(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+template <bool finalizable>
+inline ZMarkBarrierOopClosure<finalizable>::ZMarkBarrierOopClosure() :
+    ExtendedOopClosure(finalizable ? NULL : ZHeap::heap()->reference_discoverer()) {}
+
+template <bool finalizable>
+inline void ZMarkBarrierOopClosure<finalizable>::do_oop_nv(oop* p) {
+  ZBarrier::mark_barrier_on_oop_field(p, finalizable);
+}
+
+template <bool finalizable>
+inline void ZMarkBarrierOopClosure<finalizable>::do_oop_nv(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+template <bool finalizable>
+inline void ZMarkBarrierOopClosure<finalizable>::do_oop(oop* p) {
+  do_oop_nv(p);
+}
+
+template <bool finalizable>
+inline void ZMarkBarrierOopClosure<finalizable>::do_oop(narrowOop* p) {
+  do_oop_nv(p);
+}
+
+inline bool ZPhantomIsAliveObjectClosure::do_object_b(oop o) {
+  return ZBarrier::is_alive_barrier_on_phantom_oop(o);
+}
+
+inline void ZPhantomKeepAliveOopClosure::do_oop(oop* p) {
+  ZBarrier::keep_alive_barrier_on_phantom_oop_field(p);
+}
+
+inline void ZPhantomKeepAliveOopClosure::do_oop(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+inline void ZPhantomCleanOopClosure::do_oop(oop* p) {
+  // Read the oop once, to make sure the liveness check
+  // and the later clearing uses the same value.
+  const oop obj = *(volatile oop*)p;
+  if (ZBarrier::is_alive_barrier_on_phantom_oop(obj)) {
+    ZBarrier::keep_alive_barrier_on_phantom_oop_field(p);
+  } else {
+    // The destination could have been modified/reused, in which case
+    // we don't want to clear it. However, no one could write the same
+    // oop here again (the object would be strongly live and we would
+    // not consider clearing such oops), so therefore we don't have an
+    // ABA problem here.
+    Atomic::cmpxchg(oop(NULL), p, obj);
+  }
+}
+
+inline void ZPhantomCleanOopClosure::do_oop(narrowOop* p) {
+  ShouldNotReachHere();
+}
+
+#endif // SHARE_GC_Z_ZOOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zPage.cpp b/src/hotspot/share/gc/z/zPage.cpp
new file mode 100644
index 00000000000..153253aa772
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPage.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zForwardingTable.inline.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zLiveMap.inline.hpp"
+#include "gc/z/zMark.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPhysicalMemory.inline.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zThread.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "logging/log.hpp"
+#include "runtime/orderAccess.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+static const ZStatCounter ZCounterRelocationContention("Contention", "Relocation Contention", ZStatUnitOpsPerSecond);
+
+ZPage::ZPage(uint8_t type, ZVirtualMemory vmem, ZPhysicalMemory pmem) :
+    _type(type),
+    _pinned(0),
+    _numa_id((uint8_t)-1),
+    _seqnum(0),
+    _virtual(vmem),
+    _top(start()),
+    _livemap(object_max_count()),
+    _refcount(0),
+    _forwarding(),
+    _physical(pmem) {
+  assert(!_physical.is_null(), "Should not be null");
+  assert(!_virtual.is_null(), "Should not be null");
+  assert((type == ZPageTypeSmall && size() == ZPageSizeSmall) ||
+         (type == ZPageTypeMedium && size() == ZPageSizeMedium) ||
+         (type == ZPageTypeLarge && is_aligned(size(), ZPageSizeMin)),
+         "Page type/size mismatch");
+}
+
+ZPage::~ZPage() {
+  assert(!is_active(), "Should not be active");
+  assert(is_detached(), "Should be detached");
+}
+
+void ZPage::reset() {
+  assert(!is_active(), "Should not be active");
+  assert(!is_pinned(), "Should not be pinned");
+  assert(!is_detached(), "Should not be detached");
+
+  _seqnum = ZGlobalSeqNum;
+  _top = start();
+  _livemap.reset();
+
+  // Make sure we don't make the page active before
+  // the reset of the above fields are visible.
+  OrderAccess::storestore();
+
+  _refcount = 1;
+}
+
+uintptr_t ZPage::relocate_object_inner(uintptr_t from_index, uintptr_t from_offset) {
+  ZForwardingTableCursor cursor;
+
+  // Lookup address in forwarding table
+  const ZForwardingTableEntry entry = _forwarding.find(from_index, &cursor);
+  if (entry.from_index() == from_index) {
+    // Already relocated, return new address
+    return entry.to_offset();
+  }
+
+  // Not found in forwarding table, relocate object
+  assert(is_object_marked(from_offset), "Should be marked");
+
+  if (is_pinned()) {
+    // In-place forward
+    return _forwarding.insert(from_index, from_offset, &cursor);
+  }
+
+  // Allocate object
+  const uintptr_t from_good = ZAddress::good(from_offset);
+  const size_t size = ZUtils::object_size(from_good);
+  const uintptr_t to_good = ZHeap::heap()->alloc_object_for_relocation(size);
+  if (to_good == 0) {
+    // Failed, in-place forward
+    return _forwarding.insert(from_index, from_offset, &cursor);
+  }
+
+  // Copy object
+  ZUtils::object_copy(from_good, to_good, size);
+
+  // Update forwarding table
+  const uintptr_t to_offset = ZAddress::offset(to_good);
+  const uintptr_t to_offset_final = _forwarding.insert(from_index, to_offset, &cursor);
+  if (to_offset_final == to_offset) {
+    // Relocation succeeded
+    return to_offset;
+  }
+
+  // Relocation contention
+  ZStatInc(ZCounterRelocationContention);
+  log_trace(gc)("Relocation contention, thread: " PTR_FORMAT " (%s), page: " PTR_FORMAT
+                ", entry: " SIZE_FORMAT ", oop: " PTR_FORMAT ", size: " SIZE_FORMAT,
+                ZThread::id(), ZThread::name(), p2i(this), cursor, from_good, size);
+
+  // Try undo allocation
+  ZHeap::heap()->undo_alloc_object_for_relocation(to_good, size);
+
+  return to_offset_final;
+}
+
+uintptr_t ZPage::relocate_object(uintptr_t from) {
+  assert(ZHeap::heap()->is_relocating(from), "Should be relocating");
+
+  const uintptr_t from_offset = ZAddress::offset(from);
+  const uintptr_t from_index = (from_offset - start()) >> object_alignment_shift();
+  const uintptr_t to_offset = relocate_object_inner(from_index, from_offset);
+  if (from_offset == to_offset) {
+    // In-place forwarding, pin page
+    set_pinned();
+  }
+
+  return ZAddress::good(to_offset);
+}
+
+uintptr_t ZPage::forward_object(uintptr_t from) {
+  assert(ZHeap::heap()->is_relocating(from), "Should be relocated");
+
+  // Lookup address in forwarding table
+  const uintptr_t from_offset = ZAddress::offset(from);
+  const uintptr_t from_index = (from_offset - start()) >> object_alignment_shift();
+  const ZForwardingTableEntry entry = _forwarding.find(from_index);
+  assert(entry.from_index() == from_index, "Should be forwarded");
+
+  return ZAddress::good(entry.to_offset());
+}
+
+void ZPage::print_on(outputStream* out) const {
+  out->print_cr(" %-6s  " PTR_FORMAT " " PTR_FORMAT " " PTR_FORMAT " %s%s%s%s%s%s",
+                type_to_string(), start(), top(), end(),
+                is_allocating()  ? " Allocating"  : "",
+                is_relocatable() ? " Relocatable" : "",
+                is_forwarding()  ? " Forwarding"  : "",
+                is_pinned()      ? " Pinned"      : "",
+                is_detached()    ? " Detached"    : "",
+                !is_active()     ? " Inactive"    : "");
+}
+
+void ZPage::print() const {
+  print_on(tty);
+}
diff --git a/src/hotspot/share/gc/z/zPage.hpp b/src/hotspot/share/gc/z/zPage.hpp
new file mode 100644
index 00000000000..0b812b24d77
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPage.hpp
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGE_HPP
+#define SHARE_GC_Z_ZPAGE_HPP
+
+#include "gc/z/zForwardingTable.hpp"
+#include "gc/z/zList.hpp"
+#include "gc/z/zLiveMap.hpp"
+#include "gc/z/zPhysicalMemory.hpp"
+#include "gc/z/zVirtualMemory.hpp"
+#include "memory/allocation.hpp"
+
+class ZPage : public CHeapObj<mtGC> {
+  friend class VMStructs;
+  friend class ZList<ZPage>;
+
+private:
+  // Always hot
+  const uint8_t        _type;             // Page type
+  volatile uint8_t     _pinned;           // Pinned flag
+  uint8_t              _numa_id;          // NUMA node affinity
+  uint32_t             _seqnum;           // Allocation sequence number
+  const ZVirtualMemory _virtual;          // Virtual start/end address
+  volatile uintptr_t   _top;              // Virtual top address
+  ZLiveMap             _livemap;          // Live map
+
+  // Hot when relocated and cached
+  volatile uint32_t    _refcount;         // Page reference count
+  ZForwardingTable     _forwarding;       // Forwarding table
+  ZPhysicalMemory      _physical;         // Physical memory for page
+  ZListNode<ZPage>     _node;             // Page list node
+
+  const char* type_to_string() const;
+  uint32_t object_max_count() const;
+  uintptr_t relocate_object_inner(uintptr_t from_index, uintptr_t from_offset);
+
+  bool is_object_marked(uintptr_t addr) const;
+  bool is_object_strongly_marked(uintptr_t addr) const;
+
+public:
+  ZPage(uint8_t type, ZVirtualMemory vmem, ZPhysicalMemory pmem);
+  ~ZPage();
+
+  size_t object_alignment_shift() const;
+  size_t object_alignment() const;
+
+  uint8_t type() const;
+  uintptr_t start() const;
+  uintptr_t end() const;
+  size_t size() const;
+  uintptr_t top() const;
+  size_t remaining() const;
+
+  uint8_t numa_id();
+
+  ZPhysicalMemory& physical_memory();
+  const ZVirtualMemory& virtual_memory() const;
+
+  void reset();
+
+  bool inc_refcount();
+  bool dec_refcount();
+
+  bool is_in(uintptr_t addr) const;
+
+  uintptr_t block_start(uintptr_t addr) const;
+  size_t block_size(uintptr_t addr) const;
+  bool block_is_obj(uintptr_t addr) const;
+
+  bool is_active() const;
+  bool is_allocating() const;
+  bool is_relocatable() const;
+  bool is_detached() const;
+
+  bool is_mapped() const;
+  void set_pre_mapped();
+
+  bool is_pinned() const;
+  void set_pinned();
+
+  bool is_forwarding() const;
+  void set_forwarding();
+  void reset_forwarding();
+  void verify_forwarding() const;
+
+  bool is_marked() const;
+  bool is_object_live(uintptr_t addr) const;
+  bool is_object_strongly_live(uintptr_t addr) const;
+  bool mark_object(uintptr_t addr, bool finalizable, bool& inc_live);
+
+  void inc_live_atomic(uint32_t objects, size_t bytes);
+  size_t live_bytes() const;
+
+  void object_iterate(ObjectClosure* cl);
+
+  uintptr_t alloc_object(size_t size);
+  uintptr_t alloc_object_atomic(size_t size);
+
+  bool undo_alloc_object(uintptr_t addr, size_t size);
+  bool undo_alloc_object_atomic(uintptr_t addr, size_t size);
+
+  uintptr_t relocate_object(uintptr_t from);
+  uintptr_t forward_object(uintptr_t from);
+
+  void print_on(outputStream* out) const;
+  void print() const;
+};
+
+#endif // SHARE_GC_Z_ZPAGE_HPP
diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp
new file mode 100644
index 00000000000..3588611f419
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPage.inline.hpp
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGE_INLINE_HPP
+#define SHARE_GC_Z_ZPAGE_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zForwardingTable.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zLiveMap.inline.hpp"
+#include "gc/z/zMark.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "gc/z/zPage.hpp"
+#include "gc/z/zPhysicalMemory.inline.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "gc/z/zVirtualMemory.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+
+inline const char* ZPage::type_to_string() const {
+  switch (type()) {
+  case ZPageTypeSmall:
+    return "Small";
+
+  case ZPageTypeMedium:
+    return "Medium";
+
+  default:
+    assert(type() == ZPageTypeLarge, "Invalid page type");
+    return "Large";
+  }
+}
+
+inline uint32_t ZPage::object_max_count() const {
+  switch (type()) {
+  case ZPageTypeLarge:
+    // A large page can only contain a single
+    // object aligned to the start of the page.
+    return 1;
+
+  default:
+    return (uint32_t)(size() >> object_alignment_shift());
+  }
+}
+
+inline size_t ZPage::object_alignment_shift() const {
+  switch (type()) {
+  case ZPageTypeSmall:
+    return ZObjectAlignmentSmallShift;
+
+  case ZPageTypeMedium:
+    return ZObjectAlignmentMediumShift;
+
+  default:
+    assert(type() == ZPageTypeLarge, "Invalid page type");
+    return ZObjectAlignmentLargeShift;
+  }
+}
+
+inline size_t ZPage::object_alignment() const {
+  switch (type()) {
+  case ZPageTypeSmall:
+    return ZObjectAlignmentSmall;
+
+  case ZPageTypeMedium:
+    return ZObjectAlignmentMedium;
+
+  default:
+    assert(type() == ZPageTypeLarge, "Invalid page type");
+    return ZObjectAlignmentLarge;
+  }
+}
+
+inline uint8_t ZPage::type() const {
+  return _type;
+}
+
+inline uintptr_t ZPage::start() const {
+  return _virtual.start();
+}
+
+inline uintptr_t ZPage::end() const {
+  return _virtual.end();
+}
+
+inline size_t ZPage::size() const {
+  return _virtual.size();
+}
+
+inline uintptr_t ZPage::top() const {
+  return _top;
+}
+
+inline size_t ZPage::remaining() const {
+  return end() - top();
+}
+
+inline ZPhysicalMemory& ZPage::physical_memory() {
+  return _physical;
+}
+
+inline const ZVirtualMemory& ZPage::virtual_memory() const {
+  return _virtual;
+}
+
+inline uint8_t ZPage::numa_id() {
+  if (_numa_id == (uint8_t)-1) {
+    _numa_id = (uint8_t)ZNUMA::memory_id(ZAddress::good(start()));
+  }
+
+  return _numa_id;
+}
+
+inline bool ZPage::inc_refcount() {
+  for (uint32_t prev_refcount = _refcount; prev_refcount > 0; prev_refcount = _refcount) {
+    if (Atomic::cmpxchg(prev_refcount + 1, &_refcount, prev_refcount) == prev_refcount) {
+      return true;
+    }
+  }
+  return false;
+}
+
+inline bool ZPage::dec_refcount() {
+  assert(is_active(), "Should be active");
+  return Atomic::sub(1u, &_refcount) == 0;
+}
+
+inline bool ZPage::is_in(uintptr_t addr) const {
+  const uintptr_t offset = ZAddress::offset(addr);
+  return offset >= start() && offset < top();
+}
+
+inline uintptr_t ZPage::block_start(uintptr_t addr) const {
+  if (block_is_obj(addr)) {
+    return addr;
+  } else {
+    return ZAddress::good(top());
+  }
+}
+
+inline size_t ZPage::block_size(uintptr_t addr) const {
+  if (block_is_obj(addr)) {
+    return ZUtils::object_size(addr);
+  } else {
+    return end() - top();
+  }
+}
+
+inline bool ZPage::block_is_obj(uintptr_t addr) const {
+  return ZAddress::offset(addr) < top();
+}
+
+inline bool ZPage::is_active() const {
+  return _refcount > 0;
+}
+
+inline bool ZPage::is_allocating() const {
+  return is_active() && _seqnum == ZGlobalSeqNum;
+}
+
+inline bool ZPage::is_relocatable() const {
+  return is_active() && _seqnum < ZGlobalSeqNum;
+}
+
+inline bool ZPage::is_detached() const {
+  return _physical.is_null();
+}
+
+inline bool ZPage::is_mapped() const {
+  return _seqnum > 0;
+}
+
+inline void ZPage::set_pre_mapped() {
+  // The _seqnum variable is also used to signal that the virtual and physical
+  // memory has been mapped. So, we need to set it to non-zero when the memory
+  // has been pre-mapped.
+  _seqnum = 1;
+}
+
+inline bool ZPage::is_pinned() const {
+  return _pinned;
+}
+
+inline void ZPage::set_pinned() {
+  _pinned = 1;
+}
+
+inline bool ZPage::is_forwarding() const {
+  return !_forwarding.is_null();
+}
+
+inline void ZPage::set_forwarding() {
+  assert(is_marked(), "Should be marked");
+  _forwarding.setup(_livemap.live_objects());
+}
+
+inline void ZPage::reset_forwarding() {
+  _forwarding.reset();
+  _pinned = 0;
+}
+
+inline void ZPage::verify_forwarding() const {
+  _forwarding.verify(object_max_count(), _livemap.live_objects());
+}
+
+inline bool ZPage::is_marked() const {
+  assert(is_relocatable(), "Invalid page state");
+  return _livemap.is_marked();
+}
+
+inline bool ZPage::is_object_marked(uintptr_t addr) const {
+  const size_t index = ((ZAddress::offset(addr) - start()) >> object_alignment_shift()) * 2;
+  return _livemap.get(index);
+}
+
+inline bool ZPage::is_object_strongly_marked(uintptr_t addr) const {
+  const size_t index = ((ZAddress::offset(addr) - start()) >> object_alignment_shift()) * 2;
+  return _livemap.get(index + 1);
+}
+
+inline bool ZPage::is_object_live(uintptr_t addr) const {
+  return is_allocating() || is_object_marked(addr);
+}
+
+inline bool ZPage::is_object_strongly_live(uintptr_t addr) const {
+  return is_allocating() || is_object_strongly_marked(addr);
+}
+
+inline bool ZPage::mark_object(uintptr_t addr, bool finalizable, bool& inc_live) {
+  assert(ZAddress::is_marked(addr), "Invalid address");
+  assert(is_relocatable(), "Invalid page state");
+  assert(is_in(addr), "Invalid address");
+
+  // Set mark bit
+  const size_t index = ((ZAddress::offset(addr) - start()) >> object_alignment_shift()) * 2;
+  return _livemap.set_atomic(index, finalizable, inc_live);
+}
+
+inline void ZPage::inc_live_atomic(uint32_t objects, size_t bytes) {
+  _livemap.inc_live_atomic(objects, bytes);
+}
+
+inline size_t ZPage::live_bytes() const {
+  assert(is_marked(), "Should be marked");
+  return _livemap.live_bytes();
+}
+
+inline void ZPage::object_iterate(ObjectClosure* cl) {
+  _livemap.iterate(cl, ZAddress::good(start()), object_alignment_shift());
+}
+
+inline uintptr_t ZPage::alloc_object(size_t size) {
+  assert(is_allocating(), "Invalid state");
+
+  const size_t aligned_size = align_up(size, object_alignment());
+  const uintptr_t addr = top();
+  const uintptr_t new_top = addr + aligned_size;
+
+  if (new_top > end()) {
+    // Not enough space left
+    return 0;
+  }
+
+  _top = new_top;
+
+  // Fill alignment padding if needed
+  if (aligned_size != size) {
+    ZUtils::insert_filler_object(addr + size, aligned_size - size);
+  }
+
+  return ZAddress::good(addr);
+}
+
+inline uintptr_t ZPage::alloc_object_atomic(size_t size) {
+  assert(is_allocating(), "Invalid state");
+
+  const size_t aligned_size = align_up(size, object_alignment());
+  uintptr_t addr = top();
+
+  for (;;) {
+    const uintptr_t new_top = addr + aligned_size;
+    if (new_top > end()) {
+      // Not enough space left
+      return 0;
+    }
+
+    const uintptr_t prev_top = Atomic::cmpxchg(new_top, &_top, addr);
+    if (prev_top == addr) {
+      // Fill alignment padding if needed
+      if (aligned_size != size) {
+        ZUtils::insert_filler_object(addr + size, aligned_size - size);
+      }
+
+      // Success
+      return ZAddress::good(addr);
+    }
+
+    // Retry
+    addr = prev_top;
+  }
+}
+
+inline bool ZPage::undo_alloc_object(uintptr_t addr, size_t size) {
+  assert(is_allocating(), "Invalid state");
+
+  const uintptr_t offset = ZAddress::offset(addr);
+  const size_t aligned_size = align_up(size, object_alignment());
+  const uintptr_t old_top = top();
+  const uintptr_t new_top = old_top - aligned_size;
+
+  if (new_top != offset) {
+    // Failed to undo allocation, not the last allocated object
+    return false;
+  }
+
+  _top = new_top;
+
+  // Success
+  return true;
+}
+
+inline bool ZPage::undo_alloc_object_atomic(uintptr_t addr, size_t size) {
+  assert(is_allocating(), "Invalid state");
+
+  const uintptr_t offset = ZAddress::offset(addr);
+  const size_t aligned_size = align_up(size, object_alignment());
+  uintptr_t old_top = top();
+
+  for (;;) {
+    const uintptr_t new_top = old_top - aligned_size;
+    if (new_top != offset) {
+      // Failed to undo allocation, not the last allocated object
+      return false;
+    }
+
+    const uintptr_t prev_top = Atomic::cmpxchg(new_top, &_top, old_top);
+    if (prev_top == old_top) {
+      // Success
+      return true;
+    }
+
+    // Retry
+    old_top = prev_top;
+  }
+}
+
+#endif // SHARE_GC_Z_ZPAGE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
new file mode 100644
index 00000000000..e77e409d3f7
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -0,0 +1,471 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zFuture.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zLock.inline.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPageAllocator.hpp"
+#include "gc/z/zPageCache.inline.hpp"
+#include "gc/z/zPreMappedMemory.inline.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTracer.inline.hpp"
+#include "runtime/init.hpp"
+
+static const ZStatCounter       ZCounterAllocationRate("Memory", "Allocation Rate", ZStatUnitBytesPerSecond);
+static const ZStatCriticalPhase ZCriticalPhaseAllocationStall("Allocation Stall");
+
+class ZPageAllocRequest : public StackObj {
+  friend class ZList<ZPageAllocRequest>;
+
+private:
+  const uint8_t                _type;
+  const size_t                 _size;
+  const ZAllocationFlags       _flags;
+  const unsigned int           _total_collections;
+  ZListNode<ZPageAllocRequest> _node;
+  ZFuture<ZPage*>              _result;
+
+public:
+  ZPageAllocRequest(uint8_t type, size_t size, ZAllocationFlags flags, unsigned int total_collections) :
+      _type(type),
+      _size(size),
+      _flags(flags),
+      _total_collections(total_collections) {}
+
+  uint8_t type() const {
+    return _type;
+  }
+
+  size_t size() const {
+    return _size;
+  }
+
+  ZAllocationFlags flags() const {
+    return _flags;
+  }
+
+  unsigned int total_collections() const {
+    return _total_collections;
+  }
+
+  ZPage* wait() {
+    return _result.get();
+  }
+
+  void satisfy(ZPage* page) {
+    _result.set(page);
+  }
+};
+
+ZPage* const ZPageAllocator::gc_marker = (ZPage*)-1;
+
+ZPageAllocator::ZPageAllocator(size_t min_capacity, size_t max_capacity, size_t max_reserve) :
+    _virtual(),
+    _physical(max_capacity, ZPageSizeMin),
+    _cache(),
+    _pre_mapped(_virtual, _physical, min_capacity),
+    _max_reserve(max_reserve),
+    _used_high(0),
+    _used_low(0),
+    _used(0),
+    _allocated(0),
+    _reclaimed(0),
+    _queue(),
+    _detached() {}
+
+bool ZPageAllocator::is_initialized() const {
+  return _physical.is_initialized() &&
+         _virtual.is_initialized() &&
+         _pre_mapped.is_initialized();
+}
+
+size_t ZPageAllocator::max_capacity() const {
+  return _physical.max_capacity();
+}
+
+size_t ZPageAllocator::capacity() const {
+  return _physical.capacity();
+}
+
+size_t ZPageAllocator::max_reserve() const {
+  return _max_reserve;
+}
+
+size_t ZPageAllocator::used_high() const {
+  return _used_high;
+}
+
+size_t ZPageAllocator::used_low() const {
+  return _used_low;
+}
+
+size_t ZPageAllocator::used() const {
+  return _used;
+}
+
+size_t ZPageAllocator::allocated() const {
+  return _allocated;
+}
+
+size_t ZPageAllocator::reclaimed() const {
+  return _reclaimed > 0 ? (size_t)_reclaimed : 0;
+}
+
+void ZPageAllocator::reset_statistics() {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  _allocated = 0;
+  _reclaimed = 0;
+  _used_high = _used_low = _used;
+}
+
+void ZPageAllocator::increase_used(size_t size, bool relocation) {
+  if (relocation) {
+    // Allocating a page for the purpose of relocation has a
+    // negative contribution to the number of relcaimed bytes.
+    _reclaimed -= size;
+  }
+  _allocated += size;
+  _used += size;
+  if (_used > _used_high) {
+    _used_high = _used;
+  }
+}
+
+void ZPageAllocator::decrease_used(size_t size, bool reclaimed) {
+  if (reclaimed) {
+    // Only pages explicitly released with the reclaimed flag set
+    // counts as reclaimed bytes. This flag is typically true when
+    // a worker releases a page after relocation, and is typically
+    // false when we release a page to undo an allocation.
+    _reclaimed += size;
+  }
+  _used -= size;
+  if (_used < _used_low) {
+    _used_low = _used;
+  }
+}
+
+size_t ZPageAllocator::available(ZAllocationFlags flags) const {
+  size_t available = max_capacity() - used();
+  assert(_physical.available() + _pre_mapped.available() + _cache.available()  == available, "Should be equal");
+
+  if (flags.no_reserve()) {
+    // The memory reserve should not be considered free
+    available -= MIN2(available, max_reserve());
+  }
+
+  return available;
+}
+
+ZPage* ZPageAllocator::create_page(uint8_t type, size_t size) {
+  // Allocate physical memory
+  const ZPhysicalMemory pmem = _physical.alloc(size);
+  if (pmem.is_null()) {
+    // Out of memory
+    return NULL;
+  }
+
+  // Allocate virtual memory
+  const ZVirtualMemory vmem = _virtual.alloc(size);
+  if (vmem.is_null()) {
+    // Out of address space
+    _physical.free(pmem);
+    return NULL;
+  }
+
+  // Allocate page
+  return new ZPage(type, vmem, pmem);
+}
+
+void ZPageAllocator::flush_pre_mapped() {
+  if (_pre_mapped.available() == 0) {
+    return;
+  }
+
+  // Detach the memory mapping.
+  detach_memory(_pre_mapped.virtual_memory(), _pre_mapped.physical_memory());
+
+  _pre_mapped.clear();
+}
+
+void ZPageAllocator::map_page(ZPage* page) {
+  // Map physical memory
+  _physical.map(page->physical_memory(), page->start());
+}
+
+void ZPageAllocator::detach_page(ZPage* page) {
+  // Detach the memory mapping.
+  detach_memory(page->virtual_memory(), page->physical_memory());
+
+  // Add to list of detached pages
+  _detached.insert_last(page);
+}
+
+void ZPageAllocator::destroy_page(ZPage* page) {
+  assert(page->is_detached(), "Invalid page state");
+
+  // Free virtual memory
+  {
+    ZLocker locker(&_lock);
+    _virtual.free(page->virtual_memory());
+  }
+
+  delete page;
+}
+
+void ZPageAllocator::flush_detached_pages(ZList<ZPage>* list) {
+  ZLocker locker(&_lock);
+  list->transfer(&_detached);
+}
+
+void ZPageAllocator::flush_cache(size_t size) {
+  ZList<ZPage> list;
+
+  _cache.flush(&list, size);
+
+  for (ZPage* page = list.remove_first(); page != NULL; page = list.remove_first()) {
+    detach_page(page);
+  }
+}
+
+void ZPageAllocator::check_out_of_memory_during_initialization() {
+  if (!is_init_completed()) {
+    vm_exit_during_initialization("java.lang.OutOfMemoryError", "Java heap too small");
+  }
+}
+
+ZPage* ZPageAllocator::alloc_page_common_inner(uint8_t type, size_t size, ZAllocationFlags flags) {
+  const size_t available_total = available(flags);
+  if (available_total < size) {
+    // Not enough free memory
+    return NULL;
+  }
+
+  // Try allocating from the page cache
+  ZPage* const cached_page = _cache.alloc_page(type, size);
+  if (cached_page != NULL) {
+    return cached_page;
+  }
+
+  // Try allocate from the pre-mapped memory
+  ZPage* const pre_mapped_page = _pre_mapped.alloc_page(type, size);
+  if (pre_mapped_page != NULL) {
+    return pre_mapped_page;
+  }
+
+  // Flush any remaining pre-mapped memory so that
+  // subsequent allocations can use the physical memory.
+  flush_pre_mapped();
+
+  // Check if physical memory is available
+  const size_t available_physical = _physical.available();
+  if (available_physical < size) {
+    // Flush cache to free up more physical memory
+    flush_cache(size - available_physical);
+  }
+
+  // Create new page and allocate physical memory
+  return create_page(type, size);
+}
+
+ZPage* ZPageAllocator::alloc_page_common(uint8_t type, size_t size, ZAllocationFlags flags) {
+  ZPage* const page = alloc_page_common_inner(type, size, flags);
+  if (page == NULL) {
+    // Out of memory
+    return NULL;
+  }
+
+  // Update used statistics
+  increase_used(size, flags.relocation());
+
+  // Send trace event
+  ZTracer::tracer()->report_page_alloc(size, used(), available(flags), _cache.available(), flags);
+
+  return page;
+}
+
+ZPage* ZPageAllocator::alloc_page_blocking(uint8_t type, size_t size, ZAllocationFlags flags) {
+  // Prepare to block
+  ZPageAllocRequest request(type, size, flags, ZCollectedHeap::heap()->total_collections());
+
+  _lock.lock();
+
+  // Try non-blocking allocation
+  ZPage* page = alloc_page_common(type, size, flags);
+  if (page == NULL) {
+    // Allocation failed, enqueue request
+    _queue.insert_last(&request);
+  }
+
+  _lock.unlock();
+
+  if (page == NULL) {
+    // Allocation failed
+    ZStatTimer timer(ZCriticalPhaseAllocationStall);
+
+    // We can only block if VM is fully initialized
+    check_out_of_memory_during_initialization();
+
+    do {
+      // Start asynchronous GC
+      ZCollectedHeap::heap()->collect(GCCause::_z_allocation_stall);
+
+      // Wait for allocation to complete or fail
+      page = request.wait();
+    } while (page == gc_marker);
+  }
+
+  return page;
+}
+
+ZPage* ZPageAllocator::alloc_page_nonblocking(uint8_t type, size_t size, ZAllocationFlags flags) {
+  ZLocker locker(&_lock);
+  return alloc_page_common(type, size, flags);
+}
+
+ZPage* ZPageAllocator::alloc_page(uint8_t type, size_t size, ZAllocationFlags flags) {
+  ZPage* const page = flags.non_blocking()
+                      ? alloc_page_nonblocking(type, size, flags)
+                      : alloc_page_blocking(type, size, flags);
+  if (page == NULL) {
+    // Out of memory
+    return NULL;
+  }
+
+  // Map page if needed
+  if (!page->is_mapped()) {
+    map_page(page);
+  }
+
+  // Reset page. This updates the page's sequence number and must
+  // be done after page allocation, which potentially blocked in
+  // a safepoint where the global sequence number was updated.
+  page->reset();
+
+  // Update allocation statistics. Exclude worker threads to avoid
+  // artificial inflation of the allocation rate due to relocation.
+  if (!flags.worker_thread()) {
+    // Note that there are two allocation rate counters, which have
+    // different purposes and are sampled at different frequencies.
+    const size_t bytes = page->size();
+    ZStatInc(ZCounterAllocationRate, bytes);
+    ZStatInc(ZStatAllocRate::counter(), bytes);
+  }
+
+  return page;
+}
+
+void ZPageAllocator::satisfy_alloc_queue() {
+  for (;;) {
+    ZPageAllocRequest* const request = _queue.first();
+    if (request == NULL) {
+      // Allocation queue is empty
+      return;
+    }
+
+    ZPage* const page = alloc_page_common(request->type(), request->size(), request->flags());
+    if (page == NULL) {
+      // Allocation could not be satisfied, give up
+      return;
+    }
+
+    // Allocation succeeded, dequeue and satisfy request. Note that
+    // the dequeue operation must happen first, since the request
+    // will immediately be deallocated once it has been satisfied.
+    _queue.remove(request);
+    request->satisfy(page);
+  }
+}
+
+void ZPageAllocator::detach_memory(const ZVirtualMemory& vmem, ZPhysicalMemory& pmem) {
+  const uintptr_t addr = vmem.start();
+
+  // Unmap physical memory
+  _physical.unmap(pmem, addr);
+
+  // Free physical memory
+  _physical.free(pmem);
+
+  // Clear physical mapping
+  pmem.clear();
+}
+
+void ZPageAllocator::flip_page(ZPage* page) {
+  const ZPhysicalMemory& pmem = page->physical_memory();
+  const uintptr_t addr = page->start();
+
+  // Flip physical mapping
+  _physical.flip(pmem, addr);
+}
+
+void ZPageAllocator::flip_pre_mapped() {
+  if (_pre_mapped.available() == 0) {
+    // Nothing to flip
+    return;
+  }
+
+  const ZPhysicalMemory& pmem = _pre_mapped.physical_memory();
+  const ZVirtualMemory& vmem = _pre_mapped.virtual_memory();
+
+  // Flip physical mapping
+  _physical.flip(pmem, vmem.start());
+}
+
+void ZPageAllocator::free_page(ZPage* page, bool reclaimed) {
+  ZLocker locker(&_lock);
+
+  // Update used statistics
+  decrease_used(page->size(), reclaimed);
+
+  // Cache page
+  _cache.free_page(page);
+
+  // Try satisfy blocked allocations
+  satisfy_alloc_queue();
+}
+
+void ZPageAllocator::check_out_of_memory() {
+  ZLocker locker(&_lock);
+
+  ZPageAllocRequest* const first = _queue.first();
+  if (first == NULL) {
+    // Allocation queue is empty
+    return;
+  }
+
+  // Fail the allocation request if it was enqueued before the
+  // last GC cycle started, otherwise start a new GC cycle.
+  if (first->total_collections() < ZCollectedHeap::heap()->total_collections()) {
+    // Out of memory, fail all enqueued requests
+    for (ZPageAllocRequest* request = _queue.remove_first(); request != NULL; request = _queue.remove_first()) {
+      request->satisfy(NULL);
+    }
+  } else {
+    // Start another GC cycle, keep all enqueued requests
+    first->satisfy(gc_marker);
+  }
+}
diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
new file mode 100644
index 00000000000..6bd6465f386
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGEALLOCATOR_HPP
+#define SHARE_GC_Z_ZPAGEALLOCATOR_HPP
+
+#include "gc/z/zAllocationFlags.hpp"
+#include "gc/z/zList.hpp"
+#include "gc/z/zLock.hpp"
+#include "gc/z/zPageCache.hpp"
+#include "gc/z/zPhysicalMemory.hpp"
+#include "gc/z/zPreMappedMemory.hpp"
+#include "gc/z/zVirtualMemory.hpp"
+#include "memory/allocation.hpp"
+
+class ZPageAllocRequest;
+
+class ZPageAllocator {
+  friend class VMStructs;
+
+private:
+  ZLock                    _lock;
+  ZVirtualMemoryManager    _virtual;
+  ZPhysicalMemoryManager   _physical;
+  ZPageCache               _cache;
+  ZPreMappedMemory         _pre_mapped;
+  const size_t             _max_reserve;
+  size_t                   _used_high;
+  size_t                   _used_low;
+  size_t                   _used;
+  size_t                   _allocated;
+  ssize_t                  _reclaimed;
+  ZList<ZPageAllocRequest> _queue;
+  ZList<ZPage>             _detached;
+
+  static ZPage* const      gc_marker;
+
+  void increase_used(size_t size, bool relocation);
+  void decrease_used(size_t size, bool reclaimed);
+
+  size_t available(ZAllocationFlags flags) const;
+
+  ZPage* create_page(uint8_t type, size_t size);
+  void map_page(ZPage* page);
+  void detach_page(ZPage* page);
+  void flush_pre_mapped();
+  void flush_cache(size_t size);
+
+  void check_out_of_memory_during_initialization();
+
+  ZPage* alloc_page_common_inner(uint8_t type, size_t size, ZAllocationFlags flags);
+  ZPage* alloc_page_common(uint8_t type, size_t size, ZAllocationFlags flags);
+  ZPage* alloc_page_blocking(uint8_t type, size_t size, ZAllocationFlags flags);
+  ZPage* alloc_page_nonblocking(uint8_t type, size_t size, ZAllocationFlags flags);
+
+  void satisfy_alloc_queue();
+
+  void detach_memory(const ZVirtualMemory& vmem, ZPhysicalMemory& pmem);
+
+public:
+  ZPageAllocator(size_t min_capacity, size_t max_capacity, size_t max_reserve);
+
+  bool is_initialized() const;
+
+  size_t max_capacity() const;
+  size_t capacity() const;
+  size_t max_reserve() const;
+  size_t used_high() const;
+  size_t used_low() const;
+  size_t used() const;
+  size_t allocated() const;
+  size_t reclaimed() const;
+
+  void reset_statistics();
+
+  ZPage* alloc_page(uint8_t type, size_t size, ZAllocationFlags flags);
+  void flip_page(ZPage* page);
+  void free_page(ZPage* page, bool reclaimed);
+  void destroy_page(ZPage* page);
+
+  void flush_detached_pages(ZList<ZPage>* list);
+
+  void flip_pre_mapped();
+
+  void check_out_of_memory();
+};
+
+#endif // SHARE_GC_Z_ZPAGEALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/z/zPageCache.cpp b/src/hotspot/share/gc/z/zPageCache.cpp
new file mode 100644
index 00000000000..e8cb226b67f
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageCache.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zList.inline.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPageCache.hpp"
+#include "gc/z/zStat.hpp"
+#include "logging/log.hpp"
+
+static const ZStatCounter ZCounterPageCacheHitL1("Memory", "Page Cache Hit L1", ZStatUnitOpsPerSecond);
+static const ZStatCounter ZCounterPageCacheHitL2("Memory", "Page Cache Hit L2", ZStatUnitOpsPerSecond);
+static const ZStatCounter ZCounterPageCacheMiss("Memory", "Page Cache Miss", ZStatUnitOpsPerSecond);
+static const ZStatCounter ZCounterPageCacheFlush("Memory", "Page Cache Flush", ZStatUnitBytesPerSecond);
+
+ZPageCache::ZPageCache() :
+    _available(0),
+    _small(),
+    _medium(),
+    _large() {}
+
+ZPage* ZPageCache::alloc_small_page() {
+  const uint32_t numa_id = ZNUMA::id();
+  const uint32_t numa_count = ZNUMA::count();
+
+  // Try NUMA local page cache
+  ZPage* const l1_page = _small.get(numa_id).remove_first();
+  if (l1_page != NULL) {
+    ZStatInc(ZCounterPageCacheHitL1);
+    return l1_page;
+  }
+
+  // Try NUMA remote page cache(s)
+  uint32_t remote_numa_id = numa_id + 1;
+  const uint32_t remote_numa_count = numa_count - 1;
+  for (uint32_t i = 0; i < remote_numa_count; i++) {
+    if (remote_numa_id == numa_count) {
+      remote_numa_id = 0;
+    }
+
+    ZPage* const l2_page = _small.get(remote_numa_id).remove_first();
+    if (l2_page != NULL) {
+      ZStatInc(ZCounterPageCacheHitL2);
+      return l2_page;
+    }
+
+    remote_numa_id++;
+  }
+
+  ZStatInc(ZCounterPageCacheMiss);
+  return NULL;
+}
+
+ZPage* ZPageCache::alloc_medium_page() {
+  ZPage* const l1_page = _medium.remove_first();
+  if (l1_page != NULL) {
+    ZStatInc(ZCounterPageCacheHitL1);
+    return l1_page;
+  }
+
+  ZStatInc(ZCounterPageCacheMiss);
+  return NULL;
+}
+
+ZPage* ZPageCache::alloc_large_page(size_t size) {
+  // Find a page with the right size
+  ZListIterator<ZPage> iter(&_large);
+  for (ZPage* l1_page; iter.next(&l1_page);) {
+    if (l1_page->size() == size) {
+      // Page found
+      _large.remove(l1_page);
+      ZStatInc(ZCounterPageCacheHitL1);
+      return l1_page;
+    }
+  }
+
+  ZStatInc(ZCounterPageCacheMiss);
+  return NULL;
+}
+
+ZPage* ZPageCache::alloc_page(uint8_t type, size_t size) {
+  ZPage* page;
+
+  if (type == ZPageTypeSmall) {
+    page = alloc_small_page();
+  } else if (type == ZPageTypeMedium) {
+    page = alloc_medium_page();
+  } else {
+    page = alloc_large_page(size);
+  }
+
+  if (page != NULL) {
+    _available -= page->size();
+  }
+
+  return page;
+}
+
+void ZPageCache::free_page(ZPage* page) {
+  assert(!page->is_active(), "Invalid page state");
+  assert(!page->is_pinned(), "Invalid page state");
+  assert(!page->is_detached(), "Invalid page state");
+
+  const uint8_t type = page->type();
+  if (type == ZPageTypeSmall) {
+    _small.get(page->numa_id()).insert_first(page);
+  } else if (type == ZPageTypeMedium) {
+    _medium.insert_first(page);
+  } else {
+    _large.insert_first(page);
+  }
+
+  _available += page->size();
+}
+
+void ZPageCache::flush_list(ZList<ZPage>* from, size_t requested, ZList<ZPage>* to, size_t* flushed) {
+  while (*flushed < requested) {
+    // Flush least recently used
+    ZPage* const page = from->remove_last();
+    if (page == NULL) {
+      break;
+    }
+
+    *flushed += page->size();
+    to->insert_last(page);
+  }
+}
+
+void ZPageCache::flush_per_numa_lists(ZPerNUMA<ZList<ZPage> >* from, size_t requested, ZList<ZPage>* to, size_t* flushed) {
+  const uint32_t numa_count = ZNUMA::count();
+  uint32_t numa_empty = 0;
+  uint32_t numa_next = 0;
+
+  // Flush lists round-robin
+  while (*flushed < requested) {
+    ZPage* const page = from->get(numa_next).remove_last();
+
+    if (++numa_next == numa_count) {
+      numa_next = 0;
+    }
+
+    if (page == NULL) {
+      // List is empty
+      if (++numa_empty == numa_count) {
+        // All lists are empty
+        break;
+      }
+
+      // Try next list
+      continue;
+    }
+
+    // Flush page
+    numa_empty = 0;
+    *flushed += page->size();
+    to->insert_last(page);
+  }
+}
+
+void ZPageCache::flush(ZList<ZPage>* to, size_t requested) {
+  size_t flushed = 0;
+
+  // Prefer flushing large, then medium and last small pages
+  flush_list(&_large, requested, to, &flushed);
+  flush_list(&_medium, requested, to, &flushed);
+  flush_per_numa_lists(&_small, requested, to, &flushed);
+
+  ZStatInc(ZCounterPageCacheFlush, flushed);
+
+  log_info(gc, heap)("Page Cache Flushed: "
+                     SIZE_FORMAT "M requested, "
+                     SIZE_FORMAT "M(" SIZE_FORMAT "M->" SIZE_FORMAT "M) flushed",
+                     requested / M, flushed / M , _available / M, (_available - flushed) / M);
+
+  _available -= flushed;
+}
diff --git a/src/hotspot/share/gc/z/zPageCache.hpp b/src/hotspot/share/gc/z/zPageCache.hpp
new file mode 100644
index 00000000000..1237a203849
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageCache.hpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGECACHE_HPP
+#define SHARE_GC_Z_ZPAGECACHE_HPP
+
+#include "gc/z/zList.hpp"
+#include "gc/z/zPage.hpp"
+#include "gc/z/zValue.hpp"
+#include "memory/allocation.hpp"
+
+class ZPageCache {
+private:
+  size_t                  _available;
+
+  ZPerNUMA<ZList<ZPage> > _small;
+  ZList<ZPage>            _medium;
+  ZList<ZPage>            _large;
+
+  ZPage* alloc_small_page();
+  ZPage* alloc_medium_page();
+  ZPage* alloc_large_page(size_t size);
+
+  void flush_list(ZList<ZPage>* from, size_t requested, ZList<ZPage>* to, size_t* flushed);
+  void flush_per_numa_lists(ZPerNUMA<ZList<ZPage> >* from, size_t requested, ZList<ZPage>* to, size_t* flushed);
+
+public:
+  ZPageCache();
+
+  size_t available() const;
+
+  ZPage* alloc_page(uint8_t type, size_t size);
+  void free_page(ZPage* page);
+
+  void flush(ZList<ZPage>* to, size_t requested);
+};
+
+#endif // SHARE_GC_Z_ZPAGECACHE_HPP
diff --git a/src/hotspot/share/gc/z/zPageCache.inline.hpp b/src/hotspot/share/gc/z/zPageCache.inline.hpp
new file mode 100644
index 00000000000..acd52c93222
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageCache.inline.hpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGECACHE_INLINE_HPP
+#define SHARE_GC_Z_ZPAGECACHE_INLINE_HPP
+
+#include "gc/z/zPageCache.hpp"
+
+inline size_t ZPageCache::available() const {
+  return _available;
+}
+
+#endif // SHARE_GC_Z_ZPAGECACHE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zPageTable.cpp b/src/hotspot/share/gc/z/zPageTable.cpp
new file mode 100644
index 00000000000..88d03e22abe
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageTable.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPageTable.inline.hpp"
+#include "runtime/orderAccess.hpp"
+#include "utilities/debug.hpp"
+
+ZPageTable::ZPageTable() :
+    _map() {}
+
+ZPageTableEntry ZPageTable::get_entry(ZPage* page) const {
+  const uintptr_t addr = ZAddress::good(page->start());
+  return _map.get(addr);
+}
+
+void ZPageTable::put_entry(ZPage* page, ZPageTableEntry entry) {
+  // Make sure a newly created page is globally visible before
+  // updating the pagetable.
+  OrderAccess::storestore();
+
+  const uintptr_t start = ZAddress::good(page->start());
+  const uintptr_t end = start + page->size();
+  for (uintptr_t addr = start; addr < end; addr += ZPageSizeMin) {
+    _map.put(addr, entry);
+  }
+}
+
+void ZPageTable::insert(ZPage* page) {
+  assert(get_entry(page).page() == NULL ||
+         get_entry(page).page() == page, "Invalid entry");
+
+  // Cached pages stays in the pagetable and we must not re-insert
+  // those when they get re-allocated because they might also be
+  // relocating and we don't want to clear their relocating bit.
+  if (get_entry(page).page() == NULL) {
+    ZPageTableEntry entry(page, false /* relocating */);
+    put_entry(page, entry);
+  }
+
+  assert(get_entry(page).page() == page, "Invalid entry");
+}
+
+void ZPageTable::remove(ZPage* page) {
+  assert(get_entry(page).page() == page, "Invalid entry");
+
+  ZPageTableEntry entry;
+  put_entry(page, entry);
+
+  assert(get_entry(page).page() == NULL, "Invalid entry");
+}
+
+void ZPageTable::set_relocating(ZPage* page) {
+  assert(get_entry(page).page() == page, "Invalid entry");
+  assert(!get_entry(page).relocating(), "Invalid entry");
+
+  ZPageTableEntry entry(page, true /* relocating */);
+  put_entry(page, entry);
+
+  assert(get_entry(page).page() == page, "Invalid entry");
+  assert(get_entry(page).relocating(), "Invalid entry");
+}
+
+void ZPageTable::clear_relocating(ZPage* page) {
+  assert(get_entry(page).page() == page, "Invalid entry");
+  assert(get_entry(page).relocating(), "Invalid entry");
+
+  ZPageTableEntry entry(page, false /* relocating */);
+  put_entry(page, entry);
+
+  assert(get_entry(page).page() == page, "Invalid entry");
+  assert(!get_entry(page).relocating(), "Invalid entry");
+}
diff --git a/src/hotspot/share/gc/z/zPageTable.hpp b/src/hotspot/share/gc/z/zPageTable.hpp
new file mode 100644
index 00000000000..c2de4e6f567
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageTable.hpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGETABLE_HPP
+#define SHARE_GC_Z_ZPAGETABLE_HPP
+
+#include "gc/z/zAddressRangeMap.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zPageTableEntry.hpp"
+#include "memory/allocation.hpp"
+
+class ZPage;
+
+class ZPageTable {
+  friend class VMStructs;
+  friend class ZPageTableIterator;
+
+private:
+  ZAddressRangeMap<ZPageTableEntry, ZPageSizeMinShift> _map;
+
+  ZPageTableEntry get_entry(ZPage* page) const;
+  void put_entry(ZPage* page, ZPageTableEntry entry);
+
+public:
+  ZPageTable();
+
+  ZPage* get(uintptr_t addr) const;
+  void insert(ZPage* page);
+  void remove(ZPage* page);
+
+  bool is_relocating(uintptr_t addr) const;
+  void set_relocating(ZPage* page);
+  void clear_relocating(ZPage* page);
+};
+
+class ZPageTableIterator : public StackObj {
+private:
+  ZAddressRangeMapIterator<ZPageTableEntry, ZPageSizeMinShift> _iter;
+  ZPage*                                                       _prev;
+
+public:
+  ZPageTableIterator(const ZPageTable* pagetable);
+
+  bool next(ZPage** page);
+};
+
+#endif // SHARE_GC_Z_ZPAGETABLE_HPP
diff --git a/src/hotspot/share/gc/z/zPageTable.inline.hpp b/src/hotspot/share/gc/z/zPageTable.inline.hpp
new file mode 100644
index 00000000000..59deb8834c4
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGETABLE_INLINE_HPP
+#define SHARE_GC_Z_ZPAGETABLE_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zAddressRangeMap.inline.hpp"
+#include "gc/z/zPageTable.hpp"
+
+inline ZPage* ZPageTable::get(uintptr_t addr) const {
+  return _map.get(addr).page();
+}
+
+inline bool ZPageTable::is_relocating(uintptr_t addr) const {
+  return _map.get(addr).relocating();
+}
+
+inline ZPageTableIterator::ZPageTableIterator(const ZPageTable* pagetable) :
+    _iter(&pagetable->_map),
+    _prev(NULL) {}
+
+inline bool ZPageTableIterator::next(ZPage** page) {
+  ZPageTableEntry entry;
+
+  while (_iter.next(&entry)) {
+    ZPage* const next = entry.page();
+    if (next != NULL && next != _prev) {
+      // Next page found
+      *page = _prev = next;
+      return true;
+    }
+  }
+
+  // No more pages
+  return false;
+}
+
+#endif // SHARE_GC_Z_ZPAGETABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zPageTableEntry.hpp b/src/hotspot/share/gc/z/zPageTableEntry.hpp
new file mode 100644
index 00000000000..9f2d9e83aae
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPageTableEntry.hpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPAGETABLEENTRY_HPP
+#define SHARE_GC_Z_ZPAGETABLEENTRY_HPP
+
+#include "gc/z/zBitField.hpp"
+#include "memory/allocation.hpp"
+
+//
+// Page table entry layout
+// -----------------------
+//
+//   6
+//   3                                                                    1 0
+//  +----------------------------------------------------------------------+-+
+//  |11111111 11111111 11111111 11111111 11111111 11111111 11111111 1111111|1|
+//  +----------------------------------------------------------------------+-+
+//  |                                                                      |
+//  |                                          0-0 Relocating Flag (1-bit) *
+//  |
+//  |
+//  |
+//  * 63-1 Page address (63-bits)
+//
+
+class ZPage;
+
+class ZPageTableEntry {
+private:
+  typedef ZBitField<uint64_t, bool,   0, 1>     field_relocating;
+  typedef ZBitField<uint64_t, ZPage*, 1, 63, 1> field_page;
+
+  uint64_t _entry;
+
+public:
+  ZPageTableEntry() :
+      _entry(0) {}
+
+  ZPageTableEntry(ZPage* page, bool relocating) :
+      _entry(field_page::encode(page) |
+             field_relocating::encode(relocating)) {}
+
+  bool relocating() const {
+    return field_relocating::decode(_entry);
+  }
+
+  ZPage* page() const {
+    return field_page::decode(_entry);
+  }
+};
+
+#endif // SHARE_GC_Z_ZPAGETABLEENTRY_HPP
diff --git a/src/hotspot/share/gc/z/zPhysicalMemory.cpp b/src/hotspot/share/gc/z/zPhysicalMemory.cpp
new file mode 100644
index 00000000000..f64733bfde5
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.cpp
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zPhysicalMemory.inline.hpp"
+#include "logging/log.hpp"
+#include "memory/allocation.inline.hpp"
+#include "services/memTracker.hpp"
+#include "utilities/debug.hpp"
+
+ZPhysicalMemory::ZPhysicalMemory() :
+    _nsegments(0),
+    _segments(NULL) {}
+
+ZPhysicalMemory::ZPhysicalMemory(size_t size) :
+    _nsegments(0),
+    _segments(NULL) {
+  add_segment(ZPhysicalMemorySegment(0, size));
+}
+
+ZPhysicalMemory::ZPhysicalMemory(const ZPhysicalMemorySegment& segment) :
+    _nsegments(0),
+    _segments(NULL) {
+  add_segment(segment);
+}
+
+size_t ZPhysicalMemory::size() const {
+  size_t size = 0;
+
+  for (size_t i = 0; i < _nsegments; i++) {
+    size += _segments[i].size();
+  }
+
+  return size;
+}
+
+void ZPhysicalMemory::add_segment(ZPhysicalMemorySegment segment) {
+  // Try merge with last segment
+  if (_nsegments > 0) {
+    ZPhysicalMemorySegment& last = _segments[_nsegments - 1];
+    assert(last.end() <= segment.start(), "Segments added out of order");
+    if (last.end() == segment.start()) {
+      // Merge
+      last.expand(segment.size());
+      return;
+    }
+  }
+
+  // Make room for a new segment
+  const size_t size = sizeof(ZPhysicalMemorySegment) * (_nsegments + 1);
+  _segments = (ZPhysicalMemorySegment*)ReallocateHeap((char*)_segments, size, mtGC);
+
+  // Add new segment
+  _segments[_nsegments] = segment;
+  _nsegments++;
+}
+
+ZPhysicalMemory ZPhysicalMemory::split(size_t split_size) {
+  // Only splitting of single-segment instances have been implemented.
+  assert(nsegments() == 1, "Can only have one segment");
+  assert(split_size <= size(), "Invalid size");
+  return ZPhysicalMemory(_segments[0].split(split_size));
+}
+
+void ZPhysicalMemory::clear() {
+  if (_segments != NULL) {
+    FreeHeap(_segments);
+    _segments = NULL;
+    _nsegments = 0;
+  }
+}
+
+ZPhysicalMemoryManager::ZPhysicalMemoryManager(size_t max_capacity, size_t granule_size) :
+    _backing(max_capacity, granule_size),
+    _max_capacity(max_capacity),
+    _capacity(0),
+    _used(0) {}
+
+bool ZPhysicalMemoryManager::is_initialized() const {
+  return _backing.is_initialized();
+}
+
+bool ZPhysicalMemoryManager::ensure_available(size_t size) {
+  const size_t unused_capacity = _capacity - _used;
+  if (unused_capacity >= size) {
+    // Enough unused capacity available
+    return true;
+  }
+
+  const size_t expand_with = size - unused_capacity;
+  const size_t new_capacity = _capacity + expand_with;
+  if (new_capacity > _max_capacity) {
+    // Can not expand beyond max capacity
+    return false;
+  }
+
+  // Expand
+  if (!_backing.expand(_capacity, new_capacity)) {
+    log_error(gc)("Failed to expand Java heap with " SIZE_FORMAT "%s",
+                  byte_size_in_proper_unit(expand_with),
+                  proper_unit_for_byte_size(expand_with));
+    return false;
+  }
+
+  _capacity = new_capacity;
+
+  return true;
+}
+
+void ZPhysicalMemoryManager::nmt_commit(ZPhysicalMemory pmem, uintptr_t offset) {
+  const uintptr_t addr = _backing.nmt_address(offset);
+  const size_t size = pmem.size();
+  MemTracker::record_virtual_memory_commit((void*)addr, size, CALLER_PC);
+}
+
+void ZPhysicalMemoryManager::nmt_uncommit(ZPhysicalMemory pmem, uintptr_t offset) {
+  if (MemTracker::tracking_level() > NMT_minimal) {
+    const uintptr_t addr = _backing.nmt_address(offset);
+    const size_t size = pmem.size();
+
+    Tracker tracker(Tracker::uncommit);
+    tracker.record((address)addr, size);
+  }
+}
+
+ZPhysicalMemory ZPhysicalMemoryManager::alloc(size_t size) {
+  if (!ensure_available(size)) {
+    // Not enough memory available
+    return ZPhysicalMemory();
+  }
+
+  _used += size;
+  return _backing.alloc(size);
+}
+
+void ZPhysicalMemoryManager::free(ZPhysicalMemory pmem) {
+  _backing.free(pmem);
+  _used -= pmem.size();
+}
+
+void ZPhysicalMemoryManager::map(ZPhysicalMemory pmem, uintptr_t offset) {
+  // Map page
+  _backing.map(pmem, offset);
+
+  // Update native memory tracker
+  nmt_commit(pmem, offset);
+}
+
+void ZPhysicalMemoryManager::unmap(ZPhysicalMemory pmem, uintptr_t offset) {
+  // Update native memory tracker
+  nmt_uncommit(pmem, offset);
+
+  // Unmap page
+  _backing.unmap(pmem, offset);
+}
+
+void ZPhysicalMemoryManager::flip(ZPhysicalMemory pmem, uintptr_t offset) {
+  _backing.flip(pmem, offset);
+}
diff --git a/src/hotspot/share/gc/z/zPhysicalMemory.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.hpp
new file mode 100644
index 00000000000..c278f2c9289
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.hpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPHYSICALMEMORY_HPP
+#define SHARE_GC_Z_ZPHYSICALMEMORY_HPP
+
+#include "memory/allocation.hpp"
+#include OS_CPU_HEADER(gc/z/zPhysicalMemoryBacking)
+
+class ZPhysicalMemorySegment {
+private:
+  uintptr_t _start;
+  uintptr_t _end;
+
+public:
+  ZPhysicalMemorySegment(uintptr_t start, size_t size);
+
+  uintptr_t start() const;
+  uintptr_t end() const;
+  size_t size() const;
+
+  void expand(size_t size);
+  ZPhysicalMemorySegment split(size_t size);
+};
+
+class ZPhysicalMemory {
+private:
+  size_t                  _nsegments;
+  ZPhysicalMemorySegment* _segments;
+
+public:
+  ZPhysicalMemory();
+  ZPhysicalMemory(size_t size);
+  ZPhysicalMemory(const ZPhysicalMemorySegment& segment);
+
+  bool is_null() const;
+  size_t size() const;
+
+  size_t nsegments() const;
+  ZPhysicalMemorySegment segment(size_t index) const;
+  void add_segment(ZPhysicalMemorySegment segment);
+
+  ZPhysicalMemory split(size_t size);
+  void clear();
+};
+
+class ZPhysicalMemoryManager {
+  friend class VMStructs;
+
+private:
+  ZPhysicalMemoryBacking _backing;
+  const size_t           _max_capacity;
+  size_t                 _capacity;
+  size_t                 _used;
+
+  bool ensure_available(size_t size);
+
+  void nmt_commit(ZPhysicalMemory pmem, uintptr_t offset);
+  void nmt_uncommit(ZPhysicalMemory pmem, uintptr_t offset);
+
+public:
+  ZPhysicalMemoryManager(size_t max_capacity, size_t granule_size);
+
+  bool is_initialized() const;
+
+  size_t max_capacity() const;
+  size_t capacity() const;
+  size_t used() const;
+  size_t available() const;
+
+  ZPhysicalMemory alloc(size_t size);
+  void free(ZPhysicalMemory pmem);
+
+  void map(ZPhysicalMemory pmem, uintptr_t offset);
+  void unmap(ZPhysicalMemory pmem, uintptr_t offset);
+  void flip(ZPhysicalMemory pmem, uintptr_t offset);
+};
+
+#endif // SHARE_GC_Z_ZPHYSICALMEMORY_HPP
diff --git a/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp
new file mode 100644
index 00000000000..98a6f3c31fc
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP
+#define SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP
+
+#include "gc/z/zPhysicalMemory.hpp"
+#include "utilities/debug.hpp"
+
+inline ZPhysicalMemorySegment::ZPhysicalMemorySegment(uintptr_t start, size_t size) :
+    _start(start),
+    _end(start + size) {}
+
+inline uintptr_t ZPhysicalMemorySegment::start() const {
+  return _start;
+}
+
+inline uintptr_t ZPhysicalMemorySegment::end() const {
+  return _end;
+}
+
+inline size_t ZPhysicalMemorySegment::size() const {
+  return end() - start();
+}
+
+inline void ZPhysicalMemorySegment::expand(size_t size) {
+  _end += size;
+}
+
+inline ZPhysicalMemorySegment ZPhysicalMemorySegment::split(size_t split_size) {
+  assert(split_size <= size(), "Invalid size");
+  ZPhysicalMemorySegment segment(_start, split_size);
+  _start += split_size;
+  return segment;
+}
+
+inline bool ZPhysicalMemory::is_null() const {
+  return _nsegments == 0;
+}
+
+inline size_t ZPhysicalMemory::nsegments() const {
+  return _nsegments;
+}
+
+inline ZPhysicalMemorySegment ZPhysicalMemory::segment(size_t index) const {
+  assert(index < _nsegments, "Invalid segment index");
+  return _segments[index];
+}
+
+inline size_t ZPhysicalMemoryManager::max_capacity() const {
+  return _max_capacity;
+}
+
+inline size_t ZPhysicalMemoryManager::capacity() const {
+  return _capacity;
+}
+
+inline size_t ZPhysicalMemoryManager::used() const {
+  return _used;
+}
+
+inline size_t ZPhysicalMemoryManager::available() const {
+  return _max_capacity - _used;
+}
+
+#endif // SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zPreMappedMemory.cpp b/src/hotspot/share/gc/z/zPreMappedMemory.cpp
new file mode 100644
index 00000000000..8c4921c1290
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPreMappedMemory.cpp
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zPhysicalMemory.inline.hpp"
+#include "gc/z/zPreMappedMemory.inline.hpp"
+#include "gc/z/zVirtualMemory.inline.hpp"
+#include "logging/log.hpp"
+
+ZPreMappedMemory::ZPreMappedMemory(ZVirtualMemoryManager &vmm, ZPhysicalMemoryManager &pmm, size_t size) :
+    _vmem(),
+    _pmem(),
+    _initialized(false) {
+  if (!vmm.is_initialized() || !pmm.is_initialized()) {
+    // Not initialized
+    return;
+  }
+
+  // Pre-mapping and pre-touching memory can take a long time. Log a message
+  // to help the user understand why the JVM might seem slow to start.
+  log_info(gc, init)("Pre-touching: %s", AlwaysPreTouch ? "Enabled" : "Disabled");
+  log_info(gc, init)("Pre-mapping: " SIZE_FORMAT "M", size / M);
+
+  _pmem = pmm.alloc(size);
+  if (_pmem.is_null()) {
+    // Out of memory
+    return;
+  }
+
+  _vmem = vmm.alloc(size, true /* alloc_from_front */);
+  if (_vmem.is_null()) {
+    // Out of address space
+    pmm.free(_pmem);
+    return;
+  }
+
+  // Map physical memory
+  pmm.map(_pmem, _vmem.start());
+
+  _initialized = true;
+}
+
+ZPage* ZPreMappedMemory::alloc_page(uint8_t type, size_t size) {
+  if (size > available()) {
+    // Not enough pre-mapped memory
+    return NULL;
+  }
+
+  // Take a chunk of the pre-mapped memory
+  const ZPhysicalMemory pmem = _pmem.split(size);
+  const ZVirtualMemory  vmem = _vmem.split(size);
+
+  ZPage* const page = new ZPage(type, vmem, pmem);
+  page->set_pre_mapped();
+
+  return page;
+}
+
+void ZPreMappedMemory::clear() {
+  assert(_pmem.is_null(), "Should be detached");
+  _vmem.clear();
+}
diff --git a/src/hotspot/share/gc/z/zPreMappedMemory.hpp b/src/hotspot/share/gc/z/zPreMappedMemory.hpp
new file mode 100644
index 00000000000..d862a22e545
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPreMappedMemory.hpp
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPREMAPPEDMEMORY_HPP
+#define SHARE_GC_Z_ZPREMAPPEDMEMORY_HPP
+
+#include "gc/z/zPhysicalMemory.hpp"
+#include "gc/z/zVirtualMemory.hpp"
+#include "memory/allocation.hpp"
+
+class ZPage;
+
+class ZPreMappedMemory {
+private:
+  ZVirtualMemory  _vmem;
+  ZPhysicalMemory _pmem;
+  bool            _initialized;
+
+public:
+  ZPreMappedMemory(ZVirtualMemoryManager &vmm, ZPhysicalMemoryManager &pmm, size_t size);
+
+  bool is_initialized() const;
+
+  ZPhysicalMemory& physical_memory();
+  const ZVirtualMemory& virtual_memory() const;
+
+  size_t available() const;
+
+  ZPage* alloc_page(uint8_t type, size_t size);
+
+  void clear();
+};
+
+#endif // SHARE_GC_Z_ZPREMAPPEDMEMORY_HPP
diff --git a/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp b/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp
new file mode 100644
index 00000000000..3f76f089ba4
--- /dev/null
+++ b/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZPREMAPPEDMEMORY_INLINE_HPP
+#define SHARE_GC_Z_ZPREMAPPEDMEMORY_INLINE_HPP
+
+#include "gc/z/zPreMappedMemory.hpp"
+
+inline bool ZPreMappedMemory::is_initialized() const {
+  return _initialized;
+}
+
+inline ZPhysicalMemory& ZPreMappedMemory::physical_memory() {
+  return _pmem;
+}
+
+inline const ZVirtualMemory& ZPreMappedMemory::virtual_memory() const {
+  return _vmem;
+}
+
+inline size_t ZPreMappedMemory::available() const {
+  return _vmem.size();
+}
+
+#endif // SHARE_GC_Z_ZPREMAPPEDMEMORY_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zReferenceProcessor.cpp b/src/hotspot/share/gc/z/zReferenceProcessor.cpp
new file mode 100644
index 00000000000..1b50652e5dc
--- /dev/null
+++ b/src/hotspot/share/gc/z/zReferenceProcessor.cpp
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "classfile/javaClasses.inline.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/referenceProcessorStats.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zReferenceProcessor.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zTracer.inline.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "memory/universe.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/os.hpp"
+
+static const ZStatSubPhase ZSubPhaseConcurrentReferencesProcess("Concurrent References Process");
+static const ZStatSubPhase ZSubPhaseConcurrentReferencesEnqueue("Concurrent References Enqueue");
+
+ZReferenceProcessor::ZReferenceProcessor(ZWorkers* workers) :
+    _workers(workers),
+    _soft_reference_policy(NULL),
+    _encountered_count(),
+    _discovered_count(),
+    _enqueued_count(),
+    _discovered_list(NULL),
+    _pending_list(NULL),
+    _pending_list_tail(_pending_list.addr()) {}
+
+void ZReferenceProcessor::set_soft_reference_policy(bool clear) {
+  static AlwaysClearPolicy always_clear_policy;
+  static LRUMaxHeapPolicy lru_max_heap_policy;
+
+  if (clear) {
+    log_info(gc, ref)("Clearing All Soft References");
+    _soft_reference_policy = &always_clear_policy;
+  } else {
+    _soft_reference_policy = &lru_max_heap_policy;
+  }
+
+  _soft_reference_policy->setup();
+}
+
+void ZReferenceProcessor::update_soft_reference_clock() const {
+  const jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
+  java_lang_ref_SoftReference::set_clock(now);
+}
+
+bool ZReferenceProcessor::is_reference_inactive(oop obj) const {
+  // A non-null next field means the reference is inactive
+  return java_lang_ref_Reference::next(obj) != NULL;
+}
+
+ReferenceType ZReferenceProcessor::reference_type(oop obj) const {
+  return InstanceKlass::cast(obj->klass())->reference_type();
+}
+
+const char* ZReferenceProcessor::reference_type_name(ReferenceType type) const {
+  switch (type) {
+  case REF_SOFT:
+    return "Soft";
+
+  case REF_WEAK:
+    return "Weak";
+
+  case REF_FINAL:
+    return "Final";
+
+  case REF_PHANTOM:
+    return "Phantom";
+
+  default:
+    ShouldNotReachHere();
+    return NULL;
+  }
+}
+
+volatile oop* ZReferenceProcessor::reference_referent_addr(oop obj) const {
+  return (volatile oop*)java_lang_ref_Reference::referent_addr_raw(obj);
+}
+
+oop ZReferenceProcessor::reference_referent(oop obj) const {
+  return *reference_referent_addr(obj);
+}
+
+bool ZReferenceProcessor::is_referent_alive_or_null(oop obj, ReferenceType type) const {
+  volatile oop* const p = reference_referent_addr(obj);
+
+  // Check if the referent is alive or null, in which case we don't want to discover
+  // the reference. It can only be null if the application called Reference.enqueue()
+  // or Reference.clear().
+  if (type == REF_PHANTOM) {
+    const oop o = ZBarrier::weak_load_barrier_on_phantom_oop_field(p);
+    return o == NULL || ZHeap::heap()->is_object_live(ZOop::to_address(o));
+  } else {
+    const oop o = ZBarrier::weak_load_barrier_on_weak_oop_field(p);
+    return o == NULL || ZHeap::heap()->is_object_strongly_live(ZOop::to_address(o));
+  }
+}
+
+bool ZReferenceProcessor::is_referent_softly_alive(oop obj, ReferenceType type) const {
+  if (type != REF_SOFT) {
+    // Not a soft reference
+    return false;
+  }
+
+  // Ask soft reference policy
+  const jlong clock = java_lang_ref_SoftReference::clock();
+  assert(clock != 0, "Clock not initialized");
+  assert(_soft_reference_policy != NULL, "Policy not initialized");
+  return !_soft_reference_policy->should_clear_reference(obj, clock);
+}
+
+bool ZReferenceProcessor::should_drop_reference(oop obj, ReferenceType type) const {
+  // This check is racing with a call to Reference.clear() from the application.
+  // If the application clears the reference after this check it will still end
+  // up on the pending list, and there's nothing we can do about that without
+  // changing the Reference.clear() API. This check is also racing with a call
+  // to Reference.enqueue() from the application, which is unproblematic, since
+  // the application wants the reference to be enqueued anyway.
+  const oop o = reference_referent(obj);
+  if (o == NULL) {
+    // Reference has been cleared, by a call to Reference.enqueue()
+    // or Reference.clear() from the application, which means we
+    // should drop the reference.
+    return true;
+  }
+
+  // Check if the referent is still alive, in which case we should
+  // drop the reference.
+  if (type == REF_PHANTOM) {
+    return ZBarrier::is_alive_barrier_on_phantom_oop(o);
+  } else {
+    return ZBarrier::is_alive_barrier_on_weak_oop(o);
+  }
+}
+
+bool ZReferenceProcessor::should_mark_referent(ReferenceType type) const {
+  // Referents of final references (and its reachable sub graph) are
+  // always marked finalizable during discovery. This avoids the problem
+  // of later having to mark those objects if the referent is still final
+  // reachable during processing.
+  return type == REF_FINAL;
+}
+
+bool ZReferenceProcessor::should_clear_referent(ReferenceType type) const {
+  // Referents that were not marked must be cleared
+  return !should_mark_referent(type);
+}
+
+void ZReferenceProcessor::keep_referent_alive(oop obj, ReferenceType type) const {
+  volatile oop* const p = reference_referent_addr(obj);
+  if (type == REF_PHANTOM) {
+    ZBarrier::keep_alive_barrier_on_phantom_oop_field(p);
+  } else {
+    ZBarrier::keep_alive_barrier_on_weak_oop_field(p);
+  }
+}
+
+bool ZReferenceProcessor::discover_reference(oop obj, ReferenceType type) {
+  if (!RegisterReferences) {
+    // Reference processing disabled
+    return false;
+  }
+
+  log_trace(gc, ref)("Encountered Reference: " PTR_FORMAT " (%s)", p2i(obj), reference_type_name(type));
+
+  // Update statistics
+  _encountered_count.get()[type]++;
+
+  if (is_reference_inactive(obj) ||
+      is_referent_alive_or_null(obj, type) ||
+      is_referent_softly_alive(obj, type)) {
+    // Not discovered
+    return false;
+  }
+
+  discover(obj, type);
+
+  // Discovered
+  return true;
+}
+
+void ZReferenceProcessor::discover(oop obj, ReferenceType type) {
+  log_trace(gc, ref)("Discovered Reference: " PTR_FORMAT " (%s)", p2i(obj), reference_type_name(type));
+
+  // Update statistics
+  _discovered_count.get()[type]++;
+
+  // Mark referent finalizable
+  if (should_mark_referent(type)) {
+    oop* const referent_addr = (oop*)java_lang_ref_Reference::referent_addr_raw(obj);
+    ZBarrier::mark_barrier_on_oop_field(referent_addr, true /* finalizable */);
+  }
+
+  // Add reference to discovered list
+  assert(java_lang_ref_Reference::discovered(obj) == NULL, "Already discovered");
+  oop* const list = _discovered_list.addr();
+  java_lang_ref_Reference::set_discovered(obj, *list);
+  *list = obj;
+}
+
+oop ZReferenceProcessor::drop(oop obj, ReferenceType type) {
+  log_trace(gc, ref)("Dropped Reference: " PTR_FORMAT " (%s)", p2i(obj), reference_type_name(type));
+
+  // Keep referent alive
+  keep_referent_alive(obj, type);
+
+  // Unlink and return next in list
+  const oop next = java_lang_ref_Reference::discovered(obj);
+  java_lang_ref_Reference::set_discovered(obj, NULL);
+  return next;
+}
+
+oop* ZReferenceProcessor::keep(oop obj, ReferenceType type) {
+  log_trace(gc, ref)("Enqueued Reference: " PTR_FORMAT " (%s)", p2i(obj), reference_type_name(type));
+
+  // Update statistics
+  _enqueued_count.get()[type]++;
+
+  // Clear referent
+  if (should_clear_referent(type)) {
+    java_lang_ref_Reference::set_referent(obj, NULL);
+  }
+
+  // Make reference inactive by self-looping the next field. We could be racing with a
+  // call to Reference.enqueue() from the application, which is why we are using a CAS
+  // to make sure we change the next field only if it is NULL. A failing CAS means the
+  // reference has already been enqueued. However, we don't check the result of the CAS,
+  // since we still have no option other than keeping the reference on the pending list.
+  // It's ok to have the reference both on the pending list and enqueued at the same
+  // time (the pending list is linked through the discovered field, while the reference
+  // queue is linked through the next field). When the ReferenceHandler thread later
+  // calls Reference.enqueue() we detect that it has already been enqueued and drop it.
+  oop* const next_addr = (oop*)java_lang_ref_Reference::next_addr_raw(obj);
+  Atomic::cmpxchg(obj, next_addr, oop(NULL));
+
+  // Return next in list
+  return (oop*)java_lang_ref_Reference::discovered_addr_raw(obj);
+}
+
+void ZReferenceProcessor::work() {
+  // Process discovered references
+  oop* const list = _discovered_list.addr();
+  oop* p = list;
+
+  while (*p != NULL) {
+    const oop obj = *p;
+    const ReferenceType type = reference_type(obj);
+
+    if (should_drop_reference(obj, type)) {
+      *p = drop(obj, type);
+    } else {
+      p = keep(obj, type);
+    }
+  }
+
+  // Prepend discovered references to internal pending list
+  if (*list != NULL) {
+    *p = Atomic::xchg(*list, _pending_list.addr());
+    if (*p == NULL) {
+      // First to prepend to list, record tail
+      _pending_list_tail = p;
+    }
+
+    // Clear discovered list
+    *list = NULL;
+  }
+}
+
+bool ZReferenceProcessor::is_empty() const {
+  ZPerWorkerConstIterator<oop> iter(&_discovered_list);
+  for (const oop* list; iter.next(&list);) {
+    if (*list != NULL) {
+      return false;
+    }
+  }
+
+  if (_pending_list.get() != NULL) {
+    return false;
+  }
+
+  return true;
+}
+
+void ZReferenceProcessor::reset_statistics() {
+  assert(is_empty(), "Should be empty");
+
+  // Reset encountered
+  ZPerWorkerIterator<Counters> iter_encountered(&_encountered_count);
+  for (Counters* counters; iter_encountered.next(&counters);) {
+    for (int i = REF_SOFT; i <= REF_PHANTOM; i++) {
+      (*counters)[i] = 0;
+    }
+  }
+
+  // Reset discovered
+  ZPerWorkerIterator<Counters> iter_discovered(&_discovered_count);
+  for (Counters* counters; iter_discovered.next(&counters);) {
+    for (int i = REF_SOFT; i <= REF_PHANTOM; i++) {
+      (*counters)[i] = 0;
+    }
+  }
+
+  // Reset enqueued
+  ZPerWorkerIterator<Counters> iter_enqueued(&_enqueued_count);
+  for (Counters* counters; iter_enqueued.next(&counters);) {
+    for (int i = REF_SOFT; i <= REF_PHANTOM; i++) {
+      (*counters)[i] = 0;
+    }
+  }
+}
+
+void ZReferenceProcessor::collect_statistics() {
+  Counters encountered = {};
+  Counters discovered = {};
+  Counters enqueued = {};
+
+  // Sum encountered
+  ZPerWorkerConstIterator<Counters> iter_encountered(&_encountered_count);
+  for (const Counters* counters; iter_encountered.next(&counters);) {
+    for (int i = REF_SOFT; i <= REF_PHANTOM; i++) {
+      encountered[i] += (*counters)[i];
+    }
+  }
+
+  // Sum discovered
+  ZPerWorkerConstIterator<Counters> iter_discovered(&_discovered_count);
+  for (const Counters* counters; iter_discovered.next(&counters);) {
+    for (int i = REF_SOFT; i <= REF_PHANTOM; i++) {
+      discovered[i] += (*counters)[i];
+    }
+  }
+
+  // Sum enqueued
+  ZPerWorkerConstIterator<Counters> iter_enqueued(&_enqueued_count);
+  for (const Counters* counters; iter_enqueued.next(&counters);) {
+    for (int i = REF_SOFT; i <= REF_PHANTOM; i++) {
+      enqueued[i] += (*counters)[i];
+    }
+  }
+
+  // Update statistics
+  ZStatReferences::set_soft(encountered[REF_SOFT], discovered[REF_SOFT], enqueued[REF_SOFT]);
+  ZStatReferences::set_weak(encountered[REF_WEAK], discovered[REF_WEAK], enqueued[REF_WEAK]);
+  ZStatReferences::set_final(encountered[REF_FINAL], discovered[REF_FINAL], enqueued[REF_FINAL]);
+  ZStatReferences::set_phantom(encountered[REF_PHANTOM], discovered[REF_PHANTOM], enqueued[REF_PHANTOM]);
+
+  // Trace statistics
+  const ReferenceProcessorStats stats(discovered[REF_SOFT],
+                                      discovered[REF_WEAK],
+                                      discovered[REF_FINAL],
+                                      discovered[REF_PHANTOM]);
+  ZTracer::tracer()->report_gc_reference_stats(stats);
+}
+
+class ZReferenceProcessorTask : public ZTask {
+private:
+  ZReferenceProcessor* const _reference_processor;
+
+public:
+  ZReferenceProcessorTask(ZReferenceProcessor* reference_processor) :
+      ZTask("ZReferenceProcessorTask"),
+      _reference_processor(reference_processor) {}
+
+  virtual void work() {
+    _reference_processor->work();
+  }
+};
+
+void ZReferenceProcessor::process_references() {
+  ZStatTimer timer(ZSubPhaseConcurrentReferencesProcess);
+
+  // Process discovered lists
+  ZReferenceProcessorTask task(this);
+  _workers->run_concurrent(&task);
+
+  // Update soft reference clock
+  update_soft_reference_clock();
+
+  // Collect, log and trace statistics
+  collect_statistics();
+}
+
+void ZReferenceProcessor::enqueue_references() {
+  ZStatTimer timer(ZSubPhaseConcurrentReferencesEnqueue);
+
+  if (_pending_list.get() == NULL) {
+    // Nothing to enqueue
+    return;
+  }
+
+  {
+    // Heap_lock protects external pending list
+    MonitorLockerEx ml(Heap_lock);
+
+    // Prepend internal pending list to external pending list
+    *_pending_list_tail = Universe::swap_reference_pending_list(_pending_list.get());
+
+    // Notify ReferenceHandler thread
+    ml.notify_all();
+  }
+
+  // Reset internal pending list
+  _pending_list.set(NULL);
+  _pending_list_tail = _pending_list.addr();
+}
diff --git a/src/hotspot/share/gc/z/zReferenceProcessor.hpp b/src/hotspot/share/gc/z/zReferenceProcessor.hpp
new file mode 100644
index 00000000000..460f295f8a3
--- /dev/null
+++ b/src/hotspot/share/gc/z/zReferenceProcessor.hpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZREFERENCEPROCESSOR_HPP
+#define SHARE_GC_Z_ZREFERENCEPROCESSOR_HPP
+
+#include "gc/shared/referenceDiscoverer.hpp"
+#include "gc/z/zValue.hpp"
+
+class ReferencePolicy;
+class ZWorkers;
+
+class ZReferenceProcessor : public ReferenceDiscoverer {
+  friend class ZReferenceProcessorTask;
+
+private:
+  static const size_t reference_type_count = REF_PHANTOM + 1;
+  typedef size_t Counters[reference_type_count];
+
+  ZWorkers* const      _workers;
+  ReferencePolicy*     _soft_reference_policy;
+  ZPerWorker<Counters> _encountered_count;
+  ZPerWorker<Counters> _discovered_count;
+  ZPerWorker<Counters> _enqueued_count;
+  ZPerWorker<oop>      _discovered_list;
+  ZContended<oop>      _pending_list;
+  oop*                 _pending_list_tail;
+
+  void update_soft_reference_clock() const;
+
+  ReferenceType reference_type(oop obj) const;
+  const char* reference_type_name(ReferenceType type) const;
+  volatile oop* reference_referent_addr(oop obj) const;
+  oop reference_referent(oop obj) const;
+  bool is_reference_inactive(oop obj) const;
+  bool is_referent_alive_or_null(oop obj, ReferenceType type) const;
+  bool is_referent_softly_alive(oop obj, ReferenceType type) const;
+  bool should_drop_reference(oop obj, ReferenceType type) const;
+  bool should_mark_referent(ReferenceType type) const;
+  bool should_clear_referent(ReferenceType type) const;
+  void keep_referent_alive(oop obj, ReferenceType type) const;
+
+  void discover(oop obj, ReferenceType type);
+  oop drop(oop obj, ReferenceType type);
+  oop* keep(oop obj, ReferenceType type);
+
+  bool is_empty() const;
+
+  void work();
+  void collect_statistics();
+
+public:
+  ZReferenceProcessor(ZWorkers* workers);
+
+  void set_soft_reference_policy(bool clear);
+  void reset_statistics();
+
+  virtual bool discover_reference(oop reference, ReferenceType type);
+  void process_references();
+  void enqueue_references();
+};
+
+#endif // SHARE_GC_Z_ZREFERENCEPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
new file mode 100644
index 00000000000..19e81091d37
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zHeap.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zPage.hpp"
+#include "gc/z/zRelocate.hpp"
+#include "gc/z/zRelocationSet.inline.hpp"
+#include "gc/z/zRootsIterator.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zWorkers.hpp"
+
+ZRelocate::ZRelocate(ZWorkers* workers) :
+    _workers(workers) {}
+
+class ZRelocateRootsTask : public ZTask {
+private:
+  ZRootsIterator _roots;
+
+public:
+  ZRelocateRootsTask() :
+      ZTask("ZRelocateRootsTask"),
+      _roots() {}
+
+  virtual void work() {
+    // During relocation we need to visit the JVMTI
+    // export weak roots to rehash the JVMTI tag map
+    ZRelocateRootOopClosure cl;
+    _roots.oops_do(&cl, true /* visit_jvmti_weak_export */);
+  }
+};
+
+void ZRelocate::start() {
+  ZRelocateRootsTask task;
+  _workers->run_parallel(&task);
+}
+
+class ZRelocateObjectClosure : public ObjectClosure {
+private:
+  ZPage* const _page;
+
+public:
+  ZRelocateObjectClosure(ZPage* page) :
+      _page(page) {}
+
+  virtual void do_object(oop o) {
+    _page->relocate_object(ZOop::to_address(o));
+  }
+};
+
+bool ZRelocate::work(ZRelocationSetParallelIterator* iter) {
+  bool success = true;
+
+  // Relocate pages in the relocation set
+  for (ZPage* page; iter->next(&page);) {
+    // Relocate objects in page
+    ZRelocateObjectClosure cl(page);
+    page->object_iterate(&cl);
+
+    if (ZVerifyForwarding) {
+      page->verify_forwarding();
+    }
+
+    if (page->is_pinned()) {
+      // Relocation failed, page is now pinned
+      success = false;
+    } else {
+      // Relocation succeeded, release page
+      ZHeap::heap()->release_page(page, true /* reclaimed */);
+    }
+  }
+
+  return success;
+}
+
+class ZRelocateTask : public ZTask {
+private:
+  ZRelocate* const               _relocate;
+  ZRelocationSetParallelIterator _iter;
+  bool                           _failed;
+
+public:
+  ZRelocateTask(ZRelocate* relocate, ZRelocationSet* relocation_set) :
+      ZTask("ZRelocateTask"),
+      _relocate(relocate),
+      _iter(relocation_set),
+      _failed(false) {}
+
+  virtual void work() {
+    if (!_relocate->work(&_iter)) {
+      _failed = true;
+    }
+  }
+
+  bool failed() const {
+    return _failed;
+  }
+};
+
+bool ZRelocate::relocate(ZRelocationSet* relocation_set) {
+  ZRelocateTask task(this, relocation_set);
+  _workers->run_concurrent(&task);
+  return !task.failed();
+}
diff --git a/src/hotspot/share/gc/z/zRelocate.hpp b/src/hotspot/share/gc/z/zRelocate.hpp
new file mode 100644
index 00000000000..7ed71c1f51e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocate.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRELOCATE_HPP
+#define SHARE_GC_Z_ZRELOCATE_HPP
+
+#include "gc/z/zRelocationSet.hpp"
+#include "gc/z/zWorkers.hpp"
+#include "memory/allocation.hpp"
+
+class ZRelocate {
+  friend class ZRelocateTask;
+
+private:
+  ZWorkers* const _workers;
+
+  bool work(ZRelocationSetParallelIterator* iter);
+
+public:
+  ZRelocate(ZWorkers* workers);
+
+  void start();
+  bool relocate(ZRelocationSet* relocation_set);
+};
+
+#endif // SHARE_GC_Z_ZRELOCATE_HPP
diff --git a/src/hotspot/share/gc/z/zRelocationSet.cpp b/src/hotspot/share/gc/z/zRelocationSet.cpp
new file mode 100644
index 00000000000..4f58b0aa983
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocationSet.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zRelocationSet.hpp"
+#include "memory/allocation.inline.hpp"
+
+ZRelocationSet::ZRelocationSet() :
+    _pages(NULL),
+    _npages(0) {}
+
+void ZRelocationSet::populate(const ZPage* const* group0, size_t ngroup0,
+                              const ZPage* const* group1, size_t ngroup1) {
+  _npages = ngroup0 + ngroup1;
+  _pages = REALLOC_C_HEAP_ARRAY(ZPage*, _pages, _npages, mtGC);
+
+  if (_pages != NULL) {
+    if (group0 != NULL) {
+      memcpy(_pages, group0, ngroup0 * sizeof(ZPage*));
+    }
+    if (group1 != NULL) {
+      memcpy(_pages + ngroup0, group1, ngroup1 * sizeof(ZPage*));
+    }
+  }
+}
diff --git a/src/hotspot/share/gc/z/zRelocationSet.hpp b/src/hotspot/share/gc/z/zRelocationSet.hpp
new file mode 100644
index 00000000000..c2ee8907e91
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocationSet.hpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRELOCATIONSET_HPP
+#define SHARE_GC_Z_ZRELOCATIONSET_HPP
+
+#include "memory/allocation.hpp"
+
+class ZPage;
+
+class ZRelocationSet {
+  template <bool> friend class ZRelocationSetIteratorImpl;
+
+private:
+  ZPage** _pages;
+  size_t  _npages;
+
+public:
+  ZRelocationSet();
+
+  void populate(const ZPage* const* group0, size_t ngroup0,
+                const ZPage* const* group1, size_t ngroup1);
+};
+
+template <bool parallel>
+class ZRelocationSetIteratorImpl : public StackObj {
+private:
+  ZRelocationSet* const _relocation_set;
+  size_t                _next;
+
+public:
+  ZRelocationSetIteratorImpl(ZRelocationSet* relocation_set);
+
+  bool next(ZPage** page);
+};
+
+// Iterator types
+#define ZRELOCATIONSET_SERIAL      false
+#define ZRELOCATIONSET_PARALLEL    true
+
+class ZRelocationSetIterator : public ZRelocationSetIteratorImpl<ZRELOCATIONSET_SERIAL> {
+public:
+  ZRelocationSetIterator(ZRelocationSet* relocation_set) :
+      ZRelocationSetIteratorImpl<ZRELOCATIONSET_SERIAL>(relocation_set) {}
+};
+
+class ZRelocationSetParallelIterator : public ZRelocationSetIteratorImpl<ZRELOCATIONSET_PARALLEL> {
+public:
+  ZRelocationSetParallelIterator(ZRelocationSet* relocation_set) :
+      ZRelocationSetIteratorImpl<ZRELOCATIONSET_PARALLEL>(relocation_set) {}
+};
+
+#endif // SHARE_GC_Z_ZRELOCATIONSET_HPP
diff --git a/src/hotspot/share/gc/z/zRelocationSet.inline.hpp b/src/hotspot/share/gc/z/zRelocationSet.inline.hpp
new file mode 100644
index 00000000000..64ed82a55b1
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocationSet.inline.hpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP
+#define SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP
+
+#include "gc/z/zRelocationSet.hpp"
+#include "runtime/atomic.hpp"
+
+template <bool parallel>
+inline ZRelocationSetIteratorImpl<parallel>::ZRelocationSetIteratorImpl(ZRelocationSet* relocation_set) :
+    _relocation_set(relocation_set),
+    _next(0) {}
+
+template <bool parallel>
+inline bool ZRelocationSetIteratorImpl<parallel>::next(ZPage** page) {
+  const size_t npages = _relocation_set->_npages;
+
+  if (parallel) {
+    if (_next < npages) {
+      const size_t next = Atomic::add(1u, &_next) - 1u;
+      if (next < npages) {
+        *page = _relocation_set->_pages[next];
+        return true;
+      }
+    }
+  } else {
+    if (_next < npages) {
+      *page = _relocation_set->_pages[_next++];
+      return true;
+    }
+  }
+
+  return false;
+}
+
+#endif // SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
new file mode 100644
index 00000000000..222529f14ce
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zArray.inline.hpp"
+#include "gc/z/zPage.inline.hpp"
+#include "gc/z/zRelocationSet.hpp"
+#include "gc/z/zRelocationSetSelector.hpp"
+#include "logging/log.hpp"
+#include "runtime/globals.hpp"
+#include "utilities/debug.hpp"
+
+ZRelocationSetSelectorGroup::ZRelocationSetSelectorGroup(const char* name,
+                                                         size_t page_size,
+                                                         size_t object_size_limit) :
+    _name(name),
+    _page_size(page_size),
+    _object_size_limit(object_size_limit),
+    _fragmentation_limit(page_size * (ZFragmentationLimit / 100)),
+    _registered_pages(),
+    _sorted_pages(NULL),
+    _nselected(0),
+    _relocating(0),
+    _fragmentation(0) {}
+
+ZRelocationSetSelectorGroup::~ZRelocationSetSelectorGroup() {
+  FREE_C_HEAP_ARRAY(const ZPage*, _sorted_pages);
+}
+
+void ZRelocationSetSelectorGroup::register_live_page(const ZPage* page, size_t garbage) {
+  if (garbage > _fragmentation_limit) {
+    _registered_pages.add(page);
+  } else {
+    _fragmentation += garbage;
+  }
+}
+
+void ZRelocationSetSelectorGroup::semi_sort() {
+  // Semi-sort registered pages by live bytes in ascending order
+  const size_t npartitions_shift = 11;
+  const size_t npartitions = (size_t)1 << npartitions_shift;
+  const size_t partition_size = _page_size >> npartitions_shift;
+  const size_t partition_size_shift = exact_log2(partition_size);
+  const size_t npages = _registered_pages.size();
+
+  size_t partition_slots[npartitions];
+  size_t partition_finger[npartitions];
+
+  // Allocate destination array
+  _sorted_pages = REALLOC_C_HEAP_ARRAY(const ZPage*, _sorted_pages, npages, mtGC);
+  debug_only(memset(_sorted_pages, 0, npages * sizeof(ZPage*)));
+
+  // Calculate partition slots
+  memset(partition_slots, 0, sizeof(partition_slots));
+  ZArrayIterator<const ZPage*> iter1(&_registered_pages);
+  for (const ZPage* page; iter1.next(&page);) {
+    const size_t index = page->live_bytes() >> partition_size_shift;
+    partition_slots[index]++;
+  }
+
+  // Calculate accumulated partition slots and fingers
+  size_t prev_partition_slots = 0;
+  for (size_t i = 0; i < npartitions; i++) {
+    partition_slots[i] += prev_partition_slots;
+    partition_finger[i] = prev_partition_slots;
+    prev_partition_slots = partition_slots[i];
+  }
+
+  // Sort pages into partitions
+  ZArrayIterator<const ZPage*> iter2(&_registered_pages);
+  for (const ZPage* page; iter2.next(&page);) {
+    const size_t index = page->live_bytes() >> partition_size_shift;
+    const size_t finger = partition_finger[index]++;
+    assert(_sorted_pages[finger] == NULL, "Invalid finger");
+    _sorted_pages[finger] = page;
+  }
+}
+
+void ZRelocationSetSelectorGroup::select() {
+  // Calculate the number of pages to relocate by successively including pages in
+  // a candidate relocation set and calculate the maximum space requirement for
+  // their live objects.
+  const size_t npages = _registered_pages.size();
+  size_t selected_from = 0;
+  size_t selected_to = 0;
+  size_t from_size = 0;
+
+  semi_sort();
+
+  for (size_t from = 1; from <= npages; from++) {
+    // Add page to the candidate relocation set
+    from_size += _sorted_pages[from - 1]->live_bytes();
+
+    // Calculate the maximum number of pages needed by the candidate relocation set.
+    // By subtracting the object size limit from the pages size we get the maximum
+    // number of pages that the relocation set is guaranteed to fit in, regardless
+    // of in which order the objects are relocated.
+    const size_t to = ceil((double)(from_size) / (double)(_page_size - _object_size_limit));
+
+    // Calculate the relative difference in reclaimable space compared to our
+    // currently selected final relocation set. If this number is larger than the
+    // acceptable fragmentation limit, then the current candidate relocation set
+    // becomes our new final relocation set.
+    const size_t diff_from = from - selected_from;
+    const size_t diff_to = to - selected_to;
+    const double diff_reclaimable = 100 - percent_of(diff_to, diff_from);
+    if (diff_reclaimable > ZFragmentationLimit) {
+      selected_from = from;
+      selected_to = to;
+    }
+
+    log_trace(gc, reloc)("Candidate Relocation Set (%s Pages): "
+                         SIZE_FORMAT "->" SIZE_FORMAT ", %.1f%% relative defragmentation, %s",
+                         _name, from, to, diff_reclaimable, (selected_from == from) ? "Selected" : "Rejected");
+  }
+
+  // Finalize selection
+  _nselected = selected_from;
+
+  // Update statistics
+  _relocating = from_size;
+  for (size_t i = _nselected; i < npages; i++) {
+    const ZPage* const page = _sorted_pages[i];
+    _fragmentation += page->size() - page->live_bytes();
+  }
+
+  log_debug(gc, reloc)("Relocation Set (%s Pages): " SIZE_FORMAT "->" SIZE_FORMAT ", " SIZE_FORMAT " skipped",
+                       _name, selected_from, selected_to, npages - _nselected);
+}
+
+const ZPage* const* ZRelocationSetSelectorGroup::selected() const {
+  return _sorted_pages;
+}
+
+size_t ZRelocationSetSelectorGroup::nselected() const {
+  return _nselected;
+}
+
+size_t ZRelocationSetSelectorGroup::relocating() const {
+  return _relocating;
+}
+
+size_t ZRelocationSetSelectorGroup::fragmentation() const {
+  return _fragmentation;
+}
+
+ZRelocationSetSelector::ZRelocationSetSelector() :
+    _small("Small", ZPageSizeSmall, ZObjectSizeLimitSmall),
+    _medium("Medium", ZPageSizeMedium, ZObjectSizeLimitMedium),
+    _live(0),
+    _garbage(0),
+    _fragmentation(0) {}
+
+void ZRelocationSetSelector::register_live_page(const ZPage* page) {
+  const uint8_t type = page->type();
+  const size_t live = page->live_bytes();
+  const size_t garbage = page->size() - live;
+
+  if (type == ZPageTypeSmall) {
+    _small.register_live_page(page, garbage);
+  } else if (type == ZPageTypeMedium) {
+    _medium.register_live_page(page, garbage);
+  } else {
+    _fragmentation += garbage;
+  }
+
+  _live += live;
+  _garbage += garbage;
+}
+
+void ZRelocationSetSelector::register_garbage_page(const ZPage* page) {
+  _garbage += page->size();
+}
+
+void ZRelocationSetSelector::select(ZRelocationSet* relocation_set) {
+  // Select pages to relocate. The resulting relocation set will be
+  // sorted such that medium pages comes first, followed by small
+  // pages. Pages within each page group will be semi-sorted by live
+  // bytes in ascending order. Relocating pages in this order allows
+  // us to start reclaiming memory more quickly.
+
+  // Select pages from each group
+  _medium.select();
+  _small.select();
+
+  // Populate relocation set
+  relocation_set->populate(_medium.selected(), _medium.nselected(),
+                           _small.selected(), _small.nselected());
+}
+
+size_t ZRelocationSetSelector::live() const {
+  return _live;
+}
+
+size_t ZRelocationSetSelector::garbage() const {
+  return _garbage;
+}
+
+size_t ZRelocationSetSelector::relocating() const {
+  return _small.relocating() + _medium.relocating();
+}
+
+size_t ZRelocationSetSelector::fragmentation() const {
+  return _fragmentation + _small.fragmentation() + _medium.fragmentation();
+}
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.hpp b/src/hotspot/share/gc/z/zRelocationSetSelector.hpp
new file mode 100644
index 00000000000..1aa1142d58b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.hpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRELOCATIONSETSELECTOR_HPP
+#define SHARE_GC_Z_ZRELOCATIONSETSELECTOR_HPP
+
+#include "gc/z/zArray.hpp"
+#include "memory/allocation.hpp"
+
+class ZPage;
+class ZRelocationSet;
+
+class ZRelocationSetSelectorGroup {
+private:
+  const char* const    _name;
+  const size_t         _page_size;
+  const size_t         _object_size_limit;
+  const size_t         _fragmentation_limit;
+
+  ZArray<const ZPage*> _registered_pages;
+  const ZPage**        _sorted_pages;
+  size_t               _nselected;
+  size_t               _relocating;
+  size_t               _fragmentation;
+
+  void semi_sort();
+
+public:
+  ZRelocationSetSelectorGroup(const char* name,
+                              size_t page_size,
+                              size_t object_size_limit);
+  ~ZRelocationSetSelectorGroup();
+
+  void register_live_page(const ZPage* page, size_t garbage);
+  void select();
+
+  const ZPage* const* selected() const;
+  size_t nselected() const;
+  size_t relocating() const;
+  size_t fragmentation() const;
+};
+
+class ZRelocationSetSelector : public StackObj {
+private:
+  ZRelocationSetSelectorGroup _small;
+  ZRelocationSetSelectorGroup _medium;
+  size_t                      _live;
+  size_t                      _garbage;
+  size_t                      _fragmentation;
+
+public:
+  ZRelocationSetSelector();
+
+  void register_live_page(const ZPage* page);
+  void register_garbage_page(const ZPage* page);
+  void select(ZRelocationSet* relocation_set);
+
+  size_t live() const;
+  size_t garbage() const;
+  size_t relocating() const;
+  size_t fragmentation() const;
+};
+
+#endif // SHARE_GC_Z_ZRELOCATIONSETSELECTOR_HPP
diff --git a/src/hotspot/share/gc/z/zResurrection.cpp b/src/hotspot/share/gc/z/zResurrection.cpp
new file mode 100644
index 00000000000..ed7a9e8d39b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zResurrection.cpp
@@ -0,0 +1,42 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zResurrection.hpp"
+#include "runtime/orderAccess.hpp"
+#include "runtime/safepoint.hpp"
+#include "utilities/debug.hpp"
+
+volatile bool ZResurrection::_blocked = false;
+
+void ZResurrection::block() {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  _blocked = true;
+}
+
+void ZResurrection::unblock() {
+  // We use a storestore barrier to make sure all healed
+  // oops are visible before we unblock resurrection.
+  OrderAccess::storestore();
+  _blocked = false;
+}
diff --git a/src/hotspot/share/gc/z/zResurrection.hpp b/src/hotspot/share/gc/z/zResurrection.hpp
new file mode 100644
index 00000000000..a88b9354469
--- /dev/null
+++ b/src/hotspot/share/gc/z/zResurrection.hpp
@@ -0,0 +1,39 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRESURRECTION_HPP
+#define SHARE_GC_Z_ZRESURRECTION_HPP
+
+#include "memory/allocation.hpp"
+
+class ZResurrection : public AllStatic {
+private:
+  static volatile bool _blocked;
+
+public:
+  static bool is_blocked();
+  static void block();
+  static void unblock();
+};
+
+#endif // SHARE_GC_Z_ZRESURRECTION_HPP
diff --git a/src/hotspot/share/gc/z/zResurrection.inline.hpp b/src/hotspot/share/gc/z/zResurrection.inline.hpp
new file mode 100644
index 00000000000..a2f73261bf2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zResurrection.inline.hpp
@@ -0,0 +1,38 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRESURRECTION_INLINE_HPP
+#define SHARE_GC_Z_ZRESURRECTION_INLINE_HPP
+
+#include "gc/z/zResurrection.hpp"
+#include "runtime/orderAccess.hpp"
+
+inline bool ZResurrection::is_blocked() {
+  // We use a loadload barrier to make sure we are not
+  // seeing oops from a time when resurrection was blocked.
+  const bool blocked = _blocked;
+  OrderAccess::loadload();
+  return blocked;
+}
+
+#endif // SHARE_GC_Z_ZRESURRECTION_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp
new file mode 100644
index 00000000000..107899ed686
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "classfile/classLoaderData.hpp"
+#include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "code/codeCache.hpp"
+#include "compiler/oopMap.hpp"
+#include "gc/shared/oopStorageParState.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zNMethodTable.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zRootsIterator.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/jniHandles.hpp"
+#include "runtime/thread.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/synchronizer.hpp"
+#include "services/management.hpp"
+#include "utilities/debug.hpp"
+#if INCLUDE_JFR
+#include "jfr/jfr.hpp"
+#endif
+
+static const ZStatSubPhase ZSubPhasePauseRootsSetup("Pause Roots Setup");
+static const ZStatSubPhase ZSubPhasePauseRoots("Pause Roots");
+static const ZStatSubPhase ZSubPhasePauseRootsTeardown("Pause Roots Teardown");
+static const ZStatSubPhase ZSubPhasePauseRootsUniverse("Pause Roots Universe");
+static const ZStatSubPhase ZSubPhasePauseRootsVMWeakHandles("Pause Roots VMWeakHandles");
+static const ZStatSubPhase ZSubPhasePauseRootsJNIHandles("Pause Roots JNIHandles");
+static const ZStatSubPhase ZSubPhasePauseRootsJNIWeakHandles("Pause Roots JNIWeakHandles");
+static const ZStatSubPhase ZSubPhasePauseRootsObjectSynchronizer("Pause Roots ObjectSynchronizer");
+static const ZStatSubPhase ZSubPhasePauseRootsManagement("Pause Roots Management");
+static const ZStatSubPhase ZSubPhasePauseRootsJVMTIExport("Pause Roots JVMTIExport");
+static const ZStatSubPhase ZSubPhasePauseRootsJVMTIWeakExport("Pause Roots JVMTIWeakExport");
+static const ZStatSubPhase ZSubPhasePauseRootsJFRWeak("Pause Roots JRFWeak");
+static const ZStatSubPhase ZSubPhasePauseRootsSystemDictionary("Pause Roots SystemDictionary");
+static const ZStatSubPhase ZSubPhasePauseRootsClassLoaderDataGraph("Pause Roots ClassLoaderDataGraph");
+static const ZStatSubPhase ZSubPhasePauseRootsThreads("Pause Roots Threads");
+static const ZStatSubPhase ZSubPhasePauseRootsCodeCache("Pause Roots CodeCache");
+static const ZStatSubPhase ZSubPhasePauseRootsStringTable("Pause Roots StringTable");
+
+static const ZStatSubPhase ZSubPhasePauseWeakRootsSetup("Pause Weak Roots Setup");
+static const ZStatSubPhase ZSubPhasePauseWeakRoots("Pause Weak Roots");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsTeardown("Pause Weak Roots Teardown");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsVMWeakHandles("Pause Weak Roots VMWeakHandles");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsJNIWeakHandles("Pause Weak Roots JNIWeakHandles");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsJVMTIWeakExport("Pause Weak Roots JVMTIWeakExport");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsJFRWeak("Pause Weak Roots JFRWeak");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsSymbolTable("Pause Weak Roots SymbolTable");
+static const ZStatSubPhase ZSubPhasePauseWeakRootsStringTable("Pause Weak Roots StringTable");
+
+static const ZStatSubPhase ZSubPhaseConcurrentWeakRoots("Concurrent Weak Roots");
+static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsVMWeakHandles("Concurrent Weak Roots VMWeakHandles");
+static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsJNIWeakHandles("Concurrent Weak Roots JNIWeakHandles");
+static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsStringTable("Concurrent Weak Roots StringTable");
+
+template <typename T, void (T::*F)(OopClosure*)>
+ZSerialOopsDo<T, F>::ZSerialOopsDo(T* iter) :
+    _iter(iter),
+    _claimed(false) {}
+
+template <typename T, void (T::*F)(OopClosure*)>
+void ZSerialOopsDo<T, F>::oops_do(OopClosure* cl) {
+  if (!_claimed && Atomic::cmpxchg(true, &_claimed, false) == false) {
+    (_iter->*F)(cl);
+  }
+}
+
+template <typename T, void (T::*F)(OopClosure*)>
+ZParallelOopsDo<T, F>::ZParallelOopsDo(T* iter) :
+    _iter(iter),
+    _completed(false) {}
+
+template <typename T, void (T::*F)(OopClosure*)>
+void ZParallelOopsDo<T, F>::oops_do(OopClosure* cl) {
+  if (!_completed) {
+    (_iter->*F)(cl);
+    if (!_completed) {
+      _completed = true;
+    }
+  }
+}
+
+template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
+ZSerialWeakOopsDo<T, F>::ZSerialWeakOopsDo(T* iter) :
+    _iter(iter),
+    _claimed(false) {}
+
+template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
+void ZSerialWeakOopsDo<T, F>::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl) {
+  if (!_claimed && Atomic::cmpxchg(true, &_claimed, false) == false) {
+    (_iter->*F)(is_alive, cl);
+  }
+}
+
+template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
+ZParallelWeakOopsDo<T, F>::ZParallelWeakOopsDo(T* iter) :
+    _iter(iter),
+    _completed(false) {}
+
+template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
+void ZParallelWeakOopsDo<T, F>::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl) {
+  if (!_completed) {
+    (_iter->*F)(is_alive, cl);
+    if (!_completed) {
+      _completed = true;
+    }
+  }
+}
+
+ZRootsIterator::ZRootsIterator() :
+    _vm_weak_handles_iter(SystemDictionary::vm_weak_oop_storage()),
+    _jni_handles_iter(JNIHandles::global_handles()),
+    _jni_weak_handles_iter(JNIHandles::weak_global_handles()),
+    _string_table_iter(StringTable::weak_storage()),
+    _universe(this),
+    _object_synchronizer(this),
+    _management(this),
+    _jvmti_export(this),
+    _jvmti_weak_export(this),
+    _jfr_weak(this),
+    _system_dictionary(this),
+    _vm_weak_handles(this),
+    _jni_handles(this),
+    _jni_weak_handles(this),
+    _class_loader_data_graph(this),
+    _threads(this),
+    _code_cache(this),
+    _string_table(this) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  ZStatTimer timer(ZSubPhasePauseRootsSetup);
+  Threads::change_thread_claim_parity();
+  ClassLoaderDataGraph::clear_claimed_marks();
+  COMPILER2_PRESENT(DerivedPointerTable::clear());
+  CodeCache::gc_prologue();
+  ZNMethodTable::gc_prologue();
+}
+
+ZRootsIterator::~ZRootsIterator() {
+  ZStatTimer timer(ZSubPhasePauseRootsTeardown);
+  ResourceMark rm;
+  ZNMethodTable::gc_epilogue();
+  CodeCache::gc_epilogue();
+  JvmtiExport::gc_epilogue();
+  COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
+  Threads::assert_all_threads_claimed();
+}
+
+void ZRootsIterator::do_universe(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsUniverse);
+  Universe::oops_do(cl);
+}
+
+void ZRootsIterator::do_vm_weak_handles(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsVMWeakHandles);
+  _vm_weak_handles_iter.oops_do(cl);
+}
+
+void ZRootsIterator::do_jni_handles(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsJNIHandles);
+  _jni_handles_iter.oops_do(cl);
+}
+
+void ZRootsIterator::do_jni_weak_handles(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsJNIWeakHandles);
+  _jni_weak_handles_iter.oops_do(cl);
+}
+
+void ZRootsIterator::do_object_synchronizer(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsObjectSynchronizer);
+  ObjectSynchronizer::oops_do(cl);
+}
+
+void ZRootsIterator::do_management(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsManagement);
+  Management::oops_do(cl);
+}
+
+void ZRootsIterator::do_jvmti_export(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsJVMTIExport);
+  JvmtiExport::oops_do(cl);
+}
+
+void ZRootsIterator::do_jvmti_weak_export(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsJVMTIWeakExport);
+  AlwaysTrueClosure always_alive;
+  JvmtiExport::weak_oops_do(&always_alive, cl);
+}
+
+void ZRootsIterator::do_jfr_weak(OopClosure* cl) {
+#if INCLUDE_JFR
+  ZStatTimer timer(ZSubPhasePauseRootsJFRWeak);
+  AlwaysTrueClosure always_alive;
+  Jfr::weak_oops_do(&always_alive, cl);
+#endif
+}
+
+void ZRootsIterator::do_system_dictionary(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsSystemDictionary);
+  SystemDictionary::oops_do(cl);
+}
+
+void ZRootsIterator::do_class_loader_data_graph(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsClassLoaderDataGraph);
+  CLDToOopClosure cld_cl(cl);
+  ClassLoaderDataGraph::cld_do(&cld_cl);
+}
+
+class ZRootsIteratorThreadClosure : public ThreadClosure {
+private:
+  OopClosure* const _cl;
+
+public:
+  ZRootsIteratorThreadClosure(OopClosure* cl) :
+      _cl(cl) {}
+
+  virtual void do_thread(Thread* thread) {
+    if (thread->is_Java_thread()) {
+      // Update thread local adddress bad mask
+      ZThreadLocalData::set_address_bad_mask(thread, ZAddressBadMask);
+    }
+
+    // Process thread oops
+    thread->oops_do(_cl, NULL);
+  }
+};
+
+void ZRootsIterator::do_threads(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsThreads);
+  ResourceMark rm;
+  ZRootsIteratorThreadClosure thread_cl(cl);
+  Threads::possibly_parallel_threads_do(true, &thread_cl);
+}
+
+void ZRootsIterator::do_code_cache(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsCodeCache);
+  ZNMethodTable::oops_do(cl);
+}
+
+void ZRootsIterator::do_string_table(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsStringTable);
+  _string_table_iter.oops_do(cl);
+}
+
+void ZRootsIterator::oops_do(OopClosure* cl, bool visit_jvmti_weak_export) {
+  ZStatTimer timer(ZSubPhasePauseRoots);
+  _universe.oops_do(cl);
+  _object_synchronizer.oops_do(cl);
+  _management.oops_do(cl);
+  _jvmti_export.oops_do(cl);
+  _system_dictionary.oops_do(cl);
+  _jni_handles.oops_do(cl);
+  _class_loader_data_graph.oops_do(cl);
+  _threads.oops_do(cl);
+  _code_cache.oops_do(cl);
+  if (!ZWeakRoots) {
+    _jvmti_weak_export.oops_do(cl);
+    _jfr_weak.oops_do(cl);
+    _vm_weak_handles.oops_do(cl);
+    _jni_weak_handles.oops_do(cl);
+    _string_table.oops_do(cl);
+  } else {
+    if (visit_jvmti_weak_export) {
+      _jvmti_weak_export.oops_do(cl);
+    }
+  }
+}
+
+ZWeakRootsIterator::ZWeakRootsIterator() :
+    _vm_weak_handles_iter(SystemDictionary::vm_weak_oop_storage()),
+    _jni_weak_handles_iter(JNIHandles::weak_global_handles()),
+    _string_table_iter(StringTable::weak_storage()),
+    _jvmti_weak_export(this),
+    _jfr_weak(this),
+    _vm_weak_handles(this),
+    _jni_weak_handles(this),
+    _symbol_table(this),
+    _string_table(this) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  ZStatTimer timer(ZSubPhasePauseWeakRootsSetup);
+  SymbolTable::clear_parallel_claimed_index();
+}
+
+ZWeakRootsIterator::~ZWeakRootsIterator() {
+  ZStatTimer timer(ZSubPhasePauseWeakRootsTeardown);
+}
+
+void ZWeakRootsIterator::do_vm_weak_handles(BoolObjectClosure* is_alive, OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseWeakRootsVMWeakHandles);
+  _vm_weak_handles_iter.weak_oops_do(is_alive, cl);
+}
+
+void ZWeakRootsIterator::do_jni_weak_handles(BoolObjectClosure* is_alive, OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseWeakRootsJNIWeakHandles);
+  _jni_weak_handles_iter.weak_oops_do(is_alive, cl);
+}
+
+void ZWeakRootsIterator::do_jvmti_weak_export(BoolObjectClosure* is_alive, OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseWeakRootsJVMTIWeakExport);
+  JvmtiExport::weak_oops_do(is_alive, cl);
+}
+
+void ZWeakRootsIterator::do_jfr_weak(BoolObjectClosure* is_alive, OopClosure* cl) {
+#if INCLUDE_JFR
+  ZStatTimer timer(ZSubPhasePauseWeakRootsJFRWeak);
+  Jfr::weak_oops_do(is_alive, cl);
+#endif
+}
+
+void ZWeakRootsIterator::do_symbol_table(BoolObjectClosure* is_alive, OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseWeakRootsSymbolTable);
+  int dummy;
+  SymbolTable::possibly_parallel_unlink(&dummy, &dummy);
+}
+
+void ZWeakRootsIterator::do_string_table(BoolObjectClosure* is_alive, OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseWeakRootsStringTable);
+  _string_table_iter.weak_oops_do(is_alive, cl);
+}
+
+void ZWeakRootsIterator::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseWeakRoots);
+  if (ZSymbolTableUnloading) {
+    _symbol_table.weak_oops_do(is_alive, cl);
+  }
+  if (ZWeakRoots) {
+    _jvmti_weak_export.weak_oops_do(is_alive, cl);
+    _jfr_weak.weak_oops_do(is_alive, cl);
+    if (!ZConcurrentVMWeakHandles) {
+      _vm_weak_handles.weak_oops_do(is_alive, cl);
+    }
+    if (!ZConcurrentJNIWeakGlobalHandles) {
+      _jni_weak_handles.weak_oops_do(is_alive, cl);
+    }
+    if (!ZConcurrentStringTable) {
+      _string_table.weak_oops_do(is_alive, cl);
+    }
+  }
+}
+
+void ZWeakRootsIterator::oops_do(OopClosure* cl) {
+  AlwaysTrueClosure always_alive;
+  weak_oops_do(&always_alive, cl);
+}
+
+ZConcurrentWeakRootsIterator::ZConcurrentWeakRootsIterator() :
+    _vm_weak_handles_iter(SystemDictionary::vm_weak_oop_storage()),
+    _jni_weak_handles_iter(JNIHandles::weak_global_handles()),
+    _string_table_iter(StringTable::weak_storage()),
+    _vm_weak_handles(this),
+    _jni_weak_handles(this),
+    _string_table(this) {}
+
+void ZConcurrentWeakRootsIterator::do_vm_weak_handles(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhaseConcurrentWeakRootsVMWeakHandles);
+  _vm_weak_handles_iter.oops_do(cl);
+}
+
+void ZConcurrentWeakRootsIterator::do_jni_weak_handles(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhaseConcurrentWeakRootsJNIWeakHandles);
+  _jni_weak_handles_iter.oops_do(cl);
+}
+
+void ZConcurrentWeakRootsIterator::do_string_table(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhaseConcurrentWeakRootsStringTable);
+  _string_table_iter.oops_do(cl);
+}
+
+void ZConcurrentWeakRootsIterator::oops_do(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhaseConcurrentWeakRoots);
+  if (ZWeakRoots) {
+    if (ZConcurrentVMWeakHandles) {
+      _vm_weak_handles.oops_do(cl);
+    }
+    if (ZConcurrentJNIWeakGlobalHandles) {
+      _jni_weak_handles.oops_do(cl);
+    }
+    if (ZConcurrentStringTable) {
+      _string_table.oops_do(cl);
+    }
+  }
+}
+
+ZThreadRootsIterator::ZThreadRootsIterator() :
+    _threads(this) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+  ZStatTimer timer(ZSubPhasePauseRootsSetup);
+  Threads::change_thread_claim_parity();
+}
+
+ZThreadRootsIterator::~ZThreadRootsIterator() {
+  ZStatTimer timer(ZSubPhasePauseRootsTeardown);
+  Threads::assert_all_threads_claimed();
+}
+
+void ZThreadRootsIterator::do_threads(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRootsThreads);
+  ResourceMark rm;
+  Threads::possibly_parallel_oops_do(true, cl, NULL);
+}
+
+void ZThreadRootsIterator::oops_do(OopClosure* cl) {
+  ZStatTimer timer(ZSubPhasePauseRoots);
+  _threads.oops_do(cl);
+}
diff --git a/src/hotspot/share/gc/z/zRootsIterator.hpp b/src/hotspot/share/gc/z/zRootsIterator.hpp
new file mode 100644
index 00000000000..f723d9195f3
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRootsIterator.hpp
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZROOTSITERATOR_HPP
+#define SHARE_GC_Z_ZROOTSITERATOR_HPP
+
+#include "gc/shared/oopStorageParState.hpp"
+#include "memory/allocation.hpp"
+#include "memory/iterator.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+typedef OopStorage::ParState<false /* concurrent */, false /* is_const */> ZOopStorageIterator;
+typedef OopStorage::ParState<true /* concurrent */, false /* is_const */>  ZConcurrentOopStorageIterator;
+
+template <typename T, void (T::*F)(OopClosure*)>
+class ZSerialOopsDo {
+private:
+  T* const      _iter;
+  volatile bool _claimed;
+
+public:
+  ZSerialOopsDo(T* iter);
+  void oops_do(OopClosure* cl);
+};
+
+template <typename T, void (T::*F)(OopClosure*)>
+class ZParallelOopsDo {
+private:
+  T* const      _iter;
+  volatile bool _completed;
+
+public:
+  ZParallelOopsDo(T* iter);
+  void oops_do(OopClosure* cl);
+};
+
+template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
+class ZSerialWeakOopsDo {
+private:
+  T* const      _iter;
+  volatile bool _claimed;
+
+public:
+  ZSerialWeakOopsDo(T* iter);
+  void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl);
+};
+
+template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
+class ZParallelWeakOopsDo {
+private:
+  T* const      _iter;
+  volatile bool _completed;
+
+public:
+  ZParallelWeakOopsDo(T* iter);
+  void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl);
+};
+
+class ZRootsIterator {
+private:
+  ZOopStorageIterator _vm_weak_handles_iter;
+  ZOopStorageIterator _jni_handles_iter;
+  ZOopStorageIterator _jni_weak_handles_iter;
+  ZOopStorageIterator _string_table_iter;
+
+  void do_universe(OopClosure* cl);
+  void do_vm_weak_handles(OopClosure* cl);
+  void do_jni_handles(OopClosure* cl);
+  void do_jni_weak_handles(OopClosure* cl);
+  void do_object_synchronizer(OopClosure* cl);
+  void do_management(OopClosure* cl);
+  void do_jvmti_export(OopClosure* cl);
+  void do_jvmti_weak_export(OopClosure* cl);
+  void do_jfr_weak(OopClosure* cl);
+  void do_system_dictionary(OopClosure* cl);
+  void do_class_loader_data_graph(OopClosure* cl);
+  void do_threads(OopClosure* cl);
+  void do_code_cache(OopClosure* cl);
+  void do_string_table(OopClosure* cl);
+
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_universe>                  _universe;
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_object_synchronizer>       _object_synchronizer;
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_management>                _management;
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_jvmti_export>              _jvmti_export;
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_jvmti_weak_export>         _jvmti_weak_export;
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_jfr_weak>                  _jfr_weak;
+  ZSerialOopsDo<ZRootsIterator, &ZRootsIterator::do_system_dictionary>         _system_dictionary;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_vm_weak_handles>         _vm_weak_handles;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_jni_handles>             _jni_handles;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_jni_weak_handles>        _jni_weak_handles;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_class_loader_data_graph> _class_loader_data_graph;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_threads>                 _threads;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_code_cache>              _code_cache;
+  ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_string_table>            _string_table;
+
+public:
+  ZRootsIterator();
+  ~ZRootsIterator();
+
+  void oops_do(OopClosure* cl, bool visit_jvmti_weak_export = false);
+};
+
+class ZWeakRootsIterator {
+private:
+  ZOopStorageIterator _vm_weak_handles_iter;
+  ZOopStorageIterator _jni_weak_handles_iter;
+  ZOopStorageIterator _string_table_iter;
+
+  void do_vm_weak_handles(BoolObjectClosure* is_alive, OopClosure* cl);
+  void do_jni_weak_handles(BoolObjectClosure* is_alive, OopClosure* cl);
+  void do_jvmti_weak_export(BoolObjectClosure* is_alive, OopClosure* cl);
+  void do_jfr_weak(BoolObjectClosure* is_alive, OopClosure* cl);
+  void do_symbol_table(BoolObjectClosure* is_alive, OopClosure* cl);
+  void do_string_table(BoolObjectClosure* is_alive, OopClosure* cl);
+
+  ZSerialWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jvmti_weak_export>  _jvmti_weak_export;
+  ZSerialWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jfr_weak>           _jfr_weak;
+  ZParallelWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_vm_weak_handles>  _vm_weak_handles;
+  ZParallelWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jni_weak_handles> _jni_weak_handles;
+  ZParallelWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_symbol_table>     _symbol_table;
+  ZParallelWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_string_table>     _string_table;
+
+public:
+  ZWeakRootsIterator();
+  ~ZWeakRootsIterator();
+
+  void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl);
+  void oops_do(OopClosure* cl);
+};
+
+class ZConcurrentWeakRootsIterator {
+private:
+  ZConcurrentOopStorageIterator _vm_weak_handles_iter;
+  ZConcurrentOopStorageIterator _jni_weak_handles_iter;
+  ZConcurrentOopStorageIterator _string_table_iter;
+
+  void do_vm_weak_handles(OopClosure* cl);
+  void do_jni_weak_handles(OopClosure* cl);
+  void do_string_table(OopClosure* cl);
+
+  ZParallelOopsDo<ZConcurrentWeakRootsIterator, &ZConcurrentWeakRootsIterator::do_vm_weak_handles>  _vm_weak_handles;
+  ZParallelOopsDo<ZConcurrentWeakRootsIterator, &ZConcurrentWeakRootsIterator::do_jni_weak_handles> _jni_weak_handles;
+  ZParallelOopsDo<ZConcurrentWeakRootsIterator, &ZConcurrentWeakRootsIterator::do_string_table>     _string_table;
+
+public:
+  ZConcurrentWeakRootsIterator();
+
+  void oops_do(OopClosure* cl);
+};
+
+class ZThreadRootsIterator {
+private:
+  void do_threads(OopClosure* cl);
+
+  ZParallelOopsDo<ZThreadRootsIterator, &ZThreadRootsIterator::do_threads> _threads;
+
+public:
+  ZThreadRootsIterator();
+  ~ZThreadRootsIterator();
+
+  void oops_do(OopClosure* cl);
+};
+
+#endif // SHARE_GC_Z_ZROOTSITERATOR_HPP
diff --git a/src/hotspot/share/gc/z/zRuntimeWorkers.cpp b/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
new file mode 100644
index 00000000000..00a3e98d9d4
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zRuntimeWorkers.hpp"
+
+ZRuntimeWorkers::ZRuntimeWorkers() :
+    _workers("RuntimeWorker",
+             nworkers(),
+             false /* are_GC_task_threads */,
+             false /* are_ConcurrentGC_threads */) {
+
+  log_info(gc, init)("Runtime Workers: %u parallel", nworkers());
+
+  // Initialize worker threads
+  _workers.initialize_workers();
+  _workers.update_active_workers(nworkers());
+}
+
+uint ZRuntimeWorkers::nworkers() const {
+  return ParallelGCThreads;
+}
+
+WorkGang* ZRuntimeWorkers::workers() {
+  return &_workers;
+}
+
+void ZRuntimeWorkers::threads_do(ThreadClosure* tc) const {
+  _workers.threads_do(tc);
+}
+
+void ZRuntimeWorkers::print_threads_on(outputStream* st) const {
+  _workers.print_worker_threads_on(st);
+}
diff --git a/src/hotspot/share/gc/z/zRuntimeWorkers.hpp b/src/hotspot/share/gc/z/zRuntimeWorkers.hpp
new file mode 100644
index 00000000000..99095c5b7a0
--- /dev/null
+++ b/src/hotspot/share/gc/z/zRuntimeWorkers.hpp
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZRUNTIMEWORKERS_HPP
+#define SHARE_GC_Z_ZRUNTIMEWORKERS_HPP
+
+#include "gc/shared/workgroup.hpp"
+
+class ZRuntimeWorkers {
+private:
+  WorkGang _workers;
+
+  uint nworkers() const;
+
+public:
+  ZRuntimeWorkers();
+
+  WorkGang* workers();
+
+  void threads_do(ThreadClosure* tc) const;
+  void print_threads_on(outputStream* st) const;
+};
+
+#endif // SHARE_GC_Z_ZRUNTIMEWORKERS_HPP
diff --git a/src/hotspot/share/gc/z/zServiceability.cpp b/src/hotspot/share/gc/z/zServiceability.cpp
new file mode 100644
index 00000000000..96b8cea1799
--- /dev/null
+++ b/src/hotspot/share/gc/z/zServiceability.cpp
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/hSpaceCounters.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zServiceability.hpp"
+#include "memory/metaspaceCounters.hpp"
+#include "runtime/perfData.hpp"
+
+class ZOldGenerationCounters : public GenerationCounters {
+public:
+  ZOldGenerationCounters(const char* name, size_t min_capacity, size_t max_capacity) :
+    // The "1, 1" parameters are for the n-th generation (=1) with 1 space.
+    GenerationCounters(name,
+                       1 /* ordinal */,
+                       1 /* spaces */,
+                       min_capacity /* min_capacity */,
+                       max_capacity /* max_capacity */,
+                       min_capacity /* curr_capacity */) {}
+
+  virtual void update_all() {
+    size_t committed = ZHeap::heap()->capacity();
+    _current_size->set_value(committed);
+  }
+};
+
+// Class to expose perf counters used by jstat.
+class ZServiceabilityCounters : public CHeapObj<mtGC> {
+private:
+  ZOldGenerationCounters _old_collection_counters;
+  HSpaceCounters         _old_space_counters;
+
+public:
+  ZServiceabilityCounters(size_t min_capacity, size_t max_capacity);
+
+  void update_sizes();
+};
+
+ZServiceabilityCounters::ZServiceabilityCounters(size_t min_capacity, size_t max_capacity) :
+    // generation.1
+    _old_collection_counters("old",
+                             min_capacity,
+                             max_capacity),
+    // generation.1.space.0
+    _old_space_counters(_old_collection_counters.name_space(),
+                        "space",
+                        0 /* ordinal */,
+                        max_capacity /* max_capacity */,
+                        min_capacity /* init_capacity */) {}
+
+void ZServiceabilityCounters::update_sizes() {
+  if (UsePerfData) {
+    size_t capacity = ZHeap::heap()->capacity();
+    size_t used = MIN2(ZHeap::heap()->used(), capacity);
+
+    _old_space_counters.update_capacity(capacity);
+    _old_space_counters.update_used(used);
+
+    _old_collection_counters.update_all();
+
+    MetaspaceCounters::update_performance_counters();
+    CompressedClassSpaceCounters::update_performance_counters();
+  }
+}
+
+ZServiceabilityMemoryPool::ZServiceabilityMemoryPool(size_t min_capacity, size_t max_capacity) :
+    CollectedMemoryPool("ZHeap",
+                        min_capacity,
+                        max_capacity,
+                        true /* support_usage_threshold */) {}
+
+size_t ZServiceabilityMemoryPool::used_in_bytes() {
+  return ZHeap::heap()->used();
+}
+
+MemoryUsage ZServiceabilityMemoryPool::get_memory_usage() {
+  const size_t committed = ZHeap::heap()->capacity();
+  const size_t used      = MIN2(ZHeap::heap()->used(), committed);
+
+  return MemoryUsage(initial_size(), used, committed, max_size());
+}
+
+ZServiceabilityMemoryManager::ZServiceabilityMemoryManager(ZServiceabilityMemoryPool* pool)
+    : GCMemoryManager("ZGC", "end of major GC") {
+  add_pool(pool);
+}
+
+ZServiceability::ZServiceability(size_t min_capacity, size_t max_capacity) :
+    _min_capacity(min_capacity),
+    _max_capacity(max_capacity),
+    _memory_pool(_min_capacity, _max_capacity),
+    _memory_manager(&_memory_pool),
+    _counters(NULL) {}
+
+void ZServiceability::initialize() {
+  _counters = new ZServiceabilityCounters(_min_capacity, _max_capacity);
+}
+
+MemoryPool* ZServiceability::memory_pool() {
+  return &_memory_pool;
+}
+
+GCMemoryManager* ZServiceability::memory_manager() {
+  return &_memory_manager;
+}
+
+ZServiceabilityCounters* ZServiceability::counters() {
+  return _counters;
+}
+
+ZServiceabilityMemoryUsageTracker::~ZServiceabilityMemoryUsageTracker() {
+  MemoryService::track_memory_usage();
+}
+
+ZServiceabilityManagerStatsTracer::ZServiceabilityManagerStatsTracer(bool is_gc_begin, bool is_gc_end) :
+    _stats(ZHeap::heap()->serviceability_memory_manager(),
+           ZCollectedHeap::heap()->gc_cause() /* cause */,
+           is_gc_begin /* recordGCBeginTime */,
+           is_gc_begin /* recordPreGCUsage */,
+           true        /* recordPeakUsage */,
+           is_gc_end   /* recordPostGCusage */,
+           true        /* recordAccumulatedGCTime */,
+           is_gc_end   /* recordGCEndTime */,
+           is_gc_end   /* countCollection */) {}
+
+ZServiceabilityCountersTracer::ZServiceabilityCountersTracer() {
+  // Nothing to trace with TraceCollectorStats, since ZGC has
+  // neither a young collector or a full collector.
+}
+
+ZServiceabilityCountersTracer::~ZServiceabilityCountersTracer() {
+  ZHeap::heap()->serviceability_counters()->update_sizes();
+}
diff --git a/src/hotspot/share/gc/z/zServiceability.hpp b/src/hotspot/share/gc/z/zServiceability.hpp
new file mode 100644
index 00000000000..354ff5403e2
--- /dev/null
+++ b/src/hotspot/share/gc/z/zServiceability.hpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZSERVICEABILITY_HPP
+#define SHARE_GC_Z_ZSERVICEABILITY_HPP
+
+#include "memory/allocation.hpp"
+#include "services/memoryManager.hpp"
+#include "services/memoryPool.hpp"
+#include "services/memoryService.hpp"
+
+class ZServiceabilityCounters;
+
+class ZServiceabilityMemoryPool : public CollectedMemoryPool {
+public:
+  ZServiceabilityMemoryPool(size_t min_capacity, size_t max_capacity);
+
+  virtual size_t used_in_bytes();
+  virtual MemoryUsage get_memory_usage();
+};
+
+class ZServiceabilityMemoryManager : public GCMemoryManager {
+public:
+  ZServiceabilityMemoryManager(ZServiceabilityMemoryPool* pool);
+};
+
+class ZServiceability {
+private:
+  const size_t                 _min_capacity;
+  const size_t                 _max_capacity;
+  ZServiceabilityMemoryPool    _memory_pool;
+  ZServiceabilityMemoryManager _memory_manager;
+  ZServiceabilityCounters*     _counters;
+
+public:
+  ZServiceability(size_t min_capacity, size_t max_capacity);
+
+  void initialize();
+
+  MemoryPool* memory_pool();
+  GCMemoryManager* memory_manager();
+  ZServiceabilityCounters* counters();
+};
+
+class ZServiceabilityMemoryUsageTracker {
+public:
+  ~ZServiceabilityMemoryUsageTracker();
+};
+
+class ZServiceabilityManagerStatsTracer {
+private:
+  TraceMemoryManagerStats _stats;
+
+public:
+  ZServiceabilityManagerStatsTracer(bool is_gc_begin, bool is_gc_end);
+};
+
+class ZServiceabilityCountersTracer {
+public:
+  ZServiceabilityCountersTracer();
+  ~ZServiceabilityCountersTracer();
+};
+
+template <bool IsGCStart, bool IsGCEnd>
+class ZServiceabilityTracer : public StackObj {
+private:
+  ZServiceabilityMemoryUsageTracker _memory_usage_tracker;
+  ZServiceabilityManagerStatsTracer _manager_stats_tracer;
+  ZServiceabilityCountersTracer     _counters_tracer;
+
+public:
+  ZServiceabilityTracer() :
+      _memory_usage_tracker(),
+      _manager_stats_tracer(IsGCStart, IsGCEnd),
+      _counters_tracer() {}
+};
+
+typedef ZServiceabilityTracer<true,  false> ZServiceabilityMarkStartTracer;
+typedef ZServiceabilityTracer<false, false> ZServiceabilityMarkEndTracer;
+typedef ZServiceabilityTracer<false, true>  ZServiceabilityRelocateStartTracer;
+
+#endif // SHARE_GC_Z_ZSERVICEABILITY_HPP
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
new file mode 100644
index 00000000000..bf5a5fd239e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -0,0 +1,1366 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zCPU.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zLargePages.inline.hpp"
+#include "gc/z/zNMethodTable.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTracer.inline.hpp"
+#include "gc/z/zUtils.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/os.hpp"
+#include "runtime/timer.hpp"
+#include "utilities/align.hpp"
+#include "utilities/compilerWarnings.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/ticks.hpp"
+
+//
+// Stat sampler/counter data
+//
+struct ZStatSamplerData {
+  uint64_t _nsamples;
+  uint64_t _sum;
+  uint64_t _max;
+
+  ZStatSamplerData() :
+    _nsamples(0),
+    _sum(0),
+    _max(0) {}
+
+  void add(const ZStatSamplerData& new_sample) {
+    _nsamples += new_sample._nsamples;
+    _sum += new_sample._nsamples;
+    _max = MAX2(_max, new_sample._max);
+  }
+};
+
+struct ZStatCounterData {
+  uint64_t _counter;
+
+  ZStatCounterData() :
+    _counter(0) {}
+};
+
+//
+// Stat sampler history
+//
+template <size_t size>
+class ZStatSamplerHistoryInterval {
+private:
+  size_t           _next;
+  ZStatSamplerData _samples[size];
+  ZStatSamplerData _accumulated;
+  ZStatSamplerData _total;
+
+public:
+  ZStatSamplerHistoryInterval() :
+      _next(0),
+      _samples(),
+      _total(),
+      _accumulated() {}
+
+  bool add(const ZStatSamplerData& new_sample) {
+    // Insert sample
+    const ZStatSamplerData old_sample = _samples[_next];
+    _samples[_next] = new_sample;
+
+    // Adjust accumulated
+    _accumulated._nsamples += new_sample._nsamples;
+    _accumulated._sum += new_sample._sum;
+    _accumulated._max = MAX2(_accumulated._max, new_sample._max);
+
+    // Adjust total
+    _total._nsamples -= old_sample._nsamples;
+    _total._sum -= old_sample._sum;
+    _total._nsamples += new_sample._nsamples;
+    _total._sum += new_sample._sum;
+    if (_total._max < new_sample._max) {
+      // Found new max
+      _total._max = new_sample._max;
+    } else if (_total._max == old_sample._max) {
+      // Removed old max, reset and find new max
+      _total._max = 0;
+      for (size_t i = 0; i < size; i++) {
+        if (_total._max < _samples[i]._max) {
+          _total._max = _samples[i]._max;
+        }
+      }
+    }
+
+    // Adjust next
+    if (++_next == size) {
+      _next = 0;
+
+      // Clear accumulated
+      const ZStatSamplerData zero;
+      _accumulated = zero;
+
+      // Became full
+      return true;
+    }
+
+    // Not yet full
+    return false;
+  }
+
+  const ZStatSamplerData& total() const {
+    return _total;
+  }
+
+  const ZStatSamplerData& accumulated() const {
+    return _accumulated;
+  }
+};
+
+class ZStatSamplerHistory : public CHeapObj<mtGC> {
+private:
+  ZStatSamplerHistoryInterval<10> _10seconds;
+  ZStatSamplerHistoryInterval<60> _10minutes;
+  ZStatSamplerHistoryInterval<60> _10hours;
+  ZStatSamplerData                _total;
+
+  uint64_t avg(uint64_t sum, uint64_t nsamples) const {
+    return (nsamples > 0) ? sum / nsamples : 0;
+  }
+
+public:
+  ZStatSamplerHistory() :
+      _10seconds(),
+      _10minutes(),
+      _10hours(),
+      _total() {}
+
+  void add(const ZStatSamplerData& new_sample) {
+    if (_10seconds.add(new_sample)) {
+      if (_10minutes.add(_10seconds.total())) {
+        if (_10hours.add(_10minutes.total())) {
+          _total.add(_10hours.total());
+        }
+      }
+    }
+  }
+
+  uint64_t avg_10_seconds() const {
+    const uint64_t sum      = _10seconds.total()._sum;
+    const uint64_t nsamples = _10seconds.total()._nsamples;
+    return avg(sum, nsamples);
+  }
+
+  uint64_t avg_10_minutes() const {
+    const uint64_t sum      = _10seconds.accumulated()._sum +
+                              _10minutes.total()._sum;
+    const uint64_t nsamples = _10seconds.accumulated()._nsamples +
+                              _10minutes.total()._nsamples;
+    return avg(sum, nsamples);
+  }
+
+  uint64_t avg_10_hours() const {
+    const uint64_t sum      = _10seconds.accumulated()._sum +
+                              _10minutes.accumulated()._sum +
+                              _10hours.total()._sum;
+    const uint64_t nsamples = _10seconds.accumulated()._nsamples +
+                              _10minutes.accumulated()._nsamples +
+                              _10hours.total()._nsamples;
+    return avg(sum, nsamples);
+  }
+
+  uint64_t avg_total() const {
+    const uint64_t sum      = _10seconds.accumulated()._sum +
+                              _10minutes.accumulated()._sum +
+                              _10hours.accumulated()._sum +
+                              _total._sum;
+    const uint64_t nsamples = _10seconds.accumulated()._nsamples +
+                              _10minutes.accumulated()._nsamples +
+                              _10hours.accumulated()._nsamples +
+                              _total._nsamples;
+    return avg(sum, nsamples);
+  }
+
+  uint64_t max_10_seconds() const {
+    return _10seconds.total()._max;
+  }
+
+  uint64_t max_10_minutes() const {
+    return MAX2(_10seconds.accumulated()._max,
+                _10minutes.total()._max);
+  }
+
+  uint64_t max_10_hours() const {
+    return MAX3(_10seconds.accumulated()._max,
+                _10minutes.accumulated()._max,
+                _10hours.total()._max);
+  }
+
+  uint64_t max_total() const {
+    return MAX4(_10seconds.accumulated()._max,
+                _10minutes.accumulated()._max,
+                _10hours.accumulated()._max,
+                _total._max);
+  }
+};
+
+//
+// Stat unit printers
+//
+void ZStatUnitTime(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history) {
+  log.print(" %10s: %-40s  "
+            "%9.3f / %-9.3f "
+            "%9.3f / %-9.3f "
+            "%9.3f / %-9.3f "
+            "%9.3f / %-9.3f   ms",
+            sampler.group(),
+            sampler.name(),
+            TimeHelper::counter_to_millis(history.avg_10_seconds()),
+            TimeHelper::counter_to_millis(history.max_10_seconds()),
+            TimeHelper::counter_to_millis(history.avg_10_minutes()),
+            TimeHelper::counter_to_millis(history.max_10_minutes()),
+            TimeHelper::counter_to_millis(history.avg_10_hours()),
+            TimeHelper::counter_to_millis(history.max_10_hours()),
+            TimeHelper::counter_to_millis(history.avg_total()),
+            TimeHelper::counter_to_millis(history.max_total()));
+}
+
+void ZStatUnitBytes(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history) {
+  log.print(" %10s: %-40s  "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) "   MB",
+            sampler.group(),
+            sampler.name(),
+            history.avg_10_seconds() / M,
+            history.max_10_seconds() / M,
+            history.avg_10_minutes() / M,
+            history.max_10_minutes() / M,
+            history.avg_10_hours() / M,
+            history.max_10_hours() / M,
+            history.avg_total() / M,
+            history.max_total() / M);
+}
+
+void ZStatUnitThreads(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history) {
+  log.print(" %10s: %-40s  "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) "   threads",
+            sampler.group(),
+            sampler.name(),
+            history.avg_10_seconds(),
+            history.max_10_seconds(),
+            history.avg_10_minutes(),
+            history.max_10_minutes(),
+            history.avg_10_hours(),
+            history.max_10_hours(),
+            history.avg_total(),
+            history.max_total());
+}
+
+void ZStatUnitBytesPerSecond(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history) {
+  log.print(" %10s: %-40s  "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) "   MB/s",
+            sampler.group(),
+            sampler.name(),
+            history.avg_10_seconds() / M,
+            history.max_10_seconds() / M,
+            history.avg_10_minutes() / M,
+            history.max_10_minutes() / M,
+            history.avg_10_hours() / M,
+            history.max_10_hours() / M,
+            history.avg_total() / M,
+            history.max_total() / M);
+}
+
+void ZStatUnitOpsPerSecond(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history) {
+  log.print(" %10s: %-40s  "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) " "
+            UINT64_FORMAT_W(9) " / " UINT64_FORMAT_W(-9) "   ops/s",
+            sampler.group(),
+            sampler.name(),
+            history.avg_10_seconds(),
+            history.max_10_seconds(),
+            history.avg_10_minutes(),
+            history.max_10_minutes(),
+            history.avg_10_hours(),
+            history.max_10_hours(),
+            history.avg_total(),
+            history.max_total());
+}
+
+//
+// Stat value
+//
+uintptr_t ZStatValue::_base = 0;
+uint32_t  ZStatValue::_cpu_offset = 0;
+
+ZStatValue::ZStatValue(const char* group,
+                          const char* name,
+                          uint32_t id,
+                          uint32_t size) :
+    _group(group),
+    _name(name),
+    _id(id),
+    _offset(_cpu_offset) {
+  assert(_base == 0, "Already initialized");
+  _cpu_offset += size;
+}
+
+template <typename T>
+T* ZStatValue::get_cpu_local(uint32_t cpu) const {
+  assert(_base != 0, "Not initialized");
+  const uintptr_t cpu_base = _base + (_cpu_offset * cpu);
+  const uintptr_t value_addr = cpu_base + _offset;
+  return (T*)value_addr;
+}
+
+void ZStatValue::initialize() {
+  // Finalize and align CPU offset
+  _cpu_offset = align_up(_cpu_offset, ZCacheLineSize);
+
+  // Allocation aligned memory
+  const size_t size = _cpu_offset * ZCPU::count();
+  _base = ZUtils::alloc_aligned(ZCacheLineSize, size);
+  memset((void*)_base, 0, size);
+}
+
+const char* ZStatValue::group() const {
+  return _group;
+}
+
+const char* ZStatValue::name() const {
+  return _name;
+}
+
+uint32_t ZStatValue::id() const {
+  return _id;
+}
+
+//
+// Stat iterable value
+//
+template <typename T> uint32_t ZStatIterableValue<T>::_count = 0;
+template <typename T> T*       ZStatIterableValue<T>::_first = NULL;
+
+template <typename T>
+ZStatIterableValue<T>::ZStatIterableValue(const char* group,
+                                          const char* name,
+                                          uint32_t size) :
+    ZStatValue(group, name, _count++, size),
+    _next(insert()) {}
+
+template <typename T>
+T* ZStatIterableValue<T>::insert() const {
+  T** current = &_first;
+
+  while (*current != NULL) {
+    // First sort by group, then by name
+    const int group_cmp = strcmp((*current)->group(), group());
+    const int name_cmp = strcmp((*current)->name(), name());
+    if ((group_cmp > 0) || (group_cmp == 0 && name_cmp > 0)) {
+      break;
+    }
+
+    current = &(*current)->_next;
+  }
+
+  T* const next = *current;
+  *current = (T*)this;
+  return next;
+}
+
+//
+// Stat sampler
+//
+ZStatSampler::ZStatSampler(const char* group, const char* name, ZStatUnitPrinter printer) :
+    ZStatIterableValue(group, name, sizeof(ZStatSamplerData)),
+    _printer(printer) {}
+
+ZStatSamplerData* ZStatSampler::get() const {
+  return get_cpu_local<ZStatSamplerData>(ZCPU::id());
+}
+
+ZStatSamplerData ZStatSampler::collect_and_reset() const {
+  ZStatSamplerData all;
+
+  const uint32_t ncpus = ZCPU::count();
+  for (uint32_t i = 0; i < ncpus; i++) {
+    ZStatSamplerData* const cpu_data = get_cpu_local<ZStatSamplerData>(i);
+    if (cpu_data->_nsamples > 0) {
+      const uint64_t nsamples = Atomic::xchg((uint64_t)0, &cpu_data->_nsamples);
+      const uint64_t sum = Atomic::xchg((uint64_t)0, &cpu_data->_sum);
+      const uint64_t max = Atomic::xchg((uint64_t)0, &cpu_data->_max);
+      all._nsamples += nsamples;
+      all._sum += sum;
+      if (all._max < max) {
+        all._max = max;
+      }
+    }
+  }
+
+  return all;
+}
+
+ZStatUnitPrinter ZStatSampler::printer() const {
+  return _printer;
+}
+
+//
+// Stat counter
+//
+ZStatCounter::ZStatCounter(const char* group, const char* name, ZStatUnitPrinter printer) :
+    ZStatIterableValue(group, name, sizeof(ZStatCounterData)),
+    _sampler(group, name, printer) {}
+
+ZStatCounterData* ZStatCounter::get() const {
+  return get_cpu_local<ZStatCounterData>(ZCPU::id());
+}
+
+void ZStatCounter::sample_and_reset() const {
+  uint64_t counter = 0;
+
+  const uint32_t ncpus = ZCPU::count();
+  for (uint32_t i = 0; i < ncpus; i++) {
+    ZStatCounterData* const cpu_data = get_cpu_local<ZStatCounterData>(i);
+    counter += Atomic::xchg((uint64_t)0, &cpu_data->_counter);
+  }
+
+  ZStatSample(_sampler, counter);
+}
+
+//
+// Stat unsampled counter
+//
+ZStatUnsampledCounter::ZStatUnsampledCounter(const char* name) :
+    ZStatIterableValue("Unsampled", name, sizeof(ZStatCounterData)) {}
+
+ZStatCounterData* ZStatUnsampledCounter::get() const {
+  return get_cpu_local<ZStatCounterData>(ZCPU::id());
+}
+
+ZStatCounterData ZStatUnsampledCounter::collect_and_reset() const {
+  ZStatCounterData all;
+
+  const uint32_t ncpus = ZCPU::count();
+  for (uint32_t i = 0; i < ncpus; i++) {
+    ZStatCounterData* const cpu_data = get_cpu_local<ZStatCounterData>(i);
+    all._counter += Atomic::xchg((uint64_t)0, &cpu_data->_counter);
+  }
+
+  return all;
+}
+
+//
+// Stat MMU (Mimimum Mutator Utilization)
+//
+ZStatMMUPause::ZStatMMUPause() :
+    _start(0.0),
+    _end(0.0) {}
+
+ZStatMMUPause::ZStatMMUPause(const Ticks& start, const Ticks& end) :
+    _start(TimeHelper::counter_to_millis(start.value())),
+    _end(TimeHelper::counter_to_millis(end.value())) {}
+
+double ZStatMMUPause::end() const {
+  return _end;
+}
+
+double ZStatMMUPause::overlap(double start, double end) const {
+  const double start_max = MAX2(start, _start);
+  const double end_min = MIN2(end, _end);
+
+  if (end_min > start_max) {
+    // Overlap found
+    return end_min - start_max;
+  }
+
+  // No overlap
+  return 0.0;
+}
+
+size_t ZStatMMU::_next = 0;
+size_t ZStatMMU::_npauses = 0;
+ZStatMMUPause ZStatMMU::_pauses[200];
+double ZStatMMU::_mmu_2ms = 100.0;
+double ZStatMMU::_mmu_5ms = 100.0;
+double ZStatMMU::_mmu_10ms = 100.0;
+double ZStatMMU::_mmu_20ms = 100.0;
+double ZStatMMU::_mmu_50ms = 100.0;
+double ZStatMMU::_mmu_100ms = 100.0;
+
+const ZStatMMUPause& ZStatMMU::pause(size_t index) {
+  return _pauses[(_next - index - 1) % ARRAY_SIZE(_pauses)];
+}
+
+double ZStatMMU::calculate_mmu(double time_slice) {
+  const double end = pause(0).end();
+  const double start = end - time_slice;
+  double time_paused = 0.0;
+
+  // Find all overlapping pauses
+  for (size_t i = 0; i < _npauses; i++) {
+    const double overlap = pause(i).overlap(start, end);
+    if (overlap == 0.0) {
+      // No overlap
+      break;
+    }
+
+    time_paused += overlap;
+  }
+
+  // Calculate MMU
+  const double time_mutator = time_slice - time_paused;
+  return percent_of(time_mutator, time_slice);
+}
+
+void ZStatMMU::register_pause(const Ticks& start, const Ticks& end) {
+  // Add pause
+  const size_t index = _next++ % ARRAY_SIZE(_pauses);
+  _pauses[index] = ZStatMMUPause(start, end);
+  _npauses = MIN2(_npauses + 1, ARRAY_SIZE(_pauses));
+
+  // Recalculate MMUs
+  _mmu_2ms    = MIN2(_mmu_2ms,   calculate_mmu(2));
+  _mmu_5ms    = MIN2(_mmu_5ms,   calculate_mmu(5));
+  _mmu_10ms   = MIN2(_mmu_10ms,  calculate_mmu(10));
+  _mmu_20ms   = MIN2(_mmu_20ms,  calculate_mmu(20));
+  _mmu_50ms   = MIN2(_mmu_50ms,  calculate_mmu(50));
+  _mmu_100ms  = MIN2(_mmu_100ms, calculate_mmu(100));
+}
+
+void ZStatMMU::print() {
+  log_info(gc, mmu)(
+     "MMU: 2ms/%.1f%%, 5ms/%.1f%%, 10ms/%.1f%%, 20ms/%.1f%%, 50ms/%.1f%%, 100ms/%.1f%%",
+     _mmu_2ms, _mmu_5ms, _mmu_10ms, _mmu_20ms, _mmu_50ms, _mmu_100ms);
+}
+
+//
+// Stat phases
+//
+ConcurrentGCTimer ZStatPhase::_timer;
+
+ZStatPhase::ZStatPhase(const char* group, const char* name) :
+    _sampler(group, name, ZStatUnitTime) {}
+
+void ZStatPhase::log_start(LogTargetHandle log, bool thread) const {
+  if (!log.is_enabled()) {
+    return;
+  }
+
+  if (thread) {
+    ResourceMark rm;
+    log.print("%s (%s)", name(), Thread::current()->name());
+  } else {
+    log.print("%s", name());
+  }
+}
+
+void ZStatPhase::log_end(LogTargetHandle log, const Tickspan& duration, bool thread) const {
+  if (!log.is_enabled()) {
+    return;
+  }
+
+  if (thread) {
+    ResourceMark rm;
+    log.print("%s (%s) %.3fms", name(), Thread::current()->name(), TimeHelper::counter_to_millis(duration.value()));
+  } else {
+    log.print("%s %.3fms", name(), TimeHelper::counter_to_millis(duration.value()));
+  }
+}
+
+ConcurrentGCTimer* ZStatPhase::timer() {
+  return &_timer;
+}
+
+const char* ZStatPhase::name() const {
+  return _sampler.name();
+}
+
+ZStatPhaseCycle::ZStatPhaseCycle(const char* name) :
+    ZStatPhase("Collector", name) {}
+
+void ZStatPhaseCycle::register_start(const Ticks& start) const {
+  timer()->register_gc_start(start);
+
+  ZTracer::tracer()->report_gc_start(ZCollectedHeap::heap()->gc_cause(), start);
+
+  ZCollectedHeap::heap()->print_heap_before_gc();
+  ZCollectedHeap::heap()->trace_heap_before_gc(ZTracer::tracer());
+
+  log_info(gc, start)("Garbage Collection (%s)",
+                       GCCause::to_string(ZCollectedHeap::heap()->gc_cause()));
+}
+
+#define ZUSED_FMT                       SIZE_FORMAT "M(%.0lf%%)"
+#define ZUSED_ARGS(size, max_capacity)  ((size) / M), (percent_of<size_t>(size, max_capacity))
+
+void ZStatPhaseCycle::register_end(const Ticks& start, const Ticks& end) const {
+  timer()->register_gc_end(end);
+
+  ZCollectedHeap::heap()->print_heap_after_gc();
+  ZCollectedHeap::heap()->trace_heap_after_gc(ZTracer::tracer());
+
+  ZTracer::tracer()->report_gc_end(end, timer()->time_partitions());
+
+  const Tickspan duration = end - start;
+  ZStatSample(_sampler, duration.value());
+
+  ZStatLoad::print();
+  ZStatMMU::print();
+  ZStatMark::print();
+  ZStatRelocation::print();
+  ZStatNMethods::print();
+  ZStatReferences::print();
+  ZStatHeap::print();
+
+  log_info(gc)("Garbage Collection (%s) " ZUSED_FMT "->" ZUSED_FMT,
+               GCCause::to_string(ZCollectedHeap::heap()->gc_cause()),
+               ZUSED_ARGS(ZStatHeap::used_at_mark_start(), ZStatHeap::max_capacity()),
+               ZUSED_ARGS(ZStatHeap::used_at_relocate_end(), ZStatHeap::max_capacity()));
+}
+
+Tickspan ZStatPhasePause::_max;
+
+ZStatPhasePause::ZStatPhasePause(const char* name) :
+    ZStatPhase("Phase", name) {}
+
+const Tickspan& ZStatPhasePause::max() {
+  return _max;
+}
+
+void ZStatPhasePause::register_start(const Ticks& start) const {
+  timer()->register_gc_pause_start(name(), start);
+
+  LogTarget(Debug, gc, phases, start) log;
+  log_start(log);
+}
+
+void ZStatPhasePause::register_end(const Ticks& start, const Ticks& end) const {
+  timer()->register_gc_pause_end(end);
+
+  const Tickspan duration = end - start;
+  ZStatSample(_sampler, duration.value());
+
+  // Track max pause time
+  if (_max < duration) {
+    _max = duration;
+  }
+
+  // Track minimum mutator utilization
+  ZStatMMU::register_pause(start, end);
+
+  LogTarget(Info, gc, phases) log;
+  log_end(log, duration);
+}
+
+ZStatPhaseConcurrent::ZStatPhaseConcurrent(const char* name) :
+    ZStatPhase("Phase", name) {}
+
+void ZStatPhaseConcurrent::register_start(const Ticks& start) const {
+  timer()->register_gc_concurrent_start(name(), start);
+
+  LogTarget(Debug, gc, phases, start) log;
+  log_start(log);
+}
+
+void ZStatPhaseConcurrent::register_end(const Ticks& start, const Ticks& end) const {
+  timer()->register_gc_concurrent_end(end);
+
+  const Tickspan duration = end - start;
+  ZStatSample(_sampler, duration.value());
+
+  LogTarget(Info, gc, phases) log;
+  log_end(log, duration);
+}
+
+ZStatSubPhase::ZStatSubPhase(const char* name) :
+    ZStatPhase("Subphase", name) {}
+
+void ZStatSubPhase::register_start(const Ticks& start) const {
+  LogTarget(Debug, gc, phases, start) log;
+  log_start(log, true /* thread */);
+}
+
+void ZStatSubPhase::register_end(const Ticks& start, const Ticks& end) const {
+  ZTracer::tracer()->report_thread_phase(*this, start, end);
+
+  const Tickspan duration = end - start;
+  ZStatSample(_sampler, duration.value());
+
+  LogTarget(Debug, gc, phases) log;
+  log_end(log, duration, true /* thread */);
+}
+
+ZStatCriticalPhase::ZStatCriticalPhase(const char* name, bool verbose) :
+    ZStatPhase("Critical", name),
+    _counter("Critical", name, ZStatUnitOpsPerSecond),
+    _verbose(verbose) {}
+
+void ZStatCriticalPhase::register_start(const Ticks& start) const {
+  LogTarget(Debug, gc, start) log;
+  log_start(log, true /* thread */);
+}
+
+void ZStatCriticalPhase::register_end(const Ticks& start, const Ticks& end) const {
+  ZTracer::tracer()->report_thread_phase(*this, start, end);
+
+  const Tickspan duration = end - start;
+  ZStatSample(_sampler, duration.value());
+  ZStatInc(_counter);
+
+  if (_verbose) {
+    LogTarget(Info, gc) log;
+    log_end(log, duration, true /* thread */);
+  } else {
+    LogTarget(Debug, gc) log;
+    log_end(log, duration, true /* thread */);
+  }
+}
+
+//
+// Stat sample/inc
+//
+void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace) {
+  ZStatSamplerData* const cpu_data = sampler.get();
+  Atomic::add(1u, &cpu_data->_nsamples);
+  Atomic::add(value, &cpu_data->_sum);
+
+  uint64_t max = cpu_data->_max;
+  for (;;) {
+    if (max >= value) {
+      // Not max
+      break;
+    }
+
+    const uint64_t new_max = value;
+    const uint64_t prev_max = Atomic::cmpxchg(new_max, &cpu_data->_max, max);
+    if (prev_max == max) {
+      // Success
+      break;
+    }
+
+    // Retry
+    max = prev_max;
+  }
+
+  if (trace) {
+    ZTracer::tracer()->report_stat_sampler(sampler, value);
+  }
+}
+
+void ZStatInc(const ZStatCounter& counter, uint64_t increment, bool trace) {
+  ZStatCounterData* const cpu_data = counter.get();
+  const uint64_t value = Atomic::add(increment, &cpu_data->_counter);
+
+  if (trace) {
+    ZTracer::tracer()->report_stat_counter(counter, increment, value);
+  }
+}
+
+void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment) {
+  ZStatCounterData* const cpu_data = counter.get();
+  Atomic::add(increment, &cpu_data->_counter);
+}
+
+//
+// Stat allocation rate
+//
+const ZStatUnsampledCounter ZStatAllocRate::_counter("Allocation Rate");
+TruncatedSeq                ZStatAllocRate::_rate(ZStatAllocRate::sample_window_sec * ZStatAllocRate::sample_hz);
+TruncatedSeq                ZStatAllocRate::_rate_avg(ZStatAllocRate::sample_window_sec * ZStatAllocRate::sample_hz);
+
+const ZStatUnsampledCounter& ZStatAllocRate::counter() {
+  return _counter;
+}
+
+uint64_t ZStatAllocRate::sample_and_reset() {
+  const ZStatCounterData bytes_per_sample = _counter.collect_and_reset();
+  const uint64_t bytes_per_second = bytes_per_sample._counter * sample_hz;
+
+  _rate.add(bytes_per_second);
+  _rate_avg.add(_rate.avg());
+
+  return bytes_per_second;
+}
+
+double ZStatAllocRate::avg() {
+  return _rate.avg();
+}
+
+double ZStatAllocRate::avg_sd() {
+  return _rate_avg.sd();
+}
+
+//
+// Stat thread
+//
+ZStat::ZStat() :
+    _metronome(sample_hz) {
+  set_name("ZStat");
+  create_and_start();
+}
+
+void ZStat::sample_and_collect(ZStatSamplerHistory* history) const {
+  // Sample counters
+  for (const ZStatCounter* counter = ZStatCounter::first(); counter != NULL; counter = counter->next()) {
+    counter->sample_and_reset();
+  }
+
+  // Collect samples
+  for (const ZStatSampler* sampler = ZStatSampler::first(); sampler != NULL; sampler = sampler->next()) {
+    ZStatSamplerHistory& sampler_history = history[sampler->id()];
+    sampler_history.add(sampler->collect_and_reset());
+  }
+}
+
+bool ZStat::should_print(LogTargetHandle log) const {
+  return log.is_enabled() && (_metronome.nticks() % ZStatisticsInterval == 0);
+}
+
+void ZStat::print(LogTargetHandle log, const ZStatSamplerHistory* history) const {
+  // Print
+  log.print("=== Garbage Collection Statistics =======================================================================================================================");
+  log.print("                                                             Last 10s              Last 10m              Last 10h                Total");
+  log.print("                                                             Avg / Max             Avg / Max             Avg / Max             Avg / Max");
+
+  for (const ZStatSampler* sampler = ZStatSampler::first(); sampler != NULL; sampler = sampler->next()) {
+    const ZStatSamplerHistory& sampler_history = history[sampler->id()];
+    const ZStatUnitPrinter printer = sampler->printer();
+    printer(log, *sampler, sampler_history);
+  }
+
+  log.print("=========================================================================================================================================================");
+}
+
+void ZStat::run_service() {
+  ZStatSamplerHistory* const history = new ZStatSamplerHistory[ZStatSampler::count()];
+  LogTarget(Info, gc, stats) log;
+
+  // Main loop
+  while (_metronome.wait_for_tick()) {
+    sample_and_collect(history);
+    if (should_print(log)) {
+      print(log, history);
+    }
+  }
+
+  delete [] history;
+}
+
+void ZStat::stop_service() {
+  _metronome.stop();
+}
+
+//
+// Stat table
+//
+class ZStatTablePrinter {
+private:
+  static const size_t _buffer_size = 256;
+
+  const size_t _column0_width;
+  const size_t _columnN_width;
+  char         _buffer[_buffer_size];
+
+public:
+  class ZColumn {
+  private:
+    char* const  _buffer;
+    const size_t _position;
+    const size_t _width;
+    const size_t _width_next;
+
+    ZColumn next() const {
+      // Insert space between columns
+      _buffer[_position + _width] = ' ';
+      return ZColumn(_buffer, _position + _width + 1, _width_next, _width_next);
+    }
+
+    size_t print(size_t position, const char* fmt, va_list va) {
+      const int res = jio_vsnprintf(_buffer + position, _buffer_size - position, fmt, va);
+      if (res < 0) {
+        return 0;
+      }
+
+      return (size_t)res;
+    }
+
+  public:
+    ZColumn(char* buffer, size_t position, size_t width, size_t width_next) :
+        _buffer(buffer),
+        _position(position),
+        _width(width),
+        _width_next(width_next) {}
+
+    ZColumn left(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+      va_list va;
+
+      va_start(va, fmt);
+      const size_t written = print(_position, fmt, va);
+      va_end(va);
+
+      if (written < _width) {
+        // Fill empty space
+        memset(_buffer + _position + written, ' ', _width - written);
+      }
+
+      return next();
+    }
+
+    ZColumn right(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+      va_list va;
+
+      va_start(va, fmt);
+      const size_t written = print(_position, fmt, va);
+      va_end(va);
+
+      if (written > _width) {
+        // Line too long
+        return fill('?');
+      }
+
+      if (written < _width) {
+        // Short line, move all to right
+        memmove(_buffer + _position + _width - written, _buffer + _position, written);
+
+        // Fill empty space
+        memset(_buffer + _position, ' ', _width - written);
+      }
+
+      return next();
+    }
+
+    ZColumn center(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+      va_list va;
+
+      va_start(va, fmt);
+      const size_t written = print(_position, fmt, va);
+      va_end(va);
+
+      if (written > _width) {
+        // Line too long
+        return fill('?');
+      }
+
+      if (written < _width) {
+        // Short line, move all to center
+        const size_t start_space = (_width - written) / 2;
+        const size_t end_space = _width - written - start_space;
+        memmove(_buffer + _position + start_space, _buffer + _position, written);
+
+        // Fill empty spaces
+        memset(_buffer + _position, ' ', start_space);
+        memset(_buffer + _position + start_space + written, ' ', end_space);
+      }
+
+      return next();
+    }
+
+    ZColumn fill(char filler = ' ') {
+      memset(_buffer + _position, filler, _width);
+      return next();
+    }
+
+    const char* end() {
+      _buffer[_position] = '\0';
+      return _buffer;
+    }
+  };
+
+public:
+  ZStatTablePrinter(size_t column0_width, size_t columnN_width) :
+      _column0_width(column0_width),
+      _columnN_width(columnN_width) {}
+
+  ZColumn operator()() {
+    return ZColumn(_buffer, 0, _column0_width, _columnN_width);
+  }
+};
+
+//
+// Stat cycle
+//
+uint64_t  ZStatCycle::_ncycles = 0;
+Ticks     ZStatCycle::_start_of_last;
+Ticks     ZStatCycle::_end_of_last;
+NumberSeq ZStatCycle::_normalized_duration(0.3 /* alpha */);
+
+void ZStatCycle::at_start() {
+  _start_of_last = Ticks::now();
+}
+
+void ZStatCycle::at_end(double boost_factor) {
+  _end_of_last = Ticks::now();
+  _ncycles++;
+
+  // Calculate normalized cycle duration. The measured duration is
+  // normalized using the boost factor to avoid artificial deflation
+  // of the duration when boost mode is enabled.
+  const double duration = (_end_of_last - _start_of_last).seconds();
+  const double normalized_duration = duration * boost_factor;
+  _normalized_duration.add(normalized_duration);
+}
+
+uint64_t ZStatCycle::ncycles() {
+  return _ncycles;
+}
+
+const AbsSeq& ZStatCycle::normalized_duration() {
+  return _normalized_duration;
+}
+
+double ZStatCycle::time_since_last() {
+  if (_ncycles == 0) {
+    // Return time since VM start-up
+    return os::elapsedTime();
+  }
+
+  const Ticks now = Ticks::now();
+  const Tickspan time_since_last = now - _end_of_last;
+  return time_since_last.seconds();
+}
+
+//
+// Stat load
+//
+void ZStatLoad::print() {
+  double loadavg[3] = {};
+  os::loadavg(loadavg, ARRAY_SIZE(loadavg));
+  log_info(gc, load)("Load: %.2f/%.2f/%.2f", loadavg[0], loadavg[1], loadavg[2]);
+}
+
+//
+// Stat mark
+//
+size_t ZStatMark::_nstripes;
+size_t ZStatMark::_nproactiveflush;
+size_t ZStatMark::_nterminateflush;
+size_t ZStatMark::_ntrycomplete;
+size_t ZStatMark::_ncontinue;
+
+void ZStatMark::set_at_mark_start(size_t nstripes) {
+  _nstripes = nstripes;
+}
+
+void ZStatMark::set_at_mark_end(size_t nproactiveflush,
+                                size_t nterminateflush,
+                                size_t ntrycomplete,
+                                size_t ncontinue) {
+  _nproactiveflush = nproactiveflush;
+  _nterminateflush = nterminateflush;
+  _ntrycomplete = ntrycomplete;
+  _ncontinue = ncontinue;
+}
+
+void ZStatMark::print() {
+  log_info(gc, marking)("Mark: "
+                        SIZE_FORMAT " stripe(s), "
+                        SIZE_FORMAT " proactive flush(es), "
+                        SIZE_FORMAT " terminate flush(es), "
+                        SIZE_FORMAT " completion(s), "
+                        SIZE_FORMAT " continuation(s) ",
+                        _nstripes,
+                        _nproactiveflush,
+                        _nterminateflush,
+                        _ntrycomplete,
+                        _ncontinue);
+}
+
+//
+// Stat relocation
+//
+size_t ZStatRelocation::_relocating;
+bool ZStatRelocation::_success;
+
+void ZStatRelocation::set_at_select_relocation_set(size_t relocating) {
+  _relocating = relocating;
+}
+
+void ZStatRelocation::set_at_relocate_end(bool success) {
+  _success = success;
+}
+
+void ZStatRelocation::print() {
+  if (_success) {
+    log_info(gc, reloc)("Relocation: Successful, " SIZE_FORMAT "M relocated", _relocating / M);
+  } else {
+    log_info(gc, reloc)("Relocation: Incomplete");
+  }
+}
+
+//
+// Stat nmethods
+//
+void ZStatNMethods::print() {
+  log_info(gc, nmethod)("NMethods: " SIZE_FORMAT " registered, " SIZE_FORMAT " unregistered",
+                        ZNMethodTable::registered_nmethods(),
+                        ZNMethodTable::unregistered_nmethods());
+}
+
+//
+// Stat references
+//
+ZStatReferences::ZCount ZStatReferences::_soft;
+ZStatReferences::ZCount ZStatReferences::_weak;
+ZStatReferences::ZCount ZStatReferences::_final;
+ZStatReferences::ZCount ZStatReferences::_phantom;
+
+void ZStatReferences::set(ZCount* count, size_t encountered, size_t discovered, size_t enqueued) {
+  count->encountered = encountered;
+  count->discovered = discovered;
+  count->enqueued = enqueued;
+}
+
+void ZStatReferences::set_soft(size_t encountered, size_t discovered, size_t enqueued) {
+  set(&_soft, encountered, discovered, enqueued);
+}
+
+void ZStatReferences::set_weak(size_t encountered, size_t discovered, size_t enqueued) {
+  set(&_weak, encountered, discovered, enqueued);
+}
+
+void ZStatReferences::set_final(size_t encountered, size_t discovered, size_t enqueued) {
+  set(&_final, encountered, discovered, enqueued);
+}
+
+void ZStatReferences::set_phantom(size_t encountered, size_t discovered, size_t enqueued) {
+  set(&_phantom, encountered, discovered, enqueued);
+}
+
+void ZStatReferences::print(const char* name, const ZStatReferences::ZCount& ref) {
+  log_info(gc, ref)("%s: "
+                    SIZE_FORMAT " encountered, "
+                    SIZE_FORMAT " discovered, "
+                    SIZE_FORMAT " enqueued",
+                    name,
+                    ref.encountered,
+                    ref.discovered,
+                    ref.enqueued);
+}
+
+void ZStatReferences::print() {
+  print("Soft", _soft);
+  print("Weak", _weak);
+  print("Final", _final);
+  print("Phantom", _phantom);
+}
+
+//
+// Stat heap
+//
+ZStatHeap::ZAtInitialize ZStatHeap::_at_initialize;
+ZStatHeap::ZAtMarkStart ZStatHeap::_at_mark_start;
+ZStatHeap::ZAtMarkEnd ZStatHeap::_at_mark_end;
+ZStatHeap::ZAtRelocateStart ZStatHeap::_at_relocate_start;
+ZStatHeap::ZAtRelocateEnd ZStatHeap::_at_relocate_end;
+
+#define ZSIZE_NA               "%9s", "-"
+#define ZSIZE_ARGS(size)       SIZE_FORMAT_W(8) "M (%.0lf%%)", \
+                               ((size) / M), (percent_of<size_t>(size, _at_initialize.max_capacity))
+
+size_t ZStatHeap::available(size_t used) {
+  return _at_initialize.max_capacity - used;
+}
+
+size_t ZStatHeap::reserve(size_t used) {
+  return MIN2(_at_initialize.max_reserve, available(used));
+}
+
+size_t ZStatHeap::free(size_t used) {
+  return available(used) - reserve(used);
+}
+
+void ZStatHeap::set_at_initialize(size_t max_capacity,
+                                  size_t max_reserve) {
+  _at_initialize.max_capacity = max_capacity;
+  _at_initialize.max_reserve = max_reserve;
+}
+
+void ZStatHeap::set_at_mark_start(size_t capacity,
+                                  size_t used) {
+  _at_mark_start.capacity = capacity;
+  _at_mark_start.reserve = reserve(used);
+  _at_mark_start.used = used;
+  _at_mark_start.free = free(used);
+}
+
+void ZStatHeap::set_at_mark_end(size_t capacity,
+                                size_t allocated,
+                                size_t used) {
+  _at_mark_end.capacity = capacity;
+  _at_mark_end.reserve = reserve(used);
+  _at_mark_end.allocated = allocated;
+  _at_mark_end.used = used;
+  _at_mark_end.free = free(used);
+}
+
+void ZStatHeap::set_at_select_relocation_set(size_t live,
+                                             size_t garbage,
+                                             size_t reclaimed) {
+  _at_mark_end.live = live;
+  _at_mark_end.garbage = garbage;
+
+  _at_relocate_start.garbage = garbage - reclaimed;
+  _at_relocate_start.reclaimed = reclaimed;
+}
+
+void ZStatHeap::set_at_relocate_start(size_t capacity,
+                                      size_t allocated,
+                                      size_t used) {
+  _at_relocate_start.capacity = capacity;
+  _at_relocate_start.reserve = reserve(used);
+  _at_relocate_start.allocated = allocated;
+  _at_relocate_start.used = used;
+  _at_relocate_start.free = free(used);
+}
+
+void ZStatHeap::set_at_relocate_end(size_t capacity,
+                                    size_t allocated,
+                                    size_t reclaimed,
+                                    size_t used,
+                                    size_t used_high,
+                                    size_t used_low) {
+  _at_relocate_end.capacity = capacity;
+  _at_relocate_end.capacity_high = capacity;
+  _at_relocate_end.capacity_low = _at_mark_start.capacity;
+  _at_relocate_end.reserve = reserve(used);
+  _at_relocate_end.reserve_high = reserve(used_low);
+  _at_relocate_end.reserve_low = reserve(used_high);
+  _at_relocate_end.garbage = _at_mark_end.garbage - reclaimed;
+  _at_relocate_end.allocated = allocated;
+  _at_relocate_end.reclaimed = reclaimed;
+  _at_relocate_end.used = used;
+  _at_relocate_end.used_high = used_high;
+  _at_relocate_end.used_low = used_low;
+  _at_relocate_end.free = free(used);
+  _at_relocate_end.free_high = free(used_low);
+  _at_relocate_end.free_low = free(used_high);
+}
+
+size_t ZStatHeap::max_capacity() {
+  return _at_initialize.max_capacity;
+}
+
+size_t ZStatHeap::used_at_mark_start() {
+  return _at_mark_start.used;
+}
+
+size_t ZStatHeap::used_at_relocate_end() {
+  return _at_relocate_end.used;
+}
+
+void ZStatHeap::print() {
+  ZStatTablePrinter table(10, 18);
+  log_info(gc, heap)("%s", table()
+                     .fill()
+                     .center("Mark Start")
+                     .center("Mark End")
+                     .center("Relocate Start")
+                     .center("Relocate End")
+                     .center("High")
+                     .center("Low")
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Capacity:")
+                     .left(ZSIZE_ARGS(_at_mark_start.capacity))
+                     .left(ZSIZE_ARGS(_at_mark_end.capacity))
+                     .left(ZSIZE_ARGS(_at_relocate_start.capacity))
+                     .left(ZSIZE_ARGS(_at_relocate_end.capacity))
+                     .left(ZSIZE_ARGS(_at_relocate_end.capacity_high))
+                     .left(ZSIZE_ARGS(_at_relocate_end.capacity_low))
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Reserve:")
+                     .left(ZSIZE_ARGS(_at_mark_start.reserve))
+                     .left(ZSIZE_ARGS(_at_mark_end.reserve))
+                     .left(ZSIZE_ARGS(_at_relocate_start.reserve))
+                     .left(ZSIZE_ARGS(_at_relocate_end.reserve))
+                     .left(ZSIZE_ARGS(_at_relocate_end.reserve_high))
+                     .left(ZSIZE_ARGS(_at_relocate_end.reserve_low))
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Free:")
+                     .left(ZSIZE_ARGS(_at_mark_start.free))
+                     .left(ZSIZE_ARGS(_at_mark_end.free))
+                     .left(ZSIZE_ARGS(_at_relocate_start.free))
+                     .left(ZSIZE_ARGS(_at_relocate_end.free))
+                     .left(ZSIZE_ARGS(_at_relocate_end.free_high))
+                     .left(ZSIZE_ARGS(_at_relocate_end.free_low))
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Used:")
+                     .left(ZSIZE_ARGS(_at_mark_start.used))
+                     .left(ZSIZE_ARGS(_at_mark_end.used))
+                     .left(ZSIZE_ARGS(_at_relocate_start.used))
+                     .left(ZSIZE_ARGS(_at_relocate_end.used))
+                     .left(ZSIZE_ARGS(_at_relocate_end.used_high))
+                     .left(ZSIZE_ARGS(_at_relocate_end.used_low))
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Live:")
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_ARGS(_at_mark_end.live))
+                     .left(ZSIZE_ARGS(_at_mark_end.live /* Same as at mark end */))
+                     .left(ZSIZE_ARGS(_at_mark_end.live /* Same as at mark end */))
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_NA)
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Allocated:")
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_ARGS(_at_mark_end.allocated))
+                     .left(ZSIZE_ARGS(_at_relocate_start.allocated))
+                     .left(ZSIZE_ARGS(_at_relocate_end.allocated))
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_NA)
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Garbage:")
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_ARGS(_at_mark_end.garbage))
+                     .left(ZSIZE_ARGS(_at_relocate_start.garbage))
+                     .left(ZSIZE_ARGS(_at_relocate_end.garbage))
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_NA)
+                     .end());
+  log_info(gc, heap)("%s", table()
+                     .right("Reclaimed:")
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_ARGS(_at_relocate_start.reclaimed))
+                     .left(ZSIZE_ARGS(_at_relocate_end.reclaimed))
+                     .left(ZSIZE_NA)
+                     .left(ZSIZE_NA)
+                     .end());
+}
diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp
new file mode 100644
index 00000000000..80abe5dbeba
--- /dev/null
+++ b/src/hotspot/share/gc/z/zStat.hpp
@@ -0,0 +1,519 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZSTAT_HPP
+#define SHARE_GC_Z_ZSTAT_HPP
+
+#include "gc/shared/concurrentGCThread.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/z/zMetronome.hpp"
+#include "logging/logHandle.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/numberSeq.hpp"
+#include "utilities/ticks.hpp"
+
+class ZPage;
+class ZStatSampler;
+class ZStatSamplerHistory;
+struct ZStatCounterData;
+struct ZStatSamplerData;
+
+//
+// Stat unit printers
+//
+typedef void (*ZStatUnitPrinter)(LogTargetHandle log, const ZStatSampler&, const ZStatSamplerHistory&);
+
+void ZStatUnitTime(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history);
+void ZStatUnitBytes(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history);
+void ZStatUnitThreads(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history);
+void ZStatUnitBytesPerSecond(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history);
+void ZStatUnitOpsPerSecond(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history);
+
+//
+// Stat value
+//
+class ZStatValue {
+private:
+  static uintptr_t _base;
+  static uint32_t  _cpu_offset;
+
+  const char* const _group;
+  const char* const _name;
+  const uint32_t    _id;
+  const uint32_t    _offset;
+
+protected:
+  ZStatValue(const char* group,
+             const char* name,
+             uint32_t id,
+             uint32_t size);
+
+  template <typename T> T* get_cpu_local(uint32_t cpu) const;
+
+public:
+  static void initialize();
+
+  const char* group() const;
+  const char* name() const;
+  uint32_t id() const;
+};
+
+//
+// Stat iterable value
+//
+template <typename T>
+class ZStatIterableValue : public ZStatValue {
+private:
+  static uint32_t _count;
+  static T*       _first;
+
+  T* _next;
+
+  T* insert() const;
+
+protected:
+  ZStatIterableValue(const char* group,
+                     const char* name,
+                     uint32_t size);
+
+public:
+  static uint32_t count() {
+    return _count;
+  }
+
+  static T* first() {
+    return _first;
+  }
+
+  T* next() const {
+    return _next;
+  }
+};
+
+//
+// Stat sampler
+//
+class ZStatSampler : public ZStatIterableValue<ZStatSampler> {
+private:
+  const ZStatUnitPrinter _printer;
+
+public:
+  ZStatSampler(const char* group,
+               const char* name,
+               ZStatUnitPrinter printer);
+
+  ZStatSamplerData* get() const;
+  ZStatSamplerData collect_and_reset() const;
+
+  ZStatUnitPrinter printer() const;
+};
+
+//
+// Stat counter
+//
+class ZStatCounter : public ZStatIterableValue<ZStatCounter> {
+private:
+  const ZStatSampler _sampler;
+
+public:
+  ZStatCounter(const char* group,
+               const char* name,
+               ZStatUnitPrinter printer);
+
+  ZStatCounterData* get() const;
+  void sample_and_reset() const;
+};
+
+//
+// Stat unsampled counter
+//
+class ZStatUnsampledCounter : public ZStatIterableValue<ZStatUnsampledCounter> {
+public:
+  ZStatUnsampledCounter(const char* name);
+
+  ZStatCounterData* get() const;
+  ZStatCounterData collect_and_reset() const;
+};
+
+//
+// Stat MMU (Mimimum Mutator Utilization)
+//
+class ZStatMMUPause {
+private:
+  double _start;
+  double _end;
+
+public:
+  ZStatMMUPause();
+  ZStatMMUPause(const Ticks& start, const Ticks& end);
+
+  double end() const;
+  double overlap(double start, double end) const;
+};
+
+class ZStatMMU {
+private:
+  static size_t        _next;
+  static size_t        _npauses;
+  static ZStatMMUPause _pauses[200]; // Record the last 200 pauses
+
+  static double _mmu_2ms;
+  static double _mmu_5ms;
+  static double _mmu_10ms;
+  static double _mmu_20ms;
+  static double _mmu_50ms;
+  static double _mmu_100ms;
+
+  static const ZStatMMUPause& pause(size_t index);
+  static double calculate_mmu(double time_slice);
+
+public:
+  static void register_pause(const Ticks& start, const Ticks& end);
+
+  static void print();
+};
+
+//
+// Stat phases
+//
+class ZStatPhase {
+private:
+  static ConcurrentGCTimer _timer;
+
+protected:
+  const ZStatSampler _sampler;
+
+  ZStatPhase(const char* group, const char* name);
+
+  void log_start(LogTargetHandle log, bool thread = false) const;
+  void log_end(LogTargetHandle log, const Tickspan& duration, bool thread = false) const;
+
+public:
+  static ConcurrentGCTimer* timer();
+
+  const char* name() const;
+
+  virtual void register_start(const Ticks& start) const = 0;
+  virtual void register_end(const Ticks& start, const Ticks& end) const = 0;
+};
+
+class ZStatPhaseCycle : public ZStatPhase {
+public:
+  ZStatPhaseCycle(const char* name);
+
+  virtual void register_start(const Ticks& start) const;
+  virtual void register_end(const Ticks& start, const Ticks& end) const;
+};
+
+class ZStatPhasePause : public ZStatPhase {
+private:
+  static Tickspan _max; // Max pause time
+
+public:
+  ZStatPhasePause(const char* name);
+
+  static const Tickspan& max();
+
+  virtual void register_start(const Ticks& start) const;
+  virtual void register_end(const Ticks& start, const Ticks& end) const;
+};
+
+class ZStatPhaseConcurrent : public ZStatPhase {
+public:
+  ZStatPhaseConcurrent(const char* name);
+
+  virtual void register_start(const Ticks& start) const;
+  virtual void register_end(const Ticks& start, const Ticks& end) const;
+};
+
+class ZStatSubPhase : public ZStatPhase {
+public:
+  ZStatSubPhase(const char* name);
+
+  virtual void register_start(const Ticks& start) const;
+  virtual void register_end(const Ticks& start, const Ticks& end) const;
+};
+
+class ZStatCriticalPhase : public ZStatPhase {
+private:
+  const ZStatCounter _counter;
+  const bool         _verbose;
+
+public:
+  ZStatCriticalPhase(const char* name, bool verbose = true);
+
+  virtual void register_start(const Ticks& start) const;
+  virtual void register_end(const Ticks& start, const Ticks& end) const;
+};
+
+//
+// Stat timer
+//
+class ZStatTimer : public StackObj {
+private:
+  const ZStatPhase& _phase;
+  const Ticks       _start;
+
+public:
+  ZStatTimer(const ZStatPhase& phase) :
+      _phase(phase),
+      _start(Ticks::now()) {
+    _phase.register_start(_start);
+  }
+
+  ~ZStatTimer() {
+    const Ticks end = Ticks::now();
+    _phase.register_end(_start, end);
+  }
+};
+
+//
+// Stat sample/increment
+//
+void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace = ZStatisticsForceTrace);
+void ZStatInc(const ZStatCounter& counter, uint64_t increment = 1, bool trace = ZStatisticsForceTrace);
+void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment = 1);
+
+//
+// Stat allocation rate
+//
+class ZStatAllocRate : public AllStatic {
+private:
+  static const ZStatUnsampledCounter _counter;
+  static TruncatedSeq                _rate;     // B/s
+  static TruncatedSeq                _rate_avg; // B/s
+
+public:
+  static const uint64_t sample_window_sec = 1; // seconds
+  static const uint64_t sample_hz         = 10;
+
+  static const ZStatUnsampledCounter& counter();
+  static uint64_t sample_and_reset();
+
+  static double avg();
+  static double avg_sd();
+};
+
+//
+// Stat thread
+//
+class ZStat : public ConcurrentGCThread {
+private:
+  static const uint64_t sample_hz = 1;
+
+  ZMetronome _metronome;
+
+  void sample_and_collect(ZStatSamplerHistory* history) const;
+  bool should_print(LogTargetHandle log) const;
+  void print(LogTargetHandle log, const ZStatSamplerHistory* history) const;
+
+protected:
+  virtual void run_service();
+  virtual void stop_service();
+
+public:
+  ZStat();
+};
+
+//
+// Stat cycle
+//
+class ZStatCycle : public AllStatic {
+private:
+  static uint64_t  _ncycles;
+  static Ticks     _start_of_last;
+  static Ticks     _end_of_last;
+  static NumberSeq _normalized_duration;
+
+public:
+  static void at_start();
+  static void at_end(double boost_factor);
+
+  static uint64_t ncycles();
+  static const AbsSeq& normalized_duration();
+  static double time_since_last();
+};
+
+//
+// Stat load
+//
+class ZStatLoad : public AllStatic {
+public:
+  static void print();
+};
+
+//
+// Stat mark
+//
+class ZStatMark : public AllStatic {
+private:
+  static size_t _nstripes;
+  static size_t _nproactiveflush;
+  static size_t _nterminateflush;
+  static size_t _ntrycomplete;
+  static size_t _ncontinue;
+
+public:
+  static void set_at_mark_start(size_t nstripes);
+  static void set_at_mark_end(size_t nproactiveflush,
+                              size_t nterminateflush,
+                              size_t ntrycomplete,
+                              size_t ncontinue);
+
+  static void print();
+};
+
+//
+// Stat relocation
+//
+class ZStatRelocation : public AllStatic {
+private:
+  static size_t _relocating;
+  static bool   _success;
+
+public:
+  static void set_at_select_relocation_set(size_t relocating);
+  static void set_at_relocate_end(bool success);
+
+  static void print();
+};
+
+//
+// Stat nmethods
+//
+class ZStatNMethods : public AllStatic {
+public:
+  static void print();
+};
+
+//
+// Stat references
+//
+class ZStatReferences : public AllStatic {
+private:
+  static struct ZCount {
+    size_t encountered;
+    size_t discovered;
+    size_t enqueued;
+  } _soft, _weak, _final, _phantom;
+
+  static void set(ZCount* count, size_t encountered, size_t discovered, size_t enqueued);
+  static void print(const char* name, const ZCount& ref);
+
+public:
+  static void set_soft(size_t encountered, size_t discovered, size_t enqueued);
+  static void set_weak(size_t encountered, size_t discovered, size_t enqueued);
+  static void set_final(size_t encountered, size_t discovered, size_t enqueued);
+  static void set_phantom(size_t encountered, size_t discovered, size_t enqueued);
+
+  static void print();
+};
+
+//
+// Stat heap
+//
+class ZStatHeap : public AllStatic {
+private:
+  static struct ZAtInitialize {
+    size_t max_capacity;
+    size_t max_reserve;
+  } _at_initialize;
+
+  static struct ZAtMarkStart {
+    size_t capacity;
+    size_t reserve;
+    size_t used;
+    size_t free;
+  } _at_mark_start;
+
+  static struct ZAtMarkEnd {
+    size_t capacity;
+    size_t reserve;
+    size_t allocated;
+    size_t used;
+    size_t free;
+    size_t live;
+    size_t garbage;
+  } _at_mark_end;
+
+  static struct ZAtRelocateStart {
+    size_t capacity;
+    size_t reserve;
+    size_t garbage;
+    size_t allocated;
+    size_t reclaimed;
+    size_t used;
+    size_t free;
+  } _at_relocate_start;
+
+  static struct ZAtRelocateEnd {
+    size_t capacity;
+    size_t capacity_high;
+    size_t capacity_low;
+    size_t reserve;
+    size_t reserve_high;
+    size_t reserve_low;
+    size_t garbage;
+    size_t allocated;
+    size_t reclaimed;
+    size_t used;
+    size_t used_high;
+    size_t used_low;
+    size_t free;
+    size_t free_high;
+    size_t free_low;
+  } _at_relocate_end;
+
+  static size_t available(size_t used);
+  static size_t reserve(size_t used);
+  static size_t free(size_t used);
+
+public:
+  static void set_at_initialize(size_t max_capacity,
+                                size_t max_reserve);
+  static void set_at_mark_start(size_t capacity,
+                                size_t used);
+  static void set_at_mark_end(size_t capacity,
+                              size_t allocated,
+                              size_t used);
+  static void set_at_select_relocation_set(size_t live,
+                                           size_t garbage,
+                                           size_t reclaimed);
+  static void set_at_relocate_start(size_t capacity,
+                                    size_t allocated,
+                                    size_t used);
+  static void set_at_relocate_end(size_t capacity,
+                                  size_t allocated,
+                                  size_t reclaimed,
+                                  size_t used,
+                                  size_t used_high,
+                                  size_t used_low);
+
+  static size_t max_capacity();
+  static size_t used_at_mark_start();
+  static size_t used_at_relocate_end();
+
+  static void print();
+};
+
+#endif // SHARE_GC_Z_ZSTAT_HPP
diff --git a/src/hotspot/share/gc/z/zTask.cpp b/src/hotspot/share/gc/z/zTask.cpp
new file mode 100644
index 00000000000..37905ebc6df
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTask.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zThread.hpp"
+
+ZTask::GangTask::GangTask(ZTask* ztask, const char* name) :
+    AbstractGangTask(name),
+    _ztask(ztask) {}
+
+void ZTask::GangTask::work(uint worker_id) {
+  ZThread::set_worker_id(worker_id);
+  _ztask->work();
+  ZThread::clear_worker_id();
+}
+
+ZTask::ZTask(const char* name) :
+    _gang_task(this, name) {}
+
+const char* ZTask::name() const {
+  return _gang_task.name();
+}
+
+AbstractGangTask* ZTask::gang_task() {
+  return &_gang_task;
+}
diff --git a/src/hotspot/share/gc/z/zTask.hpp b/src/hotspot/share/gc/z/zTask.hpp
new file mode 100644
index 00000000000..a4a116b7c22
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTask.hpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZTASK_HPP
+#define SHARE_GC_Z_ZTASK_HPP
+
+#include "gc/shared/workgroup.hpp"
+#include "memory/allocation.hpp"
+
+class ZTask : public StackObj {
+private:
+  class GangTask : public AbstractGangTask {
+  private:
+    ZTask* const _ztask;
+
+  public:
+    GangTask(ZTask* ztask, const char* name);
+
+    virtual void work(uint worker_id);
+  };
+
+  GangTask _gang_task;
+
+public:
+  ZTask(const char* name);
+
+  const char* name() const;
+  AbstractGangTask* gang_task();
+
+  virtual void work() = 0;
+};
+
+#endif // SHARE_GC_Z_ZTASK_HPP
diff --git a/src/hotspot/share/gc/z/zThread.cpp b/src/hotspot/share/gc/z/zThread.cpp
new file mode 100644
index 00000000000..5bde1d113e3
--- /dev/null
+++ b/src/hotspot/share/gc/z/zThread.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zThread.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/debug.hpp"
+
+__thread bool      ZThread::_initialized;
+__thread uintptr_t ZThread::_id;
+__thread bool      ZThread::_is_vm;
+__thread bool      ZThread::_is_java;
+__thread bool      ZThread::_is_worker;
+__thread uint      ZThread::_worker_id;
+
+void ZThread::initialize() {
+  assert(!_initialized, "Already initialized");
+  const Thread* const thread = Thread::current();
+  _initialized = true;
+  _id = (uintptr_t)thread;
+  _is_vm = thread->is_VM_thread();
+  _is_java = thread->is_Java_thread();
+  _is_worker = thread->is_Worker_thread();
+  _worker_id = (uint)-1;
+}
+
+const char* ZThread::name() {
+  const Thread* const thread = Thread::current();
+  if (thread->is_Named_thread()) {
+    const NamedThread* const named = (const NamedThread*)thread;
+    return named->name();
+  } else if (thread->is_Java_thread()) {
+    return "Java";
+  }
+
+  return "Unknown";
+}
+
+bool ZThread::has_worker_id() {
+  return _initialized &&
+         _is_worker &&
+         _worker_id != (uint)-1;
+}
+
+void ZThread::set_worker_id(uint worker_id) {
+  ensure_initialized();
+  assert(!has_worker_id(), "Worker id already initialized");
+  _worker_id = worker_id;
+}
+
+void ZThread::clear_worker_id() {
+  assert(has_worker_id(), "Worker id not initialized");
+  _worker_id = (uint)-1;
+}
diff --git a/src/hotspot/share/gc/z/zThread.hpp b/src/hotspot/share/gc/z/zThread.hpp
new file mode 100644
index 00000000000..365a216caf5
--- /dev/null
+++ b/src/hotspot/share/gc/z/zThread.hpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZTHREAD_HPP
+#define SHARE_GC_Z_ZTHREAD_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
+
+class ZThread : public AllStatic {
+  friend class ZTask;
+
+private:
+  static __thread bool      _initialized;
+  static __thread uintptr_t _id;
+  static __thread bool      _is_vm;
+  static __thread bool      _is_java;
+  static __thread bool      _is_worker;
+  static __thread uint      _worker_id;
+
+  static void initialize();
+
+  static void ensure_initialized() {
+    if (!_initialized) {
+      initialize();
+    }
+  }
+
+  static bool has_worker_id();
+  static void set_worker_id(uint worker_id);
+  static void clear_worker_id();
+
+public:
+  static const char* name();
+
+  static uintptr_t id() {
+    ensure_initialized();
+    return _id;
+  }
+
+  static bool is_vm() {
+    ensure_initialized();
+    return _is_vm;
+  }
+
+  static bool is_java() {
+    ensure_initialized();
+    return _is_java;
+  }
+
+  static bool is_worker() {
+    ensure_initialized();
+    return _is_worker;
+  }
+
+  static uint worker_id() {
+    assert(has_worker_id(), "Worker id not initialized");
+    return _worker_id;
+  }
+};
+
+#endif // SHARE_GC_Z_ZTHREAD_HPP
diff --git a/src/hotspot/share/gc/z/zThreadLocalData.hpp b/src/hotspot/share/gc/z/zThreadLocalData.hpp
new file mode 100644
index 00000000000..627c312ed21
--- /dev/null
+++ b/src/hotspot/share/gc/z/zThreadLocalData.hpp
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZTHREADLOCALDATA_HPP
+#define SHARE_GC_Z_ZTHREADLOCALDATA_HPP
+
+#include "gc/z/zMarkStack.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/sizes.hpp"
+
+class ZThreadLocalData {
+private:
+  uintptr_t              _address_bad_mask;
+  ZMarkThreadLocalStacks _stacks;
+
+  ZThreadLocalData() :
+      _address_bad_mask(0),
+      _stacks() {}
+
+  static ZThreadLocalData* data(Thread* thread) {
+    return thread->gc_data<ZThreadLocalData>();
+  }
+
+public:
+  static void create(Thread* thread) {
+    new (data(thread)) ZThreadLocalData();
+  }
+
+  static void destroy(Thread* thread) {
+    data(thread)->~ZThreadLocalData();
+  }
+
+  static void set_address_bad_mask(Thread* thread, uintptr_t mask) {
+    data(thread)->_address_bad_mask = mask;
+  }
+
+  static ZMarkThreadLocalStacks* stacks(Thread* thread) {
+    return &data(thread)->_stacks;
+  }
+
+  static ByteSize address_bad_mask_offset() {
+    return Thread::gc_data_offset() + byte_offset_of(ZThreadLocalData, _address_bad_mask);
+  }
+};
+
+#endif // SHARE_GC_Z_ZTHREADLOCALDATA_HPP
diff --git a/src/hotspot/share/gc/z/zTracer.cpp b/src/hotspot/share/gc/z/zTracer.cpp
new file mode 100644
index 00000000000..aaec3df73a6
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTracer.cpp
@@ -0,0 +1,110 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTracer.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/gcLocker.hpp"
+#include "jfr/jfrEvents.hpp"
+#include "runtime/safepointVerifiers.hpp"
+
+ZTracer* ZTracer::_tracer = NULL;
+
+ZTracer::ZTracer() :
+    GCTracer(Z) {}
+
+void ZTracer::initialize() {
+  _tracer = new (ResourceObj::C_HEAP, mtGC) ZTracer();
+}
+
+void ZTracer::send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value) {
+  NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+
+  EventZStatisticsCounter e;
+  if (e.should_commit()) {
+    e.set_id(counter_id);
+    e.set_increment(increment);
+    e.set_value(value);
+    e.commit();
+  }
+}
+
+void ZTracer::send_stat_sampler(uint32_t sampler_id, uint64_t value) {
+  NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+
+  EventZStatisticsSampler e;
+  if (e.should_commit()) {
+    e.set_id(sampler_id);
+    e.set_value(value);
+    e.commit();
+  }
+}
+
+void ZTracer::send_thread_phase(const char* name, const Ticks& start, const Ticks& end) {
+  NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+
+  EventZThreadPhase e(UNTIMED);
+  if (e.should_commit()) {
+    e.set_gcId(GCId::current_or_undefined());
+    e.set_name(name);
+    e.set_starttime(start);
+    e.set_endtime(end);
+    e.commit();
+  }
+}
+
+void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve) {
+  NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+
+  EventZPageAllocation e;
+  if (e.should_commit()) {
+    e.set_pageSize(size);
+    e.set_usedAfter(used);
+    e.set_freeAfter(free);
+    e.set_inCacheAfter(cache);
+    e.set_nonBlocking(nonblocking);
+    e.set_noReserve(noreserve);
+    e.commit();
+  }
+}
+
+void ZTracer::report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) {
+  send_stat_counter(counter.id(), increment, value);
+}
+
+void ZTracer::report_stat_sampler(const ZStatSampler& sampler, uint64_t value) {
+  send_stat_sampler(sampler.id(), value);
+}
+
+void ZTracer::report_thread_phase(const ZStatPhase& phase, const Ticks& start, const Ticks& end) {
+  send_thread_phase(phase.name(), start, end);
+}
+
+void ZTracer::report_thread_phase(const char* name, const Ticks& start, const Ticks& end) {
+  send_thread_phase(name, start, end);
+}
+
+void ZTracer::report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) {
+  send_page_alloc(size, used, free, cache, flags.non_blocking(), flags.no_reserve());
+}
diff --git a/src/hotspot/share/gc/z/zTracer.hpp b/src/hotspot/share/gc/z/zTracer.hpp
new file mode 100644
index 00000000000..0da1f2a887a
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTracer.hpp
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZTRACER_HPP
+#define SHARE_GC_Z_ZTRACER_HPP
+
+#include "gc/shared/gcTrace.hpp"
+#include "gc/z/zAllocationFlags.hpp"
+
+class ZStatCounter;
+class ZStatPhase;
+class ZStatSampler;
+
+class ZTracer : public GCTracer {
+private:
+  static ZTracer* _tracer;
+
+  ZTracer();
+
+  void send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value);
+  void send_stat_sampler(uint32_t sampler_id, uint64_t value);
+  void send_thread_phase(const char* name, const Ticks& start, const Ticks& end);
+  void send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve);
+
+public:
+  static ZTracer* tracer();
+  static void initialize();
+
+  void report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value);
+  void report_stat_sampler(const ZStatSampler& sampler, uint64_t value);
+  void report_thread_phase(const ZStatPhase& phase, const Ticks& start, const Ticks& end);
+  void report_thread_phase(const char* name, const Ticks& start, const Ticks& end);
+  void report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags);
+};
+
+class ZTraceThreadPhase : public StackObj {
+private:
+  const Ticks       _start;
+  const char* const _name;
+
+public:
+  ZTraceThreadPhase(const char* name);
+  ~ZTraceThreadPhase();
+};
+
+#endif // SHARE_GC_Z_ZTRACER_HPP
diff --git a/src/hotspot/share/gc/z/zTracer.inline.hpp b/src/hotspot/share/gc/z/zTracer.inline.hpp
new file mode 100644
index 00000000000..ab2d7e48aea
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTracer.inline.hpp
@@ -0,0 +1,41 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZTRACER_INLINE_HPP
+#define SHARE_GC_Z_ZTRACER_INLINE_HPP
+
+#include "gc/z/zTracer.hpp"
+
+inline ZTracer* ZTracer::tracer() {
+  return _tracer;
+}
+
+inline ZTraceThreadPhase::ZTraceThreadPhase(const char* name) :
+    _start(Ticks::now()),
+    _name(name) {}
+
+inline ZTraceThreadPhase::~ZTraceThreadPhase() {
+  ZTracer::tracer()->report_thread_phase(_name, _start, Ticks::now());
+}
+
+#endif // SHARE_GC_Z_ZTRACER_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zUtils.cpp b/src/hotspot/share/gc/z/zUtils.cpp
new file mode 100644
index 00000000000..d33c715371e
--- /dev/null
+++ b/src/hotspot/share/gc/z/zUtils.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "utilities/debug.hpp"
+
+#include <stdlib.h>
+
+uintptr_t ZUtils::alloc_aligned(size_t alignment, size_t size) {
+  void* res = NULL;
+
+  if (posix_memalign(&res, alignment, size) != 0) {
+    fatal("posix_memalign() failed");
+  }
+
+  memset(res, 0, size);
+
+  return (uintptr_t)res;
+}
+
+void ZUtils::insert_filler_object(uintptr_t addr, size_t size) {
+  const size_t fill_size_in_words = bytes_to_words(size);
+  if (fill_size_in_words >= CollectedHeap::min_fill_size()) {
+    CollectedHeap::fill_with_objects((HeapWord*)ZAddress::good(addr), fill_size_in_words);
+  }
+}
diff --git a/src/hotspot/share/gc/z/zUtils.hpp b/src/hotspot/share/gc/z/zUtils.hpp
new file mode 100644
index 00000000000..898e9926621
--- /dev/null
+++ b/src/hotspot/share/gc/z/zUtils.hpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZUTILS_HPP
+#define SHARE_GC_Z_ZUTILS_HPP
+
+#include "memory/allocation.hpp"
+
+class ZUtils : public AllStatic {
+public:
+  // Allocation
+  static uintptr_t alloc_aligned(size_t alignment, size_t size);
+
+  // Power of two
+  static size_t round_up_power_of_2(size_t value);
+  static size_t round_down_power_of_2(size_t value);
+
+  // Size convertion
+  static size_t bytes_to_words(size_t size_in_words);
+  static size_t words_to_bytes(size_t size_in_words);
+
+  // Object
+  static size_t object_size(uintptr_t addr);
+  static void object_copy(uintptr_t from, uintptr_t to, size_t size);
+
+  // Filler
+  static void insert_filler_object(uintptr_t addr, size_t size);
+};
+
+#endif // SHARE_GC_Z_ZUTILS_HPP
diff --git a/src/hotspot/share/gc/z/zUtils.inline.hpp b/src/hotspot/share/gc/z/zUtils.inline.hpp
new file mode 100644
index 00000000000..b51a11764cb
--- /dev/null
+++ b/src/hotspot/share/gc/z/zUtils.inline.hpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZUTILS_INLINE_HPP
+#define SHARE_GC_Z_ZUTILS_INLINE_HPP
+
+#include "gc/z/zOop.inline.hpp"
+#include "gc/z/zUtils.hpp"
+#include "oops/oop.inline.hpp"
+#include "utilities/align.hpp"
+#include "utilities/copy.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+inline size_t ZUtils::round_up_power_of_2(size_t value) {
+  assert(value != 0, "Invalid value");
+
+  if (is_power_of_2(value)) {
+    return value;
+  }
+
+  return (size_t)1 << (log2_intptr(value) + 1);
+}
+
+inline size_t ZUtils::round_down_power_of_2(size_t value) {
+  assert(value != 0, "Invalid value");
+  return (size_t)1 << log2_intptr(value);
+}
+
+inline size_t ZUtils::bytes_to_words(size_t size_in_bytes) {
+  assert(is_aligned(size_in_bytes, BytesPerWord), "Size not word aligned");
+  return size_in_bytes >> LogBytesPerWord;
+}
+
+inline size_t ZUtils::words_to_bytes(size_t size_in_words) {
+  return size_in_words << LogBytesPerWord;
+}
+
+inline size_t ZUtils::object_size(uintptr_t addr) {
+  return words_to_bytes(ZOop::to_oop(addr)->size());
+}
+
+inline void ZUtils::object_copy(uintptr_t from, uintptr_t to, size_t size) {
+  Copy::aligned_disjoint_words((HeapWord*)from, (HeapWord*)to, bytes_to_words(size));
+}
+
+#endif // SHARE_GC_Z_ZUTILS_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zValue.hpp b/src/hotspot/share/gc/z/zValue.hpp
new file mode 100644
index 00000000000..7d746cb7734
--- /dev/null
+++ b/src/hotspot/share/gc/z/zValue.hpp
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZVALUE_HPP
+#define SHARE_GC_Z_ZVALUE_HPP
+
+#include "memory/allocation.hpp"
+#include "gc/z/zCPU.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zNUMA.hpp"
+#include "gc/z/zThread.hpp"
+#include "gc/z/zUtils.hpp"
+#include "utilities/align.hpp"
+
+template <typename S>
+class ZValueStorage : public AllStatic {
+private:
+  static uintptr_t _top;
+  static uintptr_t _end;
+
+public:
+  static const size_t offset = 4 * K;
+
+  static uintptr_t alloc(size_t size) {
+    guarantee(size <= offset, "Allocation too large");
+
+    // Allocate entry in existing memory block
+    const uintptr_t addr = align_up(_top, S::alignment());
+    _top = addr + size;
+
+    if (_top < _end) {
+      // Success
+      return addr;
+    }
+
+    // Allocate new block of memory
+    const size_t block_alignment = offset;
+    const size_t block_size = offset * S::count();
+    _top = ZUtils::alloc_aligned(block_alignment, block_size);
+    _end = _top + offset;
+
+    // Retry allocation
+    return alloc(size);
+  }
+};
+
+template <typename T> uintptr_t ZValueStorage<T>::_end = 0;
+template <typename T> uintptr_t ZValueStorage<T>::_top = 0;
+
+class ZContendedStorage : public ZValueStorage<ZContendedStorage> {
+public:
+  static size_t alignment() {
+    return ZCacheLineSize;
+  }
+
+  static uint32_t count() {
+    return 1;
+  }
+
+  static uint32_t id() {
+    return 0;
+  }
+};
+
+class ZPerCPUStorage : public ZValueStorage<ZPerCPUStorage> {
+public:
+  static size_t alignment() {
+    return sizeof(uintptr_t);
+  }
+
+  static uint32_t count() {
+    return ZCPU::count();
+  }
+
+  static uint32_t id() {
+    return ZCPU::id();
+  }
+};
+
+class ZPerNUMAStorage : public ZValueStorage<ZPerNUMAStorage> {
+public:
+  static size_t alignment() {
+    return sizeof(uintptr_t);
+  }
+
+  static uint32_t count() {
+    return ZNUMA::count();
+  }
+
+  static uint32_t id() {
+    return ZNUMA::id();
+  }
+};
+
+class ZPerWorkerStorage : public ZValueStorage<ZPerWorkerStorage> {
+public:
+  static size_t alignment() {
+    return sizeof(uintptr_t);
+  }
+
+  static uint32_t count() {
+    return MAX2(ParallelGCThreads, ConcGCThreads);
+  }
+
+  static uint32_t id() {
+    return ZThread::worker_id();
+  }
+};
+
+template <typename S, typename T>
+class ZValueIterator;
+
+template <typename S, typename T>
+class ZValue {
+private:
+  const uintptr_t _addr;
+
+  uintptr_t value_addr(uint32_t value_id) const {
+    return _addr + (value_id * S::offset);
+  }
+
+public:
+  ZValue() :
+      _addr(S::alloc(sizeof(T))) {
+    // Initialize all instances
+    ZValueIterator<S, T> iter(this);
+    for (T* addr; iter.next(&addr);) {
+      ::new (addr) T;
+    }
+  }
+
+  ZValue(const T& value) :
+      _addr(S::alloc(sizeof(T))) {
+    // Initialize all instances
+    ZValueIterator<S, T> iter(this);
+    for (T* addr; iter.next(&addr);) {
+      ::new (addr) T(value);
+    }
+  }
+
+  // Not implemented
+  ZValue(const ZValue<S, T>& value);
+  ZValue<S, T>& operator=(const ZValue<S, T>& value);
+
+  const T* addr(uint32_t value_id = S::id()) const {
+    return reinterpret_cast<const T*>(value_addr(value_id));
+  }
+
+  T* addr(uint32_t value_id = S::id()) {
+    return reinterpret_cast<T*>(value_addr(value_id));
+  }
+
+  const T& get(uint32_t value_id = S::id()) const {
+    return *addr(value_id);
+  }
+
+  T& get(uint32_t value_id = S::id()) {
+    return *addr(value_id);
+  }
+
+  void set(const T& value, uint32_t value_id = S::id()) {
+    get(value_id) = value;
+  }
+
+  void set_all(const T& value) {
+    ZValueIterator<S, T> iter(this);
+    for (T* addr; iter.next(&addr);) {
+      *addr = value;
+    }
+  }
+};
+
+template <typename T>
+class ZContended : public ZValue<ZContendedStorage, T> {
+public:
+  ZContended() :
+      ZValue<ZContendedStorage, T>() {}
+
+  ZContended(const T& value) :
+      ZValue<ZContendedStorage, T>(value) {}
+
+  using ZValue<ZContendedStorage, T>::operator=;
+};
+
+template <typename T>
+class ZPerCPU : public ZValue<ZPerCPUStorage, T> {
+public:
+  ZPerCPU() :
+      ZValue<ZPerCPUStorage, T>() {}
+
+  ZPerCPU(const T& value) :
+      ZValue<ZPerCPUStorage, T>(value) {}
+
+  using ZValue<ZPerCPUStorage, T>::operator=;
+};
+
+template <typename T>
+class ZPerNUMA : public ZValue<ZPerNUMAStorage, T> {
+public:
+  ZPerNUMA() :
+      ZValue<ZPerNUMAStorage, T>() {}
+
+  ZPerNUMA(const T& value) :
+      ZValue<ZPerNUMAStorage, T>(value) {}
+
+  using ZValue<ZPerNUMAStorage, T>::operator=;
+};
+
+template <typename T>
+class ZPerWorker : public ZValue<ZPerWorkerStorage, T> {
+public:
+  ZPerWorker() :
+      ZValue<ZPerWorkerStorage, T>() {}
+
+  ZPerWorker(const T& value) :
+      ZValue<ZPerWorkerStorage, T>(value) {}
+
+  using ZValue<ZPerWorkerStorage, T>::operator=;
+};
+
+template <typename S, typename T>
+class ZValueIterator {
+private:
+  ZValue<S, T>* const _value;
+  uint32_t            _value_id;
+
+public:
+  ZValueIterator(ZValue<S, T>* value) :
+      _value(value),
+      _value_id(0) {}
+
+  bool next(T** value) {
+    if (_value_id < S::count()) {
+      *value = _value->addr(_value_id++);
+      return true;
+    }
+    return false;
+  }
+};
+
+template <typename T>
+class ZPerCPUIterator : public ZValueIterator<ZPerCPUStorage, T> {
+public:
+  ZPerCPUIterator(ZPerCPU<T>* value) :
+      ZValueIterator<ZPerCPUStorage, T>(value) {}
+};
+
+template <typename T>
+class ZPerNUMAIterator : public ZValueIterator<ZPerNUMAStorage, T> {
+public:
+  ZPerNUMAIterator(ZPerNUMA<T>* value) :
+      ZValueIterator<ZPerNUMAStorage, T>(value) {}
+};
+
+template <typename T>
+class ZPerWorkerIterator : public ZValueIterator<ZPerWorkerStorage, T> {
+public:
+  ZPerWorkerIterator(ZPerWorker<T>* value) :
+      ZValueIterator<ZPerWorkerStorage, T>(value) {}
+};
+
+template <typename S, typename T>
+class ZValueConstIterator {
+private:
+  const ZValue<S, T>* const _value;
+  uint32_t                  _value_id;
+
+public:
+  ZValueConstIterator(const ZValue<S, T>* value) :
+      _value(value),
+      _value_id(0) {}
+
+  bool next(const T** value) {
+    if (_value_id < S::count()) {
+      *value = _value->addr(_value_id++);
+      return true;
+    }
+    return false;
+  }
+};
+
+template <typename T>
+class ZPerCPUConstIterator : public ZValueConstIterator<ZPerCPUStorage, T> {
+public:
+  ZPerCPUConstIterator(const ZPerCPU<T>* value) :
+      ZValueConstIterator<ZPerCPUStorage, T>(value) {}
+};
+
+template <typename T>
+class ZPerNUMAConstIterator : public ZValueConstIterator<ZPerNUMAStorage, T> {
+public:
+  ZPerNUMAConstIterator(const ZPerNUMA<T>* value) :
+      ZValueConstIterator<ZPerNUMAStorage, T>(value) {}
+};
+
+template <typename T>
+class ZPerWorkerConstIterator : public ZValueConstIterator<ZPerWorkerStorage, T> {
+public:
+  ZPerWorkerConstIterator(const ZPerWorker<T>* value) :
+      ZValueConstIterator<ZPerWorkerStorage, T>(value) {}
+};
+
+#endif // SHARE_GC_Z_ZVALUE_HPP
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.cpp b/src/hotspot/share/gc/z/zVirtualMemory.cpp
new file mode 100644
index 00000000000..38c0b89aa5b
--- /dev/null
+++ b/src/hotspot/share/gc/z/zVirtualMemory.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zVirtualMemory.inline.hpp"
+#include "services/memTracker.hpp"
+
+ZVirtualMemoryManager::ZVirtualMemoryManager() :
+    _manager(),
+    _initialized(false) {
+  // Reserve address space
+  if (!reserve(ZAddressSpaceStart, ZAddressSpaceSize)) {
+    return;
+  }
+
+  // Make the complete address view free
+  _manager.free(0, ZAddressOffsetMax);
+
+  // Register address space with native memory tracker
+  nmt_reserve(ZAddressSpaceStart, ZAddressSpaceSize);
+
+  // Successfully initialized
+  _initialized = true;
+}
+
+void ZVirtualMemoryManager::nmt_reserve(uintptr_t start, size_t size) {
+  MemTracker::record_virtual_memory_reserve((void*)start, size, CALLER_PC);
+  MemTracker::record_virtual_memory_type((void*)start, mtJavaHeap);
+}
+
+bool ZVirtualMemoryManager::is_initialized() const {
+  return _initialized;
+}
+
+ZVirtualMemory ZVirtualMemoryManager::alloc(size_t size, bool alloc_from_front) {
+  uintptr_t start;
+
+  if (alloc_from_front || size <= ZPageSizeSmall) {
+    // Small page
+    start = _manager.alloc_from_front(size);
+  } else {
+    // Medium/Large page
+    start = _manager.alloc_from_back(size);
+  }
+
+  return ZVirtualMemory(start, size);
+}
+
+void ZVirtualMemoryManager::free(ZVirtualMemory vmem) {
+  _manager.free(vmem.start(), vmem.size());
+}
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
new file mode 100644
index 00000000000..f13a047bbb0
--- /dev/null
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZVIRTUALMEMORY_HPP
+#define SHARE_GC_Z_ZVIRTUALMEMORY_HPP
+
+#include "gc/z/zMemory.hpp"
+#include "memory/allocation.hpp"
+
+class ZVirtualMemory {
+  friend class VMStructs;
+
+private:
+  uintptr_t _start;
+  uintptr_t _end;
+
+public:
+  ZVirtualMemory();
+  ZVirtualMemory(uintptr_t start, size_t size);
+
+  bool is_null() const;
+  uintptr_t start() const;
+  uintptr_t end() const;
+  size_t size() const;
+  ZVirtualMemory split(size_t size);
+  void clear();
+};
+
+class ZVirtualMemoryManager {
+private:
+  ZMemoryManager _manager;
+  bool           _initialized;
+
+  bool reserve(uintptr_t start, size_t size);
+  void nmt_reserve(uintptr_t start, size_t size);
+
+public:
+  ZVirtualMemoryManager();
+
+  bool is_initialized() const;
+
+  ZVirtualMemory alloc(size_t size, bool alloc_from_front = false);
+  void free(ZVirtualMemory vmem);
+};
+
+#endif // SHARE_GC_Z_ZVIRTUALMEMORY_HPP
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp
new file mode 100644
index 00000000000..df08df054be
--- /dev/null
+++ b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP
+#define SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP
+
+#include "gc/z/zMemory.inline.hpp"
+#include "gc/z/zVirtualMemory.hpp"
+
+inline ZVirtualMemory::ZVirtualMemory() :
+    _start(UINTPTR_MAX),
+    _end(UINTPTR_MAX) {}
+
+inline ZVirtualMemory::ZVirtualMemory(uintptr_t start, size_t size) :
+    _start(start),
+    _end(start + size) {}
+
+inline bool ZVirtualMemory::is_null() const {
+  return _start == UINTPTR_MAX;
+}
+
+inline uintptr_t ZVirtualMemory::start() const {
+  return _start;
+}
+
+inline uintptr_t ZVirtualMemory::end() const {
+  return _end;
+}
+
+inline size_t ZVirtualMemory::size() const {
+  return _end - _start;
+}
+
+inline ZVirtualMemory ZVirtualMemory::split(size_t split_size) {
+  assert(split_size <= size(), "precondition");
+  ZVirtualMemory mem(_start, split_size);
+  _start += split_size;
+  return mem;
+}
+
+inline void ZVirtualMemory::clear() {
+  _start = UINTPTR_MAX;
+  _end = UINTPTR_MAX;
+}
+
+#endif // SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zWeakRootsProcessor.cpp b/src/hotspot/share/gc/z/zWeakRootsProcessor.cpp
new file mode 100644
index 00000000000..6786cac8b9c
--- /dev/null
+++ b/src/hotspot/share/gc/z/zWeakRootsProcessor.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zOopClosures.inline.hpp"
+#include "gc/z/zStat.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zThread.hpp"
+#include "runtime/jniHandles.hpp"
+
+ZWeakRootsProcessor::ZWeakRootsProcessor(ZWorkers* workers) :
+    _workers(workers) {}
+
+class ZProcessWeakRootsTask : public ZTask {
+private:
+  ZWeakRootsIterator _weak_roots;
+
+public:
+  ZProcessWeakRootsTask() :
+      ZTask("ZProcessWeakRootsTask"),
+      _weak_roots() {}
+
+  virtual void work() {
+    ZPhantomIsAliveObjectClosure is_alive;
+    ZPhantomKeepAliveOopClosure keep_alive;
+    _weak_roots.weak_oops_do(&is_alive, &keep_alive);
+  }
+};
+
+void ZWeakRootsProcessor::process_weak_roots() {
+  ZProcessWeakRootsTask task;
+  _workers->run_parallel(&task);
+}
+
+class ZProcessConcurrentWeakRootsTask : public ZTask {
+private:
+  ZConcurrentWeakRootsIterator _concurrent_weak_roots;
+
+public:
+  ZProcessConcurrentWeakRootsTask() :
+      ZTask("ZProcessConccurentWeakRootsTask"),
+      _concurrent_weak_roots() {}
+
+  virtual void work() {
+    ZPhantomCleanOopClosure cl;
+    _concurrent_weak_roots.oops_do(&cl);
+  }
+};
+
+void ZWeakRootsProcessor::process_concurrent_weak_roots() {
+  ZProcessConcurrentWeakRootsTask task;
+  _workers->run_concurrent(&task);
+}
diff --git a/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp
new file mode 100644
index 00000000000..cf70406e512
--- /dev/null
+++ b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#ifndef SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP
+#define SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP
+
+#include "gc/z/zValue.hpp"
+
+class ZWorkers;
+
+class ZWeakRootsProcessor {
+private:
+  ZWorkers* const _workers;
+
+public:
+  ZWeakRootsProcessor(ZWorkers* workers);
+
+  void process_weak_roots();
+  void process_concurrent_weak_roots();
+};
+
+#endif // SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/z/zWorkers.cpp b/src/hotspot/share/gc/z/zWorkers.cpp
new file mode 100644
index 00000000000..86823f0d461
--- /dev/null
+++ b/src/hotspot/share/gc/z/zWorkers.cpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zTask.hpp"
+#include "gc/z/zWorkers.inline.hpp"
+#include "runtime/os.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/safepoint.hpp"
+
+uint ZWorkers::calculate_ncpus(double share_in_percent) {
+  return ceil(os::initial_active_processor_count() * share_in_percent / 100.0);
+}
+
+uint ZWorkers::calculate_nparallel() {
+  // Use 60% of the CPUs, rounded up. We would like to use as many threads as
+  // possible to increase parallelism. However, using a thread count that is
+  // close to the number of processors tends to lead to over-provisioning and
+  // scheduling latency issues. Using 60% of the active processors appears to
+  // be a fairly good balance.
+  return calculate_ncpus(60.0);
+}
+
+uint ZWorkers::calculate_nconcurrent() {
+  // Use 12.5% of the CPUs, rounded up. The number of concurrent threads we
+  // would like to use heavily depends on the type of workload we are running.
+  // Using too many threads will have a nagative impact on the application
+  // throughput, while using too few threads will prolong the GC-cycle and
+  // we then risk being out-run by the application. Using 12.5% of the active
+  // processors appears to be a fairly good balance.
+  return calculate_ncpus(12.5);
+}
+
+class ZWorkersWarmupTask : public ZTask {
+private:
+  const uint _nworkers;
+  uint       _started;
+  Monitor    _monitor;
+
+public:
+  ZWorkersWarmupTask(uint nworkers) :
+      ZTask("ZWorkersWarmupTask"),
+      _nworkers(nworkers),
+      _started(0),
+      _monitor(Monitor::leaf, "ZWorkersWarmup", false, Monitor::_safepoint_check_never) {}
+
+  virtual void work() {
+    // Wait for all threads to start
+    MonitorLockerEx ml(&_monitor, Monitor::_no_safepoint_check_flag);
+    if (++_started == _nworkers) {
+      // All threads started
+      ml.notify_all();
+    } else {
+      while (_started != _nworkers) {
+        ml.wait(Monitor::_no_safepoint_check_flag);
+      }
+    }
+  }
+};
+
+ZWorkers::ZWorkers() :
+    _boost(false),
+    _workers("ZWorker",
+             nworkers(),
+             true /* are_GC_task_threads */,
+             true /* are_ConcurrentGC_threads */) {
+
+  log_info(gc, init)("Workers: %u parallel, %u concurrent", nparallel(), nconcurrent());
+
+  // Initialize worker threads
+  _workers.initialize_workers();
+  _workers.update_active_workers(nworkers());
+  if (_workers.active_workers() != nworkers()) {
+    vm_exit_during_initialization("Failed to create ZWorkers");
+  }
+
+  // Warm up worker threads by having them execute a dummy task.
+  // This helps reduce latency in early GC pauses, which otherwise
+  // would have to take on any warmup costs.
+  ZWorkersWarmupTask task(nworkers());
+  run(&task, nworkers());
+}
+
+void ZWorkers::set_boost(bool boost) {
+  if (boost) {
+    log_debug(gc)("Boosting workers");
+  }
+
+  _boost = boost;
+}
+
+void ZWorkers::run(ZTask* task, uint nworkers) {
+  log_debug(gc, task)("Executing Task: %s, Active Workers: %u", task->name(), nworkers);
+  _workers.update_active_workers(nworkers);
+  _workers.run_task(task->gang_task());
+}
+
+void ZWorkers::run_parallel(ZTask* task) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at a safepoint");
+  run(task, nparallel());
+}
+
+void ZWorkers::run_concurrent(ZTask* task) {
+  run(task, nconcurrent());
+}
+
+void ZWorkers::threads_do(ThreadClosure* tc) const {
+  _workers.threads_do(tc);
+}
+
+void ZWorkers::print_threads_on(outputStream* st) const {
+  _workers.print_worker_threads_on(st);
+}
diff --git a/src/hotspot/share/gc/z/zWorkers.hpp b/src/hotspot/share/gc/z/zWorkers.hpp
new file mode 100644
index 00000000000..36a3c61fdf6
--- /dev/null
+++ b/src/hotspot/share/gc/z/zWorkers.hpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZWORKERS_HPP
+#define SHARE_GC_Z_ZWORKERS_HPP
+
+#include "gc/shared/workgroup.hpp"
+#include "memory/allocation.hpp"
+
+class ZTask;
+
+class ZWorkers {
+private:
+  bool     _boost;
+  WorkGang _workers;
+
+  static uint calculate_ncpus(double share_in_percent);
+
+  void run(ZTask* task, uint nworkers);
+
+public:
+  static uint calculate_nparallel();
+  static uint calculate_nconcurrent();
+
+  ZWorkers();
+
+  uint nparallel() const;
+  uint nparallel_no_boost() const;
+  uint nconcurrent() const;
+  uint nconcurrent_no_boost() const;
+  uint nworkers() const;
+
+  void set_boost(bool boost);
+
+  void run_parallel(ZTask* task);
+  void run_concurrent(ZTask* task);
+
+  void threads_do(ThreadClosure* tc) const;
+  void print_threads_on(outputStream* st) const;
+};
+
+#endif // SHARE_GC_Z_ZWORKERS_HPP
diff --git a/src/hotspot/share/gc/z/zWorkers.inline.hpp b/src/hotspot/share/gc/z/zWorkers.inline.hpp
new file mode 100644
index 00000000000..7b79682e800
--- /dev/null
+++ b/src/hotspot/share/gc/z/zWorkers.inline.hpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_ZWORKERS_INLINE_HPP
+#define SHARE_GC_Z_ZWORKERS_INLINE_HPP
+
+#include "gc/z/zWorkers.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+inline uint ZWorkers::nparallel() const {
+  return _boost ? nworkers() : nparallel_no_boost();
+}
+
+inline uint ZWorkers::nparallel_no_boost() const {
+  return ParallelGCThreads;
+}
+
+inline uint ZWorkers::nconcurrent() const {
+  return _boost ? nworkers() : nconcurrent_no_boost();
+}
+
+inline uint ZWorkers::nconcurrent_no_boost() const {
+  return ConcGCThreads;
+}
+
+inline uint ZWorkers::nworkers() const {
+  return MAX2(ParallelGCThreads, ConcGCThreads);
+}
+
+#endif // SHARE_GC_Z_ZWORKERS_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp
new file mode 100644
index 00000000000..a753293727d
--- /dev/null
+++ b/src/hotspot/share/gc/z/z_globals.hpp
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_Z_GLOBALS_HPP
+#define SHARE_GC_Z_Z_GLOBALS_HPP
+
+#define GC_Z_FLAGS(develop,                                                 \
+                   develop_pd,                                              \
+                   product,                                                 \
+                   product_pd,                                              \
+                   diagnostic,                                              \
+                   diagnostic_pd,                                           \
+                   experimental,                                            \
+                   notproduct,                                              \
+                   manageable,                                              \
+                   product_rw,                                              \
+                   lp64_product,                                            \
+                   range,                                                   \
+                   constraint,                                              \
+                   writeable)                                               \
+                                                                            \
+  product(ccstr, ZPath, NULL,                                               \
+          "Filesystem path for Java heap backing storage "                  \
+          "(must be a tmpfs or a hugetlbfs filesystem)")                    \
+                                                                            \
+  product(double, ZAllocationSpikeTolerance, 2.0,                           \
+          "Allocation spike tolerance factor")                              \
+                                                                            \
+  product(double, ZFragmentationLimit, 25.0,                                \
+          "Maximum allowed heap fragmentation")                             \
+                                                                            \
+  product(bool, ZStallOnOutOfMemory, true,                                  \
+          "Allow Java threads to stall and wait for GC to complete "        \
+          "instead of immediately throwing an OutOfMemoryError")            \
+                                                                            \
+  product(size_t, ZMarkStacksMax, NOT_LP64(512*M) LP64_ONLY(8*G),           \
+          "Maximum number of bytes allocated for marking stacks")           \
+          range(32*M, NOT_LP64(512*M) LP64_ONLY(1024*G))                    \
+                                                                            \
+  product(uint, ZCollectionInterval, 0,                                     \
+          "Force GC at a fixed time interval (in seconds)")                 \
+                                                                            \
+  product(uint, ZStatisticsInterval, 10,                                    \
+          "Time between statistics print outs (in seconds)")                \
+          range(1, (uint)-1)                                                \
+                                                                            \
+  diagnostic(bool, ZStatisticsForceTrace, false,                            \
+          "Force tracing of ZStats")                                        \
+                                                                            \
+  diagnostic(bool, ZProactive, true,                                        \
+          "Enable proactive GC cycles")                                     \
+                                                                            \
+  diagnostic(bool, ZUnmapBadViews, false,                                   \
+          "Unmap bad (inactive) heap views")                                \
+                                                                            \
+  diagnostic(bool, ZVerifyMarking, false,                                   \
+          "Verify marking stacks")                                          \
+                                                                            \
+  diagnostic(bool, ZVerifyForwarding, false,                                \
+          "Verify forwarding tables")                                       \
+                                                                            \
+  diagnostic(bool, ZSymbolTableUnloading, false,                            \
+          "Unload unused VM symbols")                                       \
+                                                                            \
+  diagnostic(bool, ZWeakRoots, true,                                        \
+          "Treat JNI WeakGlobalRefs and StringTable as weak roots")         \
+                                                                            \
+  diagnostic(bool, ZConcurrentStringTable, true,                            \
+          "Clean StringTable concurrently")                                 \
+                                                                            \
+  diagnostic(bool, ZConcurrentVMWeakHandles, true,                          \
+          "Clean VM WeakHandles concurrently")                              \
+                                                                            \
+  diagnostic(bool, ZConcurrentJNIWeakGlobalHandles, true,                   \
+          "Clean JNI WeakGlobalRefs concurrently")                          \
+                                                                            \
+  diagnostic(bool, ZOptimizeLoadBarriers, true,                             \
+          "Apply load barrier optimizations")                               \
+                                                                            \
+  develop(bool, ZVerifyLoadBarriers, false,                                 \
+          "Verify that reference loads are followed by barriers")
+
+#endif // SHARE_GC_Z_Z_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/z/z_specialized_oop_closures.hpp b/src/hotspot/share/gc/z/z_specialized_oop_closures.hpp
new file mode 100644
index 00000000000..8cbc9a8ce4c
--- /dev/null
+++ b/src/hotspot/share/gc/z/z_specialized_oop_closures.hpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015, 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
+ * 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.
+ */
+
+#ifndef SHARE_GC_Z_Z_SPECIALIZED_OOP_CLOSURES_HPP
+#define SHARE_GC_Z_Z_SPECIALIZED_OOP_CLOSURES_HPP
+
+class ZLoadBarrierOopClosure;
+template <bool> class ZMarkBarrierOopClosure;
+
+#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_Z(f) \
+      f(ZLoadBarrierOopClosure,_nv)       \
+      f(ZMarkBarrierOopClosure<true>,_nv) \
+      f(ZMarkBarrierOopClosure<false>,_nv)
+
+#endif // SHARE_GC_Z_Z_SPECIALIZED_OOP_CLOSURES_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/bytecodeInterpreter.cpp
index cb8e6b4f44e..f11cccfaf33 100644
--- a/src/hotspot/share/interpreter/bytecodeInterpreter.cpp
+++ b/src/hotspot/share/interpreter/bytecodeInterpreter.cpp
@@ -49,7 +49,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/threadCritical.hpp"
 #include "utilities/exceptions.hpp"
diff --git a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
index b6d780963dc..763e3daa56a 100644
--- a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
+++ b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,25 +30,10 @@
 #ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
 #define SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
 
-
-// Global settings /////////////////////////////////////////////////////////////
-
-
-// Enables profiling support.
-#if defined(COMPILER2)
-#define CC_INTERP_PROFILE
-#endif
-
-// Enables assertions for profiling code (also works in product-builds).
-// #define CC_INTERP_PROFILE_WITH_ASSERTIONS
-
-
 #ifdef CC_INTERP
 
 // Empty dummy implementations if profiling code is switched off. //////////////
 
-#ifndef CC_INTERP_PROFILE
-
 #define SET_MDX(mdx)
 
 #define BI_PROFILE_GET_OR_CREATE_METHOD_DATA(exception_handler)                \
@@ -69,240 +54,6 @@
 #define BI_PROFILE_UPDATE_VIRTUALCALL(receiver)
 #define BI_PROFILE_UPDATE_SWITCH(switch_index)
 
-
-#else
-
-
-// Non-dummy implementations ///////////////////////////////////////////////////
-
-// Accessors for the current method data pointer 'mdx'.
-#define MDX()        (istate->mdx())
-#define SET_MDX(mdx)                                                           \
-  if (TraceProfileInterpreter) {                                               \
-    /* Let it look like TraceBytecodes' format. */                             \
-    tty->print_cr("[%d]           %4d  "                                       \
-                  "mdx " PTR_FORMAT "(%d)"                                     \
-                  "  "                                                         \
-                  " \t-> " PTR_FORMAT "(%d)",                                  \
-                (int) THREAD->osthread()->thread_id(),                         \
-                BCI(),                                                         \
-                p2i(MDX()),                                                    \
-                (MDX() == NULL                                                 \
-                 ? 0                                                           \
-                 : istate->method()->method_data()->dp_to_di((address)MDX())), \
-                p2i(mdx),                                                      \
-                istate->method()->method_data()->dp_to_di((address)mdx)        \
-                );                                                             \
-  };                                                                           \
-  istate->set_mdx(mdx);
-
-
-// Dumps the profiling method data for the current method.
-#ifdef PRODUCT
-#define BI_PROFILE_PRINT_METHOD_DATA()
-#else  // PRODUCT
-#define BI_PROFILE_PRINT_METHOD_DATA()                                         \
-  {                                                                            \
-    ttyLocker ttyl;                                                            \
-    MethodData *md = istate->method()->method_data();                          \
-    tty->cr();                                                                 \
-    tty->print("method data at mdx " PTR_FORMAT "(0) for",                     \
-               p2i(md->data_layout_at(md->bci_to_di(0))));                     \
-    istate->method()->print_short_name(tty);                                   \
-    tty->cr();                                                                 \
-    if (md != NULL) {                                                          \
-      md->print_data_on(tty);                                                  \
-      address mdx = (address) MDX();                                           \
-      if (mdx != NULL) {                                                       \
-        tty->print_cr("current mdx " PTR_FORMAT "(%d)",                        \
-                      p2i(mdx),                                                \
-                      istate->method()->method_data()->dp_to_di(mdx));         \
-      }                                                                        \
-    } else {                                                                   \
-      tty->print_cr("no method data");                                         \
-    }                                                                          \
-  }
-#endif // PRODUCT
-
-
-// Gets or creates the profiling method data and initializes mdx.
-#define BI_PROFILE_GET_OR_CREATE_METHOD_DATA(exception_handler)                \
-  if (ProfileInterpreter && MDX() == NULL) {                                   \
-    /* Mdx is not yet initialized for this activation. */                      \
-    MethodData *md = istate->method()->method_data();                          \
-    if (md == NULL) {                                                          \
-      MethodCounters* mcs;                                                     \
-      GET_METHOD_COUNTERS(mcs);                                                \
-      /* The profiling method data doesn't exist for this method, */           \
-      /* create it if the counters have overflowed. */                         \
-      if (mcs->invocation_counter()                                            \
-                         ->reached_ProfileLimit(mcs->backedge_counter())) {    \
-        /* Must use CALL_VM, because an async exception may be pending. */     \
-        CALL_VM((InterpreterRuntime::profile_method(THREAD)),                  \
-                exception_handler);                                            \
-        md = istate->method()->method_data();                                  \
-        if (md != NULL) {                                                      \
-          if (TraceProfileInterpreter) {                                       \
-            BI_PROFILE_PRINT_METHOD_DATA();                                    \
-          }                                                                    \
-          Method *m = istate->method();                                        \
-          int bci = m->bci_from(pc);                                           \
-          jint di = md->bci_to_di(bci);                                        \
-          SET_MDX(md->data_layout_at(di));                                     \
-        }                                                                      \
-      }                                                                        \
-    } else {                                                                   \
-      /* The profiling method data exists, align the method data pointer */    \
-      /* mdx to the current bytecode index. */                                 \
-      if (TraceProfileInterpreter) {                                           \
-        BI_PROFILE_PRINT_METHOD_DATA();                                        \
-      }                                                                        \
-      SET_MDX(md->data_layout_at(md->bci_to_di(BCI())));                       \
-    }                                                                          \
-  }
-
-
-// Asserts that the current method data pointer mdx corresponds
-// to the current bytecode.
-#if defined(CC_INTERP_PROFILE_WITH_ASSERTIONS)
-#define BI_PROFILE_CHECK_MDX()                                                 \
-  {                                                                            \
-    MethodData *md = istate->method()->method_data();                          \
-    address mdx  = (address) MDX();                                            \
-    address mdx2 = (address) md->data_layout_at(md->bci_to_di(BCI()));         \
-    guarantee(md   != NULL, "1");                                              \
-    guarantee(mdx  != NULL, "2");                                              \
-    guarantee(mdx2 != NULL, "3");                                              \
-    if (mdx != mdx2) {                                                         \
-      BI_PROFILE_PRINT_METHOD_DATA();                                          \
-      fatal3("invalid mdx at bci %d:"                                          \
-             " was " PTR_FORMAT                                                \
-             " but expected " PTR_FORMAT,                                      \
-             BCI(),                                                            \
-             mdx,                                                              \
-             mdx2);                                                            \
-    }                                                                          \
-  }
-#else
-#define BI_PROFILE_CHECK_MDX()
-#endif
-
-
-// Aligns the method data pointer mdx to the current bytecode index.
-#define BI_PROFILE_ALIGN_TO_CURRENT_BCI()                                      \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    MethodData *md = istate->method()->method_data();                          \
-    SET_MDX(md->data_layout_at(md->bci_to_di(BCI())));                         \
-  }
-
-
-// Updates profiling data for a jump.
-#define BI_PROFILE_UPDATE_JUMP()                                               \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    JumpData::increment_taken_count_no_overflow(MDX());                        \
-    /* Remember last branch taken count. */                                    \
-    mdo_last_branch_taken_count = JumpData::taken_count(MDX());                \
-    SET_MDX(JumpData::advance_taken(MDX()));                                   \
-  }
-
-
-// Updates profiling data for a taken/not taken branch.
-#define BI_PROFILE_UPDATE_BRANCH(is_taken)                                     \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    if (is_taken) {                                                            \
-      BranchData::increment_taken_count_no_overflow(MDX());                    \
-      /* Remember last branch taken count. */                                  \
-      mdo_last_branch_taken_count = BranchData::taken_count(MDX());            \
-      SET_MDX(BranchData::advance_taken(MDX()));                               \
-    } else {                                                                   \
-      BranchData::increment_not_taken_count_no_overflow(MDX());                \
-      SET_MDX(BranchData::advance_not_taken(MDX()));                           \
-    }                                                                          \
-  }
-
-
-// Updates profiling data for a ret with given bci.
-#define BI_PROFILE_UPDATE_RET(bci)                                             \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    MethodData *md = istate->method()->method_data();                          \
-/* FIXME: there is more to do here than increment and advance(mdx)! */         \
-    CounterData::increment_count_no_overflow(MDX());                           \
-    SET_MDX(RetData::advance(md, bci));                                        \
-  }
-
-// Decrement counter at checkcast if the subtype check fails (as template
-// interpreter does!).
-#define BI_PROFILE_SUBTYPECHECK_FAILED(receiver)                               \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    ReceiverTypeData::increment_receiver_count_no_overflow(MDX(), receiver);   \
-    ReceiverTypeData::decrement_count(MDX());                                  \
-  }
-
-// Updates profiling data for a checkcast (was a null seen? which receiver?).
-#define BI_PROFILE_UPDATE_CHECKCAST(null_seen, receiver)                       \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    if (null_seen) {                                                           \
-      ReceiverTypeData::set_null_seen(MDX());                                  \
-    } else {                                                                   \
-      /* Template interpreter doesn't increment count. */                      \
-      /* ReceiverTypeData::increment_count_no_overflow(MDX()); */              \
-      ReceiverTypeData::increment_receiver_count_no_overflow(MDX(), receiver); \
-    }                                                                          \
-    SET_MDX(ReceiverTypeData::advance(MDX()));                                 \
-  }
-
-
-// Updates profiling data for an instanceof (was a null seen? which receiver?).
-#define BI_PROFILE_UPDATE_INSTANCEOF(null_seen, receiver)                      \
-  BI_PROFILE_UPDATE_CHECKCAST(null_seen, receiver)
-
-
-// Updates profiling data for a call.
-#define BI_PROFILE_UPDATE_CALL()                                               \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    CounterData::increment_count_no_overflow(MDX());                           \
-    SET_MDX(CounterData::advance(MDX()));                                      \
-  }
-
-
-// Updates profiling data for a final call.
-#define BI_PROFILE_UPDATE_FINALCALL()                                          \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    VirtualCallData::increment_count_no_overflow(MDX());                       \
-    SET_MDX(VirtualCallData::advance(MDX()));                                  \
-  }
-
-
-// Updates profiling data for a virtual call with given receiver Klass.
-#define BI_PROFILE_UPDATE_VIRTUALCALL(receiver)                                \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    VirtualCallData::increment_receiver_count_no_overflow(MDX(), receiver);    \
-    SET_MDX(VirtualCallData::advance(MDX()));                                  \
-  }
-
-
-// Updates profiling data for a switch (tabelswitch or lookupswitch) with
-// given taken index (-1 means default case was taken).
-#define BI_PROFILE_UPDATE_SWITCH(switch_index)                                 \
-  if (ProfileInterpreter && MDX() != NULL) {                                   \
-    BI_PROFILE_CHECK_MDX();                                                    \
-    MultiBranchData::increment_count_no_overflow(MDX(), switch_index);         \
-    SET_MDX(MultiBranchData::advance(MDX(), switch_index));                    \
-  }
-
-
-// The end /////////////////////////////////////////////////////////////////////
-
-#endif // CC_INTERP_PROFILE
-
 #endif // CC_INTERP
 
 #endif // SHARE_VM_INTERPRETER_BYTECODECINTERPRETERPROFILING_HPP
diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
index 029e29cb2b8..364bb58ba24 100644
--- a/src/hotspot/share/interpreter/linkResolver.cpp
+++ b/src/hotspot/share/interpreter/linkResolver.cpp
@@ -688,19 +688,21 @@ void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig,
                                               CHECK);
   if (failed_type_symbol != NULL) {
     const char* msg = "loader constraint violation: when resolving field"
-      " \"%s\" the class loader %s of the referring class, "
-      "%s, and the class loader %s for the field's resolved "
-      "type, %s, have different Class objects for that type";
-    char* field_name = field->as_C_string();
+      " \"%s\" of type %s, the class loader %s of the current class, "
+      "%s, and the class loader %s for the field's defining "
+      "type, %s, have different Class objects for type %s";
+    const char* field_name = field->as_C_string();
     const char* loader1_name = java_lang_ClassLoader::describe_external(ref_loader());
-    char* sel = sel_klass->name()->as_C_string();
+    const char* sel = sel_klass->external_name();
     const char* loader2_name = java_lang_ClassLoader::describe_external(sel_loader());
-    char* failed_type_name = failed_type_symbol->as_C_string();
-    size_t buflen = strlen(msg) + strlen(field_name) + strlen(loader1_name) +
-                    strlen(sel) + strlen(loader2_name) + strlen(failed_type_name) + 1;
+    const char* failed_type_name = failed_type_symbol->as_klass_external_name();
+    const char* curr_klass_name = current_klass->external_name();
+    size_t buflen = strlen(msg) + strlen(field_name) + 2 * strlen(failed_type_name) +
+                    strlen(loader1_name) + strlen(curr_klass_name) +
+                    strlen(loader2_name) + strlen(sel) + 1;
     char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
-    jio_snprintf(buf, buflen, msg, field_name, loader1_name, sel, loader2_name,
-                     failed_type_name);
+    jio_snprintf(buf, buflen, msg, field_name, failed_type_name, loader1_name,
+                 curr_klass_name, loader2_name, sel, failed_type_name);
     THROW_MSG(vmSymbols::java_lang_LinkageError(), buf);
   }
 }
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
index d1478391bda..c22c4d6ed6b 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -584,10 +584,8 @@ static bool is_jdk_jfr_module_in_readability_graph() {
 
 static void print_module_resolution_error(outputStream* stream) {
   assert(stream != NULL, "invariant");
-  stream->print_cr("%s not found.", JDK_JFR_MODULE_NAME);
+  stream->print_cr("Module %s not found.", JDK_JFR_MODULE_NAME);
   stream->print_cr("Flight Recorder can not be enabled.");
-  stream->print_cr("To use Flight Recorder, you might need to add" \
-    " \"--add-modules %s\" to the VM command-line options.", JDK_JFR_MODULE_NAME);
 }
 
 bool JfrJavaSupport::is_jdk_jfr_module_available() {
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
index fab6ada696e..1fe12f9c820 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
@@ -100,7 +100,7 @@ void RootSetClosure::process_roots(OopClosure* closure) {
   Universe::oops_do(closure);
   JNIHandles::oops_do(closure);
   JvmtiExport::oops_do(closure);
-  SystemDictionary::always_strong_oops_do(closure);
+  SystemDictionary::oops_do(closure);
   Management::oops_do(closure);
   StringTable::oops_do(closure);
   AOTLoader::oops_do(closure);
diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp
index 468fe40cd47..875b79578f9 100644
--- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp
@@ -32,7 +32,7 @@
 #include "memory/iterator.hpp"
 #include "oops/oop.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/ostream.hpp"
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 70ca651b9d1..d961074f54f 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -885,6 +885,39 @@
     <Field type="uint" name="newRatio" label="New Ratio" description="The size of the young generation relative to the tenured generation" />
   </Event>
 
+  <Event name="ZPageAllocation" category="Java Application" label="ZPage Allocation" description="Allocation of a ZPage" thread="true" stackTrace="false">
+     <Field type="ulong" contentType="bytes" name="pageSize" label="Page Size" />
+     <Field type="ulong" contentType="bytes" name="usedAfter" label="Used After" />
+     <Field type="ulong" contentType="bytes" name="freeAfter" label="Free After" />
+     <Field type="ulong" contentType="bytes" name="inCacheAfter" label="In Cache After" />
+     <Field type="boolean" name="nonBlocking" label="Non-blocking" />
+     <Field type="boolean" name="noReserve" label="No Reserve" />
+  </Event>
+
+  <Event name="ZThreadPhase" category="Java Virtual Machine, GC, Detailed" label="ZGC Thread Phase" thread="true">
+    <Field type="uint" name="gcId" label="GC Identifier" relation="GcId"/>
+    <Field type="string" name="name" label="Name" />
+  </Event>
+
+  <Event name="ZStatisticsCounter" category="Java Virtual Machine, GC, Detailed" label="Z Statistics Counter" thread="true">
+    <Field type="ZStatisticsCounterType" name="id" label="Id" />
+    <Field type="ulong" name="increment" label="Increment" />
+    <Field type="ulong" name="value" label="Value" />
+  </Event>
+
+  <Event name="ZStatisticsSampler" category="Java Virtual Machine, GC, Detailed" label="Z Statistics Sampler" thread="true">
+    <Field type="ZStatisticsSamplerType" name="id" label="Id" />
+    <Field type="ulong" name="value" label="Value" />
+  </Event>
+
+  <Type name="ZStatisticsCounterType" label="Z Statistics Counter">
+    <Field type="string" name="counter" label="Counter" />
+  </Type>
+
+  <Type name="ZStatisticsSamplerType" label="Z Statistics Sampler">
+    <Field type="string" name="sampler" label="Sampler" />
+  </Type>
+
   <Type name="Thread" label="Thread">
     <Field type="string" name="osName" label="OS Thread Name" />
     <Field type="long" name="osThreadId" label="OS Thread Id" />
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
index 06db7600c82..26549e240cf 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -44,46 +44,48 @@ enum JfrSampleType {
   NATIVE_SAMPLE = 2
 };
 
-static bool in_java_sample(JavaThread* thread) {
-  switch (thread->thread_state()) {
-  case _thread_new:
-  case _thread_uninitialized:
-  case _thread_new_trans:
-  case _thread_in_vm_trans:
-  case _thread_blocked_trans:
-  case _thread_in_native_trans:
-  case _thread_blocked:
-  case _thread_in_vm:
-  case _thread_in_native:
-  case _thread_in_Java_trans:
-    break;
-  case _thread_in_Java:
-    return true;
-  default:
-    ShouldNotReachHere();
-    break;
+static bool thread_state_in_java(JavaThread* thread) {
+  assert(thread != NULL, "invariant");
+  switch(thread->thread_state()) {
+    case _thread_new:
+    case _thread_uninitialized:
+    case _thread_new_trans:
+    case _thread_in_vm_trans:
+    case _thread_blocked_trans:
+    case _thread_in_native_trans:
+    case _thread_blocked:
+    case _thread_in_vm:
+    case _thread_in_native:
+    case _thread_in_Java_trans:
+      break;
+    case _thread_in_Java:
+      return true;
+    default:
+      ShouldNotReachHere();
+      break;
   }
   return false;
 }
 
-static bool in_native_sample(JavaThread* thread) {
-  switch (thread->thread_state()) {
-  case _thread_new:
-  case _thread_uninitialized:
-  case _thread_new_trans:
-  case _thread_blocked_trans:
-  case _thread_blocked:
-  case _thread_in_vm:
-  case _thread_in_vm_trans:
-  case _thread_in_Java_trans:
-  case _thread_in_Java:
-  case _thread_in_native_trans:
-    break;
-  case _thread_in_native:
-    return true;
-  default:
-    ShouldNotReachHere();
-    break;
+static bool thread_state_in_native(JavaThread* thread) {
+  assert(thread != NULL, "invariant");
+  switch(thread->thread_state()) {
+    case _thread_new:
+    case _thread_uninitialized:
+    case _thread_new_trans:
+    case _thread_blocked_trans:
+    case _thread_blocked:
+    case _thread_in_vm:
+    case _thread_in_vm_trans:
+    case _thread_in_Java_trans:
+    case _thread_in_Java:
+    case _thread_in_native_trans:
+      break;
+    case _thread_in_native:
+      return true;
+    default:
+      ShouldNotReachHere();
+      break;
   }
   return false;
 }
@@ -94,11 +96,10 @@ class JfrThreadSampleClosure {
   ~JfrThreadSampleClosure() {}
   EventExecutionSample* next_event() { return &_events[_added_java++]; }
   EventNativeMethodSample* next_event_native() { return &_events_native[_added_native++]; }
-  void commit_events();
-  int added() const { return _added_java; }
-  JfrSampleType do_sample_thread(JavaThread* thread, JfrStackFrame* frames, u4 max_frames, bool java_sample, bool native_sample);
-  int java_entries() { return _added_java; }
-  int native_entries() { return _added_native; }
+  void commit_events(JfrSampleType type);
+  bool do_sample_thread(JavaThread* thread, JfrStackFrame* frames, u4 max_frames, JfrSampleType type);
+  uint java_entries() { return _added_java; }
+  uint native_entries() { return _added_native; }
 
  private:
   bool sample_thread_in_java(JavaThread* thread, JfrStackFrame* frames, u4 max_frames);
@@ -106,8 +107,8 @@ class JfrThreadSampleClosure {
   EventExecutionSample* _events;
   EventNativeMethodSample* _events_native;
   Thread* _self;
-  int _added_java;
-  int _added_native;
+  uint _added_java;
+  uint _added_native;
 };
 
 class OSThreadSampler : public os::SuspendedThreadTask {
@@ -172,7 +173,7 @@ void OSThreadSampler::do_task(const os::SuspendedThreadTaskContext& context) {
 void OSThreadSampler::protected_task(const os::SuspendedThreadTaskContext& context) {
   JavaThread* jth = (JavaThread*)context.thread();
   // Skip sample if we signaled a thread that moved to other state
-  if (!in_java_sample(jth)) {
+  if (!thread_state_in_java(jth)) {
     return;
   }
   JfrGetCallTrace trace(true, jth);
@@ -281,12 +282,21 @@ bool JfrThreadSampleClosure::sample_thread_in_native(JavaThread* thread, JfrStac
   return true;
 }
 
-void JfrThreadSampleClosure::commit_events() {
-  for (int i = 0; i < _added_java; ++i) {
-    _events[i].commit();
-  }
-  for (int i = 0; i < _added_native; ++i) {
-    _events_native[i].commit();
+static const uint MAX_NR_OF_JAVA_SAMPLES = 5;
+static const uint MAX_NR_OF_NATIVE_SAMPLES = 1;
+
+void JfrThreadSampleClosure::commit_events(JfrSampleType type) {
+  if (JAVA_SAMPLE == type) {
+    assert(_added_java <= MAX_NR_OF_JAVA_SAMPLES, "invariant");
+    for (uint i = 0; i < _added_java; ++i) {
+      _events[i].commit();
+    }
+  } else {
+    assert(NATIVE_SAMPLE == type, "invariant");
+    assert(_added_native <= MAX_NR_OF_NATIVE_SAMPLES, "invariant");
+    for (uint i = 0; i < _added_native; ++i) {
+      _events_native[i].commit();
+    }
   }
 }
 
@@ -344,23 +354,26 @@ static void clear_transition_block(JavaThread* jt) {
   }
 }
 
-JfrSampleType JfrThreadSampleClosure::do_sample_thread(JavaThread* thread, JfrStackFrame* frames, u4 max_frames, bool java_sample, bool native_sample) {
+bool JfrThreadSampleClosure::do_sample_thread(JavaThread* thread, JfrStackFrame* frames, u4 max_frames, JfrSampleType type) {
   assert(Threads_lock->owned_by_self(), "Holding the thread table lock.");
-  if (thread->is_hidden_from_external_view()) {
-    return NO_SAMPLE;
+  if (thread->is_hidden_from_external_view() || thread->in_deopt_handler()) {
+    return false;
   }
-  if (thread->in_deopt_handler()) {
-    return NO_SAMPLE;
-  }
-  JfrSampleType ret = NO_SAMPLE;
+
+  bool ret = false;
   thread->set_trace_flag();
   if (!UseMembar) {
     os::serialize_thread_states();
   }
-  if (in_java_sample(thread) && java_sample) {
-    ret = sample_thread_in_java(thread, frames, max_frames) ? JAVA_SAMPLE : NO_SAMPLE;
-  } else if (in_native_sample(thread) && native_sample) {
-    ret = sample_thread_in_native(thread, frames, max_frames) ? NATIVE_SAMPLE : NO_SAMPLE;
+  if (JAVA_SAMPLE == type) {
+    if (thread_state_in_java(thread)) {
+      ret = sample_thread_in_java(thread, frames, max_frames);
+    }
+  } else {
+    assert(NATIVE_SAMPLE == type, "invariant");
+    if (thread_state_in_native(thread)) {
+      ret = sample_thread_in_native(thread, frames, max_frames);
+    }
   }
   clear_transition_block(thread);
   return ret;
@@ -396,31 +409,19 @@ void JfrThreadSampler::on_javathread_suspend(JavaThread* thread) {
 }
 
 JavaThread* JfrThreadSampler::next_thread(ThreadsList* t_list, JavaThread* first_sampled, JavaThread* current) {
+  assert(t_list != NULL, "invariant");
   assert(Threads_lock->owned_by_self(), "Holding the thread table lock.");
-  if (current == NULL) {
+  assert(_cur_index >= -1 && (uint)_cur_index + 1 <= t_list->length(), "invariant");
+  assert((current == NULL && -1 == _cur_index) || (t_list->find_index_of_JavaThread(current) == _cur_index), "invariant");
+  if ((uint)_cur_index + 1 == t_list->length()) {
+    // wrap
     _cur_index = 0;
-    return t_list->thread_at(_cur_index);
+  } else {
+    _cur_index++;
   }
-
-  if (_cur_index == -1 || t_list->thread_at(_cur_index) != current) {
-    // 'current' is not at '_cur_index' so find it:
-    _cur_index = t_list->find_index_of_JavaThread(current);
-    assert(_cur_index != -1, "current JavaThread should be findable.");
-  }
-  _cur_index++;
-
-  JavaThread* next = NULL;
-  // wrap
-  if ((uint)_cur_index >= t_list->length()) {
-    _cur_index = 0;
-  }
-  next = t_list->thread_at(_cur_index);
-
-  // sample wrap
-  if (next == first_sampled) {
-    return NULL;
-  }
-  return next;
+  assert(_cur_index >= 0 && (uint)_cur_index < t_list->length(), "invariant");
+  JavaThread* const next = t_list->thread_at(_cur_index);
+  return next != first_sampled ? next : NULL;
 }
 
 void JfrThreadSampler::start_thread() {
@@ -494,54 +495,50 @@ void JfrThreadSampler::run() {
   delete this;
 }
 
-static const int MAX_NR_OF_SAMPLES = 5;
 
 void JfrThreadSampler::task_stacktrace(JfrSampleType type, JavaThread** last_thread) {
   ResourceMark rm;
-  EventExecutionSample samples[MAX_NR_OF_SAMPLES];
-  EventNativeMethodSample samples_native[MAX_NR_OF_SAMPLES];
+  EventExecutionSample samples[MAX_NR_OF_JAVA_SAMPLES];
+  EventNativeMethodSample samples_native[MAX_NR_OF_NATIVE_SAMPLES];
   JfrThreadSampleClosure sample_task(samples, samples_native);
 
-  int num_samples = 0;
+  const uint sample_limit = JAVA_SAMPLE == type ? MAX_NR_OF_JAVA_SAMPLES : MAX_NR_OF_NATIVE_SAMPLES;
+  uint num_sample_attempts = 0;
+  JavaThread* start = NULL;
+
   {
     elapsedTimer sample_time;
     sample_time.start();
-
     {
       MonitorLockerEx tlock(Threads_lock, Mutex::_allow_vm_block_flag);
       ThreadsListHandle tlh;
-      JavaThread* current = tlh.includes(*last_thread) ? *last_thread : NULL;
-      JavaThread* start = NULL;
+      // Resolve a sample session relative start position index into the thread list array.
+      // In cases where the last sampled thread is NULL or not-NULL but stale, find_index() returns -1.
+      _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
+      JavaThread* current = _cur_index != -1 ? *last_thread : NULL;
 
-      while (num_samples < MAX_NR_OF_SAMPLES) {
+      while (num_sample_attempts < sample_limit) {
         current = next_thread(tlh.list(), start, current);
         if (current == NULL) {
           break;
         }
         if (start == NULL) {
-          start = current;  // remember thread where we started sampling
+          start = current;  // remember the thread where we started to attempt sampling
         }
         if (current->is_Compiler_thread()) {
           continue;
         }
-        *last_thread = current;  // remember thread we last sampled
-        JfrSampleType ret = sample_task.do_sample_thread(current, _frames, _max_frames, type == JAVA_SAMPLE, type == NATIVE_SAMPLE);
-        switch (type) {
-        case JAVA_SAMPLE:
-        case NATIVE_SAMPLE:
-          ++num_samples;
-          break;
-        default:
-          break;
-        }
+        sample_task.do_sample_thread(current, _frames, _max_frames, type);
+        num_sample_attempts++;
       }
+      *last_thread = current;  // remember the thread we last attempted to sample
     }
     sample_time.stop();
     log_trace(jfr)("JFR thread sampling done in %3.7f secs with %d java %d native samples",
-      sample_time.seconds(), sample_task.java_entries(), sample_task.native_entries());
+                   sample_time.seconds(), sample_task.java_entries(), sample_task.native_entries());
   }
-  if (num_samples > 0) {
-    sample_task.commit_events();
+  if (num_sample_attempts > 0) {
+    sample_task.commit_events(type);
   }
 }
 
@@ -573,7 +570,7 @@ JfrThreadSampling::~JfrThreadSampling() {
 }
 
 static void log(size_t interval_java, size_t interval_native) {
-  log_info(jfr)("Updated thread sampler for java: " SIZE_FORMAT"  ms, native " SIZE_FORMAT " ms", interval_java, interval_native);
+  log_info(jfr)("Updated thread sampler for java: " SIZE_FORMAT "  ms, native " SIZE_FORMAT " ms", interval_java, interval_native);
 }
 
 void JfrThreadSampling::start_sampler(size_t interval_java, size_t interval_native) {
@@ -591,13 +588,11 @@ void JfrThreadSampling::set_sampling_interval(bool java_interval, size_t period)
     interval_java = _sampler->get_java_interval();
     interval_native = _sampler->get_native_interval();
   }
-
   if (java_interval) {
     interval_java = period;
   } else {
     interval_native = period;
   }
-
   if (interval_java > 0 || interval_native > 0) {
     if (_sampler == NULL) {
       log_info(jfr)("Creating thread sampler for java:%zu ms, native %zu ms", interval_java, interval_native);
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
index 092c40971e0..befc1d7030f 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
@@ -27,7 +27,6 @@
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
-class Monitor;
 class JavaThread;
 class JfrStackFrame;
 class JfrThreadSampler;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
index 9ae40119f04..5fc07d443b0 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -38,7 +38,7 @@
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
 
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
index 3de0a2690d3..3059ca36f9a 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
@@ -59,6 +59,9 @@
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "gc/g1/g1YCTypes.hpp"
 #endif
+#if INCLUDE_ZGC
+#include "gc/z/zStat.hpp"
+#endif
 
 // implementation for the static registration function exposed in the api
 bool JfrSerializer::register_serializer(JfrTypeId id, bool require_safepoint, bool permit_cache, JfrSerializer* cs) {
@@ -346,3 +349,27 @@ void JfrThreadConstant::serialize(JfrCheckpointWriter& writer) {
   writer.write(thread_group_id);
   JfrThreadGroup::serialize(&writer, thread_group_id);
 }
+
+void ZStatisticsCounterTypeConstant::serialize(JfrCheckpointWriter& writer) {
+#if INCLUDE_ZGC
+  writer.write_count(ZStatCounter::count());
+  for (ZStatCounter* counter = ZStatCounter::first(); counter != NULL; counter = counter->next()) {
+    writer.write_key(counter->id());
+    writer.write(counter->name());
+  }
+#else
+  writer.write_count(0);
+#endif
+}
+
+void ZStatisticsSamplerTypeConstant::serialize(JfrCheckpointWriter& writer) {
+#if INCLUDE_ZGC
+  writer.write_count(ZStatSampler::count());
+  for (ZStatSampler* sampler = ZStatSampler::first(); sampler != NULL; sampler = sampler->next()) {
+    writer.write_key(sampler->id());
+    writer.write(sampler->name());
+  }
+#else
+  writer.write_count(0);
+#endif
+}
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
index 5f91819b9e1..54dd32acdf2 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
@@ -135,4 +135,14 @@ class JfrThreadConstant : public JfrSerializer {
   void serialize(JfrCheckpointWriter& writer);
 };
 
+class ZStatisticsCounterTypeConstant : public JfrSerializer {
+ public:
+  void serialize(JfrCheckpointWriter& writer);
+};
+
+class ZStatisticsSamplerTypeConstant : public JfrSerializer {
+ public:
+  void serialize(JfrCheckpointWriter& writer);
+};
+
 #endif // SHARE_VM_JFR_CHECKPOINT_CONSTANT_JFRCONSTANT_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
index 02613d2e204..be60c516ff5 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
@@ -195,7 +195,7 @@ bool JfrTypeManager::register_serializer(JfrTypeId id, bool require_safepoint, b
 
 bool JfrTypeManager::initialize() {
   // register non-safepointing type serialization
-  for (size_t i = 0; i < 16; ++i) {
+  for (size_t i = 0; i < 18; ++i) {
     switch (i) {
     case 0: register_serializer(TYPE_FLAGVALUEORIGIN, false, true, new FlagValueOriginConstant()); break;
     case 1: register_serializer(TYPE_INFLATECAUSE, false, true, new MonitorInflateCauseConstant()); break;
@@ -213,6 +213,8 @@ bool JfrTypeManager::initialize() {
     case 13: register_serializer(TYPE_CODEBLOBTYPE, false, true, new CodeBlobTypeConstant()); break;
     case 14: register_serializer(TYPE_VMOPERATIONTYPE, false, true, new VMOperationTypeConstant()); break;
     case 15: register_serializer(TYPE_THREADSTATE, false, true, new ThreadStateConstant()); break;
+    case 16: register_serializer(TYPE_ZSTATISTICSCOUNTERTYPE, false, true, new ZStatisticsCounterTypeConstant()); break;
+    case 17: register_serializer(TYPE_ZSTATISTICSSAMPLERTYPE, false, true, new ZStatisticsSamplerTypeConstant()); break;
     default:
       guarantee(false, "invariant");
     }
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
index 6df57f83832..1a838d1cecc 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
@@ -33,7 +33,7 @@
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/vm_version.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/thread.inline.hpp"
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp
index 09460e888f1..fa7b273a2b9 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "jfr/utilities/jfrTypes.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef VM_LITTLE_ENDIAN
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
index b76a3046720..80c4b0ac175 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
 #include "runtime/safepoint.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 // Alternating epochs on each rotation allow for concurrent tagging.
 // The regular epoch shift happens only during a safepoint.
diff --git a/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp b/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp
index aa67f97d7cb..cbc61605977 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp
@@ -26,7 +26,7 @@
 #include "jfr/recorder/service/jfrPostBox.hpp"
 #include "jfr/utilities/jfrTryLock.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 
 #define MSG_IS_SYNCHRONOUS ( (MSGBIT(MSG_ROTATE)) |          \
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index 63c56ff7124..512897ce886 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -46,7 +46,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.inline.hpp"
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp
index a039d2747fb..4725707b2db 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 
 static const u1* const MUTEX_CLAIM = NULL;
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
index 8e92f068227..7292c841658 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
@@ -38,7 +38,7 @@
 #include "jfr/writers/jfrNativeEventWriter.hpp"
 #include "logging/log.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp
index 51eb7583691..a0f7c34d47a 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp
@@ -26,7 +26,7 @@
 #include "jfr/recorder/storage/jfrStorageControl.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 // returns the updated value
 static jlong atomic_add(size_t value, size_t volatile* const dest) {
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index 9e76aac7126..ea282328f2c 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "jfr/recorder/storage/jfrVirtualMemory.hpp"
 #include "memory/virtualspace.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
index 549bbab9343..a5de4d12209 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
@@ -35,7 +35,7 @@
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.inline.hpp"
 
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.cpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.cpp
index 4e0edc7c8c0..f5f95b976be 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.cpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.cpp
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "jfr/recorder/stringpool/jfrStringPoolBuffer.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 
 JfrStringPoolBuffer::JfrStringPoolBuffer() : JfrBuffer(), _string_count_pos(0), _string_count_top(0) {}
diff --git a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
index fa5366ecdbf..b50db7c5dac 100644
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
@@ -28,7 +28,7 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
diff --git a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
index 1aa4dbde599..ea025c2ced1 100644
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
 
 #include "memory/allocation.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
index 73e507f4186..9d5e5b5f043 100644
--- a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -22,10 +22,90 @@
  */
 
 #include "precompiled.hpp"
-#include "jvmci/jvmciJavaClasses.hpp"
-#include "runtime/jniHandles.hpp"
 #include "classfile/symbolTable.hpp"
+#include "jvmci/jvmciJavaClasses.hpp"
 #include "memory/resourceArea.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/jniHandles.inline.hpp"
+
+
+// This macro expands for non-inline functions, in class declarations.
+
+#define START_CLASS(name)                                                                                                                                \
+    void name::check(oop obj, const char* field_name, int offset) {                                                                                          \
+      assert(obj != NULL, "NULL field access of %s.%s", #name, field_name);                                                                                  \
+      assert(obj->is_a(SystemDictionary::name##_klass()), "wrong class, " #name " expected, found %s", obj->klass()->external_name());                       \
+      assert(offset != 0, "must be valid offset");                                                                                                           \
+    }
+
+#define END_CLASS
+
+#define FIELD(klass, name, type, accessor, cast)                                                                                                                                \
+    type klass::name(jobject obj)               { check(JNIHandles::resolve(obj), #name, _##name##_offset); return cast JNIHandles::resolve(obj)->accessor(_##name##_offset); }     \
+    void klass::set_##name(jobject obj, type x) { check(JNIHandles::resolve(obj), #name, _##name##_offset); JNIHandles::resolve(obj)->accessor##_put(_##name##_offset, x); }
+
+#define EMPTY_CAST
+#define CHAR_FIELD(klass, name) FIELD(klass, name, jchar, char_field, EMPTY_CAST)
+#define INT_FIELD(klass, name) FIELD(klass, name, jint, int_field, EMPTY_CAST)
+#define BOOLEAN_FIELD(klass, name) FIELD(klass, name, jboolean, bool_field, EMPTY_CAST)
+#define LONG_FIELD(klass, name) FIELD(klass, name, jlong, long_field, EMPTY_CAST)
+#define FLOAT_FIELD(klass, name) FIELD(klass, name, jfloat, float_field, EMPTY_CAST)
+#define OOP_FIELD(klass, name, signature) FIELD(klass, name, oop, obj_field, EMPTY_CAST)
+#define OBJARRAYOOP_FIELD(klass, name, signature) FIELD(klass, name, objArrayOop, obj_field, (objArrayOop))
+#define TYPEARRAYOOP_FIELD(klass, name, signature) FIELD(klass, name, typeArrayOop, obj_field, (typeArrayOop))
+#define STATIC_OOP_FIELD(klassName, name, signature) STATIC_OOPISH_FIELD(klassName, name, oop, signature)
+#define STATIC_OBJARRAYOOP_FIELD(klassName, name, signature) STATIC_OOPISH_FIELD(klassName, name, objArrayOop, signature)
+#define STATIC_OOPISH_FIELD(klassName, name, type, signature)                                                  \
+    type klassName::name() {                                                                                   \
+      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
+      InstanceKlass* ik = klassName::klass();                                                                  \
+      oop base = ik->static_field_base_raw();                                                                  \
+      oop result = HeapAccess<>::oop_load_at(base, _##name##_offset);                                          \
+      return type(result);                                                                                     \
+    }                                                                                                          \
+    void klassName::set_##name(type x) {                                                                       \
+      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
+      assert(klassName::klass() != NULL, "Class not yet loaded: " #klassName);                                 \
+      InstanceKlass* ik = klassName::klass();                                                                  \
+      oop base = ik->static_field_base_raw();                                                                  \
+      HeapAccess<>::oop_store_at(base, _##name##_offset, x);                                                   \
+    }
+#define STATIC_PRIMITIVE_FIELD(klassName, name, jtypename)                                                     \
+    jtypename klassName::name() {                                                                              \
+      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
+      InstanceKlass* ik = klassName::klass();                                                                  \
+      oop base = ik->static_field_base_raw();                                                                  \
+      return HeapAccess<>::load_at(base, _##name##_offset);                                                    \
+    }                                                                                                          \
+    void klassName::set_##name(jtypename x) {                                                                  \
+      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
+      InstanceKlass* ik = klassName::klass();                                                                  \
+      oop base = ik->static_field_base_raw();                                                                  \
+      HeapAccess<>::store_at(base, _##name##_offset, x);                                                       \
+    }
+
+#define STATIC_INT_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jint)
+#define STATIC_BOOLEAN_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jboolean)
+
+COMPILER_CLASSES_DO(START_CLASS, END_CLASS, CHAR_FIELD, INT_FIELD, BOOLEAN_FIELD, LONG_FIELD, FLOAT_FIELD, OOP_FIELD, TYPEARRAYOOP_FIELD, OBJARRAYOOP_FIELD, STATIC_OOP_FIELD, STATIC_OBJARRAYOOP_FIELD, STATIC_INT_FIELD, STATIC_BOOLEAN_FIELD)
+#undef START_CLASS
+#undef END_CLASS
+#undef FIELD
+#undef CHAR_FIELD
+#undef INT_FIELD
+#undef BOOLEAN_FIELD
+#undef LONG_FIELD
+#undef FLOAT_FIELD
+#undef OOP_FIELD
+#undef TYPEARRAYOOP_FIELD
+#undef OBJARRAYOOP_FIELD
+#undef STATIC_OOPISH_FIELD
+#undef STATIC_OOP_FIELD
+#undef STATIC_OBJARRAYOOP_FIELD
+#undef STATIC_INT_FIELD
+#undef STATIC_BOOLEAN_FIELD
+#undef STATIC_PRIMITIVE_FIELD
+#undef EMPTY_CAST
 
 // This function is similar to javaClasses.cpp, it computes the field offset of a (static or instance) field.
 // It looks up the name and signature symbols without creating new ones, all the symbols of these classes need to be already loaded.
@@ -86,7 +166,3 @@ void JVMCIJavaClasses::compute_offsets(TRAPS) {
 
 COMPILER_CLASSES_DO(EMPTY1, EMPTY0, FIELD2, FIELD2, FIELD2, FIELD2, FIELD2, FIELD3, FIELD3, FIELD3, FIELD3, FIELD3, FIELD2, FIELD2)
 
-
-
-
-
diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp
index d5f91545a53..7407cc19808 100644
--- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp
@@ -25,10 +25,9 @@
 #define SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
 
 #include "classfile/systemDictionary.hpp"
-#include "oops/access.inline.hpp"
+#include "oops/access.hpp"
 #include "oops/instanceMirrorKlass.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/jniHandles.inline.hpp"
+#include "oops/oop.hpp"
 
 class JVMCIJavaClasses : AllStatic {
  public:
@@ -243,19 +242,19 @@ class JVMCIJavaClasses : AllStatic {
   end_class                                                                                                                                                    \
   start_class(JavaKind)                                                                                                                                        \
     char_field(JavaKind, typeChar)                                                                                                                             \
-    static_oop_field(JavaKind, Boolean, "Ljdk/vm/ci/meta/JavaKind;");                                                                                          \
-    static_oop_field(JavaKind, Byte, "Ljdk/vm/ci/meta/JavaKind;");                                                                                             \
-    static_oop_field(JavaKind, Char, "Ljdk/vm/ci/meta/JavaKind;");                                                                                             \
-    static_oop_field(JavaKind, Short, "Ljdk/vm/ci/meta/JavaKind;");                                                                                            \
-    static_oop_field(JavaKind, Int, "Ljdk/vm/ci/meta/JavaKind;");                                                                                              \
-    static_oop_field(JavaKind, Long, "Ljdk/vm/ci/meta/JavaKind;");                                                                                             \
+    static_oop_field(JavaKind, Boolean, "Ljdk/vm/ci/meta/JavaKind;")                                                                                           \
+    static_oop_field(JavaKind, Byte, "Ljdk/vm/ci/meta/JavaKind;")                                                                                              \
+    static_oop_field(JavaKind, Char, "Ljdk/vm/ci/meta/JavaKind;")                                                                                              \
+    static_oop_field(JavaKind, Short, "Ljdk/vm/ci/meta/JavaKind;")                                                                                             \
+    static_oop_field(JavaKind, Int, "Ljdk/vm/ci/meta/JavaKind;")                                                                                               \
+    static_oop_field(JavaKind, Long, "Ljdk/vm/ci/meta/JavaKind;")                                                                                              \
   end_class                                                                                                                                                    \
   start_class(ValueKind)                                                                                                                                       \
     oop_field(ValueKind, platformKind, "Ljdk/vm/ci/meta/PlatformKind;")                                                                                        \
   end_class                                                                                                                                                    \
   start_class(Value)                                                                                                                                           \
     oop_field(Value, valueKind, "Ljdk/vm/ci/meta/ValueKind;")                                                                                                  \
-    static_oop_field(Value, ILLEGAL, "Ljdk/vm/ci/meta/AllocatableValue;");                                                                                     \
+    static_oop_field(Value, ILLEGAL, "Ljdk/vm/ci/meta/AllocatableValue;")                                                                                      \
   end_class                                                                                                                                                    \
   start_class(RegisterValue)                                                                                                                                   \
     oop_field(RegisterValue, reg, "Ljdk/vm/ci/code/Register;")                                                                                                 \
@@ -317,11 +316,7 @@ class JVMCIJavaClasses : AllStatic {
 class name : AllStatic {                                                                                                                                       \
   private:                                                                                                                                                     \
     friend class JVMCICompiler;                                                                                                                                \
-    static void check(oop obj, const char* field_name, int offset) {                                                                                           \
-        assert(obj != NULL, "NULL field access of %s.%s", #name, field_name);                                                                                  \
-        assert(obj->is_a(SystemDictionary::name##_klass()), "wrong class, " #name " expected, found %s", obj->klass()->external_name());                       \
-        assert(offset != 0, "must be valid offset");                                                                                                           \
-    }                                                                                                                                                          \
+    static void check(oop obj, const char* field_name, int offset);                                                                                            \
     static void compute_offsets(TRAPS);                                                                                                                        \
   public:                                                                                                                                                      \
     static InstanceKlass* klass() { return SystemDictionary::name##_klass(); }
@@ -330,12 +325,12 @@ class name : AllStatic {
 
 #define FIELD(name, type, accessor, cast)                                                                                                                         \
     static int _##name##_offset;                                                                                                                                  \
-    static type name(oop obj)                   { check(obj, #name, _##name##_offset); return cast obj->accessor(_##name##_offset); }                                               \
-    static type name(Handle obj)                { check(obj(), #name, _##name##_offset); return cast obj->accessor(_##name##_offset); }                                             \
-    static type name(jobject obj)               { check(JNIHandles::resolve(obj), #name, _##name##_offset); return cast JNIHandles::resolve(obj)->accessor(_##name##_offset); }     \
-    static void set_##name(oop obj, type x)     { check(obj, #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); }                                                  \
-    static void set_##name(Handle obj, type x)  { check(obj(), #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); }                                                \
-    static void set_##name(jobject obj, type x) { check(JNIHandles::resolve(obj), #name, _##name##_offset); JNIHandles::resolve(obj)->accessor##_put(_##name##_offset, x); }
+    static type name(oop obj)                   { check(obj, #name, _##name##_offset); return cast obj->accessor(_##name##_offset); }                             \
+    static type name(Handle obj)                { check(obj(), #name, _##name##_offset); return cast obj->accessor(_##name##_offset); }                           \
+    static type name(jobject obj);                                                                                                                                \
+    static void set_##name(oop obj, type x)     { check(obj, #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); }                                \
+    static void set_##name(Handle obj, type x)  { check(obj(), #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); }                              \
+    static void set_##name(jobject obj, type x);                                                                                                                  \
 
 #define EMPTY_CAST
 #define CHAR_FIELD(klass, name) FIELD(name, jchar, char_field, EMPTY_CAST)
@@ -350,34 +345,12 @@ class name : AllStatic {
 #define STATIC_OBJARRAYOOP_FIELD(klassName, name, signature) STATIC_OOPISH_FIELD(klassName, name, objArrayOop, signature)
 #define STATIC_OOPISH_FIELD(klassName, name, type, signature)                                                  \
     static int _##name##_offset;                                                                               \
-    static type name() {                                                                                       \
-      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
-      InstanceKlass* ik = klassName::klass();                                                                  \
-      oop base = ik->static_field_base_raw();                                                                  \
-      oop result = HeapAccess<>::oop_load_at(base, _##name##_offset);                                          \
-      return type(result);                                                                                     \
-    }                                                                                                          \
-    static void set_##name(type x) {                                                                           \
-      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
-      assert(klassName::klass() != NULL, "Class not yet loaded: " #klassName);                                 \
-      InstanceKlass* ik = klassName::klass();                                                                  \
-      oop base = ik->static_field_base_raw();                                                                  \
-      HeapAccess<>::oop_store_at(base, _##name##_offset, x);                                                   \
-    }
+    static type name();                                                                                        \
+    static void set_##name(type x);
 #define STATIC_PRIMITIVE_FIELD(klassName, name, jtypename)                                                     \
     static int _##name##_offset;                                                                               \
-    static jtypename name() {                                                                                  \
-      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
-      InstanceKlass* ik = klassName::klass();                                                                  \
-      oop base = ik->static_field_base_raw();                                                                  \
-      return HeapAccess<>::load_at(base, _##name##_offset);                                                    \
-    }                                                                                                          \
-    static void set_##name(jtypename x) {                                                                      \
-      assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \
-      InstanceKlass* ik = klassName::klass();                                                                  \
-      oop base = ik->static_field_base_raw();                                                                  \
-      HeapAccess<>::store_at(base, _##name##_offset, x);                                                       \
-    }
+    static jtypename name();                                                                                   \
+    static void set_##name(jtypename x);
 
 #define STATIC_INT_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jint)
 #define STATIC_BOOLEAN_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jboolean)
@@ -399,6 +372,7 @@ COMPILER_CLASSES_DO(START_CLASS, END_CLASS, CHAR_FIELD, INT_FIELD, BOOLEAN_FIELD
 #undef STATIC_OBJARRAYOOP_FIELD
 #undef STATIC_INT_FIELD
 #undef STATIC_BOOLEAN_FIELD
+#undef STATIC_PRIMITIVE_FIELD
 #undef EMPTY_CAST
 
 void compute_offset(int &dest_offset, Klass* klass, const char* name, const char* signature, bool static_field, TRAPS);
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 1c04dbfd101..307c89c217c 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -26,6 +26,7 @@
 #include "code/codeBlob.hpp"
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compileBroker.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "jvmci/jvmciCodeInstaller.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciEnv.hpp"
diff --git a/src/hotspot/share/logging/logOutputList.cpp b/src/hotspot/share/logging/logOutputList.cpp
index bc0565ae766..00985fc9ad4 100644
--- a/src/hotspot/share/logging/logOutputList.cpp
+++ b/src/hotspot/share/logging/logOutputList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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,7 +26,7 @@
 #include "logging/logOutputList.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 jint LogOutputList::increase_readers() {
diff --git a/src/hotspot/share/logging/logPrefix.hpp b/src/hotspot/share/logging/logPrefix.hpp
index 2ab11cbb6d0..548063eac9d 100644
--- a/src/hotspot/share/logging/logPrefix.hpp
+++ b/src/hotspot/share/logging/logPrefix.hpp
@@ -62,9 +62,11 @@ DEBUG_ONLY(size_t Test_log_prefix_prefixer(char* buf, size_t len);)
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, humongous)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ihop)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, liveness)) \
+  LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, load)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, marking)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, metaspace)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, mmu)) \
+  LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, nmethod)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, phases)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, phases, ref)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, phases, start)) \
@@ -75,6 +77,7 @@ DEBUG_ONLY(size_t Test_log_prefix_prefixer(char* buf, size_t len);)
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, remset, tracking)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ref)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ref, start)) \
+  LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, reloc)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, start)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, stringtable)) \
   LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, sweep)) \
diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp
index 27ef8dd0ff2..8fbf76cd645 100644
--- a/src/hotspot/share/logging/logTag.hpp
+++ b/src/hotspot/share/logging/logTag.hpp
@@ -62,6 +62,7 @@
   LOG_TAG(datacreation) \
   LOG_TAG(decoder) \
   LOG_TAG(defaultmethods) \
+  LOG_TAG(director) \
   LOG_TAG(dump) \
   LOG_TAG(ergo) \
   LOG_TAG(exceptions) \
@@ -103,7 +104,9 @@
   LOG_TAG(normalize) \
   LOG_TAG(objecttagging) \
   LOG_TAG(obsolete) \
+  LOG_TAG(oom) \
   LOG_TAG(oopmap) \
+  LOG_TAG(oops) \
   LOG_TAG(oopstorage) \
   LOG_TAG(os) \
   LOG_TAG(pagesize) \
@@ -120,6 +123,7 @@
   LOG_TAG(redefine) \
   LOG_TAG(refine) \
   LOG_TAG(region) \
+  LOG_TAG(reloc) \
   LOG_TAG(remset) \
   LOG_TAG(purge) \
   LOG_TAG(resolve) \
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index bfe6616c6ac..40ff2c7091c 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 
 #include "aot/aotLoader.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/filemap.hpp"
@@ -37,11 +38,13 @@
 #include "memory/metaspace/virtualSpaceList.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceTracer.hpp"
+#include "memory/universe.hpp"
 #include "runtime/init.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 
@@ -601,11 +604,12 @@ void MetaspaceUtils::print_basic_report(outputStream* out, size_t scale) {
 void MetaspaceUtils::print_report(outputStream* out, size_t scale, int flags) {
 
   const bool print_loaders = (flags & rf_show_loaders) > 0;
+  const bool print_classes = (flags & rf_show_classes) > 0;
   const bool print_by_chunktype = (flags & rf_break_down_by_chunktype) > 0;
   const bool print_by_spacetype = (flags & rf_break_down_by_spacetype) > 0;
 
   // Some report options require walking the class loader data graph.
-  PrintCLDMetaspaceInfoClosure cl(out, scale, print_loaders, print_by_chunktype);
+  PrintCLDMetaspaceInfoClosure cl(out, scale, print_loaders, print_classes, print_by_chunktype);
   if (print_loaders) {
     out->cr();
     out->print_cr("Usage per loader:");
@@ -1269,7 +1273,7 @@ void Metaspace::report_metadata_oome(ClassLoaderData* loader_data, size_t word_s
   tracer()->report_metadata_oom(loader_data, word_size, type, mdtype);
 
   // If result is still null, we are out of memory.
-  Log(gc, metaspace, freelist) log;
+  Log(gc, metaspace, freelist, oom) log;
   if (log.is_info()) {
     log.info("Metaspace (%s) allocation failed for size " SIZE_FORMAT,
              is_class_space_allocation(mdtype) ? "class" : "data", word_size);
diff --git a/src/hotspot/share/memory/metaspace.hpp b/src/hotspot/share/memory/metaspace.hpp
index cb72fba1591..c17de2d233f 100644
--- a/src/hotspot/share/memory/metaspace.hpp
+++ b/src/hotspot/share/memory/metaspace.hpp
@@ -229,6 +229,7 @@ class Metaspace : public AllStatic {
 // Manages the metaspace portion belonging to a class loader
 class ClassLoaderMetaspace : public CHeapObj<mtClass> {
   friend class CollectedHeap; // For expand_and_allocate()
+  friend class ZCollectedHeap; // For expand_and_allocate()
   friend class Metaspace;
   friend class MetaspaceUtils;
   friend class metaspace::PrintCLDMetaspaceInfoClosure;
@@ -389,7 +390,9 @@ public:
     // Print details about the underlying virtual spaces.
     rf_show_vslist                  = (1 << 3),
     // Print metaspace map.
-    rf_show_vsmap                   = (1 << 4)
+    rf_show_vsmap                   = (1 << 4),
+    // If show_loaders: show loaded classes for each loader.
+    rf_show_classes                 = (1 << 5)
   };
 
   // This will print out a basic metaspace usage report but
diff --git a/src/hotspot/share/memory/metaspace/chunkManager.cpp b/src/hotspot/share/memory/metaspace/chunkManager.cpp
index 77ea56bcfc5..17f90f3b4ff 100644
--- a/src/hotspot/share/memory/metaspace/chunkManager.cpp
+++ b/src/hotspot/share/memory/metaspace/chunkManager.cpp
@@ -40,6 +40,13 @@
 
 namespace metaspace {
 
+ChunkManager::ChunkManager(bool is_class)
+      : _is_class(is_class), _free_chunks_total(0), _free_chunks_count(0) {
+  _free_chunks[SpecializedIndex].set_size(get_size_for_nonhumongous_chunktype(SpecializedIndex, is_class));
+  _free_chunks[SmallIndex].set_size(get_size_for_nonhumongous_chunktype(SmallIndex, is_class));
+  _free_chunks[MediumIndex].set_size(get_size_for_nonhumongous_chunktype(MediumIndex, is_class));
+}
+
 void ChunkManager::remove_chunk(Metachunk* chunk) {
   size_t word_size = chunk->word_size();
   ChunkIndex index = list_index(word_size);
diff --git a/src/hotspot/share/memory/metaspace/chunkManager.hpp b/src/hotspot/share/memory/metaspace/chunkManager.hpp
index 4a80d087c4a..3715d4608b9 100644
--- a/src/hotspot/share/memory/metaspace/chunkManager.hpp
+++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/binaryTreeDictionary.hpp"
-#include "memory/freeList.inline.hpp"
+#include "memory/freeList.hpp"
 #include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "memory/metaspaceChunkFreeListSummary.hpp"
@@ -115,12 +115,7 @@ class ChunkManager : public CHeapObj<mtInternal> {
 
  public:
 
-  ChunkManager(bool is_class)
-      : _is_class(is_class), _free_chunks_total(0), _free_chunks_count(0) {
-    _free_chunks[SpecializedIndex].set_size(get_size_for_nonhumongous_chunktype(SpecializedIndex, is_class));
-    _free_chunks[SmallIndex].set_size(get_size_for_nonhumongous_chunktype(SmallIndex, is_class));
-    _free_chunks[MediumIndex].set_size(get_size_for_nonhumongous_chunktype(MediumIndex, is_class));
-  }
+  ChunkManager(bool is_class);
 
   // Add or delete (return) a chunk to the global freelist.
   Metachunk* chunk_freelist_allocate(size_t word_size);
diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
index ac556519e4b..8a7c9b7a4a8 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, SAP and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +35,7 @@ MetaspaceDCmd::MetaspaceDCmd(outputStream* output, bool heap)
   : DCmdWithParser(output, heap)
   , _basic("basic", "Prints a basic summary (does not need a safepoint).", "BOOLEAN", false, "false")
   , _show_loaders("show-loaders", "Shows usage by class loader.", "BOOLEAN", false, "false")
+  , _show_classes("show-classes", "If show-loaders is set, shows loaded classes for each loader.", "BOOLEAN", false, "false")
   , _by_chunktype("by-chunktype", "Break down numbers by chunk type.", "BOOLEAN", false, "false")
   , _by_spacetype("by-spacetype", "Break down numbers by loader type.", "BOOLEAN", false, "false")
   , _show_vslist("vslist", "Shows details about the underlying virtual space.", "BOOLEAN", false, "false")
@@ -44,6 +46,7 @@ MetaspaceDCmd::MetaspaceDCmd(outputStream* output, bool heap)
 {
   _dcmdparser.add_dcmd_option(&_basic);
   _dcmdparser.add_dcmd_option(&_show_loaders);
+  _dcmdparser.add_dcmd_option(&_show_classes);
   _dcmdparser.add_dcmd_option(&_by_chunktype);
   _dcmdparser.add_dcmd_option(&_by_spacetype);
   _dcmdparser.add_dcmd_option(&_show_vslist);
@@ -87,6 +90,7 @@ void MetaspaceDCmd::execute(DCmdSource source, TRAPS) {
     // Full mode. Requires safepoint.
     int flags = 0;
     if (_show_loaders.value())         flags |= MetaspaceUtils::rf_show_loaders;
+    if (_show_classes.value())         flags |= MetaspaceUtils::rf_show_classes;
     if (_by_chunktype.value())         flags |= MetaspaceUtils::rf_break_down_by_chunktype;
     if (_by_spacetype.value())         flags |= MetaspaceUtils::rf_break_down_by_spacetype;
     if (_show_vslist.value())          flags |= MetaspaceUtils::rf_show_vslist;
diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
index 5d14ab93082..ec37ffff654 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, SAP and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +40,7 @@ class MetaspaceDCmd : public DCmdWithParser {
   DCmdArgument<bool> _show_vslist;
   DCmdArgument<bool> _show_vsmap;
   DCmdArgument<char*> _scale;
+  DCmdArgument<bool> _show_classes;
 public:
   MetaspaceDCmd(outputStream* output, bool heap);
   static const char* name() {
diff --git a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp
index 2d2434e9695..353949f47bf 100644
--- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp
+++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp
@@ -22,8 +22,10 @@
  *
  */
 #include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/javaClasses.hpp"
 #include "memory/metaspace/printCLDMetaspaceInfoClosure.hpp"
+#include "memory/metaspace/printMetaspaceInfoKlassClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -32,19 +34,31 @@
 
 namespace metaspace {
 
-PrintCLDMetaspaceInfoClosure::PrintCLDMetaspaceInfoClosure(outputStream* out, size_t scale, bool do_print, bool break_down_by_chunktype)
-: _out(out), _scale(scale), _do_print(do_print), _break_down_by_chunktype(break_down_by_chunktype)
-, _num_loaders(0)
+PrintCLDMetaspaceInfoClosure::PrintCLDMetaspaceInfoClosure(outputStream* out, size_t scale, bool do_print,
+    bool do_print_classes, bool break_down_by_chunktype)
+: _out(out), _scale(scale), _do_print(do_print), _do_print_classes(do_print_classes)
+, _break_down_by_chunktype(break_down_by_chunktype)
+, _num_loaders(0), _num_loaders_unloading(0), _num_loaders_without_metaspace(0)
 {
   memset(_num_loaders_by_spacetype, 0, sizeof(_num_loaders_by_spacetype));
 }
 
+static const char* classes_plural(uintx num) {
+  return num == 1 ? "" : "es";
+}
+
 void PrintCLDMetaspaceInfoClosure::do_cld(ClassLoaderData* cld) {
 
   assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
 
+  if (cld->is_unloading()) {
+    _num_loaders_unloading ++;
+    return;
+  }
+
   ClassLoaderMetaspace* msp = cld->metaspace_or_null();
   if (msp == NULL) {
+    _num_loaders_without_metaspace ++;
     return;
   }
 
@@ -63,17 +77,73 @@ void PrintCLDMetaspaceInfoClosure::do_cld(ClassLoaderData* cld) {
 
     _out->print(UINTX_FORMAT_W(4) ": ", _num_loaders);
 
-    if (cld->is_anonymous()) {
-      _out->print("ClassLoaderData " PTR_FORMAT " for anonymous class", p2i(cld));
+    // Print "CLD for [<loader name>,] instance of <loader class name>"
+    // or    "CLD for <anonymous class>, loaded by [<loader name>,] instance of <loader class name>"
+
+    ResourceMark rm;
+    const char* name = NULL;
+    const char* class_name = NULL;
+
+    // Note: this should also work if unloading:
+    Klass* k = cld->class_loader_klass();
+    if (k != NULL) {
+      class_name = k->external_name();
+      Symbol* s = cld->class_loader_name();
+      if (s != NULL) {
+        name = s->as_C_string();
+      }
     } else {
-      ResourceMark rm;
-      _out->print("ClassLoaderData " PTR_FORMAT " for %s", p2i(cld), cld->loader_name());
+      name = "<bootstrap>";
     }
 
+    // Print
+    _out->print("CLD " PTR_FORMAT, p2i(cld));
     if (cld->is_unloading()) {
       _out->print(" (unloading)");
     }
+    _out->print(":");
+    if (cld->is_anonymous()) {
+      _out->print(" <anonymous class>, loaded by");
+    }
+    if (name != NULL) {
+      _out->print(" \"%s\"", name);
+    }
+    if (class_name != NULL) {
+      _out->print(" instance of %s", class_name);
+    }
 
+    if (_do_print_classes) {
+      streamIndentor sti(_out, 6);
+      _out->cr_indent();
+      _out->print("Loaded classes: ");
+      PrintMetaspaceInfoKlassClosure pkic(_out, true);
+      cld->classes_do(&pkic);
+      _out->cr_indent();
+      _out->print("-total-: ");
+      _out->print(UINTX_FORMAT " class%s", pkic._num_classes, classes_plural(pkic._num_classes));
+      if (pkic._num_instance_classes > 0 || pkic._num_array_classes > 0) {
+        _out->print(" (");
+        if (pkic._num_instance_classes > 0) {
+          _out->print(UINTX_FORMAT " instance class%s", pkic._num_instance_classes,
+              classes_plural(pkic._num_instance_classes));
+        }
+        if (pkic._num_array_classes > 0) {
+          if (pkic._num_instance_classes > 0) {
+            _out->print(", ");
+          }
+          _out->print(UINTX_FORMAT " array class%s", pkic._num_array_classes,
+              classes_plural(pkic._num_array_classes));
+        }
+        _out->print(").");
+      }
+    }
+
+    _out->cr();
+
+
+    _out->cr();
+
+    // Print statistics
     this_cld_stat.print_on(_out, _scale, _break_down_by_chunktype);
     _out->cr();
 
diff --git a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
index b570b2c90d0..40828bc2839 100644
--- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
+++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
@@ -39,17 +39,21 @@ private:
   outputStream* const _out;
   const size_t        _scale;
   const bool          _do_print;
+  const bool          _do_print_classes;
   const bool          _break_down_by_chunktype;
 
 public:
 
   uintx                           _num_loaders;
+  uintx                           _num_loaders_without_metaspace;
+  uintx                           _num_loaders_unloading;
   ClassLoaderMetaspaceStatistics  _stats_total;
 
   uintx                           _num_loaders_by_spacetype [Metaspace::MetaspaceTypeCount];
   ClassLoaderMetaspaceStatistics  _stats_by_spacetype [Metaspace::MetaspaceTypeCount];
 
-  PrintCLDMetaspaceInfoClosure(outputStream* out, size_t scale, bool do_print, bool break_down_by_chunktype);
+  PrintCLDMetaspaceInfoClosure(outputStream* out, size_t scale, bool do_print,
+      bool do_print_classes, bool break_down_by_chunktype);
   void do_cld(ClassLoaderData* cld);
 
 };
diff --git a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp
new file mode 100644
index 00000000000..4276988b472
--- /dev/null
+++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, SAP and/or its affiliates.
+ * 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.
+ *
+ */
+#include "precompiled.hpp"
+
+#include "classfile/systemDictionary.hpp"
+#include "memory/metaspace/printMetaspaceInfoKlassClosure.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/constantPool.inline.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/klass.hpp"
+#include "utilities/constantTag.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
+
+
+namespace metaspace {
+
+PrintMetaspaceInfoKlassClosure::PrintMetaspaceInfoKlassClosure(outputStream* out, bool do_print)
+: _out(out), _do_print(do_print)
+, _num_classes(0), _num_instance_classes(0), _num_array_classes(0) {
+}
+
+void PrintMetaspaceInfoKlassClosure::do_klass(Klass* k) {
+  _num_classes ++;
+  if (k->is_instance_klass()) {
+    _num_instance_classes ++;
+  } else if (k->is_array_klass()) {
+    _num_array_classes ++;
+  }
+  if (_do_print) {
+    _out->cr_indent();
+    _out->print(UINTX_FORMAT_W(4) ": ", _num_classes);
+    ResourceMark rm;
+    _out->print("%s", k->external_name());
+  }
+}
+
+} // namespace metaspace
diff --git a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp
new file mode 100644
index 00000000000..a0413c75e2d
--- /dev/null
+++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, SAP and/or its affiliates.
+ * 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.
+ *
+ */
+
+#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_
+#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_
+
+#include "memory/iterator.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class outputStream;
+class InstanceKlass;
+
+namespace metaspace {
+
+// Helper class for MetaspaceUtils::print_report()
+class PrintMetaspaceInfoKlassClosure : public KlassClosure {
+private:
+  outputStream* const _out;
+  const bool          _do_print;
+
+public:
+  uintx _num_classes;
+  uintx _num_instance_classes;
+  uintx _num_array_classes;
+
+  PrintMetaspaceInfoKlassClosure(outputStream* out, bool do_print);
+  void do_klass(Klass* k);
+
+}; // end: PrintKlassInfoClosure
+
+} // namespace metaspace
+
+#endif /* SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_ */
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp
index 210b3353fb6..6fc6054cb83 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp
@@ -15,7 +15,7 @@
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
 #include "memory/metaspace/virtualSpaceNode.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
 
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
index 72bd6e99205..08b3546f3d3 100644
--- a/src/hotspot/share/memory/metaspaceShared.cpp
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
@@ -1841,7 +1841,7 @@ void MetaspaceShared::dump_closed_archive_heap_objects(
   G1CollectedHeap::heap()->begin_archive_alloc_range();
 
   // Archive interned string objects
-  StringTable::write_to_archive(closed_archive);
+  StringTable::write_to_archive();
 
   G1CollectedHeap::heap()->end_archive_alloc_range(closed_archive,
                                                    os::vm_allocation_granularity());
@@ -1910,6 +1910,11 @@ oop MetaspaceShared::archive_heap_object(oop obj, Thread* THREAD) {
   return archived_oop;
 }
 
+oop MetaspaceShared::materialize_archived_object(oop obj) {
+  assert(obj != NULL, "sanity");
+  return G1CollectedHeap::heap()->materialize_archived_object(obj);
+}
+
 void MetaspaceShared::archive_klass_objects(Thread* THREAD) {
   int i;
   for (i = 0; i < _global_klass_objects->length(); i++) {
@@ -1980,7 +1985,7 @@ public:
              "Archived heap object is not allowed");
       assert(MetaspaceShared::open_archive_heap_region_mapped(),
              "Open archive heap region is not mapped");
-      RootAccess<IN_ARCHIVE_ROOT>::oop_store(p, CompressedOops::decode_not_null(o));
+      *p = CompressedOops::decode_not_null(o);
     }
   }
 
diff --git a/src/hotspot/share/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp
index d54d4785697..c0eaaf8386f 100644
--- a/src/hotspot/share/memory/metaspaceShared.hpp
+++ b/src/hotspot/share/memory/metaspaceShared.hpp
@@ -111,6 +111,7 @@ class MetaspaceShared : AllStatic {
   }
   static oop find_archived_heap_object(oop obj);
   static oop archive_heap_object(oop obj, Thread* THREAD);
+  static oop materialize_archived_object(oop obj);
   static void archive_klass_objects(Thread* THREAD);
 #endif
 
diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp
index 187941aacd2..4728f402236 100644
--- a/src/hotspot/share/oops/access.hpp
+++ b/src/hotspot/share/oops/access.hpp
@@ -55,7 +55,7 @@
 // * atomic_cmpxchg_at: Atomically compare-and-swap a new value at an internal pointer address if previous value matched the compared value.
 // * atomic_xchg: Atomically swap a new value at an address if previous value matched the compared value.
 // * atomic_xchg_at: Atomically swap a new value at an internal pointer address if previous value matched the compared value.
-// * arraycopy: Copy data from one heap array to another heap array.
+// * arraycopy: Copy data from one heap array to another heap array. The ArrayAccess class has convenience functions for this.
 // * clone: Clone the contents of an object to a newly allocated object.
 // * resolve: Resolve a stable to-space invariant oop that is guaranteed not to relocate its payload until a subsequent thread transition.
 // * equals: Object equality, e.g. when different copies of the same objects are in use (from-space vs. to-space)
@@ -130,6 +130,29 @@ class Access: public AllStatic {
   static const DecoratorSet atomic_xchg_mo_decorators = MO_SEQ_CST;
   static const DecoratorSet atomic_cmpxchg_mo_decorators = MO_RELAXED | MO_SEQ_CST;
 
+protected:
+  template <typename T>
+  static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
+                                   arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                   size_t length) {
+    verify_decorators<ARRAYCOPY_DECORATOR_MASK | IN_HEAP |  IN_HEAP_ARRAY |
+                      AS_DECORATOR_MASK>();
+    return AccessInternal::arraycopy<decorators | INTERNAL_VALUE_IS_OOP>(src_obj, src_offset_in_bytes, src_raw,
+                                                                         dst_obj, dst_offset_in_bytes, dst_raw,
+                                                                         length);
+  }
+
+  template <typename T>
+  static inline void arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
+                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                               size_t length) {
+    verify_decorators<ARRAYCOPY_DECORATOR_MASK | IN_HEAP | IN_HEAP_ARRAY |
+                      AS_DECORATOR_MASK>();
+    AccessInternal::arraycopy<decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                          dst_obj, dst_offset_in_bytes, dst_raw,
+                                          length);
+  }
+
 public:
   // Primitive heap accesses
   static inline AccessInternal::LoadAtProxy<decorators> load_at(oop base, ptrdiff_t offset) {
@@ -155,13 +178,6 @@ public:
     return AccessInternal::atomic_xchg_at<decorators>(new_value, base, offset);
   }
 
-  template <typename T>
-  static inline void arraycopy(arrayOop src_obj, arrayOop dst_obj, T *src, T *dst, size_t length) {
-    verify_decorators<ARRAYCOPY_DECORATOR_MASK | IN_HEAP |
-                      AS_DECORATOR_MASK>();
-    AccessInternal::arraycopy<decorators>(src_obj, dst_obj, src, dst, length);
-  }
-
   // Oop heap accesses
   static inline AccessInternal::OopLoadAtProxy<decorators> oop_load_at(oop base, ptrdiff_t offset) {
     verify_heap_oop_decorators<load_mo_decorators>();
@@ -193,12 +209,6 @@ public:
     return AccessInternal::atomic_xchg_at<decorators | INTERNAL_VALUE_IS_OOP>(new_oop_value, base, offset);
   }
 
-  template <typename T>
-  static inline bool oop_arraycopy(arrayOop src_obj, arrayOop dst_obj, T *src, T *dst, size_t length) {
-    verify_decorators<ARRAYCOPY_DECORATOR_MASK | IN_HEAP | AS_DECORATOR_MASK>();
-    return AccessInternal::arraycopy<decorators | INTERNAL_VALUE_IS_OOP>(src_obj, dst_obj, src, dst, length);
-  }
-
   // Clone an object from src to dst
   static inline void clone(oop src, oop dst, size_t size) {
     verify_decorators<IN_HEAP>();
@@ -288,6 +298,55 @@ class HeapAccess: public Access<IN_HEAP | decorators> {};
 template <DecoratorSet decorators = INTERNAL_EMPTY>
 class RootAccess: public Access<IN_ROOT | decorators> {};
 
+// Helper for array access.
+template <DecoratorSet decorators = INTERNAL_EMPTY>
+class ArrayAccess: public HeapAccess<IN_HEAP_ARRAY | decorators> {
+  typedef HeapAccess<IN_HEAP_ARRAY | decorators> AccessT;
+public:
+  template <typename T>
+  static inline void arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
+                               arrayOop dst_obj, size_t dst_offset_in_bytes,
+                               size_t length) {
+    AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const T*>(NULL),
+                       dst_obj, dst_offset_in_bytes, reinterpret_cast<T*>(NULL),
+                       length);
+  }
+
+  template <typename T>
+  static inline void arraycopy_to_native(arrayOop src_obj, size_t src_offset_in_bytes,
+                                         T* dst,
+                                         size_t length) {
+    AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const T*>(NULL),
+                       NULL, 0, dst,
+                       length);
+  }
+
+  template <typename T>
+  static inline void arraycopy_from_native(const T* src,
+                                           arrayOop dst_obj, size_t dst_offset_in_bytes,
+                                           size_t length) {
+    AccessT::arraycopy(NULL, 0, src,
+                       dst_obj, dst_offset_in_bytes, reinterpret_cast<T*>(NULL),
+                       length);
+  }
+
+  static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
+                                   arrayOop dst_obj, size_t dst_offset_in_bytes,
+                                   size_t length) {
+    return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const HeapWord*>(NULL),
+                                  dst_obj, dst_offset_in_bytes, reinterpret_cast<HeapWord*>(NULL),
+                                  length);
+  }
+
+  template <typename T>
+  static inline bool oop_arraycopy_raw(T* src, T* dst, size_t length) {
+    return AccessT::oop_arraycopy(NULL, 0, src,
+                                  NULL, 0, dst,
+                                  length);
+  }
+
+};
+
 template <DecoratorSet decorators>
 template <DecoratorSet expected_decorators>
 void Access<decorators>::verify_decorators() {
@@ -320,8 +379,7 @@ void Access<decorators>::verify_decorators() {
     (location_decorators ^ IN_ROOT) == 0 ||
     (location_decorators ^ IN_HEAP) == 0 ||
     (location_decorators ^ (IN_HEAP | IN_HEAP_ARRAY)) == 0 ||
-    (location_decorators ^ (IN_ROOT | IN_CONCURRENT_ROOT)) == 0 ||
-    (location_decorators ^ (IN_ROOT | IN_ARCHIVE_ROOT)) == 0
+    (location_decorators ^ (IN_ROOT | IN_CONCURRENT_ROOT)) == 0
   ));
 }
 
diff --git a/src/hotspot/share/oops/access.inline.hpp b/src/hotspot/share/oops/access.inline.hpp
index c02a0c717a0..57f2a15e4d5 100644
--- a/src/hotspot/share/oops/access.inline.hpp
+++ b/src/hotspot/share/oops/access.inline.hpp
@@ -123,17 +123,23 @@ namespace AccessInternal {
   template <class GCBarrierType, DecoratorSet decorators>
   struct PostRuntimeDispatch<GCBarrierType, BARRIER_ARRAYCOPY, decorators>: public AllStatic {
     template <typename T>
-    static bool access_barrier(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-      GCBarrierType::arraycopy_in_heap(src_obj, dst_obj, src, dst, length);
+    static bool access_barrier(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                               size_t length) {
+      GCBarrierType::arraycopy_in_heap(src_obj, src_offset_in_bytes, src_raw,
+                                       dst_obj, dst_offset_in_bytes, dst_raw,
+                                       length);
       return true;
     }
 
     template <typename T>
-    static bool oop_access_barrier(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+    static bool oop_access_barrier(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                   arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                   size_t length) {
       typedef typename HeapOopType<decorators>::type OopType;
-      return GCBarrierType::oop_arraycopy_in_heap(src_obj, dst_obj,
-                                                  reinterpret_cast<OopType*>(src),
-                                                  reinterpret_cast<OopType*>(dst), length);
+      return GCBarrierType::oop_arraycopy_in_heap(src_obj, src_offset_in_bytes, reinterpret_cast<OopType*>(src_raw),
+                                                  dst_obj, dst_offset_in_bytes, reinterpret_cast<OopType*>(dst_raw),
+                                                  length);
     }
   };
 
@@ -337,10 +343,14 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators, typename T>
-  bool RuntimeDispatch<decorators, T, BARRIER_ARRAYCOPY>::arraycopy_init(arrayOop src_obj, arrayOop dst_obj, T *src, T* dst, size_t length) {
+  bool RuntimeDispatch<decorators, T, BARRIER_ARRAYCOPY>::arraycopy_init(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                                         arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                                         size_t length) {
     func_t function = BarrierResolver<decorators, func_t, BARRIER_ARRAYCOPY>::resolve_barrier();
     _arraycopy_func = function;
-    return function(src_obj, dst_obj, src, dst, length);
+    return function(src_obj, src_offset_in_bytes, src_raw,
+                    dst_obj, dst_offset_in_bytes, dst_raw,
+                    length);
   }
 
   template <DecoratorSet decorators, typename T>
diff --git a/src/hotspot/share/oops/accessBackend.cpp b/src/hotspot/share/oops/accessBackend.cpp
index 870a970b6bb..3317cc5153e 100644
--- a/src/hotspot/share/oops/accessBackend.cpp
+++ b/src/hotspot/share/oops/accessBackend.cpp
@@ -104,11 +104,21 @@ namespace AccessInternal {
                                 reinterpret_cast<HeapWord*>(dst), length);
   }
 
+  template<>
+  void arraycopy_conjoint<jboolean>(jboolean* src, jboolean* dst, size_t length) {
+    Copy::conjoint_jbytes(reinterpret_cast<jbyte*>(src), reinterpret_cast<jbyte*>(dst), length);
+  }
+
   template<>
   void arraycopy_conjoint<jbyte>(jbyte* src, jbyte* dst, size_t length) {
     Copy::conjoint_jbytes(src, dst, length);
   }
 
+  template<>
+  void arraycopy_conjoint<jchar>(jchar* src, jchar* dst, size_t length) {
+    Copy::conjoint_jshorts_atomic(reinterpret_cast<jshort*>(src), reinterpret_cast<jshort*>(dst), length);
+  }
+
   template<>
   void arraycopy_conjoint<jshort>(jshort* src, jshort* dst, size_t length) {
     Copy::conjoint_jshorts_atomic(src, dst, length);
@@ -119,11 +129,21 @@ namespace AccessInternal {
     Copy::conjoint_jints_atomic(src, dst, length);
   }
 
+  template<>
+  void arraycopy_conjoint<jfloat>(jfloat* src, jfloat* dst, size_t length) {
+    Copy::conjoint_jints_atomic(reinterpret_cast<jint*>(src), reinterpret_cast<jint*>(dst), length);
+  }
+
   template<>
   void arraycopy_conjoint<jlong>(jlong* src, jlong* dst, size_t length) {
     Copy::conjoint_jlongs_atomic(src, dst, length);
   }
 
+  template<>
+  void arraycopy_conjoint<jdouble>(jdouble* src, jdouble* dst, size_t length) {
+    Copy::conjoint_jlongs_atomic(reinterpret_cast<jlong*>(src), reinterpret_cast<jlong*>(dst), length);
+  }
+
   template<>
   void arraycopy_arrayof_conjoint<jbyte>(jbyte* src, jbyte* dst, size_t length) {
     Copy::arrayof_conjoint_jbytes(reinterpret_cast<HeapWord*>(src),
diff --git a/src/hotspot/share/oops/accessBackend.hpp b/src/hotspot/share/oops/accessBackend.hpp
index cef6dbf898e..85cc0c6cfee 100644
--- a/src/hotspot/share/oops/accessBackend.hpp
+++ b/src/hotspot/share/oops/accessBackend.hpp
@@ -110,7 +110,9 @@ namespace AccessInternal {
     typedef T (*atomic_cmpxchg_func_t)(T new_value, void* addr, T compare_value);
     typedef T (*atomic_xchg_func_t)(T new_value, void* addr);
 
-    typedef bool (*arraycopy_func_t)(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length);
+    typedef bool (*arraycopy_func_t)(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                     arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                     size_t length);
     typedef void (*clone_func_t)(oop src, oop dst, size_t size);
     typedef oop (*resolve_func_t)(oop obj);
     typedef bool (*equals_func_t)(oop o1, oop o2);
@@ -118,7 +120,9 @@ namespace AccessInternal {
 
   template <DecoratorSet decorators>
   struct AccessFunctionTypes<decorators, void> {
-    typedef bool (*arraycopy_func_t)(arrayOop src_obj, arrayOop dst_obj, void* src, void* dst, size_t length);
+    typedef bool (*arraycopy_func_t)(arrayOop src_obj, size_t src_offset_in_bytes, void* src,
+                                     arrayOop dst_obj, size_t dst_offset_in_bytes, void* dst,
+                                     size_t length);
   };
 
   template <DecoratorSet decorators, typename T, BarrierType barrier> struct AccessFunction {};
@@ -256,7 +260,7 @@ protected:
   static inline typename EnableIf<
     HasDecorator<ds, MO_UNORDERED>::value, T>::type
   load_internal(void* addr) {
-    return *reinterpret_cast<const T*>(addr);
+    return *reinterpret_cast<T*>(addr);
   }
 
   template <DecoratorSet ds, typename T>
@@ -353,7 +357,9 @@ public:
   }
 
   template <typename T>
-  static bool arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length);
+  static bool arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                        size_t length);
 
   template <typename T>
   static void oop_store(void* addr, T value);
@@ -396,7 +402,9 @@ public:
   }
 
   template <typename T>
-  static bool oop_arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length);
+  static bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                            size_t length);
 
   static void clone(oop src, oop dst, size_t size);
 
@@ -559,10 +567,16 @@ namespace AccessInternal {
     typedef typename AccessFunction<decorators, T, BARRIER_ARRAYCOPY>::type func_t;
     static func_t _arraycopy_func;
 
-    static bool arraycopy_init(arrayOop src_obj, arrayOop dst_obj, T *src, T* dst, size_t length);
+    static bool arraycopy_init(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                               size_t length);
 
-    static inline bool arraycopy(arrayOop src_obj, arrayOop dst_obj, T *src, T* dst, size_t length) {
-      return _arraycopy_func(src_obj, dst_obj, src, dst, length);
+    static inline bool arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                 arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                 size_t length) {
+      return _arraycopy_func(src_obj, src_offset_in_bytes, src_raw,
+                             dst_obj, dst_offset_in_bytes, dst_raw,
+                             length);
     }
   };
 
@@ -900,37 +914,55 @@ namespace AccessInternal {
     template <DecoratorSet decorators, typename T>
     inline static typename EnableIf<
       HasDecorator<decorators, AS_RAW>::value && CanHardwireRaw<decorators>::value, bool>::type
-    arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+    arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+              arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+              size_t length) {
       typedef RawAccessBarrier<decorators & RAW_DECORATOR_MASK> Raw;
       if (HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value) {
-        return Raw::oop_arraycopy(src_obj, dst_obj, src, dst, length);
+        return Raw::oop_arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                                  dst_obj, dst_offset_in_bytes, dst_raw,
+                                  length);
       } else {
-        return Raw::arraycopy(src_obj, dst_obj, src, dst, length);
+        return Raw::arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                              dst_obj, dst_offset_in_bytes, dst_raw,
+                              length);
       }
     }
 
     template <DecoratorSet decorators, typename T>
     inline static typename EnableIf<
       HasDecorator<decorators, AS_RAW>::value && !CanHardwireRaw<decorators>::value, bool>::type
-    arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+    arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+              arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+              size_t length) {
       if (UseCompressedOops) {
         const DecoratorSet expanded_decorators = decorators | convert_compressed_oops;
-        return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, dst_obj, src, dst, length);
+        return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                                  dst_obj, dst_offset_in_bytes, dst_raw,
+                                                                  length);
       } else {
         const DecoratorSet expanded_decorators = decorators & ~convert_compressed_oops;
-        return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, dst_obj, src, dst, length);
+        return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                                  dst_obj, dst_offset_in_bytes, dst_raw,
+                                                                  length);
       }
     }
 
     template <DecoratorSet decorators, typename T>
     inline static typename EnableIf<
       !HasDecorator<decorators, AS_RAW>::value, bool>::type
-    arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+    arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+              arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+              size_t length) {
       if (is_hardwired_primitive<decorators>()) {
         const DecoratorSet expanded_decorators = decorators | AS_RAW;
-        return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, dst_obj, src, dst, length);
+        return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                                  dst_obj, dst_offset_in_bytes, dst_raw,
+                                                                  length);
       } else {
-        return RuntimeDispatch<decorators, T, BARRIER_ARRAYCOPY>::arraycopy(src_obj, dst_obj, src, dst, length);
+        return RuntimeDispatch<decorators, T, BARRIER_ARRAYCOPY>::arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                                                                            dst_obj, dst_offset_in_bytes, dst_raw,
+                                                                            length);
       }
     }
 
@@ -1092,21 +1124,33 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators, typename T>
-  inline bool arraycopy_reduce_types(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-    return PreRuntimeDispatch::arraycopy<decorators>(src_obj, dst_obj, src, dst, length);
+  inline bool arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                     arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                     size_t length) {
+    return PreRuntimeDispatch::arraycopy<decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                     dst_obj, dst_offset_in_bytes, dst_raw,
+                                                     length);
   }
 
   template <DecoratorSet decorators>
-  inline bool arraycopy_reduce_types(arrayOop src_obj, arrayOop dst_obj, HeapWord* src, HeapWord* dst, size_t length) {
+  inline bool arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, HeapWord* src_raw,
+                                     arrayOop dst_obj, size_t dst_offset_in_bytes, HeapWord* dst_raw,
+                                     size_t length) {
     const DecoratorSet expanded_decorators = decorators | INTERNAL_CONVERT_COMPRESSED_OOP;
-    return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, dst_obj, src, dst, length);
+    return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                              dst_obj, dst_offset_in_bytes, dst_raw,
+                                                              length);
   }
 
   template <DecoratorSet decorators>
-  inline bool arraycopy_reduce_types(arrayOop src_obj, arrayOop dst_obj, narrowOop* src, narrowOop* dst, size_t length) {
+  inline bool arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, narrowOop* src_raw,
+                                     arrayOop dst_obj, size_t dst_offset_in_bytes, narrowOop* dst_raw,
+                                     size_t length) {
     const DecoratorSet expanded_decorators = decorators | INTERNAL_CONVERT_COMPRESSED_OOP |
                                              INTERNAL_RT_USE_COMPRESSED_OOPS;
-    return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, dst_obj, src, dst, length);
+    return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                              dst_obj, dst_offset_in_bytes, dst_raw,
+                                                              length);
   }
 
   // Step 1: Set default decorators. This step remembers if a type was volatile
@@ -1239,15 +1283,16 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators, typename T>
-  inline bool arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+  inline bool arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
+                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                        size_t length) {
     STATIC_ASSERT((HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value ||
                    (IsSame<T, void>::value || IsIntegral<T>::value) ||
                     IsFloatingPoint<T>::value)); // arraycopy allows type erased void elements
     typedef typename Decay<T>::type DecayedT;
     const DecoratorSet expanded_decorators = DecoratorFixup<decorators | IN_HEAP_ARRAY | IN_HEAP>::value;
-    return arraycopy_reduce_types<expanded_decorators>(src_obj, dst_obj,
-                                                       const_cast<DecayedT*>(src),
-                                                       const_cast<DecayedT*>(dst),
+    return arraycopy_reduce_types<expanded_decorators>(src_obj, src_offset_in_bytes, const_cast<DecayedT*>(src_raw),
+                                                       dst_obj, dst_offset_in_bytes, const_cast<DecayedT*>(dst_raw),
                                                        length);
   }
 
diff --git a/src/hotspot/share/oops/accessBackend.inline.hpp b/src/hotspot/share/oops/accessBackend.inline.hpp
index a38b7678df3..8305b896cde 100644
--- a/src/hotspot/share/oops/accessBackend.inline.hpp
+++ b/src/hotspot/share/oops/accessBackend.inline.hpp
@@ -118,8 +118,12 @@ inline T RawAccessBarrier<decorators>::oop_atomic_xchg_at(T new_value, oop base,
 
 template <DecoratorSet decorators>
 template <typename T>
-inline bool RawAccessBarrier<decorators>::oop_arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-  return arraycopy(src_obj, dst_obj, src, dst, length);
+inline bool RawAccessBarrier<decorators>::oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                        size_t length) {
+  return arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                   dst_obj, dst_offset_in_bytes, dst_raw,
+                   length);
 }
 
 template <DecoratorSet decorators>
@@ -243,59 +247,99 @@ RawAccessBarrier<ds>::atomic_cmpxchg_maybe_locked(T new_value, void* addr, T com
 }
 
 class RawAccessBarrierArrayCopy: public AllStatic {
+  template<typename T> struct IsHeapWordSized: public IntegralConstant<bool, sizeof(T) == HeapWordSize> { };
 public:
   template <DecoratorSet decorators, typename T>
   static inline typename EnableIf<
-  HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value>::type
-  arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
+    HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value>::type
+  arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+            size_t length) {
+    src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+    dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
     // We do not check for ARRAYCOPY_ATOMIC for oops, because they are unconditionally always atomic.
     if (HasDecorator<decorators, ARRAYCOPY_ARRAYOF>::value) {
-      AccessInternal::arraycopy_arrayof_conjoint_oops(src, dst, length);
+      AccessInternal::arraycopy_arrayof_conjoint_oops(src_raw, dst_raw, length);
     } else {
       typedef typename HeapOopType<decorators>::type OopType;
-      AccessInternal::arraycopy_conjoint_oops(reinterpret_cast<OopType*>(src),
-                                              reinterpret_cast<OopType*>(dst), length);
+      AccessInternal::arraycopy_conjoint_oops(reinterpret_cast<OopType*>(src_raw),
+                                              reinterpret_cast<OopType*>(dst_raw), length);
     }
   }
 
   template <DecoratorSet decorators, typename T>
   static inline typename EnableIf<
-    !HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value>::type
-  arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-    if (HasDecorator<decorators, ARRAYCOPY_ARRAYOF>::value) {
-      AccessInternal::arraycopy_arrayof_conjoint(src, dst, length);
-    } else if (HasDecorator<decorators, ARRAYCOPY_DISJOINT>::value && sizeof(T) == HeapWordSize) {
-      // There is only a disjoint optimization for word granularity copying
-      if (HasDecorator<decorators, ARRAYCOPY_ATOMIC>::value) {
-        AccessInternal::arraycopy_disjoint_words_atomic(src, dst, length);
-      } else {
-        AccessInternal::arraycopy_disjoint_words(src, dst, length);
-      }
+    !HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value &&
+    HasDecorator<decorators, ARRAYCOPY_ARRAYOF>::value>::type
+  arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+            size_t length) {
+    src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+    dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+    AccessInternal::arraycopy_arrayof_conjoint(src_raw, dst_raw, length);
+  }
+
+  template <DecoratorSet decorators, typename T>
+  static inline typename EnableIf<
+    !HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value &&
+    HasDecorator<decorators, ARRAYCOPY_DISJOINT>::value && IsHeapWordSized<T>::value>::type
+  arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+            size_t length) {
+    src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+    dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+    // There is only a disjoint optimization for word granularity copying
+    if (HasDecorator<decorators, ARRAYCOPY_ATOMIC>::value) {
+      AccessInternal::arraycopy_disjoint_words_atomic(src_raw, dst_raw, length);
     } else {
-      if (HasDecorator<decorators, ARRAYCOPY_ATOMIC>::value) {
-        AccessInternal::arraycopy_conjoint_atomic(src, dst, length);
-      } else {
-        AccessInternal::arraycopy_conjoint(src, dst, length);
-      }
+      AccessInternal::arraycopy_disjoint_words(src_raw, dst_raw, length);
     }
   }
 
-  template <DecoratorSet decorators>
+  template <DecoratorSet decorators, typename T>
   static inline typename EnableIf<
-    !HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value>::type
-  arraycopy(arrayOop src_obj, arrayOop dst_obj, void* src, void* dst, size_t length) {
-    if (HasDecorator<decorators, ARRAYCOPY_ATOMIC>::value) {
-      AccessInternal::arraycopy_conjoint_atomic(src, dst, length);
-    } else {
-      AccessInternal::arraycopy_conjoint(src, dst, length);
-    }
+    !HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value &&
+    !(HasDecorator<decorators, ARRAYCOPY_DISJOINT>::value && IsHeapWordSized<T>::value) &&
+    !HasDecorator<decorators, ARRAYCOPY_ARRAYOF>::value &&
+    !HasDecorator<decorators, ARRAYCOPY_ATOMIC>::value>::type
+  arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+            size_t length) {
+    src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+    dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+    AccessInternal::arraycopy_conjoint(src_raw, dst_raw, length);
+  }
+
+  template <DecoratorSet decorators, typename T>
+  static inline typename EnableIf<
+    !HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value &&
+    !(HasDecorator<decorators, ARRAYCOPY_DISJOINT>::value && IsHeapWordSized<T>::value) &&
+    !HasDecorator<decorators, ARRAYCOPY_ARRAYOF>::value &&
+    HasDecorator<decorators, ARRAYCOPY_ATOMIC>::value>::type
+  arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+            size_t length) {
+    src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+    dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+    AccessInternal::arraycopy_conjoint_atomic(src_raw, dst_raw, length);
   }
 };
 
+template<> struct RawAccessBarrierArrayCopy::IsHeapWordSized<void>: public IntegralConstant<bool, false> { };
+
 template <DecoratorSet decorators>
 template <typename T>
-inline bool RawAccessBarrier<decorators>::arraycopy(arrayOop src_obj, arrayOop dst_obj, T* src, T* dst, size_t length) {
-  RawAccessBarrierArrayCopy::arraycopy<decorators>(src_obj, dst_obj, src, dst, length);
+inline bool RawAccessBarrier<decorators>::arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                    arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                    size_t length) {
+  RawAccessBarrierArrayCopy::arraycopy<decorators>(src_obj, src_offset_in_bytes, src_raw,
+                                                   dst_obj, dst_offset_in_bytes, dst_raw,
+                                                   length);
   return true;
 }
 
diff --git a/src/hotspot/share/oops/accessDecorators.hpp b/src/hotspot/share/oops/accessDecorators.hpp
index 3b4e7aa9ede..723e6136b52 100644
--- a/src/hotspot/share/oops/accessDecorators.hpp
+++ b/src/hotspot/share/oops/accessDecorators.hpp
@@ -192,10 +192,8 @@ const DecoratorSet IN_HEAP            = UCONST64(1) << 20;
 const DecoratorSet IN_HEAP_ARRAY      = UCONST64(1) << 21;
 const DecoratorSet IN_ROOT            = UCONST64(1) << 22;
 const DecoratorSet IN_CONCURRENT_ROOT = UCONST64(1) << 23;
-const DecoratorSet IN_ARCHIVE_ROOT    = UCONST64(1) << 24;
 const DecoratorSet IN_DECORATOR_MASK  = IN_HEAP | IN_HEAP_ARRAY |
-                                        IN_ROOT | IN_CONCURRENT_ROOT |
-                                        IN_ARCHIVE_ROOT;
+                                        IN_ROOT | IN_CONCURRENT_ROOT;
 
 // == Value Decorators ==
 // * OOP_NOT_NULL: This property can make certain barriers faster such as compressing oops.
@@ -245,9 +243,7 @@ namespace AccessInternal {
       ((IN_HEAP_ARRAY & barrier_strength_default) != 0 ? IN_HEAP : INTERNAL_EMPTY);
     static const DecoratorSet conc_root_is_root = heap_array_is_in_heap |
       ((IN_CONCURRENT_ROOT & heap_array_is_in_heap) != 0 ? IN_ROOT : INTERNAL_EMPTY);
-    static const DecoratorSet archive_root_is_root = conc_root_is_root |
-      ((IN_ARCHIVE_ROOT & conc_root_is_root) != 0 ? IN_ROOT : INTERNAL_EMPTY);
-    static const DecoratorSet value = archive_root_is_root | BT_BUILDTIME_DECORATORS;
+    static const DecoratorSet value = conc_root_is_root | BT_BUILDTIME_DECORATORS;
   };
 
   // This function implements the above DecoratorFixup rules, but without meta
@@ -268,9 +264,7 @@ namespace AccessInternal {
       ((IN_HEAP_ARRAY & barrier_strength_default) != 0 ? IN_HEAP : INTERNAL_EMPTY);
     DecoratorSet conc_root_is_root = heap_array_is_in_heap |
       ((IN_CONCURRENT_ROOT & heap_array_is_in_heap) != 0 ? IN_ROOT : INTERNAL_EMPTY);
-    DecoratorSet archive_root_is_root = conc_root_is_root |
-      ((IN_ARCHIVE_ROOT & conc_root_is_root) != 0 ? IN_ROOT : INTERNAL_EMPTY);
-    DecoratorSet value = archive_root_is_root | BT_BUILDTIME_DECORATORS;
+    DecoratorSet value = conc_root_is_root | BT_BUILDTIME_DECORATORS;
     return value;
   }
 }
diff --git a/src/hotspot/share/oops/array.inline.hpp b/src/hotspot/share/oops/array.inline.hpp
index 911f39aa9a0..e13086adb23 100644
--- a/src/hotspot/share/oops/array.inline.hpp
+++ b/src/hotspot/share/oops/array.inline.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_OOPS_ARRAY_INLINE_HPP
 
 #include "oops/array.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 template <typename T>
 inline T Array<T>::at_acquire(const int which) { return OrderAccess::load_acquire(adr_at(which)); }
diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp
index 3201ec993cc..7fac4408603 100644
--- a/src/hotspot/share/oops/arrayKlass.cpp
+++ b/src/hotspot/share/oops/arrayKlass.cpp
@@ -130,7 +130,7 @@ bool ArrayKlass::compute_is_subtype_of(Klass* k) {
 
 objArrayOop ArrayKlass::allocate_arrayArray(int n, int length, TRAPS) {
   if (length < 0) {
-    THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+    THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
   }
   if (length > arrayOopDesc::max_array_length(T_ARRAY)) {
     report_java_out_of_memory("Requested array size exceeds VM limit");
diff --git a/src/hotspot/share/oops/arrayKlass.inline.hpp b/src/hotspot/share/oops/arrayKlass.inline.hpp
index f0a62bfb966..6caaae05de4 100644
--- a/src/hotspot/share/oops/arrayKlass.inline.hpp
+++ b/src/hotspot/share/oops/arrayKlass.inline.hpp
@@ -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
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
 #define SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
 
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "oops/arrayKlass.hpp"
 
 inline Klass* ArrayKlass::higher_dimension_acquire() const {
diff --git a/src/hotspot/share/oops/arrayOop.hpp b/src/hotspot/share/oops/arrayOop.hpp
index 7362dfc56c5..56695d80bfc 100644
--- a/src/hotspot/share/oops/arrayOop.hpp
+++ b/src/hotspot/share/oops/arrayOop.hpp
@@ -88,6 +88,18 @@ class arrayOopDesc : public oopDesc {
   inline void* base(BasicType type) const;
   inline void* base_raw(BasicType type) const; // GC barrier invariant
 
+  template <typename T>
+  static T* obj_offset_to_raw(arrayOop obj, size_t offset_in_bytes, T* raw) {
+    if (obj != NULL) {
+      assert(raw == NULL, "either raw or in-heap");
+      char* base = reinterpret_cast<char*>((void*) obj);
+      raw = reinterpret_cast<T*>(base + offset_in_bytes);
+    } else {
+      assert(raw != NULL, "either raw or in-heap");
+    }
+    return raw;
+  }
+
   // Tells whether index is within bounds.
   bool is_within_bounds(int index) const        { return 0 <= index && index < length(); }
 
diff --git a/src/hotspot/share/oops/constantPool.inline.hpp b/src/hotspot/share/oops/constantPool.inline.hpp
index da858be3de8..43aaa460c95 100644
--- a/src/hotspot/share/oops/constantPool.inline.hpp
+++ b/src/hotspot/share/oops/constantPool.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 inline CPSlot ConstantPool::slot_at(int which) const {
   assert(is_within_bounds(which), "index out of bounds");
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index be39ed70aac..6f73a80bdb1 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -32,6 +32,7 @@
 #include "logging/log.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
+#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
@@ -42,7 +43,7 @@
 #include "prims/methodHandles.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/macros.hpp"
 
 // Implementation of ConstantPoolCacheEntry
@@ -743,16 +744,15 @@ void ConstantPoolCache::deallocate_contents(ClassLoaderData* data) {
 
 #if INCLUDE_CDS_JAVA_HEAP
 oop ConstantPoolCache::archived_references() {
-  // Loading an archive root forces the oop to become strongly reachable.
-  // For example, if it is loaded during concurrent marking in a SATB
-  // collector, it will be enqueued to the SATB queue, effectively
-  // shading the previously white object gray.
-  return RootAccess<IN_ARCHIVE_ROOT>::oop_load(&_archived_references);
+  if (CompressedOops::is_null(_archived_references)) {
+    return NULL;
+  }
+  return MetaspaceShared::materialize_archived_object(CompressedOops::decode_not_null(_archived_references));
 }
 
 void ConstantPoolCache::set_archived_references(oop o) {
   assert(DumpSharedSpaces, "called only during runtime");
-  RootAccess<IN_ARCHIVE_ROOT>::oop_store(&_archived_references, o);
+  _archived_references = CompressedOops::encode(o);
 }
 #endif
 
diff --git a/src/hotspot/share/oops/cpCache.inline.hpp b/src/hotspot/share/oops/cpCache.inline.hpp
index f91a55d736f..c876e669de3 100644
--- a/src/hotspot/share/oops/cpCache.inline.hpp
+++ b/src/hotspot/share/oops/cpCache.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "oops/cpCache.hpp"
 #include "oops/oopHandle.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 inline int ConstantPoolCacheEntry::indices_ord() const { return OrderAccess::load_acquire(&_indices); }
 
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index ea5fd7eac84..204f37b4652 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -71,7 +71,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/classLoadingService.hpp"
 #include "services/threadService.hpp"
@@ -975,7 +975,9 @@ bool InstanceKlass::is_same_or_direct_interface(Klass *k) const {
 }
 
 objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) {
-  if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+  if (length < 0)  {
+    THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
+  }
   if (length > arrayOopDesc::max_array_length(T_OBJECT)) {
     report_java_out_of_memory("Requested array size exceeds VM limit");
     JvmtiExport::post_array_size_exhausted();
diff --git a/src/hotspot/share/oops/instanceKlass.inline.hpp b/src/hotspot/share/oops/instanceKlass.inline.hpp
index 745dcac9094..755ebcf06e2 100644
--- a/src/hotspot/share/oops/instanceKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceKlass.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -29,7 +29,7 @@
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
diff --git a/src/hotspot/share/oops/instanceRefKlass.inline.hpp b/src/hotspot/share/oops/instanceRefKlass.inline.hpp
index fe6fce234ef..fbbf648c982 100644
--- a/src/hotspot/share/oops/instanceRefKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.inline.hpp
@@ -53,13 +53,20 @@ void InstanceRefKlass::do_discovered(oop obj, OopClosureType* closure, Contains&
   }
 }
 
+static inline oop load_referent(oop obj, ReferenceType type) {
+  if (type == REF_PHANTOM) {
+    return HeapAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(java_lang_ref_Reference::referent_addr_raw(obj));
+  } else {
+    return HeapAccess<ON_WEAK_OOP_REF | AS_NO_KEEPALIVE>::oop_load(java_lang_ref_Reference::referent_addr_raw(obj));
+  }
+}
+
 template <typename T, class OopClosureType>
 bool InstanceRefKlass::try_discover(oop obj, ReferenceType type, OopClosureType* closure) {
   ReferenceDiscoverer* rd = closure->ref_discoverer();
   if (rd != NULL) {
-    T referent_oop = RawAccess<>::oop_load((T*)java_lang_ref_Reference::referent_addr_raw(obj));
-    if (!CompressedOops::is_null(referent_oop)) {
-      oop referent = CompressedOops::decode_not_null(referent_oop);
+    oop referent = load_referent(obj, type);
+    if (referent != NULL) {
       if (!referent->is_gc_marked()) {
         // Only try to discover if not yet marked.
         return rd->discover_reference(obj, type);
@@ -179,9 +186,9 @@ void InstanceRefKlass::trace_reference_gc(const char *s, oop obj) {
 
   log_develop_trace(gc, ref)("InstanceRefKlass %s for obj " PTR_FORMAT, s, p2i(obj));
   log_develop_trace(gc, ref)("     referent_addr/* " PTR_FORMAT " / " PTR_FORMAT,
-      p2i(referent_addr), p2i(referent_addr ? RawAccess<>::oop_load(referent_addr) : (oop)NULL));
+      p2i(referent_addr), p2i((oop)HeapAccess<ON_UNKNOWN_OOP_REF | AS_NO_KEEPALIVE>::oop_load_at(obj, java_lang_ref_Reference::referent_offset)));
   log_develop_trace(gc, ref)("     discovered_addr/* " PTR_FORMAT " / " PTR_FORMAT,
-      p2i(discovered_addr), p2i(discovered_addr ? RawAccess<>::oop_load(discovered_addr) : (oop)NULL));
+      p2i(discovered_addr), p2i((oop)HeapAccess<AS_NO_KEEPALIVE>::oop_load(discovered_addr)));
 }
 #endif
 
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 2921fadab8c..69e4ea78bd0 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -43,7 +43,7 @@
 #include "oops/oopHandle.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
 
@@ -529,20 +529,19 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
   Handle module_handle(THREAD, ((module_entry != NULL) ? module_entry->module() : (oop)NULL));
 
   if (this->has_raw_archived_mirror()) {
+    ResourceMark rm;
     log_debug(cds, mirror)("%s has raw archived mirror", external_name());
     if (MetaspaceShared::open_archive_heap_region_mapped()) {
-      oop m = archived_java_mirror();
-      log_debug(cds, mirror)("Archived mirror is: " PTR_FORMAT, p2i(m));
-      if (m != NULL) {
-        // mirror is archived, restore
-        assert(MetaspaceShared::is_archive_object(m), "must be archived mirror object");
-        Handle m_h(THREAD, m);
-        java_lang_Class::restore_archived_mirror(this, m_h, loader, module_handle, protection_domain, CHECK);
+      bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle,
+                                                              protection_domain,
+                                                              CHECK);
+      if (present) {
         return;
       }
     }
 
     // No archived mirror data
+    log_debug(cds, mirror)("No archived mirror data for %s", external_name());
     _java_mirror = NULL;
     this->clear_has_raw_archived_mirror();
   }
@@ -558,18 +557,10 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
 #if INCLUDE_CDS_JAVA_HEAP
 // Used at CDS dump time to access the archived mirror. No GC barrier.
 oop Klass::archived_java_mirror_raw() {
-  assert(DumpSharedSpaces, "called only during runtime");
   assert(has_raw_archived_mirror(), "must have raw archived mirror");
   return CompressedOops::decode(_archived_mirror);
 }
 
-// Used at CDS runtime to get the archived mirror from shared class. Uses GC barrier.
-oop Klass::archived_java_mirror() {
-  assert(UseSharedSpaces, "UseSharedSpaces expected.");
-  assert(has_raw_archived_mirror(), "must have raw archived mirror");
-  return RootAccess<IN_ARCHIVE_ROOT>::oop_load(&_archived_mirror);
-}
-
 // No GC barrier
 void Klass::set_archived_java_mirror_raw(oop m) {
   assert(DumpSharedSpaces, "called only during runtime");
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 3c2893c045e..8fca68b0f26 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -244,7 +244,6 @@ protected:
   void set_java_mirror(Handle m);
 
   oop archived_java_mirror_raw() NOT_CDS_JAVA_HEAP_RETURN_(NULL); // no GC barrier
-  oop archived_java_mirror() NOT_CDS_JAVA_HEAP_RETURN_(NULL);     // accessor with GC barrier
   void set_archived_java_mirror_raw(oop m) NOT_CDS_JAVA_HEAP_RETURN; // no GC barrier
 
   // Temporary mirror switch used by RedefineClasses
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index b721af31b2d..83c8c88c71c 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -54,7 +54,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/relocator.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -449,12 +449,6 @@ bool Method::init_method_counters(MethodCounters* counters) {
   return Atomic::replace_if_null(counters, &_method_counters);
 }
 
-void Method::cleanup_inline_caches() {
-  // The current system doesn't use inline caches in the interpreter
-  // => nothing to do (keep this method around for future use)
-}
-
-
 int Method::extra_stack_words() {
   // not an inline function, to avoid a header dependency on Interpreter
   return extra_stack_entries() * Interpreter::stackElementSize;
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index 24451400226..922d0e9b0ee 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -904,9 +904,6 @@ class Method : public Metadata {
     return method_holder()->lookup_osr_nmethod(this, bci, level, match_level);
   }
 
-  // Inline cache support
-  void cleanup_inline_caches();
-
   // Find if klass for method is loaded
   bool is_klass_loaded_by_klass_index(int klass_index) const;
   bool is_klass_loaded(int refinfo_index, bool must_be_resolved = false) const;
diff --git a/src/hotspot/share/oops/method.inline.hpp b/src/hotspot/share/oops/method.inline.hpp
index a2837192842..490d22d3efd 100644
--- a/src/hotspot/share/oops/method.inline.hpp
+++ b/src/hotspot/share/oops/method.inline.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_OOPS_METHOD_INLINE_HPP
 
 #include "oops/method.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 inline address Method::from_compiled_entry() const {
   return OrderAccess::load_acquire(&_from_compiled_entry);
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index 4ed9dd393ac..52b31451934 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -37,7 +37,7 @@
 #include "runtime/compilationPolicy.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
@@ -541,12 +541,6 @@ address RetData::fixup_ret(int return_bci, MethodData* h_mdo) {
   return mdp;
 }
 
-#ifdef CC_INTERP
-DataLayout* RetData::advance(MethodData *md, int bci) {
-  return (DataLayout*) md->bci_to_dp(bci);
-}
-#endif // CC_INTERP
-
 void RetData::print_data_on(outputStream* st, const char* extra) const {
   print_shared(st, "RetData", extra);
   uint row;
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index cc5fa7a8ae7..f38f858f18f 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -232,11 +232,6 @@ public:
   static ByteSize cell_offset(int index) {
     return byte_offset_of(DataLayout, _cells) + in_ByteSize(index * cell_size);
   }
-#ifdef CC_INTERP
-  static int cell_offset_in_bytes(int index) {
-    return (int)offset_of(DataLayout, _cells[index]);
-  }
-#endif // CC_INTERP
   // Return a value which, when or-ed as a byte into _flags, sets the flag.
   static int flag_number_to_byte_constant(int flag_number) {
     assert(0 <= flag_number && flag_number < flag_limit, "oob");
@@ -372,41 +367,6 @@ protected:
     _data = data;
   }
 
-#ifdef CC_INTERP
-  // Static low level accessors for DataLayout with ProfileData's semantics.
-
-  static int cell_offset_in_bytes(int index) {
-    return DataLayout::cell_offset_in_bytes(index);
-  }
-
-  static void increment_uint_at_no_overflow(DataLayout* layout, int index,
-                                            int inc = DataLayout::counter_increment) {
-    uint count = ((uint)layout->cell_at(index)) + inc;
-    if (count == 0) return;
-    layout->set_cell_at(index, (intptr_t) count);
-  }
-
-  static int int_at(DataLayout* layout, int index) {
-    return (int)layout->cell_at(index);
-  }
-
-  static int uint_at(DataLayout* layout, int index) {
-    return (uint)layout->cell_at(index);
-  }
-
-  static oop oop_at(DataLayout* layout, int index) {
-    return cast_to_oop(layout->cell_at(index));
-  }
-
-  static void set_intptr_at(DataLayout* layout, int index, intptr_t value) {
-    layout->set_cell_at(index, (intptr_t) value);
-  }
-
-  static void set_flag_at(DataLayout* layout, int flag_number) {
-    layout->set_flag_at(flag_number);
-  }
-#endif // CC_INTERP
-
 public:
   // Constructor for invalid ProfileData.
   ProfileData();
@@ -581,20 +541,6 @@ public:
     return cell_offset(bit_cell_count);
   }
 
-#ifdef CC_INTERP
-  static int bit_data_size_in_bytes() {
-    return cell_offset_in_bytes(bit_cell_count);
-  }
-
-  static void set_null_seen(DataLayout* layout) {
-    set_flag_at(layout, null_seen_flag);
-  }
-
-  static DataLayout* advance(DataLayout* layout) {
-    return (DataLayout*) (((address)layout) + (ssize_t)BitData::bit_data_size_in_bytes());
-  }
-#endif // CC_INTERP
-
   void print_data_on(outputStream* st, const char* extra = NULL) const;
 };
 
@@ -639,25 +585,6 @@ public:
     set_uint_at(count_off, count);
   }
 
-#ifdef CC_INTERP
-  static int counter_data_size_in_bytes() {
-    return cell_offset_in_bytes(counter_cell_count);
-  }
-
-  static void increment_count_no_overflow(DataLayout* layout) {
-    increment_uint_at_no_overflow(layout, count_off);
-  }
-
-  // Support counter decrementation at checkcast / subtype check failed.
-  static void decrement_count(DataLayout* layout) {
-    increment_uint_at_no_overflow(layout, count_off, -1);
-  }
-
-  static DataLayout* advance(DataLayout* layout) {
-    return (DataLayout*) (((address)layout) + (ssize_t)CounterData::counter_data_size_in_bytes());
-  }
-#endif // CC_INTERP
-
   void print_data_on(outputStream* st, const char* extra = NULL) const;
 };
 
@@ -728,20 +655,6 @@ public:
     return cell_offset(displacement_off_set);
   }
 
-#ifdef CC_INTERP
-  static void increment_taken_count_no_overflow(DataLayout* layout) {
-    increment_uint_at_no_overflow(layout, taken_off_set);
-  }
-
-  static DataLayout* advance_taken(DataLayout* layout) {
-    return (DataLayout*) (((address)layout) + (ssize_t)int_at(layout, displacement_off_set));
-  }
-
-  static uint taken_count(DataLayout* layout) {
-    return (uint) uint_at(layout, taken_off_set);
-  }
-#endif // CC_INTERP
-
   // Specific initialization.
   void post_initialize(BytecodeStream* stream, MethodData* mdo);
 
@@ -1302,43 +1215,6 @@ public:
   // GC support
   virtual void clean_weak_klass_links(bool always_clean);
 
-#ifdef CC_INTERP
-  static int receiver_type_data_size_in_bytes() {
-    return cell_offset_in_bytes(static_cell_count());
-  }
-
-  static Klass *receiver_unchecked(DataLayout* layout, uint row) {
-    Klass* recv = (Klass*)layout->cell_at(receiver_cell_index(row));
-    return recv;
-  }
-
-  static void increment_receiver_count_no_overflow(DataLayout* layout, Klass *rcvr) {
-    const int num_rows = row_limit();
-    // Receiver already exists?
-    for (int row = 0; row < num_rows; row++) {
-      if (receiver_unchecked(layout, row) == rcvr) {
-        increment_uint_at_no_overflow(layout, receiver_count_cell_index(row));
-        return;
-      }
-    }
-    // New receiver, find a free slot.
-    for (int row = 0; row < num_rows; row++) {
-      if (receiver_unchecked(layout, row) == NULL) {
-        set_intptr_at(layout, receiver_cell_index(row), (intptr_t)rcvr);
-        increment_uint_at_no_overflow(layout, receiver_count_cell_index(row));
-        return;
-      }
-    }
-    // Receiver did not match any saved receiver and there is no empty row for it.
-    // Increment total counter to indicate polymorphic case.
-    increment_count_no_overflow(layout);
-  }
-
-  static DataLayout* advance(DataLayout* layout) {
-    return (DataLayout*) (((address)layout) + (ssize_t)ReceiverTypeData::receiver_type_data_size_in_bytes());
-  }
-#endif // CC_INTERP
-
   void print_receiver_data_on(outputStream* st) const;
   void print_data_on(outputStream* st, const char* extra = NULL) const;
 };
@@ -1371,16 +1247,6 @@ public:
     return cell_offset(static_cell_count());
   }
 
-#ifdef CC_INTERP
-  static int virtual_call_data_size_in_bytes() {
-    return cell_offset_in_bytes(static_cell_count());
-  }
-
-  static DataLayout* advance(DataLayout* layout) {
-    return (DataLayout*) (((address)layout) + (ssize_t)VirtualCallData::virtual_call_data_size_in_bytes());
-  }
-#endif // CC_INTERP
-
 #if INCLUDE_JVMCI
   static ByteSize method_offset(uint row) {
     return cell_offset(method_cell_index(row));
@@ -1658,10 +1524,6 @@ public:
     return cell_offset(bci_displacement_cell_index(row));
   }
 
-#ifdef CC_INTERP
-  static DataLayout* advance(MethodData *md, int bci);
-#endif // CC_INTERP
-
   // Specific initialization.
   void post_initialize(BytecodeStream* stream, MethodData* mdo);
 
@@ -1726,20 +1588,6 @@ public:
     return cell_offset(branch_cell_count);
   }
 
-#ifdef CC_INTERP
-  static int branch_data_size_in_bytes() {
-    return cell_offset_in_bytes(branch_cell_count);
-  }
-
-  static void increment_not_taken_count_no_overflow(DataLayout* layout) {
-    increment_uint_at_no_overflow(layout, not_taken_off_set);
-  }
-
-  static DataLayout* advance_not_taken(DataLayout* layout) {
-    return (DataLayout*) (((address)layout) + (ssize_t)BranchData::branch_data_size_in_bytes());
-  }
-#endif // CC_INTERP
-
   // Specific initialization.
   void post_initialize(BytecodeStream* stream, MethodData* mdo);
 
@@ -1779,20 +1627,6 @@ protected:
     set_int_at(aindex, value);
   }
 
-#ifdef CC_INTERP
-  // Static low level accessors for DataLayout with ArrayData's semantics.
-
-  static void increment_array_uint_at_no_overflow(DataLayout* layout, int index) {
-    int aindex = index + array_start_off_set;
-    increment_uint_at_no_overflow(layout, aindex);
-  }
-
-  static int array_int_at(DataLayout* layout, int index) {
-    int aindex = index + array_start_off_set;
-    return int_at(layout, aindex);
-  }
-#endif // CC_INTERP
-
   // Code generation support for subclasses.
   static ByteSize array_element_offset(int index) {
     return cell_offset(array_start_off_set + index);
@@ -1913,28 +1747,6 @@ public:
     return in_ByteSize(relative_displacement_off_set) * cell_size;
   }
 
-#ifdef CC_INTERP
-  static void increment_count_no_overflow(DataLayout* layout, int index) {
-    if (index == -1) {
-      increment_array_uint_at_no_overflow(layout, default_count_off_set);
-    } else {
-      increment_array_uint_at_no_overflow(layout, case_array_start +
-                                                  index * per_case_cell_count +
-                                                  relative_count_off_set);
-    }
-  }
-
-  static DataLayout* advance(DataLayout* layout, int index) {
-    if (index == -1) {
-      return (DataLayout*) (((address)layout) + (ssize_t)array_int_at(layout, default_disaplacement_off_set));
-    } else {
-      return (DataLayout*) (((address)layout) + (ssize_t)array_int_at(layout, case_array_start +
-                                                                              index * per_case_cell_count +
-                                                                              relative_displacement_off_set));
-    }
-  }
-#endif // CC_INTERP
-
   // Specific initialization.
   void post_initialize(BytecodeStream* stream, MethodData* mdo);
 
@@ -2127,13 +1939,11 @@ public:
 // adjusted in the event of a change in control flow.
 //
 
-CC_INTERP_ONLY(class BytecodeInterpreter;)
 class CleanExtraDataClosure;
 
 class MethodData : public Metadata {
   friend class VMStructs;
   friend class JVMCIVMStructs;
-  CC_INTERP_ONLY(friend class BytecodeInterpreter;)
 private:
   friend class ProfileData;
   friend class TypeEntriesAtCall;
diff --git a/src/hotspot/share/oops/methodData.inline.hpp b/src/hotspot/share/oops/methodData.inline.hpp
index d3a8a739f72..4be1830de27 100644
--- a/src/hotspot/share/oops/methodData.inline.hpp
+++ b/src/hotspot/share/oops/methodData.inline.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_OOPS_METHODDATA_INLINE_HPP
 
 #include "oops/methodData.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 
 inline void DataLayout::release_set_cell_at(int index, intptr_t value) {
   OrderAccess::release_store(&_cells[index], value);
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index 86dcbf08ba2..ab0c390227c 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -181,7 +181,7 @@ objArrayOop ObjArrayKlass::allocate(int length, TRAPS) {
       THROW_OOP_0(Universe::out_of_memory_error_array_size());
     }
   } else {
-    THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+    THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
   }
 }
 
@@ -209,7 +209,7 @@ oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
       for (int i = 0; i < rank - 1; ++i) {
         sizes += 1;
         if (*sizes < 0) {
-          THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+          THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", *sizes));
         }
       }
     }
@@ -218,23 +218,23 @@ oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
 }
 
 // Either oop or narrowOop depending on UseCompressedOops.
-template <class T> void ObjArrayKlass::do_copy(arrayOop s, T* src,
-                               arrayOop d, T* dst, int length, TRAPS) {
+void ObjArrayKlass::do_copy(arrayOop s, size_t src_offset,
+                            arrayOop d, size_t dst_offset, int length, TRAPS) {
   if (oopDesc::equals(s, d)) {
     // since source and destination are equal we do not need conversion checks.
     assert(length > 0, "sanity check");
-    HeapAccess<>::oop_arraycopy(s, d, src, dst, length);
+    ArrayAccess<>::oop_arraycopy(s, src_offset, d, dst_offset, length);
   } else {
     // We have to make sure all elements conform to the destination array
     Klass* bound = ObjArrayKlass::cast(d->klass())->element_klass();
     Klass* stype = ObjArrayKlass::cast(s->klass())->element_klass();
     if (stype == bound || stype->is_subtype_of(bound)) {
       // elements are guaranteed to be subtypes, so no check necessary
-      HeapAccess<ARRAYCOPY_DISJOINT>::oop_arraycopy(s, d, src, dst, length);
+      ArrayAccess<ARRAYCOPY_DISJOINT>::oop_arraycopy(s, src_offset, d, dst_offset, length);
     } else {
       // slow case: need individual subtype checks
       // note: don't use obj_at_put below because it includes a redundant store check
-      if (!HeapAccess<ARRAYCOPY_DISJOINT | ARRAYCOPY_CHECKCAST>::oop_arraycopy(s, d, src, dst, length)) {
+      if (!ArrayAccess<ARRAYCOPY_DISJOINT | ARRAYCOPY_CHECKCAST>::oop_arraycopy(s, src_offset, d, dst_offset, length)) {
         THROW(vmSymbols::java_lang_ArrayStoreException());
       }
     }
@@ -289,13 +289,21 @@ void ObjArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d,
     return;
   }
   if (UseCompressedOops) {
-    narrowOop* const src = objArrayOop(s)->obj_at_addr<narrowOop>(src_pos);
-    narrowOop* const dst = objArrayOop(d)->obj_at_addr<narrowOop>(dst_pos);
-    do_copy<narrowOop>(s, src, d, dst, length, CHECK);
+    size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(src_pos);
+    size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(dst_pos);
+    assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(s, src_offset, NULL) ==
+           objArrayOop(s)->obj_at_addr<narrowOop>(src_pos), "sanity");
+    assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(d, dst_offset, NULL) ==
+           objArrayOop(d)->obj_at_addr<narrowOop>(dst_pos), "sanity");
+    do_copy(s, src_offset, d, dst_offset, length, CHECK);
   } else {
-    oop* const src = objArrayOop(s)->obj_at_addr<oop>(src_pos);
-    oop* const dst = objArrayOop(d)->obj_at_addr<oop>(dst_pos);
-    do_copy<oop> (s, src, d, dst, length, CHECK);
+    size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(src_pos);
+    size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(dst_pos);
+    assert(arrayOopDesc::obj_offset_to_raw<oop>(s, src_offset, NULL) ==
+           objArrayOop(s)->obj_at_addr<oop>(src_pos), "sanity");
+    assert(arrayOopDesc::obj_offset_to_raw<oop>(d, dst_offset, NULL) ==
+           objArrayOop(d)->obj_at_addr<oop>(dst_pos), "sanity");
+    do_copy(s, src_offset, d, dst_offset, length, CHECK);
   }
 }
 
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index f98ac968752..8f86e6bc309 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -88,8 +88,9 @@ class ObjArrayKlass : public ArrayKlass {
  private:
   // Either oop or narrowOop depending on UseCompressedOops.
   // must be called from within ObjArrayKlass.cpp
-  template <class T> void do_copy(arrayOop s, T* src, arrayOop d,
-                                  T* dst, int length, TRAPS);
+  void do_copy(arrayOop s, size_t src_offset,
+               arrayOop d, size_t dst_offset,
+               int length, TRAPS);
  protected:
   // Returns the ObjArrayKlass for n'th dimension.
   virtual Klass* array_klass_impl(bool or_null, int n, TRAPS);
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index 98dd89f0e8e..aa82e1bfc2d 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -30,6 +30,7 @@
 #include "memory/memRegion.hpp"
 #include "oops/access.hpp"
 #include "oops/metadata.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/macros.hpp"
 
 // oopDesc is the top baseclass for objects classes. The {name}Desc classes describe
@@ -72,7 +73,7 @@ class oopDesc {
 
   inline void release_set_mark(markOop m);
   inline markOop cas_set_mark(markOop new_mark, markOop old_mark);
-  inline markOop cas_set_mark_raw(markOop new_mark, markOop old_mark);
+  inline markOop cas_set_mark_raw(markOop new_mark, markOop old_mark, atomic_memory_order order = memory_order_conservative);
 
   // Used only to re-initialize the mark word (e.g., of promoted
   // objects during a GC) -- requires a valid klass pointer
@@ -259,7 +260,7 @@ class oopDesc {
   inline bool is_forwarded() const;
 
   inline void forward_to(oop p);
-  inline bool cas_forward_to(oop p, markOop compare);
+  inline bool cas_forward_to(oop p, markOop compare, atomic_memory_order order = memory_order_conservative);
 
   // Like "forward_to", but inserts the forwarding pointer atomically.
   // Exactly one thread succeeds in inserting the forwarding pointer, and
@@ -268,6 +269,7 @@ class oopDesc {
   inline oop forward_to_atomic(oop p);
 
   inline oop forwardee() const;
+  inline oop forwardee_acquire() const;
 
   // Age of object during scavenge
   inline uint age() const;
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index f10f6022238..4d1e4b58e72 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -35,7 +35,7 @@
 #include "oops/markOop.inline.hpp"
 #include "oops/oop.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/macros.hpp"
@@ -71,8 +71,8 @@ markOop oopDesc::cas_set_mark(markOop new_mark, markOop old_mark) {
   return HeapAccess<>::atomic_cmpxchg_at(new_mark, as_oop(), mark_offset_in_bytes(), old_mark);
 }
 
-markOop oopDesc::cas_set_mark_raw(markOop new_mark, markOop old_mark) {
-  return Atomic::cmpxchg(new_mark, &_mark, old_mark);
+markOop oopDesc::cas_set_mark_raw(markOop new_mark, markOop old_mark, atomic_memory_order order) {
+  return Atomic::cmpxchg(new_mark, &_mark, old_mark, order);
 }
 
 void oopDesc::init_mark() {
@@ -342,14 +342,14 @@ void oopDesc::forward_to(oop p) {
 }
 
 // Used by parallel scavengers
-bool oopDesc::cas_forward_to(oop p, markOop compare) {
+bool oopDesc::cas_forward_to(oop p, markOop compare, atomic_memory_order order) {
   assert(check_obj_alignment(p),
          "forwarding to something not aligned");
   assert(Universe::heap()->is_in_reserved(p),
          "forwarding to something not in heap");
   markOop m = markOopDesc::encode_pointer_as_mark(p);
   assert(m->decode_pointer() == p, "encoding must be reversable");
-  return cas_set_mark_raw(m, compare) == compare;
+  return cas_set_mark_raw(m, compare, order) == compare;
 }
 
 oop oopDesc::forward_to_atomic(oop p) {
@@ -381,6 +381,14 @@ oop oopDesc::forwardee() const {
   return (oop) mark_raw()->decode_pointer();
 }
 
+// Note that the forwardee is not the same thing as the displaced_mark.
+// The forwardee is used when copying during scavenge and mark-sweep.
+// It does need to clear the low two locking- and GC-related bits.
+oop oopDesc::forwardee_acquire() const {
+  markOop m = OrderAccess::load_acquire(&_mark);
+  return (oop) m->decode_pointer();
+}
+
 // The following method needs to be MT safe.
 uint oopDesc::age() const {
   assert(!is_forwarded(), "Attempt to read age from forwarded mark");
diff --git a/src/hotspot/share/oops/typeArrayKlass.cpp b/src/hotspot/share/oops/typeArrayKlass.cpp
index d5186e31828..4e9fca75305 100644
--- a/src/hotspot/share/oops/typeArrayKlass.cpp
+++ b/src/hotspot/share/oops/typeArrayKlass.cpp
@@ -116,7 +116,7 @@ typeArrayOop TypeArrayKlass::allocate_common(int length, bool do_zero, TRAPS) {
       THROW_OOP_0(Universe::out_of_memory_error_array_size());
     }
   } else {
-    THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+    THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
   }
 }
 
@@ -175,10 +175,9 @@ void TypeArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos
 
   // This is an attempt to make the copy_array fast.
   int l2es = log2_element_size();
-  int ihs = array_header_in_bytes() / wordSize;
-  void* src = (char*) (s->base(element_type())) + ((size_t)src_pos << l2es);
-  void* dst = (char*) (d->base(element_type())) + ((size_t)dst_pos << l2es);
-  HeapAccess<ARRAYCOPY_ATOMIC>::arraycopy(s, d, src, dst, (size_t)length << l2es);
+  size_t src_offset = arrayOopDesc::base_offset_in_bytes(element_type()) + ((size_t)src_pos << l2es);
+  size_t dst_offset = arrayOopDesc::base_offset_in_bytes(element_type()) + ((size_t)dst_pos << l2es);
+  ArrayAccess<ARRAYCOPY_ATOMIC>::arraycopy<void>(s, src_offset, d, dst_offset, (size_t)length << l2es);
 }
 
 // create a klass of array holding typeArrays
diff --git a/src/hotspot/share/oops/typeArrayOop.hpp b/src/hotspot/share/oops/typeArrayOop.hpp
index f06eed60e7f..548acab6d17 100644
--- a/src/hotspot/share/oops/typeArrayOop.hpp
+++ b/src/hotspot/share/oops/typeArrayOop.hpp
@@ -32,12 +32,22 @@
 // It is used for arrays of {characters, singles, doubles, bytes, shorts, integers, longs}
 #include <limits.h>
 
+namespace TypeToBT {
+  template<typename T> BasicType to_basic_type();
+  template<> inline BasicType to_basic_type<jboolean>() { return T_BOOLEAN; }
+  template<> inline BasicType to_basic_type<jbyte>()    { return T_BYTE;    }
+  template<> inline BasicType to_basic_type<jchar>()    { return T_CHAR;    }
+  template<> inline BasicType to_basic_type<jshort>()   { return T_SHORT;   }
+  template<> inline BasicType to_basic_type<jint>()     { return T_INT;     }
+  template<> inline BasicType to_basic_type<jlong>()    { return T_LONG;    }
+  template<> inline BasicType to_basic_type<jfloat>()   { return T_FLOAT;   }
+  template<> inline BasicType to_basic_type<jdouble>()  { return T_DOUBLE;  }
+};
+
 class typeArrayOopDesc : public arrayOopDesc {
 private:
-  template <class T>
-  static ptrdiff_t element_offset(BasicType bt, int index) {
-    return arrayOopDesc::base_offset_in_bytes(bt) + sizeof(T) * index;
-  }
+  template <typename T>
+  static BasicType bt() { return TypeToBT::to_basic_type<T>(); }
 
  protected:
   jchar*    char_base()   const;
@@ -52,6 +62,11 @@ private:
   friend class TypeArrayKlass;
 
  public:
+  template <typename T>
+  static ptrdiff_t element_offset(int index) {
+    return arrayOopDesc::base_offset_in_bytes(bt<T>()) + sizeof(T) * index;
+  }
+
   jbyte* byte_at_addr(int which) const;
   jboolean* bool_at_addr(int which) const;
   jchar* char_at_addr(int which) const;
diff --git a/src/hotspot/share/oops/typeArrayOop.inline.hpp b/src/hotspot/share/oops/typeArrayOop.inline.hpp
index 07c29c006bc..7dbd02d7db1 100644
--- a/src/hotspot/share/oops/typeArrayOop.inline.hpp
+++ b/src/hotspot/share/oops/typeArrayOop.inline.hpp
@@ -90,92 +90,92 @@ inline jdouble* typeArrayOopDesc::double_at_addr(int which) const {
 }
 
 inline jbyte typeArrayOopDesc::byte_at(int which) const {
-  ptrdiff_t offset = element_offset<jbyte>(T_BYTE, which);
+  ptrdiff_t offset = element_offset<jbyte>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::byte_at_put(int which, jbyte contents) {
-  ptrdiff_t offset = element_offset<jbyte>(T_BYTE, which);
+  ptrdiff_t offset = element_offset<jbyte>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jboolean typeArrayOopDesc::bool_at(int which) const {
-  ptrdiff_t offset = element_offset<jboolean>(T_BOOLEAN, which);
+  ptrdiff_t offset = element_offset<jboolean>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::bool_at_put(int which, jboolean contents) {
-  ptrdiff_t offset = element_offset<jboolean>(T_BOOLEAN, which);
+  ptrdiff_t offset = element_offset<jboolean>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, jboolean(contents & 1));
 }
 
 inline jchar typeArrayOopDesc::char_at(int which) const {
-  ptrdiff_t offset = element_offset<jchar>(T_CHAR, which);
+  ptrdiff_t offset = element_offset<jchar>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::char_at_put(int which, jchar contents) {
-  ptrdiff_t offset = element_offset<jchar>(T_CHAR, which);
+  ptrdiff_t offset = element_offset<jchar>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jint typeArrayOopDesc::int_at(int which) const {
-  ptrdiff_t offset = element_offset<jint>(T_INT, which);
+  ptrdiff_t offset = element_offset<jint>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::int_at_put(int which, jint contents) {
-  ptrdiff_t offset = element_offset<jint>(T_INT, which);
+  ptrdiff_t offset = element_offset<jint>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jshort typeArrayOopDesc::short_at(int which) const {
-  ptrdiff_t offset = element_offset<jshort>(T_SHORT, which);
+  ptrdiff_t offset = element_offset<jshort>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::short_at_put(int which, jshort contents) {
-  ptrdiff_t offset = element_offset<jshort>(T_SHORT, which);
+  ptrdiff_t offset = element_offset<jshort>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jushort typeArrayOopDesc::ushort_at(int which) const {
-  ptrdiff_t offset = element_offset<jushort>(T_SHORT, which);
+  ptrdiff_t offset = element_offset<jushort>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::ushort_at_put(int which, jushort contents) {
-  ptrdiff_t offset = element_offset<jushort>(T_SHORT, which);
+  ptrdiff_t offset = element_offset<jushort>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jlong typeArrayOopDesc::long_at(int which) const {
-  ptrdiff_t offset = element_offset<jlong>(T_LONG, which);
+  ptrdiff_t offset = element_offset<jlong>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::long_at_put(int which, jlong contents) {
-  ptrdiff_t offset = element_offset<jlong>(T_LONG, which);
+  ptrdiff_t offset = element_offset<jlong>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jfloat typeArrayOopDesc::float_at(int which) const {
-  ptrdiff_t offset = element_offset<jfloat>(T_FLOAT, which);
+  ptrdiff_t offset = element_offset<jfloat>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::float_at_put(int which, jfloat contents) {
-  ptrdiff_t offset = element_offset<jfloat>(T_FLOAT, which);
+  ptrdiff_t offset = element_offset<jfloat>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jdouble typeArrayOopDesc::double_at(int which) const {
-  ptrdiff_t offset = element_offset<jdouble>(T_DOUBLE, which);
+  ptrdiff_t offset = element_offset<jdouble>(which);
   return HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::double_at_put(int which, jdouble contents) {
-  ptrdiff_t offset = element_offset<jdouble>(T_DOUBLE, which);
+  ptrdiff_t offset = element_offset<jdouble>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
 inline jbyte typeArrayOopDesc::byte_at_acquire(int which) const {
-  ptrdiff_t offset = element_offset<jbyte>(T_BYTE, which);
+  ptrdiff_t offset = element_offset<jbyte>(which);
   return HeapAccess<MO_ACQUIRE | IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::release_byte_at_put(int which, jbyte contents) {
-  ptrdiff_t offset = element_offset<jbyte>(T_BYTE, which);
+  ptrdiff_t offset = element_offset<jbyte>(which);
   HeapAccess<MO_RELEASE | IN_HEAP_ARRAY>::store_at(as_oop(), offset, contents);
 }
 
@@ -184,20 +184,20 @@ inline void typeArrayOopDesc::release_byte_at_put(int which, jbyte contents) {
 // casting
 #ifdef _LP64
 inline Symbol* typeArrayOopDesc::symbol_at(int which) const {
-  ptrdiff_t offset = element_offset<jlong>(T_LONG, which);
+  ptrdiff_t offset = element_offset<jlong>(which);
   return (Symbol*)(jlong) HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::symbol_at_put(int which, Symbol* contents) {
-  ptrdiff_t offset = element_offset<jlong>(T_LONG, which);
+  ptrdiff_t offset = element_offset<jlong>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, (jlong)contents);
 }
 #else
 inline Symbol* typeArrayOopDesc::symbol_at(int which) const {
-  ptrdiff_t offset = element_offset<jint>(T_INT, which);
+  ptrdiff_t offset = element_offset<jint>(which);
   return (Symbol*)(jint) HeapAccess<IN_HEAP_ARRAY>::load_at(as_oop(), offset);
 }
 inline void typeArrayOopDesc::symbol_at_put(int which, Symbol* contents) {
-  ptrdiff_t offset = element_offset<jint>(T_INT, which);
+  ptrdiff_t offset = element_offset<jint>(which);
   HeapAccess<IN_HEAP_ARRAY>::store_at(as_oop(), offset, (jint)contents);
 }
 #endif // _LP64
diff --git a/src/hotspot/share/oops/weakHandle.cpp b/src/hotspot/share/oops/weakHandle.cpp
index 82072718334..7de613d1391 100644
--- a/src/hotspot/share/oops/weakHandle.cpp
+++ b/src/hotspot/share/oops/weakHandle.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/systemDictionary.hpp"
+#include "classfile/stringTable.hpp"
 #include "gc/shared/oopStorage.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.hpp"
@@ -35,6 +36,10 @@ template <> OopStorage* WeakHandle<vm_class_loader_data>::get_storage() {
   return SystemDictionary::vm_weak_oop_storage();
 }
 
+template <> OopStorage* WeakHandle<vm_string_table_data>::get_storage() {
+  return StringTable::weak_storage();
+}
+
 template <WeakHandleType T>
 WeakHandle<T> WeakHandle<T>::create(Handle obj) {
   assert(obj() != NULL, "no need to create weak null oop");
@@ -68,4 +73,5 @@ void WeakHandle<T>::print_on(outputStream* st) const {
 
 // Provide instantiation.
 template class WeakHandle<vm_class_loader_data>;
+template class WeakHandle<vm_string_table_data>;
 
diff --git a/src/hotspot/share/oops/weakHandle.hpp b/src/hotspot/share/oops/weakHandle.hpp
index d1054efbd9c..57587c4f224 100644
--- a/src/hotspot/share/oops/weakHandle.hpp
+++ b/src/hotspot/share/oops/weakHandle.hpp
@@ -39,12 +39,11 @@ class OopStorage;
 // This is the vm version of jweak but has different GC lifetimes and policies,
 // depending on the type.
 
-enum WeakHandleType { vm_class_loader_data, vm_string };
+enum WeakHandleType { vm_class_loader_data, vm_string, vm_string_table_data };
 
 template <WeakHandleType T>
 class WeakHandle {
  public:
-
  private:
   oop* _obj;
 
@@ -59,6 +58,8 @@ class WeakHandle {
   void release() const;
   bool is_null() const { return _obj == NULL; }
 
+  void replace(oop with_obj);
+
   void print() const;
   void print_on(outputStream* st) const;
 };
diff --git a/src/hotspot/share/oops/weakHandle.inline.hpp b/src/hotspot/share/oops/weakHandle.inline.hpp
index 6b8b5ffc2b4..7037fcea796 100644
--- a/src/hotspot/share/oops/weakHandle.inline.hpp
+++ b/src/hotspot/share/oops/weakHandle.inline.hpp
@@ -40,4 +40,10 @@ oop WeakHandle<T>::peek() const {
   return RootAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(_obj);
 }
 
+template <WeakHandleType T>
+void WeakHandle<T>::replace(oop with_obj) {
+  RootAccess<ON_PHANTOM_OOP_REF>::oop_store(_obj, with_obj);
+}
+
 #endif // SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP
+
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 1d0e16532b3..ac2e7619951 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -53,6 +53,9 @@
   diagnostic(bool, StressGCM, false,                                        \
           "Randomize instruction scheduling in GCM")                        \
                                                                             \
+  develop(bool, StressMethodHandleLinkerInlining, false,                    \
+          "Stress inlining through method handle linkers")                  \
+                                                                            \
   develop(intx, OptoPrologueNops, 0,                                        \
           "Insert this many extra nop instructions "                        \
           "in the prologue of every nmethod")                               \
diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index 3a0dd830ac1..b778b5ebfe9 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -932,7 +932,7 @@ CallGenerator* CallGenerator::for_method_handle_inline(JVMState* jvms, ciMethod*
           speculative_receiver_type = (receiver_type != NULL) ? receiver_type->speculative_type() : NULL;
         }
         CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms,
-                                              true /* allow_inline */,
+                                              !StressMethodHandleLinkerInlining /* allow_inline */,
                                               PROB_ALWAYS,
                                               speculative_receiver_type);
         return cg;
diff --git a/src/hotspot/share/opto/classes.cpp b/src/hotspot/share/opto/classes.cpp
index cf63ea1db1f..e8ac3a61de1 100644
--- a/src/hotspot/share/opto/classes.cpp
+++ b/src/hotspot/share/opto/classes.cpp
@@ -47,11 +47,17 @@
 #include "opto/rootnode.hpp"
 #include "opto/subnode.hpp"
 #include "opto/vectornode.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 
 // ----------------------------------------------------------------------------
 // Build a table of virtual functions to map from Nodes to dense integer
 // opcode names.
 int Node::Opcode() const { return Op_Node; }
 #define macro(x) int x##Node::Opcode() const { return Op_##x; }
+#define optionalmacro(x)
 #include "classes.hpp"
 #undef macro
+#undef optionalmacro
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 8f779bfe607..75148adcf9c 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include "utilities/macros.hpp"
+
 // The giant table of Node classes.
 // One entry per class, sorted by class name.
 
@@ -186,6 +188,14 @@ macro(LoadP)
 macro(LoadN)
 macro(LoadRange)
 macro(LoadS)
+#if INCLUDE_ZGC
+#define zgcmacro(x) macro(x)
+#else
+#define zgcmacro(x) optionalmacro(x)
+#endif
+zgcmacro(LoadBarrier)
+zgcmacro(LoadBarrierSlowReg)
+zgcmacro(LoadBarrierWeakSlowReg)
 macro(Lock)
 macro(Loop)
 macro(LoopLimit)
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index bdd9606e445..3d6fad130a7 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -75,9 +75,13 @@
 #include "runtime/timer.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
+#include "utilities/macros.hpp"
 #if INCLUDE_G1GC
 #include "gc/g1/g1ThreadLocalData.hpp"
 #endif // INCLUDE_G1GC
+#if INCLUDE_ZGC
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 
 
 // -------------------- Compile::mach_constant_base_node -----------------------
@@ -2163,6 +2167,11 @@ void Compile::Optimize() {
 
 #endif
 
+#ifdef ASSERT
+  BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
+  bs->verify_gc_barriers(true);
+#endif
+
   ResourceMark rm;
   int          loop_opts_cnt;
 
@@ -2335,6 +2344,12 @@ void Compile::Optimize() {
     }
   }
 
+#if INCLUDE_ZGC
+  if (UseZGC) {
+    ZBarrierSetC2::find_dominating_barriers(igvn);
+  }
+#endif
+
   if (failing())  return;
 
   // Ensure that major progress is now clear
@@ -2361,6 +2376,7 @@ void Compile::Optimize() {
   {
     TracePhase tp("macroExpand", &timers[_t_macroExpand]);
     PhaseMacroExpand  mex(igvn);
+    print_method(PHASE_BEFORE_MACRO_EXPANSION, 2);
     if (mex.expand_macro_nodes()) {
       assert(failing(), "must bail out w/ explicit message");
       return;
@@ -2890,6 +2906,10 @@ void Compile::final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc) {
   case Op_LoadL_unaligned:
   case Op_LoadPLocked:
   case Op_LoadP:
+#if INCLUDE_ZGC
+  case Op_LoadBarrierSlowReg:
+  case Op_LoadBarrierWeakSlowReg:
+#endif
   case Op_LoadN:
   case Op_LoadRange:
   case Op_LoadS: {
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index b06f11e148a..50e3d2f4fe3 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -54,6 +54,7 @@ class CloneMap;
 class ConnectionGraph;
 class InlineTree;
 class Int_Array;
+class LoadBarrierNode;
 class Matcher;
 class MachConstantNode;
 class MachConstantBaseNode;
@@ -359,9 +360,6 @@ class Compile : public Phase {
   const char*           _stub_name;             // Name of stub or adapter being compiled, or NULL
   address               _stub_entry_point;      // Compile code entry for generated stub, or NULL
 
-  // For GC
-  void*                 _barrier_set_state;
-
   // Control of this compilation.
   int                   _num_loop_opts;         // Number of iterations for doing loop optimiztions
   int                   _max_inline_size;       // Max inline size for this compilation
@@ -410,6 +408,7 @@ class Compile : public Phase {
 
   // Compilation environment.
   Arena                 _comp_arena;            // Arena with lifetime equivalent to Compile
+  void*                 _barrier_set_state;     // Potential GC barrier state for Compile
   ciEnv*                _env;                   // CI interface
   DirectiveSet*         _directive;             // Compiler directive
   CompileLog*           _log;                   // from CompilerThread
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 6d5067e10e9..8635dbc67dc 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -38,9 +38,13 @@
 #include "opto/phaseX.hpp"
 #include "opto/movenode.hpp"
 #include "opto/rootnode.hpp"
+#include "utilities/macros.hpp"
 #if INCLUDE_G1GC
 #include "gc/g1/g1ThreadLocalData.hpp"
 #endif // INCLUDE_G1GC
+#if INCLUDE_ZGC
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 
 ConnectionGraph::ConnectionGraph(Compile * C, PhaseIterGVN *igvn) :
   _nodes(C->comp_arena(), C->unique(), C->unique(), NULL),
@@ -449,6 +453,10 @@ void ConnectionGraph::add_node_to_connection_graph(Node *n, Unique_Node_List *de
       break;
     }
     case Op_LoadP:
+#if INCLUDE_ZGC
+    case Op_LoadBarrierSlowReg:
+    case Op_LoadBarrierWeakSlowReg:
+#endif
     case Op_LoadN:
     case Op_LoadPLocked: {
       add_objload_to_connection_graph(n, delayed_worklist);
@@ -483,6 +491,13 @@ void ConnectionGraph::add_node_to_connection_graph(Node *n, Unique_Node_List *de
         add_local_var_and_edge(n, PointsToNode::NoEscape,
                                n->in(0), delayed_worklist);
       }
+#if INCLUDE_ZGC
+      else if (UseZGC) {
+        if (n->as_Proj()->_con == LoadBarrierNode::Oop && n->in(0)->is_LoadBarrier()) {
+          add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0)->in(LoadBarrierNode::Oop), delayed_worklist);
+        }
+      }
+#endif
       break;
     }
     case Op_Rethrow: // Exception object escapes
@@ -651,6 +666,10 @@ void ConnectionGraph::add_final_edges(Node *n) {
       break;
     }
     case Op_LoadP:
+#if INCLUDE_ZGC
+    case Op_LoadBarrierSlowReg:
+    case Op_LoadBarrierWeakSlowReg:
+#endif
     case Op_LoadN:
     case Op_LoadPLocked: {
       // Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because
@@ -690,6 +709,14 @@ void ConnectionGraph::add_final_edges(Node *n) {
         add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0), NULL);
         break;
       }
+#if INCLUDE_ZGC
+      else if (UseZGC) {
+        if (n->as_Proj()->_con == LoadBarrierNode::Oop && n->in(0)->is_LoadBarrier()) {
+          add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0)->in(LoadBarrierNode::Oop), NULL);
+          break;
+        }
+      }
+#endif
       ELSE_FAIL("Op_Proj");
     }
     case Op_Rethrow: // Exception object escapes
@@ -3163,7 +3190,8 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
               op == Op_CastP2X || op == Op_StoreCM ||
               op == Op_FastLock || op == Op_AryEq || op == Op_StrComp || op == Op_HasNegatives ||
               op == Op_StrCompressedCopy || op == Op_StrInflatedCopy ||
-              op == Op_StrEquals || op == Op_StrIndexOf || op == Op_StrIndexOfChar)) {
+              op == Op_StrEquals || op == Op_StrIndexOf || op == Op_StrIndexOfChar ||
+              BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(use))) {
           n->dump();
           use->dump();
           assert(false, "EA: missing allocation reference path");
diff --git a/src/hotspot/share/opto/idealKit.cpp b/src/hotspot/share/opto/idealKit.cpp
index 94d7ef4033c..d0c4bec2824 100644
--- a/src/hotspot/share/opto/idealKit.cpp
+++ b/src/hotspot/share/opto/idealKit.cpp
@@ -488,13 +488,13 @@ void IdealKit::do_memory_merge(Node* merging, Node* join) {
 
 //----------------------------- make_call  ----------------------------
 // Trivial runtime call
-void IdealKit::make_leaf_call(const TypeFunc *slow_call_type,
-                              address slow_call,
-                              const char *leaf_name,
-                              Node* parm0,
-                              Node* parm1,
-                              Node* parm2,
-                              Node* parm3) {
+Node* IdealKit::make_leaf_call(const TypeFunc *slow_call_type,
+                               address slow_call,
+                               const char *leaf_name,
+                               Node* parm0,
+                               Node* parm1,
+                               Node* parm2,
+                               Node* parm3) {
 
   // We only handle taking in RawMem and modifying RawMem
   const TypePtr* adr_type = TypeRawPtr::BOTTOM;
@@ -532,6 +532,12 @@ void IdealKit::make_leaf_call(const TypeFunc *slow_call_type,
 
   assert(C->alias_type(call->adr_type()) == C->alias_type(adr_type),
          "call node must be constructed correctly");
+  Node* res = NULL;
+  if (slow_call_type->range()->cnt() > TypeFunc::Parms) {
+    assert(slow_call_type->range()->cnt() == TypeFunc::Parms+1, "only one return value");
+    res = transform(new ProjNode(call, TypeFunc::Parms));
+  }
+  return res;
 }
 
 void IdealKit::make_leaf_call_no_fp(const TypeFunc *slow_call_type,
diff --git a/src/hotspot/share/opto/idealKit.hpp b/src/hotspot/share/opto/idealKit.hpp
index 20996c286d6..fc115f94a51 100644
--- a/src/hotspot/share/opto/idealKit.hpp
+++ b/src/hotspot/share/opto/idealKit.hpp
@@ -242,13 +242,13 @@ class IdealKit: public StackObj {
                 int adr_idx);
 
   // Trivial call
-  void make_leaf_call(const TypeFunc *slow_call_type,
-                      address slow_call,
-                      const char *leaf_name,
-                      Node* parm0,
-                      Node* parm1 = NULL,
-                      Node* parm2 = NULL,
-                      Node* parm3 = NULL);
+  Node* make_leaf_call(const TypeFunc *slow_call_type,
+                       address slow_call,
+                       const char *leaf_name,
+                       Node* parm0,
+                       Node* parm1 = NULL,
+                       Node* parm2 = NULL,
+                       Node* parm3 = NULL);
 
   void make_leaf_call_no_fp(const TypeFunc *slow_call_type,
                             address slow_call,
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 1e40085e48a..8e89cd3eaf5 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -169,6 +169,8 @@ void PhaseCFG::implicit_null_check(Block* block, Node *proj, Node *val, int allo
     case Op_LoadI:
     case Op_LoadL:
     case Op_LoadP:
+    case Op_LoadBarrierSlowReg:
+    case Op_LoadBarrierWeakSlowReg:
     case Op_LoadN:
     case Op_LoadS:
     case Op_LoadKlass:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 19e3b06cf0e..ee949c4ef8a 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -29,8 +29,9 @@
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compileLog.hpp"
-#include "memory/resourceArea.hpp"
+#include "gc/shared/barrierSet.hpp"
 #include "jfr/support/jfrIntrinsics.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "opto/addnode.hpp"
 #include "opto/arraycopynode.hpp"
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 7fbf0736f36..3998cdc7e9f 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -25,6 +25,8 @@
 #include "precompiled.hpp"
 #include "ci/ciMethodData.hpp"
 #include "compiler/compileLog.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/c2/barrierSetC2.hpp"
 #include "libadt/vectset.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
@@ -213,7 +215,8 @@ Node *PhaseIdealLoop::get_early_ctrl_for_expensive(Node *n, Node* earliest) {
         if (nb_ctl_proj > 1) {
           break;
         }
-        assert(parent_ctl->is_Start() || parent_ctl->is_MemBar() || parent_ctl->is_Call(), "unexpected node");
+        assert(parent_ctl->is_Start() || parent_ctl->is_MemBar() || parent_ctl->is_Call() ||
+               BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(parent_ctl), "unexpected node");
         assert(idom(ctl) == parent_ctl, "strange");
         next = idom(parent_ctl);
       }
@@ -2635,12 +2638,15 @@ bool PhaseIdealLoop::process_expensive_nodes() {
 //----------------------------build_and_optimize-------------------------------
 // Create a PhaseLoop.  Build the ideal Loop tree.  Map each Ideal Node to
 // its corresponding LoopNode.  If 'optimize' is true, do some loop cleanups.
-void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts) {
+void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts, bool last_round) {
   ResourceMark rm;
 
   int old_progress = C->major_progress();
   uint orig_worklist_size = _igvn._worklist.size();
 
+  // Reset major-progress flag for the driver's heuristics
+  C->clear_major_progress();
+
 #ifndef PRODUCT
   // Capture for later assert
   uint unique = C->unique();
@@ -2711,16 +2717,11 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts)
   if( !_verify_me && !_verify_only && _ltree_root->_child ) {
     C->print_method(PHASE_BEFORE_BEAUTIFY_LOOPS, 3);
     if( _ltree_root->_child->beautify_loops( this ) ) {
-      // IdealLoopTree::split_outer_loop may produce phi-nodes with a single in edge.
-      // Transform them away.
-      _igvn.optimize();
-
       // Re-build loop tree!
       _ltree_root->_child = NULL;
       _nodes.clear();
       reallocate_preorders();
       build_loop_tree();
-
       // Check for bailout, and return
       if (C->failing()) {
         return;
@@ -2732,9 +2733,6 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts)
     }
   }
 
-  // Reset major-progress flag for the driver's heuristics
-  C->clear_major_progress();
-
   // Build Dominators for elision of NULL checks & loop finding.
   // Since nodes do not have a slot for immediate dominator, make
   // a persistent side array for that info indexed on node->_idx.
@@ -2882,8 +2880,11 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts)
   // that require basic-block info (like cloning through Phi's)
   if( SplitIfBlocks && do_split_ifs ) {
     visited.Clear();
-    split_if_with_blocks( visited, nstack );
+    split_if_with_blocks( visited, nstack, last_round );
     NOT_PRODUCT( if( VerifyLoopOptimizations ) verify(); );
+    if (last_round) {
+      C->set_major_progress();
+    }
   }
 
   if (!C->major_progress() && do_expensive_nodes && process_expensive_nodes()) {
@@ -4136,6 +4137,8 @@ void PhaseIdealLoop::build_loop_late_post( Node *n ) {
     case Op_LoadL:
     case Op_LoadS:
     case Op_LoadP:
+    case Op_LoadBarrierSlowReg:
+    case Op_LoadBarrierWeakSlowReg:
     case Op_LoadN:
     case Op_LoadRange:
     case Op_LoadD_unaligned:
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 4907fc0e589..f17bb799eef 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -912,7 +912,7 @@ public:
   }
 
   // build the loop tree and perform any requested optimizations
-  void build_and_optimize(bool do_split_if, bool skip_loop_opts);
+  void build_and_optimize(bool do_split_if, bool skip_loop_opts, bool last_round = false);
 
   // Dominators for the sea of nodes
   void Dominators();
@@ -922,13 +922,13 @@ public:
   Node *dom_lca_internal( Node *n1, Node *n2 ) const;
 
   // Compute the Ideal Node to Loop mapping
-  PhaseIdealLoop( PhaseIterGVN &igvn, bool do_split_ifs, bool skip_loop_opts = false) :
+  PhaseIdealLoop( PhaseIterGVN &igvn, bool do_split_ifs, bool skip_loop_opts = false, bool last_round = false) :
     PhaseTransform(Ideal_Loop),
     _igvn(igvn),
     _dom_lca_tags(arena()), // Thread::resource_area
     _verify_me(NULL),
     _verify_only(false) {
-    build_and_optimize(do_split_ifs, skip_loop_opts);
+    build_and_optimize(do_split_ifs, skip_loop_opts, last_round);
   }
 
   // Verify that verify_me made the same decisions as a fresh run.
@@ -1227,9 +1227,9 @@ public:
 
   // Check for aggressive application of 'split-if' optimization,
   // using basic block level info.
-  void  split_if_with_blocks     ( VectorSet &visited, Node_Stack &nstack );
+  void  split_if_with_blocks     ( VectorSet &visited, Node_Stack &nstack, bool last_round );
   Node *split_if_with_blocks_pre ( Node *n );
-  void  split_if_with_blocks_post( Node *n );
+  void  split_if_with_blocks_post( Node *n, bool last_round );
   Node *has_local_phi_input( Node *n );
   // Mark an IfNode as being dominated by a prior test,
   // without actually altering the CFG (and hence IDOM info).
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 7d70dad65af..49a4c31e60a 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -40,6 +40,10 @@
 #include "opto/opaquenode.hpp"
 #include "opto/rootnode.hpp"
 #include "opto/subnode.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 
 //=============================================================================
 //------------------------------split_thru_phi---------------------------------
@@ -1126,11 +1130,11 @@ bool PhaseIdealLoop::can_split_if(Node *n_ctrl) {
 // Do the real work in a non-recursive function.  CFG hackery wants to be
 // in the post-order, so it can dirty the I-DOM info and not use the dirtied
 // info.
-void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
+void PhaseIdealLoop::split_if_with_blocks_post(Node *n, bool last_round) {
 
   // Cloning Cmp through Phi's involves the split-if transform.
   // FastLock is not used by an If
-  if (n->is_Cmp() && !n->is_FastLock()) {
+  if (n->is_Cmp() && !n->is_FastLock() && !last_round) {
     Node *n_ctrl = get_ctrl(n);
     // Determine if the Node has inputs from some local Phi.
     // Returns the block to clone thru.
@@ -1377,12 +1381,18 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
       get_loop(get_ctrl(n)) == get_loop(get_ctrl(n->in(1))) ) {
     _igvn.replace_node( n, n->in(1) );
   }
+
+#if INCLUDE_ZGC
+  if (UseZGC) {
+    ZBarrierSetC2::loop_optimize_gc_barrier(this, n, last_round);
+  }
+#endif
 }
 
 //------------------------------split_if_with_blocks---------------------------
 // Check for aggressive application of 'split-if' optimization,
 // using basic block level info.
-void PhaseIdealLoop::split_if_with_blocks( VectorSet &visited, Node_Stack &nstack ) {
+void PhaseIdealLoop::split_if_with_blocks(VectorSet &visited, Node_Stack &nstack, bool last_round) {
   Node *n = C->root();
   visited.set(n->_idx); // first, mark node as visited
   // Do pre-visit work for root
@@ -1407,7 +1417,7 @@ void PhaseIdealLoop::split_if_with_blocks( VectorSet &visited, Node_Stack &nstac
       // All of n's children have been processed, complete post-processing.
       if (cnt != 0 && !n->is_Con()) {
         assert(has_node(n), "no dead nodes");
-        split_if_with_blocks_post( n );
+        split_if_with_blocks_post( n, last_round );
       }
       if (nstack.is_empty()) {
         // Finished all nodes on stack.
@@ -1743,6 +1753,23 @@ void PhaseIdealLoop::clone_loop_handle_data_uses(Node* old, Node_List &old_new,
   }
 }
 
+static void clone_outer_loop_helper(Node* n, const IdealLoopTree *loop, const IdealLoopTree* outer_loop,
+                                    const Node_List &old_new, Unique_Node_List& wq, PhaseIdealLoop* phase,
+                                    bool check_old_new) {
+  for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++) {
+    Node* u = n->fast_out(j);
+    assert(check_old_new || old_new[u->_idx] == NULL, "shouldn't have been cloned");
+    if (!u->is_CFG() && (!check_old_new || old_new[u->_idx] == NULL)) {
+      Node* c = phase->get_ctrl(u);
+      IdealLoopTree* u_loop = phase->get_loop(c);
+      assert(!loop->is_member(u_loop), "can be in outer loop or out of both loops only");
+      if (outer_loop->is_member(u_loop)) {
+        wq.push(u);
+      }
+    }
+  }
+}
+
 void PhaseIdealLoop::clone_outer_loop(LoopNode* head, CloneLoopMode mode, IdealLoopTree *loop,
                                       IdealLoopTree* outer_loop, int dd, Node_List &old_new,
                                       Node_List& extra_data_nodes) {
@@ -1847,6 +1874,22 @@ void PhaseIdealLoop::clone_outer_loop(LoopNode* head, CloneLoopMode mode, IdealL
       _igvn.register_new_node_with_optimizer(new_sfpt);
       _igvn.register_new_node_with_optimizer(new_cle_out);
     }
+    // Some other transformation may have pessimistically assign some
+    // data nodes to the outer loop. Set their control so they are out
+    // of the outer loop.
+    ResourceMark rm;
+    Unique_Node_List wq;
+    for (uint i = 0; i < extra_data_nodes.size(); i++) {
+      Node* old = extra_data_nodes.at(i);
+      clone_outer_loop_helper(old, loop, outer_loop, old_new, wq, this, true);
+    }
+    Node* new_ctrl = cl->outer_loop_exit();
+    assert(get_loop(new_ctrl) != outer_loop, "must be out of the loop nest");
+    for (uint i = 0; i < wq.size(); i++) {
+      Node* n = wq.at(i);
+      set_ctrl(n, new_ctrl);
+      clone_outer_loop_helper(n, loop, outer_loop, old_new, wq, this, false);
+    }
   } else {
     Node *newhead = old_new[loop->_head->_idx];
     set_idom(newhead, newhead->in(LoopNode::EntryControl), dd);
@@ -1947,7 +1990,7 @@ void PhaseIdealLoop::clone_loop( IdealLoopTree *loop, Node_List &old_new, int dd
   }
 
   ResourceArea *area = Thread::current()->resource_area();
-  Node_List extra_data_nodes(area);
+  Node_List extra_data_nodes(area); // data nodes in the outer strip mined loop
   clone_outer_loop(head, mode, loop, outer_loop, dd, old_new, extra_data_nodes);
 
   // Step 3: Now fix control uses.  Loop varying control uses have already
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 8ae3282fc5b..e98e0232fb7 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -2574,7 +2574,9 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
         assert(n->Opcode() == Op_LoopLimit ||
                n->Opcode() == Op_Opaque1   ||
                n->Opcode() == Op_Opaque2   ||
-               n->Opcode() == Op_Opaque3, "unknown node type in macro list");
+               n->Opcode() == Op_Opaque3   ||
+               BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(n),
+               "unknown node type in macro list");
       }
       assert(success == (C->macro_count() < old_macro_count), "elimination reduces macro count");
       progress = progress || success;
@@ -2656,7 +2658,7 @@ bool PhaseMacroExpand::expand_macro_nodes() {
   while (macro_idx >= 0) {
     Node * n = C->macro_node(macro_idx);
     assert(n->is_macro(), "only macro nodes expected here");
-    if (_igvn.type(n) == Type::TOP || n->in(0)->is_top() ) {
+    if (_igvn.type(n) == Type::TOP || (n->in(0) != NULL && n->in(0)->is_top())) {
       // node is unreachable, so don't try to expand it
       C->remove_macro_node(n);
     } else if (n->is_ArrayCopy()){
@@ -2674,7 +2676,7 @@ bool PhaseMacroExpand::expand_macro_nodes() {
     int macro_count = C->macro_count();
     Node * n = C->macro_node(macro_count-1);
     assert(n->is_macro(), "only macro nodes expected here");
-    if (_igvn.type(n) == Type::TOP || n->in(0)->is_top() ) {
+    if (_igvn.type(n) == Type::TOP || (n->in(0) != NULL && n->in(0)->is_top())) {
       // node is unreachable, so don't try to expand it
       C->remove_macro_node(n);
       continue;
diff --git a/src/hotspot/share/opto/macroArrayCopy.cpp b/src/hotspot/share/opto/macroArrayCopy.cpp
index aa609620b9e..4348094d8ad 100644
--- a/src/hotspot/share/opto/macroArrayCopy.cpp
+++ b/src/hotspot/share/opto/macroArrayCopy.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/barrierSet.hpp"
 #include "opto/arraycopynode.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "opto/convertnode.hpp"
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index b304bc3b3fa..8b61fed4ccb 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -41,6 +41,9 @@
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/align.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/zBarrierSetRuntime.hpp"
+#endif // INCLUDE_ZGC
 
 OptoReg::Name OptoReg::c_frame_pointer;
 
@@ -2062,6 +2065,7 @@ void Matcher::find_shared( Node *n ) {
       mstack.set_state(Post_Visit);
       set_visited(n);   // Flag as visited now
       bool mem_op = false;
+      int mem_addr_idx = MemNode::Address;
 
       switch( nop ) {  // Handle some opcodes special
       case Op_Phi:             // Treat Phis as shared roots
@@ -2150,6 +2154,17 @@ void Matcher::find_shared( Node *n ) {
       case Op_SafePoint:
         mem_op = true;
         break;
+#if INCLUDE_ZGC
+      case Op_CallLeaf:
+        if (UseZGC) {
+          if (n->as_Call()->entry_point() == ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr() ||
+              n->as_Call()->entry_point() == ZBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded_addr()) {
+            mem_op = true;
+            mem_addr_idx = TypeFunc::Parms+1;
+          }
+          break;
+        }
+#endif
       default:
         if( n->is_Store() ) {
           // Do match stores, despite no ideal reg
@@ -2199,7 +2214,7 @@ void Matcher::find_shared( Node *n ) {
 #endif
 
         // Clone addressing expressions as they are "free" in memory access instructions
-        if (mem_op && i == MemNode::Address && mop == Op_AddP &&
+        if (mem_op && i == mem_addr_idx && mop == Op_AddP &&
             // When there are other uses besides address expressions
             // put it on stack and mark as shared.
             !is_visited(m)) {
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 9a51d8ccc01..eb9cfe63042 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -44,7 +44,11 @@
 #include "opto/regmask.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 
 // Portions of code courtesy of Clifford Click
 
@@ -891,6 +895,14 @@ static bool skip_through_membars(Compile::AliasType* atp, const TypeInstPtr* tp,
 // a load node that reads from the source array so we may be able to
 // optimize out the ArrayCopy node later.
 Node* LoadNode::can_see_arraycopy_value(Node* st, PhaseGVN* phase) const {
+#if INCLUDE_ZGC
+  if (UseZGC) {
+    if (bottom_type()->make_oopptr() != NULL) {
+      return NULL;
+    }
+  }
+#endif
+
   Node* ld_adr = in(MemNode::Address);
   intptr_t ld_off = 0;
   AllocateNode* ld_alloc = AllocateNode::Ideal_allocation(ld_adr, phase, ld_off);
@@ -1574,7 +1586,7 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   // Is there a dominating load that loads the same value?  Leave
   // anything that is not a load of a field/array element (like
   // barriers etc.) alone
-  if (in(0) != NULL && adr_type() != TypeRawPtr::BOTTOM && can_reshape) {
+  if (in(0) != NULL && !adr_type()->isa_rawptr() && can_reshape) {
     for (DUIterator_Fast imax, i = mem->fast_outs(imax); i < imax; i++) {
       Node *use = mem->fast_out(i);
       if (use != this &&
@@ -2968,6 +2980,16 @@ Node *MemBarNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     return NULL;
   }
 
+#if INCLUDE_ZGC
+  if (UseZGC) {
+    if (req() == (Precedent+1) && in(MemBarNode::Precedent)->in(0) != NULL && in(MemBarNode::Precedent)->in(0)->is_LoadBarrier()) {
+      Node* load_node = in(MemBarNode::Precedent)->in(0)->in(LoadBarrierNode::Oop);
+      set_req(MemBarNode::Precedent, load_node);
+      return this;
+    }
+  }
+#endif
+
   bool progress = false;
   // Eliminate volatile MemBars for scalar replaced objects.
   if (can_reshape && req() == (Precedent+1)) {
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 32e8118843e..1252f50ce5a 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1130,7 +1130,7 @@ bool Node::has_special_unique_user() const {
   if (this->is_Store()) {
     // Condition for back-to-back stores folding.
     return n->Opcode() == op && n->in(MemNode::Memory) == this;
-  } else if (this->is_Load() || this->is_DecodeN()) {
+  } else if (this->is_Load() || this->is_DecodeN() || this->is_Phi()) {
     // Condition for removing an unused LoadNode or DecodeNNode from the MemBarAcquire precedence input
     return n->Opcode() == Op_MemBarAcquire;
   } else if (op == Op_AddL) {
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 82ca71b299c..3eb8bcada1d 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -80,6 +80,9 @@ class JVMState;
 class JumpNode;
 class JumpProjNode;
 class LoadNode;
+class LoadBarrierNode;
+class LoadBarrierSlowRegNode;
+class LoadBarrierWeakSlowRegNode;
 class LoadStoreNode;
 class LockNode;
 class LoopNode;
@@ -634,6 +637,7 @@ public:
       DEFINE_CLASS_ID(MemBar,      Multi, 3)
         DEFINE_CLASS_ID(Initialize,       MemBar, 0)
         DEFINE_CLASS_ID(MemBarStoreStore, MemBar, 1)
+      DEFINE_CLASS_ID(LoadBarrier, Multi, 4)
 
     DEFINE_CLASS_ID(Mach,  Node, 1)
       DEFINE_CLASS_ID(MachReturn, Mach, 0)
@@ -680,6 +684,8 @@ public:
     DEFINE_CLASS_ID(Mem,   Node, 4)
       DEFINE_CLASS_ID(Load,  Mem, 0)
         DEFINE_CLASS_ID(LoadVector,  Load, 0)
+          DEFINE_CLASS_ID(LoadBarrierSlowReg, Load, 1)
+          DEFINE_CLASS_ID(LoadBarrierWeakSlowReg, Load, 2)
       DEFINE_CLASS_ID(Store, Mem, 1)
         DEFINE_CLASS_ID(StoreVector, Store, 0)
       DEFINE_CLASS_ID(LoadStore, Mem, 2)
@@ -819,6 +825,9 @@ public:
   DEFINE_CLASS_QUERY(JumpProj)
   DEFINE_CLASS_QUERY(Load)
   DEFINE_CLASS_QUERY(LoadStore)
+  DEFINE_CLASS_QUERY(LoadBarrier)
+  DEFINE_CLASS_QUERY(LoadBarrierSlowReg)
+  DEFINE_CLASS_QUERY(LoadBarrierWeakSlowReg)
   DEFINE_CLASS_QUERY(Lock)
   DEFINE_CLASS_QUERY(Loop)
   DEFINE_CLASS_QUERY(Mach)
diff --git a/src/hotspot/share/opto/opcodes.cpp b/src/hotspot/share/opto/opcodes.cpp
index 9c0aa002613..e31e8d8477c 100644
--- a/src/hotspot/share/opto/opcodes.cpp
+++ b/src/hotspot/share/opto/opcodes.cpp
@@ -28,6 +28,7 @@
 // Build a table of class names as strings.  Used both for debugging printouts
 // and in the ADL machine descriptions.
 #define macro(x) #x,
+#define optionalmacro(x) macro(x)
 const char *NodeClassNames[] = {
   "Node",
   "Set",
@@ -48,3 +49,4 @@ const char *NodeClassNames[] = {
   "_last_class_name",
 };
 #undef macro
+#undef optionalmacro
diff --git a/src/hotspot/share/opto/opcodes.hpp b/src/hotspot/share/opto/opcodes.hpp
index 83ac9df4a76..ae3d61ce030 100644
--- a/src/hotspot/share/opto/opcodes.hpp
+++ b/src/hotspot/share/opto/opcodes.hpp
@@ -27,6 +27,7 @@
 
 // Build a big enum of class names to give them dense integer indices
 #define macro(x) Op_##x,
+#define optionalmacro(x) macro(x)
 enum Opcodes {
   Op_Node = 0,
   macro(Set)                    // Instruction selection match rule
@@ -47,6 +48,7 @@ enum Opcodes {
   _last_opcode
 };
 #undef macro
+#undef optionalmacro
 
 // Table of names, indexed by Opcode
 extern const char *NodeClassNames[];
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index 4896b7fa029..f0eac0b0bde 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -52,6 +52,7 @@ enum CompilerPhaseType {
   PHASE_MATCHING,
   PHASE_INCREMENTAL_INLINE,
   PHASE_INCREMENTAL_BOXING_INLINE,
+  PHASE_BEFORE_MACRO_EXPANSION,
   PHASE_END,
   PHASE_FAILURE,
 
@@ -88,6 +89,7 @@ class CompilerPhaseTypeHelper {
       case PHASE_MATCHING:                   return "After matching";
       case PHASE_INCREMENTAL_INLINE:         return "Incremental Inline";
       case PHASE_INCREMENTAL_BOXING_INLINE:  return "Incremental Boxing Inline";
+      case PHASE_BEFORE_MACRO_EXPANSION:     return "Before macro expansion";
       case PHASE_END:                        return "End";
       case PHASE_FAILURE:                    return "Failure";
       default:
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index eb5b6a22760..884e2725f37 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -393,9 +393,9 @@ JRT_ENTRY(void, OptoRuntime::multianewarrayN_C(Klass* elem_type, arrayOopDesc* d
   ResourceMark rm;
   jint len = dims->length();
   assert(len > 0, "Dimensions array should contain data");
-  jint *j_dims = typeArrayOop(dims)->int_at_addr(0);
   jint *c_dims = NEW_RESOURCE_ARRAY(jint, len);
-  Copy::conjoint_jints_atomic(j_dims, c_dims, len);
+  ArrayAccess<>::arraycopy_to_native<>(dims, typeArrayOopDesc::element_offset<jint>(0),
+                                       c_dims, len);
 
   Handle holder(THREAD, elem_type->klass_holder()); // keep the klass alive
   oop obj = ArrayKlass::cast(elem_type)->multi_allocate(len, c_dims, THREAD);
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index e0bf8410a0d..593baf97255 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -252,6 +252,8 @@ void VectorNode::vector_operands(Node* n, uint* start, uint* end) {
   case Op_LoadI:   case Op_LoadL:
   case Op_LoadF:   case Op_LoadD:
   case Op_LoadP:   case Op_LoadN:
+  case Op_LoadBarrierSlowReg:
+  case Op_LoadBarrierWeakSlowReg:
     *start = 0;
     *end   = 0; // no vector operands
     break;
diff --git a/src/hotspot/share/precompiled/precompiled.hpp b/src/hotspot/share/precompiled/precompiled.hpp
index 605f30ff3f1..a0a99028b95 100644
--- a/src/hotspot/share/precompiled/precompiled.hpp
+++ b/src/hotspot/share/precompiled/precompiled.hpp
@@ -187,7 +187,7 @@
 # include "runtime/mutexLocker.hpp"
 # include "runtime/objectMonitor.hpp"
 # include "runtime/orderAccess.hpp"
-# include "runtime/orderAccess.inline.hpp"
+# include "runtime/orderAccess.hpp"
 # include "runtime/os.hpp"
 # include "runtime/osThread.hpp"
 # include "runtime/perfData.hpp"
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index de4c73bbed9..1c8edde245f 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -73,7 +73,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/reflection.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -2466,7 +2466,8 @@ JNI_QUICK_ENTRY(const jchar*, jni_GetStringChars(
     if (buf != NULL) {
       if (s_len > 0) {
         if (!is_latin1) {
-          memcpy(buf, s_value->char_at_addr(0), sizeof(jchar)*s_len);
+          ArrayAccess<>::arraycopy_to_native(s_value, (size_t) typeArrayOopDesc::element_offset<jchar>(0),
+                                             buf, s_len);
         } else {
           for (int i = 0; i < s_len; i++) {
             buf[i] = ((jchar) s_value->byte_at(i)) & 0xff;
@@ -2722,7 +2723,8 @@ JNI_QUICK_ENTRY(ElementType*, \
     result = NEW_C_HEAP_ARRAY_RETURN_NULL(ElementType, len, mtInternal); \
     if (result != NULL) {                                                \
       /* copy the array to the c chunk */                                \
-      memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len);      \
+      ArrayAccess<>::arraycopy_to_native(a, typeArrayOopDesc::element_offset<ElementType>(0), \
+                                         result, len);                   \
       if (isCopy) {                                                      \
         *isCopy = JNI_TRUE;                                              \
       }                                                                  \
@@ -2771,7 +2773,7 @@ JNI_QUICK_ENTRY(void, \
   int len = a->length(); \
   if (len != 0) {   /* Empty array:  nothing to free or copy. */  \
     if ((mode == 0) || (mode == JNI_COMMIT)) { \
-      memcpy(a->Tag##_at_addr(0), buf, sizeof(ElementType)*len); \
+      ArrayAccess<>::arraycopy_from_native(buf, a, typeArrayOopDesc::element_offset<ElementType>(0), len); \
     } \
     if ((mode == 0) || (mode == JNI_ABORT)) { \
       FreeHeap(buf); \
@@ -2822,10 +2824,7 @@ jni_Get##Result##ArrayRegion(JNIEnv *env, ElementType##Array array, jsize start,
     THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \
   } else { \
     if (len > 0) { \
-      int sc = TypeArrayKlass::cast(src->klass())->log2_element_size(); \
-      memcpy((u_char*) buf, \
-             (u_char*) src->Tag##_at_addr(start), \
-             len << sc);                          \
+      ArrayAccess<>::arraycopy_to_native(src, typeArrayOopDesc::element_offset<ElementType>(start), buf, len); \
     } \
   } \
 JNI_END
@@ -2872,10 +2871,7 @@ jni_Set##Result##ArrayRegion(JNIEnv *env, ElementType##Array array, jsize start,
     THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \
   } else { \
     if (len > 0) { \
-      int sc = TypeArrayKlass::cast(dst->klass())->log2_element_size(); \
-      memcpy((u_char*) dst->Tag##_at_addr(start), \
-             (u_char*) buf, \
-             len << sc);    \
+      ArrayAccess<>::arraycopy_from_native(buf, dst, typeArrayOopDesc::element_offset<ElementType>(start), len); \
     } \
   } \
 JNI_END
@@ -3111,7 +3107,8 @@ JNI_ENTRY(void, jni_GetStringRegion(JNIEnv *env, jstring string, jsize start, js
       typeArrayOop s_value = java_lang_String::value(s);
       bool is_latin1 = java_lang_String::is_latin1(s);
       if (!is_latin1) {
-        memcpy(buf, s_value->char_at_addr(start), sizeof(jchar)*len);
+        ArrayAccess<>::arraycopy_to_native(s_value, typeArrayOopDesc::element_offset<jchar>(start),
+                                           buf, len);
       } else {
         for (int i = 0; i < len; i++) {
           buf[i] = ((jchar) s_value->byte_at(i + start)) & 0xff;
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index d526ee70675..1b3c2612a01 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -64,7 +64,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/perfData.hpp"
 #include "runtime/reflection.hpp"
@@ -1115,7 +1115,7 @@ JVM_ENTRY(jobjectArray, JVM_GetClassSigners(JNIEnv *env, jclass cls))
     return NULL;
   }
 
-  objArrayOop signers = java_lang_Class::signers(JNIHandles::resolve_non_null(cls));
+  objArrayHandle signers(THREAD, java_lang_Class::signers(JNIHandles::resolve_non_null(cls)));
 
   // If there are no signers set in the class, or if the class
   // is an array, return NULL.
diff --git a/src/hotspot/share/prims/jvmti.xml b/src/hotspot/share/prims/jvmti.xml
index 1927a4f9e6b..cd13b8de53a 100644
--- a/src/hotspot/share/prims/jvmti.xml
+++ b/src/hotspot/share/prims/jvmti.xml
@@ -1799,10 +1799,10 @@ jvmtiEnv *jvmti;
     <function id="StopThread" num="7">
       <synopsis>Stop Thread</synopsis>
       <description>
-	Send the specified asynchronous exception to the specified thread
-	(similar to <code>java.lang.Thread.stop</code>).
+	Send the specified asynchronous exception to the specified thread.
 	Normally, this function is used to kill the specified thread with an
-	instance of the exception <code>ThreadDeath</code>.
+	instance of the exception <code>ThreadDeath</code>, similar to
+        <code>java.lang.Thread.stop</code>.
       </description>
       <origin>jvmdi</origin>
       <capabilities>
diff --git a/src/hotspot/share/prims/jvmtiEnter.xsl b/src/hotspot/share/prims/jvmtiEnter.xsl
index 50bbfba54aa..09c5de61523 100644
--- a/src/hotspot/share/prims/jvmtiEnter.xsl
+++ b/src/hotspot/share/prims/jvmtiEnter.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 
 <!--
- Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 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
@@ -571,7 +571,7 @@ static jvmtiError JNICALL
     transition = false;
   } else {
     this_thread = Thread::current_or_null();
-    transition = ((this_thread != NULL) &amp;&amp; !this_thread->is_VM_thread() &amp;&amp; !this_thread->is_ConcurrentGC_thread());
+    transition = ((this_thread != NULL) &amp;&amp; !this_thread->is_Named_thread());
   }
   if (transition) {</xsl:text>
 	</xsl:otherwise>
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 0e75a8af22d..cd55c690bd4 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -3313,7 +3313,7 @@ JvmtiEnv::RawMonitorEnter(JvmtiRawMonitor * rmonitor) {
 #endif /* PROPER_TRANSITIONS */
       assert(r == ObjectMonitor::OM_OK, "raw_enter should have worked");
     } else {
-      if (thread->is_VM_thread() || thread->is_ConcurrentGC_thread()) {
+      if (thread->is_Named_thread()) {
         r = rmonitor->raw_enter(thread);
       } else {
         ShouldNotReachHere();
@@ -3351,7 +3351,7 @@ JvmtiEnv::RawMonitorExit(JvmtiRawMonitor * rmonitor) {
 #endif /* PROPER_TRANSITIONS */
       r = rmonitor->raw_exit(current_thread);
     } else {
-      if (thread->is_VM_thread() || thread->is_ConcurrentGC_thread()) {
+      if (thread->is_Named_thread()) {
         r = rmonitor->raw_exit(thread);
       } else {
         ShouldNotReachHere();
@@ -3408,7 +3408,7 @@ JvmtiEnv::RawMonitorWait(JvmtiRawMonitor * rmonitor, jlong millis) {
 
 #endif /* PROPER_TRANSITIONS */
   } else {
-    if (thread->is_VM_thread() || thread->is_ConcurrentGC_thread()) {
+    if (thread->is_Named_thread()) {
       r = rmonitor->raw_wait(millis, true, thread);
     } else {
       ShouldNotReachHere();
@@ -3442,7 +3442,7 @@ JvmtiEnv::RawMonitorNotify(JvmtiRawMonitor * rmonitor) {
     ThreadInVMfromUnknown __tiv;
     r = rmonitor->raw_notify(current_thread);
   } else {
-    if (thread->is_VM_thread() || thread->is_ConcurrentGC_thread()) {
+    if (thread->is_Named_thread()) {
       r = rmonitor->raw_notify(thread);
     } else {
       ShouldNotReachHere();
@@ -3472,7 +3472,7 @@ JvmtiEnv::RawMonitorNotifyAll(JvmtiRawMonitor * rmonitor) {
     ThreadInVMfromUnknown __tiv;
     r = rmonitor->raw_notifyAll(current_thread);
   } else {
-    if (thread->is_VM_thread() || thread->is_ConcurrentGC_thread()) {
+    if (thread->is_Named_thread()) {
       r = rmonitor->raw_notifyAll(thread);
     } else {
       ShouldNotReachHere();
diff --git a/src/hotspot/share/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp
index 3c919c61106..c92e3fb64b9 100644
--- a/src/hotspot/share/prims/jvmtiEventController.cpp
+++ b/src/hotspot/share/prims/jvmtiEventController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -508,14 +508,19 @@ JvmtiEventControllerPrivate::recompute_thread_enabled(JvmtiThreadState *state) {
 
   julong was_any_env_enabled = state->thread_event_enable()->_event_enabled.get_bits();
   julong any_env_enabled = 0;
+  // JVMTI_EVENT_FRAME_POP can be disabled (in the case FRAME_POP_BIT is not set),
+  // but we need to set interp_only if some JvmtiEnvThreadState has frame pop set
+  // to clear the request
+  bool has_frame_pops = false;
 
   {
-    // This iteration will include JvmtiEnvThreadStates whoses environments
+    // This iteration will include JvmtiEnvThreadStates whose environments
     // have been disposed.  These JvmtiEnvThreadStates must not be filtered
     // as recompute must be called on them to disable their events,
     JvmtiEnvThreadStateIterator it(state);
     for (JvmtiEnvThreadState* ets = it.first(); ets != NULL; ets = it.next(ets)) {
       any_env_enabled |= recompute_env_thread_enabled(ets, state);
+      has_frame_pops |= ets->has_frame_pops();
     }
   }
 
@@ -523,23 +528,23 @@ JvmtiEventControllerPrivate::recompute_thread_enabled(JvmtiThreadState *state) {
     // mark if event is truly enabled on this thread in any environment
     state->thread_event_enable()->_event_enabled.set_bits(any_env_enabled);
 
-    // compute interp_only mode
-    bool should_be_interp = (any_env_enabled & INTERP_EVENT_BITS) != 0;
-    bool is_now_interp = state->is_interp_only_mode();
-
-    if (should_be_interp != is_now_interp) {
-      if (should_be_interp) {
-        enter_interp_only_mode(state);
-      } else {
-        leave_interp_only_mode(state);
-      }
-    }
-
     // update the JavaThread cached value for thread-specific should_post_on_exceptions value
     bool should_post_on_exceptions = (any_env_enabled & SHOULD_POST_ON_EXCEPTIONS_BITS) != 0;
     state->set_should_post_on_exceptions(should_post_on_exceptions);
   }
 
+  // compute interp_only mode
+  bool should_be_interp = (any_env_enabled & INTERP_EVENT_BITS) != 0 || has_frame_pops;
+  bool is_now_interp = state->is_interp_only_mode();
+
+  if (should_be_interp != is_now_interp) {
+    if (should_be_interp) {
+      enter_interp_only_mode(state);
+    } else {
+      leave_interp_only_mode(state);
+    }
+  }
+
   return any_env_enabled;
 }
 
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index d2fcd49c4cc..db1ba197ffd 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -1576,9 +1576,9 @@ void JvmtiExport::post_method_exit(JavaThread *thread, Method* method, frame cur
     }
   }
 
-  if (state->is_enabled(JVMTI_EVENT_FRAME_POP)) {
-    JvmtiEnvThreadStateIterator it(state);
-    for (JvmtiEnvThreadState* ets = it.first(); ets != NULL; ets = it.next(ets)) {
+  JvmtiEnvThreadStateIterator it(state);
+  for (JvmtiEnvThreadState* ets = it.first(); ets != NULL; ets = it.next(ets)) {
+    if (ets->has_frame_pops()) {
       int cur_frame_number = state->cur_stack_depth();
 
       if (ets->is_frame_pop(cur_frame_number)) {
diff --git a/src/hotspot/share/prims/jvmtiRawMonitor.cpp b/src/hotspot/share/prims/jvmtiRawMonitor.cpp
index 689ecbfa998..b9de34b9ba1 100644
--- a/src/hotspot/share/prims/jvmtiRawMonitor.cpp
+++ b/src/hotspot/share/prims/jvmtiRawMonitor.cpp
@@ -27,7 +27,7 @@
 #include "prims/jvmtiRawMonitor.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 
 GrowableArray<JvmtiRawMonitor*> *JvmtiPendingMonitors::_monitors = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<JvmtiRawMonitor*>(1,true);
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index c519e1874ee..488d3b55304 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -59,6 +59,9 @@
 #include "runtime/vmThread.hpp"
 #include "runtime/vm_operations.hpp"
 #include "utilities/macros.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/zGlobals.hpp"
+#endif
 
 // JvmtiTagHashmapEntry
 //
@@ -178,6 +181,8 @@ class JvmtiTagHashmap : public CHeapObj<mtInternal> {
 
   // hash a given key (oop) with the specified size
   static unsigned int hash(oop key, int size) {
+    ZGC_ONLY(assert(ZAddressMetadataShift >= sizeof(unsigned int) * BitsPerByte, "cast removes the metadata bits");)
+
     // shift right to get better distribution (as these bits will be zero
     // with aligned addresses)
     unsigned int addr = (unsigned int)(cast_from_oop<intptr_t>(key));
@@ -2577,7 +2582,7 @@ class SimpleRootsClosure : public OopClosure {
 
     jvmtiHeapReferenceKind kind = root_kind();
     if (kind == JVMTI_HEAP_REFERENCE_SYSTEM_CLASS) {
-      // SystemDictionary::always_strong_oops_do reports the application
+      // SystemDictionary::oops_do reports the application
       // class loader as a root. We want this root to be reported as
       // a root kind of "OTHER" rather than "SYSTEM_CLASS".
       if (!o->is_instance() || !InstanceKlass::cast(o->klass())->is_mirror_instance_klass()) {
@@ -3003,7 +3008,7 @@ inline bool VM_HeapWalkOperation::collect_simple_roots() {
 
   // Preloaded classes and loader from the system dictionary
   blk.set_kind(JVMTI_HEAP_REFERENCE_SYSTEM_CLASS);
-  SystemDictionary::always_strong_oops_do(&blk);
+  SystemDictionary::oops_do(&blk);
   ClassLoaderDataGraph::always_strong_oops_do(&blk, false);
   if (blk.stopped()) {
     return false;
diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
index 9f464c60d56..106b3cff8ff 100644
--- a/src/hotspot/share/prims/unsafe.cpp
+++ b/src/hotspot/share/prims/unsafe.cpp
@@ -40,7 +40,7 @@
 #include "runtime/globals.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/reflection.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.hpp"
@@ -762,8 +762,8 @@ Unsafe_DefineAnonymousClass_impl(JNIEnv *env,
   // caller responsible to free it:
   *temp_alloc = class_bytes;
 
-  jbyte* array_base = typeArrayOop(JNIHandles::resolve_non_null(data))->byte_at_addr(0);
-  Copy::conjoint_jbytes(array_base, class_bytes, length);
+  ArrayAccess<>::arraycopy_to_native(arrayOop(JNIHandles::resolve_non_null(data)), typeArrayOopDesc::element_offset<jbyte>(0),
+                                     reinterpret_cast<jbyte*>(class_bytes), length);
 
   objArrayHandle cp_patches_h;
   if (cp_patches_jh != NULL) {
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index db99a50366c..12e62d9a824 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -98,6 +98,7 @@
 #define CHECK_JNI_EXCEPTION_(env, value)                               \
   do {                                                                 \
     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
+    THREAD->clear_pending_jni_exception_check();                       \
     if (HAS_PENDING_EXCEPTION) {                                       \
       return(value);                                                   \
     }                                                                  \
@@ -106,6 +107,7 @@
 #define CHECK_JNI_EXCEPTION(env)                                       \
   do {                                                                 \
     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
+    THREAD->clear_pending_jni_exception_check();                       \
     if (HAS_PENDING_EXCEPTION) {                                       \
       return;                                                          \
     }                                                                  \
@@ -345,7 +347,12 @@ WB_ENTRY(jboolean, WB_isObjectInOldGen(JNIEnv* env, jobject o, jobject obj))
     ParallelScavengeHeap* psh = ParallelScavengeHeap::heap();
     return !psh->is_in_young(p);
   }
-#endif // INCLUDE_PARALLELGC
+#endif
+#if INCLUDE_ZGC
+  if (UseZGC) {
+    return Universe::heap()->is_in(p);
+  }
+#endif
   GenCollectedHeap* gch = GenCollectedHeap::heap();
   return !gch->is_in_young(p);
 WB_END
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 4bd35d5f6cb..3af2ad7091e 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -553,6 +553,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "CheckEndorsedAndExtDirs",       JDK_Version::jdk(10),     JDK_Version::jdk(11), JDK_Version::jdk(12) },
   { "DeferThrSuspendLoopCount",      JDK_Version::jdk(10),     JDK_Version::jdk(11), JDK_Version::jdk(12) },
   { "DeferPollingPageLoopCount",     JDK_Version::jdk(10),     JDK_Version::jdk(11), JDK_Version::jdk(12) },
+  { "TraceScavenge",                 JDK_Version::undefined(), JDK_Version::jdk(11), JDK_Version::jdk(12) },
   { "PermSize",                      JDK_Version::undefined(), JDK_Version::jdk(8),  JDK_Version::undefined() },
   { "MaxPermSize",                   JDK_Version::undefined(), JDK_Version::jdk(8),  JDK_Version::undefined() },
   { "SharedReadWriteSize",           JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
@@ -1265,9 +1266,13 @@ bool Arguments::process_argument(const char* arg,
     char stripped_argname[BUFLEN+1]; // +1 for '\0'
     jio_snprintf(stripped_argname, arg_len+1, "%s", argname); // +1 for '\0'
     if (is_obsolete_flag(stripped_argname, &since)) {
-      char version[256];
-      since.to_string(version, sizeof(version));
-      warning("Ignoring option %s; support was removed in %s", stripped_argname, version);
+      if (strcmp(stripped_argname, "UseAppCDS") != 0) {
+        char version[256];
+        since.to_string(version, sizeof(version));
+        warning("Ignoring option %s; support was removed in %s", stripped_argname, version);
+      } else {
+        warning("Ignoring obsolete option UseAppCDS; AppCDS is automatically enabled");
+      }
       return true;
     }
 #ifndef PRODUCT
@@ -3365,6 +3370,10 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
   UNSUPPORTED_OPTION(TieredCompilation);
 #endif
 
+  if (!check_vm_args_consistency()) {
+    return JNI_ERR;
+  }
+
 #if INCLUDE_JVMCI
   if (EnableJVMCI &&
       !create_numbered_property("jdk.module.addmods", "jdk.internal.vm.ci", addmods_count++)) {
@@ -3372,10 +3381,6 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
   }
 #endif
 
-  if (!check_vm_args_consistency()) {
-    return JNI_ERR;
-  }
-
 #if INCLUDE_JVMCI
   if (UseJVMCICompiler) {
     Compilation_mode = CompMode_server;
@@ -4446,6 +4451,18 @@ void Arguments::PropertyList_unique_add(SystemProperty** plist, const char* k, c
   PropertyList_add(plist, k, v, writeable == WriteableProperty, internal == InternalProperty);
 }
 
+// Update existing property with new value.
+void Arguments::PropertyList_update_value(SystemProperty* plist, const char* k, const char* v) {
+  SystemProperty* prop;
+  for (prop = plist; prop != NULL; prop = prop->next()) {
+    if (strcmp(k, prop->key()) == 0) {
+        prop->set_value(v);
+        return;
+    }
+  }
+  assert(false, "invalid property");
+}
+
 // Copies src into buf, replacing "%%" with "%" and "%p" with pid
 // Returns true if all of the source pointed by src has been copied over to
 // the destination buffer pointed by buf. Otherwise, returns false.
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index edf88193673..42b9933130e 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -651,6 +651,7 @@ class Arguments : AllStatic {
   static void PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v,
                                       PropertyAppendable append, PropertyWriteable writeable,
                                       PropertyInternal internal);
+  static void PropertyList_update_value(SystemProperty* plist, const char* k, const char* v);
   static const char* PropertyList_get_value(SystemProperty* plist, const char* key);
   static const char* PropertyList_get_readable_value(SystemProperty* plist, const char* key);
   static int  PropertyList_count(SystemProperty* pl);
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index bd29092404f..ed8d2b4f5c2 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -1504,3 +1504,12 @@ void JVMFlag::printFlags(outputStream* out, bool withComments, bool printRanges,
   FREE_C_HEAP_ARRAY(JVMFlag*, array);
 }
 
+void JVMFlag::printError(bool verbose, const char* msg, ...) {
+  if (verbose) {
+    va_list listPointer;
+    va_start(listPointer, msg);
+    jio_vfprintf(defaultStream::error_stream(), msg, listPointer);
+    va_end(listPointer);
+  }
+}
+
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.hpp b/src/hotspot/share/runtime/flags/jvmFlag.hpp
index 131b4ca1db2..db7ad9d69f0 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.hpp
@@ -276,6 +276,7 @@ public:
 
   // printRanges will print out flags type, name and range values as expected by -XX:+PrintFlagsRanges
   static void printFlags(outputStream* out, bool withComments, bool printRanges = false, bool skipDefaults = false);
+  static void printError(bool verbose, const char* msg, ...);
 
   static void verify() PRODUCT_RETURN;
 };
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
index 3055dfcd026..d19b43d19ac 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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,17 +31,15 @@
 #include "runtime/arguments.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/flags/jvmFlagConstraintsCompiler.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
-#include "utilities/defaultStream.hpp"
 
 JVMFlag::Error AliasLevelConstraintFunc(intx value, bool verbose) {
   if ((value <= 1) && (Arguments::mode() == Arguments::_comp || Arguments::mode() == Arguments::_mixed)) {
-    CommandLineError::print(verbose,
-                            "AliasLevel (" INTX_FORMAT ") is not "
-                            "compatible with -Xcomp or -Xmixed\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "AliasLevel (" INTX_FORMAT ") is not "
+                        "compatible with -Xcomp or -Xmixed\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -82,10 +80,10 @@ JVMFlag::Error CICompilerCountConstraintFunc(intx value, bool verbose) {
   min_number_of_compiler_threads = MIN2(min_number_of_compiler_threads, CI_COMPILER_COUNT);
 
   if (value < (intx)min_number_of_compiler_threads) {
-    CommandLineError::print(verbose,
-                            "CICompilerCount (" INTX_FORMAT ") must be "
-                            "at least %d \n",
-                            value, min_number_of_compiler_threads);
+    JVMFlag::printError(verbose,
+                        "CICompilerCount (" INTX_FORMAT ") must be "
+                        "at least %d \n",
+                        value, min_number_of_compiler_threads);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -94,10 +92,10 @@ JVMFlag::Error CICompilerCountConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error AllocatePrefetchDistanceConstraintFunc(intx value, bool verbose) {
   if (value < 0 || value > 512) {
-    CommandLineError::print(verbose,
-                            "AllocatePrefetchDistance (" INTX_FORMAT ") must be "
-                            "between 0 and " INTX_FORMAT "\n",
-                            AllocatePrefetchDistance, 512);
+    JVMFlag::printError(verbose,
+                        "AllocatePrefetchDistance (" INTX_FORMAT ") must be "
+                        "between 0 and " INTX_FORMAT "\n",
+                        AllocatePrefetchDistance, 512);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -107,9 +105,9 @@ JVMFlag::Error AllocatePrefetchDistanceConstraintFunc(intx value, bool verbose)
 JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) {
   if (AllocatePrefetchStyle == 3) {
     if (value % wordSize != 0) {
-      CommandLineError::print(verbose,
-                              "AllocatePrefetchStepSize (" INTX_FORMAT ") must be multiple of %d\n",
-                              value, wordSize);
+      JVMFlag::printError(verbose,
+                          "AllocatePrefetchStepSize (" INTX_FORMAT ") must be multiple of %d\n",
+                          value, wordSize);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -124,9 +122,9 @@ JVMFlag::Error AllocatePrefetchInstrConstraintFunc(intx value, bool verbose) {
   max_value = 3;
 #endif
   if (value < 0 || value > max_value) {
-    CommandLineError::print(verbose,
-                            "AllocatePrefetchInstr (" INTX_FORMAT ") must be "
-                            "between 0 and " INTX_FORMAT "\n", value, max_value);
+    JVMFlag::printError(verbose,
+                        "AllocatePrefetchInstr (" INTX_FORMAT ") must be "
+                        "between 0 and " INTX_FORMAT "\n", value, max_value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -135,11 +133,11 @@ JVMFlag::Error AllocatePrefetchInstrConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error CompileThresholdConstraintFunc(intx value, bool verbose) {
   if (value < 0 || value > INT_MAX >> InvocationCounter::count_shift) {
-    CommandLineError::print(verbose,
-                            "CompileThreshold (" INTX_FORMAT ") "
-                            "must be between 0 and %d\n",
-                            value,
-                            INT_MAX >> InvocationCounter::count_shift);
+    JVMFlag::printError(verbose,
+                        "CompileThreshold (" INTX_FORMAT ") "
+                        "must be between 0 and %d\n",
+                        value,
+                        INT_MAX >> InvocationCounter::count_shift);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -150,10 +148,10 @@ JVMFlag::Error OnStackReplacePercentageConstraintFunc(intx value, bool verbose)
   int backward_branch_limit;
   if (ProfileInterpreter) {
     if (OnStackReplacePercentage < InterpreterProfilePercentage) {
-      CommandLineError::print(verbose,
-                              "OnStackReplacePercentage (" INTX_FORMAT ") must be "
-                              "larger than InterpreterProfilePercentage (" INTX_FORMAT ")\n",
-                              OnStackReplacePercentage, InterpreterProfilePercentage);
+      JVMFlag::printError(verbose,
+                          "OnStackReplacePercentage (" INTX_FORMAT ") must be "
+                          "larger than InterpreterProfilePercentage (" INTX_FORMAT ")\n",
+                          OnStackReplacePercentage, InterpreterProfilePercentage);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
 
@@ -161,20 +159,20 @@ JVMFlag::Error OnStackReplacePercentageConstraintFunc(intx value, bool verbose)
                             << InvocationCounter::count_shift;
 
     if (backward_branch_limit < 0) {
-      CommandLineError::print(verbose,
-                              "CompileThreshold * (InterpreterProfilePercentage - OnStackReplacePercentage) / 100 = "
-                              INTX_FORMAT " "
-                              "must be between 0 and " INTX_FORMAT ", try changing "
-                              "CompileThreshold, InterpreterProfilePercentage, and/or OnStackReplacePercentage\n",
-                              (CompileThreshold * (OnStackReplacePercentage - InterpreterProfilePercentage)) / 100,
-                              INT_MAX >> InvocationCounter::count_shift);
+      JVMFlag::printError(verbose,
+                          "CompileThreshold * (InterpreterProfilePercentage - OnStackReplacePercentage) / 100 = "
+                          INTX_FORMAT " "
+                          "must be between 0 and " INTX_FORMAT ", try changing "
+                          "CompileThreshold, InterpreterProfilePercentage, and/or OnStackReplacePercentage\n",
+                          (CompileThreshold * (OnStackReplacePercentage - InterpreterProfilePercentage)) / 100,
+                          INT_MAX >> InvocationCounter::count_shift);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   } else {
     if (OnStackReplacePercentage < 0 ) {
-      CommandLineError::print(verbose,
-                              "OnStackReplacePercentage (" INTX_FORMAT ") must be "
-                              "non-negative\n", OnStackReplacePercentage);
+      JVMFlag::printError(verbose,
+                          "OnStackReplacePercentage (" INTX_FORMAT ") must be "
+                          "non-negative\n", OnStackReplacePercentage);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
 
@@ -182,12 +180,12 @@ JVMFlag::Error OnStackReplacePercentageConstraintFunc(intx value, bool verbose)
                             << InvocationCounter::count_shift;
 
     if (backward_branch_limit < 0) {
-      CommandLineError::print(verbose,
-                              "CompileThreshold * OnStackReplacePercentage / 100 = " INTX_FORMAT " "
-                              "must be between 0 and " INTX_FORMAT ", try changing "
-                              "CompileThreshold and/or OnStackReplacePercentage\n",
-                              (CompileThreshold * OnStackReplacePercentage) / 100,
-                              INT_MAX >> InvocationCounter::count_shift);
+      JVMFlag::printError(verbose,
+                          "CompileThreshold * OnStackReplacePercentage / 100 = " INTX_FORMAT " "
+                          "must be between 0 and " INTX_FORMAT ", try changing "
+                          "CompileThreshold and/or OnStackReplacePercentage\n",
+                          (CompileThreshold * OnStackReplacePercentage) / 100,
+                          INT_MAX >> InvocationCounter::count_shift);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
@@ -196,29 +194,29 @@ JVMFlag::Error OnStackReplacePercentageConstraintFunc(intx value, bool verbose)
 
 JVMFlag::Error CodeCacheSegmentSizeConstraintFunc(uintx value, bool verbose) {
   if (CodeCacheSegmentSize < (uintx)CodeEntryAlignment) {
-    CommandLineError::print(verbose,
-                            "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
-                            "larger than or equal to CodeEntryAlignment (" INTX_FORMAT ") "
-                            "to align entry points\n",
-                            CodeCacheSegmentSize, CodeEntryAlignment);
+    JVMFlag::printError(verbose,
+                        "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
+                        "larger than or equal to CodeEntryAlignment (" INTX_FORMAT ") "
+                        "to align entry points\n",
+                        CodeCacheSegmentSize, CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
   if (CodeCacheSegmentSize < sizeof(jdouble)) {
-    CommandLineError::print(verbose,
-                            "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
-                            "at least " SIZE_FORMAT " to align constants\n",
-                            CodeCacheSegmentSize, sizeof(jdouble));
+    JVMFlag::printError(verbose,
+                        "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
+                        "at least " SIZE_FORMAT " to align constants\n",
+                        CodeCacheSegmentSize, sizeof(jdouble));
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
 #ifdef COMPILER2
   if (CodeCacheSegmentSize < (uintx)OptoLoopAlignment) {
-    CommandLineError::print(verbose,
-                            "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
-                            "larger than or equal to OptoLoopAlignment (" INTX_FORMAT ") "
-                            "to align inner loops\n",
-                            CodeCacheSegmentSize, OptoLoopAlignment);
+    JVMFlag::printError(verbose,
+                        "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
+                        "larger than or equal to OptoLoopAlignment (" INTX_FORMAT ") "
+                        "to align inner loops\n",
+                        CodeCacheSegmentSize, OptoLoopAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 #endif
@@ -230,11 +228,11 @@ JVMFlag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) {
 #ifdef SOLARIS
   if ((value < MinimumPriority || value > MaximumPriority) &&
       (value != -1) && (value != -FXCriticalPriority)) {
-    CommandLineError::print(verbose,
-                            "CompileThreadPriority (" INTX_FORMAT ") must be "
-                            "between %d and %d inclusively or -1 (means no change) "
-                            "or %d (special value for critical thread class/priority)\n",
-                            value, MinimumPriority, MaximumPriority, -FXCriticalPriority);
+    JVMFlag::printError(verbose,
+                        "CompileThreadPriority (" INTX_FORMAT ") must be "
+                        "between %d and %d inclusively or -1 (means no change) "
+                        "or %d (special value for critical thread class/priority)\n",
+                        value, MinimumPriority, MaximumPriority, -FXCriticalPriority);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 #endif
@@ -245,25 +243,25 @@ JVMFlag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) {
 JVMFlag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
 #ifdef SPARC
   if (CodeEntryAlignment % relocInfo::addr_unit() != 0) {
-    CommandLineError::print(verbose,
-                            "CodeEntryAlignment (" INTX_FORMAT ") must be "
-                            "multiple of NOP size\n", CodeEntryAlignment);
+    JVMFlag::printError(verbose,
+                        "CodeEntryAlignment (" INTX_FORMAT ") must be "
+                        "multiple of NOP size\n", CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 #endif
 
   if (!is_power_of_2(value)) {
-    CommandLineError::print(verbose,
-                            "CodeEntryAlignment (" INTX_FORMAT ") must be "
-                            "a power of two\n", CodeEntryAlignment);
+    JVMFlag::printError(verbose,
+                        "CodeEntryAlignment (" INTX_FORMAT ") must be "
+                        "a power of two\n", CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
   if (CodeEntryAlignment < 16) {
-      CommandLineError::print(verbose,
-                              "CodeEntryAlignment (" INTX_FORMAT ") must be "
-                              "greater than or equal to %d\n",
-                              CodeEntryAlignment, 16);
+      JVMFlag::printError(verbose,
+                          "CodeEntryAlignment (" INTX_FORMAT ") must be "
+                          "greater than or equal to %d\n",
+                          CodeEntryAlignment, 16);
       return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -272,20 +270,20 @@ JVMFlag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error OptoLoopAlignmentConstraintFunc(intx value, bool verbose) {
   if (!is_power_of_2(value)) {
-    CommandLineError::print(verbose,
-                            "OptoLoopAlignment (" INTX_FORMAT ") "
-                            "must be a power of two\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "OptoLoopAlignment (" INTX_FORMAT ") "
+                        "must be a power of two\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
   // Relevant on ppc, s390, sparc. Will be optimized where
   // addr_unit() == 1.
   if (OptoLoopAlignment % relocInfo::addr_unit() != 0) {
-    CommandLineError::print(verbose,
-                            "OptoLoopAlignment (" INTX_FORMAT ") must be "
-                            "multiple of NOP size (%d)\n",
-                            value, relocInfo::addr_unit());
+    JVMFlag::printError(verbose,
+                        "OptoLoopAlignment (" INTX_FORMAT ") must be "
+                        "multiple of NOP size (%d)\n",
+                        value, relocInfo::addr_unit());
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -294,9 +292,9 @@ JVMFlag::Error OptoLoopAlignmentConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error ArraycopyDstPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
   if (value >= 4032) {
-    CommandLineError::print(verbose,
-                            "ArraycopyDstPrefetchDistance (" UINTX_FORMAT ") must be"
-                            "between 0 and 4031\n", value);
+    JVMFlag::printError(verbose,
+                        "ArraycopyDstPrefetchDistance (" UINTX_FORMAT ") must be"
+                        "between 0 and 4031\n", value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -305,9 +303,9 @@ JVMFlag::Error ArraycopyDstPrefetchDistanceConstraintFunc(uintx value, bool verb
 
 JVMFlag::Error ArraycopySrcPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
   if (value >= 4032) {
-    CommandLineError::print(verbose,
-                            "ArraycopySrcPrefetchDistance (" UINTX_FORMAT ") must be"
-                            "between 0 and 4031\n", value);
+    JVMFlag::printError(verbose,
+                        "ArraycopySrcPrefetchDistance (" UINTX_FORMAT ") must be"
+                        "between 0 and 4031\n", value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -317,9 +315,9 @@ JVMFlag::Error ArraycopySrcPrefetchDistanceConstraintFunc(uintx value, bool verb
 JVMFlag::Error TypeProfileLevelConstraintFunc(uintx value, bool verbose) {
   for (int i = 0; i < 3; i++) {
     if (value % 10 > 2) {
-      CommandLineError::print(verbose,
-                              "Invalid value (" UINTX_FORMAT ") "
-                              "in TypeProfileLevel at position %d\n", value, i);
+      JVMFlag::printError(verbose,
+                          "Invalid value (" UINTX_FORMAT ") "
+                          "in TypeProfileLevel at position %d\n", value, i);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
     value = value / 10;
@@ -339,26 +337,26 @@ JVMFlag::Error InitArrayShortSizeConstraintFunc(intx value, bool verbose) {
 #ifdef COMPILER2
 JVMFlag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
   if (InteriorEntryAlignment > CodeEntryAlignment) {
-    CommandLineError::print(verbose,
-                           "InteriorEntryAlignment (" INTX_FORMAT ") must be "
-                           "less than or equal to CodeEntryAlignment (" INTX_FORMAT ")\n",
-                           InteriorEntryAlignment, CodeEntryAlignment);
+    JVMFlag::printError(verbose,
+                       "InteriorEntryAlignment (" INTX_FORMAT ") must be "
+                       "less than or equal to CodeEntryAlignment (" INTX_FORMAT ")\n",
+                       InteriorEntryAlignment, CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
 #ifdef SPARC
   if (InteriorEntryAlignment % relocInfo::addr_unit() != 0) {
-    CommandLineError::print(verbose,
-                            "InteriorEntryAlignment (" INTX_FORMAT ") must be "
-                            "multiple of NOP size\n");
+    JVMFlag::printError(verbose,
+                        "InteriorEntryAlignment (" INTX_FORMAT ") must be "
+                        "multiple of NOP size\n");
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 #endif
 
   if (!is_power_of_2(value)) {
-     CommandLineError::print(verbose,
-                             "InteriorEntryAlignment (" INTX_FORMAT ") must be "
-                             "a power of two\n", InteriorEntryAlignment);
+     JVMFlag::printError(verbose,
+                         "InteriorEntryAlignment (" INTX_FORMAT ") must be "
+                         "a power of two\n", InteriorEntryAlignment);
      return JVMFlag::VIOLATES_CONSTRAINT;
    }
 
@@ -370,10 +368,10 @@ JVMFlag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
 #endif
 
   if (InteriorEntryAlignment < minimum_alignment) {
-    CommandLineError::print(verbose,
-                            "InteriorEntryAlignment (" INTX_FORMAT ") must be "
-                            "greater than or equal to %d\n",
-                            InteriorEntryAlignment, minimum_alignment);
+    JVMFlag::printError(verbose,
+                        "InteriorEntryAlignment (" INTX_FORMAT ") must be "
+                        "greater than or equal to %d\n",
+                        InteriorEntryAlignment, minimum_alignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -382,10 +380,10 @@ JVMFlag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error NodeLimitFudgeFactorConstraintFunc(intx value, bool verbose) {
   if (value < MaxNodeLimit * 2 / 100 || value > MaxNodeLimit * 40 / 100) {
-    CommandLineError::print(verbose,
-                            "NodeLimitFudgeFactor must be between 2%% and 40%% "
-                            "of MaxNodeLimit (" INTX_FORMAT ")\n",
-                            MaxNodeLimit);
+    JVMFlag::printError(verbose,
+                        "NodeLimitFudgeFactor must be between 2%% and 40%% "
+                        "of MaxNodeLimit (" INTX_FORMAT ")\n",
+                        MaxNodeLimit);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -396,10 +394,10 @@ JVMFlag::Error NodeLimitFudgeFactorConstraintFunc(intx value, bool verbose) {
 JVMFlag::Error RTMTotalCountIncrRateConstraintFunc(int value, bool verbose) {
 #if INCLUDE_RTM_OPT
   if (UseRTMLocking && !is_power_of_2(RTMTotalCountIncrRate)) {
-    CommandLineError::print(verbose,
-                            "RTMTotalCountIncrRate (" INTX_FORMAT
-                            ") must be a power of 2, resetting it to 64\n",
-                            RTMTotalCountIncrRate);
+    JVMFlag::printError(verbose,
+                        "RTMTotalCountIncrRate (" INTX_FORMAT
+                        ") must be a power of 2, resetting it to 64\n",
+                        RTMTotalCountIncrRate);
     FLAG_SET_DEFAULT(RTMTotalCountIncrRate, 64);
   }
 #endif
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
index fdcb9bb193a..6559d4252f0 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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,26 +26,24 @@
 #include "runtime/arguments.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/flags/jvmFlagConstraintsRuntime.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/task.hpp"
-#include "utilities/defaultStream.hpp"
 
 JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(intx value, bool verbose) {
   if (!is_power_of_2(value)) {
-    CommandLineError::print(verbose,
-                            "ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
-                            "power of 2\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
+                        "power of 2\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   // In case page size is very small.
   if (value >= (intx)os::vm_page_size()) {
-    CommandLineError::print(verbose,
-                            "ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
-                            "less than page size (" INTX_FORMAT ")\n",
-                            value, (intx)os::vm_page_size());
+    JVMFlag::printError(verbose,
+                        "ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
+                        "less than page size (" INTX_FORMAT ")\n",
+                        value, (intx)os::vm_page_size());
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
   return JVMFlag::SUCCESS;
@@ -55,10 +53,10 @@ JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(intx value, bool verbose) {
 // It is sufficient to check against the largest type size.
 JVMFlag::Error ContendedPaddingWidthConstraintFunc(intx value, bool verbose) {
   if ((value % BytesPerLong) != 0) {
-    CommandLineError::print(verbose,
-                            "ContendedPaddingWidth (" INTX_FORMAT ") must be "
-                            "a multiple of %d\n",
-                            value, BytesPerLong);
+    JVMFlag::printError(verbose,
+                        "ContendedPaddingWidth (" INTX_FORMAT ") must be "
+                        "a multiple of %d\n",
+                        value, BytesPerLong);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -67,10 +65,10 @@ JVMFlag::Error ContendedPaddingWidthConstraintFunc(intx value, bool verbose) {
 
 JVMFlag::Error BiasedLockingBulkRebiasThresholdFunc(intx value, bool verbose) {
   if (value > BiasedLockingBulkRevokeThreshold) {
-    CommandLineError::print(verbose,
-                            "BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ") must be "
-                            "less than or equal to BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")\n",
-                            value, BiasedLockingBulkRevokeThreshold);
+    JVMFlag::printError(verbose,
+                        "BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ") must be "
+                        "less than or equal to BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")\n",
+                        value, BiasedLockingBulkRevokeThreshold);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -79,10 +77,10 @@ JVMFlag::Error BiasedLockingBulkRebiasThresholdFunc(intx value, bool verbose) {
 
 JVMFlag::Error BiasedLockingStartupDelayFunc(intx value, bool verbose) {
   if ((value % PeriodicTask::interval_gran) != 0) {
-    CommandLineError::print(verbose,
-                            "BiasedLockingStartupDelay (" INTX_FORMAT ") must be "
-                            "evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
-                            value, PeriodicTask::interval_gran);
+    JVMFlag::printError(verbose,
+                        "BiasedLockingStartupDelay (" INTX_FORMAT ") must be "
+                        "evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
+                        value, PeriodicTask::interval_gran);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -91,17 +89,17 @@ JVMFlag::Error BiasedLockingStartupDelayFunc(intx value, bool verbose) {
 
 JVMFlag::Error BiasedLockingBulkRevokeThresholdFunc(intx value, bool verbose) {
   if (value < BiasedLockingBulkRebiasThreshold) {
-    CommandLineError::print(verbose,
-                            "BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ") must be "
-                            "greater than or equal to BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")\n",
-                            value, BiasedLockingBulkRebiasThreshold);
+    JVMFlag::printError(verbose,
+                        "BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ") must be "
+                        "greater than or equal to BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")\n",
+                        value, BiasedLockingBulkRebiasThreshold);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else if ((double)value/(double)BiasedLockingDecayTime > 0.1) {
-    CommandLineError::print(verbose,
-                            "The ratio of BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")"
-                            " to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
-                            "less than or equal to 0.1\n",
-                            value, BiasedLockingBulkRebiasThreshold);
+    JVMFlag::printError(verbose,
+                        "The ratio of BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")"
+                        " to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
+                        "less than or equal to 0.1\n",
+                        value, BiasedLockingBulkRebiasThreshold);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -110,11 +108,11 @@ JVMFlag::Error BiasedLockingBulkRevokeThresholdFunc(intx value, bool verbose) {
 
 JVMFlag::Error BiasedLockingDecayTimeFunc(intx value, bool verbose) {
   if (BiasedLockingBulkRebiasThreshold/(double)value > 0.1) {
-    CommandLineError::print(verbose,
-                            "The ratio of BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")"
-                            " to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
-                            "less than or equal to 0.1\n",
-                            BiasedLockingBulkRebiasThreshold, value);
+    JVMFlag::printError(verbose,
+                        "The ratio of BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")"
+                        " to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
+                        "less than or equal to 0.1\n",
+                        BiasedLockingBulkRebiasThreshold, value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -123,10 +121,10 @@ JVMFlag::Error BiasedLockingDecayTimeFunc(intx value, bool verbose) {
 
 JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose) {
   if ((value % PeriodicTask::interval_gran != 0)) {
-    CommandLineError::print(verbose,
-                            "PerfDataSamplingInterval (" INTX_FORMAT ") must be "
-                            "evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
-                            value, PeriodicTask::interval_gran);
+    JVMFlag::printError(verbose,
+                        "PerfDataSamplingInterval (" INTX_FORMAT ") must be "
+                        "evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
+                        value, PeriodicTask::interval_gran);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -136,7 +134,7 @@ JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose) {
 JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose) {
   if (value) {
     if (!SafepointMechanism::supports_thread_local_poll()) {
-      CommandLineError::print(verbose, "ThreadLocalHandshakes not yet supported on this platform\n");
+      JVMFlag::printError(verbose, "ThreadLocalHandshakes not yet supported on this platform\n");
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
   }
diff --git a/src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp b/src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp
index 97b074e59b9..1d77f9d3870 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -35,18 +35,8 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
-#include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
 
-void CommandLineError::print(bool verbose, const char* msg, ...) {
-  if (verbose) {
-    va_list listPointer;
-    va_start(listPointer, msg);
-    jio_vfprintf(defaultStream::error_stream(), msg, listPointer);
-    va_end(listPointer);
-  }
-}
-
 class JVMFlagRange_int : public JVMFlagRange {
   int _min;
   int _max;
@@ -63,10 +53,10 @@ public:
 
   JVMFlag::Error check_int(int value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "int %s=%d is outside the allowed range "
-                              "[ %d ... %d ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "int %s=%d is outside the allowed range "
+                          "[ %d ... %d ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -93,10 +83,10 @@ public:
 
   JVMFlag::Error check_intx(intx value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "intx %s=" INTX_FORMAT " is outside the allowed range "
-                              "[ " INTX_FORMAT " ... " INTX_FORMAT " ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "intx %s=" INTX_FORMAT " is outside the allowed range "
+                          "[ " INTX_FORMAT " ... " INTX_FORMAT " ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -124,10 +114,10 @@ public:
 
   JVMFlag::Error check_uint(uint value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "uint %s=%u is outside the allowed range "
-                              "[ %u ... %u ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "uint %s=%u is outside the allowed range "
+                          "[ %u ... %u ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -155,10 +145,10 @@ public:
 
   JVMFlag::Error check_uintx(uintx value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "uintx %s=" UINTX_FORMAT " is outside the allowed range "
-                              "[ " UINTX_FORMAT " ... " UINTX_FORMAT " ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "uintx %s=" UINTX_FORMAT " is outside the allowed range "
+                          "[ " UINTX_FORMAT " ... " UINTX_FORMAT " ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -186,10 +176,10 @@ public:
 
   JVMFlag::Error check_uint64_t(uint64_t value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "uint64_t %s=" UINT64_FORMAT " is outside the allowed range "
-                              "[ " UINT64_FORMAT " ... " UINT64_FORMAT " ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "uint64_t %s=" UINT64_FORMAT " is outside the allowed range "
+                          "[ " UINT64_FORMAT " ... " UINT64_FORMAT " ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -217,10 +207,10 @@ public:
 
   JVMFlag::Error check_size_t(size_t value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "size_t %s=" SIZE_FORMAT " is outside the allowed range "
-                              "[ " SIZE_FORMAT " ... " SIZE_FORMAT " ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "size_t %s=" SIZE_FORMAT " is outside the allowed range "
+                          "[ " SIZE_FORMAT " ... " SIZE_FORMAT " ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -248,10 +238,10 @@ public:
 
   JVMFlag::Error check_double(double value, bool verbose = true) {
     if ((value < _min) || (value > _max)) {
-      CommandLineError::print(verbose,
-                              "double %s=%f is outside the allowed range "
-                              "[ %f ... %f ]\n",
-                              name(), value, _min, _max);
+      JVMFlag::printError(verbose,
+                          "double %s=%f is outside the allowed range "
+                          "[ %f ... %f ]\n",
+                          name(), value, _min, _max);
       return JVMFlag::OUT_OF_BOUNDS;
     } else {
       return JVMFlag::SUCCESS;
@@ -432,7 +422,6 @@ void JVMFlagRangeList::print(outputStream* st, const char* name, RangeStrFunc de
 }
 
 bool JVMFlagRangeList::check_ranges() {
-  // Check ranges.
   bool status = true;
   for (int i=0; i<length(); i++) {
     JVMFlagRange* range = at(i);
diff --git a/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp b/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp
index 6fa23cea244..5f21ed14cee 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp
@@ -39,11 +39,6 @@
  * then we need to use constraint instead.
  */
 
-class CommandLineError : public AllStatic {
-public:
-  static void print(bool verbose, const char* msg, ...);
-};
-
 class JVMFlagRange : public CHeapObj<mtArguments> {
 private:
   const char* _name;
diff --git a/src/hotspot/share/runtime/globals.cpp b/src/hotspot/share/runtime/globals.cpp
index 70fa4553082..c5ca3f07d05 100644
--- a/src/hotspot/share/runtime/globals.cpp
+++ b/src/hotspot/share/runtime/globals.cpp
@@ -32,7 +32,6 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/flags/jvmFlagConstraintList.hpp"
 #include "runtime/flags/jvmFlagWriteableList.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/defaultStream.hpp"
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index acb9b8a12a8..412c440a790 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1055,9 +1055,6 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
   develop(bool, TraceFinalizerRegistration, false,                          \
           "Trace registration of final references")                         \
                                                                             \
-  notproduct(bool, TraceScavenge, false,                                    \
-          "Trace scavenge")                                                 \
-                                                                            \
   product(bool, IgnoreEmptyClassPaths, false,                               \
           "Ignore empty path elements in -classpath")                       \
                                                                             \
@@ -2545,8 +2542,9 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
           "Relax the access control checks in the verifier")                \
                                                                             \
   product(uintx, StringTableSize, defaultStringTableSize,                   \
-          "Number of buckets in the interned String table")                 \
-          range(minimumStringTableSize, 111*defaultStringTableSize)         \
+          "Number of buckets in the interned String table "                 \
+          "(will be rounded to nearest higher power of 2)")                 \
+          range(minimumStringTableSize, 16777216ul)                         \
                                                                             \
   experimental(uintx, SymbolTableSize, defaultSymbolTableSize,              \
           "Number of buckets in the JVM internal Symbol table")             \
diff --git a/src/hotspot/share/runtime/interfaceSupport.cpp b/src/hotspot/share/runtime/interfaceSupport.cpp
index e1333bc811a..77777338157 100644
--- a/src/hotspot/share/runtime/interfaceSupport.cpp
+++ b/src/hotspot/share/runtime/interfaceSupport.cpp
@@ -31,7 +31,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index f557239aea6..f5dab8d4447 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -524,14 +524,9 @@ void before_exit(JavaThread* thread) {
   }
 
   if (VerifyStringTableAtExit) {
-    int fail_cnt = 0;
-    {
-      MutexLocker ml(StringTable_lock);
-      fail_cnt = StringTable::verify_and_compare_entries();
-    }
-
+    size_t fail_cnt = StringTable::verify_and_compare_entries();
     if (fail_cnt != 0) {
-      tty->print_cr("ERROR: fail_cnt=%d", fail_cnt);
+      tty->print_cr("ERROR: fail_cnt=" SIZE_FORMAT, fail_cnt);
       guarantee(fail_cnt == 0, "unexpected StringTable verification failures");
     }
   }
diff --git a/src/hotspot/share/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp
index e2a2fe44fe9..34a3ee2d8b1 100644
--- a/src/hotspot/share/runtime/jniHandles.cpp
+++ b/src/hotspot/share/runtime/jniHandles.cpp
@@ -327,7 +327,11 @@ void JNIHandles::verify() {
   VerifyJNIHandles verify_handle;
 
   oops_do(&verify_handle);
-  weak_oops_do(&verify_handle);
+
+  // JNI weaks are handled concurrently in ZGC, so they can't be verified here
+  if (!UseZGC) {
+    weak_oops_do(&verify_handle);
+  }
 }
 
 // This method is implemented here to avoid circular includes between
diff --git a/src/hotspot/share/runtime/mutex.cpp b/src/hotspot/share/runtime/mutex.cpp
index 71de11470f9..379db487c72 100644
--- a/src/hotspot/share/runtime/mutex.cpp
+++ b/src/hotspot/share/runtime/mutex.cpp
@@ -26,7 +26,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutex.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/thread.inline.hpp"
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 485cd6d7c0a..7eb058385bf 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -48,6 +48,8 @@ Mutex*   JNIGlobalAlloc_lock          = NULL;
 Mutex*   JNIGlobalActive_lock         = NULL;
 Mutex*   JNIWeakAlloc_lock            = NULL;
 Mutex*   JNIWeakActive_lock           = NULL;
+Mutex*   StringTableWeakAlloc_lock    = NULL;
+Mutex*   StringTableWeakActive_lock   = NULL;
 Mutex*   JNIHandleBlockFreeList_lock  = NULL;
 Mutex*   VMWeakAlloc_lock             = NULL;
 Mutex*   VMWeakActive_lock            = NULL;
@@ -186,6 +188,9 @@ void mutex_init() {
   def(VMWeakAlloc_lock             , PaddedMutex  , vmweak,      true,  Monitor::_safepoint_check_never);
   def(VMWeakActive_lock            , PaddedMutex  , vmweak-1,    true,  Monitor::_safepoint_check_never);
 
+  def(StringTableWeakAlloc_lock    , PaddedMutex  , vmweak,      true,  Monitor::_safepoint_check_never);
+  def(StringTableWeakActive_lock   , PaddedMutex  , vmweak-1,    true,  Monitor::_safepoint_check_never);
+
   if (UseConcMarkSweepGC || UseG1GC) {
     def(FullGCCount_lock           , PaddedMonitor, leaf,        true,  Monitor::_safepoint_check_never);      // in support of ExplicitGCInvokesConcurrent
   }
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 673d7ed56c6..a477899929c 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -42,6 +42,8 @@ extern Mutex*   JNIGlobalAlloc_lock;             // JNI global storage allocate
 extern Mutex*   JNIGlobalActive_lock;            // JNI global storage active list lock
 extern Mutex*   JNIWeakAlloc_lock;               // JNI weak storage allocate list lock
 extern Mutex*   JNIWeakActive_lock;              // JNI weak storage active list lock
+extern Mutex*   StringTableWeakAlloc_lock;       // StringTable weak storage allocate list lock
+extern Mutex*   StringTableWeakActive_lock;      // STringTable weak storage active list lock
 extern Mutex*   JNIHandleBlockFreeList_lock;     // a lock on the JNI handle block free list
 extern Mutex*   VMWeakAlloc_lock;                // VM Weak Handles storage allocate list lock
 extern Mutex*   VMWeakActive_lock;               // VM Weak Handles storage active list lock
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 29b557d4445..f069d415edc 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -36,7 +36,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
 #include "runtime/objectMonitor.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
diff --git a/src/hotspot/share/runtime/orderAccess.hpp b/src/hotspot/share/runtime/orderAccess.hpp
index cae137f5f97..e7966593e7d 100644
--- a/src/hotspot/share/runtime/orderAccess.hpp
+++ b/src/hotspot/share/runtime/orderAccess.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/macros.hpp"
 
 //                Memory Access Ordering Model
 //
@@ -311,4 +312,38 @@ struct OrderAccess::PlatformOrderedLoad {
   }
 };
 
+#include OS_CPU_HEADER(orderAccess)
+
+template<> inline void ScopedFenceGeneral<X_ACQUIRE>::postfix()       { OrderAccess::acquire(); }
+template<> inline void ScopedFenceGeneral<RELEASE_X>::prefix()        { OrderAccess::release(); }
+template<> inline void ScopedFenceGeneral<RELEASE_X_FENCE>::prefix()  { OrderAccess::release(); }
+template<> inline void ScopedFenceGeneral<RELEASE_X_FENCE>::postfix() { OrderAccess::fence();   }
+
+
+template <typename FieldType, ScopedFenceType FenceType>
+inline void OrderAccess::ordered_store(volatile FieldType* p, FieldType v) {
+  ScopedFence<FenceType> f((void*)p);
+  Atomic::store(v, p);
+}
+
+template <typename FieldType, ScopedFenceType FenceType>
+inline FieldType OrderAccess::ordered_load(const volatile FieldType* p) {
+  ScopedFence<FenceType> f((void*)p);
+  return Atomic::load(p);
+}
+
+template <typename T>
+inline T OrderAccess::load_acquire(const volatile T* p) {
+  return LoadImpl<T, PlatformOrderedLoad<sizeof(T), X_ACQUIRE> >()(p);
+}
+
+template <typename T, typename D>
+inline void OrderAccess::release_store(volatile D* p, T v) {
+  StoreImpl<T, D, PlatformOrderedStore<sizeof(D), RELEASE_X> >()(v, p);
+}
+
+template <typename T, typename D>
+inline void OrderAccess::release_store_fence(volatile D* p, T v) {
+  StoreImpl<T, D, PlatformOrderedStore<sizeof(D), RELEASE_X_FENCE> >()(v, p);
+}
 #endif // SHARE_VM_RUNTIME_ORDERACCESS_HPP
diff --git a/src/hotspot/share/runtime/orderAccess.inline.hpp b/src/hotspot/share/runtime/orderAccess.inline.hpp
deleted file mode 100644
index b1c50bb3abb..00000000000
--- a/src/hotspot/share/runtime/orderAccess.inline.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2016 SAP SE. 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.
- *
- */
-
-#ifndef SHARE_VM_RUNTIME_ORDERACCESS_INLINE_HPP
-#define SHARE_VM_RUNTIME_ORDERACCESS_INLINE_HPP
-
-#include "runtime/orderAccess.hpp"
-#include "utilities/macros.hpp"
-
-#include OS_CPU_HEADER_INLINE(orderAccess)
-
-template<> inline void ScopedFenceGeneral<X_ACQUIRE>::postfix()       { OrderAccess::acquire(); }
-template<> inline void ScopedFenceGeneral<RELEASE_X>::prefix()        { OrderAccess::release(); }
-template<> inline void ScopedFenceGeneral<RELEASE_X_FENCE>::prefix()  { OrderAccess::release(); }
-template<> inline void ScopedFenceGeneral<RELEASE_X_FENCE>::postfix() { OrderAccess::fence();   }
-
-
-template <typename FieldType, ScopedFenceType FenceType>
-inline void OrderAccess::ordered_store(volatile FieldType* p, FieldType v) {
-  ScopedFence<FenceType> f((void*)p);
-  Atomic::store(v, p);
-}
-
-template <typename FieldType, ScopedFenceType FenceType>
-inline FieldType OrderAccess::ordered_load(const volatile FieldType* p) {
-  ScopedFence<FenceType> f((void*)p);
-  return Atomic::load(p);
-}
-
-template <typename T>
-inline T OrderAccess::load_acquire(const volatile T* p) {
-  return LoadImpl<T, PlatformOrderedLoad<sizeof(T), X_ACQUIRE> >()(p);
-}
-
-template <typename T, typename D>
-inline void OrderAccess::release_store(volatile D* p, T v) {
-  StoreImpl<T, D, PlatformOrderedStore<sizeof(D), RELEASE_X> >()(v, p);
-}
-
-template <typename T, typename D>
-inline void OrderAccess::release_store_fence(volatile D* p, T v) {
-  StoreImpl<T, D, PlatformOrderedStore<sizeof(D), RELEASE_X_FENCE> >()(v, p);
-}
-#endif // SHARE_VM_RUNTIME_ORDERACCESS_INLINE_HPP
diff --git a/src/hotspot/share/runtime/os_perf.hpp b/src/hotspot/share/runtime/os_perf.hpp
index 18cfb56ff71..bdfd4987fa3 100644
--- a/src/hotspot/share/runtime/os_perf.hpp
+++ b/src/hotspot/share/runtime/os_perf.hpp
@@ -26,7 +26,7 @@
 #define SHARE_VM_RUNTIME_OS_PERF_HPP
 
 #include "utilities/macros.hpp"
-#include "memory/allocation.inline.hpp"
+#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #define FUNCTIONALITY_NOT_IMPLEMENTED -8
diff --git a/src/hotspot/share/runtime/perfMemory.cpp b/src/hotspot/share/runtime/perfMemory.cpp
index a0b5014ff57..02e62ff6339 100644
--- a/src/hotspot/share/runtime/perfMemory.cpp
+++ b/src/hotspot/share/runtime/perfMemory.cpp
@@ -30,7 +30,7 @@
 #include "runtime/java.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfData.hpp"
 #include "runtime/perfMemory.hpp"
diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
index 3297637b4f0..163c69a4677 100644
--- a/src/hotspot/share/runtime/reflection.cpp
+++ b/src/hotspot/share/runtime/reflection.cpp
@@ -337,7 +337,7 @@ arrayOop Reflection::reflect_new_array(oop element_mirror, jint length, TRAPS) {
     THROW_0(vmSymbols::java_lang_NullPointerException());
   }
   if (length < 0) {
-    THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+    THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
   }
   if (java_lang_Class::is_primitive(element_mirror)) {
     Klass* tak = basic_type_mirror_to_arrayklass(element_mirror, CHECK_NULL);
@@ -369,7 +369,7 @@ arrayOop Reflection::reflect_new_multi_array(oop element_mirror, typeArrayOop di
   for (int i = 0; i < len; i++) {
     int d = dim_array->int_at(i);
     if (d < 0) {
-      THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
+      THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", d));
     }
     dimensions[i] = d;
   }
diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index df659074fd7..da837a87cdb 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -50,7 +50,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp
index 5174a32ebfa..364a62ff1b1 100644
--- a/src/hotspot/share/runtime/serviceThread.cpp
+++ b/src/hotspot/share/runtime/serviceThread.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/stringTable.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/serviceThread.hpp"
@@ -82,6 +83,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
     bool has_gc_notification_event = false;
     bool has_dcmd_notification_event = false;
     bool acs_notify = false;
+    bool stringtable_work = false;
     JvmtiDeferredEvent jvmti_event;
     {
       // Need state transition ThreadBlockInVM so that this thread
@@ -98,7 +100,8 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
       while (!(sensors_changed = LowMemoryDetector::has_pending_requests()) &&
              !(has_jvmti_events = JvmtiDeferredEventQueue::has_events()) &&
               !(has_gc_notification_event = GCNotifier::has_event()) &&
-              !(has_dcmd_notification_event = DCmdFactory::has_pending_jmx_notification())) {
+              !(has_dcmd_notification_event = DCmdFactory::has_pending_jmx_notification()) &&
+              !(stringtable_work = StringTable::has_work())) {
         // wait until one of the sensors has pending requests, or there is a
         // pending JVMTI event or JMX GC notification to post
         Service_lock->wait(Mutex::_no_safepoint_check_flag);
@@ -109,6 +112,10 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
       }
     }
 
+    if (stringtable_work) {
+      StringTable::do_concurrent_work(jt);
+    }
+
     if (has_jvmti_events) {
       jvmti_event.post();
     }
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index ac5ae3b0d42..fac653f3dc4 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -76,9 +76,6 @@
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
-#if INCLUDE_G1GC
-#include "gc/g1/g1ThreadLocalData.hpp"
-#endif // INCLUDE_G1GC
 
 // Shared stub locations
 RuntimeStub*        SharedRuntime::_wrong_method_blob;
@@ -208,26 +205,6 @@ void SharedRuntime::print_ic_miss_histogram() {
 }
 #endif // PRODUCT
 
-#if INCLUDE_G1GC
-
-// G1 write-barrier pre: executed before a pointer store.
-JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread))
-  if (orig == NULL) {
-    assert(false, "should be optimized out");
-    return;
-  }
-  assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error");
-  // store the original value that was in the field reference
-  G1ThreadLocalData::satb_mark_queue(thread).enqueue(orig);
-JRT_END
-
-// G1 write-barrier post: executed after a pointer store.
-JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread))
-  G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
-JRT_END
-
-#endif // INCLUDE_G1GC
-
 
 JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x))
   return x * y;
@@ -1105,6 +1082,7 @@ Handle SharedRuntime::find_callee_info_helper(JavaThread* thread,
 
   Bytecode_invoke bytecode(caller, bci);
   int bytecode_index = bytecode.index();
+  bc = bytecode.invoke_code();
 
   methodHandle attached_method = extract_attached_method(vfst);
   if (attached_method.not_null()) {
@@ -1118,6 +1096,11 @@ Handle SharedRuntime::find_callee_info_helper(JavaThread* thread,
 
       // Adjust invocation mode according to the attached method.
       switch (bc) {
+        case Bytecodes::_invokevirtual:
+          if (attached_method->method_holder()->is_interface()) {
+            bc = Bytecodes::_invokeinterface;
+          }
+          break;
         case Bytecodes::_invokeinterface:
           if (!attached_method->method_holder()->is_interface()) {
             bc = Bytecodes::_invokevirtual;
@@ -1133,10 +1116,10 @@ Handle SharedRuntime::find_callee_info_helper(JavaThread* thread,
           break;
       }
     }
-  } else {
-    bc = bytecode.invoke_code();
   }
 
+  assert(bc != Bytecodes::_illegal, "not initialized");
+
   bool has_receiver = bc != Bytecodes::_invokestatic &&
                       bc != Bytecodes::_invokedynamic &&
                       bc != Bytecodes::_invokehandle;
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index 8c7bf703625..f10198d913c 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -182,12 +182,6 @@ class SharedRuntime: AllStatic {
   static address raw_exception_handler_for_return_address(JavaThread* thread, address return_address);
   static address exception_handler_for_return_address(JavaThread* thread, address return_address);
 
-#if INCLUDE_G1GC
-  // G1 write barriers
-  static void g1_wb_pre(oopDesc* orig, JavaThread *thread);
-  static void g1_wb_post(void* card_addr, JavaThread* thread);
-#endif // INCLUDE_G1GC
-
   // exception handling and implicit exceptions
   static address compute_compiled_exc_handler(CompiledMethod* nm, address ret_pc, Handle& exception,
                                               bool force_unwind, bool top_frame_only, bool& recursive_exception_occurred);
diff --git a/src/hotspot/share/runtime/stackValue.cpp b/src/hotspot/share/runtime/stackValue.cpp
index c80900a0b86..e7a122ce1d0 100644
--- a/src/hotspot/share/runtime/stackValue.cpp
+++ b/src/hotspot/share/runtime/stackValue.cpp
@@ -29,6 +29,9 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/stackValue.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/zBarrier.inline.hpp"
+#endif
 
 StackValue* StackValue::create_stack_value(const frame* fr, const RegisterMap* reg_map, ScopeValue* sv) {
   if (sv->is_location()) {
@@ -119,6 +122,13 @@ StackValue* StackValue::create_stack_value(const frame* fr, const RegisterMap* r
          val = (oop)NULL;
       }
 #endif
+#if INCLUDE_ZGC
+      // Deoptimization must make sure all oop have passed load barrier
+      if (UseZGC) {
+        val = ZBarrier::load_barrier_on_oop_field_preloaded((oop*)value_addr, val);
+      }
+#endif
+
       Handle h(Thread::current(), val); // Wrap a handle around the oop
       return new StackValue(h);
     }
diff --git a/src/hotspot/share/runtime/stubCodeGenerator.cpp b/src/hotspot/share/runtime/stubCodeGenerator.cpp
index c36c7b88e57..28ab1e2b8f7 100644
--- a/src/hotspot/share/runtime/stubCodeGenerator.cpp
+++ b/src/hotspot/share/runtime/stubCodeGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, 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
@@ -71,7 +71,7 @@ StubCodeGenerator::StubCodeGenerator(CodeBuffer* code, bool print_code) {
 }
 
 StubCodeGenerator::~StubCodeGenerator() {
-  if (_print_code) {
+  if (PRODUCT_ONLY(_print_code) NOT_PRODUCT(true)) {
     CodeBuffer* cbuf = _masm->code();
     CodeBlob*   blob = CodeCache::find_blob_unsafe(cbuf->insts()->start());
     if (blob != NULL) {
@@ -86,9 +86,19 @@ void StubCodeGenerator::stub_prolog(StubCodeDesc* cdesc) {
 
 void StubCodeGenerator::stub_epilog(StubCodeDesc* cdesc) {
   if (_print_code) {
+    CodeStrings cs;
+    ptrdiff_t offset = 0;
+#ifndef PRODUCT
+    // Find the code strings in the outer CodeBuffer.
+    CodeBuffer *outer_cbuf = _masm->code_section()->outer();
+    cs = outer_cbuf->strings();
+    // The offset from the start of the outer CodeBuffer to the start
+    // of this stub.
+    offset = cdesc->begin() - outer_cbuf->insts()->start();
+#endif
     cdesc->print();
     tty->cr();
-    Disassembler::decode(cdesc->begin(), cdesc->end());
+    Disassembler::decode(cdesc->begin(), cdesc->end(), NULL, cs, offset);
     tty->cr();
   }
 }
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index 11f4ec2fa13..1122e50a659 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -410,7 +410,7 @@ JRT_LEAF(void, StubRoutines::oop_copy(oop* src, oop* dest, size_t count))
   SharedRuntime::_oop_array_copy_ctr++;        // Slow-path oop array copy
 #endif // !PRODUCT
   assert(count != 0, "count should be non-zero");
-  HeapAccess<>::oop_arraycopy(NULL, NULL, (HeapWord*)src, (HeapWord*)dest, count);
+  ArrayAccess<>::oop_arraycopy_raw((HeapWord*)src, (HeapWord*)dest, count);
 JRT_END
 
 JRT_LEAF(void, StubRoutines::oop_copy_uninit(oop* src, oop* dest, size_t count))
@@ -418,7 +418,7 @@ JRT_LEAF(void, StubRoutines::oop_copy_uninit(oop* src, oop* dest, size_t count))
   SharedRuntime::_oop_array_copy_ctr++;        // Slow-path oop array copy
 #endif // !PRODUCT
   assert(count != 0, "count should be non-zero");
-  HeapAccess<AS_DEST_NOT_INITIALIZED>::oop_arraycopy(NULL, NULL, (HeapWord*)src, (HeapWord*)dest, count);
+  ArrayAccess<AS_DEST_NOT_INITIALIZED>::oop_arraycopy_raw((HeapWord*)src, (HeapWord*)dest, count);
 JRT_END
 
 JRT_LEAF(void, StubRoutines::arrayof_jbyte_copy(HeapWord* src, HeapWord* dest, size_t count))
@@ -454,7 +454,7 @@ JRT_LEAF(void, StubRoutines::arrayof_oop_copy(HeapWord* src, HeapWord* dest, siz
   SharedRuntime::_oop_array_copy_ctr++;        // Slow-path oop array copy
 #endif // !PRODUCT
   assert(count != 0, "count should be non-zero");
-  HeapAccess<ARRAYCOPY_ARRAYOF>::oop_arraycopy(NULL, NULL, src, dest, count);
+  ArrayAccess<ARRAYCOPY_ARRAYOF>::oop_arraycopy_raw(src, dest, count);
 JRT_END
 
 JRT_LEAF(void, StubRoutines::arrayof_oop_copy_uninit(HeapWord* src, HeapWord* dest, size_t count))
@@ -462,7 +462,7 @@ JRT_LEAF(void, StubRoutines::arrayof_oop_copy_uninit(HeapWord* src, HeapWord* de
   SharedRuntime::_oop_array_copy_ctr++;        // Slow-path oop array copy
 #endif // !PRODUCT
   assert(count != 0, "count should be non-zero");
-  HeapAccess<ARRAYCOPY_ARRAYOF | AS_DEST_NOT_INITIALIZED>::oop_arraycopy(NULL, NULL, src, dest, count);
+  ArrayAccess<ARRAYCOPY_ARRAYOF | AS_DEST_NOT_INITIALIZED>::oop_arraycopy_raw(src, dest, count);
 JRT_END
 
 address StubRoutines::select_fill_function(BasicType t, bool aligned, const char* &name) {
diff --git a/src/hotspot/share/runtime/sweeper.cpp b/src/hotspot/share/runtime/sweeper.cpp
index 9e07ce1afe2..ae2d95d2a3e 100644
--- a/src/hotspot/share/runtime/sweeper.cpp
+++ b/src/hotspot/share/runtime/sweeper.cpp
@@ -38,7 +38,7 @@
 #include "runtime/compilationPolicy.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sweeper.hpp"
 #include "runtime/thread.inline.hpp"
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 6bc42f04a29..7cfdaad2c01 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -80,7 +80,7 @@
 #include "runtime/memprofiler.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/safepoint.hpp"
@@ -1132,6 +1132,9 @@ static void reset_vm_info_property(TRAPS) {
   ResourceMark rm(THREAD);
   const char *vm_info = VM_Version::vm_info_string();
 
+  // update the native system property first
+  Arguments::PropertyList_update_value(Arguments::system_properties(), "java.vm.info", vm_info);
+
   // java.lang.System class
   Klass* klass =  SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
 
@@ -3779,9 +3782,10 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 
   initialize_java_lang_classes(main_thread, CHECK_JNI_ERR);
 
-  // We need this for ClassDataSharing - the initial vm.info property is set
-  // with the default value of CDS "sharing" which may be reset through
-  // command line options.
+  // We need this to update the java.vm.info property in case any flags used
+  // to initially define it have been changed. This is needed for both CDS and
+  // AOT, since UseSharedSpaces and UseAOT may be changed after java.vm.info
+  // is initially computed. See Abstract_VM_Version::vm_info_string().
   reset_vm_info_property(CHECK_JNI_ERR);
 
   quicken_jni_functions();
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index b02e91368c2..33efd7c2749 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.hpp"
 
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 48a51aba18e..1956a6ef983 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -164,7 +164,6 @@ typedef HashtableEntry<intptr_t, mtInternal>  IntptrHashtableEntry;
 typedef Hashtable<intptr_t, mtInternal>       IntptrHashtable;
 typedef Hashtable<Symbol*, mtSymbol>          SymbolHashtable;
 typedef HashtableEntry<Symbol*, mtClass>      SymbolHashtableEntry;
-typedef Hashtable<oop, mtSymbol>              StringHashtable;
 typedef Hashtable<InstanceKlass*, mtClass>       KlassHashtable;
 typedef HashtableEntry<InstanceKlass*, mtClass>  KlassHashtableEntry;
 typedef CompactHashtable<Symbol*, char>       SymbolCompactHashTable;
@@ -476,12 +475,6 @@ typedef PaddedEnd<ObjectMonitor>              PaddedObjectMonitor;
      static_field(SymbolTable,                 _shared_table,                                 SymbolCompactHashTable)                \
      static_field(RehashableSymbolHashtable,   _seed,                                         juint)                                 \
                                                                                                                                      \
-  /***************/                                                                                                                  \
-  /* StringTable */                                                                                                                  \
-  /***************/                                                                                                                  \
-                                                                                                                                     \
-     static_field(StringTable,                 _the_table,                                    StringTable*)                          \
-                                                                                                                                     \
   /********************/                                                                                                             \
   /* CompactHashTable */                                                                                                             \
   /********************/                                                                                                             \
@@ -1278,6 +1271,7 @@ typedef PaddedEnd<ObjectMonitor>              PaddedObjectMonitor;
   declare_integer_type(intptr_t)                                          \
   declare_unsigned_integer_type(uintx)                                    \
   declare_unsigned_integer_type(uintptr_t)                                \
+  declare_unsigned_integer_type(uint8_t)                                  \
   declare_unsigned_integer_type(uint32_t)                                 \
   declare_unsigned_integer_type(uint64_t)                                 \
                                                                           \
@@ -1365,7 +1359,6 @@ typedef PaddedEnd<ObjectMonitor>              PaddedObjectMonitor;
   declare_toplevel_type(BasicHashtable<mtSymbol>)                         \
     declare_type(RehashableSymbolHashtable, BasicHashtable<mtSymbol>)     \
   declare_type(SymbolTable, SymbolHashtable)                              \
-  declare_type(StringTable, StringHashtable)                              \
     declare_type(Dictionary, KlassHashtable)                              \
   declare_toplevel_type(BasicHashtableEntry<mtInternal>)                  \
   declare_type(IntptrHashtableEntry, BasicHashtableEntry<mtInternal>)     \
@@ -2610,6 +2603,12 @@ typedef PaddedEnd<ObjectMonitor>              PaddedObjectMonitor;
 
 #define VM_LONG_CONSTANTS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
                                                                           \
+  /****************/                                                      \
+  /* GC constants */                                                      \
+  /****************/                                                      \
+                                                                          \
+  VM_LONG_CONSTANTS_GC(declare_constant)                                  \
+                                                                          \
   /*********************/                                                 \
   /* MarkOop constants */                                                 \
   /*********************/                                                 \
diff --git a/src/hotspot/share/runtime/vm_operations.cpp b/src/hotspot/share/runtime/vm_operations.cpp
index 96310153a00..84ef01587f6 100644
--- a/src/hotspot/share/runtime/vm_operations.cpp
+++ b/src/hotspot/share/runtime/vm_operations.cpp
@@ -204,13 +204,6 @@ void VM_Verify::doit() {
 }
 
 bool VM_PrintThreads::doit_prologue() {
-  // Make sure AbstractOwnableSynchronizer is loaded
-  JavaThread* jt = JavaThread::current();
-  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(jt);
-  if (jt->has_pending_exception()) {
-    return false;
-  }
-
   // Get Heap_lock if concurrent locks will be dumped
   if (_print_concurrent_locks) {
     Heap_lock->lock();
@@ -248,19 +241,6 @@ VM_FindDeadlocks::~VM_FindDeadlocks() {
   }
 }
 
-bool VM_FindDeadlocks::doit_prologue() {
-  if (_concurrent_locks) {
-    // Make sure AbstractOwnableSynchronizer is loaded
-    JavaThread* jt = JavaThread::current();
-    java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(jt);
-    if (jt->has_pending_exception()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 void VM_FindDeadlocks::doit() {
   // Update the hazard ptr in the originating thread to the current
   // list of threads. This VM operation needs the current list of
@@ -316,13 +296,6 @@ VM_ThreadDump::VM_ThreadDump(ThreadDumpResult* result,
 }
 
 bool VM_ThreadDump::doit_prologue() {
-  // Make sure AbstractOwnableSynchronizer is loaded
-  JavaThread* jt = JavaThread::current();
-  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(jt);
-  if (jt->has_pending_exception()) {
-    return false;
-  }
-
   if (_with_locked_synchronizers) {
     // Acquire Heap_lock to dump concurrent locks
     Heap_lock->lock();
diff --git a/src/hotspot/share/runtime/vm_operations.hpp b/src/hotspot/share/runtime/vm_operations.hpp
index 2734e3b842e..4ca987e889d 100644
--- a/src/hotspot/share/runtime/vm_operations.hpp
+++ b/src/hotspot/share/runtime/vm_operations.hpp
@@ -69,6 +69,7 @@
   template(CMS_Final_Remark)                      \
   template(G1CollectForAllocation)                \
   template(G1CollectFull)                         \
+  template(ZOperation)                            \
   template(HandshakeOneThread)                    \
   template(HandshakeAllThreads)                   \
   template(HandshakeFallback)                     \
@@ -103,6 +104,7 @@
   template(RotateGCLog)                           \
   template(WhiteBoxOperation)                     \
   template(ClassLoaderStatsOperation)             \
+  template(ClassLoaderHierarchyOperation)         \
   template(DumpHashtable)                         \
   template(DumpTouchedMethods)                    \
   template(MarkActiveNMethods)                    \
@@ -421,7 +423,6 @@ class VM_FindDeadlocks: public VM_Operation {
   DeadlockCycle* result()      { return _deadlocks; };
   VMOp_Type type() const       { return VMOp_FindDeadlocks; }
   void doit();
-  bool doit_prologue();
 };
 
 class ThreadDumpResult;
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 490aa3d40d5..ab19c5fa1cf 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "classfile/classLoaderHierarchyDCmd.hpp"
 #include "classfile/classLoaderStats.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "compiler/compileBroker.hpp"
@@ -101,6 +102,7 @@ void DCmdRegistrant::register_dcmds(){
 #endif // INCLUDE_JVMTI
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderStatsDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderHierarchyDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompileQueueDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeListDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeCacheDCmd>(full_export, true, false));
diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp
index 83c4fe00d71..66fcb01df08 100644
--- a/src/hotspot/share/services/management.cpp
+++ b/src/hotspot/share/services/management.cpp
@@ -1081,9 +1081,6 @@ JVM_ENTRY(jint, jmm_GetThreadInfo(JNIEnv *env, jlongArray ids, jint maxDepth, jo
                "The length of the given ThreadInfo array does not match the length of the given array of thread IDs", -1);
   }
 
-  // make sure the AbstractOwnableSynchronizer klass is loaded before taking thread snapshots
-  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(CHECK_0);
-
   // Must use ThreadDumpResult to store the ThreadSnapshot.
   // GC may occur after the thread snapshots are taken but before
   // this function returns. The threadObj and other oops kept
@@ -1154,9 +1151,6 @@ JVM_ENTRY(jobjectArray, jmm_DumpThreads(JNIEnv *env, jlongArray thread_ids, jboo
                                         jboolean locked_synchronizers, jint maxDepth))
   ResourceMark rm(THREAD);
 
-  // make sure the AbstractOwnableSynchronizer klass is loaded before taking thread snapshots
-  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(CHECK_NULL);
-
   typeArrayOop ta = typeArrayOop(JNIHandles::resolve(thread_ids));
   int num_threads = (ta != NULL ? ta->length() : 0);
   typeArrayHandle ids_ah(THREAD, ta);
diff --git a/src/hotspot/share/services/memTracker.cpp b/src/hotspot/share/services/memTracker.cpp
index 21eaa4a9904..58aaff8aea3 100644
--- a/src/hotspot/share/services/memTracker.cpp
+++ b/src/hotspot/share/services/memTracker.cpp
@@ -25,7 +25,7 @@
 #include "jvm.h"
 
 #include "runtime/mutex.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/vmThread.hpp"
 #include "runtime/vm_operations.hpp"
 #include "services/memBaseline.hpp"
diff --git a/src/hotspot/share/services/memoryManager.cpp b/src/hotspot/share/services/memoryManager.cpp
index ecf89e6b902..933fd78bb33 100644
--- a/src/hotspot/share/services/memoryManager.cpp
+++ b/src/hotspot/share/services/memoryManager.cpp
@@ -29,7 +29,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "services/lowMemoryDetector.hpp"
 #include "services/management.hpp"
 #include "services/memoryManager.hpp"
diff --git a/src/hotspot/share/services/memoryPool.cpp b/src/hotspot/share/services/memoryPool.cpp
index 41b8221e14e..89b8f5e3eec 100644
--- a/src/hotspot/share/services/memoryPool.cpp
+++ b/src/hotspot/share/services/memoryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -29,7 +29,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "services/lowMemoryDetector.hpp"
 #include "services/management.hpp"
 #include "services/memoryManager.hpp"
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index 08891b2b0da..1b6bcb8da3d 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -369,7 +369,7 @@ DeadlockCycle* ThreadService::find_deadlocks_at_safepoint(ThreadsList * t_list,
         }
       } else {
         if (concurrent_locks) {
-          if (waitingToLockBlocker->is_a(SystemDictionary::abstract_ownable_synchronizer_klass())) {
+          if (waitingToLockBlocker->is_a(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass())) {
             oop threadObj = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(waitingToLockBlocker);
             // This JavaThread (if there is one) is protected by the
             // ThreadsListSetter in VM_FindDeadlocks::doit().
@@ -678,8 +678,8 @@ void ConcurrentLocksDump::dump_at_safepoint() {
   GrowableArray<oop>* aos_objects = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<oop>(INITIAL_ARRAY_SIZE, true /* C_heap */);
 
   // Find all instances of AbstractOwnableSynchronizer
-  HeapInspection::find_instances_at_safepoint(SystemDictionary::abstract_ownable_synchronizer_klass(),
-                                                aos_objects);
+  HeapInspection::find_instances_at_safepoint(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass(),
+                                              aos_objects);
   // Build a map of thread to its owned AQS locks
   build_map(aos_objects);
 
@@ -832,7 +832,7 @@ ThreadSnapshot::ThreadSnapshot(ThreadsList * t_list, JavaThread* thread) {
          _thread_status == java_lang_Thread::PARKED_TIMED)) {
 
     _blocker_object = thread->current_park_blocker();
-    if (_blocker_object != NULL && _blocker_object->is_a(SystemDictionary::abstract_ownable_synchronizer_klass())) {
+    if (_blocker_object != NULL && _blocker_object->is_a(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass())) {
       _blocker_object_owner = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(_blocker_object);
     }
   }
@@ -923,7 +923,7 @@ void DeadlockCycle::print_on_with(ThreadsList * t_list, outputStream* st) const
       st->print("  waiting for ownable synchronizer " INTPTR_FORMAT ", (a %s)",
                 p2i(waitingToLockBlocker),
                 waitingToLockBlocker->klass()->external_name());
-      assert(waitingToLockBlocker->is_a(SystemDictionary::abstract_ownable_synchronizer_klass()),
+      assert(waitingToLockBlocker->is_a(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass()),
              "Must be an AbstractOwnableSynchronizer");
       oop ownerObj = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(waitingToLockBlocker);
       currentThread = java_lang_Thread::thread(ownerObj);
diff --git a/src/hotspot/share/utilities/concurrentHashTable.hpp b/src/hotspot/share/utilities/concurrentHashTable.hpp
index 545f8e73dfe..6d5ab1c42fd 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.hpp
@@ -484,6 +484,9 @@ class ConcurrentHashTable : public CHeapObj<F> {
   void statistics_to(Thread* thread, VALUE_SIZE_FUNC& vs_f, outputStream* st,
                      const char* table_name);
 
+  // Moves all nodes from this table to to_cht
+  bool try_move_nodes_to(Thread* thread, ConcurrentHashTable<VALUE, CONFIG, F>* to_cht);
+
   // This is a Curiously Recurring Template Pattern (CRPT) interface for the
   // specialization.
   struct BaseConfig {
diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
index 4b7e4bdb2cd..71487d8234e 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "utilities/concurrentHashTable.hpp"
 #include "utilities/globalCounter.inline.hpp"
@@ -293,7 +293,7 @@ template <typename VALUE, typename CONFIG, MEMFLAGS F>
 inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   write_synchonize_on_visible_epoch(Thread* thread)
 {
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner == thread, "Re-size lock not held");
   OrderAccess::fence(); // Prevent below load from floating up.
   // If no reader saw this version we can skip write_synchronize.
   if (OrderAccess::load_acquire(&_invisible_epoch) == thread) {
@@ -488,7 +488,7 @@ inline void ConcurrentHashTable<VALUE, CONFIG, F>::
 {
   // Here we have resize lock so table is SMR safe, and there is no new
   // table. Can do this in parallel if we want.
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner == thread, "Re-size lock not held");
   Node* ndel[BULK_DELETE_LIMIT];
   InternalTable* table = get_table();
   assert(start_idx < stop_idx, "Must be");
@@ -500,9 +500,9 @@ inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   // own read-side.
   GlobalCounter::critical_section_begin(thread);
   for (size_t bucket_it = start_idx; bucket_it < stop_idx; bucket_it++) {
-    Bucket* bucket  = _table->get_bucket(bucket_it);
+    Bucket* bucket = table->get_bucket(bucket_it);
     Bucket* prefetch_bucket = (bucket_it+1) < stop_idx ?
-                              _table->get_bucket(bucket_it+1) : NULL;
+                              table->get_bucket(bucket_it+1) : NULL;
 
     if (!HaveDeletables<IsPointer<VALUE>::value, EVALUATE_FUNC>::
         have_deletable(bucket, eval_f, prefetch_bucket)) {
@@ -695,17 +695,13 @@ inline bool ConcurrentHashTable<VALUE, CONFIG, F>::
   if (!try_resize_lock(thread)) {
     return false;
   }
-
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
-
+  assert(_resize_lock_owner == thread, "Re-size lock not held");
   if (_table->_log2_size == _log2_start_size ||
       _table->_log2_size <= log2_size) {
     unlock_resize_lock(thread);
     return false;
   }
-
   _new_table = new InternalTable(_table->_log2_size - 1);
-
   return true;
 }
 
@@ -713,8 +709,7 @@ template <typename VALUE, typename CONFIG, MEMFLAGS F>
 inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   internal_shrink_epilog(Thread* thread)
 {
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
-  assert(_resize_lock_owner, "Should be locked");
+  assert(_resize_lock_owner == thread, "Re-size lock not held");
 
   InternalTable* old_table = set_table_from_new();
   _size_limit_reached = false;
@@ -771,14 +766,13 @@ inline bool ConcurrentHashTable<VALUE, CONFIG, F>::
   internal_shrink(Thread* thread, size_t log2_size)
 {
   if (!internal_shrink_prolog(thread, log2_size)) {
-    assert(!_resize_lock->owned_by_self(), "Re-size lock held");
+    assert(_resize_lock_owner != thread, "Re-size lock held");
     return false;
   }
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
   assert(_resize_lock_owner == thread, "Should be locked by me");
   internal_shrink_range(thread, 0, _new_table->_size);
   internal_shrink_epilog(thread);
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner != thread, "Re-size lock held");
   return true;
 }
 
@@ -815,8 +809,7 @@ template <typename VALUE, typename CONFIG, MEMFLAGS F>
 inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   internal_grow_epilog(Thread* thread)
 {
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
-  assert(_resize_lock_owner, "Should be locked");
+  assert(_resize_lock_owner == thread, "Should be locked");
 
   InternalTable* old_table = set_table_from_new();
   unlock_resize_lock(thread);
@@ -835,14 +828,13 @@ inline bool ConcurrentHashTable<VALUE, CONFIG, F>::
   internal_grow(Thread* thread, size_t log2_size)
 {
   if (!internal_grow_prolog(thread, log2_size)) {
-    assert(!_resize_lock->owned_by_self(), "Re-size lock held");
+    assert(_resize_lock_owner != thread, "Re-size lock held");
     return false;
   }
-  assert(_resize_lock->owned_by_self(), "Re-size lock not held");
   assert(_resize_lock_owner == thread, "Should be locked by me");
   internal_grow_range(thread, 0, _table->_size);
   internal_grow_epilog(thread);
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner != thread, "Re-size lock held");
   return true;
 }
 
@@ -955,15 +947,13 @@ template <typename FUNC>
 inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   do_scan_locked(Thread* thread, FUNC& scan_f)
 {
-  assert(_resize_lock->owned_by_self() ||
-         (thread->is_VM_thread() && SafepointSynchronize::is_at_safepoint()),
-         "Re-size lock not held or not VMThread at safepoint");
+  assert(_resize_lock_owner == thread, "Re-size lock not held");
   // We can do a critical section over the entire loop but that would block
   // updates for a long time. Instead we choose to block resizes.
   InternalTable* table = get_table();
-  for (size_t bucket_it = 0; bucket_it < _table->_size; bucket_it++) {
+  for (size_t bucket_it = 0; bucket_it < table->_size; bucket_it++) {
     ScopedCS cs(thread, this);
-    if (!visit_nodes(_table->get_bucket(bucket_it), scan_f)) {
+    if (!visit_nodes(table->get_bucket(bucket_it), scan_f)) {
       break; /* ends critical section */
     }
   } /* ends critical section */
@@ -1094,17 +1084,11 @@ template <typename SCAN_FUNC>
 inline bool ConcurrentHashTable<VALUE, CONFIG, F>::
   try_scan(Thread* thread, SCAN_FUNC& scan_f)
 {
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
-  bool vm_and_safepoint = thread->is_VM_thread() &&
-                          SafepointSynchronize::is_at_safepoint();
-  if (!vm_and_safepoint && !try_resize_lock(thread)) {
+  if (!try_resize_lock(thread)) {
     return false;
   }
   do_scan_locked(thread, scan_f);
-  if (!vm_and_safepoint) {
-    unlock_resize_lock(thread);
-  }
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
+  unlock_resize_lock(thread);
   return true;
 }
 
@@ -1113,11 +1097,11 @@ template <typename SCAN_FUNC>
 inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   do_scan(Thread* thread, SCAN_FUNC& scan_f)
 {
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner != thread, "Re-size lock held");
   lock_resize_lock(thread);
   do_scan_locked(thread, scan_f);
   unlock_resize_lock(thread);
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner != thread, "Re-size lock held");
 }
 
 template <typename VALUE, typename CONFIG, MEMFLAGS F>
@@ -1126,12 +1110,11 @@ inline bool ConcurrentHashTable<VALUE, CONFIG, F>::
   try_bulk_delete(Thread* thread, EVALUATE_FUNC& eval_f, DELETE_FUNC& del_f)
 {
   if (!try_resize_lock(thread)) {
-    assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
     return false;
   }
   do_bulk_delete_locked(thread, eval_f, del_f);
   unlock_resize_lock(thread);
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
+  assert(_resize_lock_owner != thread, "Re-size lock held");
   return true;
 }
 
@@ -1140,11 +1123,9 @@ template <typename EVALUATE_FUNC, typename DELETE_FUNC>
 inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   bulk_delete(Thread* thread, EVALUATE_FUNC& eval_f, DELETE_FUNC& del_f)
 {
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
   lock_resize_lock(thread);
   do_bulk_delete_locked(thread, eval_f, del_f);
   unlock_resize_lock(thread);
-  assert(!_resize_lock->owned_by_self(), "Re-size lock not held");
 }
 
 template <typename VALUE, typename CONFIG, MEMFLAGS F>
@@ -1155,17 +1136,16 @@ inline void ConcurrentHashTable<VALUE, CONFIG, F>::
 {
   NumberSeq summary;
   size_t literal_bytes = 0;
-  if ((thread->is_VM_thread() && !SafepointSynchronize::is_at_safepoint()) ||
-      (!thread->is_VM_thread() && !try_resize_lock(thread))) {
+  if (!try_resize_lock(thread)) {
     st->print_cr("statistics unavailable at this moment");
     return;
   }
 
   InternalTable* table = get_table();
-  for (size_t bucket_it = 0; bucket_it < _table->_size; bucket_it++) {
+  for (size_t bucket_it = 0; bucket_it < table->_size; bucket_it++) {
     ScopedCS cs(thread, this);
     size_t count = 0;
-    Bucket* bucket = _table->get_bucket(bucket_it);
+    Bucket* bucket = table->get_bucket(bucket_it);
     if (bucket->have_redirect() || bucket->is_locked()) {
         continue;
     }
@@ -1208,9 +1188,37 @@ inline void ConcurrentHashTable<VALUE, CONFIG, F>::
   st->print_cr("Std. dev. of bucket size: %9.3f", summary.sd());
   st->print_cr("Maximum bucket size     : %9" PRIuPTR,
                (size_t)summary.maximum());
-  if (!thread->is_VM_thread()) {
-    unlock_resize_lock(thread);
+  unlock_resize_lock(thread);
+}
+
+template <typename VALUE, typename CONFIG, MEMFLAGS F>
+inline bool ConcurrentHashTable<VALUE, CONFIG, F>::
+  try_move_nodes_to(Thread* thread, ConcurrentHashTable<VALUE, CONFIG, F>* to_cht)
+{
+  if (!try_resize_lock(thread)) {
+    return false;
   }
+  assert(_new_table == NULL, "Must be NULL");
+  for (size_t bucket_it = 0; bucket_it < _table->_size; bucket_it++) {
+    Bucket* bucket = _table->get_bucket(bucket_it);
+    assert(!bucket->have_redirect() && !bucket->is_locked(), "Table must be uncontended");
+    while (bucket->first() != NULL) {
+      Node* move_node = bucket->first();
+      bool ok = bucket->cas_first(move_node->next(), move_node);
+      assert(ok, "Uncontended cas must work");
+      bool dead_hash = false;
+      size_t insert_hash = CONFIG::get_hash(*move_node->value(), &dead_hash);
+      if (!dead_hash) {
+        Bucket* insert_bucket = to_cht->get_bucket(insert_hash);
+        assert(!bucket->have_redirect() && !bucket->is_locked(), "Not bit should be present");
+        move_node->set_next(insert_bucket->first());
+        ok = insert_bucket->cas_first(move_node, insert_bucket->first());
+        assert(ok, "Uncontended cas must work");
+      }
+    }
+  }
+  unlock_resize_lock(thread);
+  return true;
 }
 
 #endif // include guard
diff --git a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
index 8a1bc40d37b..cfee9fb7e22 100644
--- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_TASKS_INLINE_HPP
 #define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_TASKS_INLINE_HPP
 
+#include "utilities/globalDefinitions.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
 
 // This inline file contains BulkDeleteTask and GrowTasks which are both bucket
@@ -63,6 +64,7 @@ class ConcurrentHashTable<VALUE, CONFIG, F>::BucketsOperation {
   // Calculate starting values.
   void setup() {
     _size_log2 = _cht->_table->_log2_size;
+    _task_size_log2 = MIN2(_task_size_log2, _size_log2);
     size_t tmp = _size_log2 > _task_size_log2 ?
                  _size_log2 - _task_size_log2 : 0;
     _stop_task = (((size_t)1) << tmp);
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index f3dbfef6fb6..420b49b73f2 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -37,6 +37,7 @@
 #include "runtime/os.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadCritical.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/events.hpp"
 #include "utilities/exceptions.hpp"
 
@@ -151,6 +152,10 @@ void Exceptions::_throw(Thread* thread, const char* file, int line, Handle h_exc
     count_out_of_memory_exceptions(h_exception);
   }
 
+  if (h_exception->is_a(SystemDictionary::LinkageError_klass())) {
+    Atomic::inc(&_linkage_errors);
+  }
+
   assert(h_exception->is_a(SystemDictionary::Throwable_klass()), "exception is not a subclass of java/lang/Throwable");
 
   // set the pending exception
@@ -425,6 +430,7 @@ void Exceptions::wrap_dynamic_exception(Thread* THREAD) {
 
 // Exception counting for hs_err file
 volatile int Exceptions::_stack_overflow_errors = 0;
+volatile int Exceptions::_linkage_errors = 0;
 volatile int Exceptions::_out_of_memory_error_java_heap_errors = 0;
 volatile int Exceptions::_out_of_memory_error_metaspace_errors = 0;
 volatile int Exceptions::_out_of_memory_error_class_metaspace_errors = 0;
@@ -458,6 +464,9 @@ void Exceptions::print_exception_counts_on_error(outputStream* st) {
   if (_stack_overflow_errors > 0) {
     st->print_cr("StackOverflowErrors=%d", _stack_overflow_errors);
   }
+  if (_linkage_errors > 0) {
+    st->print_cr("LinkageErrors=%d", _linkage_errors);
+  }
 }
 
 // Implementation of ExceptionMark
diff --git a/src/hotspot/share/utilities/exceptions.hpp b/src/hotspot/share/utilities/exceptions.hpp
index ee8b404b61e..18c40b51780 100644
--- a/src/hotspot/share/utilities/exceptions.hpp
+++ b/src/hotspot/share/utilities/exceptions.hpp
@@ -108,6 +108,9 @@ class Exceptions {
   static volatile int _out_of_memory_error_java_heap_errors;
   static volatile int _out_of_memory_error_metaspace_errors;
   static volatile int _out_of_memory_error_class_metaspace_errors;
+
+  // Count linkage errors
+  static volatile int _linkage_errors;
  public:
   // this enum is defined to indicate whether it is safe to
   // ignore the encoding scheme of the original message string.
diff --git a/src/hotspot/share/utilities/globalCounter.cpp b/src/hotspot/share/utilities/globalCounter.cpp
index 75a4439dc63..30fa4063f35 100644
--- a/src/hotspot/share/utilities/globalCounter.cpp
+++ b/src/hotspot/share/utilities/globalCounter.cpp
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "utilities/globalCounter.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/vmThread.hpp"
diff --git a/src/hotspot/share/utilities/globalCounter.inline.hpp b/src/hotspot/share/utilities/globalCounter.inline.hpp
index 29f140d0c48..f06b4924a5b 100644
--- a/src/hotspot/share/utilities/globalCounter.inline.hpp
+++ b/src/hotspot/share/utilities/globalCounter.inline.hpp
@@ -25,7 +25,7 @@
 #ifndef SHARE_UTILITIES_GLOBAL_COUNTER_INLINE_HPP
 #define SHARE_UTILITIES_GLOBAL_COUNTER_INLINE_HPP
 
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/globalCounter.hpp"
 
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 088316591ea..2dccbc1fe54 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -424,8 +424,8 @@ const int max_method_code_size = 64*K - 1;  // JVM spec, 2nd ed. section 4.8.1 (
 //----------------------------------------------------------------------------------------------------
 // Default and minimum StringTableSize values
 
-const int defaultStringTableSize = NOT_LP64(1009) LP64_ONLY(60013);
-const int minimumStringTableSize = 1009;
+const int defaultStringTableSize = NOT_LP64(1024) LP64_ONLY(65536);
+const int minimumStringTableSize = 128;
 
 const int defaultSymbolTableSize = 20011;
 const int minimumSymbolTableSize = 1009;
diff --git a/src/hotspot/share/utilities/hashtable.inline.hpp b/src/hotspot/share/utilities/hashtable.inline.hpp
index 17ab8d89f4f..6f06d1f6879 100644
--- a/src/hotspot/share/utilities/hashtable.inline.hpp
+++ b/src/hotspot/share/utilities/hashtable.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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,7 +26,7 @@
 #define SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP
 
 #include "memory/allocation.inline.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/dtrace.hpp"
 
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 6abc6d3f0fb..00d5a1bbd42 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -149,6 +149,24 @@
 #define NOT_CMSGC_RETURN_(code) { return code; }
 #endif // INCLUDE_CMSGC
 
+#ifndef INCLUDE_EPSILONGC
+#define INCLUDE_EPSILONGC 1
+#endif // INCLUDE_EPSILONGC
+
+#if INCLUDE_EPSILONGC
+#define EPSILONGC_ONLY(x) x
+#define EPSILONGC_ONLY_ARG(arg) arg,
+#define NOT_EPSILONGC(x)
+#define NOT_EPSILONGC_RETURN        /* next token must be ; */
+#define NOT_EPSILONGC_RETURN_(code) /* next token must be ; */
+#else
+#define EPSILONGC_ONLY(x)
+#define EPSILONGC_ONLY_ARG(arg)
+#define NOT_EPSILONGC(x) x
+#define NOT_EPSILONGC_RETURN        {}
+#define NOT_EPSILONGC_RETURN_(code) { return code; }
+#endif // INCLUDE_EPSILONGC
+
 #ifndef INCLUDE_G1GC
 #define INCLUDE_G1GC 1
 #endif // INCLUDE_G1GC
@@ -203,7 +221,25 @@
 #define NOT_SERIALGC_RETURN_(code) { return code; }
 #endif // INCLUDE_SERIALGC
 
-#if INCLUDE_CMSGC || INCLUDE_G1GC || INCLUDE_PARALLELGC
+#ifndef INCLUDE_ZGC
+#define INCLUDE_ZGC 1
+#endif // INCLUDE_ZGC
+
+#if INCLUDE_ZGC
+#define ZGC_ONLY(x) x
+#define ZGC_ONLY_ARG(arg) arg,
+#define NOT_ZGC(x)
+#define NOT_ZGC_RETURN        /* next token must be ; */
+#define NOT_ZGC_RETURN_(code) /* next token must be ; */
+#else
+#define ZGC_ONLY(x)
+#define ZGC_ONLY_ARG(arg)
+#define NOT_ZGC(x) x
+#define NOT_ZGC_RETURN        {}
+#define NOT_ZGC_RETURN_(code) { return code; }
+#endif // INCLUDE_ZGC
+
+#if INCLUDE_CMSGC || INCLUDE_EPSILONGC || INCLUDE_G1GC || INCLUDE_PARALLELGC || INCLUDE_ZGC
 #define INCLUDE_NOT_ONLY_SERIALGC 1
 #else
 #define INCLUDE_NOT_ONLY_SERIALGC 0
diff --git a/src/hotspot/share/utilities/stringUtils.cpp b/src/hotspot/share/utilities/stringUtils.cpp
index 06d1e91b679..21fb7a6e8d3 100644
--- a/src/hotspot/share/utilities/stringUtils.cpp
+++ b/src/hotspot/share/utilities/stringUtils.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/stringUtils.hpp"
 
 int StringUtils::replace_no_expand(char* string, const char* from, const char* to) {
@@ -43,9 +44,16 @@ int StringUtils::replace_no_expand(char* string, const char* from, const char* t
 }
 
 double StringUtils::similarity(const char* str1, size_t len1, const char* str2, size_t len2) {
-  size_t total = len1 + len2;
+  assert(str1 != NULL && str2 != NULL, "sanity");
 
+  // filter out zero-length strings else we will underflow on len-1 below
+  if (len1 == 0 || len2 == 0) {
+    return 0.0;
+  }
+
+  size_t total = len1 + len2;
   size_t hit = 0;
+
   for (size_t i = 0; i < len1 - 1; i++) {
     for (size_t j = 0; j < len2 - 1; j++) {
       if ((str1[i] == str2[j]) && (str1[i+1] == str2[j+1])) {
diff --git a/src/java.base/aix/native/libjsig/jsig.c b/src/java.base/aix/native/libjsig/jsig.c
deleted file mode 100644
index 8914e2881a9..00000000000
--- a/src/java.base/aix/native/libjsig/jsig.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. 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.
- *
- */
-
-/* CopyrightVersion 1.2 */
-
-/* This is a special library that should be loaded before libc &
- * libthread to interpose the signal handler installation functions:
- * sigaction(), signal(), sigset().
- * Used for signal-chaining. See RFE 4381843.
- */
-
-#include <signal.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "jni.h"
-
-#define bool int
-#define true 1
-#define false 0
-
-static struct sigaction sact[NSIG]; /* saved signal handlers */
-static sigset_t jvmsigs; /* Signals used by jvm. */
-
-/* Used to synchronize the installation of signal handlers. */
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-static pthread_t tid = 0;
-
-typedef void (*sa_handler_t)(int);
-typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
-// signal_t is already defined on AIX.
-typedef sa_handler_t (*signal_like_function_t)(int, sa_handler_t);
-typedef int (*sigaction_t)(int, const struct sigaction *, struct sigaction *);
-
-static signal_like_function_t os_signal = 0; /* os's version of signal()/sigset() */
-static sigaction_t os_sigaction = 0; /* os's version of sigaction() */
-
-static bool jvm_signal_installing = false;
-static bool jvm_signal_installed = false;
-
-static void signal_lock() {
-  pthread_mutex_lock(&mutex);
-  /* When the jvm is installing its set of signal handlers, threads
-   * other than the jvm thread should wait. */
-  if (jvm_signal_installing) {
-    if (tid != pthread_self()) {
-      pthread_cond_wait(&cond, &mutex);
-    }
-  }
-}
-
-static void signal_unlock() {
-  pthread_mutex_unlock(&mutex);
-}
-
-static sa_handler_t call_os_signal(int sig, sa_handler_t disp,
-                                   bool is_sigset) {
-  if (os_signal == NULL) {
-    if (!is_sigset) {
-      // Aix: call functions directly instead of dlsym'ing them.
-      os_signal = signal;
-    } else {
-      // Aix: call functions directly instead of dlsym'ing them.
-      os_signal = sigset;
-    }
-    if (os_signal == NULL) {
-      printf("%s\n", dlerror());
-      exit(0);
-    }
-  }
-  return (*os_signal)(sig, disp);
-}
-
-static void save_signal_handler(int sig, sa_handler_t disp) {
-  sigset_t set;
-  sact[sig].sa_handler = disp;
-  sigemptyset(&set);
-  sact[sig].sa_mask = set;
-  sact[sig].sa_flags = 0;
-}
-
-static sa_handler_t set_signal(int sig, sa_handler_t disp, bool is_sigset) {
-  sa_handler_t oldhandler;
-  bool sigused;
-
-  signal_lock();
-
-  sigused = sigismember(&jvmsigs, sig);
-  if (jvm_signal_installed && sigused) {
-    /* jvm has installed its signal handler for this signal. */
-    /* Save the handler. Don't really install it. */
-    oldhandler = sact[sig].sa_handler;
-    save_signal_handler(sig, disp);
-
-    signal_unlock();
-    return oldhandler;
-  } else if (jvm_signal_installing) {
-    /* jvm is installing its signal handlers. Install the new
-     * handlers and save the old ones. jvm uses sigaction().
-     * Leave the piece here just in case. */
-    oldhandler = call_os_signal(sig, disp, is_sigset);
-    save_signal_handler(sig, oldhandler);
-
-    /* Record the signals used by jvm */
-    sigaddset(&jvmsigs, sig);
-
-    signal_unlock();
-    return oldhandler;
-  } else {
-    /* jvm has no relation with this signal (yet). Install the
-     * the handler. */
-    oldhandler = call_os_signal(sig, disp, is_sigset);
-
-    signal_unlock();
-    return oldhandler;
-  }
-}
-
-JNIEXPORT sa_handler_t JNICALL
-signal(int sig, sa_handler_t disp) {
-  return set_signal(sig, disp, false);
-}
-
-JNIEXPORT sa_handler_t JNICALL
-sigset(int sig, sa_handler_t disp) {
-  return set_signal(sig, disp, true);
-}
-
-static int call_os_sigaction(int sig, const struct sigaction  *act,
-                             struct sigaction *oact) {
-  if (os_sigaction == NULL) {
-    // Aix: call functions directly instead of dlsym'ing them.
-    os_sigaction = sigaction;
-    if (os_sigaction == NULL) {
-      printf("%s\n", dlerror());
-      exit(0);
-    }
-  }
-  return (*os_sigaction)(sig, act, oact);
-}
-
-JNIEXPORT int JNICALL
-sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
-  int res;
-  bool sigused;
-  struct sigaction oldAct;
-
-  signal_lock();
-
-  sigused = sigismember(&jvmsigs, sig);
-  if (jvm_signal_installed && sigused) {
-    /* jvm has installed its signal handler for this signal. */
-    /* Save the handler. Don't really install it. */
-    if (oact != NULL) {
-      *oact = sact[sig];
-    }
-    if (act != NULL) {
-      sact[sig] = *act;
-    }
-
-    signal_unlock();
-    return 0;
-  } else if (jvm_signal_installing) {
-    /* jvm is installing its signal handlers. Install the new
-     * handlers and save the old ones. */
-    res = call_os_sigaction(sig, act, &oldAct);
-    sact[sig] = oldAct;
-    if (oact != NULL) {
-      *oact = oldAct;
-    }
-
-    /* Record the signals used by jvm. */
-    sigaddset(&jvmsigs, sig);
-
-    signal_unlock();
-    return res;
-  } else {
-    /* jvm has no relation with this signal (yet). Install the
-     * the handler. */
-    res = call_os_sigaction(sig, act, oact);
-
-    signal_unlock();
-    return res;
-  }
-}
-
-/* The three functions for the jvm to call into. */
-JNIEXPORT void JNICALL
-JVM_begin_signal_setting() {
-  signal_lock();
-  sigemptyset(&jvmsigs);
-  jvm_signal_installing = true;
-  tid = pthread_self();
-  signal_unlock();
-}
-
-JNIEXPORT void JNICALL
-JVM_end_signal_setting() {
-  signal_lock();
-  jvm_signal_installed = true;
-  jvm_signal_installing = false;
-  pthread_cond_broadcast(&cond);
-  signal_unlock();
-}
-
-JNIEXPORT struct sigaction * JNICALL
-JVM_get_signal_action(int sig) {
-  /* Does race condition make sense here? */
-  if (sigismember(&jvmsigs, sig)) {
-    return &sact[sig];
-  }
-  return NULL;
-}
diff --git a/src/java.base/macosx/native/libjava/java_props_macosx.c b/src/java.base/macosx/native/libjava/java_props_macosx.c
index 392f548e076..68c90ba9f7a 100644
--- a/src/java.base/macosx/native/libjava/java_props_macosx.c
+++ b/src/java.base/macosx/native/libjava/java_props_macosx.c
@@ -47,6 +47,7 @@ char *getPosixLocale(int cat) {
 #define LOCALEIDLENGTH  128
 char *getMacOSXLocale(int cat) {
     const char* retVal = NULL;
+    char languageString[LOCALEIDLENGTH];
     char localeString[LOCALEIDLENGTH];
 
     switch (cat) {
@@ -67,7 +68,6 @@ char *getMacOSXLocale(int cat) {
                 CFRelease(languages);
                 return NULL;
             }
-            char languageString[LOCALEIDLENGTH];
             if (CFStringGetCString(primaryLanguage, languageString,
                                    LOCALEIDLENGTH, CFStringGetSystemEncoding()) == false) {
                 CFRelease(languages);
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
new file mode 100644
index 00000000000..cdecde2489b
--- /dev/null
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
@@ -0,0 +1,1389 @@
+/*
+ * 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 com.sun.crypto.provider;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.security.*;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+import java.util.Objects;
+import javax.crypto.spec.ChaCha20ParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.*;
+import sun.security.util.DerValue;
+
+/**
+ * Implementation of the ChaCha20 cipher, as described in RFC 7539.
+ *
+ * @since 11
+ */
+abstract class ChaCha20Cipher extends CipherSpi {
+    // Mode constants
+    private static final int MODE_NONE = 0;
+    private static final int MODE_AEAD = 1;
+
+    // Constants used in setting up the initial state
+    private static final int STATE_CONST_0 = 0x61707865;
+    private static final int STATE_CONST_1 = 0x3320646e;
+    private static final int STATE_CONST_2 = 0x79622d32;
+    private static final int STATE_CONST_3 = 0x6b206574;
+
+    // The keystream block size in bytes and as integers
+    private static final int KEYSTREAM_SIZE = 64;
+    private static final int KS_SIZE_INTS = KEYSTREAM_SIZE / Integer.BYTES;
+    private static final int CIPHERBUF_BASE = 1024;
+
+    // The initialization state of the cipher
+    private boolean initialized;
+
+    // The mode of operation for this object
+    protected int mode;
+
+    // The direction (encrypt vs. decrypt) for the data flow
+    private int direction;
+
+    // Has all AAD data been provided (i.e. have we called our first update)
+    private boolean aadDone = false;
+
+    // The key's encoding in bytes for this object
+    private byte[] keyBytes;
+
+    // The nonce used for this object
+    private byte[] nonce;
+
+    // The counter
+    private static final long MAX_UINT32 = 0x00000000FFFFFFFFL;
+    private long finalCounterValue;
+    private long counter;
+
+    // Two arrays, both implemented as 16-element integer arrays:
+    // The base state, created at initialization time, and a working
+    // state which is a clone of the start state, and is then modified
+    // with the counter and the ChaCha20 block function.
+    private final int[] startState = new int[KS_SIZE_INTS];
+    private final byte[] keyStream = new byte[KEYSTREAM_SIZE];
+
+    // The offset into the current keystream
+    private int keyStrOffset;
+
+    // AEAD-related fields and constants
+    private static final int TAG_LENGTH = 16;
+    private long aadLen;
+    private long dataLen;
+
+    // Have a buffer of zero padding that can be read all or in part
+    // by the authenticator.
+    private static final byte[] padBuf = new byte[TAG_LENGTH];
+
+    // Create a buffer for holding the AAD and Ciphertext lengths
+    private final byte[] lenBuf = new byte[TAG_LENGTH];
+
+    // The authenticator (Poly1305) when running in AEAD mode
+    protected String authAlgName;
+    private Poly1305 authenticator;
+
+    // The underlying engine for doing the ChaCha20/Poly1305 work
+    private ChaChaEngine engine;
+
+    // Use this VarHandle for converting the state elements into little-endian
+    // integer values for the ChaCha20 block function.
+    private static final VarHandle asIntLittleEndian =
+            MethodHandles.byteArrayViewVarHandle(int[].class,
+                    ByteOrder.LITTLE_ENDIAN);
+
+    // Use this VarHandle for converting the AAD and data lengths into
+    // little-endian long values for AEAD tag computations.
+    private static final VarHandle asLongLittleEndian =
+            MethodHandles.byteArrayViewVarHandle(long[].class,
+                    ByteOrder.LITTLE_ENDIAN);
+
+    // Use this for pulling in 8 bytes at a time as longs for XOR operations
+    private static final VarHandle asLongView =
+            MethodHandles.byteArrayViewVarHandle(long[].class,
+                    ByteOrder.nativeOrder());
+
+    /**
+     * Default constructor.
+     */
+    protected ChaCha20Cipher() {
+    }
+
+    /**
+     * Set the mode of operation.  Since this is a stream cipher, there
+     * is no mode of operation in the block-cipher sense of things.  The
+     * protected {@code mode} field will only accept a value of {@code None}
+     * (case-insensitive).
+     *
+     * @param mode The mode value
+     *
+     * @throws NoSuchAlgorithmException if a mode of operation besides
+     *      {@code None} is provided.
+     */
+    @Override
+    protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
+        if (mode.equalsIgnoreCase("None") == false) {
+            throw new NoSuchAlgorithmException("Mode must be None");
+        }
+    }
+
+    /**
+     * Set the padding scheme.  Padding schemes do not make sense with stream
+     * ciphers, but allow {@code NoPadding}.  See JCE spec.
+     *
+     * @param padding The padding type.  The only allowed value is
+     *      {@code NoPadding} case insensitive).
+     *
+     * @throws NoSuchPaddingException if a padding scheme besides
+     *      {@code NoPadding} is provided.
+     */
+    @Override
+    protected void engineSetPadding(String padding)
+            throws NoSuchPaddingException {
+        if (padding.equalsIgnoreCase("NoPadding") == false) {
+            throw new NoSuchPaddingException("Padding must be NoPadding");
+        }
+    }
+
+    /**
+     * Returns the block size.  For a stream cipher like ChaCha20, this
+     * value will always be zero.
+     *
+     * @return This method always returns 0.  See the JCE Specification.
+     */
+    @Override
+    protected int engineGetBlockSize() {
+        return 0;
+    }
+
+    /**
+     * Get the output size based on an input length.  In simple stream-cipher
+     * mode, the output size will equal the input size.  For ChaCha20-Poly1305
+     * for encryption the output size will be the sum of the input length
+     * and tag length.  For decryption, the output size will be the input
+     * length less the tag length or zero, whichever is larger.
+     *
+     * @param inputLen the length in bytes of the input
+     *
+     * @return the output length in bytes.
+     */
+    @Override
+    protected int engineGetOutputSize(int inputLen) {
+        int outLen = 0;
+
+        if (mode == MODE_NONE) {
+            outLen = inputLen;
+        } else if (mode == MODE_AEAD) {
+            outLen = (direction == Cipher.ENCRYPT_MODE) ?
+                    Math.addExact(inputLen, TAG_LENGTH) :
+                    Integer.max(inputLen - TAG_LENGTH, 0);
+        }
+
+        return outLen;
+    }
+
+    /**
+     * Get the nonce value used.
+     *
+     * @return the nonce bytes.  For ChaCha20 this will be a 12-byte value.
+     */
+    @Override
+    protected byte[] engineGetIV() {
+        return nonce.clone();
+    }
+
+    /**
+     * Get the algorithm parameters for this cipher.  For the ChaCha20
+     * cipher, this will always return {@code null} as there currently is
+     * no {@code AlgorithmParameters} implementation for ChaCha20.  For
+     * ChaCha20-Poly1305, a {@code ChaCha20Poly1305Parameters} object will be
+     * created and initialized with the configured nonce value and returned
+     * to the caller.
+     *
+     * @return a {@code null} value if the ChaCha20 cipher is used (mode is
+     * MODE_NONE), or a {@code ChaCha20Poly1305Parameters} object containing
+     * the nonce if the mode is MODE_AEAD.
+     */
+    @Override
+    protected AlgorithmParameters engineGetParameters() {
+        AlgorithmParameters params = null;
+        if (mode == MODE_AEAD) {
+            try {
+                // Force the 12-byte nonce into a DER-encoded OCTET_STRING
+                byte[] derNonce = new byte[nonce.length + 2];
+                derNonce[0] = 0x04;                 // OCTET_STRING tag
+                derNonce[1] = (byte)nonce.length;   // 12-byte length;
+                System.arraycopy(nonce, 0, derNonce, 2, nonce.length);
+                params = AlgorithmParameters.getInstance("ChaCha20-Poly1305");
+                params.init(derNonce);
+            } catch (NoSuchAlgorithmException | IOException exc) {
+                throw new RuntimeException(exc);
+            }
+        }
+
+        return params;
+    }
+
+    /**
+     * Initialize the engine using a key and secure random implementation.  If
+     * a SecureRandom object is provided it will be used to create a random
+     * nonce value.  If the {@code random} parameter is null an internal
+     * secure random source will be used to create the random nonce.
+     * The counter value will be set to 1.
+     *
+     * @param opmode the type of operation to do.  This value may not be
+     *      {@code Cipher.DECRYPT_MODE} or {@code Cipher.UNWRAP_MODE} mode
+     *      because it must generate random parameters like the nonce.
+     * @param key a 256-bit key suitable for ChaCha20
+     * @param random a {@code SecureRandom} implementation used to create the
+     *      random nonce.  If {@code null} is used for the random object,
+     *      then an internal secure random source will be used to create the
+     *      nonce.
+     *
+     * @throws UnsupportedOperationException if the mode of operation
+     *      is {@code Cipher.WRAP_MODE} or {@code Cipher.UNWRAP_MODE}
+     *      (currently unsupported).
+     * @throws InvalidKeyException if the key is of the wrong type or is
+     *      not 256-bits in length.  This will also be thrown if the opmode
+     *      parameter is {@code Cipher.DECRYPT_MODE}.
+     *      {@code Cipher.UNWRAP_MODE} would normally be disallowed in this
+     *      context but it is preempted by the UOE case above.
+     */
+    @Override
+    protected void engineInit(int opmode, Key key, SecureRandom random)
+            throws InvalidKeyException {
+        if (opmode != Cipher.DECRYPT_MODE) {
+            byte[] newNonce = createRandomNonce(random);
+            counter = 1;
+            init(opmode, key, newNonce);
+        } else {
+            throw new InvalidKeyException("Default parameter generation " +
+                "disallowed in DECRYPT and UNWRAP modes");
+        }
+    }
+
+    /**
+     * Initialize the engine using a key and secure random implementation.
+     *
+     * @param opmode the type of operation to do.  This value must be either
+     *      {@code Cipher.ENCRYPT_MODE} or {@code Cipher.DECRYPT_MODE}
+     * @param key a 256-bit key suitable for ChaCha20
+     * @param params a {@code ChaCha20ParameterSpec} that will provide
+     *      the nonce and initial block counter value.
+     * @param random a {@code SecureRandom} implementation, this parameter
+     *      is not used in this form of the initializer.
+     *
+     * @throws UnsupportedOperationException if the mode of operation
+     *      is {@code Cipher.WRAP_MODE} or {@code Cipher.UNWRAP_MODE}
+     *      (currently unsupported).
+     * @throws InvalidKeyException if the key is of the wrong type or is
+     *      not 256-bits in length.  This will also be thrown if the opmode
+     *      parameter is not {@code Cipher.ENCRYPT_MODE} or
+     *      {@code Cipher.DECRYPT_MODE} (excepting the UOE case above).
+     * @throws InvalidAlgorithmParameterException if {@code params} is
+     *      not a {@code ChaCha20ParameterSpec}
+     * @throws NullPointerException if {@code params} is {@code null}
+     */
+    @Override
+    protected void engineInit(int opmode, Key key,
+            AlgorithmParameterSpec params, SecureRandom random)
+            throws InvalidKeyException, InvalidAlgorithmParameterException {
+
+        // If AlgorithmParameterSpec is null, then treat this like an init
+        // of the form (int, Key, SecureRandom)
+        if (params == null) {
+            engineInit(opmode, key, random);
+            return;
+        }
+
+        // We will ignore the secure random implementation and use the nonce
+        // from the AlgorithmParameterSpec instead.
+        byte[] newNonce = null;
+        switch (mode) {
+            case MODE_NONE:
+                if (!(params instanceof ChaCha20ParameterSpec)) {
+                    throw new InvalidAlgorithmParameterException(
+                        "ChaCha20 algorithm requires ChaCha20ParameterSpec");
+                }
+                ChaCha20ParameterSpec chaParams = (ChaCha20ParameterSpec)params;
+                newNonce = chaParams.getNonce();
+                counter = ((long)chaParams.getCounter()) & 0x00000000FFFFFFFFL;
+                break;
+            case MODE_AEAD:
+                if (!(params instanceof IvParameterSpec)) {
+                    throw new InvalidAlgorithmParameterException(
+                        "ChaCha20-Poly1305 requires IvParameterSpec");
+                }
+                IvParameterSpec ivParams = (IvParameterSpec)params;
+                newNonce = ivParams.getIV();
+                if (newNonce.length != 12) {
+                    throw new InvalidAlgorithmParameterException(
+                        "ChaCha20-Poly1305 nonce must be 12 bytes in length");
+                }
+                break;
+            default:
+                // Should never happen
+                throw new RuntimeException("ChaCha20 in unsupported mode");
+        }
+        init(opmode, key, newNonce);
+    }
+
+    /**
+     * Initialize the engine using the {@code AlgorithmParameter} initialization
+     * format.  This cipher does supports initialization with
+     * {@code AlgorithmParameter} objects for ChaCha20-Poly1305 but not for
+     * ChaCha20 as a simple stream cipher.  In the latter case, it will throw
+     * an {@code InvalidAlgorithmParameterException} if the value is non-null.
+     * If a null value is supplied for the {@code params} field
+     * the cipher will be initialized with the counter value set to 1 and
+     * a random nonce.  If {@code null} is used for the random object,
+     * then an internal secure random source will be used to create the
+     * nonce.
+     *
+     * @param opmode the type of operation to do.  This value must be either
+     *      {@code Cipher.ENCRYPT_MODE} or {@code Cipher.DECRYPT_MODE}
+     * @param key a 256-bit key suitable for ChaCha20
+     * @param params a {@code null} value if the algorithm is ChaCha20, or
+     *      the appropriate {@code AlgorithmParameters} object containing the
+     *      nonce information if the algorithm is ChaCha20-Poly1305.
+     * @param random a {@code SecureRandom} implementation, may be {@code null}.
+     *
+     * @throws UnsupportedOperationException if the mode of operation
+     *      is {@code Cipher.WRAP_MODE} or {@code Cipher.UNWRAP_MODE}
+     *      (currently unsupported).
+     * @throws InvalidKeyException if the key is of the wrong type or is
+     *      not 256-bits in length.  This will also be thrown if the opmode
+     *      parameter is not {@code Cipher.ENCRYPT_MODE} or
+     *      {@code Cipher.DECRYPT_MODE} (excepting the UOE case above).
+     * @throws InvalidAlgorithmParameterException if {@code params} is
+     *      non-null and the algorithm is ChaCha20.  This exception will be
+     *      also thrown if the algorithm is ChaCha20-Poly1305 and an incorrect
+     *      {@code AlgorithmParameters} object is supplied.
+     */
+    @Override
+    protected void engineInit(int opmode, Key key,
+            AlgorithmParameters params, SecureRandom random)
+            throws InvalidKeyException, InvalidAlgorithmParameterException {
+
+        // If AlgorithmParameters is null, then treat this like an init
+        // of the form (int, Key, SecureRandom)
+        if (params == null) {
+            engineInit(opmode, key, random);
+            return;
+        }
+
+        byte[] newNonce = null;
+        switch (mode) {
+            case MODE_NONE:
+                throw new InvalidAlgorithmParameterException(
+                        "AlgorithmParameters not supported");
+            case MODE_AEAD:
+                String paramAlg = params.getAlgorithm();
+                if (!paramAlg.equalsIgnoreCase("ChaCha20-Poly1305")) {
+                    throw new InvalidAlgorithmParameterException(
+                            "Invalid parameter type: " + paramAlg);
+                }
+                try {
+                    DerValue dv = new DerValue(params.getEncoded());
+                    newNonce = dv.getOctetString();
+                    if (newNonce.length != 12) {
+                        throw new InvalidAlgorithmParameterException(
+                                "ChaCha20-Poly1305 nonce must be " +
+                                "12 bytes in length");
+                    }
+                } catch (IOException ioe) {
+                    throw new InvalidAlgorithmParameterException(ioe);
+                }
+                break;
+            default:
+                throw new RuntimeException("Invalid mode: " + mode);
+        }
+
+        // If after all the above processing we still don't have a nonce value
+        // then supply a random one provided a random source has been given.
+        if (newNonce == null) {
+            newNonce = createRandomNonce(random);
+        }
+
+        // Continue with initialization
+        init(opmode, key, newNonce);
+    }
+
+    /**
+     * Update additional authenticated data (AAD).
+     *
+     * @param src the byte array containing the authentication data.
+     * @param offset the starting offset in the buffer to update.
+     * @param len the amount of authentication data to update.
+     *
+     * @throws IllegalStateException if the cipher has not been initialized,
+     *      {@code engineUpdate} has been called, or the cipher is running
+     *      in a non-AEAD mode of operation.  It will also throw this
+     *      exception if the submitted AAD would overflow a 64-bit length
+     *      counter.
+     */
+    @Override
+    protected void engineUpdateAAD(byte[] src, int offset, int len) {
+        if (!initialized) {
+            // We know that the cipher has not been initialized if the key
+            // is still null.
+            throw new IllegalStateException(
+                    "Attempted to update AAD on uninitialized Cipher");
+        } else if (aadDone) {
+            // No AAD updates allowed after the PT/CT update method is called
+            throw new IllegalStateException("Attempted to update AAD on " +
+                    "Cipher after plaintext/ciphertext update");
+        } else if (mode != MODE_AEAD) {
+            throw new IllegalStateException(
+                    "Cipher is running in non-AEAD mode");
+        } else {
+            try {
+                aadLen = Math.addExact(aadLen, len);
+                authUpdate(src, offset, len);
+            } catch (ArithmeticException ae) {
+                throw new IllegalStateException("AAD overflow", ae);
+            }
+        }
+    }
+
+    /**
+     * Update additional authenticated data (AAD).
+     *
+     * @param src the ByteBuffer containing the authentication data.
+     *
+     * @throws IllegalStateException if the cipher has not been initialized,
+     *      {@code engineUpdate} has been called, or the cipher is running
+     *      in a non-AEAD mode of operation.  It will also throw this
+     *      exception if the submitted AAD would overflow a 64-bit length
+     *      counter.
+     */
+    @Override
+    protected void engineUpdateAAD(ByteBuffer src) {
+        if (!initialized) {
+            // We know that the cipher has not been initialized if the key
+            // is still null.
+            throw new IllegalStateException(
+                    "Attempted to update AAD on uninitialized Cipher");
+        } else if (aadDone) {
+            // No AAD updates allowed after the PT/CT update method  is called
+            throw new IllegalStateException("Attempted to update AAD on " +
+                    "Cipher after plaintext/ciphertext update");
+        } else if (mode != MODE_AEAD) {
+            throw new IllegalStateException(
+                    "Cipher is running in non-AEAD mode");
+        } else {
+            try {
+                aadLen = Math.addExact(aadLen, (src.limit() - src.position()));
+                authenticator.engineUpdate(src);
+            } catch (ArithmeticException ae) {
+                throw new IllegalStateException("AAD overflow", ae);
+            }
+        }
+    }
+
+    /**
+     * Create a random 12-byte nonce.
+     *
+     * @param random a {@code SecureRandom} object.  If {@code null} is
+     * provided a new {@code SecureRandom} object will be instantiated.
+     *
+     * @return a 12-byte array containing the random nonce.
+     */
+    private byte[] createRandomNonce(SecureRandom random) {
+        byte[] newNonce = new byte[12];
+        SecureRandom rand = (random != null) ? random : new SecureRandom();
+        rand.nextBytes(newNonce);
+        return newNonce;
+    }
+
+    /**
+     * Perform additional initialization actions based on the key and operation
+     * type.
+     *
+     * @param opmode the type of operation to do.  This value must be either
+     *      {@code Cipher.ENCRYPT_MODE} or {@code Cipher.DECRYPT_MODE}
+     * @param key a 256-bit key suitable for ChaCha20
+     * @param newNonce the new nonce value for this initialization.
+     *
+     * @throws UnsupportedOperationException if the {@code opmode} parameter
+     *      is {@code Cipher.WRAP_MODE} or {@code Cipher.UNWRAP_MODE}
+     *      (currently unsupported).
+     * @throws InvalidKeyException if the {@code opmode} parameter is not
+     *      {@code Cipher.ENCRYPT_MODE} or {@code Cipher.DECRYPT_MODE}, or
+     *      if the key format is not {@code RAW}.
+     */
+    private void init(int opmode, Key key, byte[] newNonce)
+            throws InvalidKeyException {
+        if ((opmode == Cipher.WRAP_MODE) || (opmode == Cipher.UNWRAP_MODE)) {
+            throw new UnsupportedOperationException(
+                    "WRAP_MODE and UNWRAP_MODE are not currently supported");
+        } else if ((opmode != Cipher.ENCRYPT_MODE) &&
+                (opmode != Cipher.DECRYPT_MODE)) {
+            throw new InvalidKeyException("Unknown opmode: " + opmode);
+        }
+
+        // Make sure that the provided key and nonce are unique before
+        // assigning them to the object.
+        byte[] newKeyBytes = getEncodedKey(key);
+        checkKeyAndNonce(newKeyBytes, newNonce);
+        this.keyBytes = newKeyBytes;
+        nonce = newNonce;
+
+        // Now that we have the key and nonce, we can build the initial state
+        setInitialState();
+
+        if (mode == MODE_NONE) {
+            engine = new EngineStreamOnly();
+        } else if (mode == MODE_AEAD) {
+            if (opmode == Cipher.ENCRYPT_MODE) {
+                engine = new EngineAEADEnc();
+            } else if (opmode == Cipher.DECRYPT_MODE) {
+                engine = new EngineAEADDec();
+            } else {
+                throw new InvalidKeyException("Not encrypt or decrypt mode");
+            }
+        }
+
+        // We can also get one block's worth of keystream created
+        finalCounterValue = counter + MAX_UINT32;
+        generateKeystream();
+        direction = opmode;
+        aadDone = false;
+        this.keyStrOffset = 0;
+        initialized = true;
+    }
+
+    /**
+     * Check the key and nonce bytes to make sure that they do not repeat
+     * across reinitialization.
+     *
+     * @param newKeyBytes the byte encoding for the newly provided key
+     * @param newNonce the new nonce to be used with this initialization
+     *
+     * @throws InvalidKeyException if both the key and nonce match the
+     *      previous initialization.
+     *
+     */
+    private void checkKeyAndNonce(byte[] newKeyBytes, byte[] newNonce)
+            throws InvalidKeyException {
+        // A new initialization must have either a different key or nonce
+        // so the starting state for each block is not the same as the
+        // previous initialization.
+        if (MessageDigest.isEqual(newKeyBytes, keyBytes) &&
+                MessageDigest.isEqual(newNonce, nonce)) {
+            throw new InvalidKeyException(
+                    "Matching key and nonce from previous initialization");
+        }
+    }
+
+    /**
+     * Return the encoded key as a byte array
+     *
+     * @param key the {@code Key} object used for this {@code Cipher}
+     *
+     * @return the key bytes
+     *
+     * @throws InvalidKeyException if the key is of the wrong type or length,
+     *      or if the key encoding format is not {@code RAW}.
+     */
+    private static byte[] getEncodedKey(Key key) throws InvalidKeyException {
+        if ("RAW".equals(key.getFormat()) == false) {
+            throw new InvalidKeyException("Key encoding format must be RAW");
+        }
+        byte[] encodedKey = key.getEncoded();
+        if (encodedKey == null || encodedKey.length != 32) {
+            throw new InvalidKeyException("Key length must be 256 bits");
+        }
+        return encodedKey;
+    }
+
+    /**
+     * Update the currently running operation with additional data
+     *
+     * @param in the plaintext or ciphertext input bytes (depending on the
+     *      operation type).
+     * @param inOfs the offset into the input array
+     * @param inLen the length of the data to use for the update operation.
+     *
+     * @return the resulting plaintext or ciphertext bytes (depending on
+     *      the operation type)
+     */
+    @Override
+    protected byte[] engineUpdate(byte[] in, int inOfs, int inLen) {
+        byte[] out = new byte[inLen];
+        try {
+            engine.doUpdate(in, inOfs, inLen, out, 0);
+        } catch (ShortBufferException | KeyException exc) {
+            throw new RuntimeException(exc);
+        }
+
+        return out;
+    }
+
+    /**
+     * Update the currently running operation with additional data
+     *
+     * @param in the plaintext or ciphertext input bytes (depending on the
+     *      operation type).
+     * @param inOfs the offset into the input array
+     * @param inLen the length of the data to use for the update operation.
+     * @param out the byte array that will hold the resulting data.  The array
+     *      must be large enough to hold the resulting data.
+     * @param outOfs the offset for the {@code out} buffer to begin writing
+     *      the resulting data.
+     *
+     * @return the length in bytes of the data written into the {@code out}
+     *      buffer.
+     *
+     * @throws ShortBufferException if the buffer {@code out} does not have
+     *      enough space to hold the resulting data.
+     */
+    @Override
+    protected int engineUpdate(byte[] in, int inOfs, int inLen,
+            byte[] out, int outOfs) throws ShortBufferException {
+        int bytesUpdated = 0;
+        try {
+            bytesUpdated = engine.doUpdate(in, inOfs, inLen, out, outOfs);
+        } catch (KeyException ke) {
+            throw new RuntimeException(ke);
+        }
+        return bytesUpdated;
+    }
+
+    /**
+     * Complete the currently running operation using any final
+     * data provided by the caller.
+     *
+     * @param in the plaintext or ciphertext input bytes (depending on the
+     *      operation type).
+     * @param inOfs the offset into the input array
+     * @param inLen the length of the data to use for the update operation.
+     *
+     * @return the resulting plaintext or ciphertext bytes (depending on
+     *      the operation type)
+     *
+     * @throws AEADBadTagException if, during decryption, the provided tag
+     *      does not match the calculated tag.
+     */
+    @Override
+    protected byte[] engineDoFinal(byte[] in, int inOfs, int inLen)
+            throws AEADBadTagException {
+        byte[] output = new byte[engineGetOutputSize(inLen)];
+        try {
+            engine.doFinal(in, inOfs, inLen, output, 0);
+        } catch (ShortBufferException | KeyException exc) {
+            throw new RuntimeException(exc);
+        } finally {
+            // Regardless of what happens, the cipher cannot be used for
+            // further processing until it has been freshly initialized.
+            initialized = false;
+        }
+        return output;
+    }
+
+    /**
+     * Complete the currently running operation using any final
+     * data provided by the caller.
+     *
+     * @param in the plaintext or ciphertext input bytes (depending on the
+     *      operation type).
+     * @param inOfs the offset into the input array
+     * @param inLen the length of the data to use for the update operation.
+     * @param out the byte array that will hold the resulting data.  The array
+     *      must be large enough to hold the resulting data.
+     * @param outOfs the offset for the {@code out} buffer to begin writing
+     *      the resulting data.
+     *
+     * @return the length in bytes of the data written into the {@code out}
+     *      buffer.
+     *
+     * @throws ShortBufferException if the buffer {@code out} does not have
+     *      enough space to hold the resulting data.
+     * @throws AEADBadTagException if, during decryption, the provided tag
+     *      does not match the calculated tag.
+     */
+    @Override
+    protected int engineDoFinal(byte[] in, int inOfs, int inLen, byte[] out,
+            int outOfs) throws ShortBufferException, AEADBadTagException {
+
+        int bytesUpdated = 0;
+        try {
+            bytesUpdated = engine.doFinal(in, inOfs, inLen, out, outOfs);
+        } catch (KeyException ke) {
+            throw new RuntimeException(ke);
+        } finally {
+            // Regardless of what happens, the cipher cannot be used for
+            // further processing until it has been freshly initialized.
+            initialized = false;
+        }
+        return bytesUpdated;
+    }
+
+    /**
+     * Wrap a {@code Key} using this Cipher's current encryption parameters.
+     *
+     * @param key the key to wrap.  The data that will be encrypted will
+     *      be the provided {@code Key} in its encoded form.
+     *
+     * @return a byte array consisting of the wrapped key.
+     *
+     * @throws UnsupportedOperationException this will (currently) always
+     *      be thrown, as this method is not currently supported.
+     */
+    @Override
+    protected byte[] engineWrap(Key key) throws IllegalBlockSizeException,
+            InvalidKeyException {
+        throw new UnsupportedOperationException(
+                "Wrap operations are not supported");
+    }
+
+    /**
+     * Unwrap a {@code Key} using this Cipher's current encryption parameters.
+     *
+     * @param wrappedKey the key to unwrap.
+     * @param algorithm the algorithm associated with the wrapped key
+     * @param type the type of the wrapped key. This is one of
+     *      {@code SECRET_KEY}, {@code PRIVATE_KEY}, or {@code PUBLIC_KEY}.
+     *
+     * @return the unwrapped key as a {@code Key} object.
+     *
+     * @throws UnsupportedOperationException this will (currently) always
+     *      be thrown, as this method is not currently supported.
+     */
+    @Override
+    protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
+            int type) throws InvalidKeyException, NoSuchAlgorithmException {
+        throw new UnsupportedOperationException(
+                "Unwrap operations are not supported");
+    }
+
+    /**
+     * Get the length of a provided key in bits.
+     *
+     * @param key the key to be evaluated
+     *
+     * @return the length of the key in bits
+     *
+     * @throws InvalidKeyException if the key is invalid or does not
+     *      have an encoded form.
+     */
+    @Override
+    protected int engineGetKeySize(Key key) throws InvalidKeyException {
+        byte[] encodedKey = getEncodedKey(key);
+        return encodedKey.length << 3;
+    }
+
+    /**
+     * Set the initial state.  This will populate the state array and put the
+     * key and nonce into their proper locations.  The counter field is not
+     * set here.
+     *
+     * @throws IllegalArgumentException if the key or nonce are not in
+     *      their proper lengths (32 bytes for the key, 12 bytes for the
+     *      nonce).
+     * @throws InvalidKeyException if the key does not support an encoded form.
+     */
+    private void setInitialState() throws InvalidKeyException {
+        // Apply constants to first 4 words
+        startState[0] = STATE_CONST_0;
+        startState[1] = STATE_CONST_1;
+        startState[2] = STATE_CONST_2;
+        startState[3] = STATE_CONST_3;
+
+        // Apply the key bytes as 8 32-bit little endian ints (4 through 11)
+        for (int i = 0; i < 32; i += 4) {
+            startState[(i / 4) + 4] = (keyBytes[i] & 0x000000FF) |
+                ((keyBytes[i + 1] << 8) & 0x0000FF00) |
+                ((keyBytes[i + 2] << 16) & 0x00FF0000) |
+                ((keyBytes[i + 3] << 24) & 0xFF000000);
+        }
+
+        startState[12] = 0;
+
+        // The final integers for the state are from the nonce
+        // interpreted as 3 little endian integers
+        for (int i = 0; i < 12; i += 4) {
+            startState[(i / 4) + 13] = (nonce[i] & 0x000000FF) |
+                ((nonce[i + 1] << 8) & 0x0000FF00) |
+                ((nonce[i + 2] << 16) & 0x00FF0000) |
+                ((nonce[i + 3] << 24) & 0xFF000000);
+        }
+    }
+
+    /**
+     * Using the current state and counter create the next set of keystream
+     * bytes.  This method will generate the next 512 bits of keystream and
+     * return it in the {@code keyStream} parameter.  Following the
+     * block function the counter will be incremented.
+     */
+    private void generateKeystream() {
+        chaCha20Block(startState, counter, keyStream);
+        counter++;
+    }
+
+    /**
+     * Perform a full 20-round ChaCha20 transform on the initial state.
+     *
+     * @param initState the starting state, not including the counter
+     *      value.
+     * @param counter the counter value to apply
+     * @param result  the array that will hold the result of the ChaCha20
+     *      block function.
+     *
+     * @note it is the caller's responsibility to ensure that the workState
+     * is sized the same as the initState, no checking is performed internally.
+     */
+    private static void chaCha20Block(int[] initState, long counter,
+                                      byte[] result) {
+        // Create an initial state and clone a working copy
+        int ws00 = STATE_CONST_0;
+        int ws01 = STATE_CONST_1;
+        int ws02 = STATE_CONST_2;
+        int ws03 = STATE_CONST_3;
+        int ws04 = initState[4];
+        int ws05 = initState[5];
+        int ws06 = initState[6];
+        int ws07 = initState[7];
+        int ws08 = initState[8];
+        int ws09 = initState[9];
+        int ws10 = initState[10];
+        int ws11 = initState[11];
+        int ws12 = (int)counter;
+        int ws13 = initState[13];
+        int ws14 = initState[14];
+        int ws15 = initState[15];
+
+        // Peform 10 iterations of the 8 quarter round set
+        for (int round = 0; round < 10; round++) {
+            ws00 += ws04;
+            ws12 = Integer.rotateLeft(ws12 ^ ws00, 16);
+
+            ws08 += ws12;
+            ws04 = Integer.rotateLeft(ws04 ^ ws08, 12);
+
+            ws00 += ws04;
+            ws12 = Integer.rotateLeft(ws12 ^ ws00, 8);
+
+            ws08 += ws12;
+            ws04 = Integer.rotateLeft(ws04 ^ ws08, 7);
+
+            ws01 += ws05;
+            ws13 = Integer.rotateLeft(ws13 ^ ws01, 16);
+
+            ws09 += ws13;
+            ws05 = Integer.rotateLeft(ws05 ^ ws09, 12);
+
+            ws01 += ws05;
+            ws13 = Integer.rotateLeft(ws13 ^ ws01, 8);
+
+            ws09 += ws13;
+            ws05 = Integer.rotateLeft(ws05 ^ ws09, 7);
+
+            ws02 += ws06;
+            ws14 = Integer.rotateLeft(ws14 ^ ws02, 16);
+
+            ws10 += ws14;
+            ws06 = Integer.rotateLeft(ws06 ^ ws10, 12);
+
+            ws02 += ws06;
+            ws14 = Integer.rotateLeft(ws14 ^ ws02, 8);
+
+            ws10 += ws14;
+            ws06 = Integer.rotateLeft(ws06 ^ ws10, 7);
+
+            ws03 += ws07;
+            ws15 = Integer.rotateLeft(ws15 ^ ws03, 16);
+
+            ws11 += ws15;
+            ws07 = Integer.rotateLeft(ws07 ^ ws11, 12);
+
+            ws03 += ws07;
+            ws15 = Integer.rotateLeft(ws15 ^ ws03, 8);
+
+            ws11 += ws15;
+            ws07 = Integer.rotateLeft(ws07 ^ ws11, 7);
+
+            ws00 += ws05;
+            ws15 = Integer.rotateLeft(ws15 ^ ws00, 16);
+
+            ws10 += ws15;
+            ws05 = Integer.rotateLeft(ws05 ^ ws10, 12);
+
+            ws00 += ws05;
+            ws15 = Integer.rotateLeft(ws15 ^ ws00, 8);
+
+            ws10 += ws15;
+            ws05 = Integer.rotateLeft(ws05 ^ ws10, 7);
+
+            ws01 += ws06;
+            ws12 = Integer.rotateLeft(ws12 ^ ws01, 16);
+
+            ws11 += ws12;
+            ws06 = Integer.rotateLeft(ws06 ^ ws11, 12);
+
+            ws01 += ws06;
+            ws12 = Integer.rotateLeft(ws12 ^ ws01, 8);
+
+            ws11 += ws12;
+            ws06 = Integer.rotateLeft(ws06 ^ ws11, 7);
+
+            ws02 += ws07;
+            ws13 = Integer.rotateLeft(ws13 ^ ws02, 16);
+
+            ws08 += ws13;
+            ws07 = Integer.rotateLeft(ws07 ^ ws08, 12);
+
+            ws02 += ws07;
+            ws13 = Integer.rotateLeft(ws13 ^ ws02, 8);
+
+            ws08 += ws13;
+            ws07 = Integer.rotateLeft(ws07 ^ ws08, 7);
+
+            ws03 += ws04;
+            ws14 = Integer.rotateLeft(ws14 ^ ws03, 16);
+
+            ws09 += ws14;
+            ws04 = Integer.rotateLeft(ws04 ^ ws09, 12);
+
+            ws03 += ws04;
+            ws14 = Integer.rotateLeft(ws14 ^ ws03, 8);
+
+            ws09 += ws14;
+            ws04 = Integer.rotateLeft(ws04 ^ ws09, 7);
+        }
+
+        // Add the end working state back into the original state
+        asIntLittleEndian.set(result, 0, ws00 + STATE_CONST_0);
+        asIntLittleEndian.set(result, 4, ws01 + STATE_CONST_1);
+        asIntLittleEndian.set(result, 8, ws02 + STATE_CONST_2);
+        asIntLittleEndian.set(result, 12, ws03 + STATE_CONST_3);
+        asIntLittleEndian.set(result, 16, ws04 + initState[4]);
+        asIntLittleEndian.set(result, 20, ws05 + initState[5]);
+        asIntLittleEndian.set(result, 24, ws06 + initState[6]);
+        asIntLittleEndian.set(result, 28, ws07 + initState[7]);
+        asIntLittleEndian.set(result, 32, ws08 + initState[8]);
+        asIntLittleEndian.set(result, 36, ws09 + initState[9]);
+        asIntLittleEndian.set(result, 40, ws10 + initState[10]);
+        asIntLittleEndian.set(result, 44, ws11 + initState[11]);
+        // Add the counter back into workState[12]
+        asIntLittleEndian.set(result, 48, ws12 + (int)counter);
+        asIntLittleEndian.set(result, 52, ws13 + initState[13]);
+        asIntLittleEndian.set(result, 56, ws14 + initState[14]);
+        asIntLittleEndian.set(result, 60, ws15 + initState[15]);
+    }
+
+    /**
+     * Perform the ChaCha20 transform.
+     *
+     * @param in the array of bytes for the input
+     * @param inOff the offset into the input array to start the transform
+     * @param inLen the length of the data to perform the transform on.
+     * @param out the output array.  It must be large enough to hold the
+     *      resulting data
+     * @param outOff the offset into the output array to place the resulting
+     *      data.
+     */
+    private void chaCha20Transform(byte[] in, int inOff, int inLen,
+            byte[] out, int outOff) throws KeyException {
+        int remainingData = inLen;
+
+        while (remainingData > 0) {
+            int ksRemain = keyStream.length - keyStrOffset;
+            if (ksRemain <= 0) {
+                if (counter <= finalCounterValue) {
+                    generateKeystream();
+                    keyStrOffset = 0;
+                    ksRemain = keyStream.length;
+                } else {
+                    throw new KeyException("Counter exhausted.  " +
+                            "Reinitialize with new key and/or nonce");
+                }
+            }
+
+            // XOR each byte in the keystream against the input
+            int xformLen = Math.min(remainingData, ksRemain);
+            xor(keyStream, keyStrOffset, in, inOff, out, outOff, xformLen);
+            outOff += xformLen;
+            inOff += xformLen;
+            keyStrOffset += xformLen;
+            remainingData -= xformLen;
+        }
+    }
+
+    private static void xor(byte[] in1, int off1, byte[] in2, int off2,
+            byte[] out, int outOff, int len) {
+        while (len >= 8) {
+            long v1 = (long) asLongView.get(in1, off1);
+            long v2 = (long) asLongView.get(in2, off2);
+            asLongView.set(out, outOff, v1 ^ v2);
+            off1 += 8;
+            off2 += 8;
+            outOff += 8;
+            len -= 8;
+        }
+        while (len > 0) {
+            out[outOff] = (byte) (in1[off1] ^ in2[off2]);
+            off1++;
+            off2++;
+            outOff++;
+            len--;
+        }
+    }
+
+    /**
+     * Perform initialization steps for the authenticator
+     *
+     * @throws InvalidKeyException if the key is unusable for some reason
+     *      (invalid length, etc.)
+     */
+    private void initAuthenticator() throws InvalidKeyException {
+        authenticator = new Poly1305();
+
+        // Derive the Poly1305 key from the starting state
+        byte[] serializedKey = new byte[KEYSTREAM_SIZE];
+        chaCha20Block(startState, 0, serializedKey);
+
+        authenticator.engineInit(new SecretKeySpec(serializedKey, 0, 32,
+                authAlgName), null);
+        aadLen = 0;
+        dataLen = 0;
+    }
+
+    /**
+     * Update the authenticator state with data.  This routine can be used
+     * to add data to the authenticator, whether AAD or application data.
+     *
+     * @param data the data to stir into the authenticator.
+     * @param offset the offset into the data.
+     * @param length the length of data to add to the authenticator.
+     *
+     * @return the number of bytes processed by this method.
+     */
+    private int authUpdate(byte[] data, int offset, int length) {
+        Objects.checkFromIndexSize(offset, length, data.length);
+        authenticator.engineUpdate(data, offset, length);
+        return length;
+    }
+
+    /**
+     * Finalize the data and return the tag.
+     *
+     * @param data an array containing any remaining data to process.
+     * @param dataOff the offset into the data.
+     * @param length the length of the data to process.
+     * @param out the array to write the resulting tag into
+     * @param outOff the offset to begin writing the data.
+     *
+     * @throws ShortBufferException if there is insufficient room to
+     *      write the tag.
+     */
+    private void authFinalizeData(byte[] data, int dataOff, int length,
+            byte[] out, int outOff) throws ShortBufferException {
+        // Update with the final chunk of ciphertext, then pad to a
+        // multiple of 16.
+        if (data != null) {
+            dataLen += authUpdate(data, dataOff, length);
+        }
+        authPad16(dataLen);
+
+        // Also write the AAD and ciphertext data lengths as little-endian
+        // 64-bit values.
+        authWriteLengths(aadLen, dataLen, lenBuf);
+        authenticator.engineUpdate(lenBuf, 0, lenBuf.length);
+        byte[] tag = authenticator.engineDoFinal();
+        Objects.checkFromIndexSize(outOff, tag.length, out.length);
+        System.arraycopy(tag, 0, out, outOff, tag.length);
+        aadLen = 0;
+        dataLen = 0;
+    }
+
+    /**
+     * Based on a given length of data, make the authenticator process
+     * zero bytes that will pad the length out to a multiple of 16.
+     *
+     * @param dataLen the starting length to be padded.
+     */
+    private void authPad16(long dataLen) {
+        // Pad out the AAD or data to a multiple of 16 bytes
+        authenticator.engineUpdate(padBuf, 0,
+                (TAG_LENGTH - ((int)dataLen & 15)) & 15);
+    }
+
+    /**
+     * Write the two 64-bit little-endian length fields into an array
+     * for processing by the poly1305 authenticator.
+     *
+     * @param aLen the length of the AAD.
+     * @param dLen the length of the application data.
+     * @param buf the buffer to write the two lengths into.
+     *
+     * @note it is the caller's responsibility to provide an array large
+     *      enough to hold the two longs.
+     */
+    private void authWriteLengths(long aLen, long dLen, byte[] buf) {
+        asLongLittleEndian.set(buf, 0, aLen);
+        asLongLittleEndian.set(buf, Long.BYTES, dLen);
+    }
+
+    /**
+     * Interface for the underlying processing engines for ChaCha20
+     */
+    interface ChaChaEngine {
+        /**
+         * Perform a multi-part update for ChaCha20.
+         *
+         * @param in the input data.
+         * @param inOff the offset into the input.
+         * @param inLen the length of the data to process.
+         * @param out the output buffer.
+         * @param outOff the offset at which to write the output data.
+         *
+         * @return the number of output bytes written.
+         *
+         * @throws ShortBufferException if the output buffer does not
+         *      provide enough space.
+         * @throws KeyException if the counter value has been exhausted.
+         */
+        int doUpdate(byte[] in, int inOff, int inLen, byte[] out, int outOff)
+                throws ShortBufferException, KeyException;
+
+        /**
+         * Finalize a multi-part or single-part ChaCha20 operation.
+         *
+         * @param in the input data.
+         * @param inOff the offset into the input.
+         * @param inLen the length of the data to process.
+         * @param out the output buffer.
+         * @param outOff the offset at which to write the output data.
+         *
+         * @return the number of output bytes written.
+         *
+         * @throws ShortBufferException if the output buffer does not
+         *      provide enough space.
+         * @throws AEADBadTagException if in decryption mode the provided
+         *      tag and calculated tag do not match.
+         * @throws KeyException if the counter value has been exhausted.
+         */
+        int doFinal(byte[] in, int inOff, int inLen, byte[] out, int outOff)
+                throws ShortBufferException, AEADBadTagException, KeyException;
+    }
+
+    private final class EngineStreamOnly implements ChaChaEngine {
+
+        private EngineStreamOnly () { }
+
+        @Override
+        public int doUpdate(byte[] in, int inOff, int inLen, byte[] out,
+                int outOff) throws ShortBufferException, KeyException {
+            if (initialized) {
+               try {
+                    if (out != null) {
+                        Objects.checkFromIndexSize(outOff, inLen, out.length);
+                    } else {
+                        throw new ShortBufferException(
+                                "Output buffer too small");
+                    }
+                } catch (IndexOutOfBoundsException iobe) {
+                    throw new ShortBufferException("Output buffer too small");
+                }
+                if (in != null) {
+                    Objects.checkFromIndexSize(inOff, inLen, in.length);
+                    chaCha20Transform(in, inOff, inLen, out, outOff);
+                }
+                return inLen;
+            } else {
+                throw new IllegalStateException(
+                        "Must use either a different key or iv.");
+            }
+        }
+
+        @Override
+        public int doFinal(byte[] in, int inOff, int inLen, byte[] out,
+                int outOff) throws ShortBufferException, KeyException {
+            return doUpdate(in, inOff, inLen, out, outOff);
+        }
+    }
+
+    private final class EngineAEADEnc implements ChaChaEngine {
+
+        private EngineAEADEnc() throws InvalidKeyException {
+            initAuthenticator();
+            counter = 1;
+        }
+
+        @Override
+        public int doUpdate(byte[] in, int inOff, int inLen, byte[] out,
+                int outOff) throws ShortBufferException, KeyException {
+            if (initialized) {
+                // If this is the first update since AAD updates, signal that
+                // we're done processing AAD info and pad the AAD to a multiple
+                // of 16 bytes.
+                if (!aadDone) {
+                    authPad16(aadLen);
+                    aadDone = true;
+                }
+                try {
+                    if (out != null) {
+                        Objects.checkFromIndexSize(outOff, inLen, out.length);
+                    } else {
+                        throw new ShortBufferException(
+                                "Output buffer too small");
+                    }
+                } catch (IndexOutOfBoundsException iobe) {
+                    throw new ShortBufferException("Output buffer too small");
+                }
+                if (in != null) {
+                    Objects.checkFromIndexSize(inOff, inLen, in.length);
+                    chaCha20Transform(in, inOff, inLen, out, outOff);
+                    dataLen += authUpdate(out, outOff, inLen);
+                }
+
+                return inLen;
+            } else {
+                throw new IllegalStateException(
+                        "Must use either a different key or iv.");
+            }
+        }
+
+        @Override
+        public int doFinal(byte[] in, int inOff, int inLen, byte[] out,
+                int outOff) throws ShortBufferException, KeyException {
+            // Make sure we have enough room for the remaining data (if any)
+            // and the tag.
+            if ((inLen + TAG_LENGTH) > (out.length - outOff)) {
+                throw new ShortBufferException("Output buffer too small");
+            }
+
+            doUpdate(in, inOff, inLen, out, outOff);
+            authFinalizeData(null, 0, 0, out, outOff + inLen);
+            aadDone = false;
+            return inLen + TAG_LENGTH;
+        }
+    }
+
+    private final class EngineAEADDec implements ChaChaEngine {
+
+        private final ByteArrayOutputStream cipherBuf;
+        private final byte[] tag;
+
+        private EngineAEADDec() throws InvalidKeyException {
+            initAuthenticator();
+            counter = 1;
+            cipherBuf = new ByteArrayOutputStream(CIPHERBUF_BASE);
+            tag = new byte[TAG_LENGTH];
+        }
+
+        @Override
+        public int doUpdate(byte[] in, int inOff, int inLen, byte[] out,
+                int outOff) {
+            if (initialized) {
+                // If this is the first update since AAD updates, signal that
+                // we're done processing AAD info and pad the AAD to a multiple
+                // of 16 bytes.
+                if (!aadDone) {
+                    authPad16(aadLen);
+                    aadDone = true;
+                }
+
+                if (in != null) {
+                    Objects.checkFromIndexSize(inOff, inLen, in.length);
+                    cipherBuf.write(in, inOff, inLen);
+                }
+            } else {
+                throw new IllegalStateException(
+                        "Must use either a different key or iv.");
+            }
+
+            return 0;
+        }
+
+        @Override
+        public int doFinal(byte[] in, int inOff, int inLen, byte[] out,
+                int outOff) throws ShortBufferException, AEADBadTagException,
+                KeyException {
+
+            byte[] ctPlusTag;
+            int ctPlusTagLen;
+            if (cipherBuf.size() == 0 && inOff == 0) {
+                // No previous data has been seen before doFinal, so we do
+                // not need to hold any ciphertext in a buffer.  We can
+                // process it directly from the "in" parameter.
+                doUpdate(null, inOff, inLen, out, outOff);
+                ctPlusTag = in;
+                ctPlusTagLen = inLen;
+            } else {
+                doUpdate(in, inOff, inLen, out, outOff);
+                ctPlusTag = cipherBuf.toByteArray();
+                ctPlusTagLen = ctPlusTag.length;
+            }
+            cipherBuf.reset();
+
+            // There must at least be a tag length's worth of ciphertext
+            // data in the buffered input.
+            if (ctPlusTagLen < TAG_LENGTH) {
+                throw new AEADBadTagException("Input too short - need tag");
+            }
+            int ctLen = ctPlusTagLen - TAG_LENGTH;
+
+            // Make sure we will have enough room for the output buffer
+            try {
+                Objects.checkFromIndexSize(outOff, ctLen, out.length);
+            } catch (IndexOutOfBoundsException ioobe) {
+                throw new ShortBufferException("Output buffer too small");
+            }
+
+            // Calculate and compare the tag.  Only do the decryption
+            // if and only if the tag matches.
+            authFinalizeData(ctPlusTag, 0, ctLen, tag, 0);
+            if (Arrays.compare(ctPlusTag, ctLen, ctPlusTagLen,
+                    tag, 0, tag.length) != 0) {
+                throw new AEADBadTagException("Tag mismatch");
+            }
+            chaCha20Transform(ctPlusTag, 0, ctLen, out, outOff);
+            aadDone = false;
+
+            return ctLen;
+        }
+    }
+
+    public static final class ChaCha20Only extends ChaCha20Cipher {
+        public ChaCha20Only() {
+            mode = MODE_NONE;
+        }
+    }
+
+    public static final class ChaCha20Poly1305 extends ChaCha20Cipher {
+        public ChaCha20Poly1305() {
+            mode = MODE_AEAD;
+            authAlgName = "Poly1305";
+        }
+    }
+}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java
new file mode 100644
index 00000000000..b235c313c6a
--- /dev/null
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java
@@ -0,0 +1,213 @@
+/*
+ * 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 com.sun.crypto.provider;
+
+import java.io.IOException;
+import java.security.AlgorithmParametersSpi;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.InvalidParameterSpecException;
+import javax.crypto.spec.IvParameterSpec;
+import sun.security.util.*;
+
+/**
+ * This class implements the parameter set used with the ChaCha20-Poly1305
+ * algorithm.  The parameter definition comes from
+ * <a href="https://tools.ietf.org/html/rfc8103"><i>RFC 8103</i></a>
+ * and is defined according to the following ASN.1:
+ *
+ * <pre>
+ * id-alg-AEADChaCha20Poly1305 OBJECT IDENTIFIER ::=
+          { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
+            pkcs9(9) smime(16) alg(3) 18 }
+
+ * AEADChaCha20Poly1305Nonce ::= OCTET STRING (SIZE(12))
+ * </pre>
+ *
+ * The AlgorithmParameters may be instantiated either by its name
+ * ("ChaCha20-Poly1305") or via its OID (1.2.840.113549.1.9.16.3.18)
+ */
+public final class ChaCha20Poly1305Parameters extends AlgorithmParametersSpi {
+
+    private static final String DEFAULT_FMT = "ASN.1";
+    private byte[] nonce;
+
+    public ChaCha20Poly1305Parameters() {}
+
+    /**
+     * Initialize the ChaCha20Poly1305Parameters using an IvParameterSpec.
+     *
+     * @param paramSpec the {@code IvParameterSpec} used to configure
+     *      this object.
+     *
+     * @throws InvalidParameterSpecException if an object of a type other
+     *      than {@code IvParameterSpec} is used.
+     */
+    @Override
+    protected void engineInit(AlgorithmParameterSpec paramSpec)
+        throws InvalidParameterSpecException {
+
+        if (!(paramSpec instanceof IvParameterSpec)) {
+            throw new InvalidParameterSpecException
+                ("Inappropriate parameter specification");
+        }
+        IvParameterSpec ivps = (IvParameterSpec)paramSpec;
+
+        // Obtain the nonce
+        nonce = ivps.getIV();
+        if (nonce.length != 12) {
+            throw new InvalidParameterSpecException("ChaCha20-Poly1305 nonce" +
+                    " must be 12 bytes in length");
+        }
+    }
+
+    /**
+     * Initialize the ChaCha20Poly1305Parameters from a DER encoded
+     * parameter block.
+
+     * @param encoded the DER encoding of the nonce as an OCTET STRING.
+     *
+     * @throws IOException if the encoded nonce is not 12 bytes long or a DER
+     *      decoding error occurs.
+     */
+    @Override
+    protected void engineInit(byte[] encoded) throws IOException {
+        DerValue val = new DerValue(encoded);
+
+        // Get the nonce value
+        nonce = val.getOctetString();
+        if (nonce.length != 12) {
+           throw new IOException(
+                   "ChaCha20-Poly1305 nonce must be 12 bytes in length");
+        }
+    }
+
+    /**
+     * Initialize the ChaCha20Poly1305Parameters from a DER encoded
+     * parameter block.
+     *
+     * @param encoded the DER encoding of the nonce and initial block counter.
+     * @param decodingMethod the decoding method.  The only currently accepted
+     *      value is "ASN.1"
+     *
+     * @throws IOException if the encoded nonce is not 12 bytes long, a DER
+     *      decoding error occurs, or an unsupported decoding method is
+     *      provided.
+     */
+    @Override
+    protected void engineInit(byte[] encoded, String decodingMethod)
+            throws IOException {
+        if (decodingMethod == null ||
+                decodingMethod.equalsIgnoreCase(DEFAULT_FMT)) {
+            engineInit(encoded);
+        } else {
+            throw new IOException("Unsupported parameter format: " +
+                    decodingMethod);
+        }
+    }
+
+    /**
+     * Return an IvParameterSpec with the same parameters as those
+     * held in this object.
+     *
+     * @param paramSpec the class name of the spec.  In this case it should
+     *      be {@code IvParameterSpec.class}.
+     *
+     * @return a {@code IvParameterSpec} object containing the nonce
+     *      value held in this object.
+     *
+     * @throws InvalidParameterSpecException if a class other than
+     *      {@code IvParameterSpec.class} was specified in the paramSpec
+     *      parameter.
+     */
+    @Override
+    protected <T extends AlgorithmParameterSpec>
+            T engineGetParameterSpec(Class<T> paramSpec)
+        throws InvalidParameterSpecException {
+
+        if (IvParameterSpec.class.isAssignableFrom(paramSpec)) {
+            return paramSpec.cast(new IvParameterSpec(nonce));
+        } else {
+            throw new InvalidParameterSpecException
+                ("Inappropriate parameter specification");
+        }
+    }
+
+    /**
+     * Return the encoded parameters in ASN.1 form.
+     *
+     * @return a byte array containing the DER-encoding for the
+     *      ChaCha20-Poly1305 parameters.  This will be the nonce
+     *      encoded as a DER OCTET STRING.
+     *
+     * @throws IOException if any DER encoding error occurs.
+     */
+    @Override
+    protected byte[] engineGetEncoded() throws IOException {
+        DerOutputStream out = new DerOutputStream();
+        out.write(DerValue.tag_OctetString, nonce);
+        return out.toByteArray();
+    }
+
+    /**
+     * Return the encoded parameters in ASN.1 form.
+     *
+     * @param encodingMethod the encoding method to be used.  This parameter
+     *      must be "ASN.1" as it is the only currently supported encoding
+     *      format.  If the parameter is {@code null} then the default
+     *      encoding format will be used.
+     *
+     * @return a byte array containing the DER-encoding for the
+     *      ChaCha20-Poly1305 parameters.
+     *
+     * @throws IOException if any DER encoding error occurs or an unsupported
+     *      encoding method is provided.
+     */
+    @Override
+    protected byte[] engineGetEncoded(String encodingMethod)
+        throws IOException {
+        if (encodingMethod == null ||
+                encodingMethod.equalsIgnoreCase(DEFAULT_FMT)) {
+            return engineGetEncoded();
+        } else {
+            throw new IOException("Unsupported encoding format: " +
+                    encodingMethod);
+        }
+    }
+
+    /**
+     * Creates a formatted string describing the parameters.
+     *
+     * @return a string representation of the ChaCha20 parameters.
+     */
+    @Override
+    protected String engineToString() {
+        String LINE_SEP = System.lineSeparator();
+        HexDumpEncoder encoder = new HexDumpEncoder();
+        StringBuilder sb = new StringBuilder(LINE_SEP + "nonce:" +
+                LINE_SEP + "[" + encoder.encodeBuffer(nonce) + "]");
+        return sb.toString();
+    }
+}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
index a5fd638da5b..d11c2a25db6 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, 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
@@ -111,16 +111,20 @@ final class KeyGeneratorCore {
         protected HmacSHA2KG(String algoName, int len) {
             core = new KeyGeneratorCore(algoName, len);
         }
+        @Override
         protected void engineInit(SecureRandom random) {
             core.implInit(random);
         }
+        @Override
         protected void engineInit(AlgorithmParameterSpec params,
                 SecureRandom random) throws InvalidAlgorithmParameterException {
             core.implInit(params, random);
         }
+        @Override
         protected void engineInit(int keySize, SecureRandom random) {
             core.implInit(keySize, random);
         }
+        @Override
         protected SecretKey engineGenerateKey() {
             return core.implGenerateKey();
         }
@@ -153,13 +157,16 @@ final class KeyGeneratorCore {
         public RC2KeyGenerator() {
             core = new KeyGeneratorCore("RC2", 128);
         }
+        @Override
         protected void engineInit(SecureRandom random) {
             core.implInit(random);
         }
+        @Override
         protected void engineInit(AlgorithmParameterSpec params,
                 SecureRandom random) throws InvalidAlgorithmParameterException {
             core.implInit(params, random);
         }
+        @Override
         protected void engineInit(int keySize, SecureRandom random) {
             if ((keySize < 40) || (keySize > 1024)) {
                 throw new InvalidParameterException("Key length for RC2"
@@ -167,6 +174,7 @@ final class KeyGeneratorCore {
             }
             core.implInit(keySize, random);
         }
+        @Override
         protected SecretKey engineGenerateKey() {
             return core.implGenerateKey();
         }
@@ -178,13 +186,16 @@ final class KeyGeneratorCore {
         public ARCFOURKeyGenerator() {
             core = new KeyGeneratorCore("ARCFOUR", 128);
         }
+        @Override
         protected void engineInit(SecureRandom random) {
             core.implInit(random);
         }
+        @Override
         protected void engineInit(AlgorithmParameterSpec params,
                 SecureRandom random) throws InvalidAlgorithmParameterException {
             core.implInit(params, random);
         }
+        @Override
         protected void engineInit(int keySize, SecureRandom random) {
             if ((keySize < 40) || (keySize > 1024)) {
                 throw new InvalidParameterException("Key length for ARCFOUR"
@@ -192,9 +203,38 @@ final class KeyGeneratorCore {
             }
             core.implInit(keySize, random);
         }
+        @Override
         protected SecretKey engineGenerateKey() {
             return core.implGenerateKey();
         }
     }
 
+    // nested static class for the ChaCha20 key generator
+    public static final class ChaCha20KeyGenerator extends KeyGeneratorSpi {
+        private final KeyGeneratorCore core;
+        public ChaCha20KeyGenerator() {
+            core = new KeyGeneratorCore("ChaCha20", 256);
+        }
+        @Override
+        protected void engineInit(SecureRandom random) {
+            core.implInit(random);
+        }
+        @Override
+        protected void engineInit(AlgorithmParameterSpec params,
+                SecureRandom random) throws InvalidAlgorithmParameterException {
+            core.implInit(params, random);
+        }
+        @Override
+        protected void engineInit(int keySize, SecureRandom random) {
+            if (keySize != 256) {
+                throw new InvalidParameterException(
+                        "Key length for ChaCha20 must be 256 bits");
+            }
+            core.implInit(keySize, random);
+        }
+        @Override
+        protected SecretKey engineGenerateKey() {
+            return core.implGenerateKey();
+        }
+    }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java b/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java
new file mode 100644
index 00000000000..fda04ffb93f
--- /dev/null
+++ b/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java
@@ -0,0 +1,257 @@
+/*
+ * 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 com.sun.crypto.provider;
+
+import java.nio.ByteBuffer;
+import java.security.Key;
+import java.security.InvalidKeyException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+import java.util.Objects;
+
+import sun.security.util.math.*;
+import sun.security.util.math.intpoly.*;
+
+/**
+ * This class represents the Poly1305 function defined in RFC 7539.
+ *
+ * This function is used in the implementation of ChaCha20/Poly1305
+ * AEAD mode.
+ */
+final class Poly1305 {
+
+    private static final int KEY_LENGTH = 32;
+    private static final int RS_LENGTH = KEY_LENGTH / 2;
+    private static final int BLOCK_LENGTH = 16;
+    private static final int TAG_LENGTH = 16;
+
+    private static final IntegerFieldModuloP ipl1305 =
+            new IntegerPolynomial1305();
+
+    private byte[] keyBytes;
+    private final byte[] block = new byte[BLOCK_LENGTH];
+    private int blockOffset;
+
+    private IntegerModuloP r;
+    private IntegerModuloP s;
+    private MutableIntegerModuloP a;
+    private final MutableIntegerModuloP n = ipl1305.get1().mutable();
+
+    Poly1305() { }
+
+    /**
+     * Initialize the Poly1305 object
+     *
+     * @param newKey the {@code Key} which will be used for the authentication.
+     * @param params this parameter is unused.
+     *
+     * @throws InvalidKeyException if {@code newKey} is {@code null} or is
+     *      not 32 bytes in length.
+     */
+    void engineInit(Key newKey, AlgorithmParameterSpec params)
+            throws InvalidKeyException {
+        Objects.requireNonNull(newKey, "Null key provided during init");
+        keyBytes = newKey.getEncoded();
+        if (keyBytes == null) {
+            throw new InvalidKeyException("Key does not support encoding");
+        } else if (keyBytes.length != KEY_LENGTH) {
+            throw new InvalidKeyException("Incorrect length for key: " +
+                    keyBytes.length);
+        }
+
+        engineReset();
+        setRSVals();
+    }
+
+    /**
+     * Returns the length of the MAC (authentication tag).
+     *
+     * @return the length of the auth tag, which is always 16 bytes.
+     */
+    int engineGetMacLength() {
+        return TAG_LENGTH;
+    }
+
+    /**
+     * Reset the Poly1305 object, discarding any current operation but
+     *      maintaining the same key.
+     */
+    void engineReset() {
+        // Clear the block and reset the offset
+        Arrays.fill(block, (byte)0);
+        blockOffset = 0;
+        // Discard any previous accumulator and start at zero
+        a = ipl1305.get0().mutable();
+    }
+
+    /**
+     * Update the MAC with bytes from a {@code ByteBuffer}
+     *
+     * @param buf the {@code ByteBuffer} containing the data to be consumed.
+     *      Upon return the buffer's position will be equal to its limit.
+     */
+    void engineUpdate(ByteBuffer buf) {
+        int remaining = buf.remaining();
+        while (remaining > 0) {
+            int bytesToWrite = Integer.min(remaining,
+                    BLOCK_LENGTH - blockOffset);
+
+            if (bytesToWrite >= BLOCK_LENGTH) {
+                // If bytes to write == BLOCK_LENGTH, then we have no
+                // left-over data from previous updates and we can create
+                // the IntegerModuloP directly from the input buffer.
+                processBlock(buf, bytesToWrite);
+            } else {
+                // We have some left-over data from previous updates, so
+                // copy that into the holding block until we get a full block.
+                buf.get(block, blockOffset, bytesToWrite);
+                blockOffset += bytesToWrite;
+
+                if (blockOffset >= BLOCK_LENGTH) {
+                    processBlock(block, 0, BLOCK_LENGTH);
+                    blockOffset = 0;
+                }
+            }
+
+            remaining -= bytesToWrite;
+        }
+    }
+
+    /**
+     * Update the MAC with bytes from an array.
+     *
+     * @param input the input bytes.
+     * @param offset the starting index from which to update the MAC.
+     * @param len the number of bytes to process.
+     */
+    void engineUpdate(byte[] input, int offset, int len) {
+        Objects.checkFromIndexSize(offset, len, input.length);
+        if (blockOffset > 0) {
+            // We have some left-over data from previous updates
+            int blockSpaceLeft = BLOCK_LENGTH - blockOffset;
+            if (len < blockSpaceLeft) {
+                System.arraycopy(input, offset, block, blockOffset, len);
+                blockOffset += len;
+                return; // block wasn't filled
+            } else {
+                System.arraycopy(input, offset, block, blockOffset,
+                        blockSpaceLeft);
+                offset += blockSpaceLeft;
+                len -= blockSpaceLeft;
+                processBlock(block, 0, BLOCK_LENGTH);
+                blockOffset = 0;
+            }
+        }
+        while (len >= BLOCK_LENGTH) {
+            processBlock(input, offset, BLOCK_LENGTH);
+            offset += BLOCK_LENGTH;
+            len -= BLOCK_LENGTH;
+        }
+        if (len > 0) { // and len < BLOCK_LENGTH
+            System.arraycopy(input, offset, block, 0, len);
+            blockOffset = len;
+        }
+    }
+
+    /**
+     * Update the MAC with a single byte of input
+     *
+     * @param input the byte to update the MAC with.
+     */
+    void engineUpdate(byte input) {
+        assert (blockOffset < BLOCK_LENGTH);
+        // we can't hold fully filled unprocessed block
+        block[blockOffset++] = input;
+
+        if (blockOffset == BLOCK_LENGTH) {
+            processBlock(block, 0, BLOCK_LENGTH);
+            blockOffset = 0;
+        }
+    }
+
+
+    /**
+     * Finish the authentication operation and reset the MAC for a new
+     * authentication operation.
+     *
+     * @return the authentication tag as a byte array.
+     */
+    byte[] engineDoFinal() {
+        byte[] tag = new byte[BLOCK_LENGTH];
+
+        // Finish up: process any remaining data < BLOCK_SIZE, then
+        // create the tag from the resulting little-endian integer.
+        if (blockOffset > 0) {
+            processBlock(block, 0, blockOffset);
+            blockOffset = 0;
+        }
+
+        // Add in the s-half of the key to the accumulator
+        a.addModPowerTwo(s, tag);
+
+        // Reset for the next auth
+        engineReset();
+        return tag;
+    }
+
+    /**
+     * Process a single block of data.  This should only be called
+     * when the block array is complete.  That may not necessarily
+     * be a full 16 bytes if the last block has less than 16 bytes.
+     */
+    private void processBlock(ByteBuffer buf, int len) {
+        n.setValue(buf, len, (byte)0x01);
+        a.setSum(n);                    // a += (n | 0x01)
+        a.setProduct(r);                // a = (a * r) % p
+    }
+
+    private void processBlock(byte[] block, int offset, int length) {
+        Objects.checkFromIndexSize(offset, length, block.length);
+        n.setValue(block, offset, length, (byte)0x01);
+        a.setSum(n);                    // a += (n | 0x01)
+        a.setProduct(r);                // a = (a * r) % p
+    }
+
+    /**
+     * Partition the authentication key into the R and S components, clamp
+     * the R value, and instantiate IntegerModuloP objects to R and S's
+     * numeric values.
+     */
+    private void setRSVals() {
+        // Clamp the bytes in the "r" half of the key.
+        keyBytes[3] &= 15;
+        keyBytes[7] &= 15;
+        keyBytes[11] &= 15;
+        keyBytes[15] &= 15;
+        keyBytes[4] &= 252;
+        keyBytes[8] &= 252;
+        keyBytes[12] &= 252;
+
+        // Create IntegerModuloP elements from the r and s values
+        r = ipl1305.getElement(keyBytes, 0, RS_LENGTH, (byte)0);
+        s = ipl1305.getElement(keyBytes, RS_LENGTH, RS_LENGTH, (byte)0);
+    }
+}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
index 05d8f661dea..db227f8d72b 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -57,6 +57,8 @@ import static sun.security.util.SecurityConstants.PROVIDER_VER;
  *
  * - ARCFOUR (RC4 compatible)
  *
+ * - ChaCha20 (Stream cipher only and in AEAD mode with Poly1305)
+ *
  * - Cipher modes ECB, CBC, CFB, OFB, PCBC, CTR, and CTS for all block ciphers
  *   and mode GCM for AES cipher
  *
@@ -77,7 +79,7 @@ public final class SunJCE extends Provider {
 
     private static final String info = "SunJCE Provider " +
     "(implements RSA, DES, Triple DES, AES, Blowfish, ARCFOUR, RC2, PBE, "
-    + "Diffie-Hellman, HMAC)";
+    + "Diffie-Hellman, HMAC, ChaCha20)";
 
     private static final String OID_PKCS12_RC4_128 = "1.2.840.113549.1.12.1.1";
     private static final String OID_PKCS12_RC4_40 = "1.2.840.113549.1.12.1.2";
@@ -336,6 +338,15 @@ public final class SunJCE extends Provider {
                     put("Cipher.ARCFOUR SupportedPaddings", "NOPADDING");
                     put("Cipher.ARCFOUR SupportedKeyFormats", "RAW");
 
+                    put("Cipher.ChaCha20",
+                        "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only");
+                    put("Cipher.ChaCha20 SupportedKeyFormats", "RAW");
+                    put("Cipher.ChaCha20-Poly1305",
+                        "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305");
+                    put("Cipher.ChaCha20-Poly1305 SupportedKeyFormats", "RAW");
+                    put("Alg.Alias.Cipher.1.2.840.113549.1.9.16.3.18", "ChaCha20-Poly1305");
+                    put("Alg.Alias.Cipher.OID.1.2.840.113549.1.9.16.3.18", "ChaCha20-Poly1305");
+
                     /*
                      * Key(pair) Generator engines
                      */
@@ -361,6 +372,10 @@ public final class SunJCE extends Provider {
                         "ARCFOURKeyGenerator");
                     put("Alg.Alias.KeyGenerator.RC4", "ARCFOUR");
 
+                    put("KeyGenerator.ChaCha20",
+                        "com.sun.crypto.provider.KeyGeneratorCore$" +
+                        "ChaCha20KeyGenerator");
+
                     put("KeyGenerator.HmacMD5",
                         "com.sun.crypto.provider.HmacMD5KeyGenerator");
 
@@ -541,6 +556,9 @@ public final class SunJCE extends Provider {
                     put("AlgorithmParameters.OAEP",
                         "com.sun.crypto.provider.OAEPParameters");
 
+                    put("AlgorithmParameters.ChaCha20-Poly1305",
+                        "com.sun.crypto.provider.ChaCha20Poly1305Parameters");
+
                     /*
                      * Key factories
                      */
diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index f1b3772cd23..f655f89165e 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -1419,7 +1419,8 @@ class Character implements java.io.Serializable, Comparable<Character> {
                              "YIRADICALS");
 
         /**
-         * Constant for the "Cyrillic Supplementary" Unicode character block.
+         * Constant for the "Cyrillic Supplement" Unicode character block.
+         * This block was previously known as the "Cyrillic Supplementary" block.
          * @since 1.5
          */
         public static final UnicodeBlock CYRILLIC_SUPPLEMENTARY =
diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java
index 2e031553d5b..0ccdc6b738c 100644
--- a/src/java.base/share/classes/java/lang/Object.java
+++ b/src/java.base/share/classes/java/lang/Object.java
@@ -333,12 +333,12 @@ public class Object {
      * by being <em>notified</em> or <em>interrupted</em>, or until a
      * certain amount of real time has elapsed.
      * <p>
-     * In all respects, this method behaves as if {@code wait(timeout, 0)}
+     * In all respects, this method behaves as if {@code wait(timeoutMillis, 0)}
      * had been called. See the specification of the {@link #wait(long, int)} method
      * for details.
      *
-     * @param  timeout the maximum time to wait, in milliseconds
-     * @throws IllegalArgumentException if the value of {@code timeout} is negative
+     * @param  timeoutMillis the maximum time to wait, in milliseconds
+     * @throws IllegalArgumentException if {@code timeoutMillis} is negative
      * @throws IllegalMonitorStateException if the current thread is not
      *         the owner of the object's monitor
      * @throws InterruptedException if any thread interrupted the current thread before or
@@ -349,7 +349,7 @@ public class Object {
      * @see    #wait()
      * @see    #wait(long, int)
      */
-    public final native void wait(long timeout) throws InterruptedException;
+    public final native void wait(long timeoutMillis) throws InterruptedException;
 
     /**
      * Causes the current thread to wait until it is awakened, typically
@@ -378,7 +378,7 @@ public class Object {
      * thread <var>T</var>.
      * <li>The specified amount of real time has elapsed, more or less.
      * The amount of real time, in nanoseconds, is given by the expression
-     * {@code 1000000 * timeout + nanos}. If {@code timeout} and {@code nanos}
+     * {@code 1000000 * timeoutMillis + nanos}. If {@code timeoutMillis} and {@code nanos}
      * are both zero, then real time is not taken into consideration and the
      * thread waits until awakened by one of the other causes.
      * <li>Thread <var>T</var> is awakened spuriously. (See below.)
@@ -423,17 +423,17 @@ public class Object {
      * <pre>{@code
      *     synchronized (obj) {
      *         while (<condition does not hold> and <timeout not exceeded>) {
-     *             long timeout = ... ; // recompute timeout values
+     *             long timeoutMillis = ... ; // recompute timeout values
      *             int nanos = ... ;
-     *             obj.wait(timeout, nanos);
+     *             obj.wait(timeoutMillis, nanos);
      *         }
      *         ... // Perform action appropriate to condition or timeout
      *     }
      * }</pre>
      *
-     * @param  timeout the maximum time to wait, in milliseconds
+     * @param  timeoutMillis the maximum time to wait, in milliseconds
      * @param  nanos   additional time, in nanoseconds, in the range range 0-999999 inclusive
-     * @throws IllegalArgumentException if the value of {@code timeout} is negative,
+     * @throws IllegalArgumentException if {@code timeoutMillis} is negative,
      *         or if the value of {@code nanos} is out of range
      * @throws IllegalMonitorStateException if the current thread is not
      *         the owner of the object's monitor
@@ -445,9 +445,9 @@ public class Object {
      * @see    #wait()
      * @see    #wait(long)
      */
-    public final void wait(long timeout, int nanos) throws InterruptedException {
-        if (timeout < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
+    public final void wait(long timeoutMillis, int nanos) throws InterruptedException {
+        if (timeoutMillis < 0) {
+            throw new IllegalArgumentException("timeoutMillis value is negative");
         }
 
         if (nanos < 0 || nanos > 999999) {
@@ -456,10 +456,10 @@ public class Object {
         }
 
         if (nanos > 0) {
-            timeout++;
+            timeoutMillis++;
         }
 
-        wait(timeout);
+        wait(timeoutMillis);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index d4cd69b1e1f..f1215fbf303 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -607,8 +607,9 @@ public final class System {
      * <tr><th scope="row">{@code java.home}</th>
      *     <td>Java installation directory</td></tr>
      * <tr><th scope="row">{@code java.vm.specification.version}</th>
-     *     <td>Java Virtual Machine specification version which may be
-     *     interpreted as a {@link Runtime.Version}</td></tr>
+     *     <td>Java Virtual Machine specification version, whose value is the
+     *     {@linkplain Runtime.Version#feature feature} element of the
+     *     {@linkplain Runtime#version() runtime version}</td></tr>
      * <tr><th scope="row">{@code java.vm.specification.vendor}</th>
      *     <td>Java Virtual Machine specification vendor</td></tr>
      * <tr><th scope="row">{@code java.vm.specification.name}</th>
@@ -621,8 +622,9 @@ public final class System {
      * <tr><th scope="row">{@code java.vm.name}</th>
      *     <td>Java Virtual Machine implementation name</td></tr>
      * <tr><th scope="row">{@code java.specification.version}</th>
-     *     <td>Java Runtime Environment specification version which may be
-     *     interpreted as a {@link Runtime.Version}</td></tr>
+     *     <td>Java Runtime Environment specification version, whose value is
+     *     the {@linkplain Runtime.Version#feature feature} element of the
+     *     {@linkplain Runtime#version() runtime version}</td></tr>
      * <tr><th scope="row">{@code java.specification.vendor}</th>
      *     <td>Java Runtime Environment specification  vendor</td></tr>
      * <tr><th scope="row">{@code java.specification.name}</th>
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 0ff5ad8aac3..6c785488a24 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -937,26 +937,6 @@ class Thread implements Runnable {
         stop0(new ThreadDeath());
     }
 
-    /**
-     * Throws {@code UnsupportedOperationException}.
-     *
-     * @param obj ignored
-     *
-     * @deprecated This method was originally designed to force a thread to stop
-     *        and throw a given {@code Throwable} as an exception. It was
-     *        inherently unsafe (see {@link #stop()} for details), and furthermore
-     *        could be used to generate exceptions that the target thread was
-     *        not prepared to handle.
-     *        For more information, see
-     *        <a href="{@docRoot}/java.base/java/lang/doc-files/threadPrimitiveDeprecation.html">Why
-     *        are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     *        This method is subject to removal in a future version of Java SE.
-     */
-    @Deprecated(since="1.2", forRemoval=true)
-    public final synchronized void stop(Throwable obj) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Interrupts this thread.
      *
@@ -1061,29 +1041,6 @@ class Thread implements Runnable {
     @HotSpotIntrinsicCandidate
     private native boolean isInterrupted(boolean ClearInterrupted);
 
-    /**
-     * Throws {@link NoSuchMethodError}.
-     *
-     * @deprecated This method was originally designed to destroy this
-     *     thread without any cleanup. Any monitors it held would have
-     *     remained locked. However, the method was never implemented.
-     *     If it were to be implemented, it would be deadlock-prone in
-     *     much the manner of {@link #suspend}. If the target thread held
-     *     a lock protecting a critical system resource when it was
-     *     destroyed, no thread could ever access this resource again.
-     *     If another thread ever attempted to lock this resource, deadlock
-     *     would result. Such deadlocks typically manifest themselves as
-     *     "frozen" processes. For more information, see
-     *     <a href="{@docRoot}/java.base/java/lang/doc-files/threadPrimitiveDeprecation.html">
-     *     Why are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     *     This method is subject to removal in a future version of Java SE.
-     * @throws NoSuchMethodError always
-     */
-    @Deprecated(since="1.5", forRemoval=true)
-    public void destroy() {
-        throw new NoSuchMethodError();
-    }
-
     /**
      * Tests if this thread is alive. A thread is alive if it has
      * been started and has not yet died.
diff --git a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
index 5182fbdf8ba..df87e8e9be6 100644
--- a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
+++ b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
@@ -62,21 +62,6 @@ it succeeded. The code to ensure this would be quite complex.</li>
 </ol>
 In sum, it just isn't practical.
 <hr>
-<h3>What about <code>Thread.stop(Throwable)</code>?</h3>
-<p>In addition to all of the problems noted above, this method may
-be used to generate exceptions that its target thread is unprepared
-to handle (including checked exceptions that the thread could not
-possibly throw, were it not for this method). For example, the
-following method is behaviorally identical to Java's
-<code>throw</code> operation, but circumvents the compiler's
-attempts to guarantee that the calling method has declared all of
-the checked exceptions that it may throw:</p>
-<pre>
-    static void sneakyThrow(Throwable t) {
-        Thread.currentThread().stop(t);
-    }
-</pre>
-<hr>
 <h3>What should I use instead of <code>Thread.stop</code>?</h3>
 <p>Most uses of <code>stop</code> should be replaced by code that
 simply modifies some variable to indicate that the target thread
@@ -339,13 +324,6 @@ If the <code>stop</code> method calls <code>Thread.interrupt</code>, as
 described above, it needn't call <code>notify</code> as well, but it
 still must be synchronized. This ensures that the target thread
 won't miss an interrupt due to a race condition.
-<hr>
-<h3>What about <code>Thread.destroy</code>?</h3>
-<code>Thread.destroy</code> was never implemented and has been
-deprecated. If it were implemented, it would be deadlock-prone in
-the manner of <code>Thread.suspend</code>. (In fact, it is roughly
-equivalent to <code>Thread.suspend</code> without the possibility
-of a subsequent <code>Thread.resume</code>.)
 <p><!-- Body text ends here --></p>
 </body>
 </html>
diff --git a/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java b/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
index 639b3824929..b442b1a7e75 100644
--- a/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
+++ b/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
@@ -134,6 +134,8 @@ final class BootstrapMethodInvoker {
                     String recipe = (String)argv[0];
                     Object[] shiftedArgs = Arrays.copyOfRange(argv, 1, argv.length);
                     result = (CallSite)bootstrapMethod.invokeExact(caller, name, (MethodType)type, recipe, shiftedArgs);
+                } else if (isLambdaMetafactoryAltMetafactoryBSM(bsmType)) {
+                    result = (CallSite)bootstrapMethod.invokeExact(caller, name, (MethodType)type, argv);
                 } else {
                     switch (argv.length) {
                         case 0:
@@ -286,6 +288,9 @@ final class BootstrapMethodInvoker {
     private static final MethodType LMF_INDY_MT = MethodType.methodType(CallSite.class,
             Lookup.class, String.class, MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
 
+    private static final MethodType LMF_ALT_MT = MethodType.methodType(CallSite.class,
+            Lookup.class, String.class, MethodType.class, Object[].class);
+
     private static final MethodType LMF_CONDY_MT = MethodType.methodType(Object.class,
             Lookup.class, String.class, Class.class, MethodType.class, MethodHandle.class, MethodType.class);
 
@@ -319,6 +324,15 @@ final class BootstrapMethodInvoker {
         return bsmType == LMF_INDY_MT;
     }
 
+    /**
+     * @return true iff the BSM method type exactly matches
+     *         {@see java.lang.invoke.LambdaMetafactory#altMetafactory(
+     *          MethodHandles.Lookup,String,MethodType,Object[])}
+     */
+    private static boolean isLambdaMetafactoryAltMetafactoryBSM(MethodType bsmType) {
+        return bsmType == LMF_ALT_MT;
+    }
+
     /** The JVM produces java.lang.Integer values to box
      *  CONSTANT_Integer boxes but does not intern them.
      *  Let's intern them.  This is slightly wrong for
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 4ea9e5640f7..7fd72087340 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -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
@@ -499,7 +499,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
             super(type, target);
             this.target = target;
             this.arrayType = arrayType;
-            this.asCollectorCache = target.asCollector(arrayType, 0);
         }
 
         @Override
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index fa8f2b4f4f9..9284aa039f1 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -3483,6 +3483,11 @@ assert((int)twice.invokeExact(21) == 42);
      * @return a method handle which inserts an additional argument,
      *         before calling the original method handle
      * @throws NullPointerException if the target or the {@code values} array is null
+     * @throws IllegalArgumentException if (@code pos) is less than {@code 0} or greater than
+     *         {@code N - L} where {@code N} is the arity of the target method handle and {@code L}
+     *         is the length of the values array.
+     * @throws ClassCastException if an argument does not match the corresponding bound parameter
+     *         type.
      * @see MethodHandle#bindTo
      */
     public static
diff --git a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index cd3c7562fc4..e1114054755 100644
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -43,17 +43,17 @@ public class ReferenceQueue<T> {
      */
     public ReferenceQueue() { }
 
-    private static class Null<S> extends ReferenceQueue<S> {
-        boolean enqueue(Reference<? extends S> r) {
+    private static class Null extends ReferenceQueue<Object> {
+        boolean enqueue(Reference<?> r) {
             return false;
         }
     }
 
-    static ReferenceQueue<Object> NULL = new Null<>();
-    static ReferenceQueue<Object> ENQUEUED = new Null<>();
+    static final ReferenceQueue<Object> NULL = new Null();
+    static final ReferenceQueue<Object> ENQUEUED = new Null();
 
     private static class Lock { };
-    private Lock lock = new Lock();
+    private final Lock lock = new Lock();
     private volatile Reference<? extends T> head;
     private long queueLength = 0;
 
diff --git a/src/java.base/share/classes/java/net/SocketOutputStream.java b/src/java.base/share/classes/java/net/SocketOutputStream.java
index 39f03e57446..4b0a9a70dcf 100644
--- a/src/java.base/share/classes/java/net/SocketOutputStream.java
+++ b/src/java.base/share/classes/java/net/SocketOutputStream.java
@@ -109,10 +109,6 @@ class SocketOutputStream extends FileOutputStream {
         try {
             socketWrite0(fd, b, off, len);
         } catch (SocketException se) {
-            if (se instanceof sun.net.ConnectionResetException) {
-                impl.setConnectionReset();
-                se = new SocketException("Connection reset");
-            }
             if (impl.isClosedOrPending()) {
                 throw new SocketException("Socket closed");
             } else {
diff --git a/src/java.base/share/classes/java/nio/channels/SelectionKey.java b/src/java.base/share/classes/java/nio/channels/SelectionKey.java
index ad08fe43822..ceb7f575c4d 100644
--- a/src/java.base/share/classes/java/nio/channels/SelectionKey.java
+++ b/src/java.base/share/classes/java/nio/channels/SelectionKey.java
@@ -189,6 +189,83 @@ public abstract class SelectionKey {
      */
     public abstract SelectionKey interestOps(int ops);
 
+    /**
+     * Atomically sets this key's interest set to the bitwise union ("or") of
+     * the existing interest set and the given value. This method is guaranteed
+     * to be atomic with respect to other concurrent calls to this method or to
+     * {@link #interestOpsAnd(int)}.
+     *
+     * <p> This method may be invoked at any time.  If this method is invoked
+     * while a selection operation is in progress then it has no effect upon
+     * that operation; the change to the key's interest set will be seen by the
+     * next selection operation.
+     *
+     * @implSpec The default implementation synchronizes on this key and invokes
+     * {@code interestOps()} and {@code interestOps(int)} to retrieve and set
+     * this key's interest set.
+     *
+     * @param  ops  The interest set to apply
+     *
+     * @return  The previous interest set
+     *
+     * @throws  IllegalArgumentException
+     *          If a bit in the set does not correspond to an operation that
+     *          is supported by this key's channel, that is, if
+     *          {@code (ops & ~channel().validOps()) != 0}
+     *
+     * @throws  CancelledKeyException
+     *          If this key has been cancelled
+     *
+     * @since 11
+     */
+    public int interestOpsOr(int ops) {
+        synchronized (this) {
+            int oldVal = interestOps();
+            interestOps(oldVal | ops);
+            return oldVal;
+        }
+    }
+
+    /**
+     * Atomically sets this key's interest set to the bitwise intersection ("and")
+     * of the existing interest set and the given value. This method is guaranteed
+     * to be atomic with respect to other concurrent calls to this method or to
+     * {@link #interestOpsOr(int)}.
+     *
+     * <p> This method may be invoked at any time.  If this method is invoked
+     * while a selection operation is in progress then it has no effect upon
+     * that operation; the change to the key's interest set will be seen by the
+     * next selection operation.
+     *
+     * @apiNote Unlike the {@code interestOps(int)} and {@code interestOpsOr(int)}
+     * methods, this method does not throw {@code IllegalArgumentException} when
+     * invoked with bits in the interest set that do not correspond to an
+     * operation that is supported by this key's channel. This is to allow
+     * operation bits in the interest set to be cleared using bitwise complement
+     * values, e.g., {@code interestOpsAnd(~SelectionKey.OP_READ)} will remove
+     * the {@code OP_READ} from the interest set without affecting other bits.
+     *
+     * @implSpec The default implementation synchronizes on this key and invokes
+     * {@code interestOps()} and {@code interestOps(int)} to retrieve and set
+     * this key's interest set.
+     *
+     * @param  ops  The interest set to apply
+     *
+     * @return  The previous interest set
+     *
+     * @throws  CancelledKeyException
+     *          If this key has been cancelled
+     *
+     * @since 11
+     */
+    public int interestOpsAnd(int ops) {
+        synchronized (this) {
+            int oldVal = interestOps();
+            interestOps(oldVal & ops);
+            return oldVal;
+        }
+    }
+
     /**
      * Retrieves this key's ready-operation set.
      *
diff --git a/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java
index 41ac57fa3cf..65fb4a5f2bf 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -1391,8 +1391,9 @@ public final class Files {
      *          specific exception)</i>
      * @throws  DirectoryNotEmptyException
      *          the {@code REPLACE_EXISTING} option is specified but the file
-     *          cannot be replaced because it is a non-empty directory
-     *          <i>(optional specific exception)</i>
+     *          cannot be replaced because it is a non-empty directory, or the
+     *          source is a non-empty directory containing entries that would
+     *          be required to be moved <i>(optional specific exceptions)</i>
      * @throws  AtomicMoveNotSupportedException
      *          if the options array contains the {@code ATOMIC_MOVE} option but
      *          the file cannot be moved as an atomic file system operation.
diff --git a/src/java.base/share/classes/java/time/Clock.java b/src/java.base/share/classes/java/time/Clock.java
index a372251f983..37e723ec7bf 100644
--- a/src/java.base/share/classes/java/time/Clock.java
+++ b/src/java.base/share/classes/java/time/Clock.java
@@ -586,7 +586,7 @@ public abstract class Clock {
      * This is typically used for testing.
      */
     static final class FixedClock extends Clock implements Serializable {
-       private static final long serialVersionUID = 7430389292664866958L;
+        private static final long serialVersionUID = 7430389292664866958L;
         private final Instant instant;
         private final ZoneId zone;
 
@@ -636,7 +636,7 @@ public abstract class Clock {
      * Implementation of a clock that adds an offset to an underlying clock.
      */
     static final class OffsetClock extends Clock implements Serializable {
-       private static final long serialVersionUID = 2007484719125426256L;
+        private static final long serialVersionUID = 2007484719125426256L;
         private final Clock baseClock;
         private final Duration offset;
 
diff --git a/src/java.base/share/classes/java/time/Duration.java b/src/java.base/share/classes/java/time/Duration.java
index cf44f93978d..c446bf338ac 100644
--- a/src/java.base/share/classes/java/time/Duration.java
+++ b/src/java.base/share/classes/java/time/Duration.java
@@ -231,7 +231,7 @@ public final class Duration
      * This method allows an arbitrary number of nanoseconds to be passed in.
      * The factory will alter the values of the second and nanosecond in order
      * to ensure that the stored nanosecond is in the range 0 to 999,999,999.
-     * For example, the following will result in the exactly the same duration:
+     * For example, the following will result in exactly the same duration:
      * <pre>
      *  Duration.ofSeconds(3, 1);
      *  Duration.ofSeconds(4, -999_999_999);
@@ -1357,12 +1357,14 @@ public final class Duration
      * Truncating the duration returns a copy of the original with conceptual fields
      * smaller than the specified unit set to zero.
      * For example, truncating with the {@link ChronoUnit#MINUTES MINUTES} unit will
-     * round down to the nearest minute, setting the seconds and nanoseconds to zero.
+     * round down towards zero to the nearest minute, setting the seconds and
+     * nanoseconds to zero.
      * <p>
      * The unit must have a {@linkplain TemporalUnit#getDuration() duration}
      * that divides into the length of a standard day without remainder.
-     * This includes all supplied time units on {@link ChronoUnit} and
-     * {@link ChronoUnit#DAYS DAYS}. Other ChronoUnits throw an exception.
+     * This includes all
+     * {@linkplain ChronoUnit#isTimeBased() time-based units on {@code ChronoUnit}}
+     * and {@link ChronoUnit#DAYS DAYS}. Other ChronoUnits throw an exception.
      * <p>
      * This instance is immutable and unaffected by this method call.
      *
@@ -1388,7 +1390,7 @@ public final class Duration
             throw new UnsupportedTemporalTypeException("Unit must divide into a standard day without remainder");
         }
         long nod = (seconds % LocalTime.SECONDS_PER_DAY) * LocalTime.NANOS_PER_SECOND + nanos;
-        long result = (nod / dur) * dur ;
+        long result = (nod / dur) * dur;
         return plusNanos(result - nod);
     }
 
diff --git a/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java
index 1aefddfffce..0aafa49fd40 100644
--- a/src/java.base/share/classes/java/time/Instant.java
+++ b/src/java.base/share/classes/java/time/Instant.java
@@ -311,7 +311,7 @@ public final class Instant
      * This method allows an arbitrary number of nanoseconds to be passed in.
      * The factory will alter the values of the second and nanosecond in order
      * to ensure that the stored nanosecond is in the range 0 to 999,999,999.
-     * For example, the following will result in the exactly the same instant:
+     * For example, the following will result in exactly the same instant:
      * <pre>
      *  Instant.ofEpochSecond(3, 1);
      *  Instant.ofEpochSecond(4, -999_999_999);
@@ -757,7 +757,7 @@ public final class Instant
             throw new UnsupportedTemporalTypeException("Unit must divide into a standard day without remainder");
         }
         long nod = (seconds % LocalTime.SECONDS_PER_DAY) * LocalTime.NANOS_PER_SECOND + nanos;
-        long result = Math.floorDiv(nod, dur) * dur ;
+        long result = Math.floorDiv(nod, dur) * dur;
         return plusNanos(result - nod);
     }
 
diff --git a/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java
index 76b5fed0367..80241339c35 100644
--- a/src/java.base/share/classes/java/time/LocalTime.java
+++ b/src/java.base/share/classes/java/time/LocalTime.java
@@ -356,14 +356,14 @@ public final class LocalTime
      * @return the local time, not null
      * @since 9
      */
-     public static LocalTime ofInstant(Instant instant, ZoneId zone) {
-         Objects.requireNonNull(instant, "instant");
-         Objects.requireNonNull(zone, "zone");
-         ZoneOffset offset = zone.getRules().getOffset(instant);
-         long localSecond = instant.getEpochSecond() + offset.getTotalSeconds();
-         int secsOfDay = Math.floorMod(localSecond, SECONDS_PER_DAY);
-         return ofNanoOfDay(secsOfDay * NANOS_PER_SECOND + instant.getNano());
-     }
+    public static LocalTime ofInstant(Instant instant, ZoneId zone) {
+        Objects.requireNonNull(instant, "instant");
+        Objects.requireNonNull(zone, "zone");
+        ZoneOffset offset = zone.getRules().getOffset(instant);
+        long localSecond = instant.getEpochSecond() + offset.getTotalSeconds();
+        int secsOfDay = Math.floorMod(localSecond, SECONDS_PER_DAY);
+        return ofNanoOfDay(secsOfDay * NANOS_PER_SECOND + instant.getNano());
+    }
 
     //-----------------------------------------------------------------------
     /**
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
index 26513379b43..3d236ff4ccd 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
@@ -110,7 +110,7 @@ import java.util.Objects;
  *        int year = date.get(ChronoField.YEAR);
  *        System.out.printf("  Today is %s %s %d-%s-%d%n", date.getChronology().getID(),
  *                dow, day, month, year);
-
+ *
  *        // Print today's date and the last day of the year
  *        ChronoLocalDate now1 = Chronology.of("Hijrah").dateNow();
  *        ChronoLocalDate first = now1.with(ChronoField.DAY_OF_MONTH, 1)
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java
index d8411961697..51637c2b5d8 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java
@@ -201,7 +201,7 @@ public interface ChronoLocalDateTime<D extends ChronoLocalDate>
      *
      * @return the date part of this date-time, not null
      */
-    D toLocalDate() ;
+    D toLocalDate();
 
     /**
      * Gets the local time part of this date-time.
diff --git a/src/java.base/share/classes/java/time/chrono/Chronology.java b/src/java.base/share/classes/java/time/chrono/Chronology.java
index d1c3919cb63..f35f9b95c3e 100644
--- a/src/java.base/share/classes/java/time/chrono/Chronology.java
+++ b/src/java.base/share/classes/java/time/chrono/Chronology.java
@@ -736,8 +736,8 @@ public interface Chronology extends Comparable<Chronology> {
      * @throws DateTimeException if any of the values are out of range
      * @since 9
      */
-     public default long epochSecond(int prolepticYear, int month, int dayOfMonth,
-                                     int hour, int minute, int second, ZoneOffset zoneOffset) {
+    public default long epochSecond(int prolepticYear, int month, int dayOfMonth,
+                                    int hour, int minute, int second, ZoneOffset zoneOffset) {
         Objects.requireNonNull(zoneOffset, "zoneOffset");
         HOUR_OF_DAY.checkValidValue(hour);
         MINUTE_OF_HOUR.checkValidValue(minute);
@@ -765,8 +765,8 @@ public interface Chronology extends Comparable<Chronology> {
      * @throws DateTimeException if any of the values are out of range
      * @since 9
      */
-     public default long epochSecond(Era era, int yearOfEra, int month, int dayOfMonth,
-                                     int hour, int minute, int second, ZoneOffset zoneOffset) {
+    public default long epochSecond(Era era, int yearOfEra, int month, int dayOfMonth,
+                                    int hour, int minute, int second, ZoneOffset zoneOffset) {
         Objects.requireNonNull(era, "era");
         return epochSecond(prolepticYear(era, yearOfEra), month, dayOfMonth, hour, minute, second, zoneOffset);
     }
diff --git a/src/java.base/share/classes/java/time/chrono/IsoChronology.java b/src/java.base/share/classes/java/time/chrono/IsoChronology.java
index 4919b3d7d3a..18d73689569 100644
--- a/src/java.base/share/classes/java/time/chrono/IsoChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/IsoChronology.java
@@ -287,9 +287,9 @@ public final class IsoChronology extends AbstractChronology implements Serializa
      *         or if the day-of-month is invalid for the month-of-year
      * @since 9
      */
-     @Override
-     public long epochSecond(int prolepticYear, int month, int dayOfMonth,
-                             int hour, int minute, int second, ZoneOffset zoneOffset) {
+    @Override
+    public long epochSecond(int prolepticYear, int month, int dayOfMonth,
+                            int hour, int minute, int second, ZoneOffset zoneOffset) {
         YEAR.checkValidValue(prolepticYear);
         MONTH_OF_YEAR.checkValidValue(month);
         DAY_OF_MONTH.checkValidValue(dayOfMonth);
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
index 4478c4c7de1..8cd67a05908 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
@@ -459,38 +459,38 @@ public final class JapaneseChronology extends AbstractChronology implements Seri
         return era.getPrivateEra().getSinceDate().getYear() + yearOfEra - 1;
     }
 
-     private ChronoLocalDate resolveYMD(JapaneseEra era, int yoe, Map<TemporalField,Long> fieldValues, ResolverStyle resolverStyle) {
-         fieldValues.remove(ERA);
-         fieldValues.remove(YEAR_OF_ERA);
-         if (resolverStyle == ResolverStyle.LENIENT) {
-             int y = prolepticYearLenient(era, yoe);
-             long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
-             long days = Math.subtractExact(fieldValues.remove(DAY_OF_MONTH), 1);
-             return date(y, 1, 1).plus(months, MONTHS).plus(days, DAYS);
-         }
-         int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
-         int dom = range(DAY_OF_MONTH).checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH);
-         if (resolverStyle == ResolverStyle.SMART) {  // previous valid
-             if (yoe < 1) {
-                 throw new DateTimeException("Invalid YearOfEra: " + yoe);
-             }
-             int y = prolepticYearLenient(era, yoe);
-             JapaneseDate result;
-             try {
-                 result = date(y, moy, dom);
-             } catch (DateTimeException ex) {
-                 result = date(y, moy, 1).with(TemporalAdjusters.lastDayOfMonth());
-             }
-             // handle the era being changed
-             // only allow if the new date is in the same Jan-Dec as the era change
-             // determine by ensuring either original yoe or result yoe is 1
-             if (result.getEra() != era && result.get(YEAR_OF_ERA) > 1 && yoe > 1) {
-                 throw new DateTimeException("Invalid YearOfEra for Era: " + era + " " + yoe);
-             }
-             return result;
-         }
-         return date(era, yoe, moy, dom);
-     }
+    private ChronoLocalDate resolveYMD(JapaneseEra era, int yoe, Map<TemporalField,Long> fieldValues, ResolverStyle resolverStyle) {
+        fieldValues.remove(ERA);
+        fieldValues.remove(YEAR_OF_ERA);
+        if (resolverStyle == ResolverStyle.LENIENT) {
+            int y = prolepticYearLenient(era, yoe);
+            long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
+            long days = Math.subtractExact(fieldValues.remove(DAY_OF_MONTH), 1);
+            return date(y, 1, 1).plus(months, MONTHS).plus(days, DAYS);
+        }
+        int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
+        int dom = range(DAY_OF_MONTH).checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH);
+        if (resolverStyle == ResolverStyle.SMART) {  // previous valid
+            if (yoe < 1) {
+                throw new DateTimeException("Invalid YearOfEra: " + yoe);
+            }
+            int y = prolepticYearLenient(era, yoe);
+            JapaneseDate result;
+            try {
+                result = date(y, moy, dom);
+            } catch (DateTimeException ex) {
+                result = date(y, moy, 1).with(TemporalAdjusters.lastDayOfMonth());
+            }
+            // handle the era being changed
+            // only allow if the new date is in the same Jan-Dec as the era change
+            // determine by ensuring either original yoe or result yoe is 1
+            if (result.getEra() != era && result.get(YEAR_OF_ERA) > 1 && yoe > 1) {
+                throw new DateTimeException("Invalid YearOfEra for Era: " + era + " " + yoe);
+            }
+            return result;
+        }
+        return date(era, yoe, moy, dom);
+    }
 
     private ChronoLocalDate resolveYD(JapaneseEra era, int yoe, Map <TemporalField,Long> fieldValues, ResolverStyle resolverStyle) {
         fieldValues.remove(ERA);
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
index bbafa53f054..3d318ea36b0 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -123,14 +123,19 @@ public final class JapaneseEra
      */
     public static final JapaneseEra SHOWA = new JapaneseEra(1, LocalDate.of(1926, 12, 25));
     /**
-     * The singleton instance for the 'Heisei' era (1989-01-08 - current)
+     * The singleton instance for the 'Heisei' era (1989-01-08 - 2019-04-30)
      * which has the value 2.
      */
     public static final JapaneseEra HEISEI = new JapaneseEra(2, LocalDate.of(1989, 1, 8));
+    /**
+     * The singleton instance for the 'NewEra' era (2019-05-01 - current)
+     * which has the value 3.
+     */
+    private static final JapaneseEra NEWERA = new JapaneseEra(3, LocalDate.of(2019, 5, 1));
 
     // The number of predefined JapaneseEra constants.
     // There may be a supplemental era defined by the property.
-    private static final int N_ERA_CONSTANTS = HEISEI.getValue() + ERA_OFFSET;
+    private static final int N_ERA_CONSTANTS = NEWERA.getValue() + ERA_OFFSET;
 
     /**
      * Serialization version.
@@ -148,6 +153,7 @@ public final class JapaneseEra
         KNOWN_ERAS[1] = TAISHO;
         KNOWN_ERAS[2] = SHOWA;
         KNOWN_ERAS[3] = HEISEI;
+        KNOWN_ERAS[4] = NEWERA;
         for (int i = N_ERA_CONSTANTS; i < ERA_CONFIG.length; i++) {
             CalendarDate date = ERA_CONFIG[i].getSinceDate();
             LocalDate isoDate = LocalDate.of(date.getYear(), date.getMonth(), date.getDayOfMonth());
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
index 8e9437f2184..589792c18e2 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -3049,7 +3049,7 @@ public final class DateTimeFormatterBuilder {
      * Prints and parses a numeric date-time field with optional padding.
      */
     static final class FractionPrinterParser extends NumberPrinterParser {
-       private final boolean decimalPoint;
+        private final boolean decimalPoint;
 
         /**
          * Constructor.
diff --git a/src/java.base/share/classes/java/time/format/DecimalStyle.java b/src/java.base/share/classes/java/time/format/DecimalStyle.java
index 73f3cb23160..989c1c19e48 100644
--- a/src/java.base/share/classes/java/time/format/DecimalStyle.java
+++ b/src/java.base/share/classes/java/time/format/DecimalStyle.java
@@ -216,7 +216,6 @@ public final class DecimalStyle {
      *
      * @param zeroDigit  the character for zero
      * @return  a copy with a new character that represents zero, not null
-
      */
     public DecimalStyle withZeroDigit(char zeroDigit) {
         if (zeroDigit == this.zeroDigit) {
diff --git a/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java b/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
index 4014c23c083..03e618731fc 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
@@ -119,7 +119,7 @@ import java.util.Collections;
  * Providers must ensure that once a rule has been seen by the application, the
  * rule must continue to be available.
  * <p>
-*  Providers are encouraged to implement a meaningful {@code toString} method.
+ * Providers are encouraged to implement a meaningful {@code toString} method.
  * <p>
  * Many systems would like to update time-zone rules dynamically without stopping the JVM.
  * When examined in detail, this is a complex problem.
diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
index d61f2774df1..0fd1176b970 100644
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -2914,7 +2914,7 @@ public final class Formatter implements Closeable, Flushable {
                 a.append(System.lineSeparator());
                 break;
             case Conversion.PERCENT_SIGN:
-                a.append('%');
+                print("%", l);
                 break;
             default:
                 assert false;
diff --git a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
index 35c5009b43a..65c223e929f 100644
--- a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
+++ b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -50,6 +50,7 @@ import sun.util.calendar.ZoneInfo;
  *     2       Taisho      1912-07-30T00:00:00 local time
  *     3       Showa       1926-12-25T00:00:00 local time
  *     4       Heisei      1989-01-08T00:00:00 local time
+ *     5       NewEra      2019-05-01T00:00:00 local time
  * ------------------------------------------------------
  * }</pre>
  *
@@ -71,8 +72,10 @@ import sun.util.calendar.ZoneInfo;
  * </pre>
  * where
  * <dl>
- * <dt>{@code <name>:}<dd>the full name of the new era (non-ASCII characters allowed)
- * <dt>{@code <abbr>:}<dd>the abbreviation of the new era (non-ASCII characters allowed)
+ * <dt>{@code <name>:}<dd>the full name of the new era (non-ASCII characters allowed,
+ * either in platform's native encoding or in Unicode escape notation, {@code \\uXXXX})
+ * <dt>{@code <abbr>:}<dd>the abbreviation of the new era (non-ASCII characters allowed,
+ * either in platform's native encoding or in Unicode escape notation, {@code \\uXXXX})
  * <dt>{@code <time['u']>:}<dd>the start time of the new era represented by
  * milliseconds from 1970-01-01T00:00:00 local time or UTC if {@code 'u'} is
  * appended to the milliseconds value. (ASCII digits only)
@@ -125,6 +128,11 @@ class JapaneseImperialCalendar extends Calendar {
      */
     public static final int HEISEI = 4;
 
+    /**
+     * The ERA constant designating the NewEra era.
+     */
+    private static final int NEWERA = 5;
+
     private static final int EPOCH_OFFSET   = 719163; // Fixed date of January 1, 1970 (Gregorian)
 
     // Useful millisecond constants.  Although ONE_DAY and ONE_WEEK can fit
@@ -155,6 +163,9 @@ class JapaneseImperialCalendar extends Calendar {
     // Fixed date of the first date of each era.
     private static final long[] sinceFixedDates;
 
+    // The current era
+    private static final int currentEra;
+
     /*
      * <pre>
      *                                 Greatest       Least
@@ -251,13 +262,18 @@ class JapaneseImperialCalendar extends Calendar {
         // eras[BEFORE_MEIJI] and sinceFixedDate[BEFORE_MEIJI] are the
         // same as Gregorian.
         int index = BEFORE_MEIJI;
+        int current = index;
         sinceFixedDates[index] = gcal.getFixedDate(BEFORE_MEIJI_ERA.getSinceDate());
         eras[index++] = BEFORE_MEIJI_ERA;
         for (Era e : es) {
+            if(e.getSince(TimeZone.NO_TIMEZONE) < System.currentTimeMillis()) {
+                current = index;
+            }
             CalendarDate d = e.getSinceDate();
             sinceFixedDates[index] = gcal.getFixedDate(d);
             eras[index++] = e;
         }
+        currentEra = current;
 
         LEAST_MAX_VALUES[ERA] = MAX_VALUES[ERA] = eras.length - 1;
 
@@ -1743,12 +1759,12 @@ class JapaneseImperialCalendar extends Calendar {
                     }
                 } else if (transitionYear) {
                     if (jdate.getYear() == 1) {
-                        // As of Heisei (since Meiji) there's no case
+                        // As of NewEra (since Meiji) there's no case
                         // that there are multiple transitions in a
                         // year.  Historically there was such
                         // case. There might be such case again in the
                         // future.
-                        if (era > HEISEI) {
+                        if (era > NEWERA) {
                             CalendarDate pd = eras[era - 1].getSinceDate();
                             if (normalizedYear == pd.getYear()) {
                                 d.setMonth(pd.getMonth()).setDayOfMonth(pd.getDayOfMonth());
@@ -1883,7 +1899,7 @@ class JapaneseImperialCalendar extends Calendar {
             year = isSet(YEAR) ? internalGet(YEAR) : 1;
         } else {
             if (isSet(YEAR)) {
-                era = eras.length - 1;
+                era = currentEra;
                 year = internalGet(YEAR);
             } else {
                 // Equivalent to 1970 (Gregorian)
@@ -2367,7 +2383,7 @@ class JapaneseImperialCalendar extends Calendar {
      * default ERA is the current era, but a zero (unset) ERA means before Meiji.
      */
     private int internalGetEra() {
-        return isSet(ERA) ? internalGet(ERA) : eras.length - 1;
+        return isSet(ERA) ? internalGet(ERA) : currentEra;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/util/concurrent/TimeUnit.java b/src/java.base/share/classes/java/util/concurrent/TimeUnit.java
index cbddf59c337..7942fb55816 100644
--- a/src/java.base/share/classes/java/util/concurrent/TimeUnit.java
+++ b/src/java.base/share/classes/java/util/concurrent/TimeUnit.java
@@ -35,6 +35,7 @@
 
 package java.util.concurrent;
 
+import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.Objects;
 
@@ -191,6 +192,50 @@ public enum TimeUnit {
         }
     }
 
+    /**
+     * Converts the given time duration to this unit.
+     *
+     * <p>For any TimeUnit {@code unit},
+     * {@code unit.convert(Duration.ofNanos(n))}
+     * is equivalent to
+     * {@code unit.convert(n, NANOSECONDS)}, and
+     * {@code unit.convert(Duration.of(n, unit.toChronoUnit()))}
+     * is equivalent to {@code n} (in the absence of overflow).
+     *
+     * @param duration the time duration
+     * @return the converted duration in this unit,
+     * or {@code Long.MIN_VALUE} if conversion would negatively overflow,
+     * or {@code Long.MAX_VALUE} if it would positively overflow.
+     * @throws NullPointerException if {@code duration} is null
+     * @see Duration#of(long,TemporalUnit)
+     * @since 11
+     */
+    public long convert(Duration duration) {
+        long secs = duration.getSeconds();
+        int nano = duration.getNano();
+        if (secs < 0 && nano > 0) {
+            // use representation compatible with integer division
+            secs++;
+            nano -= SECOND_SCALE;
+        }
+        final long s, nanoVal;
+        // Optimize for the common case - NANOSECONDS without overflow
+        if (this == NANOSECONDS)
+            nanoVal = nano;
+        else if ((s = scale) < SECOND_SCALE)
+            nanoVal = nano / s;
+        else if (this == SECONDS)
+            return secs;
+        else
+            return secs / secRatio;
+        long val = secs * secRatio + nanoVal;
+        return ((secs < maxSecs && secs > -maxSecs) ||
+                (secs == maxSecs && val > 0) ||
+                (secs == -maxSecs && val < 0))
+            ? val
+            : (secs > 0) ? Long.MAX_VALUE : Long.MIN_VALUE;
+    }
+
     /**
      * Equivalent to
      * {@link #convert(long, TimeUnit) NANOSECONDS.convert(duration, this)}.
@@ -221,10 +266,8 @@ public enum TimeUnit {
      */
     public long toMicros(long duration) {
         long s, m;
-        if ((s = scale) == MICRO_SCALE)
-            return duration;
-        else if (s < MICRO_SCALE)
-            return duration / microRatio;
+        if ((s = scale) <= MICRO_SCALE)
+            return (s == MICRO_SCALE) ? duration : duration / microRatio;
         else if (duration > (m = maxMicros))
             return Long.MAX_VALUE;
         else if (duration < -m)
@@ -243,10 +286,8 @@ public enum TimeUnit {
      */
     public long toMillis(long duration) {
         long s, m;
-        if ((s = scale) == MILLI_SCALE)
-            return duration;
-        else if (s < MILLI_SCALE)
-            return duration / milliRatio;
+        if ((s = scale) <= MILLI_SCALE)
+            return (s == MILLI_SCALE) ? duration : duration / milliRatio;
         else if (duration > (m = maxMillis))
             return Long.MAX_VALUE;
         else if (duration < -m)
@@ -265,10 +306,8 @@ public enum TimeUnit {
      */
     public long toSeconds(long duration) {
         long s, m;
-        if ((s = scale) == SECOND_SCALE)
-            return duration;
-        else if (s < SECOND_SCALE)
-            return duration / secRatio;
+        if ((s = scale) <= SECOND_SCALE)
+            return (s == SECOND_SCALE) ? duration : duration / secRatio;
         else if (duration > (m = maxSecs))
             return Long.MAX_VALUE;
         else if (duration < -m)
diff --git a/src/java.base/share/classes/java/util/function/Predicate.java b/src/java.base/share/classes/java/util/function/Predicate.java
index e2f448b1674..7a0bde90150 100644
--- a/src/java.base/share/classes/java/util/function/Predicate.java
+++ b/src/java.base/share/classes/java/util/function/Predicate.java
@@ -116,4 +116,20 @@ public interface Predicate<T> {
                 ? Objects::isNull
                 : object -> targetRef.equals(object);
     }
+
+    /**
+     * Returns a predicate that is the negation of the supplied predicate.
+     *
+     * @param <T>     the type of arguments to the specified predicate
+     * @param target  predicate to negate
+     *
+     * @return a predicate that negates the results of the supplied
+     *         predicate
+     *
+     * @since 11
+     */
+    @SuppressWarnings("unchecked")
+    static <T> Predicate<T> not(Predicate<? super T> target) {
+        return (Predicate<T>)target.negate();
+    }
 }
diff --git a/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java
index 016f29e7120..9860b7381d7 100644
--- a/src/java.base/share/classes/java/util/jar/Attributes.java
+++ b/src/java.base/share/classes/java/util/jar/Attributes.java
@@ -377,7 +377,8 @@ public class Attributes implements Map<Object,Object>, Cloneable {
         int len;
         while ((len = is.readLine(lbuf)) != -1) {
             boolean lineContinued = false;
-            if (lbuf[--len] != '\n') {
+            byte c = lbuf[--len];
+            if (c != '\n' && c != '\r') {
                 throw new IOException("line too long");
             }
             if (len > 0 && lbuf[len-1] == '\r') {
diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
index ec7fdf0f06a..5562611cfe4 100644
--- a/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -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
@@ -93,10 +93,14 @@ import java.util.zip.ZipFile;
  * argument.  This assures that classes compatible with the major
  * version of the running JVM are loaded from multi-release jar files.
  *
- * <p>If the verify flag is on when opening a signed jar file, the content of
- * the file is verified against its signature embedded inside the file. Please
- * note that the verification process does not include validating the signer's
- * certificate. A caller should inspect the return value of
+ * <p> If the {@code verify} flag is on when opening a signed jar file, the content
+ * of the jar entry is verified against the signature embedded inside the manifest
+ * that is associated with its {@link JarEntry#getRealName() path name}. For a
+ * multi-release jar file, the content of a versioned entry is verfieid against
+ * its own signature and {@link JarEntry#getCodeSigners()} returns its own signers.
+ *
+ * Please note that the verification process does not include validating the
+ * signer's certificate. A caller should inspect the return value of
  * {@link JarEntry#getCodeSigners()} to further determine if the signature
  * can be trusted.
  *
diff --git a/src/java.base/share/classes/java/util/jar/Manifest.java b/src/java.base/share/classes/java/util/jar/Manifest.java
index 18f6831a71b..ea73a1f65ac 100644
--- a/src/java.base/share/classes/java/util/jar/Manifest.java
+++ b/src/java.base/share/classes/java/util/jar/Manifest.java
@@ -205,7 +205,8 @@ public class Manifest implements Cloneable {
         byte[] lastline = null;
 
         while ((len = fis.readLine(lbuf)) != -1) {
-            if (lbuf[--len] != '\n') {
+            byte c = lbuf[--len];
+            if (c != '\n' && c != '\r') {
                 throw new IOException("manifest line too long");
             }
             if (len > 0 && lbuf[len-1] == '\r') {
@@ -381,13 +382,38 @@ public class Manifest implements Cloneable {
                 }
                 int tpos = pos;
                 int maxpos = tpos + n;
-                while (tpos < maxpos && tbuf[tpos++] != '\n') ;
+                byte c = 0;
+                // jar.spec.newline: CRLF | LF | CR (not followed by LF)
+                while (tpos < maxpos && (c = tbuf[tpos++]) != '\n' && c != '\r');
+                if (c == '\r' && tpos < maxpos && tbuf[tpos] == '\n') {
+                    tpos++;
+                }
                 n = tpos - pos;
                 System.arraycopy(tbuf, pos, b, off, n);
                 off += n;
                 total += n;
                 pos = tpos;
-                if (tbuf[tpos-1] == '\n') {
+                c = tbuf[tpos-1];
+                if (c == '\n') {
+                    break;
+                }
+                if (c == '\r') {
+                    if (count == pos) {
+                        // try to see if there is a trailing LF
+                        fill();
+                        if (pos < count && tbuf[pos] == '\n') {
+                            if (total < len) {
+                                b[off++] = '\n';
+                                total++;
+                            } else {
+                                // we should always have big enough lbuf but
+                                // just in case we don't, replace the last CR
+                                // with LF.
+                                b[off - 1] = '\n';
+                            }
+                            pos++;
+                        }
+                    }
                     break;
                 }
             }
diff --git a/src/java.base/share/classes/java/util/regex/Matcher.java b/src/java.base/share/classes/java/util/regex/Matcher.java
index de24ffb4e40..6cd42c7604f 100644
--- a/src/java.base/share/classes/java/util/regex/Matcher.java
+++ b/src/java.base/share/classes/java/util/regex/Matcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, 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
@@ -37,8 +37,8 @@ import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 /**
- * An engine that performs match operations on a {@linkplain java.lang.CharSequence
- * character sequence} by interpreting a {@link Pattern}.
+ * An engine that performs match operations on a {@linkplain
+ * java.lang.CharSequence character sequence} by interpreting a {@link Pattern}.
  *
  * <p> A matcher is created from a pattern by invoking the pattern's {@link
  * Pattern#matcher matcher} method.  Once created, a matcher can be used to
@@ -52,8 +52,8 @@ import java.util.stream.StreamSupport;
  *   <li><p> The {@link #lookingAt lookingAt} method attempts to match the
  *   input sequence, starting at the beginning, against the pattern.  </p></li>
  *
- *   <li><p> The {@link #find find} method scans the input sequence looking for
- *   the next subsequence that matches the pattern.  </p></li>
+ *   <li><p> The {@link #find find} method scans the input sequence looking
+ *   for the next subsequence that matches the pattern.  </p></li>
  *
  * </ul>
  *
@@ -63,12 +63,12 @@ import java.util.stream.StreamSupport;
  *
  * <p> A matcher finds matches in a subset of its input called the
  * <i>region</i>. By default, the region contains all of the matcher's input.
- * The region can be modified via the {@link #region region} method and queried
- * via the {@link #regionStart regionStart} and {@link #regionEnd regionEnd}
- * methods. The way that the region boundaries interact with some pattern
- * constructs can be changed. See {@link #useAnchoringBounds
- * useAnchoringBounds} and {@link #useTransparentBounds useTransparentBounds}
- * for more details.
+ * The region can be modified via the {@link #region(int, int) region} method
+ * and queried via the {@link #regionStart() regionStart} and {@link
+ * #regionEnd() regionEnd} methods. The way that the region boundaries interact
+ * with some pattern constructs can be changed. See {@link
+ * #useAnchoringBounds(boolean) useAnchoringBounds} and {@link
+ * #useTransparentBounds(boolean) useTransparentBounds} for more details.
  *
  * <p> This class also defines methods for replacing matched subsequences with
  * new strings whose contents can, if desired, be computed from the match
@@ -586,8 +586,8 @@ public final class Matcher implements MatchResult {
      *
      * <p> For a matcher <i>m</i> with input sequence <i>s</i>,
      * the expressions <i>m.</i>{@code group()} and
-     * <i>s.</i>{@code substring(}<i>m.</i>{@code start(),}&nbsp;<i>m.</i>{@code end())}
-     * are equivalent.  </p>
+     * <i>s.</i>{@code substring(}<i>m.</i>{@code start(),}&nbsp;<i>m.</i>
+     * {@code end())} are equivalent.  </p>
      *
      * <p> Note that some patterns, for example {@code a*}, match the empty
      * string.  This method will return the empty string when the pattern
@@ -652,8 +652,8 @@ public final class Matcher implements MatchResult {
 
     /**
      * Returns the input subsequence captured by the given
-     * <a href="Pattern.html#groupname">named-capturing group</a> during the previous
-     * match operation.
+     * <a href="Pattern.html#groupname">named-capturing group</a> during the
+     * previous match operation.
      *
      * <p> If the match was successful but the group specified failed to match
      * any part of the input sequence, then {@code null} is returned. Note
@@ -866,9 +866,9 @@ public final class Matcher implements MatchResult {
      * string.
      *
      * <p> This method is intended to be used in a loop together with the
-     * {@link #appendTail appendTail} and {@link #find find} methods.  The
-     * following code, for example, writes {@code one dog two dogs in the
-     * yard} to the standard-output stream: </p>
+     * {@link #appendTail(StringBuffer) appendTail} and {@link #find() find}
+     * methods.  The following code, for example, writes {@code one dog two dogs
+     * in the yard} to the standard-output stream: </p>
      *
      * <blockquote><pre>
      * Pattern p = Pattern.compile("cat");
@@ -959,9 +959,9 @@ public final class Matcher implements MatchResult {
      * string.
      *
      * <p> This method is intended to be used in a loop together with the
-     * {@link #appendTail appendTail} and {@link #find find} methods.  The
-     * following code, for example, writes {@code one dog two dogs in the
-     * yard} to the standard-output stream: </p>
+     * {@link #appendTail(StringBuilder) appendTail} and
+     * {@link #find() find} methods. The following code, for example, writes
+     * {@code one dog two dogs in the yard} to the standard-output stream: </p>
      *
      * <blockquote><pre>
      * Pattern p = Pattern.compile("cat");
@@ -1104,8 +1104,8 @@ public final class Matcher implements MatchResult {
      * <p> This method reads characters from the input sequence, starting at
      * the append position, and appends them to the given string buffer.  It is
      * intended to be invoked after one or more invocations of the {@link
-     * #appendReplacement appendReplacement} method in order to copy the
-     * remainder of the input sequence.  </p>
+     * #appendReplacement(StringBuffer, String) appendReplacement} method in
+     * order to copy the remainder of the input sequence.  </p>
      *
      * @param  sb
      *         The target string buffer
@@ -1123,8 +1123,9 @@ public final class Matcher implements MatchResult {
      * <p> This method reads characters from the input sequence, starting at
      * the append position, and appends them to the given string builder.  It is
      * intended to be invoked after one or more invocations of the {@link
-     * #appendReplacement appendReplacement} method in order to copy the
-     * remainder of the input sequence.  </p>
+     * #appendReplacement(StringBuilder, String)
+     * appendReplacement} method in order to copy the remainder of the input
+     * sequence.  </p>
      *
      * @param  sb
      *         The target string builder
@@ -1490,10 +1491,10 @@ public final class Matcher implements MatchResult {
      * index specified by the {@code end} parameter.
      *
      * <p>Depending on the transparency and anchoring being used (see
-     * {@link #useTransparentBounds useTransparentBounds} and
-     * {@link #useAnchoringBounds useAnchoringBounds}), certain constructs such
-     * as anchors may behave differently at or around the boundaries of the
-     * region.
+     * {@link #useTransparentBounds(boolean) useTransparentBounds} and
+     * {@link #useAnchoringBounds(boolean) useAnchoringBounds}), certain
+     * constructs such as anchors may behave differently at or around the
+     * boundaries of the region.
      *
      * @param  start
      *         The index to start searching at (inclusive)
@@ -1523,8 +1524,8 @@ public final class Matcher implements MatchResult {
     /**
      * Reports the start index of this matcher's region. The
      * searches this matcher conducts are limited to finding matches
-     * within {@link #regionStart regionStart} (inclusive) and
-     * {@link #regionEnd regionEnd} (exclusive).
+     * within {@link #regionStart() regionStart} (inclusive) and
+     * {@link #regionEnd() regionEnd} (exclusive).
      *
      * @return  The starting point of this matcher's region
      * @since 1.5
@@ -1536,8 +1537,8 @@ public final class Matcher implements MatchResult {
     /**
      * Reports the end index (exclusive) of this matcher's region.
      * The searches this matcher conducts are limited to finding matches
-     * within {@link #regionStart regionStart} (inclusive) and
-     * {@link #regionEnd regionEnd} (exclusive).
+     * within {@link #regionStart() regionStart} (inclusive) and
+     * {@link #regionEnd() regionEnd} (exclusive).
      *
      * @return  the ending point of this matcher's region
      * @since 1.5
@@ -1553,7 +1554,7 @@ public final class Matcher implements MatchResult {
      * <i>transparent</i> bounds, {@code false} if it uses <i>opaque</i>
      * bounds.
      *
-     * <p> See {@link #useTransparentBounds useTransparentBounds} for a
+     * <p> See {@link #useTransparentBounds(boolean) useTransparentBounds} for a
      * description of transparent and opaque bounds.
      *
      * <p> By default, a matcher uses opaque region boundaries.
@@ -1604,7 +1605,7 @@ public final class Matcher implements MatchResult {
      * <p> This method returns {@code true} if this matcher uses
      * <i>anchoring</i> bounds, {@code false} otherwise.
      *
-     * <p> See {@link #useAnchoringBounds useAnchoringBounds} for a
+     * <p> See {@link #useAnchoringBounds(boolean) useAnchoringBounds} for a
      * description of anchoring bounds.
      *
      * <p> By default, a matcher uses anchoring region boundaries.
@@ -1770,18 +1771,18 @@ public final class Matcher implements MatchResult {
     }
 
     /**
-     * Generates a String from this Matcher's input in the specified range.
+     * Generates a String from this matcher's input in the specified range.
      *
      * @param  beginIndex   the beginning index, inclusive
      * @param  endIndex     the ending index, exclusive
-     * @return A String generated from this Matcher's input
+     * @return A String generated from this matcher's input
      */
     CharSequence getSubSequence(int beginIndex, int endIndex) {
         return text.subSequence(beginIndex, endIndex);
     }
 
     /**
-     * Returns this Matcher's input character at index i.
+     * Returns this matcher's input character at index i.
      *
      * @return A char from the specified index
      */
@@ -1802,4 +1803,4 @@ public final class Matcher implements MatchResult {
             throw new IllegalArgumentException("No group with name <" + name + ">");
         return parentPattern.namedGroups().get(name);
     }
-}
+}
\ No newline at end of file
diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java
index cfef8043f97..0bbad9ea3c7 100644
--- a/src/java.base/share/classes/javax/crypto/Cipher.java
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java
@@ -111,7 +111,7 @@ import sun.security.jca.*;
  * encryption with a given key. When IVs are repeated for GCM
  * encryption, such usages are subject to forgery attacks. Thus, after
  * each encryption operation using GCM mode, callers should re-initialize
- * the cipher objects with GCM parameters which has a different IV value.
+ * the cipher objects with GCM parameters which have a different IV value.
  * <pre>
  *     GCMParameterSpec s = ...;
  *     cipher.init(..., s);
@@ -131,6 +131,13 @@ import sun.security.jca.*;
  *     ...
  *
  * </pre>
+ * The ChaCha20 and ChaCha20-Poly1305 algorithms have a similar requirement
+ * for unique nonces with a given key.  After each encryption or decryption
+ * operation, callers should re-initialize their ChaCha20 or ChaCha20-Poly1305
+ * ciphers with parameters that specify a different nonce value.  Please
+ * see <a href="https://tools.ietf.org/html/rfc7539">RFC 7539</a> for more
+ * information on the ChaCha20 and ChaCha20-Poly1305 algorithms.
+ * <p>
  * Every implementation of the Java platform is required to support
  * the following standard {@code Cipher} transformations with the keysizes
  * in parentheses:
diff --git a/src/java.base/share/classes/javax/crypto/CipherSpi.java b/src/java.base/share/classes/javax/crypto/CipherSpi.java
index 72bfa803bd5..a7335f01b26 100644
--- a/src/java.base/share/classes/javax/crypto/CipherSpi.java
+++ b/src/java.base/share/classes/javax/crypto/CipherSpi.java
@@ -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
@@ -755,6 +755,7 @@ public abstract class CipherSpi {
             return 0;
         }
         int outLenNeeded = engineGetOutputSize(inLen);
+
         if (output.remaining() < outLenNeeded) {
             throw new ShortBufferException("Need at least " + outLenNeeded
                 + " bytes of space in output buffer");
@@ -762,98 +763,77 @@ public abstract class CipherSpi {
 
         boolean a1 = input.hasArray();
         boolean a2 = output.hasArray();
+        int total = 0;
+        byte[] inArray, outArray;
+        if (a2) { // output has an accessible byte[]
+            outArray = output.array();
+            int outPos = output.position();
+            int outOfs = output.arrayOffset() + outPos;
 
-        if (a1 && a2) {
-            byte[] inArray = input.array();
-            int inOfs = input.arrayOffset() + inPos;
-            byte[] outArray = output.array();
-            int outPos = output.position();
-            int outOfs = output.arrayOffset() + outPos;
-            int n;
-            if (isUpdate) {
-                n = engineUpdate(inArray, inOfs, inLen, outArray, outOfs);
-            } else {
-                n = engineDoFinal(inArray, inOfs, inLen, outArray, outOfs);
-            }
-            input.position(inLimit);
-            output.position(outPos + n);
-            return n;
-        } else if (!a1 && a2) {
-            int outPos = output.position();
-            byte[] outArray = output.array();
-            int outOfs = output.arrayOffset() + outPos;
-            byte[] inArray = new byte[getTempArraySize(inLen)];
-            int total = 0;
-            do {
-                int chunk = Math.min(inLen, inArray.length);
-                if (chunk > 0) {
-                    input.get(inArray, 0, chunk);
-                }
-                int n;
-                if (isUpdate || (inLen != chunk)) {
-                    n = engineUpdate(inArray, 0, chunk, outArray, outOfs);
-                } else {
-                    n = engineDoFinal(inArray, 0, chunk, outArray, outOfs);
-                }
-                total += n;
-                outOfs += n;
-                inLen -= chunk;
-            } while (inLen > 0);
-            output.position(outPos + total);
-            return total;
-        } else { // output is not backed by an accessible byte[]
-            byte[] inArray;
-            int inOfs;
-            if (a1) {
+            if (a1) { // input also has an accessible byte[]
                 inArray = input.array();
-                inOfs = input.arrayOffset() + inPos;
-            } else {
-                inArray = new byte[getTempArraySize(inLen)];
-                inOfs = 0;
-            }
-            byte[] outArray = new byte[getTempArraySize(outLenNeeded)];
-            int outSize = outArray.length;
-            int total = 0;
-            boolean resized = false;
-            do {
-                int chunk =
-                    Math.min(inLen, (outSize == 0? inArray.length : outSize));
-                if (!a1 && !resized && chunk > 0) {
-                    input.get(inArray, 0, chunk);
-                    inOfs = 0;
+                int inOfs = input.arrayOffset() + inPos;
+                if (isUpdate) {
+                    total = engineUpdate(inArray, inOfs, inLen, outArray, outOfs);
+                } else {
+                    total = engineDoFinal(inArray, inOfs, inLen, outArray, outOfs);
                 }
-                try {
-                    int n;
-                    if (isUpdate || (inLen != chunk)) {
-                        n = engineUpdate(inArray, inOfs, chunk, outArray, 0);
-                    } else {
-                        n = engineDoFinal(inArray, inOfs, chunk, outArray, 0);
-                    }
-                    resized = false;
-                    inOfs += chunk;
-                    inLen -= chunk;
-                    if (n > 0) {
-                        output.put(outArray, 0, n);
-                        total += n;
-                    }
-                } catch (ShortBufferException e) {
-                    if (resized) {
-                        // we just resized the output buffer, but it still
-                        // did not work. Bug in the provider, abort
-                        throw (ProviderException)new ProviderException
-                            ("Could not determine buffer size").initCause(e);
-                    }
-                    // output buffer is too small, realloc and try again
-                    resized = true;
-                    outSize = engineGetOutputSize(chunk);
-                    outArray = new byte[outSize];
-                }
-            } while (inLen > 0);
-            if (a1) {
                 input.position(inLimit);
+            } else { // input does not have accessible byte[]
+                inArray = new byte[getTempArraySize(inLen)];
+                do {
+                    int chunk = Math.min(inLen, inArray.length);
+                    if (chunk > 0) {
+                        input.get(inArray, 0, chunk);
+                    }
+                    int n;
+                    if (isUpdate || (inLen > chunk)) {
+                        n = engineUpdate(inArray, 0, chunk, outArray, outOfs);
+                    } else {
+                        n = engineDoFinal(inArray, 0, chunk, outArray, outOfs);
+                    }
+                    total += n;
+                    outOfs += n;
+                    inLen -= chunk;
+                } while (inLen > 0);
+            }
+            output.position(outPos + total);
+        } else { // output does not have an accessible byte[]
+            if (a1) { // but input has an accessible byte[]
+                inArray = input.array();
+                int inOfs = input.arrayOffset() + inPos;
+                if (isUpdate) {
+                    outArray = engineUpdate(inArray, inOfs, inLen);
+                } else {
+                    outArray = engineDoFinal(inArray, inOfs, inLen);
+                }
+                input.position(inLimit);
+                if (outArray != null && outArray.length != 0) {
+                    output.put(outArray);
+                    total = outArray.length;
+                }
+            } else { // input also does not have an accessible byte[]
+                inArray = new byte[getTempArraySize(inLen)];
+                do {
+                    int chunk = Math.min(inLen, inArray.length);
+                    if (chunk > 0) {
+                        input.get(inArray, 0, chunk);
+                    }
+                    int n;
+                    if (isUpdate || (inLen > chunk)) {
+                        outArray = engineUpdate(inArray, 0, chunk);
+                    } else {
+                        outArray = engineDoFinal(inArray, 0, chunk);
+                    }
+                    if (outArray != null && outArray.length != 0) {
+                        output.put(outArray);
+                        total += outArray.length;
+                    }
+                    inLen -= chunk;
+                } while (inLen > 0);
             }
-            return total;
         }
+        return total;
     }
 
     /**
diff --git a/src/java.base/share/classes/javax/crypto/spec/ChaCha20ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/ChaCha20ParameterSpec.java
new file mode 100644
index 00000000000..75c05269460
--- /dev/null
+++ b/src/java.base/share/classes/javax/crypto/spec/ChaCha20ParameterSpec.java
@@ -0,0 +1,92 @@
+/*
+ * 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 javax.crypto.spec;
+
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Objects;
+
+/**
+ * This class specifies the parameters used with the
+ * <a href="https://tools.ietf.org/html/rfc7539"><i>ChaCha20</i></a>
+ * algorithm.
+ *
+ * <p> The parameters consist of a 12-byte nonce and an initial
+ * counter value expressed as a 32-bit integer.
+ *
+ * <p> This class can be used to initialize a {@code Cipher} object that
+ * implements the <i>ChaCha20</i> algorithm.
+ *
+ * @since 11
+ */
+public final class ChaCha20ParameterSpec implements AlgorithmParameterSpec {
+
+    // The nonce length is defined by the spec as 96 bits (12 bytes) in length.
+    private static final int NONCE_LENGTH = 12;
+
+    private final byte[] nonce;
+    private final int counter;
+
+    /**
+     * Constructs a parameter set for ChaCha20 from the given nonce
+     * and counter.
+     *
+     * @param nonce a 12-byte nonce value
+     * @param counter the initial counter value
+     *
+     * @throws NullPointerException if {@code nonce} is {@code null}
+     * @throws IllegalArgumentException if {@code nonce} is not 12 bytes
+     *      in length
+     */
+    public ChaCha20ParameterSpec(byte[] nonce, int counter) {
+        this.counter = counter;
+
+        Objects.requireNonNull(nonce, "Nonce must be non-null");
+        this.nonce = nonce.clone();
+        if (this.nonce.length != NONCE_LENGTH) {
+            throw new IllegalArgumentException(
+                    "Nonce must be 12-bytes in length");
+        }
+    }
+
+    /**
+     * Returns the nonce value.
+     *
+     * @return the nonce value.  This method returns a new array each time
+     * this method is called.
+     */
+    public byte[] getNonce() {
+        return nonce.clone();
+    }
+
+    /**
+     * Returns the configured counter value.
+     *
+     * @return the counter value
+     */
+    public int getCounter() {
+        return counter;
+    }
+}
diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index 9719946e494..d1c4e5590fb 100644
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -609,12 +609,13 @@ public final class LauncherHelper {
     }
 
     // From src/share/bin/java.c:
-    //   enum LaunchMode { LM_UNKNOWN = 0, LM_CLASS, LM_JAR, LM_MODULE }
+    //   enum LaunchMode { LM_UNKNOWN = 0, LM_CLASS, LM_JAR, LM_MODULE, LM_SOURCE }
 
     private static final int LM_UNKNOWN = 0;
     private static final int LM_CLASS   = 1;
     private static final int LM_JAR     = 2;
     private static final int LM_MODULE  = 3;
+    private static final int LM_SOURCE  = 4;
 
     static void abort(Throwable t, String msgKey, Object... args) {
         if (msgKey != null) {
@@ -645,13 +646,21 @@ public final class LauncherHelper {
      *
      * @return the application's main class
      */
+    @SuppressWarnings("fallthrough")
     public static Class<?> checkAndLoadMain(boolean printToStderr,
                                             int mode,
                                             String what) {
         initOutput(printToStderr);
 
-        Class<?> mainClass = (mode == LM_MODULE) ? loadModuleMainClass(what)
-                                                 : loadMainClass(mode, what);
+        Class<?> mainClass = null;
+        switch (mode) {
+            case LM_MODULE: case LM_SOURCE:
+                mainClass = loadModuleMainClass(what);
+                break;
+            default:
+                mainClass = loadMainClass(mode, what);
+                break;
+        }
 
         // record the real main class for UI purposes
         // neither method above can return null, they will abort()
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index 6a928bd1b9a..41dd8da5602 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -25,13 +25,17 @@
 
 # Translators please note do not translate the options themselves
 java.launcher.opt.header  =   Usage: {0} [options] <mainclass> [args...]\n\
-\           (to execute a class)\n   or  {0} [options] -jar <jarfile> [args...]\n\
+\           (to execute a class)\n\
+\   or  {0} [options] -jar <jarfile> [args...]\n\
 \           (to execute a jar file)\n\
 \   or  {0} [options] -m <module>[/<mainclass>] [args...]\n\
 \       {0} [options] --module <module>[/<mainclass>] [args...]\n\
-\           (to execute the main class in a module)\n\n\
-\ Arguments following the main class, -jar <jarfile>, -m or --module\n\
-\ <module>/<mainclass> are passed as the arguments to main class.\n\n\
+\           (to execute the main class in a module)\n\
+\   or  {0} [options] <sourcefile> [args]\n\
+\           (to execute a single source-file program)\n\n\
+\ Arguments following the main class, source file, -jar <jarfile>,\n\
+\ -m or --module <module>/<mainclass> are passed as the arguments to\n\
+\ main class.\n\n\
 \ where options include:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  to select the "{1}" VM\n
@@ -114,7 +118,7 @@ java.launcher.opt.footer = \
 \    -disable-@files\n\
 \                  prevent further argument file expansion\n\
 \    --enable-preview\n\
-\                  allow classes to depend on preview features of this release
+\                  allow classes to depend on preview features of this release\n\
 \To specify an argument for a long option, you can use --<name>=<value> or\n\
 \--<name> <value>.\n
 
@@ -180,7 +184,9 @@ java.launcher.X.usage=\n\
 \    --patch-module <module>=<file>({0}<file>)*\n\
 \                      override or augment a module with classes and resources\n\
 \                      in JAR files or directories.\n\
-\    --disable-@files  disable further argument file expansion\n\n\
+\    --disable-@files  disable further argument file expansion\n\
+\    --source <version>\n\
+\                      set the version of the source in source-file mode.\n\n\
 These extra options are subject to change without notice.\n
 
 # Translators please note do not translate the options themselves
diff --git a/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java b/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java
index a3300c3c0e9..4036e113dff 100644
--- a/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java
+++ b/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -30,6 +30,7 @@ import java.net.SocketException;
 import java.net.SocketOption;
 import java.util.Collections;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Defines the infrastructure to support extended socket options, beyond those
@@ -40,6 +41,9 @@ import java.util.Set;
  */
 public abstract class ExtendedSocketOptions {
 
+    public static final short SOCK_STREAM = 1;
+    public static final short SOCK_DGRAM = 2;
+
     private final Set<SocketOption<?>> options;
 
     /** Tells whether or not the option is supported. */
@@ -50,6 +54,30 @@ public abstract class ExtendedSocketOptions {
     /** Return the, possibly empty, set of extended socket options available. */
     public final Set<SocketOption<?>> options() { return options; }
 
+    public static final Set<SocketOption<?>> options(short type) {
+        return getInstance().options0(type);
+    }
+
+    private Set<SocketOption<?>> options0(short type) {
+        Set<SocketOption<?>> extOptions = null;
+        switch (type) {
+            case SOCK_DGRAM:
+                extOptions = options.stream()
+                        .filter((option) -> !option.name().startsWith("TCP_"))
+                        .collect(Collectors.toUnmodifiableSet());
+                break;
+            case SOCK_STREAM:
+                extOptions = options.stream()
+                        .filter((option) -> !option.name().startsWith("UDP_"))
+                        .collect(Collectors.toUnmodifiableSet());
+                break;
+            default:
+                //this will never happen
+                throw new IllegalArgumentException("Invalid socket option type");
+        }
+        return extOptions;
+    }
+
     /** Sets the value of a socket option, for the given socket. */
     public abstract void setOption(FileDescriptor fd, SocketOption<?> option, Object value)
             throws SocketException;
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
index 39b19b42204..4dd87053f91 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -39,6 +39,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import sun.net.NetHooks;
+import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_STREAM;
 
 /**
  * Base implementation of AsynchronousServerSocketChannel.
@@ -234,6 +236,7 @@ abstract class AsynchronousServerSocketChannelImpl
             if (Net.isReusePortAvailable()) {
                 set.add(StandardSocketOptions.SO_REUSEPORT);
             }
+            set.addAll(ExtendedSocketOptions.options(SOCK_STREAM));
             return Collections.unmodifiableSet(set);
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
index 1faf49b8578..fed6a87dedd 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -40,6 +40,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_STREAM;
 
 /**
  * Base implementation of AsynchronousSocketChannel
@@ -512,9 +513,7 @@ abstract class AsynchronousSocketChannelImpl
                 set.add(StandardSocketOptions.SO_REUSEPORT);
             }
             set.add(StandardSocketOptions.TCP_NODELAY);
-            ExtendedSocketOptions extendedOptions =
-                    ExtendedSocketOptions.getInstance();
-            set.addAll(extendedOptions.options());
+            set.addAll(ExtendedSocketOptions.options(SOCK_STREAM));
             return Collections.unmodifiableSet(set);
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index 3107e661e2b..770d29c0603 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -57,6 +57,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import sun.net.ResourceManager;
 import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_DGRAM;
 
 /**
  * An implementation of DatagramChannels.
@@ -334,7 +335,7 @@ class DatagramChannelImpl
             set.add(StandardSocketOptions.IP_MULTICAST_IF);
             set.add(StandardSocketOptions.IP_MULTICAST_TTL);
             set.add(StandardSocketOptions.IP_MULTICAST_LOOP);
-            set.addAll(ExtendedSocketOptions.getInstance().options());
+            set.addAll(ExtendedSocketOptions.options(SOCK_DGRAM));
             return Collections.unmodifiableSet(set);
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
index 2f917c8d2e3..256c5194e04 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
@@ -25,6 +25,9 @@
 
 package sun.nio.ch;
 
+import java.lang.invoke.ConstantBootstraps;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
@@ -39,6 +42,13 @@ import java.nio.channels.spi.AbstractSelectionKey;
 public final class SelectionKeyImpl
     extends AbstractSelectionKey
 {
+    private static final VarHandle INTERESTOPS =
+            ConstantBootstraps.fieldVarHandle(
+                    MethodHandles.lookup(),
+                    "interestOps",
+                    VarHandle.class,
+                    SelectionKeyImpl.class, int.class);
+
     private final SelChImpl channel;
     private final SelectorImpl selector;
 
@@ -84,7 +94,35 @@ public final class SelectionKeyImpl
     @Override
     public SelectionKey interestOps(int ops) {
         ensureValid();
-        return nioInterestOps(ops);
+        if ((ops & ~channel().validOps()) != 0)
+            throw new IllegalArgumentException();
+        int oldOps = (int) INTERESTOPS.getAndSet(this, ops);
+        if (ops != oldOps) {
+            selector.setEventOps(this);
+        }
+        return this;
+    }
+
+    @Override
+    public int interestOpsOr(int ops) {
+        ensureValid();
+        if ((ops & ~channel().validOps()) != 0)
+            throw new IllegalArgumentException();
+        int oldVal = (int) INTERESTOPS.getAndBitwiseOr(this, ops);
+        if (oldVal != (oldVal | ops)) {
+            selector.setEventOps(this);
+        }
+        return oldVal;
+    }
+
+    @Override
+    public int interestOpsAnd(int ops) {
+        ensureValid();
+        int oldVal = (int) INTERESTOPS.getAndBitwiseAnd(this, ops);
+        if (oldVal != (oldVal & ops)) {
+            selector.setEventOps(this);
+        }
+        return oldVal;
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index 9e23100591a..0d002c7054e 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -49,6 +49,8 @@ import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
 import sun.net.NetHooks;
+import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_STREAM;
 
 /**
  * An implementation of ServerSocketChannels
@@ -199,6 +201,7 @@ class ServerSocketChannelImpl
                 set.add(StandardSocketOptions.SO_REUSEPORT);
             }
             set.add(StandardSocketOptions.IP_TOS);
+            set.addAll(ExtendedSocketOptions.options(SOCK_STREAM));
             return Collections.unmodifiableSet(set);
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index e0a8cf45232..a3e19fcfd0e 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -54,6 +54,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_STREAM;
 
 /**
  * An implementation of SocketChannels
@@ -280,7 +281,7 @@ class SocketChannelImpl
             // additional options required by socket adaptor
             set.add(StandardSocketOptions.IP_TOS);
             set.add(ExtendedSocketOption.SO_OOBINLINE);
-            set.addAll(ExtendedSocketOptions.getInstance().options());
+            set.addAll(ExtendedSocketOptions.options(SOCK_STREAM));
             return Collections.unmodifiableSet(set);
         }
     }
diff --git a/src/java.base/share/classes/sun/text/resources/FormatData.java b/src/java.base/share/classes/sun/text/resources/FormatData.java
index e6d5aa4a5c4..27228bff699 100644
--- a/src/java.base/share/classes/sun/text/resources/FormatData.java
+++ b/src/java.base/share/classes/sun/text/resources/FormatData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, 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
@@ -106,6 +106,7 @@ public class FormatData extends ParallelListResourceBundle {
             "T",
             "S",
             "H",
+            "N", // NewEra
         };
 
         // Japanese imperial calendar era strings
@@ -115,6 +116,7 @@ public class FormatData extends ParallelListResourceBundle {
             "Taisho",
             "Showa",
             "Heisei",
+            "NewEra", // NewEra
         };
 
         return new Object[][] {
diff --git a/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
index cd7f4df1305..0f596340221 100644
--- a/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
+++ b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
@@ -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
@@ -159,6 +159,7 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
             "Taisho",
             "Showa",
             "Heisei",
+            "NewEra", // New Era
         };
 
         final String[] sharedShortEras = {
diff --git a/src/java.base/share/classes/sun/util/calendar/Era.java b/src/java.base/share/classes/sun/util/calendar/Era.java
index 3ab04110075..c622e52f3de 100644
--- a/src/java.base/share/classes/sun/util/calendar/Era.java
+++ b/src/java.base/share/classes/sun/util/calendar/Era.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -48,6 +48,7 @@ import java.util.TimeZone;
  *                           Taisho           1912-07-30T00:00:00 local time
  *                           Showa            1926-12-25T00:00:00 local time
  *                           Heisei           1989-01-08T00:00:00 local time
+ *                           NewEra           2019-05-01T00:00:00 local time
  *   -----------------------------------------------------------------------
  * }</pre>
  *
diff --git a/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java b/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
index 6830000d22f..cbc5ee195d4 100644
--- a/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
+++ b/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,6 +27,8 @@ package sun.util.calendar;
 
 import java.security.AccessController;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import sun.security.action.GetPropertyAction;
 
 /**
@@ -41,11 +43,12 @@ public class LocalGregorianCalendar extends BaseCalendar {
         new Era("Taisho", "T", -1812153600000L, true),
         new Era("Showa",  "S", -1357603200000L, true),
         new Era("Heisei", "H",   600220800000L, true),
+        new Era("NewEra", "N",  1556668800000L, true),
     };
 
     private static boolean isValidEra(Era newEra, Era[] eras) {
         Era last = eras[eras.length - 1];
-        if (last.getSinceDate().getYear() >= newEra.getSinceDate().getYear()) {
+        if (last.getSince(null) >= newEra.getSince(null)) {
             return false;
         }
         // The new era name should be unique. Its abbr may not.
@@ -173,7 +176,7 @@ public class LocalGregorianCalendar extends BaseCalendar {
                 return null;
             }
             String key = keyvalue[0].trim();
-            String value = keyvalue[1].trim();
+            String value = convertUnicodeEscape(keyvalue[1].trim());
             switch (key) {
             case "name":
                 eraName = value;
@@ -203,6 +206,17 @@ public class LocalGregorianCalendar extends BaseCalendar {
         return new Era(eraName, abbr, since, localTime);
     }
 
+    private static String convertUnicodeEscape(String src) {
+        Matcher m = Pattern.compile("\\\\u([0-9a-fA-F]{4})").matcher(src);
+        StringBuilder sb = new StringBuilder();
+        while (m.find()) {
+            m.appendReplacement(sb,
+                Character.toString((char)Integer.parseUnsignedInt(m.group(1), 16)));
+        }
+        m.appendTail(sb);
+        return sb.toString();
+    }
+
     private LocalGregorianCalendar(String name, Era[] eras) {
         this.name = name;
         this.eras = eras;
diff --git a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
index 9a664371b61..8b0dc6fb24a 100644
--- a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -35,8 +35,8 @@ import sun.util.calendar.CalendarSystem;
 import sun.util.calendar.Era;
 
 /**
- * Concrete implementation of the  {@link java.util.spi.CalendarDataProvider
- * CalendarDataProvider} class for the JRE LocaleProviderAdapter.
+ * Concrete implementation of the {@link java.util.spi.CalendarNameProvider
+ * CalendarNameProvider} class for the JRE LocaleProviderAdapter.
  *
  * @author Masayoshi Okutsu
  * @author Naoto Sato
@@ -77,28 +77,43 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
                 if (field == DAY_OF_WEEK || field == YEAR) {
                     --value;
                 }
-                if (value < 0 || value > strings.length) {
+                if (value < 0) {
                     return null;
-                } else if (value == strings.length) {
+                } else if (value >= strings.length) {
                     if (field == ERA && "japanese".equals(calendarType)) {
-                        // get the supplemental era, if any, specified through
-                        // the property "jdk.calendar.japanese.supplemental.era"
-                        // which is always the last element.
                         Era[] jeras = CalendarSystem.forName("japanese").getEras();
-                        if (jeras.length == value) {
-                            Era supEra = jeras[value - 1]; // 0-based index
-                            if (javatime) {
-                                return getBaseStyle(style) == NARROW_FORMAT ?
-                                    supEra.getAbbreviation() :
-                                    supEra.getName();
-                            } else {
-                                return (style & LONG) != 0 ?
-                                    supEra.getName() :
-                                    supEra.getAbbreviation();
+                        if (value <= jeras.length) {
+                            // Localized era name could not be retrieved from this provider.
+                            // This can occur either for NewEra or SupEra.
+                            //
+                            // If it's CLDR provider, try COMPAT first, which is guaranteed to have
+                            // the name for NewEra.
+                            if (type == LocaleProviderAdapter.Type.CLDR) {
+                                lr = LocaleProviderAdapter.forJRE().getLocaleResources(locale);
+                                key = getResourceKeyFor(LocaleProviderAdapter.Type.JRE,
+                                                calendarType, field, style, javatime);
+                                strings =
+                                    javatime ? lr.getJavaTimeNames(key) : lr.getCalendarNames(key);
                             }
+                            if (strings == null || value >= strings.length) {
+                                // Get the default name for SupEra
+                                Era supEra = jeras[value - 1]; // 0-based index
+                                if (javatime) {
+                                    return getBaseStyle(style) == NARROW_FORMAT ?
+                                        supEra.getAbbreviation() :
+                                        supEra.getName();
+                                } else {
+                                    return (style & LONG) != 0 ?
+                                        supEra.getName() :
+                                        supEra.getAbbreviation();
+                                }
+                            }
+                        } else {
+                            return null;
                         }
+                    } else {
+                        return null;
                     }
-                    return null;
                 }
                 name = strings[value];
                 // If name is empty in standalone, try its `format' style.
@@ -180,7 +195,7 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
         return map;
     }
 
-    private int getBaseStyle(int style) {
+    private static int getBaseStyle(int style) {
         return style & ~(SHORT_STANDALONE - SHORT_FORMAT);
     }
 
@@ -261,6 +276,11 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
     }
 
     private String getResourceKey(String type, int field, int style, boolean javatime) {
+        return getResourceKeyFor(this.type, type, field, style, javatime);
+    }
+
+    private static String getResourceKeyFor(LocaleProviderAdapter.Type adapterType,
+                            String type, int field, int style, boolean javatime) {
         int baseStyle = getBaseStyle(style);
         boolean isStandalone = (style != baseStyle);
 
@@ -284,7 +304,7 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
                 // JRE and CLDR use different resource key conventions
                 // due to historical reasons. (JRE DateFormatSymbols.getEras returns
                 // abbreviations while other getShort*() return abbreviations.)
-                if (this.type == LocaleProviderAdapter.Type.JRE) {
+                if (adapterType == LocaleProviderAdapter.Type.JRE) {
                     if (javatime) {
                         if (baseStyle == LONG) {
                             key.append("long.");
@@ -336,7 +356,7 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
         return key.length() > 0 ? key.toString() : null;
     }
 
-    private String toStyleName(int baseStyle) {
+    private static String toStyleName(int baseStyle) {
         switch (baseStyle) {
         case SHORT:
             return "Abbreviations";
diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
index 6f7202d6db3..e9400ef31ff 100644
--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -178,6 +178,7 @@ MMK=MMK
 MNT=MNT
 MOP=MOP
 MRO=MRO
+MRU=MRU
 MTL=MTL
 MUR=MUR
 MVR=MVR
@@ -399,6 +400,7 @@ mmk=Myanma Kyat
 mnt=Mongolian Tugrik
 mop=Macanese Pataca
 mro=Mauritanian Ouguiya
+mru=Mauritanian Ouguiya
 mtl=Maltese Lira
 mur=Mauritian Rupee
 mvr=Maldivian Rufiyaa
diff --git a/src/java.base/share/legal/c-libutl.md b/src/java.base/share/legal/c-libutl.md
new file mode 100644
index 00000000000..8bc98806825
--- /dev/null
+++ b/src/java.base/share/legal/c-libutl.md
@@ -0,0 +1,35 @@
+## c-libutl 20160225
+
+### c-libutl License
+```
+
+This software is distributed under the terms of the BSD license.
+
+==  BSD LICENSE  ===============================================================
+
+ (C) 2009 by Remo Dentato (rdentato@gmail.com)
+
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+http://opensource.org/licenses/bsd-license.php
+
+```
diff --git a/src/java.base/share/lib/security/cacerts b/src/java.base/share/lib/security/cacerts
index 19d17423a17..2796af58140 100644
Binary files a/src/java.base/share/lib/security/cacerts and b/src/java.base/share/lib/security/cacerts differ
diff --git a/src/java.base/share/native/launcher/main.c b/src/java.base/share/native/launcher/main.c
index a477c80784b..b734fe2ba78 100644
--- a/src/java.base/share/native/launcher/main.c
+++ b/src/java.base/share/native/launcher/main.c
@@ -183,7 +183,7 @@ main(int argc, char **argv)
         }
         // Iterate the rest of command line
         for (i = 1; i < argc; i++) {
-            JLI_List argsInFile = JLI_PreprocessArg(argv[i]);
+            JLI_List argsInFile = JLI_PreprocessArg(argv[i], JNI_TRUE);
             if (NULL == argsInFile) {
                 JLI_List_add(args, JLI_StringDup(argv[i]));
             } else {
diff --git a/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c
index fa4e39b8a43..e637f89ddc9 100644
--- a/src/java.base/share/native/libjava/jni_util.c
+++ b/src/java.base/share/native/libjava/jni_util.c
@@ -838,8 +838,11 @@ InitializeEncoding(JNIEnv *env, const char *encname)
     CHECK_NULL(String_getBytes_ID);
     String_init_ID = (*env)->GetMethodID(env, strClazz,
                                          "<init>", "([BLjava/lang/String;)V");
+    CHECK_NULL(String_init_ID);
     String_coder_ID = (*env)->GetFieldID(env, strClazz, "coder", "B");
+    CHECK_NULL(String_coder_ID);
     String_value_ID = (*env)->GetFieldID(env, strClazz, "value", "[B");
+    CHECK_NULL(String_value_ID);
 }
 
 JNIEXPORT jstring
diff --git a/src/java.base/share/native/libjli/args.c b/src/java.base/share/native/libjli/args.c
index 4de8f07b633..45954ef78bb 100644
--- a/src/java.base/share/native/libjli/args.c
+++ b/src/java.base/share/native/libjli/args.c
@@ -79,6 +79,11 @@ static size_t argsCount = 1;
 static jboolean stopExpansion = JNI_FALSE;
 static jboolean relaunch = JNI_FALSE;
 
+/*
+ * Prototypes for internal functions.
+ */
+static jboolean expand(JLI_List args, const char *str, const char *var_name);
+
 JNIEXPORT void JNICALL
 JLI_InitArgProcessing(jboolean hasJavaArgs, jboolean disableArgFile) {
     // No expansion for relaunch
@@ -300,6 +305,8 @@ static JLI_List readArgFile(FILE *file) {
 
     ctx.state = FIND_NEXT;
     ctx.parts = JLI_List_new(4);
+    // initialize to avoid -Werror=maybe-uninitialized issues from gcc 7.3 onwards.
+    ctx.quote_char = '"';
 
     /* arbitrarily pick 8, seems to be a reasonable number of arguments */
     rv = JLI_List_new(8);
@@ -376,9 +383,22 @@ static JLI_List expandArgFile(const char *arg) {
     return rv;
 }
 
+/*
+ * expand a string into a list of words separated by whitespace.
+ */
+static JLI_List expandArg(const char *arg) {
+    JLI_List rv;
+
+    /* arbitrarily pick 8, seems to be a reasonable number of arguments */
+    rv = JLI_List_new(8);
+
+    expand(rv, arg, NULL);
+
+    return rv;
+}
+
 JNIEXPORT JLI_List JNICALL
-JLI_PreprocessArg(const char *arg)
-{
+JLI_PreprocessArg(const char *arg, jboolean expandSourceOpt) {
     JLI_List rv;
 
     if (firstAppArgIndex > 0) {
@@ -392,6 +412,12 @@ JLI_PreprocessArg(const char *arg)
         return NULL;
     }
 
+    if (expandSourceOpt
+            && JLI_StrCCmp(arg, "--source") == 0
+            && JLI_StrChr(arg, ' ') != NULL) {
+        return expandArg(arg);
+    }
+
     if (arg[0] != '@') {
         checkArg(arg);
         return NULL;
@@ -435,9 +461,6 @@ int isTerminalOpt(char *arg) {
 JNIEXPORT jboolean JNICALL
 JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
     char *env = getenv(var_name);
-    char *p, *arg;
-    char quote;
-    JLI_List argsInFile;
 
     if (firstAppArgIndex == 0) {
         // Not 'java', return
@@ -453,44 +476,64 @@ JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
     }
 
     JLI_ReportMessage(ARG_INFO_ENVVAR, var_name, env);
+    return expand(args, env, var_name);
+}
+
+/*
+ * Expand a string into a list of args.
+ * If the string is the result of looking up an environment variable,
+ * var_name should be set to the name of that environment variable,
+ * for use if needed in error messages.
+ */
+
+static jboolean expand(JLI_List args, const char *str, const char *var_name) {
+    jboolean inEnvVar = (var_name != NULL);
+
+    char *p, *arg;
+    char quote;
+    JLI_List argsInFile;
 
     // This is retained until the process terminates as it is saved as the args
-    p = JLI_MemAlloc(JLI_StrLen(env) + 1);
-    while (*env != '\0') {
-        while (*env != '\0' && isspace(*env)) {
-            env++;
+    p = JLI_MemAlloc(JLI_StrLen(str) + 1);
+    while (*str != '\0') {
+        while (*str != '\0' && isspace(*str)) {
+            str++;
         }
 
         // Trailing space
-        if (*env == '\0') {
+        if (*str == '\0') {
             break;
         }
 
         arg = p;
-        while (*env != '\0' && !isspace(*env)) {
-            if (*env == '"' || *env == '\'') {
-                quote = *env++;
-                while (*env != quote && *env != '\0') {
-                    *p++ = *env++;
+        while (*str != '\0' && !isspace(*str)) {
+            if (inEnvVar && (*str == '"' || *str == '\'')) {
+                quote = *str++;
+                while (*str != quote && *str != '\0') {
+                    *p++ = *str++;
                 }
 
-                if (*env == '\0') {
+                if (*str == '\0') {
                     JLI_ReportMessage(ARG_ERROR8, var_name);
                     exit(1);
                 }
-                env++;
+                str++;
             } else {
-                *p++ = *env++;
+                *p++ = *str++;
             }
         }
 
         *p++ = '\0';
 
-        argsInFile = JLI_PreprocessArg(arg);
+        argsInFile = JLI_PreprocessArg(arg, JNI_FALSE);
 
         if (NULL == argsInFile) {
             if (isTerminalOpt(arg)) {
-                JLI_ReportMessage(ARG_ERROR9, arg, var_name);
+                if (inEnvVar) {
+                    JLI_ReportMessage(ARG_ERROR9, arg, var_name);
+                } else {
+                    JLI_ReportMessage(ARG_ERROR15, arg);
+                }
                 exit(1);
             }
             JLI_List_add(args, arg);
@@ -501,7 +544,11 @@ JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
             for (idx = 0; idx < cnt; idx++) {
                 arg = argsInFile->elements[idx];
                 if (isTerminalOpt(arg)) {
-                    JLI_ReportMessage(ARG_ERROR10, arg, argFile, var_name);
+                    if (inEnvVar) {
+                        JLI_ReportMessage(ARG_ERROR10, arg, argFile, var_name);
+                    } else {
+                        JLI_ReportMessage(ARG_ERROR16, arg, argFile);
+                    }
                     exit(1);
                 }
                 JLI_List_add(args, arg);
@@ -517,11 +564,15 @@ JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
          * caught now.
          */
         if (firstAppArgIndex != NOT_FOUND) {
-            JLI_ReportMessage(ARG_ERROR11, var_name);
+            if (inEnvVar) {
+                JLI_ReportMessage(ARG_ERROR11, var_name);
+            } else {
+                JLI_ReportMessage(ARG_ERROR17);
+            }
             exit(1);
         }
 
-        assert (*env == '\0' || isspace(*env));
+        assert (*str == '\0' || isspace(*str));
     }
 
     return JNI_TRUE;
@@ -642,7 +693,7 @@ int main(int argc, char** argv) {
 
     if (argc > 1) {
         for (i = 0; i < argc; i++) {
-            JLI_List tokens = JLI_PreprocessArg(argv[i]);
+            JLI_List tokens = JLI_PreprocessArg(argv[i], JNI_FALSE);
             if (NULL != tokens) {
                 for (j = 0; j < tokens->size; j++) {
                     printf("Token[%lu]: <%s>\n", (unsigned long) j, tokens->elements[j]);
diff --git a/src/java.base/share/native/libjli/emessages.h b/src/java.base/share/native/libjli/emessages.h
index 2f94a60bce8..3506a886e25 100644
--- a/src/java.base/share/native/libjli/emessages.h
+++ b/src/java.base/share/native/libjli/emessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -51,6 +51,11 @@
 #define ARG_ERROR10     "Error: Option %s in %s is not allowed in environment variable %s"
 #define ARG_ERROR11     "Error: Cannot specify main class in environment variable %s"
 #define ARG_ERROR12     "Error: %s requires module name"
+#define ARG_ERROR13     "Error: %s requires source version"
+#define ARG_ERROR14     "Error: Option %s is not allowed with --source"
+#define ARG_ERROR15     "Error: Option %s is not allowed in this context"
+#define ARG_ERROR16     "Error: Option %s in %s is not allowed in this context"
+#define ARG_ERROR17     "Error: Cannot specify main class in this context"
 
 #define JVM_ERROR1      "Error: Could not create the Java Virtual Machine.\n" GEN_ERROR
 #define JVM_ERROR2      "Error: Could not detach main thread.\n" JNI_ERROR
diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
index f274a25da7a..9c6f170ac8c 100644
--- a/src/java.base/share/native/libjli/java.c
+++ b/src/java.base/share/native/libjli/java.c
@@ -172,6 +172,9 @@ static int  KnownVMIndex(const char* name);
 static void FreeKnownVMs();
 static jboolean IsWildCardEnabled();
 
+
+#define SOURCE_LAUNCHER_MAIN_ENTRY "jdk.compiler/com.sun.tools.javac.launcher.Main"
+
 /*
  * This reports error.  VM will not be created and no usage is printed.
  */
@@ -214,7 +217,7 @@ static jlong initialHeapSize    = 0;  /* inital heap size */
  * Entry point.
  */
 JNIEXPORT int JNICALL
-JLI_Launch(int argc, char ** argv,              /* main argc, argc */
+JLI_Launch(int argc, char ** argv,              /* main argc, argv */
         int jargc, const char** jargv,          /* java args */
         int appclassc, const char** appclassv,  /* app classpath */
         const char* fullversion,                /* full version defined */
@@ -317,8 +320,7 @@ JLI_Launch(int argc, char ** argv,              /* main argc, argc */
     /* Parse command line options; if the return value of
      * ParseArguments is false, the program should exit.
      */
-    if (!ParseArguments(&argc, &argv, &mode, &what, &ret, jrepath))
-    {
+    if (!ParseArguments(&argc, &argv, &mode, &what, &ret, jrepath)) {
         return(ret);
     }
 
@@ -585,7 +587,8 @@ IsLauncherOption(const char* name) {
     return IsClassPathOption(name) ||
            IsLauncherMainOption(name) ||
            JLI_StrCmp(name, "--describe-module") == 0 ||
-           JLI_StrCmp(name, "-d") == 0;
+           JLI_StrCmp(name, "-d") == 0 ||
+           JLI_StrCmp(name, "--source") == 0;
 }
 
 /*
@@ -626,6 +629,29 @@ IsWhiteSpaceOption(const char* name) {
            IsLauncherOption(name);
 }
 
+/*
+ * Check if it is OK to set the mode.
+ * If the mode was previously set, and should not be changed,
+ * a fatal error is reported.
+ */
+static int
+checkMode(int mode, int newMode, const char *arg) {
+    if (mode == LM_SOURCE) {
+        JLI_ReportErrorMessage(ARG_ERROR14, arg);
+        exit(1);
+    }
+    return newMode;
+}
+
+/*
+ * Test if an arg identifies a source file.
+ */
+jboolean
+IsSourceFile(const char *arg) {
+    struct stat st;
+    return (JLI_HasSuffix(arg, ".java") && stat(arg, &st) == 0);
+}
+
 /*
  * Checks the command line options to find which JVM type was
  * specified.  If no command line option was given for the JVM type,
@@ -1230,7 +1256,8 @@ GetOpt(int *pargc, char ***pargv, char **poption, char **pvalue) {
         value = equals+1;
         if (JLI_StrCCmp(arg, "--describe-module=") == 0 ||
             JLI_StrCCmp(arg, "--module=") == 0 ||
-            JLI_StrCCmp(arg, "--class-path=") == 0) {
+            JLI_StrCCmp(arg, "--class-path=") == 0||
+            JLI_StrCCmp(arg, "--source=") == 0) {
             kind = LAUNCHER_OPTION_WITH_ARGUMENT;
         } else {
             kind = VM_LONG_OPTION;
@@ -1274,17 +1301,28 @@ ParseArguments(int *pargc, char ***pargv,
  */
         if (JLI_StrCmp(arg, "-jar") == 0) {
             ARG_CHECK(argc, ARG_ERROR2, arg);
-            mode = LM_JAR;
+            mode = checkMode(mode, LM_JAR, arg);
         } else if (JLI_StrCmp(arg, "--module") == 0 ||
                    JLI_StrCCmp(arg, "--module=") == 0 ||
                    JLI_StrCmp(arg, "-m") == 0) {
             REPORT_ERROR (has_arg, ARG_ERROR5, arg);
             SetMainModule(value);
-            mode = LM_MODULE;
+            mode = checkMode(mode, LM_MODULE, arg);
             if (has_arg) {
                *pwhat = value;
                 break;
             }
+        } else if (JLI_StrCmp(arg, "--source") == 0 ||
+                   JLI_StrCCmp(arg, "--source=") == 0) {
+            REPORT_ERROR (has_arg, ARG_ERROR13, arg);
+            mode = LM_SOURCE;
+            if (has_arg) {
+                const char *prop = "-Djdk.internal.javac.source=";
+                size_t size = JLI_StrLen(prop) + JLI_StrLen(value) + 1;
+                char *propValue = (char *)JLI_MemAlloc(size);
+                JLI_Snprintf(propValue, size, "%s%s", prop, value);
+                AddOption(propValue, NULL);
+            }
         } else if (JLI_StrCmp(arg, "--class-path") == 0 ||
                    JLI_StrCCmp(arg, "--class-path=") == 0 ||
                    JLI_StrCmp(arg, "-classpath") == 0 ||
@@ -1435,12 +1473,25 @@ ParseArguments(int *pargc, char ***pargv,
         if (!_have_classpath) {
             SetClassPath(".");
         }
-        mode = LM_CLASS;
+        mode = IsSourceFile(arg) ? LM_SOURCE : LM_CLASS;
+    } else if (mode == LM_CLASS && IsSourceFile(arg)) {
+        /* override LM_CLASS mode if given a source file */
+        mode = LM_SOURCE;
     }
 
-    if (argc >= 0) {
-        *pargc = argc;
-        *pargv = argv;
+    if (mode == LM_SOURCE) {
+        AddOption("--add-modules=ALL-DEFAULT", NULL);
+        *pwhat = SOURCE_LAUNCHER_MAIN_ENTRY;
+        // adjust (argc, argv) so that the name of the source file
+        // is included in the args passed to the source launcher
+        // main entry class
+        *pargc = argc + 1;
+        *pargv = argv - 1;
+    } else {
+        if (argc >= 0) {
+            *pargc = argc;
+            *pargv = argv;
+        }
     }
 
     *pmode = mode;
diff --git a/src/java.base/share/native/libjli/java.h b/src/java.base/share/native/libjli/java.h
index 3bea2e11eec..0e77e3c4004 100644
--- a/src/java.base/share/native/libjli/java.h
+++ b/src/java.base/share/native/libjli/java.h
@@ -230,11 +230,12 @@ enum LaunchMode {               // cf. sun.launcher.LauncherHelper
     LM_UNKNOWN = 0,
     LM_CLASS,
     LM_JAR,
-    LM_MODULE
+    LM_MODULE,
+    LM_SOURCE
 };
 
 static const char *launchModeNames[]
-    = { "Unknown", "Main class", "JAR file", "Module" };
+    = { "Unknown", "Main class", "JAR file", "Module", "Source" };
 
 typedef struct {
     int    argc;
diff --git a/src/java.base/share/native/libjli/jli_util.c b/src/java.base/share/native/libjli/jli_util.c
index 014e810ece7..3b24a784491 100644
--- a/src/java.base/share/native/libjli/jli_util.c
+++ b/src/java.base/share/native/libjli/jli_util.c
@@ -84,6 +84,16 @@ JLI_MemFree(void *ptr)
     free(ptr);
 }
 
+jboolean
+JLI_HasSuffix(const char *s1, const char *s2)
+{
+    char *p = JLI_StrRChr(s1, '.');
+    if (p == NULL || *p == '\0') {
+        return JNI_FALSE;
+    }
+    return (JLI_StrCaseCmp(p, s2) == 0);
+}
+
 /*
  * debug helpers we use
  */
diff --git a/src/java.base/share/native/libjli/jli_util.h b/src/java.base/share/native/libjli/jli_util.h
index 2968f1ee7e7..b8987010f31 100644
--- a/src/java.base/share/native/libjli/jli_util.h
+++ b/src/java.base/share/native/libjli/jli_util.h
@@ -51,7 +51,8 @@ JLI_StringDup(const char *s1);
 JNIEXPORT void JNICALL
 JLI_MemFree(void *ptr);
 
-int   JLI_StrCCmp(const char *s1, const char* s2);
+int   JLI_StrCCmp(const char *s1, const char *s2);
+jboolean   JLI_HasSuffix(const char *s1, const char *s2);
 
 typedef struct {
     char *arg;
@@ -158,7 +159,7 @@ JNIEXPORT void JNICALL
 JLI_InitArgProcessing(jboolean hasJavaArgs, jboolean disableArgFile);
 
 JNIEXPORT JLI_List JNICALL
-JLI_PreprocessArg(const char *arg);
+JLI_PreprocessArg(const char *arg, jboolean expandSourceOpt);
 
 JNIEXPORT jboolean JNICALL
 JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name);
diff --git a/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java b/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
index eed721152ac..063bd170dc1 100644
--- a/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
+++ b/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.util.Set;
 import java.util.HashSet;
 import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_DGRAM;
 
 /*
  * On Unix systems we simply delegate to native methods.
@@ -77,18 +78,10 @@ class PlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
 
     protected Set<SocketOption<?>> supportedOptions() {
         HashSet<SocketOption<?>> options = new HashSet<>(super.supportedOptions());
-        addExtSocketOptions(extendedOptions.options(), options);
+        options.addAll(ExtendedSocketOptions.options(SOCK_DGRAM));
         return options;
     }
 
-    private void addExtSocketOptions(Set<SocketOption<?>> extOptions,
-                                     Set<SocketOption<?>> options) {
-        // TCP_QUICKACK is applicable for TCP Sockets only.
-        extOptions.stream()
-                .filter((option) -> !option.name().equals("TCP_QUICKACK"))
-                .forEach((option) -> options.add(option));
-    }
-
     protected void socketSetOption(int opt, Object val) throws SocketException {
         if (opt == SocketOptions.SO_REUSEPORT &&
             !supportedOptions().contains(StandardSocketOptions.SO_REUSEPORT)) {
diff --git a/src/java.base/unix/classes/java/net/PlainSocketImpl.java b/src/java.base/unix/classes/java/net/PlainSocketImpl.java
index 4fb3b6545e3..83b685a927e 100644
--- a/src/java.base/unix/classes/java/net/PlainSocketImpl.java
+++ b/src/java.base/unix/classes/java/net/PlainSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -29,6 +29,7 @@ import java.io.FileDescriptor;
 import java.util.Set;
 import java.util.HashSet;
 import sun.net.ext.ExtendedSocketOptions;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_STREAM;
 
 /*
  * On Unix systems we simply delegate to native methods.
@@ -90,7 +91,7 @@ class PlainSocketImpl extends AbstractPlainSocketImpl
 
     protected Set<SocketOption<?>> supportedOptions() {
         HashSet<SocketOption<?>> options = new HashSet<>(super.supportedOptions());
-        addExtSocketOptions(extendedOptions.options(), options);
+        addExtSocketOptions(ExtendedSocketOptions.options(SOCK_STREAM), options);
         return options;
     }
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java b/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
index 34fe5d24526..5d5cca7626d 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -373,6 +373,22 @@ class UnixCopyFile {
         }
     }
 
+    // throw a DirectoryNotEmpty exception if appropriate
+    static void ensureEmptyDir(UnixPath dir) throws IOException {
+        try {
+            long ptr = opendir(dir);
+            try (UnixDirectoryStream stream =
+                new UnixDirectoryStream(dir, ptr, e -> true)) {
+                if (stream.iterator().hasNext()) {
+                    throw new DirectoryNotEmptyException(
+                        dir.getPathForExceptionMessage());
+                }
+            }
+        } catch (UnixException e) {
+            e.rethrowAsIOException(dir);
+        }
+    }
+
     // move file from source to target
     static void move(UnixPath source, UnixPath target, CopyOption... options)
         throws IOException
@@ -465,6 +481,7 @@ class UnixCopyFile {
 
         // copy source to target
         if (sourceAttrs.isDirectory()) {
+            ensureEmptyDir(source);
             copyDirectory(source, sourceAttrs, target, flags);
         } else {
             if (sourceAttrs.isSymbolicLink()) {
diff --git a/src/java.base/unix/native/libnet/SocketOutputStream.c b/src/java.base/unix/native/libnet/SocketOutputStream.c
index ba3a907ae67..0962235bc35 100644
--- a/src/java.base/unix/native/libnet/SocketOutputStream.c
+++ b/src/java.base/unix/native/libnet/SocketOutputStream.c
@@ -108,13 +108,8 @@ Java_java_net_SocketOutputStream_socketWrite0(JNIEnv *env, jobject this,
                     loff += n;
                     continue;
                 }
-                if (errno == ECONNRESET) {
-                    JNU_ThrowByName(env, "sun/net/ConnectionResetException",
-                        "Connection reset");
-                } else {
-                    JNU_ThrowByNameWithMessageAndLastError
-                        (env, "java/net/SocketException", "Write failed");
-                }
+                JNU_ThrowByNameWithMessageAndLastError
+                    (env, "java/net/SocketException", "Write failed");
                 if (bufP != BUF) {
                     free(bufP);
                 }
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
index c96a699370f..2fe40b78204 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -249,6 +249,17 @@ class WindowsFileCopy {
         }
     }
 
+    // throw a DirectoryNotEmpty exception if not empty
+    static void ensureEmptyDir(WindowsPath dir) throws IOException {
+        try (WindowsDirectoryStream dirStream =
+            new WindowsDirectoryStream(dir, (e) -> true)) {
+            if (dirStream.iterator().hasNext()) {
+                throw new DirectoryNotEmptyException(
+                    dir.getPathForExceptionMessage());
+            }
+        }
+    }
+
     /**
      * Move file from source to target
      */
@@ -407,6 +418,7 @@ class WindowsFileCopy {
         // create new directory or directory junction
         try {
             if (sourceAttrs.isDirectory()) {
+                ensureEmptyDir(source);
                 CreateDirectory(targetPath, 0L);
             } else {
                 String linkTarget = WindowsLinkSupport.readLink(source);
diff --git a/src/java.base/windows/native/libjava/TimeZone_md.c b/src/java.base/windows/native/libjava/TimeZone_md.c
index ab89a7d54ed..d46b3c3b57d 100644
--- a/src/java.base/windows/native/libjava/TimeZone_md.c
+++ b/src/java.base/windows/native/libjava/TimeZone_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, 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
@@ -437,6 +437,8 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
     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";
 
     mapFileName = malloc(strlen(java_home_dir) + strlen(MAPPINGS_FILE) + 1);
     if (mapFileName == NULL) {
@@ -472,10 +474,14 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
             items[itemIndex] = start;
             while (*idx && *idx != ':') {
                 if (++idx >= endp) {
+                    errorMessage = "premature end of line";
+                    offset = (int)(idx - lineBuffer);
                     goto illegal_format;
                 }
             }
             if (*idx == '\0') {
+                errorMessage = "illegal null character found";
+                offset = (int)(idx - lineBuffer);
                 goto illegal_format;
             }
             *idx++ = '\0';
@@ -483,6 +489,8 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
         }
 
         if (*idx != '\n') {
+            errorMessage = "illegal non-newline character found";
+            offset = (int)(idx - lineBuffer);
             goto illegal_format;
         }
 
@@ -516,7 +524,8 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
 
  illegal_format:
     (void) fclose(fp);
-    jio_fprintf(stderr, "tzmappings: Illegal format at line %d.\n", line);
+    jio_fprintf(stderr, "Illegal format in tzmappings file: %s at line %d, offset %d.\n",
+                errorMessage, line, offset);
     return NULL;
 }
 
diff --git a/src/java.base/windows/native/libjli/cmdtoargs.c b/src/java.base/windows/native/libjli/cmdtoargs.c
index 9de0e43c536..9bbbdaf9865 100644
--- a/src/java.base/windows/native/libjli/cmdtoargs.c
+++ b/src/java.base/windows/native/libjli/cmdtoargs.c
@@ -246,7 +246,7 @@ JLI_CmdToArgs(char* cmdline) {
     // iterate through rest of command line
     while (src != NULL) {
         src = next_arg(src, arg, &wildcard);
-        argsInFile = JLI_PreprocessArg(arg);
+        argsInFile = JLI_PreprocessArg(arg, JNI_TRUE);
         if (argsInFile != NULL) {
             // resize to accommodate another Arg
             cnt = argsInFile->size;
diff --git a/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java b/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java
new file mode 100644
index 00000000000..d0e7fd25ca9
--- /dev/null
+++ b/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java
@@ -0,0 +1,490 @@
+/*
+ * 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
+ * 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 sun.awt;
+
+import java.awt.AWTException;
+import java.awt.EventQueue;
+import java.awt.event.InputMethodEvent;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextHitInfo;
+import java.awt.peer.ComponentPeer;
+import java.text.AttributedString;
+
+import sun.util.logging.PlatformLogger;
+
+/**
+ * Input Method Adapter for XIM for AIX
+ *
+ * @author JavaSoft International
+ */
+public abstract class X11InputMethod extends X11InputMethodBase {
+
+    // to keep the instance of activating if IM resumed
+    static protected X11InputMethod activatedInstance = null;
+
+    /**
+     * Constructs an X11InputMethod instance. It initializes the XIM
+     * environment if it's not done yet.
+     *
+     * @exception AWTException if XOpenIM() failed.
+     */
+    public X11InputMethod() throws AWTException {
+        super();
+    }
+
+    /**
+     * Reset the composition state to the current composition state.
+     */
+    protected void resetCompositionState() {
+        if (compositionEnableSupported && haveActiveClient()) {
+            try {
+                /* Restore the composition mode to the last saved composition
+                   mode. */
+                setCompositionEnabled(savedCompositionState);
+            } catch (UnsupportedOperationException e) {
+                compositionEnableSupported = false;
+            }
+        }
+    }
+
+    /**
+     * Activate input method.
+     */
+    public synchronized void activate() {
+        activatedInstance = this;
+        clientComponentWindow = getClientComponentWindow();
+        if (clientComponentWindow == null)
+            return;
+
+        if (lastXICFocussedComponent != null) {
+            if (log.isLoggable(PlatformLogger.Level.FINE)) {
+                log.fine("XICFocused {0}, AWTFocused {1}",
+                         lastXICFocussedComponent, awtFocussedComponent);
+            }
+            if (lastXICFocussedComponent != awtFocussedComponent) {
+                ComponentPeer lastXICFocussedComponentPeer = getPeer(lastXICFocussedComponent);
+                if (lastXICFocussedComponentPeer != null) {
+                    setXICFocus(lastXICFocussedComponentPeer, false, isLastXICActive);
+                }
+            }
+            lastXICFocussedComponent = null;
+        }
+
+        if (pData == 0) {
+            if (!createXIC()) {
+                return;
+            }
+            disposed = false;
+        }
+
+        /*  reset input context if necessary and set the XIC focus
+        */
+        resetXICifneeded();
+        ComponentPeer awtFocussedComponentPeer = getPeer(awtFocussedComponent);
+        setStatusAreaVisible(true, pData);
+
+        if (awtFocussedComponentPeer != null) {
+            setXICFocus(awtFocussedComponentPeer, true, haveActiveClient());
+        }
+        lastXICFocussedComponent = awtFocussedComponent;
+        isLastXICActive = haveActiveClient();
+        isActive = true;
+        if (savedCompositionState) {
+            resetCompositionState();
+        }
+    }
+
+    /**
+     * Deactivate input method.
+     */
+    public synchronized void deactivate(boolean isTemporary) {
+        boolean   isAc =  haveActiveClient();
+        /* Usually as the client component, let's call it component A,
+           loses the focus, this method is called. Then when another client
+           component, let's call it component B,  gets the focus, activate is first called on
+           the previous focused compoent which is A, then endComposition is called on A,
+           deactivate is called on A again. And finally activate is called on the newly
+           focused component B. Here is the call sequence.
+
+           A loses focus               B gains focus
+           -------------> deactivate A -------------> activate A -> endComposition A ->
+           deactivate A -> activate B ----....
+
+           So in order to carry the composition mode across the components sharing the same
+           input context, we save it when deactivate is called so that when activate is
+           called, it can be restored correctly till activate is called on the newly focused
+           component. (See also sun/awt/im/InputContext and bug 6184471).
+           Last note, getCompositionState should be called before setXICFocus since
+           setXICFocus here sets the XIC to 0.
+        */
+        activatedInstance = null;
+        savedCompositionState = getCompositionState();
+
+        if (isTemporary) {
+            //turn the status window off...
+            turnoffStatusWindow();
+            /* Delay resetting the XIC focus until activate is called and the newly
+             * Focused component has a different peer as the last focused component.
+             */
+            lastXICFocussedComponent = awtFocussedComponent;
+        } else {
+            if (awtFocussedComponent != null ) {
+                ComponentPeer awtFocussedComponentPeer = getPeer(awtFocussedComponent);
+                if (awtFocussedComponentPeer != null) {
+                    setXICFocus(awtFocussedComponentPeer, false, isAc);
+                }
+            }
+            lastXICFocussedComponent = null;
+        }
+
+        isLastXICActive = isAc;
+        isLastTemporary = isTemporary;
+        isActive = false;
+        setStatusAreaVisible(false, pData);
+    }
+
+    // implements java.awt.im.spi.InputMethod.hideWindows
+    public void hideWindows() {
+        if (pData != 0) {
+            setStatusAreaVisible(false, pData);
+            turnoffStatusWindow();
+        }
+    }
+
+    /**
+     * Updates composed text with XIM preedit information and
+     * posts composed text to the awt event queue. The args of
+     * this method correspond to the XIM preedit callback
+     * information. The XIM highlight attributes are translated via
+     * fixed mapping (i.e., independent from any underlying input
+     * method engine). This method is invoked in the AWT Toolkit
+     * (X event loop) thread context and thus inside the AWT Lock.
+     */
+    // NOTE: This method may be called by privileged threads.
+    //       This functionality is implemented in a package-private method
+    //       to insure that it cannot be overridden by client subclasses.
+    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    void dispatchComposedText(String chgText,
+                                           int chgStyles[],
+                                           int chgOffset,
+                                           int chgLength,
+                                           int caretPosition,
+                                           long when) {
+        if (disposed) {
+            return;
+        }
+
+        // Workaround for deadlock bug on solaris2.6_zh bug#4170760
+        if (chgText == null
+            && chgStyles == null
+            && chgOffset == 0
+            && chgLength == 0
+            && caretPosition == 0
+            && composedText == null
+            && committedText == null)
+            return;
+
+        // Recalculate chgOffset and chgLength for supplementary char
+        if (composedText != null) {
+            int tmpChgOffset=chgOffset;
+            int tmpChgLength=chgLength;
+            int index = 0;
+            for (int i=0;i < tmpChgOffset; i++,index++){
+                if (index < composedText.length()
+                    && Character.charCount(composedText.codePointAt(index))==2){
+                    index++;
+                    chgOffset++;
+                }
+            }
+            // The index keeps value
+            for (int i=0;i < tmpChgLength; i++,index++){
+                if (index < composedText.length()
+                    && Character.charCount(composedText.codePointAt(index))==2){
+                    index++;
+                    chgLength++;
+                }
+            }
+        }
+
+        // Replace control character with a square box
+        if (chgText != null) {
+            StringBuffer newChgText = new StringBuffer();
+            for (int i=0; i < chgText.length(); i++){
+                char c = chgText.charAt(i);
+                if (Character.isISOControl(c)){
+                    c = '\u25A1';
+                }
+                newChgText.append(c);
+            }
+            chgText = new String(newChgText);
+        }
+
+        if (composedText == null) {
+            // TODO: avoid reallocation of those buffers
+            composedText = new StringBuffer(INITIAL_SIZE);
+            rawFeedbacks = new IntBuffer(INITIAL_SIZE);
+        }
+        if (chgLength > 0) {
+            if (chgText == null && chgStyles != null) {
+                rawFeedbacks.replace(chgOffset, chgStyles);
+            } else {
+                if (chgLength == composedText.length()) {
+                    // optimization for the special case to replace the
+                    // entire previous text
+                    composedText = new StringBuffer(INITIAL_SIZE);
+                    rawFeedbacks = new IntBuffer(INITIAL_SIZE);
+                } else {
+                    if (composedText.length() > 0) {
+                        if (chgOffset+chgLength < composedText.length()) {
+                            String text;
+                            text = composedText.toString().substring(chgOffset+chgLength,
+                                                                     composedText.length());
+                            composedText.setLength(chgOffset);
+                            composedText.append(text);
+                        } else {
+                            // in case to remove substring from chgOffset
+                            // to the end
+                            composedText.setLength(chgOffset);
+                        }
+                        rawFeedbacks.remove(chgOffset, chgLength);
+                    }
+                }
+            }
+        }
+        if (chgText != null) {
+            composedText.insert(chgOffset, chgText);
+            if (chgStyles != null) {
+                // Recalculate chgStyles for supplementary char
+                if (chgText.length() > chgStyles.length){
+                    int index=0;
+                    int[] newStyles = new int[chgText.length()];
+                    for (int i=0; i < chgStyles.length; i++, index++){
+                        newStyles[index]=chgStyles[i];
+                        if (index < chgText.length()
+                            && Character.charCount(chgText.codePointAt(index))==2){
+                            newStyles[++index]=chgStyles[i];
+                        }
+                    }
+                    chgStyles=newStyles;
+                }
+                rawFeedbacks.insert(chgOffset, chgStyles);
+            }
+
+        }
+
+        else if (chgStyles != null) {
+            // Recalculate chgStyles to support supplementary char
+            int count=0;
+            for (int i=0; i < chgStyles.length; i++){
+                if (composedText.length() > chgOffset+i+count
+                    && Character.charCount(composedText.codePointAt(chgOffset+i+count))==2){
+                    count++;
+                }
+            }
+            if (count>0){
+                int index=0;
+                int[] newStyles = new int[chgStyles.length+count];
+                for (int i=0; i < chgStyles.length; i++, index++){
+                    newStyles[index]=chgStyles[i];
+                    if (composedText.length() > chgOffset+index
+                        && Character.charCount(composedText.codePointAt(chgOffset+index))==2){
+                        newStyles[++index]=chgStyles[i];
+                    }
+                }
+                chgStyles=newStyles;
+            }
+            rawFeedbacks.replace(chgOffset, chgStyles);
+        }
+
+        if (composedText.length() == 0) {
+            composedText = null;
+            rawFeedbacks = null;
+
+            // if there is any outstanding committed text stored by
+            // dispatchCommittedText(), it has to be sent to the
+            // client component.
+            if (committedText != null) {
+                dispatchCommittedText(committedText, when);
+                committedText = null;
+                return;
+            }
+
+            // otherwise, send null text to delete client's composed
+            // text.
+            postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                                 null,
+                                 0,
+                                 null,
+                                 null,
+                                 when);
+
+            return;
+        }
+
+        // Adjust caretPosition for supplementary char
+        for (int i=0; i< caretPosition; i++){
+            if (i < composedText.length()
+                && Character.charCount(composedText.codePointAt(i))==2){
+                caretPosition++;
+                i++;
+            }
+        }
+
+        // Now sending the composed text to the client
+        int composedOffset;
+        AttributedString inputText;
+
+        // if there is any partially committed text, concatenate it to
+        // the composed text.
+        if (committedText != null) {
+            composedOffset = committedText.length();
+            inputText = new AttributedString(committedText + composedText);
+            committedText = null;
+        } else {
+            composedOffset = 0;
+            inputText = new AttributedString(composedText.toString());
+        }
+
+        int currentFeedback;
+        int nextFeedback;
+        int startOffset = 0;
+        int currentOffset;
+        int visiblePosition = 0;
+        TextHitInfo visiblePositionInfo = null;
+
+        rawFeedbacks.rewind();
+        currentFeedback = rawFeedbacks.getNext();
+        rawFeedbacks.unget();
+        while ((nextFeedback = rawFeedbacks.getNext()) != -1) {
+            if (visiblePosition == 0) {
+                visiblePosition = nextFeedback & XIMVisibleMask;
+                if (visiblePosition != 0) {
+                    int index = rawFeedbacks.getOffset() - 1;
+
+                    if (visiblePosition == XIMVisibleToBackward)
+                        visiblePositionInfo = TextHitInfo.leading(index);
+                    else
+                        visiblePositionInfo = TextHitInfo.trailing(index);
+                }
+            }
+            nextFeedback &= ~XIMVisibleMask;
+            if (currentFeedback != nextFeedback) {
+                rawFeedbacks.unget();
+                currentOffset = rawFeedbacks.getOffset();
+                inputText.addAttribute(TextAttribute.INPUT_METHOD_HIGHLIGHT,
+                                       convertVisualFeedbackToHighlight(currentFeedback),
+                                       composedOffset + startOffset,
+                                       composedOffset + currentOffset);
+                startOffset = currentOffset;
+                currentFeedback = nextFeedback;
+            }
+        }
+        currentOffset = rawFeedbacks.getOffset();
+        if (currentOffset >= 0) {
+            inputText.addAttribute(TextAttribute.INPUT_METHOD_HIGHLIGHT,
+                                   convertVisualFeedbackToHighlight(currentFeedback),
+                                   composedOffset + startOffset,
+                                   composedOffset + currentOffset);
+        }
+
+        postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                             inputText.getIterator(),
+                             composedOffset,
+                             TextHitInfo.leading(caretPosition),
+                             visiblePositionInfo,
+                             when);
+    }
+
+    /* Some IMs need forced Text clear */
+    void clearComposedText(long when) {
+        composedText = null;
+        postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                             null, 0, null, null,
+                             when);
+        if (committedText != null && committedText.length() > 0) {
+            dispatchCommittedText(committedText, when);
+        }
+        committedText = null;
+        rawFeedbacks = null;
+    }
+
+    void clearComposedText() {
+        if (EventQueue.isDispatchThread()) {
+            clearComposedText(EventQueue.getMostRecentEventTime());
+        }
+    }
+
+    /*
+     * Subclasses should override disposeImpl() instead of dispose(). Client
+     * code should always invoke dispose(), never disposeImpl().
+     */
+    protected synchronized void disposeImpl() {
+        disposeXIC();
+        awtLock();
+        try {
+            clearComposedText();
+        } finally {
+            // Put awtUnlock into finally block in case an exception is thrown in clearComposedText.
+            awtUnlock();
+        }
+        awtFocussedComponent = null;
+        lastXICFocussedComponent = null;
+        needResetXIC = false;
+        savedCompositionState = false;
+        compositionEnableSupported = true;
+    }
+
+    /**
+     * @see java.awt.im.spi.InputMethod#setCompositionEnabled(boolean)
+     */
+    public void setCompositionEnabled(boolean enable) {
+        /* If the composition state is successfully changed, set
+           the savedCompositionState to 'enable'. Otherwise, simply
+           return.
+           setCompositionEnabledNative may throw UnsupportedOperationException.
+           Don't try to catch it since the method may be called by clients.
+           Use package private mthod 'resetCompositionState' if you want the
+           exception to be caught.
+        */
+        boolean pre, post;
+        pre=getCompositionState();
+
+        if (setCompositionEnabledNative(enable)) {
+            savedCompositionState = enable;
+        }
+
+        post=getCompositionState();
+        if (pre != post && post == enable){
+            if (enable == false) flushText();
+            if (awtFocussedComponent != null && isActive){
+                setXICFocus(getPeer(awtFocussedComponent),
+                            true, haveActiveClient());
+            }
+        }
+    }
+
+    private native void setStatusAreaVisible(boolean value, long data);
+}
diff --git a/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c
new file mode 100644
index 00000000000..44d29d75677
--- /dev/null
+++ b/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c
@@ -0,0 +1,2269 @@
+/*
+ * 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
+ * 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.
+ */
+
+#ifdef HEADLESS
+    #error This file should not be included in headless library
+#endif
+
+#include "awt.h"
+#include "awt_p.h"
+
+#include <sun_awt_X11InputMethodBase.h>
+#include <sun_awt_X11InputMethod.h>
+#include <sun_awt_X11_XInputMethod.h>
+
+#include <langinfo.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <X11/Intrinsic.h>
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+
+#define THROW_OUT_OF_MEMORY_ERROR() \
+        JNU_ThrowOutOfMemoryError((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2), NULL)
+
+struct X11InputMethodIDs {
+  jfieldID pData;
+} x11InputMethodIDs;
+
+static int PreeditStartCallback(XIC, XPointer, XPointer);
+static void PreeditDoneCallback(XIC, XPointer, XPointer);
+static void PreeditDrawCallback(XIC, XPointer,
+                                XIMPreeditDrawCallbackStruct *);
+static void PreeditCaretCallback(XIC, XPointer,
+                                 XIMPreeditCaretCallbackStruct *);
+static void StatusStartCallback(XIC, XPointer, XPointer);
+static void StatusDoneCallback(XIC, XPointer, XPointer);
+static void StatusDrawCallback(XIC, XPointer,
+                               XIMStatusDrawCallbackStruct *);
+
+#define ROOT_WINDOW_STYLES      (XIMPreeditNothing | XIMStatusNothing)
+#define NO_STYLES               (XIMPreeditNone | XIMStatusNone)
+/* added style to allow for in-place composition, such as "dead" keys for accents */
+#define IN_PLACE_STYLES         (XIMPreeditNothing | XIMStatusNone)
+
+#define PreeditStartIndex       0
+#define PreeditDoneIndex        1
+#define PreeditDrawIndex        2
+#define PreeditCaretIndex       3
+#define StatusStartIndex        4
+#define StatusDoneIndex         5
+#define StatusDrawIndex         6
+#define NCALLBACKS              7
+
+#define STATUS_BORDER 2         /* Status Border width */
+#define CARET_OFFSET 1          /* Offset of caret position (pixel) */
+#define BORDER_MARGIN 3         /* BORDER MARGIN width */
+#define STATUS_MARGIN 7         /* Margin between the status window and its parent window */
+#define PREEDIT_ATTR_MASK (XIMReverse|XIMUnderline)
+          /* Preedit attribute which host adapter can handle */
+
+/*
+ * Callback function pointers: the order has to match the *Index
+ * values above.
+ */
+static XIMProc callback_funcs[NCALLBACKS] = {
+    (XIMProc)PreeditStartCallback,
+    (XIMProc)PreeditDoneCallback,
+    (XIMProc)PreeditDrawCallback,
+    (XIMProc)PreeditCaretCallback,
+    (XIMProc)StatusStartCallback,
+    (XIMProc)StatusDoneCallback,
+    (XIMProc)StatusDrawCallback,
+};
+
+#define MAX_STATUS_LEN  100
+typedef struct {
+    Window   w;                /*status window id        */
+    Window   root;             /*the root window id      */
+    Window   parent;           /*parent shell window     */
+    Window   grandParent;      /*window has WM frame     */
+    int      x, y;             /*parent's upperleft position */
+    int      width, height;    /*parent's width, height  */
+    GC       lightGC;          /*gc for light border     */
+    GC       dimGC;            /*gc for dim border       */
+    GC       bgGC;             /*normal painting         */
+    GC       fgGC;             /*normal painting         */
+    int      statusW, statusH; /*status window's w, h    */
+    int      rootW, rootH;     /*root window's w, h    */
+    int      bWidth;           /*border width            */
+    wchar_t  status[MAX_STATUS_LEN + 1]; /*status text       */
+    XFontSet fontset;           /*fontset for drawing    */
+    int      off_x, off_y;
+    Bool     on;                /*if the status window on*/
+    int      fOff;              /* font base line(in pixel) from top */
+    int      fBot;              /* font bottom line(in pixel) from top */
+    int      peTextW;           /* Composition text width in pixel */
+    wchar_t* peText;            /* Composed string (wide char.) */
+    XIMFeedback* peAttr;        /* Composed text attribute */
+    int      peCaret;           /* Caret position in number of character */
+    Bool     status_ready;      /* Not draw Status at XCreateIC */
+} StatusWindow;
+
+/*
+ * X11InputMethodData keeps per X11InputMethod instance information. A pointer
+ * to this data structure is kept in an X11InputMethod object (pData).
+ */
+typedef struct _X11InputMethodData {
+    XIC         current_ic;     /* current X Input Context */
+    XIC         ic_active;      /* X Input Context for active clients */
+    XIC         ic_passive;     /* X Input Context for passive clients */
+    XIMCallback *callbacks;     /* callback parameters */
+    jobject     x11inputmethod; /* global ref to X11InputMethod instance */
+                                /* associated with the XIC */
+    StatusWindow *statusWindow; /* our own status window  */
+    Bool        passiveStatusWindow;/* Passive Client uses StatusWindow */
+    Bool        isActiveClient;     /* True:clinet is active */
+    Bool        forceReset;     /* True: call resetXIC before UnsetICFocus */
+} X11InputMethodData;
+
+/* reference to the current X11InputMethod instance, it is always
+   point to the global reference to the X11InputMethodObject since
+   it could be referenced by different threads. */
+jobject currentX11InputMethodInstance = NULL;
+
+Window  currentFocusWindow = 0;  /* current window that has focus for input
+                                       method. (the best place to put this
+                                       information should be
+                                       currentX11InputMethodInstance's pData) */
+static XIM X11im = NULL;
+Display * dpy = NULL;
+
+#define GetJNIEnv() (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2)
+
+static X11InputMethodData * getX11InputMethodData(JNIEnv *, jobject);
+static void setX11InputMethodData(JNIEnv *, jobject, X11InputMethodData *);
+static void destroyX11InputMethodData(JNIEnv *, X11InputMethodData *);
+static void freeX11InputMethodData(JNIEnv *, X11InputMethodData *);
+
+/* Prototype for this function is missing in AIX Xlib.h */
+extern char *XSetIMValues(
+#if NeedVarargsPrototypes
+    XIM /* im */, ...
+#endif
+);
+
+static int st_wcslen(wchar_t *string);
+static Bool isPreeditStateActive(XIC ic);
+static void * buf_insert(void * src, void * insert, int size,
+                         int src_len, int ins_len, int offset);
+static void * handle_buffer(void * source, void * insert,
+                            int size, int src_len, int ins_len,
+                            int del_len, int offset);
+static void preedit_draw_passive(X11InputMethodData *pX11IMData,
+                                 XIMPreeditDrawCallbackStruct *pre_draw);
+static void resetPassivePreeditText(StatusWindow *statusWindow);
+static void draw_caret(StatusWindow *statusWindow, GC gc, int pos);
+static int  get_next_attr(int len, unsigned long *attr);
+static void draw_preedit(StatusWindow *statusWindow);
+static void align_status(StatusWindow *statusWindow);
+static void shrink_status(StatusWindow *statusWindow);
+static GC create_gc(Window win, Bool isReverse);
+static XFontSet create_fontset(void);
+static Bool is_text_available(XIMText * text);
+static Bool isNativeIm();
+static Window getGrandParent(Window parent);
+static void moveStatusWindow(StatusWindow *statusWindow);
+static void arrange_window_stack(StatusWindow* statusWindow);
+static Window get_current_focus(XIC ic);
+
+/*
+ * This function is stolen from /src/solaris/hpi/src/system_md.c
+ * It is used in setting the time in Java-level InputEvents
+ */
+jlong
+awt_util_nowMillisUTC()
+{
+    struct timeval t;
+    gettimeofday(&t, NULL);
+    return ((jlong)t.tv_sec) * 1000 + (jlong)(t.tv_usec/1000);
+}
+
+/*
+ * Converts the wchar_t string to a multi-byte string calling wcstombs(). A
+ * buffer is allocated by malloc() to store the multi-byte string. NULL is
+ * returned if the given wchar_t string pointer is NULL or buffer allocation is
+ * failed.
+ */
+static char *
+wcstombsdmp(wchar_t *wcs, int len)
+{
+    size_t n;
+    char *mbs;
+
+    if (wcs == NULL)
+        return NULL;
+
+    n = len*MB_CUR_MAX + 1;
+
+    mbs = (char *) malloc(n * sizeof(char));
+    if (mbs == NULL) {
+        THROW_OUT_OF_MEMORY_ERROR();
+        return NULL;
+    }
+
+    /* TODO: check return values... Handle invalid characters properly...  */
+    if (wcstombs(mbs, wcs, n) == (size_t)-1) {
+        free(mbs);
+        return NULL;
+    }
+
+    return mbs;
+}
+
+static X11InputMethodData * getX11InputMethodData(JNIEnv * env, jobject imInstance) {
+    X11InputMethodData *pX11IMData =
+        (X11InputMethodData *)JNU_GetLongFieldAsPtr(env, imInstance, x11InputMethodIDs.pData);
+
+    /*
+     * In case the XIM server was killed somehow, reset X11InputMethodData.
+     */
+    if (X11im == NULL && pX11IMData != NULL) {
+        JNU_CallMethodByName(env, NULL, pX11IMData->x11inputmethod,
+                             "flushText",
+                             "()V");
+        JNU_CHECK_EXCEPTION_RETURN(env, NULL);
+        /* IMPORTANT:
+           The order of the following calls is critical since "imInstance" may
+           point to the global reference itself, if "freeX11InputMethodData" is called
+           first, the global reference will be destroyed and "setX11InputMethodData"
+           will in fact fail silently. So pX11IMData will not be set to NULL.
+           This could make the original java object refers to a deleted pX11IMData
+           object.
+        */
+        setX11InputMethodData(env, imInstance, NULL);
+        freeX11InputMethodData(env, pX11IMData);
+        pX11IMData = NULL;
+    }
+
+    return pX11IMData;
+}
+
+static void setX11InputMethodData(JNIEnv * env, jobject imInstance, X11InputMethodData *pX11IMData) {
+    JNU_SetLongFieldFromPtr(env, imInstance, x11InputMethodIDs.pData, pX11IMData);
+}
+
+/* this function should be called within AWT_LOCK() */
+static void
+destroyX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
+{
+    /*
+     * Destroy XICs
+     */
+    if (pX11IMData == NULL) {
+        return;
+    }
+
+    if (pX11IMData->ic_active != (XIC)0) {
+        XUnsetICFocus(pX11IMData->ic_active);
+        XDestroyIC(pX11IMData->ic_active);
+        if (pX11IMData->ic_active != pX11IMData->ic_passive) {
+            if (pX11IMData->ic_passive != (XIC)0) {
+                XUnsetICFocus(pX11IMData->ic_passive);
+                XDestroyIC(pX11IMData->ic_passive);
+            }
+            pX11IMData->ic_passive = (XIC)0;
+            pX11IMData->current_ic = (XIC)0;
+        }
+    }
+
+    freeX11InputMethodData(env, pX11IMData);
+}
+
+static void
+freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
+{
+    if (pX11IMData->statusWindow != NULL){
+        StatusWindow *sw = pX11IMData->statusWindow;
+        XFreeGC(awt_display, sw->lightGC);
+        XFreeGC(awt_display, sw->dimGC);
+        XFreeGC(awt_display, sw->bgGC);
+        XFreeGC(awt_display, sw->fgGC);
+        if (sw->fontset != NULL) {
+            XFreeFontSet(awt_display, sw->fontset);
+        }
+        XDestroyWindow(awt_display, sw->w);
+        if (pX11IMData->statusWindow->peText){
+            free((void *)pX11IMData->statusWindow->peText);
+            pX11IMData->statusWindow->peText = NULL;
+        }
+        if (pX11IMData->statusWindow->peAttr){
+            free((void *)pX11IMData->statusWindow->peAttr);
+            pX11IMData->statusWindow->peAttr = NULL;
+        }
+        free((void*)sw);
+    }
+
+    if (pX11IMData->callbacks)
+        free((void *)pX11IMData->callbacks);
+
+    if (env) {
+        (*env)->DeleteGlobalRef(env, pX11IMData->x11inputmethod);
+    }
+
+    free((void *)pX11IMData);
+}
+
+/*
+ * Sets or unsets the focus to the given XIC.
+ */
+static void
+setXICFocus(XIC ic, unsigned short req)
+{
+    if (ic == NULL) {
+        (void)fprintf(stderr, "Couldn't find X Input Context\n");
+        return;
+    }
+    if (req == 1)
+        XSetICFocus(ic);
+    else
+        XUnsetICFocus(ic);
+}
+
+/*
+ * Sets the focus window to the given XIC.
+ */
+static void
+setXICWindowFocus(XIC ic, Window w)
+{
+    if (ic == NULL) {
+        (void)fprintf(stderr, "Couldn't find X Input Context\n");
+        return;
+    }
+    (void) XSetICValues(ic, XNFocusWindow, w, NULL);
+}
+
+/*
+ * Invokes XmbLookupString() to get something from the XIM. It invokes
+ * X11InputMethod.dispatchCommittedText() if XmbLookupString() returns
+ * committed text.  This function is called from handleKeyEvent in canvas.c and
+ * it's under the Motif event loop thread context.
+ *
+ * Buffer usage: There is a bug in XFree86-4.3.0 XmbLookupString implementation,
+ * where it never returns XBufferOverflow.  We need to allocate the initial lookup buffer
+ * big enough, so that the possibility that user encounters this problem is relatively
+ * small.  When this bug gets fixed, we can make the initial buffer size smaller.
+ * Note that XmbLookupString() sometimes produces a non-null-terminated string.
+ *
+ * Returns True when there is a keysym value to be handled.
+ */
+#define INITIAL_LOOKUP_BUF_SIZE 512
+
+Boolean
+awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
+{
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData = NULL;
+    int buf_len = INITIAL_LOOKUP_BUF_SIZE;
+    char mbbuf[INITIAL_LOOKUP_BUF_SIZE];
+    char *buf;
+    KeySym keysym = NoSymbol;
+    Status status;
+    int mblen;
+    jstring javastr;
+    XIC ic;
+    Boolean result = True;
+    static Boolean composing = False;
+
+    /*
+      printf("lookupString: entering...\n");
+     */
+
+    pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
+
+    if (pX11IMData == NULL) {
+        return False;
+    }
+
+    if ((ic = pX11IMData->current_ic) == (XIC)0){
+        return False;
+    }
+
+    buf = mbbuf;
+    mblen = XmbLookupString(ic, event, buf,
+                            buf_len - 1, &keysym, &status);
+
+    /*
+     * In case of overflow, a buffer is allocated and it retries
+     * XmbLookupString().
+     */
+    if (status == XBufferOverflow) {
+        buf_len = mblen + 1;
+        buf = (char *)malloc(buf_len);
+        if (buf == NULL) {
+            THROW_OUT_OF_MEMORY_ERROR();
+            return result;
+        }
+        mblen = XmbLookupString(ic, event, buf, buf_len, &keysym, &status);
+    }
+    buf[mblen] = 0;
+
+    /* Get keysym without taking modifiers into account first to map
+     * to AWT keyCode table.
+     */
+    switch (status) {
+    case XLookupBoth:
+        if (!composing) {
+            if (event->keycode != 0) {
+                *keysymp = keysym;
+                result = False;
+                break;
+            }
+        }
+        composing = False;
+        /*FALLTHRU*/
+    case XLookupChars:
+        /*
+        printf("lookupString: status=XLookupChars, type=%d, state=%x, keycode=%x, keysym=%x\n",
+               event->type, event->state, event->keycode, keysym);
+        */
+        javastr = JNU_NewStringPlatform(env, (const char *)buf);
+        if (javastr != NULL) {
+            JNU_CallMethodByName(env, NULL,
+                                 currentX11InputMethodInstance,
+                                 "dispatchCommittedText",
+                                 "(Ljava/lang/String;J)V",
+                                 javastr,
+                                 event->time);
+            if ((*env)->ExceptionOccurred(env)) {
+                (*env)->ExceptionDescribe(env);
+                (*env)->ExceptionClear(env);
+            }
+        }
+        break;
+
+    case XLookupKeySym:
+        /*
+        printf("lookupString: status=XLookupKeySym, type=%d, state=%x, keycode=%x, keysym=%x\n",
+               event->type, event->state, event->keycode, keysym);
+        */
+        if (keysym == XK_Multi_key)
+            composing = True;
+        if (! composing) {
+            *keysymp = keysym;
+            result = False;
+        }
+        break;
+
+    case XLookupNone:
+        /*
+        printf("lookupString: status=XLookupNone, type=%d, state=%x, keycode=%x, keysym=%x\n",
+               event->type, event->state, event->keycode, keysym);
+        */
+        break;
+    }
+
+    if (buf != mbbuf) {
+        free(buf);
+    }
+    return result;
+}
+
+static StatusWindow *createStatusWindow(Window parent) {
+    StatusWindow *statusWindow;
+    XSetWindowAttributes attrib;
+    unsigned long attribmask;
+    Window containerWindow;
+    Window status;
+    Window child;
+    XWindowAttributes xwa;
+    XWindowAttributes xxwa;
+    /* Variable for XCreateFontSet()*/
+    char **mclr;
+    int  mccr = 0;
+    char *dsr;
+    unsigned long bg, fg, light, dim;
+    int x, y, off_x, off_y, xx, yy;
+    unsigned int w, h, bw, depth;
+    XGCValues values;
+    unsigned long valuemask = 0;  /*ignore XGCvalue and use defaults*/
+    int screen = 0;
+    int i;
+    AwtGraphicsConfigDataPtr adata;
+    extern int awt_numScreens;
+    /*hardcode the size right now, should get the size base on font*/
+    int width=80, height=22;
+    Window rootWindow;
+    Window *ignoreWindowPtr;
+    unsigned int ignoreUnit;
+    Window grandParent;
+    Window target;
+    XFontSet fontset;
+
+    fontset = create_fontset();
+    if (NULL == fontset) {
+        return NULL;
+    }
+
+    XGetGeometry(dpy, parent, &rootWindow, &x, &y, &w, &h, &bw, &depth);
+
+    attrib.override_redirect = True;
+    attribmask = CWOverrideRedirect;
+    for (i = 0; i < awt_numScreens; i++) {
+        if (RootWindow(dpy, i) == rootWindow) {
+            screen = i;
+            break;
+        }
+    }
+    adata = getDefaultConfig(screen);
+    bg    = adata->AwtColorMatch(255, 255, 255, adata);
+    fg    = adata->AwtColorMatch(0, 0, 0, adata);
+    light = adata->AwtColorMatch(195, 195, 195, adata);
+    dim   = adata->AwtColorMatch(128, 128, 128, adata);
+
+    grandParent = getGrandParent(parent);
+    target = (grandParent == 0) ? parent : grandParent;
+    XGetWindowAttributes(dpy, target, &xwa);
+    bw = 2; /*xwa.border_width does not have the correct value*/
+
+    /*compare the size difference between parent container
+      and shell widget, the diff should be the border frame
+      and title bar height (?)*/
+
+    XQueryTree( dpy,
+                target,
+                &rootWindow,
+                &containerWindow,
+                &ignoreWindowPtr,
+                &ignoreUnit);
+    XGetWindowAttributes(dpy, containerWindow, &xxwa);
+
+    XTranslateCoordinates(dpy,
+                          target, xwa.root,
+                          0, 0,
+                          &x, &y, &child);
+
+    if (containerWindow == rootWindow) {
+        off_x = 0; off_y = STATUS_MARGIN;
+    } else {
+        XGetWindowAttributes(dpy, containerWindow, &xxwa);
+        off_x = (xxwa.width - xwa.width) / 2;
+        /* off_y = xxwa.height - xwa.height - off_x;*/ /*it's magic:-) */
+        {
+            int cx, cy;
+            XTranslateCoordinates(dpy,
+                                  containerWindow, xxwa.root,
+                                  0, 0,
+                                  &cx, &cy,
+                                  &child);
+            off_y = (xxwa.height + cy) - (xwa.height + y);
+        }
+    }
+
+    /*get the size of root window*/
+    XGetWindowAttributes(dpy, rootWindow, &xxwa);
+
+    XTranslateCoordinates(dpy,
+                          target, xwa.root,
+                          xwa.x, xwa.y,
+                          &x, &y,
+                          &child);
+    xx = x - off_x;
+    yy = y + xwa.height - off_y;
+    if (xx < 0 ){
+        xx = 0;
+    }
+    if (xx + width > xxwa.width) {
+        xx = xxwa.width - width;
+    }
+    if (yy + height > xxwa.height) {
+        yy = xxwa.height - height;
+    }
+
+    if ((DefaultVisual(dpy,screen))->class != adata->awt_visInfo.visual->class &&
+        adata->awt_visInfo.visual->class == TrueColor) {
+        attrib.colormap = XCreateColormap(dpy, xwa.root,
+            adata->awt_visInfo.visual, AllocNone );
+        attrib.border_pixel = BlackPixel(dpy, screen) ;
+        attribmask |= CWColormap | CWBorderPixel;
+    }
+
+    status =  XCreateWindow(dpy,
+                            xwa.root,
+                            xx, yy,
+                            width, height,
+                            0,
+                            xwa.depth,
+                            InputOutput,
+                            adata->awt_visInfo.visual,
+                            attribmask, &attrib);
+    XSelectInput(dpy, status,
+                 ExposureMask | StructureNotifyMask | EnterWindowMask |
+                 LeaveWindowMask | VisibilityChangeMask);
+    if (grandParent != 0){
+        long mask;
+        XGetWindowAttributes(dpy, grandParent, &xwa);
+        mask = xwa.your_event_mask | StructureNotifyMask |
+               VisibilityChangeMask | PropertyChangeMask;
+        XSelectInput(dpy, grandParent,mask);
+    }
+
+    statusWindow = (StatusWindow*) calloc(1, sizeof(StatusWindow));
+    if (statusWindow == NULL){
+        THROW_OUT_OF_MEMORY_ERROR();
+        return NULL;
+    }
+    statusWindow->w = status;
+    statusWindow->fontset = fontset;
+    statusWindow->parent = parent;
+    statusWindow->grandParent = grandParent;
+    statusWindow->on  = False;
+    statusWindow->x = x;
+    statusWindow->y = y;
+    statusWindow->width = xwa.width;
+    statusWindow->height = xwa.height;
+    statusWindow->off_x = off_x;
+    statusWindow->off_y = off_y;
+    statusWindow->bWidth  = bw;
+    statusWindow->statusH = height;
+    statusWindow->statusW = width;
+    statusWindow->peTextW = 0;
+    statusWindow->rootH = xxwa.height;
+    statusWindow->rootW = xxwa.width;
+    statusWindow->lightGC = XCreateGC(dpy, status, valuemask, &values);
+    XSetForeground(dpy, statusWindow->lightGC, light);
+    statusWindow->dimGC = XCreateGC(dpy, status, valuemask, &values);
+    XSetForeground(dpy, statusWindow->dimGC, dim);
+    statusWindow->fgGC = create_gc(status, FALSE);
+    XSetForeground(dpy, statusWindow->fgGC, fg);
+    statusWindow->bgGC = create_gc(status, TRUE);
+    XSetForeground(dpy, statusWindow->bgGC, bg);
+    statusWindow->status_ready = False;
+    wcscpy(statusWindow->status, L"");
+    return statusWindow;
+}
+
+/* This method is to turn off or turn on the status window. */
+static void onoffStatusWindow(X11InputMethodData* pX11IMData,
+                                Window parent,
+                                Bool ON){
+    XWindowAttributes xwa;
+    Window child;
+    int x, y;
+    StatusWindow *statusWindow = NULL;
+
+    if (NULL == pX11IMData ||
+        NULL == (statusWindow =  pX11IMData->statusWindow)){
+        return;
+    }
+
+    if (ON == False) {
+        XUnmapWindow(dpy, statusWindow->w);
+        return;
+    }
+    if (NULL == currentX11InputMethodInstance){
+        return;
+    }
+    {
+        JNIEnv *env = GetJNIEnv();
+        parent = JNU_CallMethodByName(env, NULL, pX11IMData->x11inputmethod,
+                                      "getCurrentParentWindow",
+                                      "()J").j;
+        if ((*env)->ExceptionOccurred(env)) {
+            (*env)->ExceptionDescribe(env);
+            (*env)->ExceptionClear(env);
+        }
+    }
+    if (statusWindow->parent != parent) {
+        statusWindow->parent = parent;
+    }
+    if (st_wcslen(statusWindow->status) > 0 ||
+        (statusWindow->peText != NULL && st_wcslen(statusWindow->peText) > 0 )) {
+        moveStatusWindow(statusWindow);
+        XMapRaised(dpy, statusWindow->w);
+    }
+}
+
+void paintStatusWindow(StatusWindow *statusWindow){
+    Window  win  = statusWindow->w;
+    GC  lightgc = statusWindow->lightGC;
+    GC  dimgc = statusWindow->dimGC;
+    GC  bggc = statusWindow->bgGC;
+    GC  fggc = statusWindow->fgGC;
+
+    int width = statusWindow->statusW;
+    int height = statusWindow->statusH;
+    int bwidth = statusWindow->bWidth;
+    int len;
+    XRectangle logical, ink;
+
+    if (NULL == statusWindow) return;
+    if ((len = st_wcslen(statusWindow->status)) == 0) {
+        return;
+    }
+    XwcTextExtents(statusWindow->fontset, statusWindow->status,
+                   len, &ink, &logical);
+    width = logical.width;
+    height = logical.height;
+
+    XFillRectangle(dpy, win, bggc, 0, 0, width+2, height+2);
+
+    XDrawLine(dpy, win, fggc, 0, 0, width+2, 0);
+    XDrawLine(dpy, win, fggc, 0, height+2, width+2, height+2);
+    XDrawLine(dpy, win, fggc, 0, 0, 0, height+2);
+    XDrawLine(dpy, win, fggc, width+2, 0, width+2, height+2);
+
+    if (statusWindow->fontset) {
+        XwcDrawString(dpy, win, statusWindow->fontset, fggc,
+                      -logical.x + 1, -logical.y + 1,
+                      statusWindow->status,
+                      st_wcslen(statusWindow->status));
+    } else {
+        /*too bad we failed to create a fontset for this locale*/
+        XDrawString(dpy, win, fggc, bwidth + 2, height - bwidth - 4,
+                    "[InputMethod ON]", strlen("[InputMethod ON]"));
+    }
+}
+
+Bool statusWindowEventHandler(XEvent event) {
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData = NULL;
+    StatusWindow *statusWindow;
+
+    if (NULL == currentX11InputMethodInstance ||
+        NULL == (pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance)) ||
+        NULL == (statusWindow = pX11IMData->statusWindow))
+    {
+        return False;
+    }
+
+    if (statusWindow->w == event.xany.window) {
+        switch (event.type) {
+        case Expose:
+            paintStatusWindow(statusWindow);
+            if (statusWindow->peText)
+                draw_preedit(statusWindow);
+            arrange_window_stack(statusWindow);
+            break;
+        case ConfigureNotify:
+        case VisibilityNotify:
+            arrange_window_stack(statusWindow);
+            break;
+        /*
+        case UnmapNotify:
+        case VisibilityNotify:
+            break;
+        */
+        default:
+            break;
+        }
+        return True;
+    } else if ((statusWindow->parent == event.xany.window) ||
+               (statusWindow->grandParent && statusWindow->grandParent == event.xany.window)) {
+        switch (event.type) {
+        case MapNotify:
+            if (statusWindow->on) {
+                onoffStatusWindow(pX11IMData, statusWindow->parent, True);
+            }
+            break;
+        case UnmapNotify:
+            onoffStatusWindow(pX11IMData, 0, False);
+            break;
+        case VisibilityNotify:
+            if (statusWindow->on) {
+                arrange_window_stack(statusWindow);
+            }
+            break;
+        case ConfigureNotify:
+            if (statusWindow->grandParent && statusWindow->on) {
+                moveStatusWindow(statusWindow);
+            }
+        case PropertyNotify:
+            if (statusWindow->on) {
+                arrange_window_stack(statusWindow);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    return False;
+}
+
+static void adjustStatusWindow(Window shell) {
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData = NULL;
+    StatusWindow *statusWindow;
+
+    if (NULL == currentX11InputMethodInstance
+        || NULL == (pX11IMData = getX11InputMethodData(env,currentX11InputMethodInstance))
+        || NULL == (statusWindow = pX11IMData->statusWindow)
+        || !statusWindow->on)
+    {
+        return;
+    }
+
+    moveStatusWindow(statusWindow);
+}
+
+/*
+ * Creates two XICs, one for active clients and the other for passive
+ * clients. All information on those XICs are stored in the
+ * X11InputMethodData given by the pX11IMData parameter.
+ *
+ * For active clients: Try to use preedit callback to support
+ * on-the-spot. If tc is not null, the XIC to be created will
+ * share the Status Area with Motif widgets (TextComponents). If the
+ * preferable styles can't be used, fallback to root-window styles. If
+ * root-window styles failed, fallback to None styles.
+ *
+ * For passive clients: Try to use root-window styles. If failed,
+ * fallback to None styles.
+ */
+static Bool
+createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
+{
+    XVaNestedList preedit = NULL;
+    XVaNestedList status = NULL;
+    XIMStyle on_the_spot_styles = XIMPreeditCallbacks,
+             in_place_styles = 0,
+             active_styles = 0,
+             passive_styles = 0,
+             no_styles = 0;
+    XIMCallback *callbacks;
+    unsigned short i;
+    XIMStyles *im_styles;
+    char *ret = NULL;
+    Bool passiveStatusWindow = False;
+    pX11IMData->statusWindow = NULL;
+
+    if (X11im == NULL) {
+        return False;
+    }
+    if (!w) {
+        return False;
+    }
+
+    if (getenv("IBMJAVA_PASSIVE") == NULL) {
+        passiveStatusWindow = False;
+    } else {
+        passiveStatusWindow = True;
+    }
+
+    if (isNativeIm()) { passiveStatusWindow = True; }
+
+    ret = XGetIMValues(X11im, XNQueryInputStyle, &im_styles, NULL);
+
+    if (ret != NULL) {
+        jio_fprintf(stderr,"XGetIMValues: %s\n",ret);
+        return FALSE ;
+    }
+
+    on_the_spot_styles |= XIMStatusNothing;
+
+    /*kinput does not support XIMPreeditCallbacks and XIMStatusArea
+      at the same time, so use StatusCallback to draw the status
+      ourself
+    */
+    for (i = 0; i < im_styles->count_styles; i++) {
+        if (im_styles->supported_styles[i] == (XIMPreeditCallbacks | XIMStatusCallbacks)) {
+            on_the_spot_styles = (XIMPreeditCallbacks | XIMStatusCallbacks);
+            break;
+        }
+    }
+
+    for (i = 0; i < im_styles->count_styles; i++) {
+        if (im_styles->supported_styles[i] == on_the_spot_styles)
+            active_styles = im_styles->supported_styles[i];
+        if (im_styles->supported_styles[i] == ROOT_WINDOW_STYLES)
+            passive_styles = im_styles->supported_styles[i];
+        if (im_styles->supported_styles[i] == IN_PLACE_STYLES) {
+            in_place_styles = im_styles->supported_styles[i];
+        }
+        if (im_styles->supported_styles[i] == NO_STYLES) {
+            no_styles = im_styles->supported_styles[i];
+        }
+    }
+
+    XFree(im_styles);
+
+    if (active_styles != on_the_spot_styles) {
+        if (passive_styles == ROOT_WINDOW_STYLES)
+            active_styles = passive_styles;
+        else {
+          if (in_place_styles == IN_PLACE_STYLES){
+              active_styles = passive_styles = IN_PLACE_STYLES;
+          } else {
+            if (no_styles == NO_STYLES)
+                active_styles = passive_styles = NO_STYLES;
+            else
+                active_styles = passive_styles = 0;
+          }
+        }
+    } else {
+      if (!passiveStatusWindow) {
+        if (passive_styles != ROOT_WINDOW_STYLES) {
+            if (no_styles == NO_STYLES)
+                active_styles = passive_styles = NO_STYLES;
+            else
+                active_styles = passive_styles = 0;
+        }
+      } else
+          passive_styles = active_styles;
+    }
+
+    if (active_styles == on_the_spot_styles) {
+        callbacks = (XIMCallback *)malloc(sizeof(XIMCallback) * NCALLBACKS);
+        if (callbacks == (XIMCallback *)NULL)
+            return False;
+        pX11IMData->callbacks = callbacks;
+
+        for (i = 0; i < NCALLBACKS; i++, callbacks++) {
+            callbacks->client_data = (XPointer) pX11IMData->x11inputmethod;
+            callbacks->callback = callback_funcs[i];
+        }
+
+        callbacks = pX11IMData->callbacks;
+        preedit = (XVaNestedList)XVaCreateNestedList(0,
+                        XNPreeditStartCallback, &callbacks[PreeditStartIndex],
+                        XNPreeditDoneCallback,  &callbacks[PreeditDoneIndex],
+                        XNPreeditDrawCallback,  &callbacks[PreeditDrawIndex],
+                        XNPreeditCaretCallback, &callbacks[PreeditCaretIndex],
+                        NULL);
+        if (preedit == (XVaNestedList)NULL)
+            goto err;
+        /*always try XIMStatusCallbacks for active client...*/
+        {
+        if (on_the_spot_styles & XIMStatusCallbacks) {
+            status = (XVaNestedList)XVaCreateNestedList(0,
+                        XNStatusStartCallback, &callbacks[StatusStartIndex],
+                        XNStatusDoneCallback,  &callbacks[StatusDoneIndex],
+                        XNStatusDrawCallback, &callbacks[StatusDrawIndex],
+                        NULL);
+
+            if (status == NULL)
+                goto err;
+          }
+            pX11IMData->statusWindow = createStatusWindow(w);
+            pX11IMData->ic_active = XCreateIC(X11im,
+                                              XNClientWindow, w,
+                                              XNFocusWindow, w,
+                                              XNInputStyle, active_styles,
+                                              XNPreeditAttributes, preedit,
+                                              XNStatusAttributes, status,
+                                              NULL);
+            if (NULL != pX11IMData->statusWindow) {
+                pX11IMData->statusWindow->status_ready = True;
+            }
+            XFree((void *)status);
+            XFree((void *)preedit);
+        }
+        if (passiveStatusWindow) {
+            pX11IMData->ic_passive = pX11IMData->ic_active;
+        } else {
+            pX11IMData->ic_passive = XCreateIC(X11im,
+                                               XNClientWindow, w,
+                                               XNFocusWindow, w,
+                                               XNInputStyle, passive_styles,
+                                               NULL);
+        }
+    } else {
+        pX11IMData->ic_active = XCreateIC(X11im,
+                                          XNClientWindow, w,
+                                          XNFocusWindow, w,
+                                          XNInputStyle, active_styles,
+                                          NULL);
+        pX11IMData->ic_passive = pX11IMData->ic_active;
+    }
+
+    // The code set the IC mode that the preedit state is not initialied
+    // at XmbResetIC.  This attribute can be set at XCreateIC.  I separately
+    // set the attribute to avoid the failure of XCreateIC at some platform
+    // which does not support the attribute.
+    if (pX11IMData->ic_active != 0)
+        XSetICValues(pX11IMData->ic_active,
+                        XNResetState, XIMPreserveState, NULL);
+    if (pX11IMData->ic_passive != 0 &&
+        pX11IMData->ic_active != pX11IMData->ic_passive)
+            XSetICValues(pX11IMData->ic_passive,
+             XNResetState, XIMInitialState, NULL);
+
+    pX11IMData->passiveStatusWindow = passiveStatusWindow;
+
+    if (pX11IMData->ic_active == (XIC)0
+        || pX11IMData->ic_passive == (XIC)0) {
+        return False;
+    }
+
+    /* Unset focus to avoid unexpected IM on */
+    setXICFocus(pX11IMData->ic_active, False);
+    if (pX11IMData->ic_active != pX11IMData->ic_passive)
+        setXICFocus(pX11IMData->ic_passive, False);
+
+    return True;
+
+ err:
+    if (preedit)
+        XFree((void *)preedit);
+    THROW_OUT_OF_MEMORY_ERROR();
+    return False;
+}
+
+static int
+PreeditStartCallback(XIC ic, XPointer client_data, XPointer call_data)
+{
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData;
+
+    pX11IMData = getX11InputMethodData(env, (jobject)client_data);
+    if (pX11IMData == NULL || pX11IMData->statusWindow == NULL) {
+        return 0;
+    }
+    resetPassivePreeditText(pX11IMData->statusWindow);
+
+    return -1;  /* unlimited length for preedit text  */
+}
+
+static void
+PreeditDoneCallback(XIC ic, XPointer client_data, XPointer call_data)
+{
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData;
+
+    pX11IMData = getX11InputMethodData(env, (jobject)client_data);
+    if (pX11IMData == NULL) {
+        return;
+    }
+
+    if (!pX11IMData->isActiveClient) {
+        resetPassivePreeditText(pX11IMData->statusWindow);
+        shrink_status(pX11IMData->statusWindow);
+    }
+    else{
+            JNU_CallMethodByName(env, NULL, pX11IMData->x11inputmethod,
+                                 "clearComposedText",
+                                 "(J)V",
+                                 awt_util_nowMillisUTC());
+            if ((*env)->ExceptionOccurred(env)) {
+                (*env)->ExceptionDescribe(env);
+                (*env)->ExceptionClear(env);
+            }
+    }
+}
+
+/*
+ * Translate the preedit draw callback items to Java values and invoke
+ * X11InputMethod.dispatchComposedText().
+ *
+ * client_data: X11InputMethod object
+ */
+static void
+PreeditDrawCallback(XIC ic, XPointer client_data,
+                    XIMPreeditDrawCallbackStruct *pre_draw)
+{
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData = NULL;
+    jmethodID x11imMethodID;
+
+    XIMText *text;
+    jstring javastr = NULL;
+    jintArray style = NULL;
+
+    /* printf("Native: PreeditDrawCallback() \n"); */
+    if (pre_draw == NULL) {
+        return;
+    }
+    AWT_LOCK();
+    if ((pX11IMData = getX11InputMethodData(env, (jobject)client_data)) == NULL) {
+        goto finally;
+    }
+
+    if (!pX11IMData->isActiveClient){
+        if (ic == pX11IMData->ic_passive) {
+            preedit_draw_passive(pX11IMData, pre_draw);
+        }
+        goto finally;
+    }
+
+    if ((text = pre_draw->text) != NULL) {
+        if (is_text_available(text)) {
+            if (text->string.multi_byte != NULL) {
+                if (pre_draw->text->encoding_is_wchar == False) {
+                    javastr = JNU_NewStringPlatform(env, (const char *)text->string.multi_byte);
+                    if (javastr == NULL) {
+                        goto finally;
+                    }
+                } else {
+                    char *mbstr = wcstombsdmp(text->string.wide_char, text->length);
+                    if (mbstr == NULL) {
+                        goto finally;
+                    }
+                    javastr = JNU_NewStringPlatform(env, (const char *)mbstr);
+                    free(mbstr);
+                    if (javastr == NULL) {
+                        goto finally;
+                    }
+                }
+            }
+        }
+        if (text->feedback != NULL) {
+            int cnt;
+            jint *tmpstyle;
+
+            style = (*env)->NewIntArray(env, text->length);
+            if (JNU_IsNull(env, style)) {
+                (*env)->ExceptionClear(env);
+                THROW_OUT_OF_MEMORY_ERROR();
+                goto finally;
+            }
+
+            if (sizeof(XIMFeedback) == sizeof(jint)) {
+                /*
+                 * Optimization to avoid copying the array
+                 */
+                (*env)->SetIntArrayRegion(env, style, 0,
+                                          text->length, (jint *)text->feedback);
+            } else {
+                tmpstyle  = (jint *)malloc(sizeof(jint)*(text->length));
+                if (tmpstyle == (jint *) NULL) {
+                    THROW_OUT_OF_MEMORY_ERROR();
+                    goto finally;
+                }
+                for (cnt = 0; cnt < (int)text->length; cnt++)
+                        tmpstyle[cnt] = text->feedback[cnt];
+                (*env)->SetIntArrayRegion(env, style, 0,
+                                          text->length, (jint *)tmpstyle);
+            }
+        }
+    }
+    JNU_CallMethodByName(env, NULL, pX11IMData->x11inputmethod,
+                         "dispatchComposedText",
+                         "(Ljava/lang/String;[IIIIJ)V",
+                         javastr,
+                         style,
+                         (jint)pre_draw->chg_first,
+                         (jint)pre_draw->chg_length,
+                         (jint)pre_draw->caret,
+                         awt_util_nowMillisUTC());
+
+    if ((*env)->ExceptionOccurred(env)) {
+        (*env)->ExceptionDescribe(env);
+        (*env)->ExceptionClear(env);
+    }
+
+finally:
+    AWT_UNLOCK();
+    return;
+}
+
+static void
+PreeditCaretCallback(XIC ic, XPointer client_data,
+                     XIMPreeditCaretCallbackStruct *pre_caret)
+{
+    XIMPreeditDrawCallbackStruct pre_draw;
+
+    if (pre_caret != NULL && pre_caret->direction == XIMAbsolutePosition) {
+        pre_draw.caret = pre_caret->position;
+        pre_draw.chg_first = 0;
+        pre_draw.chg_length = 0;
+        pre_draw.text = NULL;
+        PreeditDrawCallback(ic, client_data, &pre_draw);
+    }
+}
+
+static void
+StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
+{
+    /*ARGSUSED*/
+    /*printf("StatusStartCallback:\n");  */
+}
+
+static void
+StatusDoneCallback(XIC ic, XPointer client_data, XPointer call_data)
+{
+    /*ARGSUSED*/
+    /*printf("StatusDoneCallback:\n"); */
+}
+
+static void StatusDrawCallback
+  (XIC ic, XPointer client_data, XIMStatusDrawCallbackStruct *status_draw)
+{
+    /*ARGSUSED*/
+    /*printf("StatusDrawCallback:\n"); */
+    JNIEnv *env = GetJNIEnv();
+    X11InputMethodData *pX11IMData = NULL;
+    StatusWindow *statusWindow;
+    int value_make = CWX|CWWidth|CWHeight;
+    XRectangle logical, ink;
+    XWindowChanges xwc;
+    int len;
+
+    AWT_LOCK();
+
+    if (NULL == (pX11IMData = getX11InputMethodData(env, (jobject)client_data))
+        || NULL == (statusWindow = pX11IMData->statusWindow)){
+        goto finally;
+    }
+
+    if (status_draw->type == XIMTextType) {
+        XIMText *text = (status_draw->data).text;
+        if (text != NULL) {
+            if (text->string.multi_byte != NULL) {
+                if(!strcmp(text->string.multi_byte," ")){
+                    wcscpy(statusWindow->status, L"");
+                    onoffStatusWindow(pX11IMData, 0, False);
+                    goto finally;
+                }
+                mbstowcs(statusWindow->status,
+                         (const char *)text->string.multi_byte,
+                         (size_t)MAX_STATUS_LEN);
+            } else {
+                if (0 == st_wcslen(text->string.wide_char)){
+                    wcscpy(statusWindow->status, L"");
+                    onoffStatusWindow(pX11IMData, 0, False);
+                    goto finally;
+                }
+                wcsncpy(statusWindow->status,
+                        text->string.wide_char,
+                        MAX_STATUS_LEN);
+            }
+            XwcTextExtents(statusWindow->fontset, statusWindow->status,
+                           st_wcslen(statusWindow->status), &ink, &logical);
+            statusWindow->statusW = logical.width + BORDER_MARGIN;
+            statusWindow->statusH = logical.height + BORDER_MARGIN;
+            xwc.x = statusWindow->x - statusWindow->off_x;
+            if (xwc.x < 0 ) xwc.x = 0;
+            xwc.width = statusWindow->statusW;
+            xwc.height = statusWindow->statusH;
+            if (xwc.x + xwc.width > statusWindow->rootW){
+                xwc.x = statusWindow->rootW - xwc.width;
+            }
+            XConfigureWindow(dpy, statusWindow->w, value_make, &xwc);
+          if (statusWindow->status_ready && statusWindow->on == True){
+            onoffStatusWindow(pX11IMData, statusWindow->parent, True);
+          }
+            paintStatusWindow(statusWindow);
+            if (statusWindow->peText)
+                draw_preedit(statusWindow);
+        }
+        else {
+            wcscpy(statusWindow->status, L"");
+            /*just turnoff the status window
+            paintStatusWindow(statusWindow);
+            */
+            onoffStatusWindow(pX11IMData, 0, False);
+        }
+    }
+
+ finally:
+    AWT_UNLOCK();
+}
+
+/* return the string length without trailing spaces    */
+/* work around code for Japanese AIXIM is implemented. */
+static int st_wcslen(wchar_t *string)
+{
+    int len = (int32_t)wcslen(string);
+    if (len == 0)
+        return 0;
+   for (len--;len >= 0; len--) {
+        if (!iswspace((wint_t) string[len])) break;
+    }
+    return len+1;
+}
+
+/*
+ * Checks whether given XIMText contains a string data.
+ */
+static Bool is_text_available(XIMText * text)
+{
+    if (text == NULL || text->length==0)
+        return False;
+    if (text->encoding_is_wchar) {
+        if(text->string.wide_char[0] == L'\0')
+            return False;
+    } else {
+        if (text->string.multi_byte[0] == '\0')
+            return False;
+    }
+    return True;
+}
+
+/*
+ * check if preedit status is active
+*/
+static Bool isPreeditStateActive(XIC ic)
+{
+    XIMPreeditState state = XIMPreeditUnKnown;
+    XVaNestedList pr_atrb;
+    char* nosupportAttr;
+
+    if (ic == NULL) return False;
+
+    pr_atrb = XVaCreateNestedList(0,XNPreeditState,&state,NULL);
+    nosupportAttr=XGetICValues(ic,XNPreeditAttributes,pr_atrb,NULL);
+    XFree(pr_atrb);
+    if (nosupportAttr==NULL && state & XIMPreeditDisable)
+        return False;
+    else
+        return True;
+}
+
+static void * buf_insert(void * src, void * insert, int size,
+                         int src_len, int ins_len, int offset)
+{
+    char *temp;
+
+    temp = realloc(src, size*(src_len+ins_len+1));
+    if (temp == NULL) {
+        THROW_OUT_OF_MEMORY_ERROR();
+        return src;
+    }
+    if (offset != src_len) {
+        memmove(&temp[size*(offset+ins_len)],
+                &((char *)temp)[size*offset],
+                size*(src_len-offset));
+    }
+    memcpy(&temp[size*offset], insert, size*ins_len);
+
+    return (void *)temp;
+}
+
+static void * handle_buffer(void * source, void * insert,
+                            int size,int src_len, int ins_len,
+                            int del_len, int offset)
+{
+    void * temp = source;
+
+    if (del_len > 0) {
+        if (del_len == ins_len) {
+            memcpy(&((char *)source)[size*offset], insert, size*ins_len);
+            return source;
+        }
+        else if (src_len > offset+del_len) {
+            memmove(&((char *)source)[size*offset],
+                    &((char *)source)[size*(offset+del_len)],
+                    size*(src_len-offset-del_len));
+        }
+    }
+    if (ins_len > 0) {
+        temp = buf_insert(source, insert, size, src_len,
+                          ins_len, offset);
+    }
+    return temp;
+}
+/*
+ * Display the given preedit text to the root window which is ownd by
+ * myself. All of the character is converted to wide char.
+ * this function is used for the passive client.
+ */
+static void preedit_draw_passive(X11InputMethodData *pX11IMData,
+                    XIMPreeditDrawCallbackStruct *pre_draw)
+{
+    XIMText *text;
+    wchar_t *tempbuf = NULL;
+    StatusWindow *statusWindow;
+    wchar_t *cur_text;
+    unsigned long *cur_attr;
+    int     cur_len = 0;
+    int     chg_len = pre_draw->chg_length;
+    int     chg_1st = pre_draw->chg_first;
+
+    if (NULL == (statusWindow = pX11IMData->statusWindow))
+        return;
+    cur_text = statusWindow->peText;
+    cur_attr = statusWindow->peAttr;
+    if (cur_text == NULL && pre_draw->text == NULL)
+        return;
+
+    if (cur_text != NULL)
+        cur_len = (int32_t)wcslen(cur_text);
+    text = pre_draw->text;
+    if (text == NULL) {
+        /* delete only */
+        if (cur_len >  chg_1st+chg_len) {
+            memmove(&cur_text[chg_1st],
+                    &cur_text[chg_1st+chg_len],
+                    sizeof(wchar_t)*(cur_len-chg_1st-chg_len));
+            memmove(&cur_attr[chg_1st],
+                    &cur_attr[chg_1st+chg_len],
+                    sizeof(long)*(cur_len-chg_1st-chg_len));
+        }
+        if ((pre_draw->chg_length <= cur_len ) && (pre_draw->chg_length >0))
+            cur_text[cur_len-pre_draw->chg_length] =L'\0';
+    } else {
+        /* insert or replace */
+        int     ins_len = 0;
+        void *  ins_text = NULL;
+
+        /* if invalid offset is specified, do nothing. */
+        /* this fix is for aixim for eucTW             */
+        if (cur_len < chg_1st)
+            return;
+        if(is_text_available(text)) {
+            /* insert or replace the text */
+            if (text->encoding_is_wchar == False) {
+                /* convert the text to wide chars.
+                   allocate enough size buffer
+                */
+                tempbuf = (wchar_t *)malloc(sizeof(wchar_t)*(text->length+1));
+                if (tempbuf == NULL) {
+                    THROW_OUT_OF_MEMORY_ERROR();
+                    return;
+                }
+                ins_len = (int32_t)mbstowcs(tempbuf, text->string.multi_byte,
+                                   text->length);
+                if (ins_len == -1) {
+                        free(tempbuf);
+                        return;
+                }
+                ins_text = (void *)tempbuf;
+            }
+            else {
+                ins_len = text->length;
+                ins_text = text->string.wide_char;
+            }
+            /* finish prepare the data to be inserted */
+
+            statusWindow->peText =
+                    handle_buffer(cur_text, ins_text, sizeof(wchar_t),
+                                  cur_len, ins_len, chg_len, chg_1st);
+            statusWindow->peAttr =
+                    handle_buffer(cur_attr, text->feedback, sizeof(long),
+                                  cur_len, ins_len, chg_len, chg_1st);
+            statusWindow->peText[cur_len-chg_len+ins_len] =L'\0';
+
+            if (tempbuf != NULL)
+                free(tempbuf);
+        } /* endof insert or replace text */
+        else {
+            /* change attribute only */
+            memcpy(&cur_attr[chg_1st], text->feedback,
+                    sizeof(long)*text->length);
+        }
+    }
+    statusWindow->peCaret= pre_draw->caret;
+    draw_preedit(statusWindow);
+    if (statusWindow->on && wcslen(statusWindow->peText) > 0)
+        onoffStatusWindow(pX11IMData, statusWindow->parent, True);
+    else if (wcslen(statusWindow->status) == 0)
+        onoffStatusWindow(pX11IMData, 0, False);
+}
+
+/*
+ * reset predit test of passive mode
+ */
+static void
+resetPassivePreeditText(StatusWindow *statusWindow)
+{
+    if (NULL == statusWindow) return;
+    if(statusWindow->peText != NULL) {
+        free(statusWindow->peText);
+        statusWindow->peText = NULL;
+    }
+    if(statusWindow->peAttr != NULL) {
+        free(statusWindow->peAttr);
+        statusWindow->peAttr = NULL;
+    }
+    statusWindow->peCaret= 0;
+}
+
+static void draw_caret(StatusWindow *statusWindow, GC gc, int pos)
+{
+    if (NULL == statusWindow) return;
+    XSetFunction(dpy, gc, GXinvert);
+    XDrawLine(dpy, statusWindow->w,
+              gc, pos, STATUS_BORDER/2,
+              pos, STATUS_BORDER/2+statusWindow->fOff);
+    XSetFunction(dpy, gc, GXcopy);
+}
+
+static int  get_next_attr(int len, unsigned long *attr)
+{
+    int count;
+
+    for (count = 1; count < len; count++)  {
+        if ((attr[count-1] & PREEDIT_ATTR_MASK)
+            != (attr[count] & PREEDIT_ATTR_MASK))
+            break;
+    }
+    return count;
+}
+
+static void draw_preedit(StatusWindow *statusWindow)
+{
+    unsigned long *attr;
+    int x_pos,x_caret;
+    unsigned int  len;
+    int len_disp, pos;
+    wchar_t *str;
+    GC  gc;
+    XRectangle ink, rect, rect_c;
+    Bool caret_done = False;
+
+    if (NULL == statusWindow) return;
+    align_status(statusWindow);
+    XFillRectangle(dpy, statusWindow->w,
+                   statusWindow->bgGC,
+                   statusWindow->statusW,0,
+                   statusWindow->statusW + statusWindow->peTextW + BORDER_MARGIN,
+                   statusWindow->fBot+2);
+
+
+    XDrawLine(dpy, statusWindow->w, statusWindow->fgGC,
+              statusWindow->statusW, 0,
+              statusWindow->statusW + statusWindow->peTextW + BORDER_MARGIN, 0);
+    XDrawLine(dpy, statusWindow->w, statusWindow->fgGC,
+              statusWindow->statusW, statusWindow->fBot+2,
+              statusWindow->statusW + statusWindow->peTextW + BORDER_MARGIN,
+              statusWindow->fBot+2);
+    XDrawLine(dpy, statusWindow->w, statusWindow->fgGC,
+              statusWindow->statusW + statusWindow->peTextW + BORDER_MARGIN, 0,
+              statusWindow->statusW + statusWindow->peTextW + BORDER_MARGIN,
+              statusWindow->fBot+2);
+    if (0 == statusWindow->statusW)
+        XDrawLine(dpy, statusWindow->w, statusWindow->fgGC,
+                  0, 0, 0, statusWindow->fBot+2);
+
+    str =  statusWindow->peText;
+
+    if (str != NULL &&  (len = (int32_t)wcslen(str)) != 0) {
+        pos = 0;
+        attr = statusWindow->peAttr;
+        x_pos = x_caret = statusWindow->statusW + STATUS_BORDER;
+        while((int)len-1 >= pos) {
+            len_disp = get_next_attr(len - pos, &attr[pos]);
+            if (attr[pos] & XIMReverse) {
+                gc = statusWindow->bgGC;
+            }
+            else {
+                gc = statusWindow->fgGC;
+            }
+            XwcTextExtents(statusWindow->fontset,
+                           &str[pos],
+                           len_disp, &ink, &rect);
+            XwcDrawImageString(dpy, statusWindow->w,
+                               statusWindow->fontset, gc,
+                               x_pos, statusWindow->fOff+1, &str[pos], len_disp);
+            if (attr[pos] & XIMUnderline) {
+                XDrawLine(dpy, statusWindow->w,
+                          gc, x_pos, statusWindow->fBot,
+                          x_pos+rect.width, statusWindow->fBot);
+            }
+            if (!caret_done) {
+                if( statusWindow->peCaret >= pos &&
+                    statusWindow->peCaret <= pos+len_disp) {
+                    if (statusWindow->peCaret == 0)
+                        x_caret = x_pos;
+                    else if (statusWindow->peCaret == pos+len_disp)
+                        x_caret = x_pos+rect.width;
+                    else {
+                        XwcTextExtents(statusWindow->fontset,
+                                        &str[pos],
+                                        statusWindow->peCaret-pos,
+                                        &ink, &rect_c);
+                        x_caret = x_pos+ rect_c.width;
+                    }
+                    x_caret-=CARET_OFFSET;
+                    caret_done = True;
+                }
+            }
+            pos += len_disp;
+            x_pos += rect.width;
+        }
+        if (caret_done)
+            draw_caret(statusWindow, statusWindow->fgGC, x_caret);
+    }
+}
+
+/* calc required status window size and resize the window */
+static void align_status(StatusWindow *statusWindow)
+{
+    int len_st, len_pe = 0;
+    XRectangle rect_st, rect_pe, ink;
+    Dimension cur_w;
+    int value_make = CWX|CWWidth|CWHeight;
+    XWindowChanges xwc;
+
+    if (NULL == statusWindow) return;
+    if ((len_st = st_wcslen(statusWindow->status)) == 0
+        && (statusWindow->peText == NULL || st_wcslen(statusWindow->peText) == 0 ))
+        return;
+
+    rect_pe.x = rect_pe.y = rect_pe.width = rect_pe.height = 0;
+
+    XwcTextExtents(statusWindow->fontset,
+                   statusWindow->status,
+                   len_st, &ink, &rect_st);
+    if (statusWindow->peText != NULL
+        && (len_pe = (int32_t)wcslen(statusWindow->peText)) > 0) {
+        XwcTextExtents(statusWindow->fontset,
+                       statusWindow->peText,
+                       len_pe, &ink, &rect_pe);
+    }
+    statusWindow->fOff = max(-rect_st.y, -rect_pe.y);
+    statusWindow->fBot = max(rect_st.height, rect_pe.height);
+    statusWindow->statusW =rect_st.width;
+    if (rect_st.width > 0) statusWindow->statusW += BORDER_MARGIN;
+    statusWindow->peTextW = rect_pe.width;
+
+    xwc.x = statusWindow->x - statusWindow->off_x;
+    if (xwc.x < 0 ) xwc.x = 0;
+
+    if (len_pe > 0) {
+        xwc.width = statusWindow->statusW
+                    + statusWindow->peTextW + BORDER_MARGIN + 1;
+        xwc.height = statusWindow->fBot + BORDER_MARGIN;
+    } else {
+        xwc.width = statusWindow->statusW;
+        xwc.height = statusWindow->fBot + BORDER_MARGIN;
+    }
+    if (xwc.x + xwc.width > statusWindow->rootW){
+      xwc.x = statusWindow->rootW - xwc.width;
+    }
+    XConfigureWindow(dpy, statusWindow->w, value_make, &xwc);
+}
+
+static void shrink_status(StatusWindow *statusWindow)
+{
+    int value_make = CWX|CWWidth|CWHeight;
+    XWindowChanges xwc;
+
+    if (NULL == statusWindow) return;
+    xwc.width  = statusWindow->statusW;
+    xwc.height = statusWindow->statusH;
+    statusWindow->peTextW = 0;
+    xwc.x = statusWindow->x - statusWindow->off_x;
+    if (xwc.x < 0 ) xwc.x = 0;
+    if (xwc.x + xwc.width > statusWindow->rootW){
+      xwc.x = statusWindow->rootW - xwc.width;
+    }
+    XConfigureWindow(dpy, statusWindow->w, value_make, &xwc);
+}
+
+static GC create_gc(Window win, Bool isReverse)
+{
+    XGCValues xgcv;
+    unsigned long mask;
+    AwtScreenDataPtr defaultScreen;
+
+    defaultScreen = getScreenData(DefaultScreen(dpy));
+
+    mask = (GCForeground | GCBackground );
+    if (isReverse) {
+        xgcv.foreground = defaultScreen->whitepixel;
+        xgcv.background = defaultScreen->blackpixel;
+    } else {
+        xgcv.foreground = defaultScreen->blackpixel;
+        xgcv.background = defaultScreen->whitepixel;
+    }
+    return XCreateGC(dpy, win, mask, &xgcv);
+}
+
+static Bool isNativeIm()
+{
+#define XIMMODIFIER          "@im="
+#define XIM_SERVER_CATEGORY  "@server="
+    char *immodifiers;
+    char *imserver, *imserverPtr;
+    Atom imserverAtom;
+
+    if (!(immodifiers = getenv("XMODIFIERS"))) return True;
+    if (!(imserver = calloc(1,strlen(immodifiers)+strlen(XIM_SERVER_CATEGORY)+1))) return True;
+    if (!(immodifiers = strstr(immodifiers,XIMMODIFIER))) return True;
+    immodifiers += strlen(XIMMODIFIER);
+    strcpy(imserver,XIM_SERVER_CATEGORY);
+    imserverPtr = imserver + strlen(imserver);
+    while(*immodifiers != '@' && *immodifiers != '\0') {
+        *imserverPtr = *immodifiers;
+        imserverPtr++;
+        immodifiers++;
+    }
+    imserverAtom = XInternAtom(awt_display, imserver, True);
+    free(imserver);
+    if (imserverAtom > 0)
+        return False;
+    else
+        return True;
+}
+
+static Window getGrandParent(Window parent)
+{
+    Window containerWindow,rootWindow,tmp;
+    Window *ignoreWindowPtr;
+    unsigned int ignoreUnit;
+    Window grandParent=0;
+    XWindowAttributes xwa;
+    Atom WM_STATE;
+    Atom type = None;
+    int32_t format;
+    unsigned long nitems, after;
+    unsigned char * data;
+
+    if (parent == 0) return grandParent;
+    WM_STATE = XInternAtom(dpy, "WM_STATE", True);
+    if (WM_STATE == None) return grandParent;
+
+    tmp=parent;
+    while(XQueryTree(dpy, tmp,
+                     &rootWindow, &containerWindow,
+                     &ignoreWindowPtr, &ignoreUnit)){
+        XFree(ignoreWindowPtr);
+        if (containerWindow == rootWindow) break;
+        if (XGetWindowProperty(dpy, containerWindow, WM_STATE,
+                    0, 0, False, AnyPropertyType,
+                    &type, &format, &nitems, &after, &data) == Success) {
+            XFree(data);
+            if (type) {
+                XGetWindowAttributes(dpy, containerWindow, &xwa);
+                if (FALSE == xwa.override_redirect){
+                    grandParent=containerWindow;
+                }
+            }
+        }
+        tmp=containerWindow;
+    }
+    return grandParent;
+}
+
+static void moveStatusWindow(StatusWindow *statusWindow)
+{
+    XWindowAttributes xwa;
+    Window child;
+    int x, y, width;
+    Window target;
+
+    if (NULL == statusWindow) return;
+    if (statusWindow->grandParent) {
+        target = statusWindow->grandParent;
+    } else {
+        target = statusWindow->parent;
+    }
+    XGetWindowAttributes(dpy, target, &xwa);
+    XTranslateCoordinates(dpy,
+                          target, xwa.root,
+                          0, 0,
+                          &x, &y,
+                          &child);
+    if (statusWindow->x != x
+        || statusWindow->y != y
+        || statusWindow->width != xwa.width
+        || statusWindow->height != xwa.height){
+        statusWindow->x = x;
+        statusWindow->y = y;
+        statusWindow->height = xwa.height;
+        statusWindow->width = xwa.width;
+        x = statusWindow->x - statusWindow->off_x;
+        y = statusWindow->y + statusWindow->height + statusWindow->off_y;
+        if (x < 0 ){
+            x = 0;
+        }
+        if (statusWindow->peTextW > 0) {
+            width = statusWindow->statusW + statusWindow->peTextW + BORDER_MARGIN + 1;
+            if (x + width > statusWindow->rootW){
+                x = statusWindow->rootW - width;
+            }
+        } else {
+            if (x + statusWindow->statusW > statusWindow->rootW){
+                x = statusWindow->rootW - statusWindow->statusW;
+            }
+        }
+        if (y + statusWindow->statusH > statusWindow->rootH){
+            y = statusWindow->rootH - statusWindow->statusH;
+        }
+        XMoveWindow(dpy, statusWindow->w, x, y);
+    }
+}
+
+static void arrange_window_stack(StatusWindow* statusWindow)
+{
+    XWindowChanges xwc;
+    int value_make = CWSibling|CWStackMode;
+    Window root, parent, *children;
+    unsigned int nchildren;
+
+    if (NULL == statusWindow) return;
+    if (XQueryTree(dpy, statusWindow->parent,
+                       &root, &parent, &children, &nchildren)){
+        XFree(children);
+        xwc.sibling = parent;
+        while(XQueryTree(dpy, xwc.sibling, &root, &parent, &children, &nchildren)) {
+            XFree(children);
+            if (root != parent) {
+                xwc.sibling = parent;
+            } else {
+                break;
+            }
+        }
+        xwc.stack_mode = Above;
+        XConfigureWindow(dpy, statusWindow->w, value_make, &xwc);
+    }
+}
+
+static int count_missing_fonts(char **charset_list, int charset_count)
+{
+    int i,j;
+    if (charset_count > 0) {
+        j=charset_count;
+        for(i=0; i < charset_count; i++) {
+            if ((strstr(charset_list[i], "IBM-udc")) ||
+                (strstr(charset_list[i], "IBM-sbd")) ||
+                (strstr(charset_list[i], "IBM-ucdTW")))
+                j--;
+        }
+        return j;
+    }
+    else
+        return 0;
+}
+
+static XFontSet create_fontset_name(char * font_name, Bool force)
+{
+    XFontSet fontset = NULL;
+    char **charset_list;
+    int charset_count;
+    char *def_string;
+    int missing_fonts;
+
+    fontset = XCreateFontSet(dpy, font_name,
+                &charset_list, &charset_count, &def_string);
+    if (charset_count > 0) {
+        missing_fonts = count_missing_fonts(charset_list,
+                                            charset_count);
+        XFreeStringList(charset_list);
+        if (fontset && (missing_fonts > 0)) {
+            if (!force) {
+                XFreeFontSet(dpy, fontset);
+                fontset = NULL;
+            }
+        }
+    }
+    return fontset;
+}
+
+static XFontSet create_fontset()
+{
+    XFontSet fontset = NULL;
+    int i;
+    static char * fontlist[] = {
+        "-dt-interface user-medium-r-normal-S*-*-*-*-*-*-*-*-*",
+        "-*-*-medium-r-normal-*-14-*-*-*-c-*-*-*",
+        "-*-*-medium-r-normal-*-14-*-*-*-m-*-*-*",
+        "-*-*-medium-r-normal--14-0-0-0-m-*-*-*",
+        "-monotype-sansmonowt-medium-r-normal--14-*-*-*-m-*-*-*",
+        "-*--14-*",
+        "-dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*",
+        "-*--16-*",
+        "-*--17-*",
+        "-*--18-*",
+        "-*--19-*",
+        "-*--20-*",
+        "-*--24-*",
+        NULL};
+
+    for (i=0; fontlist[i] != NULL && fontset==NULL; i++)
+        fontset = create_fontset_name(fontlist[i], False);
+
+    if (!fontset)
+        fprintf(stdout, "Cannot load fonts for IMF.\n");
+    return  fontset;
+}
+
+static Window get_current_focus(XIC ic) {
+    Window w = 0;
+    if (ic != NULL)
+        XGetICValues(ic, XNFocusWindow, &w, NULL);
+    return w;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_sun_awt_X11_XInputMethod_openXIMNative(JNIEnv *env,
+                                            jobject this,
+                                            jlong display)
+{
+    Bool registered;
+
+    AWT_LOCK();
+
+    dpy = (Display *)jlong_to_ptr(display);
+
+    if (X11im == NULL) {
+        X11im = XOpenIM(dpy, NULL, NULL, NULL);
+    }
+
+    AWT_UNLOCK();
+
+    return JNI_TRUE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_sun_awt_X11_XInputMethod_createXICNative(JNIEnv *env,
+                                              jobject this,
+                                              jlong window)
+{
+    X11InputMethodData *pX11IMData;
+    jobject globalRef;
+    XIC ic;
+
+    AWT_LOCK();
+
+    if (!window) {
+        JNU_ThrowNullPointerException(env, "NullPointerException");
+        AWT_UNLOCK();
+        return JNI_FALSE;
+    }
+
+    pX11IMData = (X11InputMethodData *) calloc(1, sizeof(X11InputMethodData));
+    if (pX11IMData == NULL) {
+        THROW_OUT_OF_MEMORY_ERROR();
+        AWT_UNLOCK();
+        return JNI_FALSE;
+    }
+
+    globalRef = (*env)->NewGlobalRef(env, this);
+    pX11IMData->x11inputmethod = globalRef;
+    pX11IMData->statusWindow = NULL;
+
+    setX11InputMethodData(env, this, pX11IMData);
+
+    if (createXIC(env, pX11IMData, (Window)window) == False) {
+        destroyX11InputMethodData((JNIEnv *) NULL, pX11IMData);
+        pX11IMData = (X11InputMethodData *) NULL;
+        setX11InputMethodData(env, this, pX11IMData);
+        if ((*env)->ExceptionCheck(env)) {
+            goto finally;
+        }
+    }
+
+finally:
+    AWT_UNLOCK();
+    return (pX11IMData != NULL);
+}
+
+JNIEXPORT void JNICALL
+Java_sun_awt_X11_XInputMethod_setXICFocusNative(JNIEnv *env,
+                                                jobject this,
+                                                jlong w,
+                                                jboolean req,
+                                                jboolean active)
+{
+    X11InputMethodData *pX11IMData;
+    AWT_LOCK();
+    pX11IMData = getX11InputMethodData(env, this);
+    if (pX11IMData == NULL) {
+        AWT_UNLOCK();
+        return;
+    }
+
+    if (req) {
+        if (!w) {
+            AWT_UNLOCK();
+            return;
+        }
+        pX11IMData->isActiveClient = active;
+        pX11IMData->current_ic = active ?
+                        pX11IMData->ic_active : pX11IMData->ic_passive;
+        /*
+         * On Solaris2.6, setXICWindowFocus() has to be invoked
+         * before setting focus.
+         */
+        get_current_focus(pX11IMData->current_ic); /* workaround for kinput2 and SCIM */
+        if (currentFocusWindow != w) {
+            setXICWindowFocus(pX11IMData->current_ic, w);
+            setXICFocus(pX11IMData->current_ic, req);
+            currentX11InputMethodInstance = pX11IMData->x11inputmethod;
+            currentFocusWindow =  w;
+        } else {
+            setXICFocus(pX11IMData->current_ic, req);
+        }
+        if ((active || pX11IMData->passiveStatusWindow)
+            && (pX11IMData->statusWindow && pX11IMData->statusWindow->on))
+            onoffStatusWindow(pX11IMData, w, True);
+    } else {
+        currentX11InputMethodInstance = NULL;
+        currentFocusWindow = 0;
+        onoffStatusWindow(pX11IMData, 0, False);
+        if (pX11IMData->current_ic != NULL)
+        setXICFocus(pX11IMData->current_ic, req);
+
+        pX11IMData->current_ic = (XIC)0;
+    }
+
+    XFlush(dpy);
+    AWT_UNLOCK();
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    initIDs
+ * Signature: ()V
+ * This function gets called from the static initializer for
+ * X11InputMethod.java to initialize the fieldIDs for fields
+ * that may be accessed from C
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethodBase_initIDs
+  (JNIEnv *env, jclass cls)
+{
+    x11InputMethodIDs.pData = (*env)->GetFieldID(env, cls, "pData", "J");
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    turnoffStatusWindow
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethodBase_turnoffStatusWindow
+  (JNIEnv *env, jobject this)
+{
+    X11InputMethodData *pX11IMData;
+    StatusWindow *statusWindow;
+
+    AWT_LOCK();
+
+    if (NULL == currentX11InputMethodInstance
+        || NULL == (pX11IMData = getX11InputMethodData(env,currentX11InputMethodInstance))
+        || NULL == (statusWindow = pX11IMData->statusWindow)
+        || !statusWindow->on ){
+        AWT_UNLOCK();
+        return;
+    }
+    onoffStatusWindow(pX11IMData, 0, False);
+    statusWindow->on = False;
+
+    AWT_UNLOCK();
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    disposeXIC
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethodBase_disposeXIC
+  (JNIEnv *env, jobject this)
+{
+    X11InputMethodData *pX11IMData = NULL;
+
+    AWT_LOCK();
+    pX11IMData = getX11InputMethodData(env, this);
+    if (pX11IMData == NULL) {
+        AWT_UNLOCK();
+        return;
+    }
+
+    setX11InputMethodData(env, this, NULL);
+
+    if (pX11IMData->x11inputmethod == currentX11InputMethodInstance) {
+        currentX11InputMethodInstance = NULL;
+        currentFocusWindow = 0;
+    }
+    destroyX11InputMethodData(env, pX11IMData);
+    AWT_UNLOCK();
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    resetXIC
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_sun_awt_X11InputMethodBase_resetXIC
+  (JNIEnv *env, jobject this)
+{
+    X11InputMethodData *pX11IMData;
+    char *xText = NULL;
+    jstring jText = (jstring)0;
+
+    AWT_LOCK();
+    pX11IMData = getX11InputMethodData(env, this);
+    if (pX11IMData == NULL) {
+        AWT_UNLOCK();
+        return jText;
+    }
+
+    if (pX11IMData->current_ic) {
+        if (!isPreeditStateActive(pX11IMData->current_ic)) {
+            xText = NULL;
+        } else {
+            if (!(pX11IMData->forceReset))
+                setXICFocus(pX11IMData->current_ic, FALSE);
+            xText = XmbResetIC(pX11IMData->current_ic);
+            if (!(pX11IMData->forceReset))
+                setXICFocus(pX11IMData->current_ic, TRUE);
+        }
+    } else {
+        /*
+         * If there is no reference to the current XIC, try to reset both XICs.
+         */
+        if (!isPreeditStateActive(pX11IMData->ic_active))
+            xText = NULL;
+        else
+        xText = XmbResetIC(pX11IMData->ic_active);
+        /*it may also means that the real client component does
+          not have focus -- has been deactivated... its xic should
+          not have the focus, bug#4284651 showes reset XIC for htt
+          may bring the focus back, so de-focus it again.
+        */
+        setXICFocus(pX11IMData->ic_active, FALSE);
+        if (pX11IMData->ic_active != pX11IMData->ic_passive) {
+            char *tmpText;
+            if (!isPreeditStateActive(pX11IMData->ic_passive))
+                tmpText = NULL;
+            else
+                tmpText = XmbResetIC(pX11IMData->ic_passive);
+            setXICFocus(pX11IMData->ic_passive, FALSE);
+            if (xText == (char *)NULL && tmpText)
+                xText = tmpText;
+        }
+    }
+    if (xText != NULL) {
+        jText = JNU_NewStringPlatform(env, (const char *)xText);
+        XFree((void *)xText);
+    }
+
+    /* workaround
+     * Some IME do not call PreeditDoneCallback routine even
+     * when XmbResetIC is called. I force to reset the preedit string.
+     */
+    if (!pX11IMData->isActiveClient) {
+        resetPassivePreeditText(pX11IMData->statusWindow);
+        shrink_status(pX11IMData->statusWindow);
+    } else {
+        JNU_CallMethodByName(env, NULL, pX11IMData->x11inputmethod,
+                             "clearComposedText",
+                             "()V");
+        if ((*env)->ExceptionOccurred(env)) {
+            (*env)->ExceptionDescribe(env);
+            (*env)->ExceptionClear(env);
+        }
+    }
+
+    AWT_UNLOCK();
+    return jText;
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    setCompositionEnabledNative
+ * Signature: (Z)Z
+ *
+ * This method tries to set the XNPreeditState attribute associated with the current
+ * XIC to the passed in 'enable' state.
+ *
+ * Return JNI_TRUE if XNPreeditState attribute is successfully changed to the
+ * 'enable' state; Otherwise, if XSetICValues fails to set this attribute,
+ * java.lang.UnsupportedOperationException will be thrown. JNI_FALSE is returned if this
+ * method fails due to other reasons.
+ */
+JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_setCompositionEnabledNative
+  (JNIEnv *env, jobject this, jboolean enable)
+{
+    X11InputMethodData *pX11IMData;
+    char * ret = NULL;
+    XVaNestedList pr_atrb;
+
+    AWT_LOCK();
+    pX11IMData = getX11InputMethodData(env, this);
+
+    if ((pX11IMData == NULL) || (pX11IMData->current_ic == NULL)) {
+        AWT_UNLOCK();
+        return JNI_FALSE;
+    }
+
+    pr_atrb = XVaCreateNestedList(0, XNPreeditState,
+                  (enable ? XIMPreeditEnable : XIMPreeditDisable), NULL);
+    ret = XSetICValues(pX11IMData->current_ic, XNPreeditAttributes, pr_atrb, NULL);
+    XFree((void *)pr_atrb);
+    AWT_UNLOCK();
+
+    if ((ret != 0) &&
+        ((strcmp(ret, XNPreeditAttributes) == 0)
+         || (strcmp(ret, XNPreeditState) == 0))) {
+        JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", "");
+    }
+
+    return (jboolean)(ret == 0);
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    isCompositionEnabledNative
+ * Signature: ()Z
+ *
+ * This method tries to get the XNPreeditState attribute associated with the current XIC.
+ *
+ * Return JNI_TRUE if the XNPreeditState is successfully retrieved. Otherwise, if
+ * XGetICValues fails to get this attribute, java.lang.UnsupportedOperationException
+ * will be thrown. JNI_FALSE is returned if this method fails due to other reasons.
+ */
+JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_isCompositionEnabledNative
+  (JNIEnv *env, jobject this)
+{
+    X11InputMethodData *pX11IMData = NULL;
+    char * ret = NULL;
+    XIMPreeditState state = XIMPreeditUnKnown;
+    XVaNestedList   pr_atrb;
+
+    AWT_LOCK();
+    pX11IMData = getX11InputMethodData(env, this);
+
+    if ((pX11IMData == NULL) || (pX11IMData->current_ic == NULL)) {
+        AWT_UNLOCK();
+        return JNI_FALSE;
+    }
+
+    pr_atrb = XVaCreateNestedList(0, XNPreeditState, &state, NULL);
+    ret = XGetICValues(pX11IMData->current_ic, XNPreeditAttributes, pr_atrb, NULL);
+    XFree((void *)pr_atrb);
+    AWT_UNLOCK();
+
+    if ((ret != 0) &&
+        ((strcmp(ret, XNPreeditAttributes) == 0)
+         || (strcmp(ret, XNPreeditState) == 0))) {
+        JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", "");
+        return JNI_FALSE;
+    }
+
+    return (jboolean)(state == XIMPreeditEnable);
+}
+
+JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow
+  (JNIEnv *env, jobject this, jlong window)
+{
+
+}
+
+/*
+ * Class:     sun_awt_X11InputMethod
+ * Method:    setStatusAreaVisible
+ * Signature: (ZJ)V
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethod_setStatusAreaVisible
+  (JNIEnv *env, jobject this, jboolean value, jlong data)
+{
+    X11InputMethodData *pX11IMData;
+
+    pX11IMData = getX11InputMethodData(env, this);
+    if (NULL == pX11IMData) return;
+    if (NULL == pX11IMData->statusWindow) return;
+
+    if ((int)value){
+        pX11IMData->statusWindow->on = True;
+    }else{
+        pX11IMData->statusWindow->on = False;
+    }
+    return;
+}
diff --git a/src/java.desktop/linux/conf/oblique-fonts/fonts.dir b/src/java.desktop/linux/conf/oblique-fonts/fonts.dir
deleted file mode 100644
index 4346c9ec543..00000000000
--- a/src/java.desktop/linux/conf/oblique-fonts/fonts.dir
+++ /dev/null
@@ -1,25 +0,0 @@
-24
-LucidaSansOblique.ttf -b&h-lucidasans-medium-i-normal-sans-0-0-0-0-p-0-iso8859-1
-LucidaSansDemiOblique.ttf -b&h-lucidasans-bold-i-normal-sans-0-0-0-0-p-0-iso8859-1
-LucidaTypewriterOblique.ttf -b&h-lucidatypewriter-medium-i-normal-sans-0-0-0-0-m-0-iso8859-1
-LucidaTypewriterBoldOblique.ttf -b&h-lucidatypewriter-bold-i-normal-sans-0-0-0-0-m-0-iso8859-1
-LucidaSansOblique.ttf -b&h-lucidasans-medium-i-normal-sans-0-0-0-0-p-0-iso8859-2
-LucidaSansDemiOblique.ttf -b&h-lucidasans-bold-i-normal-sans-0-0-0-0-p-0-iso8859-2
-LucidaTypewriterOblique.ttf -b&h-lucidatypewriter-medium-i-normal-sans-0-0-0-0-m-0-iso8859-2
-LucidaTypewriterBoldOblique.ttf -b&h-lucidatypewriter-bold-i-normal-sans-0-0-0-0-m-0-iso8859-2
-LucidaSansOblique.ttf -b&h-lucidasans-medium-i-normal-sans-0-0-0-0-p-0-iso8859-4
-LucidaSansDemiOblique.ttf -b&h-lucidasans-bold-i-normal-sans-0-0-0-0-p-0-iso8859-4
-LucidaTypewriterOblique.ttf -b&h-lucidatypewriter-medium-i-normal-sans-0-0-0-0-m-0-iso8859-4
-LucidaTypewriterBoldOblique.ttf -b&h-lucidatypewriter-bold-i-normal-sans-0-0-0-0-m-0-iso8859-4
-LucidaSansOblique.ttf -b&h-lucidasans-medium-i-normal-sans-0-0-0-0-p-0-iso8859-5
-LucidaSansDemiOblique.ttf -b&h-lucidasans-bold-i-normal-sans-0-0-0-0-p-0-iso8859-5
-LucidaTypewriterOblique.ttf -b&h-lucidatypewriter-medium-i-normal-sans-0-0-0-0-m-0-iso8859-5
-LucidaTypewriterBoldOblique.ttf -b&h-lucidatypewriter-bold-i-normal-sans-0-0-0-0-m-0-iso8859-5
-LucidaSansOblique.ttf -b&h-lucidasans-medium-i-normal-sans-0-0-0-0-p-0-iso8859-7
-LucidaSansDemiOblique.ttf -b&h-lucidasans-bold-i-normal-sans-0-0-0-0-p-0-iso8859-7
-LucidaTypewriterOblique.ttf -b&h-lucidatypewriter-medium-i-normal-sans-0-0-0-0-m-0-iso8859-7
-LucidaTypewriterBoldOblique.ttf -b&h-lucidatypewriter-bold-i-normal-sans-0-0-0-0-m-0-iso8859-7
-LucidaSansOblique.ttf -b&h-lucidasans-medium-i-normal-sans-0-0-0-0-p-0-iso8859-9
-LucidaSansDemiOblique.ttf -b&h-lucidasans-bold-i-normal-sans-0-0-0-0-p-0-iso8859-9
-LucidaTypewriterOblique.ttf -b&h-lucidatypewriter-medium-i-normal-sans-0-0-0-0-m-0-iso8859-9
-LucidaTypewriterBoldOblique.ttf -b&h-lucidatypewriter-bold-i-normal-sans-0-0-0-0-m-0-iso8859-9
diff --git a/src/java.desktop/macosx/classes/sun/font/CFont.java b/src/java.desktop/macosx/classes/sun/font/CFont.java
index 15abdda711d..939466f7754 100644
--- a/src/java.desktop/macosx/classes/sun/font/CFont.java
+++ b/src/java.desktop/macosx/classes/sun/font/CFont.java
@@ -211,10 +211,8 @@ public final class CFont extends PhysicalFont implements FontSubstitution {
         ArrayList<String> listOfString = new ArrayList<String>();
         getCascadeList(nativeFontPtr, listOfString);
 
-        // add JRE "Lucida Sans Regular" to the cascade list to enable fallback
-        // to happen to this JRE font in case the intended glyph is missing in
-        // fonts provided in the CoreText provided cascaded list
-        listOfString.add("Lucida Sans Regular");
+        // In some italic cases the standard Mac cascade list is missing Arabic.
+        listOfString.add("GeezaPro");
         FontManager fm = FontManagerFactory.getInstance();
         int numFonts = 1 + listOfString.size();
         PhysicalFont[] fonts = new PhysicalFont[numFonts];
diff --git a/src/java.desktop/macosx/classes/sun/font/CFontManager.java b/src/java.desktop/macosx/classes/sun/font/CFontManager.java
index 45f48328717..883a6c6f55a 100644
--- a/src/java.desktop/macosx/classes/sun/font/CFontManager.java
+++ b/src/java.desktop/macosx/classes/sun/font/CFontManager.java
@@ -220,12 +220,12 @@ public final class CFontManager extends SunFontManager {
             );
 
             String defaultFont = "Lucida Grande";
-            String defaultFallback = "Lucida Sans";
+            String defaultFallback = "Lucida Grande";
 
             setupLogicalFonts("Dialog", defaultFont, defaultFallback);
-            setupLogicalFonts("Serif", "Times", "Lucida Bright");
+            setupLogicalFonts("Serif", "Times", "Times");
             setupLogicalFonts("SansSerif", defaultFont, defaultFallback);
-            setupLogicalFonts("Monospaced", "Menlo", "Lucida Sans Typewriter");
+            setupLogicalFonts("Monospaced", "Menlo", "Courier");
             setupLogicalFonts("DialogInput", defaultFont, defaultFallback);
         }
     }
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
index 12f9747d82c..9dddaa4d642 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,16 +25,56 @@
 
 package sun.lwawt;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.peer.*;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
+import java.awt.KeyboardFocusManager;
+import java.awt.MenuBar;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.WindowEvent;
+import java.awt.peer.ComponentPeer;
+import java.awt.peer.DialogPeer;
+import java.awt.peer.FramePeer;
+import java.awt.peer.KeyboardFocusManagerPeer;
+import java.awt.peer.WindowPeer;
 import java.util.List;
 
-import javax.swing.*;
+import javax.swing.JComponent;
 
-import sun.awt.*;
+import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.ComponentAccessor;
-import sun.java2d.*;
+import sun.awt.AppContext;
+import sun.awt.CGraphicsDevice;
+import sun.awt.DisplayChangedListener;
+import sun.awt.ExtendedKeyCodes;
+import sun.awt.FullScreenCapable;
+import sun.awt.SunToolkit;
+import sun.awt.TimedWindowEvent;
+import sun.awt.UngrabEvent;
+import sun.java2d.NullSurfaceData;
+import sun.java2d.SunGraphics2D;
+import sun.java2d.SunGraphicsEnvironment;
+import sun.java2d.SurfaceData;
 import sun.java2d.loops.Blit;
 import sun.java2d.loops.CompositeType;
 import sun.java2d.pipe.Region;
@@ -661,16 +701,25 @@ public class LWWindowPeer
      * user or window insets are changed. There's no notifyReshape() in
      * LWComponentPeer as the only components which could be resized by user are
      * top-level windows.
+     * <p>
+     * We need to update the target and post the events, if the peer was moved
+     * or resized, or if the target is out of sync with this peer.
      */
     @Override
     public void notifyReshape(int x, int y, int w, int h) {
-        Rectangle oldBounds = getBounds();
+        final Rectangle pBounds = getBounds();
         final boolean invalid = updateInsets(platformWindow.getInsets());
-        final boolean moved = (x != oldBounds.x) || (y != oldBounds.y);
-        final boolean resized = (w != oldBounds.width) || (h != oldBounds.height);
+        final boolean pMoved = (x != pBounds.x) || (y != pBounds.y);
+        final boolean pResized = (w != pBounds.width) || (h != pBounds.height);
+
+        final ComponentAccessor accessor = AWTAccessor.getComponentAccessor();
+        final Rectangle tBounds = accessor.getBounds(getTarget());
+        final boolean tMoved = (x != tBounds.x) || (y != tBounds.y);
+        final boolean tResized = (w != tBounds.width) || (h != tBounds.height);
 
         // Check if anything changed
-        if (!moved && !resized && !invalid) {
+        if (!tMoved && !tResized && !pMoved && !pResized && !invalid) {
+            // Native window(NSWindow)/LWWindowPeer/Target are in sync
             return;
         }
         // First, update peer's bounds
@@ -682,16 +731,16 @@ public class LWWindowPeer
             setPlatformMaximizedBounds(getDefaultMaximizedBounds());
         }
 
-        if (resized || isNewDevice) {
+        if (pResized || isNewDevice) {
             replaceSurfaceData();
             updateMinimumSize();
         }
 
         // Third, COMPONENT_MOVED/COMPONENT_RESIZED/PAINT events
-        if (moved || invalid) {
+        if (tMoved || pMoved || invalid) {
             handleMove(x, y, true);
         }
-        if (resized || invalid || isNewDevice) {
+        if (tResized || pResized || invalid || isNewDevice) {
             handleResize(w, h, true);
             repaintPeer();
         }
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
index b6c9d5d7250..d6220937118 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -262,7 +262,7 @@ AWT_NS_WINDOW_IMPLEMENTATION
         } else {
             [self.nsWindow setCollectionBehavior:NSWindowCollectionBehaviorDefault];
         }
-    } 
+    }
 }
 
 - (id) initWithPlatformWindow:(JNFWeakJObjectWrapper *)platformWindow
@@ -465,7 +465,7 @@ AWT_ASSERT_APPKIT_THREAD;
 // Tests whether window is blocked by modal dialog/window
 - (BOOL) isBlocked {
     BOOL isBlocked = NO;
-    
+
     JNIEnv *env = [ThreadUtilities getJNIEnv];
     jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
     if (platformWindow != NULL) {
@@ -473,7 +473,7 @@ AWT_ASSERT_APPKIT_THREAD;
         isBlocked = JNFCallBooleanMethod(env, platformWindow, jm_isBlocked) == JNI_TRUE ? YES : NO;
         (*env)->DeleteLocalRef(env, platformWindow);
     }
-    
+
     return isBlocked;
 }
 
@@ -679,7 +679,7 @@ AWT_ASSERT_APPKIT_THREAD;
         JNFCallVoidMethod(env, platformWindow, jm_windowWillMiniaturize);
         (*env)->DeleteLocalRef(env, platformWindow);
     }
-    // Excplicitly make myself a key window to avoid possible
+    // Explicitly make myself a key window to avoid possible
     // negative visual effects during iconify operation
     [self.nsWindow makeKeyAndOrderFront:self.nsWindow];
     [self iconifyChildWindows:YES];
@@ -713,13 +713,47 @@ AWT_ASSERT_APPKIT_THREAD;
     }
 }
 
+- (void) windowDidBecomeMain: (NSNotification *) notification {
+AWT_ASSERT_APPKIT_THREAD;
+    [AWTToolkit eventCountPlusPlus];
+#ifdef DEBUG
+    NSLog(@"became main: %d %@ %@", [self.nsWindow isKeyWindow], [self.nsWindow title], [self menuBarForWindow]);
+#endif
+
+    if (![self.nsWindow isKeyWindow]) {
+        [self activateWindowMenuBar];
+    }
+
+    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
+    if (platformWindow != NULL) {
+        static JNF_MEMBER_CACHE(jm_windowDidBecomeMain, jc_CPlatformWindow, "windowDidBecomeMain", "()V");
+        JNFCallVoidMethod(env, platformWindow, jm_windowDidBecomeMain);
+        (*env)->DeleteLocalRef(env, platformWindow);
+    }
+}
 
 - (void) windowDidBecomeKey: (NSNotification *) notification {
 AWT_ASSERT_APPKIT_THREAD;
     [AWTToolkit eventCountPlusPlus];
+#ifdef DEBUG
+    NSLog(@"became key: %d %@ %@", [self.nsWindow isMainWindow], [self.nsWindow title], [self menuBarForWindow]);
+#endif
     AWTWindow *opposite = [AWTWindow lastKeyWindow];
 
-    // Finds appropriate menubar in our hierarchy,
+    if (![self.nsWindow isMainWindow]) {
+        [self activateWindowMenuBar];
+    }
+
+    [AWTWindow setLastKeyWindow:nil];
+
+    [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
+    [self orderChildWindows:YES];
+}
+
+- (void) activateWindowMenuBar {
+AWT_ASSERT_APPKIT_THREAD;
+    // Finds appropriate menubar in our hierarchy
     AWTWindow *awtWindow = self;
     while (awtWindow.ownerWindow != nil) {
         awtWindow = awtWindow.ownerWindow;
@@ -738,26 +772,48 @@ AWT_ASSERT_APPKIT_THREAD;
     }
 
     [CMenuBar activate:menuBar modallyDisabled:isDisabled];
-
-    [AWTWindow setLastKeyWindow:nil];
-
-    [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
-    [self orderChildWindows:YES];
 }
 
+#ifdef DEBUG
+- (CMenuBar *) menuBarForWindow {
+AWT_ASSERT_APPKIT_THREAD;
+    AWTWindow *awtWindow = self;
+    while (awtWindow.ownerWindow != nil) {
+        awtWindow = awtWindow.ownerWindow;
+    }
+    return awtWindow.javaMenuBar;
+}
+#endif
+
 - (void) windowDidResignKey: (NSNotification *) notification {
     // TODO: check why sometimes at start is invoked *not* on AppKit main thread.
 AWT_ASSERT_APPKIT_THREAD;
     [AWTToolkit eventCountPlusPlus];
-    [self.javaMenuBar deactivate];
-
-    // In theory, this might cause flickering if the window gaining focus
-    // has its own menu. However, I couldn't reproduce it on practice, so
-    // perhaps this is a non issue.
-    CMenuBar* defaultMenu = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
-    if (defaultMenu != nil) {
-        [CMenuBar activate:defaultMenu modallyDisabled:NO];
+#ifdef DEBUG
+    NSLog(@"resigned key: %d %@ %@", [self.nsWindow isMainWindow], [self.nsWindow title], [self menuBarForWindow]);
+#endif
+    if (![self.nsWindow isMainWindow]) {
+        [self deactivateWindow];
     }
+}
+
+- (void) windowDidResignMain: (NSNotification *) notification {
+AWT_ASSERT_APPKIT_THREAD;
+    [AWTToolkit eventCountPlusPlus];
+#ifdef DEBUG
+    NSLog(@"resigned main: %d %@ %@", [self.nsWindow isKeyWindow], [self.nsWindow title], [self menuBarForWindow]);
+#endif
+    if (![self.nsWindow isKeyWindow]) {
+        [self deactivateWindow];
+    }
+}
+
+- (void) deactivateWindow {
+AWT_ASSERT_APPKIT_THREAD;
+#ifdef DEBUG
+    NSLog(@"deactivating window: %@", [self.nsWindow title]);
+#endif
+    [self.javaMenuBar deactivate];
 
     // the new key window
     NSWindow *keyWindow = [NSApp keyWindow];
@@ -773,19 +829,6 @@ AWT_ASSERT_APPKIT_THREAD;
     [self orderChildWindows:NO];
 }
 
-- (void) windowDidBecomeMain: (NSNotification *) notification {
-AWT_ASSERT_APPKIT_THREAD;
-    [AWTToolkit eventCountPlusPlus];
-
-    JNIEnv *env = [ThreadUtilities getJNIEnv];
-    jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
-    if (platformWindow != NULL) {
-        static JNF_MEMBER_CACHE(jm_windowDidBecomeMain, jc_CPlatformWindow, "windowDidBecomeMain", "()V");
-        JNFCallVoidMethod(env, platformWindow, jm_windowDidBecomeMain);
-        (*env)->DeleteLocalRef(env, platformWindow);
-    }
-}
-
 - (BOOL)windowShouldClose:(id)sender {
 AWT_ASSERT_APPKIT_THREAD;
     [AWTToolkit eventCountPlusPlus];
@@ -1040,7 +1083,7 @@ JNF_COCOA_ENTER(env);
 
         AWTWindow *window = (AWTWindow*)[nsWindow delegate];
 
-        if ([nsWindow isKeyWindow]) {
+        if ([nsWindow isKeyWindow] || [nsWindow isMainWindow]) {
             [window.javaMenuBar deactivate];
         }
 
@@ -1051,7 +1094,7 @@ JNF_COCOA_ENTER(env);
             actualMenuBar = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
         }
 
-        if ([nsWindow isKeyWindow]) {
+        if ([nsWindow isKeyWindow] || [nsWindow isMainWindow]) {
             [CMenuBar activate:actualMenuBar modallyDisabled:NO];
         }
     }];
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m
index 0a9621e9313..121ad29fcf8 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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 @@
 canChooseDirectories:(BOOL)inChooseDirectories
              withEnv:(JNIEnv*)env;
 {
-    if (self == [super init]) {
+  if (self = [super init]) {
         fHasFileFilter = inHasFilter;
         fFileDialog = JNFNewGlobalRef(env, inDialog);
         fDirectory = inPath;
@@ -92,7 +92,7 @@ canChooseDirectories:(BOOL)inChooseDirectories
 - (void)safeSaveOrLoad {
     NSSavePanel *thePanel = nil;
 
-    /* 
+    /*
      * 8013553: turns off extension hiding for the native file dialog.
      * This way is used because setExtensionHidden(NO) doesn't work
      * as expected.
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
index 2de86be755b..87d3e401897 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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,6 +31,7 @@
 #import "CMenuBar.h"
 #import "CMenu.h"
 #import "ThreadUtilities.h"
+#import "ApplicationDelegate.h"
 
 #import "sun_lwawt_macosx_CMenuBar.h"
 
@@ -101,6 +102,10 @@ static BOOL sSetupHelpMenu = NO;
         return;
     }
 
+#ifdef DEBUG
+    NSLog(@"activating menu bar: %@", menubar);
+#endif
+
     @synchronized([CMenuBar class]) {
         sActiveMenuBar = menubar;
     }
@@ -184,12 +189,30 @@ static BOOL sSetupHelpMenu = NO;
 -(void) deactivate {
     AWT_ASSERT_APPKIT_THREAD;
 
+    BOOL isDeactivated = NO;
     @synchronized([CMenuBar class]) {
-        sActiveMenuBar = nil;
+        if (sActiveMenuBar == self) {
+            sActiveMenuBar = nil;
+            isDeactivated = YES;
+        }
     }
 
-    @synchronized(self) {
-        fModallyDisabled = NO;
+    if (isDeactivated) {
+#ifdef DEBUG
+        NSLog(@"deactivating menu bar: %@", self);
+#endif
+
+        @synchronized(self) {
+            fModallyDisabled = NO;
+        }
+
+        // In theory, this might cause flickering if the window gaining focus
+        // has its own menu. However, I couldn't reproduce it on practice, so
+        // perhaps this is a non issue.
+        CMenuBar* defaultMenu = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
+        if (defaultMenu != nil) {
+            [CMenuBar activate:defaultMenu modallyDisabled:NO];
+        }
     }
 }
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
index c9cc97ae21e..9c8cefbbcd3 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -28,6 +28,7 @@
 #import "CMenuItem.h"
 #import "CMenu.h"
 #import "AWTEvent.h"
+#import "AWTWindow.h"
 #import "ThreadUtilities.h"
 
 #import "java_awt_Event.h"
@@ -111,12 +112,14 @@
                 }
                 eventKey = [NSString stringWithCharacters: &newChar length: 1];
             }
+            // The action event can be ignored only if the key window is an AWT window.
+            // Otherwise, the action event is the only notification and must be processed.
             NSWindow *keyWindow = [NSApp keyWindow];
-            if (keyWindow != nil) {
+            if (keyWindow != nil && [AWTWindow isAWTWindow: keyWindow]) {
                 return;
             }
-		}
-		
+        }
+        
         static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem");
         static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event)
 
@@ -126,7 +129,7 @@
         JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event)
     }
     JNF_COCOA_EXIT(env);
-	
+    
 }
 
 - (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers {
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
index 34532ecb05f..40bc58362f8 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
@@ -30,7 +30,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#define DEBUG 1
+//#define DEBUG 1
 
 // number of mouse buttons supported
 extern int gNumberOfButtons;
diff --git a/src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h b/src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
similarity index 100%
rename from src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
rename to src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
diff --git a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
index 1cb27bd9dde..942ed5d8297 100644
--- a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
+++ b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -324,7 +324,7 @@ public final class TypeResolver {
     /**
      * Replaces a {@link GenericArrayType GenericArrayType}
      * with plain array class where it is possible.
-     * Bug <a href="http://bugs.sun.com/view_bug.do?bug_id=5041784">5041784</a>
+     * Bug <a href="https://bugs.java.com/view_bug.do?bug_id=5041784">5041784</a>
      * is that arrays of non-generic type sometimes show up
      * as {@link GenericArrayType GenericArrayType} when using reflection.
      * For example, a {@code String[]} might show up
diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
index fb55f34b7ed..239c314fc7a 100644
--- a/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
+++ b/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, 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
@@ -84,19 +84,24 @@ public final class PropertyInfo {
             }
             this.readList = null;
         }
+        Class<?> writeType = this.type;
         if (this.writeList != null) {
             for (MethodInfo info : this.writeList) {
-                if (this.type == null) {
+                if (writeType == null) {
                     this.write = info;
-                    this.type = info.type;
-                } else if (this.type.isAssignableFrom(info.type)) {
+                    writeType = info.type;
+                } else if (writeType.isAssignableFrom(info.type)) {
                     if ((this.write == null) || this.write.type.isAssignableFrom(info.type)) {
                         this.write = info;
+                        writeType = info.type;
                     }
                 }
             }
             this.writeList = null;
         }
+        if (this.type == null) {
+            this.type = writeType;
+        }
         if (this.indexed != null) {
             if ((this.type != null) && !this.type.isArray()) {
                 this.indexed = null; // property type is not an array
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
index 8acbf84bd8a..754ea5c56d5 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
@@ -187,13 +187,7 @@ public class JPEG {
     public static final int JCS_RGB = 2;           // red/green/blue
     public static final int JCS_YCbCr = 3;         // Y/Cb/Cr (also known as YUV)
     public static final int JCS_CMYK = 4;          // C/M/Y/K
-    public static final int JCS_YCC = 5;           // PhotoYCC
-    public static final int JCS_RGBA = 6;          // RGB-Alpha
-    public static final int JCS_YCbCrA = 7;        // Y/Cb/Cr/Alpha
-    // 8 and 9 were old "Legacy" codes which the old code never identified
-    // on reading anyway.  Support for writing them is being dropped, too.
-    public static final int JCS_YCCA = 10;         // PhotoYCC-Alpha
-    public static final int JCS_YCCK = 11;         // Y/Cb/Cr/K
+    public static final int JCS_YCCK = 5;         // Y/Cb/Cr/K
 
     public static final int NUM_JCS_CODES = JCS_YCCK+1;
 
@@ -212,22 +206,6 @@ public class JPEG {
     public static class JCS {
         public static final ColorSpace sRGB =
             ColorSpace.getInstance(ColorSpace.CS_sRGB);
-
-        private static ColorSpace YCC = null;
-        private static boolean yccInited = false;
-
-        public static ColorSpace getYCC() {
-            if (!yccInited) {
-                try {
-                    YCC = ColorSpace.getInstance(ColorSpace.CS_PYCC);
-                } catch (IllegalArgumentException e) {
-                    // PYCC.pf may not always be installed
-                } finally {
-                    yccInited = true;
-                }
-            }
-            return YCC;
-        }
     }
 
     // Default value for ImageWriteParam
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index a04926083cf..a41c54a94e8 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -933,21 +933,6 @@ public class JPEGImageReader extends ImageReader {
         case JPEG.JCS_RGB:
             list.add(raw);
             list.add(getImageType(JPEG.JCS_GRAYSCALE));
-            list.add(getImageType(JPEG.JCS_YCC));
-            break;
-        case JPEG.JCS_RGBA:
-            list.add(raw);
-            break;
-        case JPEG.JCS_YCC:
-            if (raw != null) {  // Might be null if PYCC.pf not installed
-                list.add(raw);
-                list.add(getImageType(JPEG.JCS_RGB));
-            }
-            break;
-        case JPEG.JCS_YCCA:
-            if (raw != null) {  // Might be null if PYCC.pf not installed
-                list.add(raw);
-            }
             break;
         case JPEG.JCS_YCbCr:
             // As there is no YCbCr ColorSpace, we can't support
@@ -972,12 +957,6 @@ public class JPEGImageReader extends ImageReader {
             }
 
             list.add(getImageType(JPEG.JCS_GRAYSCALE));
-            list.add(getImageType(JPEG.JCS_YCC));
-            break;
-        case JPEG.JCS_YCbCrA:  // Default is to convert to RGBA
-            // As there is no YCbCr ColorSpace, we can't support
-            // the raw type.
-            list.add(getImageType(JPEG.JCS_RGBA));
             break;
         }
 
@@ -1065,36 +1044,6 @@ public class JPEGImageReader extends ImageReader {
                 throw new IIOException("Incompatible color conversion");
             }
             break;
-        case JPEG.JCS_RGBA:
-            // No conversions available; image must be RGBA
-            if ((csType != ColorSpace.TYPE_RGB) ||
-                (cm.getNumComponents() != numComponents)) {
-                throw new IIOException("Incompatible color conversion");
-            }
-            break;
-        case JPEG.JCS_YCC:
-            {
-                ColorSpace YCC = JPEG.JCS.getYCC();
-                if (YCC == null) { // We can't do YCC at all
-                    throw new IIOException("Incompatible color conversion");
-                }
-                if ((cs != YCC) &&
-                    (cm.getNumComponents() == numComponents)) {
-                    convert = new ColorConvertOp(YCC, cs, null);
-                }
-            }
-            break;
-        case JPEG.JCS_YCCA:
-            {
-                ColorSpace YCC = JPEG.JCS.getYCC();
-                // No conversions available; image must be YCCA
-                if ((YCC == null) || // We can't do YCC at all
-                    (cs != YCC) ||
-                    (cm.getNumComponents() != numComponents)) {
-                    throw new IIOException("Incompatible color conversion");
-                }
-            }
-            break;
         default:
             // Anything else we can't handle at all
             throw new IIOException("Incompatible color conversion");
@@ -1929,36 +1878,6 @@ class ImageTypeProducer {
                         DataBuffer.TYPE_BYTE,
                         false,
                         false);
-            case JPEG.JCS_RGBA:
-                return ImageTypeSpecifier.createPacked(JPEG.JCS.sRGB,
-                        0xff000000,
-                        0x00ff0000,
-                        0x0000ff00,
-                        0x000000ff,
-                        DataBuffer.TYPE_INT,
-                        false);
-            case JPEG.JCS_YCC:
-                if (JPEG.JCS.getYCC() != null) {
-                    return ImageTypeSpecifier.createInterleaved(
-                            JPEG.JCS.getYCC(),
-                        JPEG.bandOffsets[2],
-                        DataBuffer.TYPE_BYTE,
-                        false,
-                        false);
-                } else {
-                    return null;
-                }
-            case JPEG.JCS_YCCA:
-                if (JPEG.JCS.getYCC() != null) {
-                    return ImageTypeSpecifier.createInterleaved(
-                            JPEG.JCS.getYCC(),
-                        JPEG.bandOffsets[3],
-                        DataBuffer.TYPE_BYTE,
-                        true,
-                        false);
-                } else {
-                    return null;
-                }
             default:
                 return null;
         }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
index 43dcc8b6017..428f79cc7c2 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
@@ -754,115 +754,47 @@ public class JPEGImageWriter extends ImageWriter {
                             }
                             break;
                         case ColorSpace.TYPE_RGB:
-                            if (!alpha) {
-                                if (jfif != null) {
+                            if (jfif != null) {
+                                outCsType = JPEG.JCS_YCbCr;
+                                if (JPEG.isNonStandardICC(cs)
+                                    || ((cs instanceof ICC_ColorSpace)
+                                        && (jfif.iccSegment != null))) {
+                                    iccProfile =
+                                        ((ICC_ColorSpace) cs).getProfile();
+                                }
+                            } else if (adobe != null) {
+                                switch (adobe.transform) {
+                                case JPEG.ADOBE_UNKNOWN:
+                                    outCsType = JPEG.JCS_RGB;
+                                    break;
+                                case JPEG.ADOBE_YCC:
                                     outCsType = JPEG.JCS_YCbCr;
-                                    if (JPEG.isNonStandardICC(cs)
-                                        || ((cs instanceof ICC_ColorSpace)
-                                            && (jfif.iccSegment != null))) {
-                                        iccProfile =
-                                            ((ICC_ColorSpace) cs).getProfile();
-                                    }
-                                } else if (adobe != null) {
-                                    switch (adobe.transform) {
-                                    case JPEG.ADOBE_UNKNOWN:
-                                        outCsType = JPEG.JCS_RGB;
-                                        break;
-                                    case JPEG.ADOBE_YCC:
-                                        outCsType = JPEG.JCS_YCbCr;
-                                        break;
-                                    default:
-                                        warningOccurred
-                                        (WARNING_IMAGE_METADATA_ADOBE_MISMATCH);
-                                        newAdobeTransform = JPEG.ADOBE_UNKNOWN;
-                                        outCsType = JPEG.JCS_RGB;
-                                        break;
-                                    }
-                                } else {
-                                    // consult the ids
-                                    int outCS = sof.getIDencodedCSType();
-                                    // if they don't resolve it,
-                                    // consult the sampling factors
-                                    if (outCS != JPEG.JCS_UNKNOWN) {
-                                        outCsType = outCS;
-                                    } else {
-                                        boolean subsampled =
-                                        isSubsampled(sof.componentSpecs);
-                                        if (subsampled) {
-                                            outCsType = JPEG.JCS_YCbCr;
-                                        } else {
-                                            outCsType = JPEG.JCS_RGB;
-                                        }
-                                    }
-                                }
-                            } else { // RGBA
-                                if (jfif != null) {
-                                    ignoreJFIF = true;
+                                    break;
+                                default:
                                     warningOccurred
-                                    (WARNING_IMAGE_METADATA_JFIF_MISMATCH);
+                                    (WARNING_IMAGE_METADATA_ADOBE_MISMATCH);
+                                    newAdobeTransform = JPEG.ADOBE_UNKNOWN;
+                                    outCsType = JPEG.JCS_RGB;
+                                    break;
                                 }
-                                if (adobe != null) {
-                                    if (adobe.transform
-                                        != JPEG.ADOBE_UNKNOWN) {
-                                        newAdobeTransform = JPEG.ADOBE_UNKNOWN;
-                                        warningOccurred
-                                        (WARNING_IMAGE_METADATA_ADOBE_MISMATCH);
-                                    }
-                                    outCsType = JPEG.JCS_RGBA;
+                            } else {
+                                // consult the ids
+                                int outCS = sof.getIDencodedCSType();
+                                // if they don't resolve it,
+                                // consult the sampling factors
+                                if (outCS != JPEG.JCS_UNKNOWN) {
+                                    outCsType = outCS;
                                 } else {
-                                    // consult the ids
-                                    int outCS = sof.getIDencodedCSType();
-                                    // if they don't resolve it,
-                                    // consult the sampling factors
-                                    if (outCS != JPEG.JCS_UNKNOWN) {
-                                        outCsType = outCS;
+                                    boolean subsampled =
+                                    isSubsampled(sof.componentSpecs);
+                                    if (subsampled) {
+                                        outCsType = JPEG.JCS_YCbCr;
                                     } else {
-                                        boolean subsampled =
-                                        isSubsampled(sof.componentSpecs);
-                                        outCsType = subsampled ?
-                                            JPEG.JCS_YCbCrA : JPEG.JCS_RGBA;
+                                        outCsType = JPEG.JCS_RGB;
                                     }
                                 }
                             }
                             break;
-                        case ColorSpace.TYPE_3CLR:
-                            if (cs == JPEG.JCS.getYCC()) {
-                                if (!alpha) {
-                                    if (jfif != null) {
-                                        convertTosRGB = true;
-                                        convertOp =
-                                        new ColorConvertOp(cs,
-                                                           JPEG.JCS.sRGB,
-                                                           null);
-                                        outCsType = JPEG.JCS_YCbCr;
-                                    } else if (adobe != null) {
-                                        if (adobe.transform
-                                            != JPEG.ADOBE_YCC) {
-                                            newAdobeTransform = JPEG.ADOBE_YCC;
-                                            warningOccurred
-                                            (WARNING_IMAGE_METADATA_ADOBE_MISMATCH);
-                                        }
-                                        outCsType = JPEG.JCS_YCC;
-                                    } else {
-                                        outCsType = JPEG.JCS_YCC;
-                                    }
-                                } else { // PhotoYCCA
-                                    if (jfif != null) {
-                                        ignoreJFIF = true;
-                                        warningOccurred
-                                        (WARNING_IMAGE_METADATA_JFIF_MISMATCH);
-                                    } else if (adobe != null) {
-                                        if (adobe.transform
-                                            != JPEG.ADOBE_UNKNOWN) {
-                                            newAdobeTransform
-                                            = JPEG.ADOBE_UNKNOWN;
-                                            warningOccurred
-                                            (WARNING_IMAGE_METADATA_ADOBE_MISMATCH);
-                                        }
-                                    }
-                                    outCsType = JPEG.JCS_YCCA;
-                                }
-                            }
                         }
                     }
                 } // else no dest, metadata, not an image.  Defaults ok
@@ -1564,27 +1496,10 @@ public class JPEGImageWriter extends ImageWriter {
                 retval = JPEG.JCS_GRAYSCALE;
                 break;
             case ColorSpace.TYPE_RGB:
-                if (alpha) {
-                    retval = JPEG.JCS_RGBA;
-                } else {
-                    retval = JPEG.JCS_RGB;
-                }
+                retval = JPEG.JCS_RGB;
                 break;
             case ColorSpace.TYPE_YCbCr:
-                if (alpha) {
-                    retval = JPEG.JCS_YCbCrA;
-                } else {
-                    retval = JPEG.JCS_YCbCr;
-                }
-                break;
-            case ColorSpace.TYPE_3CLR:
-                if (cs == JPEG.JCS.getYCC()) {
-                    if (alpha) {
-                        retval = JPEG.JCS_YCCA;
-                    } else {
-                        retval = JPEG.JCS_YCC;
-                    }
-                }
+                retval = JPEG.JCS_YCbCr;
                 break;
             case ColorSpace.TYPE_CMYK:
                 retval = JPEG.JCS_CMYK;
@@ -1604,27 +1519,10 @@ public class JPEGImageWriter extends ImageWriter {
                 retval = JPEG.JCS_GRAYSCALE;
                 break;
             case ColorSpace.TYPE_RGB:
-                if (alpha) {
-                    retval = JPEG.JCS_RGBA;
-                } else {
-                    retval = JPEG.JCS_RGB;
-                }
+                retval = JPEG.JCS_RGB;
                 break;
             case ColorSpace.TYPE_YCbCr:
-                if (alpha) {
-                    retval = JPEG.JCS_YCbCrA;
-                } else {
-                    retval = JPEG.JCS_YCbCr;
-                }
-                break;
-            case ColorSpace.TYPE_3CLR:
-                if (cs == JPEG.JCS.getYCC()) {
-                    if (alpha) {
-                        retval = JPEG.JCS_YCCA;
-                    } else {
-                        retval = JPEG.JCS_YCC;
-                    }
-                }
+                retval = JPEG.JCS_YCbCr;
                 break;
             case ColorSpace.TYPE_CMYK:
                 retval = JPEG.JCS_CMYK;
@@ -1651,27 +1549,10 @@ public class JPEGImageWriter extends ImageWriter {
                 retval = JPEG.JCS_GRAYSCALE;
                 break;
             case ColorSpace.TYPE_RGB:
-                if (alpha) {
-                    retval = JPEG.JCS_YCbCrA;
-                } else {
-                    retval = JPEG.JCS_YCbCr;
-                }
+                retval = JPEG.JCS_YCbCr;
                 break;
             case ColorSpace.TYPE_YCbCr:
-                if (alpha) {
-                    retval = JPEG.JCS_YCbCrA;
-                } else {
-                    retval = JPEG.JCS_YCbCr;
-                }
-                break;
-            case ColorSpace.TYPE_3CLR:
-                if (cs == JPEG.JCS.getYCC()) {
-                    if (alpha) {
-                        retval = JPEG.JCS_YCCA;
-                    } else {
-                        retval = JPEG.JCS_YCC;
-                    }
-                }
+                retval = JPEG.JCS_YCbCr;
                 break;
             case ColorSpace.TYPE_CMYK:
                 retval = JPEG.JCS_YCCK;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
index 94de5da690e..bd6bcc8d784 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
@@ -73,7 +73,11 @@ public class JPEGImageWriterSpi extends ImageWriterSpi {
 
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         SampleModel sampleModel = type.getSampleModel();
+        ColorModel cm = type.getColorModel();
 
+        if (cm.hasAlpha()) {
+            return false;
+        }
         // Find the maximum bit depth across all channels
         int[] sampleSize = sampleModel.getSampleSize();
         int bitDepth = sampleSize[0];
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
index 65ac96793aa..2a95e9f1561 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
@@ -491,17 +491,6 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
                     wantJFIF = false;
                 }
                 break;
-            case ColorSpace.TYPE_3CLR:
-                if (cs == JPEG.JCS.getYCC()) {
-                    wantJFIF = false;
-                    componentIDs[0] = (byte) 'Y';
-                    componentIDs[1] = (byte) 'C';
-                    componentIDs[2] = (byte) 'c';
-                    if (hasAlpha) {
-                        componentIDs[3] = (byte) 'A';
-                    }
-                }
-                break;
             case ColorSpace.TYPE_YCbCr:
                 if (hasExtraComponents) { // e.g. K or alpha
                     wantJFIF = false;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
index ea625209cbd..8cc1813a23e 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
@@ -182,29 +182,11 @@ class SOFMarkerSegment extends MarkerSegment {
         switch(componentSpecs.length) {
         case 3:
             if ((componentSpecs[0].componentId == 'R')
-                &&(componentSpecs[0].componentId == 'G')
-                &&(componentSpecs[0].componentId == 'B')) {
+                &&(componentSpecs[1].componentId == 'G')
+                &&(componentSpecs[2].componentId == 'B')) {
                 return JPEG.JCS_RGB;
             }
-            if ((componentSpecs[0].componentId == 'Y')
-                &&(componentSpecs[0].componentId == 'C')
-                &&(componentSpecs[0].componentId == 'c')) {
-                return JPEG.JCS_YCC;
-            }
             break;
-        case 4:
-            if ((componentSpecs[0].componentId == 'R')
-                &&(componentSpecs[0].componentId == 'G')
-                &&(componentSpecs[0].componentId == 'B')
-                &&(componentSpecs[0].componentId == 'A')) {
-                return JPEG.JCS_RGBA;
-            }
-            if ((componentSpecs[0].componentId == 'Y')
-                &&(componentSpecs[0].componentId == 'C')
-                &&(componentSpecs[0].componentId == 'c')
-                &&(componentSpecs[0].componentId == 'A')) {
-                return JPEG.JCS_YCCA;
-            }
         }
 
         return JPEG.JCS_UNKNOWN;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
index 896a5652ef9..298df7df980 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
@@ -1882,6 +1882,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
                             bKGD_colorType = PNGImageReader.PNG_COLOR_GRAY;
                             bKGD_gray = red;
                         } else {
+                            bKGD_colorType = PNGImageReader.PNG_COLOR_RGB;
                             bKGD_red = red;
                             bKGD_green = green;
                             bKGD_blue = blue;
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java b/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
index c70c9800cca..6666d9ae84c 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, 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
@@ -62,13 +62,6 @@ import javax.sound.sampled.spi.MixerProvider;
  */
 public final class JDK13Services {
 
-    /**
-     * Filename of the properties file for default provider properties. This
-     * file is searched in the subdirectory "conf" of the JRE directory (this
-     * behaviour is hardcoded).
-     */
-    private static final String PROPERTIES_FILENAME = "sound.properties";
-
     /**
      * Properties loaded from the properties file for default provider
      * properties.
@@ -195,7 +188,7 @@ public final class JDK13Services {
     private static synchronized Properties getProperties() {
         if (properties == null) {
             properties = new Properties();
-            JSSecurityManager.loadProperties(properties, PROPERTIES_FILENAME);
+            JSSecurityManager.loadProperties(properties);
         }
         return properties;
     }
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java b/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
index e1de7a4587d..5e84671d360 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, 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
@@ -25,10 +25,10 @@
 
 package com.sun.media.sound;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -52,16 +52,6 @@ final class JSSecurityManager {
     private JSSecurityManager() {
     }
 
-    /** Checks if the VM currently has a SecurityManager installed.
-     * Note that this may change over time. So the result of this method
-     * should not be cached.
-     *
-     * @return true if a SecurityManger is installed, false otherwise.
-     */
-    private static boolean hasSecurityManager() {
-        return (System.getSecurityManager() != null);
-    }
-
     static void checkRecordPermission() throws SecurityException {
         if(Printer.trace) Printer.trace("JSSecurityManager.checkRecordPermission()");
         SecurityManager sm = System.getSecurityManager();
@@ -70,69 +60,48 @@ final class JSSecurityManager {
         }
     }
 
-    /** Load properties from a file.
-        This method tries to load properties from the filename give into
-        the passed properties object.
-        If the file cannot be found or something else goes wrong,
-        the method silently fails.
-        @param properties The properties bundle to store the values of the
-        properties file.
-        @param filename The filename of the properties file to load. This
-        filename is interpreted as relative to the subdirectory "conf" in
-        the JRE directory.
+    /**
+     * Load properties from a file.
+     * <p>
+     * This method tries to load properties from the filename give into the
+     * passed properties object. If the file cannot be found or something else
+     * goes wrong, the method silently fails.
+     * <p>
+     * If the file referenced in "javax.sound.config.file" property exists and
+     * the user has an access to it, then it will be loaded, otherwise default
+     * configuration file "JAVA_HOME/conf/sound.properties" will be loaded.
+     *
+     * @param  properties the properties bundle to store the values of the
+     *         properties file
      */
-    static void loadProperties(final Properties properties,
-                               final String filename) {
-        if(hasSecurityManager()) {
-            try {
-                // invoke the privileged action using 1.2 security
-                PrivilegedAction<Void> action = new PrivilegedAction<Void>() {
-                        @Override
-                        public Void run() {
-                            loadPropertiesImpl(properties, filename);
-                            return null;
-                        }
-                    };
-                AccessController.doPrivileged(action);
-                if(Printer.debug)Printer.debug("Loaded properties with JDK 1.2 security");
-            } catch (Exception e) {
-                if(Printer.debug)Printer.debug("Exception loading properties with JDK 1.2 security");
-                // try without using JDK 1.2 security
-                loadPropertiesImpl(properties, filename);
+    static void loadProperties(final Properties properties) {
+        final String customFile = AccessController.doPrivileged(
+                (PrivilegedAction<String>) () -> System.getProperty(
+                        "javax.sound.config.file"));
+        if (customFile != null) {
+            if (loadPropertiesImpl(properties, customFile)) {
+                return;
             }
-        } else {
-            // not JDK 1.2 security, assume we already have permission
-            loadPropertiesImpl(properties, filename);
         }
-    }
-
-    private static void loadPropertiesImpl(Properties properties,
-                                           String filename) {
-        if(Printer.trace)Printer.trace(">> JSSecurityManager: loadPropertiesImpl()");
-        String fname = System.getProperty("java.home");
-        try {
-            if (fname == null) {
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            final String home = System.getProperty("java.home");
+            if (home == null) {
                 throw new Error("Can't find java.home ??");
             }
-            File f = new File(fname, "conf");
-            f = new File(f, filename);
-            fname = f.getCanonicalPath();
-            InputStream in = new FileInputStream(fname);
-            BufferedInputStream bin = new BufferedInputStream(in);
-            try {
-                properties.load(bin);
-            } finally {
-                if (in != null) {
-                    in.close();
-                }
-            }
-        } catch (Throwable t) {
-            if (Printer.trace) {
-                System.err.println("Could not load properties file \"" + fname + "\"");
-                t.printStackTrace();
-            }
+            loadPropertiesImpl(properties, home, "conf", "sound.properties");
+            return null;
+        });
+    }
+
+    private static boolean loadPropertiesImpl(final Properties properties,
+                                              String first, String... more) {
+        final Path fname = Paths.get(first, more);
+        try (final Reader reader = Files.newBufferedReader(fname)) {
+            properties.load(reader);
+            return true;
+        } catch (final Throwable t) {
+            return false;
         }
-        if(Printer.trace)Printer.trace("<< JSSecurityManager: loadPropertiesImpl() completed");
     }
 
     /** Create a Thread in the current ThreadGroup.
diff --git a/src/java.desktop/share/classes/java/applet/Applet.java b/src/java.desktop/share/classes/java/applet/Applet.java
index a8430a76e99..b11ab0096c1 100644
--- a/src/java.desktop/share/classes/java/applet/Applet.java
+++ b/src/java.desktop/share/classes/java/applet/Applet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2016, 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
@@ -22,17 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.applet;
 
-import java.awt.*;
-import java.awt.image.ColorModel;
+import java.awt.AWTPermission;
+import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.Image;
+import java.awt.Panel;
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.net.URL;
 import java.net.MalformedURLException;
-import java.util.Hashtable;
+import java.net.URL;
 import java.util.Locale;
-import javax.accessibility.*;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
 
 /**
  * An applet is a small program that is intended not to be run on
@@ -47,11 +55,8 @@ import javax.accessibility.*;
  * @author      Chris Warth
  * @since       1.0
  *
- * @deprecated  The Applet API is deprecated. See the
- * <a href="package-summary.html"> java.applet package documentation</a>
- * for further information.
+ * @deprecated The Applet API is deprecated, no replacement.
  */
-
 @Deprecated(since = "9")
 public class Applet extends Panel {
 
diff --git a/src/java.desktop/share/classes/java/applet/AppletContext.java b/src/java.desktop/share/classes/java/applet/AppletContext.java
index 8c955c5db06..9c43e6eca8e 100644
--- a/src/java.desktop/share/classes/java/applet/AppletContext.java
+++ b/src/java.desktop/share/classes/java/applet/AppletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, 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
@@ -26,12 +26,10 @@
 package java.applet;
 
 import java.awt.Image;
-import java.awt.Graphics;
-import java.awt.image.ColorModel;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Enumeration;
-import java.io.InputStream;
-import java.io.IOException;
 import java.util.Iterator;
 
 /**
@@ -45,11 +43,8 @@ import java.util.Iterator;
  * @author      Arthur van Hoff
  * @since       1.0
  *
- * @deprecated  The Applet API is deprecated. See the
- * <a href="package-summary.html"> java.applet package documentation</a>
- * for further information.
+ * @deprecated The Applet API is deprecated, no replacement.
  */
-
 @Deprecated(since = "9")
 public interface AppletContext {
     /**
diff --git a/src/java.desktop/share/classes/java/applet/AppletStub.java b/src/java.desktop/share/classes/java/applet/AppletStub.java
index 1f4e39b8060..497ae030b84 100644
--- a/src/java.desktop/share/classes/java/applet/AppletStub.java
+++ b/src/java.desktop/share/classes/java/applet/AppletStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2016, 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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.applet;
 
 import java.net.URL;
@@ -37,11 +38,8 @@ import java.net.URL;
  * @see         java.applet.Applet#setStub(java.applet.AppletStub)
  * @since       1.0
  *
- * @deprecated  The Applet API is deprecated. See the
- * <a href="package-summary.html"> java.applet package documentation</a>
- * for further information.
+ * @deprecated The Applet API is deprecated, no replacement.
  */
-
 @Deprecated(since = "9")
 public interface AppletStub {
     /**
diff --git a/src/java.desktop/share/classes/java/applet/AudioClip.java b/src/java.desktop/share/classes/java/applet/AudioClip.java
index 6436ccbcc5d..82f933ed61d 100644
--- a/src/java.desktop/share/classes/java/applet/AudioClip.java
+++ b/src/java.desktop/share/classes/java/applet/AudioClip.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2016, 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
@@ -34,11 +34,8 @@ package java.applet;
  * @author      Arthur van Hoff
  * @since       1.0
  *
- * @deprecated  The Applet API is deprecated. See the
- * <a href="package-summary.html">java.applet package documentation</a>
- * for further information.
+ * @deprecated The Applet API is deprecated, no replacement.
  */
-
 @Deprecated(since = "9")
 public interface AudioClip {
     /**
diff --git a/src/java.desktop/share/classes/java/applet/package-info.java b/src/java.desktop/share/classes/java/applet/package-info.java
index 351a58be015..fd24ce24d94 100644
--- a/src/java.desktop/share/classes/java/applet/package-info.java
+++ b/src/java.desktop/share/classes/java/applet/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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,13 +36,7 @@
  * running applets. For example, the applet context could be a Web browser or an
  * applet development environment.
  * <p>
- * The APIs in this package are all deprecated. Alternative technologies such as
- * Java Web Start or installable applications should be used instead.
- * See <a href="http://openjdk.java.net/jeps/289">JEP 289</a> and
- * the Oracle White Paper
- * <a href="http://www.oracle.com/technetwork/java/javase/migratingfromapplets-2872444.pdf">
- * "Migrating from Java Applets to plugin-free Java technologies"</a> for more
- * information.
+ * The APIs in this package are all deprecated without replacement.
  *
  * @since 1.0
  */
diff --git a/src/java.desktop/share/classes/java/awt/Robot.java b/src/java.desktop/share/classes/java/awt/Robot.java
index 1f24684d093..72e873a4398 100644
--- a/src/java.desktop/share/classes/java/awt/Robot.java
+++ b/src/java.desktop/share/classes/java/awt/Robot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, 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
@@ -29,10 +29,10 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BaseMultiResolutionImage;
-import java.awt.image.MultiResolutionImage;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import java.awt.image.DirectColorModel;
+import java.awt.image.MultiResolutionImage;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.awt.peer.RobotPeer;
@@ -41,7 +41,7 @@ import sun.awt.AWTPermissions;
 import sun.awt.ComponentFactory;
 import sun.awt.SunToolkit;
 import sun.awt.image.SunWritableRaster;
-import sun.swing.SwingUtilities2;
+import sun.java2d.SunGraphicsEnvironment;
 
 /**
  * This class is used to generate native system input events
@@ -505,7 +505,7 @@ public class Robot {
                 .getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().
                 getDefaultConfiguration();
-        gc = SwingUtilities2.getGraphicsConfigurationAtPoint(
+        gc = SunGraphicsEnvironment.getGraphicsConfigurationAtPoint(
                 gc, screenRect.getCenterX(), screenRect.getCenterY());
 
         AffineTransform tx = gc.getDefaultTransform();
diff --git a/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java
index 5dcc87c2233..b0ade0d2181 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,9 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 
 /**
  * Event sent when the application is asked to open its about window.
@@ -34,12 +37,19 @@ package java.awt.desktop;
  * @since 9
  */
 public final class AboutEvent extends AppEvent {
+
     private static final long serialVersionUID = -5987180734802756477L;
 
     /**
-     * Constructs an {@code AboutEvent}
+     * Constructs an {@code AboutEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public AboutEvent() {
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
index 0eaabcbbdd5..b337c48be6b 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -26,11 +26,13 @@
 package java.awt.desktop;
 
 import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 import java.util.EventObject;
 
 /**
  * AppEvents are sent to listeners and handlers installed on the
- * {@link java.awt.Desktop}.
+ * {@link java.awt.Desktop} instance of the current desktop context.
  *
  * @since 9
  */
@@ -38,8 +40,17 @@ public class AppEvent extends EventObject {
 
     private static final long serialVersionUID = -5958503993556009432L;
 
+    /**
+     * Constructs an {@code AppEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
+     */
     AppEvent() {
         super(Desktop.getDesktop());
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java
index d5442b5b18f..205690608b9 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,9 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 
 /**
  * Event sent when the application has become the foreground app, and when it is
@@ -36,12 +39,19 @@ package java.awt.desktop;
  * @since 9
  */
 public final class AppForegroundEvent extends AppEvent {
+
     private static final long serialVersionUID = -5513582555740533911L;
 
     /**
-     * Constructs an {@code AppForegroundEvent}
+     * Constructs an {@code AppForegroundEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public AppForegroundEvent() {
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java
index 39ac364ce63..9fb31698a6a 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,9 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 
 /**
  * Event sent when the application has been hidden or shown.
@@ -35,12 +38,19 @@ package java.awt.desktop;
  * @since 9
  */
 public final class AppHiddenEvent extends AppEvent {
+
     private static final long serialVersionUID = 2637465279476429224L;
 
     /**
-     * Constructs an {@code AppHiddenEvent}
+     * Constructs an {@code AppHiddenEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public AppHiddenEvent() {
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java
index 526cd872de8..407dc740c04 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,9 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 
 /**
  * Event sent when the application is asked to re-open itself.
@@ -34,12 +37,19 @@ package java.awt.desktop;
  * @since 9
  */
 public final class AppReopenedEvent extends AppEvent {
+
     private static final long serialVersionUID = 1503238361530407990L;
 
     /**
-     * Constructs an {@code AppReopenedEvent}
+     * Constructs an {@code AppReopenedEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public AppReopenedEvent() {
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
index 5989a1b1f6e..5a97f53ad85 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
@@ -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
@@ -25,30 +25,41 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Auxiliary event containing a list of files.
  *
  * @since 9
  */
 public class FilesEvent extends AppEvent {
+
     private static final long serialVersionUID = 5271763715462312871L;
     final List<File> files;
 
     /**
-     * Constructs a {@code FilesEvent}
-     * @param files files
+     * Constructs a {@code FilesEvent}.
+     *
+     * @param  files the list of files
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     FilesEvent(final List<File> files) {
         this.files = files;
     }
 
     /**
-     * Gets the list of files
+     * Gets the list of files.
+     *
      * @return the list of files
      */
     public List<File> getFiles() {
@@ -56,5 +67,4 @@ public class FilesEvent extends AppEvent {
                 ? null
                 : new ArrayList<>(files);
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java
index 6d5d9136ad4..dfe347e1830 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,10 +25,12 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 import java.io.File;
 import java.util.List;
 
-
 /**
  * Event sent when the app is asked to open a list of files.
  *
@@ -37,13 +39,21 @@ import java.util.List;
  * @since 9
  */
 public final class OpenFilesEvent extends FilesEvent {
+
     private static final long serialVersionUID = -3982871005867718956L;
     final String searchTerm;
 
     /**
-     * Constructs an {@code OpenFilesEvent}
-     * @param files files
-     * @param searchTerm searchTerm
+     * Constructs an {@code OpenFilesEvent}.
+     *
+     * @param  files the list of files
+     * @param  searchTerm the search term
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public OpenFilesEvent(final List<File> files, final String searchTerm) {
         super(files);
@@ -57,7 +67,7 @@ public final class OpenFilesEvent extends FilesEvent {
      * term that was used to find the files. This is for example the case
      * on Mac OS X, when the files were opened using the Spotlight search
      * menu or a Finder search window.
-     *
+     * <p>
      * This is useful for highlighting the search term in the documents when
      * they are opened.
      *
@@ -66,5 +76,4 @@ public final class OpenFilesEvent extends FilesEvent {
     public String getSearchTerm() {
         return searchTerm;
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java b/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java
index d29ce26ef45..f4dc51853d7 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,9 +25,11 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 import java.net.URI;
 
-
 /**
  * Event sent when the app is asked to open a {@code URI}.
  *
@@ -36,12 +38,20 @@ import java.net.URI;
  * @since 9
  */
 public final class OpenURIEvent extends AppEvent {
+
     private static final long serialVersionUID = 221209100935933476L;
     final URI uri;
 
     /**
-     * Constructs an {@code OpenURIEvent}
-     * @param uri {@code URI}
+     * Constructs an {@code OpenURIEvent}.
+     *
+     * @param  uri the {@code URI} the app was asked to open
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public OpenURIEvent(final URI uri) {
         this.uri = uri;
@@ -54,5 +64,4 @@ public final class OpenURIEvent extends AppEvent {
     public URI getURI() {
         return uri;
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java
index 7630272c41e..982d9ac18f3 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,9 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 
 /**
  * Event sent when the application is asked to open its preferences window.
@@ -34,12 +37,19 @@ package java.awt.desktop;
  * @since 9
  */
 public final class PreferencesEvent extends AppEvent {
+
     private static final long serialVersionUID = -6398607097086476160L;
 
     /**
-     * Constructs a {@code PreferencesEvent}
+     * Constructs a {@code PreferencesEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public PreferencesEvent() {
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java
index c3e5a46c328..626aad15c87 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -23,13 +23,14 @@
  * questions.
  */
 
-
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
 import java.io.File;
 import java.util.List;
 
-
 /**
  * Event sent when the app is asked to print a list of files.
  *
@@ -37,14 +38,21 @@ import java.util.List;
  * @since 9
  */
 public final class PrintFilesEvent extends FilesEvent {
+
     private static final long serialVersionUID = -5752560876153618618L;
 
     /**
-     * Constructs a {@code PrintFilesEvent}
-     * @param files files
+     * Constructs a {@code PrintFilesEvent}.
+     *
+     * @param  files the list of files
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public PrintFilesEvent(final List<File> files) {
         super(files);
     }
-
 }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java b/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java
index c0e1bd4b217..5cd97708515 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,10 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+
 /**
  * Event sent when the application is asked to quit.
  *
@@ -37,7 +41,14 @@ public final class QuitEvent extends AppEvent {
     private static final long serialVersionUID = -256100795532403146L;
 
     /**
-     * Constructs a {@code QuitEvent}
+     * Constructs a {@code QuitEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public QuitEvent() {
     }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java b/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java
index 3f6505ccad0..05deac547c1 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -22,8 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+
 /**
  * Event sent when the displays attached to the system enter and exit power save
  * sleep.
@@ -38,7 +43,14 @@ public final class ScreenSleepEvent extends AppEvent {
     private static final long serialVersionUID = 7521606180376544150L;
 
     /**
-     * Constructs a ScreenSleepEvent
+     * Constructs a {@code ScreenSleepEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public ScreenSleepEvent() {
     }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java b/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java
index b38b76d710b..ea695bd27a2 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,10 @@
 
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+
 /**
  * Event sent when the system enters and exits power save sleep.
  *
@@ -38,7 +42,14 @@ public final class SystemSleepEvent extends AppEvent {
     private static final long serialVersionUID = 11372269824930549L;
 
     /**
-     * Constructs a SystemSleepEvent
+     * Constructs a {@code SystemSleepEvent}.
+     *
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public SystemSleepEvent() {
     }
diff --git a/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java b/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java
index aaf1ceace16..e4d6220a6e9 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -22,8 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.awt.desktop;
 
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+
 /**
  * Event sent when the user session has been changed.
  *
@@ -66,9 +71,15 @@ public final class UserSessionEvent extends AppEvent {
     }
 
     /**
-     * Constructs a {@code UserSessionEvent}
+     * Constructs a {@code UserSessionEvent}.
      *
-     * @param reason of session change
+     * @param  reason the reason of the user session change
+     * @throws HeadlessException if {@link GraphicsEnvironment#isHeadless()}
+     *         returns {@code true}
+     * @throws UnsupportedOperationException if Desktop API is not supported on
+     *         the current platform
+     * @see Desktop#isDesktopSupported()
+     * @see java.awt.GraphicsEnvironment#isHeadless
      */
     public UserSessionEvent(Reason reason) {
         this.reason = reason;
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
index 074247e0cd8..accd04a5677 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
@@ -5,7 +5,7 @@
   <title>AWT Threading Issues</title>
 </head>
 <!--
- Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>AWT Threading Issues</h1>
 
 <a id="ListenersThreads"></a>
@@ -121,7 +121,7 @@ Implementation-dependent behavior.
 Prior to 1.4, the helper threads were never terminated.
 <p>
 Starting with 1.4, the behavior has changed as a result of the fix for
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4030718">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4030718">
 4030718</a>. With the current implementation, AWT terminates all its
 helper threads allowing the application to exit cleanly when the
 following three conditions are true:
@@ -154,11 +154,11 @@ will exit cleanly in all cases. Two examples:
 <ul>
   <li> Other packages can create displayable components for internal
        needs and never make them undisplayable. See
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4515058">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4515058">
 4515058</a>,
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4671025">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4671025">
 4671025</a>, and
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4465537">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4465537">
 4465537</a>.
   <li> Both Microsoft Windows and X11 allow an application to send native
        events to windows that belong to another application. With this
@@ -192,5 +192,6 @@ non-daemon thread that blocks forever.
 <cite>The Java&trade; Virtual Machine Specification</cite>
  guarantees
 that the JVM doesn't exit until this thread terminates.
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
index b2f21bc3b93..ba3f07f517e 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
@@ -5,7 +5,7 @@
   <title>AWT Desktop Properties</title>
 </head>
 <!--
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>AWT Desktop Properties</h1>
 
 The following refers to standard AWT desktop properties that
@@ -274,5 +274,6 @@ only: {@code NOBUTTON}, {@code BUTTON1}, {@code BUTTON2} and
 This property should be used when there is no need in listening mouse events fired as a result of
 activity with extra mouse button.
 By default this property is set to {@code true}.
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
index 76fcb545baf..a13bbd4d7d9 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
@@ -5,7 +5,7 @@
   <title>The AWT Focus Subsystem</title>
 </head>
 <!--
- Copyright (c) 2001, 2017, 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
@@ -30,6 +30,7 @@
 -->
 
     <body>
+    <main role="main">
       <h1>The AWT Focus Subsystem</h1>
 
     <p>
@@ -101,7 +102,7 @@
      </ul>
 
       <a id="Overview"></a>
-      <h3>Overview of KeyboardFocusManager</h3>
+      <h2>Overview of KeyboardFocusManager</h2>
     <p>
       The focus model is centralized around a single class,
       KeyboardFocusManager, that provides a set of APIs for client code to
@@ -213,7 +214,7 @@ implementation in the <code>DefaultKeyboardFocusManager</code> class.
 
 
 <a id="BrowserContexts"></a>
-<h3>KeyboardFocusManager and Browser Contexts</h3>
+<h2>KeyboardFocusManager and Browser Contexts</h2>
 <p>
 Some browsers partition applets in different code bases into separate
 contexts, and establish walls between these contexts. Each thread and
@@ -229,7 +230,7 @@ owner, focused Window, or active Window, per ClassLoader.
 
 
 <a id="KeyEventDispatcher"></a>
-<h3>KeyEventDispatcher and KeyEventPostProcessor</h3>
+<h2>KeyEventDispatcher and KeyEventPostProcessor</h2>
 <p>
 While the user's KeyEvents should generally be delivered to the focus
 owner, there are rare cases where this is not desirable. An input
@@ -272,7 +273,7 @@ KeyEventPostProcessor, and similar restrictions apply to its use in
 that capacity.
 
 <a id="FocusEventAndWindowEvent"></a>
-<h3>FocusEvent and WindowEvent</h3>
+<h2>FocusEvent and WindowEvent</h2>
 <p>
 The AWT defines the following six event types central to the focus
 model in two different <code>java.awt.event</code> classes:
@@ -296,7 +297,7 @@ model in two different <code>java.awt.event</code> classes:
   </ol>
 
 <a id="EventDelivery"></a>
-<h3>Event Delivery</h3>
+<h2>Event Delivery</h2>
 <p>
 If the focus is not in java application and the user clicks on a focusable
 child Component<b>a</b> of an inactive Frame <b>b</b>, the following events
@@ -347,7 +348,7 @@ and VetoableChangeListener</a>.
 
 
 <a id="OppositeComponents"></a>
-<h3>Opposite Components and Windows</h3>
+<h2>Opposite Components and Windows</h2>
 <p>
 Each event includes information about the "opposite" Component or
 Window involved in the focus or activation change. For example, for a
@@ -371,7 +372,7 @@ using the opposite Component of a focus change that occurred within a
 top-level Window.
 
 <a id="TemporaryFocusEvents"></a>
-<h3>Temporary FocusEvents</h3>
+<h2>Temporary FocusEvents</h2>
 <p>
 <code>FOCUS_GAINED</code> and <code>FOCUS_LOST</code> events are
 marked as either temporary or permanent.
@@ -416,7 +417,7 @@ Components. This method is not intended for general use, but exists
 instead as a hook for lightweight Component libraries, such as Swing.
 
 <a id="FocusTraversal"></a>
-<h3>Focus Traversal</h3>
+<h2>Focus Traversal</h2>
 <p>
 Each Component defines its own Set of focus traversal keys for a given
 focus traversal operation. Components support separate Sets of keys
@@ -491,7 +492,7 @@ root, then no focus traversal operation occurs.
 
 
 <a id="FocusTraversalPolicy"></a>
-<h3>FocusTraversalPolicy</h3>
+<h2>FocusTraversalPolicy</h2>
 <p>
 
 A <code>FocusTraversalPolicy</code> defines the order in which Components within
@@ -653,7 +654,7 @@ All other applications, including pure AWT applications, will use
 <code>DefaultFocusTraversalPolicy</code> by default.
 
 <a id="FocusTraversalPolicyProviders"></a>
-<h3>Focus Traversal Policy Providers</h3>
+<h2>Focus Traversal Policy Providers</h2>
 <p>
   A Container that isn't a focus cycle root has an option to provide a
   FocusTraversalPolicy of its own. To do so, one needs to set Container's focus
@@ -740,7 +741,7 @@ All other applications, including pure AWT applications, will use
   </ul>
 
 <a id="ProgrammaticTraversal"></a>
-<h3>Programmatic Traversal</h3>
+<h2>Programmatic Traversal</h2>
 <p>
 In addition to user-initiated focus traversal, client code can
 initiate a focus traversal operation programmatically. To client code,
@@ -811,7 +812,7 @@ unchanged.
 
 
 <a id="Focusability"></a>
-<h3>Focusability</h3>
+<h2>Focusability</h2>
 <p>
 A focusable Component can become the focus owner ("focusability") and
 participates in keyboard focus traversal ("focus traversability") with
@@ -825,7 +826,7 @@ change this default by calling Component.setFocusable(boolean).
 
 
 <a id="FocusableWindows"></a>
-<h3>Focusable Windows</h3>
+<h2>Focusable Windows</h2>
 <p>
 To support palette windows and input methods, client code can prevent
 a Window from becoming the focused Window. By transitivity, this
@@ -877,7 +878,7 @@ all such focus change requests will fail. In this case, the global
 focus owner will be cleared and the focused Window will remain unchanged.
 
 <a id="RequestingFocus"></a>
-<h3>Requesting Focus</h3>
+<h2>Requesting Focus</h2>
 
 <p>
 A Component can request that it become the focus owner by calling
@@ -949,7 +950,7 @@ a temporary state.
 See <a href="#TemporaryFocusEvents">Temporary FocusEvents</a>
 
 <a id="FocusAndPropertyChangeListener"></a>
-<h3>Focus and PropertyChangeListener</h3>
+<h2>Focus and PropertyChangeListener</h2>
 <p>
 Client code can listen to changes in context-wide focus state, or to
 changes in focus-related state in Components, via
@@ -1020,7 +1021,7 @@ Window will never see a <code>PropertyChangeEvent</code> for the
 A Window is always a focus cycle root; this property cannot change.
 <p>
 <a id="FocusAndVetoableChangeListener"></a>
-<h3>Focus and VetoableChangeListener</h3>
+<h2>Focus and VetoableChangeListener</h2>
 <p>
 The <code>KeyboardFocusManager</code> also supports
 <code>VetoableChangeListener</code>s for the following properties:
@@ -1089,7 +1090,7 @@ vetoed focus changes and recovery attempts.
 
 
 <a id="ZOrder"></a>
-<h3>Z-Order</h3>
+<h2>Z-Order</h2>
 <p>
 On some native windowing systems, the Z-order of a Window can affect
 its focused or active (if applicable) state. On Microsoft Windows, the
@@ -1169,7 +1170,7 @@ Microsoft Windows and Solaris is as follows:
   </ul>
 
 <a id="ReplacingDefaultKeyboardFocusManager"></a>
-<h3>Replacing DefaultKeyboardFocusManager</h3>
+<h2>Replacing DefaultKeyboardFocusManager</h2>
 <p>
 <code>KeyboardFocusManager</code>s are pluggable at the browser context
 level. Client code can subclass <code>KeyboardFocusManager</code> or
@@ -1325,7 +1326,7 @@ and VetoableChangeListener</a>.
     </ul>
 
 <a id="Incompatibilities"></a>
-<h3>Incompatibilities with Previous Releases</h3>
+<h2>Incompatibilities with Previous Releases</h2>
   <p><b>Cross-platform changes:</b>
     <ol>
       <li>The default focus traversability for all Components is now
@@ -1361,6 +1362,6 @@ and VetoableChangeListener</a>.
           change requests in all cases. Previously, requests were granted
           for heavyweights, but denied for lightweights.
     </ol>
-
+  </main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
index e7c37d37510..c720ab2ee9c 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
@@ -5,7 +5,7 @@
   <title>The AWT Modality</title>
 </head>
 <!--
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
     <h1>The AWT Modality</h1>
 
     <p>
@@ -50,7 +50,7 @@
     </ul>
 
     <a id="Definitions"></a>
-    <h3>Definitions</h3>
+    <h2>Definitions</h2>
 
     <p>
       <u>Document</u> - a window without an owner that, together with
@@ -92,7 +92,7 @@
       <hr></blockquote>
 
     <a id="ModalityTypes"></a>
-    <h3>Modality types</h3>
+    <h2>Modality types</h2>
 
     <p>
       There are four supported modality types :
@@ -156,7 +156,7 @@
       <hr></blockquote>
 
     <a id="ShowHideBlocking"></a>
-    <h3>Show/hide blocking</h3>
+    <h2>Show/hide blocking</h2>
 
     <p>
       <u>Showing the window or modeless dialog: "F"</u><br>
@@ -261,7 +261,7 @@
       are performed for each of them in the order they were initially shown.
 
     <a id="ModalExclusion"></a>
-    </p><h3>Modal exclusion</h3>
+    </p><h2>Modal exclusion</h2>
 
     <p>
       There are two modal exclusion types introduced as of JDK 6
@@ -287,7 +287,7 @@
     </blockquote>
 
     <a id="Related"></a>
-    <h3>Related AWT features</h3>
+    <h2>Related AWT features</h2>
 
     <p>
       <u>Always-On-Top</u><br>
@@ -331,7 +331,7 @@
       unchanged.
 
     <a id="Security"></a>
-    <h3>Security</h3>
+    <h2>Security</h2>
 
     <p>
       A special <code>AWTPermission</code>, <code>"toolkitModality"</code>,
@@ -344,7 +344,7 @@
       blocked by a browser's or JWS's modal dialog.
 
     <a id="PlatformSupport"></a>
-    </p><h3>Platform support</h3>
+    </p><h2>Platform support</h2>
 
     <p>
       Two <code>java.awt.Toolkit</code> methods allow you to check whether
@@ -363,7 +363,7 @@
       </li></ul>
 
     <a id="Compatibility"></a>
-    <h3>Compatibility</h3>
+    <h2>Compatibility</h2>
 
     <p>
       The default modality type is application-modal. It is used by the API
@@ -374,7 +374,7 @@
       applets and applications launched from Java Web Start.
 
     <a id="Examples"></a>
-    </p><h3>Examples</h3>
+    </p><h2>Examples</h2>
 
     <table border="0">
       <tbody><tr>
@@ -458,5 +458,5 @@
         </td>
       </tr>
     </tbody></table>
-
+</main>
 </body></html>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
index c3b5e53530a..2034fa581cc 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
@@ -5,7 +5,7 @@
   <title>BMP Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2003, 2017, 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
@@ -30,6 +30,7 @@ questions.
 -->
 
 <body>
+<main role="main">
 <h1>BMP Metadata Format Specification</h1>
 
 The XML schema for the native image metadata format is as follows:
@@ -160,5 +161,5 @@ The XML schema for the native image metadata format is as follows:
 </pre>
 
 @since 1.5
-
+</main>
 </body>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
index 16a04d13ee6..cf83f39c46c 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
@@ -30,7 +30,7 @@ questions.
 -->
 
 <body>
-
+<main role="main">
 <h1>GIF Metadata Format Specification</h1>
 <a id="gif_stream_metadata_format"></a>
 <h2>GIF Stream Metadata Format Specification</h2>
@@ -434,6 +434,6 @@ advanced only on user input.
 "TRUE")</td>
 </tr>
 </table>
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
index 493f4142d2b..4c9b810c155 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
@@ -5,7 +5,7 @@
   <title>JPEG Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 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
@@ -30,7 +30,7 @@ questions.
 -->
 
 <body>
-
+<main role="main">
 <h1>JPEG Metadata Format Specification and Usage Notes</h1>
 
 <p>
@@ -1159,6 +1159,6 @@ format, performs a <code>reset</code> followed by a merge of the new tree.
   &lt;!-- All elements are as defined above for image metadata --&gt;
 ]&gt;
 </pre>
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
index b05fc42e78c..9211ecd67c4 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
@@ -5,7 +5,7 @@
   <title>PNG Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 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
@@ -30,7 +30,7 @@ questions.
 -->
 
 <body>
-
+<main role="main">
 <h1>PNG Metadata Format Specification</h1>
 
 <p>
@@ -561,6 +561,6 @@ written, or to determine the order of the chunks in a file being read.
           &lt;!-- Data type: String --&gt;
 ]&gt;
 </pre>
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
index ad5be43d352..c44b9271f9c 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
@@ -5,7 +5,7 @@
   <title>Standard Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 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
@@ -30,7 +30,7 @@ questions.
 -->
 
 <body>
-
+<main role="main">
 <h1>Standard (Plug-in Neutral) Metadata Format Specification</h1>
 
 <p> The plug-in neutral "javax_imageio_1.0" format consists
@@ -394,6 +394,6 @@ following DTD:
             &lt;!-- Data type: Integer --&gt;
 ]&gt;
 </pre>
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
index 23dee8cf7ca..4c9852919bd 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
@@ -5,7 +5,7 @@
     <title>TIFF Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 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
@@ -30,7 +30,7 @@ questions.
 -->
 
 <body>
-
+<main role="main">
 <h1>TIFF Metadata Format Specification and Usage Notes</h1>
 
 <a href="#Reading">Reading Images</a>
@@ -69,24 +69,24 @@ questions.
 <a href="#StreamMetadata">Native Stream Metadata Format</a><br/>
 <a href="#ImageMetadata">Native Image Metadata Format</a>
 
-<h3><a id="Reading">Reading Images</a></h3>
+<h2><a id="Reading">Reading Images</a></h2>
 
 TIFF images are read by an <a href="../../ImageReader.html">ImageReader</a>
 which may be controlled by its public interface as well as via a supplied
 <a href="../../plugins/tiff/TIFFImageReadParam.html">TIFFImageReadParam</a>.
 
-<!-- <h4>Supported Image Types</h4> -->
+<!-- <h3>Supported Image Types</h3> -->
 
 <!-- Table? -->
 
-<h4><a id="ColorConversionRead">Color Conversion</a></h4>
+<h3><a id="ColorConversionRead">Color Conversion</a></h3>
 
 <p>If the source image data
 have photometric type CIE L*a*b* or YCbCr, and the destination color space
 type is RGB, then the source image data will be automatically converted to
 RGB using an internal color converter.</p>
 
-<h4><a id="ColorSpacesRead">Color Spaces</a></h4>
+<h3><a id="ColorSpacesRead">Color Spaces</a></h3>
 
 The raw color space assigned by default, i.e., in the absence of a
 user-supplied <a href="../../ImageTypeSpecifier.html">ImageTypeSpecifier</a>,
@@ -154,7 +154,7 @@ foregoing, then an <code>ImageTypeSpecifier</code> should be
 supplied to the reader and should be derived from a color space which is correct
 for the data in question.</p>
 
-<h4><a id="ICCProfilesRead">ICC Profiles</a></h4>
+<h3><a id="ICCProfilesRead">ICC Profiles</a></h3>
 
 If an ICC profile is contained in the image metadata
 (<a href="../../plugins/tiff/BaselineTIFFTagSet.html">
@@ -196,7 +196,7 @@ space will be included in the
 more than one type, the first one will be based on the ICC profile and the
 second on the inferred color space.</p>
 
-<h4><a id="MetadataIssuesRead">Metadata Issues</a></h4>
+<h3><a id="MetadataIssuesRead">Metadata Issues</a></h3>
 
 By default all recognized fields in the TIFF image file directory (IFD) are
 loaded into the native image metadata object. Which fields are loaded may be
@@ -226,8 +226,8 @@ object may simplify gaining access to metadata values. An instance of
 object returned by the TIFF reader using the
 <code>TIFFDirectory.createFromMetadata</code> method.</p>
 
-<h5><a id="MapNativeStandard"></a>
-Mapping of TIFF Native Image Metadata to the Standard Metadata Format</h5>
+<h4><a id="MapNativeStandard"></a>
+Mapping of TIFF Native Image Metadata to the Standard Metadata Format</h4>
 
 The derivation of standard metadata format
 <a href="standard_metadata.html">javax_imageio_1.0</a>
@@ -349,12 +349,12 @@ unassociated alpha =&gt; "nonpremultiplied".</td>
 </tr>
 </table>
 
-<h4><a id="ExifRead">Reading Exif Images</a></h4>
+<h3><a id="ExifRead">Reading Exif Images</a></h3>
 
 The TIFF reader may be used to read an uncompressed Exif image or the
 contents of the <code>APP1</code> marker segment of a compressed Exif image.
 
-<h5><a id="ExifReadTIFF">Reading Uncompressed Exif Images</a></h5>
+<h4><a id="ExifReadTIFF">Reading Uncompressed Exif Images</a></h4>
 
 An uncompressed Exif image is a one- or two-page uncompressed TIFF image
 with a specific ordering of its IFD and image data content. Each pixel
@@ -386,7 +386,7 @@ Note that the Exif thumbnail is treated as a separate page in the TIFF
 stream and not as a thumbnail, i.e.,
 <code>tiffReader.hasThumbnails(0)</code> will return <code>false</code>.
 
-<h5><a id="ExifReadJPEG">Reading Compressed Exif Images</a></h5>
+<h4><a id="ExifReadJPEG">Reading Compressed Exif Images</a></h4>
 
 A compressed Exif image is a 3-band ISO/IEC 10918-1 baseline DCT JPEG stream
 with an inserted <code>APP1</code> marker segment. The parameters of the marker
@@ -453,7 +453,7 @@ images. Calling <code>tiffReader.read(0,&nbsp;readParam)</code> will throw
 an exception as the primary image in the embedded TIFF stream is always
 empty; the primary image should be obtained using the JPEG reader itself.
 
-<h3><a id="Writing">Writing Images</a></h3>
+<h2><a id="Writing">Writing Images</a></h2>
 
 TIFF images are written by a <a href="../../ImageWriter.html">ImageWriter</a> which may be
 controlled by its public interface as well as via a supplied
@@ -477,11 +477,11 @@ compression is being used and strips are being written, the number of
 rows per strip is rounded to a multiple of 8 times the maximum MCU over
 both dimensions.</p>
 
- <!-- <h4>Supported Image Types</h4> -->
+ <!-- <h3>Supported Image Types</h3> -->
 
 <!-- Table? -->
 
-<h4><a id="Compression">Compression</a></h4>
+<h3><a id="Compression">Compression</a></h3>
 
 The compression type may be set via the <code>setCompressionType()</code> method of
 the <code>ImageWriteParam</code> after setting the compression mode to
@@ -576,14 +576,14 @@ to derive the Deflate compression level. For JPEG the floating point
 quality value is passed directly to the JPEG writer plug-in which
 interprets it in the usual way.</p>
 
-<h4><a id="ColorConversionWrite">Color Conversion</a></h4>
+<h3><a id="ColorConversionWrite">Color Conversion</a></h3>
 
 <p>If the source image data
 color space type is RGB, and the destination photometric type is CIE L*a*b* or
 YCbCr, then the source image data will be automatically converted from
 RGB using an internal color converter.</p>
 
-<h4><a id="ICCProfilesWrite">ICC Profiles</a></h4>
+<h3><a id="ICCProfilesWrite">ICC Profiles</a></h3>
 
 An <code>ICC Profile</code> field will be written if either:
 <ul>
@@ -600,7 +600,7 @@ to the <code>ImageTypeSpecifier</code> of the image being written.
 </li>
 </ul>
 
-<h4><a id="MetadataIssuesWrite">Metadata Issues</a></h4>
+<h3><a id="MetadataIssuesWrite">Metadata Issues</a></h3>
 
 Some behavior of the writer is affected by or may affect the contents of
 the image metadata which may be supplied by the user.
@@ -713,8 +713,8 @@ field to be written a <code>TIFFField</code> may be added to the
 <code>IIOMetadata</code> object so obtained may then be passed to the TIFF
 writer.</p>
 
-<h5><a id="MapStandardNative"></a>
-Mapping of the Standard Metadata Format to TIFF Native Image Metadata</h5>
+<h4><a id="MapStandardNative"></a>
+Mapping of the Standard Metadata Format to TIFF Native Image Metadata</h4>
 
 The derivation of <a href="#ImageMetadata">TIFF native image metadata</a>
 elements from the standard metadata format
@@ -829,12 +829,12 @@ TIFF Fields, e.g., "Software", then the field is added with content
 </tr>
 </table>
 
-<h4><a id="ExifWrite">Writing Exif Images</a></h4>
+<h3><a id="ExifWrite">Writing Exif Images</a></h3>
 
 The TIFF writer may be used to write an uncompressed Exif image or the
 contents of the <code>APP1</code> marker segment of a compressed Exif image.
 
-<h5><a id="ExifWriteTIFF">Writing Uncompressed Exif Images</a></h5>
+<h4><a id="ExifWriteTIFF">Writing Uncompressed Exif Images</a></h4>
 
 When writing a sequence of images each image is normally recorded as
 {IFD,&nbsp;IFD Value,&nbsp;Image Data}. The Exif specification requires
@@ -901,7 +901,7 @@ written:
     }
 </code></pre>
 
-<h5><a id="ExifWriteJPEG">Writing Compressed Exif Images</a></h5>
+<h4><a id="ExifWriteJPEG">Writing Compressed Exif Images</a></h4>
 
 The structure of the embedded TIFF stream in the <code>APP1</code> segment of a
 compressed Exif image is identical to the <a href="#ExifStructure">
@@ -1008,7 +1008,7 @@ The <code>"unknown"</code> node created above would be appended to the
 and written to the JPEG stream when the primary image is written using
 the JPEG writer.
 
-<h3><a id="StreamMetadata">Stream Metadata</a></h3>
+<h2><a id="StreamMetadata">Stream Metadata</a></h2>
 
 The DTD for the TIFF native stream metadata format is as follows:
 
@@ -1025,7 +1025,7 @@ The DTD for the TIFF native stream metadata format is as follows:
 ]&gt;
 </pre>
 
-<h3><a id="ImageMetadata">Image Metadata</a></h3>
+<h2><a id="ImageMetadata">Image Metadata</a></h2>
 
 The DTD for the TIFF native image metadata format is as follows:
 
@@ -1174,6 +1174,6 @@ The DTD for the TIFF native image metadata format is as follows:
 </pre>
 
 @since 9
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
index e6141587d4f..b305029f2cf 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
@@ -5,7 +5,7 @@
   <title>WBMP Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2003, 2017, 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
@@ -30,6 +30,7 @@ questions.
 -->
 
 <body>
+<main role="main">
 <h1>WBMP Metadata Format Specification</h1>
 
 The XML schema for the native image metadata format is as follows:
@@ -62,5 +63,5 @@ The XML schema for the native image metadata format is as follows:
 </pre>
 
 @since 1.5
-
+</main>
 </body>
diff --git a/src/java.desktop/share/classes/javax/print/ServiceUI.java b/src/java.desktop/share/classes/javax/print/ServiceUI.java
index eca9faadc53..3990ba6c942 100644
--- a/src/java.desktop/share/classes/javax/print/ServiceUI.java
+++ b/src/java.desktop/share/classes/javax/print/ServiceUI.java
@@ -25,8 +25,6 @@
 
 package javax.print;
 
-import java.awt.Dialog;
-import java.awt.Frame;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
@@ -35,11 +33,11 @@ import java.awt.Window;
 
 import javax.print.attribute.Attribute;
 import javax.print.attribute.AttributeSet;
+import javax.print.attribute.standard.DialogOwner;
 import javax.print.attribute.PrintRequestAttributeSet;
 import javax.print.attribute.standard.Destination;
 import javax.print.attribute.standard.Fidelity;
 
-import sun.print.DialogOwner;
 import sun.print.ServiceDialog;
 import sun.print.SunAlternateMedia;
 
@@ -185,6 +183,7 @@ public class ServiceUI {
 
         DialogOwner dlgOwner = (DialogOwner)attributes.get(DialogOwner.class);
         Window owner = (dlgOwner != null) ? dlgOwner.getOwner() : null;
+        boolean setOnTop = (dlgOwner != null) && (owner == null);
 
         Rectangle gcBounds = (gc == null) ?  GraphicsEnvironment.
             getLocalGraphicsEnvironment().getDefaultScreenDevice().
@@ -192,21 +191,17 @@ public class ServiceUI {
 
         x += gcBounds.x;
         y += gcBounds.y;
-        ServiceDialog dialog;
-        if (owner instanceof Frame) {
-            dialog = new ServiceDialog(gc,
-                                       x,
-                                       y,
-                                       services, defaultIndex,
-                                       flavor, attributes,
-                                       (Frame)owner);
-        } else {
-            dialog = new ServiceDialog(gc,
-                                       x,
-                                       y,
-                                       services, defaultIndex,
-                                       flavor, attributes,
-                                       (Dialog)owner);
+        ServiceDialog dialog = new ServiceDialog(gc,
+                                                 x,
+                                                 y,
+                                                 services, defaultIndex,
+                                                 flavor, attributes,
+                                                 owner);
+        if (setOnTop) {
+            try {
+                dialog.setAlwaysOnTop(true);
+            } catch (SecurityException e) {
+            }
         }
         Rectangle dlgBounds = dialog.getBounds();
 
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java
new file mode 100644
index 00000000000..6e966c1ed0d
--- /dev/null
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java
@@ -0,0 +1,142 @@
+/*
+ * 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 javax.print.attribute.standard;
+
+import java.awt.Window;
+import javax.print.attribute.Attribute;
+import javax.print.attribute.PrintRequestAttribute;
+import sun.print.DialogOwnerAccessor;
+
+/**
+ * An attribute class used to support requesting a print or page setup dialog
+ * be kept displayed on top of all windows or some specific window.
+ * <p>
+ * Constructed without any arguments it will request that a print or page
+ * setup dialog be configured as if the application directly was to specify
+ * {@code java.awt.Window.setAlwaysOnTop(true)}, subject to permission checks.
+ * <p>
+ * Constructed with a {@link java.awt.Window} parameter, it requests that
+ * the dialog be owned by the specified window.
+ *
+ * @since 11
+ */
+public final class DialogOwner implements PrintRequestAttribute {
+
+    private static class Accessor extends DialogOwnerAccessor {
+
+         public long getOwnerID(DialogOwner owner) {
+             return owner.getID();
+         }
+    }
+
+    static private Accessor accessor = new Accessor();
+    static {
+             DialogOwnerAccessor.setAccessor(accessor);
+    }
+
+    private static final long serialVersionUID = -1901909867156076547L;
+
+    private Window owner;
+    private transient long id;
+
+    /**
+     * Constructs an instance which can be used to request
+     * {@code java.awt.Window.setAlwaysOnTop(true)} behaviour.
+     * This should be used where there is no application preferred owner window.
+     * Whether this has any effect depends on if always on top is supported
+     * for this platform and the particular dialog to be displayed.
+     */
+    public DialogOwner() {
+    }
+
+    /**
+     * Constructs an instance which can be used to request that the
+     * specified {@link java.awt.Window} be the owner of the dialog.
+     * @param owner window.
+     */
+    public DialogOwner(Window owner) {
+        this.owner = owner;
+    }
+
+    /**
+     * Constructs an instance which requests that the dialog be displayed
+     * as if it were a child of a native platform window, specified
+     * using its opqaue platform identifier or handle.
+     * This is useful mainly for the case where the id represents a window
+     * which may not be an AWT {@code Window}, but instead was created by
+     * another UI toolkit, such as OpenJFX.
+     * Any effect is platform dependent.
+     * @param id a native window identifier or handle
+     */
+    DialogOwner(long id) {
+        this.id = id;
+    }
+
+    /**
+     * Returns a native platform id or handle, if one was specified,
+     * otherwise, zero.
+     * @return a native platform id.
+     */
+    long getID() {
+        return id;
+    }
+
+    /**
+     * Returns a {@code Window owner}, if one was specified,
+     * otherwise {@code null}.
+     * @return an owner window.
+     */
+    public Window getOwner() {
+        return owner;
+    }
+
+    /**
+     * Get the printing attribute class which is to be used as the "category"
+     * for this printing attribute value.
+     * <p>
+     * For class {@code DialogOwner}, the category is class
+     * {@code DialogOwner} itself.
+     *
+     * @return printing attribute class (category), an instance of class
+     *         {@link Class java.lang.Class}
+     */
+    public final Class<? extends Attribute> getCategory() {
+        return DialogOwner.class;
+    }
+
+    /**
+     * Get the name of the category of which this attribute value is an
+     * instance.
+     * <p>
+     * For class {@code DialogOwner}, the category name is
+     * {@code "dialog-owner"}.
+     *
+     */
+    public final String getName() {
+        return "dialog-owner";
+
+    }
+}
diff --git a/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java b/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
index 9a928dcbdc0..d2dd96b52ec 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, 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
@@ -66,7 +66,9 @@ import com.sun.media.sound.ReferenceCountingDevice;
  * Properties can be used to specify default MIDI devices. Both system
  * properties and a properties file are considered. The "sound.properties"
  * properties file is read from an implementation-specific location (typically
- * it is the {@code conf} directory in the Java installation directory). If a
+ * it is the {@code conf} directory in the Java installation directory).
+ * The optional "javax.sound.config.file" system property can be used to specify
+ * the properties file that will be read as the initial configuration. If a
  * property exists both as a system property and in the properties file, the
  * system property takes precedence. If none is specified, a suitable default is
  * chosen among the available devices. The syntax of the properties file is
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
index 87936aeb155..7dd865b7f05 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, 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
@@ -64,7 +64,9 @@ import com.sun.media.sound.JDK13Services;
  * Both system properties and a properties file are considered. The
  * "sound.properties" properties file is read from an implementation-specific
  * location (typically it is the {@code conf} directory in the Java installation
- * directory). If a property exists both as a system property and in the
+ * directory). The optional "javax.sound.config.file" system property can be
+ * used to specify the properties file that will be read as the initial
+ * configuration. If a property exists both as a system property and in the
  * properties file, the system property takes precedence. If none is specified,
  * a suitable default is chosen among the available devices. The syntax of the
  * properties file is specified in
diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java
index c6f4a7165dd..ce858c5eb9f 100644
--- a/src/java.desktop/share/classes/javax/swing/JApplet.java
+++ b/src/java.desktop/share/classes/javax/swing/JApplet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package javax.swing;
 
 import java.applet.Applet;
@@ -93,11 +94,8 @@ import javax.accessibility.AccessibleContext;
  * @author Arnaud Weber
  * @since 1.2
  *
- * @deprecated  The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package documentation</a>
- * for further information.
+ * @deprecated The Applet API is deprecated, no replacement.
  */
-
 @Deprecated(since = "9")
 @JavaBean(defaultProperty = "JMenuBar", description = "Swing's Applet subclass.")
 @SwingContainer(delegate = "getContentPane")
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
index b636e716815..9a002777058 100644
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -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
@@ -46,7 +46,6 @@ import sun.swing.SwingUtilities2.Section;
 import static sun.swing.SwingUtilities2.Section.*;
 
 /**
- * <a id="jtree_description"></a>
  * A control that displays a set of hierarchical data as an outline.
  * You can find task-oriented documentation and examples of using trees in
  * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tree.html">How to Use Trees</a>,
@@ -3778,7 +3777,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
       * <code>TreeModel</code> changes.
       * <p>
       * For more information on what expanded state means, see the
-      * <a href=#jtree_description>JTree description</a> above.
+      * {@link JTree JTree description} above.
       *
       * @return the instance of {@code TreeModelHandler}
       */
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
index 42fc80b49a7..6d0dfecd334 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
@@ -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
@@ -882,7 +882,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
      * To prevent this from happening twice, this method is
      * reimplemented to simply paint.
      * <p>
-     * <em>NOTE:</em> NOTE: Superclass is also not thread-safe in its
+     * <em>NOTE:</em> Superclass is also not thread-safe in its
      * rendering of the background, although that is not an issue with the
      * default rendering.
      */
@@ -1283,8 +1283,8 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
      * text component (i.e. the root of the hierarchy) that
      * can be traversed to determine how the model is being
      * represented spatially.
-     * <p style="color:red;">
-     * <b>NOTE:</b>The View hierarchy can
+     * <p>
+     * <strong>Warning:</strong> The View hierarchy can
      * be traversed from the root view, and other things
      * can be done as well.  Things done in this way cannot
      * be protected like simple method calls through the TextUI.
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html b/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
index 84dd05720bc..eb174dda033 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
@@ -5,7 +5,7 @@
   <title>Using the Multiplexing Look and Feel</title>
 </head>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>Using the Multiplexing Look and Feel</h1>
 
 <blockquote>
@@ -497,6 +497,6 @@ if you use this kind of statement, be careful, because the suppliers
 of auxiliary look and feels will most likely have developed and
 tested against our Multiplexing look and feel.
 </p>
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
index d7f09b7bf45..5a248309671 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
@@ -5,7 +5,7 @@
   <title>Nimbus colors</title>
 </head>
 <!--
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 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
@@ -30,6 +30,7 @@
 -->
 
 <body>
+<main role="main">
 <h1 id="primaryColors">Primary Colors</h1>
 <table summary="Nimbus primary colors">
 <tr><th>Key</th><th>Value</th><th>Preview</th></tr>
@@ -229,6 +230,6 @@
 <td width="100" bgcolor="#8e8f91">&nbsp;</td>
 </tr>
 </table>
-
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
index 76e37d3a0ff..b7696741118 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
@@ -5,7 +5,7 @@
   <title>Component Specific Properties</title>
 </head>
 <!--
-Copyright (c) 2003, 2017, 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
@@ -29,8 +29,9 @@ or visit www.oracle.com if you need additional information or have any
 questions.
 -->
 
-<body bgcolor="white">
-<h3>Component Specific Properties</h3>
+<body>
+<main role="main">
+<h1>Component Specific Properties</h1>
 <p> The look, and to some degree the feel of Synth
   can be customized by way of component specific properties.
   These properties are accessed from <a
@@ -43,7 +44,7 @@ questions.
       unspecified: typically a <code>ClassCastException</code> is
       thrown, but it is implementation specific.
     </p>
-<h4>ArrowButton</h4>
+<h2>ArrowButton</h2>
 <p> ArrowButton is a special type of JButton that renders an arrow.
 ArrowButton is typically not created directly, rather some of the
 Components will create it       to render a button with an arrow. The
@@ -52,7 +53,7 @@ JComboBox, JScrollBar and JSplitPane (for the buttons on the divider).
 In       addition to the <a
  href="#buttonProperties">Button 	properties</a>, ArrowButton supports
 the following properties: </p>
-<h5>ArrowButton Specific Properties</h5>
+<h3>ArrowButton Specific Properties</h3>
 <table border="1" summary="ArrowButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -70,11 +71,11 @@ the following properties: </p>
   </tbody>
 </table>
 <br>
-<h4><a id="JButton">JButton</a></h4>
+<h2><a id="JButton">JButton</a></h2>
 <p> JButton paints text using the TEXT_FOREGROUND ColorType. In addition
 to the <a href="#buttonProperties">Button 	properties</a>, JButton
 supports the following property: </p>
-<h5>JButton Specific Properties</h5>
+<h3>JButton Specific Properties</h3>
 <table border="1" summary="JButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -93,11 +94,11 @@ button that is 	    receiving focus. </td>
   </tbody>
 </table>
 <br>
-<h4><a id="JCheckBox">JCheckBox</a></h4>
+<h2><a id="JCheckBox">JCheckBox</a></h2>
 <p> JCheckBox paints text using the TEXT_FOREGROUND ColorType. In
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JCheckBox supports the following property: </p>
-<h5>JCheckBox Specific Properties</h5>
+<h3>JCheckBox Specific Properties</h3>
 <table border="1" summary="JCheckBox specific properties">
   <thead><tr>
     <th>Property</th>
@@ -115,7 +116,7 @@ JCheckBox supports the following property: </p>
   </tbody>
 </table>
 <br>
-<h4><a id="JComboBox">JComboBox</a></h4>
+<h2><a id="JComboBox">JComboBox</a></h2>
 <p> JComboBox is a composite component that consists of the following
 child Components: </p>
 <table border="1" summary="JComboBox child components">
@@ -164,7 +165,7 @@ the renderer is a UIResource. 	</td>
   </tbody>
 </table>
 
-<h5>JComboBox Specific Properties</h5>
+<h3>JComboBox Specific Properties</h3>
 <table border="1" summary="JComboBox specific properties">
   <thead><tr>
     <th>Property</th>
@@ -183,8 +184,8 @@ with the keyboard. </td>
   </tbody>
 </table>
 <br>
-<h4>JFileChooser</h4>
-<h5>JFileChooser Specific Properties</h5>
+<h2>JFileChooser</h2>
+<h3>JFileChooser Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JFileChooser specific properties"
  style="width: 100%; text-align: left;">
   <tbody>
@@ -343,8 +344,8 @@ of the file chooser.<br>
   </tbody>
 </table>
 <br>
-<h4><a id="JInternalFrame"></a>JInternalFrame</h4>
-<h5>JInternalFrame Specific Properties</h5>
+<h2><a id="JInternalFrame"></a>JInternalFrame</h2>
+<h3>JInternalFrame Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JInternalFrame specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -373,11 +374,11 @@ the system menu will be shown.<br>
   </tbody>
 </table>
 <br>
-<h4><a id="JInternalFrameTitlePane"></a>JInternalFrameTitlePane</h4>
+<h2><a id="JInternalFrameTitlePane"></a>JInternalFrameTitlePane</h2>
 <p>JInternalFrameTitlePane is the control bar located at the top of the
 internal frame similar to that found in a frame.<br>
 </p>
-<h5>JInternalFrameTitlePane Specific Properties</h5>
+<h3>JInternalFrameTitlePane Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JInternalFrameTitlePane specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -473,10 +474,10 @@ abililty to close the internal frame.
   </tbody>
 </table>
 <br>
-<h4><a id="JList">JList</a></h4>
+<h2><a id="JList">JList</a></h2>
 <p> JList's sets the name of the renderer to List.renderer.       JList
 supports the following properties: </p>
-<h5>JList Specific Properties</h5>
+<h3>JList Specific Properties</h3>
 <table border="1" summary="JList specific properties">
   <thead><tr>
     <th>Property</th>
@@ -512,7 +513,7 @@ is not invoked. </td>
   </tbody>
 </table>
 <br>
-<h4><a id="menuProperties">Menu Properties</a></h4>
+<h2><a id="menuProperties">Menu Properties</a></h2>
 <p> The Menu classes (JCheckBoxMenuItem, JMenu, JMenuItem, and
 JRadioButtonMenuItem) all support the same set of properties and behave
 similarly.       Each component consists of two Regions: the region
@@ -597,12 +598,12 @@ RadioButtonMenuItem. </p>
   </tbody>
 </table>
 <br>
-<h4><a id="JOptionPane">JOptionPane</a></h4>
+<h2><a id="JOptionPane">JOptionPane</a></h2>
 <p> JOptionPane is a composite component and may consist of numerous child
 components, they are: OptionPane.button, OptionPane.label,
 OptionPane.comboBox, OptionPane.scrollPane, OptionPane.list,
 OptionPane.textField, OptionPane.iconLabel. </p>
-<h5>JOptionPane Specific Properties</h5>
+<h3>JOptionPane Specific Properties</h3>
 <table border="1" summary="JOptionPane specific properties">
   <thead><tr>
     <th>Property</th>
@@ -713,10 +714,10 @@ it follows the other buttons. 	</td>
   </tbody>
 </table>
 <br>
-<h4><a id="JProgressBar"></a>JProgressBar<br>
-</h4>
-<h5>JProgressBar Specific Properties<br>
-</h5>
+<h2><a id="JProgressBar"></a>JProgressBar<br>
+</h2>
+<h3>JProgressBar Specific Properties<br>
+</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JProgressBar specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -753,11 +754,11 @@ the bouncing box per frame when the progress bar is indeterminate.<br>
     </tr>
   </tbody>
 </table>
-<h4><a id="JRadioButton">JRadioButton</a></h4>
+<h2><a id="JRadioButton">JRadioButton</a></h2>
 <p> JRadioButton paints text using the TEXT_FOREGROUND ColorType. In
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JRadioButton supports the following property: </p>
-<h5>JRadioButton Specific Properties</h5>
+<h3>JRadioButton Specific Properties</h3>
 <table border="1" summary="JRadioButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -775,7 +776,7 @@ JRadioButton supports the following property: </p>
   </tbody>
 </table>
 <br>
-<h4><a id="JScrollBar">JScrollBar</a></h4>
+<h2><a id="JScrollBar">JScrollBar</a></h2>
 <p> JScrollBar is a composite component that consists of the following
 child Components: </p>
 <table border="1" summary="JScrollBar child components">
@@ -793,7 +794,7 @@ child Components: </p>
   </tbody>
 </table>
 
-<h5>JScrollBar Specific Properties</h5>
+<h3>JScrollBar Specific Properties</h3>
 <table border="1" summary="JScrollBar specific properties">
   <thead><tr>
     <th>Property</th>
@@ -845,7 +846,7 @@ will be made equal. 	</td>
   </tbody>
 </table>
 <br>
-<h4><a id="Separator">Separators</a></h4>
+<h2><a id="Separator">Separators</a></h2>
 <p> All of the separator classes, JSeparator, JPopupMenu.Separator and
 JToolBar.Separator use the same property: </p>
 <table border="1" summary="Separator classes common properties">
@@ -887,7 +888,7 @@ preferred size will include the Insets. </td>
   </tbody>
 </table>
 <br>
-<h4><a id="JScrollPane">JScrollPane</a></h4>
+<h2><a id="JScrollPane">JScrollPane</a></h2>
 <p>
       JScrollPane is unique in that it provides a method for setting
       the Border around the JViewport with JViewport throwing an
@@ -900,7 +901,7 @@ preferred size will include the Insets. </td>
       <code>paintViewportBorder</code> is called to paint the
       <code>Viewport</code>s border.
  </p>
-<h5>JScrollPane Specific Properties</h5>
+<h3>JScrollPane Specific Properties</h3>
 <table border="1" summary="JScrollPane specific properties">
   <thead><tr>
     <th>Property</th>
@@ -918,13 +919,13 @@ preferred size will include the Insets. </td>
   </tbody>
 </table>
 <br>
-<h4><a id="JSplitPane">JSplitPane</a></h4>
+<h2><a id="JSplitPane">JSplitPane</a></h2>
 <p> JSplitPane is a composite component that will contain a divider and
 potentially two buttons, if setOneTouchExpandable(true) has been
 invoked. The two buttons will be named:
 SplitPaneDivider.leftOneTouchButton and
 SplitPaneDivider.rightOneTouchButton. </p>
-<h5>JSplitPane Specific Properties</h5>
+<h3>JSplitPane Specific Properties</h3>
 <table border="1" summary="JSplitPane specific properties">
   <thead><tr>
     <th>Property</th>
@@ -967,8 +968,8 @@ setOneTouchExpandable. 	</td>
   </tbody>
 </table>
 <br>
-<h4><a id="JSlider"></a>JSlider</h4>
-<h5>JSlider Specific Properties</h5>
+<h2><a id="JSlider"></a>JSlider</h2>
+<h3>JSlider Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JSlider specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -1027,8 +1028,8 @@ of the slider.<br>
   </tbody>
 </table>
 <br>
-<h4><a id="JTabbedPane"></a>JTabbedPane</h4>
-<h5>JTabbedPane Specific Properties</h5>
+<h2><a id="JTabbedPane"></a>JTabbedPane</h2>
+<h3>JTabbedPane Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JTabbedPane specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -1089,10 +1090,10 @@ selected tab.<br>
   </tbody>
 </table>
 <br>
-<h4><a id="JTable">JTable</a></h4>
+<h2><a id="JTable">JTable</a></h2>
 <p> JTable sets the name of the renderer to Table.cellRenderer.
 JTable supports the following properties: </p>
-<h5>JTable Specific Properties</h5>
+<h3>JTable Specific Properties</h3>
 <table border="1" summary="JTable specific properties">
   <thead><tr>
     <th>Property</th>
@@ -1134,10 +1135,10 @@ renderer will only succeed if it is a Synth Border. 	</td>
   </tbody>
 </table>
 <br>
-<h4><a id="JTree">JTree</a></h4>
+<h2><a id="JTree">JTree</a></h2>
 <p> JTree sets the name of the renderer to Tree.renderer, the name of
 the editor is Tree.cellEditor.</p>
-<h5>JTree Specific Properties</h5>
+<h3>JTree Specific Properties</h3>
 <table border="1" summary="JTree specific properties">
   <thead><tr>
     <th>Property</th>
@@ -1217,11 +1218,11 @@ and <a href="synthFileFormat.html#e.graphicsUtils">binding it</a> to the tree.</
     </tr>
   </tbody>
 </table>
-<h4><a id="JToggleButton">JToggleButton</a></h4>
+<h2><a id="JToggleButton">JToggleButton</a></h2>
 <p> JToggleButton paints text using the TEXT_FOREGROUND ColorType. In
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JToggleButton supports the following property: </p>
-<h5>JToggleButton Specific Properties</h5>
+<h3>JToggleButton Specific Properties</h3>
 <table border="1" summary="JToggleButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -1239,7 +1240,7 @@ JToggleButton supports the following property: </p>
   </tbody>
 </table>
 <br>
-<h4><a id="buttonProperties">Button Properties</a></h4>
+<h2><a id="buttonProperties">Button Properties</a></h2>
 <p> Each of the Button classes (JButton, JCheckBox, JRadioButton,
 JToggleButton and SynthArrowButton) support a similar set of properties.
 These properties are: </p>
@@ -1292,8 +1293,8 @@ the button is in a pressed state and does 	    not have a pressed icon. </td>
 <p> <code>Prefix</code> is one of: Button, CheckBox, RadioButton or
 JToggleButton.<br>
 </p>
-<h4><a id="textProperties"></a>Text Properties<br>
-</h4>
+<h2><a id="textProperties"></a>Text Properties<br>
+</h2>
 <table cellpadding="2" cellspacing="2" border="1" summary="Text properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -1341,5 +1342,6 @@ the blink rate fo the caret.<br>
 <p><code>Prefix</code> is one of: EditorPane, FormattedTextField,
 PasswordField, TextArea, TextField or TextPane.<br>
 </p>
+</main>
 </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
index b6c9b6337a1..35e16e2076e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8"/>
   <title>Synth File Format</title>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
@@ -45,7 +45,8 @@ div.example {
   </head>
 
   <body>
-    <h2><a id="file">File Format</a></h2>
+  <main role="main">
+    <h1><a id="file">File Format</a></h1>
     <p>
       Synth's file format (<a href="synth.dtd">dtd</a>)
       allows for specifying all the pieces
@@ -98,7 +99,7 @@ div.example {
       Parsing will fail only if a necessary attribute is not
       specified, or of the wrong type.
 
-    <h3>The synth element</h3>
+    <h2>The synth element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.synth">synth</a> ((<a href="#ee.beansPersistance">%beansPersistance;</a>) | <a href="#e.style">style</a> | <a href="#e.bind">bind</a> | <a href="#e.font">font</a> | <a href="#e.color">color</a> |
@@ -118,7 +119,7 @@ div.example {
     </p>
 
 
-    <h3>The style element</h3>
+    <h2>The style element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.style">style</a> (<a href="#e.property">property</a> | <a href="#e.defaultsProperty">defaultsProperty</a> | <a href="#e.state">state</a> | <a href="#e.font">font</a> | <a href="#e.graphicsUtils">graphicsUtils</a> |
@@ -172,7 +173,7 @@ div.example {
       </pre>
     </div>
 
-    <h3>The state element</h3>
+    <h2>The state element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.state">state</a> (<a href="#e.color">color</a> | <a href="#e.font">font</a> | <a href="#e.painter">painter</a> | <a href="#e.imagePainter">imagePainter</a> | (<a href="#ee.beansPersistance">%beansPersistance;</a>) |
@@ -248,7 +249,7 @@ div.example {
       chosen, otherwise if the state is SELECTED, but not does not
       contain PRESSED, state <code>two</code> will be used.
 
-    <h3>The font element</h3>
+    <h2>The font element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.font">font</a> EMPTY>
@@ -317,7 +318,7 @@ div.example {
     </p>
 
 
-    <h3>The color element</h3>
+    <h2>The color element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.color">color</a> EMPTY>
@@ -394,7 +395,7 @@ div.example {
     </pre>
 </div>
 
-    <h3>The property element</h3>
+    <h2>The property element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.property">property</a> EMPTY>
@@ -516,7 +517,7 @@ div.example {
       <code>UIManager.get("Table.focusCellForeground")</code>.
     </p>
 
-    <h3>The graphicsUtils element</h3>
+    <h2>The graphicsUtils element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.graphicsUtils">graphicsUtils</a> EMPTY>
@@ -548,7 +549,7 @@ div.example {
     </pre>
 </div>
 
-    <h3>The insets element</h3>
+    <h2>The insets element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.insets">insets</a> EMPTY>
@@ -592,7 +593,7 @@ div.example {
     </pre>
 </div>
 
-    <h3>The bind element</h3>
+    <h2>The bind element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.bind">bind</a> EMPTY>
@@ -701,7 +702,7 @@ div.example {
     </pre>
 </div>
 
-    <h3>The painter element</h3>
+    <h2>The painter element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.painter">painter</a> EMPTY>
@@ -815,7 +816,7 @@ div.example {
 	  handle it.
 	</p>
 
-    <h3>The imagePainter element</h3>
+    <h2>The imagePainter element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.imagePainter">imagePainter</a> EMPTY>
@@ -911,7 +912,7 @@ div.example {
       understand how identical painters are handled.
 
 
-    <h3>The imageIcon element</h3>
+    <h2>The imageIcon element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.imageIcon">imageIcon</a> EMPTY>
@@ -945,7 +946,7 @@ div.example {
     </pre>
 </div>
 
-   <h3>The opaque element</h3>
+   <h2>The opaque element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.opaque">opaque</a> EMPTY>
@@ -976,7 +977,7 @@ div.example {
     </pre>
 </div>
 
-    <h3><a id="ee.beansPersistance">The beansPersistance entity</a></h3>
+    <h2><a id="ee.beansPersistance">The beansPersistance entity</a></h2>
     <p>
       Beans persistance can be used to embed any Object. This is
       typically used for embedding your own Painters, but can be used
@@ -986,7 +987,7 @@ div.example {
       for details on beans persistance.
 
 
-    <h3>Backing Style</h3>
+    <h2>Backing Style</h2>
     <p>
       In creating a Synth file it's good practice to create a backing
       style that is used by all components.  This will make sure that
@@ -1008,6 +1009,6 @@ div.example {
 &lt;/synth>
       </pre>
     </div>
-
+  </main>
   </body>
 </html>
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index df6011d1f94..c2beb780a65 100644
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -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
@@ -171,7 +171,7 @@ import sun.swing.SwingAccessor;
  *     <td>input methods
  *     <td>(generated here)
  *   <tr>
- *     <th scope="row" headers="stage">2.
+ *     <th scope="row">2.
  *     <td>focus manager
  *     <td>
  *   </tr>
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
index 0fec6a9ced1..748a5ebbe7a 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -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
@@ -112,7 +112,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR;
  *     &lt;title&gt;An example HTMLDocument&lt;/title&gt;
  *     &lt;style type="text/css"&gt;
  *       div { background-color: silver; }
- *       ul { color: red; }
+ *       ul { color: blue; }
  *     &lt;/style&gt;
  *   &lt;/head&gt;
  *   &lt;body&gt;
@@ -204,7 +204,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR;
  * <!--insertAfterStart-->
  *     <td style="white-space:nowrap">
  *       <div style="background-color: silver;">
- *         <ul style="color: red;">
+ *         <ul style="color: blue;">
  *           <li>List Item</li>
  *         </ul>
  *         <p>Paragraph 1</p>
@@ -216,14 +216,14 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR;
  *       <div style="background-color: silver;">
  *         <p>Paragraph 1</p>
  *         <p>Paragraph 2</p>
- *         <ul style="color: red;">
+ *         <ul style="color: blue;">
  *           <li>List Item</li>
  *         </ul>
  *       </div>
  *     </td>
  * <!--insertBeforeStart-->
  *     <td style="white-space:nowrap">
- *       <ul style="color: red;">
+ *       <ul style="color: blue;">
  *         <li>List Item</li>
  *       </ul>
  *       <div style="background-color: silver;">
@@ -237,21 +237,21 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR;
  *         <p>Paragraph 1</p>
  *         <p>Paragraph 2</p>
  *       </div>
- *       <ul style="color: red;">
+ *       <ul style="color: blue;">
  *         <li>List Item</li>
  *       </ul>
  *     </td>
  * <!--setInnerHTML-->
  *     <td style="white-space:nowrap">
  *       <div style="background-color: silver;">
- *         <ul style="color: red;">
+ *         <ul style="color: blue;">
  *           <li>List Item</li>
  *         </ul>
  *       </div>
  *     </td>
  * <!--setOuterHTML-->
  *     <td style="white-space:nowrap">
- *       <ul style="color: red;">
+ *       <ul style="color: blue;">
  *         <li>List Item</li>
  *       </ul>
  *     </td>
@@ -1001,16 +1001,16 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * <p>Invoking <code>setInnerHTML(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *     &lt;body&gt;
      *       |
      *     <b>&lt;div&gt;</b>
      *         \
-     *         <span style="color: red;">&lt;ul&gt;</span>
+     *         <span style="color: blue;">&lt;ul&gt;</span>
      *           \
-     *           <span style="color: red;">&lt;li&gt;</span>
+     *           <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Parameter <code>elem</code> must not be a leaf element,
@@ -1085,14 +1085,14 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * <p>Invoking <code>setOuterHTML(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *    &lt;body&gt;
      *      |
-     *     <span style="color: red;">&lt;ul&gt;</span>
+     *     <span style="color: blue;">&lt;ul&gt;</span>
      *       \
-     *       <span style="color: red;">&lt;li&gt;</span>
+     *       <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>If either <code>elem</code> or <code>htmlText</code>
@@ -1158,16 +1158,16 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * <p>Invoking <code>insertAfterStart(elem,
      * "&lt;ul&gt;&lt;li&gt;")</code> results in the following structure
-     * (new elements are <span style="color: red;">in red</span>).</p>
+     * (new elements are <span style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *          |
      *        <b>&lt;div&gt;</b>
      *       /  |  \
-     *    <span style="color: red;">&lt;ul&gt;</span> &lt;p&gt; &lt;p&gt;
+     *    <span style="color: blue;">&lt;ul&gt;</span> &lt;p&gt; &lt;p&gt;
      *     /
-     *  <span style="color: red;">&lt;li&gt;</span>
+     *  <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Unlike the <code>insertBeforeStart</code> method, new
@@ -1231,16 +1231,16 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * <p>Invoking <code>insertBeforeEnd(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *          |
      *        <b>&lt;div&gt;</b>
      *       /  |  \
-     *     &lt;p&gt; &lt;p&gt; <span style="color: red;">&lt;ul&gt;</span>
+     *     &lt;p&gt; &lt;p&gt; <span style="color: blue;">&lt;ul&gt;</span>
      *               \
-     *               <span style="color: red;">&lt;li&gt;</span>
+     *               <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Unlike the <code>insertAfterEnd</code> method, new elements
@@ -1301,14 +1301,14 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * <p>Invoking <code>insertBeforeStart(elem,
      * "&lt;ul&gt;&lt;li&gt;")</code> results in the following structure
-     * (new elements are <span style="color: red;">in red</span>).</p>
+     * (new elements are <span style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *         /  \
-     *      <span style="color: red;">&lt;ul&gt;</span> <b>&lt;div&gt;</b>
+     *      <span style="color: blue;">&lt;ul&gt;</span> <b>&lt;div&gt;</b>
      *       /    /  \
-     *     <span style="color: red;">&lt;li&gt;</span> &lt;p&gt;  &lt;p&gt;
+     *     <span style="color: blue;">&lt;li&gt;</span> &lt;p&gt;  &lt;p&gt;
      * </pre>
      *
      * <p>Unlike the <code>insertAfterStart</code> method, new
@@ -1362,14 +1362,14 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * <p>Invoking <code>insertAfterEnd(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *         /  \
-     *      <b>&lt;div&gt;</b> <span style="color: red;">&lt;ul&gt;</span>
+     *      <b>&lt;div&gt;</b> <span style="color: blue;">&lt;ul&gt;</span>
      *       / \    \
-     *     &lt;p&gt; &lt;p&gt;  <span style="color: red;">&lt;li&gt;</span>
+     *     &lt;p&gt; &lt;p&gt;  <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Unlike the <code>insertBeforeEnd</code> method, new elements
diff --git a/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java b/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java
index 38a4e93415e..c3d3aa0da02 100644
--- a/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java
+++ b/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, 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
@@ -25,31 +25,28 @@
 
 package sun.applet;
 
-import java.lang.NullPointerException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.SocketPermission;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.io.BufferedInputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FilePermission;
 import java.io.IOException;
-import java.io.BufferedInputStream;
 import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.NoSuchElementException;
-import java.security.AccessController;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
 import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
+import java.security.AccessController;
 import java.security.CodeSource;
 import java.security.Permission;
 import java.security.PermissionCollection;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.NoSuchElementException;
+
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.net.www.ParseUtil;
@@ -151,13 +148,10 @@ public class AppletClassLoader extends URLClassLoader {
         try {
             return super.loadClass(name, resolve);
         } catch (ClassNotFoundException e) {
-            //printError(name, e.getException());
             throw e;
         } catch (RuntimeException e) {
-            //printError(name, e);
             throw e;
         } catch (Error e) {
-            //printError(name, e);
             throw e;
         }
     }
@@ -825,30 +819,6 @@ public     void grab() {
     {
         return jdk12AppletInfo.get(clazz.toString());
     }
-
-    private static AppletMessageHandler mh =
-        new AppletMessageHandler("appletclassloader");
-
-    /*
-     * Prints a class loading error message.
-     */
-    private static void printError(String name, Throwable e) {
-        String s = null;
-        if (e == null) {
-            s = mh.getMessage("filenotfound", name);
-        } else if (e instanceof IOException) {
-            s = mh.getMessage("fileioexception", name);
-        } else if (e instanceof ClassFormatError) {
-            s = mh.getMessage("fileformat", name);
-        } else if (e instanceof ThreadDeath) {
-            s = mh.getMessage("filedeath", name);
-        } else if (e instanceof Error) {
-            s = mh.getMessage("fileerror", e.toString(), name);
-        }
-        if (s != null) {
-            System.err.println(s);
-        }
-    }
 }
 
 /*
diff --git a/src/java.desktop/share/classes/sun/applet/AppletEvent.java b/src/java.desktop/share/classes/sun/applet/AppletEvent.java
deleted file mode 100644
index 6a1a5880fc8..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletEvent.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1997, 2014, 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 sun.applet;
-
-import java.util.EventObject;
-
-
-/**
- * AppletEvent class.
- *
- * @author  Sunita Mani
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@SuppressWarnings("serial") // JDK-implementation class
-@Deprecated(since = "9")
-public class AppletEvent extends EventObject {
-
-    private Object arg;
-    private int id;
-
-
-    public AppletEvent(Object source, int id, Object argument) {
-        super(source);
-        this.arg = argument;
-        this.id = id;
-    }
-
-    public int getID() {
-        return id;
-    }
-
-    public Object getArgument() {
-        return arg;
-    }
-
-    public String toString() {
-        String str = getClass().getName() + "[source=" + source + " + id="+ id;
-        if (arg != null) {
-            str += " + arg=" + arg;
-        }
-        str += " ]";
-        return str;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java b/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
deleted file mode 100644
index 31542d0665b..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 1997, 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 sun.applet;
-
-import java.util.EventListener;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.IOException;
-
-/**
- * AppletEventMulticaster class.  This class manages an immutable
- * structure consisting of a chain of AppletListeners and is
- * responsible for dispatching events to them.
- *
- * @author  Sunita Mani
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@Deprecated(since = "9")
-public class AppletEventMulticaster implements AppletListener {
-
-    private final AppletListener a, b;
-
-    public AppletEventMulticaster(AppletListener a, AppletListener b) {
-        this.a = a; this.b = b;
-    }
-
-    public void appletStateChanged(AppletEvent e) {
-        a.appletStateChanged(e);
-        b.appletStateChanged(e);
-    }
-
-    /**
-     * Adds Applet-listener-a with Applet-listener-b and
-     * returns the resulting multicast listener.
-     * @param a Applet-listener-a
-     * @param b Applet-listener-b
-     */
-    public static AppletListener add(AppletListener a, AppletListener b) {
-        return addInternal(a, b);
-    }
-
-    /**
-     * Removes the old Applet-listener from Applet-listener-l and
-     * returns the resulting multicast listener.
-     * @param l Applet-listener-l
-     * @param oldl the Applet-listener being removed
-     */
-    public static AppletListener remove(AppletListener l, AppletListener oldl) {
-        return removeInternal(l, oldl);
-    }
-
-    /**
-     * Returns the resulting multicast listener from adding listener-a
-     * and listener-b together.
-     * If listener-a is null, it returns listener-b;
-     * If listener-b is null, it returns listener-a
-     * If neither are null, then it creates and returns
-     * a new AppletEventMulticaster instance which chains a with b.
-     * @param a event listener-a
-     * @param b event listener-b
-     */
-    private static AppletListener addInternal(AppletListener a, AppletListener b) {
-        if (a == null)  return b;
-        if (b == null)  return a;
-        return new AppletEventMulticaster(a, b);
-    }
-
-
-    /**
-     * Removes a listener from this multicaster and returns the
-     * resulting multicast listener.
-     * @param oldl the listener to be removed
-     */
-    protected AppletListener remove(AppletListener oldl) {
-        if (oldl == a)  return b;
-        if (oldl == b)  return a;
-        AppletListener a2 = removeInternal(a, oldl);
-        AppletListener b2 = removeInternal(b, oldl);
-        if (a2 == a && b2 == b) {
-            return this;        // it's not here
-        }
-        return addInternal(a2, b2);
-    }
-
-
-    /**
-     * Returns the resulting multicast listener after removing the
-     * old listener from listener-l.
-     * If listener-l equals the old listener OR listener-l is null,
-     * returns null.
-     * Else if listener-l is an instance of AppletEventMulticaster
-     * then it removes the old listener from it.
-     * Else, returns listener l.
-     * @param l the listener being removed from
-     * @param oldl the listener being removed
-     */
-    private static AppletListener removeInternal(AppletListener l, AppletListener oldl) {
-        if (l == oldl || l == null) {
-            return null;
-        } else if (l instanceof AppletEventMulticaster) {
-            return ((AppletEventMulticaster)l).remove(oldl);
-        } else {
-            return l;           // it's not here
-        }
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletIOException.java b/src/java.desktop/share/classes/sun/applet/AppletIOException.java
deleted file mode 100644
index e8bd4e0bf75..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletIOException.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1996, 2014, 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 sun.applet;
-
-import java.io.IOException;
-
-/**
- * An applet IO exception.
- *
- * @author      Koji Uno
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@SuppressWarnings("serial") // JDK implementation class
-@Deprecated(since = "9")
-public class AppletIOException extends IOException {
-    private String key = null;
-    private Object msgobj = null;
-
-    public AppletIOException(String key) {
-        super(key);
-        this.key = key;
-
-    }
-    public AppletIOException(String key, Object arg) {
-        this(key);
-        msgobj = arg;
-    }
-
-    public String getLocalizedMessage() {
-        if( msgobj != null)
-            return amh.getMessage(key, msgobj);
-        else
-            return amh.getMessage(key);
-    }
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletioexception");
-
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java b/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
deleted file mode 100644
index 750d09d3113..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1996, 2014, 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 sun.applet;
-
-/**
- * An applet security exception.
- *
- * @author      Arthur van Hoff
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@SuppressWarnings("serial") // JDK implementation class
-@Deprecated(since = "9")
-public class AppletIllegalArgumentException extends IllegalArgumentException {
-    private String key = null;
-
-    public AppletIllegalArgumentException(String key) {
-        super(key);
-        this.key = key;
-
-    }
-
-    public String getLocalizedMessage() {
-        return amh.getMessage(key);
-    }
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletillegalargumentexception");
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletImageRef.java b/src/java.desktop/share/classes/sun/applet/AppletImageRef.java
deleted file mode 100644
index bdda032a8ff..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletImageRef.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1995, 2014, 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 sun.applet;
-
-import java.awt.Toolkit;
-import java.awt.Image;
-import java.lang.ref.SoftReference;
-import sun.awt.image.URLImageSource;
-import java.net.URL;
-
-@Deprecated(since = "9")
-class AppletImageRef {
-    private SoftReference<Image> soft = null;
-
-    URL url;
-
-    /**
-     * Returns a pointer to the object referenced by this Ref.  If the object
-     * has been thrown away by the garbage collector, it will be
-     * reconstituted. This method does everything necessary to ensure that the garbage
-     * collector throws things away in Least Recently Used(LRU) order.  Applications should
-     * never override this method. The get() method effectively caches calls to
-     * reconstitute().
-     */
-    public synchronized Image get() {
-        Image t = check();
-        if (t == null) {
-            t = reconstitute();
-            setThing(t);
-        }
-        return t;
-    }
-
-    /**
-     * Create the Ref
-     */
-    AppletImageRef(URL url) {
-        this.url = url;
-    }
-
-    /**
-     * Flushes the cached object.  Forces the next invocation of get() to
-     * invoke reconstitute().
-     */
-    public synchronized void flush() {
-        SoftReference<Image> s = soft;
-        if (s != null) s.clear();
-        soft = null;
-    }
-
-    /**
-     * Sets the thing to the specified object.
-     * @param thing the specified object
-     */
-    public synchronized void setThing(Image thing) {
-        flush();
-        soft = new SoftReference<>(thing);
-    }
-
-    /**
-     * Checks to see what object is being pointed at by this Ref and returns it.
-     */
-    public synchronized Image check() {
-        SoftReference<Image> s = soft;
-        if (s == null) return null;
-        return s.get();
-    }
-
-    /**
-     * Reconsitute the image.  Only called when the ref has been flushed.
-     */
-    public Image reconstitute() {
-        Image img = Toolkit.getDefaultToolkit().createImage(new URLImageSource(url));
-        return img;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java b/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
deleted file mode 100644
index d05dc0bfc19..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1996, 2014, 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 sun.applet;
-
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.text.MessageFormat;
-
-/**
- * An hanlder of localized messages.
- *
- * @author      Koji Uno
- */
-class AppletMessageHandler {
-    private static ResourceBundle rb;
-    private String baseKey = null;
-
-    static {
-        try {
-            rb = ResourceBundle.getBundle
-                ("sun.applet.resources.MsgAppletViewer");
-        } catch (MissingResourceException e) {
-            System.out.println(e.getMessage());
-            System.exit(1);
-        }
-    }
-
-    AppletMessageHandler(String baseKey) {
-        this.baseKey = baseKey;
-    }
-
-    String getMessage(String key) {
-        return rb.getString(getQualifiedKey(key));
-    }
-
-    String getMessage(String key, Object arg){
-        String basemsgfmt = rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        Object msgobj[] = new Object[1];
-        if (arg == null) {
-            arg = "null"; // mimic java.io.PrintStream.print(String)
-        }
-        msgobj[0] = arg;
-        return msgfmt.format(msgobj);
-    }
-
-    String getMessage(String key, Object arg1, Object arg2) {
-        String basemsgfmt = rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        Object msgobj[] = new Object[2];
-        if (arg1 == null) {
-            arg1 = "null";
-        }
-        if (arg2 == null) {
-            arg2 = "null";
-        }
-        msgobj[0] = arg1;
-        msgobj[1] = arg2;
-        return msgfmt.format(msgobj);
-    }
-
-    String getMessage(String key, Object arg1, Object arg2, Object arg3) {
-        String basemsgfmt = rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        Object msgobj[] = new Object[3];
-        if (arg1 == null) {
-            arg1 = "null";
-        }
-        if (arg2 == null) {
-            arg2 = "null";
-        }
-        if (arg3 == null) {
-            arg3 = "null";
-        }
-        msgobj[0] = arg1;
-        msgobj[1] = arg2;
-        msgobj[2] = arg3;
-        return msgfmt.format(msgobj);
-    }
-
-    String getMessage(String key, Object arg[]) {
-        String basemsgfmt = rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        return msgfmt.format(arg);
-    }
-
-    String getQualifiedKey(String subKey) {
-        return baseKey + "." + subKey;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java b/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
deleted file mode 100644
index 689529b77e0..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 1996, 1997, 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.
- */
-/*
- * COPYRIGHT goes here
- */
-
-package sun.applet;
-
-import java.io.*;
-import java.lang.reflect.Array;
-
-/**
- * This subclass of ObjectInputStream delegates loading of classes to
- * an existing ClassLoader.
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@Deprecated(since = "9")
-class AppletObjectInputStream extends ObjectInputStream
-{
-    private AppletClassLoader loader;
-
-    /**
-     * Loader must be non-null;
-     */
-
-    public AppletObjectInputStream(InputStream in, AppletClassLoader loader)
-            throws IOException, StreamCorruptedException {
-
-        super(in);
-        if (loader == null) {
-            throw new AppletIllegalArgumentException("appletillegalargumentexception.objectinputstream");
-
-        }
-        this.loader = loader;
-    }
-
-    /**
-     * Make a primitive array class
-     */
-
-    private Class<?> primitiveType(char type) {
-        switch (type) {
-        case 'B': return byte.class;
-        case 'C': return char.class;
-        case 'D': return double.class;
-        case 'F': return float.class;
-        case 'I': return int.class;
-        case 'J': return long.class;
-        case 'S': return short.class;
-        case 'Z': return boolean.class;
-        default: return null;
-        }
-    }
-
-    /**
-     * Use the given ClassLoader rather than using the system class
-     */
-    protected Class<?> resolveClass(ObjectStreamClass classDesc)
-        throws IOException, ClassNotFoundException {
-
-        String cname = classDesc.getName();
-        if (cname.startsWith("[")) {
-            // An array
-            Class<?> component;            // component class
-            int dcount;                 // dimension
-            for (dcount=1; cname.charAt(dcount)=='['; dcount++) ;
-            if (cname.charAt(dcount) == 'L') {
-                component = loader.loadClass(cname.substring(dcount+1,
-                                                             cname.length()-1));
-            } else {
-                if (cname.length() != dcount+1) {
-                    throw new ClassNotFoundException(cname);// malformed
-                }
-                component = primitiveType(cname.charAt(dcount));
-            }
-            int dim[] = new int[dcount];
-            for (int i=0; i<dcount; i++) {
-                dim[i]=0;
-            }
-            return Array.newInstance(component, dim).getClass();
-        } else {
-            return loader.loadClass(cname);
-        }
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletPanel.java b/src/java.desktop/share/classes/sun/applet/AppletPanel.java
deleted file mode 100644
index 221314ad04d..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletPanel.java
+++ /dev/null
@@ -1,1270 +0,0 @@
-/*
- * Copyright (c) 1995, 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.  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 sun.applet;
-
-import java.applet.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.JarURLConnection;
-import java.net.SocketPermission;
-import java.net.URL;
-import java.security.*;
-import java.util.*;
-import java.util.Locale;
-import java.util.concurrent.LinkedBlockingQueue;
-import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
-import sun.awt.EmbeddedFrame;
-import sun.awt.SunToolkit;
-import sun.awt.util.PerformanceLogger;
-import sun.security.util.SecurityConstants;
-
-/**
- * Applet panel class. The panel manages and manipulates the
- * applet as it is being loaded. It forks a separate thread in a new
- * thread group to call the applet's init(), start(), stop(), and
- * destroy() methods.
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- *
- * @author      Arthur van Hoff
- */
-@SuppressWarnings({"serial"}) // JDK implementation class
-@Deprecated(since = "9")
-public
-abstract class AppletPanel extends Panel implements AppletStub, Runnable {
-
-    /**
-     * The applet (if loaded).
-     */
-    Applet applet;
-
-
-    /**
-     * The classloader for the applet.
-     */
-    protected AppletClassLoader loader;
-
-    /* applet event ids */
-    public static final int APPLET_DISPOSE = 0;
-    public static final int APPLET_LOAD = 1;
-    public static final int APPLET_INIT = 2;
-    public static final int APPLET_START = 3;
-    public static final int APPLET_STOP = 4;
-    public static final int APPLET_DESTROY = 5;
-    public static final int APPLET_QUIT = 6;
-    public static final int APPLET_ERROR = 7;
-
-    /* send to the parent to force relayout */
-    public static final int APPLET_RESIZE = 51234;
-
-    /* sent to a (distant) parent to indicate that the applet is being
-     * loaded or as completed loading
-     */
-    public static final int APPLET_LOADING = 51235;
-    public static final int APPLET_LOADING_COMPLETED = 51236;
-
-    /**
-     * The current status. One of:
-     *    APPLET_DISPOSE,
-     *    APPLET_LOAD,
-     *    APPLET_INIT,
-     *    APPLET_START,
-     *    APPLET_STOP,
-     *    APPLET_DESTROY,
-     *    APPLET_ERROR.
-     */
-    protected int status;
-
-    /**
-     * The thread for the applet.
-     */
-    protected Thread handler;
-
-
-    /**
-     * The initial applet size.
-     */
-    Dimension defaultAppletSize = new Dimension(10, 10);
-
-    /**
-     * The current applet size.
-     */
-    Dimension currentAppletSize = new Dimension(10, 10);
-
-    /**
-     * The thread to use during applet loading
-     */
-
-    Thread loaderThread = null;
-
-    /**
-     * Flag to indicate that a loading has been cancelled
-     */
-    boolean loadAbortRequest = false;
-
-    /* abstract classes */
-    protected abstract String getCode();
-    protected abstract String getJarFiles();
-
-    @Override
-    public abstract int    getWidth();
-    @Override
-    public abstract int    getHeight();
-    public abstract boolean hasInitialFocus();
-
-    private static int threadGroupNumber = 0;
-
-    protected void setupAppletAppContext() {
-        // do nothing
-    }
-
-    /*
-     * Creates a thread to run the applet. This method is called
-     * each time an applet is loaded and reloaded.
-     */
-    synchronized void createAppletThread() {
-        // Create a thread group for the applet, and start a new
-        // thread to load the applet.
-        String nm = "applet-" + getCode();
-        loader = getClassLoader(getCodeBase(), getClassLoaderCacheKey());
-        loader.grab(); // Keep this puppy around!
-
-        // 4668479: Option to turn off codebase lookup in AppletClassLoader
-        // during resource requests. [stanley.ho]
-        String param = getParameter("codebase_lookup");
-
-        if (param != null && param.equals("false"))
-            loader.setCodebaseLookup(false);
-        else
-            loader.setCodebaseLookup(true);
-
-
-        ThreadGroup appletGroup = loader.getThreadGroup();
-        handler = new Thread(appletGroup, this, "thread " + nm, 0, false);
-        // set the context class loader for this thread
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                @Override
-                public Object run() {
-                    handler.setContextClassLoader(loader);
-                    return null;
-                }
-            });
-        handler.start();
-    }
-
-    void joinAppletThread() throws InterruptedException {
-        if (handler != null) {
-            handler.join();
-            handler = null;
-        }
-    }
-
-    void release() {
-        if (loader != null) {
-            loader.release();
-            loader = null;
-        }
-    }
-
-    /**
-     * Construct an applet viewer and start the applet.
-     */
-    public void init() {
-        try {
-            // Get the width (if any)
-            defaultAppletSize.width = getWidth();
-            currentAppletSize.width = defaultAppletSize.width;
-
-            // Get the height (if any)
-            defaultAppletSize.height = getHeight();
-            currentAppletSize.height = defaultAppletSize.height;
-
-        } catch (NumberFormatException e) {
-            // Turn on the error flag and let TagAppletPanel
-            // do the right thing.
-            status = APPLET_ERROR;
-            showAppletStatus("badattribute.exception");
-            showAppletLog("badattribute.exception");
-            showAppletException(e);
-        }
-
-        setLayout(new BorderLayout());
-
-        createAppletThread();
-    }
-
-    /**
-     * Minimum size
-     */
-    @Override
-    @SuppressWarnings("deprecation")
-    public Dimension minimumSize() {
-        return new Dimension(defaultAppletSize.width,
-                             defaultAppletSize.height);
-    }
-
-    /**
-     * Preferred size
-     */
-    @Override
-    @SuppressWarnings("deprecation")
-    public Dimension preferredSize() {
-        return new Dimension(currentAppletSize.width,
-                             currentAppletSize.height);
-    }
-
-    private AppletListener listeners;
-
-    /**
-     * AppletEvent Queue
-     */
-    private LinkedBlockingQueue<Integer> queue = null;
-
-    public synchronized void addAppletListener(AppletListener l) {
-        listeners = AppletEventMulticaster.add(listeners, l);
-    }
-
-    public synchronized void removeAppletListener(AppletListener l) {
-        listeners = AppletEventMulticaster.remove(listeners, l);
-    }
-
-    /**
-     * Dispatch event to the listeners..
-     */
-    public void dispatchAppletEvent(int id, Object argument) {
-        //System.out.println("SEND= " + id);
-        if (listeners != null) {
-            AppletEvent evt = new AppletEvent(this, id, argument);
-            listeners.appletStateChanged(evt);
-        }
-    }
-
-    /**
-     * Send an event. Queue it for execution by the handler thread.
-     */
-    public void sendEvent(int id) {
-        synchronized(this) {
-            if (queue == null) {
-                //System.out.println("SEND0= " + id);
-                queue = new LinkedBlockingQueue<>();
-            }
-            boolean inserted = queue.add(id);
-            notifyAll();
-        }
-        if (id == APPLET_QUIT) {
-            try {
-                joinAppletThread(); // Let the applet event handler exit
-            } catch (InterruptedException e) {
-            }
-
-            // AppletClassLoader.release() must be called by a Thread
-            // not within the applet's ThreadGroup
-            if (loader == null)
-                loader = getClassLoader(getCodeBase(), getClassLoaderCacheKey());
-            release();
-        }
-    }
-
-    /**
-     * Get an event from the queue.
-     */
-    synchronized AppletEvent getNextEvent() throws InterruptedException {
-        while (queue == null || queue.isEmpty()) {
-            wait();
-        }
-        int eventId = queue.take();
-        return new AppletEvent(this, eventId, null);
-    }
-
-    boolean emptyEventQueue() {
-        if ((queue == null) || (queue.isEmpty()))
-            return true;
-        else
-            return false;
-    }
-
-    /**
-     * This kludge is specific to get over AccessControlException thrown during
-     * Applet.stop() or destroy() when static thread is suspended.  Set a flag
-     * in AppletClassLoader to indicate that an
-     * AccessControlException for RuntimePermission "modifyThread" or
-     * "modifyThreadGroup" had occurred.
-     */
-     private void setExceptionStatus(AccessControlException e) {
-     Permission p = e.getPermission();
-     if (p instanceof RuntimePermission) {
-         if (p.getName().startsWith("modifyThread")) {
-             if (loader == null)
-                 loader = getClassLoader(getCodeBase(), getClassLoaderCacheKey());
-             loader.setExceptionStatus();
-         }
-     }
-     }
-
-    /**
-     * Execute applet events.
-     * Here is the state transition diagram
-     *
-     * <pre>{@literal
-     *   Note: (XXX) is the action
-     *         APPLET_XXX is the state
-     *  (applet code loaded) --> APPLET_LOAD -- (applet init called)--> APPLET_INIT --
-     *  (applet start called) --> APPLET_START -- (applet stop called) --> APPLET_STOP --
-     *  (applet destroyed called) --> APPLET_DESTROY --> (applet gets disposed) -->
-     *   APPLET_DISPOSE --> ...
-     * }</pre>
-     *
-     * In the legacy lifecycle model. The applet gets loaded, inited and started. So it stays
-     * in the APPLET_START state unless the applet goes away(refresh page or leave the page).
-     * So the applet stop method called and the applet enters APPLET_STOP state. Then if the applet
-     * is revisited, it will call applet start method and enter the APPLET_START state and stay there.
-     *
-     * In the modern lifecycle model. When the applet first time visited, it is same as legacy lifecycle
-     * model. However, when the applet page goes away. It calls applet stop method and enters APPLET_STOP
-     * state and then applet destroyed method gets called and enters APPLET_DESTROY state.
-     *
-     * This code is also called by AppletViewer. In AppletViewer "Restart" menu, the applet is jump from
-     * APPLET_STOP to APPLET_DESTROY and to APPLET_INIT .
-     *
-     * Also, the applet can jump from APPLET_INIT state to APPLET_DESTROY (in Netscape/Mozilla case).
-     * Same as APPLET_LOAD to
-     * APPLET_DISPOSE since all of this are triggered by browser.
-     *
-     */
-    @Override
-    public void run() {
-
-        Thread curThread = Thread.currentThread();
-        if (curThread == loaderThread) {
-            // if we are in the loader thread, cause
-            // loading to occur.  We may exit this with
-            // status being APPLET_DISPOSE, APPLET_ERROR,
-            // or APPLET_LOAD
-            runLoader();
-            return;
-        }
-
-        boolean disposed = false;
-        while (!disposed && !curThread.isInterrupted()) {
-            AppletEvent evt;
-            try {
-                evt = getNextEvent();
-            } catch (InterruptedException e) {
-                showAppletStatus("bail");
-                return;
-            }
-
-            //showAppletStatus("EVENT = " + evt.getID());
-            try {
-                switch (evt.getID()) {
-                  case APPLET_LOAD:
-                      if (!okToLoad()) {
-                          break;
-                      }
-                      // This complexity allows loading of applets to be
-                      // interruptable.  The actual thread loading runs
-                      // in a separate thread, so it can be interrupted
-                      // without harming the applet thread.
-                      // So that we don't have to worry about
-                      // concurrency issues, the main applet thread waits
-                      // until the loader thread terminates.
-                      // (one way or another).
-                      if (loaderThread == null) {
-                          setLoaderThread(new Thread(null, this,
-                                          "AppletLoader", 0, false));
-                          loaderThread.start();
-                          // we get to go to sleep while this runs
-                          loaderThread.join();
-                          setLoaderThread(null);
-                      } else {
-                          // REMIND: issue an error -- this case should never
-                          // occur.
-                      }
-                      break;
-
-                  case APPLET_INIT:
-                    // AppletViewer "Restart" will jump from destroy method to
-                    // init, that is why we need to check status w/ APPLET_DESTROY
-                      if (status != APPLET_LOAD && status != APPLET_DESTROY) {
-                          showAppletStatus("notloaded");
-                          break;
-                      }
-                      applet.resize(defaultAppletSize);
-
-                      if (PerformanceLogger.loggingEnabled()) {
-                          PerformanceLogger.setTime("Applet Init");
-                          PerformanceLogger.outputLog();
-                      }
-                      applet.init();
-
-                      //Need the default(fallback) font to be created in this AppContext
-                      Font f = getFont();
-                      if (f == null ||
-                          "dialog".equals(f.getFamily().toLowerCase(Locale.ENGLISH)) &&
-                          f.getSize() == 12 && f.getStyle() == Font.PLAIN) {
-                          setFont(new Font(Font.DIALOG, Font.PLAIN, 12));
-                      }
-
-                      // Validate the applet in event dispatch thread
-                      // to avoid deadlock.
-                      try {
-                          final AppletPanel p = this;
-                          Runnable r = new Runnable() {
-                              @Override
-                              public void run() {
-                                  p.validate();
-                              }
-                          };
-                          AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
-                      }
-                      catch(InterruptedException ie) {
-                      }
-                      catch(InvocationTargetException ite) {
-                      }
-
-                      status = APPLET_INIT;
-                      showAppletStatus("inited");
-                      break;
-
-                  case APPLET_START:
-                  {
-                      if (status != APPLET_INIT && status != APPLET_STOP) {
-                          showAppletStatus("notinited");
-                          break;
-                      }
-                      applet.resize(currentAppletSize);
-                      applet.start();
-
-                      // Validate and show the applet in event dispatch thread
-                      // to avoid deadlock.
-                      try {
-                          final AppletPanel p = this;
-                          final Applet a = applet;
-                          Runnable r = new Runnable() {
-                              @Override
-                              public void run() {
-                                  p.validate();
-                                  a.setVisible(true);
-
-                                  // Fix for BugTraq ID 4041703.
-                                  // Set the default focus for an applet.
-                                  if (hasInitialFocus()) {
-                                      setDefaultFocus();
-                                  }
-                              }
-                          };
-                          AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
-                      }
-                      catch(InterruptedException ie) {
-                      }
-                      catch(InvocationTargetException ite) {
-                      }
-
-                      status = APPLET_START;
-                      showAppletStatus("started");
-                      break;
-                  }
-
-                case APPLET_STOP:
-                    if (status != APPLET_START) {
-                        showAppletStatus("notstarted");
-                        break;
-                    }
-                    status = APPLET_STOP;
-
-                    // Hide the applet in event dispatch thread
-                    // to avoid deadlock.
-                    try {
-                        final Applet a = applet;
-                        Runnable r = new Runnable() {
-                            @Override
-                            public void run() {
-                                a.setVisible(false);
-                            }
-                        };
-                        AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
-                    }
-                    catch(InterruptedException ie) {
-                    }
-                    catch(InvocationTargetException ite) {
-                    }
-
-
-                    // During Applet.stop(), any AccessControlException on an involved Class remains in
-                    // the "memory" of the AppletClassLoader.  If the same instance of the ClassLoader is
-                    // reused, the same exception will occur during class loading.  Set the AppletClassLoader's
-                    // exceptionStatusSet flag to allow recognition of what had happened
-                    // when reusing AppletClassLoader object.
-                    try {
-                        applet.stop();
-                    } catch (java.security.AccessControlException e) {
-                        setExceptionStatus(e);
-                        // rethrow exception to be handled as it normally would be.
-                        throw e;
-                    }
-                    showAppletStatus("stopped");
-                    break;
-
-                case APPLET_DESTROY:
-                    if (status != APPLET_STOP && status != APPLET_INIT) {
-                        showAppletStatus("notstopped");
-                        break;
-                    }
-                    status = APPLET_DESTROY;
-
-                    // During Applet.destroy(), any AccessControlException on an involved Class remains in
-                    // the "memory" of the AppletClassLoader.  If the same instance of the ClassLoader is
-                    // reused, the same exception will occur during class loading.  Set the AppletClassLoader's
-                    // exceptionStatusSet flag to allow recognition of what had happened
-                    // when reusing AppletClassLoader object.
-                    try {
-                        applet.destroy();
-                    } catch (java.security.AccessControlException e) {
-                        setExceptionStatus(e);
-                        // rethrow exception to be handled as it normally would be.
-                        throw e;
-                    }
-                    showAppletStatus("destroyed");
-                    break;
-
-                case APPLET_DISPOSE:
-                    if (status != APPLET_DESTROY && status != APPLET_LOAD) {
-                        showAppletStatus("notdestroyed");
-                        break;
-                    }
-                    status = APPLET_DISPOSE;
-
-                    try {
-                        final Applet a = applet;
-                        Runnable r = new Runnable() {
-                            @Override
-                            public void run() {
-                                remove(a);
-                            }
-                        };
-                        AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
-                    }
-                    catch(InterruptedException ie)
-                    {
-                    }
-                    catch(InvocationTargetException ite)
-                    {
-                    }
-                    applet = null;
-                    showAppletStatus("disposed");
-                    disposed = true;
-                    break;
-
-                case APPLET_QUIT:
-                    return;
-                }
-            } catch (Exception e) {
-                status = APPLET_ERROR;
-                if (e.getMessage() != null) {
-                    showAppletStatus("exception2", e.getClass().getName(),
-                                     e.getMessage());
-                } else {
-                    showAppletStatus("exception", e.getClass().getName());
-                }
-                showAppletException(e);
-            } catch (ThreadDeath e) {
-                showAppletStatus("death");
-                return;
-            } catch (Error e) {
-                status = APPLET_ERROR;
-                if (e.getMessage() != null) {
-                    showAppletStatus("error2", e.getClass().getName(),
-                                     e.getMessage());
-                } else {
-                    showAppletStatus("error", e.getClass().getName());
-                }
-                showAppletException(e);
-            }
-            clearLoadAbortRequest();
-        }
-    }
-
-    /**
-     * Gets most recent focus owner component associated with the given window.
-     * It does that without calling Window.getMostRecentFocusOwner since it
-     * provides its own logic contradicting with setDefautlFocus. Instead, it
-     * calls KeyboardFocusManager directly.
-     */
-    private Component getMostRecentFocusOwnerForWindow(Window w) {
-        return AWTAccessor.getKeyboardFocusManagerAccessor()
-                .getMostRecentFocusOwner(w);
-    }
-
-    /*
-     * Fix for BugTraq ID 4041703.
-     * Set the focus to a reasonable default for an Applet.
-     */
-    private void setDefaultFocus() {
-        Component toFocus = null;
-        Container parent = getParent();
-
-        if(parent != null) {
-            if (parent instanceof Window) {
-                toFocus = getMostRecentFocusOwnerForWindow((Window)parent);
-                if (toFocus == parent || toFocus == null) {
-                    toFocus = parent.getFocusTraversalPolicy().
-                        getInitialComponent((Window)parent);
-                }
-            } else if (parent.isFocusCycleRoot()) {
-                toFocus = parent.getFocusTraversalPolicy().
-                    getDefaultComponent(parent);
-            }
-        }
-
-        if (toFocus != null) {
-            if (parent instanceof EmbeddedFrame) {
-                ((EmbeddedFrame) parent).synthesizeWindowActivation(true);
-            }
-            // EmbeddedFrame might have focus before the applet was added.
-            // Thus after its activation the most recent focus owner will be
-            // restored. We need the applet's initial focusabled component to
-            // be focused here.
-            toFocus.requestFocusInWindow();
-        }
-    }
-
-    /**
-     * Load the applet into memory.
-     * Runs in a seperate (and interruptible) thread from the rest of the
-     * applet event processing so that it can be gracefully interrupted from
-     * things like HotJava.
-     */
-    @SuppressWarnings("deprecation")
-    private void runLoader() {
-        if (status != APPLET_DISPOSE) {
-            showAppletStatus("notdisposed");
-            return;
-        }
-
-        dispatchAppletEvent(APPLET_LOADING, null);
-
-        // REMIND -- might be cool to visually indicate loading here --
-        // maybe do animation?
-        status = APPLET_LOAD;
-
-        // Create a class loader
-        loader = getClassLoader(getCodeBase(), getClassLoaderCacheKey());
-
-        // Load the archives if present.
-        // REMIND - this probably should be done in a separate thread,
-        // or at least the additional archives (epll).
-
-        String code = getCode();
-
-        // setup applet AppContext
-        // this must be called before loadJarFiles
-        setupAppletAppContext();
-
-        try {
-            loadJarFiles(loader);
-            applet = createApplet(loader);
-        } catch (ClassNotFoundException e) {
-            status = APPLET_ERROR;
-            showAppletStatus("notfound", code);
-            showAppletLog("notfound", code);
-            showAppletException(e);
-            return;
-        } catch (InstantiationException e) {
-            status = APPLET_ERROR;
-            showAppletStatus("nocreate", code);
-            showAppletLog("nocreate", code);
-            showAppletException(e);
-            return;
-        } catch (IllegalAccessException e) {
-            status = APPLET_ERROR;
-            showAppletStatus("noconstruct", code);
-            showAppletLog("noconstruct", code);
-            showAppletException(e);
-            // sbb -- I added a return here
-            return;
-        } catch (Exception e) {
-            status = APPLET_ERROR;
-            showAppletStatus("exception", e.getMessage());
-            showAppletException(e);
-            return;
-        } catch (ThreadDeath e) {
-            status = APPLET_ERROR;
-            showAppletStatus("death");
-            return;
-        } catch (Error e) {
-            status = APPLET_ERROR;
-            showAppletStatus("error", e.getMessage());
-            showAppletException(e);
-            return;
-        } finally {
-            // notify that loading is no longer going on
-            dispatchAppletEvent(APPLET_LOADING_COMPLETED, null);
-        }
-
-        // Fixed #4508194: NullPointerException thrown during
-        // quick page switch
-        //
-        if (applet != null)
-        {
-            // Stick it in the frame
-            applet.setStub(this);
-            applet.hide();
-            add("Center", applet);
-            showAppletStatus("loaded");
-            validate();
-        }
-    }
-
-    protected Applet createApplet(final AppletClassLoader loader) throws ClassNotFoundException,
-                                                                         IllegalAccessException, IOException, InstantiationException, InterruptedException {
-        String code = getCode();
-
-        if (code != null) {
-            applet = (Applet)loader.loadCode(code).newInstance();
-        } else {
-            String msg = "nocode";
-            status = APPLET_ERROR;
-            showAppletStatus(msg);
-            showAppletLog(msg);
-            repaint();
-        }
-
-        // Determine the JDK level that the applet targets.
-        // This is critical for enabling certain backward
-        // compatibility switch if an applet is a JDK 1.1
-        // applet. [stanley.ho]
-        findAppletJDKLevel(applet);
-
-        if (Thread.interrupted()) {
-            try {
-                status = APPLET_DISPOSE; // APPLET_ERROR?
-                applet = null;
-                // REMIND: This may not be exactly the right thing: the
-                // status is set by the stop button and not necessarily
-                // here.
-                showAppletStatus("death");
-            } finally {
-                Thread.currentThread().interrupt(); // resignal interrupt
-            }
-            return null;
-        }
-        return applet;
-    }
-
-    protected void loadJarFiles(AppletClassLoader loader) throws IOException,
-                                                                 InterruptedException {
-        // Load the archives if present.
-        // REMIND - this probably should be done in a separate thread,
-        // or at least the additional archives (epll).
-        String jarFiles = getJarFiles();
-
-        if (jarFiles != null) {
-            StringTokenizer st = new StringTokenizer(jarFiles, ",", false);
-            while(st.hasMoreTokens()) {
-                String tok = st.nextToken().trim();
-                try {
-                    loader.addJar(tok);
-                } catch (IllegalArgumentException e) {
-                    // bad archive name
-                    continue;
-                }
-            }
-        }
-    }
-
-    /**
-     * Request that the loading of the applet be stopped.
-     */
-    protected synchronized void stopLoading() {
-        // REMIND: fill in the body
-        if (loaderThread != null) {
-            //System.out.println("Interrupting applet loader thread: " + loaderThread);
-            loaderThread.interrupt();
-        } else {
-            setLoadAbortRequest();
-        }
-    }
-
-
-    protected synchronized boolean okToLoad() {
-        return !loadAbortRequest;
-    }
-
-    protected synchronized void clearLoadAbortRequest() {
-        loadAbortRequest = false;
-    }
-
-    protected synchronized void setLoadAbortRequest() {
-        loadAbortRequest = true;
-    }
-
-
-    private synchronized void setLoaderThread(Thread loaderThread) {
-        this.loaderThread = loaderThread;
-    }
-
-    /**
-     * Return true when the applet has been started.
-     */
-    @Override
-    public boolean isActive() {
-        return status == APPLET_START;
-    }
-
-
-    private EventQueue appEvtQ = null;
-    /**
-     * Is called when the applet wants to be resized.
-     */
-    @Override
-    public void appletResize(int width, int height) {
-        currentAppletSize.width = width;
-        currentAppletSize.height = height;
-        final Dimension currentSize = new Dimension(currentAppletSize.width,
-                                                    currentAppletSize.height);
-
-        if(loader != null) {
-            AppContext appCtxt = loader.getAppContext();
-            if(appCtxt != null)
-                appEvtQ = (java.awt.EventQueue)appCtxt.get(AppContext.EVENT_QUEUE_KEY);
-        }
-
-        final AppletPanel ap = this;
-        if (appEvtQ != null){
-            appEvtQ.postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(),
-                                                  new Runnable() {
-                                                      @Override
-                                                      public void run() {
-                                                          if (ap != null) {
-                                                              ap.dispatchAppletEvent(
-                                                                      APPLET_RESIZE,
-                                                                      currentSize);
-                                                          }
-                                                      }
-                                                  }));
-        }
-    }
-
-    @Override
-    public void setBounds(int x, int y, int width, int height) {
-        super.setBounds(x, y, width, height);
-        currentAppletSize.width = width;
-        currentAppletSize.height = height;
-    }
-
-    public Applet getApplet() {
-        return applet;
-    }
-
-    /**
-     * Status line. Called by the AppletPanel to provide
-     * feedback on the Applet's state.
-     */
-    protected void showAppletStatus(String status) {
-        getAppletContext().showStatus(amh.getMessage(status));
-    }
-
-    protected void showAppletStatus(String status, Object arg) {
-        getAppletContext().showStatus(amh.getMessage(status, arg));
-    }
-    protected void showAppletStatus(String status, Object arg1, Object arg2) {
-        getAppletContext().showStatus(amh.getMessage(status, arg1, arg2));
-    }
-
-    /**
-     * Called by the AppletPanel to print to the log.
-     */
-    protected void showAppletLog(String msg) {
-        System.out.println(amh.getMessage(msg));
-    }
-
-    protected void showAppletLog(String msg, Object arg) {
-        System.out.println(amh.getMessage(msg, arg));
-    }
-
-    /**
-     * Called by the AppletPanel to provide
-     * feedback when an exception has happened.
-     */
-    protected void showAppletException(Throwable t) {
-        t.printStackTrace();
-        repaint();
-    }
-
-    /**
-     * Get caching key for classloader cache
-     */
-    public String getClassLoaderCacheKey()
-    {
-        /**
-         * Fixed #4501142: Classloader sharing policy doesn't
-         * take "archive" into account. This will be overridden
-         * by Java Plug-in.                     [stanleyh]
-         */
-        return getCodeBase().toString();
-    }
-
-    /**
-     * The class loaders
-     */
-    private static HashMap<String, AppletClassLoader> classloaders = new HashMap<>();
-
-    /**
-     * Flush a class loader.
-     */
-    public static synchronized void flushClassLoader(String key) {
-        classloaders.remove(key);
-    }
-
-    /**
-     * Flush all class loaders.
-     */
-    public static synchronized void flushClassLoaders() {
-        classloaders = new HashMap<>();
-    }
-
-    /**
-     * This method actually creates an AppletClassLoader.
-     *
-     * It can be override by subclasses (such as the Plug-in)
-     * to provide different classloaders.
-     */
-    protected AppletClassLoader createClassLoader(final URL codebase) {
-        return new AppletClassLoader(codebase);
-    }
-
-    /**
-     * Get a class loader. Create in a restricted context
-     */
-    synchronized AppletClassLoader getClassLoader(final URL codebase, final String key) {
-        AppletClassLoader c = classloaders.get(key);
-        if (c == null) {
-            AccessControlContext acc =
-                getAccessControlContext(codebase);
-            c = AccessController.doPrivileged(
-                    new PrivilegedAction<AppletClassLoader>() {
-                        @Override
-                        public AppletClassLoader run() {
-                            AppletClassLoader ac = createClassLoader(codebase);
-                            /* Should the creation of the classloader be
-                             * within the class synchronized block?  Since
-                             * this class is used by the plugin, take care
-                             * to avoid deadlocks, or specialize
-                             * AppletPanel within the plugin.  It may take
-                             * an arbitrary amount of time to create a
-                             * class loader (involving getting Jar files
-                             * etc.) and may block unrelated applets from
-                             * finishing createAppletThread (due to the
-                             * class synchronization). If
-                             * createAppletThread does not finish quickly,
-                             * the applet cannot process other messages,
-                             * particularly messages such as destroy
-                             * (which timeout when called from the browser).
-                             */
-                            synchronized (getClass()) {
-                                AppletClassLoader res = classloaders.get(key);
-                                if (res == null) {
-                                    classloaders.put(key, ac);
-                                    return ac;
-                                } else {
-                                    return res;
-                                }
-                            }
-                        }
-                    },acc);
-        }
-        return c;
-    }
-
-    /**
-     * get the context for the AppletClassLoader we are creating.
-     * the context is granted permission to create the class loader,
-     * connnect to the codebase, and whatever else the policy grants
-     * to all codebases.
-     */
-    private AccessControlContext getAccessControlContext(final URL codebase) {
-
-        PermissionCollection perms = AccessController.doPrivileged(
-                new PrivilegedAction<PermissionCollection>() {
-                    @Override
-                    public PermissionCollection run() {
-                        Policy p = java.security.Policy.getPolicy();
-                        if (p != null) {
-                            return p.getPermissions(new CodeSource(null,
-                                                                   (java.security.cert.Certificate[]) null));
-                        } else {
-                            return null;
-                        }
-                    }
-                });
-
-        if (perms == null)
-            perms = new Permissions();
-
-        //XXX: this is needed to be able to create the classloader itself!
-
-        perms.add(SecurityConstants.CREATE_CLASSLOADER_PERMISSION);
-
-        Permission p;
-        java.net.URLConnection urlConnection = null;
-        try {
-            urlConnection = codebase.openConnection();
-            p = urlConnection.getPermission();
-        } catch (java.io.IOException ioe) {
-            p = null;
-        }
-
-        if (p != null)
-            perms.add(p);
-
-        if (p instanceof FilePermission) {
-
-            String path = p.getName();
-
-            int endIndex = path.lastIndexOf(File.separatorChar);
-
-            if (endIndex != -1) {
-                path = path.substring(0, endIndex+1);
-
-                if (path.endsWith(File.separator)) {
-                    path += "-";
-                }
-                perms.add(new FilePermission(path,
-                                             SecurityConstants.FILE_READ_ACTION));
-            }
-        } else {
-            URL locUrl = codebase;
-            if (urlConnection instanceof JarURLConnection) {
-                locUrl = ((JarURLConnection)urlConnection).getJarFileURL();
-            }
-            String host = locUrl.getHost();
-            if (host != null && (host.length() > 0))
-                perms.add(new SocketPermission(host,
-                                               SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION));
-        }
-
-        ProtectionDomain domain =
-            new ProtectionDomain(new CodeSource(codebase,
-                                                (java.security.cert.Certificate[]) null), perms);
-        AccessControlContext acc =
-            new AccessControlContext(new ProtectionDomain[] { domain });
-
-        return acc;
-    }
-
-    public Thread getAppletHandlerThread() {
-        return handler;
-    }
-
-    public int getAppletWidth() {
-        return currentAppletSize.width;
-    }
-
-    public int getAppletHeight() {
-        return currentAppletSize.height;
-    }
-
-    public static void changeFrameAppContext(Frame frame, AppContext newAppContext)
-    {
-        // Fixed #4754451: Applet can have methods running on main
-        // thread event queue.
-        //
-        // The cause of this bug is that the frame of the applet
-        // is created in main thread group. Thus, when certain
-        // AWT/Swing events are generated, the events will be
-        // dispatched through the wrong event dispatch thread.
-        //
-        // To fix this, we rearrange the AppContext with the frame,
-        // so the proper event queue will be looked up.
-        //
-        // Swing also maintains a Frame list for the AppContext,
-        // so we will have to rearrange it as well.
-
-        // Check if frame's AppContext has already been set properly
-        AppContext oldAppContext = SunToolkit.targetToAppContext(frame);
-
-        if (oldAppContext == newAppContext)
-            return;
-
-        // Synchronization on Window.class is needed for locking the
-        // critical section of the window list in AppContext.
-        synchronized (Window.class)
-        {
-            WeakReference<Window> weakRef = null;
-            // Remove frame from the Window list in wrong AppContext
-            {
-                // Lookup current frame's AppContext
-                @SuppressWarnings("unchecked")
-                Vector<WeakReference<Window>> windowList =
-                    (Vector<WeakReference<Window>>)oldAppContext.get(Window.class);
-                if (windowList != null) {
-                    for (WeakReference<Window> ref : windowList) {
-                        if (ref.get() == frame) {
-                            weakRef = ref;
-                            break;
-                        }
-                    }
-                    // Remove frame from wrong AppContext
-                    if (weakRef != null)
-                        windowList.remove(weakRef);
-                }
-            }
-
-            // Put the frame into the applet's AppContext map
-            SunToolkit.insertTargetMapping(frame, newAppContext);
-
-            // Insert frame into the Window list in the applet's AppContext map
-            {
-                @SuppressWarnings("unchecked")
-                Vector<WeakReference<Window>> windowList =
-                    (Vector<WeakReference<Window>>)newAppContext.get(Window.class);
-                if (windowList == null) {
-                    windowList = new Vector<WeakReference<Window>>();
-                    newAppContext.put(Window.class, windowList);
-                }
-                // use the same weakRef here as it is used elsewhere
-                windowList.add(weakRef);
-            }
-        }
-    }
-
-    // Flag to indicate if applet is targeted for JDK 1.1.
-    private boolean jdk11Applet = false;
-
-    // Flag to indicate if applet is targeted for JDK 1.2.
-    private boolean jdk12Applet = false;
-
-    /**
-     * Determine JDK level of an applet.
-     */
-    private void findAppletJDKLevel(Applet applet)
-    {
-        // To determine the JDK level of an applet, the
-        // most reliable way is to check the major version
-        // of the applet class file.
-
-        // synchronized on applet class object, so calling from
-        // different instances of the same applet will be
-        // serialized.
-        Class<?> appletClass = applet.getClass();
-
-        synchronized(appletClass)  {
-            // Determine if the JDK level of an applet has been
-            // checked before.
-            Boolean jdk11Target = loader.isJDK11Target(appletClass);
-            Boolean jdk12Target = loader.isJDK12Target(appletClass);
-
-            // if applet JDK level has been checked before, retrieve
-            // value and return.
-            if (jdk11Target != null || jdk12Target != null) {
-                jdk11Applet = (jdk11Target == null) ? false : jdk11Target.booleanValue();
-                jdk12Applet = (jdk12Target == null) ? false : jdk12Target.booleanValue();
-                return;
-            }
-
-            String name = appletClass.getName();
-
-            // first convert any '.' to '/'
-            name = name.replace('.', '/');
-
-            // append .class
-            final String resourceName = name + ".class";
-
-            byte[] classHeader = new byte[8];
-
-            try (InputStream is = AccessController.doPrivileged(
-                    (PrivilegedAction<InputStream>) () -> loader.getResourceAsStream(resourceName))) {
-
-                // Read the first 8 bytes of the class file
-                int byteRead = is.read(classHeader, 0, 8);
-
-                // return if the header is not read in entirely
-                // for some reasons.
-                if (byteRead != 8)
-                    return;
-            }
-            catch (IOException e)   {
-                return;
-            }
-
-            // Check major version in class file header
-            int major_version = readShort(classHeader, 6);
-
-            // Major version in class file is as follows:
-            //   45 - JDK 1.1
-            //   46 - JDK 1.2
-            //   47 - JDK 1.3
-            //   48 - JDK 1.4
-            //   49 - JDK 1.5
-            if (major_version < 46)
-                jdk11Applet = true;
-            else if (major_version == 46)
-                jdk12Applet = true;
-
-            // Store applet JDK level in AppContext for later lookup,
-            // e.g. page switch.
-            loader.setJDK11Target(appletClass, jdk11Applet);
-            loader.setJDK12Target(appletClass, jdk12Applet);
-        }
-    }
-
-    /**
-     * Return true if applet is targeted to JDK 1.1.
-     */
-    protected boolean isJDK11Applet()   {
-        return jdk11Applet;
-    }
-
-    /**
-     * Return true if applet is targeted to JDK1.2.
-     */
-    protected boolean isJDK12Applet()   {
-        return jdk12Applet;
-    }
-
-    /**
-     * Read short from byte array.
-     */
-    private int readShort(byte[] b, int off)    {
-        int hi = readByte(b[off]);
-        int lo = readByte(b[off + 1]);
-        return (hi << 8) | lo;
-    }
-
-    private int readByte(byte b) {
-        return ((int)b) & 0xFF;
-    }
-
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletpanel");
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletProps.java b/src/java.desktop/share/classes/sun/applet/AppletProps.java
deleted file mode 100644
index bb30abe9897..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletProps.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 1995, 2014, 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 sun.applet;
-
-import java.awt.*;
-import java.io.*;
-import java.util.Properties;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-
-import sun.security.action.*;
-
-@SuppressWarnings("serial") // JDK implementation class
-@Deprecated(since = "9")
-class AppletProps extends Frame {
-
-    TextField proxyHost;
-    TextField proxyPort;
-    Choice accessMode;
-
-    @SuppressWarnings("deprecation")
-    AppletProps() {
-        setTitle(amh.getMessage("title"));
-        Panel p = new Panel();
-        p.setLayout(new GridLayout(0, 2));
-
-        p.add(new Label(amh.getMessage("label.http.server", "Http proxy server:")));
-        p.add(proxyHost = new TextField());
-
-        p.add(new Label(amh.getMessage("label.http.proxy")));
-        p.add(proxyPort = new TextField());
-
-        p.add(new Label(amh.getMessage("label.class")));
-        p.add(accessMode = new Choice());
-        accessMode.addItem(amh.getMessage("choice.class.item.restricted"));
-        accessMode.addItem(amh.getMessage("choice.class.item.unrestricted"));
-
-        add("Center", p);
-        p = new Panel();
-        p.add(new Button(amh.getMessage("button.apply")));
-        p.add(new Button(amh.getMessage("button.reset")));
-        p.add(new Button(amh.getMessage("button.cancel")));
-        add("South", p);
-        move(200, 150);
-        pack();
-        reset();
-    }
-
-    void reset() {
-        AppletSecurity security = (AppletSecurity) System.getSecurityManager();
-        if (security != null)
-            security.reset();
-
-        String proxyhost = AccessController.doPrivileged(
-                new GetPropertyAction("http.proxyHost"));
-        String proxyport = AccessController.doPrivileged(
-                new GetPropertyAction("http.proxyPort"));
-
-        Boolean tmp = AccessController.doPrivileged(
-                new GetBooleanAction("package.restrict.access.sun"));
-
-        boolean packageRestrict = tmp.booleanValue();
-        if (packageRestrict) {
-           accessMode.select(amh.getMessage("choice.class.item.restricted"));
-        } else {
-           accessMode.select(amh.getMessage("choice.class.item.unrestricted"));
-        }
-
-        if (proxyhost != null) {
-            proxyHost.setText(proxyhost);
-            proxyPort.setText(proxyport);
-        } else {
-            proxyHost.setText("");
-            proxyPort.setText("");
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    void apply() {
-        String proxyHostValue = proxyHost.getText().trim();
-        String proxyPortValue = proxyPort.getText().trim();
-
-        // Get properties
-        final Properties props = AccessController.doPrivileged(
-             new PrivilegedAction<Properties>() {
-                 public Properties run() {
-                     return System.getProperties();
-                 }
-        });
-
-        if (proxyHostValue.length() != 0) {
-            /* 4066402 */
-            /* Check for parsable value in proxy port number field before */
-            /* applying. Display warning to user until parsable value is  */
-            /* entered. */
-            int proxyPortNumber = 0;
-            try {
-                proxyPortNumber = Integer.parseInt(proxyPortValue);
-            } catch (NumberFormatException e) {}
-
-            if (proxyPortNumber <= 0) {
-                proxyPort.selectAll();
-                proxyPort.requestFocus();
-                (new AppletPropsErrorDialog(this,
-                                            amh.getMessage("title.invalidproxy"),
-                                            amh.getMessage("label.invalidproxy"),
-                                            amh.getMessage("button.ok"))).show();
-                return;
-            }
-            /* end 4066402 */
-
-            props.put("http.proxyHost", proxyHostValue);
-            props.put("http.proxyPort", proxyPortValue);
-        } else {
-            props.put("http.proxyHost", "");
-        }
-
-        if (amh.getMessage("choice.class.item.restricted").equals(accessMode.getSelectedItem())) {
-            props.put("package.restrict.access.sun", "true");
-        } else {
-            props.put("package.restrict.access.sun", "false");
-        }
-
-        // Save properties
-        try {
-            reset();
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws IOException {
-                    File dotAV = Main.theUserPropertiesFile;
-                    FileOutputStream out = new FileOutputStream(dotAV);
-                    Properties avProps = new Properties();
-                    for (int i = 0; i < Main.avDefaultUserProps.length; i++) {
-                        String avKey = Main.avDefaultUserProps[i][0];
-                        avProps.setProperty(avKey, props.getProperty(avKey));
-                    }
-                    avProps.store(out, amh.getMessage("prop.store"));
-                    out.close();
-                    return null;
-                }
-            });
-            hide();
-        } catch (java.security.PrivilegedActionException e) {
-            System.out.println(amh.getMessage("apply.exception",
-                                              e.getException()));
-            // XXX what's the general feeling on stack traces to System.out?
-            e.printStackTrace();
-            reset();
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    public boolean action(Event evt, Object obj) {
-        if (amh.getMessage("button.apply").equals(obj)) {
-            apply();
-            return true;
-        }
-        if (amh.getMessage("button.reset").equals(obj)) {
-            reset();
-            return true;
-        }
-        if (amh.getMessage("button.cancel").equals(obj)) {
-            reset();
-            hide();
-            return true;
-        }
-        return false;
-    }
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletprops");
-
-}
-
-/* 4066432 */
-/* Dialog class to display property-related errors to user */
-@SuppressWarnings("serial") // JDK implementation class
-@Deprecated(since = "9")
-class AppletPropsErrorDialog extends Dialog {
-    @SuppressWarnings("deprecation")
-    public AppletPropsErrorDialog(Frame parent, String title, String message,
-                String buttonText) {
-        super(parent, title, true);
-        Panel p = new Panel();
-        add("Center", new Label(message));
-        p.add(new Button(buttonText));
-        add("South", p);
-        pack();
-
-        Dimension dDim = size();
-        Rectangle fRect = parent.bounds();
-        move(fRect.x + ((fRect.width - dDim.width) / 2),
-             fRect.y + ((fRect.height - dDim.height) / 2));
-    }
-
-    @SuppressWarnings("deprecation")
-    public boolean action(Event event, Object object) {
-        hide();
-        dispose();
-        return true;
-    }
-}
-
-/* end 4066432 */
diff --git a/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java b/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
deleted file mode 100644
index 2cc21af694b..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1995, 2014, 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 sun.applet;
-
-/**
- * An applet security exception.
- *
- * @author      Arthur van Hoff
- */
-@SuppressWarnings("serial") // JDK-implementation class
-public
-class AppletSecurityException extends SecurityException {
-    private String key = null;
-    private Object msgobj[] = null;
-
-    public AppletSecurityException(String name) {
-        super(name);
-        this.key = name;
-    }
-
-    public AppletSecurityException(String name, String arg) {
-        this(name);
-        msgobj = new Object[1];
-        msgobj[0] = (Object)arg;
-    }
-
-    public AppletSecurityException(String name, String arg1, String arg2) {
-        this(name);
-        msgobj = new Object[2];
-        msgobj[0] = (Object)arg1;
-        msgobj[1] = (Object)arg2;
-    }
-
-    public String getLocalizedMessage() {
-        if( msgobj != null)
-            return amh.getMessage(key, msgobj);
-        else
-            return amh.getMessage(key);
-    }
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletsecurityexception");
-
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletViewer.java b/src/java.desktop/share/classes/sun/applet/AppletViewer.java
deleted file mode 100644
index c64971b4fb0..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletViewer.java
+++ /dev/null
@@ -1,1312 +0,0 @@
-/*
- * Copyright (c) 1995, 2014, 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 sun.applet;
-
-import java.util.*;
-import java.io.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.print.*;
-import javax.print.attribute.*;
-import java.applet.*;
-import java.net.URL;
-import java.net.SocketPermission;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import sun.awt.SunToolkit;
-import sun.awt.AppContext;
-
-/**
- * A frame to show the applet tag in.
- */
-@SuppressWarnings("serial") // JDK-implementation class
-@Deprecated(since = "9")
-final class TextFrame extends Frame {
-
-    /**
-     * Create the tag frame.
-     */
-    @SuppressWarnings("deprecation")
-    TextFrame(int x, int y, String title, String text) {
-        setTitle(title);
-        TextArea txt = new TextArea(20, 60);
-        txt.setText(text);
-        txt.setEditable(false);
-
-        add("Center", txt);
-
-        Panel p = new Panel();
-        add("South", p);
-        Button b = new Button(amh.getMessage("button.dismiss", "Dismiss"));
-        p.add(b);
-
-        class ActionEventListener implements ActionListener {
-            @Override
-            public void actionPerformed(ActionEvent evt) {
-                dispose();
-            }
-        }
-        b.addActionListener(new ActionEventListener());
-
-        pack();
-        move(x, y);
-        setVisible(true);
-
-        WindowListener windowEventListener = new WindowAdapter() {
-
-            @Override
-            public void windowClosing(WindowEvent evt) {
-                dispose();
-            }
-        };
-
-        addWindowListener(windowEventListener);
-    }
-    private static AppletMessageHandler amh = new AppletMessageHandler("textframe");
-
-}
-
-/**
- * Lets us construct one using unix-style one shot behaviors.
- */
-@Deprecated(since = "9")
-final class StdAppletViewerFactory implements AppletViewerFactory {
-
-    @Override
-    public AppletViewer createAppletViewer(int x, int y,
-                                           URL doc, Hashtable<String, String> atts) {
-        return new AppletViewer(x, y, doc, atts, System.out, this);
-    }
-
-    @Override
-    public MenuBar getBaseMenuBar() {
-        return new MenuBar();
-    }
-
-    @Override
-    public boolean isStandalone() {
-        return true;
-    }
-}
-
-/**
- * The applet viewer makes it possible to run a Java applet without using a browser.
- * For details on the syntax that <B>appletviewer</B> supports, see
- * <a href="../../../docs/tooldocs/appletviewertags.html">AppletViewer Tags</a>.
- * (The document named appletviewertags.html in the JDK's docs/tooldocs directory,
- *  once the JDK docs have been installed.)
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@SuppressWarnings({"serial"}) // JDK-implementation class
-@Deprecated(since = "9")
-public class AppletViewer extends Frame implements AppletContext, Printable {
-
-    /**
-     * Some constants...
-     */
-    private static String defaultSaveFile = "Applet.ser";
-
-    /**
-     * The panel in which the applet is being displayed.
-     */
-    AppletViewerPanel panel;
-
-    /**
-     * The status line.
-     */
-    Label label;
-
-    /**
-     * output status messages to this stream
-     */
-
-    PrintStream statusMsgStream;
-
-    /**
-     * For cloning
-     */
-    AppletViewerFactory factory;
-
-    @Deprecated(since = "9")
-    private final class UserActionListener implements ActionListener {
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            processUserAction(evt);
-        }
-    }
-
-    /**
-     * Create the applet viewer.
-     */
-    public AppletViewer(int x, int y, URL doc, Hashtable<String, String> atts,
-                        PrintStream statusMsgStream, AppletViewerFactory factory) {
-        this.factory = factory;
-        this.statusMsgStream = statusMsgStream;
-        setTitle(amh.getMessage("tool.title", atts.get("code")));
-
-        MenuBar mb = factory.getBaseMenuBar();
-
-        Menu m = new Menu(amh.getMessage("menu.applet"));
-
-        addMenuItem(m, "menuitem.restart");
-        addMenuItem(m, "menuitem.reload");
-        addMenuItem(m, "menuitem.stop");
-        addMenuItem(m, "menuitem.save");
-        addMenuItem(m, "menuitem.start");
-        addMenuItem(m, "menuitem.clone");
-        m.add(new MenuItem("-"));
-        addMenuItem(m, "menuitem.tag");
-        addMenuItem(m, "menuitem.info");
-        addMenuItem(m, "menuitem.edit").disable();
-        addMenuItem(m, "menuitem.encoding");
-        m.add(new MenuItem("-"));
-        addMenuItem(m, "menuitem.print");
-        m.add(new MenuItem("-"));
-        addMenuItem(m, "menuitem.props");
-        m.add(new MenuItem("-"));
-        addMenuItem(m, "menuitem.close");
-        if (factory.isStandalone()) {
-            addMenuItem(m, "menuitem.quit");
-        }
-
-        mb.add(m);
-
-        setMenuBar(mb);
-
-        add("Center", panel = new AppletViewerPanel(doc, atts));
-        add("South", label = new Label(amh.getMessage("label.hello")));
-        panel.init();
-        appletPanels.addElement(panel);
-
-        pack();
-        move(x, y);
-        setVisible(true);
-
-        WindowListener windowEventListener = new WindowAdapter() {
-
-            @Override
-            public void windowClosing(WindowEvent evt) {
-                appletClose();
-            }
-
-            @Override
-            public void windowIconified(WindowEvent evt) {
-                appletStop();
-            }
-
-            @Override
-            public void windowDeiconified(WindowEvent evt) {
-                appletStart();
-            }
-        };
-
-        @Deprecated(since = "9")
-        class AppletEventListener implements AppletListener
-        {
-            final Frame frame;
-
-            public AppletEventListener(Frame frame)
-            {
-                this.frame = frame;
-            }
-
-            @Override
-            @SuppressWarnings("deprecation")
-            public void appletStateChanged(AppletEvent evt)
-            {
-                AppletPanel src = (AppletPanel)evt.getSource();
-
-                switch (evt.getID()) {
-                    case AppletPanel.APPLET_RESIZE: {
-                        if(src != null) {
-                            resize(preferredSize());
-                            validate();
-                        }
-                        break;
-                    }
-                    case AppletPanel.APPLET_LOADING_COMPLETED: {
-                        Applet a = src.getApplet(); // sun.applet.AppletPanel
-
-                        // Fixed #4754451: Applet can have methods running on main
-                        // thread event queue.
-                        //
-                        // The cause of this bug is that the frame of the applet
-                        // is created in main thread group. Thus, when certain
-                        // AWT/Swing events are generated, the events will be
-                        // dispatched through the wrong event dispatch thread.
-                        //
-                        // To fix this, we rearrange the AppContext with the frame,
-                        // so the proper event queue will be looked up.
-                        //
-                        // Swing also maintains a Frame list for the AppContext,
-                        // so we will have to rearrange it as well.
-                        //
-                        if (a != null)
-                            AppletPanel.changeFrameAppContext(frame, SunToolkit.targetToAppContext(a));
-                        else
-                            AppletPanel.changeFrameAppContext(frame, AppContext.getAppContext());
-
-                        break;
-                    }
-                }
-            }
-        };
-
-        addWindowListener(windowEventListener);
-        panel.addAppletListener(new AppletEventListener(this));
-
-        // Start the applet
-        showStatus(amh.getMessage("status.start"));
-        initEventQueue();
-    }
-
-    // XXX 99/9/10 probably should be "private"
-    public MenuItem addMenuItem(Menu m, String s) {
-        MenuItem mItem = new MenuItem(amh.getMessage(s));
-        mItem.addActionListener(new UserActionListener());
-        return m.add(mItem);
-    }
-
-    /**
-     * Send the initial set of events to the appletviewer event queue.
-     * On start-up the current behaviour is to load the applet and call
-     * Applet.init() and Applet.start().
-     */
-    private void initEventQueue() {
-        // appletviewer.send.event is an undocumented and unsupported system
-        // property which is used exclusively for testing purposes.
-        String eventList = System.getProperty("appletviewer.send.event");
-
-        if (eventList == null) {
-            // Add the standard events onto the event queue.
-            panel.sendEvent(AppletPanel.APPLET_LOAD);
-            panel.sendEvent(AppletPanel.APPLET_INIT);
-            panel.sendEvent(AppletPanel.APPLET_START);
-        } else {
-            // We're testing AppletViewer.  Force the specified set of events
-            // onto the event queue, wait for the events to be processed, and
-            // exit.
-
-            // The list of events that will be executed is provided as a
-            // ","-separated list.  No error-checking will be done on the list.
-            String [] events = splitSeparator(",", eventList);
-
-            for (int i = 0; i < events.length; i++) {
-                System.out.println("Adding event to queue: " + events[i]);
-                if (events[i].equals("dispose"))
-                    panel.sendEvent(AppletPanel.APPLET_DISPOSE);
-                else if (events[i].equals("load"))
-                    panel.sendEvent(AppletPanel.APPLET_LOAD);
-                else if (events[i].equals("init"))
-                    panel.sendEvent(AppletPanel.APPLET_INIT);
-                else if (events[i].equals("start"))
-                    panel.sendEvent(AppletPanel.APPLET_START);
-                else if (events[i].equals("stop"))
-                    panel.sendEvent(AppletPanel.APPLET_STOP);
-                else if (events[i].equals("destroy"))
-                    panel.sendEvent(AppletPanel.APPLET_DESTROY);
-                else if (events[i].equals("quit"))
-                    panel.sendEvent(AppletPanel.APPLET_QUIT);
-                else if (events[i].equals("error"))
-                    panel.sendEvent(AppletPanel.APPLET_ERROR);
-                else
-                    // non-fatal error if we get an unrecognized event
-                    System.out.println("Unrecognized event name: " + events[i]);
-            }
-
-            while (!panel.emptyEventQueue()) ;
-            appletSystemExit();
-        }
-    }
-
-    /**
-     * Split a string based on the presence of a specified separator.  Returns
-     * an array of arbitrary length.  The end of each element in the array is
-     * indicated by the separator of the end of the string.  If there is a
-     * separator immediately before the end of the string, the final element
-     * will be empty.  None of the strings will contain the separator.  Useful
-     * when separating strings such as "foo/bar/bas" using separator "/".
-     *
-     * @param sep  The separator.
-     * @param s    The string to split.
-     * @return     An array of strings.  Each string in the array is determined
-     *             by the location of the provided sep in the original string,
-     *             s.  Whitespace not stripped.
-     */
-    private String [] splitSeparator(String sep, String s) {
-        Vector<String> v = new Vector<>();
-        int tokenStart = 0;
-        int tokenEnd   = 0;
-
-        while ((tokenEnd = s.indexOf(sep, tokenStart)) != -1) {
-            v.addElement(s.substring(tokenStart, tokenEnd));
-            tokenStart = tokenEnd+1;
-        }
-        // Add the final element.
-        v.addElement(s.substring(tokenStart));
-
-        String [] retVal = new String[v.size()];
-        v.copyInto(retVal);
-        return retVal;
-    }
-
-    /*
-     * Methods for java.applet.AppletContext
-     */
-
-    private static Map<URL, AudioClip> audioClips = new HashMap<>();
-
-    /**
-     * Get an audio clip.
-     */
-    @Override
-    public AudioClip getAudioClip(URL url) {
-        checkConnect(url);
-        synchronized (audioClips) {
-            AudioClip clip = audioClips.get(url);
-            if (clip == null) {
-                audioClips.put(url, clip = new AppletAudioClip(url));
-            }
-            return clip;
-        }
-    }
-
-    private static Map<URL, AppletImageRef> imageRefs = new HashMap<>();
-
-    /**
-     * Get an image.
-     */
-    @Override
-    public Image getImage(URL url) {
-        return getCachedImage(url);
-    }
-
-    /**
-     * Get an image.
-     */
-    static Image getCachedImage(URL url) {
-        // System.getSecurityManager().checkConnection(url.getHost(), url.getPort());
-        synchronized (imageRefs) {
-            AppletImageRef ref = imageRefs.get(url);
-            if (ref == null) {
-                ref = new AppletImageRef(url);
-                imageRefs.put(url, ref);
-            }
-            return ref.get();
-        }
-    }
-
-    /**
-     * Flush the image cache.
-     */
-    static void flushImageCache() {
-        imageRefs.clear();
-    }
-
-    static Vector<AppletPanel> appletPanels = new Vector<>();
-
-    /**
-     * Get an applet by name.
-     */
-    @Override
-    public Applet getApplet(String name) {
-        AppletSecurity security = (AppletSecurity)System.getSecurityManager();
-        name = name.toLowerCase();
-        SocketPermission panelSp =
-            new SocketPermission(panel.getCodeBase().getHost(), "connect");
-        for (Enumeration<AppletPanel> e = appletPanels.elements() ; e.hasMoreElements() ;) {
-            AppletPanel p = e.nextElement();
-            String param = p.getParameter("name");
-            if (param != null) {
-                param = param.toLowerCase();
-            }
-            if (name.equals(param) &&
-                p.getDocumentBase().equals(panel.getDocumentBase())) {
-
-                SocketPermission sp =
-                    new SocketPermission(p.getCodeBase().getHost(), "connect");
-
-                if (panelSp.implies(sp)) {
-                    return p.applet;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return an enumeration of all the accessible
-     * applets on this page.
-     */
-    @Override
-    public Enumeration<Applet> getApplets() {
-        AppletSecurity security = (AppletSecurity)System.getSecurityManager();
-        Vector<Applet> v = new Vector<>();
-        SocketPermission panelSp =
-            new SocketPermission(panel.getCodeBase().getHost(), "connect");
-
-        for (Enumeration<AppletPanel> e = appletPanels.elements() ; e.hasMoreElements() ;) {
-            AppletPanel p = e.nextElement();
-            if (p.getDocumentBase().equals(panel.getDocumentBase())) {
-
-                SocketPermission sp =
-                    new SocketPermission(p.getCodeBase().getHost(), "connect");
-                if (panelSp.implies(sp)) {
-                    v.addElement(p.applet);
-                }
-            }
-        }
-        return v.elements();
-    }
-
-    /**
-     * Ignore.
-     */
-    @Override
-    public void showDocument(URL url) {
-    }
-
-    /**
-     * Ignore.
-     */
-    @Override
-    public void showDocument(URL url, String target) {
-    }
-
-    /**
-     * Show status.
-     */
-    @Override
-    public void showStatus(String status) {
-        label.setText(status);
-    }
-
-    @Override
-    public void setStream(String key, InputStream stream)throws IOException{
-        // We do nothing.
-    }
-
-    @Override
-    public InputStream getStream(String key){
-        // We do nothing.
-        return null;
-    }
-
-    @Override
-    public Iterator<String> getStreamKeys(){
-        // We do nothing.
-        return null;
-    }
-
-    /**
-     * System parameters.
-     */
-    static Hashtable<String, String> systemParam = new Hashtable<>();
-
-    static {
-        systemParam.put("codebase", "codebase");
-        systemParam.put("code", "code");
-        systemParam.put("alt", "alt");
-        systemParam.put("width", "width");
-        systemParam.put("height", "height");
-        systemParam.put("align", "align");
-        systemParam.put("vspace", "vspace");
-        systemParam.put("hspace", "hspace");
-    }
-
-    /**
-     * Print the HTML tag.
-     */
-    public static void printTag(PrintStream out, Hashtable<String, String> atts) {
-        out.print("<applet");
-
-        String v = atts.get("codebase");
-        if (v != null) {
-            out.print(" codebase=\"" + v + "\"");
-        }
-
-        v = atts.get("code");
-        if (v == null) {
-            v = "applet.class";
-        }
-        out.print(" code=\"" + v + "\"");
-        v = atts.get("width");
-        if (v == null) {
-            v = "150";
-        }
-        out.print(" width=" + v);
-
-        v = atts.get("height");
-        if (v == null) {
-            v = "100";
-        }
-        out.print(" height=" + v);
-
-        v = atts.get("name");
-        if (v != null) {
-            out.print(" name=\"" + v + "\"");
-        }
-        out.println(">");
-
-        // A very slow sorting algorithm
-        int len = atts.size();
-        String params[] = new String[len];
-        len = 0;
-        for (Enumeration<String> e = atts.keys() ; e.hasMoreElements() ;) {
-            String param = e.nextElement();
-            int i = 0;
-            for (; i < len ; i++) {
-                if (params[i].compareTo(param) >= 0) {
-                    break;
-                }
-            }
-            System.arraycopy(params, i, params, i + 1, len - i);
-            params[i] = param;
-            len++;
-        }
-
-        for (int i = 0 ; i < len ; i++) {
-            String param = params[i];
-            if (systemParam.get(param) == null) {
-                out.println("<param name=" + param +
-                            " value=\"" + atts.get(param) + "\">");
-            }
-        }
-        out.println("</applet>");
-    }
-
-    /**
-     * Make sure the atrributes are uptodate.
-     */
-    @SuppressWarnings("deprecation")
-    public void updateAtts() {
-        Dimension d = panel.size();
-        Insets in = panel.insets();
-        panel.atts.put("width",
-                       Integer.toString(d.width - (in.left + in.right)));
-        panel.atts.put("height",
-                       Integer.toString(d.height - (in.top + in.bottom)));
-    }
-
-    /**
-     * Restart the applet.
-     */
-    void appletRestart() {
-        panel.sendEvent(AppletPanel.APPLET_STOP);
-        panel.sendEvent(AppletPanel.APPLET_DESTROY);
-        panel.sendEvent(AppletPanel.APPLET_INIT);
-        panel.sendEvent(AppletPanel.APPLET_START);
-    }
-
-    /**
-     * Reload the applet.
-     */
-    void appletReload() {
-        panel.sendEvent(AppletPanel.APPLET_STOP);
-        panel.sendEvent(AppletPanel.APPLET_DESTROY);
-        panel.sendEvent(AppletPanel.APPLET_DISPOSE);
-
-        /**
-         * Fixed #4501142: Classloader sharing policy doesn't
-         * take "archive" into account. This will be overridden
-         * by Java Plug-in.                     [stanleyh]
-         */
-        AppletPanel.flushClassLoader(panel.getClassLoaderCacheKey());
-
-        /*
-         * Make sure we don't have two threads running through the event queue
-         * at the same time.
-         */
-        try {
-            panel.joinAppletThread();
-            panel.release();
-        } catch (InterruptedException e) {
-            return;   // abort the reload
-        }
-
-        panel.createAppletThread();
-        panel.sendEvent(AppletPanel.APPLET_LOAD);
-        panel.sendEvent(AppletPanel.APPLET_INIT);
-        panel.sendEvent(AppletPanel.APPLET_START);
-    }
-
-    /**
-     * Save the applet to a well known file (for now) as a serialized object
-     */
-    @SuppressWarnings("deprecation")
-    void appletSave() {
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-
-            @Override
-            public Object run() {
-                // XXX: this privileged block should be made smaller
-                // by initializing a private static variable with "user.dir"
-
-                // Applet needs to be stopped for serialization to succeed.
-                // Since panel.sendEvent only queues the event, there is a
-                // chance that the event will not be processed before
-                // serialization begins.  However, by sending the event before
-                // FileDialog is created, enough time is given such that this
-                // situation is unlikely to ever occur.
-
-                panel.sendEvent(AppletPanel.APPLET_STOP);
-                FileDialog fd = new FileDialog(AppletViewer.this,
-                                               amh.getMessage("appletsave.filedialogtitle"),
-                                               FileDialog.SAVE);
-                // needed for a bug under Solaris...
-                fd.setDirectory(System.getProperty("user.dir"));
-                fd.setFile(defaultSaveFile);
-                fd.show();
-                String fname = fd.getFile();
-                if (fname == null) {
-                    // Restart applet if Save is cancelled.
-                    panel.sendEvent(AppletPanel.APPLET_START);
-                    return null;                // cancelled
-                }
-                String dname = fd.getDirectory();
-                File file = new File(dname, fname);
-
-                try (FileOutputStream fos = new FileOutputStream(file);
-                     BufferedOutputStream bos = new BufferedOutputStream(fos);
-                     ObjectOutputStream os = new ObjectOutputStream(bos)) {
-
-                    showStatus(amh.getMessage("appletsave.err1", panel.applet.toString(), file.toString()));
-                    os.writeObject(panel.applet);
-                } catch (IOException ex) {
-                    System.err.println(amh.getMessage("appletsave.err2", ex));
-                } finally {
-                    panel.sendEvent(AppletPanel.APPLET_START);
-                }
-                return null;
-            }
-        });
-    }
-
-    /**
-     * Clone the viewer and the applet.
-     */
-    @SuppressWarnings("deprecation")
-    void appletClone() {
-        Point p = location();
-        updateAtts();
-        @SuppressWarnings("unchecked")
-        Hashtable<String, String> tmp = (Hashtable<String, String>) panel.atts.clone();
-        factory.createAppletViewer(p.x + XDELTA, p.y + YDELTA,
-                                   panel.documentURL, tmp);
-    }
-
-    /**
-     * Show the applet tag.
-     */
-    @SuppressWarnings("deprecation")
-    void appletTag() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        updateAtts();
-        printTag(new PrintStream(out), panel.atts);
-        showStatus(amh.getMessage("applettag"));
-
-        Point p = location();
-        new TextFrame(p.x + XDELTA, p.y + YDELTA, amh.getMessage("applettag.textframe"), out.toString());
-    }
-
-    /**
-     * Show the applet info.
-     */
-    @SuppressWarnings("deprecation")
-    void appletInfo() {
-        String str = panel.applet.getAppletInfo();
-        if (str == null) {
-            str = amh.getMessage("appletinfo.applet");
-        }
-        str += "\n\n";
-
-        String atts[][] = panel.applet.getParameterInfo();
-        if (atts != null) {
-            for (int i = 0 ; i < atts.length ; i++) {
-                str += atts[i][0] + " -- " + atts[i][1] + " -- " + atts[i][2] + "\n";
-            }
-        } else {
-            str += amh.getMessage("appletinfo.param");
-        }
-
-        Point p = location();
-        new TextFrame(p.x + XDELTA, p.y + YDELTA, amh.getMessage("appletinfo.textframe"), str);
-
-    }
-
-    /**
-     * Show character encoding type
-     */
-    void appletCharacterEncoding() {
-        showStatus(amh.getMessage("appletencoding", encoding));
-    }
-
-    /**
-     * Edit the applet.
-     */
-    void appletEdit() {
-    }
-
-    /**
-     * Print the applet.
-     */
-    void appletPrint() {
-        PrinterJob pj = PrinterJob.getPrinterJob();
-
-        if (pj != null) {
-            PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
-            if (pj.printDialog(aset)) {
-                pj.setPrintable(this);
-                try {
-                    pj.print(aset);
-                    statusMsgStream.println(amh.getMessage("appletprint.finish"));
-                } catch (PrinterException e) {
-                   statusMsgStream.println(amh.getMessage("appletprint.fail"));
-                }
-            } else {
-                statusMsgStream.println(amh.getMessage("appletprint.cancel"));
-            }
-        } else {
-            statusMsgStream.println(amh.getMessage("appletprint.fail"));
-        }
-    }
-
-    @Override
-    public int print(Graphics graphics, PageFormat pf, int pageIndex) {
-        if (pageIndex > 0) {
-            return Printable.NO_SUCH_PAGE;
-        } else {
-            Graphics2D g2d = (Graphics2D)graphics;
-            g2d.translate(pf.getImageableX(), pf.getImageableY());
-            panel.applet.printAll(graphics);
-            return Printable.PAGE_EXISTS;
-        }
-    }
-
-    /**
-     * Properties.
-     */
-    static AppletProps props;
-    public static synchronized void networkProperties() {
-        if (props == null) {
-            props = new AppletProps();
-        }
-        props.addNotify();
-        props.setVisible(true);
-    }
-
-    /**
-     * Start the applet.
-     */
-    void appletStart() {
-        panel.sendEvent(AppletPanel.APPLET_START);
-    }
-
-    /**
-     * Stop the applet.
-     */
-    void appletStop() {
-        panel.sendEvent(AppletPanel.APPLET_STOP);
-    }
-
-    /**
-     * Shutdown a viewer.
-     * Stop, Destroy, Dispose and Quit a viewer
-     */
-    private void appletShutdown(AppletPanel p) {
-        p.sendEvent(AppletPanel.APPLET_STOP);
-        p.sendEvent(AppletPanel.APPLET_DESTROY);
-        p.sendEvent(AppletPanel.APPLET_DISPOSE);
-        p.sendEvent(AppletPanel.APPLET_QUIT);
-    }
-
-    /**
-     * Close this viewer.
-     * Stop, Destroy, Dispose and Quit an AppletView, then
-     * reclaim resources and exit the program if this is
-     * the last applet.
-     */
-    void appletClose() {
-
-        // The caller thread is event dispatch thread, so
-        // spawn a new thread to avoid blocking the event queue
-        // when calling appletShutdown.
-        //
-        final AppletPanel p = panel;
-
-        new Thread(null, new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                appletShutdown(p);
-                appletPanels.removeElement(p);
-                dispose();
-
-                if (countApplets() == 0) {
-                    appletSystemExit();
-                }
-            }
-        },
-        "AppletCloser", 0, false).start();
-    }
-
-    /**
-     * Exit the program.
-     * Exit from the program (if not stand alone) - do no clean-up
-     */
-    private void appletSystemExit() {
-        if (factory.isStandalone())
-            System.exit(0);
-    }
-
-    /**
-     * Quit all viewers.
-     * Shutdown all viewers properly then
-     * exit from the program (if not stand alone)
-     */
-    protected void appletQuit()
-    {
-        // The caller thread is event dispatch thread, so
-        // spawn a new thread to avoid blocking the event queue
-        // when calling appletShutdown.
-        //
-        new Thread(null, new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                for (Enumeration<AppletPanel> e = appletPanels.elements() ; e.hasMoreElements() ;) {
-                    AppletPanel p = e.nextElement();
-                    appletShutdown(p);
-                }
-                appletSystemExit();
-            }
-        },
-         "AppletQuit", 0, false).start();
-    }
-
-    /**
-     * Handle events.
-     */
-    public void processUserAction(ActionEvent evt) {
-
-        String label = ((MenuItem)evt.getSource()).getLabel();
-
-        if (amh.getMessage("menuitem.restart").equals(label)) {
-            appletRestart();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.reload").equals(label)) {
-            appletReload();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.clone").equals(label)) {
-            appletClone();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.stop").equals(label)) {
-            appletStop();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.save").equals(label)) {
-            appletSave();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.start").equals(label)) {
-            appletStart();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.tag").equals(label)) {
-            appletTag();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.info").equals(label)) {
-            appletInfo();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.encoding").equals(label)) {
-            appletCharacterEncoding();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.edit").equals(label)) {
-            appletEdit();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.print").equals(label)) {
-            appletPrint();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.props").equals(label)) {
-            networkProperties();
-            return;
-        }
-
-        if (amh.getMessage("menuitem.close").equals(label)) {
-            appletClose();
-            return;
-        }
-
-        if (factory.isStandalone() && amh.getMessage("menuitem.quit").equals(label)) {
-            appletQuit();
-            return;
-        }
-        //statusMsgStream.println("evt = " + evt);
-    }
-
-    /**
-     * How many applets are running?
-     */
-
-    public static int countApplets() {
-        return appletPanels.size();
-    }
-
-
-    /**
-     * The current character.
-     */
-    static int c;
-
-    /**
-     * Scan spaces.
-     */
-    public static void skipSpace(Reader in) throws IOException {
-        while ((c >= 0) &&
-               ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'))) {
-            c = in.read();
-        }
-    }
-
-    /**
-     * Scan identifier
-     */
-    public static String scanIdentifier(Reader in) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        while (true) {
-            if (((c >= 'a') && (c <= 'z')) ||
-                ((c >= 'A') && (c <= 'Z')) ||
-                ((c >= '0') && (c <= '9')) || (c == '_')) {
-                sb.append((char) c);
-                c = in.read();
-            } else {
-                return sb.toString();
-            }
-        }
-    }
-
-    /**
-     * Scan tag
-     */
-    public static Hashtable<String, String> scanTag(Reader in) throws IOException {
-        Hashtable<String, String> atts = new Hashtable<>();
-        skipSpace(in);
-        while (c >= 0 && c != '>') {
-            String att = scanIdentifier(in);
-            String val = "";
-            skipSpace(in);
-            if (c == '=') {
-                int quote = -1;
-                c = in.read();
-                skipSpace(in);
-                if ((c == '\'') || (c == '\"')) {
-                    quote = c;
-                    c = in.read();
-                }
-                StringBuilder sb = new StringBuilder();
-                while ((c > 0) &&
-                       (((quote < 0) && (c != ' ') && (c != '\t') &&
-                         (c != '\n') && (c != '\r') && (c != '>'))
-                        || ((quote >= 0) && (c != quote)))) {
-                    sb.append((char) c);
-                    c = in.read();
-                }
-                if (c == quote) {
-                    c = in.read();
-                }
-                skipSpace(in);
-                val = sb.toString();
-            }
-            //statusMsgStream.println("PUT " + att + " = '" + val + "'");
-            if (! val.equals("")) {
-                atts.put(att.toLowerCase(java.util.Locale.ENGLISH), val);
-            }
-            while (true) {
-                if ((c == '>') || (c < 0) ||
-                    ((c >= 'a') && (c <= 'z')) ||
-                    ((c >= 'A') && (c <= 'Z')) ||
-                    ((c >= '0') && (c <= '9')) || (c == '_'))
-                    break;
-                c = in.read();
-            }
-            //skipSpace(in);
-        }
-        return atts;
-    }
-
-    /* values used for placement of AppletViewer's frames */
-    private static int x = 0;
-    private static int y = 0;
-    private static final int XDELTA = 30;
-    private static final int YDELTA = XDELTA;
-
-    static String encoding = null;
-
-    private static Reader makeReader(InputStream is) {
-        if (encoding != null) {
-            try {
-                return new BufferedReader(new InputStreamReader(is, encoding));
-            } catch (IOException x) { }
-        }
-        InputStreamReader r = new InputStreamReader(is);
-        encoding = r.getEncoding();
-        return new BufferedReader(r);
-    }
-
-    /**
-     * Scan an html file for {@code <applet>} tags
-     */
-    public static void parse(URL url, String enc) throws IOException {
-        encoding = enc;
-        parse(url, System.out, new StdAppletViewerFactory());
-    }
-
-    public static void parse(URL url) throws IOException {
-        parse(url, System.out, new StdAppletViewerFactory());
-    }
-
-    public static void parse(URL url, PrintStream statusMsgStream,
-                             AppletViewerFactory factory) throws IOException {
-        // <OBJECT> <EMBED> tag flags
-        boolean isAppletTag = false;
-        boolean isObjectTag = false;
-        boolean isEmbedTag = false;
-
-        // warning messages
-        String requiresNameWarning = amh.getMessage("parse.warning.requiresname");
-        String paramOutsideWarning = amh.getMessage("parse.warning.paramoutside");
-        String appletRequiresCodeWarning = amh.getMessage("parse.warning.applet.requirescode");
-        String appletRequiresHeightWarning = amh.getMessage("parse.warning.applet.requiresheight");
-        String appletRequiresWidthWarning = amh.getMessage("parse.warning.applet.requireswidth");
-        String objectRequiresCodeWarning = amh.getMessage("parse.warning.object.requirescode");
-        String objectRequiresHeightWarning = amh.getMessage("parse.warning.object.requiresheight");
-        String objectRequiresWidthWarning = amh.getMessage("parse.warning.object.requireswidth");
-        String embedRequiresCodeWarning = amh.getMessage("parse.warning.embed.requirescode");
-        String embedRequiresHeightWarning = amh.getMessage("parse.warning.embed.requiresheight");
-        String embedRequiresWidthWarning = amh.getMessage("parse.warning.embed.requireswidth");
-        String appNotLongerSupportedWarning = amh.getMessage("parse.warning.appnotLongersupported");
-
-        java.net.URLConnection conn = url.openConnection();
-        Reader in = makeReader(conn.getInputStream());
-        /* The original URL may have been redirected - this
-         * sets it to whatever URL/codebase we ended up getting
-         */
-        url = conn.getURL();
-
-        int ydisp = 1;
-        Hashtable<String, String> atts = null;
-
-        while(true) {
-            c = in.read();
-            if (c == -1)
-                break;
-
-            if (c == '<') {
-                c = in.read();
-                if (c == '/') {
-                    c = in.read();
-                    String nm = scanIdentifier(in);
-                    if (nm.equalsIgnoreCase("applet") ||
-                        nm.equalsIgnoreCase("object") ||
-                        nm.equalsIgnoreCase("embed")) {
-
-                        // We can't test for a code tag until </OBJECT>
-                        // because it is a parameter, not an attribute.
-                        if(isObjectTag) {
-                            if (atts.get("code") == null && atts.get("object") == null) {
-                                statusMsgStream.println(objectRequiresCodeWarning);
-                                atts = null;
-                            }
-                        }
-
-                        if (atts != null) {
-                            // XXX 5/18 In general this code just simply
-                            // shouldn't be part of parsing.  It's presence
-                            // causes things to be a little too much of a
-                            // hack.
-                            factory.createAppletViewer(x, y, url, atts);
-                            x += XDELTA;
-                            y += YDELTA;
-                            // make sure we don't go too far!
-                            Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-                            if ((x > d.width - 300) || (y > d.height - 300)) {
-                                x = 0;
-                                y = 2 * ydisp * YDELTA;
-                                ydisp++;
-                            }
-                        }
-                        atts = null;
-                        isAppletTag = false;
-                        isObjectTag = false;
-                        isEmbedTag = false;
-                    }
-                }
-                else {
-                    String nm = scanIdentifier(in);
-                    if (nm.equalsIgnoreCase("param")) {
-                        Hashtable<String, String> t = scanTag(in);
-                        String att = t.get("name");
-                        if (att == null) {
-                            statusMsgStream.println(requiresNameWarning);
-                        } else {
-                            String val = t.get("value");
-                            if (val == null) {
-                                statusMsgStream.println(requiresNameWarning);
-                            } else if (atts != null) {
-                                atts.put(att.toLowerCase(), val);
-                            } else {
-                                statusMsgStream.println(paramOutsideWarning);
-                            }
-                        }
-                    }
-                    else if (nm.equalsIgnoreCase("applet")) {
-                        isAppletTag = true;
-                        atts = scanTag(in);
-                        if (atts.get("code") == null && atts.get("object") == null) {
-                            statusMsgStream.println(appletRequiresCodeWarning);
-                            atts = null;
-                        } else if (atts.get("width") == null) {
-                            statusMsgStream.println(appletRequiresWidthWarning);
-                            atts = null;
-                        } else if (atts.get("height") == null) {
-                            statusMsgStream.println(appletRequiresHeightWarning);
-                            atts = null;
-                        }
-                    }
-                    else if (nm.equalsIgnoreCase("object")) {
-                        isObjectTag = true;
-                        atts = scanTag(in);
-                        // The <OBJECT> attribute codebase isn't what
-                        // we want. If its defined, remove it.
-                        if(atts.get("codebase") != null) {
-                            atts.remove("codebase");
-                        }
-
-                        if (atts.get("width") == null) {
-                            statusMsgStream.println(objectRequiresWidthWarning);
-                            atts = null;
-                        } else if (atts.get("height") == null) {
-                            statusMsgStream.println(objectRequiresHeightWarning);
-                            atts = null;
-                        }
-                    }
-                    else if (nm.equalsIgnoreCase("embed")) {
-                        isEmbedTag = true;
-                        atts = scanTag(in);
-
-                        if (atts.get("code") == null && atts.get("object") == null) {
-                            statusMsgStream.println(embedRequiresCodeWarning);
-                            atts = null;
-                        } else if (atts.get("width") == null) {
-                            statusMsgStream.println(embedRequiresWidthWarning);
-                            atts = null;
-                        } else if (atts.get("height") == null) {
-                            statusMsgStream.println(embedRequiresHeightWarning);
-                            atts = null;
-                        }
-                    }
-                    else if (nm.equalsIgnoreCase("app")) {
-                        statusMsgStream.println(appNotLongerSupportedWarning);
-                        Hashtable<String, String> atts2 = scanTag(in);
-                        nm = atts2.get("class");
-                        if (nm != null) {
-                            atts2.remove("class");
-                            atts2.put("code", nm + ".class");
-                        }
-                        nm = atts2.get("src");
-                        if (nm != null) {
-                            atts2.remove("src");
-                            atts2.put("codebase", nm);
-                        }
-                        if (atts2.get("width") == null) {
-                            atts2.put("width", "100");
-                        }
-                        if (atts2.get("height") == null) {
-                            atts2.put("height", "100");
-                        }
-                        printTag(statusMsgStream, atts2);
-                        statusMsgStream.println();
-                    }
-                }
-            }
-        }
-        in.close();
-    }
-
-    /**
-     * Old main entry point.
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public static void main(String argv[]) {
-        // re-route everything to the new main entry point
-        Main.main(argv);
-    }
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletviewer");
-
-    private static void checkConnect(URL url)
-    {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            try {
-                java.security.Permission perm =
-                    url.openConnection().getPermission();
-                if (perm != null)
-                    security.checkPermission(perm);
-                else
-                    security.checkConnect(url.getHost(), url.getPort());
-            } catch (java.io.IOException ioe) {
-                    security.checkConnect(url.getHost(), url.getPort());
-            }
-        }
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java b/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
deleted file mode 100644
index 86ef3671df0..00000000000
--- a/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1995, 2005, 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 sun.applet;
-
-import java.util.*;
-import java.io.*;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.awt.*;
-import java.applet.*;
-
-
-/**
- * Sample applet panel class. The panel manages and manipulates the
- * applet as it is being loaded. It forks a seperate thread in a new
- * thread group to call the applet's init(), start(), stop(), and
- * destroy() methods.
- *
- * @author      Arthur van Hoff
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@Deprecated(since = "9")
-class AppletViewerPanel extends AppletPanel {
-
-    /* Are we debugging? */
-    static boolean debug = false;
-
-    /**
-     * The document url.
-     */
-    URL documentURL;
-
-    /**
-     * The base url.
-     */
-    URL baseURL;
-
-    /**
-     * The attributes of the applet.
-     */
-    Hashtable<String, String> atts;
-
-    /*
-     * JDK 1.1 serialVersionUID
-     */
-    private static final long serialVersionUID = 8890989370785545619L;
-
-    /**
-     * Construct an applet viewer and start the applet.
-     */
-    AppletViewerPanel(URL documentURL, Hashtable<String, String> atts) {
-        this.documentURL = documentURL;
-        this.atts = atts;
-
-        String att = getParameter("codebase");
-        if (att != null) {
-            if (!att.endsWith("/")) {
-                att += "/";
-            }
-            try {
-                baseURL = new URL(documentURL, att);
-            } catch (MalformedURLException e) {
-            }
-        }
-        if (baseURL == null) {
-            String file = documentURL.getFile();
-            int i = file.lastIndexOf('/');
-            if (i >= 0 && i < file.length() - 1) {
-                try {
-                    baseURL = new URL(documentURL, file.substring(0, i + 1));
-                } catch (MalformedURLException e) {
-                }
-            }
-        }
-
-        // when all is said & done, baseURL shouldn't be null
-        if (baseURL == null)
-                baseURL = documentURL;
-
-
-    }
-
-    /**
-     * Get an applet parameter.
-     */
-    public String getParameter(String name) {
-        return atts.get(name.toLowerCase());
-    }
-
-    /**
-     * Get the document url.
-     */
-    public URL getDocumentBase() {
-        return documentURL;
-
-    }
-
-    /**
-     * Get the base url.
-     */
-    public URL getCodeBase() {
-        return baseURL;
-    }
-
-    /**
-     * Get the width.
-     */
-    public int getWidth() {
-        String w = getParameter("width");
-        if (w != null) {
-            return Integer.valueOf(w).intValue();
-        }
-        return 0;
-    }
-
-
-    /**
-     * Get the height.
-     */
-    public int getHeight() {
-        String h = getParameter("height");
-        if (h != null) {
-            return Integer.valueOf(h).intValue();
-        }
-        return 0;
-    }
-
-    /**
-     * Get initial_focus
-     */
-    public boolean hasInitialFocus()
-    {
-
-        // 6234219: Do not set initial focus on an applet
-        // during startup if applet is targeted for
-        // JDK 1.1/1.2. [stanley.ho]
-        if (isJDK11Applet() || isJDK12Applet())
-            return false;
-
-        String initialFocus = getParameter("initial_focus");
-
-        if (initialFocus != null)
-        {
-            if (initialFocus.toLowerCase().equals("false"))
-                return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the code parameter
-     */
-    public String getCode() {
-        return getParameter("code");
-    }
-
-
-    /**
-     * Return the list of jar files if specified.
-     * Otherwise return null.
-     */
-    public String getJarFiles() {
-        return getParameter("archive");
-    }
-
-    /**
-     * Return the value of the object param
-     */
-    public String getSerializedObject() {
-        return getParameter("object");// another name?
-    }
-
-
-    /**
-     * Get the applet context. For now this is
-     * also implemented by the AppletPanel class.
-     */
-    @SuppressWarnings("deprecation")
-    public AppletContext getAppletContext() {
-        return (AppletContext)getParent();
-    }
-
-    static void debug(String s) {
-        if(debug)
-            System.err.println("AppletViewerPanel:::" + s);
-    }
-
-    static void debug(String s, Throwable t) {
-        if(debug) {
-            t.printStackTrace();
-            debug(s);
-        }
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/Main.java b/src/java.desktop/share/classes/sun/applet/Main.java
deleted file mode 100644
index 6f5d0c178d7..00000000000
--- a/src/java.desktop/share/classes/sun/applet/Main.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright (c) 1999, 2016, 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 sun.applet;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Vector;
-import sun.net.www.ParseUtil;
-
-/**
- * The main entry point into AppletViewer.
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
- */
-@Deprecated(since = "9")
-public class Main {
-    /**
-     * The file which contains all of the AppletViewer specific properties.
-     */
-    static File theUserPropertiesFile;
-
-    /**
-     * The default key/value pairs for the required user-specific properties.
-     */
-    static final String [][] avDefaultUserProps = {
-        // There's a bootstrapping problem here.  If we don't have a proxyHost,
-        // then we will not be able to connect to a URL outside the firewall;
-        // however, there's no way for us to set the proxyHost without starting
-        // AppletViewer.  This problem existed before the re-write.
-        {"http.proxyHost", ""},
-        {"http.proxyPort", "80"},
-        {"package.restrict.access.sun", "true"}
-    };
-
-    static {
-        File userHome = new File(System.getProperty("user.home"));
-        // make sure we can write to this location
-        userHome.canWrite();
-
-        theUserPropertiesFile = new File(userHome, ".appletviewer");
-    }
-
-    // i18n
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletviewer");
-
-    /**
-     * Member variables set according to options passed in to AppletViewer.
-     */
-    private boolean helpFlag  = false;
-    private String  encoding  = null;
-    private boolean noSecurityFlag  = false;
-    private static boolean cmdLineTestFlag = false;
-
-    /**
-     * The list of valid URLs passed in to AppletViewer.
-     */
-    private static Vector<URL> urlList = new Vector<>(1);
-
-    // This is used in init().  Getting rid of this is desirable but depends
-    // on whether the property that uses it is necessary/standard.
-    public static final String theVersion = System.getProperty("java.version");
-
-    /**
-     * The main entry point into AppletViewer.
-     */
-    public static void main(String [] args) {
-        Main m = new Main();
-        int ret = m.run(args);
-
-        // Exit immediately if we got some sort of error along the way.
-        // For debugging purposes, if we have passed in "-XcmdLineTest" we
-        // force a premature exit.
-        if ((ret != 0) || (cmdLineTestFlag))
-            System.exit(ret);
-    }
-
-    private int run(String [] args) {
-        // DECODE ARGS
-        try {
-            System.err.println(lookup("deprecated"));
-            System.err.flush();
-            if (args.length == 0) {
-                usage();
-                return 0;
-            }
-            for (int i = 0; i < args.length; ) {
-                int j = decodeArg(args, i);
-                if (j == 0) {
-                    throw new ParseException(lookup("main.err.unrecognizedarg",
-                                                    args[i]));
-                }
-                i += j;
-            }
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            return 1;
-        }
-
-        // CHECK ARGUMENTS
-        if (helpFlag) {
-            usage();
-            return 0;
-        }
-
-        if (urlList.size() == 0) {
-            System.err.println(lookup("main.err.inputfile"));
-            return 1;
-        }
-
-        // INSTALL THE SECURITY MANAGER (if necessary)
-        if (!noSecurityFlag && (System.getSecurityManager() == null))
-            init();
-
-        // LAUNCH APPLETVIEWER FOR EACH URL
-        for (int i = 0; i < urlList.size(); i++) {
-            try {
-                // XXX 5/17 this parsing method should be changed/fixed so that
-                // it doesn't do both parsing of the html file and launching of
-                // the AppletPanel
-                AppletViewer.parse(urlList.elementAt(i), encoding);
-            } catch (IOException e) {
-                System.err.println(lookup("main.err.io", e.getMessage()));
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    private static void usage() {
-        System.out.println(lookup("usage"));
-    }
-
-    /**
-     * Decode a single argument in an array and return the number of elements
-     * used.
-     *
-     * @param args The array of arguments.
-     * @param i    The argument to decode.
-     * @return     The number of array elements used when the argument was
-     *             decoded.
-     * @exception ParseException
-     *             Thrown when there is a problem with something in the
-     *             argument array.
-     */
-    private int decodeArg(String [] args, int i) throws ParseException {
-        String arg = args[i];
-        int argc = args.length;
-
-        if ("-help".equalsIgnoreCase(arg) || "-?".equals(arg)) {
-            helpFlag = true;
-            return 1;
-        } else if ("-encoding".equals(arg) && (i < argc - 1)) {
-            if (encoding != null)
-                throw new ParseException(lookup("main.err.dupoption", arg));
-            encoding = args[++i];
-            return 2;
-        } else if ("-Xnosecurity".equals(arg)) {
-            // This is an undocumented (and, in the future, unsupported)
-            // flag which prevents AppletViewer from installing its own
-            // SecurityManager.
-
-            System.err.println();
-            System.err.println(lookup("main.warn.nosecmgr"));
-            System.err.println();
-
-            noSecurityFlag = true;
-            return 1;
-        } else if ("-XcmdLineTest".equals(arg)) {
-            // This is an internal flag which should be used for command-line
-            // testing.  It instructs AppletViewer to force a premature exit
-            // immediately after the applet has been launched.
-            cmdLineTestFlag = true;
-            return 1;
-        } else if (arg.startsWith("-")) {
-            throw new ParseException(lookup("main.err.unsupportedopt", arg));
-        } else {
-            // we found what we hope is a url
-            URL url = parseURL(arg);
-            if (url != null) {
-                urlList.addElement(url);
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * Following the relevant RFC, construct a valid URL based on the passed in
-     * string.
-     *
-     * @param url  a string which represents either a relative or absolute URL.
-     * @return     a URL when the passed in string can be interpreted according
-     *             to the RFC, {@code null} otherwise.
-     * @exception  ParseException
-     *             Thrown when we are unable to construct a proper URL from the
-     *             passed in string.
-     */
-    private URL parseURL(String url) throws ParseException {
-        URL u = null;
-        // prefix of the urls with 'file' scheme
-        String prefix = "file:";
-
-        try {
-            if (url.indexOf(':') <= 1)
-            {
-                // appletviewer accepts only unencoded filesystem paths
-                u = ParseUtil.fileToEncodedURL(new File(url));
-            } else if (url.startsWith(prefix) &&
-                       url.length() != prefix.length() &&
-                       !(new File(url.substring(prefix.length())).isAbsolute()))
-            {
-                // relative file URL, like this "file:index.html"
-                // ensure that this file URL is absolute
-                // ParseUtil.fileToEncodedURL should be done last (see 6329251)
-                String path = ParseUtil.fileToEncodedURL(new File(System.getProperty("user.dir"))).getPath() +
-                    url.substring(prefix.length());
-                u = new URL("file", "", path);
-            } else {
-                // appletviewer accepts only encoded urls
-                u = new URL(url);
-            }
-        } catch (MalformedURLException e) {
-            throw new ParseException(lookup("main.err.badurl",
-                                            url, e.getMessage()));
-        }
-
-        return u;
-    }
-
-    private void init() {
-        // GET APPLETVIEWER USER-SPECIFIC PROPERTIES
-        Properties avProps = getAVProps();
-
-        // ADD OTHER RANDOM PROPERTIES
-        // XXX 5/18 need to revisit why these are here, is there some
-        // standard for what is available?
-
-        // Standard browser properties
-        avProps.put("browser", "sun.applet.AppletViewer");
-        avProps.put("browser.version", "1.06");
-        avProps.put("browser.vendor", "Oracle Corporation");
-        avProps.put("http.agent", "Java(tm) 2 SDK, Standard Edition v" + theVersion);
-
-        // Define which packages can be extended by applets
-        // XXX 5/19 probably not needed, not checked in AppletSecurity
-        avProps.put("package.restrict.definition.java", "true");
-        avProps.put("package.restrict.definition.sun", "true");
-
-        // Define which properties can be read by applets.
-        // A property named by "key" can be read only when its twin
-        // property "key.applet" is true.  The following ten properties
-        // are open by default.  Any other property can be explicitly
-        // opened up by the browser user by calling appletviewer with
-        // -J-Dkey.applet=true
-        avProps.put("java.version.applet", "true");
-        avProps.put("java.vendor.applet", "true");
-        avProps.put("java.vendor.url.applet", "true");
-        avProps.put("java.class.version.applet", "true");
-        avProps.put("os.name.applet", "true");
-        avProps.put("os.version.applet", "true");
-        avProps.put("os.arch.applet", "true");
-        avProps.put("file.separator.applet", "true");
-        avProps.put("path.separator.applet", "true");
-        avProps.put("line.separator.applet", "true");
-
-        // Read in the System properties.  If something is going to be
-        // over-written, warn about it.
-        Properties sysProps = System.getProperties();
-        for (Enumeration<?> e = sysProps.propertyNames(); e.hasMoreElements(); ) {
-            String key = (String) e.nextElement();
-            String val = sysProps.getProperty(key);
-            String oldVal;
-            if ((oldVal = (String) avProps.setProperty(key, val)) != null)
-                System.err.println(lookup("main.warn.prop.overwrite", key,
-                                          oldVal, val));
-        }
-
-        // INSTALL THE PROPERTY LIST
-        System.setProperties(avProps);
-
-        // Create and install the security manager
-        if (!noSecurityFlag) {
-            System.setSecurityManager(new AppletSecurity());
-        } else {
-            System.err.println(lookup("main.nosecmgr"));
-        }
-
-        // REMIND: Create and install a socket factory!
-    }
-
-    /**
-     * Read the AppletViewer user-specific properties.  Typically, these
-     * properties should reside in the file $USER/.appletviewer.  If this file
-     * does not exist, one will be created.  Information for this file will
-     * be gleaned from $USER/.hotjava/properties.  If that file does not exist,
-     * then default values will be used.
-     *
-     * @return     A Properties object containing all of the AppletViewer
-     *             user-specific properties.
-     */
-    private Properties getAVProps() {
-        Properties avProps = new Properties();
-
-        File dotAV = theUserPropertiesFile;
-        if (dotAV.exists()) {
-            // we must have already done the conversion
-            if (dotAV.canRead()) {
-                // just read the file
-                avProps = getAVProps(dotAV);
-            } else {
-                // send out warning and use defaults
-                System.err.println(lookup("main.warn.cantreadprops",
-                                          dotAV.toString()));
-                avProps = setDefaultAVProps();
-            }
-        } else {
-            // create the $USER/.appletviewer file
-
-            // see if $USER/.hotjava/properties exists
-            File userHome = new File(System.getProperty("user.home"));
-            File dotHJ = new File(userHome, ".hotjava");
-            dotHJ = new File(dotHJ, "properties");
-            if (dotHJ.exists()) {
-                // just read the file
-                avProps = getAVProps(dotHJ);
-            } else {
-                // send out warning and use defaults
-                System.err.println(lookup("main.warn.cantreadprops",
-                                          dotHJ.toString()));
-                avProps = setDefaultAVProps();
-            }
-
-            // SAVE THE FILE
-            try (FileOutputStream out = new FileOutputStream(dotAV)) {
-                avProps.store(out, lookup("main.prop.store"));
-            } catch (IOException e) {
-                System.err.println(lookup("main.err.prop.cantsave",
-                                          dotAV.toString()));
-            }
-        }
-        return avProps;
-    }
-
-    /**
-     * Set the AppletViewer user-specific properties to be the default values.
-     *
-     * @return     A Properties object containing all of the AppletViewer
-     *             user-specific properties, set to the default values.
-     */
-    private Properties setDefaultAVProps() {
-        Properties avProps = new Properties();
-        for (int i = 0; i < avDefaultUserProps.length; i++) {
-            avProps.setProperty(avDefaultUserProps[i][0],
-                                avDefaultUserProps[i][1]);
-        }
-        return avProps;
-    }
-
-    /**
-     * Given a file, find only the properties that are setable by AppletViewer.
-     *
-     * @param inFile A Properties file from which we select the properties of
-     *             interest.
-     * @return     A Properties object containing all of the AppletViewer
-     *             user-specific properties.
-     */
-    private Properties getAVProps(File inFile) {
-        Properties avProps  = new Properties();
-
-        // read the file
-        Properties tmpProps = new Properties();
-        try (FileInputStream in = new FileInputStream(inFile)) {
-            tmpProps.load(new BufferedInputStream(in));
-        } catch (IOException e) {
-            System.err.println(lookup("main.err.prop.cantread", inFile.toString()));
-        }
-
-        // pick off the properties we care about
-        for (int i = 0; i < avDefaultUserProps.length; i++) {
-            String value = tmpProps.getProperty(avDefaultUserProps[i][0]);
-            if (value != null) {
-                // the property exists in the file, so replace the default
-                avProps.setProperty(avDefaultUserProps[i][0], value);
-            } else {
-                // just use the default
-                avProps.setProperty(avDefaultUserProps[i][0],
-                                    avDefaultUserProps[i][1]);
-            }
-        }
-        return avProps;
-    }
-
-    /**
-     * Methods for easier i18n handling.
-     */
-
-    private static String lookup(String key) {
-        return amh.getMessage(key);
-    }
-
-    private static String lookup(String key, String arg0) {
-        return amh.getMessage(key, arg0);
-    }
-
-    private static String lookup(String key, String arg0, String arg1) {
-        return amh.getMessage(key, arg0, arg1);
-    }
-
-    private static String lookup(String key, String arg0, String arg1,
-                                 String arg2) {
-        return amh.getMessage(key, arg0, arg1, arg2);
-    }
-
-    @SuppressWarnings("serial") // JDK implementation class
-    class ParseException extends RuntimeException
-    {
-        public ParseException(String msg) {
-            super(msg);
-        }
-
-        public ParseException(Throwable t) {
-            super(t.getMessage());
-            this.t = t;
-        }
-
-        Throwable t = null;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
deleted file mode 100644
index 70e87bd0353..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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
- * 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "Dismiss"},
-            {"appletviewer.tool.title", "Applet Viewer: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Restart"},
-            {"appletviewer.menuitem.reload", "Reload"},
-            {"appletviewer.menuitem.stop", "Stop"},
-            {"appletviewer.menuitem.save", "Save..."},
-            {"appletviewer.menuitem.start", "Start"},
-            {"appletviewer.menuitem.clone", "Clone..."},
-            {"appletviewer.menuitem.tag", "Tag..."},
-            {"appletviewer.menuitem.info", "Info..."},
-            {"appletviewer.menuitem.edit", "Edit"},
-            {"appletviewer.menuitem.encoding", "Character Encoding"},
-            {"appletviewer.menuitem.print", "Print..."},
-            {"appletviewer.menuitem.props", "Properties..."},
-            {"appletviewer.menuitem.close", "Close"},
-            {"appletviewer.menuitem.quit", "Quit"},
-            {"appletviewer.label.hello", "Hello..."},
-            {"appletviewer.status.start", "starting applet..."},
-            {"appletviewer.appletsave.filedialogtitle","Serialize Applet into File"},
-            {"appletviewer.appletsave.err1", "serializing an {0} to {1}"},
-            {"appletviewer.appletsave.err2", "in appletSave: {0}"},
-            {"appletviewer.applettag", "Tag shown"},
-            {"appletviewer.applettag.textframe", "Applet HTML Tag"},
-            {"appletviewer.appletinfo.applet", "-- no applet info --"},
-            {"appletviewer.appletinfo.param", "-- no parameter info --"},
-            {"appletviewer.appletinfo.textframe", "Applet Info"},
-            {"appletviewer.appletprint.fail", "Printing failed."},
-            {"appletviewer.appletprint.finish", "Finished printing."},
-            {"appletviewer.appletprint.cancel", "Printing cancelled."},
-            {"appletviewer.appletencoding", "Character Encoding: {0}"},
-            {"appletviewer.parse.warning.requiresname", "Warning: <param name=... value=...> tag requires name attribute."},
-            {"appletviewer.parse.warning.paramoutside", "Warning: <param> tag outside <applet> ... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Warning: <applet> tag requires code attribute."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Warning: <applet> tag requires height attribute."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Warning: <applet> tag requires width attribute."},
-            {"appletviewer.parse.warning.object.requirescode", "Warning: <object> tag requires code attribute."},
-            {"appletviewer.parse.warning.object.requiresheight", "Warning: <object> tag requires height attribute."},
-            {"appletviewer.parse.warning.object.requireswidth", "Warning: <object> tag requires width attribute."},
-            {"appletviewer.parse.warning.embed.requirescode", "Warning: <embed> tag requires code attribute."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Warning: <embed> tag requires height attribute."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Warning: <embed> tag requires width attribute."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Warning: <app> tag no longer supported, use <applet> instead:"},
-            {"appletviewer.deprecated", "Warning: Applet API and AppletViewer are deprecated."},
-            {"appletviewer.usage", "Usage: appletviewer <options> url(s)\n\nwhere <options> include:\n  -encoding <encoding>    Specify character encoding used by HTML files\n  -J<runtime flag>        Pass argument to the java interpreter\n\nThe -J option is non-standard and subject to change without notice."},
-            {"appletviewer.main.err.unsupportedopt", "Unsupported option: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Unrecognized argument: {0}"},
-            {"appletviewer.main.err.dupoption", "Duplicate use of option: {0}"},
-            {"appletviewer.main.err.inputfile", "No input files specified."},
-            {"appletviewer.main.err.badurl", "Bad URL: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "I/O exception while reading: {0}"},
-            {"appletviewer.main.err.readablefile", "Make sure that {0} is a file and is readable."},
-            {"appletviewer.main.err.correcturl", "Is {0} the correct URL?"},
-            {"appletviewer.main.prop.store", "User-specific properties for AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "Can''t read user properties file: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "Can''t save user properties file: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Warning: disabling security."},
-            {"appletviewer.main.debug.cantfinddebug", "Can''t find the debugger!"},
-            {"appletviewer.main.debug.cantfindmain", "Can''t find main method in the debugger!"},
-            {"appletviewer.main.debug.exceptionindebug", "Exception in the debugger!"},
-            {"appletviewer.main.debug.cantaccess", "Can''t access the debugger!"},
-            {"appletviewer.main.nosecmgr", "Warning: SecurityManager not installed!"},
-            {"appletviewer.main.warning", "Warning: No applets were started. Make sure the input contains an <applet> tag."},
-            {"appletviewer.main.warn.prop.overwrite", "Warning: Temporarily overwriting system property at user''s request: key: {0} old value: {1} new value: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "Warning: Can''t read AppletViewer properties file: {0} Using defaults."},
-            {"appletioexception.loadclass.throw.interrupted", "class loading interrupted: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "class not loaded: {0}"},
-            {"appletclassloader.loadcode.verbose", "Opening stream to: {0} to get {1}"},
-            {"appletclassloader.filenotfound", "File not found when looking for: {0}"},
-            {"appletclassloader.fileformat", "File format exception when loading: {0}"},
-            {"appletclassloader.fileioexception", "I/O exception when loading: {0}"},
-            {"appletclassloader.fileexception", "{0} exception when loading: {1}"},
-            {"appletclassloader.filedeath", "{0} killed when loading: {1}"},
-            {"appletclassloader.fileerror", "{0} error when loading: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "Opening stream to: {0} to get {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource for name: {0}"},
-            {"appletclassloader.getresource.verbose.found", "Found resource: {0} as a system resource"},
-            {"appletclassloader.getresourceasstream.verbose", "Found resource: {0} as a system resource"},
-            {"appletpanel.runloader.err", "Either object or code parameter!"},
-            {"appletpanel.runloader.exception", "exception while deserializing {0}"},
-            {"appletpanel.destroyed", "Applet destroyed."},
-            {"appletpanel.loaded", "Applet loaded."},
-            {"appletpanel.started", "Applet started."},
-            {"appletpanel.inited", "Applet initialized."},
-            {"appletpanel.stopped", "Applet stopped."},
-            {"appletpanel.disposed", "Applet disposed."},
-            {"appletpanel.nocode", "APPLET tag missing CODE parameter."},
-            {"appletpanel.notfound", "load: class {0} not found."},
-            {"appletpanel.nocreate", "load: {0} can''t be instantiated."},
-            {"appletpanel.noconstruct", "load: {0} is not public or has no public constructor."},
-            {"appletpanel.death", "killed"},
-            {"appletpanel.exception", "exception: {0}."},
-            {"appletpanel.exception2", "exception: {0}: {1}."},
-            {"appletpanel.error", "error: {0}."},
-            {"appletpanel.error2", "error: {0}: {1}."},
-            {"appletpanel.notloaded", "Init: applet not loaded."},
-            {"appletpanel.notinited", "Start: applet not initialized."},
-            {"appletpanel.notstarted", "Stop: applet not started."},
-            {"appletpanel.notstopped", "Destroy: applet not stopped."},
-            {"appletpanel.notdestroyed", "Dispose: applet not destroyed."},
-            {"appletpanel.notdisposed", "Load: applet not disposed."},
-            {"appletpanel.bail", "Interrupted: bailing out."},
-            {"appletpanel.filenotfound", "File not found when looking for: {0}"},
-            {"appletpanel.fileformat", "File format exception when loading: {0}"},
-            {"appletpanel.fileioexception", "I/O exception when loading: {0}"},
-            {"appletpanel.fileexception", "{0} exception when loading: {1}"},
-            {"appletpanel.filedeath", "{0} killed when loading: {1}"},
-            {"appletpanel.fileerror", "{0} error when loading: {1}"},
-            {"appletpanel.badattribute.exception", "HTML parsing: incorrect value for width/height attribute"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requires non-null loader"},
-            {"appletprops.title", "AppletViewer Properties"},
-            {"appletprops.label.http.server", "Http proxy server:"},
-            {"appletprops.label.http.proxy", "Http proxy port:"},
-            {"appletprops.label.network", "Network access:"},
-            {"appletprops.choice.network.item.none", "None"},
-            {"appletprops.choice.network.item.applethost", "Applet Host"},
-            {"appletprops.choice.network.item.unrestricted", "Unrestricted"},
-            {"appletprops.label.class", "Class access:"},
-            {"appletprops.choice.class.item.restricted", "Restricted"},
-            {"appletprops.choice.class.item.unrestricted", "Unrestricted"},
-            {"appletprops.label.unsignedapplet", "Allow unsigned applets:"},
-            {"appletprops.choice.unsignedapplet.no", "No"},
-            {"appletprops.choice.unsignedapplet.yes", "Yes"},
-            {"appletprops.button.apply", "Apply"},
-            {"appletprops.button.cancel", "Cancel"},
-            {"appletprops.button.reset", "Reset"},
-            {"appletprops.apply.exception", "Failed to save properties: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Invalid Entry"},
-            {"appletprops.label.invalidproxy", "Proxy Port must be a positive integer value."},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "User-specific properties for AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "Security Exception: classloader"},
-            {"appletsecurityexception.checkaccess.thread", "Security Exception: thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "Security Exception: threadgroup: {0}"},
-            {"appletsecurityexception.checkexit", "Security Exception: exit: {0}"},
-            {"appletsecurityexception.checkexec", "Security Exception: exec: {0}"},
-            {"appletsecurityexception.checklink", "Security Exception: link: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "Security Exception: properties"},
-            {"appletsecurityexception.checkpropsaccess.key", "Security Exception: properties access {0}"},
-            {"appletsecurityexception.checkread.exception1", "Security Exception: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "Security Exception: file.read: {0}"},
-            {"appletsecurityexception.checkread", "Security Exception: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "Security Exception: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "Security Exception: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "Security Exception: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "Security Exception: fd.write"},
-            {"appletsecurityexception.checklisten", "Security Exception: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "Security Exception: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "Security Exception: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "Security Exception: Couldn''t connect to {0} with origin from {1}."},
-            {"appletsecurityexception.checkconnect.networkhost2", "Security Exception: Couldn''t resolve IP for host {0} or for {1}. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "Security Exception: Could not resolve IP for host {0}. See the trustProxy property."},
-            {"appletsecurityexception.checkconnect", "Security Exception: connect: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "Security Exception: cannot access package: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "Security Exception: cannot define package: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "Security Exception: cannot set factory"},
-            {"appletsecurityexception.checkgetprintjob", "Security Exception: getPrintJob"},
-            {"appletsecurityexception.checksecurityaccess", "Security Exception: security operation: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "unknown class loader type. unable to check for getContext"},
-            {"appletsecurityexception.checkread.unknown", "unknown class loader type. unable to check for checking read {0}"},
-            {"appletsecurityexception.checkconnect.unknown", "unknown class loader type. unable to check for checking connect"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
deleted file mode 100644
index b13bbdd182e..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_de extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "Verwerfen"},
-            {"appletviewer.tool.title", "Applet Viewer: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Neu starten"},
-            {"appletviewer.menuitem.reload", "Neu laden"},
-            {"appletviewer.menuitem.stop", "Stoppen"},
-            {"appletviewer.menuitem.save", "Speichern..."},
-            {"appletviewer.menuitem.start", "Starten..."},
-            {"appletviewer.menuitem.clone", "Klonen..."},
-            {"appletviewer.menuitem.tag", "Tag..."},
-            {"appletviewer.menuitem.info", "Informationen..."},
-            {"appletviewer.menuitem.edit", "Bearbeiten"},
-            {"appletviewer.menuitem.encoding", "Zeichencodierung"},
-            {"appletviewer.menuitem.print", "Drucken..."},
-            {"appletviewer.menuitem.props", "Eigenschaften..."},
-            {"appletviewer.menuitem.close", "Schlie\u00DFen"},
-            {"appletviewer.menuitem.quit", "Beenden"},
-            {"appletviewer.label.hello", "Hallo..."},
-            {"appletviewer.status.start", "Applet wird gestartet..."},
-            {"appletviewer.appletsave.filedialogtitle","Applet in Datei serialisieren"},
-            {"appletviewer.appletsave.err1", "{0} in {1} serialisieren"},
-            {"appletviewer.appletsave.err2", "in appletSave: {0}"},
-            {"appletviewer.applettag", "Angezeigtes Tag"},
-            {"appletviewer.applettag.textframe", "Applet-HTML-Tag"},
-            {"appletviewer.appletinfo.applet", "-- keine Applet-Informationen --"},
-            {"appletviewer.appletinfo.param", "-- keine Parameterinformationen --"},
-            {"appletviewer.appletinfo.textframe", "Applet-Informationen"},
-            {"appletviewer.appletprint.fail", "Druck nicht erfolgreich."},
-            {"appletviewer.appletprint.finish", "Druck abgeschlossen."},
-            {"appletviewer.appletprint.cancel", "Druck abgebrochen."},
-            {"appletviewer.appletencoding", "Zeichencodierung: {0}"},
-            {"appletviewer.parse.warning.requiresname", "Warnung: F\u00FCr <param name=... value=...>-Tag ist ein \"name\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.paramoutside", "Warnung: <param>-Tag au\u00DFerhalb von <applet> ... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Warnung: F\u00FCr <applet>-Tag ist ein \"code\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Warnung: F\u00FCr <applet>-Tag ist ein \"height\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Warnung: F\u00FCr <applet>-Tag ist ein \"width\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.object.requirescode", "Warnung: F\u00FCr <object>-Tag ist ein \"code\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.object.requiresheight", "Warnung: F\u00FCr <object>-Tag ist ein \"height\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.object.requireswidth", "Warnung: F\u00FCr <object>-Tag ist ein \"width\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.embed.requirescode", "Warnung: F\u00FCr <embed>-Tag ist ein \"code\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Warnung: F\u00FCr <embed>-Tag ist ein \"height\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Warnung: F\u00FCr <embed>-Tag ist ein \"width\"-Attribut erforderlich."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Warnung: <app>-Tag wird nicht mehr unterst\u00FCtzt. Verwenden Sie stattdessen <applet>:"},
-            {"appletviewer.deprecated", "Warnung: Applet-API und AppletViewer sind veraltet."},
-            {"appletviewer.usage", "Verwendung: appletviewer <Optionen> url(s)\n\nwobei die <Optionen> Folgendes umfassen:\n  -encoding <Codierung>    Zeichencodierung f\u00FCr HTML-Dateien angeben\n  -J<Laufzeitkennzeichen>        Argument an den Java-Interpreter \u00FCbergeben\n\nDie Option \"-J\" ist nicht standardm\u00E4\u00DFig und kann ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden."},
-            {"appletviewer.main.err.unsupportedopt", "Nicht unterst\u00FCtzte Option: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Unbekanntes Argument: {0}"},
-            {"appletviewer.main.err.dupoption", "Doppelte Verwendung von Option: {0}"},
-            {"appletviewer.main.err.inputfile", "Keine Eingabedateien angegeben."},
-            {"appletviewer.main.err.badurl", "Ung\u00FCltige URL: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "I/O-Ausnahme beim Lesen von: {0}"},
-            {"appletviewer.main.err.readablefile", "Stellen Sie sicher, dass {0} eine lesbare Datei ist."},
-            {"appletviewer.main.err.correcturl", "Ist {0} die richtige URL?"},
-            {"appletviewer.main.prop.store", "Benutzerspezifische Eigenschaften f\u00FCr AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "Benutzereigenschaftendatei kann nicht gelesen werden: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "Benutzereigenschaftendatei kann nicht gespeichert werden: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Warnung: Sicherheit wird deaktiviert."},
-            {"appletviewer.main.debug.cantfinddebug", "Debugger kann nicht gefunden werden."},
-            {"appletviewer.main.debug.cantfindmain", "Hauptmethode im Debugger kann nicht gefunden werden."},
-            {"appletviewer.main.debug.exceptionindebug", "Ausnahme im Debugger."},
-            {"appletviewer.main.debug.cantaccess", "Zugriff auf Debugger nicht m\u00F6glich."},
-            {"appletviewer.main.nosecmgr", "Warnung: SecurityManager nicht installiert."},
-            {"appletviewer.main.warning", "Warnung: Es wurden keine Applets gestartet. Stellen Sie sicher, dass die Eingabe ein <applet>-Tag enth\u00E4lt."},
-            {"appletviewer.main.warn.prop.overwrite", "Warnung: Systemeigenschaft wird tempor\u00E4r aufgrund von Benutzeranforderung \u00FCberschrieben: Schl\u00FCssel: {0} Alter Wert: {1} Neuer Wert: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "Warnung: AppletViewer-Eigenschaftendatei kann nicht gelesen werden: {0} Standardwerte werden verwendet."},
-            {"appletioexception.loadclass.throw.interrupted", "Laden der Klasse unterbrochen: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "Klasse nicht geladen: {0}"},
-            {"appletclassloader.loadcode.verbose", "\u00D6ffnen von Stream zu: {0}, um {1} abzurufen"},
-            {"appletclassloader.filenotfound", "Datei nicht gefunden beim Suchen nach: {0}"},
-            {"appletclassloader.fileformat", "Dateiformatausnahme beim Laden von: {0}"},
-            {"appletclassloader.fileioexception", "I/O-Ausnahme beim Laden von: {0}"},
-            {"appletclassloader.fileexception", "{0}-Ausnahme beim Laden von: {1}"},
-            {"appletclassloader.filedeath", "{0} abgebrochen beim Laden von: {1}"},
-            {"appletclassloader.fileerror", "{0}-Fehler beim Laden von: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "\u00D6ffnen von Stream zu: {0}, um {1} abzurufen"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource f\u00FCr Name: {0}"},
-            {"appletclassloader.getresource.verbose.found", "Ressource {0} als Systemressource gefunden"},
-            {"appletclassloader.getresourceasstream.verbose", "Ressource {0} als Systemressource gefunden"},
-            {"appletpanel.runloader.err", "Objekt oder Codeparameter."},
-            {"appletpanel.runloader.exception", "Ausnahme beim Deserialisieren von {0}"},
-            {"appletpanel.destroyed", "Applet zerst\u00F6rt."},
-            {"appletpanel.loaded", "Applet geladen."},
-            {"appletpanel.started", "Applet gestartet."},
-            {"appletpanel.inited", "Applet initialisiert."},
-            {"appletpanel.stopped", "Applet gestoppt."},
-            {"appletpanel.disposed", "Applet verworfen."},
-            {"appletpanel.nocode", "Bei APPLET-Tag fehlt CODE-Parameter."},
-            {"appletpanel.notfound", "Laden: Klasse {0} nicht gefunden."},
-            {"appletpanel.nocreate", "Laden: {0} kann nicht instanziiert werden."},
-            {"appletpanel.noconstruct", "Laden: {0} ist nicht \"public\" oder hat keinen \"public\"-Constructor."},
-            {"appletpanel.death", "abgebrochen"},
-            {"appletpanel.exception", "Ausnahme: {0}."},
-            {"appletpanel.exception2", "Ausnahme: {0}: {1}."},
-            {"appletpanel.error", "Fehler: {0}."},
-            {"appletpanel.error2", "Fehler: {0}: {1}."},
-            {"appletpanel.notloaded", "Init.: Applet nicht geladen."},
-            {"appletpanel.notinited", "Starten: Applet nicht initialisiert."},
-            {"appletpanel.notstarted", "Stoppen: Applet nicht gestartet."},
-            {"appletpanel.notstopped", "Zerst\u00F6ren: Applet nicht gestoppt."},
-            {"appletpanel.notdestroyed", "Verwerfen: Applet nicht zerst\u00F6rt."},
-            {"appletpanel.notdisposed", "Laden: Applet nicht verworfen."},
-            {"appletpanel.bail", "Unterbrochen: Zur\u00FCckziehen."},
-            {"appletpanel.filenotfound", "Datei nicht gefunden beim Suchen nach: {0}"},
-            {"appletpanel.fileformat", "Dateiformatausnahme beim Laden von: {0}"},
-            {"appletpanel.fileioexception", "I/O-Ausnahme beim Laden von: {0}"},
-            {"appletpanel.fileexception", "{0}-Ausnahme beim Laden von: {1}"},
-            {"appletpanel.filedeath", "{0} abgebrochen beim Laden von: {1}"},
-            {"appletpanel.fileerror", "{0}-Fehler beim Laden von: {1}"},
-            {"appletpanel.badattribute.exception", "HTML-Parsing: Falscher Wert f\u00FCr \"width/height\"-Attribut"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream erfordert Loader ungleich null"},
-            {"appletprops.title", "AppletViewer-Eigenschaften"},
-            {"appletprops.label.http.server", "HTTP-Proxyserver:"},
-            {"appletprops.label.http.proxy", "HTTP-Proxyport:"},
-            {"appletprops.label.network", "Netzwerkzugriff:"},
-            {"appletprops.choice.network.item.none", "Keine"},
-            {"appletprops.choice.network.item.applethost", "Applet-Host"},
-            {"appletprops.choice.network.item.unrestricted", "Uneingeschr\u00E4nkt"},
-            {"appletprops.label.class", "Klassenzugriff:"},
-            {"appletprops.choice.class.item.restricted", "Eingeschr\u00E4nkt"},
-            {"appletprops.choice.class.item.unrestricted", "Uneingeschr\u00E4nkt"},
-            {"appletprops.label.unsignedapplet", "Nicht signierte Applets zulassen:"},
-            {"appletprops.choice.unsignedapplet.no", "Nein"},
-            {"appletprops.choice.unsignedapplet.yes", "Ja"},
-            {"appletprops.button.apply", "Anwenden"},
-            {"appletprops.button.cancel", "Abbrechen"},
-            {"appletprops.button.reset", "Zur\u00FCcksetzen"},
-            {"appletprops.apply.exception", "Eigenschaften konnten nicht gespeichert werden: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Ung\u00FCltiger Eintrag"},
-            {"appletprops.label.invalidproxy", "Proxyport muss ein positiver Ganzzahlwert sein."},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "Benutzerspezifische Eigenschaften f\u00FCr AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "Sicherheitsausnahme: Class Loader"},
-            {"appletsecurityexception.checkaccess.thread", "Sicherheitsausnahme: Thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "Sicherheitsausnahme: Threadgruppe: {0}"},
-            {"appletsecurityexception.checkexit", "Sicherheitsausnahme: Beenden: {0}"},
-            {"appletsecurityexception.checkexec", "Sicherheitsausnahme: Ausf\u00FChrung: {0}"},
-            {"appletsecurityexception.checklink", "Sicherheitsausnahme: Link: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "Sicherheitsausnahme: Eigenschaften"},
-            {"appletsecurityexception.checkpropsaccess.key", "Sicherheitsausnahme: Eigenschaftszugriff {0}"},
-            {"appletsecurityexception.checkread.exception1", "Sicherheitsausnahme: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "Sicherheitsausnahme: file.read: {0}"},
-            {"appletsecurityexception.checkread", "Sicherheitsausnahme: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "Sicherheitsausnahme: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "Sicherheitsausnahme: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "Sicherheitsausnahme: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "Sicherheitsausnahme: fd.write"},
-            {"appletsecurityexception.checklisten", "Sicherheitsausnahme: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "Sicherheitsausnahme: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "Sicherheitsausnahme: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "Sicherheitsausnahme: Verbindung mit {0} mit Ursprung aus {1} konnte nicht hergestellt werden."},
-            {"appletsecurityexception.checkconnect.networkhost2", "Sicherheitsausnahme: IP f\u00FCr Host {0} oder f\u00FCr {1} konnte nicht aufgel\u00F6st werden. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "Sicherheitsausnahme: IP f\u00FCr Host {0} konnte nicht aufgel\u00F6st werden. Siehe trustProxy-Eigenschaft."},
-            {"appletsecurityexception.checkconnect", "Sicherheitsausnahme: Verbinden: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "Sicherheitsausnahme: Zugriff auf Package nicht m\u00F6glich: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "Sicherheitsausnahme: Package kann nicht definiert werden: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "Sicherheitsausnahme: Factory kann nicht festgelegt werden"},
-            {"appletsecurityexception.checkmemberaccess", "Sicherheitsausnahme: Mitgliedszugriff pr\u00FCfen"},
-            {"appletsecurityexception.checkgetprintjob", "Sicherheitsausnahme: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "Sicherheitsausnahme: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "Sicherheitsausnahme: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "Sicherheitsausnahme: Sicherheitsvorgang: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "Unbekannter Class Loader-Typ. Pr\u00FCfen auf getContext nicht m\u00F6glich"},
-            {"appletsecurityexception.checkread.unknown", "Unbekannter Class Loader-Typ. Pr\u00FCfen auf checkRead {0} nicht m\u00F6glich"},
-            {"appletsecurityexception.checkconnect.unknown", "Unbekannter Class Loader-Typ. Pr\u00FCfen auf checkConnect nicht m\u00F6glich"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
deleted file mode 100644
index a78d18debde..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_es extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "Descartar"},
-            {"appletviewer.tool.title", "Visor de Applet: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Reiniciar"},
-            {"appletviewer.menuitem.reload", "Volver a Cargar"},
-            {"appletviewer.menuitem.stop", "Parar"},
-            {"appletviewer.menuitem.save", "Guardar..."},
-            {"appletviewer.menuitem.start", "Iniciar"},
-            {"appletviewer.menuitem.clone", "Clonar..."},
-            {"appletviewer.menuitem.tag", "Etiqueta..."},
-            {"appletviewer.menuitem.info", "Informaci\u00F3n..."},
-            {"appletviewer.menuitem.edit", "Editar"},
-            {"appletviewer.menuitem.encoding", "Codificaci\u00F3n de Caracteres"},
-            {"appletviewer.menuitem.print", "Imprimir..."},
-            {"appletviewer.menuitem.props", "Propiedades..."},
-            {"appletviewer.menuitem.close", "Cerrar"},
-            {"appletviewer.menuitem.quit", "Salir"},
-            {"appletviewer.label.hello", "Hola..."},
-            {"appletviewer.status.start", "iniciando applet..."},
-            {"appletviewer.appletsave.filedialogtitle","Serializar Applet en Archivo"},
-            {"appletviewer.appletsave.err1", "serializando {0} en {1}"},
-            {"appletviewer.appletsave.err2", "en appletSave: {0}"},
-            {"appletviewer.applettag", "Etiqueta Mostrada"},
-            {"appletviewer.applettag.textframe", "Etiqueta HTML de Applet"},
-            {"appletviewer.appletinfo.applet", "-- ninguna informaci\u00F3n de applet --"},
-            {"appletviewer.appletinfo.param", "-- ninguna informaci\u00F3n de par\u00E1metros --"},
-            {"appletviewer.appletinfo.textframe", "Informaci\u00F3n del Applet"},
-            {"appletviewer.appletprint.fail", "Fallo de impresi\u00F3n."},
-            {"appletviewer.appletprint.finish", "Impresi\u00F3n terminada."},
-            {"appletviewer.appletprint.cancel", "Impresi\u00F3n cancelada."},
-            {"appletviewer.appletencoding", "Codificaci\u00F3n de Caracteres: {0}"},
-            {"appletviewer.parse.warning.requiresname", "Advertencia: la etiqueta <param name=... value=...> requiere un atributo name."},
-            {"appletviewer.parse.warning.paramoutside", "Advertencia: la etiqueta <param> est\u00E1 fuera de <applet> ... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Advertencia: la etiqueta <applet> requiere el atributo code."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Advertencia: la etiqueta <applet> requiere el atributo height."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Advertencia: la etiqueta <applet> requiere el atributo width."},
-            {"appletviewer.parse.warning.object.requirescode", "Advertencia: la etiqueta <object> requiere el atributo code."},
-            {"appletviewer.parse.warning.object.requiresheight", "Advertencia: la etiqueta <object> requiere el atributo height."},
-            {"appletviewer.parse.warning.object.requireswidth", "Advertencia: la etiqueta <object> requiere el atributo width."},
-            {"appletviewer.parse.warning.embed.requirescode", "Advertencia: la etiqueta <embed> requiere el atributo code."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Advertencia: la etiqueta <embed> requiere el atributo height."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Advertencia: la etiqueta <embed> requiere el atributo width."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Advertencia: la etiqueta <app> ya no est\u00E1 soportada, utilice <applet> en su lugar:"},
-            {"appletviewer.deprecated", "Advertencia: la API de applet y AppletViewer est\u00E1n en desuso."},
-            {"appletviewer.usage", "Sintaxis: appletviewer <opciones> url(s)\n\ndonde <opciones> incluye:\n  -encoding <codificaci\u00F3n>    Especificar la codificaci\u00F3n de caracteres utilizada por los archivos HTML\n  -J<indicador de tiempo de ejecuci\u00F3n>        Transferir argumento al int\u00E9rprete de Java\n\nLa opci\u00F3n -J es no est\u00E1ndar y est\u00E1 sujeta a cambios sin previo aviso."},
-            {"appletviewer.main.err.unsupportedopt", "Opci\u00F3n no soportada: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Argumento no reconocido: {0}"},
-            {"appletviewer.main.err.dupoption", "Uso duplicado de la opci\u00F3n: {0}"},
-            {"appletviewer.main.err.inputfile", "No se ha especificado ning\u00FAn archivo de entrada."},
-            {"appletviewer.main.err.badurl", "URL Err\u00F3nea: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "Excepci\u00F3n de E/S durante la lectura: {0}"},
-            {"appletviewer.main.err.readablefile", "Aseg\u00FArese de que {0} es un archivo y que se puede leer."},
-            {"appletviewer.main.err.correcturl", "\u00BFEs {0} la URL correcta?"},
-            {"appletviewer.main.prop.store", "Propiedades Espec\u00EDficas del Usuario para AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "No se puede leer el archivo de propiedades del usuario: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "No se puede guardar el archivo de propiedades del usuario: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Advertencia: desactivando seguridad."},
-            {"appletviewer.main.debug.cantfinddebug", "No se ha encontrado el depurador."},
-            {"appletviewer.main.debug.cantfindmain", "No se ha encontrado el m\u00E9todo principal en el depurador."},
-            {"appletviewer.main.debug.exceptionindebug", "Excepci\u00F3n en el depurador."},
-            {"appletviewer.main.debug.cantaccess", "No se puede acceder al depurador."},
-            {"appletviewer.main.nosecmgr", "Advertencia: no se ha instalado SecurityManager."},
-            {"appletviewer.main.warning", "Advertencia: no se ha iniciado ning\u00FAn applet. Aseg\u00FArese de que la entrada contiene una etiqueta <applet>."},
-            {"appletviewer.main.warn.prop.overwrite", "Advertencia: se sobrescribir\u00E1 temporalmente la propiedad del sistema cuando lo solicite el usuario: clave: {0} valor anterior: {1} nuevo valor: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "Advertencia: no se puede leer el archivo de propiedades de AppletViewer: {0}. Utilizando valores por defecto."},
-            {"appletioexception.loadclass.throw.interrupted", "carga de clase interrumpida: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "clase no cargada: {0}"},
-            {"appletclassloader.loadcode.verbose", "Abriendo flujo a: {0} para obtener {1}"},
-            {"appletclassloader.filenotfound", "No se ha encontrado el archivo al buscar: {0}"},
-            {"appletclassloader.fileformat", "Excepci\u00F3n de formato de archivo al cargar: {0}"},
-            {"appletclassloader.fileioexception", "Excepci\u00F3n de E/S al cargar: {0}"},
-            {"appletclassloader.fileexception", "Excepci\u00F3n de {0} al cargar: {1}"},
-            {"appletclassloader.filedeath", "{0} interrumpido al cargar: {1}"},
-            {"appletclassloader.fileerror", "error de {0} al cargar: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "Abriendo flujo a: {0} para obtener {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource para nombre: {0}"},
-            {"appletclassloader.getresource.verbose.found", "Recurso encontrado: {0} como un recurso de sistema"},
-            {"appletclassloader.getresourceasstream.verbose", "Recurso encontrado: {0} como un recurso de sistema"},
-            {"appletpanel.runloader.err", "Par\u00E1metro de c\u00F3digo u objeto."},
-            {"appletpanel.runloader.exception", "excepci\u00F3n al deserializar {0}"},
-            {"appletpanel.destroyed", "Applet destruido."},
-            {"appletpanel.loaded", "Applet cargado."},
-            {"appletpanel.started", "Applet iniciado."},
-            {"appletpanel.inited", "Applet inicializado."},
-            {"appletpanel.stopped", "Applet parado."},
-            {"appletpanel.disposed", "Applet desechado."},
-            {"appletpanel.nocode", "Falta el par\u00E1metro CODE en la etiqueta APPLET."},
-            {"appletpanel.notfound", "cargar: clase {0} no encontrada."},
-            {"appletpanel.nocreate", "cargar: {0} no se puede instanciar."},
-            {"appletpanel.noconstruct", "cargar: {0} no es p\u00FAblico o no tiene un constructor p\u00FAblico."},
-            {"appletpanel.death", "interrumpido"},
-            {"appletpanel.exception", "excepci\u00F3n: {0}."},
-            {"appletpanel.exception2", "excepci\u00F3n: {0}: {1}."},
-            {"appletpanel.error", "error: {0}."},
-            {"appletpanel.error2", "error: {0}: {1}."},
-            {"appletpanel.notloaded", "Iniciaci\u00F3n: applet no cargado."},
-            {"appletpanel.notinited", "Iniciar: applet no inicializado."},
-            {"appletpanel.notstarted", "Parar: applet no iniciado."},
-            {"appletpanel.notstopped", "Destruir: applet no parado."},
-            {"appletpanel.notdestroyed", "Desechar: applet no destruido."},
-            {"appletpanel.notdisposed", "Cargar: applet no desechado."},
-            {"appletpanel.bail", "Interrumpido: rescatando."},
-            {"appletpanel.filenotfound", "No se ha encontrado el archivo al buscar: {0}"},
-            {"appletpanel.fileformat", "Excepci\u00F3n de formato de archivo al cargar: {0}"},
-            {"appletpanel.fileioexception", "Excepci\u00F3n de E/S al cargar: {0}"},
-            {"appletpanel.fileexception", "Excepci\u00F3n de {0} al cargar: {1}"},
-            {"appletpanel.filedeath", "{0} interrumpido al cargar: {1}"},
-            {"appletpanel.fileerror", "error de {0} al cargar: {1}"},
-            {"appletpanel.badattribute.exception", "An\u00E1lisis HTML: valor incorrecto para el atributo width/height."},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requiere un cargador no nulo"},
-            {"appletprops.title", "Propiedades de AppletViewer"},
-            {"appletprops.label.http.server", "Servidor Proxy HTTP:"},
-            {"appletprops.label.http.proxy", "Puerto Proxy HTTP:"},
-            {"appletprops.label.network", "Acceso de Red:"},
-            {"appletprops.choice.network.item.none", "Ninguno"},
-            {"appletprops.choice.network.item.applethost", "Host del Applet"},
-            {"appletprops.choice.network.item.unrestricted", "No Restringido"},
-            {"appletprops.label.class", "Acceso de Clase:"},
-            {"appletprops.choice.class.item.restricted", "Restringido"},
-            {"appletprops.choice.class.item.unrestricted", "No Restringido"},
-            {"appletprops.label.unsignedapplet", "Permitir Applets no Firmados:"},
-            {"appletprops.choice.unsignedapplet.no", "No"},
-            {"appletprops.choice.unsignedapplet.yes", "S\u00ED"},
-            {"appletprops.button.apply", "Aplicar"},
-            {"appletprops.button.cancel", "Cancelar"},
-            {"appletprops.button.reset", "Restablecer"},
-            {"appletprops.apply.exception", "Fallo al guardar las propiedades: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Entrada no V\u00E1lida"},
-            {"appletprops.label.invalidproxy", "El puerto proxy debe ser un valor entero positivo."},
-            {"appletprops.button.ok", "Aceptar"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "Propiedades espec\u00EDficas del usuario para AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "Excepci\u00F3n de Seguridad: classloader"},
-            {"appletsecurityexception.checkaccess.thread", "Excepci\u00F3n de Seguridad: thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "Excepci\u00F3n de Seguridad: threadgroup: {0}"},
-            {"appletsecurityexception.checkexit", "Excepci\u00F3n de Seguridad: salir: {0}"},
-            {"appletsecurityexception.checkexec", "Excepci\u00F3n de Seguridad: ejecutar: {0}"},
-            {"appletsecurityexception.checklink", "Excepci\u00F3n de Seguridad: enlace: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "Excepci\u00F3n de Seguridad: propiedades"},
-            {"appletsecurityexception.checkpropsaccess.key", "Excepci\u00F3n de Seguridad: acceso a propiedades {0}"},
-            {"appletsecurityexception.checkread.exception1", "Excepci\u00F3n de Seguridad: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "Excepci\u00F3n de Seguridad: file.read: {0}"},
-            {"appletsecurityexception.checkread", "Excepci\u00F3n de Seguridad: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "Excepci\u00F3n de Seguridad: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "Excepci\u00F3n de Seguridad: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "Excepci\u00F3n de Seguridad: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "Excepci\u00F3n de Seguridad: fd.write"},
-            {"appletsecurityexception.checklisten", "Excepci\u00F3n de Seguridad: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "Excepci\u00F3n de Seguridad: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "Excepci\u00F3n de Seguridad: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "Excepci\u00F3n de Seguridad: no se puede conectar a {0} con origen de {1}."},
-            {"appletsecurityexception.checkconnect.networkhost2", "Excepci\u00F3n de Seguridad: no se puede resolver la IP para el host {0} o para {1}. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "Excepci\u00F3n de Seguridad: no se puede resolver la IP para el host {0}. Consulte la propiedad trustProxy."},
-            {"appletsecurityexception.checkconnect", "Excepci\u00F3n de Seguridad: conexi\u00F3n: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "Excepci\u00F3n de Seguridad: no se puede acceder al paquete: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "Excepci\u00F3n de Seguridad: no se puede definir el paquete: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "Excepci\u00F3n de Seguridad: no se puede definir el valor de f\u00E1brica"},
-            {"appletsecurityexception.checkmemberaccess", "Excepci\u00F3n de Seguridad: comprobar el acceso de miembro"},
-            {"appletsecurityexception.checkgetprintjob", "Excepci\u00F3n de Seguridad: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "Excepci\u00F3n de Seguridad: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "Excepci\u00F3n de Seguridad: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "Excepci\u00F3n de Seguridad: operaci\u00F3n de seguridad: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "tipo de cargador de clase desconocido. no se puede comprobar para getContext"},
-            {"appletsecurityexception.checkread.unknown", "tipo de cargador de clase desconocido. no se puede comprobar para lectura de comprobaci\u00F3n {0}"},
-            {"appletsecurityexception.checkconnect.unknown", "tipo de cargador de clase desconocido. no se puede comprobar para conexi\u00F3n de comprobaci\u00F3n"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
deleted file mode 100644
index da7e9b201a0..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_fr extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "Abandonner"},
-            {"appletviewer.tool.title", "Visualiseur d''applets : {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Red\u00E9marrer"},
-            {"appletviewer.menuitem.reload", "Recharger"},
-            {"appletviewer.menuitem.stop", "Arr\u00EAter"},
-            {"appletviewer.menuitem.save", "Enregistrer..."},
-            {"appletviewer.menuitem.start", "D\u00E9marrer"},
-            {"appletviewer.menuitem.clone", "Cloner..."},
-            {"appletviewer.menuitem.tag", "Baliser..."},
-            {"appletviewer.menuitem.info", "Informations..."},
-            {"appletviewer.menuitem.edit", "Modifier"},
-            {"appletviewer.menuitem.encoding", "Encodage de caract\u00E8res"},
-            {"appletviewer.menuitem.print", "Imprimer..."},
-            {"appletviewer.menuitem.props", "Propri\u00E9t\u00E9s..."},
-            {"appletviewer.menuitem.close", "Fermer"},
-            {"appletviewer.menuitem.quit", "Quitter"},
-            {"appletviewer.label.hello", "Bonjour..."},
-            {"appletviewer.status.start", "d\u00E9marrage de l'applet..."},
-            {"appletviewer.appletsave.filedialogtitle","S\u00E9rialiser l'applet dans le fichier"},
-            {"appletviewer.appletsave.err1", "S\u00E9rialisation de {0} vers {1}"},
-            {"appletviewer.appletsave.err2", "dans appletSave : {0}"},
-            {"appletviewer.applettag", "Balise affich\u00E9e"},
-            {"appletviewer.applettag.textframe", "Balise HTML d'applet"},
-            {"appletviewer.appletinfo.applet", "-- aucune information d'applet --"},
-            {"appletviewer.appletinfo.param", "-- aucune information de param\u00E8tre --"},
-            {"appletviewer.appletinfo.textframe", "Informations d'applet"},
-            {"appletviewer.appletprint.fail", "Echec de l'impression."},
-            {"appletviewer.appletprint.finish", "Impression termin\u00E9e."},
-            {"appletviewer.appletprint.cancel", "Impression annul\u00E9e."},
-            {"appletviewer.appletencoding", "Encodage de caract\u00E8res : {0}"},
-            {"appletviewer.parse.warning.requiresname", "Avertissement : la balise <param name=... value=...> requiert un attribut de nom."},
-            {"appletviewer.parse.warning.paramoutside", "Avertissement : la balise <param> est en dehors des balises <applet> ... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Avertissement : la balise <applet> requiert un attribut de code."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Avertissement : la balise <applet> requiert un attribut de hauteur."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Avertissement : la balise <applet> requiert un attribut de largeur."},
-            {"appletviewer.parse.warning.object.requirescode", "Avertissement : la balise <object> requiert un attribut de code."},
-            {"appletviewer.parse.warning.object.requiresheight", "Avertissement : la balise <object> requiert un attribut de hauteur."},
-            {"appletviewer.parse.warning.object.requireswidth", "Avertissement : la balise <object> requiert un attribut de largeur."},
-            {"appletviewer.parse.warning.embed.requirescode", "Avertissement : la balise <embed> requiert un attribut de code."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Avertissement : la balise <embed> requiert un attribut de hauteur."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Avertissement : la balise <embed> requiert un attribut de largeur."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Avertissement : la balise <app> n'est plus prise en charge, utilisez <applet> \u00E0 la place :"},
-            {"appletviewer.deprecated", "Avertissement : l'API d'applet et AppletViewer sont en phase d'abandon."},
-            {"appletviewer.usage", "Syntaxe : appletviewer <options> url(s)\n\no\u00F9 <options> inclut :\n  -encoding <encoding>    Indiquer l'encodage de caract\u00E8res utilis\u00E9 par les fichiers HTML\n  -J<runtime flag>        Transmettre l'argument \u00E0 l'interpr\u00E9teur Java\n\nL'option -J n'est pas standard et elle peut \u00EAtre modifi\u00E9e sans pr\u00E9avis."},
-            {"appletviewer.main.err.unsupportedopt", "Option non prise en charge : {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Argument non reconnu : {0}"},
-            {"appletviewer.main.err.dupoption", "Utilisation en double de l''option : {0}"},
-            {"appletviewer.main.err.inputfile", "Aucun fichier d'entr\u00E9e indiqu\u00E9."},
-            {"appletviewer.main.err.badurl", "URL incorrecte : {0} ({1})"},
-            {"appletviewer.main.err.io", "Exception d''E/S lors de la lecture : {0}"},
-            {"appletviewer.main.err.readablefile", "Assurez-vous que {0} est un fichier accessible en lecture."},
-            {"appletviewer.main.err.correcturl", "L''\u00E9l\u00E9ment {0} est-il l''URL correcte ?"},
-            {"appletviewer.main.prop.store", "Propri\u00E9t\u00E9s utilisateur pour AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "Impossible de lire le fichier de propri\u00E9t\u00E9s utilisateur : {0}"},
-            {"appletviewer.main.err.prop.cantsave", "Impossible d''enregistrer le fichier de propri\u00E9t\u00E9s utilisateur : {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Avertissement : d\u00E9sactivation de la s\u00E9curit\u00E9."},
-            {"appletviewer.main.debug.cantfinddebug", "D\u00E9bogueur introuvable."},
-            {"appletviewer.main.debug.cantfindmain", "La m\u00E9thode principale est introuvable dans le d\u00E9bogueur."},
-            {"appletviewer.main.debug.exceptionindebug", "Exception d\u00E9tect\u00E9e dans le d\u00E9bogueur."},
-            {"appletviewer.main.debug.cantaccess", "Impossible d'acc\u00E9der au d\u00E9bogueur."},
-            {"appletviewer.main.nosecmgr", "Avertissement : SecurityManager n'est pas install\u00E9."},
-            {"appletviewer.main.warning", "Avertissement : aucune applet n'a \u00E9t\u00E9 d\u00E9marr\u00E9e. Assurez-vous que l'entr\u00E9e contient une balise <applet>."},
-            {"appletviewer.main.warn.prop.overwrite", "Avertissement : remplacement temporaire de la propri\u00E9t\u00E9 syst\u00E8me \u00E0 la demande de l''utilisateur - Cl\u00E9 : {0}, ancienne valeur : {1}, nouvelle valeur : {2}"},
-            {"appletviewer.main.warn.cantreadprops", "Avertissement : impossible de lire le fichier de propri\u00E9t\u00E9s d''AppletViewer : {0} Utilisation des valeurs par d\u00E9faut."},
-            {"appletioexception.loadclass.throw.interrupted", "chargement de classe interrompu : {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "classe non charg\u00E9e : {0}"},
-            {"appletclassloader.loadcode.verbose", "Ouverture du flux de donn\u00E9es dans {0} pour obtenir {1}"},
-            {"appletclassloader.filenotfound", "Fichier introuvable lors de la recherche de {0}"},
-            {"appletclassloader.fileformat", "Exception de format de fichier d\u00E9tect\u00E9e lors du chargement de : {0}"},
-            {"appletclassloader.fileioexception", "Exception d''E/S lors du chargement de : {0}"},
-            {"appletclassloader.fileexception", "Exception {0} lors du chargement de : {1}"},
-            {"appletclassloader.filedeath", "Fermeture de {0} lors du chargement de : {1}"},
-            {"appletclassloader.fileerror", "Erreur {0} lors du chargement de : {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "Ouverture du flux de donn\u00E9es dans {0} pour obtenir {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource pour le nom : {0}"},
-            {"appletclassloader.getresource.verbose.found", "Ressource {0} trouv\u00E9e en tant que ressource syst\u00E8me"},
-            {"appletclassloader.getresourceasstream.verbose", "Ressource {0} trouv\u00E9e en tant que ressource syst\u00E8me"},
-            {"appletpanel.runloader.err", "Param\u00E8tre d'objet ou de code."},
-            {"appletpanel.runloader.exception", "exception lors de la d\u00E9s\u00E9rialisation de {0}"},
-            {"appletpanel.destroyed", "Applet d\u00E9truite."},
-            {"appletpanel.loaded", "Applet charg\u00E9e."},
-            {"appletpanel.started", "Applet d\u00E9marr\u00E9e."},
-            {"appletpanel.inited", "Applet initialis\u00E9e."},
-            {"appletpanel.stopped", "Applet arr\u00EAt\u00E9e."},
-            {"appletpanel.disposed", "Applet \u00E9limin\u00E9e."},
-            {"appletpanel.nocode", "Param\u00E8tre CODE manquant dans la balise APPLET."},
-            {"appletpanel.notfound", "Charger : la classe {0} est introuvable."},
-            {"appletpanel.nocreate", "Charger : impossible d''instantier {0}."},
-            {"appletpanel.noconstruct", "Charger : l''\u00E9l\u00E9ment {0} n''est pas public ou ne poss\u00E8de aucun constructeur public."},
-            {"appletpanel.death", "arr\u00EAt\u00E9"},
-            {"appletpanel.exception", "exception : {0}."},
-            {"appletpanel.exception2", "exception : {0} : {1}."},
-            {"appletpanel.error", "erreur : {0}."},
-            {"appletpanel.error2", "erreur : {0} : {1}."},
-            {"appletpanel.notloaded", "Initialiser : applet non charg\u00E9e."},
-            {"appletpanel.notinited", "D\u00E9marrer : applet non initialis\u00E9e."},
-            {"appletpanel.notstarted", "Arr\u00EAter : applet non d\u00E9marr\u00E9e."},
-            {"appletpanel.notstopped", "D\u00E9truire : applet non arr\u00EAt\u00E9e."},
-            {"appletpanel.notdestroyed", "Eliminer : applet non d\u00E9truite."},
-            {"appletpanel.notdisposed", "Charger : applet non \u00E9limin\u00E9e."},
-            {"appletpanel.bail", "Interrompu : r\u00E9solution."},
-            {"appletpanel.filenotfound", "Fichier introuvable lors de la recherche de {0}"},
-            {"appletpanel.fileformat", "Exception de format de fichier d\u00E9tect\u00E9e lors du chargement de : {0}"},
-            {"appletpanel.fileioexception", "Exception d''E/S lors du chargement de : {0}"},
-            {"appletpanel.fileexception", "Exception {0} lors du chargement de : {1}"},
-            {"appletpanel.filedeath", "Fermeture de {0} lors du chargement de : {1}"},
-            {"appletpanel.fileerror", "Erreur {0} lors du chargement de : {1}"},
-            {"appletpanel.badattribute.exception", "Analyse HTML : valeur incorrecte pour l'attribut de largeur/hauteur"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requiert un chargeur non NULL"},
-            {"appletprops.title", "Propri\u00E9t\u00E9s d'AppletViewer"},
-            {"appletprops.label.http.server", "Serveur proxy HTTP :"},
-            {"appletprops.label.http.proxy", "Port proxy HTTP :"},
-            {"appletprops.label.network", "Acc\u00E8s au r\u00E9seau :"},
-            {"appletprops.choice.network.item.none", "Aucun"},
-            {"appletprops.choice.network.item.applethost", "H\u00F4te de l'applet"},
-            {"appletprops.choice.network.item.unrestricted", "Sans restriction"},
-            {"appletprops.label.class", "Acc\u00E8s \u00E0 la classe :"},
-            {"appletprops.choice.class.item.restricted", "Avec restriction"},
-            {"appletprops.choice.class.item.unrestricted", "Sans restriction"},
-            {"appletprops.label.unsignedapplet", "Autoriser les applets non sign\u00E9es :"},
-            {"appletprops.choice.unsignedapplet.no", "Non"},
-            {"appletprops.choice.unsignedapplet.yes", "Oui"},
-            {"appletprops.button.apply", "Appliquer"},
-            {"appletprops.button.cancel", "Annuler"},
-            {"appletprops.button.reset", "R\u00E9initialiser"},
-            {"appletprops.apply.exception", "Echec de l''enregistrement des propri\u00E9t\u00E9s : {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Entr\u00E9e non valide"},
-            {"appletprops.label.invalidproxy", "Le port proxy doit \u00EAtre un entier positif."},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "Propri\u00E9t\u00E9s utilisateur pour AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "Exception de s\u00E9curit\u00E9 : chargeur de classe"},
-            {"appletsecurityexception.checkaccess.thread", "Exception de s\u00E9curit\u00E9 : thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "Exception de s\u00E9curit\u00E9 : groupe de threads : {0}"},
-            {"appletsecurityexception.checkexit", "Exception de s\u00E9curit\u00E9 : sortie : {0}"},
-            {"appletsecurityexception.checkexec", "Exception de s\u00E9curit\u00E9 : ex\u00E9cution : {0}"},
-            {"appletsecurityexception.checklink", "Exception de s\u00E9curit\u00E9 : lien : {0}"},
-            {"appletsecurityexception.checkpropsaccess", "Exception de s\u00E9curit\u00E9 : propri\u00E9t\u00E9s"},
-            {"appletsecurityexception.checkpropsaccess.key", "Exception de s\u00E9curit\u00E9 : acc\u00E8s aux propri\u00E9t\u00E9s {0}"},
-            {"appletsecurityexception.checkread.exception1", "Exception de s\u00E9curit\u00E9 : {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "Exception de s\u00E9curit\u00E9 : file.read : {0}"},
-            {"appletsecurityexception.checkread", "Exception de s\u00E9curit\u00E9 : file.read : {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "Exception de s\u00E9curit\u00E9 : {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "Exception de s\u00E9curit\u00E9 : file.write : {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "Exception de s\u00E9curit\u00E9 : fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "Exception de s\u00E9curit\u00E9 : fd.write"},
-            {"appletsecurityexception.checklisten", "Exception de s\u00E9curit\u00E9 : socket.listen : {0}"},
-            {"appletsecurityexception.checkaccept", "Exception de s\u00E9curit\u00E9 : socket.accept : {0} : {1}"},
-            {"appletsecurityexception.checkconnect.networknone", "Exception de s\u00E9curit\u00E9 : socket.connect : {0} -> {1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "Exception de s\u00E9curit\u00E9 : impossible de se connecter \u00E0 {0} dont l''origine est {1}."},
-            {"appletsecurityexception.checkconnect.networkhost2", "Exception de s\u00E9curit\u00E9 : impossible de r\u00E9soudre l''adresse IP pour l''h\u00F4te {0} ou pour {1}. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "Exception de s\u00E9curit\u00E9 : impossible de r\u00E9soudre l''adresse IP pour l''h\u00F4te {0}. Voir la propri\u00E9t\u00E9 trustProxy."},
-            {"appletsecurityexception.checkconnect", "Exception de s\u00E9curit\u00E9 : connexion : {0} -> {1}"},
-            {"appletsecurityexception.checkpackageaccess", "Exception de s\u00E9curit\u00E9 : impossible d''acc\u00E9der au package : {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "Exception de s\u00E9curit\u00E9 : impossible de d\u00E9finir le package : {0}"},
-            {"appletsecurityexception.cannotsetfactory", "Exception de s\u00E9curit\u00E9 : impossible de d\u00E9finir la fabrique"},
-            {"appletsecurityexception.checkmemberaccess", "Exception de s\u00E9curit\u00E9 : v\u00E9rifier l'acc\u00E8s des membres"},
-            {"appletsecurityexception.checkgetprintjob", "Exception de s\u00E9curit\u00E9 : getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "Exception de s\u00E9curit\u00E9 : getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "Exception de s\u00E9curit\u00E9 : getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "Exception de s\u00E9curit\u00E9 : op\u00E9ration de s\u00E9curit\u00E9 : {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "type de chargeur de classe inconnu, impossible de rechercher getContext"},
-            {"appletsecurityexception.checkread.unknown", "type de chargeur de classe inconnu, impossible de rechercher la v\u00E9rification de lecture {0}"},
-            {"appletsecurityexception.checkconnect.unknown", "type de chargeur de classe inconnu, impossible de rechercher la v\u00E9rification de connexion"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
deleted file mode 100644
index f0ecbaf33e8..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_it extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "Chiudi"},
-            {"appletviewer.tool.title", "Visualizzatore applet: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Riavvia"},
-            {"appletviewer.menuitem.reload", "Ricarica"},
-            {"appletviewer.menuitem.stop", "Arresta"},
-            {"appletviewer.menuitem.save", "Salva..."},
-            {"appletviewer.menuitem.start", "Avvia"},
-            {"appletviewer.menuitem.clone", "Copia..."},
-            {"appletviewer.menuitem.tag", "Tag..."},
-            {"appletviewer.menuitem.info", "Informazioni..."},
-            {"appletviewer.menuitem.edit", "Modifica"},
-            {"appletviewer.menuitem.encoding", "Codifica caratteri"},
-            {"appletviewer.menuitem.print", "Stampa..."},
-            {"appletviewer.menuitem.props", "Propriet\u00E0..."},
-            {"appletviewer.menuitem.close", "Chiudi"},
-            {"appletviewer.menuitem.quit", "Esci"},
-            {"appletviewer.label.hello", "Benvenuti..."},
-            {"appletviewer.status.start", "avvio applet in corso..."},
-            {"appletviewer.appletsave.filedialogtitle","Serializza applet in file"},
-            {"appletviewer.appletsave.err1", "serializzazione di {0} in {1}"},
-            {"appletviewer.appletsave.err2", "in appletSave: {0}"},
-            {"appletviewer.applettag", "Tag visualizzata"},
-            {"appletviewer.applettag.textframe", "Applet tag HTML"},
-            {"appletviewer.appletinfo.applet", "-- nessuna informazione sull'applet --"},
-            {"appletviewer.appletinfo.param", "-- nessuna informazione sul parametro --"},
-            {"appletviewer.appletinfo.textframe", "Informazioni applet"},
-            {"appletviewer.appletprint.fail", "Stampa non riuscita."},
-            {"appletviewer.appletprint.finish", "Stampa completata."},
-            {"appletviewer.appletprint.cancel", "Stampa annullata."},
-            {"appletviewer.appletencoding", "Codifica caratteri: {0}"},
-            {"appletviewer.parse.warning.requiresname", "Avvertenza: la tag <param name=... value=...> richiede un attributo name."},
-            {"appletviewer.parse.warning.paramoutside", "Avvertenza: la tag <param> non rientra in <applet>... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Avvertenza: la tag <applet> richiede un attributo code."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Avvertenza: la tag <applet> richiede un attributo height."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Avvertenza: la tag <applet> richiede un attributo width."},
-            {"appletviewer.parse.warning.object.requirescode", "Avvertenza: la tag <object> richiede un attributo code."},
-            {"appletviewer.parse.warning.object.requiresheight", "Avvertenza: la tag <object> richiede un attributo height."},
-            {"appletviewer.parse.warning.object.requireswidth", "Avvertenza: la tag <object> richiede un attributo width."},
-            {"appletviewer.parse.warning.embed.requirescode", "Avvertenza: la tag <embed> richiede un attributo code."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Avvertenza: la tag <embed> richiede un attributo height."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Avvertenza: la tag <embed> richiede un attributo width."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Avvertenza: la tag <app> non \u00E8 pi\u00F9 supportata. Utilizzare <applet>:"},
-            {"appletviewer.deprecated", "Avvertenza: l'API dell'applet e AppletViewer non sono pi\u00F9 validi."},
-            {"appletviewer.usage", "Uso: appletviewer <options> url(s)\n\ndove <options> includono:\n  -encoding <encoding>    Specifica la codifica dei caratteri utilizzata dai file HTML\n  -J<runtime flag>        Passa l'argomento all'interpreter Java\n\nL'opzione -J non \u00E8 standard ed \u00E8 soggetta a modifica senza preavviso."},
-            {"appletviewer.main.err.unsupportedopt", "Opzione non supportata: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Argomento non riconosciuto: {0}"},
-            {"appletviewer.main.err.dupoption", "Uso duplicato dell''opzione: {0}"},
-            {"appletviewer.main.err.inputfile", "Nessun file di input specificato."},
-            {"appletviewer.main.err.badurl", "URL non valido: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "Eccezione I/O durante la lettura di {0}"},
-            {"appletviewer.main.err.readablefile", "Assicurarsi che {0} sia un file e che sia leggibile."},
-            {"appletviewer.main.err.correcturl", "{0} \u00E8 l''URL corretto?"},
-            {"appletviewer.main.prop.store", "Propriet\u00E0 specifiche dell'utente per AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "Impossibile leggere il file delle propriet\u00E0 utente: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "Impossibile salvare il file delle propriet\u00E0 utente: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Avvertenza: la sicurezza verr\u00E0 disabilitata."},
-            {"appletviewer.main.debug.cantfinddebug", "Impossibile trovare il debugger."},
-            {"appletviewer.main.debug.cantfindmain", "Impossibile trovare il metodo principale nel debugger."},
-            {"appletviewer.main.debug.exceptionindebug", "Eccezione nel debugger."},
-            {"appletviewer.main.debug.cantaccess", "Impossibile accedere al debugger."},
-            {"appletviewer.main.nosecmgr", "Avvertenza: SecurityManager non installato."},
-            {"appletviewer.main.warning", "Avvertenza: nessuna applet avviata. Assicurarsi che l'input contenga una tag <applet>."},
-            {"appletviewer.main.warn.prop.overwrite", "Avvertenza: la propriet\u00E0 di sistema verr\u00E0 sovrascritta temporaneamente su richiesta dell''utente. Chiave {0}, valore precedente {1}, nuovo valore {2}."},
-            {"appletviewer.main.warn.cantreadprops", "Avvertenza: impossibile leggere il file delle propriet\u00E0 AppletViewer {0}. Verranno utilizzate le impostazioni predefinite."},
-            {"appletioexception.loadclass.throw.interrupted", "caricamento della classe interrotto: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "classe non caricata: {0}"},
-            {"appletclassloader.loadcode.verbose", "Apertura del flusso per {0} per recuperare {1}"},
-            {"appletclassloader.filenotfound", "File non trovato durante la ricerca di {0}"},
-            {"appletclassloader.fileformat", "Eccezione di formato file durante il caricamento di {0}"},
-            {"appletclassloader.fileioexception", "Eccezione I/O durante il caricamento di {0}"},
-            {"appletclassloader.fileexception", "Eccezione {0} durante il caricamento di {1}"},
-            {"appletclassloader.filedeath", "{0} terminato durante il caricamento di {1}"},
-            {"appletclassloader.fileerror", "Errore {0} durante il caricamento di {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "Apertura del flusso per {0} per recuperare {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource per il nome: {0}"},
-            {"appletclassloader.getresource.verbose.found", "\u00C8 stata trovata la risorsa {0} come risorsa di sistema"},
-            {"appletclassloader.getresourceasstream.verbose", "\u00C8 stata trovata la risorsa {0} come risorsa di sistema"},
-            {"appletpanel.runloader.err", "Parametro di oggetto o di codice."},
-            {"appletpanel.runloader.exception", "eccezione durante la deserializzazione di {0}"},
-            {"appletpanel.destroyed", "Applet rimossa."},
-            {"appletpanel.loaded", "Applet caricata."},
-            {"appletpanel.started", "Applet avviata."},
-            {"appletpanel.inited", "Applet inizializzata."},
-            {"appletpanel.stopped", "Applet arrestata."},
-            {"appletpanel.disposed", "Applet eliminata."},
-            {"appletpanel.nocode", "Nella tag APPLET manca il parametro CODE."},
-            {"appletpanel.notfound", "caricamento: classe {0} non trovata."},
-            {"appletpanel.nocreate", "caricamento: impossibile creare un''istanza di {0}."},
-            {"appletpanel.noconstruct", "caricamento: {0} non \u00E8 pubblico o non ha un costruttore pubblico."},
-            {"appletpanel.death", "terminato"},
-            {"appletpanel.exception", "eccezione: {0}"},
-            {"appletpanel.exception2", "eccezione: {0}: {1}."},
-            {"appletpanel.error", "errore: {0}."},
-            {"appletpanel.error2", "errore: {0}: {1}."},
-            {"appletpanel.notloaded", "Inizializzazione: applet non caricata."},
-            {"appletpanel.notinited", "Avvio: applet non inizializzata."},
-            {"appletpanel.notstarted", "Arresto: applet non avviata."},
-            {"appletpanel.notstopped", "Rimozione: applet non arrestata."},
-            {"appletpanel.notdestroyed", "Eliminazione: applet non rimossa."},
-            {"appletpanel.notdisposed", "Caricamento: applet non eliminata."},
-            {"appletpanel.bail", "Interrotto: chiusura."},
-            {"appletpanel.filenotfound", "File non trovato durante la ricerca di {0}"},
-            {"appletpanel.fileformat", "Eccezione di formato file durante il caricamento di {0}"},
-            {"appletpanel.fileioexception", "Eccezione I/O durante il caricamento di {0}"},
-            {"appletpanel.fileexception", "Eccezione {0} durante il caricamento di {1}"},
-            {"appletpanel.filedeath", "{0} terminato durante il caricamento di {1}"},
-            {"appletpanel.fileerror", "Errore {0} durante il caricamento di {1}"},
-            {"appletpanel.badattribute.exception", "Analisi HTML: valore errato per l'attributo width/height"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream richiede un loader non nullo"},
-            {"appletprops.title", "Propriet\u00E0 AppletViewer"},
-            {"appletprops.label.http.server", "Server proxy http:"},
-            {"appletprops.label.http.proxy", "Porta proxy http:"},
-            {"appletprops.label.network", "Accesso alla rete:"},
-            {"appletprops.choice.network.item.none", "Nessuno"},
-            {"appletprops.choice.network.item.applethost", "Host applet"},
-            {"appletprops.choice.network.item.unrestricted", "Non limitato"},
-            {"appletprops.label.class", "Accesso alla classe:"},
-            {"appletprops.choice.class.item.restricted", "Limitato"},
-            {"appletprops.choice.class.item.unrestricted", "Non limitato"},
-            {"appletprops.label.unsignedapplet", "Consenti applet senza firma:"},
-            {"appletprops.choice.unsignedapplet.no", "No"},
-            {"appletprops.choice.unsignedapplet.yes", "S\u00EC"},
-            {"appletprops.button.apply", "Applica"},
-            {"appletprops.button.cancel", "Annulla"},
-            {"appletprops.button.reset", "Reimposta"},
-            {"appletprops.apply.exception", "Salvataggio delle propriet\u00E0 non riuscito: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Voce non valida"},
-            {"appletprops.label.invalidproxy", "La porta del proxy deve essere un valore intero positivo."},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "Propriet\u00E0 specifiche dell'utente per AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "Eccezione di sicurezza: classloader"},
-            {"appletsecurityexception.checkaccess.thread", "Eccezione di sicurezza: thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "Eccezione di sicurezza: threadgroup: {0}"},
-            {"appletsecurityexception.checkexit", "Eccezione di sicurezza: exit: {0}"},
-            {"appletsecurityexception.checkexec", "Eccezione di sicurezza: exec: {0}"},
-            {"appletsecurityexception.checklink", "Eccezione di sicurezza: link: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "Eccezione di sicurezza: properties"},
-            {"appletsecurityexception.checkpropsaccess.key", "Eccezione di sicurezza: properties access {0}"},
-            {"appletsecurityexception.checkread.exception1", "Eccezione di sicurezza: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "Eccezione di sicurezza: file.read: {0}"},
-            {"appletsecurityexception.checkread", "Eccezione di sicurezza: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "Eccezione di sicurezza: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "Eccezione di sicurezza: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "Eccezione di sicurezza: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "Eccezione di sicurezza: fd.write"},
-            {"appletsecurityexception.checklisten", "Eccezione di sicurezza: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "Eccezione di sicurezza: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "Eccezione di sicurezza: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "Eccezione di sicurezza: impossibile connettersi a {0} con origine da {1}."},
-            {"appletsecurityexception.checkconnect.networkhost2", "Eccezione di sicurezza: impossibile risolvere l''IP per l''host {0} o per {1}. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "Eccezione di sicurezza: impossibile non risolvere l''IP per l''host {0}. Vedere la propriet\u00E0 trustProxy."},
-            {"appletsecurityexception.checkconnect", "Eccezione di sicurezza: connect: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "Eccezione di sicurezza: impossibile accedere al package {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "Eccezione di sicurezza: impossibile definire il package {0}"},
-            {"appletsecurityexception.cannotsetfactory", "Eccezione di sicurezza: impossibile impostare il factory"},
-            {"appletsecurityexception.checkmemberaccess", "Eccezione di sicurezza: controllare l'accesso dei membri"},
-            {"appletsecurityexception.checkgetprintjob", "Eccezione di sicurezza: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "Eccezione di sicurezza: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "Eccezione di sicurezza: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "Eccezione di sicurezza: operazione di sicurezza {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "tipo di loader della classe sconosciuto. Impossibile verificare la presenza di getContext."},
-            {"appletsecurityexception.checkread.unknown", "tipo di loader della classe sconosciuto. Impossibile verificare la presenza della lettura di controllo {0}."},
-            {"appletsecurityexception.checkconnect.unknown", "tipo di loader della classe sconosciuto. Impossibile verificare la presenza della connessione di controllo."},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
deleted file mode 100644
index 03a02508497..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_ja extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "\u53D6\u6D88"},
-            {"appletviewer.tool.title", "\u30A2\u30D7\u30EC\u30C3\u30C8\u30FB\u30D3\u30E5\u30FC\u30A2: {0}"},
-            {"appletviewer.menu.applet", "\u30A2\u30D7\u30EC\u30C3\u30C8"},
-            {"appletviewer.menuitem.restart", "\u518D\u8D77\u52D5"},
-            {"appletviewer.menuitem.reload", "\u518D\u30ED\u30FC\u30C9"},
-            {"appletviewer.menuitem.stop", "\u505C\u6B62"},
-            {"appletviewer.menuitem.save", "\u4FDD\u5B58..."},
-            {"appletviewer.menuitem.start", "\u958B\u59CB"},
-            {"appletviewer.menuitem.clone", "\u30AF\u30ED\u30FC\u30F3..."},
-            {"appletviewer.menuitem.tag", "\u30BF\u30B0..."},
-            {"appletviewer.menuitem.info", "\u60C5\u5831..."},
-            {"appletviewer.menuitem.edit", "\u7DE8\u96C6"},
-            {"appletviewer.menuitem.encoding", "\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"},
-            {"appletviewer.menuitem.print", "\u5370\u5237..."},
-            {"appletviewer.menuitem.props", "\u30D7\u30ED\u30D1\u30C6\u30A3..."},
-            {"appletviewer.menuitem.close", "\u9589\u3058\u308B"},
-            {"appletviewer.menuitem.quit", "\u7D42\u4E86"},
-            {"appletviewer.label.hello", "Hello..."},
-            {"appletviewer.status.start", "\u30A2\u30D7\u30EC\u30C3\u30C8\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059..."},
-            {"appletviewer.appletsave.filedialogtitle","\u30A2\u30D7\u30EC\u30C3\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA"},
-            {"appletviewer.appletsave.err1", "{0}\u3092{1}\u306B\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA"},
-            {"appletviewer.appletsave.err2", "appletSave\u5185: {0}"},
-            {"appletviewer.applettag", "\u30BF\u30B0\u306E\u8868\u793A"},
-            {"appletviewer.applettag.textframe", "\u30A2\u30D7\u30EC\u30C3\u30C8HTML\u30BF\u30B0"},
-            {"appletviewer.appletinfo.applet", "-- \u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831\u306A\u3057 --"},
-            {"appletviewer.appletinfo.param", "-- \u30D1\u30E9\u30E1\u30FC\u30BF\u60C5\u5831\u306A\u3057 --"},
-            {"appletviewer.appletinfo.textframe", "\u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831"},
-            {"appletviewer.appletprint.fail", "\u5370\u5237\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002"},
-            {"appletviewer.appletprint.finish", "\u5370\u5237\u3092\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002"},
-            {"appletviewer.appletprint.cancel", "\u5370\u5237\u304C\u53D6\u308A\u6D88\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletviewer.appletencoding", "\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0: {0}"},
-            {"appletviewer.parse.warning.requiresname", "\u8B66\u544A: <param name=... value=...>\u30BF\u30B0\u306Bname\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.paramoutside", "\u8B66\u544A: <param>\u30BF\u30B0\u304C<applet> ... </applet>\u306E\u5916\u5074\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.applet.requirescode", "\u8B66\u544A: <applet>\u30BF\u30B0\u306Bcode\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.applet.requiresheight", "\u8B66\u544A: <applet>\u30BF\u30B0\u306Bheight\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.applet.requireswidth", "\u8B66\u544A: <applet>\u30BF\u30B0\u306Bwidth\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.object.requirescode", "\u8B66\u544A: <object>\u30BF\u30B0\u306Bcode\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.object.requiresheight", "\u8B66\u544A: <object>\u30BF\u30B0\u306Bheight\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.object.requireswidth", "\u8B66\u544A: <object>\u30BF\u30B0\u306Bwidth\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.embed.requirescode", "\u8B66\u544A: <embed>\u30BF\u30B0\u306Bcode\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.embed.requiresheight", "\u8B66\u544A: <embed>\u30BF\u30B0\u306Bheight\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.embed.requireswidth", "\u8B66\u544A: <embed>\u30BF\u30B0\u306Bwidth\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-            {"appletviewer.parse.warning.appnotLongersupported", "\u8B66\u544A: <app>\u30BF\u30B0\u306F\u73FE\u5728\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u304B\u308F\u308A\u306B<applet>\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-            {"appletviewer.deprecated", "\u8B66\u544A: \u30A2\u30D7\u30EC\u30C3\u30C8API\u304A\u3088\u3073AppletViewer\u306F\u975E\u63A8\u5968\u3067\u3059\u3002"},
-            {"appletviewer.usage", "\u4F7F\u7528\u65B9\u6CD5: appletviewer <options> url(s)\n\n<options>\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n  -encoding <encoding>    HTML\u30D5\u30A1\u30A4\u30EB\u306B\u3088\u3063\u3066\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3059\u308B\n  -J<runtime flag>        \u5F15\u6570\u3092Java\u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u306B\u6E21\u3059\n\n-J\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
-            {"appletviewer.main.err.unsupportedopt", "\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "\u8A8D\u8B58\u3055\u308C\u306A\u3044\u5F15\u6570: {0}"},
-            {"appletviewer.main.err.dupoption", "\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}"},
-            {"appletviewer.main.err.inputfile", "\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletviewer.main.err.badurl", "\u4E0D\u6B63\u306AURL: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "\u8AAD\u8FBC\u307F\u4E2D\u306E\u5165\u51FA\u529B\u4F8B\u5916\u3067\u3059: {0}"},
-            {"appletviewer.main.err.readablefile", "{0}\u304C\u30D5\u30A1\u30A4\u30EB\u3067\u3042\u308A\u3001\u8AAD\u8FBC\u307F\u53EF\u80FD\u3067\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-            {"appletviewer.main.err.correcturl", "{0}\u306F\u6B63\u3057\u3044URL\u3067\u3059\u304B\u3002"},
-            {"appletviewer.main.prop.store", "AppletViewer\u7528\u306E\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D7\u30ED\u30D1\u30C6\u30A3"},
-            {"appletviewer.main.err.prop.cantread", "\u30E6\u30FC\u30B6\u30FC\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "\u30E6\u30FC\u30B6\u30FC\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "\u8B66\u544A: \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u3092\u7121\u52B9\u5316\u3057\u307E\u3059\u3002"},
-            {"appletviewer.main.debug.cantfinddebug", "\u30C7\u30D0\u30C3\u30AC\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002"},
-            {"appletviewer.main.debug.cantfindmain", "\u30C7\u30D0\u30C3\u30AC\u306E\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002"},
-            {"appletviewer.main.debug.exceptionindebug", "\u30C7\u30D0\u30C3\u30AC\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002"},
-            {"appletviewer.main.debug.cantaccess", "\u30C7\u30D0\u30C3\u30AC\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002"},
-            {"appletviewer.main.nosecmgr", "\u8B66\u544A: SecurityManager\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletviewer.main.warning", "\u8B66\u544A: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u958B\u59CB\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5165\u529B\u306B<applet>\u30BF\u30B0\u304C\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-            {"appletviewer.main.warn.prop.overwrite", "\u8B66\u544A: \u30E6\u30FC\u30B6\u30FC\u306E\u30EA\u30AF\u30A8\u30B9\u30C8\u3067\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u4E00\u6642\u7684\u306B\u4E0A\u66F8\u304D\u3057\u307E\u3059: \u30AD\u30FC: {0} \u53E4\u3044\u5024: {1} \u65B0\u3057\u3044\u5024: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "\u8B66\u544A: AppletViewer\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002"},
-            {"appletioexception.loadclass.throw.interrupted", "\u30AF\u30E9\u30B9\u306E\u30ED\u30FC\u30C9\u304C\u4E2D\u65AD\u3057\u307E\u3057\u305F: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "\u30AF\u30E9\u30B9\u304C\u30ED\u30FC\u30C9\u3055\u308C\u307E\u305B\u3093: {0}"},
-            {"appletclassloader.loadcode.verbose", "{1}\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306E{0}\u3078\u306E\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304D\u307E\u3059"},
-            {"appletclassloader.filenotfound", "{0}\u306E\u691C\u7D22\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-            {"appletclassloader.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletclassloader.fileioexception", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u5165\u51FA\u529B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletclassloader.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletclassloader.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
-            {"appletclassloader.fileerror", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletclassloader.findclass.verbose.openstream", "{1}\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306E{0}\u3078\u306E\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304D\u307E\u3059"},
-            {"appletclassloader.getresource.verbose.forname", "\u540D\u524D{0}\u306EAppletClassLoader.getResource\u3067\u3059"},
-            {"appletclassloader.getresource.verbose.found", "\u30EA\u30BD\u30FC\u30B9{0}\u304C\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u3068\u3057\u3066\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
-            {"appletclassloader.getresourceasstream.verbose", "\u30EA\u30BD\u30FC\u30B9{0}\u304C\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u3068\u3057\u3066\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
-            {"appletpanel.runloader.err", "\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u307E\u305F\u306F\u30B3\u30FC\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002"},
-            {"appletpanel.runloader.exception", "{0}\u306E\u30C7\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletpanel.destroyed", "\u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u7834\u68C4\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletpanel.loaded", "\u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletpanel.started", "\u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u958B\u59CB\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletpanel.inited", "\u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u521D\u671F\u5316\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletpanel.stopped", "\u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u505C\u6B62\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletpanel.disposed", "\u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u7834\u68C4\u3055\u308C\u307E\u3057\u305F\u3002"},
-            {"appletpanel.nocode", "APPLET\u30BF\u30B0\u306BCODE\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3042\u308A\u307E\u305B\u3093\u3002"},
-            {"appletpanel.notfound", "\u30ED\u30FC\u30C9: \u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002"},
-            {"appletpanel.nocreate", "\u30ED\u30FC\u30C9: {0}\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3002"},
-            {"appletpanel.noconstruct", "\u30ED\u30FC\u30C9: {0}\u306Fpublic\u3067\u306A\u3044\u304B\u3001public\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u6301\u3063\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.death", "\u5F37\u5236\u7D42\u4E86\u3055\u308C\u307E\u3057\u305F"},
-            {"appletpanel.exception", "\u4F8B\u5916: {0}\u3002"},
-            {"appletpanel.exception2", "\u4F8B\u5916: {0}: {1}\u3002"},
-            {"appletpanel.error", "\u30A8\u30E9\u30FC: {0}\u3002"},
-            {"appletpanel.error2", "\u30A8\u30E9\u30FC: {0}: {1}\u3002"},
-            {"appletpanel.notloaded", "\u521D\u671F\u5316: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u30ED\u30FC\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.notinited", "\u958B\u59CB: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.notstarted", "\u505C\u6B62: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u958B\u59CB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.notstopped", "\u7834\u68C4: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u505C\u6B62\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.notdestroyed", "\u7834\u68C4: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u7834\u68C4\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.notdisposed", "\u30ED\u30FC\u30C9: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u7834\u68C4\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-            {"appletpanel.bail", "\u4E2D\u65AD\u6E08: \u7D42\u4E86\u3057\u3066\u3044\u307E\u3059\u3002"},
-            {"appletpanel.filenotfound", "{0}\u306E\u691C\u7D22\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-            {"appletpanel.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletpanel.fileioexception", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u5165\u51FA\u529B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletpanel.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletpanel.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
-            {"appletpanel.fileerror", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-            {"appletpanel.badattribute.exception", "HTML\u89E3\u6790: width\u307E\u305F\u306Fheight\u5C5E\u6027\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream\u306F\u975Enull\u306E\u30ED\u30FC\u30C0\u30FC\u304C\u5FC5\u8981\u3067\u3059"},
-            {"appletprops.title", "AppletViewer\u30D7\u30ED\u30D1\u30C6\u30A3"},
-            {"appletprops.label.http.server", "Http\u30D7\u30ED\u30AD\u30B7\u30FB\u30B5\u30FC\u30D0\u30FC:"},
-            {"appletprops.label.http.proxy", "Http\u30D7\u30ED\u30AD\u30B7\u30FB\u30DD\u30FC\u30C8:"},
-            {"appletprops.label.network", "\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30FB\u30A2\u30AF\u30BB\u30B9:"},
-            {"appletprops.choice.network.item.none", "\u306A\u3057"},
-            {"appletprops.choice.network.item.applethost", "\u30A2\u30D7\u30EC\u30C3\u30C8\u30FB\u30DB\u30B9\u30C8"},
-            {"appletprops.choice.network.item.unrestricted", "\u5236\u9650\u306A\u3057"},
-            {"appletprops.label.class", "\u30AF\u30E9\u30B9\u30FB\u30A2\u30AF\u30BB\u30B9:"},
-            {"appletprops.choice.class.item.restricted", "\u5236\u9650\u4ED8\u304D"},
-            {"appletprops.choice.class.item.unrestricted", "\u5236\u9650\u306A\u3057"},
-            {"appletprops.label.unsignedapplet", "\u7F72\u540D\u3055\u308C\u3066\u3044\u306A\u3044\u30A2\u30D7\u30EC\u30C3\u30C8\u3092\u8A31\u53EF:"},
-            {"appletprops.choice.unsignedapplet.no", "\u3044\u3044\u3048"},
-            {"appletprops.choice.unsignedapplet.yes", "\u306F\u3044"},
-            {"appletprops.button.apply", "\u9069\u7528"},
-            {"appletprops.button.cancel", "\u53D6\u6D88"},
-            {"appletprops.button.reset", "\u30EA\u30BB\u30C3\u30C8"},
-            {"appletprops.apply.exception", "\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "\u30A8\u30F3\u30C8\u30EA\u304C\u7121\u52B9\u3067\u3059"},
-            {"appletprops.label.invalidproxy", "\u30D7\u30ED\u30AD\u30B7\u30FB\u30DD\u30FC\u30C8\u306F\u6B63\u306E\u6574\u6570\u5024\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "AppletViewer\u7528\u306E\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D7\u30ED\u30D1\u30C6\u30A3"},
-            {"appletsecurityexception.checkcreateclassloader", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30AF\u30E9\u30B9\u30ED\u30FC\u30C0\u30FC"},
-            {"appletsecurityexception.checkaccess.thread", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30B9\u30EC\u30C3\u30C9"},
-            {"appletsecurityexception.checkaccess.threadgroup", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7: {0}"},
-            {"appletsecurityexception.checkexit", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u7D42\u4E86: {0}"},
-            {"appletsecurityexception.checkexec", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u5B9F\u884C: {0}"},
-            {"appletsecurityexception.checklink", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30EA\u30F3\u30AF: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30D7\u30ED\u30D1\u30C6\u30A3"},
-            {"appletsecurityexception.checkpropsaccess.key", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30A2\u30AF\u30BB\u30B9{0}"},
-            {"appletsecurityexception.checkread.exception1", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: file.read: {0}"},
-            {"appletsecurityexception.checkread", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: fd.write"},
-            {"appletsecurityexception.checklisten", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: {1}\u306E\u8D77\u70B9\u3092\u4F7F\u7528\u3057\u3066{0}\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
-            {"appletsecurityexception.checkconnect.networkhost2", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30DB\u30B9\u30C8{0}\u307E\u305F\u306F{1}\u306EIP\u3092\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002 "},
-            {"appletsecurityexception.checkconnect.networkhost3", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30DB\u30B9\u30C8{0}\u306EIP\u3092\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002trustProxy\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-            {"appletsecurityexception.checkconnect", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u63A5\u7D9A: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u5B9A\u7FA9\u3067\u304D\u307E\u305B\u3093: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30D5\u30A1\u30AF\u30C8\u30EA\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-            {"appletsecurityexception.checkmemberaccess", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30E1\u30F3\u30D0\u30FC\u30FB\u30A2\u30AF\u30BB\u30B9\u306E\u78BA\u8A8D"},
-            {"appletsecurityexception.checkgetprintjob", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u306E\u4F8B\u5916: \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u64CD\u4F5C: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "\u4E0D\u660E\u306A\u30AF\u30E9\u30B9\u30ED\u30FC\u30C0\u30FC\u30FB\u30BF\u30A4\u30D7\u3067\u3059\u3002getContext\u3092\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093"},
-            {"appletsecurityexception.checkread.unknown", "\u4E0D\u660E\u306A\u30AF\u30E9\u30B9\u30ED\u30FC\u30C0\u30FC\u30FB\u30BF\u30A4\u30D7\u3067\u3059\u3002{0}\u306E\u8AAD\u53D6\u308A\u30C1\u30A7\u30C3\u30AF\u3092\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093"},
-            {"appletsecurityexception.checkconnect.unknown", "\u4E0D\u660E\u306A\u30AF\u30E9\u30B9\u30ED\u30FC\u30C0\u30FC\u30FB\u30BF\u30A4\u30D7\u3067\u3059\u3002\u63A5\u7D9A\u30C1\u30A7\u30C3\u30AF\u3092\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
deleted file mode 100644
index 3b9e685341e..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 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
- * 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_ko extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "\uD574\uC81C"},
-            {"appletviewer.tool.title", "\uC560\uD50C\uB9BF \uBDF0\uC5B4: {0}"},
-            {"appletviewer.menu.applet", "\uC560\uD50C\uB9BF"},
-            {"appletviewer.menuitem.restart", "\uC7AC\uC2DC\uC791"},
-            {"appletviewer.menuitem.reload", "\uC7AC\uB85C\uB4DC"},
-            {"appletviewer.menuitem.stop", "\uC815\uC9C0"},
-            {"appletviewer.menuitem.save", "\uC800\uC7A5..."},
-            {"appletviewer.menuitem.start", "\uC2DC\uC791"},
-            {"appletviewer.menuitem.clone", "\uBCF5\uC81C..."},
-            {"appletviewer.menuitem.tag", "\uD0DC\uADF8 \uC9C0\uC815..."},
-            {"appletviewer.menuitem.info", "\uC815\uBCF4..."},
-            {"appletviewer.menuitem.edit", "\uD3B8\uC9D1"},
-            {"appletviewer.menuitem.encoding", "\uBB38\uC790 \uC778\uCF54\uB529"},
-            {"appletviewer.menuitem.print", "\uC778\uC1C4..."},
-            {"appletviewer.menuitem.props", "\uC18D\uC131..."},
-            {"appletviewer.menuitem.close", "\uB2EB\uAE30"},
-            {"appletviewer.menuitem.quit", "\uC885\uB8CC"},
-            {"appletviewer.label.hello", "\uC2DC\uC791..."},
-            {"appletviewer.status.start", "\uC560\uD50C\uB9BF\uC744 \uC2DC\uC791\uD558\uB294 \uC911..."},
-            {"appletviewer.appletsave.filedialogtitle","\uD30C\uC77C\uB85C \uC560\uD50C\uB9BF \uC9C1\uB82C\uD654"},
-            {"appletviewer.appletsave.err1", "{0}\uC744(\uB97C) {1}(\uC73C)\uB85C \uC9C1\uB82C\uD654\uD558\uB294 \uC911"},
-            {"appletviewer.appletsave.err2", "appletSave\uC5D0 \uC624\uB958 \uBC1C\uC0DD: {0}"},
-            {"appletviewer.applettag", "\uD0DC\uADF8\uAC00 \uD45C\uC2DC\uB428"},
-            {"appletviewer.applettag.textframe", "\uC560\uD50C\uB9BF HTML \uD0DC\uADF8"},
-            {"appletviewer.appletinfo.applet", "-- \uC560\uD50C\uB9BF \uC815\uBCF4 \uC5C6\uC74C --"},
-            {"appletviewer.appletinfo.param", "-- \uB9E4\uAC1C\uBCC0\uC218 \uC815\uBCF4 \uC5C6\uC74C --"},
-            {"appletviewer.appletinfo.textframe", "\uC560\uD50C\uB9BF \uC815\uBCF4"},
-            {"appletviewer.appletprint.fail", "\uC778\uC1C4\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.appletprint.finish", "\uC778\uC1C4\uB97C \uC644\uB8CC\uD588\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.appletprint.cancel", "\uC778\uC1C4\uAC00 \uCDE8\uC18C\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.appletencoding", "\uBB38\uC790 \uC778\uCF54\uB529: {0}"},
-            {"appletviewer.parse.warning.requiresname", "\uACBD\uACE0: <param name=... value=...> \uD0DC\uADF8\uC5D0\uB294 name \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.paramoutside", "\uACBD\uACE0: <param> \uD0DC\uADF8\uAC00 <applet> ... </applet> \uBC16\uC5D0 \uC788\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.applet.requirescode", "\uACBD\uACE0: <applet> \uD0DC\uADF8\uC5D0\uB294 code \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.applet.requiresheight", "\uACBD\uACE0: <applet> \uD0DC\uADF8\uC5D0\uB294 height \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.applet.requireswidth", "\uACBD\uACE0: <applet> \uD0DC\uADF8\uC5D0\uB294 width \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.object.requirescode", "\uACBD\uACE0: <object> \uD0DC\uADF8\uC5D0\uB294 code \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.object.requiresheight", "\uACBD\uACE0: <object> \uD0DC\uADF8\uC5D0\uB294 height \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.object.requireswidth", "\uACBD\uACE0: <object> \uD0DC\uADF8\uC5D0\uB294 width \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.embed.requirescode", "\uACBD\uACE0: <embed> \uD0DC\uADF8\uC5D0\uB294 code \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.embed.requiresheight", "\uACBD\uACE0: <embed> \uD0DC\uADF8\uC5D0\uB294 height \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.embed.requireswidth", "\uACBD\uACE0: <embed> \uD0DC\uADF8\uC5D0\uB294 width \uC18D\uC131\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletviewer.parse.warning.appnotLongersupported", "\uACBD\uACE0: <app> \uD0DC\uADF8\uB294 \uB354 \uC774\uC0C1 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uB300\uC2E0 <applet>\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624."},
-            {"appletviewer.deprecated", "\uACBD\uACE0: \uC560\uD50C\uB9BF API \uBC0F AppletViewer\uAC00 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.usage", "\uC0AC\uC6A9\uBC95: appletviewer <options> url(s)\n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n  -encoding <encoding>    HTML \uD30C\uC77C\uC5D0 \uC0AC\uC6A9\uB420 \uBB38\uC790 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n  -J<runtime flag>        Java \uC778\uD130\uD504\uB9AC\uD130\uB85C \uC778\uC218\uB97C \uC804\uB2EC\uD569\uB2C8\uB2E4.\n\n-J \uC635\uC158\uC740 \uD45C\uC900\uC774 \uC544\uB2C8\uBA70 \uC608\uACE0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.main.err.unsupportedopt", "\uC9C0\uC6D0\uB418\uC9C0 \uC54A\uB294 \uC635\uC158: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "\uC54C \uC218 \uC5C6\uB294 \uC778\uC218: {0}"},
-            {"appletviewer.main.err.dupoption", "\uC911\uBCF5\uB41C \uC635\uC158 \uC0AC\uC6A9: {0}"},
-            {"appletviewer.main.err.inputfile", "\uC9C0\uC815\uB41C \uC785\uB825 \uD30C\uC77C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletviewer.main.err.badurl", "\uC798\uBABB\uB41C URL: {0}({1})"},
-            {"appletviewer.main.err.io", "\uC77D\uB294 \uC911 I/O \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {0}"},
-            {"appletviewer.main.err.readablefile", "{0}\uC774(\uAC00) \uD30C\uC77C\uC774\uBA70 \uC77D\uAE30 \uAC00\uB2A5\uD55C \uC0C1\uD0DC\uC778\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
-            {"appletviewer.main.err.correcturl", "{0}\uC774(\uAC00) \uC62C\uBC14\uB978 URL\uC785\uB2C8\uAE4C?"},
-            {"appletviewer.main.prop.store", "\uC0AC\uC6A9\uC790 \uAD00\uB828 AppletViewer \uC18D\uC131"},
-            {"appletviewer.main.err.prop.cantread", "\uC0AC\uC6A9\uC790 \uC18D\uC131 \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC74C: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "\uC0AC\uC6A9\uC790 \uC18D\uC131 \uD30C\uC77C\uC744 \uC800\uC7A5\uD560 \uC218 \uC5C6\uC74C: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "\uACBD\uACE0: \uBCF4\uC548\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD558\uB294 \uC911\uC785\uB2C8\uB2E4."},
-            {"appletviewer.main.debug.cantfinddebug", "\uB514\uBC84\uAC70\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4!"},
-            {"appletviewer.main.debug.cantfindmain", "\uB514\uBC84\uAC70\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4!"},
-            {"appletviewer.main.debug.exceptionindebug", "\uB514\uBC84\uAC70\uC5D0 \uC608\uC678\uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4!"},
-            {"appletviewer.main.debug.cantaccess", "\uB514\uBC84\uAC70\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4!"},
-            {"appletviewer.main.nosecmgr", "\uACBD\uACE0: SecurityManager\uAC00 \uC124\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4!"},
-            {"appletviewer.main.warning", "\uACBD\uACE0: \uC2DC\uC791\uB41C \uC560\uD50C\uB9BF\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. <applet> \uD0DC\uADF8\uAC00 \uC785\uB825\uB418\uC5C8\uB294\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
-            {"appletviewer.main.warn.prop.overwrite", "\uACBD\uACE0: \uC0AC\uC6A9\uC790\uC758 \uC694\uCCAD\uC5D0 \uB530\uB77C \uC77C\uC2DC\uC801\uC73C\uB85C \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uACB9\uCCD0 \uC4F0\uB294 \uC911: \uD0A4: {0}, \uC774\uC804 \uAC12: {1}, \uC0C8 \uAC12: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "\uACBD\uACE0: AppletViewer \uC18D\uC131 \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC74C: {0}. \uAE30\uBCF8\uAC12\uC744 \uC0AC\uC6A9\uD558\uB294 \uC911\uC785\uB2C8\uB2E4."},
-            {"appletioexception.loadclass.throw.interrupted", "\uD074\uB798\uC2A4 \uB85C\uB4DC\uAC00 \uC911\uB2E8\uB428: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "\uD074\uB798\uC2A4\uAC00 \uB85C\uB4DC\uB418\uC9C0 \uC54A\uC74C: {0}"},
-            {"appletclassloader.loadcode.verbose", "{1}\uC744(\uB97C) \uAC00\uC838\uC624\uAE30 \uC704\uD574 {0}\uC5D0 \uB300\uD55C \uC2A4\uD2B8\uB9BC\uC744 \uC5EC\uB294 \uC911"},
-            {"appletclassloader.filenotfound", "{0}\uC744(\uB97C) \uAC80\uC0C9\uD558\uB294 \uC911 \uD30C\uC77C\uC744 \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4."},
-            {"appletclassloader.fileformat", "\uB85C\uB4DC \uC911 \uD30C\uC77C \uD615\uC2DD \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {0}"},
-            {"appletclassloader.fileioexception", "\uB85C\uB4DC \uC911 I/O \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {0}"},
-            {"appletclassloader.fileexception", "\uB85C\uB4DC \uC911 {0} \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {1}"},
-            {"appletclassloader.filedeath", "\uB85C\uB4DC \uC911 {0}\uC774(\uAC00) \uC885\uB8CC\uB428: {1}"},
-            {"appletclassloader.fileerror", "\uB85C\uB4DC \uC911 {0} \uC624\uB958 \uBC1C\uC0DD: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "{1}\uC744(\uB97C) \uAC00\uC838\uC624\uAE30 \uC704\uD574 {0}\uC5D0 \uB300\uD55C \uC2A4\uD2B8\uB9BC\uC744 \uC5EC\uB294 \uC911"},
-            {"appletclassloader.getresource.verbose.forname", "\uC774\uB984\uC5D0 \uB300\uD55C AppletClassLoader.getResource: {0}"},
-            {"appletclassloader.getresource.verbose.found", "\uC2DC\uC2A4\uD15C \uB9AC\uC18C\uC2A4\uB85C {0} \uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletclassloader.getresourceasstream.verbose", "\uC2DC\uC2A4\uD15C \uB9AC\uC18C\uC2A4\uB85C {0} \uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.runloader.err", "\uAC1D\uCCB4 \uB610\uB294 \uCF54\uB4DC \uB9E4\uAC1C\uBCC0\uC218\uC785\uB2C8\uB2E4!"},
-            {"appletpanel.runloader.exception", "{0}\uC758 \uC9C1\uB82C\uD654\uB97C \uD574\uC81C\uD558\uB294 \uC911 \uC608\uC678\uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.destroyed", "\uC560\uD50C\uB9BF\uC774 \uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.loaded", "\uC560\uD50C\uB9BF\uC774 \uB85C\uB4DC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.started", "\uC560\uD50C\uB9BF\uC774 \uC2DC\uC791\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.inited", "\uC560\uD50C\uB9BF\uC774 \uCD08\uAE30\uD654\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.stopped", "\uC560\uD50C\uB9BF\uC774 \uC815\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.disposed", "\uC560\uD50C\uB9BF\uC774 \uBC30\uCE58\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.nocode", "APPLET \uD0DC\uADF8\uC5D0 CODE \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.notfound", "\uB85C\uB4DC: {0} \uD074\uB798\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.nocreate", "\uB85C\uB4DC: {0}\uC744(\uB97C) \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.noconstruct", "\uB85C\uB4DC: {0}\uC740(\uB294) \uACF5\uC6A9\uC774 \uC544\uB2C8\uAC70\uB098 \uACF5\uC6A9 \uC0DD\uC131\uC790\uB97C \uD3EC\uD568\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.death", "\uC885\uB8CC\uB428"},
-            {"appletpanel.exception", "\uC608\uC678\uC0AC\uD56D: {0}."},
-            {"appletpanel.exception2", "\uC608\uC678\uC0AC\uD56D: {0}: {1}."},
-            {"appletpanel.error", "\uC624\uB958: {0}."},
-            {"appletpanel.error2", "\uC624\uB958: {0}: {1}."},
-            {"appletpanel.notloaded", "\uCD08\uAE30\uD654: \uC560\uD50C\uB9BF\uC774 \uB85C\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.notinited", "\uC2DC\uC791: \uC560\uD50C\uB9BF\uC774 \uCD08\uAE30\uD654\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.notstarted", "\uC815\uC9C0: \uC560\uD50C\uB9BF\uC774 \uC2DC\uC791\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.notstopped", "\uC0AD\uC81C: \uC560\uD50C\uB9BF\uC774 \uC815\uC9C0\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.notdestroyed", "\uBC30\uCE58: \uC560\uD50C\uB9BF\uC774 \uC0AD\uC81C\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.notdisposed", "\uB85C\uB4DC: \uC560\uD50C\uB9BF\uC774 \uBC30\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.bail", "\uC911\uB2E8\uB428: \uC911\uB2E8\uD558\uB294 \uC911\uC785\uB2C8\uB2E4."},
-            {"appletpanel.filenotfound", "{0}\uC744(\uB97C) \uAC80\uC0C9\uD558\uB294 \uC911 \uD30C\uC77C\uC744 \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4."},
-            {"appletpanel.fileformat", "\uB85C\uB4DC \uC911 \uD30C\uC77C \uD615\uC2DD \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {0}"},
-            {"appletpanel.fileioexception", "\uB85C\uB4DC \uC911 I/O \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {0}"},
-            {"appletpanel.fileexception", "\uB85C\uB4DC \uC911 {0} \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {1}"},
-            {"appletpanel.filedeath", "\uB85C\uB4DC \uC911 {0}\uC774(\uAC00) \uC885\uB8CC\uB428: {1}"},
-            {"appletpanel.fileerror", "\uB85C\uB4DC \uC911 {0} \uC624\uB958 \uBC1C\uC0DD: {1}"},
-            {"appletpanel.badattribute.exception", "HTML \uAD6C\uBB38\uBD84\uC11D \uC911: width/height \uC18D\uC131\uC5D0 \uB300\uD55C \uAC12\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream\uC5D0 \uB110\uC774 \uC544\uB2CC \uB85C\uB354\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
-            {"appletprops.title", "AppletViewer \uC18D\uC131"},
-            {"appletprops.label.http.server", "HTTP \uD504\uB85D\uC2DC \uC11C\uBC84:"},
-            {"appletprops.label.http.proxy", "HTTP \uD504\uB85D\uC2DC \uD3EC\uD2B8:"},
-            {"appletprops.label.network", "\uB124\uD2B8\uC6CC\uD06C \uC561\uC138\uC2A4:"},
-            {"appletprops.choice.network.item.none", "\uC5C6\uC74C"},
-            {"appletprops.choice.network.item.applethost", "\uC560\uD50C\uB9BF \uD638\uC2A4\uD2B8"},
-            {"appletprops.choice.network.item.unrestricted", "\uC81C\uD55C\uB418\uC9C0 \uC54A\uC74C"},
-            {"appletprops.label.class", "\uD074\uB798\uC2A4 \uC561\uC138\uC2A4:"},
-            {"appletprops.choice.class.item.restricted", "\uC81C\uD55C\uB428"},
-            {"appletprops.choice.class.item.unrestricted", "\uC81C\uD55C\uB418\uC9C0 \uC54A\uC74C"},
-            {"appletprops.label.unsignedapplet", "\uC11C\uBA85\uB418\uC9C0 \uC54A\uC740 \uC560\uD50C\uB9BF \uD5C8\uC6A9:"},
-            {"appletprops.choice.unsignedapplet.no", "\uC544\uB2C8\uC624"},
-            {"appletprops.choice.unsignedapplet.yes", "\uC608"},
-            {"appletprops.button.apply", "\uC801\uC6A9"},
-            {"appletprops.button.cancel", "\uCDE8\uC18C"},
-            {"appletprops.button.reset", "\uC7AC\uC124\uC815"},
-            {"appletprops.apply.exception", "\uC18D\uC131 \uC800\uC7A5 \uC2E4\uD328: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "\uBD80\uC801\uD569\uD55C \uD56D\uBAA9"},
-            {"appletprops.label.invalidproxy", "\uD504\uB85D\uC2DC \uD3EC\uD2B8\uB294 \uC591\uC758 \uC815\uC218 \uAC12\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-            {"appletprops.button.ok", "\uD655\uC778"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "\uC0AC\uC6A9\uC790 \uAD00\uB828 AppletViewer \uC18D\uC131"},
-            {"appletsecurityexception.checkcreateclassloader", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uD074\uB798\uC2A4 \uB85C\uB354"},
-            {"appletsecurityexception.checkaccess.thread", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC2A4\uB808\uB4DC"},
-            {"appletsecurityexception.checkaccess.threadgroup", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC2A4\uB808\uB4DC \uADF8\uB8F9: {0}"},
-            {"appletsecurityexception.checkexit", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC885\uB8CC: {0}"},
-            {"appletsecurityexception.checkexec", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC2E4\uD589: {0}"},
-            {"appletsecurityexception.checklink", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uB9C1\uD06C: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC18D\uC131"},
-            {"appletsecurityexception.checkpropsaccess.key", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC18D\uC131 \uC561\uC138\uC2A4 {0}"},
-            {"appletsecurityexception.checkread.exception1", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: file.read: {0}"},
-            {"appletsecurityexception.checkread", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: fd.write"},
-            {"appletsecurityexception.checklisten", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: {1}\uC5D0\uC11C {0}\uC5D0 \uC811\uC18D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletsecurityexception.checkconnect.networkhost2", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: {0} \uD638\uC2A4\uD2B8 \uB610\uB294 {1}\uC5D0 \uB300\uD55C IP\uB97C \uBD84\uC11D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: {0} \uD638\uC2A4\uD2B8\uC5D0 \uB300\uD55C IP\uB97C \uBD84\uC11D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. trustProxy \uC18D\uC131\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624."},
-            {"appletsecurityexception.checkconnect", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uC811\uC18D: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uD328\uD0A4\uC9C0\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC74C: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uD328\uD0A4\uC9C0\uB97C \uC815\uC758\uD560 \uC218 \uC5C6\uC74C: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uD329\uD1A0\uB9AC\uB97C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletsecurityexception.checkmemberaccess", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uBA64\uBC84 \uC561\uC138\uC2A4\uB97C \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
-            {"appletsecurityexception.checkgetprintjob", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "\uBCF4\uC548 \uC608\uC678\uC0AC\uD56D: \uBCF4\uC548 \uC791\uC5C5: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "\uC54C \uC218 \uC5C6\uB294 \uD074\uB798\uC2A4 \uB85C\uB354 \uC720\uD615\uC785\uB2C8\uB2E4. getContext\uB97C \uD655\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletsecurityexception.checkread.unknown", "\uC54C \uC218 \uC5C6\uB294 \uD074\uB798\uC2A4 \uB85C\uB354 \uC720\uD615\uC785\uB2C8\uB2E4. {0} \uC77D\uAE30\uB97C \uD655\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-            {"appletsecurityexception.checkconnect.unknown", "\uC54C \uC218 \uC5C6\uB294 \uD074\uB798\uC2A4 \uB85C\uB354 \uC720\uD615\uC785\uB2C8\uB2E4. \uC811\uC18D\uC744 \uD655\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
deleted file mode 100644
index ce91b3a1b51..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_pt_BR extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "Rejeitar"},
-            {"appletviewer.tool.title", "Visualizador do Applet: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Reiniciar"},
-            {"appletviewer.menuitem.reload", "Recarregar"},
-            {"appletviewer.menuitem.stop", "Interromper"},
-            {"appletviewer.menuitem.save", "Salvar"},
-            {"appletviewer.menuitem.start", "Iniciar"},
-            {"appletviewer.menuitem.clone", "Clonar..."},
-            {"appletviewer.menuitem.tag", "Tag..."},
-            {"appletviewer.menuitem.info", "Informa\u00E7\u00F5es..."},
-            {"appletviewer.menuitem.edit", "Editar"},
-            {"appletviewer.menuitem.encoding", "Codifica\u00E7\u00E3o do Caractere"},
-            {"appletviewer.menuitem.print", "Imprimir..."},
-            {"appletviewer.menuitem.props", "Propriedades..."},
-            {"appletviewer.menuitem.close", "Fechar"},
-            {"appletviewer.menuitem.quit", "Sair"},
-            {"appletviewer.label.hello", "Ol\u00E1..."},
-            {"appletviewer.status.start", "iniciando o applet..."},
-            {"appletviewer.appletsave.filedialogtitle","Serializar Applet no Arquivo"},
-            {"appletviewer.appletsave.err1", "serializando um {0} para {1}"},
-            {"appletviewer.appletsave.err2", "no appletSave: {0}"},
-            {"appletviewer.applettag", "Tag mostrada"},
-            {"appletviewer.applettag.textframe", "Tag HTML do Applet"},
-            {"appletviewer.appletinfo.applet", "-- nenhuma informa\u00E7\u00E3o do applet --"},
-            {"appletviewer.appletinfo.param", "-- sem informa\u00E7\u00E3o de par\u00E2metro --"},
-            {"appletviewer.appletinfo.textframe", "Informa\u00E7\u00F5es do Applet"},
-            {"appletviewer.appletprint.fail", "Falha na impress\u00E3o."},
-            {"appletviewer.appletprint.finish", "Impress\u00E3o finalizada."},
-            {"appletviewer.appletprint.cancel", "Impress\u00E3o cancelada."},
-            {"appletviewer.appletencoding", "Codifica\u00E7\u00E3o de Caractere: {0}"},
-            {"appletviewer.parse.warning.requiresname", "Advert\u00EAncia: a tag <param name=... value=...> requer um atributo de nome."},
-            {"appletviewer.parse.warning.paramoutside", "Advert\u00EAncia: a tag <param> externa <applet> ... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Advert\u00EAncia: a tag <applet> requer um atributo de c\u00F3digo."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Advert\u00EAncia: a tag <applet> requer um atributo de altura."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Advert\u00EAncia: a tag <applet> requer um atributo de largura."},
-            {"appletviewer.parse.warning.object.requirescode", "Advert\u00EAncia: a tag <object> requer um atributo de c\u00F3digo."},
-            {"appletviewer.parse.warning.object.requiresheight", "Advert\u00EAncia: a tag <object> requer um atributo de altura."},
-            {"appletviewer.parse.warning.object.requireswidth", "Advert\u00EAncia: a tag <object> requer um atributo de largura."},
-            {"appletviewer.parse.warning.embed.requirescode", "Advert\u00EAncia: a tag <embed> requer um atributo de c\u00F3digo."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Advert\u00EAncia: a tag <embed> requer um atributo de altura."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Advert\u00EAncia: a tag <embed> requer um atributo de largura."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Advert\u00EAncia: a tag <app> n\u00E3o \u00E9 mais suportada; use <applet>:"},
-            {"appletviewer.deprecated", "Advert\u00EAncia: A API do e o AppletViewer est\u00E3o obsoletos."},
-            {"appletviewer.usage", "Uso: appletviewer <op\u00E7\u00F5es> url(s)\n\nem que as <op\u00E7\u00F5es> incluem:\n  -encoding <codifica\u00E7\u00E3o>    Especifica a codifica\u00E7\u00E3o de caractere usada pelos arquivos HTML\n  -J<flag de runtime>        Informa o argumento ao intepretador java\n\nA op\u00E7\u00E3o -J n\u00E3o \u00E9 padr\u00E3o e est\u00E1 sujeita \u00E0 altera\u00E7\u00E3o sem notifica\u00E7\u00E3o."},
-            {"appletviewer.main.err.unsupportedopt", "Op\u00E7\u00E3o n\u00E3o suportada: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Argumento n\u00E3o reconhecido: {0}"},
-            {"appletviewer.main.err.dupoption", "Uso duplicado da op\u00E7\u00E3o: {0}"},
-            {"appletviewer.main.err.inputfile", "Nenhum arquivo de entrada especificado."},
-            {"appletviewer.main.err.badurl", "URL Inv\u00E1lido: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "Exce\u00E7\u00E3o de E/S ao ler: {0}"},
-            {"appletviewer.main.err.readablefile", "Certifique-se de que {0} seja um arquivo e seja leg\u00EDvel."},
-            {"appletviewer.main.err.correcturl", "O URL {0} est\u00E1 correto?"},
-            {"appletviewer.main.prop.store", "Propriedades espec\u00EDficas do usu\u00E1rio do AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "N\u00E3o \u00E9 poss\u00EDvel ler o arquivo de propriedades do usu\u00E1rio: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "N\u00E3o \u00E9 poss\u00EDvel salvar o arquivo de propriedades do usu\u00E1rio: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Advert\u00EAncia: desativando a seguran\u00E7a."},
-            {"appletviewer.main.debug.cantfinddebug", "N\u00E3o \u00E9 poss\u00EDvel localizar o depurador!"},
-            {"appletviewer.main.debug.cantfindmain", "N\u00E3o \u00E9 poss\u00EDvel localizar o m\u00E9todo main no depurador!"},
-            {"appletviewer.main.debug.exceptionindebug", "Exce\u00E7\u00E3o no depurador!"},
-            {"appletviewer.main.debug.cantaccess", "N\u00E3o \u00E9 poss\u00EDvel acessar o depurador!"},
-            {"appletviewer.main.nosecmgr", "Advert\u00EAncia: SecurityManager n\u00E3o instalado!"},
-            {"appletviewer.main.warning", "Advert\u00EAncia: Nenhum applet iniciado. Certifique-se de que a entrada contenha uma tag <applet>."},
-            {"appletviewer.main.warn.prop.overwrite", "Advert\u00EAncia: Substituindo a propriedade do sistema temporariamente a pedido do usu\u00E1rio: chave: {0} valor antigo: {1} valor novo: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "Advert\u00EAncia: N\u00E3o \u00E9 poss\u00EDvel ler o arquivo de propriedades AppletViewer: {0} Usando padr\u00F5es."},
-            {"appletioexception.loadclass.throw.interrupted", "carregamento de classe interrompido: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "classe n\u00E3o carregada: {0}"},
-            {"appletclassloader.loadcode.verbose", "Fluxo de abertura para: {0} para obter {1}"},
-            {"appletclassloader.filenotfound", "Arquivo n\u00E3o encontrado ao procurar: {0}"},
-            {"appletclassloader.fileformat", "Exce\u00E7\u00E3o de formato do arquivo ao carregar: {0}"},
-            {"appletclassloader.fileioexception", "Exce\u00E7\u00E3o de E/S ao carregar: {0}"},
-            {"appletclassloader.fileexception", "exce\u00E7\u00E3o de {0} ao carregar: {1}"},
-            {"appletclassloader.filedeath", "{0} eliminado ao carregar: {1}"},
-            {"appletclassloader.fileerror", "erro de {0} ao carregar: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "Fluxo de abertura para: {0} para obter {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource do nome: {0}"},
-            {"appletclassloader.getresource.verbose.found", "Recurso encontrado: {0} como um recurso do sistema"},
-            {"appletclassloader.getresourceasstream.verbose", "Recurso encontrado: {0} como um recurso do sistema"},
-            {"appletpanel.runloader.err", "Par\u00E2metro de c\u00F3digo ou objeto!"},
-            {"appletpanel.runloader.exception", "exce\u00E7\u00E3o ao desserializar {0}"},
-            {"appletpanel.destroyed", "Applet destru\u00EDdo."},
-            {"appletpanel.loaded", "Applet carregado."},
-            {"appletpanel.started", "Applet iniciado."},
-            {"appletpanel.inited", "Applet inicializado."},
-            {"appletpanel.stopped", "Applet interrompido."},
-            {"appletpanel.disposed", "Applet descartado."},
-            {"appletpanel.nocode", "A tag APPLET n\u00E3o encontrou o par\u00E2metro CODE."},
-            {"appletpanel.notfound", "carga: classe {0} n\u00E3o encontrada."},
-            {"appletpanel.nocreate", "carga: {0} n\u00E3o pode ser instanciada."},
-            {"appletpanel.noconstruct", "carga: {0} n\u00E3o \u00E9 p\u00FAblica ou n\u00E3o tem construtor p\u00FAblico."},
-            {"appletpanel.death", "eliminado"},
-            {"appletpanel.exception", "exce\u00E7\u00E3o: {0}."},
-            {"appletpanel.exception2", "exce\u00E7\u00E3o: {0}: {1}."},
-            {"appletpanel.error", "erro: {0}."},
-            {"appletpanel.error2", "erro: {0}: {1}."},
-            {"appletpanel.notloaded", "Inic: applet n\u00E3o carregado."},
-            {"appletpanel.notinited", "Iniciar: applet n\u00E3o inicializado."},
-            {"appletpanel.notstarted", "Interromper: applet n\u00E3o inicializado."},
-            {"appletpanel.notstopped", "Destruir: applet n\u00E3o interrompido."},
-            {"appletpanel.notdestroyed", "Descartar: applet n\u00E3o destru\u00EDdo."},
-            {"appletpanel.notdisposed", "Carregar: applet n\u00E3o descartado."},
-            {"appletpanel.bail", "Interrompido: esvaziando."},
-            {"appletpanel.filenotfound", "Arquivo n\u00E3o encontrado ao procurar: {0}"},
-            {"appletpanel.fileformat", "Exce\u00E7\u00E3o de formato do arquivo ao carregar: {0}"},
-            {"appletpanel.fileioexception", "Exce\u00E7\u00E3o de E/S ao carregar: {0}"},
-            {"appletpanel.fileexception", "exce\u00E7\u00E3o de {0} ao carregar: {1}"},
-            {"appletpanel.filedeath", "{0} eliminado ao carregar: {1}"},
-            {"appletpanel.fileerror", "erro de {0} ao carregar: {1}"},
-            {"appletpanel.badattribute.exception", "Parsing de HTML: valor incorreto do atributo de largura/altura"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requer um carregador n\u00E3o nulo"},
-            {"appletprops.title", "Propriedades do AppletViewer"},
-            {"appletprops.label.http.server", "Servidor proxy Http:"},
-            {"appletprops.label.http.proxy", "Porta proxy Http:"},
-            {"appletprops.label.network", "Acesso de rede:"},
-            {"appletprops.choice.network.item.none", "Nenhum"},
-            {"appletprops.choice.network.item.applethost", "Host do Applet"},
-            {"appletprops.choice.network.item.unrestricted", "Irrestrito"},
-            {"appletprops.label.class", "Acesso \u00E0 classe:"},
-            {"appletprops.choice.class.item.restricted", "Restrito"},
-            {"appletprops.choice.class.item.unrestricted", "Irrestrito"},
-            {"appletprops.label.unsignedapplet", "Permitir applets n\u00E3o assinados:"},
-            {"appletprops.choice.unsignedapplet.no", "N\u00E3o"},
-            {"appletprops.choice.unsignedapplet.yes", "Sim"},
-            {"appletprops.button.apply", "Aplicar"},
-            {"appletprops.button.cancel", "Cancelar"},
-            {"appletprops.button.reset", "Redefinir"},
-            {"appletprops.apply.exception", "Falha ao salvar as propriedades: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Entrada Inv\u00E1lida"},
-            {"appletprops.label.invalidproxy", "A Porta Proxy deve ser um valor inteiro positivo."},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "Propriedades espec\u00EDficas do usu\u00E1rio do AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "Exce\u00E7\u00E3o de Seguran\u00E7a: carregador de classes"},
-            {"appletsecurityexception.checkaccess.thread", "Exce\u00E7\u00E3o de Seguran\u00E7a: thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "Exce\u00E7\u00E3o de Seguran\u00E7a: grupo de threads: {0}"},
-            {"appletsecurityexception.checkexit", "Exce\u00E7\u00E3o de Seguran\u00E7a: sa\u00EDda: {0}"},
-            {"appletsecurityexception.checkexec", "Exce\u00E7\u00E3o de Seguran\u00E7a: exec.: {0}"},
-            {"appletsecurityexception.checklink", "Exce\u00E7\u00E3o de Seguran\u00E7a: link: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "Exce\u00E7\u00E3o de Seguran\u00E7a: propriedades"},
-            {"appletsecurityexception.checkpropsaccess.key", "Exce\u00E7\u00E3o de Seguran\u00E7a: acesso \u00E0s propriedades {0}"},
-            {"appletsecurityexception.checkread.exception1", "Exce\u00E7\u00E3o de Seguran\u00E7a: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "Exce\u00E7\u00E3o de Seguran\u00E7a: file.read: {0}"},
-            {"appletsecurityexception.checkread", "Exce\u00E7\u00E3o de Seguran\u00E7a: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "Exce\u00E7\u00E3o de Seguran\u00E7a: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "Exce\u00E7\u00E3o de Seguran\u00E7a: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "Exce\u00E7\u00E3o de Seguran\u00E7a: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "Exce\u00E7\u00E3o de Seguran\u00E7a: fd.write"},
-            {"appletsecurityexception.checklisten", "Exce\u00E7\u00E3o de Seguran\u00E7a: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "Exce\u00E7\u00E3o de Seguran\u00E7a: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "Exce\u00E7\u00E3o de Seguran\u00E7a: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "Exce\u00E7\u00E3o de Seguran\u00E7a: N\u00E3o foi poss\u00EDvel estabelecer conex\u00E3o com {0} com a origem de {1}."},
-            {"appletsecurityexception.checkconnect.networkhost2", "Exce\u00E7\u00E3o de Seguran\u00E7a: N\u00E3o foi poss\u00EDvel resolver o IP para o host {0} ou para {1}. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "Exce\u00E7\u00E3o de Seguran\u00E7a: N\u00E3o foi poss\u00EDvel resolver o IP para o host {0}. Consulte a propriedade trustProxy."},
-            {"appletsecurityexception.checkconnect", "Exce\u00E7\u00E3o de Seguran\u00E7a: conectar: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "Exce\u00E7\u00E3o de Seguran\u00E7a: n\u00E3o \u00E9 poss\u00EDvel acessar o pacote: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "Exce\u00E7\u00E3o de Seguran\u00E7a: n\u00E3o \u00E9 poss\u00EDvel definir o pacote: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "Exce\u00E7\u00E3o de Seguran\u00E7a: n\u00E3o \u00E9 poss\u00EDvel definir o factory"},
-            {"appletsecurityexception.checkmemberaccess", "Exce\u00E7\u00E3o de Seguran\u00E7a: verificar acesso do membro"},
-            {"appletsecurityexception.checkgetprintjob", "Exce\u00E7\u00E3o de Seguran\u00E7a: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "Exce\u00E7\u00E3o de Seguran\u00E7a: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "Exce\u00E7\u00E3o de Seguran\u00E7a: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "Exce\u00E7\u00E3o de Seguran\u00E7a: opera\u00E7\u00E3o de seguran\u00E7a: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "tipo de carregador de classe desconhecido. n\u00E3o \u00E9 poss\u00EDvel verificar getContext"},
-            {"appletsecurityexception.checkread.unknown", "tipo de carregador de classe desconhecido. n\u00E3o \u00E9 poss\u00EDvel verificar a leitura {0}"},
-            {"appletsecurityexception.checkconnect.unknown", "tipo de carregador de classe desconhecido. n\u00E3o \u00E9 poss\u00EDvel verificar a conex\u00E3o"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
deleted file mode 100644
index f4b6eb38bd3..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_sv extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "St\u00E4ng"},
-            {"appletviewer.tool.title", "Applet Viewer: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "Starta om"},
-            {"appletviewer.menuitem.reload", "Ladda om"},
-            {"appletviewer.menuitem.stop", "Stopp"},
-            {"appletviewer.menuitem.save", "Spara..."},
-            {"appletviewer.menuitem.start", "Starta"},
-            {"appletviewer.menuitem.clone", "Klona..."},
-            {"appletviewer.menuitem.tag", "Tagg..."},
-            {"appletviewer.menuitem.info", "Information..."},
-            {"appletviewer.menuitem.edit", "Redigera"},
-            {"appletviewer.menuitem.encoding", "Teckenkodning"},
-            {"appletviewer.menuitem.print", "Skriv ut..."},
-            {"appletviewer.menuitem.props", "Egenskaper..."},
-            {"appletviewer.menuitem.close", "St\u00E4ng"},
-            {"appletviewer.menuitem.quit", "Avsluta"},
-            {"appletviewer.label.hello", "Hej..."},
-            {"appletviewer.status.start", "startar applet..."},
-            {"appletviewer.appletsave.filedialogtitle","Serialisera applet till fil"},
-            {"appletviewer.appletsave.err1", "serialiserar {0} till {1}"},
-            {"appletviewer.appletsave.err2", "i appletSave: {0}"},
-            {"appletviewer.applettag", "Tagg visas"},
-            {"appletviewer.applettag.textframe", "HTML-tagg f\u00F6r applet"},
-            {"appletviewer.appletinfo.applet", "-- ingen appletinformation --"},
-            {"appletviewer.appletinfo.param", "-- ingen parameterinformation --"},
-            {"appletviewer.appletinfo.textframe", "Appletinformation"},
-            {"appletviewer.appletprint.fail", "Kunde inte skriva ut."},
-            {"appletviewer.appletprint.finish", "Utskriften klar."},
-            {"appletviewer.appletprint.cancel", "Utskriften avbruten."},
-            {"appletviewer.appletencoding", "Teckenkodning: {0}"},
-            {"appletviewer.parse.warning.requiresname", "Varning: <param name=... value=...>-taggen kr\u00E4ver ett namnattribut."},
-            {"appletviewer.parse.warning.paramoutside", "Varning: <param>-taggen finns utanf\u00F6r <applet> ... </applet>."},
-            {"appletviewer.parse.warning.applet.requirescode", "Varning: <applet>-taggen kr\u00E4ver ett kodattribut."},
-            {"appletviewer.parse.warning.applet.requiresheight", "Varning: <applet>-taggen kr\u00E4ver ett h\u00F6jdattribut."},
-            {"appletviewer.parse.warning.applet.requireswidth", "Varning: <applet>-taggen kr\u00E4ver ett breddattribut."},
-            {"appletviewer.parse.warning.object.requirescode", "Varning: <object>-taggen kr\u00E4ver ett kodattribut."},
-            {"appletviewer.parse.warning.object.requiresheight", "Varning: <object>-taggen kr\u00E4ver ett h\u00F6jdattribut."},
-            {"appletviewer.parse.warning.object.requireswidth", "Varning: <object>-taggen kr\u00E4ver ett breddattribut."},
-            {"appletviewer.parse.warning.embed.requirescode", "Varning: <embed>-taggen kr\u00E4ver ett kodattribut."},
-            {"appletviewer.parse.warning.embed.requiresheight", "Varning: <embed>-taggen kr\u00E4ver ett h\u00F6jdattribut."},
-            {"appletviewer.parse.warning.embed.requireswidth", "Varning: <embed>-taggen kr\u00E4ver ett breddattribut."},
-            {"appletviewer.parse.warning.appnotLongersupported", "Varning: <app>-taggen st\u00F6ds inte l\u00E4ngre, anv\u00E4nd <applet> ist\u00E4llet:"},
-            {"appletviewer.deprecated", "Varning: Applet-API:t och AppletViewer \u00E4r inaktuella."},
-            {"appletviewer.usage", "Syntax: appletviewer <options> url(s)\n\nd\u00E4r <options> \u00E4r:\n  -encoding <encoding>    Ange teckenkodning som anv\u00E4nds av HTML-filer\n  -J<runtime flag>        \u00D6verf\u00F6r argument till java-tolken\n\nAlternativet -J \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande."},
-            {"appletviewer.main.err.unsupportedopt", "Alternativ som inte st\u00F6ds: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "Ok\u00E4nt argument: {0}"},
-            {"appletviewer.main.err.dupoption", "Duplicerat alternativ: {0}"},
-            {"appletviewer.main.err.inputfile", "Inga angivna indatafiler."},
-            {"appletviewer.main.err.badurl", "Felaktig URL: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "I/O-undantag vid l\u00E4sning: {0}"},
-            {"appletviewer.main.err.readablefile", "Kontrollera att {0} \u00E4r en fil som \u00E4r l\u00E4sbar."},
-            {"appletviewer.main.err.correcturl", "\u00C4r {0} den korrekta URL:en?"},
-            {"appletviewer.main.prop.store", "Anv\u00E4ndarspecifika egenskaper f\u00F6r AppletViewer"},
-            {"appletviewer.main.err.prop.cantread", "Kan inte l\u00E4sa egenskapsfilen: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "Kan inte spara egenskapsfilen: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "Varning! S\u00E4kerheten avaktiveras."},
-            {"appletviewer.main.debug.cantfinddebug", "Hittar inte fels\u00F6kningsprogrammet!"},
-            {"appletviewer.main.debug.cantfindmain", "Hittar inte huvudmetoden i fels\u00F6kningsprogrammet!"},
-            {"appletviewer.main.debug.exceptionindebug", "Undantag i fels\u00F6kningsprogrammet!"},
-            {"appletviewer.main.debug.cantaccess", "Det finns ingen \u00E5tkomst till fels\u00F6kningsprogrammet!"},
-            {"appletviewer.main.nosecmgr", "Varning: SecurityManager har inte installerats!"},
-            {"appletviewer.main.warning", "Varning: Inga appletar har startats. Kontrollera att indata inneh\u00E5ller <applet>-tagg."},
-            {"appletviewer.main.warn.prop.overwrite", "Varning: Skriver tillf\u00E4lligt \u00F6ver systemegenskap enligt beg\u00E4ran fr\u00E5n anv\u00E4ndare: nyckel: {0} tidigare v\u00E4rde: {1} nytt v\u00E4rde: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "Varning: Kan inte l\u00E4sa egenskapsfil f\u00F6r AppletViewer: {0} Standardv\u00E4rden anv\u00E4nds."},
-            {"appletioexception.loadclass.throw.interrupted", "klassladdning avbr\u00F6ts: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "klass inte laddad: {0}"},
-            {"appletclassloader.loadcode.verbose", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
-            {"appletclassloader.filenotfound", "Hittade inte fil vid s\u00F6kning efter: {0}"},
-            {"appletclassloader.fileformat", "Undantag av filformat vid laddning av: {0}"},
-            {"appletclassloader.fileioexception", "I/O-undantag vid laddning: {0}"},
-            {"appletclassloader.fileexception", "{0} undantag vid laddning: {1}"},
-            {"appletclassloader.filedeath", "{0} avslutad vid laddning: {1}"},
-            {"appletclassloader.fileerror", "{0} fel vid laddning: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource f\u00F6r namnet: {0}"},
-            {"appletclassloader.getresource.verbose.found", "Hittade resursen: {0} som systemresurs"},
-            {"appletclassloader.getresourceasstream.verbose", "Hittade resursen: {0} som systemresurs"},
-            {"appletpanel.runloader.err", "Antingen objekt- eller kodparameter!"},
-            {"appletpanel.runloader.exception", "undantag vid avserialisering {0}"},
-            {"appletpanel.destroyed", "Applet raderad."},
-            {"appletpanel.loaded", "Applet laddad."},
-            {"appletpanel.started", "Applet startad."},
-            {"appletpanel.inited", "Applet initierad."},
-            {"appletpanel.stopped", "Applet stoppad."},
-            {"appletpanel.disposed", "Applet kasserad."},
-            {"appletpanel.nocode", "APPLET-tagg saknar CODE-parameter."},
-            {"appletpanel.notfound", "load: hittade inte klassen {0}."},
-            {"appletpanel.nocreate", "load: {0} kan inte instansieras."},
-            {"appletpanel.noconstruct", "load: {0} \u00E4r inte allm\u00E4n eller saknar allm\u00E4n konstruktor."},
-            {"appletpanel.death", "avslutad"},
-            {"appletpanel.exception", "undantag: {0}."},
-            {"appletpanel.exception2", "undantag: {0}: {1}."},
-            {"appletpanel.error", "fel: {0}."},
-            {"appletpanel.error2", "fel {0}: {1}."},
-            {"appletpanel.notloaded", "Initiera: applet \u00E4r inte laddad."},
-            {"appletpanel.notinited", "Starta: applet \u00E4r inte initierad."},
-            {"appletpanel.notstarted", "Stoppa: applet har inte startats."},
-            {"appletpanel.notstopped", "Radera: applet har inte stoppats."},
-            {"appletpanel.notdestroyed", "Kassera: applet har inte raderats."},
-            {"appletpanel.notdisposed", "Ladda: applet har inte kasserats."},
-            {"appletpanel.bail", "Avbruten."},
-            {"appletpanel.filenotfound", "Hittade inte fil vid s\u00F6kning efter: {0}"},
-            {"appletpanel.fileformat", "Undantag av filformat vid laddning av: {0}"},
-            {"appletpanel.fileioexception", "I/O-undantag vid laddning: {0}"},
-            {"appletpanel.fileexception", "{0} undantag vid laddning: {1}"},
-            {"appletpanel.filedeath", "{0} avslutad vid laddning: {1}"},
-            {"appletpanel.fileerror", "{0} fel vid laddning: {1}"},
-            {"appletpanel.badattribute.exception", "HTML-tolkning: felaktigt v\u00E4rde f\u00F6r bredd-/h\u00F6jdattribut"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream kr\u00E4ver laddare med icke-null"},
-            {"appletprops.title", "AppletViewer-egenskaper"},
-            {"appletprops.label.http.server", "HTTP-proxyserver:"},
-            {"appletprops.label.http.proxy", "HTTP-proxyport:"},
-            {"appletprops.label.network", "N\u00E4tverks\u00E5tkomst:"},
-            {"appletprops.choice.network.item.none", "Ingen"},
-            {"appletprops.choice.network.item.applethost", "Appletv\u00E4rd"},
-            {"appletprops.choice.network.item.unrestricted", "Obegr\u00E4nsad"},
-            {"appletprops.label.class", "Klass\u00E5tkomst:"},
-            {"appletprops.choice.class.item.restricted", "Begr\u00E4nsad"},
-            {"appletprops.choice.class.item.unrestricted", "Obegr\u00E4nsad"},
-            {"appletprops.label.unsignedapplet", "Till\u00E5t osignerade appletar:"},
-            {"appletprops.choice.unsignedapplet.no", "Nej"},
-            {"appletprops.choice.unsignedapplet.yes", "Ja"},
-            {"appletprops.button.apply", "Anv\u00E4nd"},
-            {"appletprops.button.cancel", "Avbryt"},
-            {"appletprops.button.reset", "\u00C5terst\u00E4ll"},
-            {"appletprops.apply.exception", "Kunde inte spara egenskaper: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "Ogiltig post"},
-            {"appletprops.label.invalidproxy", "Proxyport m\u00E5ste vara ett positivt heltal."},
-            {"appletprops.button.ok", "OK"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "Anv\u00E4ndarspecifika egenskaper f\u00F6r AppletViewer"},
-            {"appletsecurityexception.checkcreateclassloader", "S\u00E4kerhetsundantag: klassladdare"},
-            {"appletsecurityexception.checkaccess.thread", "S\u00E4kerhetsundantag: tr\u00E5d"},
-            {"appletsecurityexception.checkaccess.threadgroup", "S\u00E4kerhetsundantag: tr\u00E5dgrupp: {0}"},
-            {"appletsecurityexception.checkexit", "S\u00E4kerhetsundantag: utg\u00E5ng: {0}"},
-            {"appletsecurityexception.checkexec", "S\u00E4kerhetsundantag: exec: {0}"},
-            {"appletsecurityexception.checklink", "S\u00E4kerhetsundantag: l\u00E4nk: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "S\u00E4kerhetsundantag: egenskaper"},
-            {"appletsecurityexception.checkpropsaccess.key", "S\u00E4kerhetsundantag: egenskaps\u00E5tkomst {0}"},
-            {"appletsecurityexception.checkread.exception1", "S\u00E4kerhetsundantag: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "S\u00E4kerhetsundantag: file.read: {0}"},
-            {"appletsecurityexception.checkread", "S\u00E4kerhetsundantag: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "S\u00E4kerhetsundantag: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "S\u00E4kerhetsundantag: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "S\u00E4kerhetsundantag: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "S\u00E4kerhetsundantag: fd.write"},
-            {"appletsecurityexception.checklisten", "S\u00E4kerhetsundantag: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "S\u00E4kerhetsundantag: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "S\u00E4kerhetsundantag: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "S\u00E4kerhetsundantag: Kunde inte ansluta till {0} med ursprung fr\u00E5n {1}."},
-            {"appletsecurityexception.checkconnect.networkhost2", "S\u00E4kerhetsundantag: Kunde inte matcha IP f\u00F6r v\u00E4rd {0} eller f\u00F6r {1}. "},
-            {"appletsecurityexception.checkconnect.networkhost3", "S\u00E4kerhetsundantag: Kunde inte matcha IP f\u00F6r v\u00E4rd {0}. Se egenskapen trustProxy."},
-            {"appletsecurityexception.checkconnect", "S\u00E4kerhetsundantag: connect: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "S\u00E4kerhetsundantag: ingen \u00E5tkomst till paket: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "S\u00E4kerhetsundantag: kan inte definiera paket: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "S\u00E4kerhetsundantag: kan inte ange fabrik"},
-            {"appletsecurityexception.checkmemberaccess", "S\u00E4kerhetsundantag: kontrollera medlems\u00E5tkomst"},
-            {"appletsecurityexception.checkgetprintjob", "S\u00E4kerhetsundantag: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "S\u00E4kerhetsundantag: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "S\u00E4kerhetsundantag: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "S\u00E4kerhetsundantag: s\u00E4kerhets\u00E5tg\u00E4rd: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "ok\u00E4nd typ av klassladdare. kan inte kontrollera getContext"},
-            {"appletsecurityexception.checkread.unknown", "ok\u00E4nd typ av klassladdare. kan inte kontrollera kontroll\u00E4sning {0}"},
-            {"appletsecurityexception.checkconnect.unknown", "ok\u00E4nd typ av klassladdare. kan inte kontrollera kontrollanslutning"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
deleted file mode 100644
index 392513f57dd..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_zh_CN extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "\u5173\u95ED"},
-            {"appletviewer.tool.title", "\u5C0F\u5E94\u7528\u7A0B\u5E8F\u67E5\u770B\u5668: {0}"},
-            {"appletviewer.menu.applet", "\u5C0F\u5E94\u7528\u7A0B\u5E8F"},
-            {"appletviewer.menuitem.restart", "\u91CD\u65B0\u542F\u52A8"},
-            {"appletviewer.menuitem.reload", "\u91CD\u65B0\u52A0\u8F7D"},
-            {"appletviewer.menuitem.stop", "\u505C\u6B62"},
-            {"appletviewer.menuitem.save", "\u4FDD\u5B58..."},
-            {"appletviewer.menuitem.start", "\u542F\u52A8"},
-            {"appletviewer.menuitem.clone", "\u514B\u9686..."},
-            {"appletviewer.menuitem.tag", "\u6807\u8BB0..."},
-            {"appletviewer.menuitem.info", "\u4FE1\u606F..."},
-            {"appletviewer.menuitem.edit", "\u7F16\u8F91"},
-            {"appletviewer.menuitem.encoding", "\u5B57\u7B26\u7F16\u7801"},
-            {"appletviewer.menuitem.print", "\u6253\u5370..."},
-            {"appletviewer.menuitem.props", "\u5C5E\u6027..."},
-            {"appletviewer.menuitem.close", "\u5173\u95ED"},
-            {"appletviewer.menuitem.quit", "\u9000\u51FA"},
-            {"appletviewer.label.hello", "\u60A8\u597D..."},
-            {"appletviewer.status.start", "\u6B63\u5728\u542F\u52A8\u5C0F\u5E94\u7528\u7A0B\u5E8F..."},
-            {"appletviewer.appletsave.filedialogtitle","\u5C06\u5C0F\u5E94\u7528\u7A0B\u5E8F\u5E8F\u5217\u5316\u4E3A\u6587\u4EF6"},
-            {"appletviewer.appletsave.err1", "\u5C06{0}\u5E8F\u5217\u5316\u4E3A{1}"},
-            {"appletviewer.appletsave.err2", "\u5728 appletSave \u4E2D: {0}"},
-            {"appletviewer.applettag", "\u663E\u793A\u7684\u6807\u8BB0"},
-            {"appletviewer.applettag.textframe", "\u5C0F\u5E94\u7528\u7A0B\u5E8F HTML \u6807\u8BB0"},
-            {"appletviewer.appletinfo.applet", "-- \u6CA1\u6709\u5C0F\u5E94\u7528\u7A0B\u5E8F\u4FE1\u606F --"},
-            {"appletviewer.appletinfo.param", "-- \u6CA1\u6709\u53C2\u6570\u4FE1\u606F --"},
-            {"appletviewer.appletinfo.textframe", "\u5C0F\u5E94\u7528\u7A0B\u5E8F\u4FE1\u606F"},
-            {"appletviewer.appletprint.fail", "\u6253\u5370\u5931\u8D25\u3002"},
-            {"appletviewer.appletprint.finish", "\u5DF2\u5B8C\u6210\u6253\u5370\u3002"},
-            {"appletviewer.appletprint.cancel", "\u6253\u5370\u5DF2\u53D6\u6D88\u3002"},
-            {"appletviewer.appletencoding", "\u5B57\u7B26\u7F16\u7801: {0}"},
-            {"appletviewer.parse.warning.requiresname", "\u8B66\u544A: <param name=... value=...> \u6807\u8BB0\u9700\u8981\u540D\u79F0\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.paramoutside", "\u8B66\u544A: <param> \u6807\u8BB0\u5728 <applet> ... </applet> \u5916\u90E8\u3002"},
-            {"appletviewer.parse.warning.applet.requirescode", "\u8B66\u544A: <applet> \u6807\u8BB0\u9700\u8981\u4EE3\u7801\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.applet.requiresheight", "\u8B66\u544A: <applet> \u6807\u8BB0\u9700\u8981\u9AD8\u5EA6\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.applet.requireswidth", "\u8B66\u544A: <applet> \u6807\u8BB0\u9700\u8981\u5BBD\u5EA6\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.object.requirescode", "\u8B66\u544A: <object> \u6807\u8BB0\u9700\u8981\u4EE3\u7801\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.object.requiresheight", "\u8B66\u544A: <object> \u6807\u8BB0\u9700\u8981\u9AD8\u5EA6\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.object.requireswidth", "\u8B66\u544A: <object> \u6807\u8BB0\u9700\u8981\u5BBD\u5EA6\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.embed.requirescode", "\u8B66\u544A: <embed> \u6807\u8BB0\u9700\u8981\u4EE3\u7801\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.embed.requiresheight", "\u8B66\u544A: <embed> \u6807\u8BB0\u9700\u8981\u9AD8\u5EA6\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.embed.requireswidth", "\u8B66\u544A: <embed> \u6807\u8BB0\u9700\u8981\u5BBD\u5EA6\u5C5E\u6027\u3002"},
-            {"appletviewer.parse.warning.appnotLongersupported", "\u8B66\u544A: \u4E0D\u518D\u652F\u6301 <app> \u6807\u8BB0, \u8BF7\u6539\u7528 <applet>:"},
-            {"appletviewer.deprecated", "\u8B66\u544A: \u5C0F\u5E94\u7528\u7A0B\u5E8F API \u548C AppletViewer \u5DF2\u8FC7\u65F6\u3002"},
-            {"appletviewer.usage", "\u7528\u6CD5: appletviewer <options> url(s)\n\n\u5176\u4E2D <options> \u5305\u62EC:\n  -encoding <encoding>    \u6307\u5B9A HTML \u6587\u4EF6\u4F7F\u7528\u7684\u5B57\u7B26\u7F16\u7801\n  -J<runtime flag>        \u5C06\u53C2\u6570\u4F20\u9012\u5230 java \u89E3\u91CA\u5668\n\n-J \u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879, \u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002"},
-            {"appletviewer.main.err.unsupportedopt", "\u4E0D\u652F\u6301\u7684\u9009\u9879: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "\u65E0\u6CD5\u8BC6\u522B\u7684\u53C2\u6570: {0}"},
-            {"appletviewer.main.err.dupoption", "\u91CD\u590D\u4F7F\u7528\u9009\u9879: {0}"},
-            {"appletviewer.main.err.inputfile", "\u672A\u6307\u5B9A\u8F93\u5165\u6587\u4EF6\u3002"},
-            {"appletviewer.main.err.badurl", "\u9519\u8BEF URL: {0} ({1})"},
-            {"appletviewer.main.err.io", "\u8BFB\u53D6{0}\u65F6\u51FA\u73B0 I/O \u5F02\u5E38\u9519\u8BEF"},
-            {"appletviewer.main.err.readablefile", "\u786E\u4FDD{0}\u662F\u6587\u4EF6\u4E14\u53EF\u8BFB\u3002"},
-            {"appletviewer.main.err.correcturl", "{0} \u662F\u5426\u662F\u6B63\u786E\u7684 URL?"},
-            {"appletviewer.main.prop.store", "AppletViewer \u7684\u7528\u6237\u7279\u5B9A\u5C5E\u6027"},
-            {"appletviewer.main.err.prop.cantread", "\u65E0\u6CD5\u8BFB\u53D6\u7528\u6237\u5C5E\u6027\u6587\u4EF6: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "\u65E0\u6CD5\u4FDD\u5B58\u7528\u6237\u5C5E\u6027\u6587\u4EF6: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "\u8B66\u544A: \u7981\u7528\u5B89\u5168\u3002"},
-            {"appletviewer.main.debug.cantfinddebug", "\u627E\u4E0D\u5230\u8C03\u8BD5\u5668!"},
-            {"appletviewer.main.debug.cantfindmain", "\u5728\u8C03\u8BD5\u5668\u4E2D\u627E\u4E0D\u5230 main \u65B9\u6CD5!"},
-            {"appletviewer.main.debug.exceptionindebug", "\u8C03\u8BD5\u5668\u4E2D\u5B58\u5728\u5F02\u5E38\u9519\u8BEF!"},
-            {"appletviewer.main.debug.cantaccess", "\u65E0\u6CD5\u8BBF\u95EE\u8C03\u8BD5\u5668!"},
-            {"appletviewer.main.nosecmgr", "\u8B66\u544A: \u672A\u5B89\u88C5 SecurityManager!"},
-            {"appletviewer.main.warning", "\u8B66\u544A: \u672A\u542F\u52A8\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002\u786E\u4FDD\u8F93\u5165\u5305\u542B <applet> \u6807\u8BB0\u3002"},
-            {"appletviewer.main.warn.prop.overwrite", "\u8B66\u544A: \u6839\u636E\u7528\u6237\u8BF7\u6C42\u4E34\u65F6\u8986\u76D6\u7CFB\u7EDF\u5C5E\u6027: \u5173\u952E\u5B57: {0}, \u65E7\u503C: {1}, \u65B0\u503C: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "\u8B66\u544A: \u65E0\u6CD5\u8BFB\u53D6 AppletViewer \u5C5E\u6027\u6587\u4EF6: {0}\u3002\u8BF7\u4F7F\u7528\u9ED8\u8BA4\u503C\u3002"},
-            {"appletioexception.loadclass.throw.interrupted", "\u7C7B\u52A0\u8F7D\u4E2D\u65AD: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "\u672A\u52A0\u8F7D\u7C7B: {0}"},
-            {"appletclassloader.loadcode.verbose", "\u6253\u5F00\u5230{0}\u7684\u6D41\u4EE5\u83B7\u53D6{1}"},
-            {"appletclassloader.filenotfound", "\u67E5\u627E\u65F6\u627E\u4E0D\u5230\u6587\u4EF6: {0}"},
-            {"appletclassloader.fileformat", "\u52A0\u8F7D\u65F6\u51FA\u73B0\u6587\u4EF6\u683C\u5F0F\u5F02\u5E38\u9519\u8BEF: {0}"},
-            {"appletclassloader.fileioexception", "\u52A0\u8F7D\u65F6\u51FA\u73B0 I/O \u5F02\u5E38\u9519\u8BEF: {0}"},
-            {"appletclassloader.fileexception", "\u52A0\u8F7D\u65F6\u51FA\u73B0{0}\u5F02\u5E38\u9519\u8BEF: {1}"},
-            {"appletclassloader.filedeath", "\u52A0\u8F7D\u65F6\u5DF2\u7EC8\u6B62{0}: {1}"},
-            {"appletclassloader.fileerror", "\u52A0\u8F7D\u65F6\u51FA\u73B0{0}\u9519\u8BEF: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "\u6253\u5F00\u5230{0}\u7684\u6D41\u4EE5\u83B7\u53D6{1}"},
-            {"appletclassloader.getresource.verbose.forname", "\u540D\u79F0\u7684 AppletClassLoader.getResource: {0}"},
-            {"appletclassloader.getresource.verbose.found", "\u5DF2\u627E\u5230\u4F5C\u4E3A\u7CFB\u7EDF\u8D44\u6E90\u7684\u8D44\u6E90{0}"},
-            {"appletclassloader.getresourceasstream.verbose", "\u5DF2\u627E\u5230\u4F5C\u4E3A\u7CFB\u7EDF\u8D44\u6E90\u7684\u8D44\u6E90{0}"},
-            {"appletpanel.runloader.err", "\u5BF9\u8C61\u6216\u4EE3\u7801\u53C2\u6570!"},
-            {"appletpanel.runloader.exception", "\u53CD\u5E8F\u5217\u5316{0}\u65F6\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF"},
-            {"appletpanel.destroyed", "\u5DF2\u9500\u6BC1\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.loaded", "\u5DF2\u52A0\u8F7D\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.started", "\u5DF2\u542F\u52A8\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.inited", "\u5DF2\u521D\u59CB\u5316\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.stopped", "\u5DF2\u505C\u6B62\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.disposed", "\u5DF2\u5904\u7406\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.nocode", "APPLET \u6807\u8BB0\u7F3A\u5C11 CODE \u53C2\u6570\u3002"},
-            {"appletpanel.notfound", "\u52A0\u8F7D: \u627E\u4E0D\u5230\u7C7B{0}\u3002"},
-            {"appletpanel.nocreate", "\u52A0\u8F7D: \u65E0\u6CD5\u5B9E\u4F8B\u5316{0}\u3002"},
-            {"appletpanel.noconstruct", "\u52A0\u8F7D: {0}\u4E0D\u662F\u516C\u5171\u7684, \u6216\u8005\u6CA1\u6709\u516C\u5171\u6784\u9020\u5668\u3002"},
-            {"appletpanel.death", "\u5DF2\u7EC8\u6B62"},
-            {"appletpanel.exception", "\u5F02\u5E38\u9519\u8BEF: {0}\u3002"},
-            {"appletpanel.exception2", "\u5F02\u5E38\u9519\u8BEF: {0}: {1}\u3002"},
-            {"appletpanel.error", "\u9519\u8BEF: {0}\u3002"},
-            {"appletpanel.error2", "\u9519\u8BEF: {0}: {1}\u3002"},
-            {"appletpanel.notloaded", "\u521D\u59CB\u5316: \u672A\u52A0\u8F7D\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.notinited", "\u542F\u52A8: \u672A\u521D\u59CB\u5316\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.notstarted", "\u505C\u6B62: \u672A\u542F\u52A8\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.notstopped", "\u9500\u6BC1: \u672A\u505C\u6B62\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.notdestroyed", "\u5904\u7406: \u672A\u9500\u6BC1\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.notdisposed", "\u52A0\u8F7D: \u672A\u5904\u7406\u5C0F\u5E94\u7528\u7A0B\u5E8F\u3002"},
-            {"appletpanel.bail", "\u5DF2\u4E2D\u65AD: \u79BB\u5F00\u3002"},
-            {"appletpanel.filenotfound", "\u67E5\u627E\u65F6\u627E\u4E0D\u5230\u6587\u4EF6: {0}"},
-            {"appletpanel.fileformat", "\u52A0\u8F7D\u65F6\u51FA\u73B0\u6587\u4EF6\u683C\u5F0F\u5F02\u5E38\u9519\u8BEF: {0}"},
-            {"appletpanel.fileioexception", "\u52A0\u8F7D\u65F6\u51FA\u73B0 I/O \u5F02\u5E38\u9519\u8BEF: {0}"},
-            {"appletpanel.fileexception", "\u52A0\u8F7D\u65F6\u51FA\u73B0{0}\u5F02\u5E38\u9519\u8BEF: {1}"},
-            {"appletpanel.filedeath", "\u52A0\u8F7D\u65F6\u5DF2\u7EC8\u6B62{0}: {1}"},
-            {"appletpanel.fileerror", "\u52A0\u8F7D\u65F6\u51FA\u73B0{0}\u9519\u8BEF: {1}"},
-            {"appletpanel.badattribute.exception", "HTML \u89E3\u6790: \u5BBD\u5EA6/\u9AD8\u5EA6\u5C5E\u6027\u7684\u503C\u4E0D\u6B63\u786E"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream \u9700\u8981\u975E\u7A7A\u52A0\u8F7D\u5668"},
-            {"appletprops.title", "AppletViewer \u5C5E\u6027"},
-            {"appletprops.label.http.server", "Http \u4EE3\u7406\u670D\u52A1\u5668:"},
-            {"appletprops.label.http.proxy", "Http \u4EE3\u7406\u7AEF\u53E3:"},
-            {"appletprops.label.network", "\u7F51\u7EDC\u8BBF\u95EE\u6743\u9650:"},
-            {"appletprops.choice.network.item.none", "\u65E0"},
-            {"appletprops.choice.network.item.applethost", "\u5C0F\u5E94\u7528\u7A0B\u5E8F\u4E3B\u673A"},
-            {"appletprops.choice.network.item.unrestricted", "\u4E0D\u53D7\u9650\u5236"},
-            {"appletprops.label.class", "\u7C7B\u8BBF\u95EE\u6743\u9650:"},
-            {"appletprops.choice.class.item.restricted", "\u53D7\u9650\u5236"},
-            {"appletprops.choice.class.item.unrestricted", "\u4E0D\u53D7\u9650\u5236"},
-            {"appletprops.label.unsignedapplet", "\u5141\u8BB8\u672A\u7B7E\u540D\u5C0F\u5E94\u7528\u7A0B\u5E8F:"},
-            {"appletprops.choice.unsignedapplet.no", "\u5426"},
-            {"appletprops.choice.unsignedapplet.yes", "\u662F"},
-            {"appletprops.button.apply", "\u5E94\u7528"},
-            {"appletprops.button.cancel", "\u53D6\u6D88"},
-            {"appletprops.button.reset", "\u91CD\u7F6E"},
-            {"appletprops.apply.exception", "\u65E0\u6CD5\u4FDD\u5B58\u5C5E\u6027: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "\u6761\u76EE\u65E0\u6548"},
-            {"appletprops.label.invalidproxy", "\u4EE3\u7406\u7AEF\u53E3\u5FC5\u987B\u662F\u4E00\u4E2A\u6B63\u6574\u6570\u503C\u3002"},
-            {"appletprops.button.ok", "\u786E\u5B9A"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "AppletViewer \u7684\u7528\u6237\u7279\u5B9A\u5C5E\u6027"},
-            {"appletsecurityexception.checkcreateclassloader", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u7C7B\u52A0\u8F7D\u5668"},
-            {"appletsecurityexception.checkaccess.thread", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u7EBF\u7A0B"},
-            {"appletsecurityexception.checkaccess.threadgroup", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u7EBF\u7A0B\u7EC4: {0}"},
-            {"appletsecurityexception.checkexit", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u9000\u51FA: {0}"},
-            {"appletsecurityexception.checkexec", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u6267\u884C: {0}"},
-            {"appletsecurityexception.checklink", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u94FE\u63A5: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u5C5E\u6027"},
-            {"appletsecurityexception.checkpropsaccess.key", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u5C5E\u6027\u8BBF\u95EE{0}"},
-            {"appletsecurityexception.checkread.exception1", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: {0}, {1}"},
-            {"appletsecurityexception.checkread.exception2", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: file.read: {0}"},
-            {"appletsecurityexception.checkread", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: {0}, {1}"},
-            {"appletsecurityexception.checkwrite", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: fd.write"},
-            {"appletsecurityexception.checklisten", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u65E0\u6CD5\u8FDE\u63A5\u5230\u6E90\u81EA{1}\u7684{0}\u3002"},
-            {"appletsecurityexception.checkconnect.networkhost2", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u65E0\u6CD5\u89E3\u6790\u4E3B\u673A{0}\u6216{1}\u7684 IP\u3002"},
-            {"appletsecurityexception.checkconnect.networkhost3", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u65E0\u6CD5\u89E3\u6790\u4E3B\u673A{0}\u7684 IP\u3002\u8BF7\u53C2\u9605 trustProxy \u5C5E\u6027\u3002"},
-            {"appletsecurityexception.checkconnect", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u8FDE\u63A5: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u65E0\u6CD5\u8BBF\u95EE\u7A0B\u5E8F\u5305: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u65E0\u6CD5\u5B9A\u4E49\u7A0B\u5E8F\u5305: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u65E0\u6CD5\u8BBE\u7F6E\u5DE5\u5382"},
-            {"appletsecurityexception.checkmemberaccess", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u68C0\u67E5\u6210\u5458\u8BBF\u95EE\u6743\u9650"},
-            {"appletsecurityexception.checkgetprintjob", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "\u5B89\u5168\u5F02\u5E38\u9519\u8BEF: \u5B89\u5168\u64CD\u4F5C: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "\u7C7B\u52A0\u8F7D\u5668\u7C7B\u578B\u672A\u77E5\u3002\u65E0\u6CD5\u68C0\u67E5 getContext"},
-            {"appletsecurityexception.checkread.unknown", "\u7C7B\u52A0\u8F7D\u5668\u7C7B\u578B\u672A\u77E5\u3002\u65E0\u6CD5\u4E3A\u68C0\u67E5\u8BFB\u53D6\u6743\u9650{0}\u800C\u8FDB\u884C\u68C0\u67E5"},
-            {"appletsecurityexception.checkconnect.unknown", "\u7C7B\u52A0\u8F7D\u5668\u7C7B\u578B\u672A\u77E5\u3002\u65E0\u6CD5\u4E3A\u68C0\u67E5\u8FDE\u63A5\u800C\u8FDB\u884C\u68C0\u67E5"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
deleted file mode 100644
index d52195c2168..00000000000
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1996, 2016, 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 sun.applet.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgAppletViewer_zh_TW extends ListResourceBundle {
-
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-            {"textframe.button.dismiss", "\u95DC\u9589"},
-            {"appletviewer.tool.title", "Applet \u6AA2\u8996\u5668: {0}"},
-            {"appletviewer.menu.applet", "Applet"},
-            {"appletviewer.menuitem.restart", "\u91CD\u65B0\u555F\u52D5"},
-            {"appletviewer.menuitem.reload", "\u91CD\u65B0\u8F09\u5165"},
-            {"appletviewer.menuitem.stop", "\u505C\u6B62"},
-            {"appletviewer.menuitem.save", "\u5132\u5B58..."},
-            {"appletviewer.menuitem.start", "\u555F\u52D5"},
-            {"appletviewer.menuitem.clone", "\u8907\u88FD..."},
-            {"appletviewer.menuitem.tag", "\u6A19\u8A18..."},
-            {"appletviewer.menuitem.info", "\u8CC7\u8A0A..."},
-            {"appletviewer.menuitem.edit", "\u7DE8\u8F2F"},
-            {"appletviewer.menuitem.encoding", "\u5B57\u5143\u7DE8\u78BC"},
-            {"appletviewer.menuitem.print", "\u5217\u5370..."},
-            {"appletviewer.menuitem.props", "\u5C6C\u6027..."},
-            {"appletviewer.menuitem.close", "\u95DC\u9589"},
-            {"appletviewer.menuitem.quit", "\u7D50\u675F"},
-            {"appletviewer.label.hello", "\u60A8\u597D..."},
-            {"appletviewer.status.start", "\u6B63\u5728\u555F\u52D5 Applet..."},
-            {"appletviewer.appletsave.filedialogtitle","\u5C07 Applet \u5E8F\u5217\u5316\u70BA\u6A94\u6848"},
-            {"appletviewer.appletsave.err1", "\u5C07 {0} \u5E8F\u5217\u5316\u70BA {1}"},
-            {"appletviewer.appletsave.err2", "\u5728 appletSave \u4E2D: {0}"},
-            {"appletviewer.applettag", "\u986F\u793A\u7684\u6A19\u8A18"},
-            {"appletviewer.applettag.textframe", "Applet HTML \u6A19\u8A18"},
-            {"appletviewer.appletinfo.applet", "-- \u7121 Applet \u8CC7\u8A0A --"},
-            {"appletviewer.appletinfo.param", "-- \u7121\u53C3\u6578\u8CC7\u8A0A --"},
-            {"appletviewer.appletinfo.textframe", "Applet \u8CC7\u8A0A"},
-            {"appletviewer.appletprint.fail", "\u5217\u5370\u5931\u6557\u3002"},
-            {"appletviewer.appletprint.finish", "\u5B8C\u6210\u5217\u5370\u3002"},
-            {"appletviewer.appletprint.cancel", "\u5217\u5370\u53D6\u6D88\u3002"},
-            {"appletviewer.appletencoding", "\u5B57\u5143\u7DE8\u78BC: {0}"},
-            {"appletviewer.parse.warning.requiresname", "\u8B66\u544A: <\u53C3\u6578\u540D\u7A31=... \u503C=...> \u6A19\u8A18\u9700\u8981\u540D\u7A31\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.paramoutside", "\u8B66\u544A: <param> \u6A19\u8A18\u5728 <applet> ... </applet> \u4E4B\u5916\u3002"},
-            {"appletviewer.parse.warning.applet.requirescode", "\u8B66\u544A: <applet> \u6A19\u8A18\u9700\u8981\u4EE3\u78BC\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.applet.requiresheight", "\u8B66\u544A: <applet> \u6A19\u8A18\u9700\u8981\u9AD8\u5EA6\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.applet.requireswidth", "\u8B66\u544A: <applet> \u6A19\u8A18\u9700\u8981\u5BEC\u5EA6\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.object.requirescode", "\u8B66\u544A: <object> \u6A19\u8A18\u9700\u8981\u4EE3\u78BC\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.object.requiresheight", "\u8B66\u544A: <object> \u6A19\u8A18\u9700\u8981\u9AD8\u5EA6\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.object.requireswidth", "\u8B66\u544A: <object> \u6A19\u8A18\u9700\u8981\u5BEC\u5EA6\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.embed.requirescode", "\u8B66\u544A: <embed> \u6A19\u8A18\u9700\u8981\u4EE3\u78BC\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.embed.requiresheight", "\u8B66\u544A: <embed> \u6A19\u8A18\u9700\u8981\u9AD8\u5EA6\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.embed.requireswidth", "\u8B66\u544A: <embed> \u6A19\u8A18\u9700\u8981\u5BEC\u5EA6\u5C6C\u6027\u3002"},
-            {"appletviewer.parse.warning.appnotLongersupported", "\u8B66\u544A: \u4E0D\u518D\u652F\u63F4 <app> \u6A19\u8A18\uFF0C\u8ACB\u6539\u7528 <applet>:"},
-            {"appletviewer.deprecated", "\u8B66\u544A: \u5DF2\u4E0D\u518D\u4F7F\u7528 Applet API \u548C AppletViewer\u3002"},
-            {"appletviewer.usage", "\u7528\u6CD5: appletviewer <options> url(s)\n\n\u5176\u4E2D\u7684 <options> \u5305\u62EC:\n  -encoding <encoding>    \u6307\u5B9A HTML \u6A94\u6848\u4F7F\u7528\u7684\u5B57\u5143\u7DE8\u78BC\n  -J<runtime flag>        \u5C07\u5F15\u6578\u50B3\u9001\u81F3 Java \u89E3\u8B6F\u5668\n\n-J \u9078\u9805\u4E0D\u662F\u6A19\u6E96\u9078\u9805\uFF0C\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002"},
-            {"appletviewer.main.err.unsupportedopt", "\u4E0D\u652F\u63F4\u7684\u9078\u9805: {0}"},
-            {"appletviewer.main.err.unrecognizedarg", "\u7121\u6CD5\u8FA8\u8B58\u7684\u5F15\u6578: {0}"},
-            {"appletviewer.main.err.dupoption", "\u91CD\u8907\u4F7F\u7528\u9078\u9805: {0}"},
-            {"appletviewer.main.err.inputfile", "\u672A\u6307\u5B9A\u8F38\u5165\u6A94\u6848\u3002"},
-            {"appletviewer.main.err.badurl", "\u932F\u8AA4\u7684 URL: {0} ( {1} )"},
-            {"appletviewer.main.err.io", "\u8B80\u53D6\u6642\u767C\u751F I/O \u7570\u5E38\u72C0\u6CC1: {0}"},
-            {"appletviewer.main.err.readablefile", "\u78BA\u8A8D {0} \u70BA\u6A94\u6848\u4E14\u53EF\u8B80\u53D6\u3002"},
-            {"appletviewer.main.err.correcturl", "{0} \u662F\u5426\u70BA\u6B63\u78BA\u7684 URL\uFF1F"},
-            {"appletviewer.main.prop.store", "AppletViewer \u7684\u4F7F\u7528\u8005\u7279\u5B9A\u5C6C\u6027"},
-            {"appletviewer.main.err.prop.cantread", "\u7121\u6CD5\u8B80\u53D6\u4F7F\u7528\u8005\u5C6C\u6027\u6A94\u6848: {0}"},
-            {"appletviewer.main.err.prop.cantsave", "\u7121\u6CD5\u5132\u5B58\u4F7F\u7528\u8005\u5C6C\u6027\u6A94\u6848: {0}"},
-            {"appletviewer.main.warn.nosecmgr", "\u8B66\u544A: \u505C\u7528\u5B89\u5168\u529F\u80FD\u3002"},
-            {"appletviewer.main.debug.cantfinddebug", "\u627E\u4E0D\u5230\u9664\u932F\u7A0B\u5F0F\uFF01"},
-            {"appletviewer.main.debug.cantfindmain", "\u5728\u9664\u932F\u7A0B\u5F0F\u4E2D\u627E\u4E0D\u5230\u4E3B\u8981\u65B9\u6CD5\uFF01"},
-            {"appletviewer.main.debug.exceptionindebug", "\u9664\u932F\u7A0B\u5F0F\u767C\u751F\u7570\u5E38\u72C0\u6CC1\uFF01"},
-            {"appletviewer.main.debug.cantaccess", "\u7121\u6CD5\u5B58\u53D6\u9664\u932F\u7A0B\u5F0F\uFF01"},
-            {"appletviewer.main.nosecmgr", "\u8B66\u544A: \u672A\u5B89\u88DD SecurityManager\uFF01"},
-            {"appletviewer.main.warning", "\u8B66\u544A: \u672A\u555F\u52D5 Applet\u3002\u8ACB\u78BA\u8A8D\u8F38\u5165\u5305\u542B <applet> \u6A19\u8A18\u3002"},
-            {"appletviewer.main.warn.prop.overwrite", "\u8B66\u544A: \u4F9D\u7167\u4F7F\u7528\u8005\u8981\u6C42\uFF0C\u66AB\u6642\u8986\u5BEB\u7CFB\u7D71\u5C6C\u6027: \u7D22\u5F15\u9375: {0} \u820A\u503C: {1} \u65B0\u503C: {2}"},
-            {"appletviewer.main.warn.cantreadprops", "\u8B66\u544A: \u7121\u6CD5\u8B80\u53D6 AppletViewer \u5C6C\u6027\u6A94\u6848: {0} \u4F7F\u7528\u9810\u8A2D\u503C\u3002"},
-            {"appletioexception.loadclass.throw.interrupted", "\u985E\u5225\u8F09\u5165\u4E2D\u65B7: {0}"},
-            {"appletioexception.loadclass.throw.notloaded", "\u672A\u8F09\u5165\u985E\u5225: {0}"},
-            {"appletclassloader.loadcode.verbose", "\u958B\u555F {0} \u7684\u4E32\u6D41\u4EE5\u53D6\u5F97 {1}"},
-            {"appletclassloader.filenotfound", "\u5C0B\u627E {0} \u6642\u627E\u4E0D\u5230\u6A94\u6848"},
-            {"appletclassloader.fileformat", "\u8F09\u5165\u6642\u767C\u751F\u6A94\u6848\u683C\u5F0F\u7570\u5E38\u72C0\u6CC1: {0}"},
-            {"appletclassloader.fileioexception", "\u8F09\u5165\u6642\u767C\u751F I/O \u7570\u5E38\u72C0\u6CC1: {0}"},
-            {"appletclassloader.fileexception", "\u8F09\u5165\u6642\u767C\u751F {0} \u7570\u5E38\u72C0\u6CC1: {1}"},
-            {"appletclassloader.filedeath", "\u8F09\u5165\u6642\u522A\u9664 {0}: {1}"},
-            {"appletclassloader.fileerror", "\u8F09\u5165\u6642\u767C\u751F {0} \u932F\u8AA4: {1}"},
-            {"appletclassloader.findclass.verbose.openstream", "\u958B\u555F {0} \u7684\u4E32\u6D41\u4EE5\u53D6\u5F97 {1}"},
-            {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource \u7684\u540D\u7A31: {0}"},
-            {"appletclassloader.getresource.verbose.found", "\u627E\u5230\u8CC7\u6E90: {0} \u4F5C\u70BA\u7CFB\u7D71\u8CC7\u6E90"},
-            {"appletclassloader.getresourceasstream.verbose", "\u627E\u5230\u8CC7\u6E90: {0} \u4F5C\u70BA\u7CFB\u7D71\u8CC7\u6E90"},
-            {"appletpanel.runloader.err", "\u7269\u4EF6\u6216\u4EE3\u78BC\u53C3\u6578\uFF01"},
-            {"appletpanel.runloader.exception", "\u9084\u539F\u5E8F\u5217\u5316 {0} \u6642\u767C\u751F\u7570\u5E38\u72C0\u6CC1"},
-            {"appletpanel.destroyed", "\u5DF2\u640D\u6BC0 Applet\u3002"},
-            {"appletpanel.loaded", "\u5DF2\u8F09\u5165 Applet\u3002"},
-            {"appletpanel.started", "\u5DF2\u555F\u7528 Applet\u3002"},
-            {"appletpanel.inited", "\u5DF2\u8D77\u59CB Applet\u3002"},
-            {"appletpanel.stopped", "\u5DF2\u505C\u6B62 Applet\u3002"},
-            {"appletpanel.disposed", "\u5DF2\u8655\u7F6E Applet\u3002"},
-            {"appletpanel.nocode", "APPLET \u6A19\u8A18\u907A\u6F0F CODE \u53C3\u6578\u3002"},
-            {"appletpanel.notfound", "\u8F09\u5165: \u627E\u4E0D\u5230\u985E\u5225 {0}\u3002"},
-            {"appletpanel.nocreate", "\u8F09\u5165: \u7121\u6CD5\u5EFA\u7ACB {0}\u3002"},
-            {"appletpanel.noconstruct", "\u8F09\u5165: {0} \u975E\u516C\u7528\u6216\u6C92\u6709\u516C\u7528\u5EFA\u69CB\u5B50\u3002"},
-            {"appletpanel.death", "\u5DF2\u522A\u9664"},
-            {"appletpanel.exception", "\u7570\u5E38\u72C0\u6CC1: {0}\u3002"},
-            {"appletpanel.exception2", "\u7570\u5E38\u72C0\u6CC1: {0}: {1}\u3002"},
-            {"appletpanel.error", "\u932F\u8AA4: {0}\u3002"},
-            {"appletpanel.error2", "\u932F\u8AA4: {0}: {1}\u3002"},
-            {"appletpanel.notloaded", "\u8D77\u59CB: \u672A\u8F09\u5165 Applet\u3002"},
-            {"appletpanel.notinited", "\u555F\u52D5: \u672A\u8D77\u59CB Applet\u3002"},
-            {"appletpanel.notstarted", "\u505C\u6B62: \u672A\u555F\u52D5 Applet\u3002"},
-            {"appletpanel.notstopped", "\u640D\u6BC0: \u672A\u505C\u6B62 Applet\u3002"},
-            {"appletpanel.notdestroyed", "\u8655\u7F6E: \u672A\u640D\u6BC0 Applet\u3002"},
-            {"appletpanel.notdisposed", "\u8F09\u5165: \u672A\u8655\u7F6E Applet\u3002"},
-            {"appletpanel.bail", "\u5DF2\u4E2D\u65B7: \u6B63\u5728\u7D50\u675F\u3002"},
-            {"appletpanel.filenotfound", "\u5C0B\u627E {0} \u6642\u627E\u4E0D\u5230\u6A94\u6848"},
-            {"appletpanel.fileformat", "\u8F09\u5165\u6642\u767C\u751F\u6A94\u6848\u683C\u5F0F\u7570\u5E38\u72C0\u6CC1: {0}"},
-            {"appletpanel.fileioexception", "\u8F09\u5165\u6642\u767C\u751F I/O \u7570\u5E38\u72C0\u6CC1: {0}"},
-            {"appletpanel.fileexception", "\u8F09\u5165\u6642\u767C\u751F {0} \u7570\u5E38\u72C0\u6CC1: {1}"},
-            {"appletpanel.filedeath", "\u8F09\u5165\u6642\u522A\u9664 {0}: {1}"},
-            {"appletpanel.fileerror", "\u8F09\u5165\u6642\u767C\u751F {0} \u932F\u8AA4: {1}"},
-            {"appletpanel.badattribute.exception", "HTML \u5256\u6790: \u5BEC\u5EA6/\u9AD8\u5EA6\u5C6C\u6027\u7684\u503C\u4E0D\u6B63\u78BA"},
-            {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream \u9700\u8981\u975E\u7A7A\u503C\u8F09\u5165\u5668"},
-            {"appletprops.title", "AppletViewer \u5C6C\u6027"},
-            {"appletprops.label.http.server", "Http \u4EE3\u7406\u4E3B\u6A5F\u4F3A\u670D\u5668:"},
-            {"appletprops.label.http.proxy", "Http \u4EE3\u7406\u4E3B\u6A5F\u9023\u63A5\u57E0:"},
-            {"appletprops.label.network", "\u7DB2\u8DEF\u5B58\u53D6:"},
-            {"appletprops.choice.network.item.none", "\u7121"},
-            {"appletprops.choice.network.item.applethost", "Applet \u4E3B\u6A5F"},
-            {"appletprops.choice.network.item.unrestricted", "\u4E0D\u53D7\u9650\u5236"},
-            {"appletprops.label.class", "\u985E\u5225\u5B58\u53D6:"},
-            {"appletprops.choice.class.item.restricted", "\u53D7\u9650\u5236"},
-            {"appletprops.choice.class.item.unrestricted", "\u4E0D\u53D7\u9650\u5236"},
-            {"appletprops.label.unsignedapplet", "\u5141\u8A31\u672A\u7C3D\u7F72\u7684 Applet:"},
-            {"appletprops.choice.unsignedapplet.no", "\u5426"},
-            {"appletprops.choice.unsignedapplet.yes", "\u662F"},
-            {"appletprops.button.apply", "\u5957\u7528"},
-            {"appletprops.button.cancel", "\u53D6\u6D88"},
-            {"appletprops.button.reset", "\u91CD\u8A2D"},
-            {"appletprops.apply.exception", "\u7121\u6CD5\u5132\u5B58\u5C6C\u6027: {0}"},
-            /* 4066432 */
-            {"appletprops.title.invalidproxy", "\u7121\u6548\u7684\u9805\u76EE"},
-            {"appletprops.label.invalidproxy", "\u4EE3\u7406\u4E3B\u6A5F\u9023\u63A5\u57E0\u5FC5\u9808\u662F\u6B63\u6574\u6578\u503C\u3002"},
-            {"appletprops.button.ok", "\u78BA\u5B9A"},
-            /* end 4066432 */
-            {"appletprops.prop.store", "AppletViewer \u7684\u4F7F\u7528\u8005\u7279\u5B9A\u5C6C\u6027"},
-            {"appletsecurityexception.checkcreateclassloader", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: classloader"},
-            {"appletsecurityexception.checkaccess.thread", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: thread"},
-            {"appletsecurityexception.checkaccess.threadgroup", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: threadgroup: {0}"},
-            {"appletsecurityexception.checkexit", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: exit: {0}"},
-            {"appletsecurityexception.checkexec", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: exec: {0}"},
-            {"appletsecurityexception.checklink", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: link: {0}"},
-            {"appletsecurityexception.checkpropsaccess", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u5C6C\u6027"},
-            {"appletsecurityexception.checkpropsaccess.key", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u5C6C\u6027\u5B58\u53D6 {0}"},
-            {"appletsecurityexception.checkread.exception1", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: {0}\uFF0C{1}"},
-            {"appletsecurityexception.checkread.exception2", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: file.read: {0}"},
-            {"appletsecurityexception.checkread", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: file.read: {0} == {1}"},
-            {"appletsecurityexception.checkwrite.exception", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: {0}\uFF0C{1}"},
-            {"appletsecurityexception.checkwrite", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: file.write: {0} == {1}"},
-            {"appletsecurityexception.checkread.fd", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: fd.read"},
-            {"appletsecurityexception.checkwrite.fd", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: fd.write"},
-            {"appletsecurityexception.checklisten", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: socket.listen: {0}"},
-            {"appletsecurityexception.checkaccept", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: socket.accept: {0}:{1}"},
-            {"appletsecurityexception.checkconnect.networknone", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: socket.connect: {0}->{1}"},
-            {"appletsecurityexception.checkconnect.networkhost1", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u7121\u6CD5\u5F9E\u4F86\u6E90 {1} \u9023\u7DDA\u81F3 {0}\u3002"},
-            {"appletsecurityexception.checkconnect.networkhost2", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u7121\u6CD5\u89E3\u6790\u4E3B\u6A5F {0} \u6216 {1} \u7684 IP\u3002"},
-            {"appletsecurityexception.checkconnect.networkhost3", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u7121\u6CD5\u89E3\u6790\u4E3B\u6A5F {0} \u7684 IP\u3002\u8ACB\u53C3\u95B1 trustProxy \u5C6C\u6027\u3002"},
-            {"appletsecurityexception.checkconnect", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: connect: {0}->{1}"},
-            {"appletsecurityexception.checkpackageaccess", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u7121\u6CD5\u5B58\u53D6\u5957\u88DD\u7A0B\u5F0F: {0}"},
-            {"appletsecurityexception.checkpackagedefinition", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u7121\u6CD5\u5B9A\u7FA9\u5957\u88DD\u7A0B\u5F0F: {0}"},
-            {"appletsecurityexception.cannotsetfactory", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u7121\u6CD5\u8A2D\u5B9A\u8655\u7406\u7AD9"},
-            {"appletsecurityexception.checkmemberaccess", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u6AA2\u67E5\u6210\u54E1\u5B58\u53D6"},
-            {"appletsecurityexception.checkgetprintjob", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: getEventQueue"},
-            {"appletsecurityexception.checksecurityaccess", "\u5B89\u5168\u7570\u5E38\u72C0\u6CC1: \u5B89\u5168\u4F5C\u696D: {0}"},
-            {"appletsecurityexception.getsecuritycontext.unknown", "\u4E0D\u660E\u7684\u985E\u5225\u8F09\u5165\u5668\u985E\u578B\u3002\u7121\u6CD5\u6AA2\u67E5 getContext"},
-            {"appletsecurityexception.checkread.unknown", "\u4E0D\u660E\u7684\u985E\u5225\u8F09\u5165\u5668\u985E\u578B\u3002\u7121\u6CD5\u6AA2\u67E5 read {0}"},
-            {"appletsecurityexception.checkconnect.unknown", "\u4E0D\u660E\u7684\u985E\u5225\u8F09\u5165\u5668\u985E\u578B\u3002\u7121\u6CD5\u6AA2\u67E5\u9023\u7DDA"},
-        };
-
-        return temp;
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
index 68deeb3aeaf..b623058ac79 100644
--- a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
+++ b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
@@ -1016,8 +1016,6 @@ public abstract class FontConfiguration {
     /**
      * Returns an array of composite font descriptors for all logical font
      * faces.
-     * If the font configuration file doesn't specify Lucida Sans Regular
-     * or the given fallback font as component fonts, they are added here.
      */
     public CompositeFontDescriptor[] get2DCompositeFontInfo() {
         CompositeFontDescriptor[] result =
@@ -1053,7 +1051,6 @@ public abstract class FontConfiguration {
             // other info is per style
             for (int styleIndex = 0; styleIndex < NUM_STYLES; styleIndex++) {
                 int maxComponentFontCount = compFontNameIDs[fontIndex][styleIndex].length;
-                boolean sawDefaultFontFile = false;
                 // fall back fonts listed in the lib/fonts/fallback directory
                 if (installedFallbackFontFiles != null) {
                     maxComponentFontCount += installedFallbackFontFiles.length;
@@ -1074,35 +1071,12 @@ public abstract class FontConfiguration {
                         needToSearchForFile(componentFileNames[index])) {
                         componentFileNames[index] = getFileNameFromComponentFontName(getComponentFontName(fontNameID));
                     }
-                    if (!sawDefaultFontFile &&
-                        defaultFontFile.equals(componentFileNames[index])) {
-                        sawDefaultFontFile = true;
-                    }
                     /*
                     System.out.println(publicFontNames[fontIndex] + "." + styleNames[styleIndex] + "."
                         + getString(table_scriptIDs[coreScripts[index]]) + "=" + componentFileNames[index]);
                     */
                 }
 
-                //"Lucida Sans Regular" is not in the list, we add it here
-                if (!sawDefaultFontFile) {
-                    int len = 0;
-                    if (installedFallbackFontFiles != null) {
-                        len = installedFallbackFontFiles.length;
-                    }
-                    if (index + len == maxComponentFontCount) {
-                        String[] newComponentFaceNames = new String[maxComponentFontCount + 1];
-                        System.arraycopy(componentFaceNames, 0, newComponentFaceNames, 0, index);
-                        componentFaceNames = newComponentFaceNames;
-                        String[] newComponentFileNames = new String[maxComponentFontCount + 1];
-                        System.arraycopy(componentFileNames, 0, newComponentFileNames, 0, index);
-                        componentFileNames = newComponentFileNames;
-                    }
-                    componentFaceNames[index] = defaultFontFaceName;
-                    componentFileNames[index] = defaultFontFile;
-                    index++;
-                }
-
                 if (installedFallbackFontFiles != null) {
                     for (int ifb=0; ifb<installedFallbackFontFiles.length; ifb++) {
                         componentFaceNames[index] = null;
@@ -1458,8 +1432,7 @@ public abstract class FontConfiguration {
             for (int ii = 0; ii < table_awtfontpaths.length; ii++) {
                 if (table_awtfontpaths[ii] == 0) {
                     String script = getString(table_scriptIDs[ii]);
-                    if (script.contains("lucida") ||
-                        script.contains("dingbats") ||
+                    if (script.contains("dingbats") ||
                         script.contains("symbol")) {
                         continue;
                     }
diff --git a/src/java.desktop/share/classes/sun/font/CMap.java b/src/java.desktop/share/classes/sun/font/CMap.java
index 73cfcc7d07f..410280cf142 100644
--- a/src/java.desktop/share/classes/sun/font/CMap.java
+++ b/src/java.desktop/share/classes/sun/font/CMap.java
@@ -191,7 +191,7 @@ abstract class CMap {
                  * The primary purpose of these mappings was to facilitate
                  * display of symbol chars etc in composite fonts, however
                  * this is not needed as all these code points are covered
-                 * by Lucida Sans Regular.
+                 * by some other platform symbol font.
                  * Commenting this out reduces the role of these two files
                  * (assuming that they continue to be used in font.properties)
                  * to just one of contributing to the overall composite
diff --git a/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
index 06b9f489891..7c19bc3e5a9 100644
--- a/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
+++ b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
@@ -34,8 +34,7 @@ public class FontManagerNativeLibrary {
             public Object run() {
                /* REMIND do we really have to load awt here? */
                System.loadLibrary("awt");
-               if (FontUtilities.isOpenJDK &&
-                   System.getProperty("os.name").startsWith("Windows")) {
+               if (System.getProperty("os.name").startsWith("Windows")) {
                    /* Ideally fontmanager library should not depend on
                       particular implementation of the font scaler.
                       However, freetype scaler is basically small wrapper on
diff --git a/src/java.desktop/share/classes/sun/font/FontUtilities.java b/src/java.desktop/share/classes/sun/font/FontUtilities.java
index f3d86c07299..e3f7e86b73d 100644
--- a/src/java.desktop/share/classes/sun/font/FontUtilities.java
+++ b/src/java.desktop/share/classes/sun/font/FontUtilities.java
@@ -58,10 +58,6 @@ public final class FontUtilities {
 
     public static boolean isWindows;
 
-    public static boolean isOpenJDK;
-
-    static final String LUCIDA_FILE_NAME = "LucidaSansRegular.ttf";
-
     private static boolean debugFonts = false;
     private static PlatformLogger logger = null;
     private static boolean logging;
@@ -110,14 +106,6 @@ public final class FontUtilities {
                     useJDKScaler = false;
                 }
                 isWindows = osName.startsWith("Windows");
-                String jreLibDirName = System.getProperty("java.home", "")
-                                                      + File.separator + "lib";
-                String jreFontDirName =
-                        jreLibDirName + File.separator + "fonts";
-                File lucidaFile = new File(jreFontDirName + File.separator
-                                           + LUCIDA_FILE_NAME);
-                isOpenJDK = !lucidaFile.exists();
-
                 String debugLevel =
                     System.getProperty("sun.java2d.debugfonts");
 
diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java
index 0b175c35b6b..bd31fafa276 100644
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java
@@ -188,12 +188,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
     private boolean loaded1dot0Fonts = false;
     boolean loadedAllFonts = false;
     boolean loadedAllFontFiles = false;
-    HashMap<String,String> jreFontMap;
-    HashSet<String> jreLucidaFontFiles;
     String[] jreOtherFontFiles;
     boolean noOtherJREFontFiles = false; // initial assumption.
 
-    public static final String lucidaFontName = "Lucida Sans Regular";
     public static String jreLibDirName;
     public static String jreFontDirName;
     private static HashSet<String> missingFontFiles = null;
@@ -265,72 +262,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         return _usingPerAppContextComposites;
     }
 
-    private void initJREFontMap() {
-
-        /* Key is familyname+style value as an int.
-         * Value is filename containing the font.
-         * If no mapping exists, it means there is no font file for the style
-         * If the mapping exists but the file doesn't exist in the deferred
-         * list then it means its not installed.
-         * This looks like a lot of code and strings but if it saves even
-         * a single file being opened at JRE start-up there's a big payoff.
-         * Lucida Sans is probably the only important case as the others
-         * are rarely used. Consider removing the other mappings if there's
-         * no evidence they are useful in practice.
-         */
-        jreFontMap = new HashMap<String,String>();
-        jreLucidaFontFiles = new HashSet<String>();
-        if (isOpenJDK()) {
-            return;
-        }
-        /* Lucida Sans Family */
-        jreFontMap.put("lucida sans0",   "LucidaSansRegular.ttf");
-        jreFontMap.put("lucida sans1",   "LucidaSansDemiBold.ttf");
-        /* Lucida Sans full names (map Bold and DemiBold to same file) */
-        jreFontMap.put("lucida sans regular0", "LucidaSansRegular.ttf");
-        jreFontMap.put("lucida sans regular1", "LucidaSansDemiBold.ttf");
-        jreFontMap.put("lucida sans bold1", "LucidaSansDemiBold.ttf");
-        jreFontMap.put("lucida sans demibold1", "LucidaSansDemiBold.ttf");
-
-        /* Lucida Sans Typewriter Family */
-        jreFontMap.put("lucida sans typewriter0",
-                       "LucidaTypewriterRegular.ttf");
-        jreFontMap.put("lucida sans typewriter1", "LucidaTypewriterBold.ttf");
-        /* Typewriter full names (map Bold and DemiBold to same file) */
-        jreFontMap.put("lucida sans typewriter regular0",
-                       "LucidaTypewriter.ttf");
-        jreFontMap.put("lucida sans typewriter regular1",
-                       "LucidaTypewriterBold.ttf");
-        jreFontMap.put("lucida sans typewriter bold1",
-                       "LucidaTypewriterBold.ttf");
-        jreFontMap.put("lucida sans typewriter demibold1",
-                       "LucidaTypewriterBold.ttf");
-
-        /* Lucida Bright Family */
-        jreFontMap.put("lucida bright0", "LucidaBrightRegular.ttf");
-        jreFontMap.put("lucida bright1", "LucidaBrightDemiBold.ttf");
-        jreFontMap.put("lucida bright2", "LucidaBrightItalic.ttf");
-        jreFontMap.put("lucida bright3", "LucidaBrightDemiItalic.ttf");
-        /* Lucida Bright full names (map Bold and DemiBold to same file) */
-        jreFontMap.put("lucida bright regular0", "LucidaBrightRegular.ttf");
-        jreFontMap.put("lucida bright regular1", "LucidaBrightDemiBold.ttf");
-        jreFontMap.put("lucida bright regular2", "LucidaBrightItalic.ttf");
-        jreFontMap.put("lucida bright regular3", "LucidaBrightDemiItalic.ttf");
-        jreFontMap.put("lucida bright bold1", "LucidaBrightDemiBold.ttf");
-        jreFontMap.put("lucida bright bold3", "LucidaBrightDemiItalic.ttf");
-        jreFontMap.put("lucida bright demibold1", "LucidaBrightDemiBold.ttf");
-        jreFontMap.put("lucida bright demibold3","LucidaBrightDemiItalic.ttf");
-        jreFontMap.put("lucida bright italic2", "LucidaBrightItalic.ttf");
-        jreFontMap.put("lucida bright italic3", "LucidaBrightDemiItalic.ttf");
-        jreFontMap.put("lucida bright bold italic3",
-                       "LucidaBrightDemiItalic.ttf");
-        jreFontMap.put("lucida bright demibold italic3",
-                       "LucidaBrightDemiItalic.ttf");
-        for (String ffile : jreFontMap.values()) {
-            jreLucidaFontFiles.add(ffile);
-        }
-    }
-
     static {
 
         java.security.AccessController.doPrivileged(
@@ -354,8 +285,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
                jreLibDirName =
                    System.getProperty("java.home","") + File.separator + "lib";
                jreFontDirName = jreLibDirName + File.separator + "fonts";
-               File lucidaFile =
-                   new File(jreFontDirName + File.separator + FontUtilities.LUCIDA_FILE_NAME);
 
                return null;
            }
@@ -381,7 +310,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
     @SuppressWarnings("unchecked")
     protected SunFontManager() {
 
-        initJREFontMap();
         java.security.AccessController.doPrivileged(
                 new java.security.PrivilegedAction<Object>() {
                     public Object run() {
@@ -438,11 +366,10 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
                          * that might be specified.
                          */
                         fontConfig = createFontConfiguration();
-                        if (isOpenJDK()) {
-                            String[] fontInfo = getDefaultPlatformFont();
-                            defaultFontName = fontInfo[0];
-                            defaultFontFileName = fontInfo[1];
-                        }
+
+                        String[] fontInfo = getDefaultPlatformFont();
+                        defaultFontName = fontInfo[0];
+                        defaultFontFileName = fontInfo[1];
 
                         String extraFontPath = fontConfig.getExtraFontPath();
 
@@ -919,47 +846,20 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         return deferredFontFiles.containsKey(fileName);
     }
 
-    /* We keep a map of the files which contain the Lucida fonts so we
-     * don't need to search for them.
-     * But since we know what fonts these files contain, we can also avoid
-     * opening them to look for a font name we don't recognise - see
-     * findDeferredFont().
-     * For typical cases where the font isn't a JRE one the overhead is
-     * this method call, HashMap.get() and null reference test, then
-     * a boolean test of noOtherJREFontFiles.
-     */
-    public
-    /*private*/ PhysicalFont findJREDeferredFont(String name, int style) {
-
-        PhysicalFont physicalFont;
-        String nameAndStyle = name.toLowerCase(Locale.ENGLISH) + style;
-        String fileName = jreFontMap.get(nameAndStyle);
-        if (fileName != null) {
-            fileName = jreFontDirName + File.separator + fileName;
-            if (deferredFontFiles.get(fileName) != null) {
-                physicalFont = initialiseDeferredFont(fileName);
-                if (physicalFont != null &&
-                    (physicalFont.getFontName(null).equalsIgnoreCase(name) ||
-                     physicalFont.getFamilyName(null).equalsIgnoreCase(name))
-                    && physicalFont.style == style) {
-                    return physicalFont;
-                }
-            }
-        }
+    PhysicalFont findJREDeferredFont(String name, int style) {
 
         /* Iterate over the deferred font files looking for any in the
          * jre directory that we didn't recognise, open each of these.
          * In almost all installations this will quickly fall through
-         * because only the Lucidas will be present and jreOtherFontFiles
-         * will be empty.
+         * because jreOtherFontFiles will be empty.
          * noOtherJREFontFiles is used so we can skip this block as soon
-         * as its determined that its not needed - almost always after the
+         * as its determined that it's not needed - almost always after the
          * very first time through.
          */
         if (noOtherJREFontFiles) {
             return null;
         }
-        synchronized (jreLucidaFontFiles) {
+        synchronized (jreFontDirName) {
             if (jreOtherFontFiles == null) {
                 HashSet<String> otherFontFiles = new HashSet<String>();
                 for (String deferredFile : deferredFontFiles.keySet()) {
@@ -969,9 +869,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
                     /* skip names which aren't absolute, aren't in the JRE
                      * directory, or are known Lucida fonts.
                      */
-                    if (dir == null ||
-                        !dir.equals(jreFontDirName) ||
-                        jreLucidaFontFiles.contains(fname)) {
+                    if (dir == null || !dir.equals(jreFontDirName)) {
                         continue;
                     }
                     otherFontFiles.add(deferredFile);
@@ -983,12 +881,12 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
             }
 
             for (int i=0; i<jreOtherFontFiles.length;i++) {
-                fileName = jreOtherFontFiles[i];
+                String fileName = jreOtherFontFiles[i];
                 if (fileName == null) {
                     continue;
                 }
                 jreOtherFontFiles[i] = null;
-                physicalFont = initialiseDeferredFont(fileName);
+                PhysicalFont physicalFont = initialiseDeferredFont(fileName);
                 if (physicalFont != null &&
                     (physicalFont.getFontName(null).equalsIgnoreCase(name) ||
                      physicalFont.getFamilyName(null).equalsIgnoreCase(name))
@@ -1001,17 +899,8 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         return null;
     }
 
-    /* This skips JRE installed fonts. */
     private PhysicalFont findOtherDeferredFont(String name, int style) {
         for (String fileName : deferredFontFiles.keySet()) {
-            File file = new File(fileName);
-            String dir = file.getParent();
-            String fname = file.getName();
-            if (dir != null &&
-                dir.equals(jreFontDirName) &&
-                jreLucidaFontFiles.contains(fname)) {
-                continue;
-            }
             PhysicalFont physicalFont = initialiseDeferredFont(fileName);
             if (physicalFont != null &&
                 (physicalFont.getFontName(null).equalsIgnoreCase(name) ||
@@ -1024,7 +913,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
     }
 
     private PhysicalFont findDeferredFont(String name, int style) {
-
         PhysicalFont physicalFont = findJREDeferredFont(name, style);
         if (physicalFont != null) {
             return physicalFont;
@@ -1196,11 +1084,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
              * misconfiguration and this is probably a reasonable substitution.
              */
             defaultPhysicalFont = (PhysicalFont)
-                findFont2D("Lucida Sans Regular", Font.PLAIN, NO_FALLBACK);
-            if (defaultPhysicalFont == null) {
-                defaultPhysicalFont = (PhysicalFont)
-                    findFont2D("Arial", Font.PLAIN, NO_FALLBACK);
-            }
+                findFont2D(getDefaultFontFaceName(), Font.PLAIN, NO_FALLBACK);
             if (defaultPhysicalFont == null) {
                 /* Because of the findFont2D call above, if we reach here, we
                  * know all fonts have already been loaded, just accept any
@@ -2197,9 +2081,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
                 fontNameCache.put(mapName, font);
                 return font;
             }
-
-            /* Don't want Windows to return a Lucida Sans font from
-             * C:\Windows\Fonts
+            /* Don't want Windows to return a font from C:\Windows\Fonts
+             * if someone has installed a font with the same name
+             * in the JRE.
              */
             if (deferredFontFiles.size() > 0) {
                 font = findJREDeferredFont(lowerCaseName, style);
@@ -3285,10 +3169,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         return fontPath;
     }
 
-    public static boolean isOpenJDK() {
-        return FontUtilities.isOpenJDK;
-    }
-
     protected void loadFonts() {
         if (discoveredAllFonts) {
             return;
@@ -3379,24 +3259,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
      * or relative as needed by registerFontFile.
      */
     public synchronized String getDefaultFontFile() {
-        if (defaultFontFileName == null) {
-            initDefaultFonts();
-        }
         return defaultFontFileName;
     }
 
-    private void initDefaultFonts() {
-        if (!isOpenJDK()) {
-            defaultFontName = lucidaFontName;
-            if (useAbsoluteFontFileNames()) {
-                defaultFontFileName =
-                    jreFontDirName + File.separator + FontUtilities.LUCIDA_FILE_NAME;
-            } else {
-                defaultFontFileName = FontUtilities.LUCIDA_FILE_NAME;
-            }
-        }
-    }
-
     /**
      * Whether registerFontFile expects absolute or relative
      * font file names.
@@ -3420,9 +3285,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
      * for this platform.
      */
     public synchronized String getDefaultFontFaceName() {
-        if (defaultFontName == null) {
-            initDefaultFonts();
-        }
         return defaultFontName;
     }
 
diff --git a/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
index 1e1fd3e42e1..a6e8d676b80 100644
--- a/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
+++ b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, 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
@@ -33,40 +33,26 @@ import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Insets;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
-import java.awt.font.TextAttribute;
+import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.peer.ComponentPeer;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FilenameFilter;
 import java.io.InputStreamReader;
-import java.io.IOException;
-import java.text.AttributedCharacterIterator;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.security.AccessController;
 import java.util.Locale;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.StringTokenizer;
 import java.util.TreeMap;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-import sun.awt.AppContext;
+
 import sun.awt.DisplayChangedListener;
-import sun.awt.FontConfiguration;
 import sun.awt.SunDisplayChanger;
-import sun.font.CompositeFontDescriptor;
-import sun.font.Font2D;
 import sun.font.FontManager;
 import sun.font.FontManagerFactory;
 import sun.font.FontManagerForSGE;
-import sun.font.NativeFont;
-import java.security.AccessController;
+import sun.java2d.pipe.Region;
 import sun.security.action.GetPropertyAction;
 
 /**
@@ -389,4 +375,48 @@ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
             return -1;
         }
     }
+
+    /**
+     * Returns the graphics configuration which bounds contain the given point.
+     *
+     * @param  current the default configuration which is checked in the first
+     *         place
+     * @param  x the x coordinate of the given point
+     * @param  y the y coordinate of the given point
+     * @return the graphics configuration
+     */
+    public static GraphicsConfiguration getGraphicsConfigurationAtPoint(
+            GraphicsConfiguration current, double x, double y) {
+        if (current.getBounds().contains(x, y)) {
+            return current;
+        }
+        GraphicsEnvironment env = getLocalGraphicsEnvironment();
+        for (GraphicsDevice device : env.getScreenDevices()) {
+            GraphicsConfiguration config = device.getDefaultConfiguration();
+            if (config.getBounds().contains(x, y)) {
+                return config;
+            }
+        }
+        return current;
+    }
+
+    /**
+     * Converts coordinates from the user's space to the device space using
+     * appropriate device transformation.
+     *
+     * @param  x coordinate in the user space
+     * @param  y coordinate in the user space
+     * @return the point which uses device space(pixels)
+     */
+    public static Point convertToDeviceSpace(double x, double y) {
+        GraphicsConfiguration gc = getLocalGraphicsEnvironment()
+                        .getDefaultScreenDevice().getDefaultConfiguration();
+        gc = getGraphicsConfigurationAtPoint(gc, x, y);
+
+        AffineTransform tx = gc.getDefaultTransform();
+        x = Region.clipRound(x * tx.getScaleX());
+        y = Region.clipRound(y * tx.getScaleY());
+
+        return new Point((int) x, (int) y);
+    }
 }
diff --git a/src/java.desktop/share/classes/sun/print/DialogOnTop.java b/src/java.desktop/share/classes/sun/print/DialogOnTop.java
deleted file mode 100644
index 821e4e0beee..00000000000
--- a/src/java.desktop/share/classes/sun/print/DialogOnTop.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 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
- * 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 sun.print;
-
-import javax.print.attribute.Attribute;
-import javax.print.attribute.PrintRequestAttribute;
-
-/*
- * An implementation class used to request the dialog be set always-on-top.
- * It needs to be read and honoured by the dialog code which will use
- * java.awt.Window.setAlwaysOnTop(true) in cases where it is supported.
- */
-public class DialogOnTop implements PrintRequestAttribute {
-
-    private static final long serialVersionUID = -1901909867156076547L;
-
-    long id;
-
-    public DialogOnTop() {
-    }
-
-    public DialogOnTop(long id) {
-        this.id = id;
-    }
-
-    public final Class<? extends Attribute> getCategory() {
-        return DialogOnTop.class;
-    }
-
-    public long getID() {
-        return id;
-    }
-
-    public final String getName() {
-        return "dialog-on-top";
-    }
-
-    public String toString() {
-       return "dialog-on-top";
-    }
-}
diff --git a/src/java.desktop/share/classes/sun/print/DialogOwner.java b/src/java.desktop/share/classes/sun/print/DialogOwner.java
deleted file mode 100644
index f3f50391754..00000000000
--- a/src/java.desktop/share/classes/sun/print/DialogOwner.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, 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 sun.print;
-
-import java.awt.Dialog;
-import javax.print.attribute.Attribute;
-import javax.print.attribute.PrintRequestAttribute;
-import java.awt.Frame;
-import java.awt.Window;
-
-/**
- * Class DialogOwner is a printing attribute class that identifies
- * the window that owns the print dialog.
- *
- * <P>
- * <B>IPP Compatibility:</B> This is not an IPP attribute.
- * <P>
- *
- */
-@SuppressWarnings("serial") // JDK-implementation class
-public final class DialogOwner
-    implements PrintRequestAttribute {
-
-    private Window dlgOwner;
-
-    /**
-     * Construct a new dialog owner attribute with the given frame.
-     *
-     * @param  frame the frame that owns the print dialog
-     */
-    public DialogOwner(Frame frame) {
-        dlgOwner = frame;
-    }
-
-    /**
-     * Construct a new dialog owner attribute with the given dialog.
-     *
-     * @param  dialog the dialog that owns the print dialog
-     */
-    public DialogOwner(Dialog dialog) {
-        dlgOwner = dialog;
-    }
-
-    /**
-     * Returns the string table for class DialogOwner.
-     */
-    public Window getOwner() {
-        return dlgOwner;
-    }
-
-
-    /**
-     * Get the printing attribute class which is to be used as the "category"
-     * for this printing attribute value.
-     * <P>
-     * For class DialogOwner the category is class
-     * DialogOwner itself.
-     *
-     * @return  Printing attribute class (category), an instance of class
-     *          {@link java.lang.Class java.lang.Class}.
-     */
-    public Class<? extends Attribute> getCategory() {
-        return DialogOwner.class;
-    }
-
-
-    /**
-     * Get the name of the category of which this attribute value is an
-     * instance.
-     * <P>
-     * For class DialogOwner the category name is
-     * {@code "dialog-owner"}.
-     *
-     * @return  Attribute category name.
-     */
-    public String getName() {
-        return "dialog-owner";
-    }
-
-}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java b/src/java.desktop/share/classes/sun/print/DialogOwnerAccessor.java
similarity index 66%
rename from src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
rename to src/java.desktop/share/classes/sun/print/DialogOwnerAccessor.java
index f0d84671e11..db029f3ee03 100644
--- a/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
+++ b/src/java.desktop/share/classes/sun/print/DialogOwnerAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,22 +23,25 @@
  * questions.
  */
 
-package sun.applet;
+package sun.print;
 
-import java.net.URL;
-import java.awt.Image;
+import javax.print.attribute.standard.DialogOwner;
 
-/**
- * Part of this class still remains only to support legacy, 100%-impure
- * applications such as HotJava 1.0.1.
- */
-@Deprecated
-public class AppletResourceLoader {
-    public static Image getImage(URL url) {
-        return AppletViewer.getCachedImage(url);
+public abstract class DialogOwnerAccessor {
+
+    public abstract long getOwnerID(DialogOwner owner);
+
+    public static DialogOwnerAccessor accessor = null;
+
+    public static void setAccessor(DialogOwnerAccessor acc) {
+        accessor = acc;
     }
 
-    public static void flushImages() {
-        AppletViewer.flushImageCache();
+    public static long getID(DialogOwner owner) {
+        if (accessor == null || owner == null) {
+            return 0;
+        } else {
+            return accessor.getOwnerID(owner);
+        }
     }
 }
diff --git a/src/java.desktop/share/classes/sun/print/PrintJob2D.java b/src/java.desktop/share/classes/sun/print/PrintJob2D.java
index 9d9b2009af3..861f496e0c3 100644
--- a/src/java.desktop/share/classes/sun/print/PrintJob2D.java
+++ b/src/java.desktop/share/classes/sun/print/PrintJob2D.java
@@ -60,6 +60,7 @@ import javax.print.attribute.standard.Chromaticity;
 import javax.print.attribute.standard.Copies;
 import javax.print.attribute.standard.Destination;
 import javax.print.attribute.standard.DialogTypeSelection;
+import javax.print.attribute.standard.DialogOwner;
 import javax.print.attribute.standard.JobName;
 import javax.print.attribute.standard.MediaSize;
 import javax.print.attribute.standard.PrintQuality;
diff --git a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index 0decacad4af..5d584e587df 100644
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
@@ -74,6 +74,7 @@ import javax.print.attribute.Size2DSyntax;
 import javax.print.attribute.standard.Copies;
 import javax.print.attribute.standard.Destination;
 import javax.print.attribute.standard.DialogTypeSelection;
+import javax.print.attribute.standard.DialogOwner;
 import javax.print.attribute.standard.Fidelity;
 import javax.print.attribute.standard.JobName;
 import javax.print.attribute.standard.JobSheets;
@@ -830,17 +831,24 @@ public abstract class RasterPrinterJob extends PrinterJob {
         int x = gcBounds.x+50;
         int y = gcBounds.y+50;
         ServiceDialog pageDialog;
+        boolean setOnTop = false;
         if (onTop != null) {
             attributes.add(onTop);
+            Window owner = onTop.getOwner();
+            if (owner != null) {
+                w = owner; // use the one specifed by the app
+            } else if (DialogOwnerAccessor.getID(onTop) == 0) {
+                setOnTop = true;
+            }
         }
-        if (w instanceof Frame) {
             pageDialog = new ServiceDialog(gc, x, y, service,
                                            DocFlavor.SERVICE_FORMATTED.PAGEABLE,
-                                           attributes,(Frame)w);
-        } else {
-            pageDialog = new ServiceDialog(gc, x, y, service,
-                                           DocFlavor.SERVICE_FORMATTED.PAGEABLE,
-                                           attributes, (Dialog)w);
+                                           attributes, w);
+        if (setOnTop) {
+            try {
+                pageDialog.setAlwaysOnTop(true);
+            } catch (SecurityException e) {
+            }
         }
 
         Rectangle dlgBounds = pageDialog.getBounds();
@@ -988,8 +996,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
               * (it might be set in java.awt.PrintJob.printDialog)
               */
             if (attributes.get(DialogOwner.class) == null) {
-                attributes.add(w instanceof Frame ? new DialogOwner((Frame)w) :
-                                                    new DialogOwner((Dialog)w));
+                attributes.add(new DialogOwner(w));
             }
         } else {
             grCfg = GraphicsEnvironment.getLocalGraphicsEnvironment().
@@ -2581,7 +2588,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
         }
     }
 
-    private DialogOnTop onTop = null;
+    private DialogOwner onTop = null;
 
     private long parentWindowID = 0L;
 
@@ -2597,9 +2604,9 @@ public abstract class RasterPrinterJob extends PrinterJob {
 
     private void setParentWindowID(PrintRequestAttributeSet attrs) {
         parentWindowID = 0L;
-        onTop = (DialogOnTop)attrs.get(DialogOnTop.class);
+        onTop = (DialogOwner)attrs.get(DialogOwner.class);
         if (onTop != null) {
-            parentWindowID = onTop.getID();
+            parentWindowID = DialogOwnerAccessor.getID(onTop);
         }
     }
 }
diff --git a/src/java.desktop/share/classes/sun/print/ServiceDialog.java b/src/java.desktop/share/classes/sun/print/ServiceDialog.java
index c253332231b..7e5cba3dfec 100644
--- a/src/java.desktop/share/classes/sun/print/ServiceDialog.java
+++ b/src/java.desktop/share/classes/sun/print/ServiceDialog.java
@@ -38,6 +38,7 @@ import java.awt.GridBagConstraints;
 import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
@@ -136,33 +137,13 @@ public class ServiceDialog extends JDialog implements ActionListener {
                          int defaultServiceIndex,
                          DocFlavor flavor,
                          PrintRequestAttributeSet attributes,
-                         Dialog dialog)
+                         Window window)
     {
-        super(dialog, getMsg("dialog.printtitle"), true, gc);
+        super(window, getMsg("dialog.printtitle"), Dialog.DEFAULT_MODALITY_TYPE, gc);
         initPrintDialog(x, y, services, defaultServiceIndex,
                         flavor, attributes);
     }
 
-
-
-    /**
-     * Constructor for the "standard" print dialog (containing all relevant
-     * tabs)
-     */
-    public ServiceDialog(GraphicsConfiguration gc,
-                         int x, int y,
-                         PrintService[] services,
-                         int defaultServiceIndex,
-                         DocFlavor flavor,
-                         PrintRequestAttributeSet attributes,
-                         Frame frame)
-    {
-        super(frame, getMsg("dialog.printtitle"), true, gc);
-        initPrintDialog(x, y, services, defaultServiceIndex,
-                        flavor, attributes);
-    }
-
-
     /**
      * Initialize print dialog.
      */
@@ -184,8 +165,22 @@ public class ServiceDialog extends JDialog implements ActionListener {
             isAWT = true;
         }
 
-        if (attributes.get(DialogOnTop.class) != null) {
-            setAlwaysOnTop(true);
+        if (attributes.get(DialogOwner.class) != null) {
+            DialogOwner owner = (DialogOwner)attributes.get(DialogOwner.class);
+            /* When the ServiceDialog is constructed the caller of the
+             * constructor checks for this attribute and if it specifies a
+             * window then it will use that in the constructor instead of
+             * inferring one from keyboard focus.
+             * In this case the owner of the dialog is the same as that
+             * specified in the attribute and we do not need to set the
+             * on top property
+             */
+            if ((getOwner() == null) || (owner.getOwner() != getOwner())) {
+                try {
+                    setAlwaysOnTop(true);
+                } catch (SecurityException e) {
+                }
+            }
         }
         Container c = getContentPane();
         c.setLayout(new BorderLayout());
@@ -244,27 +239,12 @@ public class ServiceDialog extends JDialog implements ActionListener {
                          PrintService ps,
                          DocFlavor flavor,
                          PrintRequestAttributeSet attributes,
-                         Dialog dialog)
+                         Window window)
     {
-        super(dialog, getMsg("dialog.pstitle"), true, gc);
+        super(window, getMsg("dialog.pstitle"), Dialog.DEFAULT_MODALITY_TYPE, gc);
         initPageDialog(x, y, ps, flavor, attributes);
     }
 
-    /**
-     * Constructor for the solitary "page setup" dialog
-     */
-    public ServiceDialog(GraphicsConfiguration gc,
-                         int x, int y,
-                         PrintService ps,
-                         DocFlavor flavor,
-                         PrintRequestAttributeSet attributes,
-                         Frame frame)
-    {
-        super(frame, getMsg("dialog.pstitle"), true, gc);
-        initPageDialog(x, y, ps, flavor, attributes);
-    }
-
-
     /**
      * Initialize "page setup" dialog
      */
@@ -278,8 +258,15 @@ public class ServiceDialog extends JDialog implements ActionListener {
         this.asOriginal = attributes;
         this.asCurrent = new HashPrintRequestAttributeSet(attributes);
 
-        if (attributes.get(DialogOnTop.class) != null) {
-            setAlwaysOnTop(true);
+        if (attributes.get(DialogOwner.class) != null) {
+            /* See comments in same block in initPrintDialog */
+            DialogOwner owner = (DialogOwner)attributes.get(DialogOwner.class);
+            if ((getOwner() == null) || (owner.getOwner() != getOwner())) {
+                try {
+                    setAlwaysOnTop(true);
+                } catch (SecurityException e) {
+                }
+            }
         }
 
         Container c = getContentPane();
diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index b83a5cbc96d..aab3a109116 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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,6 +52,7 @@ import javax.swing.table.TableColumnModel;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
+import sun.java2d.pipe.Region;
 import sun.print.ProxyPrintGraphics;
 import sun.awt.*;
 import java.io.*;
@@ -2240,35 +2241,6 @@ public class SwingUtilities2 {
         return UIManager.getBoolean(key);
     }
 
-    /**
-     *
-     * Returns the graphics configuration which bounds contain the given
-     * point
-     *
-     * @param current the default configuration which is checked in the first place
-     * @param x the x coordinate of the given point
-     * @param y the y coordinate of the given point
-     * @return the graphics configuration
-     */
-    public static GraphicsConfiguration getGraphicsConfigurationAtPoint(GraphicsConfiguration current, double x, double y) {
-
-        if (current.getBounds().contains(x, y)) {
-            return current;
-        }
-
-        GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice[] devices = env.getScreenDevices();
-
-        for (GraphicsDevice device : devices) {
-            GraphicsConfiguration config = device.getDefaultConfiguration();
-            if (config.getBounds().contains(x, y)) {
-                return config;
-            }
-        }
-
-        return current;
-    }
-
     /**
      * Used to listen to "blit" repaints in RepaintManager.
      */
diff --git a/src/java.desktop/share/legal/freetype.md b/src/java.desktop/share/legal/freetype.md
index b1ffc63ea04..d943e083981 100644
--- a/src/java.desktop/share/legal/freetype.md
+++ b/src/java.desktop/share/legal/freetype.md
@@ -1,4 +1,4 @@
-## The FreeType Project: Freetype v2.9
+## The FreeType Project: Freetype v2.9.1
 
 
 ### FreeType Notice
diff --git a/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md
index 0f0d17d80bd..5ca0c787131 100644
--- a/src/java.desktop/share/legal/harfbuzz.md
+++ b/src/java.desktop/share/legal/harfbuzz.md
@@ -1,4 +1,4 @@
-## Harfbuzz v1.7.1
+## Harfbuzz v1.7.6
 
 ### Harfbuzz License
 
diff --git a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
index c2a294f91b7..94d04cdb5cd 100644
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -45,7 +45,7 @@
 #define  FloatToFTFixed(f) (FT_Fixed)((f) * (float)(ftFixed1))
 #define  FTFixedToFloat(x) ((x) / (float)(ftFixed1))
 #define  FT26Dot6ToFloat(x)  ((x) / ((float) (1<<6)))
-#define  ROUND(x) ((int) (x+0.5))
+#define  FT26Dot6ToInt(x) (((int)(x)) >> 6)
 
 typedef struct {
     /* Important note:
@@ -765,12 +765,12 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative(
     } else {
         if (!ftglyph->advance.y) {
             glyphInfo->advanceX =
-                (float) ROUND(FT26Dot6ToFloat(ftglyph->advance.x));
+                (float) FT26Dot6ToInt(ftglyph->advance.x);
             glyphInfo->advanceY = 0;
         } else if (!ftglyph->advance.x) {
             glyphInfo->advanceX = 0;
             glyphInfo->advanceY =
-                (float) ROUND(FT26Dot6ToFloat(-ftglyph->advance.y));
+                (float) FT26Dot6ToInt(-ftglyph->advance.y);
         } else {
             glyphInfo->advanceX = FT26Dot6ToFloat(ftglyph->advance.x);
             glyphInfo->advanceY = FT26Dot6ToFloat(-ftglyph->advance.y);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh
index b3ddb08faa1..53c37a016c3 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh
@@ -70,6 +70,29 @@ typedef LONG hb_atomic_int_impl_t;
 #define hb_atomic_ptr_impl_cmpexch(P,O,N)       (InterlockedCompareExchangePointer ((void **) (P), (void *) (N), (void *) (O)) == (void *) (O))
 
 
+#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
+
+typedef int hb_atomic_int_impl_t;
+#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
+#define hb_atomic_int_impl_add(AI, V)           __sync_fetch_and_add (&(AI), (V))
+
+#define hb_atomic_ptr_impl_get(P)               (void *) (__sync_synchronize (), *(P))
+#define hb_atomic_ptr_impl_cmpexch(P,O,N)       __sync_bool_compare_and_swap ((P), (O), (N))
+
+
+#elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)
+
+#include <atomic.h>
+#include <mbarrier.h>
+
+typedef unsigned int hb_atomic_int_impl_t;
+#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
+#define hb_atomic_int_impl_add(AI, V)           ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V))
+
+#define hb_atomic_ptr_impl_get(P)               ( ({__machine_rw_barrier ();}), (void *) *(P))
+#define hb_atomic_ptr_impl_cmpexch(P,O,N)       ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false)
+
+
 #elif !defined(HB_NO_MT) && defined(__APPLE__)
 
 #include <libkern/OSAtomic.h>
@@ -96,29 +119,6 @@ typedef int32_t hb_atomic_int_impl_t;
 #endif
 
 
-#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
-
-typedef int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
-#define hb_atomic_int_impl_add(AI, V)           __sync_fetch_and_add (&(AI), (V))
-
-#define hb_atomic_ptr_impl_get(P)               (void *) (__sync_synchronize (), *(P))
-#define hb_atomic_ptr_impl_cmpexch(P,O,N)       __sync_bool_compare_and_swap ((P), (O), (N))
-
-
-#elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)
-
-#include <atomic.h>
-#include <mbarrier.h>
-
-typedef unsigned int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
-#define hb_atomic_int_impl_add(AI, V)           ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V))
-
-#define hb_atomic_ptr_impl_get(P)               ( ({__machine_rw_barrier ();}), (void *) *(P))
-#define hb_atomic_ptr_impl_cmpexch(P,O,N)       ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false)
-
-
 #elif !defined(HB_NO_MT) && defined(_AIX) && defined(__IBMCPP__)
 
 #include <builtins.h>
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
index 9c8241ebac1..c8a2f57028e 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
@@ -26,7 +26,7 @@
 
 /* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */
 #ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 199309L
+#define _POSIX_C_SOURCE 200809L
 #endif
 
 #include "hb-private.hh"
@@ -170,6 +170,31 @@ hb_blob_create_sub_blob (hb_blob_t    *parent,
   return blob;
 }
 
+/**
+ * hb_blob_copy_writable_or_fail:
+ * @blob: A blob.
+ *
+ * Makes a writable copy of @blob.
+ *
+ * Return value: New blob, or nullptr if allocation failed.
+ *
+ * Since: 1.8.0
+ **/
+hb_blob_t *
+hb_blob_copy_writable_or_fail (hb_blob_t *blob)
+{
+  blob = hb_blob_create (blob->data,
+                         blob->length,
+                         HB_MEMORY_MODE_DUPLICATE,
+                         nullptr,
+                         nullptr);
+
+  if (unlikely (blob == hb_blob_get_empty ()))
+    blob = nullptr;
+
+  return blob;
+}
+
 /**
  * hb_blob_get_empty:
  *
@@ -222,7 +247,7 @@ hb_blob_reference (hb_blob_t *blob)
  * hb_blob_destroy: (skip)
  * @blob: a blob.
  *
- * Descreases the reference count on @blob, and if it reaches zero, destroys
+ * Decreases the reference count on @blob, and if it reaches zero, destroys
  * @blob, freeing all memory, possibly calling the destroy-callback the blob
  * was created for if it has not been called already.
  *
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h
index ff44e18b76f..dadaccc3583 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h
@@ -44,7 +44,7 @@ HB_BEGIN_DECLS
  *   any such possibility, MODE_DUPLICATE should be used
  *   such that HarfBuzz makes a copy immediately,
  *
- * - Use MODE_READONLY otherse, unless you really really
+ * - Use MODE_READONLY otherwise, unless you really really
  *   really know what you are doing,
  *
  * - MODE_WRITABLE is appropriate if you really made a
@@ -82,6 +82,9 @@ hb_blob_create_sub_blob (hb_blob_t    *parent,
                          unsigned int  offset,
                          unsigned int  length);
 
+HB_EXTERN hb_blob_t *
+hb_blob_copy_writable_or_fail (hb_blob_t *blob);
+
 HB_EXTERN hb_blob_t *
 hb_blob_get_empty (void);
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh
index 2e0cb855a68..bddfd200cb3 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh
@@ -35,8 +35,8 @@
 #include "hb-unicode-private.hh"
 
 
-#ifndef HB_BUFFER_MAX_EXPANSION_FACTOR
-#define HB_BUFFER_MAX_EXPANSION_FACTOR 32
+#ifndef HB_BUFFER_MAX_LEN_FACTOR
+#define HB_BUFFER_MAX_LEN_FACTOR 32
 #endif
 #ifndef HB_BUFFER_MAX_LEN_MIN
 #define HB_BUFFER_MAX_LEN_MIN 8192
@@ -45,6 +45,16 @@
 #define HB_BUFFER_MAX_LEN_DEFAULT 0x3FFFFFFF /* Shaping more than a billion chars? Let us know! */
 #endif
 
+#ifndef HB_BUFFER_MAX_OPS_FACTOR
+#define HB_BUFFER_MAX_OPS_FACTOR 64
+#endif
+#ifndef HB_BUFFER_MAX_OPS_MIN
+#define HB_BUFFER_MAX_OPS_MIN 1024
+#endif
+#ifndef HB_BUFFER_MAX_OPS_DEFAULT
+#define HB_BUFFER_MAX_OPS_DEFAULT 0x1FFFFFFF /* Shaping more than a billion operations? Let us know! */
+#endif
+
 static_assert ((sizeof (hb_glyph_info_t) == 20), "");
 static_assert ((sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t)), "");
 
@@ -59,6 +69,7 @@ enum hb_buffer_scratch_flags_t {
   HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK             = 0x00000004u,
   HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT            = 0x00000008u,
   HB_BUFFER_SCRATCH_FLAG_HAS_UNSAFE_TO_BREAK            = 0x00000010u,
+  HB_BUFFER_SCRATCH_FLAG_HAS_CGJ                        = 0x00000020u,
 
   /* Reserved for complex shapers' internal use. */
   HB_BUFFER_SCRATCH_FLAG_COMPLEX0                       = 0x01000000u,
@@ -82,8 +93,9 @@ struct hb_buffer_t {
   hb_buffer_flags_t flags; /* BOT / EOT / etc. */
   hb_buffer_cluster_level_t cluster_level;
   hb_codepoint_t replacement; /* U+FFFD or something else. */
-  hb_buffer_scratch_flags_t scratch_flags; /* Have space-flallback, etc. */
+  hb_buffer_scratch_flags_t scratch_flags; /* Have space-fallback, etc. */
   unsigned int max_len; /* Maximum allowed len. */
+  int max_ops; /* Maximum allowed operations. */
 
   /* Buffer contents */
   hb_buffer_content_type_t content_type;
@@ -102,17 +114,6 @@ struct hb_buffer_t {
   hb_glyph_info_t     *out_info;
   hb_glyph_position_t *pos;
 
-  inline hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; }
-  inline hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; }
-
-  inline hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; }
-  inline hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; }
-
-  inline hb_glyph_info_t &prev (void) { return out_info[out_len ? out_len - 1 : 0]; }
-  inline hb_glyph_info_t prev (void) const { return out_info[out_len ? out_len - 1 : 0]; }
-
-  inline bool has_separate_output (void) const { return info != out_info; }
-
   unsigned int serial;
 
   /* Text before / after the main buffer contents.
@@ -132,6 +133,10 @@ struct hb_buffer_t {
 #ifndef HB_NDEBUG
   uint8_t allocated_var_bits;
 #endif
+
+
+  /* Methods */
+
   inline void allocate_var (unsigned int start, unsigned int count)
   {
 #ifndef HB_NDEBUG
@@ -168,8 +173,17 @@ struct hb_buffer_t {
 #endif
   }
 
+  inline hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; }
+  inline hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; }
+
+  inline hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; }
+  inline hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; }
+
+  inline hb_glyph_info_t &prev (void) { return out_info[out_len ? out_len - 1 : 0]; }
+  inline hb_glyph_info_t prev (void) const { return out_info[out_len ? out_len - 1 : 0]; }
+
+  inline bool has_separate_output (void) const { return info != out_info; }
 
-  /* Methods */
 
   HB_INTERNAL void reset (void);
   HB_INTERNAL void clear (void);
@@ -293,45 +307,44 @@ struct hb_buffer_t {
   HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
 
   static inline void
-  set_cluster (hb_glyph_info_t &info, unsigned int cluster, unsigned int mask = 0)
+  set_cluster (hb_glyph_info_t &inf, unsigned int cluster, unsigned int mask = 0)
   {
-    if (info.cluster != cluster)
+    if (inf.cluster != cluster)
     {
       if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
-        info.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+        inf.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
       else
-        info.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+        inf.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
     }
-    info.cluster = cluster;
+    inf.cluster = cluster;
   }
 
   inline int
-  _unsafe_to_break_find_min_cluster (const hb_glyph_info_t *info,
+  _unsafe_to_break_find_min_cluster (const hb_glyph_info_t *infos,
                                      unsigned int start, unsigned int end,
                                      unsigned int cluster) const
   {
     for (unsigned int i = start; i < end; i++)
-      cluster = MIN<unsigned int> (cluster, info[i].cluster);
+      cluster = MIN<unsigned int> (cluster, infos[i].cluster);
     return cluster;
   }
   inline void
-  _unsafe_to_break_set_mask (hb_glyph_info_t *info,
+  _unsafe_to_break_set_mask (hb_glyph_info_t *infos,
                              unsigned int start, unsigned int end,
                              unsigned int cluster)
   {
     for (unsigned int i = start; i < end; i++)
-      if (cluster != info[i].cluster)
+      if (cluster != infos[i].cluster)
       {
         scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_UNSAFE_TO_BREAK;
-        info[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+        infos[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
       }
   }
 
   inline void
   unsafe_to_break_all (void)
   {
-    for (unsigned int i = 0; i < len; i++)
-      info[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+    unsafe_to_break_impl (0, len);
   }
   inline void
   safe_to_break_all (void)
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc
index cba46cd8d5f..97072c12e03 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc
@@ -109,6 +109,7 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
                              nullptr : hb_buffer_get_glyph_positions (buffer, nullptr);
 
   *buf_consumed = 0;
+  hb_position_t x = 0, y = 0;
   for (unsigned int i = start; i < end; i++)
   {
     char b[1024];
@@ -146,9 +147,10 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
     if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS))
     {
       p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"dx\":%d,\"dy\":%d",
-                             pos[i].x_offset, pos[i].y_offset));
-      p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"ax\":%d,\"ay\":%d",
-                             pos[i].x_advance, pos[i].y_advance));
+                             x+pos[i].x_offset, y+pos[i].y_offset));
+      if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES))
+        p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"ax\":%d,\"ay\":%d",
+                               pos[i].x_advance, pos[i].y_advance));
     }
 
     if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS)
@@ -179,6 +181,12 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
       *buf = '\0';
     } else
       return i - start;
+
+    if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES))
+    {
+      x += pos[i].x_advance;
+      y += pos[i].y_advance;
+    }
   }
 
   return end - start;
@@ -199,6 +207,7 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
                              nullptr : hb_buffer_get_glyph_positions (buffer, nullptr);
 
   *buf_consumed = 0;
+  hb_position_t x = 0, y = 0;
   for (unsigned int i = start; i < end; i++)
   {
     char b[1024];
@@ -223,13 +232,16 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
 
     if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS))
     {
-      if (pos[i].x_offset || pos[i].y_offset)
-        p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", pos[i].x_offset, pos[i].y_offset));
+      if (x+pos[i].x_offset || y+pos[i].y_offset)
+        p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", x+pos[i].x_offset, y+pos[i].y_offset));
 
-      *p++ = '+';
-      p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%d", pos[i].x_advance));
-      if (pos[i].y_advance)
-        p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",%d", pos[i].y_advance));
+      if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES))
+      {
+        *p++ = '+';
+        p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%d", pos[i].x_advance));
+        if (pos[i].y_advance)
+          p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",%d", pos[i].y_advance));
+      }
     }
 
     if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS)
@@ -255,6 +267,12 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
       *buf = '\0';
     } else
       return i - start;
+
+    if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES))
+    {
+      x += pos[i].x_advance;
+      y += pos[i].y_advance;
+    }
   }
 
   return end - start;
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc
index 5a1bc8e32dc..c010d9810cf 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc
@@ -722,6 +722,7 @@ hb_buffer_create (void)
     return hb_buffer_get_empty ();
 
   buffer->max_len = HB_BUFFER_MAX_LEN_DEFAULT;
+  buffer->max_ops = HB_BUFFER_MAX_OPS_DEFAULT;
 
   buffer->reset ();
 
@@ -749,6 +750,7 @@ hb_buffer_get_empty (void)
     HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT,
     HB_BUFFER_SCRATCH_FLAG_DEFAULT,
     HB_BUFFER_MAX_LEN_DEFAULT,
+    HB_BUFFER_MAX_OPS_DEFAULT,
 
     HB_BUFFER_CONTENT_TYPE_INVALID,
     HB_SEGMENT_PROPERTIES_DEFAULT,
@@ -1931,7 +1933,7 @@ hb_buffer_diff (hb_buffer_t *buffer,
       result |= HB_BUFFER_DIFF_FLAG_CODEPOINT_MISMATCH;
     if (buf_info->cluster != ref_info->cluster)
       result |= HB_BUFFER_DIFF_FLAG_CLUSTER_MISMATCH;
-    if ((buf_info->mask & HB_GLYPH_FLAG_DEFINED) != (ref_info->mask & HB_GLYPH_FLAG_DEFINED))
+    if ((buf_info->mask & ~ref_info->mask & HB_GLYPH_FLAG_DEFINED))
       result |= HB_BUFFER_DIFF_FLAG_GLYPH_FLAGS_MISMATCH;
     if (contains && ref_info->codepoint == dottedcircle_glyph)
       result |= HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT;
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h
index 1fb11705a57..ecafc2abb1d 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h
@@ -71,6 +71,24 @@ typedef struct hb_glyph_info_t {
   hb_var_int_t   var2;
 } hb_glyph_info_t;
 
+/**
+ * hb_glyph_flags_t:
+ * @HB_GLYPH_FLAG_UNSAFE_TO_BREAK: Indicates that if input text is broken at the
+ *                                 beginning of the cluster this glyph is part of,
+ *                                 then both sides need to be re-shaped, as the
+ *                                 result might be different.  On the flip side,
+ *                                 it means that when this flag is not present,
+ *                                 then it's safe to break the glyph-run at the
+ *                                 beginning of this cluster, and the two sides
+ *                                 represent the exact same result one would get
+ *                                 if breaking input text at the beginning of
+ *                                 this cluster and shaping the two sides
+ *                                 separately.  This can be used to optimize
+ *                                 paragraph layout, by avoiding re-shaping
+ *                                 of each line after line-breaking, or limiting
+ *                                 the reshaping to a small piece around the
+ *                                 breaking point only.
+ */
 typedef enum { /*< flags >*/
   HB_GLYPH_FLAG_UNSAFE_TO_BREAK         = 0x00000001,
 
@@ -247,13 +265,21 @@ hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
  *                      of the text without the full context.
  * @HB_BUFFER_FLAG_EOT: flag indicating that special handling of the end of text
  *                      paragraph can be applied to this buffer, similar to
- *                      @HB_BUFFER_FLAG_EOT.
+ *                      @HB_BUFFER_FLAG_BOT.
  * @HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES:
  *                      flag indication that character with Default_Ignorable
  *                      Unicode property should use the corresponding glyph
- *                      from the font, instead of hiding them (currently done
- *                      by replacing them with the space glyph and zeroing the
- *                      advance width.)
+ *                      from the font, instead of hiding them (done by
+ *                      replacing them with the space glyph and zeroing the
+ *                      advance width.)  This flag takes precedence over
+ *                      @HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES.
+ * @HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES:
+ *                      flag indication that character with Default_Ignorable
+ *                      Unicode property should be removed from glyph string
+ *                      instead of hiding them (done by replacing them with the
+ *                      space glyph and zeroing the advance width.)
+ *                      @HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES takes
+ *                      precedence over this flag. Since: 1.8.0
  *
  * Since: 0.9.20
  */
@@ -261,7 +287,8 @@ typedef enum { /*< flags >*/
   HB_BUFFER_FLAG_DEFAULT                        = 0x00000000u,
   HB_BUFFER_FLAG_BOT                            = 0x00000001u, /* Beginning-of-text */
   HB_BUFFER_FLAG_EOT                            = 0x00000002u, /* End-of-text */
-  HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES    = 0x00000004u
+  HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES    = 0x00000004u,
+  HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES      = 0x00000008u
 } hb_buffer_flags_t;
 
 HB_EXTERN void
@@ -412,6 +439,9 @@ hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
  * @HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS: do not serialize glyph position information.
  * @HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES: do no serialize glyph name.
  * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS: serialize glyph extents.
+ * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS: serialize glyph flags. Since: 1.5.0
+ * @HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES: do not serialize glyph advances,
+ *  glyph offsets will reflect absolute glyph positions. Since: 1.8.0
  *
  * Flags that control what glyph information are serialized in hb_buffer_serialize_glyphs().
  *
@@ -423,7 +453,8 @@ typedef enum { /*< flags >*/
   HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS         = 0x00000002u,
   HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES       = 0x00000004u,
   HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS        = 0x00000008u,
-  HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS          = 0x00000010u
+  HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS          = 0x00000010u,
+  HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES          = 0x00000020u
 } hb_buffer_serialize_flags_t;
 
 /**
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc
index 239e8edce68..21e00d6409a 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc
@@ -524,6 +524,7 @@ hb_script_get_horizontal_direction (hb_script_t script)
     case HB_SCRIPT_PSALTER_PAHLAVI:
 
     /* Unicode-8.0 additions */
+    case HB_SCRIPT_HATRAN:
     case HB_SCRIPT_OLD_HUNGARIAN:
 
     /* Unicode-9.0 additions */
@@ -784,9 +785,9 @@ parse_bool (const char **pp, const char *end, uint32_t *pv)
     (*pp)++;
 
   /* CSS allows on/off as aliases 1/0. */
-  if (*pp - p == 2 || 0 == strncmp (p, "on", 2))
+  if (*pp - p == 2 && 0 == strncmp (p, "on", 2))
     *pv = 1;
-  else if (*pp - p == 3 || 0 == strncmp (p, "off", 2))
+  else if (*pp - p == 3 && 0 == strncmp (p, "off", 3))
     *pv = 0;
   else
     return false;
@@ -878,7 +879,7 @@ parse_feature_value_postfix (const char **pp, const char *end, hb_feature_t *fea
                    parse_bool (pp, end, &feature->value);
   /* CSS doesn't use equal-sign between tag and value.
    * If there was an equal-sign, then there *must* be a value.
-   * A value without an eqaul-sign is ok, but not required. */
+   * A value without an equal-sign is ok, but not required. */
   return !had_equal || had_value;
 }
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc
index 989731d73c3..fd832dc4dab 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc
@@ -39,7 +39,7 @@
 #define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f
 
 static CGFloat
-coretext_font_size (float ptem)
+coretext_font_size_from_ptem (float ptem)
 {
   /* CoreText points are CSS pixels (96 per inch),
    * NOT typographic points (72 per inch).
@@ -49,6 +49,12 @@ coretext_font_size (float ptem)
   ptem *= 96.f / 72.f;
   return ptem <= 0.f ? HB_CORETEXT_DEFAULT_FONT_SIZE : ptem;
 }
+static float
+coretext_font_size_to_ptem (CGFloat size)
+{
+  size *= 72.f / 96.f;
+  return size <= 0.f ? 0 : size;
+}
 
 static void
 release_table_data (void *user_data)
@@ -68,7 +74,10 @@ reference_table  (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
   const char *data = reinterpret_cast<const char*> (CFDataGetBytePtr (cf_data));
   const size_t length = CFDataGetLength (cf_data);
   if (!data || !length)
+  {
+    CFRelease (cf_data);
     return nullptr;
+  }
 
   return hb_blob_create (data, length, HB_MEMORY_MODE_READONLY,
                          reinterpret_cast<void *> (const_cast<__CFData *> (cf_data)),
@@ -81,21 +90,12 @@ _hb_cg_font_release (void *data)
   CGFontRelease ((CGFontRef) data);
 }
 
-hb_face_t *
-hb_coretext_face_create (CGFontRef cg_font)
-{
-  return hb_face_create_for_tables (reference_table, CGFontRetain (cg_font), _hb_cg_font_release);
-}
 
 HB_SHAPER_DATA_ENSURE_DEFINE(coretext, face)
 HB_SHAPER_DATA_ENSURE_DEFINE_WITH_CONDITION(coretext, font,
-        fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size (font->ptem)) <= .5
+        fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) <= .5
 )
 
-/*
- * shaper face data
- */
-
 static CTFontDescriptorRef
 get_last_resort_font_desc (void)
 {
@@ -267,6 +267,12 @@ _hb_coretext_shaper_face_data_destroy (hb_coretext_shaper_face_data_t *data)
   CFRelease ((CGFontRef) data);
 }
 
+hb_face_t *
+hb_coretext_face_create (CGFontRef cg_font)
+{
+  return hb_face_create_for_tables (reference_table, CGFontRetain (cg_font), _hb_cg_font_release);
+}
+
 /*
  * Since: 0.9.10
  */
@@ -278,10 +284,6 @@ hb_coretext_face_get_cg_font (hb_face_t *face)
 }
 
 
-/*
- * shaper font data
- */
-
 hb_coretext_shaper_font_data_t *
 _hb_coretext_shaper_font_data_create (hb_font_t *font)
 {
@@ -289,7 +291,7 @@ _hb_coretext_shaper_font_data_create (hb_font_t *font)
   if (unlikely (!hb_coretext_shaper_face_data_ensure (face))) return nullptr;
   CGFontRef cg_font = (CGFontRef) HB_SHAPER_DATA_GET (face);
 
-  CTFontRef ct_font = create_ct_font (cg_font, coretext_font_size (font->ptem));
+  CTFontRef ct_font = create_ct_font (cg_font, coretext_font_size_from_ptem (font->ptem));
 
   if (unlikely (!ct_font))
   {
@@ -306,6 +308,37 @@ _hb_coretext_shaper_font_data_destroy (hb_coretext_shaper_font_data_t *data)
   CFRelease ((CTFontRef) data);
 }
 
+/*
+ * Since: 1.7.2
+ */
+hb_font_t *
+hb_coretext_font_create (CTFontRef ct_font)
+{
+  CGFontRef cg_font = CTFontCopyGraphicsFont (ct_font, nullptr);
+  hb_face_t *face = hb_coretext_face_create (cg_font);
+  CFRelease (cg_font);
+  hb_font_t *font = hb_font_create (face);
+  hb_face_destroy (face);
+
+  if (unlikely (hb_object_is_inert (font)))
+    return font;
+
+  hb_font_set_ptem (font, coretext_font_size_to_ptem (CTFontGetSize(ct_font)));
+
+  /* Let there be dragons here... */
+  HB_SHAPER_DATA_GET (font) = (hb_coretext_shaper_font_data_t *) CFRetain (ct_font);
+
+  return font;
+}
+
+CTFontRef
+hb_coretext_font_get_ct_font (hb_font_t *font)
+{
+  if (unlikely (!hb_coretext_shaper_font_data_ensure (font))) return nullptr;
+  return (CTFontRef) HB_SHAPER_DATA_GET (font);
+}
+
+
 
 /*
  * shaper shape_plan data
@@ -328,13 +361,6 @@ _hb_coretext_shaper_shape_plan_data_destroy (hb_coretext_shaper_shape_plan_data_
 {
 }
 
-CTFontRef
-hb_coretext_font_get_ct_font (hb_font_t *font)
-{
-  if (unlikely (!hb_coretext_shaper_font_data_ensure (font))) return nullptr;
-  return (CTFontRef)HB_SHAPER_DATA_GET (font);
-}
-
 
 /*
  * shaper
@@ -854,7 +880,10 @@ resize_and_retry:
                                                             kCFStringEncodingUTF8,
                                                             kCFAllocatorNull);
         if (unlikely (!lang))
+        {
+          CFRelease (attr_string);
           FAIL ("CFStringCreateWithCStringNoCopy failed");
+        }
         CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len),
                                         kCTLanguageAttributeName, lang);
         CFRelease (lang);
@@ -923,7 +952,10 @@ resize_and_retry:
                                                     &kCFTypeDictionaryValueCallBacks);
       CFRelease (level_number);
       if (unlikely (!options))
+      {
+        CFRelease (attr_string);
         FAIL ("CFDictionaryCreate failed");
+      }
 
       CTTypesetterRef typesetter = CTTypesetterCreateWithAttributedStringAndOptions (attr_string, options);
       CFRelease (options);
@@ -1000,7 +1032,7 @@ resize_and_retry:
          * However, even that wouldn't work if we were passed in the CGFont to
          * construct a hb_face to begin with.
          *
-         * See: http://github.com/behdad/harfbuzz/pull/36
+         * See: http://github.com/harfbuzz/harfbuzz/pull/36
          *
          * Also see: https://bugs.chromium.org/p/chromium/issues/detail?id=597098
          */
@@ -1013,7 +1045,7 @@ resize_and_retry:
           }
         if (!matched)
         {
-          CGFontRef run_cg_font = CTFontCopyGraphicsFont (run_ct_font, 0);
+          CGFontRef run_cg_font = CTFontCopyGraphicsFont (run_ct_font, nullptr);
           if (run_cg_font)
           {
             matched = CFEqual (run_cg_font, cg_font);
@@ -1186,7 +1218,7 @@ resize_and_retry:
     }
 
     /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel,
-     * or if it does, it doesn't resepct it.  So we get runs with wrong
+     * or if it does, it doesn't respect it.  So we get runs with wrong
      * directions.  As such, disable the assert...  It wouldn't crash, but
      * cursoring will be off...
      *
@@ -1212,8 +1244,6 @@ resize_and_retry:
         pos->x_offset = info->var1.i32;
         pos->y_offset = info->var2.i32;
 
-        info->mask = HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
-
         info++, pos++;
       }
     else
@@ -1223,8 +1253,6 @@ resize_and_retry:
         pos->x_offset = info->var1.i32;
         pos->y_offset = info->var2.i32;
 
-        info->mask = HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
-
         info++, pos++;
       }
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h
index c9136ff4c30..4b0a6f01b6f 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h
@@ -48,6 +48,9 @@ HB_BEGIN_DECLS
 HB_EXTERN hb_face_t *
 hb_coretext_face_create (CGFontRef cg_font);
 
+HB_EXTERN hb_font_t *
+hb_coretext_font_create (CTFontRef ct_font);
+
 
 HB_EXTERN CGFontRef
 hb_coretext_face_get_cg_font (hb_face_t *face);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh
index bd667433a9f..762f27bdefc 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh
@@ -93,7 +93,7 @@ _hb_debug_msg_va (const char *what,
   fprintf (stderr, "%-10s", what ? what : "");
 
   if (obj)
-    fprintf (stderr, "(%0*lx) ", (unsigned int) (2 * sizeof (void *)), (unsigned long) obj);
+    fprintf (stderr, "(%*p) ", (unsigned int) (2 * sizeof (void *)), obj);
   else
     fprintf (stderr, " %*s  ", (unsigned int) (2 * sizeof (void *)), "");
 
@@ -220,13 +220,15 @@ template <>
 {}
 
 template <int max_level, typename ret_t>
-struct hb_auto_trace_t {
+struct hb_auto_trace_t
+{
   explicit inline hb_auto_trace_t (unsigned int *plevel_,
                                    const char *what_,
                                    const void *obj_,
                                    const char *func,
                                    const char *message,
-                                   ...) : plevel (plevel_), what (what_), obj (obj_), returned (false)
+                                   ...) HB_PRINTF_FUNC(6, 7)
+                                   : plevel (plevel_), what (what_), obj (obj_), returned (false)
   {
     if (plevel) ++*plevel;
 
@@ -267,10 +269,20 @@ struct hb_auto_trace_t {
   bool returned;
 };
 template <typename ret_t> /* Make sure we don't use hb_auto_trace_t when not tracing. */
-struct hb_auto_trace_t<0, ret_t>;
+struct hb_auto_trace_t<0, ret_t>
+{
+  explicit inline hb_auto_trace_t (unsigned int *plevel_,
+                                   const char *what_,
+                                   const void *obj_,
+                                   const char *func,
+                                   const char *message,
+                                   ...) HB_PRINTF_FUNC(6, 7) {}
+
+  inline ret_t ret (ret_t v, unsigned int line HB_UNUSED = 0) { return v; }
+};
 
 /* For disabled tracing; optimize out everything.
- * https://github.com/behdad/harfbuzz/pull/605 */
+ * https://github.com/harfbuzz/harfbuzz/pull/605 */
 template <typename ret_t>
 struct hb_no_trace_t {
   inline ret_t ret (ret_t v, unsigned int line HB_UNUSED = 0) { return v; }
@@ -343,7 +355,7 @@ struct hb_no_trace_t {
 #define TRACE_CLOSURE(this) \
         hb_auto_trace_t<HB_DEBUG_CLOSURE, hb_void_t> trace \
         (&c->debug_depth, c->get_name (), this, HB_FUNC, \
-         "")
+         " ")
 #else
 #define TRACE_CLOSURE(this) hb_no_trace_t<hb_void_t> trace HB_UNUSED
 #endif
@@ -355,7 +367,7 @@ struct hb_no_trace_t {
 #define TRACE_COLLECT_GLYPHS(this) \
         hb_auto_trace_t<HB_DEBUG_COLLECT_GLYPHS, hb_void_t> trace \
         (&c->debug_depth, c->get_name (), this, HB_FUNC, \
-         "")
+         " ")
 #else
 #define TRACE_COLLECT_GLYPHS(this) hb_no_trace_t<hb_void_t> trace HB_UNUSED
 #endif
@@ -367,7 +379,7 @@ struct hb_no_trace_t {
 #define TRACE_SANITIZE(this) \
         hb_auto_trace_t<HB_DEBUG_SANITIZE, bool> trace \
         (&c->debug_depth, c->get_name (), this, HB_FUNC, \
-         "");
+         " ");
 #else
 #define TRACE_SANITIZE(this) hb_no_trace_t<bool> trace
 #endif
@@ -379,11 +391,23 @@ struct hb_no_trace_t {
 #define TRACE_SERIALIZE(this) \
         hb_auto_trace_t<HB_DEBUG_SERIALIZE, bool> trace \
         (&c->debug_depth, "SERIALIZE", c, HB_FUNC, \
-         "");
+         " ");
 #else
 #define TRACE_SERIALIZE(this) hb_no_trace_t<bool> trace
 #endif
 
+#ifndef HB_DEBUG_SUBSET
+#define HB_DEBUG_SUBSET (HB_DEBUG+0)
+#endif
+#if HB_DEBUG_SUBSET
+#define TRACE_SUBSET(this) \
+  hb_auto_trace_t<HB_DEBUG_SUBSET, bool> trace \
+  (&c->debug_depth, c->get_name (), this, HB_FUNC, \
+   " ");
+#else
+#define TRACE_SUBSET(this) hb_no_trace_t<bool> trace
+#endif
+
 #ifndef HB_DEBUG_WOULD_APPLY
 #define HB_DEBUG_WOULD_APPLY (HB_DEBUG+0)
 #endif
@@ -403,6 +427,7 @@ struct hb_no_trace_t {
         HB_DEBUG_COLLECT_GLYPHS + \
         HB_DEBUG_SANITIZE + \
         HB_DEBUG_SERIALIZE + \
+  HB_DEBUG_SUBSET + \
         HB_DEBUG_WOULD_APPLY + \
         0)
 #endif
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh
index f0f480fea2c..2e37b9d87b6 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh
@@ -76,12 +76,8 @@ void hb_sort_r(void *base, size_t nel, size_t width,
 
 
 /* swap a, b iff a>b */
-#ifndef __SUNPRO_CC
 /* __restrict is same as restrict but better support on old machines */
 static int sort_r_cmpswap(char *__restrict a, char *__restrict b, size_t w,
-#else
-static int sort_r_cmpswap(char *a, char *b, size_t w,
-#endif
                           int (*compar)(const void *_a, const void *_b,
                                         void *_arg),
                           void *arg)
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
index a02c17a1bfe..50a8a5b00e4 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
@@ -170,7 +170,7 @@ hb_face_create (hb_blob_t    *blob,
   if (unlikely (!blob))
     blob = hb_blob_get_empty ();
 
-  hb_face_for_data_closure_t *closure = _hb_face_for_data_closure_create (OT::Sanitizer<OT::OpenTypeFontFile>::sanitize (hb_blob_reference (blob)), index);
+  hb_face_for_data_closure_t *closure = _hb_face_for_data_closure_create (OT::Sanitizer<OT::OpenTypeFontFile>().sanitize (hb_blob_reference (blob)), index);
 
   if (unlikely (!closure))
     return hb_face_get_empty ();
@@ -430,7 +430,7 @@ hb_face_get_upem (hb_face_t *face)
 void
 hb_face_t::load_upem (void) const
 {
-  hb_blob_t *head_blob = OT::Sanitizer<OT::head>::sanitize (reference_table (HB_OT_TAG_head));
+  hb_blob_t *head_blob = OT::Sanitizer<OT::head>().sanitize (reference_table (HB_OT_TAG_head));
   const OT::head *head_table = OT::Sanitizer<OT::head>::lock_instance (head_blob);
   upem = head_table->get_upem ();
   hb_blob_destroy (head_blob);
@@ -474,7 +474,7 @@ hb_face_get_glyph_count (hb_face_t *face)
 void
 hb_face_t::load_num_glyphs (void) const
 {
-  hb_blob_t *maxp_blob = OT::Sanitizer<OT::maxp>::sanitize (reference_table (HB_OT_TAG_maxp));
+  hb_blob_t *maxp_blob = OT::Sanitizer<OT::maxp>().sanitize (reference_table (HB_OT_TAG_maxp));
   const OT::maxp *maxp_table = OT::Sanitizer<OT::maxp>::lock_instance (maxp_blob);
   num_glyphs = maxp_table->get_num_glyphs ();
   hb_blob_destroy (maxp_blob);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h
index cc83044353f..332195902ea 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h
@@ -71,7 +71,6 @@ hb_face_set_user_data (hb_face_t          *face,
                        hb_destroy_func_t   destroy,
                        hb_bool_t           replace);
 
-
 HB_EXTERN void *
 hb_face_get_user_data (hb_face_t          *face,
                        hb_user_data_key_t *key);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh
index 460483587bc..6bca15142a3 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh
@@ -128,6 +128,8 @@ struct hb_font_t {
   inline hb_position_t em_scale_y (int16_t v) { return em_scale (v, y_scale); }
   inline hb_position_t em_scalef_x (float v) { return em_scalef (v, this->x_scale); }
   inline hb_position_t em_scalef_y (float v) { return em_scalef (v, this->y_scale); }
+  inline float em_fscale_x (int16_t v) { return em_fscale (v, x_scale); }
+  inline float em_fscale_y (int16_t v) { return em_fscale (v, y_scale); }
   inline hb_position_t em_scale_dir (int16_t v, hb_direction_t direction)
   { return em_scale (v, dir_scale (direction)); }
 
@@ -541,7 +543,11 @@ struct hb_font_t {
   }
   inline hb_position_t em_scalef (float v, int scale)
   {
-    return (hb_position_t) (v * scale / face->get_upem ());
+    return (hb_position_t) round (v * scale / face->get_upem ());
+  }
+  inline float em_fscale (int16_t v, int scale)
+  {
+    return (float) v * scale / face->get_upem ();
   }
 };
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h
index ec46fee671b..ebf6cd6c936 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h
@@ -456,7 +456,7 @@ hb_font_get_glyph_from_name (hb_font_t *font,
 /* high-level funcs, with fallback */
 
 /* Calls either hb_font_get_nominal_glyph() if variation_selector is 0,
- * otherwise callse hb_font_get_variation_glyph(). */
+ * otherwise calls hb_font_get_variation_glyph(). */
 HB_EXTERN hb_bool_t
 hb_font_get_glyph (hb_font_t *font,
                    hb_codepoint_t unicode, hb_codepoint_t variation_selector,
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc
index 32ab88acb32..994d68ac77f 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc
@@ -58,7 +58,7 @@
  *
  *   - In the future, we should add constructors to create fonts in font space?
  *
- *   - FT_Load_Glyph() is exteremely costly.  Do something about it?
+ *   - FT_Load_Glyph() is extremely costly.  Do something about it?
  */
 
 
@@ -635,15 +635,27 @@ hb_ft_font_changed (hb_font_t *font)
     {
       if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, ft_coords))
       {
-        for (unsigned int i = 0; i < mm_var->num_axis; ++i)
-          coords[i] = ft_coords[i] >>= 2;
+        bool nonzero = false;
 
-        hb_font_set_var_coords_normalized (font, coords, mm_var->num_axis);
+        for (unsigned int i = 0; i < mm_var->num_axis; ++i)
+         {
+          coords[i] = ft_coords[i] >>= 2;
+          nonzero = nonzero || coords[i];
+         }
+
+        if (nonzero)
+          hb_font_set_var_coords_normalized (font, coords, mm_var->num_axis);
+        else
+          hb_font_set_var_coords_normalized (font, nullptr, 0);
       }
     }
     free (coords);
     free (ft_coords);
+#ifdef HAVE_FT_DONE_MM_VAR
+    FT_Done_MM_Var (ft_face->glyph->library, mm_var);
+#else
     free (mm_var);
+#endif
   }
 #endif
 }
@@ -747,6 +759,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
     FT_Set_Transform (ft_face, &matrix, nullptr);
   }
 
+#ifdef HAVE_FT_SET_VAR_BLEND_COORDINATES
   unsigned int num_coords;
   const int *coords = hb_font_get_var_coords_normalized (font, &num_coords);
   if (num_coords)
@@ -760,6 +773,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
       free (ft_coords);
     }
   }
+#endif
 
   ft_face->generic.data = blob;
   ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh
index c7e31f920b1..81686b176ad 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh
@@ -30,6 +30,7 @@
 #define HB_OPEN_FILE_PRIVATE_HH
 
 #include "hb-open-type-private.hh"
+#include "hb-ot-head-table.hh"
 
 
 namespace OT {
@@ -54,7 +55,14 @@ struct TTCHeader;
 typedef struct TableRecord
 {
   int cmp (Tag t) const
-  { return t.cmp (tag); }
+  { return -t.cmp (tag); }
+
+  static int cmp (const void *pa, const void *pb)
+  {
+    const TableRecord *a = (const TableRecord *) pa;
+    const TableRecord *b = (const TableRecord *) pb;
+    return b->cmp (a->tag);
+  }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -64,9 +72,9 @@ typedef struct TableRecord
 
   Tag           tag;            /* 4-byte identifier. */
   CheckSum      checkSum;       /* CheckSum for this table. */
-  ULONG         offset;         /* Offset from beginning of TrueType font
+  Offset32      offset;         /* Offset from beginning of TrueType font
                                  * file. */
-  ULONG         length;         /* Length of this table. */
+  HBUINT32      length;         /* Length of this table. */
   public:
   DEFINE_SIZE_STATIC (16);
 } OpenTypeTable;
@@ -81,7 +89,7 @@ typedef struct OffsetTable
   {
     return tables[i];
   }
-  inline unsigned int get_table_tags (unsigned int start_offset,
+  inline unsigned int get_table_tags (unsigned int  start_offset,
                                       unsigned int *table_count, /* IN/OUT */
                                       hb_tag_t     *table_tags /* OUT */) const
   {
@@ -118,6 +126,78 @@ typedef struct OffsetTable
   }
 
   public:
+
+  inline bool serialize (hb_serialize_context_t *c,
+                         hb_tag_t sfnt_tag,
+                         Supplier<hb_tag_t> &tags,
+                         Supplier<hb_blob_t *> &blobs,
+                         unsigned int table_count)
+  {
+    TRACE_SERIALIZE (this);
+    /* Alloc 12 for the OTHeader. */
+    if (unlikely (!c->extend_min (*this))) return_trace (false);
+    /* Write sfntVersion (bytes 0..3). */
+    sfnt_version.set (sfnt_tag);
+    /* Take space for numTables, searchRange, entrySelector, RangeShift
+     * and the TableRecords themselves.  */
+    if (unlikely (!tables.serialize (c, table_count))) return_trace (false);
+
+    const char *dir_end = (const char *) c->head;
+    HBUINT32 *checksum_adjustment = nullptr;
+
+    /* Write OffsetTables, alloc for and write actual table blobs. */
+    for (unsigned int i = 0; i < table_count; i++)
+    {
+      TableRecord &rec = tables.array[i];
+      hb_blob_t *blob = blobs[i];
+      rec.tag.set (tags[i]);
+      rec.length.set (hb_blob_get_length (blob));
+      rec.offset.serialize (c, this);
+
+      /* Allocate room for the table and copy it. */
+      char *start = (char *) c->allocate_size<void> (rec.length);
+      if (unlikely (!start)) {return false;}
+
+      memcpy (start, hb_blob_get_data (blob, nullptr), rec.length);
+
+      /* 4-byte allignment. */
+      if (rec.length % 4)
+        c->allocate_size<void> (4 - rec.length % 4);
+      const char *end = (const char *) c->head;
+
+      if (tags[i] == HB_OT_TAG_head && end - start >= head::static_size)
+      {
+        head *h = (head *) start;
+        checksum_adjustment = &h->checkSumAdjustment;
+        checksum_adjustment->set (0);
+      }
+
+      rec.checkSum.set_for_data (start, end - start);
+    }
+    tags += table_count;
+    blobs += table_count;
+
+    tables.qsort ();
+
+    if (checksum_adjustment)
+    {
+      CheckSum checksum;
+
+      /* The following line is a slower version of the following block. */
+      //checksum.set_for_data (this, (const char *) c->head - (const char *) this);
+      checksum.set_for_data (this, dir_end - (const char *) this);
+      for (unsigned int i = 0; i < table_count; i++)
+      {
+        TableRecord &rec = tables.array[i];
+        checksum.set (checksum + rec.checkSum);
+      }
+
+      checksum_adjustment->set (0xB1B0AFBAu - checksum);
+    }
+
+    return_trace (true);
+  }
+
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -154,7 +234,7 @@ struct TTCHeaderVersion1
   Tag           ttcTag;         /* TrueType Collection ID string: 'ttcf' */
   FixedVersion<>version;        /* Version of the TTC Header (1.0),
                                  * 0x00010000u */
-  ArrayOf<LOffsetTo<OffsetTable>, ULONG>
+  ArrayOf<LOffsetTo<OffsetTable>, HBUINT32>
                 table;          /* Array of offsets to the OffsetTable for each font
                                  * from the beginning of the file */
   public:
@@ -249,6 +329,18 @@ struct OpenTypeFontFile
     }
   }
 
+  inline bool serialize_single (hb_serialize_context_t *c,
+                                hb_tag_t sfnt_tag,
+                                Supplier<hb_tag_t> &tags,
+                                Supplier<hb_blob_t *> &blobs,
+                                unsigned int table_count)
+  {
+    TRACE_SERIALIZE (this);
+    assert (sfnt_tag != TTCTag);
+    if (unlikely (!c->extend_min (*this))) return_trace (false);
+    return_trace (u.fontFace.serialize (c, sfnt_tag, tags, blobs, table_count));
+  }
+
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh
index e325e0188ca..e441f5793ce 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh
@@ -134,7 +134,17 @@ static inline Type& StructAfter(TObject &X)
 
 #define HB_NULL_POOL_SIZE 264
 static_assert (HB_NULL_POOL_SIZE % sizeof (void *) == 0, "Align HB_NULL_POOL_SIZE.");
-extern HB_INTERNAL const void * const _hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)];
+
+#ifdef HB_NO_VISIBILITY
+static
+#else
+extern HB_INTERNAL
+#endif
+const void * const _hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)]
+#ifdef HB_NO_VISIBILITY
+= {}
+#endif
+;
 
 /* Generic nul-content Null objects. */
 template <typename Type>
@@ -179,6 +189,12 @@ struct hb_dispatch_context_t
 #ifndef HB_SANITIZE_MAX_EDITS
 #define HB_SANITIZE_MAX_EDITS 32
 #endif
+#ifndef HB_SANITIZE_MAX_OPS_FACTOR
+#define HB_SANITIZE_MAX_OPS_FACTOR 8
+#endif
+#ifndef HB_SANITIZE_MAX_OPS_MIN
+#define HB_SANITIZE_MAX_OPS_MIN 16384
+#endif
 
 struct hb_sanitize_context_t :
        hb_dispatch_context_t<hb_sanitize_context_t, bool, HB_DEBUG_SANITIZE>
@@ -186,8 +202,9 @@ struct hb_sanitize_context_t :
   inline hb_sanitize_context_t (void) :
         debug_depth (0),
         start (nullptr), end (nullptr),
-        writable (false), edit_count (0),
-        blob (nullptr) {}
+        writable (false), edit_count (0), max_ops (0),
+        blob (nullptr),
+        num_glyphs (0) {}
 
   inline const char *get_name (void) { return "SANITIZE"; }
   template <typename T, typename F>
@@ -210,6 +227,8 @@ struct hb_sanitize_context_t :
     this->start = hb_blob_get_data (this->blob, nullptr);
     this->end = this->start + hb_blob_get_length (this->blob);
     assert (this->start <= this->end); /* Must not overflow. */
+    this->max_ops = MAX ((unsigned int) (this->end - this->start) * HB_SANITIZE_MAX_OPS_FACTOR,
+                         (unsigned) HB_SANITIZE_MAX_OPS_MIN);
     this->edit_count = 0;
     this->debug_depth = 0;
 
@@ -233,7 +252,10 @@ struct hb_sanitize_context_t :
   inline bool check_range (const void *base, unsigned int len) const
   {
     const char *p = (const char *) base;
-    bool ok = this->start <= p && p <= this->end && (unsigned int) (this->end - p) >= len;
+    bool ok = this->max_ops-- > 0 &&
+              this->start <= p &&
+              p <= this->end &&
+              (unsigned int) (this->end - p) >= len;
 
     DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0,
        "check_range [%p..%p] (%d bytes) in [%p..%p] -> %s",
@@ -297,7 +319,9 @@ struct hb_sanitize_context_t :
   const char *start, *end;
   bool writable;
   unsigned int edit_count;
+  mutable int max_ops;
   hb_blob_t *blob;
+  unsigned int num_glyphs;
 };
 
 
@@ -306,8 +330,9 @@ struct hb_sanitize_context_t :
 template <typename Type>
 struct Sanitizer
 {
-  static hb_blob_t *sanitize (hb_blob_t *blob) {
-    hb_sanitize_context_t c[1];
+  inline Sanitizer (void) {}
+
+  inline hb_blob_t *sanitize (hb_blob_t *blob) {
     bool sane;
 
     /* TODO is_sane() stuff */
@@ -370,6 +395,11 @@ struct Sanitizer
     const char *base = hb_blob_get_data (blob, nullptr);
     return unlikely (!base) ? &Null(Type) : CastP<Type> (base);
   }
+
+  inline void set_num_glyphs (unsigned int num_glyphs) { c->num_glyphs = num_glyphs; }
+
+  private:
+  hb_sanitize_context_t c[1];
 };
 
 
@@ -491,23 +521,25 @@ struct hb_serialize_context_t
 template <typename Type>
 struct Supplier
 {
-  inline Supplier (const Type *array, unsigned int len_)
+  inline Supplier (const Type *array, unsigned int len_, unsigned int stride_=sizeof(Type))
   {
     head = array;
     len = len_;
+    stride = stride_;
   }
   inline const Type operator [] (unsigned int i) const
   {
     if (unlikely (i >= len)) return Type ();
-    return head[i];
+    return * (const Type *) (const void *) ((const char *) head + stride * i);
   }
 
-  inline void advance (unsigned int count)
+  inline Supplier<Type> & operator += (unsigned int count)
   {
     if (unlikely (count > len))
       count = len;
     len -= count;
-    head += count;
+    head = (const Type *) (const void *) ((const char *) head + stride * count);
+    return *this;
   }
 
   private:
@@ -515,12 +547,11 @@ struct Supplier
   inline Supplier<Type>& operator= (const Supplier<Type> &); /* Disallow copy */
 
   unsigned int len;
+  unsigned int stride;
   const Type *head;
 };
 
 
-
-
 /*
  *
  * The OpenType Font File: Data Types
@@ -635,23 +666,22 @@ struct IntType
   DEFINE_SIZE_STATIC (Size);
 };
 
-typedef IntType<int8_t,   1> CHAR;      /* 8-bit signed integer. */
-typedef IntType<uint8_t,  1> BYTE;      /* 8-bit unsigned integer. */
-typedef IntType<int8_t,   1> INT8;      /* 8-bit signed integer. */
-typedef IntType<uint16_t, 2> USHORT;    /* 16-bit unsigned integer. */
-typedef IntType<int16_t,  2> SHORT;     /* 16-bit signed integer. */
-typedef IntType<uint32_t, 4> ULONG;     /* 32-bit unsigned integer. */
-typedef IntType<int32_t,  4> LONG;      /* 32-bit signed integer. */
+typedef IntType<uint8_t,  1> HBUINT8;   /* 8-bit unsigned integer. */
+typedef IntType<int8_t,   1> HBINT8;    /* 8-bit signed integer. */
+typedef IntType<uint16_t, 2> HBUINT16;  /* 16-bit unsigned integer. */
+typedef IntType<int16_t,  2> HBINT16;   /* 16-bit signed integer. */
+typedef IntType<uint32_t, 4> HBUINT32;  /* 32-bit unsigned integer. */
+typedef IntType<int32_t,  4> HBINT32;   /* 32-bit signed integer. */
 typedef IntType<uint32_t, 3> UINT24;    /* 24-bit unsigned integer. */
 
-/* 16-bit signed integer (SHORT) that describes a quantity in FUnits. */
-typedef SHORT FWORD;
+/* 16-bit signed integer (HBINT16) that describes a quantity in FUnits. */
+typedef HBINT16 FWORD;
 
-/* 16-bit unsigned integer (USHORT) that describes a quantity in FUnits. */
-typedef USHORT UFWORD;
+/* 16-bit unsigned integer (HBUINT16) that describes a quantity in FUnits. */
+typedef HBUINT16 UFWORD;
 
 /* 16-bit signed fixed number with the low 14 bits of fraction (2.14). */
-struct F2DOT14 : SHORT
+struct F2DOT14 : HBINT16
 {
   //inline float to_float (void) const { return ???; }
   //inline void set_float (float f) { v.set (f * ???); }
@@ -660,10 +690,10 @@ struct F2DOT14 : SHORT
 };
 
 /* 32-bit signed fixed-point number (16.16). */
-struct Fixed: LONG
+struct Fixed: HBINT32
 {
-  //inline float to_float (void) const { return ???; }
-  //inline void set_float (float f) { v.set (f * ???); }
+  inline float to_float (void) const { return ((int32_t) v) / 65536.0; }
+  inline void set_float (float f) { v.set (round (f * 65536.0)); }
   public:
   DEFINE_SIZE_STATIC (4);
 };
@@ -678,15 +708,15 @@ struct LONGDATETIME
     return_trace (likely (c->check_struct (this)));
   }
   protected:
-  LONG major;
-  ULONG minor;
+  HBINT32 major;
+  HBUINT32 minor;
   public:
   DEFINE_SIZE_STATIC (8);
 };
 
 /* Array of four uint8s (length = 32 bits) used to identify a script, language
  * system, feature, or baseline */
-struct Tag : ULONG
+struct Tag : HBUINT32
 {
   /* What the char* converters return is NOT nul-terminated.  Print using "%.4s" */
   inline operator const char* (void) const { return reinterpret_cast<const char *> (&this->v); }
@@ -697,32 +727,44 @@ struct Tag : ULONG
 DEFINE_NULL_DATA (Tag, "    ");
 
 /* Glyph index number, same as uint16 (length = 16 bits) */
-typedef USHORT GlyphID;
+typedef HBUINT16 GlyphID;
 
 /* Script/language-system/feature index */
-struct Index : USHORT {
+struct Index : HBUINT16 {
   static const unsigned int NOT_FOUND_INDEX = 0xFFFFu;
 };
 DEFINE_NULL_DATA (Index, "\xff\xff");
 
 /* Offset, Null offset = 0 */
-template <typename Type=USHORT>
+template <typename Type>
 struct Offset : Type
 {
   inline bool is_null (void) const { return 0 == *this; }
+
+  inline void *serialize (hb_serialize_context_t *c, const void *base)
+  {
+    void *t = c->start_embed<void> ();
+    this->set ((char *) t - (char *) base); /* TODO(serialize) Overflow? */
+    return t;
+  }
+
   public:
   DEFINE_SIZE_STATIC (sizeof(Type));
 };
 
+typedef Offset<HBUINT16> Offset16;
+typedef Offset<HBUINT32> Offset32;
+
 
 /* CheckSum */
-struct CheckSum : ULONG
+struct CheckSum : HBUINT32
 {
   /* This is reference implementation from the spec. */
-  static inline uint32_t CalcTableChecksum (const ULONG *Table, uint32_t Length)
+  static inline uint32_t CalcTableChecksum (const HBUINT32 *Table, uint32_t Length)
   {
     uint32_t Sum = 0L;
-    const ULONG *EndPtr = Table+((Length+3) & ~3) / ULONG::static_size;
+    assert (0 == (Length & 3));
+    const HBUINT32 *EndPtr = Table + Length / HBUINT32::static_size;
 
     while (Table < EndPtr)
       Sum += *Table++;
@@ -731,7 +773,7 @@ struct CheckSum : ULONG
 
   /* Note: data should be 4byte aligned and have 4byte padding at the end. */
   inline void set_for_data (const void *data, unsigned int length)
-  { set (CalcTableChecksum ((const ULONG *) data, length)); }
+  { set (CalcTableChecksum ((const HBUINT32 *) data, length)); }
 
   public:
   DEFINE_SIZE_STATIC (4);
@@ -742,7 +784,7 @@ struct CheckSum : ULONG
  * Version Numbers
  */
 
-template <typename FixedType=USHORT>
+template <typename FixedType=HBUINT16>
 struct FixedVersion
 {
   inline uint32_t to_int (void) const { return (major << (sizeof(FixedType) * 8)) + minor; }
@@ -766,7 +808,7 @@ struct FixedVersion
  * Use: (base+offset)
  */
 
-template <typename Type, typename OffsetType=USHORT>
+template <typename Type, typename OffsetType=HBUINT16>
 struct OffsetTo : Offset<OffsetType>
 {
   inline const Type& operator () (const void *base) const
@@ -778,9 +820,7 @@ struct OffsetTo : Offset<OffsetType>
 
   inline Type& serialize (hb_serialize_context_t *c, const void *base)
   {
-    Type *t = c->start_embed<Type> ();
-    this->set ((char *) t - (char *) base); /* TODO(serialize) Overflow? */
-    return *t;
+    return * (Type *) Offset<OffsetType>::serialize (c, base);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
@@ -811,7 +851,7 @@ struct OffsetTo : Offset<OffsetType>
   }
   DEFINE_SIZE_STATIC (sizeof(OffsetType));
 };
-template <typename Type> struct LOffsetTo : OffsetTo<Type, ULONG> {};
+template <typename Type> struct LOffsetTo : OffsetTo<Type, HBUINT32> {};
 template <typename Base, typename OffsetType, typename Type>
 static inline const Type& operator + (const Base &base, const OffsetTo<Type, OffsetType> &offset) { return offset (base); }
 template <typename Base, typename OffsetType, typename Type>
@@ -823,7 +863,7 @@ static inline Type& operator + (Base &base, OffsetTo<Type, OffsetType> &offset)
  */
 
 /* An array with a number of elements. */
-template <typename Type, typename LenType=USHORT>
+template <typename Type, typename LenType=HBUINT16>
 struct ArrayOf
 {
   const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const
@@ -868,7 +908,7 @@ struct ArrayOf
     if (unlikely (!serialize (c, items_len))) return_trace (false);
     for (unsigned int i = 0; i < items_len; i++)
       array[i] = items[i];
-    items.advance (items_len);
+    items += items_len;
     return_trace (true);
   }
 
@@ -920,6 +960,11 @@ struct ArrayOf
     return -1;
   }
 
+  inline void qsort (void)
+  {
+    ::qsort (array, len, sizeof (Type), Type::cmp);
+  }
+
   private:
   inline bool sanitize_shallow (hb_sanitize_context_t *c) const
   {
@@ -933,10 +978,10 @@ struct ArrayOf
   public:
   DEFINE_SIZE_ARRAY (sizeof (LenType), array);
 };
-template <typename Type> struct LArrayOf : ArrayOf<Type, ULONG> {};
+template <typename Type> struct LArrayOf : ArrayOf<Type, HBUINT32> {};
 
 /* Array of Offset's */
-template <typename Type, typename OffsetType=USHORT>
+template <typename Type, typename OffsetType=HBUINT16>
 struct OffsetArrayOf : ArrayOf<OffsetTo<Type, OffsetType> > {};
 
 /* Array of offsets relative to the beginning of the array itself. */
@@ -964,7 +1009,7 @@ struct OffsetListOf : OffsetArrayOf<Type>
 
 
 /* An array starting at second element. */
-template <typename Type, typename LenType=USHORT>
+template <typename Type, typename LenType=HBUINT16>
 struct HeadlessArrayOf
 {
   inline const Type& operator [] (unsigned int i) const
@@ -986,7 +1031,7 @@ struct HeadlessArrayOf
     if (unlikely (!c->extend (*this))) return_trace (false);
     for (unsigned int i = 0; i < items_len - 1; i++)
       array[i] = items[i];
-    items.advance (items_len - 1);
+    items += items_len - 1;
     return_trace (true);
   }
 
@@ -1026,19 +1071,19 @@ struct HeadlessArrayOf
 /*
  * An array with sorted elements.  Supports binary searching.
  */
-template <typename Type, typename LenType=USHORT>
+template <typename Type, typename LenType=HBUINT16>
 struct SortedArrayOf : ArrayOf<Type, LenType>
 {
   template <typename SearchType>
   inline int bsearch (const SearchType &x) const
   {
     /* Hand-coded bsearch here since this is in the hot inner loop. */
-    const Type *array = this->array;
+    const Type *arr = this->array;
     int min = 0, max = (int) this->len - 1;
     while (min <= max)
     {
       int mid = (min + max) / 2;
-      int c = array[mid].cmp (x);
+      int c = arr[mid].cmp (x);
       if (c < 0)
         max = mid - 1;
       else if (c > 0)
@@ -1064,11 +1109,22 @@ struct BinSearchHeader
     return_trace (c->check_struct (this));
   }
 
+  inline void set (unsigned int v)
+  {
+    len.set (v);
+    assert (len == v);
+    entrySelectorZ.set (MAX (1u, _hb_bit_storage (v)) - 1);
+    searchRangeZ.set (16 * (1u << entrySelectorZ));
+    rangeShiftZ.set (v * 16 > searchRangeZ
+                     ? 16 * v - searchRangeZ
+                     : 0);
+  }
+
   protected:
-  USHORT        len;
-  USHORT        searchRangeZ;
-  USHORT        entrySelectorZ;
-  USHORT        rangeShiftZ;
+  HBUINT16      len;
+  HBUINT16      searchRangeZ;
+  HBUINT16      entrySelectorZ;
+  HBUINT16      rangeShiftZ;
 
   public:
   DEFINE_SIZE_STATIC (8);
@@ -1137,8 +1193,8 @@ struct hb_lazy_table_loader_t
   inline void init (hb_face_t *face_)
   {
     face = face_;
-    instance = nullptr;
     blob = nullptr;
+    instance = nullptr;
   }
 
   inline void fini (void)
@@ -1152,7 +1208,7 @@ struct hb_lazy_table_loader_t
     T *p = (T *) hb_atomic_ptr_get (&instance);
     if (unlikely (!p))
     {
-      hb_blob_t *blob_ = OT::Sanitizer<T>::sanitize (face->reference_table (T::tableTag));
+      hb_blob_t *blob_ = OT::Sanitizer<T>().sanitize (face->reference_table (T::tableTag));
       p = const_cast<T *>(OT::Sanitizer<T>::lock_instance (blob_));
       if (!hb_atomic_ptr_cmpexch (const_cast<T **>(&instance), nullptr, p))
       {
@@ -1169,10 +1225,10 @@ struct hb_lazy_table_loader_t
     return get();
   }
 
-  private:
   hb_face_t *face;
-  T *instance;
   mutable hb_blob_t *blob;
+  private:
+  mutable T *instance;
 };
 
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh
index 89deef871db..75db76d8ffc 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh
@@ -28,7 +28,7 @@
 #define HB_OT_CMAP_TABLE_HH
 
 #include "hb-open-type-private.hh"
-
+#include "hb-subset-plan.hh"
 
 namespace OT {
 
@@ -58,10 +58,10 @@ struct CmapSubtableFormat0
   }
 
   protected:
-  USHORT        format;         /* Format number is set to 0. */
-  USHORT        lengthZ;        /* Byte length of this subtable. */
-  USHORT        languageZ;      /* Ignore. */
-  BYTE          glyphIdArray[256];/* An array that maps character
+  HBUINT16      format;         /* Format number is set to 0. */
+  HBUINT16      lengthZ;        /* Byte length of this subtable. */
+  HBUINT16      languageZ;      /* Ignore. */
+  HBUINT8       glyphIdArray[256];/* An array that maps character
                                  * code to glyph index values. */
   public:
   DEFINE_SIZE_STATIC (6 + 256);
@@ -88,8 +88,8 @@ struct CmapSubtableFormat4
 
       /* Custom two-array bsearch. */
       int min = 0, max = (int) thiz->segCount - 1;
-      const USHORT *startCount = thiz->startCount;
-      const USHORT *endCount = thiz->endCount;
+      const HBUINT16 *startCount = thiz->startCount;
+      const HBUINT16 *endCount = thiz->endCount;
       unsigned int i;
       while (min <= max)
       {
@@ -127,11 +127,11 @@ struct CmapSubtableFormat4
       return true;
     }
 
-    const USHORT *endCount;
-    const USHORT *startCount;
-    const USHORT *idDelta;
-    const USHORT *idRangeOffset;
-    const USHORT *glyphIdArray;
+    const HBUINT16 *endCount;
+    const HBUINT16 *startCount;
+    const HBUINT16 *idDelta;
+    const HBUINT16 *idRangeOffset;
+    const HBUINT16 *glyphIdArray;
     unsigned int segCount;
     unsigned int glyphIdArrayLength;
   };
@@ -165,24 +165,24 @@ struct CmapSubtableFormat4
   }
 
   protected:
-  USHORT        format;         /* Format number is set to 4. */
-  USHORT        length;         /* This is the length in bytes of the
+  HBUINT16      format;         /* Format number is set to 4. */
+  HBUINT16      length;         /* This is the length in bytes of the
                                  * subtable. */
-  USHORT        languageZ;      /* Ignore. */
-  USHORT        segCountX2;     /* 2 x segCount. */
-  USHORT        searchRangeZ;   /* 2 * (2**floor(log2(segCount))) */
-  USHORT        entrySelectorZ; /* log2(searchRange/2) */
-  USHORT        rangeShiftZ;    /* 2 x segCount - searchRange */
+  HBUINT16      languageZ;      /* Ignore. */
+  HBUINT16      segCountX2;     /* 2 x segCount. */
+  HBUINT16      searchRangeZ;   /* 2 * (2**floor(log2(segCount))) */
+  HBUINT16      entrySelectorZ; /* log2(searchRange/2) */
+  HBUINT16      rangeShiftZ;    /* 2 x segCount - searchRange */
 
-  USHORT        values[VAR];
+  HBUINT16      values[VAR];
 #if 0
-  USHORT        endCount[segCount];     /* End characterCode for each segment,
+  HBUINT16      endCount[segCount];     /* End characterCode for each segment,
                                          * last=0xFFFFu. */
-  USHORT        reservedPad;            /* Set to 0. */
-  USHORT        startCount[segCount];   /* Start character code for each segment. */
-  SHORT         idDelta[segCount];      /* Delta for all character codes in segment. */
-  USHORT        idRangeOffset[segCount];/* Offsets into glyphIdArray or 0 */
-  USHORT        glyphIdArray[VAR];      /* Glyph index array (arbitrary length) */
+  HBUINT16      reservedPad;            /* Set to 0. */
+  HBUINT16      startCount[segCount];   /* Start character code for each segment. */
+  HBINT16               idDelta[segCount];      /* Delta for all character codes in segment. */
+  HBUINT16      idRangeOffset[segCount];/* Offsets into glyphIdArray or 0 */
+  HBUINT16      glyphIdArray[VAR];      /* Glyph index array (arbitrary length) */
 #endif
 
   public:
@@ -193,6 +193,7 @@ struct CmapSubtableLongGroup
 {
   friend struct CmapSubtableFormat12;
   friend struct CmapSubtableFormat13;
+  friend struct cmap;
 
   int cmp (hb_codepoint_t codepoint) const
   {
@@ -208,9 +209,9 @@ struct CmapSubtableLongGroup
   }
 
   private:
-  ULONG         startCharCode;  /* First character code in this group. */
-  ULONG         endCharCode;    /* Last character code in this group. */
-  ULONG         glyphID;        /* Glyph index; interpretation depends on
+  HBUINT32              startCharCode;  /* First character code in this group. */
+  HBUINT32              endCharCode;    /* Last character code in this group. */
+  HBUINT32              glyphID;        /* Glyph index; interpretation depends on
                                  * subtable format. */
   public:
   DEFINE_SIZE_STATIC (12);
@@ -247,12 +248,14 @@ struct CmapSubtableTrimmed
   DEFINE_SIZE_ARRAY (5 * sizeof (UINT), glyphIdArray);
 };
 
-struct CmapSubtableFormat6  : CmapSubtableTrimmed<USHORT> {};
-struct CmapSubtableFormat10 : CmapSubtableTrimmed<ULONG > {};
+struct CmapSubtableFormat6  : CmapSubtableTrimmed<HBUINT16> {};
+struct CmapSubtableFormat10 : CmapSubtableTrimmed<HBUINT32 > {};
 
 template <typename T>
 struct CmapSubtableLongSegmented
 {
+  friend struct cmap;
+
   inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const
   {
     int i = groups.bsearch (codepoint);
@@ -268,12 +271,22 @@ struct CmapSubtableLongSegmented
     return_trace (c->check_struct (this) && groups.sanitize (c));
   }
 
+  inline bool serialize (hb_serialize_context_t *c,
+                         hb_prealloced_array_t<CmapSubtableLongGroup> &group_data)
+  {
+    TRACE_SERIALIZE (this);
+    if (unlikely (!c->extend_min (*this))) return_trace (false);
+    Supplier<CmapSubtableLongGroup> supplier (group_data.array, group_data.len);
+    if (unlikely (!groups.serialize (c, supplier, group_data.len))) return_trace (false);
+    return true;
+  }
+
   protected:
-  USHORT        format;         /* Subtable format; set to 12. */
-  USHORT        reservedZ;      /* Reserved; set to 0. */
-  ULONG         lengthZ;        /* Byte length of this subtable. */
-  ULONG         languageZ;      /* Ignore. */
-  SortedArrayOf<CmapSubtableLongGroup, ULONG>
+  HBUINT16      format;         /* Subtable format; set to 12. */
+  HBUINT16      reservedZ;      /* Reserved; set to 0. */
+  HBUINT32              lengthZ;        /* Byte length of this subtable. */
+  HBUINT32              languageZ;      /* Ignore. */
+  SortedArrayOf<CmapSubtableLongGroup, HBUINT32>
                 groups;         /* Groupings. */
   public:
   DEFINE_SIZE_ARRAY (16, groups);
@@ -316,13 +329,13 @@ struct UnicodeValueRange
   }
 
   UINT24        startUnicodeValue;      /* First value in this range. */
-  BYTE          additionalCount;        /* Number of additional values in this
+  HBUINT8               additionalCount;        /* Number of additional values in this
                                          * range. */
   public:
   DEFINE_SIZE_STATIC (4);
 };
 
-typedef SortedArrayOf<UnicodeValueRange, ULONG> DefaultUVS;
+typedef SortedArrayOf<UnicodeValueRange, HBUINT32> DefaultUVS;
 
 struct UVSMapping
 {
@@ -343,7 +356,7 @@ struct UVSMapping
   DEFINE_SIZE_STATIC (5);
 };
 
-typedef SortedArrayOf<UVSMapping, ULONG> NonDefaultUVS;
+typedef SortedArrayOf<UVSMapping, HBUINT32> NonDefaultUVS;
 
 struct VariationSelectorRecord
 {
@@ -405,9 +418,9 @@ struct CmapSubtableFormat14
   }
 
   protected:
-  USHORT        format;         /* Format number is set to 14. */
-  ULONG         lengthZ;        /* Byte length of this subtable. */
-  SortedArrayOf<VariationSelectorRecord, ULONG>
+  HBUINT16      format;         /* Format number is set to 14. */
+  HBUINT32              lengthZ;        /* Byte length of this subtable. */
+  SortedArrayOf<VariationSelectorRecord, HBUINT32>
                 record;         /* Variation selector records; sorted
                                  * in increasing order of `varSelector'. */
   public:
@@ -422,12 +435,12 @@ struct CmapSubtable
                          hb_codepoint_t *glyph) const
   {
     switch (u.format) {
-    case  0: return u.format0 .get_glyph(codepoint, glyph);
-    case  4: return u.format4 .get_glyph(codepoint, glyph);
-    case  6: return u.format6 .get_glyph(codepoint, glyph);
-    case 10: return u.format10.get_glyph(codepoint, glyph);
-    case 12: return u.format12.get_glyph(codepoint, glyph);
-    case 13: return u.format13.get_glyph(codepoint, glyph);
+    case  0: return u.format0 .get_glyph (codepoint, glyph);
+    case  4: return u.format4 .get_glyph (codepoint, glyph);
+    case  6: return u.format6 .get_glyph (codepoint, glyph);
+    case 10: return u.format10.get_glyph (codepoint, glyph);
+    case 12: return u.format12.get_glyph (codepoint, glyph);
+    case 13: return u.format13.get_glyph (codepoint, glyph);
     case 14:
     default: return false;
     }
@@ -451,7 +464,7 @@ struct CmapSubtable
 
   public:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   CmapSubtableFormat0   format0;
   CmapSubtableFormat4   format4;
   CmapSubtableFormat6   format6;
@@ -484,8 +497,8 @@ struct EncodingRecord
                   subtable.sanitize (c, base));
   }
 
-  USHORT        platformID;     /* Platform ID. */
-  USHORT        encodingID;     /* Platform-specific encoding ID. */
+  HBUINT16      platformID;     /* Platform ID. */
+  HBUINT16      encodingID;     /* Platform-specific encoding ID. */
   LOffsetTo<CmapSubtable>
                 subtable;       /* Byte offset from beginning of table to the subtable for this encoding. */
   public:
@@ -496,6 +509,254 @@ struct cmap
 {
   static const hb_tag_t tableTag        = HB_OT_TAG_cmap;
 
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  likely (version == 0) &&
+                  encodingRecord.sanitize (c, this));
+  }
+
+  inline bool populate_groups (hb_subset_plan_t *plan,
+                               hb_prealloced_array_t<CmapSubtableLongGroup> *groups) const
+  {
+    CmapSubtableLongGroup *group = nullptr;
+    for (unsigned int i = 0; i < plan->codepoints.len; i++) {
+
+      hb_codepoint_t cp = plan->codepoints[i];
+      if (!group || cp - 1 != group->endCharCode)
+      {
+        group = groups->push ();
+        group->startCharCode.set (cp);
+        group->endCharCode.set (cp);
+        hb_codepoint_t new_gid;
+        if (unlikely (!hb_subset_plan_new_gid_for_codepoint (plan, cp, &new_gid)))
+        {
+          DEBUG_MSG(SUBSET, nullptr, "Unable to find new gid for %04x", cp);
+          return false;
+        }
+        group->glyphID.set (new_gid);
+      } else
+      {
+        group->endCharCode.set (cp);
+      }
+    }
+
+    DEBUG_MSG(SUBSET, nullptr, "cmap");
+    for (unsigned int i = 0; i < groups->len; i++) {
+      CmapSubtableLongGroup& group = (*groups)[i];
+      DEBUG_MSG(SUBSET, nullptr, "  %d: U+%04X-U+%04X, gid %d-%d", i, (uint32_t) group.startCharCode, (uint32_t) group.endCharCode, (uint32_t) group.glyphID, (uint32_t) group.glyphID + ((uint32_t) group.endCharCode - (uint32_t) group.startCharCode));
+    }
+
+    return true;
+  }
+
+  inline bool _subset (hb_prealloced_array_t<CmapSubtableLongGroup> &groups,
+                       size_t dest_sz,
+                       void *dest) const
+  {
+    hb_serialize_context_t c (dest, dest_sz);
+
+    OT::cmap *cmap = c.start_serialize<OT::cmap> ();
+    if (unlikely (!c.extend_min (*cmap)))
+    {
+      return false;
+    }
+
+    cmap->version.set (0);
+
+    if (unlikely (!cmap->encodingRecord.serialize (&c, /* numTables */ 1))) return false;
+
+    EncodingRecord &rec = cmap->encodingRecord[0];
+    rec.platformID.set (3); // Windows
+    rec.encodingID.set (10); // Unicode UCS-4
+
+    /* capture offset to subtable */
+    CmapSubtable &subtable = rec.subtable.serialize (&c, cmap);
+
+    subtable.u.format.set (12);
+
+    CmapSubtableFormat12 &format12 = subtable.u.format12;
+    if (unlikely (!c.extend_min (format12))) return false;
+
+    format12.format.set (12);
+    format12.reservedZ.set (0);
+    format12.lengthZ.set (16 + 12 * groups.len);
+
+    if (unlikely (!format12.serialize (&c, groups))) return false;
+
+    c.end_serialize ();
+
+    return true;
+  }
+
+  inline bool subset (hb_subset_plan_t *plan) const
+  {
+    hb_auto_array_t<CmapSubtableLongGroup> groups;
+
+    if (unlikely (!populate_groups (plan, &groups))) return false;
+
+    // We now know how big our blob needs to be
+    // TODO use APIs from the structs to get size?
+    size_t dest_sz = 4 // header
+                   + 8 // 1 EncodingRecord
+                   + 16 // Format 12 header
+                   + 12 * groups.len; // SequentialMapGroup records
+    void *dest = malloc (dest_sz);
+    if (unlikely (!dest)) {
+      DEBUG_MSG(SUBSET, nullptr, "Unable to alloc %lu for cmap subset output", (unsigned long) dest_sz);
+      return false;
+    }
+
+    if (unlikely (!_subset (groups, dest_sz, dest)))
+    {
+      free (dest);
+      return false;
+    }
+
+    // all done, write the blob into dest
+    hb_blob_t *cmap_prime = hb_blob_create ((const char *)dest,
+                                            dest_sz,
+                                            HB_MEMORY_MODE_READONLY,
+                                            dest,
+                                            free);
+    bool result =  hb_subset_plan_add_table (plan, HB_OT_TAG_cmap, cmap_prime);
+    hb_blob_destroy (cmap_prime);
+    return result;
+  }
+
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face)
+    {
+      this->blob = OT::Sanitizer<OT::cmap>().sanitize (face->reference_table (HB_OT_TAG_cmap));
+      const OT::cmap *cmap = OT::Sanitizer<OT::cmap>::lock_instance (this->blob);
+      const OT::CmapSubtable *subtable = nullptr;
+      const OT::CmapSubtableFormat14 *subtable_uvs = nullptr;
+
+      bool symbol = false;
+      /* 32-bit subtables. */
+      if (!subtable) subtable = cmap->find_subtable (3, 10);
+      if (!subtable) subtable = cmap->find_subtable (0, 6);
+      if (!subtable) subtable = cmap->find_subtable (0, 4);
+      /* 16-bit subtables. */
+      if (!subtable) subtable = cmap->find_subtable (3, 1);
+      if (!subtable) subtable = cmap->find_subtable (0, 3);
+      if (!subtable) subtable = cmap->find_subtable (0, 2);
+      if (!subtable) subtable = cmap->find_subtable (0, 1);
+      if (!subtable) subtable = cmap->find_subtable (0, 0);
+      if (!subtable)
+      {
+        subtable = cmap->find_subtable (3, 0);
+        if (subtable) symbol = true;
+      }
+      /* Meh. */
+      if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
+
+      /* UVS subtable. */
+      if (!subtable_uvs)
+      {
+        const OT::CmapSubtable *st = cmap->find_subtable (0, 5);
+        if (st && st->u.format == 14)
+          subtable_uvs = &st->u.format14;
+      }
+      /* Meh. */
+      if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtableFormat14);
+
+      this->uvs_table = subtable_uvs;
+
+      this->get_glyph_data = subtable;
+      if (unlikely (symbol))
+        this->get_glyph_func = get_glyph_from_symbol<OT::CmapSubtable>;
+      else
+        switch (subtable->u.format) {
+        /* Accelerate format 4 and format 12. */
+        default: this->get_glyph_func = get_glyph_from<OT::CmapSubtable>;               break;
+        case 12: this->get_glyph_func = get_glyph_from<OT::CmapSubtableFormat12>;       break;
+        case  4:
+          {
+            this->format4_accel.init (&subtable->u.format4);
+            this->get_glyph_data = &this->format4_accel;
+            this->get_glyph_func = this->format4_accel.get_glyph_func;
+          }
+          break;
+        }
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (this->blob);
+    }
+
+    inline bool get_nominal_glyph (hb_codepoint_t  unicode,
+                                   hb_codepoint_t *glyph) const
+    {
+      return this->get_glyph_func (this->get_glyph_data, unicode, glyph);
+    }
+
+    inline bool get_variation_glyph (hb_codepoint_t  unicode,
+                                     hb_codepoint_t  variation_selector,
+                                     hb_codepoint_t *glyph) const
+    {
+      switch (this->uvs_table->get_glyph_variant (unicode,
+                                                  variation_selector,
+                                                  glyph))
+      {
+        case OT::GLYPH_VARIANT_NOT_FOUND:               return false;
+        case OT::GLYPH_VARIANT_FOUND:           return true;
+        case OT::GLYPH_VARIANT_USE_DEFAULT:     break;
+      }
+
+      return get_nominal_glyph (unicode, glyph);
+    }
+
+    protected:
+    typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
+                                              hb_codepoint_t codepoint,
+                                              hb_codepoint_t *glyph);
+
+    template <typename Type>
+    static inline bool get_glyph_from (const void *obj,
+                                       hb_codepoint_t codepoint,
+                                       hb_codepoint_t *glyph)
+    {
+      const Type *typed_obj = (const Type *) obj;
+      return typed_obj->get_glyph (codepoint, glyph);
+    }
+
+    template <typename Type>
+    static inline bool get_glyph_from_symbol (const void *obj,
+                                              hb_codepoint_t codepoint,
+                                              hb_codepoint_t *glyph)
+    {
+      const Type *typed_obj = (const Type *) obj;
+      if (likely (typed_obj->get_glyph (codepoint, glyph)))
+        return true;
+
+      if (codepoint <= 0x00FFu)
+      {
+        /* For symbol-encoded OpenType fonts, we duplicate the
+         * U+F000..F0FF range at U+0000..U+00FF.  That's what
+         * Windows seems to do, and that's hinted about at:
+         * http://www.microsoft.com/typography/otspec/recom.htm
+         * under "Non-Standard (Symbol) Fonts". */
+        return typed_obj->get_glyph (0xF000u + codepoint, glyph);
+      }
+
+      return false;
+    }
+
+    private:
+    hb_cmap_get_glyph_func_t get_glyph_func;
+    const void *get_glyph_data;
+    OT::CmapSubtableFormat4::accelerator_t format4_accel;
+
+    const OT::CmapSubtableFormat14 *uvs_table;
+    hb_blob_t *blob;
+  };
+
+  protected:
+
   inline const CmapSubtable *find_subtable (unsigned int platform_id,
                                             unsigned int encoding_id) const
   {
@@ -513,15 +774,8 @@ struct cmap
     return &(this+encodingRecord[result].subtable);
   }
 
-  inline bool sanitize (hb_sanitize_context_t *c) const
-  {
-    TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) &&
-                  likely (version == 0) &&
-                  encodingRecord.sanitize (c, this));
-  }
-
-  USHORT                version;        /* Table version number (0). */
+  protected:
+  HBUINT16              version;        /* Table version number (0). */
   SortedArrayOf<EncodingRecord>
                         encodingRecord; /* Encoding tables. */
   public:
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh
similarity index 70%
rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh
rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh
index 29798923e3b..39826692bbd 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh
@@ -24,8 +24,8 @@
  * Google Author(s): Seigo Nonaka
  */
 
-#ifndef HB_OT_CBDT_TABLE_HH
-#define HB_OT_CBDT_TABLE_HH
+#ifndef HB_OT_COLOR_CBDT_TABLE_HH
+#define HB_OT_COLOR_CBDT_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -47,20 +47,20 @@ struct SmallGlyphMetrics
     extents->height = -height;
   }
 
-  BYTE height;
-  BYTE width;
-  CHAR bearingX;
-  CHAR bearingY;
-  BYTE advance;
+  HBUINT8 height;
+  HBUINT8 width;
+  HBINT8 bearingX;
+  HBINT8 bearingY;
+  HBUINT8 advance;
 
   DEFINE_SIZE_STATIC(5);
 };
 
 struct BigGlyphMetrics : SmallGlyphMetrics
 {
-  CHAR vertBearingX;
-  CHAR vertBearingY;
-  BYTE vertAdvance;
+  HBINT8 vertBearingX;
+  HBINT8 vertBearingY;
+  HBUINT8 vertAdvance;
 
   DEFINE_SIZE_STATIC(8);
 };
@@ -73,18 +73,18 @@ struct SBitLineMetrics
     return_trace (c->check_struct (this));
   }
 
-  CHAR ascender;
-  CHAR decender;
-  BYTE widthMax;
-  CHAR caretSlopeNumerator;
-  CHAR caretSlopeDenominator;
-  CHAR caretOffset;
-  CHAR minOriginSB;
-  CHAR minAdvanceSB;
-  CHAR maxBeforeBL;
-  CHAR minAfterBL;
-  CHAR padding1;
-  CHAR padding2;
+  HBINT8 ascender;
+  HBINT8 decender;
+  HBUINT8 widthMax;
+  HBINT8 caretSlopeNumerator;
+  HBINT8 caretSlopeDenominator;
+  HBINT8 caretOffset;
+  HBINT8 minOriginSB;
+  HBINT8 minAdvanceSB;
+  HBINT8 maxBeforeBL;
+  HBINT8 minAfterBL;
+  HBINT8 padding1;
+  HBINT8 padding2;
 
   DEFINE_SIZE_STATIC(12);
 };
@@ -102,9 +102,9 @@ struct IndexSubtableHeader
     return_trace (c->check_struct (this));
   }
 
-  USHORT indexFormat;
-  USHORT imageFormat;
-  ULONG imageDataOffset;
+  HBUINT16 indexFormat;
+  HBUINT16 imageFormat;
+  HBUINT32 imageDataOffset;
 
   DEFINE_SIZE_STATIC(8);
 };
@@ -137,8 +137,8 @@ struct IndexSubtableFormat1Or3
   DEFINE_SIZE_ARRAY(8, offsetArrayZ);
 };
 
-struct IndexSubtableFormat1 : IndexSubtableFormat1Or3<ULONG> {};
-struct IndexSubtableFormat3 : IndexSubtableFormat1Or3<USHORT> {};
+struct IndexSubtableFormat1 : IndexSubtableFormat1Or3<HBUINT32> {};
+struct IndexSubtableFormat3 : IndexSubtableFormat1Or3<HBUINT16> {};
 
 struct IndexSubtable
 {
@@ -214,8 +214,8 @@ struct IndexSubtableRecord
                                                    offset, length, format);
   }
 
-  USHORT firstGlyphIndex;
-  USHORT lastGlyphIndex;
+  HBUINT16 firstGlyphIndex;
+  HBUINT16 lastGlyphIndex;
   LOffsetTo<IndexSubtable> offsetToSubtable;
 
   DEFINE_SIZE_STATIC(8);
@@ -276,19 +276,19 @@ struct BitmapSizeTable
 
   protected:
   LOffsetTo<IndexSubtableArray> indexSubtableArrayOffset;
-  ULONG indexTablesSize;
-  ULONG numberOfIndexSubtables;
-  ULONG colorRef;
+  HBUINT32 indexTablesSize;
+  HBUINT32 numberOfIndexSubtables;
+  HBUINT32 colorRef;
   SBitLineMetrics horizontal;
   SBitLineMetrics vertical;
-  USHORT startGlyphIndex;
-  USHORT endGlyphIndex;
-  BYTE ppemX;
-  BYTE ppemY;
-  BYTE bitDepth;
-  CHAR flags;
+  HBUINT16 startGlyphIndex;
+  HBUINT16 endGlyphIndex;
+  HBUINT8 ppemX;
+  HBUINT8 ppemY;
+  HBUINT8 bitDepth;
+  HBINT8 flags;
 
-public:
+  public:
   DEFINE_SIZE_STATIC(48);
 };
 
@@ -300,8 +300,8 @@ public:
 struct GlyphBitmapDataFormat17
 {
   SmallGlyphMetrics glyphMetrics;
-  ULONG dataLen;
-  BYTE dataZ[VAR];
+  HBUINT32 dataLen;
+  HBUINT8 dataZ[VAR];
 
   DEFINE_SIZE_ARRAY(9, dataZ);
 };
@@ -315,6 +315,8 @@ struct GlyphBitmapDataFormat17
 
 struct CBLC
 {
+  friend struct CBDT;
+
   static const hb_tag_t tableTag = HB_OT_TAG_CBLC;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -325,7 +327,7 @@ struct CBLC
                   sizeTables.sanitize (c, this));
   }
 
-  public:
+  protected:
   const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
                                          unsigned int *x_ppem, unsigned int *y_ppem) const
   {
@@ -371,9 +373,94 @@ struct CBDT
                   likely (version.major == 2 || version.major == 3));
   }
 
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face)
+    {
+      upem = hb_face_get_upem (face);
+
+      cblc_blob = Sanitizer<CBLC>().sanitize (face->reference_table (HB_OT_TAG_CBLC));
+      cbdt_blob = Sanitizer<CBDT>().sanitize (face->reference_table (HB_OT_TAG_CBDT));
+      cbdt_len = hb_blob_get_length (cbdt_blob);
+
+      if (hb_blob_get_length (cblc_blob) == 0) {
+        cblc = nullptr;
+        cbdt = nullptr;
+        return;  /* Not a bitmap font. */
+      }
+      cblc = Sanitizer<CBLC>::lock_instance (cblc_blob);
+      cbdt = Sanitizer<CBDT>::lock_instance (cbdt_blob);
+
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (this->cblc_blob);
+      hb_blob_destroy (this->cbdt_blob);
+    }
+
+    inline bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
+    {
+      unsigned int x_ppem = upem, y_ppem = upem; /* TODO Use font ppem if available. */
+
+      if (!cblc)
+        return false;  // Not a color bitmap font.
+
+      const IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem);
+      if (!subtable_record || !x_ppem || !y_ppem)
+        return false;
+
+      if (subtable_record->get_extents (extents))
+        return true;
+
+      unsigned int image_offset = 0, image_length = 0, image_format = 0;
+      if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format))
+        return false;
+
+      {
+        if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
+          return false;
+
+        switch (image_format)
+        {
+          case 17: {
+            if (unlikely (image_length < GlyphBitmapDataFormat17::min_size))
+              return false;
+
+            const GlyphBitmapDataFormat17& glyphFormat17 =
+                StructAtOffset<GlyphBitmapDataFormat17> (this->cbdt, image_offset);
+            glyphFormat17.glyphMetrics.get_extents (extents);
+          }
+          break;
+          default:
+            // TODO: Support other image formats.
+            return false;
+        }
+      }
+
+      /* Convert to the font units. */
+      extents->x_bearing *= upem / (float) x_ppem;
+      extents->y_bearing *= upem / (float) y_ppem;
+      extents->width *= upem / (float) x_ppem;
+      extents->height *= upem / (float) y_ppem;
+
+      return true;
+    }
+
+    private:
+    hb_blob_t *cblc_blob;
+    hb_blob_t *cbdt_blob;
+    const CBLC *cblc;
+    const CBDT *cbdt;
+
+    unsigned int cbdt_len;
+    unsigned int upem;
+  };
+
+
   protected:
   FixedVersion<>version;
-  BYTE dataZ[VAR];
+  HBUINT8 dataZ[VAR];
 
   public:
   DEFINE_SIZE_ARRAY(4, dataZ);
@@ -381,4 +468,4 @@ struct CBDT
 
 } /* namespace OT */
 
-#endif /* HB_OT_CBDT_TABLE_HH */
+#endif /* HB_OT_COLOR_CBDT_TABLE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh
new file mode 100644
index 00000000000..d924fd0e37f
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2018  Ebrahim Byagowi
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+
+#ifndef HB_OT_COLOR_COLR_TABLE_HH
+#define HB_OT_COLOR_COLR_TABLE_HH
+
+#include "hb-open-type-private.hh"
+
+/*
+ * Color Palette
+ * http://www.microsoft.com/typography/otspec/colr.htm
+ */
+
+#define HB_OT_TAG_COLR HB_TAG('C','O','L','R')
+
+namespace OT {
+
+
+struct LayerRecord
+{
+  friend struct COLR;
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  GlyphID gID;                  /* Glyph ID of layer glyph */
+  HBUINT16 paletteIndex;        /* Index value to use with a selected color palette */
+  public:
+  DEFINE_SIZE_STATIC (4);
+};
+
+struct BaseGlyphRecord
+{
+  friend struct COLR;
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  GlyphID gID;                  /* Glyph ID of reference glyph */
+  HBUINT16 firstLayerIndex;     /* Index to the layer record */
+  HBUINT16 numLayers;           /* Number of color layers associated with this glyph */
+  public:
+  DEFINE_SIZE_STATIC (6);
+};
+
+struct COLR
+{
+  static const hb_tag_t tableTag = HB_OT_TAG_COLR;
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    if (!(c->check_struct (this) &&
+        c->check_array ((const void*) &layerRecordsOffsetZ, sizeof (LayerRecord), numLayerRecords) &&
+        c->check_array ((const void*) &baseGlyphRecordsZ, sizeof (BaseGlyphRecord), numBaseGlyphRecords)))
+      return_trace (false);
+
+    const BaseGlyphRecord* base_glyph_records = &baseGlyphRecordsZ (this);
+    for (unsigned int i = 0; i < numBaseGlyphRecords; ++i)
+      if (base_glyph_records[i].firstLayerIndex +
+          base_glyph_records[i].numLayers > numLayerRecords)
+        return_trace (false);
+
+    return_trace (true);
+  }
+
+  inline bool get_base_glyph_record (
+    hb_codepoint_t glyph_id, unsigned int &first_layer, unsigned int &num_layers) const
+  {
+    const BaseGlyphRecord* base_glyph_records = &baseGlyphRecordsZ (this);
+    unsigned int min = 0, max = numBaseGlyphRecords - 1;
+    while (min <= max)
+    {
+      unsigned int mid = (min + max) / 2;
+      hb_codepoint_t gID = base_glyph_records[mid].gID;
+      if (gID > glyph_id)
+        max = mid - 1;
+      else if (gID < glyph_id)
+        min = mid + 1;
+      else
+      {
+        first_layer = base_glyph_records[mid].firstLayerIndex;
+        num_layers = base_glyph_records[mid].numLayers;
+        return true;
+      }
+    }
+    return false;
+  }
+
+  inline void get_layer_record (int layer,
+    hb_codepoint_t &glyph_id, unsigned int &palette_index) const
+  {
+    const LayerRecord* records = &layerRecordsOffsetZ (this);
+    glyph_id = records[layer].gID;
+    palette_index = records[layer].paletteIndex;
+  }
+
+  protected:
+  HBUINT16      version;                /* Table version number */
+  HBUINT16      numBaseGlyphRecords;    /* Number of Base Glyph Records */
+  LOffsetTo<BaseGlyphRecord>
+                baseGlyphRecordsZ;      /* Offset to Base Glyph records. */
+  LOffsetTo<LayerRecord>
+                layerRecordsOffsetZ;    /* Offset to Layer Records */
+  HBUINT16      numLayerRecords;        /* Number of Layer Records */
+  public:
+  DEFINE_SIZE_STATIC (14);
+};
+
+} /* namespace OT */
+
+
+#endif /* HB_OT_COLOR_COLR_TABLE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh
new file mode 100644
index 00000000000..46b956435af
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh
@@ -0,0 +1,208 @@
+/*
+ * Copyright © 2016  Google, Inc.
+ * Copyright © 2018  Ebrahim Byagowi
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Sascha Brawer
+ */
+
+#ifndef HB_OT_COLOR_CPAL_TABLE_HH
+#define HB_OT_COLOR_CPAL_TABLE_HH
+
+#include "hb-open-type-private.hh"
+
+
+/*
+ * Following parts to be moved to a public header.
+ */
+
+/**
+ * hb_ot_color_t:
+ * ARGB data type for holding color values.
+ *
+ * Since: REPLACEME
+ */
+typedef uint32_t hb_ot_color_t;
+
+
+/**
+ * hb_ot_color_palette_flags_t:
+ * @HB_OT_COLOR_PALETTE_FLAG_DEFAULT: default indicating that there is nothing special to note about a color palette.
+ * @HB_OT_COLOR_PALETTE_FLAG_FOR_LIGHT_BACKGROUND: flag indicating that the color palette is suitable for rendering text on light background.
+ * @HB_OT_COLOR_PALETTE_FLAG_FOR_DARK_BACKGROUND: flag indicating that the color palette is suitable for rendering text on dark background.
+ *
+ * Since: REPLACEME
+ */
+typedef enum { /*< flags >*/
+  HB_OT_COLOR_PALETTE_FLAG_DEFAULT = 0x00000000u,
+  HB_OT_COLOR_PALETTE_FLAG_FOR_LIGHT_BACKGROUND = 0x00000001u,
+  HB_OT_COLOR_PALETTE_FLAG_FOR_DARK_BACKGROUND = 0x00000002u,
+} hb_ot_color_palette_flags_t;
+
+// HB_EXTERN unsigned int
+// hb_ot_color_get_palette_count (hb_face_t *face);
+
+// HB_EXTERN unsigned int
+// hb_ot_color_get_palette_name_id (hb_face_t *face, unsigned int palette);
+
+// HB_EXTERN hb_ot_color_palette_flags_t
+// hb_ot_color_get_palette_flags (hb_face_t *face, unsigned int palette);
+
+// HB_EXTERN unsigned int
+// hb_ot_color_get_palette_colors (hb_face_t       *face,
+//                              unsigned int     palette, /* default=0 */
+//                              unsigned int     start_offset,
+//                              unsigned int    *color_count /* IN/OUT */,
+//                              hb_ot_color_t   *colors /* OUT */);
+
+
+
+
+
+/*
+ * Color Palette
+ * http://www.microsoft.com/typography/otspec/cpal.htm
+ */
+
+#define HB_OT_TAG_CPAL HB_TAG('C','P','A','L')
+
+namespace OT {
+
+
+struct CPALV1Tail
+{
+  friend struct CPAL;
+
+  inline bool sanitize (hb_sanitize_context_t *c, unsigned int palettes) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (
+      c->check_struct (this) &&
+      c->check_array ((const void*) &paletteFlags, sizeof (HBUINT32), palettes) &&
+      c->check_array ((const void*) &paletteLabel, sizeof (HBUINT16), palettes) &&
+      c->check_array ((const void*) &paletteEntryLabel, sizeof (HBUINT16), palettes));
+  }
+
+  private:
+  inline hb_ot_color_palette_flags_t
+  get_palette_flags (const void *base, unsigned int palette) const
+  {
+    const HBUINT32* flags = &paletteFlags (base);
+    return (hb_ot_color_palette_flags_t) (uint32_t) flags[palette];
+  }
+
+  inline unsigned int
+  get_palette_name_id (const void *base, unsigned int palette) const
+  {
+    const HBUINT16* name_ids = &paletteLabel (base);
+    return name_ids[palette];
+  }
+
+  protected:
+  LOffsetTo<HBUINT32> paletteFlags;
+  LOffsetTo<HBUINT16> paletteLabel;
+  LOffsetTo<HBUINT16> paletteEntryLabel;
+  public:
+  DEFINE_SIZE_STATIC (12);
+};
+
+typedef HBUINT32 BGRAColor;
+
+struct CPAL
+{
+  static const hb_tag_t tableTag = HB_OT_TAG_CPAL;
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    if (!(c->check_struct (this) && // This checks colorRecordIndicesX sanity also, see #get_size
+        c->check_array ((const void*) &colorRecordsZ, sizeof (BGRAColor), numColorRecords)))
+      return_trace (false);
+
+    // Check for indices sanity so no need for doing it runtime
+    for (unsigned int i = 0; i < numPalettes; ++i)
+      if (colorRecordIndicesX[i] + numPaletteEntries > numColorRecords)
+        return_trace (false);
+
+    // If version is zero, we are done here; otherwise we need to check tail also
+    if (version == 0)
+      return_trace (true);
+
+    const CPALV1Tail &v1 = StructAfter<CPALV1Tail> (*this);
+    return_trace (v1.sanitize (c, numPalettes));
+  }
+
+  inline unsigned int get_size (void) const
+  {
+    return min_size + numPalettes * sizeof (HBUINT16);
+  }
+
+  inline hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette) const
+  {
+    if (version == 0 || palette >= numPalettes)
+      return HB_OT_COLOR_PALETTE_FLAG_DEFAULT;
+
+    const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
+    return cpal1.get_palette_flags (this, palette);
+  }
+
+  inline unsigned int get_palette_name_id (unsigned int palette) const
+  {
+    if (version == 0 || palette >= numPalettes)
+      return 0xFFFF;
+
+    const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
+    return cpal1.get_palette_name_id (this, palette);
+  }
+
+  inline unsigned int get_palette_count () const
+  {
+    return numPalettes;
+  }
+
+  inline hb_ot_color_t get_color_record_argb (unsigned int color_index, unsigned int palette) const
+  {
+    if (color_index >= numPaletteEntries || palette >= numPalettes)
+      return 0;
+
+    const BGRAColor* records = &colorRecordsZ(this);
+    // No need for more range check as it is already done on #sanitize
+    return records[colorRecordIndicesX[palette] + color_index];
+  }
+
+  protected:
+  HBUINT16      version;
+  /* Version 0 */
+  HBUINT16      numPaletteEntries;
+  HBUINT16      numPalettes;
+  HBUINT16      numColorRecords;
+  LOffsetTo<HBUINT32>   colorRecordsZ;
+  HBUINT16      colorRecordIndicesX[VAR];  // VAR=numPalettes
+/*CPALV1Tail    v1[VAR];*/
+  public:
+  DEFINE_SIZE_ARRAY (12, colorRecordIndicesX);
+};
+
+} /* namespace OT */
+
+
+#endif /* HB_OT_COLOR_CPAL_TABLE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc
index f9d1d11b17c..93aa2399791 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc
@@ -31,468 +31,23 @@
 #include "hb-font-private.hh"
 
 #include "hb-ot-cmap-table.hh"
-#include "hb-ot-cbdt-table.hh"
 #include "hb-ot-glyf-table.hh"
-#include "hb-ot-head-table.hh"
-#include "hb-ot-hhea-table.hh"
 #include "hb-ot-hmtx-table.hh"
 #include "hb-ot-kern-table.hh"
-#include "hb-ot-os2-table.hh"
 #include "hb-ot-post-table.hh"
-#include "hb-ot-var-hvar-table.hh"
 
+#include "hb-ot-color-cbdt-table.hh"
 
-struct hb_ot_face_metrics_accelerator_t
-{
-  unsigned int num_metrics;
-  unsigned int num_advances;
-  unsigned int default_advance;
-  unsigned short ascender;
-  unsigned short descender;
-  unsigned short line_gap;
-  bool has_font_extents;
-
-  const OT::hmtxvmtx *table;
-  hb_blob_t *blob;
-
-  const OT::HVARVVAR *var;
-  hb_blob_t *var_blob;
-
-  inline void init (hb_face_t *face,
-                    hb_tag_t _hea_tag,
-                    hb_tag_t _mtx_tag,
-                    hb_tag_t _var_tag,
-                    hb_tag_t os2_tag,
-                    unsigned int default_advance = 0)
-  {
-    this->default_advance = default_advance ? default_advance : face->get_upem ();
-
-    bool got_font_extents = false;
-    if (os2_tag)
-    {
-      hb_blob_t *os2_blob = OT::Sanitizer<OT::os2>::sanitize (face->reference_table (os2_tag));
-      const OT::os2 *os2 = OT::Sanitizer<OT::os2>::lock_instance (os2_blob);
-#define USE_TYPO_METRICS (1u<<7)
-      if (0 != (os2->fsSelection & USE_TYPO_METRICS))
-      {
-        this->ascender = os2->sTypoAscender;
-        this->descender = os2->sTypoDescender;
-        this->line_gap = os2->sTypoLineGap;
-        got_font_extents = (this->ascender | this->descender) != 0;
-      }
-      hb_blob_destroy (os2_blob);
-    }
-
-    hb_blob_t *_hea_blob = OT::Sanitizer<OT::_hea>::sanitize (face->reference_table (_hea_tag));
-    const OT::_hea *_hea = OT::Sanitizer<OT::_hea>::lock_instance (_hea_blob);
-    this->num_advances = _hea->numberOfLongMetrics;
-    if (!got_font_extents)
-    {
-      this->ascender = _hea->ascender;
-      this->descender = _hea->descender;
-      this->line_gap = _hea->lineGap;
-      got_font_extents = (this->ascender | this->descender) != 0;
-    }
-    hb_blob_destroy (_hea_blob);
-
-    this->has_font_extents = got_font_extents;
-
-    this->blob = OT::Sanitizer<OT::hmtxvmtx>::sanitize (face->reference_table (_mtx_tag));
-
-    /* Cap num_metrics() and num_advances() based on table length. */
-    unsigned int len = hb_blob_get_length (this->blob);
-    if (unlikely (this->num_advances * 4 > len))
-      this->num_advances = len / 4;
-    this->num_metrics = this->num_advances + (len - 4 * this->num_advances) / 2;
-
-    /* We MUST set num_metrics to zero if num_advances is zero.
-     * Our get_advance() depends on that. */
-    if (unlikely (!this->num_advances))
-    {
-      this->num_metrics = this->num_advances = 0;
-      hb_blob_destroy (this->blob);
-      this->blob = hb_blob_get_empty ();
-    }
-    this->table = OT::Sanitizer<OT::hmtxvmtx>::lock_instance (this->blob);
-
-    this->var_blob = OT::Sanitizer<OT::HVARVVAR>::sanitize (face->reference_table (_var_tag));
-    this->var = OT::Sanitizer<OT::HVARVVAR>::lock_instance (this->var_blob);
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->blob);
-    hb_blob_destroy (this->var_blob);
-  }
-
-  inline unsigned int get_advance (hb_codepoint_t  glyph,
-                                   hb_font_t      *font) const
-  {
-    if (unlikely (glyph >= this->num_metrics))
-    {
-      /* If this->num_metrics is zero, it means we don't have the metrics table
-       * for this direction: return default advance.  Otherwise, it means that the
-       * glyph index is out of bound: return zero. */
-      if (this->num_metrics)
-        return 0;
-      else
-        return this->default_advance;
-    }
-
-    return this->table->longMetric[MIN (glyph, (uint32_t) this->num_advances - 1)].advance
-         + this->var->get_advance_var (glyph, font->coords, font->num_coords); // TODO Optimize?!
-  }
-};
-
-struct hb_ot_face_glyf_accelerator_t
-{
-  bool short_offset;
-  unsigned int num_glyphs;
-  const OT::loca *loca;
-  const OT::glyf *glyf;
-  hb_blob_t *loca_blob;
-  hb_blob_t *glyf_blob;
-  unsigned int glyf_len;
-
-  inline void init (hb_face_t *face)
-  {
-    hb_blob_t *head_blob = OT::Sanitizer<OT::head>::sanitize (face->reference_table (HB_OT_TAG_head));
-    const OT::head *head = OT::Sanitizer<OT::head>::lock_instance (head_blob);
-    if ((unsigned int) head->indexToLocFormat > 1 || head->glyphDataFormat != 0)
-    {
-      /* Unknown format.  Leave num_glyphs=0, that takes care of disabling us. */
-      hb_blob_destroy (head_blob);
-      return;
-    }
-    this->short_offset = 0 == head->indexToLocFormat;
-    hb_blob_destroy (head_blob);
-
-    this->loca_blob = OT::Sanitizer<OT::loca>::sanitize (face->reference_table (HB_OT_TAG_loca));
-    this->loca = OT::Sanitizer<OT::loca>::lock_instance (this->loca_blob);
-    this->glyf_blob = OT::Sanitizer<OT::glyf>::sanitize (face->reference_table (HB_OT_TAG_glyf));
-    this->glyf = OT::Sanitizer<OT::glyf>::lock_instance (this->glyf_blob);
-
-    this->num_glyphs = MAX (1u, hb_blob_get_length (this->loca_blob) / (this->short_offset ? 2 : 4)) - 1;
-    this->glyf_len = hb_blob_get_length (this->glyf_blob);
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->loca_blob);
-    hb_blob_destroy (this->glyf_blob);
-  }
-
-  inline bool get_extents (hb_codepoint_t glyph,
-                           hb_glyph_extents_t *extents) const
-  {
-    if (unlikely (glyph >= this->num_glyphs))
-      return false;
-
-    unsigned int start_offset, end_offset;
-    if (this->short_offset)
-    {
-      start_offset = 2 * this->loca->u.shortsZ[glyph];
-      end_offset   = 2 * this->loca->u.shortsZ[glyph + 1];
-    }
-    else
-    {
-      start_offset = this->loca->u.longsZ[glyph];
-      end_offset   = this->loca->u.longsZ[glyph + 1];
-    }
-
-    if (start_offset > end_offset || end_offset > this->glyf_len)
-      return false;
-
-    if (end_offset - start_offset < OT::glyfGlyphHeader::static_size)
-      return true; /* Empty glyph; zero extents. */
-
-    const OT::glyfGlyphHeader &glyph_header = OT::StructAtOffset<OT::glyfGlyphHeader> (this->glyf, start_offset);
-
-    extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax);
-    extents->y_bearing = MAX (glyph_header.yMin, glyph_header.yMax);
-    extents->width     = MAX (glyph_header.xMin, glyph_header.xMax) - extents->x_bearing;
-    extents->height    = MIN (glyph_header.yMin, glyph_header.yMax) - extents->y_bearing;
-
-    return true;
-  }
-};
-
-struct hb_ot_face_cbdt_accelerator_t
-{
-  hb_blob_t *cblc_blob;
-  hb_blob_t *cbdt_blob;
-  const OT::CBLC *cblc;
-  const OT::CBDT *cbdt;
-
-  unsigned int cbdt_len;
-  unsigned int upem;
-
-  inline void init (hb_face_t *face)
-  {
-    upem = face->get_upem();
-
-    cblc_blob = OT::Sanitizer<OT::CBLC>::sanitize (face->reference_table (HB_OT_TAG_CBLC));
-    cbdt_blob = OT::Sanitizer<OT::CBDT>::sanitize (face->reference_table (HB_OT_TAG_CBDT));
-    cbdt_len = hb_blob_get_length (cbdt_blob);
-
-    if (hb_blob_get_length (cblc_blob) == 0) {
-      cblc = nullptr;
-      cbdt = nullptr;
-      return;  /* Not a bitmap font. */
-    }
-    cblc = OT::Sanitizer<OT::CBLC>::lock_instance (cblc_blob);
-    cbdt = OT::Sanitizer<OT::CBDT>::lock_instance (cbdt_blob);
-
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->cblc_blob);
-    hb_blob_destroy (this->cbdt_blob);
-  }
-
-  inline bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
-  {
-    unsigned int x_ppem = upem, y_ppem = upem; /* TODO Use font ppem if available. */
-
-    if (!cblc)
-      return false;  // Not a color bitmap font.
-
-    const OT::IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem);
-    if (!subtable_record || !x_ppem || !y_ppem)
-      return false;
-
-    if (subtable_record->get_extents (extents))
-      return true;
-
-    unsigned int image_offset = 0, image_length = 0, image_format = 0;
-    if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format))
-      return false;
-
-    {
-      /* TODO Move the following into CBDT struct when adding more formats. */
-
-      if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
-        return false;
-
-      switch (image_format)
-      {
-        case 17: {
-          if (unlikely (image_length < OT::GlyphBitmapDataFormat17::min_size))
-            return false;
-
-          const OT::GlyphBitmapDataFormat17& glyphFormat17 =
-              OT::StructAtOffset<OT::GlyphBitmapDataFormat17> (this->cbdt, image_offset);
-          glyphFormat17.glyphMetrics.get_extents (extents);
-        }
-        break;
-        default:
-          // TODO: Support other image formats.
-          return false;
-      }
-    }
-
-    /* Convert to the font units. */
-    extents->x_bearing *= upem / (float) x_ppem;
-    extents->y_bearing *= upem / (float) y_ppem;
-    extents->width *= upem / (float) x_ppem;
-    extents->height *= upem / (float) y_ppem;
-
-    return true;
-  }
-};
-
-struct hb_ot_face_post_accelerator_t
-{
-  hb_blob_t *post_blob;
-  OT::post::accelerator_t accel;
-
-  inline void init (hb_face_t *face)
-  {
-    hb_blob_t *blob = this->post_blob = OT::Sanitizer<OT::post>::sanitize (face->reference_table (HB_OT_TAG_post));
-    accel.init (OT::Sanitizer<OT::post>::lock_instance (blob), hb_blob_get_length (blob));
-  }
-
-  inline void fini (void)
-  {
-    accel.fini ();
-    hb_blob_destroy (this->post_blob);
-  }
-
-  inline bool get_glyph_name (hb_codepoint_t glyph,
-                              char *name, unsigned int size) const
-  {
-    return this->accel.get_glyph_name (glyph, name, size);
-  }
-
-  inline bool get_glyph_from_name (const char *name, int len,
-                                   hb_codepoint_t *glyph) const
-  {
-    if (unlikely (!len))
-      return false;
-
-    return this->accel.get_glyph_from_name (name, len, glyph);
-  }
-};
-
-struct hb_ot_face_kern_accelerator_t
-{
-  hb_blob_t *kern_blob;
-  OT::kern::accelerator_t accel;
-
-  inline void init (hb_face_t *face)
-  {
-    hb_blob_t *blob = this->kern_blob = OT::Sanitizer<OT::kern>::sanitize (face->reference_table (HB_OT_TAG_kern));
-    accel.init (OT::Sanitizer<OT::kern>::lock_instance (blob), hb_blob_get_length (blob));
-  }
-
-  inline void fini (void)
-  {
-    accel.fini ();
-    hb_blob_destroy (this->kern_blob);
-  }
-
-  inline int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const
-  { return accel.get_h_kerning (left, right); }
-};
-
-typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
-                                          hb_codepoint_t codepoint,
-                                          hb_codepoint_t *glyph);
-
-template <typename Type>
-static inline bool get_glyph_from (const void *obj,
-                                   hb_codepoint_t codepoint,
-                                   hb_codepoint_t *glyph)
-{
-  const Type *typed_obj = (const Type *) obj;
-  return typed_obj->get_glyph (codepoint, glyph);
-}
-
-template <typename Type>
-static inline bool get_glyph_from_symbol (const void *obj,
-                                          hb_codepoint_t codepoint,
-                                          hb_codepoint_t *glyph)
-{
-  const Type *typed_obj = (const Type *) obj;
-  if (likely (typed_obj->get_glyph (codepoint, glyph)))
-    return true;
-
-  if (codepoint <= 0x00FFu)
-  {
-    /* For symbol-encoded OpenType fonts, we duplicate the
-     * U+F000..F0FF range at U+0000..U+00FF.  That's what
-     * Windows seems to do, and that's hinted about at:
-     * http://www.microsoft.com/typography/otspec/recom.htm
-     * under "Non-Standard (Symbol) Fonts". */
-    return typed_obj->get_glyph (0xF000u + codepoint, glyph);
-  }
-
-  return false;
-}
-
-struct hb_ot_face_cmap_accelerator_t
-{
-  hb_cmap_get_glyph_func_t get_glyph_func;
-  const void *get_glyph_data;
-  OT::CmapSubtableFormat4::accelerator_t format4_accel;
-
-  const OT::CmapSubtableFormat14 *uvs_table;
-  hb_blob_t *blob;
-
-  inline void init (hb_face_t *face)
-  {
-    this->blob = OT::Sanitizer<OT::cmap>::sanitize (face->reference_table (HB_OT_TAG_cmap));
-    const OT::cmap *cmap = OT::Sanitizer<OT::cmap>::lock_instance (this->blob);
-    const OT::CmapSubtable *subtable = nullptr;
-    const OT::CmapSubtableFormat14 *subtable_uvs = nullptr;
-
-    bool symbol = false;
-    /* 32-bit subtables. */
-    if (!subtable) subtable = cmap->find_subtable (3, 10);
-    if (!subtable) subtable = cmap->find_subtable (0, 6);
-    if (!subtable) subtable = cmap->find_subtable (0, 4);
-    /* 16-bit subtables. */
-    if (!subtable) subtable = cmap->find_subtable (3, 1);
-    if (!subtable) subtable = cmap->find_subtable (0, 3);
-    if (!subtable) subtable = cmap->find_subtable (0, 2);
-    if (!subtable) subtable = cmap->find_subtable (0, 1);
-    if (!subtable) subtable = cmap->find_subtable (0, 0);
-    if (!subtable)
-    {
-      subtable = cmap->find_subtable (3, 0);
-      if (subtable) symbol = true;
-    }
-    /* Meh. */
-    if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
-
-    /* UVS subtable. */
-    if (!subtable_uvs)
-    {
-      const OT::CmapSubtable *st = cmap->find_subtable (0, 5);
-      if (st && st->u.format == 14)
-        subtable_uvs = &st->u.format14;
-    }
-    /* Meh. */
-    if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtableFormat14);
-
-    this->uvs_table = subtable_uvs;
-
-    this->get_glyph_data = subtable;
-    if (unlikely (symbol))
-      this->get_glyph_func = get_glyph_from_symbol<OT::CmapSubtable>;
-    else
-      switch (subtable->u.format) {
-      /* Accelerate format 4 and format 12. */
-      default: this->get_glyph_func = get_glyph_from<OT::CmapSubtable>;         break;
-      case 12: this->get_glyph_func = get_glyph_from<OT::CmapSubtableFormat12>; break;
-      case  4:
-        {
-          this->format4_accel.init (&subtable->u.format4);
-          this->get_glyph_data = &this->format4_accel;
-          this->get_glyph_func = this->format4_accel.get_glyph_func;
-        }
-        break;
-      }
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->blob);
-  }
-
-  inline bool get_nominal_glyph (hb_codepoint_t  unicode,
-                                 hb_codepoint_t *glyph) const
-  {
-    return this->get_glyph_func (this->get_glyph_data, unicode, glyph);
-  }
-
-  inline bool get_variation_glyph (hb_codepoint_t  unicode,
-                                   hb_codepoint_t  variation_selector,
-                                   hb_codepoint_t *glyph) const
-  {
-    switch (this->uvs_table->get_glyph_variant (unicode,
-                                                variation_selector,
-                                                glyph))
-    {
-      case OT::GLYPH_VARIANT_NOT_FOUND:         return false;
-      case OT::GLYPH_VARIANT_FOUND:             return true;
-      case OT::GLYPH_VARIANT_USE_DEFAULT:       break;
-    }
-
-    return get_nominal_glyph (unicode, glyph);
-  }
-};
 
 struct hb_ot_font_t
 {
-  hb_ot_face_cmap_accelerator_t cmap;
-  hb_ot_face_metrics_accelerator_t h_metrics;
-  hb_ot_face_metrics_accelerator_t v_metrics;
-  OT::hb_lazy_loader_t<hb_ot_face_glyf_accelerator_t> glyf;
-  OT::hb_lazy_loader_t<hb_ot_face_cbdt_accelerator_t> cbdt;
-  OT::hb_lazy_loader_t<hb_ot_face_post_accelerator_t> post;
-  OT::hb_lazy_loader_t<hb_ot_face_kern_accelerator_t> kern;
+  OT::cmap::accelerator_t cmap;
+  OT::hmtx::accelerator_t h_metrics;
+  OT::vmtx::accelerator_t v_metrics;
+  OT::hb_lazy_loader_t<OT::glyf::accelerator_t> glyf;
+  OT::hb_lazy_loader_t<OT::CBDT::accelerator_t> cbdt;
+  OT::hb_lazy_loader_t<OT::post::accelerator_t> post;
+  OT::hb_lazy_loader_t<OT::kern::accelerator_t> kern;
 };
 
 
@@ -505,9 +60,8 @@ _hb_ot_font_create (hb_face_t *face)
     return nullptr;
 
   ot_font->cmap.init (face);
-  ot_font->h_metrics.init (face, HB_OT_TAG_hhea, HB_OT_TAG_hmtx, HB_OT_TAG_HVAR, HB_OT_TAG_os2);
-  ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_OT_TAG_VVAR, HB_TAG_NONE,
-                           ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */
+  ot_font->h_metrics.init (face);
+  ot_font->v_metrics.init (face, ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */
   ot_font->glyf.init (face);
   ot_font->cbdt.init (face);
   ot_font->post.init (face);
@@ -688,7 +242,7 @@ retry:
     hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ot_get_glyph_h_kerning, nullptr, nullptr);
     //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ot_get_glyph_v_kerning, nullptr, nullptr);
     hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, nullptr, nullptr);
-    //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, nullptr, nullptr); TODO
+    //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, nullptr, nullptr);
     hb_font_funcs_set_glyph_name_func (funcs, hb_ot_get_glyph_name, nullptr, nullptr);
     hb_font_funcs_set_glyph_from_name_func (funcs, hb_ot_get_glyph_from_name, nullptr, nullptr);
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh
index cdb23939268..57b9949ad19 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh
@@ -28,7 +28,10 @@
 #define HB_OT_GLYF_TABLE_HH
 
 #include "hb-open-type-private.hh"
-
+#include "hb-ot-head-table.hh"
+#include "hb-subset-glyf.hh"
+#include "hb-subset-plan.hh"
+#include "hb-subset-private.hh"
 
 namespace OT {
 
@@ -42,6 +45,8 @@ namespace OT {
 
 struct loca
 {
+  friend struct glyf;
+
   static const hb_tag_t tableTag = HB_OT_TAG_loca;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -50,12 +55,9 @@ struct loca
     return_trace (true);
   }
 
-  public:
-  union {
-    USHORT      shortsZ[VAR];           /* Location offset divided by 2. */
-    ULONG       longsZ[VAR];            /* Location offset. */
-  } u;
-  DEFINE_SIZE_ARRAY (0, u.longsZ);
+  protected:
+  HBUINT8               dataX[VAR];             /* Location data. */
+  DEFINE_SIZE_ARRAY (0, dataX);
 };
 
 
@@ -78,26 +80,393 @@ struct glyf
     return_trace (true);
   }
 
-  public:
-  BYTE          dataX[VAR];             /* Glyphs data. */
+  inline bool subset (hb_subset_plan_t *plan) const
+  {
+    hb_blob_t *glyf_prime = nullptr;
+    hb_blob_t *loca_prime = nullptr;
+
+    bool success = true;
+    bool use_short_loca = false;
+    if (hb_subset_glyf_and_loca (plan, &use_short_loca, &glyf_prime, &loca_prime)) {
+      success = success && hb_subset_plan_add_table (plan, HB_OT_TAG_glyf, glyf_prime);
+      success = success && hb_subset_plan_add_table (plan, HB_OT_TAG_loca, loca_prime);
+      success = success && _add_head_and_set_loca_version (plan->source, use_short_loca, plan->dest);
+    } else {
+      success = false;
+    }
+    hb_blob_destroy (loca_prime);
+    hb_blob_destroy (glyf_prime);
+
+    return success;
+  }
+
+  static bool
+  _add_head_and_set_loca_version (hb_face_t *source, bool use_short_loca, hb_face_t *dest)
+  {
+    hb_blob_t *head_blob = OT::Sanitizer<OT::head>().sanitize (hb_face_reference_table (source, HB_OT_TAG_head));
+    hb_blob_t *head_prime_blob = hb_blob_copy_writable_or_fail (head_blob);
+    hb_blob_destroy (head_blob);
+
+    if (unlikely (!head_prime_blob))
+      return false;
+
+    OT::head *head_prime = (OT::head *) hb_blob_get_data_writable (head_prime_blob, nullptr);
+    head_prime->indexToLocFormat.set (use_short_loca ? 0 : 1);
+    bool success = hb_subset_face_add_table (dest, HB_OT_TAG_head, head_prime_blob);
+
+    hb_blob_destroy (head_prime_blob);
+    return success;
+  }
+
+  struct GlyphHeader
+  {
+    HBINT16             numberOfContours;       /* If the number of contours is
+                                                 * greater than or equal to zero,
+                                                 * this is a simple glyph; if negative,
+                                                 * this is a composite glyph. */
+    FWORD               xMin;                   /* Minimum x for coordinate data. */
+    FWORD               yMin;                   /* Minimum y for coordinate data. */
+    FWORD               xMax;                   /* Maximum x for coordinate data. */
+    FWORD               yMax;                   /* Maximum y for coordinate data. */
+
+    DEFINE_SIZE_STATIC (10);
+  };
+
+  struct CompositeGlyphHeader
+  {
+    static const uint16_t ARG_1_AND_2_ARE_WORDS =      0x0001;
+    static const uint16_t ARGS_ARE_XY_VALUES =         0x0002;
+    static const uint16_t ROUND_XY_TO_GRID =           0x0004;
+    static const uint16_t WE_HAVE_A_SCALE =            0x0008;
+    static const uint16_t MORE_COMPONENTS =            0x0020;
+    static const uint16_t WE_HAVE_AN_X_AND_Y_SCALE =   0x0040;
+    static const uint16_t WE_HAVE_A_TWO_BY_TWO =       0x0080;
+    static const uint16_t WE_HAVE_INSTRUCTIONS =       0x0100;
+    static const uint16_t USE_MY_METRICS =             0x0200;
+    static const uint16_t OVERLAP_COMPOUND =           0x0400;
+    static const uint16_t SCALED_COMPONENT_OFFSET =    0x0800;
+    static const uint16_t UNSCALED_COMPONENT_OFFSET =  0x1000;
+
+    HBUINT16 flags;
+    HBUINT16 glyphIndex;
+
+    inline unsigned int get_size (void) const
+    {
+      unsigned int size = min_size;
+      if (flags & ARG_1_AND_2_ARE_WORDS) {
+        // arg1 and 2 are int16
+        size += 4;
+      } else {
+        // arg1 and 2 are int8
+        size += 2;
+      }
+      if (flags & WE_HAVE_A_SCALE) {
+        // One x 16 bit (scale)
+        size += 2;
+      } else if (flags & WE_HAVE_AN_X_AND_Y_SCALE) {
+        // Two x 16 bit (xscale, yscale)
+        size += 4;
+      } else if (flags & WE_HAVE_A_TWO_BY_TWO) {
+        // Four x 16 bit (xscale, scale01, scale10, yscale)
+        size += 8;
+      }
+      return size;
+    }
+
+    struct Iterator
+    {
+      const char *glyph_start;
+      const char *glyph_end;
+      const CompositeGlyphHeader *current;
+
+      inline bool move_to_next ()
+      {
+        if (current->flags & CompositeGlyphHeader::MORE_COMPONENTS)
+        {
+          const CompositeGlyphHeader *possible =
+            &StructAfter<CompositeGlyphHeader, CompositeGlyphHeader> (*current);
+          if (!in_range (possible))
+            return false;
+          current = possible;
+          return true;
+        }
+        return false;
+      }
+
+      inline bool in_range (const CompositeGlyphHeader *composite) const
+      {
+        return (const char *) composite >= glyph_start
+          && ((const char *) composite + CompositeGlyphHeader::min_size) <= glyph_end
+          && ((const char *) composite + composite->get_size()) <= glyph_end;
+      }
+    };
+
+    static inline bool get_iterator (const char * glyph_data,
+                                     unsigned int length,
+                                     CompositeGlyphHeader::Iterator *iterator /* OUT */)
+    {
+      if (length < GlyphHeader::static_size)
+        return false; /* Empty glyph; zero extents. */
+
+      const GlyphHeader &glyph_header = StructAtOffset<GlyphHeader> (glyph_data, 0);
+      if (glyph_header.numberOfContours < 0)
+      {
+        const CompositeGlyphHeader *possible =
+          &StructAfter<CompositeGlyphHeader, GlyphHeader> (glyph_header);
+
+        iterator->glyph_start = glyph_data;
+        iterator->glyph_end = (const char *) glyph_data + length;
+        if (!iterator->in_range (possible))
+          return false;
+        iterator->current = possible;
+        return true;
+      }
+
+      return false;
+    }
+
+    DEFINE_SIZE_MIN (4);
+  };
+
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face)
+    {
+      hb_blob_t *head_blob = Sanitizer<head>().sanitize (face->reference_table (HB_OT_TAG_head));
+      const head *head_table = Sanitizer<head>::lock_instance (head_blob);
+      if ((unsigned int) head_table->indexToLocFormat > 1 || head_table->glyphDataFormat != 0)
+      {
+        /* Unknown format.  Leave num_glyphs=0, that takes care of disabling us. */
+        hb_blob_destroy (head_blob);
+        return;
+      }
+      short_offset = 0 == head_table->indexToLocFormat;
+      hb_blob_destroy (head_blob);
+
+      loca_blob = Sanitizer<loca>().sanitize (face->reference_table (HB_OT_TAG_loca));
+      loca_table = Sanitizer<loca>::lock_instance (loca_blob);
+      glyf_blob = Sanitizer<glyf>().sanitize (face->reference_table (HB_OT_TAG_glyf));
+      glyf_table = Sanitizer<glyf>::lock_instance (glyf_blob);
+
+      num_glyphs = MAX (1u, hb_blob_get_length (loca_blob) / (short_offset ? 2 : 4)) - 1;
+      glyf_len = hb_blob_get_length (glyf_blob);
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (loca_blob);
+      hb_blob_destroy (glyf_blob);
+    }
+
+    /*
+     * Returns true if the referenced glyph is a valid glyph and a composite glyph.
+     * If true is returned a pointer to the composite glyph will be written into
+     * composite.
+     */
+    inline bool get_composite (hb_codepoint_t glyph,
+                               CompositeGlyphHeader::Iterator *composite /* OUT */) const
+    {
+      unsigned int start_offset, end_offset;
+      if (!get_offsets (glyph, &start_offset, &end_offset))
+        return false; /* glyph not found */
+
+      return CompositeGlyphHeader::get_iterator ((const char*) this->glyf_table + start_offset,
+                                                 end_offset - start_offset,
+                                                 composite);
+    }
+
+    /* based on FontTools _g_l_y_f.py::trim */
+    inline bool remove_padding(unsigned int start_offset,
+                               unsigned int *end_offset) const
+    {
+      static const int FLAG_X_SHORT = 0x02;
+      static const int FLAG_Y_SHORT = 0x04;
+      static const int FLAG_REPEAT = 0x08;
+      static const int FLAG_X_SAME = 0x10;
+      static const int FLAG_Y_SAME = 0x20;
+
+      if (*end_offset - start_offset < GlyphHeader::static_size)
+        return true;
+
+      const char *glyph = ((const char *) glyf_table) + start_offset;
+      const char * const glyph_end = glyph + (*end_offset - start_offset);
+      const GlyphHeader &glyph_header = StructAtOffset<GlyphHeader> (glyph, 0);
+      int16_t num_contours = (int16_t) glyph_header.numberOfContours;
+
+      if (num_contours < 0)
+        /* Trimming for composites not implemented.
+         * If removing hints it falls out of that. */
+        return true;
+      else if (num_contours > 0)
+      {
+        /* simple glyph w/contours, possibly trimmable */
+        glyph += GlyphHeader::static_size + 2 * num_contours;
+
+        if (unlikely (glyph + 2 >= glyph_end)) return false;
+        uint16_t nCoordinates = (uint16_t) StructAtOffset<HBUINT16>(glyph - 2, 0) + 1;
+        uint16_t nInstructions = (uint16_t) StructAtOffset<HBUINT16>(glyph, 0);
+
+        glyph += 2 + nInstructions;
+        if (unlikely (glyph + 2 >= glyph_end)) return false;
+
+        unsigned int coordBytes = 0;
+        unsigned int coordsWithFlags = 0;
+        while (glyph < glyph_end)
+        {
+          uint8_t flag = (uint8_t) *glyph;
+          glyph++;
+
+          unsigned int repeat = 1;
+          if (flag & FLAG_REPEAT)
+          {
+            if (glyph >= glyph_end)
+            {
+              DEBUG_MSG(SUBSET, nullptr, "Bad flag");
+              return false;
+            }
+            repeat = ((uint8_t) *glyph) + 1;
+            glyph++;
+          }
+
+          unsigned int xBytes, yBytes;
+          xBytes = yBytes = 0;
+          if (flag & FLAG_X_SHORT)
+            xBytes = 1;
+          else if ((flag & FLAG_X_SAME) == 0)
+            xBytes = 2;
+
+          if (flag & FLAG_Y_SHORT)
+            yBytes = 1;
+          else if ((flag & FLAG_Y_SAME) == 0)
+            yBytes = 2;
+
+          coordBytes += (xBytes + yBytes) * repeat;
+          coordsWithFlags += repeat;
+          if (coordsWithFlags >= nCoordinates)
+            break;
+        }
+
+        if (coordsWithFlags != nCoordinates)
+        {
+          DEBUG_MSG(SUBSET, nullptr, "Expect %d coords to have flags, got flags for %d", nCoordinates, coordsWithFlags);
+          return false;
+        }
+        glyph += coordBytes;
+
+        if (glyph < glyph_end)
+          *end_offset -= glyph_end - glyph;
+      }
+      return true;
+    }
+
+    inline bool get_offsets (hb_codepoint_t  glyph,
+                             unsigned int   *start_offset /* OUT */,
+                             unsigned int   *end_offset   /* OUT */) const
+    {
+      if (unlikely (glyph >= num_glyphs))
+        return false;
+
+      if (short_offset)
+      {
+        const HBUINT16 *offsets = (const HBUINT16 *) loca_table->dataX;
+        *start_offset = 2 * offsets[glyph];
+        *end_offset   = 2 * offsets[glyph + 1];
+      }
+      else
+      {
+        const HBUINT32 *offsets = (const HBUINT32 *) loca_table->dataX;
+
+        *start_offset = offsets[glyph];
+        *end_offset   = offsets[glyph + 1];
+      }
+
+      if (*start_offset > *end_offset || *end_offset > glyf_len)
+        return false;
+
+      return true;
+    }
+
+    inline bool get_instruction_offsets(unsigned int start_offset,
+                                        unsigned int end_offset,
+                                        unsigned int *instruction_start /* OUT */,
+                                        unsigned int *instruction_end /* OUT */) const
+    {
+      if (end_offset - start_offset < GlyphHeader::static_size)
+      {
+        *instruction_start = 0;
+        *instruction_end = 0;
+        return true; /* Empty glyph; no instructions. */
+      }
+      const GlyphHeader &glyph_header = StructAtOffset<GlyphHeader> (glyf_table, start_offset);
+      int16_t num_contours = (int16_t) glyph_header.numberOfContours;
+      if (num_contours < 0)
+      {
+        CompositeGlyphHeader::Iterator composite_it;
+        if (unlikely (!CompositeGlyphHeader::get_iterator (
+            (const char*) this->glyf_table + start_offset,
+             end_offset - start_offset, &composite_it))) return false;
+        const CompositeGlyphHeader *last;
+        do {
+          last = composite_it.current;
+        } while (composite_it.move_to_next());
+
+        if ( (uint16_t) last->flags & CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS)
+          *instruction_start = ((char *) last - (char *) glyf_table->dataX) + last->get_size();
+        else
+          *instruction_start = end_offset;
+        *instruction_end = end_offset;
+        if (unlikely (*instruction_start > *instruction_end))
+        {
+          DEBUG_MSG(SUBSET, nullptr, "Invalid instruction offset, %d is outside [%d, %d]", *instruction_start, start_offset, end_offset);
+          return false;
+        }
+      }
+      else
+      {
+        unsigned int instruction_length_offset = start_offset + GlyphHeader::static_size + 2 * num_contours;
+        const HBUINT16 &instruction_length = StructAtOffset<HBUINT16> (glyf_table, instruction_length_offset);
+        *instruction_start = instruction_length_offset + 2;
+        *instruction_end = *instruction_start + (uint16_t) instruction_length;
+      }
+      return true;
+    }
+
+    inline bool get_extents (hb_codepoint_t glyph,
+                             hb_glyph_extents_t *extents) const
+    {
+      unsigned int start_offset, end_offset;
+      if (!get_offsets (glyph, &start_offset, &end_offset))
+        return false;
+
+      if (end_offset - start_offset < GlyphHeader::static_size)
+        return true; /* Empty glyph; zero extents. */
+
+      const GlyphHeader &glyph_header = StructAtOffset<GlyphHeader> (glyf_table, start_offset);
+
+      extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax);
+      extents->y_bearing = MAX (glyph_header.yMin, glyph_header.yMax);
+      extents->width     = MAX (glyph_header.xMin, glyph_header.xMax) - extents->x_bearing;
+      extents->height    = MIN (glyph_header.yMin, glyph_header.yMax) - extents->y_bearing;
+
+      return true;
+    }
+
+    private:
+    bool short_offset;
+    unsigned int num_glyphs;
+    const loca *loca_table;
+    const glyf *glyf_table;
+    hb_blob_t *loca_blob;
+    hb_blob_t *glyf_blob;
+    unsigned int glyf_len;
+  };
+
+  protected:
+  HBUINT8               dataX[VAR];             /* Glyphs data. */
 
   DEFINE_SIZE_ARRAY (0, dataX);
 };
 
-struct glyfGlyphHeader
-{
-  SHORT         numberOfContours;       /* If the number of contours is
-                                         * greater than or equal to zero,
-                                         * this is a simple glyph; if negative,
-                                         * this is a composite glyph. */
-  FWORD         xMin;                   /* Minimum x for coordinate data. */
-  FWORD         yMin;                   /* Minimum y for coordinate data. */
-  FWORD         xMax;                   /* Maximum x for coordinate data. */
-  FWORD         yMax;                   /* Maximum y for coordinate data. */
-
-  DEFINE_SIZE_STATIC (10);
-};
-
 } /* namespace OT */
 
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh
index 16d18c8f243..b64c2a362f9 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh
@@ -43,6 +43,8 @@ namespace OT {
 
 struct head
 {
+  friend struct OffsetTable;
+
   static const hb_tag_t tableTag        = HB_OT_TAG_head;
 
   inline unsigned int get_upem (void) const
@@ -64,11 +66,11 @@ struct head
   FixedVersion<>version;                /* Version of the head table--currently
                                          * 0x00010000u for version 1.0. */
   FixedVersion<>fontRevision;           /* Set by font manufacturer. */
-  ULONG         checkSumAdjustment;     /* To compute: set it to 0, sum the
-                                         * entire font as ULONG, then store
+  HBUINT32      checkSumAdjustment;     /* To compute: set it to 0, sum the
+                                         * entire font as HBUINT32, then store
                                          * 0xB1B0AFBAu - sum. */
-  ULONG         magicNumber;            /* Set to 0x5F0F3CF5u. */
-  USHORT        flags;                  /* Bit 0: Baseline for font at y=0;
+  HBUINT32      magicNumber;            /* Set to 0x5F0F3CF5u. */
+  HBUINT16      flags;                  /* Bit 0: Baseline for font at y=0;
                                          * Bit 1: Left sidebearing point at x=0;
                                          * Bit 2: Instructions may depend on point size;
                                          * Bit 3: Force ppem to integer values for all
@@ -76,7 +78,6 @@ struct head
                                          *   ppem sizes if this bit is clear;
                                          * Bit 4: Instructions may alter advance width
                                          *   (the advance widths might not scale linearly);
-
                                          * Bits 5-10: These should be set according to
                                          *   Apple's specification. However, they are not
                                          *   implemented in OpenType.
@@ -96,7 +97,6 @@ struct head
                                          *   contains any strong right-to-left glyphs.
                                          * Bit 10: This bit should be set if the font
                                          *   contains Indic-style rearrangement effects.
-
                                          * Bit 11: Font data is 'lossless,' as a result
                                          *   of having been compressed and decompressed
                                          *   with the Agfa MicroType Express engine.
@@ -114,18 +114,18 @@ struct head
                                          * encoded in the cmap subtables represent proper
                                          * support for those code points.
                                          * Bit 15: Reserved, set to 0. */
-  USHORT        unitsPerEm;             /* Valid range is from 16 to 16384. This value
+  HBUINT16      unitsPerEm;             /* Valid range is from 16 to 16384. This value
                                          * should be a power of 2 for fonts that have
                                          * TrueType outlines. */
   LONGDATETIME  created;                /* Number of seconds since 12:00 midnight,
                                            January 1, 1904. 64-bit integer */
   LONGDATETIME  modified;               /* Number of seconds since 12:00 midnight,
                                            January 1, 1904. 64-bit integer */
-  SHORT         xMin;                   /* For all glyph bounding boxes. */
-  SHORT         yMin;                   /* For all glyph bounding boxes. */
-  SHORT         xMax;                   /* For all glyph bounding boxes. */
-  SHORT         yMax;                   /* For all glyph bounding boxes. */
-  USHORT        macStyle;               /* Bit 0: Bold (if set to 1);
+  HBINT16       xMin;                   /* For all glyph bounding boxes. */
+  HBINT16       yMin;                   /* For all glyph bounding boxes. */
+  HBINT16       xMax;                   /* For all glyph bounding boxes. */
+  HBINT16       yMax;                   /* For all glyph bounding boxes. */
+  HBUINT16      macStyle;               /* Bit 0: Bold (if set to 1);
                                          * Bit 1: Italic (if set to 1)
                                          * Bit 2: Underline (if set to 1)
                                          * Bit 3: Outline (if set to 1)
@@ -133,16 +133,16 @@ struct head
                                          * Bit 5: Condensed (if set to 1)
                                          * Bit 6: Extended (if set to 1)
                                          * Bits 7-15: Reserved (set to 0). */
-  USHORT        lowestRecPPEM;          /* Smallest readable size in pixels. */
-  SHORT         fontDirectionHint;      /* Deprecated (Set to 2).
+  HBUINT16      lowestRecPPEM;          /* Smallest readable size in pixels. */
+  HBINT16       fontDirectionHint;      /* Deprecated (Set to 2).
                                          * 0: Fully mixed directional glyphs;
                                          * 1: Only strongly left to right;
                                          * 2: Like 1 but also contains neutrals;
                                          * -1: Only strongly right to left;
                                          * -2: Like -1 but also contains neutrals. */
   public:
-  SHORT         indexToLocFormat;       /* 0 for short offsets, 1 for long. */
-  SHORT         glyphDataFormat;        /* 0 for current format. */
+  HBINT16       indexToLocFormat;       /* 0 for short offsets, 1 for long. */
+  HBINT16       glyphDataFormat;        /* 0 for current format. */
 
   DEFINE_SIZE_STATIC (54);
 };
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh
index c63f4668a42..aa3d406f6d5 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh
@@ -41,14 +41,9 @@ namespace OT {
 #define HB_OT_TAG_hhea HB_TAG('h','h','e','a')
 #define HB_OT_TAG_vhea HB_TAG('v','h','e','a')
 
-
+template <typename T>
 struct _hea
 {
-  static const hb_tag_t tableTag = HB_TAG('_','h','e','a');
-
-  static const hb_tag_t hheaTag = HB_OT_TAG_hhea;
-  static const hb_tag_t vheaTag = HB_OT_TAG_vhea;
-
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -69,30 +64,30 @@ struct _hea
                                          * (xMax - xMin)) for horizontal. */
   FWORD         maxExtent;              /* horizontal: Max(lsb + (xMax - xMin)),
                                          * vertical: minLeadingBearing+(yMax-yMin). */
-  SHORT         caretSlopeRise;         /* Used to calculate the slope of the
+  HBINT16               caretSlopeRise;         /* Used to calculate the slope of the
                                          * cursor (rise/run); 1 for vertical caret,
                                          * 0 for horizontal.*/
-  SHORT         caretSlopeRun;          /* 0 for vertical caret, 1 for horizontal. */
-  SHORT         caretOffset;            /* The amount by which a slanted
+  HBINT16               caretSlopeRun;          /* 0 for vertical caret, 1 for horizontal. */
+  HBINT16               caretOffset;            /* The amount by which a slanted
                                          * highlight on a glyph needs
                                          * to be shifted to produce the
                                          * best appearance. Set to 0 for
                                          * non-slanted fonts. */
-  SHORT         reserved1;              /* Set to 0. */
-  SHORT         reserved2;              /* Set to 0. */
-  SHORT         reserved3;              /* Set to 0. */
-  SHORT         reserved4;              /* Set to 0. */
-  SHORT         metricDataFormat;       /* 0 for current format. */
-  USHORT        numberOfLongMetrics;    /* Number of LongMetric entries in metric
+  HBINT16               reserved1;              /* Set to 0. */
+  HBINT16               reserved2;              /* Set to 0. */
+  HBINT16               reserved3;              /* Set to 0. */
+  HBINT16               reserved4;              /* Set to 0. */
+  HBINT16               metricDataFormat;       /* 0 for current format. */
+  HBUINT16      numberOfLongMetrics;    /* Number of LongMetric entries in metric
                                          * table. */
   public:
   DEFINE_SIZE_STATIC (36);
 };
 
-struct hhea : _hea {
+struct hhea : _hea<hhea> {
   static const hb_tag_t tableTag        = HB_OT_TAG_hhea;
 };
-struct vhea : _hea {
+struct vhea : _hea<vhea> {
   static const hb_tag_t tableTag        = HB_OT_TAG_vhea;
 };
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh
index 591b0c93b0a..305faa94fb8 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh
@@ -21,13 +21,16 @@
  * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- * Google Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod, Roderick Sheeter
  */
 
 #ifndef HB_OT_HMTX_TABLE_HH
 #define HB_OT_HMTX_TABLE_HH
 
 #include "hb-open-type-private.hh"
+#include "hb-ot-hhea-table.hh"
+#include "hb-ot-os2-table.hh"
+#include "hb-ot-var-hvar-table.hh"
 
 
 namespace OT {
@@ -50,11 +53,9 @@ struct LongMetric
   DEFINE_SIZE_STATIC (4);
 };
 
+template <typename T, typename H>
 struct hmtxvmtx
 {
-  static const hb_tag_t hmtxTag = HB_OT_TAG_hmtx;
-  static const hb_tag_t vmtxTag = HB_OT_TAG_vmtx;
-
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -63,7 +64,228 @@ struct hmtxvmtx
     return_trace (true);
   }
 
-  public:
+
+  inline bool subset_update_header (hb_subset_plan_t *plan,
+                                    unsigned int num_hmetrics) const
+  {
+    hb_blob_t *src_blob = OT::Sanitizer<H> ().sanitize (plan->source->reference_table (H::tableTag));
+    hb_blob_t *dest_blob = hb_blob_copy_writable_or_fail(src_blob);
+    hb_blob_destroy (src_blob);
+
+    if (unlikely (!dest_blob)) {
+      return false;
+    }
+
+    unsigned int length;
+    H *table = (H *) hb_blob_get_data (dest_blob, &length);
+    table->numberOfLongMetrics.set (num_hmetrics);
+
+    bool result = hb_subset_plan_add_table (plan, H::tableTag, dest_blob);
+    hb_blob_destroy (dest_blob);
+
+    return result;
+  }
+
+  inline bool subset (hb_subset_plan_t *plan) const
+  {
+    typename T::accelerator_t _mtx;
+    _mtx.init (plan->source);
+
+    /* All the trailing glyphs with the same advance can use one LongMetric
+     * and just keep LSB */
+    hb_prealloced_array_t<hb_codepoint_t> &gids = plan->gids_to_retain_sorted;
+    unsigned int num_advances = gids.len;
+    unsigned int last_advance = _mtx.get_advance (gids[num_advances - 1]);
+    while (num_advances > 1
+        && last_advance == _mtx.get_advance (gids[num_advances - 2]))
+    {
+      num_advances--;
+    }
+
+    /* alloc the new table */
+    size_t dest_sz = num_advances * 4
+                  + (gids.len - num_advances) * 2;
+    void *dest = (void *) malloc (dest_sz);
+    if (unlikely (!dest))
+    {
+      return false;
+    }
+    DEBUG_MSG(SUBSET, nullptr, "%c%c%c%c in src has %d advances, %d lsbs", HB_UNTAG(T::tableTag), _mtx.num_advances, _mtx.num_metrics - _mtx.num_advances);
+    DEBUG_MSG(SUBSET, nullptr, "%c%c%c%c in dest has %d advances, %d lsbs, %u bytes", HB_UNTAG(T::tableTag), num_advances, gids.len - num_advances, (unsigned int) dest_sz);
+
+    const char *source_table = hb_blob_get_data (_mtx.blob, nullptr);
+    // Copy everything over
+    LongMetric * old_metrics = (LongMetric *) source_table;
+    FWORD *lsbs = (FWORD *) (old_metrics + _mtx.num_advances);
+    char * dest_pos = (char *) dest;
+    for (unsigned int i = 0; i < gids.len; i++)
+    {
+      /* the last metric or the one for gids[i] */
+      LongMetric *src_metric = old_metrics + MIN ((hb_codepoint_t) _mtx.num_advances - 1, gids[i]);
+      if (gids[i] < _mtx.num_advances)
+      {
+        /* src is a LongMetric */
+        if (i < num_advances)
+        {
+          /* dest is a LongMetric, copy it */
+          *((LongMetric *) dest_pos) = *src_metric;
+        }
+        else
+        {
+          /* dest just lsb */
+          *((FWORD *) dest_pos) = src_metric->lsb;
+        }
+      }
+      else
+      {
+        FWORD src_lsb = *(lsbs + gids[i] - _mtx.num_advances);
+        if (i < num_advances)
+        {
+          /* dest needs a full LongMetric */
+          LongMetric *metric = (LongMetric *)dest_pos;
+          metric->advance = src_metric->advance;
+          metric->lsb = src_lsb;
+        }
+        else
+        {
+          /* dest just needs an lsb */
+          *((FWORD *) dest_pos) = src_lsb;
+        }
+      }
+      dest_pos += (i < num_advances ? 4 : 2);
+    }
+    _mtx.fini ();
+
+    // Amend header num hmetrics
+    if (unlikely (!subset_update_header (plan, num_advances)))
+    {
+      free (dest);
+      return false;
+    }
+
+    hb_blob_t *result = hb_blob_create ((const char *)dest,
+                                        dest_sz,
+                                        HB_MEMORY_MODE_READONLY,
+                                        dest,
+                                        free);
+    bool success = hb_subset_plan_add_table (plan, T::tableTag, result);
+    hb_blob_destroy (result);
+    return success;
+  }
+
+  struct accelerator_t
+  {
+    friend struct hmtxvmtx;
+
+    inline void init (hb_face_t *face,
+                      unsigned int default_advance_ = 0)
+    {
+      default_advance = default_advance_ ? default_advance_ : hb_face_get_upem (face);
+
+      bool got_font_extents = false;
+      if (T::os2Tag)
+      {
+        hb_blob_t *os2_blob = Sanitizer<os2> ().sanitize (face->reference_table (T::os2Tag));
+        const os2 *os2_table = Sanitizer<os2>::lock_instance (os2_blob);
+#define USE_TYPO_METRICS (1u<<7)
+        if (0 != (os2_table->fsSelection & USE_TYPO_METRICS))
+        {
+          ascender = os2_table->sTypoAscender;
+          descender = os2_table->sTypoDescender;
+          line_gap = os2_table->sTypoLineGap;
+          got_font_extents = (ascender | descender) != 0;
+        }
+        hb_blob_destroy (os2_blob);
+      }
+
+      hb_blob_t *_hea_blob = Sanitizer<H> ().sanitize (face->reference_table (H::tableTag));
+      const H *_hea_table = Sanitizer<H>::lock_instance (_hea_blob);
+      num_advances = _hea_table->numberOfLongMetrics;
+      if (!got_font_extents)
+      {
+        ascender = _hea_table->ascender;
+        descender = _hea_table->descender;
+        line_gap = _hea_table->lineGap;
+        got_font_extents = (ascender | descender) != 0;
+      }
+      hb_blob_destroy (_hea_blob);
+
+      has_font_extents = got_font_extents;
+
+      blob = Sanitizer<hmtxvmtx> ().sanitize (face->reference_table (T::tableTag));
+
+      /* Cap num_metrics() and num_advances() based on table length. */
+      unsigned int len = hb_blob_get_length (blob);
+      if (unlikely (num_advances * 4 > len))
+        num_advances = len / 4;
+      num_metrics = num_advances + (len - 4 * num_advances) / 2;
+
+      /* We MUST set num_metrics to zero if num_advances is zero.
+       * Our get_advance() depends on that. */
+      if (unlikely (!num_advances))
+      {
+        num_metrics = num_advances = 0;
+        hb_blob_destroy (blob);
+        blob = hb_blob_get_empty ();
+      }
+      table = Sanitizer<hmtxvmtx>::lock_instance (blob);
+
+      var_blob = Sanitizer<HVARVVAR> ().sanitize (face->reference_table (T::variationsTag));
+      var_table = Sanitizer<HVARVVAR>::lock_instance (var_blob);
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (blob);
+      hb_blob_destroy (var_blob);
+    }
+
+    inline unsigned int get_advance (hb_codepoint_t  glyph) const
+    {
+      if (unlikely (glyph >= num_metrics))
+      {
+        /* If num_metrics is zero, it means we don't have the metrics table
+         * for this direction: return default advance.  Otherwise, it means that the
+         * glyph index is out of bound: return zero. */
+        if (num_metrics)
+          return 0;
+        else
+          return default_advance;
+      }
+
+      return table->longMetric[MIN (glyph, (uint32_t) num_advances - 1)].advance;
+    }
+
+    inline unsigned int get_advance (hb_codepoint_t  glyph,
+                                     hb_font_t      *font) const
+    {
+      unsigned int advance = get_advance (glyph);
+      if (likely(glyph < num_metrics))
+      {
+        advance += (font->num_coords ? var_table->get_advance_var (glyph, font->coords, font->num_coords) : 0); // TODO Optimize?!
+      }
+      return advance;
+    }
+
+    public:
+    bool has_font_extents;
+    unsigned short ascender;
+    unsigned short descender;
+    unsigned short line_gap;
+
+    protected:
+    unsigned int num_metrics;
+    unsigned int num_advances;
+    unsigned int default_advance;
+
+    private:
+    const hmtxvmtx *table;
+    hb_blob_t *blob;
+    const HVARVVAR *var_table;
+    hb_blob_t *var_blob;
+  };
+
+  protected:
   LongMetric    longMetric[VAR];        /* Paired advance width and leading
                                          * bearing values for each glyph. The
                                          * value numOfHMetrics comes from
@@ -72,7 +294,7 @@ struct hmtxvmtx
                                          * be in the array, but that entry is
                                          * required. The last entry applies to
                                          * all subsequent glyphs. */
-  FWORD         leadingBearingX[VAR];   /* Here the advance is assumed
+/*FWORD         leadingBearingX[VAR];*/ /* Here the advance is assumed
                                          * to be the same as the advance
                                          * for the last entry above. The
                                          * number of entries in this array is
@@ -86,14 +308,18 @@ struct hmtxvmtx
                                          * font to vary the side bearing
                                          * values for each glyph. */
   public:
-  DEFINE_SIZE_ARRAY2 (0, longMetric, leadingBearingX);
+  DEFINE_SIZE_ARRAY (0, longMetric);
 };
 
-struct hmtx : hmtxvmtx {
+struct hmtx : hmtxvmtx<hmtx, hhea> {
   static const hb_tag_t tableTag        = HB_OT_TAG_hmtx;
+  static const hb_tag_t variationsTag   = HB_OT_TAG_HVAR;
+  static const hb_tag_t os2Tag          = HB_OT_TAG_os2;
 };
-struct vmtx : hmtxvmtx {
+struct vmtx : hmtxvmtx<vmtx, vhea> {
   static const hb_tag_t tableTag        = HB_OT_TAG_vmtx;
+  static const hb_tag_t variationsTag   = HB_OT_TAG_VVAR;
+  static const hb_tag_t os2Tag          = HB_TAG_NONE;
 };
 
 } /* namespace OT */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh
index 25986102dd5..a98ebf6ec37 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh
@@ -104,8 +104,8 @@ struct KernClassTable
   }
 
   protected:
-  USHORT                firstGlyph;     /* First glyph in class range. */
-  ArrayOf<USHORT>       classes;        /* Glyph classes. */
+  HBUINT16              firstGlyph;     /* First glyph in class range. */
+  ArrayOf<HBUINT16>     classes;        /* Glyph classes. */
   public:
   DEFINE_SIZE_ARRAY (4, classes);
 };
@@ -115,7 +115,7 @@ struct KernSubTableFormat2
   inline int get_kerning (hb_codepoint_t left, hb_codepoint_t right, const char *end) const
   {
     unsigned int l = (this+leftClassTable).get_class (left);
-    unsigned int r = (this+leftClassTable).get_class (left);
+    unsigned int r = (this+rightClassTable).get_class (right);
     unsigned int offset = l * rowWidth + r * sizeof (FWORD);
     const FWORD *arr = &(this+array);
     if (unlikely ((const void *) arr < (const void *) this || (const void *) arr >= (const void *) end))
@@ -136,7 +136,7 @@ struct KernSubTableFormat2
   }
 
   protected:
-  USHORT        rowWidth;       /* The width, in bytes, of a row in the table. */
+  HBUINT16      rowWidth;       /* The width, in bytes, of a row in the table. */
   OffsetTo<KernClassTable>
                 leftClassTable; /* Offset from beginning of this subtable to
                                  * left-hand class table. */
@@ -275,19 +275,19 @@ struct KernOT : KernTable<KernOT>
     };
 
     protected:
-    USHORT      versionZ;       /* Unused. */
-    USHORT      length;         /* Length of the subtable (including this header). */
-    BYTE        format;         /* Subtable format. */
-    BYTE        coverage;       /* Coverage bits. */
+    HBUINT16    versionZ;       /* Unused. */
+    HBUINT16    length;         /* Length of the subtable (including this header). */
+    HBUINT8     format;         /* Subtable format. */
+    HBUINT8     coverage;       /* Coverage bits. */
     KernSubTable subtable;      /* Subtable data. */
     public:
     DEFINE_SIZE_MIN (6);
   };
 
   protected:
-  USHORT        version;        /* Version--0x0000u */
-  USHORT        nTables;        /* Number of subtables in the kerning table. */
-  BYTE          data[VAR];
+  HBUINT16      version;        /* Version--0x0000u */
+  HBUINT16      nTables;        /* Number of subtables in the kerning table. */
+  HBUINT8               data[VAR];
   public:
   DEFINE_SIZE_ARRAY (4, data);
 };
@@ -314,10 +314,10 @@ struct KernAAT : KernTable<KernAAT>
     };
 
     protected:
-    ULONG       length;         /* Length of the subtable (including this header). */
-    BYTE        coverage;       /* Coverage bits. */
-    BYTE        format;         /* Subtable format. */
-    USHORT      tupleIndex;     /* The tuple index (used for variations fonts).
+    HBUINT32    length;         /* Length of the subtable (including this header). */
+    HBUINT8     coverage;       /* Coverage bits. */
+    HBUINT8     format;         /* Subtable format. */
+    HBUINT16    tupleIndex;     /* The tuple index (used for variations fonts).
                                  * This value specifies which tuple this subtable covers. */
     KernSubTable subtable;      /* Subtable data. */
     public:
@@ -325,9 +325,9 @@ struct KernAAT : KernTable<KernAAT>
   };
 
   protected:
-  ULONG         version;        /* Version--0x00010000u */
-  ULONG         nTables;        /* Number of subtables in the kerning table. */
-  BYTE          data[VAR];
+  HBUINT32              version;        /* Version--0x00010000u */
+  HBUINT32              nTables;        /* Number of subtables in the kerning table. */
+  HBUINT8               data[VAR];
   public:
   DEFINE_SIZE_ARRAY (8, data);
 };
@@ -358,24 +358,29 @@ struct kern
 
   struct accelerator_t
   {
-    inline void init (const kern *table_, unsigned int table_length_)
+    inline void init (hb_face_t *face)
     {
-      table = table_;
-      table_length = table_length_;
+      blob = Sanitizer<kern>().sanitize (face->reference_table (HB_OT_TAG_kern));
+      table = Sanitizer<kern>::lock_instance (blob);
+      table_length = hb_blob_get_length (blob);
+    }
+    inline void fini (void)
+    {
+      hb_blob_destroy (blob);
     }
-    inline void fini (void) {}
 
     inline int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     { return table->get_h_kerning (left, right, table_length); }
 
     private:
+    hb_blob_t *blob;
     const kern *table;
     unsigned int table_length;
   };
 
   protected:
   union {
-  USHORT                major;
+  HBUINT16              major;
   KernOT                ot;
   KernAAT               aat;
   } u;
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh
new file mode 100644
index 00000000000..bbc215cf3c8
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh
@@ -0,0 +1,655 @@
+/*
+ * Copyright © 2016 Elie Roux <elie.roux@telecom-bretagne.eu>
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_LAYOUT_BASE_TABLE_HH
+#define HB_OT_LAYOUT_BASE_TABLE_HH
+
+#include "hb-open-type-private.hh"
+#include "hb-ot-layout-common-private.hh"
+
+namespace OT {
+
+#define NOT_INDEXED   ((unsigned int) -1)
+
+/*
+ * BASE -- The BASE Table
+ */
+
+struct BaseCoordFormat1
+{
+  inline int get_coord (void) const { return coordinate; }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  HBUINT16      format;         /* Format identifier--format = 1 */
+  HBINT16       coordinate;     /* X or Y value, in design units */
+  public:
+  DEFINE_SIZE_STATIC (4);
+};
+
+struct BaseCoordFormat2
+{
+  inline int get_coord (void) const
+  {
+    /* TODO */
+    return coordinate;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  HBUINT16      format;         /* Format identifier--format = 2 */
+  HBINT16       coordinate;     /* X or Y value, in design units */
+  GlyphID       referenceGlyph; /* Glyph ID of control glyph */
+  HBUINT16      coordPoint;     /* Index of contour point on the
+                                 * reference glyph */
+  public:
+  DEFINE_SIZE_STATIC (8);
+};
+
+struct BaseCoordFormat3
+{
+  inline int get_coord (void) const
+  {
+    /* TODO */
+    return coordinate;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) && deviceTable.sanitize (c, this));
+  }
+
+  protected:
+  HBUINT16              format;         /* Format identifier--format = 3 */
+  HBINT16               coordinate;     /* X or Y value, in design units */
+  OffsetTo<Device>      deviceTable;    /* Offset to Device table for X or
+                                         * Y value, from beginning of
+                                         * BaseCoord table (may be NULL). */
+  public:
+  DEFINE_SIZE_STATIC (6);
+};
+
+struct BaseCoord
+{
+  inline int get_coord (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coord ();
+    case 2: return u.format2.get_coord ();
+    case 3: return u.format3.get_coord ();
+    default:return 0;
+    }
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    if (!u.format.sanitize (c)) return_trace (false);
+    switch (u.format) {
+    case 1: return_trace (u.format1.sanitize (c));
+    case 2: return_trace (u.format2.sanitize (c));
+    case 3: return_trace (u.format3.sanitize (c));
+    default:return_trace (false);
+    }
+  }
+
+  protected:
+  union {
+    HBUINT16            format;
+    BaseCoordFormat1    format1;
+    BaseCoordFormat2    format2;
+    BaseCoordFormat3    format3;
+  } u;
+  public:
+  DEFINE_SIZE_UNION (2, format);
+};
+
+struct FeatMinMaxRecord
+{
+  inline int get_min_value (void) const
+  { return (this+minCoord).get_coord(); }
+
+  inline int get_max_value (void) const
+  { return (this+maxCoord).get_coord(); }
+
+  inline const Tag &get_tag () const
+  { return tag; }
+
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  minCoord.sanitize (c, base) &&
+                  maxCoord.sanitize (c, base));
+  }
+
+  protected:
+  Tag                   tag;            /* 4-byte feature identification tag--must
+                                         * match feature tag in FeatureList */
+  OffsetTo<BaseCoord>   minCoord;       /* Offset to BaseCoord table that defines
+                                         * the minimum extent value, from beginning
+                                         * of MinMax table (may be NULL) */
+  OffsetTo<BaseCoord>   maxCoord;       /* Offset to BaseCoord table that defines
+                                         * the maximum extent value, from beginning
+                                         * of MinMax table (may be NULL) */
+  public:
+  DEFINE_SIZE_STATIC (8);
+
+};
+
+struct MinMax
+{
+  inline unsigned int get_feature_tag_index (Tag featureTableTag) const
+  {
+    /* TODO bsearch */
+    unsigned int count = featMinMaxRecords.len;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      Tag tag = featMinMaxRecords[i].get_tag();
+      int cmp = tag.cmp(featureTableTag);
+      if (cmp == 0) return i;
+      if (cmp > 0)  return NOT_INDEXED;
+    }
+    return NOT_INDEXED;
+  }
+
+  inline int get_min_value (unsigned int featureTableTagIndex) const
+  {
+    if (featureTableTagIndex == NOT_INDEXED)
+      return (this+minCoord).get_coord();
+    return featMinMaxRecords[featureTableTagIndex].get_min_value();
+  }
+
+  inline int get_max_value (unsigned int featureTableTagIndex) const
+  {
+    if (featureTableTagIndex == NOT_INDEXED)
+      return (this+maxCoord).get_coord();
+    return featMinMaxRecords[featureTableTagIndex].get_max_value();
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  minCoord.sanitize (c, this) &&
+                  maxCoord.sanitize (c, this) &&
+                  featMinMaxRecords.sanitize (c, this));
+  }
+
+  protected:
+  OffsetTo<BaseCoord>   minCoord;       /* Offset to BaseCoord table that defines
+                                         * minimum extent value, from the beginning
+                                         * of MinMax table (may be NULL) */
+  OffsetTo<BaseCoord>   maxCoord;       /* Offset to BaseCoord table that defines
+                                         * maximum extent value, from the beginning
+                                         * of MinMax table (may be NULL) */
+  ArrayOf<FeatMinMaxRecord>
+                featMinMaxRecords;      /* Array of FeatMinMaxRecords, in alphabetical
+                                         * order by featureTableTag */
+  public:
+  DEFINE_SIZE_ARRAY (6, featMinMaxRecords);
+};
+
+/* TODO... */
+struct BaseLangSysRecord
+{
+  inline const Tag& get_tag(void) const
+  { return baseLangSysTag; }
+
+  inline unsigned int get_feature_tag_index (Tag featureTableTag) const
+  { return (this+minMax).get_feature_tag_index(featureTableTag); }
+
+  inline int get_min_value (unsigned int featureTableTagIndex) const
+  { return (this+minMax).get_min_value(featureTableTagIndex); }
+
+  inline int get_max_value (unsigned int featureTableTagIndex) const
+  { return (this+minMax).get_max_value(featureTableTagIndex); }
+
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  minMax.sanitize (c, base));
+  }
+
+  protected:
+  Tag                   baseLangSysTag;
+  OffsetTo<MinMax>      minMax;
+  public:
+  DEFINE_SIZE_STATIC (6);
+
+};
+
+struct BaseValues
+{
+  inline unsigned int get_default_base_tag_index (void) const
+  { return defaultIndex; }
+
+  inline int get_base_coord (unsigned int baselineTagIndex) const
+  {
+    return (this+baseCoords[baselineTagIndex]).get_coord();
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+      defaultIndex <= baseCoordCount &&
+      baseCoords.sanitize (c, this));
+  }
+
+  protected:
+  Index                         defaultIndex;
+  HBUINT16                      baseCoordCount;
+  OffsetArrayOf<BaseCoord>      baseCoords;
+  public:
+  DEFINE_SIZE_ARRAY (6, baseCoords);
+
+};
+
+struct BaseScript {
+
+  inline unsigned int get_lang_tag_index (Tag baseLangSysTag) const
+  {
+    Tag tag;
+    int cmp;
+    for (unsigned int i = 0; i < baseLangSysCount; i++) {
+      tag = baseLangSysRecords[i].get_tag();
+      // taking advantage of alphabetical order
+      cmp = tag.cmp(baseLangSysTag);
+      if (cmp == 0) return i;
+      if (cmp > 0)  return NOT_INDEXED;
+    }
+    return NOT_INDEXED;
+  }
+
+  inline unsigned int get_feature_tag_index (unsigned int baseLangSysIndex, Tag featureTableTag) const
+  {
+    if (baseLangSysIndex == NOT_INDEXED) {
+      if (unlikely(defaultMinMax)) return NOT_INDEXED;
+      return (this+defaultMinMax).get_feature_tag_index(featureTableTag);
+    }
+    if (unlikely(baseLangSysIndex >= baseLangSysCount)) return NOT_INDEXED;
+    return baseLangSysRecords[baseLangSysIndex].get_feature_tag_index(featureTableTag);
+  }
+
+  inline int get_min_value (unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    if (baseLangSysIndex == NOT_INDEXED)
+      return (this+defaultMinMax).get_min_value(featureTableTagIndex);
+    return baseLangSysRecords[baseLangSysIndex].get_max_value(featureTableTagIndex);
+  }
+
+  inline int get_max_value (unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    if (baseLangSysIndex == NOT_INDEXED)
+      return (this+defaultMinMax).get_min_value(featureTableTagIndex);
+    return baseLangSysRecords[baseLangSysIndex].get_max_value(featureTableTagIndex);
+  }
+
+  inline unsigned int get_default_base_tag_index (void) const
+  { return (this+baseValues).get_default_base_tag_index(); }
+
+  inline int get_base_coord (unsigned int baselineTagIndex) const
+  { return (this+baseValues).get_base_coord(baselineTagIndex); }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+      baseValues.sanitize (c, this) &&
+      defaultMinMax.sanitize (c, this) &&
+      baseLangSysRecords.sanitize (c, this));
+  }
+
+  protected:
+  OffsetTo<BaseValues>        baseValues;
+  OffsetTo<MinMax>            defaultMinMax;
+  HBUINT16                      baseLangSysCount;
+  ArrayOf<BaseLangSysRecord>  baseLangSysRecords;
+
+  public:
+    DEFINE_SIZE_ARRAY (8, baseLangSysRecords);
+};
+
+
+struct BaseScriptRecord {
+
+  inline const Tag& get_tag (void) const
+  { return baseScriptTag; }
+
+  inline unsigned int get_default_base_tag_index(void) const
+  { return (this+baseScript).get_default_base_tag_index(); }
+
+  inline int get_base_coord(unsigned int baselineTagIndex) const
+  { return (this+baseScript).get_base_coord(baselineTagIndex); }
+
+  inline unsigned int get_lang_tag_index (Tag baseLangSysTag) const
+  { return (this+baseScript).get_lang_tag_index(baseLangSysTag); }
+
+  inline unsigned int get_feature_tag_index (unsigned int baseLangSysIndex, Tag featureTableTag) const
+  { return (this+baseScript).get_feature_tag_index(baseLangSysIndex, featureTableTag); }
+
+  inline int get_max_value (unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  { return (this+baseScript).get_max_value(baseLangSysIndex, featureTableTagIndex); }
+
+  inline int get_min_value (unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  { return (this+baseScript).get_min_value(baseLangSysIndex, featureTableTagIndex); }
+
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+      baseScript != Null(OffsetTo<BaseScript>) &&
+      baseScript.sanitize (c, base));
+  }
+
+  protected:
+  Tag                   baseScriptTag;
+  OffsetTo<BaseScript>  baseScript;
+
+  public:
+    DEFINE_SIZE_STATIC (6);
+};
+
+struct BaseScriptList {
+
+  inline unsigned int get_base_script_index (Tag baseScriptTag) const
+  {
+    for (unsigned int i = 0; i < baseScriptCount; i++)
+      if (baseScriptRecords[i].get_tag() == baseScriptTag)
+        return i;
+    return NOT_INDEXED;
+  }
+
+  inline unsigned int get_default_base_tag_index (unsigned int baseScriptIndex) const
+  {
+    if (unlikely(baseScriptIndex >= baseScriptCount)) return NOT_INDEXED;
+    return baseScriptRecords[baseScriptIndex].get_default_base_tag_index();
+  }
+
+  inline int get_base_coord(unsigned int baseScriptIndex, unsigned int baselineTagIndex) const
+  {
+    return baseScriptRecords[baseScriptIndex].get_base_coord(baselineTagIndex);
+  }
+
+  inline unsigned int get_lang_tag_index (unsigned int baseScriptIndex, Tag baseLangSysTag) const
+  {
+    if (unlikely(baseScriptIndex >= baseScriptCount)) return NOT_INDEXED;
+    return baseScriptRecords[baseScriptIndex].get_lang_tag_index(baseLangSysTag);
+  }
+
+  inline unsigned int get_feature_tag_index (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, Tag featureTableTag) const
+  {
+    if (unlikely(baseScriptIndex >= baseScriptCount)) return NOT_INDEXED;
+    return baseScriptRecords[baseScriptIndex].get_feature_tag_index(baseLangSysIndex, featureTableTag);
+  }
+
+  inline int get_max_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return baseScriptRecords[baseScriptIndex].get_max_value(baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline int get_min_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return baseScriptRecords[baseScriptIndex].get_min_value(baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+      baseScriptRecords.sanitize (c, this));
+  }
+
+  protected:
+  HBUINT16                    baseScriptCount;
+  ArrayOf<BaseScriptRecord> baseScriptRecords;
+
+  public:
+  DEFINE_SIZE_ARRAY (4, baseScriptRecords);
+
+};
+
+struct BaseTagList
+{
+
+  inline unsigned int get_tag_index(Tag baselineTag) const
+  {
+    for (unsigned int i = 0; i < baseTagCount; i++)
+      if (baselineTags[i] == baselineTag)
+        return i;
+    return NOT_INDEXED;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  HBUINT16        baseTagCount;
+  SortedArrayOf<Tag>  baselineTags;
+
+  public:
+  DEFINE_SIZE_ARRAY (4, baselineTags);
+};
+
+struct Axis
+{
+
+  inline unsigned int get_base_tag_index(Tag baselineTag) const
+  {
+    if (unlikely(baseTagList == Null(OffsetTo<BaseTagList>))) return NOT_INDEXED;
+    return (this+baseTagList).get_tag_index(baselineTag);
+  }
+
+  inline unsigned int get_default_base_tag_index_for_script_index (unsigned int baseScriptIndex) const
+  {
+    if (unlikely(baseScriptList == Null(OffsetTo<BaseScriptList>))) return NOT_INDEXED;
+    return (this+baseScriptList).get_default_base_tag_index(baseScriptIndex);
+  }
+
+  inline int get_base_coord(unsigned int baseScriptIndex, unsigned int baselineTagIndex) const
+  {
+    return (this+baseScriptList).get_base_coord(baseScriptIndex, baselineTagIndex);
+  }
+
+  inline unsigned int get_lang_tag_index (unsigned int baseScriptIndex, Tag baseLangSysTag) const
+  {
+    if (unlikely(baseScriptList == Null(OffsetTo<BaseScriptList>))) return NOT_INDEXED;
+    return (this+baseScriptList).get_lang_tag_index(baseScriptIndex, baseLangSysTag);
+  }
+
+  inline unsigned int get_feature_tag_index (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, Tag featureTableTag) const
+  {
+    if (unlikely(baseScriptList == Null(OffsetTo<BaseScriptList>))) return NOT_INDEXED;
+    return (this+baseScriptList).get_feature_tag_index(baseScriptIndex, baseLangSysIndex, featureTableTag);
+  }
+
+  inline int get_max_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return (this+baseScriptList).get_max_value(baseScriptIndex, baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline int get_min_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return (this+baseScriptList).get_min_value(baseScriptIndex, baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+      baseTagList.sanitize (c, this) &&
+      baseScriptList.sanitize (c, this));
+  }
+
+  protected:
+  OffsetTo<BaseTagList>     baseTagList;
+  OffsetTo<BaseScriptList>  baseScriptList;
+
+  public:
+  DEFINE_SIZE_STATIC (4);
+};
+
+struct BASE
+{
+  static const hb_tag_t tableTag = HB_OT_TAG_BASE;
+
+  inline bool has_vert_axis(void)
+  { return vertAxis != Null(OffsetTo<Axis>); }
+
+  inline bool has_horiz_axis(void)
+  { return horizAxis != Null(OffsetTo<Axis>); }
+
+  // horizontal axis base coords:
+
+  inline unsigned int get_horiz_base_tag_index(Tag baselineTag) const
+  {
+    if (unlikely(horizAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+horizAxis).get_base_tag_index(baselineTag);
+  }
+
+  inline unsigned int get_horiz_default_base_tag_index_for_script_index (unsigned int baseScriptIndex) const
+  {
+    if (unlikely(horizAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+horizAxis).get_default_base_tag_index_for_script_index(baseScriptIndex);
+  }
+
+  inline int get_horiz_base_coord(unsigned int baseScriptIndex, unsigned int baselineTagIndex) const
+  {
+    return (this+horizAxis).get_base_coord(baseScriptIndex, baselineTagIndex);
+  }
+
+  // vertical axis base coords:
+
+  inline unsigned int get_vert_base_tag_index(Tag baselineTag) const
+  {
+    if (unlikely(vertAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+vertAxis).get_base_tag_index(baselineTag);
+  }
+
+  inline unsigned int get_vert_default_base_tag_index_for_script_index (unsigned int baseScriptIndex) const
+  {
+    if (unlikely(vertAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+vertAxis).get_default_base_tag_index_for_script_index(baseScriptIndex);
+  }
+
+  inline int get_vert_base_coord(unsigned int baseScriptIndex, unsigned int baselineTagIndex) const
+  {
+    return (this+vertAxis).get_base_coord(baseScriptIndex, baselineTagIndex);
+  }
+
+  // horizontal axis min/max coords:
+
+  inline unsigned int get_horiz_lang_tag_index (unsigned int baseScriptIndex, Tag baseLangSysTag) const
+  {
+    if (unlikely(horizAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+horizAxis).get_lang_tag_index (baseScriptIndex, baseLangSysTag);
+  }
+
+  inline unsigned int get_horiz_feature_tag_index (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, Tag featureTableTag) const
+  {
+    if (unlikely(horizAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+horizAxis).get_feature_tag_index (baseScriptIndex, baseLangSysIndex, featureTableTag);
+  }
+
+  inline int get_horiz_max_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return (this+horizAxis).get_max_value (baseScriptIndex, baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline int get_horiz_min_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return (this+horizAxis).get_min_value (baseScriptIndex, baseLangSysIndex, featureTableTagIndex);
+  }
+
+    // vertical axis min/max coords:
+
+  inline unsigned int get_vert_lang_tag_index (unsigned int baseScriptIndex, Tag baseLangSysTag) const
+  {
+    if (unlikely(vertAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+vertAxis).get_lang_tag_index (baseScriptIndex, baseLangSysTag);
+  }
+
+  inline unsigned int get_vert_feature_tag_index (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, Tag featureTableTag) const
+  {
+    if (unlikely(vertAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
+    return (this+vertAxis).get_feature_tag_index (baseScriptIndex, baseLangSysIndex, featureTableTag);
+  }
+
+  inline int get_vert_max_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return (this+vertAxis).get_max_value (baseScriptIndex, baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline int get_vert_min_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
+  {
+    return (this+vertAxis).get_min_value (baseScriptIndex, baseLangSysIndex, featureTableTagIndex);
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  likely (version.major == 1) &&
+                  horizAxis.sanitize (c, this) &&
+                  vertAxis.sanitize (c, this) &&
+                  (version.to_int () < 0x00010001u || varStore.sanitize (c, this)));
+  }
+
+  protected:
+  FixedVersion<>  version;
+  OffsetTo<Axis>  horizAxis;
+  OffsetTo<Axis>  vertAxis;
+  LOffsetTo<VariationStore>
+                varStore;               /* Offset to the table of Item Variation
+                                         * Store--from beginning of BASE
+                                         * header (may be NULL).  Introduced
+                                         * in version 0x00010001. */
+  public:
+  DEFINE_SIZE_MIN (8);
+};
+
+
+} /* namespace OT */
+
+
+#endif /* HB_OT_LAYOUT_BASE_TABLE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh
index 13e923499a6..a5a33db34e2 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh
@@ -155,13 +155,13 @@ struct RangeRecord
   }
 
   template <typename set_t>
-  inline void add_coverage (set_t *glyphs) const {
-    glyphs->add_range (start, end);
+  inline bool add_coverage (set_t *glyphs) const {
+    return glyphs->add_range (start, end);
   }
 
   GlyphID       start;          /* First GlyphID in the range */
   GlyphID       end;            /* Last GlyphID in the range */
-  USHORT        value;          /* Value */
+  HBUINT16      value;          /* Value */
   public:
   DEFINE_SIZE_STATIC (6);
 };
@@ -175,7 +175,7 @@ struct IndexArray : ArrayOf<Index>
                                    unsigned int *_indexes /* OUT */) const
   {
     if (_count) {
-      const USHORT *arr = this->sub_array (start_offset, _count);
+      const HBUINT16 *arr = this->sub_array (start_offset, _count);
       unsigned int count = *_count;
       for (unsigned int i = 0; i < count; i++)
         _indexes[i] = arr[i];
@@ -216,9 +216,9 @@ struct LangSys
     return_trace (c->check_struct (this) && featureIndex.sanitize (c));
   }
 
-  Offset<>      lookupOrderZ;   /* = Null (reserved for an offset to a
+  Offset16      lookupOrderZ;   /* = Null (reserved for an offset to a
                                  * reordering table) */
-  USHORT        reqFeatureIndex;/* Index of a feature required for this
+  HBUINT16      reqFeatureIndex;/* Index of a feature required for this
                                  * language system--if no required features
                                  * = 0xFFFFu */
   IndexArray    featureIndex;   /* Array of indices into the FeatureList */
@@ -299,7 +299,7 @@ struct FeatureParamsSize
      * better.
      *
      * Assume that the offset to the size feature is according to specification,
-     * and make the following value checks. If it fails, assume the the size
+     * and make the following value checks. If it fails, assume the size
      * feature is calculated as versions of MakeOTF before the AFDKO 2.0 built it.
      * If this fails, reject the 'size' feature. The older makeOTF's calculated the
      * offset from the beginning of the FeatureList table, rather than from the
@@ -343,12 +343,12 @@ struct FeatureParamsSize
       return_trace (true);
   }
 
-  USHORT        designSize;     /* Represents the design size in 720/inch
+  HBUINT16      designSize;     /* Represents the design size in 720/inch
                                  * units (decipoints).  The design size entry
                                  * must be non-zero.  When there is a design
                                  * size but no recommended size range, the
                                  * rest of the array will consist of zeros. */
-  USHORT        subfamilyID;    /* Has no independent meaning, but serves
+  HBUINT16      subfamilyID;    /* Has no independent meaning, but serves
                                  * as an identifier that associates fonts
                                  * in a subfamily. All fonts which share a
                                  * Preferred or Font Family name and which
@@ -358,7 +358,7 @@ struct FeatureParamsSize
                                  * same subfamily value. If this value is
                                  * zero, the remaining fields in the array
                                  * will be ignored. */
-  USHORT        subfamilyNameID;/* If the preceding value is non-zero, this
+  HBUINT16      subfamilyNameID;/* If the preceding value is non-zero, this
                                  * value must be set in the range 256 - 32767
                                  * (inclusive). It records the value of a
                                  * field in the name table, which must
@@ -372,10 +372,10 @@ struct FeatureParamsSize
                                  * subfamily in a menu.  Applications will
                                  * choose the appropriate version based on
                                  * their selection criteria. */
-  USHORT        rangeStart;     /* Large end of the recommended usage range
+  HBUINT16      rangeStart;     /* Large end of the recommended usage range
                                  * (inclusive), stored in 720/inch units
                                  * (decipoints). */
-  USHORT        rangeEnd;       /* Small end of the recommended usage range
+  HBUINT16      rangeEnd;       /* Small end of the recommended usage range
                                    (exclusive), stored in 720/inch units
                                  * (decipoints). */
   public:
@@ -393,12 +393,12 @@ struct FeatureParamsStylisticSet
     return_trace (c->check_struct (this));
   }
 
-  USHORT        version;        /* (set to 0): This corresponds to a “minor”
+  HBUINT16      version;        /* (set to 0): This corresponds to a “minor”
                                  * version number. Additional data may be
                                  * added to the end of this Feature Parameters
                                  * table in the future. */
 
-  USHORT        uiNameID;       /* The 'name' table name ID that specifies a
+  HBUINT16      uiNameID;       /* The 'name' table name ID that specifies a
                                  * string (or strings, for multiple languages)
                                  * for a user-interface label for this
                                  * feature.  The values of uiLabelNameId and
@@ -426,25 +426,25 @@ struct FeatureParamsCharacterVariants
                   characters.sanitize (c));
   }
 
-  USHORT        format;                 /* Format number is set to 0. */
-  USHORT        featUILableNameID;      /* The ‘name’ table name ID that
+  HBUINT16      format;                 /* Format number is set to 0. */
+  HBUINT16      featUILableNameID;      /* The ‘name’ table name ID that
                                          * specifies a string (or strings,
                                          * for multiple languages) for a
                                          * user-interface label for this
                                          * feature. (May be nullptr.) */
-  USHORT        featUITooltipTextNameID;/* The ‘name’ table name ID that
+  HBUINT16      featUITooltipTextNameID;/* The ‘name’ table name ID that
                                          * specifies a string (or strings,
                                          * for multiple languages) that an
                                          * application can use for tooltip
                                          * text for this feature. (May be
                                          * nullptr.) */
-  USHORT        sampleTextNameID;       /* The ‘name’ table name ID that
+  HBUINT16      sampleTextNameID;       /* The ‘name’ table name ID that
                                          * specifies sample text that
                                          * illustrates the effect of this
                                          * feature. (May be nullptr.) */
-  USHORT        numNamedParameters;     /* Number of named parameters. (May
+  HBUINT16      numNamedParameters;     /* Number of named parameters. (May
                                          * be zero.) */
-  USHORT        firstParamUILabelNameID;/* The first ‘name’ table name ID
+  HBUINT16      firstParamUILabelNameID;/* The first ‘name’ table name ID
                                          * used to specify strings for
                                          * user-interface labels for the
                                          * feature parameters. (Must be zero
@@ -562,7 +562,7 @@ struct Feature
 typedef RecordListOf<Feature> FeatureList;
 
 
-struct LookupFlag : USHORT
+struct LookupFlag : HBUINT16
 {
   enum Flags {
     RightToLeft         = 0x0001u,
@@ -608,7 +608,7 @@ struct Lookup
     unsigned int flag = lookupFlag;
     if (unlikely (flag & LookupFlag::UseMarkFilteringSet))
     {
-      const USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
+      const HBUINT16 &markFilteringSet = StructAfter<HBUINT16> (subTable);
       flag += (markFilteringSet << 16);
     }
     return flag;
@@ -640,7 +640,7 @@ struct Lookup
     if (unlikely (!subTable.serialize (c, num_subtables))) return_trace (false);
     if (lookupFlag & LookupFlag::UseMarkFilteringSet)
     {
-      USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
+      HBUINT16 &markFilteringSet = StructAfter<HBUINT16> (subTable);
       markFilteringSet.set (lookup_props >> 16);
     }
     return_trace (true);
@@ -653,18 +653,18 @@ struct Lookup
     if (!(c->check_struct (this) && subTable.sanitize (c))) return_trace (false);
     if (lookupFlag & LookupFlag::UseMarkFilteringSet)
     {
-      const USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
+      const HBUINT16 &markFilteringSet = StructAfter<HBUINT16> (subTable);
       if (!markFilteringSet.sanitize (c)) return_trace (false);
     }
     return_trace (true);
   }
 
   private:
-  USHORT        lookupType;             /* Different enumerations for GSUB and GPOS */
-  USHORT        lookupFlag;             /* Lookup qualifiers */
-  ArrayOf<Offset<> >
+  HBUINT16      lookupType;             /* Different enumerations for GSUB and GPOS */
+  HBUINT16      lookupFlag;             /* Lookup qualifiers */
+  ArrayOf<Offset16>
                 subTable;               /* Array of SubTables */
-  USHORT        markFilteringSetX[VAR]; /* Index (base 0) into GDEF mark glyph sets
+  HBUINT16      markFilteringSetX[VAR]; /* Index (base 0) into GDEF mark glyph sets
                                          * structure. This field is only present if bit
                                          * UseMarkFilteringSet of lookup flags is set. */
   public:
@@ -700,7 +700,7 @@ struct CoverageFormat1
     if (unlikely (!c->extend (glyphArray))) return_trace (false);
     for (unsigned int i = 0; i < num_glyphs; i++)
       glyphArray[i] = glyphs[i];
-    glyphs.advance (num_glyphs);
+    glyphs += num_glyphs;
     return_trace (true);
   }
 
@@ -715,10 +715,8 @@ struct CoverageFormat1
   }
 
   template <typename set_t>
-  inline void add_coverage (set_t *glyphs) const {
-    unsigned int count = glyphArray.len;
-    for (unsigned int i = 0; i < count; i++)
-      glyphs->add (glyphArray[i]);
+  inline bool add_coverage (set_t *glyphs) const {
+    return glyphs->add_sorted_array (glyphArray.array, glyphArray.len);
   }
 
   public:
@@ -737,7 +735,7 @@ struct CoverageFormat1
   private:
 
   protected:
-  USHORT        coverageFormat; /* Format identifier--format = 1 */
+  HBUINT16      coverageFormat; /* Format identifier--format = 1 */
   SortedArrayOf<GlyphID>
                 glyphArray;     /* Array of GlyphIDs--in numerical order */
   public:
@@ -791,7 +789,7 @@ struct CoverageFormat2
       } else {
         rangeRecord[range].end = glyphs[i];
       }
-    glyphs.advance (num_glyphs);
+    glyphs += num_glyphs;
     return_trace (true);
   }
 
@@ -817,10 +815,12 @@ struct CoverageFormat2
   }
 
   template <typename set_t>
-  inline void add_coverage (set_t *glyphs) const {
+  inline bool add_coverage (set_t *glyphs) const {
     unsigned int count = rangeRecord.len;
     for (unsigned int i = 0; i < count; i++)
-      rangeRecord[i].add_coverage (glyphs);
+      if (unlikely (!rangeRecord[i].add_coverage (glyphs)))
+        return false;
+    return true;
   }
 
   public:
@@ -860,7 +860,7 @@ struct CoverageFormat2
   private:
 
   protected:
-  USHORT        coverageFormat; /* Format identifier--format = 2 */
+  HBUINT16      coverageFormat; /* Format identifier--format = 2 */
   SortedArrayOf<RangeRecord>
                 rangeRecord;    /* Array of glyph ranges--ordered by
                                  * Start GlyphID. rangeCount entries
@@ -874,8 +874,8 @@ struct Coverage
   inline unsigned int get_coverage (hb_codepoint_t glyph_id) const
   {
     switch (u.format) {
-    case 1: return u.format1.get_coverage(glyph_id);
-    case 2: return u.format2.get_coverage(glyph_id);
+    case 1: return u.format1.get_coverage (glyph_id);
+    case 2: return u.format2.get_coverage (glyph_id);
     default:return NOT_COVERED;
     }
   }
@@ -927,12 +927,14 @@ struct Coverage
     }
   }
 
+  /* Might return false if array looks unsorted.
+   * Used for faster rejection of corrupt data. */
   template <typename set_t>
-  inline void add_coverage (set_t *glyphs) const {
+  inline bool add_coverage (set_t *glyphs) const {
     switch (u.format) {
-    case 1: u.format1.add_coverage (glyphs); break;
-    case 2: u.format2.add_coverage (glyphs); break;
-    default:                                 break;
+    case 1: return u.format1.add_coverage (glyphs);
+    case 2: return u.format2.add_coverage (glyphs);
+    default:return false;
     }
   }
 
@@ -985,7 +987,7 @@ struct Coverage
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   CoverageFormat1       format1;
   CoverageFormat2       format2;
   } u;
@@ -1018,11 +1020,36 @@ struct ClassDefFormat1
   }
 
   template <typename set_t>
-  inline void add_class (set_t *glyphs, unsigned int klass) const {
+  inline bool add_coverage (set_t *glyphs) const {
+    unsigned int start = 0;
     unsigned int count = classValue.len;
     for (unsigned int i = 0; i < count; i++)
+    {
+      if (classValue[i])
+        continue;
+
+      if (start != i)
+        if (unlikely (!glyphs->add_range (startGlyph + start, startGlyph + i)))
+          return false;
+
+      start = i + 1;
+    }
+    if (start != count)
+      if (unlikely (!glyphs->add_range (startGlyph + start, startGlyph + count)))
+        return false;
+
+    return true;
+  }
+
+  template <typename set_t>
+  inline bool add_class (set_t *glyphs, unsigned int klass) const {
+    unsigned int count = classValue.len;
+    for (unsigned int i = 0; i < count; i++)
+    {
       if (classValue[i] == klass)
         glyphs->add (startGlyph + i);
+    }
+    return true;
   }
 
   inline bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const {
@@ -1030,7 +1057,7 @@ struct ClassDefFormat1
     if (klass == 0)
     {
       /* Match if there's any glyph that is not listed! */
-      hb_codepoint_t g = -1;
+      hb_codepoint_t g = HB_SET_VALUE_INVALID;
       if (!hb_set_next (glyphs, &g))
         return false;
       if (g < startGlyph)
@@ -1047,9 +1074,9 @@ struct ClassDefFormat1
   }
 
   protected:
-  USHORT        classFormat;            /* Format identifier--format = 1 */
+  HBUINT16      classFormat;            /* Format identifier--format = 1 */
   GlyphID       startGlyph;             /* First GlyphID of the classValueArray */
-  ArrayOf<USHORT>
+  ArrayOf<HBUINT16>
                 classValue;             /* Array of Class Values--one per GlyphID */
   public:
   DEFINE_SIZE_ARRAY (6, classValue);
@@ -1075,11 +1102,25 @@ struct ClassDefFormat2
   }
 
   template <typename set_t>
-  inline void add_class (set_t *glyphs, unsigned int klass) const {
+  inline bool add_coverage (set_t *glyphs) const {
     unsigned int count = rangeRecord.len;
     for (unsigned int i = 0; i < count; i++)
+      if (rangeRecord[i].value)
+        if (unlikely (!rangeRecord[i].add_coverage (glyphs)))
+          return false;
+    return true;
+  }
+
+  template <typename set_t>
+  inline bool add_class (set_t *glyphs, unsigned int klass) const {
+    unsigned int count = rangeRecord.len;
+    for (unsigned int i = 0; i < count; i++)
+    {
       if (rangeRecord[i].value == klass)
-        rangeRecord[i].add_coverage (glyphs);
+        if (unlikely (!rangeRecord[i].add_coverage (glyphs)))
+          return false;
+    }
+    return true;
   }
 
   inline bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const {
@@ -1087,7 +1128,7 @@ struct ClassDefFormat2
     if (klass == 0)
     {
       /* Match if there's any glyph that is not listed! */
-      hb_codepoint_t g = (hb_codepoint_t) -1;
+      hb_codepoint_t g = HB_SET_VALUE_INVALID;
       for (unsigned int i = 0; i < count; i++)
       {
         if (!hb_set_next (glyphs, &g))
@@ -1096,7 +1137,7 @@ struct ClassDefFormat2
           return true;
         g = rangeRecord[i].end;
       }
-      if (g != (hb_codepoint_t) -1 && hb_set_next (glyphs, &g))
+      if (g != HB_SET_VALUE_INVALID && hb_set_next (glyphs, &g))
         return true;
       /* Fall through. */
     }
@@ -1107,7 +1148,7 @@ struct ClassDefFormat2
   }
 
   protected:
-  USHORT        classFormat;    /* Format identifier--format = 2 */
+  HBUINT16      classFormat;    /* Format identifier--format = 2 */
   SortedArrayOf<RangeRecord>
                 rangeRecord;    /* Array of glyph ranges--ordered by
                                  * Start GlyphID */
@@ -1120,8 +1161,8 @@ struct ClassDef
   inline unsigned int get_class (hb_codepoint_t glyph_id) const
   {
     switch (u.format) {
-    case 1: return u.format1.get_class(glyph_id);
-    case 2: return u.format2.get_class(glyph_id);
+    case 1: return u.format1.get_class (glyph_id);
+    case 2: return u.format2.get_class (glyph_id);
     default:return 0;
     }
   }
@@ -1137,11 +1178,25 @@ struct ClassDef
     }
   }
 
-  inline void add_class (hb_set_t *glyphs, unsigned int klass) const {
+  /* Might return false if array looks unsorted.
+   * Used for faster rejection of corrupt data. */
+  template <typename set_t>
+  inline bool add_coverage (set_t *glyphs) const {
     switch (u.format) {
-    case 1: u.format1.add_class (glyphs, klass); return;
-    case 2: u.format2.add_class (glyphs, klass); return;
-    default:return;
+    case 1: return u.format1.add_coverage (glyphs);
+    case 2: return u.format2.add_coverage (glyphs);
+    default:return false;
+    }
+  }
+
+  /* Might return false if array looks unsorted.
+   * Used for faster rejection of corrupt data. */
+  template <typename set_t>
+  inline bool add_class (set_t *glyphs, unsigned int klass) const {
+    switch (u.format) {
+    case 1: return u.format1.add_class (glyphs, klass);
+    case 2: return u.format2.add_class (glyphs, klass);
+    default:return false;
     }
   }
 
@@ -1155,7 +1210,7 @@ struct ClassDef
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   ClassDefFormat1       format1;
   ClassDefFormat2       format2;
   } u;
@@ -1220,10 +1275,11 @@ struct VarRegionList
     const VarRegionAxis *axes = axesZ + (region_index * axisCount);
 
     float v = 1.;
-    unsigned int count = MIN (coord_len, (unsigned int) axisCount);
+    unsigned int count = axisCount;
     for (unsigned int i = 0; i < count; i++)
     {
-      float factor = axes[i].evaluate (coords[i]);
+      int coord = i < coord_len ? coords[i] : 0;
+      float factor = axes[i].evaluate (coord);
       if (factor == 0.)
         return 0.;
       v *= factor;
@@ -1240,8 +1296,8 @@ struct VarRegionList
   }
 
   protected:
-  USHORT        axisCount;
-  USHORT        regionCount;
+  HBUINT16      axisCount;
+  HBUINT16      regionCount;
   VarRegionAxis axesZ[VAR];
   public:
   DEFINE_SIZE_ARRAY (4, axesZ);
@@ -1265,19 +1321,19 @@ struct VarData
    unsigned int count = regionIndices.len;
    unsigned int scount = shortCount;
 
-   const BYTE *bytes = &StructAfter<BYTE> (regionIndices);
-   const BYTE *row = bytes + inner * (scount + count);
+   const HBUINT8 *bytes = &StructAfter<HBUINT8> (regionIndices);
+   const HBUINT8 *row = bytes + inner * (scount + count);
 
    float delta = 0.;
    unsigned int i = 0;
 
-   const SHORT *scursor = reinterpret_cast<const SHORT *> (row);
+   const HBINT16 *scursor = reinterpret_cast<const HBINT16 *> (row);
    for (; i < scount; i++)
    {
      float scalar = regions.evaluate (regionIndices.array[i], coords, coord_count);
      delta += scalar * *scursor++;
    }
-   const INT8 *bcursor = reinterpret_cast<const INT8 *> (scursor);
+   const HBINT8 *bcursor = reinterpret_cast<const HBINT8 *> (scursor);
    for (; i < count; i++)
    {
      float scalar = regions.evaluate (regionIndices.array[i], coords, coord_count);
@@ -1293,15 +1349,15 @@ struct VarData
     return_trace (c->check_struct (this) &&
                   regionIndices.sanitize(c) &&
                   shortCount <= regionIndices.len &&
-                  c->check_array (&StructAfter<BYTE> (regionIndices),
+                  c->check_array (&StructAfter<HBUINT8> (regionIndices),
                                   get_row_size (), itemCount));
   }
 
   protected:
-  USHORT                itemCount;
-  USHORT                shortCount;
-  ArrayOf<USHORT>       regionIndices;
-  BYTE                  bytesX[VAR];
+  HBUINT16              itemCount;
+  HBUINT16              shortCount;
+  ArrayOf<HBUINT16>     regionIndices;
+  HBUINT8                       bytesX[VAR];
   public:
   DEFINE_SIZE_ARRAY2 (6, regionIndices, bytesX);
 };
@@ -1337,9 +1393,9 @@ struct VariationStore
   }
 
   protected:
-  USHORT                                format;
+  HBUINT16                              format;
   LOffsetTo<VarRegionList>              regions;
-  OffsetArrayOf<VarData, ULONG>         dataSets;
+  OffsetArrayOf<VarData, HBUINT32>      dataSets;
   public:
   DEFINE_SIZE_ARRAY (8, dataSets);
 };
@@ -1366,8 +1422,8 @@ struct ConditionFormat1
   }
 
   protected:
-  USHORT        format;         /* Format identifier--format = 1 */
-  USHORT        axisIndex;
+  HBUINT16      format;         /* Format identifier--format = 1 */
+  HBUINT16      axisIndex;
   F2DOT14       filterRangeMinValue;
   F2DOT14       filterRangeMaxValue;
   public:
@@ -1396,7 +1452,7 @@ struct Condition
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   ConditionFormat1      format1;
   } u;
   public:
@@ -1421,7 +1477,7 @@ struct ConditionSet
   }
 
   protected:
-  OffsetArrayOf<Condition, ULONG> conditions;
+  OffsetArrayOf<Condition, HBUINT32> conditions;
   public:
   DEFINE_SIZE_ARRAY (2, conditions);
 };
@@ -1437,7 +1493,7 @@ struct FeatureTableSubstitutionRecord
   }
 
   protected:
-  USHORT                featureIndex;
+  HBUINT16              featureIndex;
   LOffsetTo<Feature>    feature;
   public:
   DEFINE_SIZE_STATIC (6);
@@ -1557,8 +1613,8 @@ struct HintingDevice
   inline unsigned int get_size (void) const
   {
     unsigned int f = deltaFormat;
-    if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * USHORT::static_size;
-    return USHORT::static_size * (4 + ((endSize - startSize) >> (4 - f)));
+    if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * HBUINT16::static_size;
+    return HBUINT16::static_size * (4 + ((endSize - startSize) >> (4 - f)));
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -1603,14 +1659,14 @@ struct HintingDevice
   }
 
   protected:
-  USHORT        startSize;              /* Smallest size to correct--in ppem */
-  USHORT        endSize;                /* Largest size to correct--in ppem */
-  USHORT        deltaFormat;            /* Format of DeltaValue array data: 1, 2, or 3
+  HBUINT16      startSize;              /* Smallest size to correct--in ppem */
+  HBUINT16      endSize;                /* Largest size to correct--in ppem */
+  HBUINT16      deltaFormat;            /* Format of DeltaValue array data: 1, 2, or 3
                                          * 1    Signed 2-bit value, 8 values per uint16
                                          * 2    Signed 4-bit value, 4 values per uint16
                                          * 3    Signed 8-bit value, 2 values per uint16
                                          */
-  USHORT        deltaValue[VAR];        /* Array of compressed data */
+  HBUINT16      deltaValue[VAR];        /* Array of compressed data */
   public:
   DEFINE_SIZE_ARRAY (6, deltaValue);
 };
@@ -1641,9 +1697,9 @@ struct VariationDevice
   }
 
   protected:
-  USHORT        outerIndex;
-  USHORT        innerIndex;
-  USHORT        deltaFormat;    /* Format identifier for this table: 0x0x8000 */
+  HBUINT16      outerIndex;
+  HBUINT16      innerIndex;
+  HBUINT16      deltaFormat;    /* Format identifier for this table: 0x0x8000 */
   public:
   DEFINE_SIZE_STATIC (6);
 };
@@ -1651,10 +1707,10 @@ struct VariationDevice
 struct DeviceHeader
 {
   protected:
-  USHORT                reserved1;
-  USHORT                reserved2;
+  HBUINT16              reserved1;
+  HBUINT16              reserved2;
   public:
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   public:
   DEFINE_SIZE_STATIC (6);
 };
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh
index 51cc2ebef3d..7ea380c6921 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh
@@ -41,7 +41,7 @@ namespace OT {
  * Attachment List Table
  */
 
-typedef ArrayOf<USHORT> AttachPoint;    /* Array of contour point indices--in
+typedef ArrayOf<HBUINT16> AttachPoint;  /* Array of contour point indices--in
                                          * increasing numerical order */
 
 struct AttachList
@@ -62,7 +62,7 @@ struct AttachList
     const AttachPoint &points = this+attachPoint[index];
 
     if (point_count) {
-      const USHORT *array = points.sub_array (start_offset, point_count);
+      const HBUINT16 *array = points.sub_array (start_offset, point_count);
       unsigned int count = *point_count;
       for (unsigned int i = 0; i < count; i++)
         point_array[i] = array[i];
@@ -109,8 +109,8 @@ struct CaretValueFormat1
   }
 
   protected:
-  USHORT        caretValueFormat;       /* Format identifier--format = 1 */
-  SHORT         coordinate;             /* X or Y value, in design units */
+  HBUINT16      caretValueFormat;       /* Format identifier--format = 1 */
+  FWORD         coordinate;             /* X or Y value, in design units */
   public:
   DEFINE_SIZE_STATIC (4);
 };
@@ -136,8 +136,8 @@ struct CaretValueFormat2
   }
 
   protected:
-  USHORT        caretValueFormat;       /* Format identifier--format = 2 */
-  USHORT        caretValuePoint;        /* Contour point index on glyph */
+  HBUINT16      caretValueFormat;       /* Format identifier--format = 2 */
+  HBUINT16      caretValuePoint;        /* Contour point index on glyph */
   public:
   DEFINE_SIZE_STATIC (4);
 };
@@ -160,8 +160,8 @@ struct CaretValueFormat3
   }
 
   protected:
-  USHORT        caretValueFormat;       /* Format identifier--format = 3 */
-  SHORT         coordinate;             /* X or Y value, in design units */
+  HBUINT16      caretValueFormat;       /* Format identifier--format = 3 */
+  FWORD         coordinate;             /* X or Y value, in design units */
   OffsetTo<Device>
                 deviceTable;            /* Offset to Device table for X or Y
                                          * value--from beginning of CaretValue
@@ -199,7 +199,7 @@ struct CaretValue
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   CaretValueFormat1     format1;
   CaretValueFormat2     format2;
   CaretValueFormat3     format3;
@@ -294,7 +294,7 @@ struct MarkGlyphSetsFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   ArrayOf<LOffsetTo<Coverage> >
                 coverage;               /* Array of long offsets to mark set
                                          * coverage tables */
@@ -324,7 +324,7 @@ struct MarkGlyphSets
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   MarkGlyphSetsFormat1  format1;
   } u;
   public:
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh
index cfe6954eb43..17b1a83af62 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh
@@ -51,11 +51,11 @@ enum attach_type_t {
 
 /* Shared Tables: ValueRecord, Anchor Table, and MarkArray */
 
-typedef USHORT Value;
+typedef HBUINT16 Value;
 
 typedef Value ValueRecord[VAR];
 
-struct ValueFormat : USHORT
+struct ValueFormat : HBUINT16
 {
   enum Flags {
     xPlacement  = 0x0001u,      /* Includes horizontal adjustment for placement */
@@ -74,14 +74,14 @@ struct ValueFormat : USHORT
 
 /* All fields are options.  Only those available advance the value pointer. */
 #if 0
-  SHORT         xPlacement;             /* Horizontal adjustment for
+  HBINT16               xPlacement;             /* Horizontal adjustment for
                                          * placement--in design units */
-  SHORT         yPlacement;             /* Vertical adjustment for
+  HBINT16               yPlacement;             /* Vertical adjustment for
                                          * placement--in design units */
-  SHORT         xAdvance;               /* Horizontal adjustment for
+  HBINT16               xAdvance;               /* Horizontal adjustment for
                                          * advance--in design units (only used
                                          * for horizontal writing) */
-  SHORT         yAdvance;               /* Vertical adjustment for advance--in
+  HBINT16               yAdvance;               /* Vertical adjustment for advance--in
                                          * design units (only used for vertical
                                          * writing) */
   Offset        xPlaDevice;             /* Offset to Device table for
@@ -99,11 +99,11 @@ struct ValueFormat : USHORT
 #endif
 
   inline unsigned int get_len (void) const
-  { return _hb_popcount32 ((unsigned int) *this); }
+  { return _hb_popcount ((unsigned int) *this); }
   inline unsigned int get_size (void) const
   { return get_len () * Value::static_size; }
 
-  void apply_value (hb_apply_context_t   *c,
+  void apply_value (hb_ot_apply_context_t   *c,
                     const void           *base,
                     const Value          *values,
                     hb_glyph_position_t  &glyph_pos) const
@@ -178,8 +178,8 @@ struct ValueFormat : USHORT
   static inline const OffsetTo<Device>& get_device (const Value* value)
   { return *CastP<OffsetTo<Device> > (value); }
 
-  static inline const SHORT& get_short (const Value* value)
-  { return *CastP<SHORT> (value); }
+  static inline const HBINT16& get_short (const Value* value)
+  { return *CastP<HBINT16> (value); }
 
   public:
 
@@ -232,12 +232,12 @@ struct ValueFormat : USHORT
 
 struct AnchorFormat1
 {
-  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id HB_UNUSED,
-                          hb_position_t *x, hb_position_t *y) const
+  inline void get_anchor (hb_ot_apply_context_t *c, hb_codepoint_t glyph_id HB_UNUSED,
+                          float *x, float *y) const
   {
     hb_font_t *font = c->font;
-    *x = font->em_scale_x (xCoordinate);
-    *y = font->em_scale_y (yCoordinate);
+    *x = font->em_fscale_x (xCoordinate);
+    *y = font->em_fscale_y (yCoordinate);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -247,17 +247,17 @@ struct AnchorFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
-  SHORT         xCoordinate;            /* Horizontal value--in design units */
-  SHORT         yCoordinate;            /* Vertical value--in design units */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
+  FWORD         xCoordinate;            /* Horizontal value--in design units */
+  FWORD         yCoordinate;            /* Vertical value--in design units */
   public:
   DEFINE_SIZE_STATIC (6);
 };
 
 struct AnchorFormat2
 {
-  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id,
-                          hb_position_t *x, hb_position_t *y) const
+  inline void get_anchor (hb_ot_apply_context_t *c, hb_codepoint_t glyph_id,
+                          float *x, float *y) const
   {
     hb_font_t *font = c->font;
     unsigned int x_ppem = font->x_ppem;
@@ -267,8 +267,8 @@ struct AnchorFormat2
 
     ret = (x_ppem || y_ppem) &&
            font->get_glyph_contour_point_for_origin (glyph_id, anchorPoint, HB_DIRECTION_LTR, &cx, &cy);
-    *x = ret && x_ppem ? cx : font->em_scale_x (xCoordinate);
-    *y = ret && y_ppem ? cy : font->em_scale_y (yCoordinate);
+    *x = ret && x_ppem ? cx : font->em_fscale_x (xCoordinate);
+    *y = ret && y_ppem ? cy : font->em_fscale_y (yCoordinate);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -278,22 +278,22 @@ struct AnchorFormat2
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 2 */
-  SHORT         xCoordinate;            /* Horizontal value--in design units */
-  SHORT         yCoordinate;            /* Vertical value--in design units */
-  USHORT        anchorPoint;            /* Index to glyph contour point */
+  HBUINT16      format;                 /* Format identifier--format = 2 */
+  FWORD         xCoordinate;            /* Horizontal value--in design units */
+  FWORD         yCoordinate;            /* Vertical value--in design units */
+  HBUINT16      anchorPoint;            /* Index to glyph contour point */
   public:
   DEFINE_SIZE_STATIC (8);
 };
 
 struct AnchorFormat3
 {
-  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id HB_UNUSED,
-                          hb_position_t *x, hb_position_t *y) const
+  inline void get_anchor (hb_ot_apply_context_t *c, hb_codepoint_t glyph_id HB_UNUSED,
+                          float *x, float *y) const
   {
     hb_font_t *font = c->font;
-    *x = font->em_scale_x (xCoordinate);
-    *y = font->em_scale_y (yCoordinate);
+    *x = font->em_fscale_x (xCoordinate);
+    *y = font->em_fscale_y (yCoordinate);
 
     if (font->x_ppem || font->num_coords)
       *x += (this+xDeviceTable).get_x_delta (font, c->var_store);
@@ -308,9 +308,9 @@ struct AnchorFormat3
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 3 */
-  SHORT         xCoordinate;            /* Horizontal value--in design units */
-  SHORT         yCoordinate;            /* Vertical value--in design units */
+  HBUINT16      format;                 /* Format identifier--format = 3 */
+  FWORD         xCoordinate;            /* Horizontal value--in design units */
+  FWORD         yCoordinate;            /* Vertical value--in design units */
   OffsetTo<Device>
                 xDeviceTable;           /* Offset to Device table for X
                                          * coordinate-- from beginning of
@@ -325,15 +325,15 @@ struct AnchorFormat3
 
 struct Anchor
 {
-  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id,
-                          hb_position_t *x, hb_position_t *y) const
+  inline void get_anchor (hb_ot_apply_context_t *c, hb_codepoint_t glyph_id,
+                          float *x, float *y) const
   {
     *x = *y = 0;
     switch (u.format) {
     case 1: u.format1.get_anchor (c, glyph_id, x, y); return;
     case 2: u.format2.get_anchor (c, glyph_id, x, y); return;
     case 3: u.format3.get_anchor (c, glyph_id, x, y); return;
-    default:                                             return;
+    default:                                          return;
     }
   }
 
@@ -351,7 +351,7 @@ struct Anchor
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   AnchorFormat1         format1;
   AnchorFormat2         format2;
   AnchorFormat3         format3;
@@ -382,7 +382,7 @@ struct AnchorMatrix
     return_trace (true);
   }
 
-  USHORT        rows;                   /* Number of rows */
+  HBUINT16      rows;                   /* Number of rows */
   protected:
   OffsetTo<Anchor>
                 matrixZ[VAR];           /* Matrix of offsets to Anchor tables--
@@ -403,7 +403,7 @@ struct MarkRecord
   }
 
   protected:
-  USHORT        klass;                  /* Class defined for this mark */
+  HBUINT16      klass;                  /* Class defined for this mark */
   OffsetTo<Anchor>
                 markAnchor;             /* Offset to Anchor table--from
                                          * beginning of MarkArray table */
@@ -413,7 +413,7 @@ struct MarkRecord
 
 struct MarkArray : ArrayOf<MarkRecord>  /* Array of MarkRecords--in Coverage order */
 {
-  inline bool apply (hb_apply_context_t *c,
+  inline bool apply (hb_ot_apply_context_t *c,
                      unsigned int mark_index, unsigned int glyph_index,
                      const AnchorMatrix &anchors, unsigned int class_count,
                      unsigned int glyph_pos) const
@@ -430,15 +430,15 @@ struct MarkArray : ArrayOf<MarkRecord>  /* Array of MarkRecords--in Coverage ord
      * return false such that the subsequent subtables have a chance at it. */
     if (unlikely (!found)) return_trace (false);
 
-    hb_position_t mark_x, mark_y, base_x, base_y;
+    float mark_x, mark_y, base_x, base_y;
 
     buffer->unsafe_to_break (glyph_pos, buffer->idx);
     mark_anchor.get_anchor (c, buffer->cur().codepoint, &mark_x, &mark_y);
     glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y);
 
     hb_glyph_position_t &o = buffer->cur_pos();
-    o.x_offset = base_x - mark_x;
-    o.y_offset = base_y - mark_y;
+    o.x_offset = round (base_x - mark_x);
+    o.y_offset = round (base_y - mark_y);
     o.attach_type() = ATTACH_TYPE_MARK;
     o.attach_chain() = (int) glyph_pos - (int) buffer->idx;
     buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT;
@@ -462,7 +462,7 @@ struct SinglePosFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+coverage).add_coverage (c->input);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -470,7 +470,7 @@ struct SinglePosFormat1
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
@@ -492,7 +492,7 @@ struct SinglePosFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of subtable */
@@ -510,7 +510,7 @@ struct SinglePosFormat2
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+coverage).add_coverage (c->input);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -518,7 +518,7 @@ struct SinglePosFormat2
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
@@ -544,13 +544,13 @@ struct SinglePosFormat2
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 2 */
+  HBUINT16      format;                 /* Format identifier--format = 2 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of subtable */
   ValueFormat   valueFormat;            /* Defines the types of data in the
                                          * ValueRecord */
-  USHORT        valueCount;             /* Number of ValueRecords */
+  HBUINT16      valueCount;             /* Number of ValueRecords */
   ValueRecord   values;                 /* Array of ValueRecords--positioning
                                          * values applied to glyphs */
   public:
@@ -573,7 +573,7 @@ struct SinglePos
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   SinglePosFormat1      format1;
   SinglePosFormat2      format2;
   } u;
@@ -604,18 +604,13 @@ struct PairSet
     TRACE_COLLECT_GLYPHS (this);
     unsigned int len1 = valueFormats[0].get_len ();
     unsigned int len2 = valueFormats[1].get_len ();
-    unsigned int record_size = USHORT::static_size * (1 + len1 + len2);
+    unsigned int record_size = HBUINT16::static_size * (1 + len1 + len2);
 
     const PairValueRecord *record = CastP<PairValueRecord> (arrayZ);
-    unsigned int count = len;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      c->input->add (record->secondGlyph);
-      record = &StructAtOffset<PairValueRecord> (record, record_size);
-    }
+    c->input->add_array (&record->secondGlyph, len, record_size);
   }
 
-  inline bool apply (hb_apply_context_t *c,
+  inline bool apply (hb_ot_apply_context_t *c,
                      const ValueFormat *valueFormats,
                      unsigned int pos) const
   {
@@ -623,7 +618,7 @@ struct PairSet
     hb_buffer_t *buffer = c->buffer;
     unsigned int len1 = valueFormats[0].get_len ();
     unsigned int len2 = valueFormats[1].get_len ();
-    unsigned int record_size = USHORT::static_size * (1 + len1 + len2);
+    unsigned int record_size = HBUINT16::static_size * (1 + len1 + len2);
 
     const PairValueRecord *record_array = CastP<PairValueRecord> (arrayZ);
     unsigned int count = len;
@@ -668,7 +663,7 @@ struct PairSet
   {
     TRACE_SANITIZE (this);
     if (!(c->check_struct (this)
-       && c->check_array (arrayZ, USHORT::static_size * closure->stride, len))) return_trace (false);
+       && c->check_array (arrayZ, HBUINT16::static_size * closure->stride, len))) return_trace (false);
 
     unsigned int count = len;
     const PairValueRecord *record = CastP<PairValueRecord> (arrayZ);
@@ -677,8 +672,8 @@ struct PairSet
   }
 
   protected:
-  USHORT        len;                    /* Number of PairValueRecords */
-  USHORT        arrayZ[VAR];            /* Array of PairValueRecords--ordered
+  HBUINT16      len;                    /* Number of PairValueRecords */
+  HBUINT16      arrayZ[VAR];            /* Array of PairValueRecords--ordered
                                          * by GlyphID of the second glyph */
   public:
   DEFINE_SIZE_ARRAY (2, arrayZ);
@@ -689,7 +684,7 @@ struct PairPosFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+coverage).add_coverage (c->input);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
     unsigned int count = pairSet.len;
     for (unsigned int i = 0; i < count; i++)
       (this+pairSet[i]).collect_glyphs (c, valueFormat);
@@ -700,14 +695,14 @@ struct PairPosFormat1
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
     if (likely (index == NOT_COVERED)) return_trace (false);
 
-    hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (buffer->idx, 1);
     if (!skippy_iter.next ()) return_trace (false);
 
@@ -733,7 +728,7 @@ struct PairPosFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of subtable */
@@ -755,17 +750,8 @@ struct PairPosFormat2
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+coverage).add_coverage (c->input);
-
-    unsigned int count1 = class1Count;
-    const ClassDef &klass1 = this+classDef1;
-    for (unsigned int i = 0; i < count1; i++)
-      klass1.add_class (c->input, i);
-
-    unsigned int count2 = class2Count;
-    const ClassDef &klass2 = this+classDef2;
-    for (unsigned int i = 0; i < count2; i++)
-      klass2.add_class (c->input, i);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
+    if (unlikely (!(this+classDef2).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -773,14 +759,14 @@ struct PairPosFormat2
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
     if (likely (index == NOT_COVERED)) return_trace (false);
 
-    hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (buffer->idx, 1);
     if (!skippy_iter.next ()) return_trace (false);
 
@@ -823,7 +809,7 @@ struct PairPosFormat2
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 2 */
+  HBUINT16      format;                 /* Format identifier--format = 2 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of subtable */
@@ -841,9 +827,9 @@ struct PairPosFormat2
                 classDef2;              /* Offset to ClassDef table--from
                                          * beginning of PairPos subtable--for
                                          * the second glyph of the pair */
-  USHORT        class1Count;            /* Number of classes in ClassDef1
+  HBUINT16      class1Count;            /* Number of classes in ClassDef1
                                          * table--includes Class0 */
-  USHORT        class2Count;            /* Number of classes in ClassDef2
+  HBUINT16      class2Count;            /* Number of classes in ClassDef2
                                          * table--includes Class0 */
   ValueRecord   values;                 /* Matrix of value pairs:
                                          * class1-major, class2-minor,
@@ -868,7 +854,7 @@ struct PairPos
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   PairPosFormat1        format1;
   PairPosFormat2        format2;
   } u;
@@ -906,7 +892,7 @@ struct CursivePosFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+coverage).add_coverage (c->input);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -914,7 +900,7 @@ struct CursivePosFormat1
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
@@ -922,7 +908,7 @@ struct CursivePosFormat1
     const EntryExitRecord &this_record = entryExitRecord[(this+coverage).get_coverage  (buffer->cur().codepoint)];
     if (!this_record.exitAnchor) return_trace (false);
 
-    hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (buffer->idx, 1);
     if (!skippy_iter.next ()) return_trace (false);
 
@@ -933,7 +919,7 @@ struct CursivePosFormat1
     unsigned int j = skippy_iter.idx;
 
     buffer->unsafe_to_break (i, j);
-    hb_position_t entry_x, entry_y, exit_x, exit_y;
+    float entry_x, entry_y, exit_x, exit_y;
     (this+this_record.exitAnchor).get_anchor (c, buffer->info[i].codepoint, &exit_x, &exit_y);
     (this+next_record.entryAnchor).get_anchor (c, buffer->info[j].codepoint, &entry_x, &entry_y);
 
@@ -943,32 +929,32 @@ struct CursivePosFormat1
     /* Main-direction adjustment */
     switch (c->direction) {
       case HB_DIRECTION_LTR:
-        pos[i].x_advance  =  exit_x + pos[i].x_offset;
+        pos[i].x_advance  = round (exit_x) + pos[i].x_offset;
 
-        d = entry_x + pos[j].x_offset;
+        d = round (entry_x) + pos[j].x_offset;
         pos[j].x_advance -= d;
         pos[j].x_offset  -= d;
         break;
       case HB_DIRECTION_RTL:
-        d = exit_x + pos[i].x_offset;
+        d = round (exit_x) + pos[i].x_offset;
         pos[i].x_advance -= d;
         pos[i].x_offset  -= d;
 
-        pos[j].x_advance  =  entry_x + pos[j].x_offset;
+        pos[j].x_advance  = round (entry_x) + pos[j].x_offset;
         break;
       case HB_DIRECTION_TTB:
-        pos[i].y_advance  =  exit_y + pos[i].y_offset;
+        pos[i].y_advance  = round (exit_y) + pos[i].y_offset;
 
-        d = entry_y + pos[j].y_offset;
+        d = round (entry_y) + pos[j].y_offset;
         pos[j].y_advance -= d;
         pos[j].y_offset  -= d;
         break;
       case HB_DIRECTION_BTT:
-        d = exit_y + pos[i].y_offset;
+        d = round (exit_y) + pos[i].y_offset;
         pos[i].y_advance -= d;
         pos[i].y_offset  -= d;
 
-        pos[j].y_advance  =  entry_y;
+        pos[j].y_advance  = round (entry_y);
         break;
       case HB_DIRECTION_INVALID:
       default:
@@ -1022,7 +1008,7 @@ struct CursivePosFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of subtable */
@@ -1048,7 +1034,7 @@ struct CursivePos
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   CursivePosFormat1     format1;
   } u;
 };
@@ -1064,8 +1050,8 @@ struct MarkBasePosFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+markCoverage).add_coverage (c->input);
-    (this+baseCoverage).add_coverage (c->input);
+    if (unlikely (!(this+markCoverage).add_coverage (c->input))) return;
+    if (unlikely (!(this+baseCoverage).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -1073,7 +1059,7 @@ struct MarkBasePosFormat1
     return this+markCoverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
@@ -1081,14 +1067,22 @@ struct MarkBasePosFormat1
     if (likely (mark_index == NOT_COVERED)) return_trace (false);
 
     /* Now we search backwards for a non-mark glyph */
-    hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (buffer->idx, 1);
     skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
     do {
       if (!skippy_iter.prev ()) return_trace (false);
-      /* We only want to attach to the first of a MultipleSubst sequence.  Reject others. */
+      /* We only want to attach to the first of a MultipleSubst sequence.
+       * https://github.com/harfbuzz/harfbuzz/issues/740
+       * Reject others. */
       if (!_hb_glyph_info_multiplied (&buffer->info[skippy_iter.idx]) ||
-          0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]))
+          0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) ||
+          (skippy_iter.idx == 0 ||
+           _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx]) !=
+           _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx - 1]) ||
+           _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) !=
+           _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx - 1]) + 1
+           ))
         break;
       skippy_iter.reject ();
     } while (1);
@@ -1113,14 +1107,14 @@ struct MarkBasePosFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 markCoverage;           /* Offset to MarkCoverage table--from
                                          * beginning of MarkBasePos subtable */
   OffsetTo<Coverage>
                 baseCoverage;           /* Offset to BaseCoverage table--from
                                          * beginning of MarkBasePos subtable */
-  USHORT        classCount;             /* Number of classes defined for marks */
+  HBUINT16      classCount;             /* Number of classes defined for marks */
   OffsetTo<MarkArray>
                 markArray;              /* Offset to MarkArray table--from
                                          * beginning of MarkBasePos subtable */
@@ -1146,7 +1140,7 @@ struct MarkBasePos
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   MarkBasePosFormat1    format1;
   } u;
 };
@@ -1167,8 +1161,8 @@ struct MarkLigPosFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+markCoverage).add_coverage (c->input);
-    (this+ligatureCoverage).add_coverage (c->input);
+    if (unlikely (!(this+markCoverage).add_coverage (c->input))) return;
+    if (unlikely (!(this+ligatureCoverage).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -1176,7 +1170,7 @@ struct MarkLigPosFormat1
     return this+markCoverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
@@ -1184,7 +1178,7 @@ struct MarkLigPosFormat1
     if (likely (mark_index == NOT_COVERED)) return_trace (false);
 
     /* Now we search backwards for a non-mark glyph */
-    hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (buffer->idx, 1);
     skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
     if (!skippy_iter.prev ()) return_trace (false);
@@ -1230,7 +1224,7 @@ struct MarkLigPosFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 markCoverage;           /* Offset to Mark Coverage table--from
                                          * beginning of MarkLigPos subtable */
@@ -1238,7 +1232,7 @@ struct MarkLigPosFormat1
                 ligatureCoverage;       /* Offset to Ligature Coverage
                                          * table--from beginning of MarkLigPos
                                          * subtable */
-  USHORT        classCount;             /* Number of defined mark classes */
+  HBUINT16      classCount;             /* Number of defined mark classes */
   OffsetTo<MarkArray>
                 markArray;              /* Offset to MarkArray table--from
                                          * beginning of MarkLigPos subtable */
@@ -1264,7 +1258,7 @@ struct MarkLigPos
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   MarkLigPosFormat1     format1;
   } u;
 };
@@ -1280,8 +1274,8 @@ struct MarkMarkPosFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+mark1Coverage).add_coverage (c->input);
-    (this+mark2Coverage).add_coverage (c->input);
+    if (unlikely (!(this+mark1Coverage).add_coverage (c->input))) return;
+    if (unlikely (!(this+mark2Coverage).add_coverage (c->input))) return;
   }
 
   inline const Coverage &get_coverage (void) const
@@ -1289,7 +1283,7 @@ struct MarkMarkPosFormat1
     return this+mark1Coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
@@ -1297,7 +1291,7 @@ struct MarkMarkPosFormat1
     if (likely (mark1_index == NOT_COVERED)) return_trace (false);
 
     /* now we search backwards for a suitable mark glyph until a non-mark glyph */
-    hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (buffer->idx, 1);
     skippy_iter.set_lookup_props (c->lookup_props & ~LookupFlag::IgnoreFlags);
     if (!skippy_iter.prev ()) return_trace (false);
@@ -1344,7 +1338,7 @@ struct MarkMarkPosFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 mark1Coverage;          /* Offset to Combining Mark1 Coverage
                                          * table--from beginning of MarkMarkPos
@@ -1353,7 +1347,7 @@ struct MarkMarkPosFormat1
                 mark2Coverage;          /* Offset to Combining Mark2 Coverage
                                          * table--from beginning of MarkMarkPos
                                          * subtable */
-  USHORT        classCount;             /* Number of defined mark classes */
+  HBUINT16      classCount;             /* Number of defined mark classes */
   OffsetTo<MarkArray>
                 mark1Array;             /* Offset to Mark1Array table--from
                                          * beginning of MarkMarkPos subtable */
@@ -1379,7 +1373,7 @@ struct MarkMarkPos
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   MarkMarkPosFormat1    format1;
   } u;
 };
@@ -1438,7 +1432,7 @@ struct PosLookupSubTable
 
   protected:
   union {
-  USHORT                sub_format;
+  HBUINT16              sub_format;
   SinglePos             single;
   PairPos               pair;
   CursivePos            cursive;
@@ -1464,7 +1458,7 @@ struct PosLookup : Lookup
     return false;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     return_trace (dispatch (c));
@@ -1483,7 +1477,7 @@ struct PosLookup : Lookup
     dispatch (&c);
   }
 
-  static bool apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index);
+  static bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index);
 
   template <typename context_t>
   static inline typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index);
@@ -1635,7 +1629,7 @@ template <typename context_t>
   return l.dispatch (c);
 }
 
-/*static*/ inline bool PosLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index)
+/*static*/ inline bool PosLookup::apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index)
 {
   const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos);
   const PosLookup &l = gpos.get_lookup (lookup_index);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh
index ea64d723d92..20009a4e924 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh
@@ -44,7 +44,7 @@ struct SingleSubstFormat1
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       /* TODO Switch to range-based API to work around malicious fonts.
-       * https://github.com/behdad/harfbuzz/issues/363 */
+       * https://github.com/harfbuzz/harfbuzz/issues/363 */
       hb_codepoint_t glyph_id = iter.get_glyph ();
       if (c->glyphs->has (glyph_id))
         c->glyphs->add ((glyph_id + deltaGlyphID) & 0xFFFFu);
@@ -54,13 +54,13 @@ struct SingleSubstFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
     Coverage::Iter iter;
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       /* TODO Switch to range-based API to work around malicious fonts.
-       * https://github.com/behdad/harfbuzz/issues/363 */
+       * https://github.com/harfbuzz/harfbuzz/issues/363 */
       hb_codepoint_t glyph_id = iter.get_glyph ();
-      c->input->add (glyph_id);
       c->output->add ((glyph_id + deltaGlyphID) & 0xFFFFu);
     }
   }
@@ -76,7 +76,7 @@ struct SingleSubstFormat1
     return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
@@ -110,11 +110,11 @@ struct SingleSubstFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of Substitution table */
-  SHORT         deltaGlyphID;           /* Add to original GlyphID to get
+  HBINT16       deltaGlyphID;           /* Add to original GlyphID to get
                                          * substitute GlyphID */
   public:
   DEFINE_SIZE_STATIC (6);
@@ -130,7 +130,7 @@ struct SingleSubstFormat2
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         c->glyphs->add (substitute[iter.get_coverage ()]);
     }
@@ -139,13 +139,13 @@ struct SingleSubstFormat2
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
     Coverage::Iter iter;
     unsigned int count = substitute.len;
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
-      c->input->add (iter.get_glyph ());
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       c->output->add (substitute[iter.get_coverage ()]);
     }
   }
@@ -161,7 +161,7 @@ struct SingleSubstFormat2
     return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
@@ -195,7 +195,7 @@ struct SingleSubstFormat2
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 2 */
+  HBUINT16      format;                 /* Format identifier--format = 2 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of Substitution table */
@@ -249,7 +249,7 @@ struct SingleSubst
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   SingleSubstFormat1    format1;
   SingleSubstFormat2    format2;
   } u;
@@ -269,12 +269,10 @@ struct Sequence
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    unsigned int count = substitute.len;
-    for (unsigned int i = 0; i < count; i++)
-      c->output->add (substitute[i]);
+    c->output->add_array (substitute.array, substitute.len);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int count = substitute.len;
@@ -287,7 +285,7 @@ struct Sequence
       return_trace (true);
     }
     /* Spec disallows this, but Uniscribe allows it.
-     * https://github.com/behdad/harfbuzz/issues/253 */
+     * https://github.com/harfbuzz/harfbuzz/issues/253 */
     else if (unlikely (count == 0))
     {
       c->buffer->delete_glyph ();
@@ -339,7 +337,7 @@ struct MultipleSubstFormat1
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         (this+sequence[iter.get_coverage ()]).closure (c);
     }
@@ -348,7 +346,7 @@ struct MultipleSubstFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    (this+coverage).add_coverage (c->input);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
     unsigned int count = sequence.len;
     for (unsigned int i = 0; i < count; i++)
         (this+sequence[i]).collect_glyphs (c);
@@ -365,7 +363,7 @@ struct MultipleSubstFormat1
     return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
 
@@ -388,7 +386,7 @@ struct MultipleSubstFormat1
       if (unlikely (!sequence[i].serialize (c, this).serialize (c,
                                                                 substitute_glyphs_list,
                                                                 substitute_len_list[i]))) return_trace (false);
-    substitute_len_list.advance (num_glyphs);
+    substitute_len_list += num_glyphs;
     if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return_trace (false);
     return_trace (true);
   }
@@ -400,7 +398,7 @@ struct MultipleSubstFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of Substitution table */
@@ -442,7 +440,7 @@ struct MultipleSubst
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   MultipleSubstFormat1  format1;
   } u;
 };
@@ -461,7 +459,7 @@ struct AlternateSubstFormat1
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ())) {
         const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
         unsigned int count = alt_set.len;
@@ -474,17 +472,15 @@ struct AlternateSubstFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
     Coverage::Iter iter;
     unsigned int count = alternateSet.len;
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
-      c->input->add (iter.get_glyph ());
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
-      unsigned int count = alt_set.len;
-      for (unsigned int i = 0; i < count; i++)
-        c->output->add (alt_set[i]);
+      c->output->add_array (alt_set.array, alt_set.len);
     }
   }
 
@@ -499,7 +495,7 @@ struct AlternateSubstFormat1
     return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
@@ -540,7 +536,7 @@ struct AlternateSubstFormat1
       if (unlikely (!alternateSet[i].serialize (c, this).serialize (c,
                                                                     alternate_glyphs_list,
                                                                     alternate_len_list[i]))) return_trace (false);
-    alternate_len_list.advance (num_glyphs);
+    alternate_len_list += num_glyphs;
     if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return_trace (false);
     return_trace (true);
   }
@@ -552,7 +548,7 @@ struct AlternateSubstFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of Substitution table */
@@ -594,7 +590,7 @@ struct AlternateSubst
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   AlternateSubstFormat1 format1;
   } u;
 };
@@ -615,9 +611,7 @@ struct Ligature
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    unsigned int count = component.len;
-    for (unsigned int i = 1; i < count; i++)
-      c->input->add (component[i]);
+    c->input->add_array (component.array, component.len ? component.len - 1 : 0);
     c->output->add (ligGlyph);
   }
 
@@ -634,7 +628,7 @@ struct Ligature
     return_trace (true);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int count = component.len;
@@ -736,7 +730,7 @@ struct LigatureSet
     return_trace (false);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int num_ligs = ligature.len;
@@ -763,8 +757,8 @@ struct LigatureSet
                                                                 ligatures[i],
                                                                 component_list,
                                                                 component_count_list[i]))) return_trace (false);
-    ligatures.advance (num_ligatures);
-    component_count_list.advance (num_ligatures);
+    ligatures += num_ligatures;
+    component_count_list += num_ligatures;
     return_trace (true);
   }
 
@@ -792,7 +786,7 @@ struct LigatureSubstFormat1
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         (this+ligatureSet[iter.get_coverage ()]).closure (c);
     }
@@ -801,13 +795,13 @@ struct LigatureSubstFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
     Coverage::Iter iter;
     unsigned int count = ligatureSet.len;
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
-      c->input->add (iter.get_glyph ());
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       (this+ligatureSet[iter.get_coverage ()]).collect_glyphs (c);
     }
   }
@@ -827,7 +821,7 @@ struct LigatureSubstFormat1
     return_trace (lig_set.would_apply (c));
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
@@ -856,7 +850,7 @@ struct LigatureSubstFormat1
                                                                    component_count_list,
                                                                    ligature_per_first_glyph_count_list[i],
                                                                    component_list))) return_trace (false);
-    ligature_per_first_glyph_count_list.advance (num_first_glyphs);
+    ligature_per_first_glyph_count_list += num_first_glyphs;
     if (unlikely (!coverage.serialize (c, this).serialize (c, first_glyphs, num_first_glyphs))) return_trace (false);
     return_trace (true);
   }
@@ -868,7 +862,7 @@ struct LigatureSubstFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of Substitution table */
@@ -918,7 +912,7 @@ struct LigatureSubst
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   LigatureSubstFormat1  format1;
   } u;
 };
@@ -961,7 +955,7 @@ struct ReverseChainSingleSubstFormat1
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         c->glyphs->add (substitute[iter.get_coverage ()]);
     }
@@ -970,25 +964,22 @@ struct ReverseChainSingleSubstFormat1
   inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
   {
     TRACE_COLLECT_GLYPHS (this);
-
-    const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
+    if (unlikely (!(this+coverage).add_coverage (c->input))) return;
 
     unsigned int count;
 
-    (this+coverage).add_coverage (c->input);
-
     count = backtrack.len;
     for (unsigned int i = 0; i < count; i++)
-      (this+backtrack[i]).add_coverage (c->before);
+      if (unlikely (!(this+backtrack[i]).add_coverage (c->before))) return;
 
+    const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
     count = lookahead.len;
     for (unsigned int i = 0; i < count; i++)
-      (this+lookahead[i]).add_coverage (c->after);
+      if (unlikely (!(this+lookahead[i]).add_coverage (c->after))) return;
 
     const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
     count = substitute.len;
-    for (unsigned int i = 0; i < count; i++)
-      c->output->add (substitute[i]);
+    c->output->add_array (substitute.array, substitute.len);
   }
 
   inline const Coverage &get_coverage (void) const
@@ -1002,7 +993,7 @@ struct ReverseChainSingleSubstFormat1
     return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     if (unlikely (c->nesting_level_left != HB_MAX_NESTING_LEVEL))
@@ -1016,11 +1007,11 @@ struct ReverseChainSingleSubstFormat1
 
   unsigned int start_index = 0, end_index = 0;
     if (match_backtrack (c,
-                         backtrack.len, (USHORT *) backtrack.array,
+                         backtrack.len, (HBUINT16 *) backtrack.array,
                          match_coverage, this,
                          &start_index) &&
         match_lookahead (c,
-                         lookahead.len, (USHORT *) lookahead.array,
+                         lookahead.len, (HBUINT16 *) lookahead.array,
                          match_coverage, this,
                          1, &end_index))
     {
@@ -1048,7 +1039,7 @@ struct ReverseChainSingleSubstFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of table */
@@ -1082,7 +1073,7 @@ struct ReverseChainSingleSubst
 
   protected:
   union {
-  USHORT                                format;         /* Format identifier */
+  HBUINT16                              format;         /* Format identifier */
   ReverseChainSingleSubstFormat1        format1;
   } u;
 };
@@ -1128,7 +1119,7 @@ struct SubstLookupSubTable
 
   protected:
   union {
-  USHORT                        sub_format;
+  HBUINT16                      sub_format;
   SingleSubst                   single;
   MultipleSubst                 multiple;
   AlternateSubst                alternate;
@@ -1159,7 +1150,7 @@ struct SubstLookup : Lookup
     return lookup_type_is_reverse (type);
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     return_trace (dispatch (c));
@@ -1195,7 +1186,7 @@ struct SubstLookup : Lookup
       return_trace (dispatch (c));
   }
 
-  static bool apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index);
+  static bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index);
 
   inline SubstLookupSubTable& serialize_subtable (hb_serialize_context_t *c,
                                                   unsigned int i)
@@ -1280,8 +1271,9 @@ struct SubstLookup : Lookup
     if (unlikely (get_type () == SubstLookupSubTable::Extension))
     {
       /* The spec says all subtables of an Extension lookup should
-       * have the same type.  This is specially important if one has
-       * a reverse type! */
+       * have the same type, which shall not be the Extension type
+       * itself (but we already checked for that).
+       * This is specially important if one has a reverse type! */
       unsigned int type = get_subtable (0).u.extension.get_type ();
       unsigned int count = get_subtable_count ();
       for (unsigned int i = 1; i < count; i++)
@@ -1351,7 +1343,7 @@ template <typename context_t>
   return l.dispatch (c);
 }
 
-/*static*/ inline bool SubstLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index)
+/*static*/ inline bool SubstLookup::apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index)
 {
   const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub);
   const SubstLookup &l = gsub.get_lookup (lookup_index);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh
index 50489f88f51..99bc6172f0d 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh
@@ -218,8 +218,8 @@ struct hb_add_coverage_context_t :
 };
 
 
-struct hb_apply_context_t :
-       hb_dispatch_context_t<hb_apply_context_t, bool, HB_DEBUG_APPLY>
+struct hb_ot_apply_context_t :
+       hb_dispatch_context_t<hb_ot_apply_context_t, bool, HB_DEBUG_APPLY>
 {
   struct matcher_t
   {
@@ -234,7 +234,7 @@ struct hb_apply_context_t :
              match_func (nullptr),
              match_data (nullptr) {};
 
-    typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data);
+    typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const HBUINT16 &value, const void *data);
 
     inline void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; }
     inline void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; }
@@ -252,7 +252,7 @@ struct hb_apply_context_t :
     };
 
     inline may_match_t may_match (const hb_glyph_info_t &info,
-                                  const USHORT          *glyph_data) const
+                                  const HBUINT16          *glyph_data) const
     {
       if (!(info.mask & mask) ||
           (syllable && syllable != info.syllable ()))
@@ -271,7 +271,7 @@ struct hb_apply_context_t :
     };
 
     inline may_skip_t
-    may_skip (const hb_apply_context_t *c,
+    may_skip (const hb_ot_apply_context_t *c,
               const hb_glyph_info_t    &info) const
     {
       if (!c->check_glyph_property (&info, lookup_props))
@@ -297,7 +297,7 @@ struct hb_apply_context_t :
 
   struct skipping_iterator_t
   {
-    inline void init (hb_apply_context_t *c_, bool context_match = false)
+    inline void init (hb_ot_apply_context_t *c_, bool context_match = false)
     {
       c = c_;
       match_glyph_data = nullptr;
@@ -315,7 +315,7 @@ struct hb_apply_context_t :
     }
     inline void set_match_func (matcher_t::match_func_t match_func_,
                                 const void *match_data_,
-                                const USHORT glyph_data[])
+                                const HBUINT16 glyph_data[])
     {
       matcher.set_match_func (match_func_, match_data_);
       match_glyph_data = glyph_data;
@@ -333,8 +333,7 @@ struct hb_apply_context_t :
     inline void reject (void) { num_items++; match_glyph_data--; }
 
     inline matcher_t::may_skip_t
-    may_skip (const hb_apply_context_t *c,
-              const hb_glyph_info_t    &info) const
+    may_skip (const hb_glyph_info_t    &info) const
     {
       return matcher.may_skip (c, info);
     }
@@ -396,9 +395,9 @@ struct hb_apply_context_t :
 
     unsigned int idx;
     protected:
-    hb_apply_context_t *c;
+    hb_ot_apply_context_t *c;
     matcher_t matcher;
-    const USHORT *match_glyph_data;
+    const HBUINT16 *match_glyph_data;
 
     unsigned int num_items;
     unsigned int end;
@@ -406,18 +405,18 @@ struct hb_apply_context_t :
 
 
   inline const char *get_name (void) { return "APPLY"; }
-  typedef return_t (*recurse_func_t) (hb_apply_context_t *c, unsigned int lookup_index);
+  typedef return_t (*recurse_func_t) (hb_ot_apply_context_t *c, unsigned int lookup_index);
   template <typename T>
   inline return_t dispatch (const T &obj) { return obj.apply (this); }
   static return_t default_return_value (void) { return false; }
   bool stop_sublookup_iteration (return_t r) const { return r; }
-  return_t recurse (unsigned int lookup_index)
+  return_t recurse (unsigned int sub_lookup_index)
   {
-    if (unlikely (nesting_level_left == 0 || !recurse_func))
+    if (unlikely (nesting_level_left == 0 || !recurse_func || buffer->max_ops-- <= 0))
       return default_return_value ();
 
     nesting_level_left--;
-    bool ret = recurse_func (this, lookup_index);
+    bool ret = recurse_func (this, sub_lookup_index);
     nesting_level_left++;
     return ret;
   }
@@ -444,7 +443,7 @@ struct hb_apply_context_t :
   bool has_glyph_classes;
 
 
-  hb_apply_context_t (unsigned int table_index_,
+  hb_ot_apply_context_t (unsigned int table_index_,
                       hb_font_t *font_,
                       hb_buffer_t *buffer_) :
                         iter_input (), iter_context (),
@@ -568,9 +567,9 @@ struct hb_apply_context_t :
 
 
 
-typedef bool (*intersects_func_t) (hb_set_t *glyphs, const USHORT &value, const void *data);
-typedef void (*collect_glyphs_func_t) (hb_set_t *glyphs, const USHORT &value, const void *data);
-typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data);
+typedef bool (*intersects_func_t) (hb_set_t *glyphs, const HBUINT16 &value, const void *data);
+typedef void (*collect_glyphs_func_t) (hb_set_t *glyphs, const HBUINT16 &value, const void *data);
+typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const HBUINT16 &value, const void *data);
 
 struct ContextClosureFuncs
 {
@@ -586,16 +585,16 @@ struct ContextApplyFuncs
 };
 
 
-static inline bool intersects_glyph (hb_set_t *glyphs, const USHORT &value, const void *data HB_UNUSED)
+static inline bool intersects_glyph (hb_set_t *glyphs, const HBUINT16 &value, const void *data HB_UNUSED)
 {
   return glyphs->has (value);
 }
-static inline bool intersects_class (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline bool intersects_class (hb_set_t *glyphs, const HBUINT16 &value, const void *data)
 {
   const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
   return class_def.intersects_class (glyphs, value);
 }
-static inline bool intersects_coverage (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline bool intersects_coverage (hb_set_t *glyphs, const HBUINT16 &value, const void *data)
 {
   const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value;
   return (data+coverage).intersects (glyphs);
@@ -603,7 +602,7 @@ static inline bool intersects_coverage (hb_set_t *glyphs, const USHORT &value, c
 
 static inline bool intersects_array (hb_closure_context_t *c,
                                      unsigned int count,
-                                     const USHORT values[],
+                                     const HBUINT16 values[],
                                      intersects_func_t intersects_func,
                                      const void *intersects_data)
 {
@@ -614,16 +613,16 @@ static inline bool intersects_array (hb_closure_context_t *c,
 }
 
 
-static inline void collect_glyph (hb_set_t *glyphs, const USHORT &value, const void *data HB_UNUSED)
+static inline void collect_glyph (hb_set_t *glyphs, const HBUINT16 &value, const void *data HB_UNUSED)
 {
   glyphs->add (value);
 }
-static inline void collect_class (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline void collect_class (hb_set_t *glyphs, const HBUINT16 &value, const void *data)
 {
   const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
   class_def.add_class (glyphs, value);
 }
-static inline void collect_coverage (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline void collect_coverage (hb_set_t *glyphs, const HBUINT16 &value, const void *data)
 {
   const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value;
   (data+coverage).add_coverage (glyphs);
@@ -631,7 +630,7 @@ static inline void collect_coverage (hb_set_t *glyphs, const USHORT &value, cons
 static inline void collect_array (hb_collect_glyphs_context_t *c HB_UNUSED,
                                   hb_set_t *glyphs,
                                   unsigned int count,
-                                  const USHORT values[],
+                                  const HBUINT16 values[],
                                   collect_glyphs_func_t collect_func,
                                   const void *collect_data)
 {
@@ -640,16 +639,16 @@ static inline void collect_array (hb_collect_glyphs_context_t *c HB_UNUSED,
 }
 
 
-static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, const void *data HB_UNUSED)
+static inline bool match_glyph (hb_codepoint_t glyph_id, const HBUINT16 &value, const void *data HB_UNUSED)
 {
   return glyph_id == value;
 }
-static inline bool match_class (hb_codepoint_t glyph_id, const USHORT &value, const void *data)
+static inline bool match_class (hb_codepoint_t glyph_id, const HBUINT16 &value, const void *data)
 {
   const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
   return class_def.get_class (glyph_id) == value;
 }
-static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value, const void *data)
+static inline bool match_coverage (hb_codepoint_t glyph_id, const HBUINT16 &value, const void *data)
 {
   const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value;
   return (data+coverage).get_coverage (glyph_id) != NOT_COVERED;
@@ -657,7 +656,7 @@ static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value,
 
 static inline bool would_match_input (hb_would_apply_context_t *c,
                                       unsigned int count, /* Including the first glyph (not matched) */
-                                      const USHORT input[], /* Array of input values--start with second glyph */
+                                      const HBUINT16 input[], /* Array of input values--start with second glyph */
                                       match_func_t match_func,
                                       const void *match_data)
 {
@@ -670,9 +669,9 @@ static inline bool would_match_input (hb_would_apply_context_t *c,
 
   return true;
 }
-static inline bool match_input (hb_apply_context_t *c,
+static inline bool match_input (hb_ot_apply_context_t *c,
                                 unsigned int count, /* Including the first glyph (not matched) */
-                                const USHORT input[], /* Array of input values--start with second glyph */
+                                const HBUINT16 input[], /* Array of input values--start with second glyph */
                                 match_func_t match_func,
                                 const void *match_data,
                                 unsigned int *end_offset,
@@ -686,7 +685,7 @@ static inline bool match_input (hb_apply_context_t *c,
 
   hb_buffer_t *buffer = c->buffer;
 
-  hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+  hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
   skippy_iter.reset (buffer->idx, count - 1);
   skippy_iter.set_match_func (match_func, match_data, input);
 
@@ -711,7 +710,7 @@ static inline bool match_input (hb_apply_context_t *c,
    *   o If two marks want to ligate and they belong to different components of the
    *     same ligature glyph, and said ligature glyph is to be ignored according to
    *     mark-filtering rules, then allow.
-   *     https://github.com/behdad/harfbuzz/issues/545
+   *     https://github.com/harfbuzz/harfbuzz/issues/545
    */
 
   bool is_mark_ligature = _hb_glyph_info_is_mark (&buffer->cur());
@@ -763,7 +762,7 @@ static inline bool match_input (hb_apply_context_t *c,
             j--;
           }
 
-          if (found && skippy_iter.may_skip (c, out[j]) == hb_apply_context_t::matcher_t::SKIP_YES)
+          if (found && skippy_iter.may_skip (out[j]) == hb_ot_apply_context_t::matcher_t::SKIP_YES)
             ligbase = LIGBASE_MAY_SKIP;
           else
             ligbase = LIGBASE_MAY_NOT_SKIP;
@@ -796,7 +795,7 @@ static inline bool match_input (hb_apply_context_t *c,
 
   return_trace (true);
 }
-static inline bool ligate_input (hb_apply_context_t *c,
+static inline bool ligate_input (hb_ot_apply_context_t *c,
                                  unsigned int count, /* Including the first glyph */
                                  unsigned int match_positions[HB_MAX_CONTEXT_LENGTH], /* Including the first glyph */
                                  unsigned int match_length,
@@ -894,16 +893,16 @@ static inline bool ligate_input (hb_apply_context_t *c,
   return_trace (true);
 }
 
-static inline bool match_backtrack (hb_apply_context_t *c,
+static inline bool match_backtrack (hb_ot_apply_context_t *c,
                                     unsigned int count,
-                                    const USHORT backtrack[],
+                                    const HBUINT16 backtrack[],
                                     match_func_t match_func,
                                     const void *match_data,
                                     unsigned int *match_start)
 {
   TRACE_APPLY (nullptr);
 
-  hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
+  hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
   skippy_iter.reset (c->buffer->backtrack_len (), count);
   skippy_iter.set_match_func (match_func, match_data, backtrack);
 
@@ -916,9 +915,9 @@ static inline bool match_backtrack (hb_apply_context_t *c,
   return_trace (true);
 }
 
-static inline bool match_lookahead (hb_apply_context_t *c,
+static inline bool match_lookahead (hb_ot_apply_context_t *c,
                                     unsigned int count,
-                                    const USHORT lookahead[],
+                                    const HBUINT16 lookahead[],
                                     match_func_t match_func,
                                     const void *match_data,
                                     unsigned int offset,
@@ -926,7 +925,7 @@ static inline bool match_lookahead (hb_apply_context_t *c,
 {
   TRACE_APPLY (nullptr);
 
-  hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
+  hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
   skippy_iter.reset (c->buffer->idx + offset - 1, count);
   skippy_iter.set_match_func (match_func, match_data, lookahead);
 
@@ -949,9 +948,9 @@ struct LookupRecord
     return_trace (c->check_struct (this));
   }
 
-  USHORT        sequenceIndex;          /* Index into current glyph
+  HBUINT16      sequenceIndex;          /* Index into current glyph
                                          * sequence--first glyph = 0 */
-  USHORT        lookupListIndex;        /* Lookup to apply to that
+  HBUINT16      lookupListIndex;        /* Lookup to apply to that
                                          * position--zero--based */
   public:
   DEFINE_SIZE_STATIC (4);
@@ -967,7 +966,7 @@ static inline void recurse_lookups (context_t *c,
     c->recurse (lookupRecord[i].lookupListIndex);
 }
 
-static inline bool apply_lookup (hb_apply_context_t *c,
+static inline bool apply_lookup (hb_ot_apply_context_t *c,
                                  unsigned int count, /* Including the first glyph */
                                  unsigned int match_positions[HB_MAX_CONTEXT_LENGTH], /* Including the first glyph */
                                  unsigned int lookupCount,
@@ -1002,7 +1001,11 @@ static inline bool apply_lookup (hb_apply_context_t *c,
     if (idx == 0 && lookupRecord[i].lookupListIndex == c->lookup_index)
       continue;
 
-    buffer->move_to (match_positions[idx]);
+    if (unlikely (!buffer->move_to (match_positions[idx])))
+      break;
+
+    if (unlikely (buffer->max_ops <= 0))
+      break;
 
     unsigned int orig_len = buffer->backtrack_len () + buffer->lookahead_len ();
     if (!c->recurse (lookupRecord[i].lookupListIndex))
@@ -1108,7 +1111,7 @@ struct ContextApplyLookupContext
 
 static inline void context_closure_lookup (hb_closure_context_t *c,
                                            unsigned int inputCount, /* Including the first glyph (not matched) */
-                                           const USHORT input[], /* Array of input values--start with second glyph */
+                                           const HBUINT16 input[], /* Array of input values--start with second glyph */
                                            unsigned int lookupCount,
                                            const LookupRecord lookupRecord[],
                                            ContextClosureLookupContext &lookup_context)
@@ -1122,7 +1125,7 @@ static inline void context_closure_lookup (hb_closure_context_t *c,
 
 static inline void context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c,
                                                   unsigned int inputCount, /* Including the first glyph (not matched) */
-                                                  const USHORT input[], /* Array of input values--start with second glyph */
+                                                  const HBUINT16 input[], /* Array of input values--start with second glyph */
                                                   unsigned int lookupCount,
                                                   const LookupRecord lookupRecord[],
                                                   ContextCollectGlyphsLookupContext &lookup_context)
@@ -1136,7 +1139,7 @@ static inline void context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c
 
 static inline bool context_would_apply_lookup (hb_would_apply_context_t *c,
                                                unsigned int inputCount, /* Including the first glyph (not matched) */
-                                               const USHORT input[], /* Array of input values--start with second glyph */
+                                               const HBUINT16 input[], /* Array of input values--start with second glyph */
                                                unsigned int lookupCount HB_UNUSED,
                                                const LookupRecord lookupRecord[] HB_UNUSED,
                                                ContextApplyLookupContext &lookup_context)
@@ -1145,9 +1148,9 @@ static inline bool context_would_apply_lookup (hb_would_apply_context_t *c,
                             inputCount, input,
                             lookup_context.funcs.match, lookup_context.match_data);
 }
-static inline bool context_apply_lookup (hb_apply_context_t *c,
+static inline bool context_apply_lookup (hb_ot_apply_context_t *c,
                                          unsigned int inputCount, /* Including the first glyph (not matched) */
-                                         const USHORT input[], /* Array of input values--start with second glyph */
+                                         const HBUINT16 input[], /* Array of input values--start with second glyph */
                                          unsigned int lookupCount,
                                          const LookupRecord lookupRecord[],
                                          ContextApplyLookupContext &lookup_context)
@@ -1194,7 +1197,7 @@ struct Rule
     return_trace (context_would_apply_lookup (c, inputCount, inputZ, lookupCount, lookupRecord, lookup_context));
   }
 
-  inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
+  inline bool apply (hb_ot_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY (this);
     const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (inputZ, inputZ[0].static_size * (inputCount ? inputCount - 1 : 0));
@@ -1209,20 +1212,20 @@ struct Rule
                   lookupCount.sanitize (c) &&
                   c->check_range (inputZ,
                                   inputZ[0].static_size * inputCount +
-                                  lookupRecordX[0].static_size * lookupCount));
+                                  LookupRecord::static_size * lookupCount));
   }
 
   protected:
-  USHORT        inputCount;             /* Total number of glyphs in input
+  HBUINT16      inputCount;             /* Total number of glyphs in input
                                          * glyph sequence--includes the first
                                          * glyph */
-  USHORT        lookupCount;            /* Number of LookupRecords */
-  USHORT        inputZ[VAR];            /* Array of match inputs--start with
+  HBUINT16      lookupCount;            /* Number of LookupRecords */
+  HBUINT16      inputZ[VAR];            /* Array of match inputs--start with
                                          * second glyph */
-  LookupRecord  lookupRecordX[VAR];     /* Array of LookupRecords--in
+/*LookupRecord  lookupRecordX[VAR];*/   /* Array of LookupRecords--in
                                          * design order */
   public:
-  DEFINE_SIZE_ARRAY2 (4, inputZ, lookupRecordX);
+  DEFINE_SIZE_ARRAY (4, inputZ);
 };
 
 struct RuleSet
@@ -1255,7 +1258,7 @@ struct RuleSet
     return_trace (false);
   }
 
-  inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
+  inline bool apply (hb_ot_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY (this);
     unsigned int num_rules = rule.len;
@@ -1335,7 +1338,7 @@ struct ContextFormat1
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
@@ -1357,7 +1360,7 @@ struct ContextFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of table */
@@ -1427,7 +1430,7 @@ struct ContextFormat2
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
@@ -1450,7 +1453,7 @@ struct ContextFormat2
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 2 */
+  HBUINT16      format;                 /* Format identifier--format = 2 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of table */
@@ -1479,7 +1482,7 @@ struct ContextFormat3
       this
     };
     context_closure_lookup (c,
-                            glyphCount, (const USHORT *) (coverageZ + 1),
+                            glyphCount, (const HBUINT16 *) (coverageZ + 1),
                             lookupCount, lookupRecord,
                             lookup_context);
   }
@@ -1496,7 +1499,7 @@ struct ContextFormat3
     };
 
     context_collect_glyphs_lookup (c,
-                                   glyphCount, (const USHORT *) (coverageZ + 1),
+                                   glyphCount, (const HBUINT16 *) (coverageZ + 1),
                                    lookupCount, lookupRecord,
                                    lookup_context);
   }
@@ -1510,7 +1513,7 @@ struct ContextFormat3
       {match_coverage},
       this
     };
-    return_trace (context_would_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
+    return_trace (context_would_apply_lookup (c, glyphCount, (const HBUINT16 *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
   }
 
   inline const Coverage &get_coverage (void) const
@@ -1518,7 +1521,7 @@ struct ContextFormat3
     return this+coverageZ[0];
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverageZ[0]).get_coverage (c->buffer->cur().codepoint);
@@ -1529,7 +1532,7 @@ struct ContextFormat3
       {match_coverage},
       this
     };
-    return_trace (context_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
+    return_trace (context_apply_lookup (c, glyphCount, (const HBUINT16 *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -1546,17 +1549,17 @@ struct ContextFormat3
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 3 */
-  USHORT        glyphCount;             /* Number of glyphs in the input glyph
+  HBUINT16      format;                 /* Format identifier--format = 3 */
+  HBUINT16      glyphCount;             /* Number of glyphs in the input glyph
                                          * sequence */
-  USHORT        lookupCount;            /* Number of LookupRecords */
+  HBUINT16      lookupCount;            /* Number of LookupRecords */
   OffsetTo<Coverage>
                 coverageZ[VAR];         /* Array of offsets to Coverage
                                          * table in glyph sequence order */
-  LookupRecord  lookupRecordX[VAR];     /* Array of LookupRecords--in
+/*LookupRecord  lookupRecordX[VAR];*/   /* Array of LookupRecords--in
                                          * design order */
   public:
-  DEFINE_SIZE_ARRAY2 (6, coverageZ, lookupRecordX);
+  DEFINE_SIZE_ARRAY (6, coverageZ);
 };
 
 struct Context
@@ -1576,7 +1579,7 @@ struct Context
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   ContextFormat1        format1;
   ContextFormat2        format2;
   ContextFormat3        format3;
@@ -1606,11 +1609,11 @@ struct ChainContextApplyLookupContext
 
 static inline void chain_context_closure_lookup (hb_closure_context_t *c,
                                                  unsigned int backtrackCount,
-                                                 const USHORT backtrack[],
+                                                 const HBUINT16 backtrack[],
                                                  unsigned int inputCount, /* Including the first glyph (not matched) */
-                                                 const USHORT input[], /* Array of input values--start with second glyph */
+                                                 const HBUINT16 input[], /* Array of input values--start with second glyph */
                                                  unsigned int lookaheadCount,
-                                                 const USHORT lookahead[],
+                                                 const HBUINT16 lookahead[],
                                                  unsigned int lookupCount,
                                                  const LookupRecord lookupRecord[],
                                                  ChainContextClosureLookupContext &lookup_context)
@@ -1630,11 +1633,11 @@ static inline void chain_context_closure_lookup (hb_closure_context_t *c,
 
 static inline void chain_context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c,
                                                         unsigned int backtrackCount,
-                                                        const USHORT backtrack[],
+                                                        const HBUINT16 backtrack[],
                                                         unsigned int inputCount, /* Including the first glyph (not matched) */
-                                                        const USHORT input[], /* Array of input values--start with second glyph */
+                                                        const HBUINT16 input[], /* Array of input values--start with second glyph */
                                                         unsigned int lookaheadCount,
-                                                        const USHORT lookahead[],
+                                                        const HBUINT16 lookahead[],
                                                         unsigned int lookupCount,
                                                         const LookupRecord lookupRecord[],
                                                         ChainContextCollectGlyphsLookupContext &lookup_context)
@@ -1654,11 +1657,11 @@ static inline void chain_context_collect_glyphs_lookup (hb_collect_glyphs_contex
 
 static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c,
                                                      unsigned int backtrackCount,
-                                                     const USHORT backtrack[] HB_UNUSED,
+                                                     const HBUINT16 backtrack[] HB_UNUSED,
                                                      unsigned int inputCount, /* Including the first glyph (not matched) */
-                                                     const USHORT input[], /* Array of input values--start with second glyph */
+                                                     const HBUINT16 input[], /* Array of input values--start with second glyph */
                                                      unsigned int lookaheadCount,
-                                                     const USHORT lookahead[] HB_UNUSED,
+                                                     const HBUINT16 lookahead[] HB_UNUSED,
                                                      unsigned int lookupCount HB_UNUSED,
                                                      const LookupRecord lookupRecord[] HB_UNUSED,
                                                      ChainContextApplyLookupContext &lookup_context)
@@ -1669,13 +1672,13 @@ static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c
                             lookup_context.funcs.match, lookup_context.match_data[1]);
 }
 
-static inline bool chain_context_apply_lookup (hb_apply_context_t *c,
+static inline bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
                                                unsigned int backtrackCount,
-                                               const USHORT backtrack[],
+                                               const HBUINT16 backtrack[],
                                                unsigned int inputCount, /* Including the first glyph (not matched) */
-                                               const USHORT input[], /* Array of input values--start with second glyph */
+                                               const HBUINT16 input[], /* Array of input values--start with second glyph */
                                                unsigned int lookaheadCount,
-                                               const USHORT lookahead[],
+                                               const HBUINT16 lookahead[],
                                                unsigned int lookupCount,
                                                const LookupRecord lookupRecord[],
                                                ChainContextApplyLookupContext &lookup_context)
@@ -1706,8 +1709,8 @@ struct ChainRule
   inline void closure (hb_closure_context_t *c, ChainContextClosureLookupContext &lookup_context) const
   {
     TRACE_CLOSURE (this);
-    const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
-    const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
+    const HeadlessArrayOf<HBUINT16> &input = StructAfter<HeadlessArrayOf<HBUINT16> > (backtrack);
+    const ArrayOf<HBUINT16> &lookahead = StructAfter<ArrayOf<HBUINT16> > (input);
     const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
     chain_context_closure_lookup (c,
                                   backtrack.len, backtrack.array,
@@ -1720,8 +1723,8 @@ struct ChainRule
   inline void collect_glyphs (hb_collect_glyphs_context_t *c, ChainContextCollectGlyphsLookupContext &lookup_context) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
-    const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
+    const HeadlessArrayOf<HBUINT16> &input = StructAfter<HeadlessArrayOf<HBUINT16> > (backtrack);
+    const ArrayOf<HBUINT16> &lookahead = StructAfter<ArrayOf<HBUINT16> > (input);
     const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
     chain_context_collect_glyphs_lookup (c,
                                          backtrack.len, backtrack.array,
@@ -1734,8 +1737,8 @@ struct ChainRule
   inline bool would_apply (hb_would_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_WOULD_APPLY (this);
-    const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
-    const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
+    const HeadlessArrayOf<HBUINT16> &input = StructAfter<HeadlessArrayOf<HBUINT16> > (backtrack);
+    const ArrayOf<HBUINT16> &lookahead = StructAfter<ArrayOf<HBUINT16> > (input);
     const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
     return_trace (chain_context_would_apply_lookup (c,
                                                     backtrack.len, backtrack.array,
@@ -1744,11 +1747,11 @@ struct ChainRule
                                                     lookup.array, lookup_context));
   }
 
-  inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
+  inline bool apply (hb_ot_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY (this);
-    const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
-    const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
+    const HeadlessArrayOf<HBUINT16> &input = StructAfter<HeadlessArrayOf<HBUINT16> > (backtrack);
+    const ArrayOf<HBUINT16> &lookahead = StructAfter<ArrayOf<HBUINT16> > (input);
     const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
     return_trace (chain_context_apply_lookup (c,
                                               backtrack.len, backtrack.array,
@@ -1761,23 +1764,23 @@ struct ChainRule
   {
     TRACE_SANITIZE (this);
     if (!backtrack.sanitize (c)) return_trace (false);
-    const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
+    const HeadlessArrayOf<HBUINT16> &input = StructAfter<HeadlessArrayOf<HBUINT16> > (backtrack);
     if (!input.sanitize (c)) return_trace (false);
-    const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
+    const ArrayOf<HBUINT16> &lookahead = StructAfter<ArrayOf<HBUINT16> > (input);
     if (!lookahead.sanitize (c)) return_trace (false);
     const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
     return_trace (lookup.sanitize (c));
   }
 
   protected:
-  ArrayOf<USHORT>
+  ArrayOf<HBUINT16>
                 backtrack;              /* Array of backtracking values
                                          * (to be matched before the input
                                          * sequence) */
-  HeadlessArrayOf<USHORT>
+  HeadlessArrayOf<HBUINT16>
                 inputX;                 /* Array of input values (start with
                                          * second glyph) */
-  ArrayOf<USHORT>
+  ArrayOf<HBUINT16>
                 lookaheadX;             /* Array of lookahead values's (to be
                                          * matched after the input sequence) */
   ArrayOf<LookupRecord>
@@ -1816,7 +1819,7 @@ struct ChainRuleSet
     return_trace (false);
   }
 
-  inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
+  inline bool apply (hb_ot_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY (this);
     unsigned int num_rules = rule.len;
@@ -1893,7 +1896,7 @@ struct ChainContextFormat1
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
@@ -1914,7 +1917,7 @@ struct ChainContextFormat1
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 1 */
+  HBUINT16      format;                 /* Format identifier--format = 1 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of table */
@@ -1997,7 +2000,7 @@ struct ChainContextFormat2
     return this+coverage;
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
@@ -2029,7 +2032,7 @@ struct ChainContextFormat2
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 2 */
+  HBUINT16      format;                 /* Format identifier--format = 2 */
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of table */
@@ -2069,9 +2072,9 @@ struct ChainContextFormat3
       {this, this, this}
     };
     chain_context_closure_lookup (c,
-                                  backtrack.len, (const USHORT *) backtrack.array,
-                                  input.len, (const USHORT *) input.array + 1,
-                                  lookahead.len, (const USHORT *) lookahead.array,
+                                  backtrack.len, (const HBUINT16 *) backtrack.array,
+                                  input.len, (const HBUINT16 *) input.array + 1,
+                                  lookahead.len, (const HBUINT16 *) lookahead.array,
                                   lookup.len, lookup.array,
                                   lookup_context);
   }
@@ -2090,9 +2093,9 @@ struct ChainContextFormat3
       {this, this, this}
     };
     chain_context_collect_glyphs_lookup (c,
-                                         backtrack.len, (const USHORT *) backtrack.array,
-                                         input.len, (const USHORT *) input.array + 1,
-                                         lookahead.len, (const USHORT *) lookahead.array,
+                                         backtrack.len, (const HBUINT16 *) backtrack.array,
+                                         input.len, (const HBUINT16 *) input.array + 1,
+                                         lookahead.len, (const HBUINT16 *) lookahead.array,
                                          lookup.len, lookup.array,
                                          lookup_context);
   }
@@ -2109,9 +2112,9 @@ struct ChainContextFormat3
       {this, this, this}
     };
     return_trace (chain_context_would_apply_lookup (c,
-                                                    backtrack.len, (const USHORT *) backtrack.array,
-                                                    input.len, (const USHORT *) input.array + 1,
-                                                    lookahead.len, (const USHORT *) lookahead.array,
+                                                    backtrack.len, (const HBUINT16 *) backtrack.array,
+                                                    input.len, (const HBUINT16 *) input.array + 1,
+                                                    lookahead.len, (const HBUINT16 *) lookahead.array,
                                                     lookup.len, lookup.array, lookup_context));
   }
 
@@ -2121,7 +2124,7 @@ struct ChainContextFormat3
     return this+input[0];
   }
 
-  inline bool apply (hb_apply_context_t *c) const
+  inline bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
     const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
@@ -2136,9 +2139,9 @@ struct ChainContextFormat3
       {this, this, this}
     };
     return_trace (chain_context_apply_lookup (c,
-                                              backtrack.len, (const USHORT *) backtrack.array,
-                                              input.len, (const USHORT *) input.array + 1,
-                                              lookahead.len, (const USHORT *) lookahead.array,
+                                              backtrack.len, (const HBUINT16 *) backtrack.array,
+                                              input.len, (const HBUINT16 *) input.array + 1,
+                                              lookahead.len, (const HBUINT16 *) lookahead.array,
                                               lookup.len, lookup.array, lookup_context));
   }
 
@@ -2156,7 +2159,7 @@ struct ChainContextFormat3
   }
 
   protected:
-  USHORT        format;                 /* Format identifier--format = 3 */
+  HBUINT16      format;                 /* Format identifier--format = 3 */
   OffsetArrayOf<Coverage>
                 backtrack;              /* Array of coverage tables
                                          * in backtracking sequence, in  glyph
@@ -2193,7 +2196,7 @@ struct ChainContext
 
   protected:
   union {
-  USHORT                format; /* Format identifier */
+  HBUINT16              format; /* Format identifier */
   ChainContextFormat1   format1;
   ChainContextFormat2   format2;
   ChainContextFormat3   format3;
@@ -2226,15 +2229,17 @@ struct ExtensionFormat1
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && extensionOffset != 0);
+    return_trace (c->check_struct (this) &&
+                  extensionOffset != 0 &&
+                  extensionLookupType != T::LookupSubTable::Extension);
   }
 
   protected:
-  USHORT        format;                 /* Format identifier. Set to 1. */
-  USHORT        extensionLookupType;    /* Lookup type of subtable referenced
+  HBUINT16      format;                 /* Format identifier. Set to 1. */
+  HBUINT16      extensionLookupType;    /* Lookup type of subtable referenced
                                          * by ExtensionOffset (i.e. the
                                          * extension subtable). */
-  ULONG         extensionOffset;        /* Offset to the extension subtable,
+  HBUINT32      extensionOffset;        /* Offset to the extension subtable,
                                          * of lookup type subtable. */
   public:
   DEFINE_SIZE_STATIC (8);
@@ -2272,7 +2277,7 @@ struct Extension
 
   protected:
   union {
-  USHORT                format;         /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   ExtensionFormat1<T>   format1;
   } u;
 };
@@ -2284,9 +2289,6 @@ struct Extension
 
 struct GSUBGPOS
 {
-  static const hb_tag_t GSUBTag = HB_OT_TAG_GSUB;
-  static const hb_tag_t GPOSTag = HB_OT_TAG_GPOS;
-
   inline unsigned int get_script_count (void) const
   { return (this+scriptList).len; }
   inline const Tag& get_script_tag (unsigned int i) const
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh
index 6cd53fe509b..6a98b109026 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh
@@ -90,12 +90,12 @@ hb_ot_layout_substitute_start (hb_font_t    *font,
 struct hb_ot_layout_lookup_accelerator_t;
 
 namespace OT {
-  struct hb_apply_context_t;
+  struct hb_ot_apply_context_t;
   struct SubstLookup;
 }
 
 HB_INTERNAL void
-hb_ot_layout_substitute_lookup (OT::hb_apply_context_t *c,
+hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
                                 const OT::SubstLookup &lookup,
                                 const hb_ot_layout_lookup_accelerator_t &accel);
 
@@ -122,6 +122,9 @@ hb_ot_layout_position_finish_offsets (hb_font_t    *font,
  */
 
 namespace OT {
+  struct BASE;
+  struct COLR;
+  struct CPAL;
   struct GDEF;
   struct GSUB;
   struct GPOS;
@@ -130,6 +133,13 @@ namespace OT {
   struct avar;
 }
 
+namespace AAT {
+  struct ankr;
+  struct kerx;
+  struct morx;
+  struct trak;
+}
+
 struct hb_ot_layout_lookup_accelerator_t
 {
   template <typename TLookup>
@@ -162,9 +172,16 @@ struct hb_ot_layout_t
   const struct OT::GPOS *gpos;
 
   /* TODO Move the following out of this struct. */
+  OT::hb_lazy_table_loader_t<struct OT::BASE> base;
+  OT::hb_lazy_table_loader_t<struct OT::COLR> colr;
+  OT::hb_lazy_table_loader_t<struct OT::CPAL> cpal;
   OT::hb_lazy_table_loader_t<struct OT::MATH> math;
   OT::hb_lazy_table_loader_t<struct OT::fvar> fvar;
   OT::hb_lazy_table_loader_t<struct OT::avar> avar;
+  OT::hb_lazy_table_loader_t<struct AAT::ankr> ankr;
+  OT::hb_lazy_table_loader_t<struct AAT::kerx> kerx;
+  OT::hb_lazy_table_loader_t<struct AAT::morx> morx;
+  OT::hb_lazy_table_loader_t<struct AAT::trak> trak;
 
   unsigned int gsub_lookup_count;
   unsigned int gpos_lookup_count;
@@ -273,14 +290,18 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
        * what we do for joiners in Indic-like shapers, but since the
        * FVSes are GC=Mn, we have use a separate bit to remember them.
        * Fixes:
-       * https://github.com/behdad/harfbuzz/issues/234 */
+       * https://github.com/harfbuzz/harfbuzz/issues/234 */
       else if (unlikely (hb_in_range (u, 0x180Bu, 0x180Du))) props |= UPROPS_MASK_HIDDEN;
       /* TAG characters need similar treatment. Fixes:
-       * https://github.com/behdad/harfbuzz/issues/463 */
+       * https://github.com/harfbuzz/harfbuzz/issues/463 */
       else if (unlikely (hb_in_range (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN;
       /* COMBINING GRAPHEME JOINER should not be skipped; at least some times.
-       * https://github.com/behdad/harfbuzz/issues/554 */
-      else if (unlikely (u == 0x034Fu)) props |= UPROPS_MASK_HIDDEN;
+       * https://github.com/harfbuzz/harfbuzz/issues/554 */
+      else if (unlikely (u == 0x034Fu))
+      {
+        buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_CGJ;
+        props |= UPROPS_MASK_HIDDEN;
+      }
     }
     else if (unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_NON_ENCLOSING_MARK_OR_MODIFIER_SYMBOL (gen_cat)))
     {
@@ -305,7 +326,7 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
       /* Recategorize emoji skin-tone modifiers as Unicode mark, so they
        * behave correctly in non-native directionality.  They originally
        * are MODIFIER_SYMBOL.  Fixes:
-       * https://github.com/behdad/harfbuzz/issues/169
+       * https://github.com/harfbuzz/harfbuzz/issues/169
        */
       if (unlikely (hb_in_range (u, 0x1F3FBu, 0x1F3FFu)))
       {
@@ -350,6 +371,28 @@ _hb_glyph_info_get_modified_combining_class (const hb_glyph_info_t *info)
   return _hb_glyph_info_is_unicode_mark (info) ? info->unicode_props()>>8 : 0;
 }
 
+
+/* Loop over grapheme. Based on foreach_cluster(). */
+#define foreach_grapheme(buffer, start, end) \
+  for (unsigned int \
+       _count = buffer->len, \
+       start = 0, end = _count ? _next_grapheme (buffer, 0) : 0; \
+       start < _count; \
+       start = end, end = _next_grapheme (buffer, start))
+
+static inline unsigned int
+_next_grapheme (hb_buffer_t *buffer, unsigned int start)
+{
+  hb_glyph_info_t *info = buffer->info;
+  unsigned int count = buffer->len;
+
+  while (++start < count && _hb_glyph_info_is_unicode_mark (&info[start]))
+    ;
+
+  return start;
+}
+
+
 #define info_cc(info) (_hb_glyph_info_get_modified_combining_class (&(info)))
 
 static inline bool
@@ -388,6 +431,11 @@ _hb_glyph_info_is_default_ignorable_and_not_hidden (const hb_glyph_info_t *info)
           == UPROPS_MASK_IGNORABLE) &&
          !_hb_glyph_info_ligated (info);
 }
+static inline void
+_hb_glyph_info_unhide (hb_glyph_info_t *info)
+{
+  info->unicode_props() &= ~ UPROPS_MASK_HIDDEN;
+}
 
 static inline bool
 _hb_glyph_info_is_unicode_format (const hb_glyph_info_t *info)
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc
index 46b6df74231..be5f785aaab 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc
@@ -31,16 +31,21 @@
 #include "hb-open-type-private.hh"
 #include "hb-ot-layout-private.hh"
 
+#include "hb-ot-layout-base-table.hh"
 #include "hb-ot-layout-gdef-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-layout-jstf-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-ot-name-table.hh" // Just so we compile it; unused otherwise.
+#include "hb-ot-color-colr-table.hh"
+#include "hb-ot-color-cpal-table.hh"
 
 #include "hb-ot-map-private.hh"
 
 
+#ifndef HB_NO_VISIBILITY
 const void * const OT::_hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)] = {};
+#endif
 
 
 hb_ot_layout_t *
@@ -50,18 +55,25 @@ _hb_ot_layout_create (hb_face_t *face)
   if (unlikely (!layout))
     return nullptr;
 
-  layout->gdef_blob = OT::Sanitizer<OT::GDEF>::sanitize (face->reference_table (HB_OT_TAG_GDEF));
+  layout->gdef_blob = OT::Sanitizer<OT::GDEF>().sanitize (face->reference_table (HB_OT_TAG_GDEF));
   layout->gdef = OT::Sanitizer<OT::GDEF>::lock_instance (layout->gdef_blob);
 
-  layout->gsub_blob = OT::Sanitizer<OT::GSUB>::sanitize (face->reference_table (HB_OT_TAG_GSUB));
+  layout->gsub_blob = OT::Sanitizer<OT::GSUB>().sanitize (face->reference_table (HB_OT_TAG_GSUB));
   layout->gsub = OT::Sanitizer<OT::GSUB>::lock_instance (layout->gsub_blob);
 
-  layout->gpos_blob = OT::Sanitizer<OT::GPOS>::sanitize (face->reference_table (HB_OT_TAG_GPOS));
+  layout->gpos_blob = OT::Sanitizer<OT::GPOS>().sanitize (face->reference_table (HB_OT_TAG_GPOS));
   layout->gpos = OT::Sanitizer<OT::GPOS>::lock_instance (layout->gpos_blob);
 
+  layout->base.init (face);
+  layout->colr.init (face);
+  layout->cpal.init (face);
   layout->math.init (face);
   layout->fvar.init (face);
   layout->avar.init (face);
+  layout->ankr.init (face);
+  layout->kerx.init (face);
+  layout->morx.init (face);
+  layout->trak.init (face);
 
   {
     /*
@@ -194,10 +206,12 @@ _hb_ot_layout_create (hb_face_t *face)
 void
 _hb_ot_layout_destroy (hb_ot_layout_t *layout)
 {
-  for (unsigned int i = 0; i < layout->gsub_lookup_count; i++)
-    layout->gsub_accels[i].fini ();
-  for (unsigned int i = 0; i < layout->gpos_lookup_count; i++)
-    layout->gpos_accels[i].fini ();
+  if (layout->gsub_accels)
+    for (unsigned int i = 0; i < layout->gsub_lookup_count; i++)
+      layout->gsub_accels[i].fini ();
+  if (layout->gpos_accels)
+    for (unsigned int i = 0; i < layout->gpos_lookup_count; i++)
+      layout->gpos_accels[i].fini ();
 
   free (layout->gsub_accels);
   free (layout->gpos_accels);
@@ -206,13 +220,28 @@ _hb_ot_layout_destroy (hb_ot_layout_t *layout)
   hb_blob_destroy (layout->gsub_blob);
   hb_blob_destroy (layout->gpos_blob);
 
+  layout->base.fini ();
+  layout->colr.fini ();
+  layout->cpal.fini ();
   layout->math.fini ();
   layout->fvar.fini ();
   layout->avar.fini ();
+  layout->ankr.fini ();
+  layout->kerx.fini ();
+  layout->morx.fini ();
+  layout->trak.fini ();
 
   free (layout);
 }
 
+// static inline const OT::BASE&
+// _get_base (hb_face_t *face)
+// {
+//   if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::BASE);
+//   hb_ot_layout_t * layout = hb_ot_layout_from_face (face);
+//   return *(layout->base.get ());
+// }
+
 static inline const OT::GDEF&
 _get_gdef (hb_face_t *face)
 {
@@ -601,6 +630,7 @@ unsigned int
 hb_ot_layout_table_get_lookup_count (hb_face_t    *face,
                                      hb_tag_t      table_tag)
 {
+  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return 0;
   switch (table_tag)
   {
     case HB_OT_TAG_GSUB:
@@ -1054,13 +1084,13 @@ struct hb_get_subtables_context_t :
        OT::hb_dispatch_context_t<hb_get_subtables_context_t, hb_void_t, HB_DEBUG_APPLY>
 {
   template <typename Type>
-  static inline bool apply_to (const void *obj, OT::hb_apply_context_t *c)
+  static inline bool apply_to (const void *obj, OT::hb_ot_apply_context_t *c)
   {
     const Type *typed_obj = (const Type *) obj;
     return typed_obj->apply (c);
   }
 
-  typedef bool (*hb_apply_func_t) (const void *obj, OT::hb_apply_context_t *c);
+  typedef bool (*hb_apply_func_t) (const void *obj, OT::hb_ot_apply_context_t *c);
 
   struct hb_applicable_t
   {
@@ -1070,7 +1100,7 @@ struct hb_get_subtables_context_t :
       apply_func = apply_func_;
     }
 
-    inline bool apply (OT::hb_apply_context_t *c) const { return apply_func (obj, c); }
+    inline bool apply (OT::hb_ot_apply_context_t *c) const { return apply_func (obj, c); }
 
     private:
     const void *obj;
@@ -1101,7 +1131,7 @@ struct hb_get_subtables_context_t :
 };
 
 static inline bool
-apply_forward (OT::hb_apply_context_t *c,
+apply_forward (OT::hb_ot_apply_context_t *c,
                const hb_ot_layout_lookup_accelerator_t &accel,
                const hb_get_subtables_context_t::array_t &subtables)
 {
@@ -1131,7 +1161,7 @@ apply_forward (OT::hb_apply_context_t *c,
 }
 
 static inline bool
-apply_backward (OT::hb_apply_context_t *c,
+apply_backward (OT::hb_ot_apply_context_t *c,
                const hb_ot_layout_lookup_accelerator_t &accel,
                const hb_get_subtables_context_t::array_t &subtables)
 {
@@ -1160,7 +1190,7 @@ apply_backward (OT::hb_apply_context_t *c,
 
 template <typename Proxy>
 static inline void
-apply_string (OT::hb_apply_context_t *c,
+apply_string (OT::hb_ot_apply_context_t *c,
               const typename Proxy::Lookup &lookup,
               const hb_ot_layout_lookup_accelerator_t &accel)
 {
@@ -1211,7 +1241,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
 {
   const unsigned int table_index = proxy.table_index;
   unsigned int i = 0;
-  OT::hb_apply_context_t c (table_index, font, buffer);
+  OT::hb_ot_apply_context_t c (table_index, font, buffer);
   c.set_recurse_func (Proxy::Lookup::apply_recurse_func);
 
   for (unsigned int stage_index = 0; stage_index < stages[table_index].len; stage_index++) {
@@ -1250,10 +1280,34 @@ void hb_ot_map_t::position (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_
   apply (proxy, plan, font, buffer);
 }
 
-HB_INTERNAL void
-hb_ot_layout_substitute_lookup (OT::hb_apply_context_t *c,
+void
+hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
                                 const OT::SubstLookup &lookup,
                                 const hb_ot_layout_lookup_accelerator_t &accel)
 {
   apply_string<GSUBProxy> (c, lookup, accel);
 }
+
+
+
+
+/*
+ * OT::BASE
+ */
+
+// /**
+//  * hb_ot_base_has_data:
+//  * @face: #hb_face_t to test
+//  *
+//  * This function allows to verify the presence of an OpenType BASE table on the
+//  * face.
+//  *
+//  * Return value: true if face has a BASE table, false otherwise
+//  *
+//  * Since: XXX
+//  **/
+// hb_bool_t
+// hb_ot_base_has_data (hb_face_t *face)
+// {
+//   return &_get_base (face) != &OT::Null(OT::BASE);
+// }
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h
index 5ee95105181..f641be84c02 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h
@@ -38,6 +38,7 @@
 HB_BEGIN_DECLS
 
 
+#define HB_OT_TAG_BASE HB_TAG('B','A','S','E')
 #define HB_OT_TAG_GDEF HB_TAG('G','D','E','F')
 #define HB_OT_TAG_GSUB HB_TAG('G','S','U','B')
 #define HB_OT_TAG_GPOS HB_TAG('G','P','O','S')
@@ -316,6 +317,22 @@ hb_ot_layout_get_size_params (hb_face_t    *face,
                               unsigned int *range_end          /* OUT.  May be NULL */);
 
 
+/*
+ * BASE
+ */
+#if 0
+
+#define HB_OT_TAG_BASE_HANG HB_TAG('h','a','n','g')
+#define HB_OT_TAG_BASE_ICFB HB_TAG('i','c','f','b')
+#define HB_OT_TAG_BASE_ICFT HB_TAG('i','c','f','t')
+#define HB_OT_TAG_BASE_IDEO HB_TAG('i','d','e','o')
+#define HB_OT_TAG_BASE_IDTB HB_TAG('i','d','t','b')
+#define HB_OT_TAG_BASE_MATH HB_TAG('m','a','t','h')
+#define HB_OT_TAG_BASE_ROMN HB_TAG('r','o','m','n')
+
+#endif
+
+
 HB_END_DECLS
 
 #endif /* HB_OT_LAYOUT_H */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh
index 95fabeb6b00..bb2612feb57 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh
@@ -84,28 +84,28 @@ struct hb_ot_map_t
   inline hb_mask_t get_global_mask (void) const { return global_mask; }
 
   inline hb_mask_t get_mask (hb_tag_t feature_tag, unsigned int *shift = nullptr) const {
-    const feature_map_t *map = features.bsearch (&feature_tag);
+    const feature_map_t *map = features.bsearch (feature_tag);
     if (shift) *shift = map ? map->shift : 0;
     return map ? map->mask : 0;
   }
 
   inline bool needs_fallback (hb_tag_t feature_tag) const {
-    const feature_map_t *map = features.bsearch (&feature_tag);
+    const feature_map_t *map = features.bsearch (feature_tag);
     return map ? map->needs_fallback : false;
   }
 
   inline hb_mask_t get_1_mask (hb_tag_t feature_tag) const {
-    const feature_map_t *map = features.bsearch (&feature_tag);
+    const feature_map_t *map = features.bsearch (feature_tag);
     return map ? map->_1_mask : 0;
   }
 
   inline unsigned int get_feature_index (unsigned int table_index, hb_tag_t feature_tag) const {
-    const feature_map_t *map = features.bsearch (&feature_tag);
+    const feature_map_t *map = features.bsearch (feature_tag);
     return map ? map->index[table_index] : HB_OT_LAYOUT_NO_FEATURE_INDEX;
   }
 
   inline unsigned int get_feature_stage (unsigned int table_index, hb_tag_t feature_tag) const {
-    const feature_map_t *map = features.bsearch (&feature_tag);
+    const feature_map_t *map = features.bsearch (feature_tag);
     return map ? map->stage[table_index] : (unsigned int) -1;
   }
 
@@ -198,7 +198,6 @@ struct hb_ot_map_builder_t
   private:
 
   HB_INTERNAL void add_lookups (hb_ot_map_t  &m,
-                                hb_face_t    *face,
                                 unsigned int  table_index,
                                 unsigned int  feature_index,
                                 unsigned int  variations_index,
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc
index 7c06f90c76b..1b66ac7d155 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc
@@ -80,7 +80,6 @@ void hb_ot_map_builder_t::add_feature (hb_tag_t tag, unsigned int value,
 
 void
 hb_ot_map_builder_t::add_lookups (hb_ot_map_t  &m,
-                                  hb_face_t    *face,
                                   unsigned int  table_index,
                                   unsigned int  feature_index,
                                   unsigned int  variations_index,
@@ -140,7 +139,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t  &m,
 {
   static_assert ((!(HB_GLYPH_FLAG_DEFINED & (HB_GLYPH_FLAG_DEFINED + 1))), "");
   unsigned int global_bit_mask = HB_GLYPH_FLAG_DEFINED + 1;
-  unsigned int global_bit_shift = _hb_popcount32 (HB_GLYPH_FLAG_DEFINED);
+  unsigned int global_bit_shift = _hb_popcount (HB_GLYPH_FLAG_DEFINED);
 
   m.global_mask = global_bit_mask;
 
@@ -289,14 +288,14 @@ hb_ot_map_builder_t::compile (hb_ot_map_t  &m,
     {
       if (required_feature_index[table_index] != HB_OT_LAYOUT_NO_FEATURE_INDEX &&
           required_feature_stage[table_index] == stage)
-        add_lookups (m, face, table_index,
+        add_lookups (m, table_index,
                      required_feature_index[table_index],
                      variations_index,
                      global_bit_mask);
 
       for (unsigned i = 0; i < m.features.len; i++)
         if (m.features[i].stage[table_index] == stage)
-          add_lookups (m, face, table_index,
+          add_lookups (m, table_index,
                        m.features[i].index[table_index],
                        variations_index,
                        m.features[i].mask,
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh
index 5b9ed91134e..30de96a10a4 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh
@@ -28,7 +28,7 @@
 #define HB_OT_MAXP_TABLE_HH
 
 #include "hb-open-type-private.hh"
-
+#include "hb-subset-plan.hh"
 
 namespace OT {
 
@@ -39,28 +39,104 @@ namespace OT {
 
 #define HB_OT_TAG_maxp HB_TAG('m','a','x','p')
 
+struct maxpV1Tail
+{
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  HBUINT16 maxPoints;             /* Maximum points in a non-composite glyph. */
+  HBUINT16 maxContours;           /* Maximum contours in a non-composite glyph. */
+  HBUINT16 maxCompositePoints;    /* Maximum points in a composite glyph. */
+  HBUINT16 maxCompositeContours;  /* Maximum contours in a composite glyph. */
+  HBUINT16 maxZones;              /* 1 if instructions do not use the twilight zone (Z0),
+                                   * or 2 if instructions do use Z0; should be set to 2 in
+                                   * most cases. */
+  HBUINT16 maxTwilightPoints;     /* Maximum points used in Z0. */
+  HBUINT16 maxStorage;            /* Number of Storage Area locations. */
+  HBUINT16 maxFunctionDefs;       /* Number of FDEFs, equal to the highest function number + 1. */
+  HBUINT16 maxInstructionDefs;    /* Number of IDEFs. */
+  HBUINT16 maxStackElements;      /* Maximum stack depth. (This includes Font and CVT
+                                   * Programs, as well as the instructions for each glyph.) */
+  HBUINT16 maxSizeOfInstructions; /* Maximum byte count for glyph instructions. */
+  HBUINT16 maxComponentElements;  /* Maximum number of components referenced at
+                                   * "top level" for any composite glyph. */
+  HBUINT16 maxComponentDepth;     /* Maximum levels of recursion; 1 for simple components. */
+ public:
+  DEFINE_SIZE_STATIC (26);
+};
+
+
 struct maxp
 {
-  static const hb_tag_t tableTag        = HB_OT_TAG_maxp;
+  static const hb_tag_t tableTag = HB_OT_TAG_maxp;
 
   inline unsigned int get_num_glyphs (void) const
   {
     return numGlyphs;
   }
 
+  inline void set_num_glyphs (unsigned int count)
+  {
+    numGlyphs.set (count);
+  }
+
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) &&
-                  likely (version.major == 1 ||
-                          (version.major == 0 && version.minor == 0x5000u)));
+    if (unlikely (!c->check_struct (this)))
+      return_trace (false);
+
+    if (version.major == 1)
+    {
+      const maxpV1Tail &v1 = StructAfter<maxpV1Tail> (*this);
+      return v1.sanitize (c);
+    }
+    return_trace (likely (version.major == 0 && version.minor == 0x5000u));
+  }
+
+  inline bool subset (hb_subset_plan_t *plan) const
+  {
+    hb_blob_t *maxp_blob = OT::Sanitizer<OT::maxp>().sanitize (hb_face_reference_table (plan->source, HB_OT_TAG_maxp));
+    hb_blob_t *maxp_prime_blob = hb_blob_copy_writable_or_fail (maxp_blob);
+    hb_blob_destroy (maxp_blob);
+
+    if (unlikely (!maxp_prime_blob)) {
+      return false;
+    }
+    OT::maxp *maxp_prime = (OT::maxp *) hb_blob_get_data (maxp_prime_blob, nullptr);
+
+    maxp_prime->set_num_glyphs (plan->gids_to_retain_sorted.len);
+    if (plan->drop_hints)
+      drop_hint_fields (plan, maxp_prime);
+
+    bool result = hb_subset_plan_add_table(plan, HB_OT_TAG_maxp, maxp_prime_blob);
+    hb_blob_destroy (maxp_prime_blob);
+    return result;
+  }
+
+  static inline void drop_hint_fields (hb_subset_plan_t *plan, OT::maxp *maxp_prime)
+  {
+    if (maxp_prime->version.major == 1)
+    {
+      maxpV1Tail &v1 = StructAfter<maxpV1Tail> (*maxp_prime);
+      v1.maxZones.set (1);
+      v1.maxTwilightPoints.set (0);
+      v1.maxStorage.set (0);
+      v1.maxFunctionDefs.set (0);
+      v1.maxInstructionDefs.set (0);
+      v1.maxStackElements.set (0);
+      v1.maxSizeOfInstructions.set (0);
+    }
   }
 
-  /* We only implement version 0.5 as none of the extra fields in version 1.0 are useful. */
   protected:
   FixedVersion<>version;                /* Version of the maxp table (0.5 or 1.0),
                                          * 0x00005000u or 0x00010000u. */
-  USHORT        numGlyphs;              /* The number of glyphs in the font. */
+  HBUINT16      numGlyphs;              /* The number of glyphs in the font. */
+/*maxpV1Tail v1Tail[VAR]; */
   public:
   DEFINE_SIZE_STATIC (6);
 };
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh
index 478469c0785..b5efc1da834 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh
@@ -65,12 +65,12 @@ struct NameRecord
     return_trace (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset));
   }
 
-  USHORT        platformID;     /* Platform ID. */
-  USHORT        encodingID;     /* Platform-specific encoding ID. */
-  USHORT        languageID;     /* Language ID. */
-  USHORT        nameID;         /* Name ID. */
-  USHORT        length;         /* String length (in bytes). */
-  USHORT        offset;         /* String offset from start of storage area (in bytes). */
+  HBUINT16      platformID;     /* Platform ID. */
+  HBUINT16      encodingID;     /* Platform-specific encoding ID. */
+  HBUINT16      languageID;     /* Language ID. */
+  HBUINT16      nameID;         /* Name ID. */
+  HBUINT16      length;         /* String length (in bytes). */
+  HBUINT16      offset;         /* String offset from start of storage area (in bytes). */
   public:
   DEFINE_SIZE_STATIC (12);
 };
@@ -123,9 +123,9 @@ struct name
   }
 
   /* We only implement format 0 for now. */
-  USHORT        format;                 /* Format selector (=0/1). */
-  USHORT        count;                  /* Number of name records. */
-  Offset<>      stringOffset;           /* Offset to start of string storage (from start of table). */
+  HBUINT16      format;                 /* Format selector (=0/1). */
+  HBUINT16      count;                  /* Number of name records. */
+  Offset16      stringOffset;           /* Offset to start of string storage (from start of table). */
   NameRecord    nameRecord[VAR];        /* The name records where count is the number of records. */
   public:
   DEFINE_SIZE_ARRAY (6, nameRecord);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh
index 9d3df8de401..3d3490af46a 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh
@@ -28,7 +28,7 @@
 #define HB_OT_OS2_TABLE_HH
 
 #include "hb-open-type-private.hh"
-
+#include "hb-ot-os2-unicode-ranges.hh"
 
 namespace OT {
 
@@ -49,51 +49,127 @@ struct os2
     return_trace (c->check_struct (this));
   }
 
+  inline bool subset (hb_subset_plan_t *plan) const
+  {
+    hb_blob_t *os2_blob = OT::Sanitizer<OT::os2>().sanitize (hb_face_reference_table (plan->source, HB_OT_TAG_os2));
+    hb_blob_t *os2_prime_blob = hb_blob_create_sub_blob (os2_blob, 0, -1);
+    // TODO(grieger): move to hb_blob_copy_writable_or_fail
+    hb_blob_destroy (os2_blob);
+
+    OT::os2 *os2_prime = (OT::os2 *) hb_blob_get_data_writable (os2_prime_blob, nullptr);
+    if (unlikely (!os2_prime)) {
+      hb_blob_destroy (os2_prime_blob);
+      return false;
+    }
+
+    uint16_t min_cp, max_cp;
+    find_min_and_max_codepoint (plan->codepoints, &min_cp, &max_cp);
+    os2_prime->usFirstCharIndex.set (min_cp);
+    os2_prime->usLastCharIndex.set (max_cp);
+
+    _update_unicode_ranges (plan->codepoints, os2_prime->ulUnicodeRange);
+    bool result = hb_subset_plan_add_table(plan, HB_OT_TAG_os2, os2_prime_blob);
+
+    hb_blob_destroy (os2_prime_blob);
+    return result;
+  }
+
+  inline void _update_unicode_ranges (const hb_prealloced_array_t<hb_codepoint_t> &codepoints,
+                                      HBUINT32 ulUnicodeRange[4]) const
+  {
+    for (unsigned int i = 0; i < 4; i++)
+      ulUnicodeRange[i].set (0);
+
+    for (unsigned int i = 0; i < codepoints.len; i++)
+    {
+      hb_codepoint_t cp = codepoints[i];
+      unsigned int bit = hb_get_unicode_range_bit (cp);
+      if (bit < 128)
+      {
+        unsigned int block = bit / 32;
+        unsigned int bit_in_block = bit % 32;
+        unsigned int mask = 1 << bit_in_block;
+        ulUnicodeRange[block].set (ulUnicodeRange[block] | mask);
+      }
+      if (cp >= 0x10000 && cp <= 0x110000)
+      {
+        /* the spec says that bit 57 ("Non Plane 0") implies that there's
+           at least one codepoint beyond the BMP; so I also include all
+           the non-BMP codepoints here */
+        ulUnicodeRange[1].set (ulUnicodeRange[1] | (1 << 25));
+      }
+    }
+  }
+
+  static inline void find_min_and_max_codepoint (const hb_prealloced_array_t<hb_codepoint_t> &codepoints,
+                                                 uint16_t *min_cp, /* OUT */
+                                                 uint16_t *max_cp  /* OUT */)
+  {
+    hb_codepoint_t min = -1, max = 0;
+
+    for (unsigned int i = 0; i < codepoints.len; i++)
+    {
+      hb_codepoint_t cp = codepoints[i];
+      if (cp < min)
+        min = cp;
+      if (cp > max)
+        max = cp;
+    }
+
+    if (min > 0xFFFF)
+      min = 0xFFFF;
+    if (max > 0xFFFF)
+      max = 0xFFFF;
+
+    *min_cp = min;
+    *max_cp = max;
+  }
+
   public:
-  USHORT        version;
+  HBUINT16      version;
 
   /* Version 0 */
-  SHORT         xAvgCharWidth;
-  USHORT        usWeightClass;
-  USHORT        usWidthClass;
-  USHORT        fsType;
-  SHORT         ySubscriptXSize;
-  SHORT         ySubscriptYSize;
-  SHORT         ySubscriptXOffset;
-  SHORT         ySubscriptYOffset;
-  SHORT         ySuperscriptXSize;
-  SHORT         ySuperscriptYSize;
-  SHORT         ySuperscriptXOffset;
-  SHORT         ySuperscriptYOffset;
-  SHORT         yStrikeoutSize;
-  SHORT         yStrikeoutPosition;
-  SHORT         sFamilyClass;
-  BYTE          panose[10];
-  ULONG         ulUnicodeRange[4];
+  HBINT16       xAvgCharWidth;
+  HBUINT16      usWeightClass;
+  HBUINT16      usWidthClass;
+  HBUINT16      fsType;
+  HBINT16       ySubscriptXSize;
+  HBINT16       ySubscriptYSize;
+  HBINT16       ySubscriptXOffset;
+  HBINT16       ySubscriptYOffset;
+  HBINT16       ySuperscriptXSize;
+  HBINT16       ySuperscriptYSize;
+  HBINT16       ySuperscriptXOffset;
+  HBINT16       ySuperscriptYOffset;
+  HBINT16       yStrikeoutSize;
+  HBINT16       yStrikeoutPosition;
+  HBINT16       sFamilyClass;
+  HBUINT8       panose[10];
+  HBUINT32      ulUnicodeRange[4];
   Tag           achVendID;
-  USHORT        fsSelection;
-  USHORT        usFirstCharIndex;
-  USHORT        usLastCharIndex;
-  SHORT         sTypoAscender;
-  SHORT         sTypoDescender;
-  SHORT         sTypoLineGap;
-  USHORT        usWinAscent;
-  USHORT        usWinDescent;
+  HBUINT16      fsSelection;
+  HBUINT16      usFirstCharIndex;
+  HBUINT16      usLastCharIndex;
+  HBINT16       sTypoAscender;
+  HBINT16       sTypoDescender;
+  HBINT16       sTypoLineGap;
+  HBUINT16      usWinAscent;
+  HBUINT16      usWinDescent;
 
   /* Version 1 */
-  //ULONG ulCodePageRange1;
-  //ULONG ulCodePageRange2;
+  //HBUINT32    ulCodePageRange1;
+  //HBUINT32    ulCodePageRange2;
 
   /* Version 2 */
-  //SHORT sxHeight;
-  //SHORT sCapHeight;
-  //USHORT  usDefaultChar;
-  //USHORT  usBreakChar;
-  //USHORT  usMaxContext;
+  //HBINT16     sxHeight;
+  //HBINT16     sCapHeight;
+  //HBUINT16    usDefaultChar;
+  //HBUINT16    usBreakChar;
+  //HBUINT16    usMaxContext;
 
   /* Version 5 */
-  //USHORT  usLowerOpticalPointSize;
-  //USHORT  usUpperOpticalPointSize;
+  //HBUINT16    usLowerOpticalPointSize;
+  //HBUINT16    usUpperOpticalPointSize;
 
   public:
   DEFINE_SIZE_STATIC (78);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh
new file mode 100644
index 00000000000..2cf168f9c55
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh
@@ -0,0 +1,247 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#ifndef HB_OT_OS2_UNICODE_RANGES_HH
+#define HB_OT_OS2_UNICODE_RANGES_HH
+
+#include "hb-private.hh"
+#include "hb-dsalgs.hh"
+
+namespace OT {
+
+struct Range {
+  hb_codepoint_t start;
+  hb_codepoint_t end;
+  unsigned int bit;
+};
+
+/* Note: The contents of this array was generated using src/gen-unicode-ranges.py. */
+static Range os2UnicodeRangesSorted[] =
+{
+  {     0x0,     0x7F,   0}, // Basic Latin
+  {    0x80,     0xFF,   1}, // Latin-1 Supplement
+  {   0x100,    0x17F,   2}, // Latin Extended-A
+  {   0x180,    0x24F,   3}, // Latin Extended-B
+  {   0x250,    0x2AF,   4}, // IPA Extensions
+  {   0x2B0,    0x2FF,   5}, // Spacing Modifier Letters
+  {   0x300,    0x36F,   6}, // Combining Diacritical Marks
+  {   0x370,    0x3FF,   7}, // Greek and Coptic
+  {   0x400,    0x4FF,   9}, // Cyrillic
+  {   0x500,    0x52F,   9}, // Cyrillic Supplement
+  {   0x530,    0x58F,  10}, // Armenian
+  {   0x590,    0x5FF,  11}, // Hebrew
+  {   0x600,    0x6FF,  13}, // Arabic
+  {   0x700,    0x74F,  71}, // Syriac
+  {   0x750,    0x77F,  13}, // Arabic Supplement
+  {   0x780,    0x7BF,  72}, // Thaana
+  {   0x7C0,    0x7FF,  14}, // NKo
+  {   0x900,    0x97F,  15}, // Devanagari
+  {   0x980,    0x9FF,  16}, // Bengali
+  {   0xA00,    0xA7F,  17}, // Gurmukhi
+  {   0xA80,    0xAFF,  18}, // Gujarati
+  {   0xB00,    0xB7F,  19}, // Oriya
+  {   0xB80,    0xBFF,  20}, // Tamil
+  {   0xC00,    0xC7F,  21}, // Telugu
+  {   0xC80,    0xCFF,  22}, // Kannada
+  {   0xD00,    0xD7F,  23}, // Malayalam
+  {   0xD80,    0xDFF,  73}, // Sinhala
+  {   0xE00,    0xE7F,  24}, // Thai
+  {   0xE80,    0xEFF,  25}, // Lao
+  {   0xF00,    0xFFF,  70}, // Tibetan
+  {  0x1000,   0x109F,  74}, // Myanmar
+  {  0x10A0,   0x10FF,  26}, // Georgian
+  {  0x1100,   0x11FF,  28}, // Hangul Jamo
+  {  0x1200,   0x137F,  75}, // Ethiopic
+  {  0x1380,   0x139F,  75}, // Ethiopic Supplement
+  {  0x13A0,   0x13FF,  76}, // Cherokee
+  {  0x1400,   0x167F,  77}, // Unified Canadian Aboriginal Syllabics
+  {  0x1680,   0x169F,  78}, // Ogham
+  {  0x16A0,   0x16FF,  79}, // Runic
+  {  0x1700,   0x171F,  84}, // Tagalog
+  {  0x1720,   0x173F,  84}, // Hanunoo
+  {  0x1740,   0x175F,  84}, // Buhid
+  {  0x1760,   0x177F,  84}, // Tagbanwa
+  {  0x1780,   0x17FF,  80}, // Khmer
+  {  0x1800,   0x18AF,  81}, // Mongolian
+  {  0x1900,   0x194F,  93}, // Limbu
+  {  0x1950,   0x197F,  94}, // Tai Le
+  {  0x1980,   0x19DF,  95}, // New Tai Lue
+  {  0x19E0,   0x19FF,  80}, // Khmer Symbols
+  {  0x1A00,   0x1A1F,  96}, // Buginese
+  {  0x1B00,   0x1B7F,  27}, // Balinese
+  {  0x1B80,   0x1BBF, 112}, // Sundanese
+  {  0x1C00,   0x1C4F, 113}, // Lepcha
+  {  0x1C50,   0x1C7F, 114}, // Ol Chiki
+  {  0x1D00,   0x1D7F,   4}, // Phonetic Extensions
+  {  0x1D80,   0x1DBF,   4}, // Phonetic Extensions Supplement
+  {  0x1DC0,   0x1DFF,   6}, // Combining Diacritical Marks Supplement
+  {  0x1E00,   0x1EFF,  29}, // Latin Extended Additional
+  {  0x1F00,   0x1FFF,  30}, // Greek Extended
+  {  0x2000,   0x206F,  31}, // General Punctuation
+  {  0x2070,   0x209F,  32}, // Superscripts And Subscripts
+  {  0x20A0,   0x20CF,  33}, // Currency Symbols
+  {  0x20D0,   0x20FF,  34}, // Combining Diacritical Marks For Symbols
+  {  0x2100,   0x214F,  35}, // Letterlike Symbols
+  {  0x2150,   0x218F,  36}, // Number Forms
+  {  0x2190,   0x21FF,  37}, // Arrows
+  {  0x2200,   0x22FF,  38}, // Mathematical Operators
+  {  0x2300,   0x23FF,  39}, // Miscellaneous Technical
+  {  0x2400,   0x243F,  40}, // Control Pictures
+  {  0x2440,   0x245F,  41}, // Optical Character Recognition
+  {  0x2460,   0x24FF,  42}, // Enclosed Alphanumerics
+  {  0x2500,   0x257F,  43}, // Box Drawing
+  {  0x2580,   0x259F,  44}, // Block Elements
+  {  0x25A0,   0x25FF,  45}, // Geometric Shapes
+  {  0x2600,   0x26FF,  46}, // Miscellaneous Symbols
+  {  0x2700,   0x27BF,  47}, // Dingbats
+  {  0x27C0,   0x27EF,  38}, // Miscellaneous Mathematical Symbols-A
+  {  0x27F0,   0x27FF,  37}, // Supplemental Arrows-A
+  {  0x2800,   0x28FF,  82}, // Braille Patterns
+  {  0x2900,   0x297F,  37}, // Supplemental Arrows-B
+  {  0x2980,   0x29FF,  38}, // Miscellaneous Mathematical Symbols-B
+  {  0x2A00,   0x2AFF,  38}, // Supplemental Mathematical Operators
+  {  0x2B00,   0x2BFF,  37}, // Miscellaneous Symbols and Arrows
+  {  0x2C00,   0x2C5F,  97}, // Glagolitic
+  {  0x2C60,   0x2C7F,  29}, // Latin Extended-C
+  {  0x2C80,   0x2CFF,   8}, // Coptic
+  {  0x2D00,   0x2D2F,  26}, // Georgian Supplement
+  {  0x2D30,   0x2D7F,  98}, // Tifinagh
+  {  0x2D80,   0x2DDF,  75}, // Ethiopic Extended
+  {  0x2DE0,   0x2DFF,   9}, // Cyrillic Extended-A
+  {  0x2E00,   0x2E7F,  31}, // Supplemental Punctuation
+  {  0x2E80,   0x2EFF,  59}, // CJK Radicals Supplement
+  {  0x2F00,   0x2FDF,  59}, // Kangxi Radicals
+  {  0x2FF0,   0x2FFF,  59}, // Ideographic Description Characters
+  {  0x3000,   0x303F,  48}, // CJK Symbols And Punctuation
+  {  0x3040,   0x309F,  49}, // Hiragana
+  {  0x30A0,   0x30FF,  50}, // Katakana
+  {  0x3100,   0x312F,  51}, // Bopomofo
+  {  0x3130,   0x318F,  52}, // Hangul Compatibility Jamo
+  {  0x3190,   0x319F,  59}, // Kanbun
+  {  0x31A0,   0x31BF,  51}, // Bopomofo Extended
+  {  0x31C0,   0x31EF,  61}, // CJK Strokes
+  {  0x31F0,   0x31FF,  50}, // Katakana Phonetic Extensions
+  {  0x3200,   0x32FF,  54}, // Enclosed CJK Letters And Months
+  {  0x3300,   0x33FF,  55}, // CJK Compatibility
+  {  0x3400,   0x4DBF,  59}, // CJK Unified Ideographs Extension A
+  {  0x4DC0,   0x4DFF,  99}, // Yijing Hexagram Symbols
+  {  0x4E00,   0x9FFF,  59}, // CJK Unified Ideographs
+  {  0xA000,   0xA48F,  83}, // Yi Syllables
+  {  0xA490,   0xA4CF,  83}, // Yi Radicals
+  {  0xA500,   0xA63F,  12}, // Vai
+  {  0xA640,   0xA69F,   9}, // Cyrillic Extended-B
+  {  0xA700,   0xA71F,   5}, // Modifier Tone Letters
+  {  0xA720,   0xA7FF,  29}, // Latin Extended-D
+  {  0xA800,   0xA82F, 100}, // Syloti Nagri
+  {  0xA840,   0xA87F,  53}, // Phags-pa
+  {  0xA880,   0xA8DF, 115}, // Saurashtra
+  {  0xA900,   0xA92F, 116}, // Kayah Li
+  {  0xA930,   0xA95F, 117}, // Rejang
+  {  0xAA00,   0xAA5F, 118}, // Cham
+  {  0xAC00,   0xD7AF,  56}, // Hangul Syllables
+  {  0xD800,   0xDFFF,  57}, // Non-Plane 0 *
+  {  0xE000,   0xF8FF,  60}, // Private Use Area (plane 0)
+  {  0xF900,   0xFAFF,  61}, // CJK Compatibility Ideographs
+  {  0xFB00,   0xFB4F,  62}, // Alphabetic Presentation Forms
+  {  0xFB50,   0xFDFF,  63}, // Arabic Presentation Forms-A
+  {  0xFE00,   0xFE0F,  91}, // Variation Selectors
+  {  0xFE10,   0xFE1F,  65}, // Vertical Forms
+  {  0xFE20,   0xFE2F,  64}, // Combining Half Marks
+  {  0xFE30,   0xFE4F,  65}, // CJK Compatibility Forms
+  {  0xFE50,   0xFE6F,  66}, // Small Form Variants
+  {  0xFE70,   0xFEFF,  67}, // Arabic Presentation Forms-B
+  {  0xFF00,   0xFFEF,  68}, // Halfwidth And Fullwidth Forms
+  {  0xFFF0,   0xFFFF,  69}, // Specials
+  { 0x10000,  0x1007F, 101}, // Linear B Syllabary
+  { 0x10080,  0x100FF, 101}, // Linear B Ideograms
+  { 0x10100,  0x1013F, 101}, // Aegean Numbers
+  { 0x10140,  0x1018F, 102}, // Ancient Greek Numbers
+  { 0x10190,  0x101CF, 119}, // Ancient Symbols
+  { 0x101D0,  0x101FF, 120}, // Phaistos Disc
+  { 0x10280,  0x1029F, 121}, // Lycian
+  { 0x102A0,  0x102DF, 121}, // Carian
+  { 0x10300,  0x1032F,  85}, // Old Italic
+  { 0x10330,  0x1034F,  86}, // Gothic
+  { 0x10380,  0x1039F, 103}, // Ugaritic
+  { 0x103A0,  0x103DF, 104}, // Old Persian
+  { 0x10400,  0x1044F,  87}, // Deseret
+  { 0x10450,  0x1047F, 105}, // Shavian
+  { 0x10480,  0x104AF, 106}, // Osmanya
+  { 0x10800,  0x1083F, 107}, // Cypriot Syllabary
+  { 0x10900,  0x1091F,  58}, // Phoenician
+  { 0x10920,  0x1093F, 121}, // Lydian
+  { 0x10A00,  0x10A5F, 108}, // Kharoshthi
+  { 0x12000,  0x123FF, 110}, // Cuneiform
+  { 0x12400,  0x1247F, 110}, // Cuneiform Numbers and Punctuation
+  { 0x1D000,  0x1D0FF,  88}, // Byzantine Musical Symbols
+  { 0x1D100,  0x1D1FF,  88}, // Musical Symbols
+  { 0x1D200,  0x1D24F,  88}, // Ancient Greek Musical Notation
+  { 0x1D300,  0x1D35F, 109}, // Tai Xuan Jing Symbols
+  { 0x1D360,  0x1D37F, 111}, // Counting Rod Numerals
+  { 0x1D400,  0x1D7FF,  89}, // Mathematical Alphanumeric Symbols
+  { 0x1F000,  0x1F02F, 122}, // Mahjong Tiles
+  { 0x1F030,  0x1F09F, 122}, // Domino Tiles
+  { 0x20000,  0x2A6DF,  59}, // CJK Unified Ideographs Extension B
+  { 0x2F800,  0x2FA1F,  61}, // CJK Compatibility Ideographs Supplement
+  { 0xE0000,  0xE007F,  92}, // Tags
+  { 0xE0100,  0xE01EF,  91}, // Variation Selectors Supplement
+  { 0xF0000,  0xFFFFD,  90}, // Private Use (plane 15)
+  {0x100000, 0x10FFFD,  90}, // Private Use (plane 16)
+};
+
+static int
+_compare_range (const void *_key, const void *_item, void *_arg)
+{
+  hb_codepoint_t cp = *((hb_codepoint_t *) _key);
+  const Range *range = (Range *) _item;
+
+  if (cp < range->start)
+    return -1;
+  else if (cp <= range->end)
+    return 0;
+  else
+    return 1;
+}
+
+/**
+ * hb_get_unicode_range_bit:
+ * Returns the bit to be set in os/2 ulUnicodeRange for a given codepoint.
+ **/
+static unsigned int
+hb_get_unicode_range_bit (hb_codepoint_t cp)
+{
+  Range *range = (Range*) hb_bsearch_r (&cp, os2UnicodeRangesSorted,
+                                        sizeof (os2UnicodeRangesSorted) / sizeof(Range),
+                                        sizeof(Range),
+                                        _compare_range, nullptr);
+  if (range != NULL)
+    return range->bit;
+  return -1;
+}
+
+} /* namespace OT */
+
+#endif /* HB_OT_OS2_UNICODE_RANGES_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh
index e1cf5f7a121..6ab62aa0226 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh
@@ -56,10 +56,10 @@ struct postV2Tail
     return_trace (glyphNameIndex.sanitize (c));
   }
 
-  ArrayOf<USHORT>glyphNameIndex;        /* This is not an offset, but is the
+  ArrayOf<HBUINT16>glyphNameIndex;      /* This is not an offset, but is the
                                          * ordinal number of the glyph in 'post'
                                          * string tables. */
-  BYTE          namesX[VAR];            /* Glyph names with length bytes [variable]
+  HBUINT8               namesX[VAR];            /* Glyph names with length bytes [variable]
                                          * (a Pascal string). */
 
   DEFINE_SIZE_ARRAY2 (2, glyphNameIndex, namesX);
@@ -84,8 +84,12 @@ struct post
 
   struct accelerator_t
   {
-    inline void init (const post *table, unsigned int post_len)
+    inline void init (hb_face_t *face)
     {
+      blob = Sanitizer<post>().sanitize (face->reference_table (HB_OT_TAG_post));
+      const post *table = Sanitizer<post>::lock_instance (blob);
+      unsigned int table_length = hb_blob_get_length (blob);
+
       version = table->version.to_int ();
       index_to_offset.init ();
       if (version != 0x00020000)
@@ -96,7 +100,7 @@ struct post
       glyphNameIndex = &v2.glyphNameIndex;
       pool = &StructAfter<uint8_t> (v2.glyphNameIndex);
 
-      const uint8_t *end = (uint8_t *) table + post_len;
+      const uint8_t *end = (uint8_t *) table + table_length;
       for (const uint8_t *data = pool; data < end && data + *data <= end; data += 1 + *data)
       {
         uint32_t *offset = index_to_offset.push ();
@@ -227,8 +231,10 @@ struct post
       return hb_string_t ((const char *) data, name_length);
     }
 
+    private:
+    hb_blob_t *blob;
     uint32_t version;
-    const ArrayOf<USHORT> *glyphNameIndex;
+    const ArrayOf<HBUINT16> *glyphNameIndex;
     hb_prealloced_array_t<uint32_t, 1> index_to_offset;
     const uint8_t *pool;
     mutable uint16_t *gids_sorted_by_name;
@@ -255,16 +261,16 @@ struct post
                                          * from the value of this field. */
   FWORD         underlineThickness;     /* Suggested values for the underline
                                            thickness. */
-  ULONG         isFixedPitch;           /* Set to 0 if the font is proportionally
+  HBUINT32      isFixedPitch;           /* Set to 0 if the font is proportionally
                                          * spaced, non-zero if the font is not
                                          * proportionally spaced (i.e. monospaced). */
-  ULONG         minMemType42;           /* Minimum memory usage when an OpenType font
+  HBUINT32      minMemType42;           /* Minimum memory usage when an OpenType font
                                          * is downloaded. */
-  ULONG         maxMemType42;           /* Maximum memory usage when an OpenType font
+  HBUINT32      maxMemType42;           /* Maximum memory usage when an OpenType font
                                          * is downloaded. */
-  ULONG         minMemType1;            /* Minimum memory usage when an OpenType font
+  HBUINT32      minMemType1;            /* Minimum memory usage when an OpenType font
                                          * is downloaded as a Type 1 font. */
-  ULONG         maxMemType1;            /* Maximum memory usage when an OpenType font
+  HBUINT32      maxMemType1;            /* Maximum memory usage when an OpenType font
                                          * is downloaded as a Type 1 font. */
 /*postV2Tail    v2[VAR];*/
   DEFINE_SIZE_STATIC (32);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh
index 5fe13951cf7..eabee234caa 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh
@@ -77,13 +77,7 @@ arabic_fallback_synthesize_lookup_single (const hb_ot_shape_plan_t *plan HB_UNUS
 
   /* Bubble-sort or something equally good!
    * May not be good-enough for presidential candidate interviews, but good-enough for us... */
-
-#if defined(_AIX)
-  /* Workaround AIX xlC 12 compilation problems caused by the overloaded versions of 'cmp' in IntType */
   hb_stable_sort (&glyphs[0], num_glyphs, (int(*)(const OT::GlyphID*, const OT::GlyphID *)) OT::GlyphID::cmp, &substitutes[0]);
-#else
-  hb_stable_sort (&glyphs[0], num_glyphs, OT::GlyphID::cmp, &substitutes[0]);
-#endif
 
   OT::Supplier<OT::GlyphID> glyphs_supplier      (glyphs, num_glyphs);
   OT::Supplier<OT::GlyphID> substitutes_supplier (substitutes, num_glyphs);
@@ -132,13 +126,7 @@ arabic_fallback_synthesize_lookup_ligature (const hb_ot_shape_plan_t *plan HB_UN
     first_glyphs_indirection[num_first_glyphs] = first_glyph_idx;
     num_first_glyphs++;
   }
-
-#if defined(_AIX)
-  /* Workaround AIX xlC 12 compilation problems caused by the overloaded versions of 'cmp' in IntType */
-  hb_stable_sort (&first_glyphs[0], num_first_glyphs, (int(*)(const OT::GlyphID *, const OT::GlyphID *)) OT::GlyphID::cmp, &first_glyphs_indirection[0]);
-#else
-  hb_stable_sort (&first_glyphs[0], num_first_glyphs, OT::GlyphID::cmp, &first_glyphs_indirection[0]);
-#endif
+  hb_stable_sort (&first_glyphs[0], num_first_glyphs, (int(*)(const OT::GlyphID*, const OT::GlyphID *)) OT::GlyphID::cmp, &first_glyphs_indirection[0]);
 
   /* Now that the first-glyphs are sorted, walk again, populate ligatures. */
   for (unsigned int i = 0; i < num_first_glyphs; i++)
@@ -352,7 +340,7 @@ arabic_fallback_plan_shape (arabic_fallback_plan_t *fallback_plan,
                             hb_font_t *font,
                             hb_buffer_t *buffer)
 {
-  OT::hb_apply_context_t c (0, font, buffer);
+  OT::hb_ot_apply_context_t c (0, font, buffer);
   for (unsigned int i = 0; i < fallback_plan->num_lookups; i++)
     if (fallback_plan->lookup_array[i]) {
       c.set_lookup_mask (fallback_plan->mask_array[i]);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh
index 5d0268cfc7c..d957781902d 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh
@@ -43,16 +43,16 @@
 #define OT_TABLE_END                    }
 #define OT_LABEL_START(Name)            unsigned char Name[
 #define OT_LABEL_END                    ];
-#define OT_BYTE(u8)                     +1/*byte*/
-#define OT_USHORT(u16)                  +2/*bytes*/
+#define OT_UINT8(u8)                    +1/*byte*/
+#define OT_UINT16(u16)                  +2/*bytes*/
 #else
 #undef  OT_MEASURE
 #define OT_TABLE_START                  TABLE_NAME = {
 #define OT_TABLE_END                    };
 #define OT_LABEL_START(Name)            {
 #define OT_LABEL_END                    },
-#define OT_BYTE(u8)                     (u8),
-#define OT_USHORT(u16)                  (unsigned char)((u16)>>8), (unsigned char)((u16)&0xFFu),
+#define OT_UINT8(u8)                    (u8),
+#define OT_UINT16(u16)                  (unsigned char)((u16)>>8), (unsigned char)((u16)&0xFFu),
 #define OT_COUNT(Name, ItemSize)        ((unsigned int) sizeof(((struct TABLE_NAME*)0)->Name) \
                                          / (unsigned int)(ItemSize) \
                                          /* OT_ASSERT it's divisible (and positive). */)
@@ -80,24 +80,24 @@
  */
 
 #define OT_TAG(a,b,c,d) \
-        OT_BYTE(a) OT_BYTE(b) OT_BYTE(c) OT_BYTE(d)
+        OT_UINT8(a) OT_UINT8(b) OT_UINT8(c) OT_UINT8(d)
 
 #define OT_OFFSET(From, To) /* Offset from From to To in bytes */ \
-        OT_USHORT(OT_DISTANCE(From, To))
+        OT_UINT16(OT_DISTANCE(From, To))
 
 #define OT_GLYPHID /* GlyphID */ \
-        OT_USHORT
+        OT_UINT16
 
 #define OT_UARRAY(Name, Items) \
         OT_LABEL_START(Name) \
-        OT_USHORT(OT_COUNT(Name##Data, 2)) \
+        OT_UINT16(OT_COUNT(Name##Data, 2)) \
         OT_LABEL(Name##Data) \
         Items \
         OT_LABEL_END
 
 #define OT_UHEADLESSARRAY(Name, Items) \
         OT_LABEL_START(Name) \
-        OT_USHORT(OT_COUNT(Name##Data, 2) + 1) \
+        OT_UINT16(OT_COUNT(Name##Data, 2) + 1) \
         OT_LABEL(Name##Data) \
         Items \
         OT_LABEL_END
@@ -111,19 +111,19 @@
 
 #define OT_LOOKUP(Name, LookupType, LookupFlag, SubLookupOffsets) \
         OT_LABEL_START(Name) \
-        OT_USHORT(LookupType) \
-        OT_USHORT(LookupFlag) \
+        OT_UINT16(LookupType) \
+        OT_UINT16(LookupFlag) \
         OT_LABEL_END \
         OT_UARRAY(Name##SubLookupOffsetsArray, OT_LIST(SubLookupOffsets))
 
 #define OT_SUBLOOKUP(Name, SubFormat, Items) \
         OT_LABEL_START(Name) \
-        OT_USHORT(SubFormat) \
+        OT_UINT16(SubFormat) \
         Items
 
 #define OT_COVERAGE1(Name, Items) \
         OT_LABEL_START(Name) \
-        OT_USHORT(1) \
+        OT_UINT16(1) \
         OT_LABEL_END \
         OT_UARRAY(Name##Glyphs, OT_LIST(Items))
 
@@ -174,7 +174,7 @@
 /* Table manifest. */
 #define MANIFEST(Items) \
         OT_LABEL_START(manifest) \
-        OT_USHORT(OT_COUNT(manifestData, 6)) \
+        OT_UINT16(OT_COUNT(manifestData, 6)) \
         OT_LABEL(manifestData) \
         Items \
         OT_LABEL_END
@@ -304,8 +304,8 @@ OT_TABLE_END
 #undef OT_TABLE_END
 #undef OT_LABEL_START
 #undef OT_LABEL_END
-#undef OT_BYTE
-#undef OT_USHORT
+#undef OT_UINT8
+#undef OT_UINT16
 #undef OT_DISTANCE
 #undef OT_COUNT
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc
index 0bb631f1fa7..708bf74ebc2 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc
@@ -36,7 +36,7 @@
 #define HB_BUFFER_SCRATCH_FLAG_ARABIC_HAS_STCH HB_BUFFER_SCRATCH_FLAG_COMPLEX0
 
 /* See:
- * https://github.com/behdad/harfbuzz/commit/6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d#commitcomment-14248516 */
+ * https://github.com/harfbuzz/harfbuzz/commit/6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d#commitcomment-14248516 */
 #define HB_ARABIC_GENERAL_CATEGORY_IS_WORD(gen_cat) \
         (FLAG_UNSAFE (gen_cat) & \
          (FLAG (HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED) | \
@@ -198,7 +198,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan)
    * pause for Arabic, not other scripts.
    *
    * A pause after calt is required to make KFGQPC Uthmanic Script HAFS
-   * work correctly.  See https://github.com/behdad/harfbuzz/issues/505
+   * work correctly.  See https://github.com/harfbuzz/harfbuzz/issues/505
    */
 
   map->add_gsub_pause (nuke_joiners);
@@ -644,13 +644,15 @@ reorder_marks_arabic (const hb_ot_shape_plan_t *plan,
 {
   hb_glyph_info_t *info = buffer->info;
 
+  DEBUG_MSG (ARABIC, buffer, "Reordering marks from %d to %d", start, end);
+
   unsigned int i = start;
   for (unsigned int cc = 220; cc <= 230; cc += 10)
   {
-    DEBUG_MSG (ARABIC, buffer, "Looking for %d's starting at %d\n", cc, i);
+    DEBUG_MSG (ARABIC, buffer, "Looking for %d's starting at %d", cc, i);
     while (i < end && info_cc(info[i]) < cc)
       i++;
-    DEBUG_MSG (ARABIC, buffer, "Looking for %d's stopped at %d\n", cc, i);
+    DEBUG_MSG (ARABIC, buffer, "Looking for %d's stopped at %d", cc, i);
 
     if (i == end)
       break;
@@ -658,20 +660,17 @@ reorder_marks_arabic (const hb_ot_shape_plan_t *plan,
     if (info_cc(info[i]) > cc)
       continue;
 
-    /* Technically we should also check "info_cc(info[j]) == cc"
-     * in the following loop.  But not doing it is safe; we might
-     * end up moving all the 220 MCMs and 230 MCMs together in one
-     * move and be done. */
     unsigned int j = i;
-    while (j < end && info_is_mcm (info[j]))
+    while (j < end && info_cc(info[j]) == cc && info_is_mcm (info[j]))
       j++;
-    DEBUG_MSG (ARABIC, buffer, "Found %d's from %d to %d\n", cc, i, j);
 
     if (i == j)
       continue;
 
+    DEBUG_MSG (ARABIC, buffer, "Found %d's from %d to %d", cc, i, j);
+
     /* Shift it! */
-    DEBUG_MSG (ARABIC, buffer, "Shifting %d's: %d %d\n", cc, i, j);
+    DEBUG_MSG (ARABIC, buffer, "Shifting %d's: %d %d", cc, i, j);
     hb_glyph_info_t temp[HB_OT_SHAPE_COMPLEX_MAX_COMBINING_MARKS];
     assert (j - i <= ARRAY_LENGTH (temp));
     buffer->merge_clusters (start, j);
@@ -679,7 +678,25 @@ reorder_marks_arabic (const hb_ot_shape_plan_t *plan,
     memmove (&info[start + j - i], &info[start], (i - start) * sizeof (hb_glyph_info_t));
     memmove (&info[start], temp, (j - i) * sizeof (hb_glyph_info_t));
 
-    start += j - i;
+    /* Renumber CC such that the reordered sequence is still sorted.
+     * 22 and 26 are chosen because they are smaller than all Arabic categories,
+     * and are folded back to 220/230 respectively during fallback mark positioning.
+     *
+     * We do this because the CGJ-handling logic in the normalizer relies on
+     * mark sequences having an increasing order even after this reordering.
+     * https://github.com/harfbuzz/harfbuzz/issues/554
+     * This, however, does break some obscure sequences, where the normalizer
+     * might compose a sequence that it should not.  For example, in the seequence
+     * ALEF, HAMZAH, MADDAH, we should NOT try to compose ALEF+MADDAH, but with this
+     * renumbering, we will.
+     */
+    unsigned int new_start = start + j - i;
+    unsigned int new_cc = cc == 220 ? HB_MODIFIED_COMBINING_CLASS_CCC22 : HB_MODIFIED_COMBINING_CLASS_CCC26;
+    while (start < new_start)
+    {
+      _hb_glyph_info_set_modified_combining_class (&info[start], new_cc);
+      start++;
+    }
 
     i = j;
   }
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc
index 99406c062a2..eed0c5dfaf4 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc
@@ -161,7 +161,7 @@ disable_otl_hebrew (const hb_ot_shape_plan_t *plan)
    * script.  This matches Uniscribe better, and makes fonts like
    * Arial that have GSUB/GPOS/GDEF but no data for Hebrew work.
    * See:
-   * https://github.com/behdad/harfbuzz/issues/347#issuecomment-267838368
+   * https://github.com/harfbuzz/harfbuzz/issues/347#issuecomment-267838368
    */
   return plan->map.chosen_script[1] != HB_TAG ('h','e','b','r');
 }
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh
index a6dffec3594..bf72441b11b 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh
@@ -34,1106 +34,889 @@
 
 #line 36 "hb-ot-shape-complex-indic-machine.hh"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
-        8u, 8u, 1u, 16u, 8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u,
-        7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u,
-        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u,
-        4u, 8u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 8u, 13u,
-        5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u,
-        7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u,
-        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u,
-        5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u,
-        7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u,
-        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u,
-        8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
+        8u, 8u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
         5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u,
         4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u,
-        16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 5u, 8u, 4u, 14u, 4u, 14u, 5u, 8u,
-        5u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
-        5u, 7u, 7u, 7u, 8u, 8u, 1u, 16u, 8u, 13u, 4u, 8u, 6u, 6u, 16u, 16u,
+        16u, 16u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u,
+        4u, 13u, 4u, 8u, 4u, 13u, 8u, 8u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
+        5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u,
         4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u,
-        16u, 16u, 8u, 8u, 1u, 19u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
+        16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u,
+        4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 8u, 8u, 5u, 8u,
+        5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u,
+        5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u,
+        16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u,
+        4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u,
+        8u, 8u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
+        5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u,
+        4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u,
+        16u, 16u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u,
+        4u, 13u, 4u, 8u, 4u, 13u, 4u, 13u, 5u, 8u, 5u, 8u, 5u, 7u, 5u, 8u,
+        5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u,
+        8u, 8u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u,
+        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 8u, 8u, 1u, 19u, 3u, 17u,
         3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
-        3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u,
-        5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u,
-        3u, 10u, 5u, 10u, 3u, 10u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u,
-        5u, 14u, 3u, 14u, 1u, 16u, 4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u,
-        1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+        3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
+        3u, 17u, 4u, 17u, 5u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u,
+        5u, 10u, 3u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
+        3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u,
+        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u,
+        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u,
         1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
         3u, 17u, 3u, 17u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u,
         4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u,
-        4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u,
-        9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u,
-        5u, 10u, 3u, 10u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u,
-        4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 1u, 16u, 4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 1u, 16u,
+        4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 10u, 5u, 10u, 5u, 10u,
+        10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
+        3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u,
+        5u, 10u, 3u, 10u, 4u, 10u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
+        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u,
+        1u, 16u, 1u, 16u, 1u, 16u, 4u, 8u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
+        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
+        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 10u,
+        5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u, 3u, 10u,
+        4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
+        3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 3u, 17u, 3u, 17u, 1u, 16u,
+        1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
+        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 13u, 3u, 17u, 4u, 8u,
         3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
         3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 9u, 10u, 9u, 9u,
-        9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u,
-        3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 1u, 16u,
-        4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
-        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u,
-        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 3u, 17u, 4u, 14u,
-        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 9u, 10u, 9u, 9u,
-        9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u,
-        3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 1u, 16u,
-        4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
-        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u,
-        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 1u, 17u, 3u, 17u,
-        1u, 17u, 4u, 14u, 5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u,
-        5u, 10u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 3u, 17u, 3u, 17u, 1u, 16u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u,
-        5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u,
-        3u, 13u, 1u, 16u, 3u, 10u, 5u, 10u, 5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u,
-        9u, 10u, 9u, 9u, 5u, 10u, 1u, 16u, 0
+        3u, 17u, 3u, 17u, 4u, 17u, 5u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u,
+        10u, 10u, 5u, 10u, 3u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u,
+        5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u,
+        4u, 10u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
+        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u,
+        1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+        1u, 16u, 3u, 17u, 1u, 17u, 3u, 17u, 1u, 17u, 4u, 13u, 5u, 10u, 10u, 10u,
+        10u, 10u, 10u, 10u, 5u, 10u, 1u, 16u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u,
+        4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
+        3u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 1u, 16u,
+        0
 };
 
 static const char _indic_syllable_machine_key_spans[] = {
-        1, 16, 6, 4, 3, 1, 4, 3,
-        1, 4, 3, 1, 4, 3, 1, 5,
-        1, 1, 5, 1, 1, 5, 1, 1,
-        5, 1, 1, 11, 11, 11, 11, 11,
-        11, 11, 11, 11, 11, 1, 16, 6,
-        4, 3, 1, 4, 3, 1, 4, 3,
-        1, 4, 3, 1, 5, 1, 1, 5,
-        1, 1, 5, 1, 1, 5, 1, 1,
-        11, 11, 11, 11, 11, 11, 11, 11,
-        11, 11, 1, 16, 6, 4, 3, 1,
-        4, 3, 1, 4, 3, 1, 4, 3,
-        1, 5, 1, 1, 5, 1, 1, 5,
-        1, 1, 5, 1, 1, 11, 11, 11,
-        11, 11, 11, 11, 11, 11, 1, 16,
-        6, 4, 3, 1, 4, 3, 1, 4,
+        1, 4, 3, 1, 4, 3, 1, 4,
         3, 1, 4, 3, 1, 5, 1, 1,
         5, 1, 1, 5, 1, 1, 5, 1,
-        1, 11, 11, 11, 11, 11, 11, 11,
-        11, 11, 11, 11, 4, 11, 11, 4,
-        3, 4, 3, 1, 4, 3, 1, 4,
-        3, 1, 1, 16, 6, 5, 1, 1,
+        1, 5, 10, 5, 10, 5, 10, 5,
+        10, 5, 10, 1, 4, 3, 1, 4,
+        3, 1, 4, 3, 1, 4, 3, 1,
         5, 1, 1, 5, 1, 1, 5, 1,
-        1, 1, 19, 15, 15, 14, 16, 15,
+        1, 5, 1, 1, 5, 10, 5, 10,
+        5, 10, 5, 10, 5, 10, 1, 4,
+        3, 1, 4, 3, 1, 4, 3, 1,
+        4, 3, 1, 5, 1, 1, 5, 1,
+        1, 5, 1, 1, 5, 1, 1, 5,
+        10, 5, 10, 5, 10, 5, 10, 5,
+        1, 4, 3, 1, 4, 3, 1, 4,
+        3, 1, 4, 3, 1, 5, 1, 1,
+        5, 1, 1, 5, 1, 1, 5, 1,
+        1, 5, 10, 5, 10, 5, 10, 5,
+        10, 5, 10, 10, 4, 4, 3, 4,
+        3, 1, 4, 3, 1, 4, 3, 1,
+        1, 5, 1, 1, 5, 1, 1, 5,
+        1, 1, 5, 1, 1, 1, 19, 15,
         15, 14, 16, 15, 15, 14, 16, 15,
-        15, 14, 16, 15, 15, 14, 10, 10,
-        6, 2, 1, 2, 2, 1, 6, 11,
-        8, 6, 8, 11, 12, 12, 11, 10,
-        12, 11, 10, 12, 11, 10, 12, 11,
-        10, 12, 16, 11, 15, 15, 16, 16,
-        16, 16, 16, 15, 15, 16, 16, 16,
+        15, 14, 16, 15, 15, 14, 16, 15,
+        15, 14, 6, 6, 6, 1, 1, 1,
+        6, 8, 8, 7, 6, 8, 7, 6,
+        8, 7, 6, 8, 7, 6, 8, 7,
+        15, 15, 16, 16, 16, 16, 15, 15,
+        16, 16, 16, 16, 15, 15, 16, 16,
         16, 16, 15, 15, 16, 16, 16, 16,
-        16, 15, 15, 16, 16, 16, 16, 16,
         15, 15, 15, 15, 14, 16, 15, 15,
         14, 16, 15, 15, 14, 16, 15, 15,
-        14, 16, 15, 15, 14, 10, 10, 6,
-        2, 1, 2, 2, 1, 6, 11, 8,
-        6, 8, 11, 12, 12, 11, 10, 12,
-        11, 10, 12, 11, 10, 12, 11, 10,
-        12, 16, 11, 15, 15, 16, 16, 16,
-        16, 16, 15, 15, 16, 16, 16, 16,
-        16, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 16, 16, 16, 16, 11, 16,
+        14, 16, 15, 15, 14, 6, 6, 6,
+        1, 1, 1, 6, 8, 8, 7, 6,
+        8, 7, 6, 8, 7, 6, 8, 7,
+        6, 8, 7, 15, 15, 16, 16, 16,
+        16, 15, 15, 16, 16, 16, 16, 15,
+        15, 16, 16, 16, 16, 15, 15, 16,
+        16, 16, 16, 5, 15, 15, 14, 16,
+        15, 15, 14, 16, 15, 15, 14, 16,
+        15, 15, 14, 16, 15, 15, 14, 6,
+        6, 6, 1, 1, 1, 6, 8, 8,
+        7, 6, 8, 7, 6, 8, 7, 6,
+        8, 7, 6, 8, 7, 15, 15, 16,
+        16, 16, 16, 15, 15, 16, 16, 16,
+        16, 15, 15, 16, 16, 16, 16, 15,
+        15, 16, 16, 16, 16, 10, 15, 5,
         15, 15, 14, 16, 15, 15, 14, 16,
         15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 10, 10, 6, 2, 1,
-        2, 2, 1, 6, 11, 8, 6, 8,
-        11, 12, 12, 11, 10, 12, 11, 10,
-        12, 11, 10, 12, 11, 10, 12, 16,
-        11, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 16, 16, 16, 16, 16, 15,
-        15, 16, 16, 16, 16, 16, 15, 15,
-        16, 16, 16, 16, 16, 11, 15, 11,
-        15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 10, 10, 6, 2, 1,
-        2, 2, 1, 6, 11, 8, 6, 8,
-        11, 12, 12, 11, 10, 12, 11, 10,
-        12, 11, 10, 12, 11, 10, 12, 16,
-        11, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 16, 16, 16, 16, 16, 15,
-        15, 16, 16, 16, 16, 16, 15, 15,
-        16, 16, 16, 16, 16, 15, 17, 15,
-        17, 11, 6, 2, 1, 2, 2, 1,
-        6, 16, 15, 15, 14, 15, 15, 16,
-        12, 11, 10, 12, 11, 10, 12, 11,
-        10, 12, 11, 10, 11, 8, 6, 8,
-        11, 16, 8, 6, 6, 2, 1, 2,
-        2, 1, 6, 16
+        15, 15, 14, 6, 6, 6, 1, 1,
+        1, 6, 8, 8, 7, 6, 8, 7,
+        6, 8, 7, 6, 8, 7, 6, 8,
+        7, 15, 15, 16, 16, 16, 16, 15,
+        15, 16, 16, 16, 16, 15, 15, 16,
+        16, 16, 16, 15, 15, 16, 16, 16,
+        16, 15, 17, 15, 17, 10, 6, 1,
+        1, 1, 6, 16, 8, 7, 6, 8,
+        7, 6, 8, 7, 6, 8, 7, 6,
+        8, 6, 6, 1, 1, 1, 6, 16
 };
 
 static const short _indic_syllable_machine_index_offsets[] = {
-        0, 2, 19, 26, 31, 35, 37, 42,
-        46, 48, 53, 57, 59, 64, 68, 70,
-        76, 78, 80, 86, 88, 90, 96, 98,
-        100, 106, 108, 110, 122, 134, 146, 158,
-        170, 182, 194, 206, 218, 230, 232, 249,
-        256, 261, 265, 267, 272, 276, 278, 283,
-        287, 289, 294, 298, 300, 306, 308, 310,
-        316, 318, 320, 326, 328, 330, 336, 338,
-        340, 352, 364, 376, 388, 400, 412, 424,
-        436, 448, 460, 462, 479, 486, 491, 495,
-        497, 502, 506, 508, 513, 517, 519, 524,
-        528, 530, 536, 538, 540, 546, 548, 550,
-        556, 558, 560, 566, 568, 570, 582, 594,
-        606, 618, 630, 642, 654, 666, 678, 680,
-        697, 704, 709, 713, 715, 720, 724, 726,
-        731, 735, 737, 742, 746, 748, 754, 756,
-        758, 764, 766, 768, 774, 776, 778, 784,
-        786, 788, 800, 812, 824, 836, 848, 860,
-        872, 884, 896, 908, 920, 925, 937, 949,
-        954, 958, 963, 967, 969, 974, 978, 980,
-        985, 989, 991, 993, 1010, 1017, 1023, 1025,
-        1027, 1033, 1035, 1037, 1043, 1045, 1047, 1053,
-        1055, 1057, 1059, 1079, 1095, 1111, 1126, 1143,
-        1159, 1175, 1190, 1207, 1223, 1239, 1254, 1271,
-        1287, 1303, 1318, 1335, 1351, 1367, 1382, 1393,
-        1404, 1411, 1414, 1416, 1419, 1422, 1424, 1431,
-        1443, 1452, 1459, 1468, 1480, 1493, 1506, 1518,
-        1529, 1542, 1554, 1565, 1578, 1590, 1601, 1614,
-        1626, 1637, 1650, 1667, 1679, 1695, 1711, 1728,
-        1745, 1762, 1779, 1796, 1812, 1828, 1845, 1862,
-        1879, 1896, 1913, 1929, 1945, 1962, 1979, 1996,
-        2013, 2030, 2046, 2062, 2079, 2096, 2113, 2130,
-        2147, 2163, 2179, 2195, 2211, 2226, 2243, 2259,
-        2275, 2290, 2307, 2323, 2339, 2354, 2371, 2387,
-        2403, 2418, 2435, 2451, 2467, 2482, 2493, 2504,
-        2511, 2514, 2516, 2519, 2522, 2524, 2531, 2543,
-        2552, 2559, 2568, 2580, 2593, 2606, 2618, 2629,
-        2642, 2654, 2665, 2678, 2690, 2701, 2714, 2726,
-        2737, 2750, 2767, 2779, 2795, 2811, 2828, 2845,
-        2862, 2879, 2896, 2912, 2928, 2945, 2962, 2979,
-        2996, 3013, 3029, 3045, 3062, 3079, 3096, 3113,
-        3130, 3146, 3162, 3179, 3196, 3213, 3230, 3242,
-        3259, 3275, 3291, 3306, 3323, 3339, 3355, 3370,
-        3387, 3403, 3419, 3434, 3451, 3467, 3483, 3498,
-        3515, 3531, 3547, 3562, 3573, 3584, 3591, 3594,
-        3596, 3599, 3602, 3604, 3611, 3623, 3632, 3639,
-        3648, 3660, 3673, 3686, 3698, 3709, 3722, 3734,
-        3745, 3758, 3770, 3781, 3794, 3806, 3817, 3830,
-        3847, 3859, 3875, 3891, 3908, 3925, 3942, 3959,
-        3976, 3992, 4008, 4025, 4042, 4059, 4076, 4093,
-        4109, 4125, 4142, 4159, 4176, 4193, 4210, 4226,
-        4242, 4259, 4276, 4293, 4310, 4327, 4339, 4355,
-        4367, 4383, 4399, 4414, 4431, 4447, 4463, 4478,
-        4495, 4511, 4527, 4542, 4559, 4575, 4591, 4606,
-        4623, 4639, 4655, 4670, 4681, 4692, 4699, 4702,
-        4704, 4707, 4710, 4712, 4719, 4731, 4740, 4747,
-        4756, 4768, 4781, 4794, 4806, 4817, 4830, 4842,
-        4853, 4866, 4878, 4889, 4902, 4914, 4925, 4938,
-        4955, 4967, 4983, 4999, 5016, 5033, 5050, 5067,
-        5084, 5100, 5116, 5133, 5150, 5167, 5184, 5201,
-        5217, 5233, 5250, 5267, 5284, 5301, 5318, 5334,
-        5350, 5367, 5384, 5401, 5418, 5435, 5451, 5469,
-        5485, 5503, 5515, 5522, 5525, 5527, 5530, 5533,
-        5535, 5542, 5559, 5575, 5591, 5606, 5622, 5638,
-        5655, 5668, 5680, 5691, 5704, 5716, 5727, 5740,
-        5752, 5763, 5776, 5788, 5799, 5811, 5820, 5827,
-        5836, 5848, 5865, 5874, 5881, 5888, 5891, 5893,
-        5896, 5899, 5901, 5908
+        0, 2, 7, 11, 13, 18, 22, 24,
+        29, 33, 35, 40, 44, 46, 52, 54,
+        56, 62, 64, 66, 72, 74, 76, 82,
+        84, 86, 92, 103, 109, 120, 126, 137,
+        143, 154, 160, 171, 173, 178, 182, 184,
+        189, 193, 195, 200, 204, 206, 211, 215,
+        217, 223, 225, 227, 233, 235, 237, 243,
+        245, 247, 253, 255, 257, 263, 274, 280,
+        291, 297, 308, 314, 325, 331, 342, 344,
+        349, 353, 355, 360, 364, 366, 371, 375,
+        377, 382, 386, 388, 394, 396, 398, 404,
+        406, 408, 414, 416, 418, 424, 426, 428,
+        434, 445, 451, 462, 468, 479, 485, 496,
+        502, 504, 509, 513, 515, 520, 524, 526,
+        531, 535, 537, 542, 546, 548, 554, 556,
+        558, 564, 566, 568, 574, 576, 578, 584,
+        586, 588, 594, 605, 611, 622, 628, 639,
+        645, 656, 662, 673, 684, 689, 694, 698,
+        703, 707, 709, 714, 718, 720, 725, 729,
+        731, 733, 739, 741, 743, 749, 751, 753,
+        759, 761, 763, 769, 771, 773, 775, 795,
+        811, 827, 842, 859, 875, 891, 906, 923,
+        939, 955, 970, 987, 1003, 1019, 1034, 1051,
+        1067, 1083, 1098, 1105, 1112, 1119, 1121, 1123,
+        1125, 1132, 1141, 1150, 1158, 1165, 1174, 1182,
+        1189, 1198, 1206, 1213, 1222, 1230, 1237, 1246,
+        1254, 1270, 1286, 1303, 1320, 1337, 1354, 1370,
+        1386, 1403, 1420, 1437, 1454, 1470, 1486, 1503,
+        1520, 1537, 1554, 1570, 1586, 1603, 1620, 1637,
+        1654, 1670, 1686, 1702, 1718, 1733, 1750, 1766,
+        1782, 1797, 1814, 1830, 1846, 1861, 1878, 1894,
+        1910, 1925, 1942, 1958, 1974, 1989, 1996, 2003,
+        2010, 2012, 2014, 2016, 2023, 2032, 2041, 2049,
+        2056, 2065, 2073, 2080, 2089, 2097, 2104, 2113,
+        2121, 2128, 2137, 2145, 2161, 2177, 2194, 2211,
+        2228, 2245, 2261, 2277, 2294, 2311, 2328, 2345,
+        2361, 2377, 2394, 2411, 2428, 2445, 2461, 2477,
+        2494, 2511, 2528, 2545, 2551, 2567, 2583, 2598,
+        2615, 2631, 2647, 2662, 2679, 2695, 2711, 2726,
+        2743, 2759, 2775, 2790, 2807, 2823, 2839, 2854,
+        2861, 2868, 2875, 2877, 2879, 2881, 2888, 2897,
+        2906, 2914, 2921, 2930, 2938, 2945, 2954, 2962,
+        2969, 2978, 2986, 2993, 3002, 3010, 3026, 3042,
+        3059, 3076, 3093, 3110, 3126, 3142, 3159, 3176,
+        3193, 3210, 3226, 3242, 3259, 3276, 3293, 3310,
+        3326, 3342, 3359, 3376, 3393, 3410, 3421, 3437,
+        3443, 3459, 3475, 3490, 3507, 3523, 3539, 3554,
+        3571, 3587, 3603, 3618, 3635, 3651, 3667, 3682,
+        3699, 3715, 3731, 3746, 3753, 3760, 3767, 3769,
+        3771, 3773, 3780, 3789, 3798, 3806, 3813, 3822,
+        3830, 3837, 3846, 3854, 3861, 3870, 3878, 3885,
+        3894, 3902, 3918, 3934, 3951, 3968, 3985, 4002,
+        4018, 4034, 4051, 4068, 4085, 4102, 4118, 4134,
+        4151, 4168, 4185, 4202, 4218, 4234, 4251, 4268,
+        4285, 4302, 4318, 4336, 4352, 4370, 4381, 4388,
+        4390, 4392, 4394, 4401, 4418, 4427, 4435, 4442,
+        4451, 4459, 4466, 4475, 4483, 4490, 4499, 4507,
+        4514, 4523, 4530, 4537, 4539, 4541, 4543, 4550
 };
 
 static const short _indic_syllable_machine_indicies[] = {
-        1, 0, 2, 3, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 2, 0, 1, 0, 0, 0, 0,
-        4, 0, 5, 5, 6, 1, 0, 7,
-        7, 6, 0, 6, 0, 8, 8, 9,
-        1, 0, 10, 10, 9, 0, 9, 0,
-        11, 11, 12, 1, 0, 13, 13, 12,
-        0, 12, 0, 14, 14, 15, 1, 0,
-        16, 16, 15, 0, 15, 0, 17, 0,
-        0, 0, 1, 0, 18, 0, 19, 0,
-        20, 14, 14, 15, 1, 0, 21, 0,
-        22, 0, 23, 11, 11, 12, 1, 0,
-        24, 0, 25, 0, 26, 8, 8, 9,
-        1, 0, 27, 0, 28, 0, 29, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        29, 0, 29, 5, 5, 6, 1, 0,
-        0, 0, 0, 30, 29, 0, 31, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        31, 0, 31, 5, 5, 6, 1, 0,
-        0, 0, 0, 32, 31, 0, 33, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        33, 0, 33, 5, 5, 6, 1, 0,
-        0, 0, 0, 34, 33, 0, 35, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        35, 0, 35, 5, 5, 6, 1, 0,
-        0, 0, 0, 36, 35, 0, 37, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        37, 0, 37, 5, 5, 6, 1, 0,
-        0, 0, 0, 38, 37, 0, 40, 39,
-        41, 42, 39, 39, 39, 39, 39, 39,
-        39, 39, 39, 39, 39, 39, 39, 41,
-        39, 40, 39, 39, 39, 39, 43, 39,
-        44, 44, 45, 40, 39, 46, 46, 45,
-        39, 45, 39, 47, 47, 48, 40, 39,
-        49, 49, 48, 39, 48, 39, 50, 50,
-        51, 40, 39, 52, 52, 51, 39, 51,
-        39, 53, 53, 54, 40, 39, 55, 55,
-        54, 39, 54, 39, 56, 39, 39, 39,
-        40, 39, 57, 39, 58, 39, 59, 53,
-        53, 54, 40, 39, 60, 39, 61, 39,
-        62, 50, 50, 51, 40, 39, 63, 39,
-        64, 39, 65, 47, 47, 48, 40, 39,
-        66, 39, 67, 39, 68, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 68, 39,
-        68, 44, 44, 45, 40, 39, 39, 39,
-        39, 69, 68, 39, 70, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 70, 39,
-        70, 44, 44, 45, 40, 39, 39, 39,
-        39, 71, 70, 39, 72, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 72, 39,
-        72, 44, 44, 45, 40, 39, 39, 39,
-        39, 73, 72, 39, 74, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 74, 39,
-        74, 44, 44, 45, 40, 39, 39, 39,
-        39, 75, 74, 39, 76, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 76, 39,
-        76, 44, 44, 45, 40, 39, 39, 39,
-        39, 77, 76, 39, 79, 78, 80, 81,
-        78, 78, 78, 78, 78, 78, 78, 78,
-        78, 78, 78, 78, 78, 80, 78, 79,
-        78, 78, 78, 78, 82, 78, 83, 83,
-        84, 79, 78, 86, 86, 84, 85, 84,
-        85, 87, 87, 88, 79, 78, 89, 89,
-        88, 78, 88, 78, 90, 90, 91, 79,
-        78, 92, 92, 91, 78, 91, 78, 93,
-        93, 94, 79, 78, 95, 95, 94, 78,
-        94, 78, 96, 78, 78, 78, 79, 78,
-        97, 78, 98, 78, 99, 93, 93, 94,
-        79, 78, 100, 78, 101, 78, 102, 90,
-        90, 91, 79, 78, 103, 78, 104, 78,
-        105, 87, 87, 88, 79, 78, 106, 78,
-        107, 78, 108, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 108, 78, 108, 83,
-        83, 84, 79, 78, 78, 78, 78, 109,
-        108, 78, 110, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 110, 78, 110, 83,
-        83, 84, 79, 78, 78, 78, 78, 111,
-        110, 78, 112, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 112, 78, 112, 83,
-        83, 84, 79, 78, 78, 78, 78, 113,
-        112, 78, 114, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 114, 78, 114, 83,
-        83, 84, 79, 78, 78, 78, 78, 115,
-        114, 78, 116, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 116, 78, 118, 117,
-        119, 120, 117, 117, 117, 117, 117, 117,
-        117, 117, 117, 117, 117, 117, 117, 119,
-        117, 118, 117, 117, 117, 117, 121, 117,
-        122, 122, 123, 118, 117, 124, 124, 123,
-        117, 123, 117, 125, 125, 126, 118, 117,
-        127, 127, 126, 117, 126, 117, 128, 128,
-        129, 118, 117, 130, 130, 129, 117, 129,
-        117, 131, 131, 132, 118, 117, 133, 133,
-        132, 117, 132, 117, 134, 117, 117, 117,
-        118, 117, 135, 117, 136, 117, 137, 131,
-        131, 132, 118, 117, 138, 117, 139, 117,
-        140, 128, 128, 129, 118, 117, 141, 117,
-        142, 117, 143, 125, 125, 126, 118, 117,
-        144, 117, 145, 117, 146, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 146, 117,
-        146, 122, 122, 123, 118, 117, 117, 117,
-        117, 147, 146, 117, 148, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 148, 117,
-        148, 122, 122, 123, 118, 117, 117, 117,
-        117, 149, 148, 117, 150, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 150, 117,
-        150, 122, 122, 123, 118, 117, 117, 117,
-        117, 151, 150, 117, 152, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 152, 117,
-        152, 122, 122, 123, 118, 117, 117, 117,
-        117, 153, 152, 117, 154, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 154, 117,
-        154, 122, 122, 123, 118, 117, 117, 117,
-        117, 155, 154, 117, 116, 83, 83, 84,
-        79, 78, 78, 78, 78, 156, 116, 78,
-        86, 86, 84, 1, 0, 114, 83, 83,
-        84, 157, 0, 0, 0, 0, 0, 114,
-        0, 114, 83, 83, 84, 157, 0, 0,
-        0, 0, 158, 114, 0, 159, 159, 160,
-        1, 0, 7, 7, 160, 0, 161, 161,
-        162, 157, 0, 163, 163, 162, 0, 162,
-        0, 164, 164, 165, 157, 0, 166, 166,
-        165, 0, 165, 0, 167, 167, 168, 157,
-        0, 169, 169, 168, 0, 168, 0, 157,
-        0, 170, 171, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        170, 0, 157, 0, 0, 0, 0, 172,
-        0, 173, 0, 0, 0, 157, 0, 174,
-        0, 175, 0, 176, 167, 167, 168, 157,
-        0, 177, 0, 178, 0, 179, 164, 164,
-        165, 157, 0, 180, 0, 181, 0, 182,
-        161, 161, 162, 157, 0, 183, 0, 184,
-        0, 186, 185, 188, 189, 190, 191, 192,
-        193, 84, 79, 194, 195, 196, 196, 156,
-        197, 198, 199, 200, 201, 202, 187, 204,
-        205, 206, 207, 6, 1, 208, 209, 203,
-        203, 38, 210, 203, 203, 211, 203, 212,
-        205, 213, 213, 6, 1, 208, 209, 203,
-        203, 203, 210, 203, 203, 211, 203, 205,
-        213, 213, 6, 1, 208, 209, 203, 203,
-        203, 210, 203, 203, 211, 203, 214, 203,
-        203, 203, 19, 215, 203, 1, 208, 209,
-        203, 203, 203, 216, 203, 214, 203, 217,
-        218, 219, 220, 6, 1, 208, 209, 203,
-        203, 36, 221, 203, 203, 211, 203, 222,
-        218, 223, 223, 6, 1, 208, 209, 203,
-        203, 203, 221, 203, 203, 211, 203, 218,
-        223, 223, 6, 1, 208, 209, 203, 203,
-        203, 221, 203, 203, 211, 203, 224, 203,
-        203, 203, 19, 225, 203, 1, 208, 209,
-        203, 203, 203, 216, 203, 224, 203, 226,
-        227, 228, 229, 6, 1, 208, 209, 203,
-        203, 34, 230, 203, 203, 211, 203, 231,
-        227, 232, 232, 6, 1, 208, 209, 203,
-        203, 203, 230, 203, 203, 211, 203, 227,
-        232, 232, 6, 1, 208, 209, 203, 203,
-        203, 230, 203, 203, 211, 203, 233, 203,
-        203, 203, 19, 234, 203, 1, 208, 209,
-        203, 203, 203, 216, 203, 233, 203, 235,
-        236, 237, 238, 6, 1, 208, 209, 203,
-        203, 32, 239, 203, 203, 211, 203, 240,
-        236, 241, 241, 6, 1, 208, 209, 203,
-        203, 203, 239, 203, 203, 211, 203, 236,
-        241, 241, 6, 1, 208, 209, 203, 203,
-        203, 239, 203, 203, 211, 203, 242, 203,
-        203, 203, 19, 243, 203, 1, 208, 209,
-        203, 203, 203, 216, 203, 242, 203, 244,
-        245, 246, 247, 6, 1, 208, 209, 203,
-        203, 30, 248, 203, 203, 211, 203, 249,
-        245, 250, 250, 6, 1, 208, 209, 203,
-        203, 203, 248, 203, 203, 211, 203, 245,
-        250, 250, 6, 1, 208, 209, 203, 203,
-        203, 248, 203, 203, 211, 203, 19, 251,
-        203, 1, 208, 209, 203, 203, 203, 216,
-        203, 252, 252, 203, 1, 208, 209, 203,
-        203, 203, 216, 203, 253, 203, 203, 254,
-        208, 209, 203, 208, 209, 203, 255, 203,
-        208, 256, 203, 208, 257, 203, 208, 203,
-        253, 203, 203, 203, 208, 209, 203, 258,
-        203, 259, 260, 203, 1, 208, 209, 203,
-        203, 4, 203, 3, 203, 252, 252, 203,
-        1, 208, 209, 203, 252, 252, 203, 1,
-        208, 209, 203, 258, 203, 252, 252, 203,
-        1, 208, 209, 203, 258, 203, 259, 252,
-        203, 1, 208, 209, 203, 203, 4, 203,
-        19, 203, 261, 261, 6, 1, 208, 209,
-        203, 203, 203, 216, 203, 262, 28, 263,
-        264, 9, 1, 208, 209, 203, 203, 203,
-        216, 203, 28, 263, 264, 9, 1, 208,
-        209, 203, 203, 203, 216, 203, 263, 263,
-        9, 1, 208, 209, 203, 203, 203, 216,
-        203, 265, 25, 266, 267, 12, 1, 208,
-        209, 203, 203, 203, 216, 203, 25, 266,
-        267, 12, 1, 208, 209, 203, 203, 203,
-        216, 203, 266, 266, 12, 1, 208, 209,
-        203, 203, 203, 216, 203, 268, 22, 269,
-        270, 15, 1, 208, 209, 203, 203, 203,
-        216, 203, 22, 269, 270, 15, 1, 208,
-        209, 203, 203, 203, 216, 203, 269, 269,
-        15, 1, 208, 209, 203, 203, 203, 216,
-        203, 271, 19, 252, 272, 203, 1, 208,
-        209, 203, 203, 203, 216, 203, 19, 252,
-        272, 203, 1, 208, 209, 203, 203, 203,
-        216, 203, 252, 273, 203, 1, 208, 209,
-        203, 203, 203, 216, 203, 19, 203, 252,
-        252, 203, 1, 208, 209, 203, 203, 203,
-        216, 203, 2, 3, 203, 203, 19, 251,
-        203, 1, 208, 209, 203, 203, 203, 216,
-        203, 2, 203, 245, 250, 250, 6, 1,
-        208, 209, 203, 203, 203, 248, 203, 244,
-        245, 250, 250, 6, 1, 208, 209, 203,
-        203, 203, 248, 203, 203, 211, 203, 244,
-        245, 246, 250, 6, 1, 208, 209, 203,
-        203, 30, 248, 203, 203, 211, 203, 242,
-        203, 274, 203, 261, 261, 6, 1, 208,
-        209, 203, 203, 203, 216, 203, 242, 203,
-        242, 203, 203, 203, 252, 252, 203, 1,
-        208, 209, 203, 203, 203, 216, 203, 242,
-        203, 242, 203, 203, 203, 252, 275, 203,
-        1, 208, 209, 203, 203, 203, 216, 203,
-        242, 203, 242, 203, 274, 203, 252, 252,
-        203, 1, 208, 209, 203, 203, 203, 216,
-        203, 242, 203, 242, 3, 203, 203, 19,
-        243, 203, 1, 208, 209, 203, 203, 203,
-        216, 203, 242, 203, 235, 236, 241, 241,
-        6, 1, 208, 209, 203, 203, 203, 239,
-        203, 203, 211, 203, 235, 236, 237, 241,
-        6, 1, 208, 209, 203, 203, 32, 239,
-        203, 203, 211, 203, 233, 203, 276, 203,
-        261, 261, 6, 1, 208, 209, 203, 203,
-        203, 216, 203, 233, 203, 233, 203, 203,
-        203, 252, 252, 203, 1, 208, 209, 203,
-        203, 203, 216, 203, 233, 203, 233, 203,
-        203, 203, 252, 277, 203, 1, 208, 209,
-        203, 203, 203, 216, 203, 233, 203, 233,
-        203, 276, 203, 252, 252, 203, 1, 208,
-        209, 203, 203, 203, 216, 203, 233, 203,
-        233, 3, 203, 203, 19, 234, 203, 1,
-        208, 209, 203, 203, 203, 216, 203, 233,
-        203, 226, 227, 232, 232, 6, 1, 208,
-        209, 203, 203, 203, 230, 203, 203, 211,
-        203, 226, 227, 228, 232, 6, 1, 208,
-        209, 203, 203, 34, 230, 203, 203, 211,
-        203, 224, 203, 278, 203, 261, 261, 6,
-        1, 208, 209, 203, 203, 203, 216, 203,
-        224, 203, 224, 203, 203, 203, 252, 252,
-        203, 1, 208, 209, 203, 203, 203, 216,
-        203, 224, 203, 224, 203, 203, 203, 252,
-        279, 203, 1, 208, 209, 203, 203, 203,
-        216, 203, 224, 203, 224, 203, 278, 203,
-        252, 252, 203, 1, 208, 209, 203, 203,
-        203, 216, 203, 224, 203, 224, 3, 203,
-        203, 19, 225, 203, 1, 208, 209, 203,
-        203, 203, 216, 203, 224, 203, 217, 218,
-        223, 223, 6, 1, 208, 209, 203, 203,
-        203, 221, 203, 203, 211, 203, 217, 218,
-        219, 223, 6, 1, 208, 209, 203, 203,
-        36, 221, 203, 203, 211, 203, 214, 203,
-        280, 203, 261, 261, 6, 1, 208, 209,
-        203, 203, 203, 216, 203, 214, 203, 214,
-        203, 203, 203, 252, 252, 203, 1, 208,
-        209, 203, 203, 203, 216, 203, 214, 203,
-        214, 203, 203, 203, 252, 281, 203, 1,
-        208, 209, 203, 203, 203, 216, 203, 214,
-        203, 214, 203, 280, 203, 252, 252, 203,
-        1, 208, 209, 203, 203, 203, 216, 203,
-        214, 203, 214, 3, 203, 203, 19, 215,
-        203, 1, 208, 209, 203, 203, 203, 216,
-        203, 214, 203, 204, 205, 213, 213, 6,
-        1, 208, 209, 203, 203, 203, 210, 203,
-        203, 211, 203, 204, 205, 206, 213, 6,
-        1, 208, 209, 203, 203, 38, 210, 203,
-        203, 211, 203, 283, 284, 285, 286, 45,
-        40, 287, 288, 282, 282, 77, 289, 282,
-        282, 290, 282, 291, 284, 292, 286, 45,
-        40, 287, 288, 282, 282, 282, 289, 282,
-        282, 290, 282, 284, 292, 286, 45, 40,
-        287, 288, 282, 282, 282, 289, 282, 282,
-        290, 282, 293, 282, 282, 282, 58, 294,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 293, 282, 296, 297, 298, 299, 45,
-        40, 287, 288, 282, 282, 75, 300, 282,
-        282, 290, 282, 301, 297, 302, 302, 45,
-        40, 287, 288, 282, 282, 282, 300, 282,
-        282, 290, 282, 297, 302, 302, 45, 40,
-        287, 288, 282, 282, 282, 300, 282, 282,
-        290, 282, 303, 282, 282, 282, 58, 304,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 303, 282, 305, 306, 307, 308, 45,
-        40, 287, 288, 282, 282, 73, 309, 282,
-        282, 290, 282, 310, 306, 311, 311, 45,
-        40, 287, 288, 282, 282, 282, 309, 282,
-        282, 290, 282, 306, 311, 311, 45, 40,
-        287, 288, 282, 282, 282, 309, 282, 282,
-        290, 282, 312, 282, 282, 282, 58, 313,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 312, 282, 314, 315, 316, 317, 45,
-        40, 287, 288, 282, 282, 71, 318, 282,
-        282, 290, 282, 319, 315, 320, 320, 45,
-        40, 287, 288, 282, 282, 282, 318, 282,
-        282, 290, 282, 315, 320, 320, 45, 40,
-        287, 288, 282, 282, 282, 318, 282, 282,
-        290, 282, 321, 282, 282, 282, 58, 322,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 321, 282, 323, 324, 325, 326, 45,
-        40, 287, 288, 282, 282, 69, 327, 282,
-        282, 290, 282, 328, 324, 329, 329, 45,
-        40, 287, 288, 282, 282, 282, 327, 282,
-        282, 290, 282, 324, 329, 329, 45, 40,
-        287, 288, 282, 282, 282, 327, 282, 282,
-        290, 282, 58, 330, 282, 40, 287, 288,
-        282, 282, 282, 295, 282, 331, 331, 282,
-        40, 287, 288, 282, 282, 282, 295, 282,
-        332, 282, 282, 333, 287, 288, 282, 287,
-        288, 282, 334, 282, 287, 335, 282, 287,
-        336, 282, 287, 282, 332, 282, 282, 282,
-        287, 288, 282, 337, 282, 338, 339, 282,
-        40, 287, 288, 282, 282, 43, 282, 42,
-        282, 331, 331, 282, 40, 287, 288, 282,
-        331, 331, 282, 40, 287, 288, 282, 337,
-        282, 331, 331, 282, 40, 287, 288, 282,
-        337, 282, 338, 331, 282, 40, 287, 288,
-        282, 282, 43, 282, 58, 282, 340, 340,
-        45, 40, 287, 288, 282, 282, 282, 295,
-        282, 341, 67, 342, 343, 48, 40, 287,
-        288, 282, 282, 282, 295, 282, 67, 342,
-        343, 48, 40, 287, 288, 282, 282, 282,
-        295, 282, 342, 342, 48, 40, 287, 288,
-        282, 282, 282, 295, 282, 344, 64, 345,
-        346, 51, 40, 287, 288, 282, 282, 282,
-        295, 282, 64, 345, 346, 51, 40, 287,
-        288, 282, 282, 282, 295, 282, 345, 345,
-        51, 40, 287, 288, 282, 282, 282, 295,
-        282, 347, 61, 348, 349, 54, 40, 287,
-        288, 282, 282, 282, 295, 282, 61, 348,
-        349, 54, 40, 287, 288, 282, 282, 282,
-        295, 282, 348, 348, 54, 40, 287, 288,
-        282, 282, 282, 295, 282, 350, 58, 331,
-        351, 282, 40, 287, 288, 282, 282, 282,
-        295, 282, 58, 331, 351, 282, 40, 287,
-        288, 282, 282, 282, 295, 282, 331, 352,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 58, 282, 331, 331, 282, 40, 287,
-        288, 282, 282, 282, 295, 282, 41, 42,
-        282, 282, 58, 330, 282, 40, 287, 288,
-        282, 282, 282, 295, 282, 41, 282, 324,
-        329, 329, 45, 40, 287, 288, 282, 282,
-        282, 327, 282, 323, 324, 329, 329, 45,
-        40, 287, 288, 282, 282, 282, 327, 282,
-        282, 290, 282, 323, 324, 325, 329, 45,
-        40, 287, 288, 282, 282, 69, 327, 282,
-        282, 290, 282, 321, 282, 353, 282, 340,
-        340, 45, 40, 287, 288, 282, 282, 282,
-        295, 282, 321, 282, 321, 282, 282, 282,
-        331, 331, 282, 40, 287, 288, 282, 282,
-        282, 295, 282, 321, 282, 321, 282, 282,
-        282, 331, 354, 282, 40, 287, 288, 282,
-        282, 282, 295, 282, 321, 282, 321, 282,
-        353, 282, 331, 331, 282, 40, 287, 288,
-        282, 282, 282, 295, 282, 321, 282, 321,
-        42, 282, 282, 58, 322, 282, 40, 287,
-        288, 282, 282, 282, 295, 282, 321, 282,
-        314, 315, 320, 320, 45, 40, 287, 288,
-        282, 282, 282, 318, 282, 282, 290, 282,
-        314, 315, 316, 320, 45, 40, 287, 288,
-        282, 282, 71, 318, 282, 282, 290, 282,
-        312, 282, 355, 282, 340, 340, 45, 40,
-        287, 288, 282, 282, 282, 295, 282, 312,
-        282, 312, 282, 282, 282, 331, 331, 282,
-        40, 287, 288, 282, 282, 282, 295, 282,
-        312, 282, 312, 282, 282, 282, 331, 356,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 312, 282, 312, 282, 355, 282, 331,
-        331, 282, 40, 287, 288, 282, 282, 282,
-        295, 282, 312, 282, 312, 42, 282, 282,
-        58, 313, 282, 40, 287, 288, 282, 282,
-        282, 295, 282, 312, 282, 305, 306, 311,
-        311, 45, 40, 287, 288, 282, 282, 282,
-        309, 282, 282, 290, 282, 305, 306, 307,
-        311, 45, 40, 287, 288, 282, 282, 73,
-        309, 282, 282, 290, 282, 303, 282, 357,
-        282, 340, 340, 45, 40, 287, 288, 282,
-        282, 282, 295, 282, 303, 282, 303, 282,
-        282, 282, 331, 331, 282, 40, 287, 288,
-        282, 282, 282, 295, 282, 303, 282, 303,
-        282, 282, 282, 331, 358, 282, 40, 287,
-        288, 282, 282, 282, 295, 282, 303, 282,
-        303, 282, 357, 282, 331, 331, 282, 40,
-        287, 288, 282, 282, 282, 295, 282, 303,
-        282, 303, 42, 282, 282, 58, 304, 282,
-        40, 287, 288, 282, 282, 282, 295, 282,
-        303, 282, 296, 297, 302, 302, 45, 40,
-        287, 288, 282, 282, 282, 300, 282, 282,
-        290, 282, 296, 297, 298, 302, 45, 40,
-        287, 288, 282, 282, 75, 300, 282, 282,
-        290, 282, 293, 282, 359, 282, 340, 340,
-        45, 40, 287, 288, 282, 282, 282, 295,
-        282, 293, 282, 293, 282, 282, 282, 331,
-        331, 282, 40, 287, 288, 282, 282, 282,
-        295, 282, 293, 282, 293, 282, 282, 282,
-        331, 360, 282, 40, 287, 288, 282, 282,
-        282, 295, 282, 293, 282, 293, 282, 359,
-        282, 331, 331, 282, 40, 287, 288, 282,
-        282, 282, 295, 282, 293, 282, 76, 44,
-        44, 45, 40, 282, 282, 282, 282, 282,
-        76, 282, 293, 42, 282, 282, 58, 294,
-        282, 40, 287, 288, 282, 282, 282, 295,
-        282, 293, 282, 283, 284, 292, 286, 45,
-        40, 287, 288, 282, 282, 282, 289, 282,
-        282, 290, 282, 362, 191, 363, 363, 84,
-        79, 194, 195, 361, 361, 361, 197, 361,
-        361, 200, 361, 191, 363, 363, 84, 79,
-        194, 195, 361, 361, 361, 197, 361, 361,
-        200, 361, 364, 361, 361, 361, 98, 365,
-        361, 79, 194, 195, 361, 361, 361, 366,
-        361, 364, 361, 367, 368, 369, 370, 84,
-        79, 194, 195, 361, 361, 115, 371, 361,
-        361, 200, 361, 372, 368, 373, 373, 84,
-        79, 194, 195, 361, 361, 361, 371, 361,
-        361, 200, 361, 368, 373, 373, 84, 79,
-        194, 195, 361, 361, 361, 371, 361, 361,
-        200, 361, 374, 361, 361, 361, 98, 375,
-        361, 79, 194, 195, 361, 361, 361, 366,
-        361, 374, 361, 376, 377, 378, 379, 84,
-        79, 194, 195, 361, 361, 113, 380, 361,
-        361, 200, 361, 381, 377, 382, 382, 84,
-        79, 194, 195, 361, 361, 361, 380, 361,
-        361, 200, 361, 377, 382, 382, 84, 79,
-        194, 195, 361, 361, 361, 380, 361, 361,
-        200, 361, 383, 361, 361, 361, 98, 384,
-        361, 79, 194, 195, 361, 361, 361, 366,
-        361, 383, 361, 385, 386, 387, 388, 84,
-        79, 194, 195, 361, 361, 111, 389, 361,
-        361, 200, 361, 390, 386, 391, 391, 84,
-        79, 194, 195, 361, 361, 361, 389, 361,
-        361, 200, 361, 386, 391, 391, 84, 79,
-        194, 195, 361, 361, 361, 389, 361, 361,
-        200, 361, 392, 361, 361, 361, 98, 393,
-        361, 79, 194, 195, 361, 361, 361, 366,
-        361, 392, 361, 394, 395, 396, 397, 84,
-        79, 194, 195, 361, 361, 109, 398, 361,
-        361, 200, 361, 399, 395, 400, 400, 84,
-        79, 194, 195, 361, 361, 361, 398, 361,
-        361, 200, 361, 395, 400, 400, 84, 79,
-        194, 195, 361, 361, 361, 398, 361, 361,
-        200, 361, 98, 401, 361, 79, 194, 195,
-        361, 361, 361, 366, 361, 402, 402, 361,
-        79, 194, 195, 361, 361, 361, 366, 361,
-        403, 361, 361, 404, 194, 195, 361, 194,
-        195, 361, 405, 361, 194, 406, 361, 194,
-        407, 361, 194, 361, 403, 361, 361, 361,
-        194, 195, 361, 408, 361, 409, 410, 361,
-        79, 194, 195, 361, 361, 82, 361, 81,
-        361, 402, 402, 361, 79, 194, 195, 361,
-        402, 402, 361, 79, 194, 195, 361, 408,
-        361, 402, 402, 361, 79, 194, 195, 361,
-        408, 361, 409, 402, 361, 79, 194, 195,
-        361, 361, 82, 361, 98, 361, 411, 411,
-        84, 79, 194, 195, 361, 361, 361, 366,
-        361, 412, 107, 413, 414, 88, 79, 194,
-        195, 361, 361, 361, 366, 361, 107, 413,
-        414, 88, 79, 194, 195, 361, 361, 361,
-        366, 361, 413, 413, 88, 79, 194, 195,
-        361, 361, 361, 366, 361, 415, 104, 416,
-        417, 91, 79, 194, 195, 361, 361, 361,
-        366, 361, 104, 416, 417, 91, 79, 194,
-        195, 361, 361, 361, 366, 361, 416, 416,
-        91, 79, 194, 195, 361, 361, 361, 366,
-        361, 418, 101, 419, 420, 94, 79, 194,
-        195, 361, 361, 361, 366, 361, 101, 419,
-        420, 94, 79, 194, 195, 361, 361, 361,
-        366, 361, 419, 419, 94, 79, 194, 195,
-        361, 361, 361, 366, 361, 421, 98, 402,
-        422, 361, 79, 194, 195, 361, 361, 361,
-        366, 361, 98, 402, 422, 361, 79, 194,
-        195, 361, 361, 361, 366, 361, 402, 423,
-        361, 79, 194, 195, 361, 361, 361, 366,
-        361, 98, 361, 402, 402, 361, 79, 194,
-        195, 361, 361, 361, 366, 361, 80, 81,
-        361, 361, 98, 401, 361, 79, 194, 195,
-        361, 361, 361, 366, 361, 80, 361, 395,
-        400, 400, 84, 79, 194, 195, 361, 361,
-        361, 398, 361, 394, 395, 400, 400, 84,
-        79, 194, 195, 361, 361, 361, 398, 361,
-        361, 200, 361, 394, 395, 396, 400, 84,
-        79, 194, 195, 361, 361, 109, 398, 361,
-        361, 200, 361, 392, 361, 424, 361, 411,
-        411, 84, 79, 194, 195, 361, 361, 361,
-        366, 361, 392, 361, 392, 361, 361, 361,
-        402, 402, 361, 79, 194, 195, 361, 361,
-        361, 366, 361, 392, 361, 392, 361, 361,
-        361, 402, 425, 361, 79, 194, 195, 361,
-        361, 361, 366, 361, 392, 361, 392, 361,
-        424, 361, 402, 402, 361, 79, 194, 195,
-        361, 361, 361, 366, 361, 392, 361, 392,
-        81, 361, 361, 98, 393, 361, 79, 194,
-        195, 361, 361, 361, 366, 361, 392, 361,
-        385, 386, 391, 391, 84, 79, 194, 195,
-        361, 361, 361, 389, 361, 361, 200, 361,
-        385, 386, 387, 391, 84, 79, 194, 195,
-        361, 361, 111, 389, 361, 361, 200, 361,
-        383, 361, 426, 361, 411, 411, 84, 79,
-        194, 195, 361, 361, 361, 366, 361, 383,
-        361, 383, 361, 361, 361, 402, 402, 361,
-        79, 194, 195, 361, 361, 361, 366, 361,
-        383, 361, 383, 361, 361, 361, 402, 427,
-        361, 79, 194, 195, 361, 361, 361, 366,
-        361, 383, 361, 383, 361, 426, 361, 402,
-        402, 361, 79, 194, 195, 361, 361, 361,
-        366, 361, 383, 361, 383, 81, 361, 361,
-        98, 384, 361, 79, 194, 195, 361, 361,
-        361, 366, 361, 383, 361, 376, 377, 382,
-        382, 84, 79, 194, 195, 361, 361, 361,
-        380, 361, 361, 200, 361, 376, 377, 378,
-        382, 84, 79, 194, 195, 361, 361, 113,
-        380, 361, 361, 200, 361, 374, 361, 428,
-        361, 411, 411, 84, 79, 194, 195, 361,
-        361, 361, 366, 361, 374, 361, 374, 361,
-        361, 361, 402, 402, 361, 79, 194, 195,
-        361, 361, 361, 366, 361, 374, 361, 374,
-        361, 361, 361, 402, 429, 361, 79, 194,
-        195, 361, 361, 361, 366, 361, 374, 361,
-        374, 361, 428, 361, 402, 402, 361, 79,
-        194, 195, 361, 361, 361, 366, 361, 374,
-        361, 374, 81, 361, 361, 98, 375, 361,
-        79, 194, 195, 361, 361, 361, 366, 361,
-        374, 361, 367, 368, 373, 373, 84, 79,
-        194, 195, 361, 361, 361, 371, 361, 361,
-        200, 361, 367, 368, 369, 373, 84, 79,
-        194, 195, 361, 361, 115, 371, 361, 361,
-        200, 361, 364, 361, 430, 361, 411, 411,
-        84, 79, 194, 195, 361, 361, 361, 366,
-        361, 364, 361, 364, 361, 361, 361, 402,
-        402, 361, 79, 194, 195, 361, 361, 361,
-        366, 361, 364, 361, 364, 361, 361, 361,
-        402, 431, 361, 79, 194, 195, 361, 361,
-        361, 366, 361, 364, 361, 364, 361, 430,
-        361, 402, 402, 361, 79, 194, 195, 361,
-        361, 361, 366, 361, 364, 361, 364, 81,
-        361, 361, 98, 365, 361, 79, 194, 195,
-        361, 361, 361, 366, 361, 364, 361, 116,
-        83, 83, 84, 79, 432, 432, 432, 432,
-        156, 116, 432, 190, 191, 363, 363, 84,
-        79, 194, 195, 361, 361, 361, 197, 361,
-        361, 200, 361, 116, 83, 83, 84, 79,
-        432, 432, 432, 432, 432, 116, 432, 434,
-        435, 436, 437, 123, 118, 438, 439, 433,
-        433, 155, 440, 433, 433, 441, 433, 442,
-        435, 437, 437, 123, 118, 438, 439, 433,
-        433, 433, 440, 433, 433, 441, 433, 435,
-        437, 437, 123, 118, 438, 439, 433, 433,
-        433, 440, 433, 433, 441, 433, 443, 433,
-        433, 433, 136, 444, 433, 118, 438, 439,
-        433, 433, 433, 445, 433, 443, 433, 446,
-        447, 448, 449, 123, 118, 438, 439, 433,
-        433, 153, 450, 433, 433, 441, 433, 451,
-        447, 452, 452, 123, 118, 438, 439, 433,
-        433, 433, 450, 433, 433, 441, 433, 447,
-        452, 452, 123, 118, 438, 439, 433, 433,
-        433, 450, 433, 433, 441, 433, 453, 433,
-        433, 433, 136, 454, 433, 118, 438, 439,
-        433, 433, 433, 445, 433, 453, 433, 455,
-        456, 457, 458, 123, 118, 438, 439, 433,
-        433, 151, 459, 433, 433, 441, 433, 460,
-        456, 461, 461, 123, 118, 438, 439, 433,
-        433, 433, 459, 433, 433, 441, 433, 456,
-        461, 461, 123, 118, 438, 439, 433, 433,
-        433, 459, 433, 433, 441, 433, 462, 433,
-        433, 433, 136, 463, 433, 118, 438, 439,
-        433, 433, 433, 445, 433, 462, 433, 464,
-        465, 466, 467, 123, 118, 438, 439, 433,
-        433, 149, 468, 433, 433, 441, 433, 469,
-        465, 470, 470, 123, 118, 438, 439, 433,
-        433, 433, 468, 433, 433, 441, 433, 465,
-        470, 470, 123, 118, 438, 439, 433, 433,
-        433, 468, 433, 433, 441, 433, 471, 433,
-        433, 433, 136, 472, 433, 118, 438, 439,
-        433, 433, 433, 445, 433, 471, 433, 473,
-        474, 475, 476, 123, 118, 438, 439, 433,
-        433, 147, 477, 433, 433, 441, 433, 478,
-        474, 479, 479, 123, 118, 438, 439, 433,
-        433, 433, 477, 433, 433, 441, 433, 474,
-        479, 479, 123, 118, 438, 439, 433, 433,
-        433, 477, 433, 433, 441, 433, 136, 480,
-        433, 118, 438, 439, 433, 433, 433, 445,
-        433, 481, 481, 433, 118, 438, 439, 433,
-        433, 433, 445, 433, 482, 433, 433, 483,
-        438, 439, 433, 438, 439, 433, 484, 433,
-        438, 485, 433, 438, 486, 433, 438, 433,
-        482, 433, 433, 433, 438, 439, 433, 487,
-        433, 488, 489, 433, 118, 438, 439, 433,
-        433, 121, 433, 120, 433, 481, 481, 433,
-        118, 438, 439, 433, 481, 481, 433, 118,
-        438, 439, 433, 487, 433, 481, 481, 433,
-        118, 438, 439, 433, 487, 433, 488, 481,
-        433, 118, 438, 439, 433, 433, 121, 433,
-        136, 433, 490, 490, 123, 118, 438, 439,
-        433, 433, 433, 445, 433, 491, 145, 492,
-        493, 126, 118, 438, 439, 433, 433, 433,
-        445, 433, 145, 492, 493, 126, 118, 438,
-        439, 433, 433, 433, 445, 433, 492, 492,
-        126, 118, 438, 439, 433, 433, 433, 445,
-        433, 494, 142, 495, 496, 129, 118, 438,
-        439, 433, 433, 433, 445, 433, 142, 495,
-        496, 129, 118, 438, 439, 433, 433, 433,
-        445, 433, 495, 495, 129, 118, 438, 439,
-        433, 433, 433, 445, 433, 497, 139, 498,
-        499, 132, 118, 438, 439, 433, 433, 433,
-        445, 433, 139, 498, 499, 132, 118, 438,
-        439, 433, 433, 433, 445, 433, 498, 498,
-        132, 118, 438, 439, 433, 433, 433, 445,
-        433, 500, 136, 481, 501, 433, 118, 438,
-        439, 433, 433, 433, 445, 433, 136, 481,
-        501, 433, 118, 438, 439, 433, 433, 433,
-        445, 433, 481, 502, 433, 118, 438, 439,
-        433, 433, 433, 445, 433, 136, 433, 481,
-        481, 433, 118, 438, 439, 433, 433, 433,
-        445, 433, 119, 120, 433, 433, 136, 480,
-        433, 118, 438, 439, 433, 433, 433, 445,
-        433, 119, 433, 474, 479, 479, 123, 118,
-        438, 439, 433, 433, 433, 477, 433, 473,
-        474, 479, 479, 123, 118, 438, 439, 433,
-        433, 433, 477, 433, 433, 441, 433, 473,
-        474, 475, 479, 123, 118, 438, 439, 433,
-        433, 147, 477, 433, 433, 441, 433, 471,
-        433, 503, 433, 490, 490, 123, 118, 438,
-        439, 433, 433, 433, 445, 433, 471, 433,
-        471, 433, 433, 433, 481, 481, 433, 118,
-        438, 439, 433, 433, 433, 445, 433, 471,
-        433, 471, 433, 433, 433, 481, 504, 433,
-        118, 438, 439, 433, 433, 433, 445, 433,
-        471, 433, 471, 433, 503, 433, 481, 481,
-        433, 118, 438, 439, 433, 433, 433, 445,
-        433, 471, 433, 471, 120, 433, 433, 136,
-        472, 433, 118, 438, 439, 433, 433, 433,
-        445, 433, 471, 433, 464, 465, 470, 470,
-        123, 118, 438, 439, 433, 433, 433, 468,
-        433, 433, 441, 433, 464, 465, 466, 470,
-        123, 118, 438, 439, 433, 433, 149, 468,
-        433, 433, 441, 433, 462, 433, 505, 433,
-        490, 490, 123, 118, 438, 439, 433, 433,
-        433, 445, 433, 462, 433, 462, 433, 433,
-        433, 481, 481, 433, 118, 438, 439, 433,
-        433, 433, 445, 433, 462, 433, 462, 433,
-        433, 433, 481, 506, 433, 118, 438, 439,
-        433, 433, 433, 445, 433, 462, 433, 462,
-        433, 505, 433, 481, 481, 433, 118, 438,
-        439, 433, 433, 433, 445, 433, 462, 433,
-        462, 120, 433, 433, 136, 463, 433, 118,
-        438, 439, 433, 433, 433, 445, 433, 462,
-        433, 455, 456, 461, 461, 123, 118, 438,
-        439, 433, 433, 433, 459, 433, 433, 441,
-        433, 455, 456, 457, 461, 123, 118, 438,
-        439, 433, 433, 151, 459, 433, 433, 441,
-        433, 453, 433, 507, 433, 490, 490, 123,
-        118, 438, 439, 433, 433, 433, 445, 433,
-        453, 433, 453, 433, 433, 433, 481, 481,
-        433, 118, 438, 439, 433, 433, 433, 445,
-        433, 453, 433, 453, 433, 433, 433, 481,
-        508, 433, 118, 438, 439, 433, 433, 433,
-        445, 433, 453, 433, 453, 433, 507, 433,
-        481, 481, 433, 118, 438, 439, 433, 433,
-        433, 445, 433, 453, 433, 453, 120, 433,
-        433, 136, 454, 433, 118, 438, 439, 433,
-        433, 433, 445, 433, 453, 433, 446, 447,
-        452, 452, 123, 118, 438, 439, 433, 433,
-        433, 450, 433, 433, 441, 433, 446, 447,
-        448, 452, 123, 118, 438, 439, 433, 433,
-        153, 450, 433, 433, 441, 433, 443, 433,
-        509, 433, 490, 490, 123, 118, 438, 439,
-        433, 433, 433, 445, 433, 443, 433, 443,
-        433, 433, 433, 481, 481, 433, 118, 438,
-        439, 433, 433, 433, 445, 433, 443, 433,
-        443, 433, 433, 433, 481, 510, 433, 118,
-        438, 439, 433, 433, 433, 445, 433, 443,
-        433, 443, 433, 509, 433, 481, 481, 433,
-        118, 438, 439, 433, 433, 433, 445, 433,
-        443, 433, 443, 120, 433, 433, 136, 444,
-        433, 118, 438, 439, 433, 433, 433, 445,
-        433, 443, 433, 434, 435, 437, 437, 123,
-        118, 438, 439, 433, 433, 433, 440, 433,
-        433, 441, 433, 188, 189, 190, 191, 511,
-        363, 84, 79, 194, 195, 196, 196, 156,
-        197, 361, 188, 200, 361, 204, 512, 206,
-        207, 6, 1, 208, 209, 203, 203, 38,
-        210, 203, 203, 211, 203, 214, 189, 190,
-        191, 513, 514, 84, 157, 515, 516, 203,
-        196, 156, 517, 203, 214, 200, 203, 116,
-        518, 518, 84, 157, 208, 209, 203, 203,
-        156, 519, 203, 520, 203, 203, 521, 515,
-        516, 203, 515, 516, 203, 255, 203, 515,
-        522, 203, 515, 523, 203, 515, 203, 520,
-        203, 203, 203, 515, 516, 203, 524, 3,
-        361, 361, 402, 431, 361, 79, 194, 195,
-        361, 361, 361, 366, 361, 524, 361, 525,
-        368, 526, 527, 84, 157, 515, 516, 203,
-        203, 158, 371, 203, 203, 200, 203, 528,
-        368, 529, 529, 84, 157, 515, 516, 203,
-        203, 203, 371, 203, 203, 200, 203, 368,
-        529, 529, 84, 157, 515, 516, 203, 203,
-        203, 371, 203, 203, 200, 203, 525, 368,
-        529, 529, 84, 157, 515, 516, 203, 203,
-        203, 371, 203, 203, 200, 203, 525, 368,
-        526, 529, 84, 157, 515, 516, 203, 203,
-        158, 371, 203, 203, 200, 203, 214, 203,
-        280, 116, 530, 530, 160, 157, 208, 209,
-        203, 203, 203, 519, 203, 214, 203, 531,
-        184, 532, 533, 162, 157, 515, 516, 203,
-        203, 203, 534, 203, 184, 532, 533, 162,
-        157, 515, 516, 203, 203, 203, 534, 203,
-        532, 532, 162, 157, 515, 516, 203, 203,
-        203, 534, 203, 535, 181, 536, 537, 165,
-        157, 515, 516, 203, 203, 203, 534, 203,
-        181, 536, 537, 165, 157, 515, 516, 203,
-        203, 203, 534, 203, 536, 536, 165, 157,
-        515, 516, 203, 203, 203, 534, 203, 538,
-        178, 539, 540, 168, 157, 515, 516, 203,
-        203, 203, 534, 203, 178, 539, 540, 168,
-        157, 515, 516, 203, 203, 203, 534, 203,
-        539, 539, 168, 157, 515, 516, 203, 203,
-        203, 534, 203, 541, 175, 542, 543, 203,
-        157, 515, 516, 203, 203, 203, 534, 203,
-        175, 542, 543, 203, 157, 515, 516, 203,
-        203, 203, 534, 203, 542, 542, 203, 157,
-        515, 516, 203, 203, 203, 534, 203, 544,
-        203, 545, 546, 203, 157, 515, 516, 203,
-        203, 172, 203, 171, 203, 542, 542, 203,
-        157, 515, 516, 203, 542, 542, 203, 157,
-        515, 516, 203, 544, 203, 542, 542, 203,
-        157, 515, 516, 203, 544, 203, 545, 542,
-        203, 157, 515, 516, 203, 203, 172, 203,
-        524, 171, 361, 361, 98, 365, 361, 79,
-        194, 195, 361, 361, 361, 366, 361, 524,
-        361, 548, 547, 549, 549, 547, 186, 550,
-        551, 547, 549, 549, 547, 186, 550, 551,
-        547, 552, 547, 547, 553, 550, 551, 547,
-        550, 551, 547, 554, 547, 550, 555, 547,
-        550, 556, 547, 550, 547, 552, 547, 547,
-        547, 550, 551, 547, 188, 432, 432, 432,
-        432, 432, 432, 432, 432, 432, 196, 432,
-        432, 432, 432, 188, 432, 0
+        1, 0, 2, 2, 3, 1, 0, 4,
+        4, 3, 0, 3, 0, 5, 5, 6,
+        1, 0, 7, 7, 6, 0, 6, 0,
+        8, 8, 9, 1, 0, 10, 10, 9,
+        0, 9, 0, 11, 11, 12, 1, 0,
+        13, 13, 12, 0, 12, 0, 14, 0,
+        0, 0, 1, 0, 15, 0, 16, 0,
+        17, 11, 11, 12, 1, 0, 18, 0,
+        19, 0, 20, 8, 8, 9, 1, 0,
+        21, 0, 22, 0, 23, 5, 5, 6,
+        1, 0, 24, 0, 25, 0, 26, 2,
+        2, 3, 1, 0, 26, 2, 2, 3,
+        1, 0, 0, 0, 0, 27, 0, 28,
+        2, 2, 3, 1, 0, 28, 2, 2,
+        3, 1, 0, 0, 0, 0, 29, 0,
+        30, 2, 2, 3, 1, 0, 30, 2,
+        2, 3, 1, 0, 0, 0, 0, 31,
+        0, 32, 2, 2, 3, 1, 0, 32,
+        2, 2, 3, 1, 0, 0, 0, 0,
+        33, 0, 34, 2, 2, 3, 1, 0,
+        34, 2, 2, 3, 1, 0, 0, 0,
+        0, 35, 0, 37, 36, 38, 38, 39,
+        37, 36, 40, 40, 39, 36, 39, 36,
+        41, 41, 42, 37, 36, 43, 43, 42,
+        36, 42, 36, 44, 44, 45, 37, 36,
+        46, 46, 45, 36, 45, 36, 47, 47,
+        48, 37, 36, 49, 49, 48, 36, 48,
+        36, 50, 36, 36, 36, 37, 36, 51,
+        36, 52, 36, 53, 47, 47, 48, 37,
+        36, 54, 36, 55, 36, 56, 44, 44,
+        45, 37, 36, 57, 36, 58, 36, 59,
+        41, 41, 42, 37, 36, 60, 36, 61,
+        36, 62, 38, 38, 39, 37, 36, 62,
+        38, 38, 39, 37, 36, 36, 36, 36,
+        63, 36, 64, 38, 38, 39, 37, 36,
+        64, 38, 38, 39, 37, 36, 36, 36,
+        36, 65, 36, 66, 38, 38, 39, 37,
+        36, 66, 38, 38, 39, 37, 36, 36,
+        36, 36, 67, 36, 68, 38, 38, 39,
+        37, 36, 68, 38, 38, 39, 37, 36,
+        36, 36, 36, 69, 36, 70, 38, 38,
+        39, 37, 36, 70, 38, 38, 39, 37,
+        36, 36, 36, 36, 71, 36, 73, 72,
+        74, 74, 75, 73, 72, 77, 77, 75,
+        76, 75, 76, 78, 78, 79, 73, 72,
+        80, 80, 79, 72, 79, 72, 81, 81,
+        82, 73, 72, 83, 83, 82, 72, 82,
+        72, 84, 84, 85, 73, 72, 86, 86,
+        85, 72, 85, 72, 87, 72, 72, 72,
+        73, 72, 88, 72, 89, 72, 90, 84,
+        84, 85, 73, 72, 91, 72, 92, 72,
+        93, 81, 81, 82, 73, 72, 94, 72,
+        95, 72, 96, 78, 78, 79, 73, 72,
+        97, 72, 98, 72, 99, 74, 74, 75,
+        73, 72, 99, 74, 74, 75, 73, 72,
+        72, 72, 72, 100, 72, 101, 74, 74,
+        75, 73, 72, 101, 74, 74, 75, 73,
+        72, 72, 72, 72, 102, 72, 103, 74,
+        74, 75, 73, 72, 103, 74, 74, 75,
+        73, 72, 72, 72, 72, 104, 72, 105,
+        74, 74, 75, 73, 72, 105, 74, 74,
+        75, 73, 72, 72, 72, 72, 106, 72,
+        107, 74, 74, 75, 73, 72, 109, 108,
+        110, 110, 111, 109, 108, 112, 112, 111,
+        108, 111, 108, 113, 113, 114, 109, 108,
+        115, 115, 114, 108, 114, 108, 116, 116,
+        117, 109, 108, 118, 118, 117, 108, 117,
+        108, 119, 119, 120, 109, 108, 121, 121,
+        120, 108, 120, 108, 122, 108, 108, 108,
+        109, 108, 123, 108, 124, 108, 125, 119,
+        119, 120, 109, 108, 126, 108, 127, 108,
+        128, 116, 116, 117, 109, 108, 129, 108,
+        130, 108, 131, 113, 113, 114, 109, 108,
+        132, 108, 133, 108, 134, 110, 110, 111,
+        109, 108, 134, 110, 110, 111, 109, 108,
+        108, 108, 108, 135, 108, 136, 110, 110,
+        111, 109, 108, 136, 110, 110, 111, 109,
+        108, 108, 108, 108, 137, 108, 138, 110,
+        110, 111, 109, 108, 138, 110, 110, 111,
+        109, 108, 108, 108, 108, 139, 108, 140,
+        110, 110, 111, 109, 108, 140, 110, 110,
+        111, 109, 108, 108, 108, 108, 141, 108,
+        142, 110, 110, 111, 109, 108, 142, 110,
+        110, 111, 109, 108, 108, 108, 108, 143,
+        108, 107, 74, 74, 75, 73, 72, 72,
+        72, 72, 144, 72, 77, 77, 75, 1,
+        0, 145, 145, 146, 1, 0, 4, 4,
+        146, 0, 147, 147, 148, 149, 0, 150,
+        150, 148, 0, 148, 0, 151, 151, 152,
+        149, 0, 153, 153, 152, 0, 152, 0,
+        154, 154, 155, 149, 0, 156, 156, 155,
+        0, 155, 0, 149, 0, 157, 0, 0,
+        0, 149, 0, 158, 0, 159, 0, 160,
+        154, 154, 155, 149, 0, 161, 0, 162,
+        0, 163, 151, 151, 152, 149, 0, 164,
+        0, 165, 0, 166, 147, 147, 148, 149,
+        0, 167, 0, 168, 0, 170, 169, 172,
+        173, 174, 175, 176, 177, 75, 73, 171,
+        178, 179, 179, 144, 171, 180, 181, 182,
+        183, 184, 171, 186, 187, 188, 189, 3,
+        1, 185, 190, 185, 185, 35, 185, 185,
+        185, 191, 185, 192, 187, 193, 193, 3,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        185, 191, 185, 187, 193, 193, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 194, 185, 185, 185, 16, 195,
+        185, 1, 185, 190, 185, 185, 185, 185,
+        185, 194, 185, 196, 197, 198, 199, 3,
+        1, 185, 190, 185, 185, 33, 185, 185,
+        185, 191, 185, 200, 197, 201, 201, 3,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        185, 191, 185, 197, 201, 201, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 202, 185, 185, 185, 16, 203,
+        185, 1, 185, 190, 185, 185, 185, 185,
+        185, 202, 185, 204, 205, 206, 207, 3,
+        1, 185, 190, 185, 185, 31, 185, 185,
+        185, 191, 185, 208, 205, 209, 209, 3,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        185, 191, 185, 205, 209, 209, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 210, 185, 185, 185, 16, 211,
+        185, 1, 185, 190, 185, 185, 185, 185,
+        185, 210, 185, 212, 213, 214, 215, 3,
+        1, 185, 190, 185, 185, 29, 185, 185,
+        185, 191, 185, 216, 213, 217, 217, 3,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        185, 191, 185, 213, 217, 217, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 218, 185, 185, 185, 16, 219,
+        185, 1, 185, 190, 185, 185, 185, 185,
+        185, 218, 185, 220, 221, 222, 223, 3,
+        1, 185, 190, 185, 185, 27, 185, 185,
+        185, 191, 185, 224, 221, 225, 225, 3,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        185, 191, 185, 221, 225, 225, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 16, 226, 185, 1, 185, 190,
+        185, 227, 227, 185, 1, 185, 190, 185,
+        228, 185, 185, 229, 185, 190, 185, 190,
+        185, 230, 185, 231, 185, 228, 185, 185,
+        185, 185, 190, 185, 16, 185, 232, 232,
+        3, 1, 185, 190, 185, 233, 25, 234,
+        235, 6, 1, 185, 190, 185, 25, 234,
+        235, 6, 1, 185, 190, 185, 234, 234,
+        6, 1, 185, 190, 185, 236, 22, 237,
+        238, 9, 1, 185, 190, 185, 22, 237,
+        238, 9, 1, 185, 190, 185, 237, 237,
+        9, 1, 185, 190, 185, 239, 19, 240,
+        241, 12, 1, 185, 190, 185, 19, 240,
+        241, 12, 1, 185, 190, 185, 240, 240,
+        12, 1, 185, 190, 185, 242, 16, 227,
+        243, 185, 1, 185, 190, 185, 16, 227,
+        243, 185, 1, 185, 190, 185, 227, 244,
+        185, 1, 185, 190, 185, 16, 185, 227,
+        227, 185, 1, 185, 190, 185, 221, 225,
+        225, 3, 1, 185, 190, 185, 220, 221,
+        225, 225, 3, 1, 185, 190, 185, 185,
+        185, 185, 185, 185, 191, 185, 220, 221,
+        222, 225, 3, 1, 185, 190, 185, 185,
+        27, 185, 185, 185, 191, 185, 218, 185,
+        245, 185, 232, 232, 3, 1, 185, 190,
+        185, 185, 185, 185, 185, 218, 185, 218,
+        185, 185, 185, 227, 227, 185, 1, 185,
+        190, 185, 185, 185, 185, 185, 218, 185,
+        218, 185, 185, 185, 227, 246, 185, 1,
+        185, 190, 185, 185, 185, 185, 185, 218,
+        185, 218, 185, 245, 185, 227, 227, 185,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        218, 185, 212, 213, 217, 217, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 212, 213, 214, 217, 3, 1,
+        185, 190, 185, 185, 29, 185, 185, 185,
+        191, 185, 210, 185, 247, 185, 232, 232,
+        3, 1, 185, 190, 185, 185, 185, 185,
+        185, 210, 185, 210, 185, 185, 185, 227,
+        227, 185, 1, 185, 190, 185, 185, 185,
+        185, 185, 210, 185, 210, 185, 185, 185,
+        227, 248, 185, 1, 185, 190, 185, 185,
+        185, 185, 185, 210, 185, 210, 185, 247,
+        185, 227, 227, 185, 1, 185, 190, 185,
+        185, 185, 185, 185, 210, 185, 204, 205,
+        209, 209, 3, 1, 185, 190, 185, 185,
+        185, 185, 185, 185, 191, 185, 204, 205,
+        206, 209, 3, 1, 185, 190, 185, 185,
+        31, 185, 185, 185, 191, 185, 202, 185,
+        249, 185, 232, 232, 3, 1, 185, 190,
+        185, 185, 185, 185, 185, 202, 185, 202,
+        185, 185, 185, 227, 227, 185, 1, 185,
+        190, 185, 185, 185, 185, 185, 202, 185,
+        202, 185, 185, 185, 227, 250, 185, 1,
+        185, 190, 185, 185, 185, 185, 185, 202,
+        185, 202, 185, 249, 185, 227, 227, 185,
+        1, 185, 190, 185, 185, 185, 185, 185,
+        202, 185, 196, 197, 201, 201, 3, 1,
+        185, 190, 185, 185, 185, 185, 185, 185,
+        191, 185, 196, 197, 198, 201, 3, 1,
+        185, 190, 185, 185, 33, 185, 185, 185,
+        191, 185, 194, 185, 251, 185, 232, 232,
+        3, 1, 185, 190, 185, 185, 185, 185,
+        185, 194, 185, 194, 185, 185, 185, 227,
+        227, 185, 1, 185, 190, 185, 185, 185,
+        185, 185, 194, 185, 194, 185, 185, 185,
+        227, 252, 185, 1, 185, 190, 185, 185,
+        185, 185, 185, 194, 185, 194, 185, 251,
+        185, 227, 227, 185, 1, 185, 190, 185,
+        185, 185, 185, 185, 194, 185, 186, 187,
+        193, 193, 3, 1, 185, 190, 185, 185,
+        185, 185, 185, 185, 191, 185, 186, 187,
+        188, 193, 3, 1, 185, 190, 185, 185,
+        35, 185, 185, 185, 191, 185, 254, 255,
+        256, 257, 39, 37, 253, 258, 253, 253,
+        71, 253, 253, 253, 259, 253, 260, 255,
+        261, 257, 39, 37, 253, 258, 253, 253,
+        253, 253, 253, 253, 259, 253, 255, 261,
+        257, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 262, 253, 253,
+        253, 52, 263, 253, 37, 253, 258, 253,
+        253, 253, 253, 253, 262, 253, 264, 265,
+        266, 267, 39, 37, 253, 258, 253, 253,
+        69, 253, 253, 253, 259, 253, 268, 265,
+        269, 269, 39, 37, 253, 258, 253, 253,
+        253, 253, 253, 253, 259, 253, 265, 269,
+        269, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 270, 253, 253,
+        253, 52, 271, 253, 37, 253, 258, 253,
+        253, 253, 253, 253, 270, 253, 272, 273,
+        274, 275, 39, 37, 253, 258, 253, 253,
+        67, 253, 253, 253, 259, 253, 276, 273,
+        277, 277, 39, 37, 253, 258, 253, 253,
+        253, 253, 253, 253, 259, 253, 273, 277,
+        277, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 278, 253, 253,
+        253, 52, 279, 253, 37, 253, 258, 253,
+        253, 253, 253, 253, 278, 253, 280, 281,
+        282, 283, 39, 37, 253, 258, 253, 253,
+        65, 253, 253, 253, 259, 253, 284, 281,
+        285, 285, 39, 37, 253, 258, 253, 253,
+        253, 253, 253, 253, 259, 253, 281, 285,
+        285, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 286, 253, 253,
+        253, 52, 287, 253, 37, 253, 258, 253,
+        253, 253, 253, 253, 286, 253, 288, 289,
+        290, 291, 39, 37, 253, 258, 253, 253,
+        63, 253, 253, 253, 259, 253, 292, 289,
+        293, 293, 39, 37, 253, 258, 253, 253,
+        253, 253, 253, 253, 259, 253, 289, 293,
+        293, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 52, 294, 253,
+        37, 253, 258, 253, 295, 295, 253, 37,
+        253, 258, 253, 296, 253, 253, 297, 253,
+        258, 253, 258, 253, 298, 253, 299, 253,
+        296, 253, 253, 253, 253, 258, 253, 52,
+        253, 300, 300, 39, 37, 253, 258, 253,
+        301, 61, 302, 303, 42, 37, 253, 258,
+        253, 61, 302, 303, 42, 37, 253, 258,
+        253, 302, 302, 42, 37, 253, 258, 253,
+        304, 58, 305, 306, 45, 37, 253, 258,
+        253, 58, 305, 306, 45, 37, 253, 258,
+        253, 305, 305, 45, 37, 253, 258, 253,
+        307, 55, 308, 309, 48, 37, 253, 258,
+        253, 55, 308, 309, 48, 37, 253, 258,
+        253, 308, 308, 48, 37, 253, 258, 253,
+        310, 52, 295, 311, 253, 37, 253, 258,
+        253, 52, 295, 311, 253, 37, 253, 258,
+        253, 295, 312, 253, 37, 253, 258, 253,
+        52, 253, 295, 295, 253, 37, 253, 258,
+        253, 289, 293, 293, 39, 37, 253, 258,
+        253, 288, 289, 293, 293, 39, 37, 253,
+        258, 253, 253, 253, 253, 253, 253, 259,
+        253, 288, 289, 290, 293, 39, 37, 253,
+        258, 253, 253, 63, 253, 253, 253, 259,
+        253, 286, 253, 313, 253, 300, 300, 39,
+        37, 253, 258, 253, 253, 253, 253, 253,
+        286, 253, 286, 253, 253, 253, 295, 295,
+        253, 37, 253, 258, 253, 253, 253, 253,
+        253, 286, 253, 286, 253, 253, 253, 295,
+        314, 253, 37, 253, 258, 253, 253, 253,
+        253, 253, 286, 253, 286, 253, 313, 253,
+        295, 295, 253, 37, 253, 258, 253, 253,
+        253, 253, 253, 286, 253, 280, 281, 285,
+        285, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 280, 281, 282,
+        285, 39, 37, 253, 258, 253, 253, 65,
+        253, 253, 253, 259, 253, 278, 253, 315,
+        253, 300, 300, 39, 37, 253, 258, 253,
+        253, 253, 253, 253, 278, 253, 278, 253,
+        253, 253, 295, 295, 253, 37, 253, 258,
+        253, 253, 253, 253, 253, 278, 253, 278,
+        253, 253, 253, 295, 316, 253, 37, 253,
+        258, 253, 253, 253, 253, 253, 278, 253,
+        278, 253, 315, 253, 295, 295, 253, 37,
+        253, 258, 253, 253, 253, 253, 253, 278,
+        253, 272, 273, 277, 277, 39, 37, 253,
+        258, 253, 253, 253, 253, 253, 253, 259,
+        253, 272, 273, 274, 277, 39, 37, 253,
+        258, 253, 253, 67, 253, 253, 253, 259,
+        253, 270, 253, 317, 253, 300, 300, 39,
+        37, 253, 258, 253, 253, 253, 253, 253,
+        270, 253, 270, 253, 253, 253, 295, 295,
+        253, 37, 253, 258, 253, 253, 253, 253,
+        253, 270, 253, 270, 253, 253, 253, 295,
+        318, 253, 37, 253, 258, 253, 253, 253,
+        253, 253, 270, 253, 270, 253, 317, 253,
+        295, 295, 253, 37, 253, 258, 253, 253,
+        253, 253, 253, 270, 253, 264, 265, 269,
+        269, 39, 37, 253, 258, 253, 253, 253,
+        253, 253, 253, 259, 253, 264, 265, 266,
+        269, 39, 37, 253, 258, 253, 253, 69,
+        253, 253, 253, 259, 253, 262, 253, 319,
+        253, 300, 300, 39, 37, 253, 258, 253,
+        253, 253, 253, 253, 262, 253, 262, 253,
+        253, 253, 295, 295, 253, 37, 253, 258,
+        253, 253, 253, 253, 253, 262, 253, 262,
+        253, 253, 253, 295, 320, 253, 37, 253,
+        258, 253, 253, 253, 253, 253, 262, 253,
+        262, 253, 319, 253, 295, 295, 253, 37,
+        253, 258, 253, 253, 253, 253, 253, 262,
+        253, 70, 38, 38, 39, 37, 253, 254,
+        255, 261, 257, 39, 37, 253, 258, 253,
+        253, 253, 253, 253, 253, 259, 253, 322,
+        175, 323, 323, 75, 73, 321, 178, 321,
+        321, 321, 321, 321, 321, 182, 321, 175,
+        323, 323, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 324, 321,
+        321, 321, 89, 325, 321, 73, 321, 178,
+        321, 321, 321, 321, 321, 324, 321, 326,
+        327, 328, 329, 75, 73, 321, 178, 321,
+        321, 106, 321, 321, 321, 182, 321, 330,
+        327, 331, 331, 75, 73, 321, 178, 321,
+        321, 321, 321, 321, 321, 182, 321, 327,
+        331, 331, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 332, 321,
+        321, 321, 89, 333, 321, 73, 321, 178,
+        321, 321, 321, 321, 321, 332, 321, 334,
+        335, 336, 337, 75, 73, 321, 178, 321,
+        321, 104, 321, 321, 321, 182, 321, 338,
+        335, 339, 339, 75, 73, 321, 178, 321,
+        321, 321, 321, 321, 321, 182, 321, 335,
+        339, 339, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 340, 321,
+        321, 321, 89, 341, 321, 73, 321, 178,
+        321, 321, 321, 321, 321, 340, 321, 342,
+        343, 344, 345, 75, 73, 321, 178, 321,
+        321, 102, 321, 321, 321, 182, 321, 346,
+        343, 347, 347, 75, 73, 321, 178, 321,
+        321, 321, 321, 321, 321, 182, 321, 343,
+        347, 347, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 348, 321,
+        321, 321, 89, 349, 321, 73, 321, 178,
+        321, 321, 321, 321, 321, 348, 321, 350,
+        351, 352, 353, 75, 73, 321, 178, 321,
+        321, 100, 321, 321, 321, 182, 321, 354,
+        351, 355, 355, 75, 73, 321, 178, 321,
+        321, 321, 321, 321, 321, 182, 321, 351,
+        355, 355, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 89, 356,
+        321, 73, 321, 178, 321, 357, 357, 321,
+        73, 321, 178, 321, 358, 321, 321, 359,
+        321, 178, 321, 178, 321, 360, 321, 361,
+        321, 358, 321, 321, 321, 321, 178, 321,
+        89, 321, 362, 362, 75, 73, 321, 178,
+        321, 363, 98, 364, 365, 79, 73, 321,
+        178, 321, 98, 364, 365, 79, 73, 321,
+        178, 321, 364, 364, 79, 73, 321, 178,
+        321, 366, 95, 367, 368, 82, 73, 321,
+        178, 321, 95, 367, 368, 82, 73, 321,
+        178, 321, 367, 367, 82, 73, 321, 178,
+        321, 369, 92, 370, 371, 85, 73, 321,
+        178, 321, 92, 370, 371, 85, 73, 321,
+        178, 321, 370, 370, 85, 73, 321, 178,
+        321, 372, 89, 357, 373, 321, 73, 321,
+        178, 321, 89, 357, 373, 321, 73, 321,
+        178, 321, 357, 374, 321, 73, 321, 178,
+        321, 89, 321, 357, 357, 321, 73, 321,
+        178, 321, 351, 355, 355, 75, 73, 321,
+        178, 321, 350, 351, 355, 355, 75, 73,
+        321, 178, 321, 321, 321, 321, 321, 321,
+        182, 321, 350, 351, 352, 355, 75, 73,
+        321, 178, 321, 321, 100, 321, 321, 321,
+        182, 321, 348, 321, 375, 321, 362, 362,
+        75, 73, 321, 178, 321, 321, 321, 321,
+        321, 348, 321, 348, 321, 321, 321, 357,
+        357, 321, 73, 321, 178, 321, 321, 321,
+        321, 321, 348, 321, 348, 321, 321, 321,
+        357, 376, 321, 73, 321, 178, 321, 321,
+        321, 321, 321, 348, 321, 348, 321, 375,
+        321, 357, 357, 321, 73, 321, 178, 321,
+        321, 321, 321, 321, 348, 321, 342, 343,
+        347, 347, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 342, 343,
+        344, 347, 75, 73, 321, 178, 321, 321,
+        102, 321, 321, 321, 182, 321, 340, 321,
+        377, 321, 362, 362, 75, 73, 321, 178,
+        321, 321, 321, 321, 321, 340, 321, 340,
+        321, 321, 321, 357, 357, 321, 73, 321,
+        178, 321, 321, 321, 321, 321, 340, 321,
+        340, 321, 321, 321, 357, 378, 321, 73,
+        321, 178, 321, 321, 321, 321, 321, 340,
+        321, 340, 321, 377, 321, 357, 357, 321,
+        73, 321, 178, 321, 321, 321, 321, 321,
+        340, 321, 334, 335, 339, 339, 75, 73,
+        321, 178, 321, 321, 321, 321, 321, 321,
+        182, 321, 334, 335, 336, 339, 75, 73,
+        321, 178, 321, 321, 104, 321, 321, 321,
+        182, 321, 332, 321, 379, 321, 362, 362,
+        75, 73, 321, 178, 321, 321, 321, 321,
+        321, 332, 321, 332, 321, 321, 321, 357,
+        357, 321, 73, 321, 178, 321, 321, 321,
+        321, 321, 332, 321, 332, 321, 321, 321,
+        357, 380, 321, 73, 321, 178, 321, 321,
+        321, 321, 321, 332, 321, 332, 321, 379,
+        321, 357, 357, 321, 73, 321, 178, 321,
+        321, 321, 321, 321, 332, 321, 326, 327,
+        331, 331, 75, 73, 321, 178, 321, 321,
+        321, 321, 321, 321, 182, 321, 326, 327,
+        328, 331, 75, 73, 321, 178, 321, 321,
+        106, 321, 321, 321, 182, 321, 324, 321,
+        381, 321, 362, 362, 75, 73, 321, 178,
+        321, 321, 321, 321, 321, 324, 321, 324,
+        321, 321, 321, 357, 357, 321, 73, 321,
+        178, 321, 321, 321, 321, 321, 324, 321,
+        324, 321, 321, 321, 357, 382, 321, 73,
+        321, 178, 321, 321, 321, 321, 321, 324,
+        321, 324, 321, 381, 321, 357, 357, 321,
+        73, 321, 178, 321, 321, 321, 321, 321,
+        324, 321, 107, 74, 74, 75, 73, 383,
+        383, 383, 383, 144, 383, 174, 175, 323,
+        323, 75, 73, 321, 178, 321, 321, 321,
+        321, 321, 321, 182, 321, 107, 74, 74,
+        75, 73, 383, 385, 386, 387, 388, 111,
+        109, 384, 389, 384, 384, 143, 384, 384,
+        384, 390, 384, 391, 386, 388, 388, 111,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        384, 390, 384, 386, 388, 388, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 392, 384, 384, 384, 124, 393,
+        384, 109, 384, 389, 384, 384, 384, 384,
+        384, 392, 384, 394, 395, 396, 397, 111,
+        109, 384, 389, 384, 384, 141, 384, 384,
+        384, 390, 384, 398, 395, 399, 399, 111,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        384, 390, 384, 395, 399, 399, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 400, 384, 384, 384, 124, 401,
+        384, 109, 384, 389, 384, 384, 384, 384,
+        384, 400, 384, 402, 403, 404, 405, 111,
+        109, 384, 389, 384, 384, 139, 384, 384,
+        384, 390, 384, 406, 403, 407, 407, 111,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        384, 390, 384, 403, 407, 407, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 408, 384, 384, 384, 124, 409,
+        384, 109, 384, 389, 384, 384, 384, 384,
+        384, 408, 384, 410, 411, 412, 413, 111,
+        109, 384, 389, 384, 384, 137, 384, 384,
+        384, 390, 384, 414, 411, 415, 415, 111,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        384, 390, 384, 411, 415, 415, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 416, 384, 384, 384, 124, 417,
+        384, 109, 384, 389, 384, 384, 384, 384,
+        384, 416, 384, 418, 419, 420, 421, 111,
+        109, 384, 389, 384, 384, 135, 384, 384,
+        384, 390, 384, 422, 419, 423, 423, 111,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        384, 390, 384, 419, 423, 423, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 124, 424, 384, 109, 384, 389,
+        384, 425, 425, 384, 109, 384, 389, 384,
+        426, 384, 384, 427, 384, 389, 384, 389,
+        384, 428, 384, 429, 384, 426, 384, 384,
+        384, 384, 389, 384, 124, 384, 430, 430,
+        111, 109, 384, 389, 384, 431, 133, 432,
+        433, 114, 109, 384, 389, 384, 133, 432,
+        433, 114, 109, 384, 389, 384, 432, 432,
+        114, 109, 384, 389, 384, 434, 130, 435,
+        436, 117, 109, 384, 389, 384, 130, 435,
+        436, 117, 109, 384, 389, 384, 435, 435,
+        117, 109, 384, 389, 384, 437, 127, 438,
+        439, 120, 109, 384, 389, 384, 127, 438,
+        439, 120, 109, 384, 389, 384, 438, 438,
+        120, 109, 384, 389, 384, 440, 124, 425,
+        441, 384, 109, 384, 389, 384, 124, 425,
+        441, 384, 109, 384, 389, 384, 425, 442,
+        384, 109, 384, 389, 384, 124, 384, 425,
+        425, 384, 109, 384, 389, 384, 419, 423,
+        423, 111, 109, 384, 389, 384, 418, 419,
+        423, 423, 111, 109, 384, 389, 384, 384,
+        384, 384, 384, 384, 390, 384, 418, 419,
+        420, 423, 111, 109, 384, 389, 384, 384,
+        135, 384, 384, 384, 390, 384, 416, 384,
+        443, 384, 430, 430, 111, 109, 384, 389,
+        384, 384, 384, 384, 384, 416, 384, 416,
+        384, 384, 384, 425, 425, 384, 109, 384,
+        389, 384, 384, 384, 384, 384, 416, 384,
+        416, 384, 384, 384, 425, 444, 384, 109,
+        384, 389, 384, 384, 384, 384, 384, 416,
+        384, 416, 384, 443, 384, 425, 425, 384,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        416, 384, 410, 411, 415, 415, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 410, 411, 412, 415, 111, 109,
+        384, 389, 384, 384, 137, 384, 384, 384,
+        390, 384, 408, 384, 445, 384, 430, 430,
+        111, 109, 384, 389, 384, 384, 384, 384,
+        384, 408, 384, 408, 384, 384, 384, 425,
+        425, 384, 109, 384, 389, 384, 384, 384,
+        384, 384, 408, 384, 408, 384, 384, 384,
+        425, 446, 384, 109, 384, 389, 384, 384,
+        384, 384, 384, 408, 384, 408, 384, 445,
+        384, 425, 425, 384, 109, 384, 389, 384,
+        384, 384, 384, 384, 408, 384, 402, 403,
+        407, 407, 111, 109, 384, 389, 384, 384,
+        384, 384, 384, 384, 390, 384, 402, 403,
+        404, 407, 111, 109, 384, 389, 384, 384,
+        139, 384, 384, 384, 390, 384, 400, 384,
+        447, 384, 430, 430, 111, 109, 384, 389,
+        384, 384, 384, 384, 384, 400, 384, 400,
+        384, 384, 384, 425, 425, 384, 109, 384,
+        389, 384, 384, 384, 384, 384, 400, 384,
+        400, 384, 384, 384, 425, 448, 384, 109,
+        384, 389, 384, 384, 384, 384, 384, 400,
+        384, 400, 384, 447, 384, 425, 425, 384,
+        109, 384, 389, 384, 384, 384, 384, 384,
+        400, 384, 394, 395, 399, 399, 111, 109,
+        384, 389, 384, 384, 384, 384, 384, 384,
+        390, 384, 394, 395, 396, 399, 111, 109,
+        384, 389, 384, 384, 141, 384, 384, 384,
+        390, 384, 392, 384, 449, 384, 430, 430,
+        111, 109, 384, 389, 384, 384, 384, 384,
+        384, 392, 384, 392, 384, 384, 384, 425,
+        425, 384, 109, 384, 389, 384, 384, 384,
+        384, 384, 392, 384, 392, 384, 384, 384,
+        425, 450, 384, 109, 384, 389, 384, 384,
+        384, 384, 384, 392, 384, 392, 384, 449,
+        384, 425, 425, 384, 109, 384, 389, 384,
+        384, 384, 384, 384, 392, 384, 385, 386,
+        388, 388, 111, 109, 384, 389, 384, 384,
+        384, 384, 384, 384, 390, 384, 172, 173,
+        174, 175, 451, 323, 75, 73, 321, 178,
+        179, 179, 144, 321, 321, 172, 182, 321,
+        186, 452, 188, 189, 3, 1, 185, 190,
+        185, 185, 35, 185, 185, 185, 191, 185,
+        194, 173, 174, 175, 453, 454, 75, 149,
+        185, 455, 185, 179, 144, 185, 185, 194,
+        182, 185, 107, 456, 456, 75, 149, 185,
+        190, 185, 185, 144, 185, 457, 185, 185,
+        458, 185, 455, 185, 455, 185, 459, 185,
+        231, 185, 457, 185, 185, 185, 185, 455,
+        185, 194, 185, 251, 107, 460, 460, 146,
+        149, 185, 190, 185, 185, 185, 185, 185,
+        194, 185, 461, 168, 462, 463, 148, 149,
+        185, 455, 185, 168, 462, 463, 148, 149,
+        185, 455, 185, 462, 462, 148, 149, 185,
+        455, 185, 464, 165, 465, 466, 152, 149,
+        185, 455, 185, 165, 465, 466, 152, 149,
+        185, 455, 185, 465, 465, 152, 149, 185,
+        455, 185, 467, 162, 468, 469, 155, 149,
+        185, 455, 185, 162, 468, 469, 155, 149,
+        185, 455, 185, 468, 468, 155, 149, 185,
+        455, 185, 470, 159, 471, 472, 185, 149,
+        185, 455, 185, 159, 471, 472, 185, 149,
+        185, 455, 185, 471, 471, 185, 149, 185,
+        455, 185, 474, 473, 475, 475, 473, 170,
+        473, 476, 473, 475, 475, 473, 170, 473,
+        476, 473, 477, 473, 473, 478, 473, 476,
+        473, 476, 473, 479, 473, 480, 473, 477,
+        473, 473, 473, 473, 476, 473, 172, 383,
+        383, 383, 383, 383, 383, 383, 383, 383,
+        179, 383, 383, 383, 383, 172, 383, 0
 };
 
 static const short _indic_syllable_machine_trans_targs[] = {
-        178, 200, 207, 209, 210, 4, 213, 5,
-        7, 216, 8, 10, 219, 11, 13, 222,
-        14, 16, 17, 199, 19, 20, 221, 22,
-        23, 218, 25, 26, 215, 224, 228, 232,
-        235, 239, 242, 246, 249, 253, 256, 178,
-        279, 286, 288, 289, 41, 292, 42, 44,
-        295, 45, 47, 298, 48, 50, 301, 51,
-        53, 54, 278, 56, 57, 300, 59, 60,
-        297, 62, 63, 294, 303, 307, 311, 314,
-        318, 321, 325, 328, 332, 336, 178, 357,
-        364, 366, 367, 78, 370, 178, 79, 81,
-        373, 82, 84, 376, 85, 87, 379, 88,
-        90, 91, 356, 93, 94, 378, 96, 97,
-        375, 99, 100, 372, 381, 385, 389, 392,
-        396, 399, 403, 406, 410, 178, 437, 444,
-        446, 447, 114, 450, 115, 117, 453, 118,
-        120, 456, 121, 123, 459, 124, 126, 127,
-        436, 129, 130, 458, 132, 133, 455, 135,
-        136, 452, 461, 465, 469, 472, 476, 479,
-        483, 486, 490, 493, 414, 498, 509, 152,
-        512, 154, 515, 155, 157, 518, 158, 160,
-        521, 161, 524, 526, 527, 166, 167, 523,
-        169, 170, 520, 172, 173, 517, 175, 176,
-        514, 178, 532, 178, 179, 258, 337, 339,
-        413, 415, 359, 360, 416, 412, 494, 495,
-        384, 530, 539, 178, 180, 182, 36, 257,
-        202, 203, 255, 227, 181, 35, 183, 251,
-        1, 184, 186, 34, 250, 248, 185, 33,
-        187, 244, 188, 190, 32, 243, 241, 189,
-        31, 191, 237, 192, 194, 30, 236, 234,
-        193, 29, 195, 230, 196, 198, 28, 229,
-        226, 197, 27, 212, 0, 201, 206, 178,
-        204, 205, 208, 2, 211, 3, 214, 6,
-        24, 217, 9, 21, 220, 12, 18, 223,
-        15, 225, 231, 233, 238, 240, 245, 247,
-        252, 254, 178, 259, 261, 73, 334, 281,
-        282, 335, 306, 260, 72, 262, 330, 38,
-        263, 265, 71, 329, 327, 264, 70, 266,
-        323, 267, 269, 69, 322, 320, 268, 68,
-        270, 316, 271, 273, 67, 315, 313, 272,
-        66, 274, 309, 275, 277, 65, 308, 305,
-        276, 64, 291, 37, 280, 285, 178, 283,
-        284, 287, 39, 290, 40, 293, 43, 61,
-        296, 46, 58, 299, 49, 55, 302, 52,
-        304, 310, 312, 317, 319, 324, 326, 331,
-        333, 178, 338, 109, 340, 408, 75, 341,
-        343, 108, 407, 405, 342, 107, 344, 401,
-        345, 347, 106, 400, 398, 346, 105, 348,
-        394, 349, 351, 104, 393, 391, 350, 103,
-        352, 387, 353, 355, 102, 386, 383, 354,
-        101, 369, 74, 358, 363, 178, 361, 362,
-        365, 76, 368, 77, 371, 80, 98, 374,
-        83, 95, 377, 86, 92, 380, 89, 382,
-        388, 390, 395, 397, 402, 404, 409, 411,
-        178, 178, 417, 419, 146, 145, 439, 440,
-        492, 464, 418, 420, 488, 111, 421, 423,
-        144, 487, 485, 422, 143, 424, 481, 425,
-        427, 142, 480, 478, 426, 141, 428, 474,
-        429, 431, 140, 473, 471, 430, 139, 432,
-        467, 433, 435, 138, 466, 463, 434, 137,
-        449, 110, 438, 443, 178, 441, 442, 445,
-        112, 448, 113, 451, 116, 134, 454, 119,
-        131, 457, 122, 128, 460, 125, 462, 468,
-        470, 475, 477, 482, 484, 489, 491, 147,
-        496, 497, 511, 500, 501, 529, 148, 505,
-        499, 504, 502, 503, 506, 507, 150, 510,
-        508, 149, 151, 513, 153, 174, 163, 516,
-        156, 171, 519, 159, 168, 522, 162, 165,
-        525, 164, 528, 178, 531, 177, 534, 535,
-        533, 538, 178, 536, 537
+        166, 188, 2, 194, 3, 5, 197, 6,
+        8, 200, 9, 11, 203, 12, 14, 15,
+        187, 17, 18, 202, 20, 21, 199, 23,
+        24, 196, 205, 208, 212, 214, 218, 220,
+        224, 226, 230, 232, 166, 255, 37, 261,
+        38, 40, 264, 41, 43, 267, 44, 46,
+        270, 47, 49, 50, 254, 52, 53, 269,
+        55, 56, 266, 58, 59, 263, 272, 275,
+        279, 281, 285, 287, 291, 293, 297, 300,
+        166, 321, 72, 327, 166, 73, 75, 330,
+        76, 78, 333, 79, 81, 336, 82, 84,
+        85, 320, 87, 88, 335, 90, 91, 332,
+        93, 94, 329, 338, 341, 345, 347, 351,
+        353, 357, 359, 363, 166, 389, 106, 395,
+        107, 109, 398, 110, 112, 401, 113, 115,
+        404, 116, 118, 119, 388, 121, 122, 403,
+        124, 125, 400, 127, 128, 397, 406, 409,
+        413, 415, 419, 421, 425, 427, 431, 433,
+        366, 142, 444, 144, 447, 438, 145, 147,
+        450, 148, 150, 453, 151, 154, 155, 455,
+        157, 158, 452, 160, 161, 449, 163, 164,
+        446, 166, 458, 166, 167, 234, 301, 303,
+        365, 367, 323, 368, 434, 435, 340, 456,
+        463, 166, 168, 170, 34, 233, 190, 207,
+        169, 33, 171, 228, 172, 174, 32, 227,
+        173, 31, 175, 222, 176, 178, 30, 221,
+        177, 29, 179, 216, 180, 182, 28, 215,
+        181, 27, 183, 210, 184, 186, 26, 209,
+        185, 25, 193, 0, 189, 192, 191, 166,
+        1, 195, 4, 22, 198, 7, 19, 201,
+        10, 16, 204, 13, 206, 211, 213, 217,
+        219, 223, 225, 229, 231, 166, 235, 237,
+        69, 299, 257, 274, 236, 68, 238, 295,
+        239, 241, 67, 294, 240, 66, 242, 289,
+        243, 245, 65, 288, 244, 64, 246, 283,
+        247, 249, 63, 282, 248, 62, 250, 277,
+        251, 253, 61, 276, 252, 60, 260, 35,
+        256, 259, 258, 166, 36, 262, 39, 57,
+        265, 42, 54, 268, 45, 51, 271, 48,
+        273, 278, 280, 284, 286, 290, 292, 296,
+        298, 166, 302, 103, 304, 361, 305, 307,
+        102, 360, 306, 101, 308, 355, 309, 311,
+        100, 354, 310, 99, 312, 349, 313, 315,
+        98, 348, 314, 97, 316, 343, 317, 319,
+        96, 342, 318, 95, 326, 70, 322, 325,
+        324, 166, 71, 328, 74, 92, 331, 77,
+        89, 334, 80, 86, 337, 83, 339, 344,
+        346, 350, 352, 356, 358, 362, 364, 166,
+        166, 369, 371, 138, 137, 391, 408, 370,
+        372, 429, 373, 375, 136, 428, 374, 135,
+        376, 423, 377, 379, 134, 422, 378, 133,
+        380, 417, 381, 383, 132, 416, 382, 131,
+        384, 411, 385, 387, 130, 410, 386, 129,
+        394, 104, 390, 393, 392, 166, 105, 396,
+        108, 126, 399, 111, 123, 402, 114, 120,
+        405, 117, 407, 412, 414, 418, 420, 424,
+        426, 430, 432, 139, 436, 437, 443, 440,
+        140, 439, 442, 441, 141, 445, 143, 162,
+        448, 146, 159, 451, 149, 156, 454, 152,
+        153, 166, 457, 165, 460, 459, 462, 461,
+        166
 };
 
 static const char _indic_syllable_machine_trans_actions[] = {
-        1, 0, 2, 2, 2, 0, 2, 0,
-        0, 2, 0, 0, 2, 0, 0, 2,
-        0, 0, 0, 2, 0, 0, 2, 0,
-        0, 2, 0, 0, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 3,
-        0, 2, 2, 2, 0, 2, 0, 0,
-        2, 0, 0, 2, 0, 0, 2, 0,
-        0, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 0, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 4, 0,
-        2, 2, 2, 0, 2, 5, 0, 0,
-        2, 0, 0, 2, 0, 0, 2, 0,
-        0, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 0, 2, 2, 6, 2, 6,
-        2, 6, 2, 6, 2, 7, 0, 2,
-        2, 2, 0, 2, 0, 0, 2, 0,
+        1, 0, 0, 2, 0, 0, 2, 0,
         0, 2, 0, 0, 2, 0, 0, 0,
         2, 0, 0, 2, 0, 0, 2, 0,
         0, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 6, 0, 8, 0,
-        2, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 2, 2, 2, 0, 0, 2,
+        2, 2, 2, 2, 3, 0, 0, 2,
+        0, 0, 2, 0, 0, 2, 0, 0,
+        2, 0, 0, 0, 2, 0, 0, 2,
+        0, 0, 2, 0, 0, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2,
+        4, 0, 0, 2, 5, 0, 0, 2,
         0, 0, 2, 0, 0, 2, 0, 0,
-        2, 9, 0, 12, 2, 2, 6, 2,
-        13, 13, 0, 0, 2, 2, 6, 2,
-        6, 2, 0, 14, 2, 2, 0, 2,
-        0, 0, 2, 2, 2, 0, 2, 2,
-        0, 2, 2, 0, 2, 2, 2, 0,
-        2, 2, 2, 2, 0, 2, 2, 2,
-        0, 2, 2, 2, 2, 0, 2, 2,
-        2, 0, 2, 2, 2, 2, 0, 2,
-        2, 2, 0, 2, 0, 0, 0, 15,
-        0, 0, 2, 0, 2, 0, 2, 0,
         0, 2, 0, 0, 2, 0, 0, 2,
-        0, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 16, 2, 2, 0, 2, 0,
-        0, 2, 2, 2, 0, 2, 2, 0,
-        2, 2, 0, 2, 2, 2, 0, 2,
-        2, 2, 2, 0, 2, 2, 2, 0,
-        2, 2, 2, 2, 0, 2, 2, 2,
-        0, 2, 2, 2, 2, 0, 2, 2,
-        2, 0, 2, 0, 0, 0, 17, 0,
-        0, 2, 0, 2, 0, 2, 0, 0,
+        0, 0, 2, 2, 6, 2, 6, 2,
+        6, 2, 6, 2, 7, 0, 0, 2,
+        0, 0, 2, 0, 0, 2, 0, 0,
+        2, 0, 0, 0, 2, 0, 0, 2,
+        0, 0, 2, 0, 0, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2,
+        6, 0, 2, 0, 2, 0, 0, 0,
+        2, 0, 0, 2, 0, 0, 0, 2,
+        0, 0, 2, 0, 0, 2, 0, 0,
+        2, 8, 0, 11, 2, 2, 6, 0,
+        12, 12, 0, 2, 6, 2, 6, 2,
+        0, 13, 2, 0, 0, 2, 0, 2,
+        2, 0, 2, 2, 2, 0, 0, 2,
+        2, 0, 2, 2, 2, 0, 0, 2,
+        2, 0, 2, 2, 2, 0, 0, 2,
+        2, 0, 2, 2, 2, 0, 0, 2,
+        2, 0, 2, 0, 0, 0, 0, 14,
+        0, 2, 0, 0, 2, 0, 0, 2,
+        0, 0, 2, 0, 2, 2, 2, 2,
+        2, 2, 2, 2, 2, 15, 2, 0,
+        0, 2, 0, 2, 2, 0, 2, 2,
+        2, 0, 0, 2, 2, 0, 2, 2,
+        2, 0, 0, 2, 2, 0, 2, 2,
+        2, 0, 0, 2, 2, 0, 2, 2,
+        2, 0, 0, 2, 2, 0, 2, 0,
+        0, 0, 0, 16, 0, 2, 0, 0,
         2, 0, 0, 2, 0, 0, 2, 0,
         2, 2, 2, 2, 2, 2, 2, 2,
-        2, 18, 6, 0, 6, 6, 0, 6,
-        2, 0, 6, 2, 6, 0, 6, 6,
-        6, 2, 0, 6, 2, 6, 0, 6,
-        6, 6, 2, 0, 6, 2, 6, 0,
-        6, 6, 6, 2, 0, 6, 2, 6,
-        0, 6, 0, 0, 0, 19, 0, 0,
-        2, 0, 2, 0, 2, 0, 0, 2,
-        0, 0, 2, 0, 0, 2, 0, 2,
-        2, 2, 2, 2, 2, 2, 2, 2,
-        20, 21, 2, 2, 0, 0, 0, 0,
-        2, 2, 2, 2, 2, 0, 2, 2,
-        0, 2, 2, 2, 0, 2, 2, 2,
-        2, 0, 2, 2, 2, 0, 2, 2,
-        2, 2, 0, 2, 2, 2, 0, 2,
-        2, 2, 2, 0, 2, 2, 2, 0,
-        2, 0, 0, 0, 22, 0, 0, 2,
-        0, 2, 0, 2, 0, 0, 2, 0,
+        2, 17, 6, 0, 6, 6, 6, 0,
+        0, 6, 6, 0, 6, 6, 6, 0,
+        0, 6, 6, 0, 6, 6, 6, 0,
+        0, 6, 6, 0, 6, 6, 6, 0,
+        0, 6, 6, 0, 6, 0, 0, 0,
+        0, 18, 0, 2, 0, 0, 2, 0,
         0, 2, 0, 0, 2, 0, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 0,
-        0, 8, 2, 0, 0, 2, 0, 2,
-        0, 0, 0, 0, 8, 8, 0, 8,
-        8, 0, 0, 2, 0, 0, 0, 2,
+        2, 2, 2, 2, 2, 2, 2, 19,
+        20, 2, 0, 0, 0, 0, 2, 2,
+        2, 2, 2, 0, 0, 2, 2, 0,
+        2, 2, 2, 0, 0, 2, 2, 0,
+        2, 2, 2, 0, 0, 2, 2, 0,
+        2, 2, 2, 0, 0, 2, 2, 0,
+        2, 0, 0, 0, 0, 21, 0, 2,
         0, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 2, 23, 2, 0, 0, 0,
-        0, 0, 24, 0, 0
+        2, 0, 2, 2, 2, 2, 2, 2,
+        2, 2, 2, 0, 0, 22, 2, 0,
+        0, 0, 0, 0, 0, 2, 0, 0,
+        2, 0, 0, 2, 0, 0, 2, 0,
+        0, 23, 2, 0, 0, 0, 0, 0,
+        24
 };
 
 static const char _indic_syllable_machine_to_state_actions[] = {
@@ -1157,9 +940,7 @@ static const char _indic_syllable_machine_to_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 10, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 9, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
@@ -1196,15 +977,7 @@ static const char _indic_syllable_machine_to_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const char _indic_syllable_machine_from_state_actions[] = {
@@ -1228,9 +1001,7 @@ static const char _indic_syllable_machine_from_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 11, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 10, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
@@ -1267,15 +1038,7 @@ static const char _indic_syllable_machine_from_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const short _indic_syllable_machine_eof_trans[] = {
@@ -1283,84 +1046,74 @@ static const short _indic_syllable_machine_eof_trans[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 79, 79, 79, 79, 86, 86,
-        79, 79, 79, 79, 79, 79, 79, 79,
-        79, 79, 79, 79, 79, 79, 79, 79,
-        79, 79, 79, 79, 79, 79, 79, 79,
-        79, 79, 79, 79, 79, 79, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 79, 1, 1, 1, 1,
+        1, 1, 1, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 73, 73,
+        77, 77, 73, 73, 73, 73, 73, 73,
+        73, 73, 73, 73, 73, 73, 73, 73,
+        73, 73, 73, 73, 73, 73, 73, 73,
+        73, 73, 73, 73, 73, 73, 73, 73,
+        109, 109, 109, 109, 109, 109, 109, 109,
+        109, 109, 109, 109, 109, 109, 109, 109,
+        109, 109, 109, 109, 109, 109, 109, 109,
+        109, 109, 109, 109, 109, 109, 109, 109,
+        109, 109, 109, 73, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 186, 0, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 283, 283, 283, 283, 283, 283, 283,
-        283, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 362, 362, 362,
-        362, 362, 362, 362, 362, 433, 362, 433,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 434, 434,
-        434, 434, 434, 434, 434, 434, 362, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 362, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 204, 204, 204, 204, 204, 204, 204,
-        204, 362, 548, 548, 548, 548, 548, 548,
-        548, 548, 548, 433
+        1, 1, 1, 1, 1, 170, 0, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 254, 254, 254,
+        254, 254, 254, 254, 254, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 322, 322, 322,
+        322, 322, 322, 322, 322, 384, 322, 384,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 385, 385, 385, 385, 385, 385,
+        385, 385, 322, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        186, 186, 186, 186, 186, 186, 186, 186,
+        474, 474, 474, 474, 474, 474, 474, 384
 };
 
-static const int indic_syllable_machine_start = 178;
-static const int indic_syllable_machine_first_final = 178;
+static const int indic_syllable_machine_start = 166;
+static const int indic_syllable_machine_first_final = 166;
 static const int indic_syllable_machine_error = -1;
 
-static const int indic_syllable_machine_en_main = 178;
+static const int indic_syllable_machine_en_main = 166;
 
 
 #line 36 "hb-ot-shape-complex-indic-machine.rl"
 
 
 
-#line 97 "hb-ot-shape-complex-indic-machine.rl"
+#line 92 "hb-ot-shape-complex-indic-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -1380,7 +1133,7 @@ find_syllables (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 1384 "hb-ot-shape-complex-indic-machine.hh"
+#line 1137 "hb-ot-shape-complex-indic-machine.hh"
         {
         cs = indic_syllable_machine_start;
         ts = 0;
@@ -1388,7 +1141,7 @@ find_syllables (hb_buffer_t *buffer)
         act = 0;
         }
 
-#line 118 "hb-ot-shape-complex-indic-machine.rl"
+#line 113 "hb-ot-shape-complex-indic-machine.rl"
 
 
   p = 0;
@@ -1397,7 +1150,7 @@ find_syllables (hb_buffer_t *buffer)
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
 
-#line 1401 "hb-ot-shape-complex-indic-machine.hh"
+#line 1154 "hb-ot-shape-complex-indic-machine.hh"
         {
         int _slen;
         int _trans;
@@ -1407,11 +1160,11 @@ find_syllables (hb_buffer_t *buffer)
                 goto _test_eof;
 _resume:
         switch ( _indic_syllable_machine_from_state_actions[cs] ) {
-        case 11:
+        case 10:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 1415 "hb-ot-shape-complex-indic-machine.hh"
+#line 1168 "hb-ot-shape-complex-indic-machine.hh"
         }
 
         _keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -1433,72 +1186,72 @@ _eof_trans:
 #line 1 "NONE"
         {te = p+1;}
         break;
-        case 15:
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+        case 14:
+#line 83 "hb-ot-shape-complex-indic-machine.rl"
         {te = p+1;{ found_syllable (consonant_syllable); }}
         break;
-        case 17:
-#line 89 "hb-ot-shape-complex-indic-machine.rl"
+        case 16:
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
         {te = p+1;{ found_syllable (vowel_syllable); }}
         break;
-        case 22:
-#line 90 "hb-ot-shape-complex-indic-machine.rl"
+        case 21:
+#line 85 "hb-ot-shape-complex-indic-machine.rl"
         {te = p+1;{ found_syllable (standalone_cluster); }}
         break;
         case 24:
-#line 91 "hb-ot-shape-complex-indic-machine.rl"
+#line 86 "hb-ot-shape-complex-indic-machine.rl"
         {te = p+1;{ found_syllable (symbol_cluster); }}
         break;
-        case 19:
-#line 92 "hb-ot-shape-complex-indic-machine.rl"
+        case 18:
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
         {te = p+1;{ found_syllable (broken_cluster); }}
         break;
-        case 12:
-#line 93 "hb-ot-shape-complex-indic-machine.rl"
+        case 11:
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
         {te = p+1;{ found_syllable (non_indic_cluster); }}
         break;
-        case 14:
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+        case 13:
+#line 83 "hb-ot-shape-complex-indic-machine.rl"
         {te = p;p--;{ found_syllable (consonant_syllable); }}
         break;
-        case 16:
-#line 89 "hb-ot-shape-complex-indic-machine.rl"
+        case 15:
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
         {te = p;p--;{ found_syllable (vowel_syllable); }}
         break;
-        case 21:
-#line 90 "hb-ot-shape-complex-indic-machine.rl"
+        case 20:
+#line 85 "hb-ot-shape-complex-indic-machine.rl"
         {te = p;p--;{ found_syllable (standalone_cluster); }}
         break;
         case 23:
-#line 91 "hb-ot-shape-complex-indic-machine.rl"
+#line 86 "hb-ot-shape-complex-indic-machine.rl"
         {te = p;p--;{ found_syllable (symbol_cluster); }}
         break;
-        case 18:
-#line 92 "hb-ot-shape-complex-indic-machine.rl"
+        case 17:
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
         {te = p;p--;{ found_syllable (broken_cluster); }}
         break;
-        case 20:
-#line 93 "hb-ot-shape-complex-indic-machine.rl"
+        case 19:
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
         {te = p;p--;{ found_syllable (non_indic_cluster); }}
         break;
         case 1:
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+#line 83 "hb-ot-shape-complex-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (consonant_syllable); }}
         break;
         case 3:
-#line 89 "hb-ot-shape-complex-indic-machine.rl"
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (vowel_syllable); }}
         break;
         case 7:
-#line 90 "hb-ot-shape-complex-indic-machine.rl"
+#line 85 "hb-ot-shape-complex-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (standalone_cluster); }}
         break;
-        case 9:
-#line 91 "hb-ot-shape-complex-indic-machine.rl"
+        case 8:
+#line 86 "hb-ot-shape-complex-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (symbol_cluster); }}
         break;
         case 4:
-#line 92 "hb-ot-shape-complex-indic-machine.rl"
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (broken_cluster); }}
         break;
         case 5:
@@ -1516,34 +1269,34 @@ _eof_trans:
         }
         }
         break;
-        case 8:
+        case 22:
 #line 1 "NONE"
         {te = p+1;}
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+#line 83 "hb-ot-shape-complex-indic-machine.rl"
         {act = 1;}
         break;
         case 6:
 #line 1 "NONE"
         {te = p+1;}
-#line 92 "hb-ot-shape-complex-indic-machine.rl"
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
         {act = 5;}
         break;
-        case 13:
+        case 12:
 #line 1 "NONE"
         {te = p+1;}
-#line 93 "hb-ot-shape-complex-indic-machine.rl"
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
         {act = 6;}
         break;
-#line 1538 "hb-ot-shape-complex-indic-machine.hh"
+#line 1291 "hb-ot-shape-complex-indic-machine.hh"
         }
 
 _again:
         switch ( _indic_syllable_machine_to_state_actions[cs] ) {
-        case 10:
+        case 9:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 1547 "hb-ot-shape-complex-indic-machine.hh"
+#line 1300 "hb-ot-shape-complex-indic-machine.hh"
         }
 
         if ( ++p != pe )
@@ -1559,7 +1312,7 @@ _again:
 
         }
 
-#line 127 "hb-ot-shape-complex-indic-machine.rl"
+#line 122 "hb-ot-shape-complex-indic-machine.rl"
 
 }
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh
index a94235aea0d..60e680c1d25 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh
@@ -34,6 +34,11 @@
 #include "hb-ot-shape-private.hh" /* XXX Remove */
 
 
+/* buffer var allocations */
+#define indic_category() complex_var_u8_0() /* indic_category_t */
+#define indic_position() complex_var_u8_1() /* indic_position_t */
+
+
 #define INDIC_TABLE_ELEMENT_TYPE uint16_t
 
 /* Cateories used in the OpenType spec:
@@ -51,7 +56,7 @@ enum indic_category_t {
   OT_ZWJ = 6,
   OT_M = 7,
   OT_SM = 8,
-  OT_VD = 9,
+  /* OT_VD = 9, UNUSED; we use OT_A instead. */
   OT_A = 10,
   OT_PLACEHOLDER = 11,
   OT_DOTTEDCIRCLE = 12,
@@ -73,34 +78,33 @@ enum indic_category_t {
  * consonant syllable logic from the vowel syllable function and get it all right! */
 #define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | MEDIAL_FLAGS | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE))
 #define JOINER_FLAGS (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ))
-#define HALANT_OR_COENG_FLAGS (FLAG (OT_H) | FLAG (OT_Coeng))
 
 
 /* Visual positions in a syllable from left to right. */
 enum indic_position_t {
-  POS_START,
+  POS_START = 0,
 
-  POS_RA_TO_BECOME_REPH,
-  POS_PRE_M,
-  POS_PRE_C,
+  POS_RA_TO_BECOME_REPH = 1,
+  POS_PRE_M = 2,
+  POS_PRE_C = 3,
 
-  POS_BASE_C,
-  POS_AFTER_MAIN,
+  POS_BASE_C = 4,
+  POS_AFTER_MAIN = 5,
 
-  POS_ABOVE_C,
+  POS_ABOVE_C = 6,
 
-  POS_BEFORE_SUB,
-  POS_BELOW_C,
-  POS_AFTER_SUB,
+  POS_BEFORE_SUB = 7,
+  POS_BELOW_C = 8,
+  POS_AFTER_SUB = 9,
 
-  POS_BEFORE_POST,
-  POS_POST_C,
-  POS_AFTER_POST,
+  POS_BEFORE_POST = 10,
+  POS_POST_C = 11,
+  POS_AFTER_POST = 12,
 
-  POS_FINAL_C,
-  POS_SMVD,
+  POS_FINAL_C = 13,
+  POS_SMVD = 14,
 
-  POS_END
+  POS_END = 15
 };
 
 /* Categories used in IndicSyllabicCategory.txt from UCD. */
@@ -123,7 +127,7 @@ enum indic_syllabic_category_t {
   INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED           = OT_CM,
   INDIC_SYLLABIC_CATEGORY_CONSONANT_SUCCEEDING_REPHA    = OT_N,
   INDIC_SYLLABIC_CATEGORY_CONSONANT_WITH_STACKER        = OT_CS,
-  INDIC_SYLLABIC_CATEGORY_GEMINATION_MARK               = OT_SM, /* https://github.com/behdad/harfbuzz/issues/552 */
+  INDIC_SYLLABIC_CATEGORY_GEMINATION_MARK               = OT_SM, /* https://github.com/harfbuzz/harfbuzz/issues/552 */
   INDIC_SYLLABIC_CATEGORY_INVISIBLE_STACKER             = OT_Coeng,
   INDIC_SYLLABIC_CATEGORY_JOINER                        = OT_ZWJ,
   INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER              = OT_X,
@@ -187,4 +191,211 @@ enum indic_matra_category_t {
 HB_INTERNAL INDIC_TABLE_ELEMENT_TYPE
 hb_indic_get_categories (hb_codepoint_t u);
 
+
+static inline bool
+is_one_of (const hb_glyph_info_t &info, unsigned int flags)
+{
+  /* If it ligated, all bets are off. */
+  if (_hb_glyph_info_ligated (&info)) return false;
+  return !!(FLAG_UNSAFE (info.indic_category()) & flags);
+}
+
+static inline bool
+is_joiner (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, JOINER_FLAGS);
+}
+
+static inline bool
+is_consonant (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, CONSONANT_FLAGS);
+}
+
+static inline bool
+is_halant (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, FLAG (OT_H));
+}
+
+#define IN_HALF_BLOCK(u, Base) (((u) & ~0x7Fu) == (Base))
+
+#define IS_DEVA(u) (IN_HALF_BLOCK (u, 0x0900u))
+#define IS_BENG(u) (IN_HALF_BLOCK (u, 0x0980u))
+#define IS_GURU(u) (IN_HALF_BLOCK (u, 0x0A00u))
+#define IS_GUJR(u) (IN_HALF_BLOCK (u, 0x0A80u))
+#define IS_ORYA(u) (IN_HALF_BLOCK (u, 0x0B00u))
+#define IS_TAML(u) (IN_HALF_BLOCK (u, 0x0B80u))
+#define IS_TELU(u) (IN_HALF_BLOCK (u, 0x0C00u))
+#define IS_KNDA(u) (IN_HALF_BLOCK (u, 0x0C80u))
+#define IS_MLYM(u) (IN_HALF_BLOCK (u, 0x0D00u))
+#define IS_SINH(u) (IN_HALF_BLOCK (u, 0x0D80u))
+
+
+#define MATRA_POS_LEFT(u)       POS_PRE_M
+#define MATRA_POS_RIGHT(u)      ( \
+                                  IS_DEVA(u) ? POS_AFTER_SUB  : \
+                                  IS_BENG(u) ? POS_AFTER_POST : \
+                                  IS_GURU(u) ? POS_AFTER_POST : \
+                                  IS_GUJR(u) ? POS_AFTER_POST : \
+                                  IS_ORYA(u) ? POS_AFTER_POST : \
+                                  IS_TAML(u) ? POS_AFTER_POST : \
+                                  IS_TELU(u) ? (u <= 0x0C42u ? POS_BEFORE_SUB : POS_AFTER_SUB) : \
+                                  IS_KNDA(u) ? (u < 0x0CC3u || u > 0xCD6u ? POS_BEFORE_SUB : POS_AFTER_SUB) : \
+                                  IS_MLYM(u) ? POS_AFTER_POST : \
+                                  IS_SINH(u) ? POS_AFTER_SUB  : \
+                                  /*default*/  POS_AFTER_SUB    \
+                                )
+#define MATRA_POS_TOP(u)        ( /* BENG and MLYM don't have top matras. */ \
+                                  IS_DEVA(u) ? POS_AFTER_SUB  : \
+                                  IS_GURU(u) ? POS_AFTER_POST : /* Deviate from spec */ \
+                                  IS_GUJR(u) ? POS_AFTER_SUB  : \
+                                  IS_ORYA(u) ? POS_AFTER_MAIN : \
+                                  IS_TAML(u) ? POS_AFTER_SUB  : \
+                                  IS_TELU(u) ? POS_BEFORE_SUB : \
+                                  IS_KNDA(u) ? POS_BEFORE_SUB : \
+                                  IS_SINH(u) ? POS_AFTER_SUB  : \
+                                  /*default*/  POS_AFTER_SUB    \
+                                )
+#define MATRA_POS_BOTTOM(u)     ( \
+                                  IS_DEVA(u) ? POS_AFTER_SUB  : \
+                                  IS_BENG(u) ? POS_AFTER_SUB  : \
+                                  IS_GURU(u) ? POS_AFTER_POST : \
+                                  IS_GUJR(u) ? POS_AFTER_POST : \
+                                  IS_ORYA(u) ? POS_AFTER_SUB  : \
+                                  IS_TAML(u) ? POS_AFTER_POST : \
+                                  IS_TELU(u) ? POS_BEFORE_SUB : \
+                                  IS_KNDA(u) ? POS_BEFORE_SUB : \
+                                  IS_MLYM(u) ? POS_AFTER_POST : \
+                                  IS_SINH(u) ? POS_AFTER_SUB  : \
+                                  /*default*/  POS_AFTER_SUB    \
+                                )
+
+static inline indic_position_t
+matra_position_indic (hb_codepoint_t u, indic_position_t side)
+{
+  switch ((int) side)
+  {
+    case POS_PRE_C:     return MATRA_POS_LEFT (u);
+    case POS_POST_C:    return MATRA_POS_RIGHT (u);
+    case POS_ABOVE_C:   return MATRA_POS_TOP (u);
+    case POS_BELOW_C:   return MATRA_POS_BOTTOM (u);
+  };
+  return side;
+}
+
+/* XXX
+ * This is a hack for now.  We should move this data into the main Indic table.
+ * Or completely remove it and just check in the tables.
+ */
+static const hb_codepoint_t ra_chars[] = {
+  0x0930u, /* Devanagari */
+  0x09B0u, /* Bengali */
+  0x09F0u, /* Bengali */
+  0x0A30u, /* Gurmukhi */       /* No Reph */
+  0x0AB0u, /* Gujarati */
+  0x0B30u, /* Oriya */
+  0x0BB0u, /* Tamil */          /* No Reph */
+  0x0C30u, /* Telugu */         /* Reph formed only with ZWJ */
+  0x0CB0u, /* Kannada */
+  0x0D30u, /* Malayalam */      /* No Reph, Logical Repha */
+
+  0x0DBBu, /* Sinhala */                /* Reph formed only with ZWJ */
+};
+
+static inline bool
+is_ra (hb_codepoint_t u)
+{
+  for (unsigned int i = 0; i < ARRAY_LENGTH (ra_chars); i++)
+    if (u == ra_chars[i])
+      return true;
+  return false;
+}
+
+static inline void
+set_indic_properties (hb_glyph_info_t &info)
+{
+  hb_codepoint_t u = info.codepoint;
+  unsigned int type = hb_indic_get_categories (u);
+  indic_category_t cat = (indic_category_t) (type & 0x7Fu);
+  indic_position_t pos = (indic_position_t) (type >> 8);
+
+
+  /*
+   * Re-assign category
+   */
+
+  /* The following act more like the Bindus. */
+  if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x0953u, 0x0954u)))
+    cat = OT_SM;
+  /* The following act like consonants. */
+  else if (unlikely (hb_in_ranges<hb_codepoint_t> (u, 0x0A72u, 0x0A73u,
+                                      0x1CF5u, 0x1CF6u)))
+    cat = OT_C;
+  /* TODO: The following should only be allowed after a Visarga.
+   * For now, just treat them like regular tone marks. */
+  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1CE2u, 0x1CE8u)))
+    cat = OT_A;
+  /* TODO: The following should only be allowed after some of
+   * the nasalization marks, maybe only for U+1CE9..U+1CF1.
+   * For now, just treat them like tone marks. */
+  else if (unlikely (u == 0x1CEDu))
+    cat = OT_A;
+  /* The following take marks in standalone clusters, similar to Avagraha. */
+  else if (unlikely (hb_in_ranges<hb_codepoint_t> (u, 0xA8F2u, 0xA8F7u,
+                                      0x1CE9u, 0x1CECu,
+                                      0x1CEEu, 0x1CF1u)))
+  {
+    cat = OT_Symbol;
+    static_assert (((int) INDIC_SYLLABIC_CATEGORY_AVAGRAHA == OT_Symbol), "");
+  }
+  else if (unlikely (u == 0x0A51u))
+  {
+    /* https://github.com/harfbuzz/harfbuzz/issues/524 */
+    cat = OT_M;
+    pos = POS_BELOW_C;
+  }
+
+  /* According to ScriptExtensions.txt, these Grantha marks may also be used in Tamil,
+   * so the Indic shaper needs to know their categories. */
+  else if (unlikely (u == 0x11301u || u == 0x11303u)) cat = OT_SM;
+  else if (unlikely (u == 0x1133cu)) cat = OT_N;
+
+  else if (unlikely (u == 0x0AFBu)) cat = OT_N; /* https://github.com/harfbuzz/harfbuzz/issues/552 */
+
+  else if (unlikely (u == 0x0980u)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/issues/538 */
+  else if (unlikely (u == 0x0C80u)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/pull/623 */
+  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x2010u, 0x2011u)))
+                                    cat = OT_PLACEHOLDER;
+  else if (unlikely (u == 0x25CCu)) cat = OT_DOTTEDCIRCLE;
+
+
+  /*
+   * Re-assign position.
+   */
+
+  if ((FLAG_UNSAFE (cat) & CONSONANT_FLAGS))
+  {
+    pos = POS_BASE_C;
+    if (is_ra (u))
+      cat = OT_Ra;
+  }
+  else if (cat == OT_M)
+  {
+    pos = matra_position_indic (u, pos);
+  }
+  else if ((FLAG_UNSAFE (cat) & (FLAG (OT_SM) /* | FLAG (OT_VD) */ | FLAG (OT_A) | FLAG (OT_Symbol))))
+  {
+    pos = POS_SMVD;
+  }
+
+  if (unlikely (u == 0x0B01u)) pos = POS_BEFORE_SUB; /* Oriya Bindu is BeforeSub in the spec. */
+
+
+
+  info.indic_category() = cat;
+  info.indic_position() = pos;
+}
+
+
 #endif /* HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc
index 35e970a6421..0359c1857b1 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc
@@ -399,10 +399,10 @@ hb_indic_get_categories (hb_codepoint_t u)
   switch (u >> 12)
   {
     case 0x0u:
+      if (unlikely (u == 0x00A0u)) return _(CP,x);
       if (hb_in_range<hb_codepoint_t> (u, 0x0028u, 0x003Fu)) return indic_table[u - 0x0028u + indic_offset_0x0028u];
       if (hb_in_range<hb_codepoint_t> (u, 0x00B0u, 0x00D7u)) return indic_table[u - 0x00B0u + indic_offset_0x00b0u];
       if (hb_in_range<hb_codepoint_t> (u, 0x0900u, 0x0DF7u)) return indic_table[u - 0x0900u + indic_offset_0x0900u];
-      if (unlikely (u == 0x00A0u)) return _(CP,x);
       break;
 
     case 0x1u:
@@ -412,9 +412,9 @@ hb_indic_get_categories (hb_codepoint_t u)
       break;
 
     case 0x2u:
+      if (unlikely (u == 0x25CCu)) return _(CP,x);
       if (hb_in_range<hb_codepoint_t> (u, 0x2008u, 0x2017u)) return indic_table[u - 0x2008u + indic_offset_0x2008u];
       if (hb_in_range<hb_codepoint_t> (u, 0x2070u, 0x2087u)) return indic_table[u - 0x2070u + indic_offset_0x2070u];
-      if (unlikely (u == 0x25CCu)) return _(CP,x);
       break;
 
     case 0xAu:
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc
index b22b0d4383a..69c36b05b58 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc
@@ -27,240 +27,12 @@
 #include "hb-ot-shape-complex-indic-private.hh"
 #include "hb-ot-layout-private.hh"
 
-/* buffer var allocations */
-#define indic_category() complex_var_u8_0() /* indic_category_t */
-#define indic_position() complex_var_u8_1() /* indic_position_t */
-
 
 /*
  * Indic shaper.
  */
 
 
-#define IN_HALF_BLOCK(u, Base) (((u) & ~0x7Fu) == (Base))
-
-#define IS_DEVA(u) (IN_HALF_BLOCK (u, 0x0900u))
-#define IS_BENG(u) (IN_HALF_BLOCK (u, 0x0980u))
-#define IS_GURU(u) (IN_HALF_BLOCK (u, 0x0A00u))
-#define IS_GUJR(u) (IN_HALF_BLOCK (u, 0x0A80u))
-#define IS_ORYA(u) (IN_HALF_BLOCK (u, 0x0B00u))
-#define IS_TAML(u) (IN_HALF_BLOCK (u, 0x0B80u))
-#define IS_TELU(u) (IN_HALF_BLOCK (u, 0x0C00u))
-#define IS_KNDA(u) (IN_HALF_BLOCK (u, 0x0C80u))
-#define IS_MLYM(u) (IN_HALF_BLOCK (u, 0x0D00u))
-#define IS_SINH(u) (IN_HALF_BLOCK (u, 0x0D80u))
-#define IS_KHMR(u) (IN_HALF_BLOCK (u, 0x1780u))
-
-
-#define MATRA_POS_LEFT(u)       POS_PRE_M
-#define MATRA_POS_RIGHT(u)      ( \
-                                  IS_DEVA(u) ? POS_AFTER_SUB  : \
-                                  IS_BENG(u) ? POS_AFTER_POST : \
-                                  IS_GURU(u) ? POS_AFTER_POST : \
-                                  IS_GUJR(u) ? POS_AFTER_POST : \
-                                  IS_ORYA(u) ? POS_AFTER_POST : \
-                                  IS_TAML(u) ? POS_AFTER_POST : \
-                                  IS_TELU(u) ? (u <= 0x0C42u ? POS_BEFORE_SUB : POS_AFTER_SUB) : \
-                                  IS_KNDA(u) ? (u < 0x0CC3u || u > 0xCD6u ? POS_BEFORE_SUB : POS_AFTER_SUB) : \
-                                  IS_MLYM(u) ? POS_AFTER_POST : \
-                                  IS_SINH(u) ? POS_AFTER_SUB  : \
-                                  IS_KHMR(u) ? POS_AFTER_POST : \
-                                  /*default*/  POS_AFTER_SUB    \
-                                )
-#define MATRA_POS_TOP(u)        ( /* BENG and MLYM don't have top matras. */ \
-                                  IS_DEVA(u) ? POS_AFTER_SUB  : \
-                                  IS_GURU(u) ? POS_AFTER_POST : /* Deviate from spec */ \
-                                  IS_GUJR(u) ? POS_AFTER_SUB  : \
-                                  IS_ORYA(u) ? POS_AFTER_MAIN : \
-                                  IS_TAML(u) ? POS_AFTER_SUB  : \
-                                  IS_TELU(u) ? POS_BEFORE_SUB : \
-                                  IS_KNDA(u) ? POS_BEFORE_SUB : \
-                                  IS_SINH(u) ? POS_AFTER_SUB  : \
-                                  IS_KHMR(u) ? POS_AFTER_POST : \
-                                  /*default*/  POS_AFTER_SUB    \
-                                )
-#define MATRA_POS_BOTTOM(u)     ( \
-                                  IS_DEVA(u) ? POS_AFTER_SUB  : \
-                                  IS_BENG(u) ? POS_AFTER_SUB  : \
-                                  IS_GURU(u) ? POS_AFTER_POST : \
-                                  IS_GUJR(u) ? POS_AFTER_POST : \
-                                  IS_ORYA(u) ? POS_AFTER_SUB  : \
-                                  IS_TAML(u) ? POS_AFTER_POST : \
-                                  IS_TELU(u) ? POS_BEFORE_SUB : \
-                                  IS_KNDA(u) ? POS_BEFORE_SUB : \
-                                  IS_MLYM(u) ? POS_AFTER_POST : \
-                                  IS_SINH(u) ? POS_AFTER_SUB  : \
-                                  IS_KHMR(u) ? POS_AFTER_POST : \
-                                  /*default*/  POS_AFTER_SUB    \
-                                )
-
-static inline indic_position_t
-matra_position (hb_codepoint_t u, indic_position_t side)
-{
-  switch ((int) side)
-  {
-    case POS_PRE_C:     return MATRA_POS_LEFT (u);
-    case POS_POST_C:    return MATRA_POS_RIGHT (u);
-    case POS_ABOVE_C:   return MATRA_POS_TOP (u);
-    case POS_BELOW_C:   return MATRA_POS_BOTTOM (u);
-  };
-  return side;
-}
-
-/* XXX
- * This is a hack for now.  We should move this data into the main Indic table.
- * Or completely remove it and just check in the tables.
- */
-static const hb_codepoint_t ra_chars[] = {
-  0x0930u, /* Devanagari */
-  0x09B0u, /* Bengali */
-  0x09F0u, /* Bengali */
-  0x0A30u, /* Gurmukhi */       /* No Reph */
-  0x0AB0u, /* Gujarati */
-  0x0B30u, /* Oriya */
-  0x0BB0u, /* Tamil */          /* No Reph */
-  0x0C30u, /* Telugu */         /* Reph formed only with ZWJ */
-  0x0CB0u, /* Kannada */
-  0x0D30u, /* Malayalam */      /* No Reph, Logical Repha */
-
-  0x0DBBu, /* Sinhala */                /* Reph formed only with ZWJ */
-
-  0x179Au, /* Khmer */          /* No Reph, Visual Repha */
-};
-
-static inline bool
-is_ra (hb_codepoint_t u)
-{
-  for (unsigned int i = 0; i < ARRAY_LENGTH (ra_chars); i++)
-    if (u == ra_chars[i])
-      return true;
-  return false;
-}
-
-static inline bool
-is_one_of (const hb_glyph_info_t &info, unsigned int flags)
-{
-  /* If it ligated, all bets are off. */
-  if (_hb_glyph_info_ligated (&info)) return false;
-  return !!(FLAG_UNSAFE (info.indic_category()) & flags);
-}
-
-static inline bool
-is_joiner (const hb_glyph_info_t &info)
-{
-  return is_one_of (info, JOINER_FLAGS);
-}
-
-static inline bool
-is_consonant (const hb_glyph_info_t &info)
-{
-  return is_one_of (info, CONSONANT_FLAGS);
-}
-
-static inline bool
-is_halant_or_coeng (const hb_glyph_info_t &info)
-{
-  return is_one_of (info, HALANT_OR_COENG_FLAGS);
-}
-
-static inline void
-set_indic_properties (hb_glyph_info_t &info)
-{
-  hb_codepoint_t u = info.codepoint;
-  unsigned int type = hb_indic_get_categories (u);
-  indic_category_t cat = (indic_category_t) (type & 0x7Fu);
-  indic_position_t pos = (indic_position_t) (type >> 8);
-
-
-  /*
-   * Re-assign category
-   */
-
-  /* The following act more like the Bindus. */
-  if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x0953u, 0x0954u)))
-    cat = OT_SM;
-  /* The following act like consonants. */
-  else if (unlikely (hb_in_ranges<hb_codepoint_t> (u, 0x0A72u, 0x0A73u,
-                                      0x1CF5u, 0x1CF6u)))
-    cat = OT_C;
-  /* TODO: The following should only be allowed after a Visarga.
-   * For now, just treat them like regular tone marks. */
-  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1CE2u, 0x1CE8u)))
-    cat = OT_A;
-  /* TODO: The following should only be allowed after some of
-   * the nasalization marks, maybe only for U+1CE9..U+1CF1.
-   * For now, just treat them like tone marks. */
-  else if (unlikely (u == 0x1CEDu))
-    cat = OT_A;
-  /* The following take marks in standalone clusters, similar to Avagraha. */
-  else if (unlikely (hb_in_ranges<hb_codepoint_t> (u, 0xA8F2u, 0xA8F7u,
-                                      0x1CE9u, 0x1CECu,
-                                      0x1CEEu, 0x1CF1u)))
-  {
-    cat = OT_Symbol;
-    static_assert (((int) INDIC_SYLLABIC_CATEGORY_AVAGRAHA == OT_Symbol), "");
-  }
-  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x17CDu, 0x17D1u) ||
-                     u == 0x17CBu || u == 0x17D3u || u == 0x17DDu)) /* Khmer Various signs */
-  {
-    /* These can occur mid-syllable (eg. before matras), even though Unicode marks them as Syllable_Modifier.
-     * https://github.com/roozbehp/unicode-data/issues/5 */
-    cat = OT_M;
-    pos = POS_ABOVE_C;
-  }
-  else if (unlikely (u == 0x0A51u))
-  {
-    /* https://github.com/behdad/harfbuzz/issues/524 */
-    cat = OT_M;
-    pos = POS_BELOW_C;
-  }
-
-  /* According to ScriptExtensions.txt, these Grantha marks may also be used in Tamil,
-   * so the Indic shaper needs to know their categories. */
-  else if (unlikely (u == 0x11301u || u == 0x11303u)) cat = OT_SM;
-  else if (unlikely (u == 0x1133cu)) cat = OT_N;
-
-  else if (unlikely (u == 0x0AFBu)) cat = OT_N; /* https://github.com/behdad/harfbuzz/issues/552 */
-
-  else if (unlikely (u == 0x0980u)) cat = OT_PLACEHOLDER; /* https://github.com/behdad/harfbuzz/issues/538 */
-  else if (unlikely (u == 0x17C6u)) cat = OT_N; /* Khmer Bindu doesn't like to be repositioned. */
-  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x2010u, 0x2011u)))
-                                    cat = OT_PLACEHOLDER;
-  else if (unlikely (u == 0x25CCu)) cat = OT_DOTTEDCIRCLE;
-
-
-  /*
-   * Re-assign position.
-   */
-
-  if ((FLAG_UNSAFE (cat) & CONSONANT_FLAGS))
-  {
-    pos = POS_BASE_C;
-    if (is_ra (u))
-      cat = OT_Ra;
-  }
-  else if (cat == OT_M)
-  {
-    pos = matra_position (u, pos);
-  }
-  else if ((FLAG_UNSAFE (cat) & (FLAG (OT_SM) | FLAG (OT_VD) | FLAG (OT_A) | FLAG (OT_Symbol))))
-  {
-    pos = POS_SMVD;
-  }
-
-  if (unlikely (u == 0x0B01u)) pos = POS_BEFORE_SUB; /* Oriya Bindu is BeforeSub in the spec. */
-
-
-
-  info.indic_category() = cat;
-  info.indic_position() = pos;
-}
-
-/*
- * Things above this line should ideally be moved to the Indic table itself.
- */
-
-
 /*
  * Indic configurations.  Note that we do not want to keep every single script-specific
  * behavior in these tables necessarily.  This should mainly be used for per-script
@@ -270,7 +42,6 @@ set_indic_properties (hb_glyph_info_t &info)
  */
 
 enum base_position_t {
-  BASE_POS_FIRST,
   BASE_POS_LAST_SINHALA,
   BASE_POS_LAST
 };
@@ -279,13 +50,11 @@ enum reph_position_t {
   REPH_POS_BEFORE_SUB  = POS_BEFORE_SUB,
   REPH_POS_AFTER_SUB   = POS_AFTER_SUB,
   REPH_POS_BEFORE_POST = POS_BEFORE_POST,
-  REPH_POS_AFTER_POST  = POS_AFTER_POST,
-  REPH_POS_DONT_CARE   = POS_RA_TO_BECOME_REPH
+  REPH_POS_AFTER_POST  = POS_AFTER_POST
 };
 enum reph_mode_t {
   REPH_MODE_IMPLICIT,  /* Reph formed out of initial Ra,H sequence. */
   REPH_MODE_EXPLICIT,  /* Reph formed out of initial Ra,H,ZWJ sequence. */
-  REPH_MODE_VIS_REPHA, /* Encoded Repha character, no reordering needed. */
   REPH_MODE_LOG_REPHA  /* Encoded Repha character, needs reordering. */
 };
 enum blwf_mode_t {
@@ -318,7 +87,6 @@ static const indic_config_t indic_configs[] =
   {HB_SCRIPT_MALAYALAM, true, 0x0D4Du,BASE_POS_LAST, REPH_POS_AFTER_MAIN, REPH_MODE_LOG_REPHA,BLWF_MODE_PRE_AND_POST},
   {HB_SCRIPT_SINHALA,   false,0x0DCAu,BASE_POS_LAST_SINHALA,
                                                      REPH_POS_AFTER_MAIN, REPH_MODE_EXPLICIT, BLWF_MODE_PRE_AND_POST},
-  {HB_SCRIPT_KHMER,     false,0x17D2u,BASE_POS_FIRST,REPH_POS_DONT_CARE,  REPH_MODE_VIS_REPHA,BLWF_MODE_PRE_AND_POST},
 };
 
 
@@ -350,7 +118,6 @@ indic_features[] =
   {HB_TAG('p','s','t','f'), F_NONE},
   {HB_TAG('v','a','t','u'), F_GLOBAL},
   {HB_TAG('c','j','c','t'), F_GLOBAL},
-  {HB_TAG('c','f','a','r'), F_NONE},
   /*
    * Other features.
    * These features are applied all at once, after final_reordering.
@@ -384,7 +151,6 @@ enum {
   PSTF,
   _VATU,
   _CJCT,
-  CFAR,
 
   INIT,
   _PRES,
@@ -451,17 +217,6 @@ collect_features_indic (hb_ot_shape_planner_t *plan)
 static void
 override_features_indic (hb_ot_shape_planner_t *plan)
 {
-  /* Uniscribe does not apply 'kern' in Khmer. */
-  if (hb_options ().uniscribe_bug_compatible)
-  {
-    switch ((hb_tag_t) plan->props.script)
-    {
-      case HB_SCRIPT_KHMER:
-        plan->map.add_feature (HB_TAG('k','e','r','n'), 0, F_GLOBAL);
-        break;
-    }
-  }
-
   plan->map.add_feature (HB_TAG('l','i','g','a'), 0, F_GLOBAL);
 }
 
@@ -691,7 +446,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
   const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
   hb_glyph_info_t *info = buffer->info;
 
-  /* https://github.com/behdad/harfbuzz/issues/435#issuecomment-335560167
+  /* https://github.com/harfbuzz/harfbuzz/issues/435#issuecomment-335560167
    * // For compatibility with legacy usage in Kannada,
    * // Ra+h+ZWJ must behave like Ra+ZWJ+h...
    */
@@ -713,7 +468,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
    * following algorithm: starting from the end of the syllable, move backwards
    * until a consonant is found that does not have a below-base or post-base
    * form (post-base forms have to follow below-base forms), or that is not a
-   * pre-base reordering Ra, or arrive at the first consonant. The consonant
+   * pre-base-reordering Ra, or arrive at the first consonant. The consonant
    * stopped at will be the base.
    *
    *   o If the syllable starts with Ra + Halant (in a script that has Reph)
@@ -729,8 +484,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
      *    and has more than one consonant, Ra is excluded from candidates for
      *    base consonants. */
     unsigned int limit = start;
-    if (indic_plan->config->reph_pos != REPH_POS_DONT_CARE &&
-        indic_plan->mask_array[RPHF] &&
+    if (indic_plan->mask_array[RPHF] &&
         start + 3 <= end &&
         (
          (indic_plan->config->reph_mode == REPH_MODE_IMPLICIT && !is_joiner (info[start + 2])) ||
@@ -784,11 +538,11 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
             if (info[i].indic_position() == POS_BELOW_C)
               seen_below = true;
 
-            /* -> or that is not a pre-base reordering Ra,
+            /* -> or that is not a pre-base-reordering Ra,
              *
              * IMPLEMENTATION NOTES:
              *
-             * Our pre-base reordering Ra's are marked POS_POST_C, so will be skipped
+             * Our pre-base-reordering Ra's are marked POS_POST_C, so will be skipped
              * by the logic above already.
              */
 
@@ -839,22 +593,6 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
             info[i].indic_position() = POS_BELOW_C;
       }
       break;
-
-      case BASE_POS_FIRST:
-      {
-        /* The first consonant is always the base. */
-
-        assert (indic_plan->config->reph_mode == REPH_MODE_VIS_REPHA);
-        assert (!has_reph);
-
-        base = start;
-
-        /* Mark all subsequent consonants as below. */
-        for (unsigned int i = base + 1; i < end; i++)
-          if (is_consonant (info[i]))
-            info[i].indic_position() = POS_BELOW_C;
-      }
-      break;
     }
 
     /* -> If the syllable starts with Ra + Halant (in a script that has Reph)
@@ -909,15 +647,15 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
   if (base < end)
     info[base].indic_position() = POS_BASE_C;
 
-  /* Mark final consonants.  A final consonant is one appearing after a matra,
-   * like in Khmer. */
+  /* Mark final consonants.  A final consonant is one appearing after a matra.
+   * Happens in Sinhala. */
   for (unsigned int i = base + 1; i < end; i++)
     if (info[i].indic_category() == OT_M) {
       for (unsigned int j = i + 1; j < end; j++)
         if (is_consonant (info[j])) {
-          info[j].indic_position() = POS_FINAL_C;
-          break;
-        }
+         info[j].indic_position() = POS_FINAL_C;
+         break;
+       }
       break;
     }
 
@@ -968,7 +706,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
     indic_position_t last_pos = POS_START;
     for (unsigned int i = start; i < end; i++)
     {
-      if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | MEDIAL_FLAGS | HALANT_OR_COENG_FLAGS)))
+      if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | MEDIAL_FLAGS | FLAG (OT_H))))
       {
         info[i].indic_position() = last_pos;
         if (unlikely (info[i].indic_category() == OT_H &&
@@ -1123,7 +861,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
   unsigned int pref_len = 2;
   if (indic_plan->mask_array[PREF] && base + pref_len < end)
   {
-    /* Find a Halant,Ra sequence and mark it for pre-base reordering processing. */
+    /* Find a Halant,Ra sequence and mark it for pre-base-reordering processing. */
     for (unsigned int i = base + 1; i + pref_len - 1 < end; i++) {
       hb_codepoint_t glyphs[2];
       for (unsigned int j = 0; j < pref_len; j++)
@@ -1132,17 +870,6 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
       {
         for (unsigned int j = 0; j < pref_len; j++)
           info[i++].mask |= indic_plan->mask_array[PREF];
-
-        /* Mark the subsequent stuff with 'cfar'.  Used in Khmer.
-         * Read the feature spec.
-         * This allows distinguishing the following cases with MS Khmer fonts:
-         * U+1784,U+17D2,U+179A,U+17D2,U+1782
-         * U+1784,U+17D2,U+1782,U+17D2,U+179A
-         */
-        if (indic_plan->mask_array[CFAR])
-          for (; i < end; i++)
-            info[i].mask |= indic_plan->mask_array[CFAR];
-
         break;
       }
     }
@@ -1310,7 +1037,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
           _hb_glyph_info_ligated (&info[i]) &&
           _hb_glyph_info_multiplied (&info[i]))
       {
-        /* This will make sure that this glyph passes is_halant_or_coeng() test. */
+        /* This will make sure that this glyph passes is_halant() test. */
         info[i].indic_category() = OT_H;
         _hb_glyph_info_clear_ligated_and_multiplied (&info[i]);
       }
@@ -1343,7 +1070,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
               /* Ok, this was a 'pref' candidate but didn't form any.
                * Base is around here... */
               base = i;
-              while (base < end && is_halant_or_coeng (info[base]))
+              while (base < end && is_halant (info[base]))
                 base++;
               info[base].indic_position() = POS_BASE_C;
 
@@ -1359,7 +1086,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
         {
           while (i < end && is_joiner (info[i]))
             i++;
-          if (i == end || !is_halant_or_coeng (info[i]))
+          if (i == end || !is_halant (info[i]))
             break;
           i++; /* Skip halant. */
           while (i < end && is_joiner (info[i]))
@@ -1381,7 +1108,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
     base--;
   if (base < end)
     while (start < base &&
-           is_one_of (info[base], (FLAG (OT_N) | HALANT_OR_COENG_FLAGS)))
+           is_one_of (info[base], (FLAG (OT_N) | FLAG (OT_H))))
       base--;
 
 
@@ -1407,13 +1134,13 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
     if (buffer->props.script != HB_SCRIPT_MALAYALAM && buffer->props.script != HB_SCRIPT_TAMIL)
     {
       while (new_pos > start &&
-             !(is_one_of (info[new_pos], (FLAG (OT_M) | HALANT_OR_COENG_FLAGS))))
+             !(is_one_of (info[new_pos], (FLAG (OT_M) | FLAG (OT_H)))))
         new_pos--;
 
       /* If we found no Halant we are done.
        * Otherwise only proceed if the Halant does
        * not belong to the Matra itself! */
-      if (is_halant_or_coeng (info[new_pos]) &&
+      if (is_halant (info[new_pos]) &&
           info[new_pos].indic_position() != POS_PRE_M)
       {
         /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
@@ -1480,8 +1207,6 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
     unsigned int new_reph_pos;
     reph_position_t reph_pos = indic_plan->config->reph_pos;
 
-    assert (reph_pos != REPH_POS_DONT_CARE);
-
     /*       1. If reph should be positioned after post-base consonant forms,
      *          proceed to step 5.
      */
@@ -1503,10 +1228,10 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
      */
     {
       new_reph_pos = start + 1;
-      while (new_reph_pos < base && !is_halant_or_coeng (info[new_reph_pos]))
+      while (new_reph_pos < base && !is_halant (info[new_reph_pos]))
         new_reph_pos++;
 
-      if (new_reph_pos < base && is_halant_or_coeng (info[new_reph_pos]))
+      if (new_reph_pos < base && is_halant (info[new_reph_pos]))
       {
         /* ->If ZWJ or ZWNJ are following this halant, position is moved after it. */
         if (new_reph_pos + 1 < base && is_joiner (info[new_reph_pos + 1]))
@@ -1517,7 +1242,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
 
     /*       3. If reph should be repositioned after the main consonant: find the
      *          first consonant not ligated with main, or find the first
-     *          consonant that is not a potential pre-base reordering Ra.
+     *          consonant that is not a potential pre-base-reordering Ra.
      */
     if (reph_pos == REPH_POS_AFTER_MAIN)
     {
@@ -1555,10 +1280,10 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
     {
       /* Copied from step 2. */
       new_reph_pos = start + 1;
-      while (new_reph_pos < base && !is_halant_or_coeng (info[new_reph_pos]))
+      while (new_reph_pos < base && !is_halant (info[new_reph_pos]))
         new_reph_pos++;
 
-      if (new_reph_pos < base && is_halant_or_coeng (info[new_reph_pos]))
+      if (new_reph_pos < base && is_halant (info[new_reph_pos]))
       {
         /* ->If ZWJ or ZWNJ are following this halant, position is moved after it. */
         if (new_reph_pos + 1 < base && is_joiner (info[new_reph_pos + 1]))
@@ -1582,7 +1307,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
        * TEST: U+0930,U+094D,U+0915,U+094B,U+094D
        */
       if (!hb_options ().uniscribe_bug_compatible &&
-          unlikely (is_halant_or_coeng (info[new_reph_pos]))) {
+          unlikely (is_halant (info[new_reph_pos]))) {
         for (unsigned int i = base + 1; i < new_reph_pos; i++)
           if (info[i].indic_category() == OT_M) {
             /* Ok, got it. */
@@ -1606,13 +1331,13 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
   }
 
 
-  /*   o Reorder pre-base reordering consonants:
+  /*   o Reorder pre-base-reordering consonants:
    *
-   *     If a pre-base reordering consonant is found, reorder it according to
+   *     If a pre-base-reordering consonant is found, reorder it according to
    *     the following rules:
    */
 
-  if (try_pref && base + 1 < end) /* Otherwise there can't be any pre-base reordering Ra. */
+  if (try_pref && base + 1 < end) /* Otherwise there can't be any pre-base-reordering Ra. */
   {
     for (unsigned int i = base + 1; i < end; i++)
       if ((info[i].mask & indic_plan->mask_array[PREF]) != 0)
@@ -1643,24 +1368,11 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
           if (buffer->props.script != HB_SCRIPT_MALAYALAM && buffer->props.script != HB_SCRIPT_TAMIL)
           {
             while (new_pos > start &&
-                   !(is_one_of (info[new_pos - 1], FLAG(OT_M) | HALANT_OR_COENG_FLAGS)))
+                   !(is_one_of (info[new_pos - 1], FLAG(OT_M) | FLAG (OT_H))))
               new_pos--;
-
-            /* In Khmer coeng model, a H,Ra can go *after* matras.  If it goes after a
-             * split matra, it should be reordered to *before* the left part of such matra. */
-            if (new_pos > start && info[new_pos - 1].indic_category() == OT_M)
-            {
-              unsigned int old_pos = i;
-              for (unsigned int j = base + 1; j < old_pos; j++)
-                if (info[j].indic_category() == OT_M)
-                {
-                  new_pos--;
-                  break;
-                }
-            }
           }
 
-          if (new_pos > start && is_halant_or_coeng (info[new_pos - 1]))
+          if (new_pos > start && is_halant (info[new_pos - 1]))
           {
             /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
             if (new_pos < end && is_joiner (info[new_pos]))
@@ -1765,13 +1477,6 @@ decompose_indic (const hb_ot_shape_normalize_context_t *c,
      * Decompose split matras that don't have Unicode decompositions.
      */
 
-    /* Khmer */
-    case 0x17BEu  : *a = 0x17C1u; *b= 0x17BEu; return true;
-    case 0x17BFu  : *a = 0x17C1u; *b= 0x17BFu; return true;
-    case 0x17C0u  : *a = 0x17C1u; *b= 0x17C0u; return true;
-    case 0x17C4u  : *a = 0x17C1u; *b= 0x17C4u; return true;
-    case 0x17C5u  : *a = 0x17C1u; *b= 0x17C5u; return true;
-
 #if 0
     /* Gujarati */
     /* This one has no decomposition in Unicode, but needs no decomposition either. */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh
new file mode 100644
index 00000000000..e1f363a9ce4
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh
@@ -0,0 +1,294 @@
+
+#line 1 "hb-ot-shape-complex-khmer-machine.rl"
+/*
+ * Copyright © 2011,2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH
+#define HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH
+
+#include "hb-private.hh"
+
+
+#line 36 "hb-ot-shape-complex-khmer-machine.hh"
+static const unsigned char _khmer_syllable_machine_trans_keys[] = {
+        7u, 7u, 1u, 16u, 13u, 13u, 1u, 16u, 7u, 13u, 7u, 7u, 1u, 16u, 13u, 13u,
+        1u, 16u, 7u, 13u, 1u, 16u, 3u, 14u, 3u, 14u, 5u, 14u, 3u, 14u, 5u, 14u,
+        8u, 8u, 3u, 13u, 3u, 8u, 8u, 8u, 3u, 8u, 3u, 14u, 3u, 14u, 5u, 14u,
+        3u, 14u, 5u, 14u, 8u, 8u, 3u, 13u, 3u, 8u, 8u, 8u, 3u, 8u, 3u, 14u,
+        3u, 14u, 7u, 13u, 7u, 7u, 1u, 16u, 0
+};
+
+static const char _khmer_syllable_machine_key_spans[] = {
+        1, 16, 1, 16, 7, 1, 16, 1,
+        16, 7, 16, 12, 12, 10, 12, 10,
+        1, 11, 6, 1, 6, 12, 12, 10,
+        12, 10, 1, 11, 6, 1, 6, 12,
+        12, 7, 1, 16
+};
+
+static const short _khmer_syllable_machine_index_offsets[] = {
+        0, 2, 19, 21, 38, 46, 48, 65,
+        67, 84, 92, 109, 122, 135, 146, 159,
+        170, 172, 184, 191, 193, 200, 213, 226,
+        237, 250, 261, 263, 275, 282, 284, 291,
+        304, 317, 325, 327
+};
+
+static const char _khmer_syllable_machine_indicies[] = {
+        1, 0, 2, 2, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 2, 0, 3, 0, 4, 4, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 4, 0, 1, 0,
+        0, 0, 0, 0, 5, 0, 7, 6,
+        8, 8, 6, 6, 6, 6, 6, 6,
+        6, 6, 6, 6, 6, 6, 6, 8,
+        6, 9, 6, 10, 10, 6, 6, 6,
+        6, 6, 6, 6, 6, 6, 6, 6,
+        6, 6, 10, 6, 7, 6, 6, 6,
+        6, 6, 11, 6, 4, 4, 13, 12,
+        14, 15, 7, 16, 12, 12, 4, 4,
+        11, 17, 12, 4, 12, 19, 18, 20,
+        21, 1, 22, 18, 18, 18, 18, 5,
+        23, 18, 24, 18, 21, 21, 1, 22,
+        18, 18, 18, 18, 18, 23, 18, 21,
+        21, 1, 22, 18, 18, 18, 18, 18,
+        23, 18, 25, 18, 21, 21, 1, 22,
+        18, 18, 18, 18, 18, 26, 18, 21,
+        21, 1, 22, 18, 18, 18, 18, 18,
+        26, 18, 27, 18, 28, 18, 29, 18,
+        18, 22, 18, 18, 18, 18, 3, 18,
+        30, 18, 18, 18, 18, 22, 18, 22,
+        18, 28, 18, 18, 18, 18, 22, 18,
+        19, 18, 21, 21, 1, 22, 18, 18,
+        18, 18, 18, 23, 18, 32, 31, 33,
+        33, 7, 16, 31, 31, 31, 31, 31,
+        34, 31, 33, 33, 7, 16, 31, 31,
+        31, 31, 31, 34, 31, 35, 31, 33,
+        33, 7, 16, 31, 31, 31, 31, 31,
+        36, 31, 33, 33, 7, 16, 31, 31,
+        31, 31, 31, 36, 31, 37, 31, 38,
+        31, 39, 31, 31, 16, 31, 31, 31,
+        31, 9, 31, 40, 31, 31, 31, 31,
+        16, 31, 16, 31, 38, 31, 31, 31,
+        31, 16, 31, 13, 31, 41, 33, 7,
+        16, 31, 31, 31, 31, 11, 34, 31,
+        13, 31, 33, 33, 7, 16, 31, 31,
+        31, 31, 31, 34, 31, 7, 42, 42,
+        42, 42, 42, 11, 42, 7, 42, 10,
+        10, 42, 42, 42, 42, 42, 42, 42,
+        42, 42, 42, 42, 42, 42, 10, 42,
+        0
+};
+
+static const char _khmer_syllable_machine_trans_targs[] = {
+        10, 14, 17, 20, 11, 21, 10, 24,
+        27, 30, 31, 32, 10, 22, 33, 34,
+        26, 35, 10, 12, 4, 0, 16, 3,
+        13, 15, 1, 10, 18, 2, 19, 10,
+        23, 5, 8, 25, 6, 10, 28, 7,
+        29, 9, 10
+};
+
+static const char _khmer_syllable_machine_trans_actions[] = {
+        1, 2, 2, 0, 2, 2, 3, 2,
+        2, 0, 2, 2, 6, 2, 0, 0,
+        0, 0, 7, 2, 0, 0, 0, 0,
+        2, 2, 0, 8, 0, 0, 0, 9,
+        2, 0, 0, 2, 0, 10, 0, 0,
+        0, 0, 11
+};
+
+static const char _khmer_syllable_machine_to_state_actions[] = {
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 4, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0
+};
+
+static const char _khmer_syllable_machine_from_state_actions[] = {
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 5, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0
+};
+
+static const unsigned char _khmer_syllable_machine_eof_trans[] = {
+        1, 1, 1, 1, 1, 7, 7, 7,
+        7, 7, 0, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        32, 43, 43, 43
+};
+
+static const int khmer_syllable_machine_start = 10;
+static const int khmer_syllable_machine_first_final = 10;
+static const int khmer_syllable_machine_error = -1;
+
+static const int khmer_syllable_machine_en_main = 10;
+
+
+#line 36 "hb-ot-shape-complex-khmer-machine.rl"
+
+
+
+#line 74 "hb-ot-shape-complex-khmer-machine.rl"
+
+
+#define found_syllable(syllable_type) \
+  HB_STMT_START { \
+    if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \
+    for (unsigned int i = last; i < p+1; i++) \
+      info[i].syllable() = (syllable_serial << 4) | syllable_type; \
+    last = p+1; \
+    syllable_serial++; \
+    if (unlikely (syllable_serial == 16)) syllable_serial = 1; \
+  } HB_STMT_END
+
+static void
+find_syllables (hb_buffer_t *buffer)
+{
+  unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED;
+  int cs;
+  hb_glyph_info_t *info = buffer->info;
+
+#line 181 "hb-ot-shape-complex-khmer-machine.hh"
+        {
+        cs = khmer_syllable_machine_start;
+        ts = 0;
+        te = 0;
+        act = 0;
+        }
+
+#line 95 "hb-ot-shape-complex-khmer-machine.rl"
+
+
+  p = 0;
+  pe = eof = buffer->len;
+
+  unsigned int last = 0;
+  unsigned int syllable_serial = 1;
+
+#line 198 "hb-ot-shape-complex-khmer-machine.hh"
+        {
+        int _slen;
+        int _trans;
+        const unsigned char *_keys;
+        const char *_inds;
+        if ( p == pe )
+                goto _test_eof;
+_resume:
+        switch ( _khmer_syllable_machine_from_state_actions[cs] ) {
+        case 5:
+#line 1 "NONE"
+        {ts = p;}
+        break;
+#line 212 "hb-ot-shape-complex-khmer-machine.hh"
+        }
+
+        _keys = _khmer_syllable_machine_trans_keys + (cs<<1);
+        _inds = _khmer_syllable_machine_indicies + _khmer_syllable_machine_index_offsets[cs];
+
+        _slen = _khmer_syllable_machine_key_spans[cs];
+        _trans = _inds[ _slen > 0 && _keys[0] <=( info[p].khmer_category()) &&
+                ( info[p].khmer_category()) <= _keys[1] ?
+                ( info[p].khmer_category()) - _keys[0] : _slen ];
+
+_eof_trans:
+        cs = _khmer_syllable_machine_trans_targs[_trans];
+
+        if ( _khmer_syllable_machine_trans_actions[_trans] == 0 )
+                goto _again;
+
+        switch ( _khmer_syllable_machine_trans_actions[_trans] ) {
+        case 2:
+#line 1 "NONE"
+        {te = p+1;}
+        break;
+        case 8:
+#line 68 "hb-ot-shape-complex-khmer-machine.rl"
+        {te = p+1;{ found_syllable (consonant_syllable); }}
+        break;
+        case 10:
+#line 69 "hb-ot-shape-complex-khmer-machine.rl"
+        {te = p+1;{ found_syllable (broken_cluster); }}
+        break;
+        case 6:
+#line 70 "hb-ot-shape-complex-khmer-machine.rl"
+        {te = p+1;{ found_syllable (non_khmer_cluster); }}
+        break;
+        case 7:
+#line 68 "hb-ot-shape-complex-khmer-machine.rl"
+        {te = p;p--;{ found_syllable (consonant_syllable); }}
+        break;
+        case 9:
+#line 69 "hb-ot-shape-complex-khmer-machine.rl"
+        {te = p;p--;{ found_syllable (broken_cluster); }}
+        break;
+        case 11:
+#line 70 "hb-ot-shape-complex-khmer-machine.rl"
+        {te = p;p--;{ found_syllable (non_khmer_cluster); }}
+        break;
+        case 1:
+#line 68 "hb-ot-shape-complex-khmer-machine.rl"
+        {{p = ((te))-1;}{ found_syllable (consonant_syllable); }}
+        break;
+        case 3:
+#line 69 "hb-ot-shape-complex-khmer-machine.rl"
+        {{p = ((te))-1;}{ found_syllable (broken_cluster); }}
+        break;
+#line 266 "hb-ot-shape-complex-khmer-machine.hh"
+        }
+
+_again:
+        switch ( _khmer_syllable_machine_to_state_actions[cs] ) {
+        case 4:
+#line 1 "NONE"
+        {ts = 0;}
+        break;
+#line 275 "hb-ot-shape-complex-khmer-machine.hh"
+        }
+
+        if ( ++p != pe )
+                goto _resume;
+        _test_eof: {}
+        if ( p == eof )
+        {
+        if ( _khmer_syllable_machine_eof_trans[cs] > 0 ) {
+                _trans = _khmer_syllable_machine_eof_trans[cs] - 1;
+                goto _eof_trans;
+        }
+        }
+
+        }
+
+#line 104 "hb-ot-shape-complex-khmer-machine.rl"
+
+}
+
+#endif /* HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-private.hh
new file mode 100644
index 00000000000..90cb91e68e6
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-private.hh
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_SHAPE_COMPLEX_KHMER_PRIVATE_HH
+#define HB_OT_SHAPE_COMPLEX_KHMER_PRIVATE_HH
+
+#include "hb-private.hh"
+
+#include "hb-ot-shape-complex-indic-private.hh"
+
+
+/* buffer var allocations */
+#define khmer_category() indic_category() /* khmer_category_t */
+#define khmer_position() indic_position() /* khmer_position_t */
+
+
+typedef indic_category_t khmer_category_t;
+typedef indic_position_t khmer_position_t;
+
+
+static inline khmer_position_t
+matra_position_khmer (khmer_position_t side)
+{
+  switch ((int) side)
+  {
+    case POS_PRE_C:
+      return POS_PRE_M;
+
+    case POS_POST_C:
+    case POS_ABOVE_C:
+    case POS_BELOW_C:
+      return POS_AFTER_POST;
+
+    default:
+      return side;
+  };
+}
+
+static inline bool
+is_consonant_or_vowel (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, CONSONANT_FLAGS | FLAG (OT_V));
+}
+
+static inline bool
+is_coeng (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, FLAG (OT_Coeng));
+}
+
+static inline void
+set_khmer_properties (hb_glyph_info_t &info)
+{
+  hb_codepoint_t u = info.codepoint;
+  unsigned int type = hb_indic_get_categories (u);
+  khmer_category_t cat = (khmer_category_t) (type & 0x7Fu);
+  khmer_position_t pos = (khmer_position_t) (type >> 8);
+
+
+  /*
+   * Re-assign category
+   */
+
+  if (unlikely (u == 0x17C6u)) cat = OT_N; /* Khmer Bindu doesn't like to be repositioned. */
+  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x17CDu, 0x17D1u) ||
+                     u == 0x17CBu || u == 0x17D3u || u == 0x17DDu)) /* Khmer Various signs */
+  {
+    /* These can occur mid-syllable (eg. before matras), even though Unicode marks them as Syllable_Modifier.
+     * https://github.com/roozbehp/unicode-data/issues/5 */
+    cat = OT_M;
+    pos = POS_ABOVE_C;
+  }
+  else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x2010u, 0x2011u))) cat = OT_PLACEHOLDER;
+  else if (unlikely (u == 0x25CCu)) cat = OT_DOTTEDCIRCLE;
+
+
+  /*
+   * Re-assign position.
+   */
+
+  if ((FLAG_UNSAFE (cat) & CONSONANT_FLAGS))
+  {
+    pos = POS_BASE_C;
+    if (u == 0x179Au)
+      cat = OT_Ra;
+  }
+  else if (cat == OT_M)
+  {
+    pos = matra_position_khmer (pos);
+  }
+  else if ((FLAG_UNSAFE (cat) & (FLAG (OT_SM) | FLAG (OT_A) | FLAG (OT_Symbol))))
+  {
+    pos = POS_SMVD;
+  }
+
+  info.khmer_category() = cat;
+  info.khmer_position() = pos;
+}
+
+
+#endif /* HB_OT_SHAPE_COMPLEX_KHMER_PRIVATE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc
new file mode 100644
index 00000000000..801c18614f0
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc
@@ -0,0 +1,835 @@
+/*
+ * Copyright © 2011,2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "hb-ot-shape-complex-khmer-private.hh"
+#include "hb-ot-layout-private.hh"
+
+
+/*
+ * Khmer shaper.
+ */
+
+struct feature_list_t {
+  hb_tag_t tag;
+  hb_ot_map_feature_flags_t flags;
+};
+
+static const feature_list_t
+khmer_features[] =
+{
+  /*
+   * Basic features.
+   * These features are applied in order, one at a time, after initial_reordering.
+   */
+  {HB_TAG('p','r','e','f'), F_NONE},
+  {HB_TAG('b','l','w','f'), F_NONE},
+  {HB_TAG('a','b','v','f'), F_NONE},
+  {HB_TAG('p','s','t','f'), F_NONE},
+  {HB_TAG('c','f','a','r'), F_NONE},
+  /*
+   * Other features.
+   * These features are applied all at once, after final_reordering.
+   * Default Bengali font in Windows for example has intermixed
+   * lookups for init,pres,abvs,blws features.
+   */
+  {HB_TAG('p','r','e','s'), F_GLOBAL},
+  {HB_TAG('a','b','v','s'), F_GLOBAL},
+  {HB_TAG('b','l','w','s'), F_GLOBAL},
+  {HB_TAG('p','s','t','s'), F_GLOBAL},
+  /* Positioning features, though we don't care about the types. */
+  {HB_TAG('d','i','s','t'), F_GLOBAL},
+  {HB_TAG('a','b','v','m'), F_GLOBAL},
+  {HB_TAG('b','l','w','m'), F_GLOBAL},
+};
+
+/*
+ * Must be in the same order as the khmer_features array.
+ */
+enum {
+  PREF,
+  BLWF,
+  ABVF,
+  PSTF,
+  CFAR,
+
+  _PRES,
+  _ABVS,
+  _BLWS,
+  _PSTS,
+  _DIST,
+  _ABVM,
+  _BLWM,
+
+  KHMER_NUM_FEATURES,
+  KHMER_BASIC_FEATURES = _PRES /* Don't forget to update this! */
+};
+
+static void
+setup_syllables (const hb_ot_shape_plan_t *plan,
+                 hb_font_t *font,
+                 hb_buffer_t *buffer);
+static void
+initial_reordering (const hb_ot_shape_plan_t *plan,
+                    hb_font_t *font,
+                    hb_buffer_t *buffer);
+static void
+final_reordering (const hb_ot_shape_plan_t *plan,
+                  hb_font_t *font,
+                  hb_buffer_t *buffer);
+static void
+clear_syllables (const hb_ot_shape_plan_t *plan,
+                 hb_font_t *font,
+                 hb_buffer_t *buffer);
+
+static void
+collect_features_khmer (hb_ot_shape_planner_t *plan)
+{
+  hb_ot_map_builder_t *map = &plan->map;
+
+  /* Do this before any lookups have been applied. */
+  map->add_gsub_pause (setup_syllables);
+
+  map->add_global_bool_feature (HB_TAG('l','o','c','l'));
+  /* The Indic specs do not require ccmp, but we apply it here since if
+   * there is a use of it, it's typically at the beginning. */
+  map->add_global_bool_feature (HB_TAG('c','c','m','p'));
+
+
+  unsigned int i = 0;
+  map->add_gsub_pause (initial_reordering);
+  for (; i < KHMER_BASIC_FEATURES; i++) {
+    map->add_feature (khmer_features[i].tag, 1, khmer_features[i].flags | F_MANUAL_ZWJ | F_MANUAL_ZWNJ);
+    map->add_gsub_pause (nullptr);
+  }
+  map->add_gsub_pause (final_reordering);
+  for (; i < KHMER_NUM_FEATURES; i++) {
+    map->add_feature (khmer_features[i].tag, 1, khmer_features[i].flags | F_MANUAL_ZWJ | F_MANUAL_ZWNJ);
+  }
+
+  map->add_global_bool_feature (HB_TAG('c','a','l','t'));
+  map->add_global_bool_feature (HB_TAG('c','l','i','g'));
+
+  map->add_gsub_pause (clear_syllables);
+}
+
+static void
+override_features_khmer (hb_ot_shape_planner_t *plan)
+{
+  /* Uniscribe does not apply 'kern' in Khmer. */
+  if (hb_options ().uniscribe_bug_compatible)
+  {
+    plan->map.add_feature (HB_TAG('k','e','r','n'), 0, F_GLOBAL);
+  }
+
+  plan->map.add_feature (HB_TAG('l','i','g','a'), 0, F_GLOBAL);
+}
+
+
+struct would_substitute_feature_t
+{
+  inline void init (const hb_ot_map_t *map, hb_tag_t feature_tag, bool zero_context_)
+  {
+    zero_context = zero_context_;
+    map->get_stage_lookups (0/*GSUB*/,
+                            map->get_feature_stage (0/*GSUB*/, feature_tag),
+                            &lookups, &count);
+  }
+
+  inline bool would_substitute (const hb_codepoint_t *glyphs,
+                                unsigned int          glyphs_count,
+                                hb_face_t            *face) const
+  {
+    for (unsigned int i = 0; i < count; i++)
+      if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context))
+        return true;
+    return false;
+  }
+
+  private:
+  const hb_ot_map_t::lookup_map_t *lookups;
+  unsigned int count;
+  bool zero_context;
+};
+
+struct khmer_shape_plan_t
+{
+  ASSERT_POD ();
+
+  inline bool get_virama_glyph (hb_font_t *font, hb_codepoint_t *pglyph) const
+  {
+    hb_codepoint_t glyph = virama_glyph;
+    if (unlikely (virama_glyph == (hb_codepoint_t) -1))
+    {
+      if (!font->get_nominal_glyph (0x17D2u, &glyph))
+        glyph = 0;
+      /* Technically speaking, the spec says we should apply 'locl' to virama too.
+       * Maybe one day... */
+
+      /* Our get_nominal_glyph() function needs a font, so we can't get the virama glyph
+       * during shape planning...  Instead, overwrite it here.  It's safe.  Don't worry! */
+      virama_glyph = glyph;
+    }
+
+    *pglyph = glyph;
+    return glyph != 0;
+  }
+
+  mutable hb_codepoint_t virama_glyph;
+
+  would_substitute_feature_t pref;
+
+  hb_mask_t mask_array[KHMER_NUM_FEATURES];
+};
+
+static void *
+data_create_khmer (const hb_ot_shape_plan_t *plan)
+{
+  khmer_shape_plan_t *khmer_plan = (khmer_shape_plan_t *) calloc (1, sizeof (khmer_shape_plan_t));
+  if (unlikely (!khmer_plan))
+    return nullptr;
+
+  khmer_plan->virama_glyph = (hb_codepoint_t) -1;
+
+  khmer_plan->pref.init (&plan->map, HB_TAG('p','r','e','f'), true);
+
+  for (unsigned int i = 0; i < ARRAY_LENGTH (khmer_plan->mask_array); i++)
+    khmer_plan->mask_array[i] = (khmer_features[i].flags & F_GLOBAL) ?
+                                 0 : plan->map.get_1_mask (khmer_features[i].tag);
+
+  return khmer_plan;
+}
+
+static void
+data_destroy_khmer (void *data)
+{
+  free (data);
+}
+
+
+enum syllable_type_t {
+  consonant_syllable,
+  broken_cluster,
+  non_khmer_cluster,
+};
+
+#include "hb-ot-shape-complex-khmer-machine.hh"
+
+static void
+setup_masks_khmer (const hb_ot_shape_plan_t *plan HB_UNUSED,
+                   hb_buffer_t              *buffer,
+                   hb_font_t                *font HB_UNUSED)
+{
+  HB_BUFFER_ALLOCATE_VAR (buffer, khmer_category);
+  HB_BUFFER_ALLOCATE_VAR (buffer, khmer_position);
+
+  /* We cannot setup masks here.  We save information about characters
+   * and setup masks later on in a pause-callback. */
+
+  unsigned int count = buffer->len;
+  hb_glyph_info_t *info = buffer->info;
+  for (unsigned int i = 0; i < count; i++)
+    set_khmer_properties (info[i]);
+}
+
+static void
+setup_syllables (const hb_ot_shape_plan_t *plan HB_UNUSED,
+                 hb_font_t *font HB_UNUSED,
+                 hb_buffer_t *buffer)
+{
+  find_syllables (buffer);
+  foreach_syllable (buffer, start, end)
+    buffer->unsafe_to_break (start, end);
+}
+
+static int
+compare_khmer_order (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb)
+{
+  int a = pa->khmer_position();
+  int b = pb->khmer_position();
+
+  return a < b ? -1 : a == b ? 0 : +1;
+}
+
+
+/* Rules from:
+ * https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx */
+
+static void
+initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
+                                       hb_face_t *face,
+                                       hb_buffer_t *buffer,
+                                       unsigned int start, unsigned int end)
+{
+  const khmer_shape_plan_t *khmer_plan = (const khmer_shape_plan_t *) plan->data;
+  hb_glyph_info_t *info = buffer->info;
+
+  /* 1. Khmer shaping assumes that a syllable will begin with a Cons, IndV, or Number. */
+
+  /* The first consonant is always the base. */
+  unsigned int base = start;
+  info[base].khmer_position() = POS_BASE_C;
+
+  /* Mark all subsequent consonants as below. */
+  for (unsigned int i = base + 1; i < end; i++)
+    if (is_consonant_or_vowel (info[i]))
+      info[i].khmer_position() = POS_BELOW_C;
+
+  /* Mark final consonants.  A final consonant is one appearing after a matra,
+   * like in Khmer. */
+  for (unsigned int i = base + 1; i < end; i++)
+    if (info[i].khmer_category() == OT_M) {
+      for (unsigned int j = i + 1; j < end; j++)
+        if (is_consonant_or_vowel (info[j])) {
+          info[j].khmer_position() = POS_FINAL_C;
+          break;
+        }
+      break;
+    }
+
+  /* Attach misc marks to previous char to move with them. */
+  {
+    khmer_position_t last_pos = POS_START;
+    for (unsigned int i = start; i < end; i++)
+    {
+      if ((FLAG_UNSAFE (info[i].khmer_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | MEDIAL_FLAGS | FLAG (OT_Coeng))))
+      {
+        info[i].khmer_position() = last_pos;
+        if (unlikely (info[i].khmer_category() == OT_H &&
+                      info[i].khmer_position() == POS_PRE_M))
+        {
+          /*
+           * Uniscribe doesn't move the Halant with Left Matra.
+           * TEST: U+092B,U+093F,U+094DE
+           * We follow.  This is important for the Sinhala
+           * U+0DDA split matra since it decomposes to U+0DD9,U+0DCA
+           * where U+0DD9 is a left matra and U+0DCA is the virama.
+           * We don't want to move the virama with the left matra.
+           * TEST: U+0D9A,U+0DDA
+           */
+          for (unsigned int j = i; j > start; j--)
+            if (info[j - 1].khmer_position() != POS_PRE_M) {
+              info[i].khmer_position() = info[j - 1].khmer_position();
+              break;
+            }
+        }
+      } else if (info[i].khmer_position() != POS_SMVD) {
+        last_pos = (khmer_position_t) info[i].khmer_position();
+      }
+    }
+  }
+  /* For post-base consonants let them own anything before them
+   * since the last consonant or matra. */
+  {
+    unsigned int last = base;
+    for (unsigned int i = base + 1; i < end; i++)
+      if (is_consonant_or_vowel (info[i]))
+      {
+        for (unsigned int j = last + 1; j < i; j++)
+          if (info[j].khmer_position() < POS_SMVD)
+            info[j].khmer_position() = info[i].khmer_position();
+        last = i;
+      } else if (info[i].khmer_category() == OT_M)
+        last = i;
+  }
+
+  {
+    /* Use syllable() for sort accounting temporarily. */
+    unsigned int syllable = info[start].syllable();
+    for (unsigned int i = start; i < end; i++)
+      info[i].syllable() = i - start;
+
+    /* Sit tight, rock 'n roll! */
+    hb_stable_sort (info + start, end - start, compare_khmer_order);
+    /* Find base again */
+    base = end;
+    for (unsigned int i = start; i < end; i++)
+      if (info[i].khmer_position() == POS_BASE_C)
+      {
+        base = i;
+        break;
+      }
+
+    /* Note!  syllable() is a one-byte field. */
+    for (unsigned int i = base; i < end; i++)
+      if (info[i].syllable() != 255)
+      {
+        unsigned int max = i;
+        unsigned int j = start + info[i].syllable();
+        while (j != i)
+        {
+          max = MAX (max, j);
+          unsigned int next = start + info[j].syllable();
+          info[j].syllable() = 255; /* So we don't process j later again. */
+          j = next;
+        }
+        if (i != max)
+          buffer->merge_clusters (i, max + 1);
+      }
+
+    /* Put syllable back in. */
+    for (unsigned int i = start; i < end; i++)
+      info[i].syllable() = syllable;
+  }
+
+  /* Setup masks now */
+
+  {
+    hb_mask_t mask;
+
+    /* Post-base */
+    mask = khmer_plan->mask_array[BLWF] | khmer_plan->mask_array[ABVF] | khmer_plan->mask_array[PSTF];
+    for (unsigned int i = base + 1; i < end; i++)
+      info[i].mask  |= mask;
+  }
+
+  unsigned int pref_len = 2;
+  if (khmer_plan->mask_array[PREF] && base + pref_len < end)
+  {
+    /* Find a Halant,Ra sequence and mark it for pre-base-reordering processing. */
+    for (unsigned int i = base + 1; i + pref_len - 1 < end; i++) {
+      hb_codepoint_t glyphs[2];
+      for (unsigned int j = 0; j < pref_len; j++)
+        glyphs[j] = info[i + j].codepoint;
+      if (khmer_plan->pref.would_substitute (glyphs, pref_len, face))
+      {
+        for (unsigned int j = 0; j < pref_len; j++)
+          info[i++].mask |= khmer_plan->mask_array[PREF];
+
+        /* Mark the subsequent stuff with 'cfar'.  Used in Khmer.
+         * Read the feature spec.
+         * This allows distinguishing the following cases with MS Khmer fonts:
+         * U+1784,U+17D2,U+179A,U+17D2,U+1782
+         * U+1784,U+17D2,U+1782,U+17D2,U+179A
+         */
+        if (khmer_plan->mask_array[CFAR])
+          for (; i < end; i++)
+            info[i].mask |= khmer_plan->mask_array[CFAR];
+
+        break;
+      }
+    }
+  }
+}
+
+static void
+initial_reordering_syllable (const hb_ot_shape_plan_t *plan,
+                             hb_face_t *face,
+                             hb_buffer_t *buffer,
+                             unsigned int start, unsigned int end)
+{
+  syllable_type_t syllable_type = (syllable_type_t) (buffer->info[start].syllable() & 0x0F);
+  switch (syllable_type)
+  {
+    case broken_cluster: /* We already inserted dotted-circles, so just call the consonant_syllable. */
+    case consonant_syllable:
+     initial_reordering_consonant_syllable (plan, face, buffer, start, end);
+     break;
+
+    case non_khmer_cluster:
+      break;
+  }
+}
+
+static inline void
+insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
+                       hb_font_t *font,
+                       hb_buffer_t *buffer)
+{
+  /* Note: This loop is extra overhead, but should not be measurable. */
+  bool has_broken_syllables = false;
+  unsigned int count = buffer->len;
+  hb_glyph_info_t *info = buffer->info;
+  for (unsigned int i = 0; i < count; i++)
+    if ((info[i].syllable() & 0x0F) == broken_cluster)
+    {
+      has_broken_syllables = true;
+      break;
+    }
+  if (likely (!has_broken_syllables))
+    return;
+
+
+  hb_codepoint_t dottedcircle_glyph;
+  if (!font->get_nominal_glyph (0x25CCu, &dottedcircle_glyph))
+    return;
+
+  hb_glyph_info_t dottedcircle = {0};
+  dottedcircle.codepoint = 0x25CCu;
+  set_khmer_properties (dottedcircle);
+  dottedcircle.codepoint = dottedcircle_glyph;
+
+  buffer->clear_output ();
+
+  buffer->idx = 0;
+  unsigned int last_syllable = 0;
+  while (buffer->idx < buffer->len && !buffer->in_error)
+  {
+    unsigned int syllable = buffer->cur().syllable();
+    syllable_type_t syllable_type = (syllable_type_t) (syllable & 0x0F);
+    if (unlikely (last_syllable != syllable && syllable_type == broken_cluster))
+    {
+      last_syllable = syllable;
+
+      hb_glyph_info_t ginfo = dottedcircle;
+      ginfo.cluster = buffer->cur().cluster;
+      ginfo.mask = buffer->cur().mask;
+      ginfo.syllable() = buffer->cur().syllable();
+      /* TODO Set glyph_props? */
+
+      /* Insert dottedcircle after possible Repha. */
+      while (buffer->idx < buffer->len && !buffer->in_error &&
+             last_syllable == buffer->cur().syllable() &&
+             buffer->cur().khmer_category() == OT_Repha)
+        buffer->next_glyph ();
+
+      buffer->output_info (ginfo);
+    }
+    else
+      buffer->next_glyph ();
+  }
+
+  buffer->swap_buffers ();
+}
+
+static void
+initial_reordering (const hb_ot_shape_plan_t *plan,
+                    hb_font_t *font,
+                    hb_buffer_t *buffer)
+{
+  insert_dotted_circles (plan, font, buffer);
+
+  foreach_syllable (buffer, start, end)
+    initial_reordering_syllable (plan, font->face, buffer, start, end);
+}
+
+static void
+final_reordering_syllable (const hb_ot_shape_plan_t *plan,
+                           hb_buffer_t *buffer,
+                           unsigned int start, unsigned int end)
+{
+  const khmer_shape_plan_t *khmer_plan = (const khmer_shape_plan_t *) plan->data;
+  hb_glyph_info_t *info = buffer->info;
+
+
+  /* This function relies heavily on halant glyphs.  Lots of ligation
+   * and possibly multiple substitutions happened prior to this
+   * phase, and that might have messed up our properties.  Recover
+   * from a particular case of that where we're fairly sure that a
+   * class of OT_H is desired but has been lost. */
+  if (khmer_plan->virama_glyph)
+  {
+    unsigned int virama_glyph = khmer_plan->virama_glyph;
+    for (unsigned int i = start; i < end; i++)
+      if (info[i].codepoint == virama_glyph &&
+          _hb_glyph_info_ligated (&info[i]) &&
+          _hb_glyph_info_multiplied (&info[i]))
+      {
+        /* This will make sure that this glyph passes is_coeng() test. */
+        info[i].khmer_category() = OT_H;
+        _hb_glyph_info_clear_ligated_and_multiplied (&info[i]);
+      }
+  }
+
+
+  /* 4. Final reordering:
+   *
+   * After the localized forms and basic shaping forms GSUB features have been
+   * applied (see below), the shaping engine performs some final glyph
+   * reordering before applying all the remaining font features to the entire
+   * syllable.
+   */
+
+  bool try_pref = !!khmer_plan->mask_array[PREF];
+
+  /* Find base again */
+  unsigned int base;
+  for (base = start; base < end; base++)
+    if (info[base].khmer_position() >= POS_BASE_C)
+    {
+      if (try_pref && base + 1 < end)
+      {
+        for (unsigned int i = base + 1; i < end; i++)
+          if ((info[i].mask & khmer_plan->mask_array[PREF]) != 0)
+          {
+            if (!(_hb_glyph_info_substituted (&info[i]) &&
+                  _hb_glyph_info_ligated_and_didnt_multiply (&info[i])))
+            {
+              /* Ok, this was a 'pref' candidate but didn't form any.
+               * Base is around here... */
+              base = i;
+              while (base < end && is_coeng (info[base]))
+                base++;
+              info[base].khmer_position() = POS_BASE_C;
+
+              try_pref = false;
+            }
+            break;
+          }
+      }
+
+      if (start < base && info[base].khmer_position() > POS_BASE_C)
+        base--;
+      break;
+    }
+  if (base == end && start < base &&
+      is_one_of (info[base - 1], FLAG (OT_ZWJ)))
+    base--;
+  if (base < end)
+    while (start < base &&
+           is_one_of (info[base], (FLAG (OT_N) | FLAG (OT_Coeng))))
+      base--;
+
+
+  /*   o Reorder matras:
+   *
+   *     If a pre-base matra character had been reordered before applying basic
+   *     features, the glyph can be moved closer to the main consonant based on
+   *     whether half-forms had been formed. Actual position for the matra is
+   *     defined as “after last standalone halant glyph, after initial matra
+   *     position and before the main consonant”. If ZWJ or ZWNJ follow this
+   *     halant, position is moved after it.
+   */
+
+  if (start + 1 < end && start < base) /* Otherwise there can't be any pre-base matra characters. */
+  {
+    /* If we lost track of base, alas, position before last thingy. */
+    unsigned int new_pos = base == end ? base - 2 : base - 1;
+
+    while (new_pos > start &&
+           !(is_one_of (info[new_pos], (FLAG (OT_M) | FLAG (OT_Coeng)))))
+      new_pos--;
+
+    /* If we found no Halant we are done.
+     * Otherwise only proceed if the Halant does
+     * not belong to the Matra itself! */
+    if (is_coeng (info[new_pos]) &&
+        info[new_pos].khmer_position() != POS_PRE_M)
+    {
+      /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
+      if (new_pos + 1 < end && is_joiner (info[new_pos + 1]))
+        new_pos++;
+    }
+    else
+      new_pos = start; /* No move. */
+
+    if (start < new_pos && info[new_pos].khmer_position () != POS_PRE_M)
+    {
+      /* Now go see if there's actually any matras... */
+      for (unsigned int i = new_pos; i > start; i--)
+        if (info[i - 1].khmer_position () == POS_PRE_M)
+        {
+          unsigned int old_pos = i - 1;
+          if (old_pos < base && base <= new_pos) /* Shouldn't actually happen. */
+            base--;
+
+          hb_glyph_info_t tmp = info[old_pos];
+          memmove (&info[old_pos], &info[old_pos + 1], (new_pos - old_pos) * sizeof (info[0]));
+          info[new_pos] = tmp;
+
+          /* Note: this merge_clusters() is intentionally *after* the reordering.
+           * Indic matra reordering is special and tricky... */
+          buffer->merge_clusters (new_pos, MIN (end, base + 1));
+
+          new_pos--;
+        }
+    } else {
+      for (unsigned int i = start; i < base; i++)
+        if (info[i].khmer_position () == POS_PRE_M) {
+          buffer->merge_clusters (i, MIN (end, base + 1));
+          break;
+        }
+    }
+  }
+
+
+  /*   o Reorder pre-base-reordering consonants:
+   *
+   *     If a pre-base-reordering consonant is found, reorder it according to
+   *     the following rules:
+   */
+
+  if (try_pref && base + 1 < end) /* Otherwise there can't be any pre-base-reordering Ra. */
+  {
+    for (unsigned int i = base + 1; i < end; i++)
+      if ((info[i].mask & khmer_plan->mask_array[PREF]) != 0)
+      {
+        /*       1. Only reorder a glyph produced by substitution during application
+         *          of the <pref> feature. (Note that a font may shape a Ra consonant with
+         *          the feature generally but block it in certain contexts.)
+         */
+        /* Note: We just check that something got substituted.  We don't check that
+         * the <pref> feature actually did it...
+         *
+         * Reorder pref only if it ligated. */
+        if (_hb_glyph_info_ligated_and_didnt_multiply (&info[i]))
+        {
+          /*
+           *       2. Try to find a target position the same way as for pre-base matra.
+           *          If it is found, reorder pre-base consonant glyph.
+           *
+           *       3. If position is not found, reorder immediately before main
+           *          consonant.
+           */
+
+          unsigned int new_pos = base;
+          while (new_pos > start &&
+                 !(is_one_of (info[new_pos - 1], FLAG(OT_M) | FLAG (OT_Coeng))))
+            new_pos--;
+
+          /* In Khmer coeng model, a H,Ra can go *after* matras.  If it goes after a
+           * split matra, it should be reordered to *before* the left part of such matra. */
+          if (new_pos > start && info[new_pos - 1].khmer_category() == OT_M)
+          {
+            unsigned int old_pos = i;
+            for (unsigned int j = base + 1; j < old_pos; j++)
+              if (info[j].khmer_category() == OT_M)
+              {
+                new_pos--;
+                break;
+              }
+          }
+
+          if (new_pos > start && is_coeng (info[new_pos - 1]))
+          {
+            /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
+            if (new_pos < end && is_joiner (info[new_pos]))
+              new_pos++;
+          }
+
+          {
+            unsigned int old_pos = i;
+
+            buffer->merge_clusters (new_pos, old_pos + 1);
+            hb_glyph_info_t tmp = info[old_pos];
+            memmove (&info[new_pos + 1], &info[new_pos], (old_pos - new_pos) * sizeof (info[0]));
+            info[new_pos] = tmp;
+
+            if (new_pos <= base && base < old_pos)
+              base++;
+          }
+        }
+
+        break;
+      }
+  }
+
+
+  /*
+   * Finish off the clusters and go home!
+   */
+  if (hb_options ().uniscribe_bug_compatible)
+  {
+    /* Uniscribe merges the entire syllable into a single cluster... Except for Tamil & Sinhala.
+     * This means, half forms are submerged into the main consonant's cluster.
+     * This is unnecessary, and makes cursor positioning harder, but that's what
+     * Uniscribe does. */
+    buffer->merge_clusters (start, end);
+  }
+}
+
+
+static void
+final_reordering (const hb_ot_shape_plan_t *plan,
+                  hb_font_t *font HB_UNUSED,
+                  hb_buffer_t *buffer)
+{
+  unsigned int count = buffer->len;
+  if (unlikely (!count)) return;
+
+  foreach_syllable (buffer, start, end)
+    final_reordering_syllable (plan, buffer, start, end);
+
+  HB_BUFFER_DEALLOCATE_VAR (buffer, khmer_category);
+  HB_BUFFER_DEALLOCATE_VAR (buffer, khmer_position);
+}
+
+
+static void
+clear_syllables (const hb_ot_shape_plan_t *plan HB_UNUSED,
+                 hb_font_t *font HB_UNUSED,
+                 hb_buffer_t *buffer)
+{
+  hb_glyph_info_t *info = buffer->info;
+  unsigned int count = buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    info[i].syllable() = 0;
+}
+
+
+static bool
+decompose_khmer (const hb_ot_shape_normalize_context_t *c,
+                 hb_codepoint_t  ab,
+                 hb_codepoint_t *a,
+                 hb_codepoint_t *b)
+{
+  switch (ab)
+  {
+    /*
+     * Decompose split matras that don't have Unicode decompositions.
+     */
+
+    /* Khmer */
+    case 0x17BEu  : *a = 0x17C1u; *b= 0x17BEu; return true;
+    case 0x17BFu  : *a = 0x17C1u; *b= 0x17BFu; return true;
+    case 0x17C0u  : *a = 0x17C1u; *b= 0x17C0u; return true;
+    case 0x17C4u  : *a = 0x17C1u; *b= 0x17C4u; return true;
+    case 0x17C5u  : *a = 0x17C1u; *b= 0x17C5u; return true;
+  }
+
+  return (bool) c->unicode->decompose (ab, a, b);
+}
+
+static bool
+compose_khmer (const hb_ot_shape_normalize_context_t *c,
+               hb_codepoint_t  a,
+               hb_codepoint_t  b,
+               hb_codepoint_t *ab)
+{
+  /* Avoid recomposing split matras. */
+  if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (c->unicode->general_category (a)))
+    return false;
+
+  return (bool) c->unicode->compose (a, b, ab);
+}
+
+
+const hb_ot_complex_shaper_t _hb_ot_complex_shaper_khmer =
+{
+  collect_features_khmer,
+  override_features_khmer,
+  data_create_khmer,
+  data_destroy_khmer,
+  nullptr, /* preprocess_text */
+  nullptr, /* postprocess_glyphs */
+  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT,
+  decompose_khmer,
+  compose_khmer,
+  setup_masks_khmer,
+  nullptr, /* disable_otl */
+  nullptr, /* reorder_marks */
+  HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
+  false, /* fallback_position */
+};
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
index a2d2193ede2..75c157ab46f 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
@@ -36,28 +36,29 @@
 static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
         1u, 32u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u,
         3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u,
-        3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u, 5u, 8u,
-        5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
-        3u, 30u, 3u, 29u, 1u, 32u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
-        3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 32u, 8u, 8u, 0
+        3u, 29u, 3u, 29u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u,
+        5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u,
+        3u, 29u, 3u, 30u, 3u, 29u, 1u, 32u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
+        3u, 29u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 32u, 8u, 8u,
+        0
 };
 
 static const char _myanmar_syllable_machine_key_spans[] = {
         32, 28, 25, 4, 25, 23, 21, 21,
         27, 27, 27, 27, 16, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 25, 4,
-        25, 23, 21, 21, 27, 27, 27, 27,
-        28, 27, 32, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 32, 1
+        27, 27, 28, 27, 27, 27, 27, 25,
+        4, 25, 23, 21, 21, 27, 27, 27,
+        27, 28, 27, 32, 27, 27, 27, 27,
+        27, 28, 27, 27, 27, 27, 32, 1
 };
 
 static const short _myanmar_syllable_machine_index_offsets[] = {
         0, 33, 62, 88, 93, 119, 143, 165,
         187, 215, 243, 271, 299, 316, 344, 372,
-        400, 428, 456, 484, 512, 540, 568, 594,
-        599, 625, 649, 671, 693, 721, 749, 777,
-        805, 834, 862, 895, 923, 951, 979, 1007,
-        1035, 1063, 1091, 1119, 1147, 1180
+        400, 428, 456, 485, 513, 541, 569, 597,
+        623, 628, 654, 678, 700, 722, 750, 778,
+        806, 834, 863, 891, 924, 952, 980, 1008,
+        1036, 1064, 1093, 1121, 1149, 1177, 1205, 1238
 };
 
 static const char _myanmar_syllable_machine_indicies[] = {
@@ -105,7 +106,7 @@ static const char _myanmar_syllable_machine_indicies[] = {
         21, 21, 21, 27, 21, 21, 28, 29,
         30, 31, 32, 33, 34, 35, 36, 21,
         22, 21, 24, 24, 21, 25, 21, 26,
-        21, 21, 21, 21, 21, 21, 21, 35,
+        21, 21, 21, 21, 21, 21, 21, 43,
         21, 21, 21, 21, 21, 21, 32, 33,
         34, 35, 36, 21, 22, 21, 24, 24,
         21, 25, 21, 26, 21, 21, 21, 21,
@@ -119,106 +120,114 @@ static const char _myanmar_syllable_machine_indicies[] = {
         21, 21, 21, 21, 21, 21, 21, 21,
         21, 21, 32, 21, 34, 21, 36, 21,
         22, 21, 24, 24, 21, 25, 21, 26,
-        21, 21, 21, 21, 21, 21, 21, 35,
-        21, 21, 28, 21, 30, 21, 32, 33,
-        34, 35, 36, 21, 22, 21, 24, 24,
-        21, 25, 21, 26, 21, 21, 21, 21,
-        21, 21, 21, 35, 21, 21, 28, 21,
-        21, 21, 32, 33, 34, 35, 36, 21,
-        22, 21, 24, 24, 21, 25, 21, 26,
-        21, 21, 21, 21, 21, 21, 21, 35,
-        21, 21, 28, 29, 30, 21, 32, 33,
-        34, 35, 36, 21, 22, 23, 24, 24,
-        21, 25, 21, 26, 21, 21, 21, 21,
-        21, 21, 21, 27, 21, 21, 28, 29,
-        30, 31, 32, 33, 34, 35, 36, 21,
-        3, 3, 43, 5, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 44, 43, 43,
-        43, 43, 43, 43, 14, 43, 43, 43,
-        18, 43, 3, 3, 43, 5, 43, 3,
-        3, 43, 5, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 43, 43, 43,
-        43, 43, 43, 14, 43, 43, 43, 18,
-        43, 45, 43, 3, 3, 43, 5, 43,
-        14, 43, 43, 43, 43, 43, 43, 43,
-        46, 43, 43, 43, 43, 43, 43, 14,
-        43, 3, 3, 43, 5, 43, 43, 43,
-        43, 43, 43, 43, 43, 43, 46, 43,
-        43, 43, 43, 43, 43, 14, 43, 3,
-        3, 43, 5, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 43, 43, 43,
-        43, 43, 43, 14, 43, 2, 43, 3,
-        3, 43, 5, 43, 6, 43, 43, 43,
-        43, 43, 43, 43, 47, 43, 43, 47,
-        43, 43, 43, 14, 48, 43, 43, 18,
-        43, 2, 43, 3, 3, 43, 5, 43,
-        6, 43, 43, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 43, 43, 14,
-        43, 43, 43, 18, 43, 2, 43, 3,
-        3, 43, 5, 43, 6, 43, 43, 43,
-        43, 43, 43, 43, 47, 43, 43, 43,
-        43, 43, 43, 14, 48, 43, 43, 18,
-        43, 2, 43, 3, 3, 43, 5, 43,
-        6, 43, 43, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 43, 43, 14,
-        48, 43, 43, 18, 43, 22, 23, 24,
+        21, 21, 21, 21, 21, 21, 21, 21,
+        21, 21, 21, 21, 21, 21, 32, 33,
+        34, 35, 36, 43, 21, 22, 21, 24,
         24, 21, 25, 21, 26, 21, 21, 21,
-        21, 21, 21, 21, 49, 21, 21, 28,
-        29, 30, 31, 32, 33, 34, 35, 36,
-        37, 21, 22, 50, 24, 24, 21, 25,
+        21, 21, 21, 21, 43, 21, 21, 28,
+        21, 30, 21, 32, 33, 34, 35, 36,
+        21, 22, 21, 24, 24, 21, 25, 21,
+        26, 21, 21, 21, 21, 21, 21, 21,
+        43, 21, 21, 28, 21, 21, 21, 32,
+        33, 34, 35, 36, 21, 22, 21, 24,
+        24, 21, 25, 21, 26, 21, 21, 21,
+        21, 21, 21, 21, 43, 21, 21, 28,
+        29, 30, 21, 32, 33, 34, 35, 36,
+        21, 22, 23, 24, 24, 21, 25, 21,
+        26, 21, 21, 21, 21, 21, 21, 21,
+        27, 21, 21, 28, 29, 30, 31, 32,
+        33, 34, 35, 36, 21, 3, 3, 44,
+        5, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 45, 44, 44, 44, 44, 44,
+        44, 14, 44, 44, 44, 18, 44, 3,
+        3, 44, 5, 44, 3, 3, 44, 5,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        14, 44, 44, 44, 18, 44, 46, 44,
+        3, 3, 44, 5, 44, 14, 44, 44,
+        44, 44, 44, 44, 44, 47, 44, 44,
+        44, 44, 44, 44, 14, 44, 3, 3,
+        44, 5, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 47, 44, 44, 44, 44,
+        44, 44, 14, 44, 3, 3, 44, 5,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        14, 44, 2, 44, 3, 3, 44, 5,
+        44, 6, 44, 44, 44, 44, 44, 44,
+        44, 48, 44, 44, 48, 44, 44, 44,
+        14, 49, 44, 44, 18, 44, 2, 44,
+        3, 3, 44, 5, 44, 6, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 44, 14, 44, 44, 44,
+        18, 44, 2, 44, 3, 3, 44, 5,
+        44, 6, 44, 44, 44, 44, 44, 44,
+        44, 48, 44, 44, 44, 44, 44, 44,
+        14, 49, 44, 44, 18, 44, 2, 44,
+        3, 3, 44, 5, 44, 6, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 44, 14, 49, 44, 44,
+        18, 44, 22, 23, 24, 24, 21, 25,
         21, 26, 21, 21, 21, 21, 21, 21,
-        21, 27, 21, 21, 28, 29, 30, 31,
-        32, 33, 34, 35, 36, 21, 1, 1,
-        2, 3, 3, 3, 43, 5, 43, 6,
-        1, 43, 43, 43, 43, 1, 43, 8,
-        43, 43, 10, 11, 12, 13, 14, 15,
-        16, 17, 18, 19, 43, 1, 43, 2,
-        43, 3, 3, 43, 5, 43, 6, 43,
-        43, 43, 43, 43, 43, 43, 8, 43,
-        43, 10, 11, 12, 13, 14, 15, 16,
-        17, 18, 43, 2, 43, 3, 3, 43,
-        5, 43, 6, 43, 43, 43, 43, 43,
-        43, 43, 17, 43, 43, 43, 43, 43,
-        43, 14, 15, 16, 17, 18, 43, 2,
-        43, 3, 3, 43, 5, 43, 6, 43,
-        43, 43, 43, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 14, 15, 16,
-        17, 18, 43, 2, 43, 3, 3, 43,
-        5, 43, 6, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 43, 43, 43,
-        43, 14, 15, 16, 43, 18, 43, 2,
-        43, 3, 3, 43, 5, 43, 6, 43,
-        43, 43, 43, 43, 43, 43, 43, 43,
-        43, 43, 43, 43, 43, 14, 43, 16,
-        43, 18, 43, 2, 43, 3, 3, 43,
-        5, 43, 6, 43, 43, 43, 43, 43,
-        43, 43, 17, 43, 43, 10, 43, 12,
-        43, 14, 15, 16, 17, 18, 43, 2,
-        43, 3, 3, 43, 5, 43, 6, 43,
-        43, 43, 43, 43, 43, 43, 17, 43,
-        43, 10, 43, 43, 43, 14, 15, 16,
-        17, 18, 43, 2, 43, 3, 3, 43,
-        5, 43, 6, 43, 43, 43, 43, 43,
-        43, 43, 17, 43, 43, 10, 11, 12,
-        43, 14, 15, 16, 17, 18, 43, 2,
-        3, 3, 3, 43, 5, 43, 6, 43,
-        43, 43, 43, 43, 43, 43, 8, 43,
-        43, 10, 11, 12, 13, 14, 15, 16,
-        17, 18, 43, 1, 1, 51, 51, 51,
-        51, 51, 51, 51, 51, 1, 51, 51,
-        51, 51, 1, 51, 51, 51, 51, 51,
-        51, 51, 51, 51, 51, 51, 51, 51,
-        51, 51, 1, 51, 52, 51, 0
+        21, 50, 21, 21, 28, 29, 30, 31,
+        32, 33, 34, 35, 36, 37, 21, 22,
+        51, 24, 24, 21, 25, 21, 26, 21,
+        21, 21, 21, 21, 21, 21, 27, 21,
+        21, 28, 29, 30, 31, 32, 33, 34,
+        35, 36, 21, 1, 1, 2, 3, 3,
+        3, 44, 5, 44, 6, 1, 44, 44,
+        44, 44, 1, 44, 8, 44, 44, 10,
+        11, 12, 13, 14, 15, 16, 17, 18,
+        19, 44, 1, 44, 2, 44, 3, 3,
+        44, 5, 44, 6, 44, 44, 44, 44,
+        44, 44, 44, 8, 44, 44, 10, 11,
+        12, 13, 14, 15, 16, 17, 18, 44,
+        2, 44, 3, 3, 44, 5, 44, 6,
+        44, 44, 44, 44, 44, 44, 44, 52,
+        44, 44, 44, 44, 44, 44, 14, 15,
+        16, 17, 18, 44, 2, 44, 3, 3,
+        44, 5, 44, 6, 44, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 14, 15, 16, 17, 18, 44,
+        2, 44, 3, 3, 44, 5, 44, 6,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 14, 15,
+        16, 44, 18, 44, 2, 44, 3, 3,
+        44, 5, 44, 6, 44, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 14, 44, 16, 44, 18, 44,
+        2, 44, 3, 3, 44, 5, 44, 6,
+        44, 44, 44, 44, 44, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 14, 15,
+        16, 17, 18, 52, 44, 2, 44, 3,
+        3, 44, 5, 44, 6, 44, 44, 44,
+        44, 44, 44, 44, 52, 44, 44, 10,
+        44, 12, 44, 14, 15, 16, 17, 18,
+        44, 2, 44, 3, 3, 44, 5, 44,
+        6, 44, 44, 44, 44, 44, 44, 44,
+        52, 44, 44, 10, 44, 44, 44, 14,
+        15, 16, 17, 18, 44, 2, 44, 3,
+        3, 44, 5, 44, 6, 44, 44, 44,
+        44, 44, 44, 44, 52, 44, 44, 10,
+        11, 12, 44, 14, 15, 16, 17, 18,
+        44, 2, 3, 3, 3, 44, 5, 44,
+        6, 44, 44, 44, 44, 44, 44, 44,
+        8, 44, 44, 10, 11, 12, 13, 14,
+        15, 16, 17, 18, 44, 1, 1, 53,
+        53, 53, 53, 53, 53, 53, 53, 1,
+        53, 53, 53, 53, 1, 53, 53, 53,
+        53, 53, 53, 53, 53, 53, 53, 53,
+        53, 53, 53, 53, 1, 53, 54, 53,
+        0
 };
 
 static const char _myanmar_syllable_machine_trans_targs[] = {
-        0, 1, 22, 0, 0, 23, 29, 32,
-        35, 44, 36, 40, 41, 42, 25, 38,
-        39, 37, 28, 43, 45, 0, 2, 12,
-        0, 3, 9, 13, 14, 18, 19, 20,
-        5, 16, 17, 15, 8, 21, 4, 6,
-        7, 10, 11, 0, 24, 26, 27, 30,
-        31, 33, 34, 0, 0
+        0, 1, 23, 0, 0, 24, 30, 33,
+        36, 46, 37, 42, 43, 44, 26, 39,
+        40, 41, 29, 45, 47, 0, 2, 12,
+        0, 3, 9, 13, 14, 19, 20, 21,
+        5, 16, 17, 18, 8, 22, 4, 6,
+        7, 10, 11, 15, 0, 25, 27, 28,
+        31, 32, 34, 35, 38, 0, 0
 };
 
 static const char _myanmar_syllable_machine_trans_actions[] = {
@@ -227,8 +236,8 @@ static const char _myanmar_syllable_machine_trans_actions[] = {
         0, 0, 0, 0, 0, 6, 0, 0,
         7, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 8, 0, 0, 0, 0,
-        0, 0, 0, 9, 10
+        0, 0, 0, 0, 8, 0, 0, 0,
+        0, 0, 0, 0, 0, 9, 10
 };
 
 static const char _myanmar_syllable_machine_to_state_actions[] = {
@@ -237,7 +246,7 @@ static const char _myanmar_syllable_machine_to_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const char _myanmar_syllable_machine_from_state_actions[] = {
@@ -246,16 +255,16 @@ static const char _myanmar_syllable_machine_from_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const short _myanmar_syllable_machine_eof_trans[] = {
         0, 22, 22, 22, 22, 22, 22, 22,
         22, 22, 22, 22, 22, 22, 22, 22,
-        22, 22, 22, 22, 22, 22, 44, 44,
-        44, 44, 44, 44, 44, 44, 44, 44,
-        22, 22, 44, 44, 44, 44, 44, 44,
-        44, 44, 44, 44, 52, 52
+        22, 22, 22, 22, 22, 22, 22, 45,
+        45, 45, 45, 45, 45, 45, 45, 45,
+        45, 22, 22, 45, 45, 45, 45, 45,
+        45, 45, 45, 45, 45, 45, 54, 54
 };
 
 static const int myanmar_syllable_machine_start = 0;
@@ -289,7 +298,7 @@ find_syllables (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 293 "hb-ot-shape-complex-myanmar-machine.hh"
+#line 302 "hb-ot-shape-complex-myanmar-machine.hh"
         {
         cs = myanmar_syllable_machine_start;
         ts = 0;
@@ -306,7 +315,7 @@ find_syllables (hb_buffer_t *buffer)
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
 
-#line 310 "hb-ot-shape-complex-myanmar-machine.hh"
+#line 319 "hb-ot-shape-complex-myanmar-machine.hh"
         {
         int _slen;
         int _trans;
@@ -320,7 +329,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 324 "hb-ot-shape-complex-myanmar-machine.hh"
+#line 333 "hb-ot-shape-complex-myanmar-machine.hh"
         }
 
         _keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
@@ -370,7 +379,7 @@ _eof_trans:
 #line 90 "hb-ot-shape-complex-myanmar-machine.rl"
         {te = p;p--;{ found_syllable (non_myanmar_cluster); }}
         break;
-#line 374 "hb-ot-shape-complex-myanmar-machine.hh"
+#line 383 "hb-ot-shape-complex-myanmar-machine.hh"
         }
 
 _again:
@@ -379,7 +388,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 383 "hb-ot-shape-complex-myanmar-machine.hh"
+#line 392 "hb-ot-shape-complex-myanmar-machine.hh"
         }
 
         if ( ++p != pe )
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-private.hh
new file mode 100644
index 00000000000..f30770f327e
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-private.hh
@@ -0,0 +1,171 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_PRIVATE_HH
+#define HB_OT_SHAPE_COMPLEX_MYANMAR_PRIVATE_HH
+
+#include "hb-private.hh"
+
+#include "hb-ot-shape-complex-indic-private.hh"
+
+
+/* buffer var allocations */
+#define myanmar_category() indic_category() /* myanmar_category_t */
+#define myanmar_position() indic_position() /* myanmar_position_t */
+
+
+/* Note: This enum is duplicated in the -machine.rl source file.
+ * Not sure how to avoid duplication. */
+enum myanmar_category_t {
+  OT_As  = 18,  /* Asat */
+  OT_D0  = 20, /* Digit zero */
+  OT_DB  = OT_N, /* Dot below */
+  OT_GB  = OT_PLACEHOLDER,
+  OT_MH  = 21, /* Various consonant medial types */
+  OT_MR  = 22, /* Various consonant medial types */
+  OT_MW  = 23, /* Various consonant medial types */
+  OT_MY  = 24, /* Various consonant medial types */
+  OT_PT  = 25, /* Pwo and other tones */
+  OT_VAbv = 26,
+  OT_VBlw = 27,
+  OT_VPre = 28,
+  OT_VPst = 29,
+  OT_VS   = 30, /* Variation selectors */
+  OT_P    = 31, /* Punctuation */
+  OT_D    = 32, /* Digits except zero */
+};
+
+
+static inline void
+set_myanmar_properties (hb_glyph_info_t &info)
+{
+  hb_codepoint_t u = info.codepoint;
+  unsigned int type = hb_indic_get_categories (u);
+  indic_category_t cat = (indic_category_t) (type & 0x7Fu);
+  indic_position_t pos = (indic_position_t) (type >> 8);
+
+  /* Myanmar
+   * http://www.microsoft.com/typography/OpenTypeDev/myanmar/intro.htm#analyze
+   */
+  if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xFE00u, 0xFE0Fu)))
+    cat = (indic_category_t) OT_VS;
+
+  switch (u)
+  {
+    case 0x104Eu:
+      cat = (indic_category_t) OT_C; /* The spec says C, IndicSyllableCategory doesn't have. */
+      break;
+
+    case 0x002Du: case 0x00A0u: case 0x00D7u: case 0x2012u:
+    case 0x2013u: case 0x2014u: case 0x2015u: case 0x2022u:
+    case 0x25CCu: case 0x25FBu: case 0x25FCu: case 0x25FDu:
+    case 0x25FEu:
+      cat = (indic_category_t) OT_GB;
+      break;
+
+    case 0x1004u: case 0x101Bu: case 0x105Au:
+      cat = (indic_category_t) OT_Ra;
+      break;
+
+    case 0x1032u: case 0x1036u:
+      cat = (indic_category_t) OT_A;
+      break;
+
+    case 0x1039u:
+      cat = (indic_category_t) OT_H;
+      break;
+
+    case 0x103Au:
+      cat = (indic_category_t) OT_As;
+      break;
+
+    case 0x1041u: case 0x1042u: case 0x1043u: case 0x1044u:
+    case 0x1045u: case 0x1046u: case 0x1047u: case 0x1048u:
+    case 0x1049u: case 0x1090u: case 0x1091u: case 0x1092u:
+    case 0x1093u: case 0x1094u: case 0x1095u: case 0x1096u:
+    case 0x1097u: case 0x1098u: case 0x1099u:
+      cat = (indic_category_t) OT_D;
+      break;
+
+    case 0x1040u:
+      cat = (indic_category_t) OT_D; /* XXX The spec says D0, but Uniscribe doesn't seem to do. */
+      break;
+
+    case 0x103Eu: case 0x1060u:
+      cat = (indic_category_t) OT_MH;
+      break;
+
+    case 0x103Cu:
+      cat = (indic_category_t) OT_MR;
+      break;
+
+    case 0x103Du: case 0x1082u:
+      cat = (indic_category_t) OT_MW;
+      break;
+
+    case 0x103Bu: case 0x105Eu: case 0x105Fu:
+      cat = (indic_category_t) OT_MY;
+      break;
+
+    case 0x1063u: case 0x1064u: case 0x1069u: case 0x106Au:
+    case 0x106Bu: case 0x106Cu: case 0x106Du: case 0xAA7Bu:
+      cat = (indic_category_t) OT_PT;
+      break;
+
+    case 0x1038u: case 0x1087u: case 0x1088u: case 0x1089u:
+    case 0x108Au: case 0x108Bu: case 0x108Cu: case 0x108Du:
+    case 0x108Fu: case 0x109Au: case 0x109Bu: case 0x109Cu:
+      cat = (indic_category_t) OT_SM;
+      break;
+
+    case 0x104Au: case 0x104Bu:
+      cat = (indic_category_t) OT_P;
+      break;
+
+    case 0xAA74u: case 0xAA75u: case 0xAA76u:
+      /* https://github.com/roozbehp/unicode-data/issues/3 */
+      cat = (indic_category_t) OT_C;
+      break;
+  }
+
+  if (cat == OT_M)
+  {
+    switch ((int) pos)
+    {
+      case POS_PRE_C:   cat = (indic_category_t) OT_VPre;
+                        pos = POS_PRE_M;                  break;
+      case POS_ABOVE_C: cat = (indic_category_t) OT_VAbv; break;
+      case POS_BELOW_C: cat = (indic_category_t) OT_VBlw; break;
+      case POS_POST_C:  cat = (indic_category_t) OT_VPst; break;
+    }
+  }
+
+  info.myanmar_category() = (myanmar_category_t) cat;
+  info.myanmar_position() = pos;
+}
+
+
+#endif /* HB_OT_SHAPE_COMPLEX_MYANMAR_PRIVATE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc
index cd9a983fbef..3edb649d7c4 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc
@@ -24,11 +24,7 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#include "hb-ot-shape-complex-indic-private.hh"
-
-/* buffer var allocations */
-#define myanmar_category() complex_var_u8_0() /* myanmar_category_t */
-#define myanmar_position() complex_var_u8_1() /* myanmar_position_t */
+#include "hb-ot-shape-complex-myanmar-private.hh"
 
 
 /*
@@ -127,153 +123,6 @@ enum syllable_type_t {
 #include "hb-ot-shape-complex-myanmar-machine.hh"
 
 
-/* Note: This enum is duplicated in the -machine.rl source file.
- * Not sure how to avoid duplication. */
-enum myanmar_category_t {
-  OT_As  = 18,  /* Asat */
-  OT_D0  = 20, /* Digit zero */
-  OT_DB  = OT_N, /* Dot below */
-  OT_GB  = OT_PLACEHOLDER,
-  OT_MH  = 21, /* Various consonant medial types */
-  OT_MR  = 22, /* Various consonant medial types */
-  OT_MW  = 23, /* Various consonant medial types */
-  OT_MY  = 24, /* Various consonant medial types */
-  OT_PT  = 25, /* Pwo and other tones */
-  OT_VAbv = 26,
-  OT_VBlw = 27,
-  OT_VPre = 28,
-  OT_VPst = 29,
-  OT_VS   = 30, /* Variation selectors */
-  OT_P    = 31, /* Punctuation */
-  OT_D    = 32, /* Digits except zero */
-};
-
-
-static inline bool
-is_one_of (const hb_glyph_info_t &info, unsigned int flags)
-{
-  /* If it ligated, all bets are off. */
-  if (_hb_glyph_info_ligated (&info)) return false;
-  return !!(FLAG_UNSAFE (info.myanmar_category()) & flags);
-}
-
-static inline bool
-is_consonant (const hb_glyph_info_t &info)
-{
-  return is_one_of (info, CONSONANT_FLAGS);
-}
-
-
-static inline void
-set_myanmar_properties (hb_glyph_info_t &info)
-{
-  hb_codepoint_t u = info.codepoint;
-  unsigned int type = hb_indic_get_categories (u);
-  indic_category_t cat = (indic_category_t) (type & 0x7Fu);
-  indic_position_t pos = (indic_position_t) (type >> 8);
-
-  /* Myanmar
-   * http://www.microsoft.com/typography/OpenTypeDev/myanmar/intro.htm#analyze
-   */
-  if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xFE00u, 0xFE0Fu)))
-    cat = (indic_category_t) OT_VS;
-
-  switch (u)
-  {
-    case 0x104Eu:
-      cat = (indic_category_t) OT_C; /* The spec says C, IndicSyllableCategory doesn't have. */
-      break;
-
-    case 0x002Du: case 0x00A0u: case 0x00D7u: case 0x2012u:
-    case 0x2013u: case 0x2014u: case 0x2015u: case 0x2022u:
-    case 0x25CCu: case 0x25FBu: case 0x25FCu: case 0x25FDu:
-    case 0x25FEu:
-      cat = (indic_category_t) OT_GB;
-      break;
-
-    case 0x1004u: case 0x101Bu: case 0x105Au:
-      cat = (indic_category_t) OT_Ra;
-      break;
-
-    case 0x1032u: case 0x1036u:
-      cat = (indic_category_t) OT_A;
-      break;
-
-    case 0x1039u:
-      cat = (indic_category_t) OT_H;
-      break;
-
-    case 0x103Au:
-      cat = (indic_category_t) OT_As;
-      break;
-
-    case 0x1041u: case 0x1042u: case 0x1043u: case 0x1044u:
-    case 0x1045u: case 0x1046u: case 0x1047u: case 0x1048u:
-    case 0x1049u: case 0x1090u: case 0x1091u: case 0x1092u:
-    case 0x1093u: case 0x1094u: case 0x1095u: case 0x1096u:
-    case 0x1097u: case 0x1098u: case 0x1099u:
-      cat = (indic_category_t) OT_D;
-      break;
-
-    case 0x1040u:
-      cat = (indic_category_t) OT_D; /* XXX The spec says D0, but Uniscribe doesn't seem to do. */
-      break;
-
-    case 0x103Eu: case 0x1060u:
-      cat = (indic_category_t) OT_MH;
-      break;
-
-    case 0x103Cu:
-      cat = (indic_category_t) OT_MR;
-      break;
-
-    case 0x103Du: case 0x1082u:
-      cat = (indic_category_t) OT_MW;
-      break;
-
-    case 0x103Bu: case 0x105Eu: case 0x105Fu:
-      cat = (indic_category_t) OT_MY;
-      break;
-
-    case 0x1063u: case 0x1064u: case 0x1069u: case 0x106Au:
-    case 0x106Bu: case 0x106Cu: case 0x106Du: case 0xAA7Bu:
-      cat = (indic_category_t) OT_PT;
-      break;
-
-    case 0x1038u: case 0x1087u: case 0x1088u: case 0x1089u:
-    case 0x108Au: case 0x108Bu: case 0x108Cu: case 0x108Du:
-    case 0x108Fu: case 0x109Au: case 0x109Bu: case 0x109Cu:
-      cat = (indic_category_t) OT_SM;
-      break;
-
-    case 0x104Au: case 0x104Bu:
-      cat = (indic_category_t) OT_P;
-      break;
-
-    case 0xAA74u: case 0xAA75u: case 0xAA76u:
-      /* https://github.com/roozbehp/unicode-data/issues/3 */
-      cat = (indic_category_t) OT_C;
-      break;
-  }
-
-  if (cat == OT_M)
-  {
-    switch ((int) pos)
-    {
-      case POS_PRE_C:   cat = (indic_category_t) OT_VPre;
-                        pos = POS_PRE_M;                  break;
-      case POS_ABOVE_C: cat = (indic_category_t) OT_VAbv; break;
-      case POS_BELOW_C: cat = (indic_category_t) OT_VBlw; break;
-      case POS_POST_C:  cat = (indic_category_t) OT_VPst; break;
-    }
-  }
-
-  info.myanmar_category() = (myanmar_category_t) cat;
-  info.myanmar_position() = pos;
-}
-
-
-
 static void
 setup_masks_myanmar (const hb_ot_shape_plan_t *plan HB_UNUSED,
                    hb_buffer_t              *buffer,
@@ -374,6 +223,11 @@ initial_reordering_consonant_syllable (hb_buffer_t *buffer,
       {
         continue;
       }
+      if (info[i].myanmar_category() == OT_VS)
+      {
+        info[i].myanmar_position() = info[i - 1].myanmar_position();
+        continue;
+      }
 
       if (pos == POS_AFTER_MAIN && info[i].myanmar_category() == OT_VBlw)
       {
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh
index 385407f6d45..2198f90ce8b 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh
@@ -54,9 +54,10 @@ enum hb_ot_shape_zero_width_marks_type_t {
   HB_COMPLEX_SHAPER_IMPLEMENT (arabic) \
   HB_COMPLEX_SHAPER_IMPLEMENT (hangul) \
   HB_COMPLEX_SHAPER_IMPLEMENT (hebrew) \
-  HB_COMPLEX_SHAPER_IMPLEMENT (myanmar_old) \
   HB_COMPLEX_SHAPER_IMPLEMENT (indic) \
+  HB_COMPLEX_SHAPER_IMPLEMENT (khmer) \
   HB_COMPLEX_SHAPER_IMPLEMENT (myanmar) \
+  HB_COMPLEX_SHAPER_IMPLEMENT (myanmar_old) \
   HB_COMPLEX_SHAPER_IMPLEMENT (thai) \
   HB_COMPLEX_SHAPER_IMPLEMENT (tibetan) \
   HB_COMPLEX_SHAPER_IMPLEMENT (use) \
@@ -285,7 +286,7 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
                                               planner->map.language_index[0],
                                               HB_TAG ('p','r','e','f'),
                                               nullptr))
-        return &_hb_ot_complex_shaper_indic;
+        return &_hb_ot_complex_shaper_khmer;
       else
         return &_hb_ot_complex_shaper_default;
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh
index 0a86f4927a0..192c60f7b66 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh
@@ -36,271 +36,286 @@
 
 #line 38 "hb-ot-shape-complex-use-machine.hh"
 static const unsigned char _use_syllable_machine_trans_keys[] = {
-        1u, 1u, 0u, 43u, 21u, 21u, 8u, 39u, 8u, 39u, 1u, 1u, 8u, 39u, 8u, 39u,
-        8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u,
+        12u, 12u, 1u, 15u, 1u, 1u, 12u, 12u, 0u, 43u, 21u, 21u, 8u, 39u, 8u, 39u,
+        1u, 15u, 1u, 1u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u,
         8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u,
-        13u, 21u, 4u, 4u, 13u, 13u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u,
-        8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u,
-        8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 1u, 1u, 1u, 39u, 8u, 39u,
-        21u, 42u, 41u, 42u, 42u, 42u, 1u, 5u, 0
+        8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 13u, 21u, 4u, 4u, 13u, 13u, 8u, 39u,
+        8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u,
+        8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u,
+        8u, 39u, 1u, 15u, 12u, 12u, 1u, 39u, 8u, 39u, 21u, 42u, 41u, 42u, 42u, 42u,
+        1u, 5u, 0
 };
 
 static const char _use_syllable_machine_key_spans[] = {
-        1, 44, 1, 32, 32, 1, 32, 32,
-        32, 19, 19, 19, 32, 32, 32, 32,
+        1, 15, 1, 1, 44, 1, 32, 32,
+        15, 1, 32, 32, 32, 19, 19, 19,
         32, 32, 32, 32, 32, 32, 32, 32,
-        9, 1, 1, 32, 32, 32, 32, 19,
-        19, 19, 32, 32, 32, 32, 32, 32,
-        32, 32, 32, 32, 32, 1, 39, 32,
-        22, 2, 1, 5
+        32, 32, 32, 32, 9, 1, 1, 32,
+        32, 32, 32, 19, 19, 19, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        32, 15, 1, 39, 32, 22, 2, 1,
+        5
 };
 
 static const short _use_syllable_machine_index_offsets[] = {
-        0, 2, 47, 49, 82, 115, 117, 150,
-        183, 216, 236, 256, 276, 309, 342, 375,
-        408, 441, 474, 507, 540, 573, 606, 639,
-        672, 682, 684, 686, 719, 752, 785, 818,
-        838, 858, 878, 911, 944, 977, 1010, 1043,
-        1076, 1109, 1142, 1175, 1208, 1241, 1243, 1283,
-        1316, 1339, 1342, 1344
+        0, 2, 18, 20, 22, 67, 69, 102,
+        135, 151, 153, 186, 219, 252, 272, 292,
+        312, 345, 378, 411, 444, 477, 510, 543,
+        576, 609, 642, 675, 708, 718, 720, 722,
+        755, 788, 821, 854, 874, 894, 914, 947,
+        980, 1013, 1046, 1079, 1112, 1145, 1178, 1211,
+        1244, 1277, 1293, 1295, 1335, 1368, 1391, 1394,
+        1396
 };
 
 static const char _use_syllable_machine_indicies[] = {
-        1, 0, 2, 3, 4, 2, 5, 3,
-        4, 4, 6, 4, 4, 1, 7, 4,
-        4, 4, 2, 2, 8, 9, 4, 4,
-        10, 11, 12, 13, 14, 15, 16, 10,
-        17, 18, 19, 20, 21, 22, 4, 23,
-        24, 25, 4, 4, 4, 26, 4, 28,
-        27, 30, 29, 29, 31, 32, 29, 29,
-        29, 29, 29, 29, 29, 29, 33, 34,
-        35, 36, 37, 38, 39, 40, 34, 41,
-        33, 42, 43, 44, 45, 29, 46, 47,
-        48, 29, 30, 29, 29, 31, 32, 29,
-        29, 29, 29, 29, 29, 29, 29, 49,
-        34, 35, 36, 37, 38, 39, 40, 34,
-        41, 42, 42, 43, 44, 45, 29, 46,
-        47, 48, 29, 31, 50, 30, 29, 29,
-        31, 32, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 34, 35, 36, 37, 38,
-        39, 40, 34, 41, 42, 42, 43, 44,
-        45, 29, 46, 47, 48, 29, 30, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 34, 35, 36, 37,
-        38, 29, 29, 29, 29, 29, 29, 43,
-        44, 45, 29, 46, 47, 48, 29, 30,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 35, 36,
-        37, 38, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 46, 47, 48, 29,
-        30, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        36, 37, 38, 29, 30, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 37, 38, 29,
-        30, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 38, 29, 30, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 36, 37, 38, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 46, 47, 48, 29, 30, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 36, 37, 38,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 47, 48, 29, 30, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 36, 37,
-        38, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 48, 29, 30,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 35, 36,
-        37, 38, 29, 29, 29, 29, 29, 29,
-        43, 44, 45, 29, 46, 47, 48, 29,
-        30, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 35,
-        36, 37, 38, 29, 29, 29, 29, 29,
-        29, 29, 44, 45, 29, 46, 47, 48,
-        29, 30, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        35, 36, 37, 38, 29, 29, 29, 29,
-        29, 29, 29, 29, 45, 29, 46, 47,
-        48, 29, 30, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        34, 35, 36, 37, 38, 29, 40, 34,
-        29, 29, 29, 43, 44, 45, 29, 46,
-        47, 48, 29, 30, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 34, 35, 36, 37, 38, 29, 51,
-        34, 29, 29, 29, 43, 44, 45, 29,
-        46, 47, 48, 29, 30, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 34, 35, 36, 37, 38, 29,
-        29, 34, 29, 29, 29, 43, 44, 45,
-        29, 46, 47, 48, 29, 30, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 34, 35, 36, 37, 38,
-        39, 40, 34, 29, 29, 29, 43, 44,
-        45, 29, 46, 47, 48, 29, 30, 29,
-        29, 31, 32, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 34, 35, 36, 37,
-        38, 39, 40, 34, 41, 29, 42, 43,
-        44, 45, 29, 46, 47, 48, 29, 30,
-        29, 29, 31, 32, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 34, 35, 36,
-        37, 38, 39, 40, 34, 41, 33, 42,
-        43, 44, 45, 29, 46, 47, 48, 29,
-        53, 52, 52, 52, 52, 52, 52, 52,
-        54, 52, 5, 55, 53, 52, 6, 56,
-        56, 1, 57, 56, 56, 56, 56, 56,
-        56, 56, 56, 58, 10, 11, 12, 13,
-        14, 15, 16, 10, 17, 19, 19, 20,
-        21, 22, 56, 23, 24, 25, 56, 6,
-        56, 56, 1, 57, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 10, 11, 12,
-        13, 14, 15, 16, 10, 17, 19, 19,
-        20, 21, 22, 56, 23, 24, 25, 56,
-        6, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 10, 11,
-        12, 13, 14, 56, 56, 56, 56, 56,
-        56, 20, 21, 22, 56, 23, 24, 25,
-        56, 6, 56, 56, 56, 56, 56, 56,
+        1, 0, 3, 2, 2, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2,
+        4, 2, 3, 2, 6, 5, 7, 8,
+        9, 7, 10, 8, 9, 9, 11, 9,
+        9, 3, 12, 9, 9, 13, 7, 7,
+        14, 15, 9, 9, 16, 17, 18, 19,
+        20, 21, 22, 16, 23, 24, 25, 26,
+        27, 28, 9, 29, 30, 31, 9, 9,
+        9, 32, 9, 34, 33, 36, 35, 35,
+        37, 1, 35, 35, 38, 35, 35, 35,
+        35, 35, 39, 40, 41, 42, 43, 44,
+        45, 46, 40, 47, 39, 48, 49, 50,
+        51, 35, 52, 53, 54, 35, 36, 35,
+        35, 37, 1, 35, 35, 38, 35, 35,
+        35, 35, 35, 55, 40, 41, 42, 43,
+        44, 45, 46, 40, 47, 48, 48, 49,
+        50, 51, 35, 52, 53, 54, 35, 37,
         56, 56, 56, 56, 56, 56, 56, 56,
-        11, 12, 13, 14, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 23, 24,
-        25, 56, 6, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 12, 13, 14, 56, 6, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 13,
-        14, 56, 6, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 14, 56, 6, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 12, 13,
-        14, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 23, 24, 25, 56, 6,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 12,
-        13, 14, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 24, 25, 56,
-        6, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        12, 13, 14, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 25,
-        56, 6, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        11, 12, 13, 14, 56, 56, 56, 56,
-        56, 56, 20, 21, 22, 56, 23, 24,
-        25, 56, 6, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 11, 12, 13, 14, 56, 56, 56,
-        56, 56, 56, 56, 21, 22, 56, 23,
-        24, 25, 56, 6, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 11, 12, 13, 14, 56, 56,
-        56, 56, 56, 56, 56, 56, 22, 56,
-        23, 24, 25, 56, 6, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 10, 11, 12, 13, 14, 56,
-        16, 10, 56, 56, 56, 20, 21, 22,
-        56, 23, 24, 25, 56, 6, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 10, 11, 12, 13, 14,
-        56, 59, 10, 56, 56, 56, 20, 21,
-        22, 56, 23, 24, 25, 56, 6, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 10, 11, 12, 13,
-        14, 56, 56, 10, 56, 56, 56, 20,
-        21, 22, 56, 23, 24, 25, 56, 6,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 10, 11, 12,
-        13, 14, 15, 16, 10, 56, 56, 56,
-        20, 21, 22, 56, 23, 24, 25, 56,
-        6, 56, 56, 1, 57, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 10, 11,
-        12, 13, 14, 15, 16, 10, 17, 56,
-        19, 20, 21, 22, 56, 23, 24, 25,
-        56, 1, 60, 3, 56, 56, 56, 3,
-        56, 56, 6, 56, 56, 1, 57, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        10, 11, 12, 13, 14, 15, 16, 10,
-        17, 18, 19, 20, 21, 22, 56, 23,
-        24, 25, 56, 6, 56, 56, 1, 57,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 10, 11, 12, 13, 14, 15, 16,
-        10, 17, 18, 19, 20, 21, 22, 56,
-        23, 24, 25, 56, 62, 61, 61, 61,
-        61, 61, 61, 61, 61, 61, 61, 61,
-        61, 61, 61, 61, 61, 61, 61, 61,
-        62, 63, 61, 62, 63, 61, 63, 61,
-        3, 60, 60, 60, 3, 60, 0
+        56, 56, 56, 56, 56, 57, 56, 37,
+        56, 36, 35, 35, 37, 1, 35, 35,
+        38, 35, 35, 35, 35, 35, 35, 40,
+        41, 42, 43, 44, 45, 46, 40, 47,
+        48, 48, 49, 50, 51, 35, 52, 53,
+        54, 35, 36, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        40, 41, 42, 43, 44, 35, 35, 35,
+        35, 35, 35, 49, 50, 51, 35, 52,
+        53, 54, 35, 36, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 41, 42, 43, 44, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        52, 53, 54, 35, 36, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 42, 43, 44, 35,
+        36, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 43, 44, 35, 36, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 44, 35,
+        36, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        42, 43, 44, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 52, 53, 54,
+        35, 36, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 42, 43, 44, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 53,
+        54, 35, 36, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 42, 43, 44, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 54, 35, 36, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 41, 42, 43, 44, 35, 35,
+        35, 35, 35, 35, 49, 50, 51, 35,
+        52, 53, 54, 35, 36, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 41, 42, 43, 44, 35,
+        35, 35, 35, 35, 35, 35, 50, 51,
+        35, 52, 53, 54, 35, 36, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 41, 42, 43, 44,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        51, 35, 52, 53, 54, 35, 36, 35,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 40, 41, 42, 43,
+        44, 35, 46, 40, 35, 35, 35, 49,
+        50, 51, 35, 52, 53, 54, 35, 36,
+        35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 40, 41, 42,
+        43, 44, 35, 58, 40, 35, 35, 35,
+        49, 50, 51, 35, 52, 53, 54, 35,
+        36, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 40, 41,
+        42, 43, 44, 35, 35, 40, 35, 35,
+        35, 49, 50, 51, 35, 52, 53, 54,
+        35, 36, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 40,
+        41, 42, 43, 44, 45, 46, 40, 35,
+        35, 35, 49, 50, 51, 35, 52, 53,
+        54, 35, 36, 35, 35, 37, 1, 35,
+        35, 38, 35, 35, 35, 35, 35, 35,
+        40, 41, 42, 43, 44, 45, 46, 40,
+        47, 35, 48, 49, 50, 51, 35, 52,
+        53, 54, 35, 36, 35, 35, 37, 1,
+        35, 35, 38, 35, 35, 35, 35, 35,
+        35, 40, 41, 42, 43, 44, 45, 46,
+        40, 47, 39, 48, 49, 50, 51, 35,
+        52, 53, 54, 35, 60, 59, 59, 59,
+        59, 59, 59, 59, 61, 59, 10, 62,
+        60, 59, 11, 63, 63, 3, 6, 63,
+        63, 64, 63, 63, 63, 63, 63, 65,
+        16, 17, 18, 19, 20, 21, 22, 16,
+        23, 25, 25, 26, 27, 28, 63, 29,
+        30, 31, 63, 11, 63, 63, 3, 6,
+        63, 63, 64, 63, 63, 63, 63, 63,
+        63, 16, 17, 18, 19, 20, 21, 22,
+        16, 23, 25, 25, 26, 27, 28, 63,
+        29, 30, 31, 63, 11, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 16, 17, 18, 19, 20, 63,
+        63, 63, 63, 63, 63, 26, 27, 28,
+        63, 29, 30, 31, 63, 11, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 17, 18, 19, 20,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 29, 30, 31, 63, 11, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 18, 19,
+        20, 63, 11, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 19, 20, 63, 11, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        20, 63, 11, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 18, 19, 20, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 29,
+        30, 31, 63, 11, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 18, 19, 20, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 30, 31, 63, 11, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 18, 19, 20, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 31, 63, 11, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 17, 18, 19, 20,
+        63, 63, 63, 63, 63, 63, 26, 27,
+        28, 63, 29, 30, 31, 63, 11, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 17, 18, 19,
+        20, 63, 63, 63, 63, 63, 63, 63,
+        27, 28, 63, 29, 30, 31, 63, 11,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 17, 18,
+        19, 20, 63, 63, 63, 63, 63, 63,
+        63, 63, 28, 63, 29, 30, 31, 63,
+        11, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 16, 17,
+        18, 19, 20, 63, 22, 16, 63, 63,
+        63, 26, 27, 28, 63, 29, 30, 31,
+        63, 11, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 16,
+        17, 18, 19, 20, 63, 66, 16, 63,
+        63, 63, 26, 27, 28, 63, 29, 30,
+        31, 63, 11, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        16, 17, 18, 19, 20, 63, 63, 16,
+        63, 63, 63, 26, 27, 28, 63, 29,
+        30, 31, 63, 11, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 16, 17, 18, 19, 20, 21, 22,
+        16, 63, 63, 63, 26, 27, 28, 63,
+        29, 30, 31, 63, 11, 63, 63, 3,
+        6, 63, 63, 64, 63, 63, 63, 63,
+        63, 63, 16, 17, 18, 19, 20, 21,
+        22, 16, 23, 63, 25, 26, 27, 28,
+        63, 29, 30, 31, 63, 3, 67, 67,
+        67, 67, 67, 67, 67, 67, 67, 67,
+        67, 67, 67, 4, 67, 6, 67, 8,
+        63, 63, 63, 8, 63, 63, 11, 63,
+        63, 3, 6, 63, 63, 64, 63, 63,
+        63, 63, 63, 63, 16, 17, 18, 19,
+        20, 21, 22, 16, 23, 24, 25, 26,
+        27, 28, 63, 29, 30, 31, 63, 11,
+        63, 63, 3, 6, 63, 63, 64, 63,
+        63, 63, 63, 63, 63, 16, 17, 18,
+        19, 20, 21, 22, 16, 23, 24, 25,
+        26, 27, 28, 63, 29, 30, 31, 63,
+        69, 68, 68, 68, 68, 68, 68, 68,
+        68, 68, 68, 68, 68, 68, 68, 68,
+        68, 68, 68, 68, 69, 70, 68, 69,
+        70, 68, 70, 68, 8, 67, 67, 67,
+        8, 67, 0
 };
 
 static const char _use_syllable_machine_trans_targs[] = {
-        1, 27, 2, 3, 1, 24, 1, 45,
-        46, 48, 29, 30, 31, 32, 33, 40,
-        41, 43, 47, 44, 37, 38, 39, 34,
-        35, 36, 51, 1, 1, 1, 1, 4,
-        5, 23, 7, 8, 9, 10, 11, 18,
-        19, 21, 22, 15, 16, 17, 12, 13,
-        14, 6, 1, 20, 1, 25, 26, 1,
-        1, 0, 28, 42, 1, 1, 49, 50
+        4, 8, 4, 31, 2, 4, 1, 5,
+        6, 4, 28, 4, 49, 50, 51, 53,
+        33, 34, 35, 36, 37, 44, 45, 47,
+        52, 48, 41, 42, 43, 38, 39, 40,
+        56, 4, 4, 4, 4, 7, 0, 27,
+        11, 12, 13, 14, 15, 22, 23, 25,
+        26, 19, 20, 21, 16, 17, 18, 10,
+        4, 9, 24, 4, 29, 30, 4, 4,
+        3, 32, 46, 4, 4, 54, 55
 };
 
 static const char _use_syllable_machine_trans_actions[] = {
-        1, 2, 0, 0, 5, 0, 6, 0,
-        2, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 2, 2, 0, 0, 0, 0,
-        0, 0, 0, 7, 8, 9, 10, 0,
+        1, 0, 2, 3, 0, 4, 0, 0,
+        7, 8, 0, 9, 10, 10, 3, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
+        3, 3, 0, 0, 0, 0, 0, 0,
+        0, 11, 12, 13, 14, 7, 0, 7,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 11, 0, 12, 0, 0, 13,
-        14, 0, 2, 0, 15, 16, 0, 0
+        7, 0, 0, 0, 0, 0, 0, 7,
+        15, 0, 0, 16, 0, 0, 17, 18,
+        0, 3, 0, 19, 20, 0, 0
 };
 
 static const char _use_syllable_machine_to_state_actions[] = {
-        0, 3, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 5, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0
 };
 
 static const char _use_syllable_machine_from_state_actions[] = {
-        0, 4, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 6, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0
 };
 
 static const short _use_syllable_machine_eof_trans[] = {
-        1, 0, 28, 30, 30, 51, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30,
-        53, 56, 53, 57, 57, 57, 57, 57,
-        57, 57, 57, 57, 57, 57, 57, 57,
-        57, 57, 57, 57, 57, 61, 57, 57,
-        62, 62, 62, 61
+        1, 3, 3, 6, 0, 34, 36, 36,
+        57, 57, 36, 36, 36, 36, 36, 36,
+        36, 36, 36, 36, 36, 36, 36, 36,
+        36, 36, 36, 36, 60, 63, 60, 64,
+        64, 64, 64, 64, 64, 64, 64, 64,
+        64, 64, 64, 64, 64, 64, 64, 64,
+        64, 68, 68, 64, 64, 69, 69, 69,
+        68
 };
 
-static const int use_syllable_machine_start = 1;
-static const int use_syllable_machine_first_final = 1;
+static const int use_syllable_machine_start = 4;
+static const int use_syllable_machine_first_final = 4;
 static const int use_syllable_machine_error = -1;
 
-static const int use_syllable_machine_en_main = 1;
+static const int use_syllable_machine_en_main = 4;
 
 
 #line 38 "hb-ot-shape-complex-use-machine.rl"
 
 
 
-#line 140 "hb-ot-shape-complex-use-machine.rl"
+#line 141 "hb-ot-shape-complex-use-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -320,7 +335,7 @@ find_syllables (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 324 "hb-ot-shape-complex-use-machine.hh"
+#line 339 "hb-ot-shape-complex-use-machine.hh"
         {
         cs = use_syllable_machine_start;
         ts = 0;
@@ -328,7 +343,7 @@ find_syllables (hb_buffer_t *buffer)
         act = 0;
         }
 
-#line 161 "hb-ot-shape-complex-use-machine.rl"
+#line 162 "hb-ot-shape-complex-use-machine.rl"
 
 
   p = 0;
@@ -337,7 +352,7 @@ find_syllables (hb_buffer_t *buffer)
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
 
-#line 341 "hb-ot-shape-complex-use-machine.hh"
+#line 356 "hb-ot-shape-complex-use-machine.hh"
         {
         int _slen;
         int _trans;
@@ -347,11 +362,11 @@ find_syllables (hb_buffer_t *buffer)
                 goto _test_eof;
 _resume:
         switch ( _use_syllable_machine_from_state_actions[cs] ) {
-        case 4:
+        case 6:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 355 "hb-ot-shape-complex-use-machine.hh"
+#line 370 "hb-ot-shape-complex-use-machine.hh"
         }
 
         _keys = _use_syllable_machine_trans_keys + (cs<<1);
@@ -369,72 +384,100 @@ _eof_trans:
                 goto _again;
 
         switch ( _use_syllable_machine_trans_actions[_trans] ) {
-        case 2:
+        case 7:
 #line 1 "NONE"
         {te = p+1;}
         break;
-        case 8:
-#line 129 "hb-ot-shape-complex-use-machine.rl"
+        case 12:
+#line 130 "hb-ot-shape-complex-use-machine.rl"
         {te = p+1;{ found_syllable (independent_cluster); }}
         break;
-        case 10:
-#line 131 "hb-ot-shape-complex-use-machine.rl"
+        case 14:
+#line 132 "hb-ot-shape-complex-use-machine.rl"
         {te = p+1;{ found_syllable (standard_cluster); }}
         break;
-        case 6:
-#line 135 "hb-ot-shape-complex-use-machine.rl"
+        case 9:
+#line 136 "hb-ot-shape-complex-use-machine.rl"
         {te = p+1;{ found_syllable (broken_cluster); }}
         break;
-        case 5:
-#line 136 "hb-ot-shape-complex-use-machine.rl"
+        case 8:
+#line 137 "hb-ot-shape-complex-use-machine.rl"
         {te = p+1;{ found_syllable (non_cluster); }}
         break;
-        case 7:
-#line 129 "hb-ot-shape-complex-use-machine.rl"
-        {te = p;p--;{ found_syllable (independent_cluster); }}
-        break;
         case 11:
 #line 130 "hb-ot-shape-complex-use-machine.rl"
-        {te = p;p--;{ found_syllable (virama_terminated_cluster); }}
+        {te = p;p--;{ found_syllable (independent_cluster); }}
         break;
-        case 9:
+        case 15:
 #line 131 "hb-ot-shape-complex-use-machine.rl"
-        {te = p;p--;{ found_syllable (standard_cluster); }}
+        {te = p;p--;{ found_syllable (virama_terminated_cluster); }}
         break;
         case 13:
 #line 132 "hb-ot-shape-complex-use-machine.rl"
-        {te = p;p--;{ found_syllable (number_joiner_terminated_cluster); }}
+        {te = p;p--;{ found_syllable (standard_cluster); }}
         break;
-        case 12:
+        case 17:
 #line 133 "hb-ot-shape-complex-use-machine.rl"
-        {te = p;p--;{ found_syllable (numeral_cluster); }}
+        {te = p;p--;{ found_syllable (number_joiner_terminated_cluster); }}
         break;
         case 16:
 #line 134 "hb-ot-shape-complex-use-machine.rl"
+        {te = p;p--;{ found_syllable (numeral_cluster); }}
+        break;
+        case 20:
+#line 135 "hb-ot-shape-complex-use-machine.rl"
         {te = p;p--;{ found_syllable (symbol_cluster); }}
         break;
-        case 14:
-#line 135 "hb-ot-shape-complex-use-machine.rl"
+        case 18:
+#line 136 "hb-ot-shape-complex-use-machine.rl"
         {te = p;p--;{ found_syllable (broken_cluster); }}
         break;
-        case 15:
-#line 136 "hb-ot-shape-complex-use-machine.rl"
+        case 19:
+#line 137 "hb-ot-shape-complex-use-machine.rl"
         {te = p;p--;{ found_syllable (non_cluster); }}
         break;
         case 1:
-#line 135 "hb-ot-shape-complex-use-machine.rl"
+#line 132 "hb-ot-shape-complex-use-machine.rl"
+        {{p = ((te))-1;}{ found_syllable (standard_cluster); }}
+        break;
+        case 4:
+#line 136 "hb-ot-shape-complex-use-machine.rl"
         {{p = ((te))-1;}{ found_syllable (broken_cluster); }}
         break;
-#line 429 "hb-ot-shape-complex-use-machine.hh"
+        case 2:
+#line 1 "NONE"
+        {       switch( act ) {
+        case 7:
+        {{p = ((te))-1;} found_syllable (broken_cluster); }
+        break;
+        case 8:
+        {{p = ((te))-1;} found_syllable (non_cluster); }
+        break;
+        }
+        }
+        break;
+        case 3:
+#line 1 "NONE"
+        {te = p+1;}
+#line 136 "hb-ot-shape-complex-use-machine.rl"
+        {act = 7;}
+        break;
+        case 10:
+#line 1 "NONE"
+        {te = p+1;}
+#line 137 "hb-ot-shape-complex-use-machine.rl"
+        {act = 8;}
+        break;
+#line 472 "hb-ot-shape-complex-use-machine.hh"
         }
 
 _again:
         switch ( _use_syllable_machine_to_state_actions[cs] ) {
-        case 3:
+        case 5:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 438 "hb-ot-shape-complex-use-machine.hh"
+#line 481 "hb-ot-shape-complex-use-machine.hh"
         }
 
         if ( ++p != pe )
@@ -450,7 +493,7 @@ _again:
 
         }
 
-#line 170 "hb-ot-shape-complex-use-machine.rl"
+#line 171 "hb-ot-shape-complex-use-machine.rl"
 
 }
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh
index fd4e6363429..d59813e1b4b 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh
@@ -92,6 +92,6 @@ enum use_category_t {
 };
 
 HB_INTERNAL USE_TABLE_ELEMENT_TYPE
-hb_use_get_categories (hb_codepoint_t u);
+hb_use_get_category (hb_codepoint_t u);
 
 #endif /* HB_OT_SHAPE_COMPLEX_USE_PRIVATE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc
index ba9067f4539..b1975e666e4 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc
@@ -75,7 +75,13 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 00C0 */     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 00D0 */     O,     O,     O,     O,     O,     O,     O,    GB,
 
-#define use_offset_0x0900u 80
+#define use_offset_0x0348u 80
+
+
+  /* Combining Diacritical Marks */
+                                                                         O,     O,     O,     O,     O,     O,     O,   CGJ,
+
+#define use_offset_0x0900u 88
 
 
   /* Devanagari */
@@ -188,7 +194,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 0DE0 */     O,     O,     O,     O,     O,     O,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 0DF0 */     O,     O,  VPst,  VPst,     O,     O,     O,     O,
 
-#define use_offset_0x1000u 1352
+#define use_offset_0x1000u 1360
 
 
   /* Myanmar */
@@ -204,7 +210,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 1080 */     B,     B,  MBlw,  VPst,  VPre,  VAbv,  VAbv, VMPst, VMPst, VMPst, VMPst, VMPst, VMPst, VMBlw,     B, VMPst,
   /* 1090 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B, VMPst, VMPst,  VPst,  VAbv,     O,     O,
 
-#define use_offset_0x1700u 1512
+#define use_offset_0x1700u 1520
 
 
   /* Tagalog */
@@ -237,7 +243,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 17D0 */    FM,  VAbv,     H,    FM,     O,     O,     O,     O,     O,     O,     O,     O,     B,  VAbv,     O,     O,
   /* 17E0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x1900u 1752
+#define use_offset_0x1900u 1760
 
 
   /* Limbu */
@@ -281,7 +287,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 1A80 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
   /* 1A90 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x1b00u 2168
+#define use_offset_0x1b00u 2176
 
 
   /* Balinese */
@@ -307,7 +313,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 1BC0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 1BD0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 1BE0 */     B,     B,     B,     B,     B,     B, CMAbv,  VPst,  VAbv,  VAbv,  VPst,  VPst,  VPst,  VAbv,  VPst,  VAbv,
-  /* 1BF0 */  FAbv,  FAbv,  VPst,  VPst,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
+  /* 1BF0 */  FAbv,  FAbv, CMBlw, CMBlw,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
 
   /* Lepcha */
 
@@ -317,7 +323,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 1C30 */  FAbv,  FAbv,  FAbv,  FAbv, VMPre, VMPre,    FM, CMBlw,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 1C40 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     B,     B,     B,
 
-#define use_offset_0x1cd0u 2504
+#define use_offset_0x1cd0u 2512
 
 
   /* Vedic Extensions */
@@ -326,20 +332,20 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 1CE0 */ VMAbv, VMPst, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw,     O,     O,     O,     O, VMBlw,     O,     O,
   /* 1CF0 */     O,     O, VMPst, VMPst, VMAbv,     O,     O, VMPst, VMAbv, VMAbv,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x1df8u 2552
+#define use_offset_0x1df8u 2560
 
 
   /* Combining Diacritical Marks Supplement */
                                                                          O,     O,     O,    FM,     O,     O,     O,     O,
 
-#define use_offset_0x2008u 2560
+#define use_offset_0x2008u 2568
 
 
   /* General Punctuation */
                                                                          O,     O,     O,     O,  ZWNJ,   ZWJ,     O,     O,
   /* 2010 */    GB,    GB,    GB,    GB,    GB,     O,     O,     O,
 
-#define use_offset_0x2060u 2576
+#define use_offset_0x2060u 2584
 
   /* 2060 */    WJ,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
 
@@ -348,7 +354,20 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 2070 */     O,     O,     O,     O,    FM,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 2080 */     O,     O,    FM,    FM,    FM,     O,     O,     O,
 
-#define use_offset_0xa800u 2616
+#define use_offset_0x20f0u 2624
+
+
+  /* Combining Diacritical Marks for Symbols */
+
+  /* 20F0 */ VMAbv,     O,     O,     O,     O,     O,     O,     O,
+
+#define use_offset_0x25c8u 2632
+
+
+  /* Geometric Shapes */
+                                                                         O,     O,     O,     O,    GB,     O,     O,     O,
+
+#define use_offset_0xa800u 2640
 
 
   /* Syloti Nagri */
@@ -370,7 +389,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* A880 */ VMPst, VMPst,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* A890 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* A8A0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
-  /* A8B0 */     B,     B,     B,     B,  FPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,
+  /* A8B0 */     B,     B,     B,     B,  MPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,
   /* A8C0 */  VPst,  VPst,  VPst,  VPst,     H, VMAbv,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* A8D0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
@@ -435,7 +454,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* AAE0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,  VPre,  VBlw,  VAbv,  VPre,  VPst,
   /* AAF0 */     O,     O,     O,     O,     O, VMPst,     H,     O,
 
-#define use_offset_0xabc0u 3376
+#define use_offset_0xabc0u 3400
 
 
   /* Meetei Mayek */
@@ -445,14 +464,14 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* ABE0 */     B,     B,     B,  VPst,  VPst,  VAbv,  VPst,  VPst,  VBlw,  VPst,  VPst,     O, VMPst,  VBlw,     O,     O,
   /* ABF0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0xfe00u 3440
+#define use_offset_0xfe00u 3464
 
 
   /* Variation Selectors */
 
   /* FE00 */    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,
 
-#define use_offset_0x10a00u 3456
+#define use_offset_0x10a00u 3480
 
 
   /* Kharoshthi */
@@ -463,7 +482,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 10A30 */     B,     B,     B,     B,     O,     O,     O,     O, CMAbv, CMBlw, CMBlw,     O,     O,     O,     O,     H,
   /* 10A40 */     B,     B,     B,     B,     B,     B,     B,     B,
 
-#define use_offset_0x11000u 3528
+#define use_offset_0x11000u 3552
 
 
   /* Brahmi */
@@ -475,7 +494,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11040 */  VBlw,  VBlw,  VAbv,  VAbv,  VAbv,  VAbv,     H,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 11050 */     O,     O,     N,     N,     N,     N,     N,     N,     N,     N,     N,     N,     N,     N,     N,     N,
   /* 11060 */     N,     N,     N,     N,     N,     N,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
-  /* 11070 */     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
+  /* 11070 */     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,    HN,
 
   /* Kaithi */
 
@@ -484,7 +503,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 110A0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 110B0 */  VPst,  VPre,  VPst,  VBlw,  VBlw,  VAbv,  VAbv,  VPst,  VPst,     H, CMBlw,     O,     O,     O,     O,     O,
 
-#define use_offset_0x11100u 3720
+#define use_offset_0x11100u 3744
 
 
   /* Chakma */
@@ -522,7 +541,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11220 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,  VPst,  VPst,  VPst,  VBlw,
   /* 11230 */  VAbv,  VAbv,  VAbv,  VAbv, VMAbv,     H, CMAbv, CMAbv,     O,     O,     O,     O,     O,     O, VMAbv,     O,
 
-#define use_offset_0x11280u 4040
+#define use_offset_0x11280u 4064
 
 
   /* Multani */
@@ -550,7 +569,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11360 */     B,     B,  VPst,  VPst,     O,     O, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,     O,     O,     O,
   /* 11370 */ VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,     O,     O,     O,
 
-#define use_offset_0x11400u 4288
+#define use_offset_0x11400u 4312
 
 
   /* Newa */
@@ -573,7 +592,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 114C0 */ VMAbv, VMPst,     H, CMBlw,     B,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 114D0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x11580u 4512
+#define use_offset_0x11580u 4536
 
 
   /* Siddham */
@@ -616,7 +635,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11720 */  VPst,  VPst,  VAbv,  VAbv,  VBlw,  VBlw,  VPre,  VAbv,  VBlw,  VAbv,  VAbv,  VAbv,     O,     O,     O,     O,
   /* 11730 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,
 
-#define use_offset_0x11a00u 4960
+#define use_offset_0x11a00u 4984
 
 
   /* Zanabazar Square */
@@ -635,7 +654,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11A80 */     B,     B,     B,     B,     O,     O,     R,     R,     R,     R,  FBlw,  FBlw,  FBlw,  FBlw,  FBlw,  FBlw,
   /* 11A90 */  FBlw,  FBlw,  FBlw,  FBlw,  FBlw,  FBlw, VMAbv, VMPst, CMAbv,     H,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x11c00u 5120
+#define use_offset_0x11c00u 5144
 
 
   /* Bhaiksuki */
@@ -656,7 +675,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11CA0 */   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,     O,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,
   /* 11CB0 */  VBlw,  VPre,  VBlw,  VAbv,  VPst, VMAbv, VMAbv,     O,
 
-#define use_offset_0x11d00u 5304
+#define use_offset_0x11d00u 5328
 
 
   /* Masaram Gondi */
@@ -668,18 +687,18 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11D40 */ VMAbv, VMAbv, CMBlw,  VAbv,  VBlw,     H,     R,  MBlw,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 11D50 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-}; /* Table items: 5400; occupancy: 73% */
+}; /* Table items: 5424; occupancy: 73% */
 
 USE_TABLE_ELEMENT_TYPE
-hb_use_get_categories (hb_codepoint_t u)
+hb_use_get_category (hb_codepoint_t u)
 {
   switch (u >> 12)
   {
     case 0x0u:
       if (hb_in_range<hb_codepoint_t> (u, 0x0028u, 0x003Fu)) return use_table[u - 0x0028u + use_offset_0x0028u];
       if (hb_in_range<hb_codepoint_t> (u, 0x00A0u, 0x00D7u)) return use_table[u - 0x00A0u + use_offset_0x00a0u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x0348u, 0x034Fu)) return use_table[u - 0x0348u + use_offset_0x0348u];
       if (hb_in_range<hb_codepoint_t> (u, 0x0900u, 0x0DF7u)) return use_table[u - 0x0900u + use_offset_0x0900u];
-      if (unlikely (u == 0x034Fu)) return CGJ;
       break;
 
     case 0x1u:
@@ -694,7 +713,8 @@ hb_use_get_categories (hb_codepoint_t u)
     case 0x2u:
       if (hb_in_range<hb_codepoint_t> (u, 0x2008u, 0x2017u)) return use_table[u - 0x2008u + use_offset_0x2008u];
       if (hb_in_range<hb_codepoint_t> (u, 0x2060u, 0x2087u)) return use_table[u - 0x2060u + use_offset_0x2060u];
-      if (unlikely (u == 0x25CCu)) return GB;
+      if (hb_in_range<hb_codepoint_t> (u, 0x20F0u, 0x20F7u)) return use_table[u - 0x20F0u + use_offset_0x20f0u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x25C8u, 0x25CFu)) return use_table[u - 0x25C8u + use_offset_0x25c8u];
       break;
 
     case 0xAu:
@@ -719,7 +739,6 @@ hb_use_get_categories (hb_codepoint_t u)
       if (hb_in_range<hb_codepoint_t> (u, 0x11A00u, 0x11A9Fu)) return use_table[u - 0x11A00u + use_offset_0x11a00u];
       if (hb_in_range<hb_codepoint_t> (u, 0x11C00u, 0x11CB7u)) return use_table[u - 0x11C00u + use_offset_0x11c00u];
       if (hb_in_range<hb_codepoint_t> (u, 0x11D00u, 0x11D5Fu)) return use_table[u - 0x11D00u + use_offset_0x11d00u];
-      if (unlikely (u == 0x1107Fu)) return HN;
       break;
 
     default:
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc
index b024b8f5fde..6f3b50c0ebc 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc
@@ -262,7 +262,7 @@ setup_masks_use (const hb_ot_shape_plan_t *plan,
   unsigned int count = buffer->len;
   hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 0; i < count; i++)
-    info[i].use_category() = hb_use_get_categories (info[i].codepoint);
+    info[i].use_category() = hb_use_get_category (info[i].codepoint);
 }
 
 static void
@@ -505,7 +505,7 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
   hb_glyph_info_t dottedcircle = {0};
   if (!font->get_nominal_glyph (0x25CCu, &dottedcircle.codepoint))
     return;
-  dottedcircle.use_category() = hb_use_get_categories (0x25CC);
+  dottedcircle.use_category() = hb_use_get_category (0x25CC);
 
   buffer->clear_output ();
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc
index 816ba592fda..49a93e78e8a 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc
@@ -200,8 +200,7 @@ position_mark (const hb_ot_shape_plan_t *plan,
                unsigned int combining_class)
 {
   hb_glyph_extents_t mark_extents;
-  if (!font->get_glyph_extents (buffer->info[i].codepoint,
-                                &mark_extents))
+  if (!font->get_glyph_extents (buffer->info[i].codepoint, &mark_extents))
     return;
 
   hb_position_t y_gap = font->y_scale / 16;
@@ -218,10 +217,10 @@ position_mark (const hb_ot_shape_plan_t *plan,
     case HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW:
     case HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE:
       if (buffer->props.direction == HB_DIRECTION_LTR) {
-        pos.x_offset += base_extents.x_bearing - mark_extents.width / 2 - mark_extents.x_bearing;
+        pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width / 2 - mark_extents.x_bearing;
         break;
       } else if (buffer->props.direction == HB_DIRECTION_RTL) {
-        pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width / 2 - mark_extents.x_bearing;
+        pos.x_offset += base_extents.x_bearing - mark_extents.width / 2 - mark_extents.x_bearing;
         break;
       }
       HB_FALLTHROUGH;
@@ -322,7 +321,9 @@ position_around_base (const hb_ot_shape_plan_t *plan,
   base_extents.y_bearing += buffer->pos[base].y_offset;
 
   unsigned int lig_id = _hb_glyph_info_get_lig_id (&buffer->info[base]);
-  unsigned int num_lig_components = _hb_glyph_info_get_lig_num_comps (&buffer->info[base]);
+  /* Use integer for num_lig_components such that it doesn't convert to unsigned
+   * when we divide or multiply by it. */
+  int num_lig_components = _hb_glyph_info_get_lig_num_comps (&buffer->info[base]);
 
   hb_position_t x_offset = 0, y_offset = 0;
   if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) {
@@ -331,7 +332,7 @@ position_around_base (const hb_ot_shape_plan_t *plan,
   }
 
   hb_glyph_extents_t component_extents = base_extents;
-  unsigned int last_lig_component = (unsigned int) -1;
+  int last_lig_component = -1;
   unsigned int last_combining_class = 255;
   hb_glyph_extents_t cluster_extents = base_extents; /* Initialization is just to shut gcc up. */
   hb_glyph_info_t *info = buffer->info;
@@ -340,7 +341,7 @@ position_around_base (const hb_ot_shape_plan_t *plan,
     {
       if (num_lig_components > 1) {
         unsigned int this_lig_id = _hb_glyph_info_get_lig_id (&info[i]);
-        unsigned int this_lig_component = _hb_glyph_info_get_lig_comp (&info[i]) - 1;
+        int this_lig_component = _hb_glyph_info_get_lig_comp (&info[i]) - 1;
         /* Conditions for attaching to the last component. */
         if (!lig_id || lig_id != this_lig_id || this_lig_component >= num_lig_components)
           this_lig_component = num_lig_components - 1;
@@ -442,10 +443,10 @@ _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan,
 {
   if (!plan->has_kern) return;
 
-  OT::hb_apply_context_t c (1, font, buffer);
+  OT::hb_ot_apply_context_t c (1, font, buffer);
   c.set_lookup_mask (plan->kern_mask);
   c.set_lookup_props (OT::LookupFlag::IgnoreMarks);
-  OT::hb_apply_context_t::skipping_iterator_t &skippy_iter = c.iter_input;
+  OT::hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c.iter_input;
   skippy_iter.init (&c);
 
   unsigned int count = buffer->len;
@@ -473,6 +474,7 @@ _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan,
       pos[idx].x_advance += kern1;
       pos[skippy_iter.idx].x_advance += kern2;
       pos[skippy_iter.idx].x_offset += kern2;
+      buffer->unsafe_to_break (idx, skippy_iter.idx + 1);
     }
 
     if (y_kern)
@@ -482,6 +484,7 @@ _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan,
       pos[idx].y_advance += kern1;
       pos[skippy_iter.idx].y_advance += kern2;
       pos[skippy_iter.idx].y_offset += kern2;
+      buffer->unsafe_to_break (idx, skippy_iter.idx + 1);
     }
 
     idx = skippy_iter.idx;
@@ -524,7 +527,7 @@ _hb_ot_shape_fallback_spaces (const hb_ot_shape_plan_t *plan,
           break;
 
         case t::SPACE_4_EM_18:
-          pos[i].x_advance = font->x_scale * 4 / 18;
+          pos[i].x_advance = (int64_t) font->x_scale * 4 / 18;
           break;
 
         case t::SPACE_FIGURE:
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc
index 9f1026ce9ea..e94070de0ce 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc
@@ -345,9 +345,8 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
       if (_hb_glyph_info_get_modified_combining_class (&buffer->info[end]) == 0)
         break;
 
-    /* We are going to do a O(n^2).  Only do this if the sequence is short,
-     * but not too short ;). */
-    if (end - i < 2 || end - i > HB_OT_SHAPE_COMPLEX_MAX_COMBINING_MARKS) {
+    /* We are going to do a O(n^2).  Only do this if the sequence is short. */
+    if (end - i > HB_OT_SHAPE_COMPLEX_MAX_COMBINING_MARKS) {
       i = end;
       continue;
     }
@@ -373,13 +372,11 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
   buffer->clear_output ();
   count = buffer->len;
   unsigned int starter = 0;
-  bool combine = true;
   buffer->next_glyph ();
   while (buffer->idx < count && !buffer->in_error)
   {
     hb_codepoint_t composed, glyph;
-    if (combine &&
-        /* We don't try to compose a non-mark character with it's preceding starter.
+    if (/* We don't try to compose a non-mark character with it's preceding starter.
          * This is both an optimization to avoid trying to compose every two neighboring
          * glyphs in most scripts AND a desired feature for Hangul.  Apparently Hangul
          * fonts are not designed to mix-and-match pre-composed syllables and Jamo. */
@@ -410,22 +407,27 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
 
         continue;
       }
-      else if (/* We sometimes custom-tailor the sorted order of marks. In that case, stop
-                * trying to combine as soon as combining-class drops. */
-               starter < buffer->out_len - 1 &&
-               info_cc (buffer->prev()) > info_cc (buffer->cur()))
-        combine = false;
     }
 
     /* Blocked, or doesn't compose. */
     buffer->next_glyph ();
 
     if (info_cc (buffer->prev()) == 0)
-    {
       starter = buffer->out_len - 1;
-      combine = true;
-    }
   }
   buffer->swap_buffers ();
 
+  if (buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_CGJ)
+  {
+    /* For all CGJ, check if it prevented any reordering at all.
+     * If it did NOT, then make it skippable.
+     * https://github.com/harfbuzz/harfbuzz/issues/554
+     */
+    for (unsigned int i = 1; i + 1 < buffer->len; i++)
+      if (buffer->info[i].codepoint == 0x034Fu/*CGJ*/ &&
+          info_cc(buffer->info[i-1]) <= info_cc(buffer->info[i+1]))
+      {
+        _hb_glyph_info_unhide (&buffer->info[i]);
+      }
+  }
 }
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc
index 95e915881ab..22b0a8a784a 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc
@@ -40,6 +40,8 @@
 #include "hb-unicode-private.hh"
 #include "hb-set-private.hh"
 
+#include "hb-ot-layout-gsubgpos-private.hh"
+//#include "hb-aat-layout-private.hh"
 
 static hb_tag_t common_features[] = {
   HB_TAG('c','c','m','p'),
@@ -108,7 +110,7 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t          *planner,
     /* We really want to find a 'vert' feature if there's any in the font, no
      * matter which script/langsys it is listed (or not) under.
      * See various bugs referenced from:
-     * https://github.com/behdad/harfbuzz/issues/63 */
+     * https://github.com/harfbuzz/harfbuzz/issues/63 */
     map->add_feature (HB_TAG ('v','e','r','t'), 1, F_GLOBAL | F_GLOBAL_SEARCH);
   }
 
@@ -450,7 +452,8 @@ hb_ot_zero_width_default_ignorables (hb_ot_shape_context_t *c)
   hb_buffer_t *buffer = c->buffer;
 
   if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_DEFAULT_IGNORABLES) ||
-      (buffer->flags & HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES))
+      (buffer->flags & HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES) ||
+      (buffer->flags & HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES))
     return;
 
   unsigned int count = buffer->len;
@@ -486,7 +489,8 @@ hb_ot_hide_default_ignorables (hb_ot_shape_context_t *c)
     return;
 
   hb_codepoint_t space;
-  if (c->font->get_nominal_glyph (' ', &space))
+  if (!(buffer->flags & HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES) &&
+      c->font->get_nominal_glyph (' ', &space))
   {
     /* Replace default-ignorables with a zero-advance space glyph. */
     for (/*continue*/; i < count; i++)
@@ -614,7 +618,8 @@ hb_ot_substitute_complex (hb_ot_shape_context_t *c)
 
   c->plan->substitute (c->font, buffer);
 
-  return;
+  /* XXX Call morx instead. */
+  //hb_aat_layout_substitute (c->font, c->buffer);
 }
 
 static inline void
@@ -782,6 +787,8 @@ hb_ot_position (hb_ot_shape_context_t *c)
     _hb_ot_shape_fallback_kern (c->plan, c->font, c->buffer);
 
   _hb_buffer_deallocate_gsubgpos_vars (c->buffer);
+
+  //hb_aat_layout_position (c->font, c->buffer);
 }
 
 static inline void
@@ -817,11 +824,16 @@ hb_ot_shape_internal (hb_ot_shape_context_t *c)
 {
   c->buffer->deallocate_var_all ();
   c->buffer->scratch_flags = HB_BUFFER_SCRATCH_FLAG_DEFAULT;
-  if (likely (!_hb_unsigned_int_mul_overflows (c->buffer->len, HB_BUFFER_MAX_EXPANSION_FACTOR)))
+  if (likely (!_hb_unsigned_int_mul_overflows (c->buffer->len, HB_BUFFER_MAX_LEN_FACTOR)))
   {
-    c->buffer->max_len = MAX (c->buffer->len * HB_BUFFER_MAX_EXPANSION_FACTOR,
+    c->buffer->max_len = MAX (c->buffer->len * HB_BUFFER_MAX_LEN_FACTOR,
                               (unsigned) HB_BUFFER_MAX_LEN_MIN);
   }
+  if (likely (!_hb_unsigned_int_mul_overflows (c->buffer->len, HB_BUFFER_MAX_OPS_FACTOR)))
+  {
+    c->buffer->max_ops = MAX (c->buffer->len * HB_BUFFER_MAX_OPS_FACTOR,
+                              (unsigned) HB_BUFFER_MAX_OPS_MIN);
+  }
 
   bool disable_otl = c->plan->shaper->disable_otl && c->plan->shaper->disable_otl (c->plan);
   //c->fallback_substitute     = disable_otl || !hb_ot_layout_has_substitution (c->face);
@@ -861,6 +873,7 @@ hb_ot_shape_internal (hb_ot_shape_context_t *c)
   c->buffer->props.direction = c->target_direction;
 
   c->buffer->max_len = HB_BUFFER_MAX_LEN_DEFAULT;
+  c->buffer->max_ops = HB_BUFFER_MAX_OPS_DEFAULT;
   c->buffer->deallocate_var_all ();
 }
 
@@ -946,7 +959,7 @@ hb_ot_shape_glyphs_closure (hb_font_t          *font,
   hb_set_t *copy = hb_set_create ();
   do {
     copy->set (glyphs);
-    for (hb_codepoint_t lookup_index = -1; hb_set_next (lookups, &lookup_index);)
+    for (hb_codepoint_t lookup_index = HB_SET_VALUE_INVALID; hb_set_next (lookups, &lookup_index);)
       hb_ot_layout_lookup_substitute_closure (font->face, lookup_index, glyphs);
   } while (!copy->is_equal (glyphs));
   hb_set_destroy (copy);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc
index b77261a0e48..6b160e23f8a 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc
@@ -920,7 +920,7 @@ hb_ot_tag_from_language (hb_language_t language)
     char tag[4];
     int i;
     s += 6;
-    for (i = 0; i < 4 && ISALPHA (s[i]); i++)
+    for (i = 0; i < 4 && ISALNUM (s[i]); i++)
       tag[i] = TOUPPER (s[i]);
     if (i) {
       for (; i < 4; i++)
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh
index ff7c11e1ad6..d30d814fd24 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh
@@ -133,8 +133,8 @@ struct avar
   protected:
   FixedVersion<>version;        /* Version of the avar table
                                  * initially set to 0x00010000u */
-  USHORT        reserved;       /* This field is permanently reserved. Set to 0. */
-  USHORT        axisCount;      /* The number of variation axes in the font. This
+  HBUINT16      reserved;       /* This field is permanently reserved. Set to 0. */
+  HBUINT16      axisCount;      /* The number of variation axes in the font. This
                                  * must be the same number as axisCount in the
                                  * 'fvar' table. */
   SegmentMaps   axisSegmentMapsZ;
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh
index 68e1da07a90..4254a475332 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh
@@ -42,11 +42,11 @@ struct InstanceRecord
   }
 
   protected:
-  USHORT        subfamilyNameID;/* The name ID for entries in the 'name' table
+  HBUINT16      subfamilyNameID;/* The name ID for entries in the 'name' table
                                  * that provide subfamily names for this instance. */
-  USHORT        reserved;       /* Reserved for future use — set to 0. */
+  HBUINT16      reserved;       /* Reserved for future use — set to 0. */
   Fixed         coordinates[VAR];/* The coordinates array for this instance. */
-  //USHORT      postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
+  //HBUINT16    postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
   //                              * table that provide PostScript names for this
   //                              * instance. */
 
@@ -67,8 +67,8 @@ struct AxisRecord
   Fixed         minValue;       /* The minimum coordinate value for the axis. */
   Fixed         defaultValue;   /* The default coordinate value for the axis. */
   Fixed         maxValue;       /* The maximum coordinate value for the axis. */
-  USHORT        reserved;       /* Reserved for future use — set to 0. */
-  USHORT        axisNameID;     /* The name ID for entries in the 'name' table that
+  HBUINT16      reserved;       /* Reserved for future use — set to 0. */
+  HBUINT16      axisNameID;     /* The name ID for entries in the 'name' table that
                                  * provide a display name for this axis. */
 
   public:
@@ -186,16 +186,16 @@ struct fvar
   protected:
   FixedVersion<>version;        /* Version of the fvar table
                                  * initially set to 0x00010000u */
-  Offset<>      things;         /* Offset in bytes from the beginning of the table
+  Offset16      things;         /* Offset in bytes from the beginning of the table
                                  * to the start of the AxisRecord array. */
-  USHORT        reserved;       /* This field is permanently reserved. Set to 2. */
-  USHORT        axisCount;      /* The number of variation axes in the font (the
+  HBUINT16      reserved;       /* This field is permanently reserved. Set to 2. */
+  HBUINT16      axisCount;      /* The number of variation axes in the font (the
                                  * number of records in the axes array). */
-  USHORT        axisSize;       /* The size in bytes of each VariationAxisRecord —
+  HBUINT16      axisSize;       /* The size in bytes of each VariationAxisRecord —
                                  * set to 20 (0x0014) for this version. */
-  USHORT        instanceCount;  /* The number of named instances defined in the font
+  HBUINT16      instanceCount;  /* The number of named instances defined in the font
                                  * (the number of records in the instances array). */
-  USHORT        instanceSize;   /* The size in bytes of each InstanceRecord — set
+  HBUINT16      instanceSize;   /* The size in bytes of each InstanceRecord — set
                                  * to either axisCount * sizeof(Fixed) + 4, or to
                                  * axisCount * sizeof(Fixed) + 6. */
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh
index bd849bc6348..5686b1cacbc 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh
@@ -55,7 +55,7 @@ struct DeltaSetIndexMap
     unsigned int u = 0;
     { /* Fetch it. */
       unsigned int w = get_width ();
-      const BYTE *p = mapData + w * v;
+      const HBUINT8 *p = mapData + w * v;
       for (; w; w--)
         u = (u << 8) + *p++;
     }
@@ -78,10 +78,10 @@ struct DeltaSetIndexMap
   { return (format & 0xF) + 1; }
 
   protected:
-  USHORT        format;         /* A packed field that describes the compressed
+  HBUINT16      format;         /* A packed field that describes the compressed
                                  * representation of delta-set indices. */
-  USHORT        mapCount;       /* The number of mapping entries. */
-  BYTE          mapData[VAR];   /* The delta-set index mapping data. */
+  HBUINT16      mapCount;       /* The number of mapping entries. */
+  HBUINT8               mapData[VAR];   /* The delta-set index mapping data. */
 
   public:
   DEFINE_SIZE_ARRAY (4, mapData);
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh
index 5baafd4826d..56a6047cd44 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh
@@ -43,7 +43,7 @@ struct VariationValueRecord
 
   public:
   Tag           valueTag;       /* Four-byte tag identifying a font-wide measure. */
-  ULONG         varIdx;         /* Outer/inner index into VariationStore item. */
+  HBUINT32              varIdx;         /* Outer/inner index into VariationStore item. */
 
   public:
   DEFINE_SIZE_STATIC (8);
@@ -95,13 +95,13 @@ protected:
   protected:
   FixedVersion<>version;        /* Version of the metrics variation table
                                  * initially set to 0x00010000u */
-  USHORT        reserved;       /* Not used; set to 0. */
-  USHORT        valueRecordSize;/* The size in bytes of each value record —
+  HBUINT16      reserved;       /* Not used; set to 0. */
+  HBUINT16      valueRecordSize;/* The size in bytes of each value record —
                                  * must be greater than zero. */
-  USHORT        valueRecordCount;/* The number of value records — may be zero. */
+  HBUINT16      valueRecordCount;/* The number of value records — may be zero. */
   OffsetTo<VariationStore>
                 varStore;       /* Offset to item variation store table. */
-  BYTE          values[VAR];    /* Array of value records. The records must be
+  HBUINT8               values[VAR];    /* Array of value records. The records must be
                                  * in binary order of their valueTag field. */
 
   public:
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh
index a3208f169ae..5aa7122683d 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh
@@ -29,6 +29,8 @@
 #ifndef HB_PRIVATE_HH
 #define HB_PRIVATE_HH
 
+#define _GNU_SOURCE 1
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -40,6 +42,7 @@
 #define HB_OT_H_IN
 #endif
 
+#include <math.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
@@ -48,6 +51,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#include <intrin.h>
+#endif
 
 #define HB_PASTE1(a,b) a##b
 #define HB_PASTE(a,b) HB_PASTE1(a,b)
@@ -86,8 +92,6 @@ extern "C" void  hb_free_impl(void *ptr);
 
 #endif // __cplusplus < 201103L
 
-#define _GNU_SOURCE 1
-
 #if (defined(__GNUC__) || defined(__clang__)) && defined(__OPTIMIZE__)
 #define likely(expr) (__builtin_expect (!!(expr), 1))
 #define unlikely(expr) (__builtin_expect (!!(expr), 0))
@@ -112,15 +116,18 @@ extern "C" void  hb_free_impl(void *ptr);
 #endif
 #if __GNUC__ >= 4
 #define HB_UNUSED       __attribute__((unused))
+#elif defined(_MSC_VER) /* https://github.com/harfbuzz/harfbuzz/issues/635 */
+#define HB_UNUSED __pragma(warning(suppress: 4100 4101))
 #else
 #define HB_UNUSED
 #endif
 
 #ifndef HB_INTERNAL
-# if !defined(__MINGW32__) && !defined(__CYGWIN__)
+# if !defined(HB_NO_VISIBILITY) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(_MSC_VER) && !defined(__SUNPRO_CC)
 #  define HB_INTERNAL __attribute__((__visibility__("hidden")))
 # else
 #  define HB_INTERNAL
+#  define HB_NO_VISIBILITY 1
 # endif
 #endif
 
@@ -132,6 +139,11 @@ extern "C" void  hb_free_impl(void *ptr);
 #define HB_FUNC __func__
 #endif
 
+#ifdef __SUNPRO_CC
+/* https://github.com/harfbuzz/harfbuzz/issues/630 */
+#define __restrict
+#endif
+
 /*
  * Borrowed from https://bugzilla.mozilla.org/show_bug.cgi?id=1215411
  * HB_FALLTHROUGH is an annotation to suppress compiler warnings about switch
@@ -151,6 +163,9 @@ extern "C" void  hb_free_impl(void *ptr);
 #if defined(__clang__) && __cplusplus >= 201103L
    /* clang's fallthrough annotations are only available starting in C++11. */
 #  define HB_FALLTHROUGH [[clang::fallthrough]]
+#elif __GNUC__ >= 7
+   /* GNU fallthrough attribute is available from GCC7 */
+#  define HB_FALLTHROUGH __attribute__((fallthrough))
 #elif defined(_MSC_VER)
    /*
     * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
@@ -218,6 +233,12 @@ static int errno = 0; /* Use something better? */
  * https://developer.android.com/tools/sdk/ndk/index.html
  */
 #    define HB_USE_ATEXIT 1
+#  elif defined(__APPLE__)
+/* For macOS and related platforms, the atexit man page indicates
+ * that it will be invoked when the library is unloaded, not only
+ * at application exit.
+ */
+#    define HB_USE_ATEXIT 1
 #  endif
 #endif
 
@@ -295,69 +316,198 @@ static_assert ((sizeof (hb_var_int_t) == 4), "");
 
 /* Misc */
 
-/* Void! */
-struct _hb_void_t {};
-typedef const _hb_void_t *hb_void_t;
+/*
+ * Void!
+ */
+typedef const struct _hb_void_t *hb_void_t;
 #define HB_VOID ((const _hb_void_t *) nullptr)
 
-/* Return the number of 1 bits in mask. */
+/* Return the number of 1 bits in v. */
+template <typename T>
 static inline HB_CONST_FUNC unsigned int
-_hb_popcount32 (uint32_t mask)
+_hb_popcount (T v)
 {
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  return __builtin_popcount (mask);
-#else
-  /* "HACKMEM 169" */
-  uint32_t y;
-  y = (mask >> 1) &033333333333;
-  y = mask - y - ((y >>1) & 033333333333);
-  return (((y + (y >> 3)) & 030707070707) % 077);
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && defined(__OPTIMIZE__)
+  if (sizeof (T) <= sizeof (unsigned int))
+    return __builtin_popcount (v);
+
+  if (sizeof (T) <= sizeof (unsigned long))
+    return __builtin_popcountl (v);
+
+  if (sizeof (T) <= sizeof (unsigned long long))
+    return __builtin_popcountll (v);
 #endif
+
+  if (sizeof (T) <= 4)
+  {
+    /* "HACKMEM 169" */
+    uint32_t y;
+    y = (v >> 1) &033333333333;
+    y = v - y - ((y >>1) & 033333333333);
+    return (((y + (y >> 3)) & 030707070707) % 077);
+  }
+
+  if (sizeof (T) == 8)
+  {
+    unsigned int shift = 32;
+    return _hb_popcount<uint32_t> ((uint32_t) v) + _hb_popcount ((uint32_t) (v >> shift));
+  }
+
+  if (sizeof (T) == 16)
+  {
+    unsigned int shift = 64;
+    return _hb_popcount<uint64_t> ((uint64_t) v) + _hb_popcount ((uint64_t) (v >> shift));
+  }
+
+  assert (0);
+  return 0;
 }
-static inline HB_CONST_FUNC unsigned int
-_hb_popcount64 (uint64_t mask)
-{
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  if (sizeof (long) >= sizeof (mask))
-    return __builtin_popcountl (mask);
-#endif
-  return _hb_popcount32 (mask & 0xFFFFFFFF) + _hb_popcount32 (mask >> 32);
-}
-template <typename T> static inline unsigned int _hb_popcount (T mask);
-template <> inline unsigned int _hb_popcount<uint32_t> (uint32_t mask) { return _hb_popcount32 (mask); }
-template <> inline unsigned int _hb_popcount<uint64_t> (uint64_t mask) { return _hb_popcount64 (mask); }
 
 /* Returns the number of bits needed to store number */
+template <typename T>
 static inline HB_CONST_FUNC unsigned int
-_hb_bit_storage (unsigned int number)
+_hb_bit_storage (T v)
 {
+  if (unlikely (!v)) return 0;
+
 #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
-  return likely (number) ? (sizeof (unsigned int) * 8 - __builtin_clz (number)) : 0;
-#else
-  unsigned int n_bits = 0;
-  while (number) {
-    n_bits++;
-    number >>= 1;
-  }
-  return n_bits;
+  if (sizeof (T) <= sizeof (unsigned int))
+    return sizeof (unsigned int) * 8 - __builtin_clz (v);
+
+  if (sizeof (T) <= sizeof (unsigned long))
+    return sizeof (unsigned long) * 8 - __builtin_clzl (v);
+
+  if (sizeof (T) <= sizeof (unsigned long long))
+    return sizeof (unsigned long long) * 8 - __builtin_clzll (v);
 #endif
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+  if (sizeof (T) <= sizeof (unsigned int))
+  {
+    unsigned long where;
+    _BitScanReverse (&where, v);
+    return 1 + where;
+  }
+# if _WIN64
+  if (sizeof (T) <= 8)
+  {
+    unsigned long where;
+    _BitScanReverse64 (&where, v);
+    return 1 + where;
+  }
+# endif
+#endif
+
+  if (sizeof (T) <= 4)
+  {
+    /* "bithacks" */
+    const unsigned int b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000};
+    const unsigned int S[] = {1, 2, 4, 8, 16};
+    unsigned int r = 0;
+    for (int i = 4; i >= 0; i--)
+      if (v & b[i])
+      {
+        v >>= S[i];
+        r |= S[i];
+      }
+    return r + 1;
+  }
+  if (sizeof (T) <= 8)
+  {
+    /* "bithacks" */
+    const uint64_t b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000, 0xFFFFFFFF00000000};
+    const unsigned int S[] = {1, 2, 4, 8, 16, 32};
+    unsigned int r = 0;
+    for (int i = 5; i >= 0; i--)
+      if (v & b[i])
+      {
+        v >>= S[i];
+        r |= S[i];
+      }
+    return r + 1;
+  }
+  if (sizeof (T) == 16)
+  {
+    unsigned int shift = 64;
+    return (v >> shift) ? _hb_bit_storage<uint64_t> ((uint64_t) v >> shift) + shift :
+                          _hb_bit_storage<uint64_t> ((uint64_t) v);
+  }
+
+  assert (0);
+  return 0;
 }
 
-/* Returns the number of zero bits in the least significant side of number */
+/* Returns the number of zero bits in the least significant side of v */
+template <typename T>
 static inline HB_CONST_FUNC unsigned int
-_hb_ctz (unsigned int number)
+_hb_ctz (T v)
 {
+  if (unlikely (!v)) return 0;
+
 #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
-  return likely (number) ? __builtin_ctz (number) : 0;
-#else
-  unsigned int n_bits = 0;
-  if (unlikely (!number)) return 0;
-  while (!(number & 1)) {
-    n_bits++;
-    number >>= 1;
-  }
-  return n_bits;
+  if (sizeof (T) <= sizeof (unsigned int))
+    return __builtin_ctz (v);
+
+  if (sizeof (T) <= sizeof (unsigned long))
+    return __builtin_ctzl (v);
+
+  if (sizeof (T) <= sizeof (unsigned long long))
+    return __builtin_ctzll (v);
 #endif
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+  if (sizeof (T) <= sizeof (unsigned int))
+  {
+    unsigned long where;
+    _BitScanForward (&where, v);
+    return where;
+  }
+# if _WIN64
+  if (sizeof (T) <= 8)
+  {
+    unsigned long where;
+    _BitScanForward64 (&where, v);
+    return where;
+  }
+# endif
+#endif
+
+  if (sizeof (T) <= 4)
+  {
+    /* "bithacks" */
+    unsigned int c = 32;
+    v &= - (int32_t) v;
+    if (v) c--;
+    if (v & 0x0000FFFF) c -= 16;
+    if (v & 0x00FF00FF) c -= 8;
+    if (v & 0x0F0F0F0F) c -= 4;
+    if (v & 0x33333333) c -= 2;
+    if (v & 0x55555555) c -= 1;
+    return c;
+  }
+  if (sizeof (T) <= 8)
+  {
+    /* "bithacks" */
+    unsigned int c = 64;
+    v &= - (int64_t) (v);
+    if (v) c--;
+    if (v & 0x00000000FFFFFFFF) c -= 32;
+    if (v & 0x0000FFFF0000FFFF) c -= 16;
+    if (v & 0x00FF00FF00FF00FF) c -= 8;
+    if (v & 0x0F0F0F0F0F0F0F0F) c -= 4;
+    if (v & 0x3333333333333333) c -= 2;
+    if (v & 0x5555555555555555) c -= 1;
+    return c;
+  }
+  if (sizeof (T) == 16)
+  {
+    unsigned int shift = 64;
+    return (uint64_t) v ? _hb_bit_storage<uint64_t> ((uint64_t) v) :
+                          _hb_bit_storage<uint64_t> ((uint64_t) v >> shift) + shift;
+  }
+
+  assert (0);
+  return 0;
 }
 
 static inline bool
@@ -366,6 +516,12 @@ _hb_unsigned_int_mul_overflows (unsigned int count, unsigned int size)
   return (size > 0) && (count >= ((unsigned int) -1) / size);
 }
 
+static inline unsigned int
+_hb_ceil_to_4 (unsigned int v)
+{
+  return ((v - 1) | 3) + 1;
+}
+
 
 
 /* arrays and maps */
@@ -398,35 +554,44 @@ struct hb_prealloced_array_t
     return &array[len - 1];
   }
 
+  /* Allocate for size but don't adjust len. */
+  inline bool alloc(unsigned int size)
+  {
+    if (likely (size <= allocated))
+      return true;
+
+    /* Reallocate */
+
+    unsigned int new_allocated = allocated;
+    while (size >= new_allocated)
+      new_allocated += (new_allocated >> 1) + 8;
+
+    Type *new_array = nullptr;
+
+    if (array == static_array) {
+      new_array = (Type *) calloc (new_allocated, sizeof (Type));
+      if (new_array)
+        memcpy (new_array, array, len * sizeof (Type));
+          } else {
+      bool overflows = (new_allocated < allocated) || _hb_unsigned_int_mul_overflows (new_allocated, sizeof (Type));
+      if (likely (!overflows)) {
+        new_array = (Type *) realloc (array, new_allocated * sizeof (Type));
+      }
+    }
+
+    if (unlikely (!new_array))
+      return false;
+
+    array = new_array;
+    allocated = new_allocated;
+
+    return true;
+  }
+
   inline bool resize (unsigned int size)
   {
-    if (unlikely (size > allocated))
-    {
-      /* Need to reallocate */
-
-      unsigned int new_allocated = allocated;
-      while (size >= new_allocated)
-        new_allocated += (new_allocated >> 1) + 8;
-
-      Type *new_array = nullptr;
-
-      if (array == static_array) {
-        new_array = (Type *) calloc (new_allocated, sizeof (Type));
-        if (new_array)
-          memcpy (new_array, array, len * sizeof (Type));
-      } else {
-        bool overflows = (new_allocated < allocated) || _hb_unsigned_int_mul_overflows (new_allocated, sizeof (Type));
-        if (likely (!overflows)) {
-          new_array = (Type *) realloc (array, new_allocated * sizeof (Type));
-        }
-      }
-
-      if (unlikely (!new_array))
-        return false;
-
-      array = new_array;
-      allocated = new_allocated;
-    }
+    if (!alloc (size))
+      return false;
 
     len = size;
     return true;
@@ -468,6 +633,11 @@ struct hb_prealloced_array_t
     return nullptr;
   }
 
+  inline void qsort (int (*cmp)(const void*, const void*))
+  {
+    ::qsort (array, len, sizeof (Type), cmp);
+  }
+
   inline void qsort (void)
   {
     ::qsort (array, len, sizeof (Type), Type::cmp);
@@ -479,25 +649,34 @@ struct hb_prealloced_array_t
   }
 
   template <typename T>
-  inline Type *bsearch (T *x)
+  inline Type *lsearch (const T &x)
+  {
+    for (unsigned int i = 0; i < len; i++)
+      if (0 == this->array[i].cmp (&x))
+        return &array[i];
+    return nullptr;
+  }
+
+  template <typename T>
+  inline Type *bsearch (const T &x)
   {
     unsigned int i;
     return bfind (x, &i) ? &array[i] : nullptr;
   }
   template <typename T>
-  inline const Type *bsearch (T *x) const
+  inline const Type *bsearch (const T &x) const
   {
     unsigned int i;
     return bfind (x, &i) ? &array[i] : nullptr;
   }
   template <typename T>
-  inline bool bfind (T *x, unsigned int *i) const
+  inline bool bfind (const T &x, unsigned int *i) const
   {
     int min = 0, max = (int) this->len - 1;
     while (min <= max)
     {
       int mid = (min + max) / 2;
-      int c = this->array[mid].cmp (x);
+      int c = this->array[mid].cmp (&x);
       if (c < 0)
         max = mid - 1;
       else if (c > 0)
@@ -508,7 +687,7 @@ struct hb_prealloced_array_t
         return true;
       }
     }
-    if (max < 0 || (max < (int) this->len && this->array[max].cmp (x) > 0))
+    if (max < 0 || (max < (int) this->len && this->array[max].cmp (&x) > 0))
       max++;
     *i = max;
     return false;
@@ -692,7 +871,7 @@ hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3)
  * one enum to another...  So this doesn't provide the type-checking that I
  * originally had in mind... :(.
  *
- * For MSVC warnings, see: https://github.com/behdad/harfbuzz/pull/163
+ * For MSVC warnings, see: https://github.com/harfbuzz/harfbuzz/pull/163
  */
 #ifdef _MSC_VER
 # pragma warning(disable:4200)
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest-private.hh
index b45daba3b08..6b9556b5d0f 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest-private.hh
@@ -71,7 +71,7 @@ struct hb_set_digest_lowest_bits_t
     mask |= mask_for (g);
   }
 
-  inline void add_range (hb_codepoint_t a, hb_codepoint_t b) {
+  inline bool add_range (hb_codepoint_t a, hb_codepoint_t b) {
     if ((b >> shift) - (a >> shift) >= mask_bits - 1)
       mask = (mask_t) -1;
     else {
@@ -79,6 +79,27 @@ struct hb_set_digest_lowest_bits_t
       mask_t mb = mask_for (b);
       mask |= mb + (mb - ma) - (mb < ma);
     }
+    return true;
+  }
+
+  template <typename T>
+  inline void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
+  {
+    for (unsigned int i = 0; i < count; i++)
+    {
+      add (*array);
+      array = (const T *) (stride + (const char *) array);
+    }
+  }
+  template <typename T>
+  inline bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
+  {
+    for (unsigned int i = 0; i < count; i++)
+    {
+      add (*array);
+      array = (const T *) (stride + (const char *) array);
+    }
+    return true;
   }
 
   inline bool may_have (hb_codepoint_t g) const {
@@ -108,9 +129,23 @@ struct hb_set_digest_combiner_t
     tail.add (g);
   }
 
-  inline void add_range (hb_codepoint_t a, hb_codepoint_t b) {
+  inline bool add_range (hb_codepoint_t a, hb_codepoint_t b) {
     head.add_range (a, b);
     tail.add_range (a, b);
+    return true;
+  }
+  template <typename T>
+  inline void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
+  {
+    head.add_array (array, count, stride);
+    tail.add_array (array, count, stride);
+  }
+  template <typename T>
+  inline bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
+  {
+    head.add_sorted_array (array, count, stride);
+    tail.add_sorted_array (array, count, stride);
+    return true;
   }
 
   inline bool may_have (hb_codepoint_t g) const {
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh
index 7bea93e6da8..b953246423d 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh
@@ -35,6 +35,9 @@
  * hb_set_t
  */
 
+/* TODO Keep a free-list so we can free pages that are completely zeroed.  At that
+ * point maybe also use a sentinel value for "all-1" pages? */
+
 struct hb_set_t
 {
   struct page_map_t
@@ -47,9 +50,8 @@ struct hb_set_t
 
   struct page_t
   {
-    inline void init (void) {
-      memset (&v, 0, sizeof (v));
-    }
+    inline void init0 (void) { memset (&v, 0, sizeof (v)); }
+    inline void init1 (void) { memset (&v, 0xff, sizeof (v)); }
 
     inline unsigned int len (void) const
     { return ARRAY_LENGTH_CONST (v); }
@@ -66,6 +68,23 @@ struct hb_set_t
     inline void del (hb_codepoint_t g) { elt (g) &= ~mask (g); }
     inline bool has (hb_codepoint_t g) const { return !!(elt (g) & mask (g)); }
 
+    inline void add_range (hb_codepoint_t a, hb_codepoint_t b)
+    {
+      elt_t *la = &elt (a);
+      elt_t *lb = &elt (b);
+      if (la == lb)
+        *la |= (mask (b) << 1) - mask(a);
+      else
+      {
+        *la |= ~(mask (a) - 1);
+        la++;
+
+        memset (la, 0xff, (char *) lb - (char *) la);
+
+        *lb |= ((mask (b) << 1) - 1);
+      }
+    }
+
     inline bool is_equal (const page_t *other) const
     {
       return 0 == memcmp (&v, &other->v, sizeof (v));
@@ -90,51 +109,60 @@ struct hb_set_t
       unsigned int i = m / ELT_BITS;
       unsigned int j = m & ELT_MASK;
 
-      for (; j < ELT_BITS; j++)
-        if (v[i] & (elt_t (1) << j))
-          goto found;
-      for (i++; i < len (); i++)
-        if (v[i])
-          for (j = 0; j < ELT_BITS; j++)
-            if (v[i] & (elt_t (1) << j))
-              goto found;
+      const elt_t vv = v[i] & ~((elt_t (1) << j) - 1);
+      for (const elt_t *p = &vv; i < len (); p = &v[++i])
+        if (*p)
+        {
+          *codepoint = i * ELT_BITS + elt_get_min (*p);
+          return true;
+        }
 
       *codepoint = INVALID;
       return false;
+    }
+    inline bool previous (hb_codepoint_t *codepoint) const
+    {
+      unsigned int m = (*codepoint - 1) & MASK;
+      if (m == MASK)
+      {
+        *codepoint = INVALID;
+        return false;
+      }
+      unsigned int i = m / ELT_BITS;
+      unsigned int j = m & ELT_MASK;
 
-    found:
-      *codepoint = i * ELT_BITS + j;
-      return true;
+      const elt_t vv = v[i] & ((elt_t (1) << (j + 1)) - 1);
+      for (const elt_t *p = &vv; (int) i >= 0; p = &v[--i])
+        if (*p)
+        {
+          *codepoint = i * ELT_BITS + elt_get_max (*p);
+          return true;
+        }
+
+      *codepoint = INVALID;
+      return false;
     }
     inline hb_codepoint_t get_min (void) const
     {
       for (unsigned int i = 0; i < len (); i++)
         if (v[i])
-        {
-          elt_t e = v[i];
-          for (unsigned int j = 0; j < ELT_BITS; j++)
-            if (e & (elt_t (1) << j))
-              return i * ELT_BITS + j;
-        }
+          return i * ELT_BITS + elt_get_min (v[i]);
       return INVALID;
     }
     inline hb_codepoint_t get_max (void) const
     {
       for (int i = len () - 1; i >= 0; i--)
         if (v[i])
-        {
-          elt_t e = v[i];
-          for (int j = ELT_BITS - 1; j >= 0; j--)
-            if (e & (elt_t (1) << j))
-              return i * ELT_BITS + j;
-        }
+          return i * ELT_BITS + elt_get_max (v[i]);
       return 0;
     }
 
-    static const unsigned int PAGE_BITS = 512; /* Use to tune. */
+    typedef unsigned long long elt_t;
+    static const unsigned int PAGE_BITS = 1024;
     static_assert ((PAGE_BITS & ((PAGE_BITS) - 1)) == 0, "");
 
-    typedef uint64_t elt_t;
+    static inline unsigned int elt_get_min (const elt_t &elt) { return _hb_ctz (elt); }
+    static inline unsigned int elt_get_max (const elt_t &elt) { return _hb_bit_storage (elt) - 1; }
 
 #if 0 && HAVE_VECTOR_SIZE
     /* The vectorized version does not work with clang as non-const
@@ -162,7 +190,19 @@ struct hb_set_t
   ASSERT_POD ();
   bool in_error;
   hb_prealloced_array_t<page_map_t, 8> page_map;
-  hb_prealloced_array_t<page_t, 8> pages;
+  hb_prealloced_array_t<page_t, 1> pages;
+
+  inline void init (void)
+  {
+    in_error = false;
+    page_map.init ();
+    pages.init ();
+  }
+  inline void finish (void)
+  {
+    page_map.finish ();
+    pages.finish ();
+  }
 
   inline bool resize (unsigned int count)
   {
@@ -195,18 +235,90 @@ struct hb_set_t
   {
     if (unlikely (in_error)) return;
     if (unlikely (g == INVALID)) return;
-    page_t *page = page_for_insert (g);
-    if (!page)
-      return;
+    page_t *page = page_for_insert (g); if (unlikely (!page)) return;
     page->add (g);
   }
-  inline void add_range (hb_codepoint_t a, hb_codepoint_t b)
+  inline bool add_range (hb_codepoint_t a, hb_codepoint_t b)
+  {
+    if (unlikely (in_error)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
+    if (unlikely (a > b || a == INVALID || b == INVALID)) return false;
+    unsigned int ma = get_major (a);
+    unsigned int mb = get_major (b);
+    if (ma == mb)
+    {
+      page_t *page = page_for_insert (a); if (unlikely (!page)) return false;
+      page->add_range (a, b);
+    }
+    else
+    {
+      page_t *page = page_for_insert (a); if (unlikely (!page)) return false;
+      page->add_range (a, major_start (ma + 1) - 1);
+
+      for (unsigned int m = ma + 1; m < mb; m++)
+      {
+        page = page_for_insert (major_start (m)); if (unlikely (!page)) return false;
+        page->init1 ();
+      }
+
+      page = page_for_insert (b); if (unlikely (!page)) return false;
+      page->add_range (major_start (mb), b);
+    }
+    return true;
+  }
+
+  template <typename T>
+  inline void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
   {
     if (unlikely (in_error)) return;
-    /* TODO Speedup */
-    for (unsigned int i = a; i < b + 1; i++)
-      add (i);
+    if (!count) return;
+    hb_codepoint_t g = *array;
+    while (count)
+    {
+      unsigned int m = get_major (g);
+      page_t *page = page_for_insert (g); if (unlikely (!page)) return;
+      unsigned int start = major_start (m);
+      unsigned int end = major_start (m + 1);
+      do
+      {
+        page->add (g);
+
+        array = (const T *) ((const char *) array + stride);
+        count--;
+      }
+      while (count && (g = *array, start <= g && g < end));
+    }
   }
+
+  /* Might return false if array looks unsorted.
+   * Used for faster rejection of corrupt data. */
+  template <typename T>
+  inline bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
+  {
+    if (unlikely (in_error)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
+    if (!count) return true;
+    hb_codepoint_t g = *array;
+    hb_codepoint_t last_g = g;
+    while (count)
+    {
+      unsigned int m = get_major (g);
+      page_t *page = page_for_insert (g); if (unlikely (!page)) return false;
+      unsigned int end = major_start (m + 1);
+      do
+      {
+        /* If we try harder we can change the following comparison to <=;
+         * Not sure if it's worth it. */
+        if (g < last_g) return false;
+        last_g = g;
+        page->add (g);
+
+        array = (const T *) ((const char *) array + stride);
+        count--;
+      }
+      while (count && (g = *array, g < end));
+    }
+    return true;
+  }
+
   inline void del (hb_codepoint_t g)
   {
     if (unlikely (in_error)) return;
@@ -217,6 +329,7 @@ struct hb_set_t
   }
   inline void del_range (hb_codepoint_t a, hb_codepoint_t b)
   {
+    /* TODO Optimize, like add_range(). */
     if (unlikely (in_error)) return;
     for (unsigned int i = a; i < b + 1; i++)
       del (i);
@@ -276,6 +389,7 @@ struct hb_set_t
 
     unsigned int na = pages.len;
     unsigned int nb = other->pages.len;
+    unsigned int next_page = na;
 
     unsigned int count = 0;
     unsigned int a = 0, b = 0;
@@ -317,27 +431,47 @@ struct hb_set_t
       {
         a--;
         b--;
-        Op::process (page_at (--count).v, page_at (a).v, other->page_at (b).v);
+        count--;
+        page_map[count] = page_map[a];
+        Op::process (page_at (count).v, page_at (a).v, other->page_at (b).v);
       }
       else if (page_map[a - 1].major > other->page_map[b - 1].major)
       {
         a--;
         if (Op::passthru_left)
-          page_at (--count).v = page_at (a).v;
+        {
+          count--;
+          page_map[count] = page_map[a];
+        }
       }
       else
       {
         b--;
         if (Op::passthru_right)
-          page_at (--count).v = other->page_at (b).v;
+        {
+          count--;
+          page_map[count].major = other->page_map[b].major;
+          page_map[count].index = next_page++;
+          page_at (count).v = other->page_at (b).v;
+        }
       }
     }
     if (Op::passthru_left)
       while (a)
-        page_at (--count).v = page_at (--a).v;
+      {
+        a--;
+        count--;
+        page_map[count] = page_map [a];
+      }
     if (Op::passthru_right)
       while (b)
-        page_at (--count).v = other->page_at (--b).v;
+      {
+        b--;
+        count--;
+        page_map[count].major = other->page_map[b].major;
+        page_map[count].index = next_page++;
+        page_at (count).v = other->page_at (b).v;
+      }
     assert (!count);
   }
 
@@ -366,8 +500,8 @@ struct hb_set_t
 
     page_map_t map = {get_major (*codepoint), 0};
     unsigned int i;
-    page_map.bfind (&map, &i);
-    if (i < page_map.len)
+    page_map.bfind (map, &i);
+    if (i < page_map.len && page_map[i].major == map.major)
     {
       if (pages[page_map[i].index].next (codepoint))
       {
@@ -388,6 +522,37 @@ struct hb_set_t
     *codepoint = INVALID;
     return false;
   }
+  inline bool previous (hb_codepoint_t *codepoint) const
+  {
+    if (unlikely (*codepoint == INVALID)) {
+      *codepoint = get_max ();
+      return *codepoint != INVALID;
+    }
+
+    page_map_t map = {get_major (*codepoint), 0};
+    unsigned int i;
+    page_map.bfind (map, &i);
+    if (i < page_map.len && page_map[i].major == map.major)
+    {
+      if (pages[page_map[i].index].previous (codepoint))
+      {
+        *codepoint += page_map[i].major * page_t::PAGE_BITS;
+        return true;
+      }
+    }
+    i--;
+    for (; (int) i >= 0; i--)
+    {
+      hb_codepoint_t m = pages[page_map[i].index].get_max ();
+      if (m != INVALID)
+      {
+        *codepoint = page_map[i].major * page_t::PAGE_BITS + m;
+        return true;
+      }
+    }
+    *codepoint = INVALID;
+    return false;
+  }
   inline bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const
   {
     hb_codepoint_t i;
@@ -399,12 +564,31 @@ struct hb_set_t
       return false;
     }
 
+    /* TODO Speed up. */
     *last = *first = i;
     while (next (&i) && i == *last + 1)
       (*last)++;
 
     return true;
   }
+  inline bool previous_range (hb_codepoint_t *first, hb_codepoint_t *last) const
+  {
+    hb_codepoint_t i;
+
+    i = *first;
+    if (!previous (&i))
+    {
+      *last = *first = INVALID;
+      return false;
+    }
+
+    /* TODO Speed up. */
+    *last = *first = i;
+    while (previous (&i) && i == *first - 1)
+      (*first)--;
+
+    return true;
+  }
 
   inline unsigned int get_population (void) const
   {
@@ -433,40 +617,41 @@ struct hb_set_t
 
   static  const hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
 
-  page_t *page_for_insert (hb_codepoint_t g)
+  inline page_t *page_for_insert (hb_codepoint_t g)
   {
     page_map_t map = {get_major (g), pages.len};
     unsigned int i;
-    if (!page_map.bfind (&map, &i))
+    if (!page_map.bfind (map, &i))
     {
       if (!resize (pages.len + 1))
         return nullptr;
 
-      pages[map.index].init ();
+      pages[map.index].init0 ();
       memmove (&page_map[i + 1], &page_map[i], (page_map.len - 1 - i) * sizeof (page_map[0]));
       page_map[i] = map;
     }
     return &pages[page_map[i].index];
   }
-  page_t *page_for (hb_codepoint_t g)
+  inline page_t *page_for (hb_codepoint_t g)
   {
     page_map_t key = {get_major (g)};
-    const page_map_t *found = page_map.bsearch (&key);
+    const page_map_t *found = page_map.bsearch (key);
     if (found)
       return &pages[found->index];
     return nullptr;
   }
-  const page_t *page_for (hb_codepoint_t g) const
+  inline const page_t *page_for (hb_codepoint_t g) const
   {
     page_map_t key = {get_major (g)};
-    const page_map_t *found = page_map.bsearch (&key);
+    const page_map_t *found = page_map.bsearch (key);
     if (found)
       return &pages[found->index];
     return nullptr;
   }
-  page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
-  const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
-  unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
+  inline page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
+  inline const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
+  inline unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
+  inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
 };
 
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc
index 40706bfc89c..ebedcb0f93d 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc
@@ -45,12 +45,18 @@ hb_set_create (void)
   if (!(set = hb_object_create<hb_set_t> ()))
     return hb_set_get_empty ();
 
-  set->page_map.init ();
-  set->pages.init ();
+  set->init ();
 
   return set;
 }
 
+static const hb_set_t _hb_set_nil = {
+  HB_OBJECT_HEADER_STATIC,
+  true, /* in_error */
+
+  {0} /* elts */
+};
+
 /**
  * hb_set_get_empty:
  *
@@ -61,13 +67,6 @@ hb_set_create (void)
 hb_set_t *
 hb_set_get_empty (void)
 {
-  static const hb_set_t _hb_set_nil = {
-    HB_OBJECT_HEADER_STATIC,
-    true, /* in_error */
-
-    {0} /* elts */
-  };
-
   return const_cast<hb_set_t *> (&_hb_set_nil);
 }
 
@@ -96,8 +95,7 @@ hb_set_destroy (hb_set_t *set)
 {
   if (!hb_object_destroy (set)) return;
 
-  set->page_map.finish ();
-  set->pages.finish ();
+  set->finish ();
 
   free (set);
 }
@@ -439,7 +437,9 @@ hb_set_get_max (const hb_set_t *set)
  * @set: a set.
  * @codepoint: (inout):
  *
+ * Gets the next number in @set that is greater than current value of @codepoint.
  *
+ * Set @codepoint to %HB_SET_VALUE_INVALID to get started.
  *
  * Return value: whether there was a next value.
  *
@@ -452,6 +452,26 @@ hb_set_next (const hb_set_t *set,
   return set->next (codepoint);
 }
 
+/**
+ * hb_set_previous:
+ * @set: a set.
+ * @codepoint: (inout):
+ *
+ * Gets the previous number in @set that is slower than current value of @codepoint.
+ *
+ * Set @codepoint to %HB_SET_VALUE_INVALID to get started.
+ *
+ * Return value: whether there was a previous value.
+ *
+ * Since: 1.8.0
+ **/
+hb_bool_t
+hb_set_previous (const hb_set_t *set,
+                 hb_codepoint_t *codepoint)
+{
+  return set->previous (codepoint);
+}
+
 /**
  * hb_set_next_range:
  * @set: a set.
@@ -461,6 +481,8 @@ hb_set_next (const hb_set_t *set,
  * Gets the next consecutive range of numbers in @set that
  * are greater than current value of @last.
  *
+ * Set @last to %HB_SET_VALUE_INVALID to get started.
+ *
  * Return value: whether there was a next range.
  *
  * Since: 0.9.7
@@ -472,3 +494,26 @@ hb_set_next_range (const hb_set_t *set,
 {
   return set->next_range (first, last);
 }
+
+/**
+ * hb_set_previous_range:
+ * @set: a set.
+ * @first: (inout): input current first and output first codepoint in the range.
+ * @last: (out): output last codepoint in the range.
+ *
+ * Gets the previous consecutive range of numbers in @set that
+ * are greater than current value of @last.
+ *
+ * Set @first to %HB_SET_VALUE_INVALID to get started.
+ *
+ * Return value: whether there was a previous range.
+ *
+ * Since: 1.8.0
+ **/
+hb_bool_t
+hb_set_previous_range (const hb_set_t *set,
+                       hb_codepoint_t *first,
+                       hb_codepoint_t *last)
+{
+  return set->previous_range (first, last);
+}
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h
index c7d7c9f5d29..8cbc18f3513 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h
@@ -129,25 +129,36 @@ hb_set_symmetric_difference (hb_set_t       *set,
 HB_EXTERN unsigned int
 hb_set_get_population (const hb_set_t *set);
 
-/* Returns -1 if set empty. */
+/* Returns HB_SET_VALUE_INVALID if set empty. */
 HB_EXTERN hb_codepoint_t
 hb_set_get_min (const hb_set_t *set);
 
-/* Returns -1 if set empty. */
+/* Returns HB_SET_VALUE_INVALID if set empty. */
 HB_EXTERN hb_codepoint_t
 hb_set_get_max (const hb_set_t *set);
 
-/* Pass -1 in to get started. */
+/* Pass HB_SET_VALUE_INVALID in to get started. */
 HB_EXTERN hb_bool_t
 hb_set_next (const hb_set_t *set,
              hb_codepoint_t *codepoint);
 
-/* Pass -1 for first and last to get started. */
+/* Pass HB_SET_VALUE_INVALID in to get started. */
+HB_EXTERN hb_bool_t
+hb_set_previous (const hb_set_t *set,
+                 hb_codepoint_t *codepoint);
+
+/* Pass HB_SET_VALUE_INVALID for first and last to get started. */
 HB_EXTERN hb_bool_t
 hb_set_next_range (const hb_set_t *set,
                    hb_codepoint_t *first,
                    hb_codepoint_t *last);
 
+/* Pass HB_SET_VALUE_INVALID for first and last to get started. */
+HB_EXTERN hb_bool_t
+hb_set_previous_range (const hb_set_t *set,
+                       hb_codepoint_t *first,
+                       hb_codepoint_t *last);
+
 
 HB_END_DECLS
 
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh
index d11a1ff789d..0f2a2a5d8eb 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh
@@ -48,7 +48,7 @@ static const union HB_STRING_ARRAY_TYPE_NAME {
 #include HB_STRING_ARRAY_LIST
 #undef _S
   } st;
-  char str[1];
+  char str[VAR];
 }
 HB_STRING_ARRAY_POOL_NAME =
 {
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh
new file mode 100644
index 00000000000..99b76db9bbe
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#ifndef HB_SUBSET_GLYF_HH
+#define HB_SUBSET_GLYF_HH
+
+#include "hb-private.hh"
+
+#include "hb-subset-plan.hh"
+
+HB_INTERNAL bool
+hb_subset_glyf_and_loca (hb_subset_plan_t *plan,
+                         bool             *use_short_loca, /* OUT */
+                         hb_blob_t       **glyf_prime /* OUT */,
+                         hb_blob_t       **loca_prime /* OUT */);
+
+#endif /* HB_SUBSET_GLYF_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh
new file mode 100644
index 00000000000..d1b66b44d54
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger, Roderick Sheeter
+ */
+
+#ifndef HB_SUBSET_PLAN_HH
+#define HB_SUBSET_PLAN_HH
+
+#include "hb-private.hh"
+
+#include "hb-subset.h"
+
+#include "hb-object-private.hh"
+
+struct hb_subset_plan_t {
+  hb_object_header_t header;
+  ASSERT_POD ();
+
+  hb_bool_t drop_hints;
+
+  // TODO(Q1) actual map, drop this crap
+  // Look at me ma, I'm a poor mans map codepoint : new gid
+  // codepoints is sorted and aligned with gids_to_retain.
+
+  // These first two lists provide a mapping from cp -> gid
+  // As a result it does not list the full set of glyphs to retain.
+  hb_prealloced_array_t<hb_codepoint_t> codepoints;
+  hb_prealloced_array_t<hb_codepoint_t> gids_to_retain;
+
+  // This list contains the complete set of glyphs to retain and may contain
+  // more glyphs then the lists above.
+  hb_prealloced_array_t<hb_codepoint_t> gids_to_retain_sorted;
+
+  // Plan is only good for a specific source/dest so keep them with it
+  hb_face_t *source;
+  hb_face_t *dest;
+};
+
+typedef struct hb_subset_plan_t hb_subset_plan_t;
+
+HB_INTERNAL hb_subset_plan_t *
+hb_subset_plan_create (hb_face_t           *face,
+                       hb_subset_profile_t *profile,
+                       hb_subset_input_t   *input);
+
+HB_INTERNAL hb_bool_t
+hb_subset_plan_new_gid_for_old_id(hb_subset_plan_t *plan,
+                                  hb_codepoint_t old_gid,
+                                  hb_codepoint_t *new_gid /* OUT */);
+
+HB_INTERNAL hb_bool_t
+hb_subset_plan_new_gid_for_codepoint(hb_subset_plan_t *plan,
+                                     hb_codepoint_t codepont,
+                                     hb_codepoint_t *new_gid /* OUT */);
+
+HB_INTERNAL hb_bool_t
+hb_subset_plan_add_table(hb_subset_plan_t *plan,
+                         hb_tag_t tag,
+                         hb_blob_t *contents);
+
+HB_INTERNAL void
+hb_subset_plan_destroy (hb_subset_plan_t *plan);
+
+#endif /* HB_SUBSET_PLAN_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-private.hh
new file mode 100644
index 00000000000..5fa72527671
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-private.hh
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger, Roderick Sheeter
+ */
+
+#ifndef HB_SUBSET_PRIVATE_HH
+#define HB_SUBSET_PRIVATE_HH
+
+
+#include "hb-private.hh"
+
+#include "hb-subset.h"
+
+#include "hb-font-private.hh"
+
+typedef struct hb_subset_face_data_t hb_subset_face_data_t;
+
+struct hb_subset_input_t {
+  hb_object_header_t header;
+  ASSERT_POD ();
+
+  hb_set_t *unicodes;
+  hb_set_t *glyphs;
+
+  hb_bool_t drop_hints;
+  /* TODO
+   *
+   * features
+   * lookups
+   * nameIDs
+   * ...
+   */
+};
+
+HB_INTERNAL hb_face_t *
+hb_subset_face_create (void);
+
+HB_INTERNAL hb_bool_t
+hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob);
+
+#endif /* HB_SUBSET_PRIVATE_HH */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h
new file mode 100644
index 00000000000..b6206732806
--- /dev/null
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Rod Sheeter
+ */
+
+#ifndef HB_SUBSET_H
+#define HB_SUBSET_H
+
+#include "hb.h"
+
+HB_BEGIN_DECLS
+
+/*
+ * hb_subset_profile_t
+ * Things that change based on target environment, e.g. OS.
+ * Threadsafe for multiple concurrent subset operations.
+ */
+
+typedef struct hb_subset_profile_t hb_subset_profile_t;
+
+HB_EXTERN hb_subset_profile_t *
+hb_subset_profile_create (void);
+
+HB_EXTERN void
+hb_subset_profile_destroy (hb_subset_profile_t *profile);
+
+/*
+ * hb_subset_input_t
+ *
+ * Things that change based on the input. Characters to keep, etc.
+ */
+
+typedef struct hb_subset_input_t hb_subset_input_t;
+
+HB_EXTERN hb_subset_input_t *
+hb_subset_input_create_or_fail (void);
+
+HB_EXTERN hb_subset_input_t *
+hb_subset_input_reference (hb_subset_input_t *subset_input);
+
+HB_EXTERN void
+hb_subset_input_destroy (hb_subset_input_t *subset_input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_unicode_set (hb_subset_input_t *subset_input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_glyph_set (hb_subset_input_t *subset_input);
+
+HB_EXTERN hb_bool_t *
+hb_subset_input_drop_hints (hb_subset_input_t *subset_input);
+
+/* hb_subset() */
+
+HB_EXTERN hb_face_t *
+hb_subset (hb_face_t *source,
+           hb_subset_profile_t *profile,
+           hb_subset_input_t *input);
+
+HB_END_DECLS
+
+#endif /* HB_SUBSET_H */
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh
index 5bc56a77a19..76471a3d101 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh
@@ -137,7 +137,7 @@ HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
    * we do NOT want to hide them, as the way Uniscribe has implemented them
    * is with regular spacing glyphs, and that's the way fonts are made to work.
    * As such, we make exceptions for those four.
-   * Also ignoring U+1BCA0..1BCA3. https://github.com/behdad/harfbuzz/issues/503
+   * Also ignoring U+1BCA0..1BCA3. https://github.com/harfbuzz/harfbuzz/issues/503
    *
    * Unicode 7.0:
    * $ grep '; Default_Ignorable_Code_Point ' DerivedCoreProperties.txt | sed 's/;.*#/#/'
diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h
index ea6f1d2f2ce..ac35d0998ac 100644
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h
@@ -38,9 +38,9 @@ HB_BEGIN_DECLS
 
 #define HB_VERSION_MAJOR 1
 #define HB_VERSION_MINOR 7
-#define HB_VERSION_MICRO 1
+#define HB_VERSION_MICRO 6
 
-#define HB_VERSION_STRING "1.7.1"
+#define HB_VERSION_STRING "1.7.6"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
         ((major)*10000+(minor)*100+(micro) <= \
diff --git a/src/java.desktop/share/native/libfreetype/UPDATING.txt b/src/java.desktop/share/native/libfreetype/UPDATING.txt
index ad062632312..8f7595dc342 100644
--- a/src/java.desktop/share/native/libfreetype/UPDATING.txt
+++ b/src/java.desktop/share/native/libfreetype/UPDATING.txt
@@ -12,6 +12,8 @@ Import just what is needed.
 Before attempting compilation be sure to diff the JDK copy and the freetype copy
 of src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
 and re-apply the same edits made for the JDK option file.
+Also modules the JDK does not include must be commented out in
+src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h.
 Notably JDK is not using GZIP or LZW or BDF support which are on by default
 for the freetype distribution.
 If you don't make the edits the build will fail due to not copying the relevant
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
index f539e9a17a7..eedebf4082e 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
@@ -422,9 +422,9 @@ FT_BEGIN_HEADER
 #endif /* !FT_BASE_DEF */
 
 
-  /*   When compiling FreeType as a DLL, some systems/compilers need a     */
-  /*   special attribute in front OR after the return type of function     */
-  /*   declarations.                                                       */
+  /*   When compiling FreeType as a DLL or DSO with hidden visibility      */
+  /*   some systems/compilers need a special attribute in front OR after   */
+  /*   the return type of function declarations.                           */
   /*                                                                       */
   /*   Two macros are used within the FreeType source code to define       */
   /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
@@ -455,19 +455,28 @@ FT_BEGIN_HEADER
   /*                                                                       */
 #ifndef FT_EXPORT
 
-#ifdef __cplusplus
+#ifdef FT2_BUILD_LIBRARY
+
+#if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) )
+#define FT_EXPORT( x )  __declspec( dllexport )  x
+#elif defined( __GNUC__ ) && __GNUC__ >= 4
+#define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
+#elif defined( __cplusplus )
 #define FT_EXPORT( x )  extern "C"  x
 #else
 #define FT_EXPORT( x )  extern  x
 #endif
 
-#ifdef _MSC_VER
-#undef FT_EXPORT
-#ifdef _DLL
-#define FT_EXPORT( x )  __declspec( dllexport )  x
 #else
+
+#if defined( FT2_DLLIMPORT )
 #define FT_EXPORT( x )  __declspec( dllimport )  x
+#elif defined( __cplusplus )
+#define FT_EXPORT( x )  extern "C"  x
+#else
+#define FT_EXPORT( x )  extern  x
 #endif
+
 #endif
 
 #endif /* !FT_EXPORT */
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
index 044d19f84f0..8bd0ffc31b2 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
@@ -82,6 +82,10 @@ FT_BEGIN_HEADER
   /* to control the various font drivers and modules.  The controllable    */
   /* properties are listed in the section @properties.                     */
   /*                                                                       */
+  /* You have to undefine this configuration option on platforms that lack */
+  /* the concept of environment variables (and thus don't have the         */
+  /* `getenv' function), for example Windows CE.                           */
+  /*                                                                       */
   /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
   /* multiple lines for better readability).                               */
   /*                                                                       */
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h b/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
index eda95e2abe4..96644046e45 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
@@ -724,11 +724,12 @@ FT_BEGIN_HEADER
   /*      Same as FT_ENCODING_JOHAB.  Deprecated.                          */
   /*                                                                       */
   /* <Note>                                                                */
-  /*    By default, FreeType automatically synthesizes a Unicode charmap   */
-  /*    for PostScript fonts, using their glyph name dictionaries.         */
-  /*    However, it also reports the encodings defined explicitly in the   */
-  /*    font file, for the cases when they are needed, with the Adobe      */
-  /*    values as well.                                                    */
+  /*    By default, FreeType enables a Unicode charmap and tags it with    */
+  /*    FT_ENCODING_UNICODE when it is either provided or can be generated */
+  /*    from PostScript glyph name dictionaries in the font file.          */
+  /*    All other encodings are considered legacy and tagged only if       */
+  /*    explicitly defined in the font file.  Otherwise, FT_ENCODING_NONE  */
+  /*    is used.                                                           */
   /*                                                                       */
   /*    FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap  */
   /*    is neither Unicode nor ISO-8859-1 (otherwise it is set to          */
@@ -1175,7 +1176,7 @@ FT_BEGIN_HEADER
   /*      interpolating between them.  Supported formats are Adobe MM,     */
   /*      TrueType GX, and OpenType variation fonts.                       */
   /*                                                                       */
-  /*      See the multiple-masters specific API for details.               */
+  /*      See section @multiple_masters for API details.                   */
   /*                                                                       */
   /*    FT_FACE_FLAG_GLYPH_NAMES ::                                        */
   /*      The face contains glyph names, which can be retrieved using      */
@@ -2062,8 +2063,8 @@ FT_BEGIN_HEADER
   /*    data :: A pointer to the parameter data.                           */
   /*                                                                       */
   /* <Note>                                                                */
-  /*    The ID and function of parameters are driver-specific.  See the    */
-  /*    various FT_PARAM_TAG_XXX flags for more information.               */
+  /*    The ID and function of parameters are driver-specific.  See        */
+  /*    section @parameter_tags for more information.                      */
   /*                                                                       */
   typedef struct  FT_Parameter_
   {
@@ -2833,6 +2834,10 @@ FT_BEGIN_HEADER
   /*    since its glyph indices are not listed in any of the font's        */
   /*    charmaps.                                                          */
   /*                                                                       */
+  /*    If no active cmap is set up (i.e., `face->charmap' is zero), the   */
+  /*    call to @FT_Get_Char_Index is omitted, and the function behaves    */
+  /*    identically to @FT_Load_Glyph.                                     */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Load_Char( FT_Face   face,
                 FT_ULong  char_code,
@@ -3065,7 +3070,7 @@ FT_BEGIN_HEADER
    *
    *     Advance widths are rounded to integer values; however, using the
    *     `lsb_delta' and `rsb_delta' fields of @FT_GlyphSlotRec, it is
-   *     possible to get fractional advance widths for sub-pixel positioning
+   *     possible to get fractional advance widths for subpixel positioning
    *     (which is recommended to use).
    *
    *     If configuration option AF_CONFIG_OPTION_TT_SIZE_METRICS is active,
@@ -3204,13 +3209,13 @@ FT_BEGIN_HEADER
   /*      opacity).                                                        */
   /*                                                                       */
   /*    FT_RENDER_MODE_LCD ::                                              */
-  /*      This mode corresponds to horizontal RGB and BGR sub-pixel        */
+  /*      This mode corresponds to horizontal RGB and BGR subpixel         */
   /*      displays like LCD screens.  It produces 8-bit bitmaps that are   */
   /*      3~times the width of the original glyph outline in pixels, and   */
   /*      which use the @FT_PIXEL_MODE_LCD mode.                           */
   /*                                                                       */
   /*    FT_RENDER_MODE_LCD_V ::                                            */
-  /*      This mode corresponds to vertical RGB and BGR sub-pixel displays */
+  /*      This mode corresponds to vertical RGB and BGR subpixel displays  */
   /*      (like PDA screens, rotated LCD displays, etc.).  It produces     */
   /*      8-bit bitmaps that are 3~times the height of the original        */
   /*      glyph outline in pixels and use the @FT_PIXEL_MODE_LCD_V mode.   */
@@ -4552,7 +4557,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  9
-#define FREETYPE_PATCH  0
+#define FREETYPE_PATCH  1
 
 
   /*************************************************************************/
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
index be4fe235d02..0a90e2941f5 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
@@ -111,9 +111,9 @@ FT_BEGIN_HEADER
    *
    *   One of the reasons to not hint horizontally is antialiasing for LCD
    *   screens: The pixel geometry of modern displays supplies three
-   *   vertical sub-pixels as the eye moves horizontally across each visible
+   *   vertical subpixels as the eye moves horizontally across each visible
    *   pixel.  On devices where we can be certain this characteristic is
-   *   present a rasterizer can take advantage of the sub-pixels to add
+   *   present a rasterizer can take advantage of the subpixels to add
    *   increments of weight.  In Western writing systems this turns out to
    *   be the more critical direction anyway; the weights and spacing of
    *   vertical stems (see above) are central to Armenian, Cyrillic, Greek,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h
index 9b54fc86a08..fc1248ff489 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h
@@ -29,6 +29,9 @@
 #endif
 
 
+FT_BEGIN_HEADER
+
+
   /***************************************************************************
    *
    * @section:
@@ -131,6 +134,8 @@
   /* */
 
 
+FT_END_HEADER
+
 #endif /* FTGASP_H_ */
 
 
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
index 37c6baffe6f..1c3c6ad4563 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
@@ -155,7 +155,7 @@ FT_BEGIN_HEADER
 
   } FT_CMapRec;
 
-  /* typecase any pointer to a charmap handle */
+  /* typecast any pointer to a charmap handle */
 #define FT_CMAP( x )  ( (FT_CMap)( x ) )
 
   /* obvious macros */
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c
index 61ab7957f0c..e4078fd0444 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c
@@ -166,6 +166,10 @@
     '\0',
     '\xE2', '\xB4', '\x84', ' ', '\xE2', '\xB4', '\x85', ' ', '\xE2', '\xB4', '\x94', ' ', '\xE2', '\xB4', '\x95', ' ', '\xE2', '\xB4', '\x81', ' ', '\xE2', '\xB4', '\x82', ' ', '\xE2', '\xB4', '\x98', ' ', '\xE2', '\xB4', '\x9D',  /* ⴄ ⴅ ⴔ ⴕ ⴁ ⴂ ⴘ ⴝ */
     '\0',
+    '\xE1', '\xB2', '\x9C', ' ', '\xE1', '\xB2', '\x9F', ' ', '\xE1', '\xB2', '\xB3', ' ', '\xE1', '\xB2', '\xB8', ' ', '\xE1', '\xB2', '\x92', ' ', '\xE1', '\xB2', '\x94', ' ', '\xE1', '\xB2', '\x9D', ' ', '\xE1', '\xB2', '\xB4',  /* Ნ Ჟ Ჳ Ჸ Გ Ე Ო Ჴ */
+    '\0',
+    '\xE1', '\xB2', '\x98', ' ', '\xE1', '\xB2', '\xB2', ' ', '\xE1', '\xB2', '\x9D', ' ', '\xE1', '\xB2', '\xA9', ' ', '\xE1', '\xB2', '\x9B', ' ', '\xE1', '\xB2', '\xA8', ' ', '\xE1', '\xB2', '\xAF', ' ', '\xE1', '\xB2', '\xBD',  /* Ი Ჲ Ო Ჩ Მ Შ Ჯ Ჽ */
+    '\0',
     '\xE2', '\xB0', '\x85', ' ', '\xE2', '\xB0', '\x94', ' ', '\xE2', '\xB0', '\xAA', ' ', '\xE2', '\xB0', '\x84', ' ', '\xE2', '\xB0', '\x82', ' ', '\xE2', '\xB0', '\x8A', ' ', '\xE2', '\xB0', '\xAB', ' ', '\xE2', '\xB0', '\x8B',  /* Ⰵ Ⱄ Ⱚ Ⰴ Ⰲ Ⰺ Ⱛ Ⰻ */
     '\0',
     '\xE2', '\xB0', '\x85', ' ', '\xE2', '\xB0', '\x84', ' ', '\xE2', '\xB0', '\x82', ' ', '\xE2', '\xB0', '\xAA', ' ', '\xE2', '\xB0', '\x9E', ' ', '\xE2', '\xB0', '\xA1', ' ', '\xE2', '\xB0', '\x8A', ' ', '\xE2', '\xB0', '\x94',  /* Ⰵ Ⰴ Ⰲ Ⱚ Ⱎ Ⱑ Ⰺ Ⱄ */
@@ -539,6 +543,8 @@
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM,    0                                 },
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER,  AF_BLUE_PROPERTY_LATIN_TOP        },
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP,        AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM,     0                                 },
     { AF_BLUE_STRING_MAX,                          0                                 },
     { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP,    AF_BLUE_PROPERTY_LATIN_TOP        },
     { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM, 0                                 },
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
index d3cc4284b87..bc2f0d27540 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
@@ -242,6 +242,11 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
   AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER
     "ⴄ ⴅ ⴔ ⴕ ⴁ ⴂ ⴘ ⴝ"
 
+  AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP
+    "Ნ Ჟ Ჳ Ჸ Გ Ე Ო Ჴ"
+  AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM
+    "Ი Ჲ Ო Ჩ Მ Შ Ჯ Ჽ"
+
   AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP
     "Ⰵ Ⱄ Ⱚ Ⰴ Ⰲ Ⰺ Ⱛ Ⰻ"
   AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM
@@ -795,13 +800,14 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN:
     { AF_BLUE_STRING_ETHIOPIC_BOTTOM, 0                          }
     { AF_BLUE_STRING_MAX,             0                          }
 
-  // blue zones for Mtavruli are missing (not yet defined in Unicode)
   AF_BLUE_STRINGSET_GEOR
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP,       AF_BLUE_PROPERTY_LATIN_TOP      |
                                                    AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM,    0                                 }
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER,  AF_BLUE_PROPERTY_LATIN_TOP        }
     { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP,        AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM,     0                                 }
     { AF_BLUE_STRING_MAX,                          0                                 }
 
   AF_BLUE_STRINGSET_GEOK
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h
index 56b591aa8df..de31e259c3b 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h
@@ -147,119 +147,121 @@ FT_BEGIN_HEADER
     AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1813,
     AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1845,
     AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1877,
-    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1909,
-    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1941,
-    AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1973,
-    AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 2005,
-    AF_BLUE_STRING_GOTHIC_TOP = 2037,
-    AF_BLUE_STRING_GOTHIC_BOTTOM = 2077,
-    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 2097,
-    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 2118,
-    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 2136,
-    AF_BLUE_STRING_GREEK_SMALL = 2154,
-    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 2178,
-    AF_BLUE_STRING_GUJARATI_TOP = 2202,
-    AF_BLUE_STRING_GUJARATI_BOTTOM = 2234,
-    AF_BLUE_STRING_GUJARATI_ASCENDER = 2266,
-    AF_BLUE_STRING_GUJARATI_DESCENDER = 2316,
-    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 2349,
-    AF_BLUE_STRING_GURMUKHI_BASE = 2369,
-    AF_BLUE_STRING_GURMUKHI_HEAD = 2401,
-    AF_BLUE_STRING_GURMUKHI_TOP = 2433,
-    AF_BLUE_STRING_GURMUKHI_BOTTOM = 2465,
-    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2497,
-    AF_BLUE_STRING_HEBREW_TOP = 2517,
-    AF_BLUE_STRING_HEBREW_BOTTOM = 2541,
-    AF_BLUE_STRING_HEBREW_DESCENDER = 2559,
-    AF_BLUE_STRING_KANNADA_TOP = 2574,
-    AF_BLUE_STRING_KANNADA_BOTTOM = 2618,
-    AF_BLUE_STRING_KAYAH_LI_TOP = 2650,
-    AF_BLUE_STRING_KAYAH_LI_BOTTOM = 2674,
-    AF_BLUE_STRING_KAYAH_LI_ASCENDER = 2694,
-    AF_BLUE_STRING_KAYAH_LI_DESCENDER = 2702,
-    AF_BLUE_STRING_KAYAH_LI_LARGE_DESCENDER = 2714,
-    AF_BLUE_STRING_KHMER_TOP = 2735,
-    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2759,
-    AF_BLUE_STRING_KHMER_BOTTOM = 2799,
-    AF_BLUE_STRING_KHMER_DESCENDER = 2831,
-    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2865,
-    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2952,
-    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2960,
-    AF_BLUE_STRING_LAO_TOP = 2968,
-    AF_BLUE_STRING_LAO_BOTTOM = 3000,
-    AF_BLUE_STRING_LAO_ASCENDER = 3032,
-    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 3048,
-    AF_BLUE_STRING_LAO_DESCENDER = 3060,
-    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 3084,
-    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 3100,
-    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 3116,
-    AF_BLUE_STRING_LATIN_SMALL_TOP = 3130,
-    AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 3146,
-    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 3162,
-    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 3172,
-    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 3192,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 3212,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL = 3232,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 3268,
-    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 3288,
-    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 3319,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 3348,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL = 3374,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 3399,
-    AF_BLUE_STRING_LISU_TOP = 3410,
-    AF_BLUE_STRING_LISU_BOTTOM = 3442,
-    AF_BLUE_STRING_MALAYALAM_TOP = 3474,
-    AF_BLUE_STRING_MALAYALAM_BOTTOM = 3518,
-    AF_BLUE_STRING_MYANMAR_TOP = 3550,
-    AF_BLUE_STRING_MYANMAR_BOTTOM = 3582,
-    AF_BLUE_STRING_MYANMAR_ASCENDER = 3614,
-    AF_BLUE_STRING_MYANMAR_DESCENDER = 3642,
-    AF_BLUE_STRING_NKO_TOP = 3674,
-    AF_BLUE_STRING_NKO_BOTTOM = 3698,
-    AF_BLUE_STRING_NKO_SMALL_TOP = 3713,
-    AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3722,
-    AF_BLUE_STRING_OL_CHIKI = 3734,
-    AF_BLUE_STRING_OLD_TURKIC_TOP = 3758,
-    AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3773,
-    AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3793,
-    AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3833,
-    AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3863,
-    AF_BLUE_STRING_OSAGE_SMALL_TOP = 3878,
-    AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3918,
-    AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3958,
-    AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3983,
-    AF_BLUE_STRING_OSMANYA_TOP = 3998,
-    AF_BLUE_STRING_OSMANYA_BOTTOM = 4038,
-    AF_BLUE_STRING_SAURASHTRA_TOP = 4078,
-    AF_BLUE_STRING_SAURASHTRA_BOTTOM = 4110,
-    AF_BLUE_STRING_SHAVIAN_TOP = 4130,
-    AF_BLUE_STRING_SHAVIAN_BOTTOM = 4140,
-    AF_BLUE_STRING_SHAVIAN_DESCENDER = 4165,
-    AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 4175,
-    AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4210,
-    AF_BLUE_STRING_SINHALA_TOP = 4225,
-    AF_BLUE_STRING_SINHALA_BOTTOM = 4257,
-    AF_BLUE_STRING_SINHALA_DESCENDER = 4289,
-    AF_BLUE_STRING_SUNDANESE_TOP = 4333,
-    AF_BLUE_STRING_SUNDANESE_BOTTOM = 4357,
-    AF_BLUE_STRING_SUNDANESE_DESCENDER = 4389,
-    AF_BLUE_STRING_TAI_VIET_TOP = 4397,
-    AF_BLUE_STRING_TAI_VIET_BOTTOM = 4417,
-    AF_BLUE_STRING_TAMIL_TOP = 4429,
-    AF_BLUE_STRING_TAMIL_BOTTOM = 4461,
-    AF_BLUE_STRING_TELUGU_TOP = 4493,
-    AF_BLUE_STRING_TELUGU_BOTTOM = 4521,
-    AF_BLUE_STRING_THAI_TOP = 4549,
-    AF_BLUE_STRING_THAI_BOTTOM = 4573,
-    AF_BLUE_STRING_THAI_ASCENDER = 4601,
-    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4613,
-    AF_BLUE_STRING_THAI_DESCENDER = 4625,
-    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4641,
-    AF_BLUE_STRING_THAI_DIGIT_TOP = 4649,
-    AF_BLUE_STRING_TIFINAGH = 4661,
-    AF_BLUE_STRING_VAI_TOP = 4693,
-    AF_BLUE_STRING_VAI_BOTTOM = 4725,
-    af_blue_1_1 = 4756,
+    AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP = 1909,
+    AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM = 1941,
+    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1973,
+    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 2005,
+    AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 2037,
+    AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 2069,
+    AF_BLUE_STRING_GOTHIC_TOP = 2101,
+    AF_BLUE_STRING_GOTHIC_BOTTOM = 2141,
+    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 2161,
+    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 2182,
+    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 2200,
+    AF_BLUE_STRING_GREEK_SMALL = 2218,
+    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 2242,
+    AF_BLUE_STRING_GUJARATI_TOP = 2266,
+    AF_BLUE_STRING_GUJARATI_BOTTOM = 2298,
+    AF_BLUE_STRING_GUJARATI_ASCENDER = 2330,
+    AF_BLUE_STRING_GUJARATI_DESCENDER = 2380,
+    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 2413,
+    AF_BLUE_STRING_GURMUKHI_BASE = 2433,
+    AF_BLUE_STRING_GURMUKHI_HEAD = 2465,
+    AF_BLUE_STRING_GURMUKHI_TOP = 2497,
+    AF_BLUE_STRING_GURMUKHI_BOTTOM = 2529,
+    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2561,
+    AF_BLUE_STRING_HEBREW_TOP = 2581,
+    AF_BLUE_STRING_HEBREW_BOTTOM = 2605,
+    AF_BLUE_STRING_HEBREW_DESCENDER = 2623,
+    AF_BLUE_STRING_KANNADA_TOP = 2638,
+    AF_BLUE_STRING_KANNADA_BOTTOM = 2682,
+    AF_BLUE_STRING_KAYAH_LI_TOP = 2714,
+    AF_BLUE_STRING_KAYAH_LI_BOTTOM = 2738,
+    AF_BLUE_STRING_KAYAH_LI_ASCENDER = 2758,
+    AF_BLUE_STRING_KAYAH_LI_DESCENDER = 2766,
+    AF_BLUE_STRING_KAYAH_LI_LARGE_DESCENDER = 2778,
+    AF_BLUE_STRING_KHMER_TOP = 2799,
+    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2823,
+    AF_BLUE_STRING_KHMER_BOTTOM = 2863,
+    AF_BLUE_STRING_KHMER_DESCENDER = 2895,
+    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2929,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 3016,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 3024,
+    AF_BLUE_STRING_LAO_TOP = 3032,
+    AF_BLUE_STRING_LAO_BOTTOM = 3064,
+    AF_BLUE_STRING_LAO_ASCENDER = 3096,
+    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 3112,
+    AF_BLUE_STRING_LAO_DESCENDER = 3124,
+    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 3148,
+    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 3164,
+    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 3180,
+    AF_BLUE_STRING_LATIN_SMALL_TOP = 3194,
+    AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 3210,
+    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 3226,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 3236,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 3256,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 3276,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL = 3296,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 3332,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 3352,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 3383,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 3412,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL = 3438,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 3463,
+    AF_BLUE_STRING_LISU_TOP = 3474,
+    AF_BLUE_STRING_LISU_BOTTOM = 3506,
+    AF_BLUE_STRING_MALAYALAM_TOP = 3538,
+    AF_BLUE_STRING_MALAYALAM_BOTTOM = 3582,
+    AF_BLUE_STRING_MYANMAR_TOP = 3614,
+    AF_BLUE_STRING_MYANMAR_BOTTOM = 3646,
+    AF_BLUE_STRING_MYANMAR_ASCENDER = 3678,
+    AF_BLUE_STRING_MYANMAR_DESCENDER = 3706,
+    AF_BLUE_STRING_NKO_TOP = 3738,
+    AF_BLUE_STRING_NKO_BOTTOM = 3762,
+    AF_BLUE_STRING_NKO_SMALL_TOP = 3777,
+    AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3786,
+    AF_BLUE_STRING_OL_CHIKI = 3798,
+    AF_BLUE_STRING_OLD_TURKIC_TOP = 3822,
+    AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3837,
+    AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3857,
+    AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3897,
+    AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3927,
+    AF_BLUE_STRING_OSAGE_SMALL_TOP = 3942,
+    AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3982,
+    AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 4022,
+    AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 4047,
+    AF_BLUE_STRING_OSMANYA_TOP = 4062,
+    AF_BLUE_STRING_OSMANYA_BOTTOM = 4102,
+    AF_BLUE_STRING_SAURASHTRA_TOP = 4142,
+    AF_BLUE_STRING_SAURASHTRA_BOTTOM = 4174,
+    AF_BLUE_STRING_SHAVIAN_TOP = 4194,
+    AF_BLUE_STRING_SHAVIAN_BOTTOM = 4204,
+    AF_BLUE_STRING_SHAVIAN_DESCENDER = 4229,
+    AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 4239,
+    AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4274,
+    AF_BLUE_STRING_SINHALA_TOP = 4289,
+    AF_BLUE_STRING_SINHALA_BOTTOM = 4321,
+    AF_BLUE_STRING_SINHALA_DESCENDER = 4353,
+    AF_BLUE_STRING_SUNDANESE_TOP = 4397,
+    AF_BLUE_STRING_SUNDANESE_BOTTOM = 4421,
+    AF_BLUE_STRING_SUNDANESE_DESCENDER = 4453,
+    AF_BLUE_STRING_TAI_VIET_TOP = 4461,
+    AF_BLUE_STRING_TAI_VIET_BOTTOM = 4481,
+    AF_BLUE_STRING_TAMIL_TOP = 4493,
+    AF_BLUE_STRING_TAMIL_BOTTOM = 4525,
+    AF_BLUE_STRING_TELUGU_TOP = 4557,
+    AF_BLUE_STRING_TELUGU_BOTTOM = 4585,
+    AF_BLUE_STRING_THAI_TOP = 4613,
+    AF_BLUE_STRING_THAI_BOTTOM = 4637,
+    AF_BLUE_STRING_THAI_ASCENDER = 4665,
+    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4677,
+    AF_BLUE_STRING_THAI_DESCENDER = 4689,
+    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4705,
+    AF_BLUE_STRING_THAI_DIGIT_TOP = 4713,
+    AF_BLUE_STRING_TIFINAGH = 4725,
+    AF_BLUE_STRING_VAI_TOP = 4757,
+    AF_BLUE_STRING_VAI_BOTTOM = 4789,
+    af_blue_1_1 = 4820,
 #ifdef AF_CONFIG_OPTION_CJK
     AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1,
     AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203,
@@ -336,41 +338,41 @@ FT_BEGIN_HEADER
     AF_BLUE_STRINGSET_DSRT = 75,
     AF_BLUE_STRINGSET_ETHI = 80,
     AF_BLUE_STRINGSET_GEOR = 83,
-    AF_BLUE_STRINGSET_GEOK = 88,
-    AF_BLUE_STRINGSET_GLAG = 95,
-    AF_BLUE_STRINGSET_GOTH = 100,
-    AF_BLUE_STRINGSET_GREK = 103,
-    AF_BLUE_STRINGSET_GUJR = 110,
-    AF_BLUE_STRINGSET_GURU = 116,
-    AF_BLUE_STRINGSET_HEBR = 122,
-    AF_BLUE_STRINGSET_KALI = 126,
-    AF_BLUE_STRINGSET_KHMR = 132,
-    AF_BLUE_STRINGSET_KHMS = 138,
-    AF_BLUE_STRINGSET_KNDA = 141,
-    AF_BLUE_STRINGSET_LAO = 144,
-    AF_BLUE_STRINGSET_LATN = 150,
-    AF_BLUE_STRINGSET_LATB = 157,
-    AF_BLUE_STRINGSET_LATP = 164,
-    AF_BLUE_STRINGSET_LISU = 171,
-    AF_BLUE_STRINGSET_MLYM = 174,
-    AF_BLUE_STRINGSET_MYMR = 177,
-    AF_BLUE_STRINGSET_NKOO = 182,
-    AF_BLUE_STRINGSET_NONE = 187,
-    AF_BLUE_STRINGSET_OLCK = 188,
-    AF_BLUE_STRINGSET_ORKH = 191,
-    AF_BLUE_STRINGSET_OSGE = 194,
-    AF_BLUE_STRINGSET_OSMA = 202,
-    AF_BLUE_STRINGSET_SAUR = 205,
-    AF_BLUE_STRINGSET_SHAW = 208,
-    AF_BLUE_STRINGSET_SINH = 214,
-    AF_BLUE_STRINGSET_SUND = 218,
-    AF_BLUE_STRINGSET_TAML = 222,
-    AF_BLUE_STRINGSET_TAVT = 225,
-    AF_BLUE_STRINGSET_TELU = 228,
-    AF_BLUE_STRINGSET_TFNG = 231,
-    AF_BLUE_STRINGSET_THAI = 234,
-    AF_BLUE_STRINGSET_VAII = 242,
-    af_blue_2_1 = 245,
+    AF_BLUE_STRINGSET_GEOK = 90,
+    AF_BLUE_STRINGSET_GLAG = 97,
+    AF_BLUE_STRINGSET_GOTH = 102,
+    AF_BLUE_STRINGSET_GREK = 105,
+    AF_BLUE_STRINGSET_GUJR = 112,
+    AF_BLUE_STRINGSET_GURU = 118,
+    AF_BLUE_STRINGSET_HEBR = 124,
+    AF_BLUE_STRINGSET_KALI = 128,
+    AF_BLUE_STRINGSET_KHMR = 134,
+    AF_BLUE_STRINGSET_KHMS = 140,
+    AF_BLUE_STRINGSET_KNDA = 143,
+    AF_BLUE_STRINGSET_LAO = 146,
+    AF_BLUE_STRINGSET_LATN = 152,
+    AF_BLUE_STRINGSET_LATB = 159,
+    AF_BLUE_STRINGSET_LATP = 166,
+    AF_BLUE_STRINGSET_LISU = 173,
+    AF_BLUE_STRINGSET_MLYM = 176,
+    AF_BLUE_STRINGSET_MYMR = 179,
+    AF_BLUE_STRINGSET_NKOO = 184,
+    AF_BLUE_STRINGSET_NONE = 189,
+    AF_BLUE_STRINGSET_OLCK = 190,
+    AF_BLUE_STRINGSET_ORKH = 193,
+    AF_BLUE_STRINGSET_OSGE = 196,
+    AF_BLUE_STRINGSET_OSMA = 204,
+    AF_BLUE_STRINGSET_SAUR = 207,
+    AF_BLUE_STRINGSET_SHAW = 210,
+    AF_BLUE_STRINGSET_SINH = 216,
+    AF_BLUE_STRINGSET_SUND = 220,
+    AF_BLUE_STRINGSET_TAML = 224,
+    AF_BLUE_STRINGSET_TAVT = 227,
+    AF_BLUE_STRINGSET_TELU = 230,
+    AF_BLUE_STRINGSET_TFNG = 233,
+    AF_BLUE_STRINGSET_THAI = 236,
+    AF_BLUE_STRINGSET_VAII = 244,
+    af_blue_2_1 = 247,
 #ifdef AF_CONFIG_OPTION_CJK
     AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0,
     af_blue_2_1_1 = af_blue_2_1 + 2,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c b/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
index 1355c5e7cc3..cf67fafb11c 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
@@ -91,7 +91,7 @@
     AF_UNIRANGE_REC(  0x06E7,  0x06E8 ),
     AF_UNIRANGE_REC(  0x06EA,  0x06ED ),
     AF_UNIRANGE_REC(  0x08D4,  0x08E1 ),
-    AF_UNIRANGE_REC(  0x08E3,  0x08FF ),
+    AF_UNIRANGE_REC(  0x08D3,  0x08FF ),
     AF_UNIRANGE_REC(  0xFBB2,  0xFBC1 ),
     AF_UNIRANGE_REC(  0xFE70,  0xFE70 ),
     AF_UNIRANGE_REC(  0xFE72,  0xFE72 ),
@@ -163,6 +163,7 @@
     AF_UNIRANGE_REC(  0x09C1,  0x09C4 ),
     AF_UNIRANGE_REC(  0x09CD,  0x09CD ),
     AF_UNIRANGE_REC(  0x09E2,  0x09E3 ),
+    AF_UNIRANGE_REC(  0x09FE,  0x09FE ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -190,6 +191,7 @@
   {
     AF_UNIRANGE_REC( 0x11100, 0x11102 ),
     AF_UNIRANGE_REC( 0x11127, 0x11134 ),
+    AF_UNIRANGE_REC( 0x11146, 0x11146 ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -304,6 +306,7 @@
     AF_UNIRANGE_REC(  0x0953,  0x0957 ),
     AF_UNIRANGE_REC(  0x0962,  0x0963 ),
     AF_UNIRANGE_REC(  0xA8E0,  0xA8F1 ),
+    AF_UNIRANGE_REC(  0xA8FF,  0xA8FF ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -338,11 +341,8 @@
 
   const AF_Script_UniRangeRec  af_geor_uniranges[] =
   {
-    AF_UNIRANGE_REC(  0x10D0,  0x10FF ),  /* Georgian (Mkhedruli) */
-#if 0
-    /* the following range is proposed for inclusion in Unicode */
-    AF_UNIRANGE_REC(  0x1C90,  0x1CBF ),  /* Georgian (Mtavruli)  */
-#endif
+    AF_UNIRANGE_REC(  0x10D0,  0x10FF ),  /* Georgian (Mkhedruli)          */
+    AF_UNIRANGE_REC(  0x1C90,  0x1CBF ),  /* Georgian Extended (Mtavruli)  */
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -355,8 +355,8 @@
   const AF_Script_UniRangeRec  af_geok_uniranges[] =
   {
     /* Khutsuri */
-    AF_UNIRANGE_REC(  0x10A0,  0x10CD ),  /* Georgian (Asomtavruli) */
-    AF_UNIRANGE_REC(  0x2D00,  0x2D2D ),  /* Georgian (Nuskhuri)    */
+    AF_UNIRANGE_REC(  0x10A0,  0x10CD ),  /* Georgian (Asomtavruli)         */
+    AF_UNIRANGE_REC(  0x2D00,  0x2D2D ),  /* Georgian Supplement (Nuskhuri) */
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -425,6 +425,7 @@
     AF_UNIRANGE_REC(  0x0AC1,  0x0AC8 ),
     AF_UNIRANGE_REC(  0x0ACD,  0x0ACD ),
     AF_UNIRANGE_REC(  0x0AE2,  0x0AE3 ),
+    AF_UNIRANGE_REC(  0x0AFA,  0x0AFF ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -655,7 +656,8 @@
 
   const AF_Script_UniRangeRec  af_mlym_nonbase_uniranges[] =
   {
-    AF_UNIRANGE_REC(  0x0D01,  0x0D01 ),
+    AF_UNIRANGE_REC(  0x0D00,  0x0D01 ),
+    AF_UNIRANGE_REC(  0x0D3B,  0x0D3C ),
     AF_UNIRANGE_REC(  0x0D4D,  0x0D4E ),
     AF_UNIRANGE_REC(  0x0D62,  0x0D63 ),
     AF_UNIRANGE_REC(       0,       0 )
@@ -697,6 +699,7 @@
   const AF_Script_UniRangeRec  af_nkoo_nonbase_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x07EB,  0x07F5 ),
+    AF_UNIRANGE_REC(  0x07FD,  0x07FD ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -856,6 +859,7 @@
   const AF_Script_UniRangeRec  af_telu_nonbase_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x0C00,  0x0C00 ),
+    AF_UNIRANGE_REC(  0x0C04,  0x0C04 ),
     AF_UNIRANGE_REC(  0x0C3E,  0x0C40 ),
     AF_UNIRANGE_REC(  0x0C46,  0x0C56 ),
     AF_UNIRANGE_REC(  0x0C62,  0x0C63 ),
@@ -1006,10 +1010,13 @@
     AF_UNIRANGE_REC(  0xFE30,  0xFE4F ),  /* CJK Compatibility Forms                 */
     AF_UNIRANGE_REC(  0xFF00,  0xFFEF ),  /* Halfwidth and Fullwidth Forms           */
     AF_UNIRANGE_REC( 0x1B000, 0x1B0FF ),  /* Kana Supplement                         */
+    AF_UNIRANGE_REC( 0x1B100, 0x1B12F ),  /* Kana Extended-A                         */
     AF_UNIRANGE_REC( 0x1D300, 0x1D35F ),  /* Tai Xuan Hing Symbols                   */
     AF_UNIRANGE_REC( 0x20000, 0x2A6DF ),  /* CJK Unified Ideographs Extension B      */
     AF_UNIRANGE_REC( 0x2A700, 0x2B73F ),  /* CJK Unified Ideographs Extension C      */
     AF_UNIRANGE_REC( 0x2B740, 0x2B81F ),  /* CJK Unified Ideographs Extension D      */
+    AF_UNIRANGE_REC( 0x2B820, 0x2CEAF ),  /* CJK Unified Ideographs Extension E      */
+    AF_UNIRANGE_REC( 0x2CEB0, 0x2EBEF ),  /* CJK Unified Ideographs Extension F      */
     AF_UNIRANGE_REC( 0x2F800, 0x2FA1F ),  /* CJK Compatibility Ideographs Supplement */
     AF_UNIRANGE_REC(       0,       0 )
   };
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h b/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h
index 6ac193f6a71..623a1734a62 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h
@@ -137,7 +137,7 @@
           "Georgian (Mkhedruli)",
           HB_SCRIPT_GEORGIAN,
           HINTING_BOTTOM_TO_TOP,
-          "\xE1\x83\x98 \xE1\x83\x94 \xE1\x83\x90" ) /* ი ე ა */
+          "\xE1\x83\x98 \xE1\x83\x94 \xE1\x83\x90 \xE1\xB2\xBF" ) /* ი ე ა Ი */
 
   SCRIPT( geok, GEOK,
           "Georgian (Khutsuri)",
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h b/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
index a50013439bf..6bd8c895b2a 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
@@ -76,9 +76,9 @@ extern void*  _af_debug_hints;
 
   typedef struct  AF_WidthRec_
   {
-    FT_Pos  org;  /* original position/width in font units              */
-    FT_Pos  cur;  /* current/scaled position/width in device sub-pixels */
-    FT_Pos  fit;  /* current/fitted position/width in device sub-pixels */
+    FT_Pos  org;  /* original position/width in font units             */
+    FT_Pos  cur;  /* current/scaled position/width in device subpixels */
+    FT_Pos  fit;  /* current/fitted position/width in device subpixels */
 
   } AF_WidthRec, *AF_Width;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c b/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
index 93efb094479..a9746663faa 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
@@ -237,7 +237,7 @@
       unsigned char*  out = buffer;
 
       unsigned char*  limit = bitmap->buffer + pitch * bitmap->rows;
-      unsigned int    delta = new_pitch - pitch;
+      unsigned int    delta = new_pitch - len;
 
 
       FT_MEM_ZERO( out, new_pitch * ypixels );
@@ -247,8 +247,10 @@
       {
         FT_MEM_COPY( out, in, len );
         in  += pitch;
-        out += pitch;
+        out += len;
 
+        /* we use FT_QALLOC_MULT, which doesn't zero out the buffer;      */
+        /* consequently, we have to manually zero out the remaining bytes */
         FT_MEM_ZERO( out, delta );
         out += delta;
       }
@@ -261,14 +263,14 @@
       unsigned char*  out = buffer;
 
       unsigned char*  limit = bitmap->buffer + pitch * bitmap->rows;
-      unsigned int    delta = new_pitch - pitch;
+      unsigned int    delta = new_pitch - len;
 
 
       while ( in < limit )
       {
         FT_MEM_COPY( out, in, len );
         in  += pitch;
-        out += pitch;
+        out += len;
 
         FT_MEM_ZERO( out, delta );
         out += delta;
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c b/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c
index 5c38911a907..8d314df0803 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c
@@ -77,7 +77,7 @@
 
 
     /* take care of bitmap flow */
-    if ( pitch > 0 )
+    if ( pitch > 0 && height > 0 )
       origin += pitch * (FT_Int)( height - 1 );
 
     /* horizontal in-place FIR filter */
@@ -192,7 +192,7 @@
 
 
     /* take care of bitmap flow */
-    if ( pitch > 0 )
+    if ( pitch > 0 && height > 0 )
       origin += pitch * (FT_Int)( height - 1 );
 
     /* horizontal in-place intra-pixel filter */
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c b/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
index 9c29ade92fb..cb91321debf 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
@@ -286,12 +286,13 @@
     FT_TRACE5(( "FT_Outline_Decompose: Done\n", n ));
     return FT_Err_Ok;
 
+  Invalid_Outline:
+    error = FT_THROW( Invalid_Outline );
+    /* fall through */
+
   Exit:
     FT_TRACE5(( "FT_Outline_Decompose: Error 0x%x\n", error ));
     return error;
-
-  Invalid_Outline:
-    return FT_THROW( Invalid_Outline );
   }
 
 
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffload.c b/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
index ba49793dc8a..1c6fe515667 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
@@ -1933,6 +1933,24 @@
     else if ( priv->initial_random_seed == 0 )
       priv->initial_random_seed = 987654321;
 
+    /* some sanitizing to avoid overflows later on; */
+    /* the upper limits are ad-hoc values           */
+    if ( priv->blue_shift > 1000 || priv->blue_shift < 0 )
+    {
+      FT_TRACE2(( "cff_load_private_dict:"
+                  " setting unlikely BlueShift value %d to default (7)\n",
+                  priv->blue_shift ));
+      priv->blue_shift = 7;
+    }
+
+    if ( priv->blue_fuzz > 1000 || priv->blue_fuzz < 0 )
+    {
+      FT_TRACE2(( "cff_load_private_dict:"
+                  " setting unlikely BlueFuzz value %d to default (1)\n",
+                  priv->blue_fuzz ));
+      priv->blue_fuzz = 1;
+    }
+
   Exit:
     /* clean up */
     cff_blend_clear( subfont ); /* clear blend stack */
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c b/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
index 5c0ee784924..da5a8dad1db 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
@@ -852,7 +852,8 @@
 
         curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
 
-        cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+        if ( !decoder->flex_state )
+          cf2_glyphpath_moveTo( &glyphPath, curX, curY );
 
         break;
 
@@ -2674,7 +2675,8 @@
 
         curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
 
-        cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+        if ( !decoder->flex_state )
+          cf2_glyphpath_moveTo( &glyphPath, curX, curY );
 
         break;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c b/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
index 29f328d0e6d..accc04921d0 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
@@ -227,8 +227,8 @@
   }
 
 
-  /* Re-read blue zones from the original fonts and store them into out */
-  /* private structure.  This function re-orders, sanitizes and         */
+  /* Re-read blue zones from the original fonts and store them into our */
+  /* private structure.  This function re-orders, sanitizes, and        */
   /* fuzz-expands the zones as well.                                    */
   static void
   psh_blues_set_zones( PSH_Blues  target,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c b/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
index 0c917030f37..6ba8509f569 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
@@ -1144,6 +1144,8 @@
     FT_Bool       has_outline;
     FT_Bool       is_apple_sbit;
     FT_Bool       is_apple_sbix;
+    FT_Bool       has_CBLC;
+    FT_Bool       has_CBDT;
     FT_Bool       ignore_typographic_family    = FALSE;
     FT_Bool       ignore_typographic_subfamily = FALSE;
 
@@ -1224,6 +1226,13 @@
         goto Exit;
     }
 
+    has_CBLC = !face->goto_table( face, TTAG_CBLC, stream, 0 );
+    has_CBDT = !face->goto_table( face, TTAG_CBDT, stream, 0 );
+
+    /* Ignore outlines for CBLC/CBDT fonts. */
+    if ( has_CBLC || has_CBDT )
+      has_outline = FALSE;
+
     /* OpenType 1.8.2 introduced limits to this value;    */
     /* however, they make sense for older SFNT fonts also */
     if ( face->header.Units_Per_EM <    16 ||
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
index 8cc70f759af..996e66485fa 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
@@ -222,10 +222,10 @@
   /***** The following charmap lookup and iteration functions all      *****/
   /***** assume that the value `charcode' fulfills the following.      *****/
   /*****                                                               *****/
-  /*****   - For one byte characters, `charcode' is simply the         *****/
+  /*****   - For one-byte characters, `charcode' is simply the         *****/
   /*****     character code.                                           *****/
   /*****                                                               *****/
-  /*****   - For two byte characters, `charcode' is the 2-byte         *****/
+  /*****   - For two-byte characters, `charcode' is the 2-byte         *****/
   /*****     character code in big endian format.  More precisely:     *****/
   /*****                                                               *****/
   /*****       (charcode >> 8)    is the first byte value              *****/
@@ -252,11 +252,11 @@
   /*   subs        518            SUBHEAD[NSUBS]  sub-headers array        */
   /*   glyph_ids   518+NSUB*8     USHORT[]        glyph ID array           */
   /*                                                                       */
-  /* The `keys' table is used to map charcode high-bytes to sub-headers.   */
+  /* The `keys' table is used to map charcode high bytes to sub-headers.   */
   /* The value of `NSUBS' is the number of sub-headers defined in the      */
   /* table and is computed by finding the maximum of the `keys' table.     */
   /*                                                                       */
-  /* Note that for any n, `keys[n]' is a byte offset within the `subs'     */
+  /* Note that for any `n', `keys[n]' is a byte offset within the `subs'   */
   /* table, i.e., it is the corresponding sub-header index multiplied      */
   /* by 8.                                                                 */
   /*                                                                       */
@@ -269,8 +269,8 @@
   /*   delta       4           SHORT           see below                   */
   /*   offset      6           USHORT          see below                   */
   /*                                                                       */
-  /* A sub-header defines, for each high-byte, the range of valid          */
-  /* low-bytes within the charmap.  Note that the range defined by `first' */
+  /* A sub-header defines, for each high byte, the range of valid          */
+  /* low bytes within the charmap.  Note that the range defined by `first' */
   /* and `count' must be completely included in the interval [0..255]      */
   /* according to the specification.                                       */
   /*                                                                       */
@@ -360,7 +360,7 @@
       /* check range within 0..255 */
       if ( valid->level >= FT_VALIDATE_PARANOID )
       {
-        if ( first_code >= 256 || first_code + code_count > 256 )
+        if ( first_code >= 256 || code_count > 256 - first_code )
           FT_INVALID_DATA;
       }
 
@@ -412,7 +412,7 @@
     {
       FT_UInt   char_lo = (FT_UInt)( char_code & 0xFF );
       FT_UInt   char_hi = (FT_UInt)( char_code >> 8 );
-      FT_Byte*  p       = table + 6;    /* keys table */
+      FT_Byte*  p       = table + 6;    /* keys table       */
       FT_Byte*  subs    = table + 518;  /* subheaders table */
       FT_Byte*  sub;
 
@@ -425,8 +425,8 @@
         sub = subs;  /* jump to first sub-header */
 
         /* check that the sub-header for this byte is 0, which */
-        /* indicates that it is really a valid one-byte value  */
-        /* Otherwise, return 0                                 */
+        /* indicates that it is really a valid one-byte value; */
+        /* otherwise, return 0                                 */
         /*                                                     */
         p += char_lo * 2;
         if ( TT_PEEK_USHORT( p ) != 0 )
@@ -445,6 +445,7 @@
         if ( sub == subs )
           goto Exit;
       }
+
       result = sub;
     }
 
@@ -517,6 +518,13 @@
         FT_UInt   pos, idx;
 
 
+        if ( char_lo >= start + count && charcode <= 0xFF )
+        {
+          /* this happens only for a malformed cmap */
+          charcode = 0x100;
+          continue;
+        }
+
         if ( offset == 0 )
         {
           if ( charcode == 0x100 )
@@ -549,19 +557,18 @@
             }
           }
         }
+
+        /* if unsuccessful, avoid `charcode' leaving */
+        /* the current 256-character block           */
+        if ( count )
+          charcode--;
       }
 
-      /* If `charcode' is <= 0xFF, retry with `charcode + 1'.  If        */
-      /* `charcode' is 0x100 after the loop, do nothing since we have    */
-      /* just reached the first sub-header for two-byte character codes. */
-      /*                                                                 */
-      /* For all other cases, we jump to the next sub-header and adjust  */
-      /* `charcode' accordingly.                                         */
+      /* If `charcode' is <= 0xFF, retry with `charcode + 1'.      */
+      /* Otherwise jump to the next 256-character block and retry. */
     Next_SubHeader:
       if ( charcode <= 0xFF )
         charcode++;
-      else if ( charcode == 0x100 )
-        ;
       else
         charcode = FT_PAD_FLOOR( charcode, 0x100 ) + 0x100;
     }
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
index f140649993a..6de99ef9778 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
@@ -473,8 +473,8 @@
   /*    idx    :: The glyph index.                                         */
   /*                                                                       */
   /* <InOut>                                                               */
-  /*    PSname :: The address of a string pointer.  Will be NULL in case   */
-  /*              of error, otherwise it is a pointer to the glyph name.   */
+  /*    PSname :: The address of a string pointer.  Undefined in case of   */
+  /*              error, otherwise it is a pointer to the glyph name.      */
   /*                                                                       */
   /*              You must not modify the returned string!                 */
   /*                                                                       */
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
index 53e61756d18..33b8640bc31 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
@@ -1514,7 +1514,7 @@
     FT_FRAME_EXIT();
 
     if ( glyph_start == glyph_end )
-      return FT_THROW( Invalid_Argument );
+      return FT_THROW( Missing_Bitmap );
     if ( glyph_start > glyph_end                     ||
          glyph_end - glyph_start < 8                 ||
          face->ebdt_size - strike_offset < glyph_end )
diff --git a/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c b/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
index 6ce6f86444c..803a19e4150 100644
--- a/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
+++ b/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
@@ -404,7 +404,7 @@ typedef ptrdiff_t  FT_PtrDist;
   /* need to define them to "float" or "double" when experimenting with   */
   /* new algorithms                                                       */
 
-  typedef long  TPos;     /* sub-pixel coordinate              */
+  typedef long  TPos;     /* subpixel coordinate               */
   typedef int   TCoord;   /* integer scanline/pixel coordinate */
   typedef int   TArea;    /* cell areas, coordinate products   */
 
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
index 32ed34aba5e..39d9c3f7362 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
@@ -1219,7 +1219,7 @@
              * Theoretically, a glyph's bytecode can toggle ClearType's
              * `backward compatibility' mode, which would allow modification
              * of the advance width.  In reality, however, applications
-             * neither allow nor expect modified advance widths if sub-pixel
+             * neither allow nor expect modified advance widths if subpixel
              * rendering is active.
              *
              */
@@ -2709,6 +2709,10 @@
          ( load_flags & FT_LOAD_NO_BITMAP ) == 0 &&
          IS_DEFAULT_INSTANCE                     )
     {
+      FT_Fixed  x_scale = size->root.metrics.x_scale;
+      FT_Fixed  y_scale = size->root.metrics.y_scale;
+
+
       error = load_sbit_image( size, glyph, glyph_index, load_flags );
       if ( FT_ERR_EQ( error, Missing_Bitmap ) )
       {
@@ -2716,9 +2720,13 @@
         /* if we have a bitmap-only font, return an empty glyph            */
         if ( !FT_IS_SCALABLE( glyph->face ) )
         {
-          TT_Face    face = (TT_Face)glyph->face;
-          FT_Short   left_bearing = 0, top_bearing = 0;
-          FT_UShort  advance_width = 0, advance_height = 0;
+          TT_Face  face = (TT_Face)glyph->face;
+
+          FT_Short  left_bearing = 0;
+          FT_Short  top_bearing  = 0;
+
+          FT_UShort  advance_width  = 0;
+          FT_UShort  advance_height = 0;
 
 
           /* to return an empty glyph, however, we need metrics data   */
@@ -2744,13 +2752,13 @@
           glyph->metrics.width  = 0;
           glyph->metrics.height = 0;
 
-          glyph->metrics.horiBearingX = left_bearing;
+          glyph->metrics.horiBearingX = FT_MulFix( left_bearing, x_scale );
           glyph->metrics.horiBearingY = 0;
-          glyph->metrics.horiAdvance  = advance_width;
+          glyph->metrics.horiAdvance  = FT_MulFix( advance_width, x_scale );
 
           glyph->metrics.vertBearingX = 0;
-          glyph->metrics.vertBearingY = top_bearing;
-          glyph->metrics.vertAdvance  = advance_height;
+          glyph->metrics.vertBearingY = FT_MulFix( top_bearing, y_scale );
+          glyph->metrics.vertAdvance  = FT_MulFix( advance_height, y_scale );
 
           glyph->format            = FT_GLYPH_FORMAT_BITMAP;
           glyph->bitmap.pixel_mode = FT_PIXEL_MODE_MONO;
@@ -2781,13 +2789,11 @@
           /* sanity checks: if `xxxAdvance' in the sbit metric */
           /* structure isn't set, use `linearXXXAdvance'      */
           if ( !glyph->metrics.horiAdvance && glyph->linearHoriAdvance )
-            glyph->metrics.horiAdvance =
-              FT_MulFix( glyph->linearHoriAdvance,
-                         size->metrics->x_scale );
+            glyph->metrics.horiAdvance = FT_MulFix( glyph->linearHoriAdvance,
+                                                    x_scale );
           if ( !glyph->metrics.vertAdvance && glyph->linearVertAdvance )
-            glyph->metrics.vertAdvance =
-              FT_MulFix( glyph->linearVertAdvance,
-                         size->metrics->y_scale );
+            glyph->metrics.vertAdvance = FT_MulFix( glyph->linearVertAdvance,
+                                                    y_scale );
         }
 
         return FT_Err_Ok;
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
index 6f456cf8c41..29ab2a4efdd 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
@@ -1733,17 +1733,13 @@
     /* based on the [min,def,max] values for the axis to be [-1,0,1]. */
     /* Then, if there's an `avar' table, we renormalize this range.   */
 
-    FT_TRACE5(( "%d design coordinate%s:\n",
-                num_coords,
-                num_coords == 1 ? "" : "s" ));
-
     a = mmvar->axis;
     for ( i = 0; i < num_coords; i++, a++ )
     {
       FT_Fixed  coord = coords[i];
 
 
-      FT_TRACE5(( "  %.5f\n", coord / 65536.0 ));
+      FT_TRACE5(( "    %d: %.5f\n", i, coord / 65536.0 ));
       if ( coord > a->maximum || coord < a->minimum )
       {
         FT_TRACE1((
@@ -2043,12 +2039,15 @@
 
       FT_TRACE2(( "loaded\n" ));
 
-      FT_TRACE5(( "number of GX style axes: %d\n", fvar_head.axisCount ));
+      FT_TRACE5(( "%d variation ax%s\n",
+                  fvar_head.axisCount,
+                  fvar_head.axisCount == 1 ? "is" : "es" ));
 
       if ( FT_NEW( face->blend ) )
         goto Exit;
 
-      num_axes = fvar_head.axisCount;
+      num_axes              = fvar_head.axisCount;
+      face->blend->num_axis = num_axes;
     }
     else
       num_axes = face->blend->num_axis;
@@ -2142,6 +2141,10 @@
       {
         GX_FVar_Axis  axis_rec;
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+        int  invalid = 0;
+#endif
+
 
         if ( FT_STREAM_READ_FIELDS( fvaraxis_fields, &axis_rec ) )
           goto Exit;
@@ -2162,22 +2165,31 @@
         if ( a->minimum > a->def ||
              a->def > a->maximum )
         {
-          FT_TRACE2(( "TT_Get_MM_Var:"
-                      " invalid \"%s\" axis record; disabling\n",
-                      a->name ));
-
           a->minimum = a->def;
           a->maximum = a->def;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+          invalid = 1;
+#endif
         }
 
-        FT_TRACE5(( "  \"%s\":"
-                    " minimum=%.5f, default=%.5f, maximum=%.5f,"
-                    " flags=0x%04X\n",
+#ifdef FT_DEBUG_LEVEL_TRACE
+        if ( i == 0 )
+          FT_TRACE5(( "  idx   tag  "
+                   /* "  XXX  `XXXX'" */
+                      "    minimum     default     maximum   flags\n" ));
+                   /* "  XXXX.XXXXX  XXXX.XXXXX  XXXX.XXXXX  0xXXXX" */
+
+        FT_TRACE5(( "  %3d  `%s'"
+                    "  %10.5f  %10.5f  %10.5f  0x%04X%s\n",
+                    i,
                     a->name,
                     a->minimum / 65536.0,
                     a->def / 65536.0,
                     a->maximum / 65536.0,
-                    *axis_flags ));
+                    *axis_flags,
+                    invalid ? " (invalid, disabled)" : "" ));
+#endif
 
         a++;
         axis_flags++;
@@ -2202,6 +2214,10 @@
           goto Exit;
       }
 
+      FT_TRACE5(( "%d instance%s\n",
+                  fvar_head.instanceCount,
+                  fvar_head.instanceCount == 1 ? "" : "s" ));
+
       ns  = mmvar->namedstyle;
       nsc = face->blend->normalized_stylecoords;
       for ( i = 0; i < fvar_head.instanceCount; i++, ns++ )
@@ -2224,6 +2240,52 @@
         else
           ns->psid = 0xFFFF;
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+        {
+          SFNT_Service  sfnt = (SFNT_Service)face->sfnt;
+
+          FT_String*  strname = NULL;
+          FT_String*  psname  = NULL;
+
+          FT_ULong  pos;
+
+
+          pos = FT_STREAM_POS();
+
+          if ( ns->strid != 0xFFFF )
+          {
+            (void)sfnt->get_name( face,
+                                  (FT_UShort)ns->strid,
+                                  &strname );
+            if ( strname && !ft_strcmp( strname, ".notdef" ) )
+              strname = NULL;
+          }
+
+          if ( ns->psid != 0xFFFF )
+          {
+            (void)sfnt->get_name( face,
+                                  (FT_UShort)ns->psid,
+                                  &psname );
+            if ( psname && !ft_strcmp( psname, ".notdef" ) )
+              psname = NULL;
+          }
+
+          (void)FT_STREAM_SEEK( pos );
+
+          FT_TRACE5(( "  instance %d (%s%s%s, %s%s%s)\n",
+                      i,
+                      strname ? "name: `" : "",
+                      strname ? strname : "unnamed",
+                      strname ? "'" : "",
+                      psname ? "PS name: `" : "",
+                      psname ? psname : "no PS name",
+                      psname ? "'" : "" ));
+
+          FT_FREE( strname );
+          FT_FREE( psname );
+        }
+#endif /* FT_DEBUG_LEVEL_TRACE */
+
         ft_var_to_normalized( face, num_axes, ns->coords, nsc );
         nsc += num_axes;
 
@@ -2381,11 +2443,12 @@
       num_coords = mmvar->num_axis;
     }
 
-    FT_TRACE5(( "normalized design coordinates:\n" ));
+    FT_TRACE5(( "TT_Set_MM_Blend:\n"
+                "  normalized design coordinates:\n" ));
 
     for ( i = 0; i < num_coords; i++ )
     {
-      FT_TRACE5(( "  %.5f\n", coords[i] / 65536.0 ));
+      FT_TRACE5(( "    %.5f\n", coords[i] / 65536.0 ));
       if ( coords[i] < -0x00010000L || coords[i] > 0x00010000L )
       {
         FT_TRACE1(( "TT_Set_MM_Blend: normalized design coordinate %.5f\n"
@@ -2761,8 +2824,9 @@
       }
     }
 
-    /* return value -1 indicates `no change' */
-    if ( !have_diff )
+    /* return value -1 indicates `no change';                      */
+    /* we can exit early if `normalizedcoords' is already computed */
+    if ( blend->normalizedcoords && !have_diff )
       return -1;
 
     if ( FT_NEW_ARRAY( normalized, mmvar->num_axis ) )
@@ -2771,6 +2835,8 @@
     if ( !face->blend->avar_loaded )
       ft_var_load_avar( face );
 
+    FT_TRACE5(( "TT_Set_Var_Design:\n"
+                "  normalized design coordinates:\n" ));
     ft_var_to_normalized( face, num_coords, blend->coords, normalized );
 
     error = tt_set_mm_blend( face, mmvar->num_axis, normalized, 0 );
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
index d855aaaa9c6..da9b595aba0 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
@@ -2165,7 +2165,7 @@
       val = ADD_LONG( distance,
                       exc->threshold - exc->phase + compensation ) &
               -exc->period;
-      val += exc->phase;
+      val = ADD_LONG( val, exc->phase );
       if ( val < 0 )
         val = exc->phase;
     }
@@ -2174,7 +2174,7 @@
       val = NEG_LONG( SUB_LONG( exc->threshold - exc->phase + compensation,
                                 distance ) &
                         -exc->period );
-      val -= exc->phase;
+      val = SUB_LONG( val, exc->phase );
       if ( val > 0 )
         val = -exc->phase;
     }
@@ -2216,7 +2216,7 @@
       val = ( ADD_LONG( distance,
                         exc->threshold - exc->phase + compensation ) /
                 exc->period ) * exc->period;
-      val += exc->phase;
+      val = ADD_LONG( val, exc->phase );
       if ( val < 0 )
         val = exc->phase;
     }
@@ -2225,7 +2225,7 @@
       val = NEG_LONG( ( SUB_LONG( exc->threshold - exc->phase + compensation,
                                   distance ) /
                           exc->period ) * exc->period );
-      val -= exc->phase;
+      val = SUB_LONG( val, exc->phase );
       if ( val > 0 )
         val = -exc->phase;
     }
@@ -2954,7 +2954,7 @@
   static void
   Ins_CEILING( FT_Long*  args )
   {
-    args[0] = FT_PIX_CEIL( args[0] );
+    args[0] = FT_PIX_CEIL_LONG( args[0] );
   }
 
 
@@ -3289,7 +3289,10 @@
     if ( args[0] < 0 )
       exc->error = FT_THROW( Bad_Argument );
     else
-      exc->GS.loop = args[0];
+    {
+      /* we heuristically limit the number of loops to 16 bits */
+      exc->GS.loop = args[0] > 0xFFFFL ? 0xFFFFL : args[0];
+    }
   }
 
 
@@ -5782,6 +5785,7 @@
     FT_F26Dot6  distance;
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
     FT_F26Dot6  control_value_cutin = 0;
+    FT_F26Dot6  delta;
 
 
     if ( SUBPIXEL_HINTING_INFINALITY )
@@ -5817,11 +5821,15 @@
     distance = PROJECT( exc->zp1.cur + point, exc->zp0.cur + exc->GS.rp0 );
 
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+    delta = SUB_LONG( distance, args[1] );
+    if ( delta < 0 )
+      delta = NEG_LONG( delta );
+
     /* subpixel hinting - make MSIRP respect CVT cut-in; */
-    if ( SUBPIXEL_HINTING_INFINALITY                                    &&
-         exc->ignore_x_mode                                             &&
-         exc->GS.freeVector.x != 0                                      &&
-         FT_ABS( SUB_LONG( distance, args[1] ) ) >= control_value_cutin )
+    if ( SUBPIXEL_HINTING_INFINALITY  &&
+         exc->ignore_x_mode           &&
+         exc->GS.freeVector.x != 0    &&
+         delta >= control_value_cutin )
       distance = args[1];
 #endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
 
@@ -5869,16 +5877,18 @@
       if ( SUBPIXEL_HINTING_INFINALITY &&
            exc->ignore_x_mode          &&
            exc->GS.freeVector.x != 0   )
-        distance = Round_None(
-                     exc,
-                     cur_dist,
-                     exc->tt_metrics.compensations[0] ) - cur_dist;
+        distance = SUB_LONG(
+                     Round_None( exc,
+                                 cur_dist,
+                                 exc->tt_metrics.compensations[0] ),
+                     cur_dist );
       else
 #endif
-        distance = exc->func_round(
-                     exc,
-                     cur_dist,
-                     exc->tt_metrics.compensations[0] ) - cur_dist;
+        distance = SUB_LONG(
+                     exc->func_round( exc,
+                                      cur_dist,
+                                      exc->tt_metrics.compensations[0] ),
+                     cur_dist );
     }
     else
       distance = 0;
@@ -5978,7 +5988,14 @@
 
     if ( ( exc->opcode & 1 ) != 0 )   /* rounding and control cut-in flag */
     {
-      if ( FT_ABS( distance - org_dist ) > control_value_cutin )
+      FT_F26Dot6  delta;
+
+
+      delta = SUB_LONG( distance, org_dist );
+      if ( delta < 0 )
+        delta = NEG_LONG( delta );
+
+      if ( delta > control_value_cutin )
         distance = org_dist;
 
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
@@ -6176,7 +6193,7 @@
     minimum_distance    = exc->GS.minimum_distance;
     control_value_cutin = exc->GS.control_value_cutin;
     point               = (FT_UShort)args[0];
-    cvtEntry            = (FT_ULong)( args[1] + 1 );
+    cvtEntry            = (FT_ULong)( ADD_LONG( args[1], 1 ) );
 
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
     if ( SUBPIXEL_HINTING_INFINALITY                        &&
@@ -6259,6 +6276,9 @@
 
       if ( exc->GS.gep0 == exc->GS.gep1 )
       {
+        FT_F26Dot6  delta;
+
+
         /* XXX: According to Greg Hitchcock, the following wording is */
         /*      the right one:                                        */
         /*                                                            */
@@ -6271,7 +6291,11 @@
         /*      `ttinst2.doc', version 1.66, is thus incorrect since  */
         /*      it implies `>=' instead of `>'.                       */
 
-        if ( FT_ABS( cvt_dist - org_dist ) > control_value_cutin )
+        delta = SUB_LONG( cvt_dist, org_dist );
+        if ( delta < 0 )
+          delta = NEG_LONG( delta );
+
+        if ( delta > control_value_cutin )
           cvt_dist = org_dist;
       }
 
@@ -6289,7 +6313,14 @@
            exc->ignore_x_mode           &&
            exc->GS.gep0 == exc->GS.gep1 )
       {
-        if ( FT_ABS( cvt_dist - org_dist ) > control_value_cutin )
+        FT_F26Dot6  delta;
+
+
+        delta = SUB_LONG( cvt_dist, org_dist );
+        if ( delta < 0 )
+          delta = NEG_LONG( delta );
+
+        if ( delta > control_value_cutin )
           cvt_dist = org_dist;
       }
 #endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
@@ -7532,8 +7563,16 @@
       return;
     }
 
-    for ( i = 0; i < num_axes; i++ )
-      args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
+    if ( coords )
+    {
+      for ( i = 0; i < num_axes; i++ )
+        args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
+    }
+    else
+    {
+      for ( i = 0; i < num_axes; i++ )
+        args[i] = 0;
+    }
   }
 
 
@@ -8487,8 +8526,8 @@
 
   LNo_Error_:
     FT_TRACE4(( "  %d instruction%s executed\n",
-                ins_counter == 1 ? "" : "s",
-                ins_counter ));
+                ins_counter,
+                ins_counter == 1 ? "" : "s" ));
     return FT_Err_Ok;
 
   LErrorCodeOverflow_:
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
index bc8086f2568..6685dc81960 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
@@ -147,7 +147,7 @@
   {
 
 #define TRICK_NAMES_MAX_CHARACTERS  19
-#define TRICK_NAMES_COUNT           23
+#define TRICK_NAMES_COUNT           26
 
     static const char trick_names[TRICK_NAMES_COUNT]
                                  [TRICK_NAMES_MAX_CHARACTERS + 1] =
@@ -167,12 +167,15 @@
       "DFGirl-W6-WIN-BF",   /* dftt-h6.ttf; version 1.00, 1993 */
       "DFGothic-EB",        /* DynaLab Inc. 1992-1995 */
       "DFGyoSho-Lt",        /* DynaLab Inc. 1992-1995 */
+      "DFHei-Md-HK-BF",     /* maybe DynaLab Inc. */
       "DFHSGothic-W5",      /* DynaLab Inc. 1992-1995 */
       "DFHSMincho-W3",      /* DynaLab Inc. 1992-1995 */
       "DFHSMincho-W7",      /* DynaLab Inc. 1992-1995 */
       "DFKaiSho-SB",        /* dfkaisb.ttf */
       "DFKaiShu",
+      "DFKaiShu-Md-HK-BF",  /* maybe DynaLab Inc. */
       "DFKai-SB",           /* kaiu.ttf; version 3.00, 1998 [DFKaiShu-SB-Estd-BF] */
+      "DFMing-Bd-HK-BF",    /* maybe DynaLab Inc. */
       "DLC",                /* dftt-m7.ttf; version 1.00, 1993 [DLCMingBold] */
                             /* dftt-f5.ttf; version 1.00, 1993 [DLCFongSung] */
       "DLCHayMedium",       /* dftt-b5.ttf; version 1.00, 1993 */
@@ -270,7 +273,7 @@
   tt_check_trickyness_sfnt_ids( TT_Face  face )
   {
 #define TRICK_SFNT_IDS_PER_FACE   3
-#define TRICK_SFNT_IDS_NUM_FACES  26
+#define TRICK_SFNT_IDS_NUM_FACES  29
 
     static const tt_sfnt_id_rec sfnt_id[TRICK_SFNT_IDS_NUM_FACES]
                                        [TRICK_SFNT_IDS_PER_FACE] = {
@@ -299,6 +302,11 @@
         { 0xCE5956E9UL, 0x0000BC85UL }, /* fpgm */
         { 0x8272F416UL, 0x00000045UL }  /* prep */
       },
+      { /* DFHei-Md-HK-BF */
+        { 0x1257EB46UL, 0x00000350UL }, /* cvt  */
+        { 0xF699D160UL, 0x0000715FUL }, /* fpgm */
+        { 0xD222F568UL, 0x000003BCUL }  /* prep */
+      },
       { /* DFHSGothic-W5 */
         { 0x1262EB4EUL, 0x00000350UL }, /* cvt  */
         { 0xE86A5D64UL, 0x00007940UL }, /* fpgm */
@@ -324,6 +332,16 @@
         { 0xA6E78C01UL, 0x00008998UL }, /* fpgm */
         { 0x13A42602UL, 0x0000007EUL }  /* prep */
       },
+      { /* DFKaiShu-Md-HK-BF */
+        { 0x11E5EAD4UL, 0x00000360UL }, /* cvt  */
+        { 0x9DB282B2UL, 0x0000C06EUL }, /* fpgm */
+        { 0x53E6D7CAUL, 0x00000082UL }  /* prep */
+      },
+      { /* DFMing-Bd-HK-BF */
+        { 0x1243EB18UL, 0x00000350UL }, /* cvt  */
+        { 0xBA0A8C30UL, 0x000074ADUL }, /* fpgm */
+        { 0xF3D83409UL, 0x0000037BUL }  /* prep */
+      },
       { /* DLCLiShu */
         { 0x07DCF546UL, 0x00000308UL }, /* cvt  */
         { 0x40FE7C90UL, 0x00008E2AUL }, /* fpgm */
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1load.c b/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
index 2b8d4893c69..9dfa637a695 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
@@ -2493,6 +2493,24 @@
       type1->encoding.num_chars  = loader.num_chars;
     }
 
+    /* some sanitizing to avoid overflows later on; */
+    /* the upper limits are ad-hoc values           */
+    if ( priv->blue_shift > 1000 || priv->blue_shift < 0 )
+    {
+      FT_TRACE2(( "T1_Open_Face:"
+                  " setting unlikely BlueShift value %d to default (7)\n",
+                  priv->blue_shift ));
+      priv->blue_shift = 7;
+    }
+
+    if ( priv->blue_fuzz > 1000 || priv->blue_fuzz < 0 )
+    {
+      FT_TRACE2(( "T1_Open_Face:"
+                  " setting unlikely BlueFuzz value %d to default (1)\n",
+                  priv->blue_fuzz ));
+      priv->blue_fuzz = 1;
+    }
+
   Exit:
     t1_done_loader( &loader );
     return error;
diff --git a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
index d0c60b99e54..a4bfd656cd9 100644
--- a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+++ b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
@@ -1762,11 +1762,6 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader
                 }
             }
             break;
-#ifdef YCCALPHA
-        case JCS_YCC:
-            cinfo->out_color_space = JCS_YCC;
-            break;
-#endif
         case JCS_YCCK:
             if ((cinfo->saw_Adobe_marker) && (cinfo->Adobe_transform != 2)) {
                 /*
diff --git a/src/java.desktop/share/native/libjavajpeg/jchuff.c b/src/java.desktop/share/native/libjavajpeg/jchuff.c
index 378fea5abfa..ec5153dbd4d 100644
--- a/src/java.desktop/share/native/libjavajpeg/jchuff.c
+++ b/src/java.desktop/share/native/libjavajpeg/jchuff.c
@@ -805,8 +805,11 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])
   for (i = MAX_CLEN; i > 16; i--) {
     while (bits[i] > 0) {
       j = i - 2;                /* find length of new prefix to be used */
-      while (bits[j] == 0)
+      while (bits[j] == 0) {
+        if (j == 0)
+          ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW);
         j--;
+      }
 
       bits[i] -= 2;             /* remove two symbols */
       bits[i-1]++;              /* one goes in this length */
diff --git a/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
index 108a7db6fed..419c4a94b60 100644
--- a/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
+++ b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
@@ -569,11 +569,7 @@ Java_sun_awt_image_JPEGImageDecoder_readImage(JNIEnv *env,
   /* select buffered-image mode if it is a progressive JPEG only */
   buffered_mode = cinfo.buffered_image = jpeg_has_multiple_scans(&cinfo);
   grayscale = (cinfo.out_color_space == JCS_GRAYSCALE);
-#ifdef YCCALPHA
-  hasalpha = (cinfo.out_color_space == JCS_RGBA);
-#else
   hasalpha = 0;
-#endif
   /* We can ignore the return value from jpeg_read_header since
    *   (a) suspension is not possible with the stdio data source, and
    *                                    (nor with the Java input source)
diff --git a/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c b/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
index 02c4a164fc1..d71e261decd 100644
--- a/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
+++ b/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -28,6 +28,7 @@
 #include <jni.h>
 #include <jni_util.h>
 #include <sizecalc.h>
+#include "java_awt_SplashScreen.h"
 
 JNIEXPORT jint JNICALL
 DEF_JNI_OnLoad(JavaVM * vm, void *reserved)
diff --git a/src/java.desktop/unix/classes/sun/awt/FcFontManager.java b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
index f9f3bc8b46a..3317b36e480 100644
--- a/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
@@ -73,12 +73,14 @@ public class FcFontManager extends SunFontManager {
         getFontConfigManager().initFontConfigFonts(false);
         FontConfigManager.FcCompFont[] fontConfigFonts =
             getFontConfigManager().getFontConfigFonts();
-        for (int i=0; i<fontConfigFonts.length; i++) {
-            if ("sans".equals(fontConfigFonts[i].fcFamily) &&
-                0 == fontConfigFonts[i].style) {
-                info[0] = fontConfigFonts[i].firstFont.familyName;
-                info[1] = fontConfigFonts[i].firstFont.fontFile;
-                break;
+        if (fontConfigFonts != null) {
+            for (int i=0; i<fontConfigFonts.length; i++) {
+                if ("sans".equals(fontConfigFonts[i].fcFamily) &&
+                    0 == fontConfigFonts[i].style) {
+                    info[0] = fontConfigFonts[i].firstFont.familyName;
+                    info[1] = fontConfigFonts[i].firstFont.fontFile;
+                    break;
+                }
             }
         }
         /* Absolute last ditch attempt in the face of fontconfig problems.
@@ -86,7 +88,7 @@ public class FcFontManager extends SunFontManager {
          * up so we don't NPE.
          */
         if (info[0] == null) {
-            if (fontConfigFonts.length > 0 &&
+            if (fontConfigFonts != null && fontConfigFonts.length > 0 &&
                 fontConfigFonts[0].firstFont.fontFile != null) {
                 info[0] = fontConfigFonts[0].firstFont.familyName;
                 info[1] = fontConfigFonts[0].firstFont.fontFile;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11FontManager.java b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
index 2ae8e194a14..974cf27af47 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
@@ -126,17 +126,6 @@ public final class X11FontManager extends FcFontManager {
       */
      private static HashSet<String> fontConfigDirs = null;
 
-    /* These maps are used on Linux where we reference the Lucida oblique
-     * fonts in fontconfig files even though they aren't in the standard
-     * font directory. This explicitly remaps the XLFDs for these to the
-     * correct base font. This is needed to prevent composite fonts from
-     * defaulting to the Lucida Sans which is a bad substitute for the
-     * monospaced Lucida Sans Typewriter. Also these maps prevent the
-     * JRE from doing wasted work at start up.
-     */
-    HashMap<String, String> oblmap = null;
-
-
     /*
      * Used to eliminate redundant work. When a font directory is
      * registered it added to this list. Subsequent registrations for the
@@ -232,16 +221,6 @@ public final class X11FontManager extends FcFontManager {
 
         if (fontID != null) {
             fileName = fontNameMap.get(fontID);
-            /* On Linux check for the Lucida Oblique fonts */
-            if (fileName == null && FontUtilities.isLinux && !isOpenJDK()) {
-                if (oblmap == null) {
-                    initObliqueLucidaFontMap();
-                }
-                String oblkey = getObliqueLucidaFontID(fontID);
-                if (oblkey != null) {
-                    fileName = oblmap.get(oblkey);
-                }
-            }
             if (fontPath == null &&
                 (fileName == null || !fileName.startsWith("/"))) {
                 if (FontUtilities.debugFonts()) {
@@ -471,17 +450,6 @@ public final class X11FontManager extends FcFontManager {
         fontNameMap = new HashMap<>(1);
     }
 
-    private String getObliqueLucidaFontID(String fontID) {
-        if (fontID.startsWith("-lucidasans-medium-i-normal") ||
-            fontID.startsWith("-lucidasans-bold-i-normal") ||
-            fontID.startsWith("-lucidatypewriter-medium-i-normal") ||
-            fontID.startsWith("-lucidatypewriter-bold-i-normal")) {
-            return fontID.substring(0, fontID.indexOf("-i-"));
-        } else {
-            return null;
-        }
-    }
-
     private static String getX11FontName(String platName) {
         String xlfd = platName.replaceAll("%d", "*");
         if (NativeFont.fontExists(xlfd)) {
@@ -491,18 +459,6 @@ public final class X11FontManager extends FcFontManager {
         }
     }
 
-    private void initObliqueLucidaFontMap() {
-        oblmap = new HashMap<String, String>();
-        oblmap.put("-lucidasans-medium",
-                   jreLibDirName+"/fonts/LucidaSansRegular.ttf");
-        oblmap.put("-lucidasans-bold",
-                   jreLibDirName+"/fonts/LucidaSansDemiBold.ttf");
-        oblmap.put("-lucidatypewriter-medium",
-                   jreLibDirName+"/fonts/LucidaTypewriterRegular.ttf");
-        oblmap.put("-lucidatypewriter-bold",
-                   jreLibDirName+"/fonts/LucidaTypewriterBold.ttf");
-    }
-
     private boolean isHeadless() {
         GraphicsEnvironment ge =
             GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -749,9 +705,7 @@ public final class X11FontManager extends FcFontManager {
          * For Linux we require an exact match of distro and version to
          * use the preconfigured file.
          * If synthesising fails, we fall back to any preconfigured file
-         * and do the best we can. For the commercial JDK this will be
-         * fine as it includes the Lucida fonts. OpenJDK should not hit
-         * this as the synthesis should always work on its platforms.
+         * and do the best we can.
          */
         FontConfiguration mFontConfig = new MFontConfiguration(this);
         if ((FontUtilities.isLinux && !mFontConfig.foundOsSpecificFile()) ||
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
index 2e570129f84..854d1900e72 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
@@ -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
@@ -25,147 +25,21 @@
 
 package sun.awt;
 
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Map;
-import java.util.HashMap;
-import java.awt.AWTEvent;
 import java.awt.AWTException;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.EventQueue;
-import java.awt.Window;
-import java.awt.im.InputMethodHighlight;
-import java.awt.im.spi.InputMethodContext;
-import sun.awt.im.InputMethodAdapter;
 import java.awt.event.InputMethodEvent;
 import java.awt.font.TextAttribute;
 import java.awt.font.TextHitInfo;
 import java.awt.peer.ComponentPeer;
-import java.lang.Character.Subset;
 import java.text.AttributedString;
-import java.text.AttributedCharacterIterator;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
 import sun.util.logging.PlatformLogger;
-import java.util.StringTokenizer;
-import java.util.regex.Pattern;
-
 
 /**
  * Input Method Adapter for XIM
  *
  * @author JavaSoft International
  */
-public abstract class X11InputMethod extends InputMethodAdapter {
-    private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11InputMethod");
-    /*
-     * The following XIM* values must be the same as those defined in
-     * Xlib.h
-     */
-    private static final int XIMReverse = (1<<0);
-    private static final int XIMUnderline = (1<<1);
-    private static final int XIMHighlight = (1<<2);
-    private static final int XIMPrimary = (1<<5);
-    private static final int XIMSecondary = (1<<6);
-    private static final int XIMTertiary = (1<<7);
-
-    /*
-     * visible position values
-     */
-    private static final int XIMVisibleToForward = (1<<8);
-    private static final int XIMVisibleToBackward = (1<<9);
-    private static final int XIMVisibleCenter = (1<<10);
-    private static final int XIMVisibleMask = (XIMVisibleToForward|
-                                               XIMVisibleToBackward|
-                                               XIMVisibleCenter);
-
-    private Locale locale;
-    private static boolean isXIMOpened = false;
-    protected Container clientComponentWindow = null;
-    private Component awtFocussedComponent = null;
-    private Component lastXICFocussedComponent = null;
-    private boolean   isLastXICActive = false;
-    private boolean   isLastTemporary = false;
-    private boolean   isActive = false;
-    private boolean   isActiveClient = false;
-    private static Map<TextAttribute, ?>[] highlightStyles;
-    private boolean disposed = false;
-
-    //reset the XIC if necessary
-    private boolean   needResetXIC = false;
-    private WeakReference<Component> needResetXICClient = new WeakReference<>(null);
-
-    // The use of compositionEnableSupported is to reduce unnecessary
-    // native calls if set/isCompositionEnabled
-    // throws UnsupportedOperationException.
-    // It is set to false if that exception is thrown first time
-    // either of the two methods are called.
-    private boolean compositionEnableSupported = true;
-    // The savedCompositionState indicates the composition mode when
-    // endComposition or setCompositionEnabled is called. It doesn't always
-    // reflect the actual composition state because it doesn't get updated
-    // when the user changes the composition state through direct interaction
-    // with the input method. It is used to save the composition mode when
-    // focus is traversed across different client components sharing the
-    // same java input context. Also if set/isCompositionEnabled are not
-    // supported, it remains false.
-    private boolean savedCompositionState = false;
-
-    // variables to keep track of preedit context.
-    // these variables need to be accessed within AWT_LOCK/UNLOCK
-    private String committedText = null;
-    private StringBuffer composedText = null;
-    private IntBuffer rawFeedbacks;
-
-    // private data (X11InputMethodData structure defined in
-    // awt_InputMethod.c) for native methods
-    // this structure needs to be accessed within AWT_LOCK/UNLOCK
-    private transient long pData = 0; // accessed by native
-
-    // Initialize highlight mapping table
-    static {
-        @SuppressWarnings({"unchecked", "rawtypes"})
-        Map<TextAttribute, ?> styles[] = new Map[4];
-        HashMap<TextAttribute, Object> map;
-
-        // UNSELECTED_RAW_TEXT_HIGHLIGHT
-        map = new HashMap<>(1);
-        map.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
-        styles[0] = Collections.unmodifiableMap(map);
-
-        // SELECTED_RAW_TEXT_HIGHLIGHT
-        map = new HashMap<>(1);
-        map.put(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON);
-        styles[1] = Collections.unmodifiableMap(map);
-
-        // UNSELECTED_CONVERTED_TEXT_HIGHLIGHT
-        map = new HashMap<>(1);
-        map.put(TextAttribute.INPUT_METHOD_UNDERLINE,
-                TextAttribute.UNDERLINE_LOW_ONE_PIXEL);
-        styles[2] = Collections.unmodifiableMap(map);
-
-        // SELECTED_CONVERTED_TEXT_HIGHLIGHT
-        map = new HashMap<>(1);
-        map.put(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON);
-        styles[3] = Collections.unmodifiableMap(map);
-
-        highlightStyles = styles;
-    }
-
-    static {
-        initIDs();
-    }
-
-    /**
-     * Initialize JNI field and method IDs for fields that may be
-       accessed from C.
-     */
-    private static native void initIDs();
+public abstract class X11InputMethod extends X11InputMethodBase {
 
     /**
      * Constructs an X11InputMethod instance. It initializes the XIM
@@ -174,113 +48,13 @@ public abstract class X11InputMethod extends InputMethodAdapter {
      * @exception AWTException if XOpenIM() failed.
      */
     public X11InputMethod() throws AWTException {
-        // supports only the locale in which the VM is started
-        locale = X11InputMethodDescriptor.getSupportedLocale();
-        if (initXIM() == false) {
-            throw new AWTException("Cannot open X Input Method");
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    protected void finalize() throws Throwable {
-        dispose();
-        super.finalize();
-    }
-
-    /**
-     * Invokes openIM() that invokes XOpenIM() if it's not opened yet.
-     * @return  true if openXIM() is successful or it's already been opened.
-     */
-    private synchronized boolean initXIM() {
-        if (isXIMOpened == false)
-            isXIMOpened = openXIM();
-        return isXIMOpened;
-    }
-
-    protected abstract boolean openXIM();
-
-    protected boolean isDisposed() {
-        return disposed;
-    }
-
-    protected abstract void setXICFocus(ComponentPeer peer,
-                                    boolean value, boolean active);
-
-    /**
-     * Does nothing - this adapter doesn't use the input method context.
-     *
-     * @see java.awt.im.spi.InputMethod#setInputMethodContext
-     */
-    public void setInputMethodContext(InputMethodContext context) {
-    }
-
-    /**
-     * Set locale to input. If input method doesn't support specified locale,
-     * false will be returned and its behavior is not changed.
-     *
-     * @param lang locale to input
-     * @return the true is returned when specified locale is supported.
-     */
-    public boolean setLocale(Locale lang) {
-        if (lang.equals(locale)) {
-            return true;
-        }
-        // special compatibility rule for Japanese and Korean
-        if (locale.equals(Locale.JAPAN) && lang.equals(Locale.JAPANESE) ||
-                locale.equals(Locale.KOREA) && lang.equals(Locale.KOREAN)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns current input locale.
-     */
-    public Locale getLocale() {
-        return locale;
-    }
-
-    /**
-     * Does nothing - XIM doesn't let you specify which characters you expect.
-     *
-     * @see java.awt.im.spi.InputMethod#setCharacterSubsets
-     */
-    public void setCharacterSubsets(Subset[] subsets) {
-    }
-
-    /**
-     * Dispatch event to input method. InputContext dispatch event with this
-     * method. Input method set consume flag if event is consumed in
-     * input method.
-     *
-     * @param e event
-     */
-    public void dispatchEvent(AWTEvent e) {
-    }
-
-
-    protected final void resetXICifneeded(){
-        /* needResetXIC is used to indicate whether to call
-           resetXIC on the active client. resetXIC will always be
-           called on the passive client when endComposition is called.
-        */
-        if (needResetXIC && haveActiveClient() &&
-            getClientComponent() != needResetXICClient.get()){
-            resetXIC();
-
-            // needs to reset the last xic focussed component.
-            lastXICFocussedComponent = null;
-            isLastXICActive = false;
-
-            needResetXICClient.clear();
-            needResetXIC = false;
-        }
+        super();
     }
 
     /**
      * Reset the composition state to the current composition state.
      */
-    private void resetCompositionState() {
+    protected void resetCompositionState() {
         if (compositionEnableSupported) {
             try {
                 /* Restore the composition mode to the last saved composition
@@ -292,23 +66,6 @@ public abstract class X11InputMethod extends InputMethodAdapter {
         }
     }
 
-    /**
-     * Query and then return the current composition state.
-     * @return the composition state if isCompositionEnabled call
-     * is successful. Otherwise, it returns false.
-     */
-    private boolean getCompositionState() {
-        boolean compositionState = false;
-        if (compositionEnableSupported) {
-            try {
-                compositionState = isCompositionEnabled();
-            } catch (UnsupportedOperationException e) {
-                compositionEnableSupported = false;
-            }
-        }
-        return compositionState;
-    }
-
     /**
      * Activate input method.
      */
@@ -317,7 +74,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
         if (clientComponentWindow == null)
             return;
 
-        if (lastXICFocussedComponent != null){
+        if (lastXICFocussedComponent != null) {
             if (log.isLoggable(PlatformLogger.Level.FINE)) {
                 log.fine("XICFocused {0}, AWTFocused {1}",
                          lastXICFocussedComponent, awtFocussedComponent);
@@ -360,8 +117,6 @@ public abstract class X11InputMethod extends InputMethodAdapter {
         isActive = true;
     }
 
-    protected abstract boolean createXIC();
-
     /**
      * Deactivate input method.
      */
@@ -387,197 +142,25 @@ public abstract class X11InputMethod extends InputMethodAdapter {
         */
         savedCompositionState = getCompositionState();
 
-        if (isTemporary){
+        if (isTemporary) {
             //turn the status window off...
             turnoffStatusWindow();
         }
 
         /* Delay resetting the XIC focus until activate is called and the newly
-           focussed component has a different peer as the last focussed component.
-        */
+         * Focused component has a different peer as the last focused component.
+         */
         lastXICFocussedComponent = awtFocussedComponent;
         isLastXICActive = isAc;
         isLastTemporary = isTemporary;
         isActive = false;
     }
 
-    /**
-     * Explicitly disable the native IME. Native IME is not disabled when
-     * deactivate is called.
-     */
-    public void disableInputMethod() {
-        if (lastXICFocussedComponent != null) {
-            setXICFocus(getPeer(lastXICFocussedComponent), false, isLastXICActive);
-            lastXICFocussedComponent = null;
-            isLastXICActive = false;
-
-            resetXIC();
-            needResetXICClient.clear();
-            needResetXIC = false;
-        }
-    }
-
     // implements java.awt.im.spi.InputMethod.hideWindows
     public void hideWindows() {
         // ??? need real implementation
     }
 
-    /**
-     * @see java.awt.Toolkit#mapInputMethodHighlight
-     */
-    public static Map<TextAttribute, ?> mapInputMethodHighlight(InputMethodHighlight highlight) {
-        int index;
-        int state = highlight.getState();
-        if (state == InputMethodHighlight.RAW_TEXT) {
-            index = 0;
-        } else if (state == InputMethodHighlight.CONVERTED_TEXT) {
-            index = 2;
-        } else {
-            return null;
-        }
-        if (highlight.isSelected()) {
-            index += 1;
-        }
-        return highlightStyles[index];
-    }
-
-    /**
-     * @see sun.awt.im.InputMethodAdapter#setAWTFocussedComponent
-     */
-    protected void setAWTFocussedComponent(Component component) {
-        if (component == null) {
-            return;
-        }
-        if (isActive) {
-            // deactivate/activate are being suppressed during a focus change -
-            // this may happen when an input method window is made visible
-            boolean ac = haveActiveClient();
-            setXICFocus(getPeer(awtFocussedComponent), false, ac);
-            setXICFocus(getPeer(component), true, ac);
-        }
-        awtFocussedComponent = component;
-    }
-
-    /**
-     * @see sun.awt.im.InputMethodAdapter#stopListening
-     */
-    protected void stopListening() {
-        // It is desirable to disable XIM by calling XSetICValues with
-        // XNPreeditState == XIMPreeditDisable.  But Solaris 2.6 and
-        // Solaris 7 do not implement this correctly without a patch,
-        // so just call resetXIC here.  Prior endComposition call commits
-        // the existing composed text.
-        endComposition();
-        // disable the native input method so that the other input
-        // method could get the input focus.
-        disableInputMethod();
-        if (needResetXIC) {
-            resetXIC();
-            needResetXICClient.clear();
-            needResetXIC = false;
-        }
-    }
-
-    /**
-     * Returns the Window instance in which the client component is
-     * contained. If not found, null is returned. (IS THIS POSSIBLE?)
-     */
-    // NOTE: This method may be called by privileged threads.
-    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
-    private Window getClientComponentWindow() {
-        Component client = getClientComponent();
-        Container container;
-
-        if (client instanceof Container) {
-            container = (Container) client;
-        } else {
-            container = getParent(client);
-        }
-
-        while (container != null && !(container instanceof java.awt.Window)) {
-            container = getParent(container);
-        }
-        return (Window) container;
-    }
-
-    protected abstract Container getParent(Component client);
-
-    /**
-     * Returns peer of the given client component. If the given client component
-     * doesn't have peer, peer of the native container of the client is returned.
-     */
-    protected abstract ComponentPeer getPeer(Component client);
-
-    /**
-     * Used to protect preedit data
-     */
-    protected abstract void awtLock();
-    protected abstract void awtUnlock();
-
-    /**
-     * Creates an input method event from the arguments given
-     * and posts it on the AWT event queue. For arguments,
-     * see InputMethodEvent. Called by input method.
-     *
-     * @see java.awt.event.InputMethodEvent#InputMethodEvent
-     */
-    private void postInputMethodEvent(int id,
-                                      AttributedCharacterIterator text,
-                                      int committedCharacterCount,
-                                      TextHitInfo caret,
-                                      TextHitInfo visiblePosition,
-                                      long when) {
-        Component source = getClientComponent();
-        if (source != null) {
-            InputMethodEvent event = new InputMethodEvent(source,
-                id, when, text, committedCharacterCount, caret, visiblePosition);
-            SunToolkit.postEvent(SunToolkit.targetToAppContext(source), (AWTEvent)event);
-        }
-    }
-
-    private void postInputMethodEvent(int id,
-                                      AttributedCharacterIterator text,
-                                      int committedCharacterCount,
-                                      TextHitInfo caret,
-                                      TextHitInfo visiblePosition) {
-        postInputMethodEvent(id, text, committedCharacterCount,
-                             caret, visiblePosition, EventQueue.getMostRecentEventTime());
-    }
-
-    /**
-     * Dispatches committed text from XIM to the awt event queue. This
-     * method is invoked from the event handler in canvas.c in the
-     * AWT Toolkit thread context and thus inside the AWT Lock.
-     * @param   str     committed text
-     * @param   when    when
-     */
-    // NOTE: This method may be called by privileged threads.
-    //       This functionality is implemented in a package-private method
-    //       to insure that it cannot be overridden by client subclasses.
-    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
-    void dispatchCommittedText(String str, long when) {
-        if (str == null)
-            return;
-
-        if (composedText == null) {
-            AttributedString attrstr = new AttributedString(str);
-            postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
-                                 attrstr.getIterator(),
-                                 str.length(),
-                                 null,
-                                 null,
-                                 when);
-        } else {
-            // if there is composed text, wait until the preedit
-            // callback is invoked.
-            committedText = str;
-        }
-    }
-
-    private void dispatchCommittedText(String str) {
-        dispatchCommittedText(str, EventQueue.getMostRecentEventTime());
-    }
-
     /**
      * Updates composed text with XIM preedit information and
      * posts composed text to the awt event queue. The args of
@@ -601,7 +184,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
             return;
         }
 
-        //Workaround for deadlock bug on solaris2.6_zh bug#4170760
+        // Workaround for deadlock bug on solaris2.6_zh bug#4170760
         if (chgText == null
             && chgStyles == null
             && chgOffset == 0
@@ -739,34 +322,6 @@ public abstract class X11InputMethod extends InputMethodAdapter {
                              when);
     }
 
-    /**
-     * Flushes composed and committed text held in this context.
-     * This method is invoked in the AWT Toolkit (X event loop) thread context
-     * and thus inside the AWT Lock.
-     */
-    // NOTE: This method may be called by privileged threads.
-    //       This functionality is implemented in a package-private method
-    //       to insure that it cannot be overridden by client subclasses.
-    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
-    void flushText() {
-        String flush = (committedText != null ? committedText : "");
-        if (composedText != null) {
-            flush += composedText.toString();
-        }
-
-        if (!flush.equals("")) {
-            AttributedString attrstr = new AttributedString(flush);
-            postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
-                                 attrstr.getIterator(),
-                                 flush.length(),
-                                 null,
-                                 null,
-                                 EventQueue.getMostRecentEventTime());
-            composedText = null;
-            committedText = null;
-        }
-    }
-
     /*
      * Subclasses should override disposeImpl() instead of dispose(). Client
      * code should always invoke dispose(), never disposeImpl().
@@ -782,43 +337,6 @@ public abstract class X11InputMethod extends InputMethodAdapter {
         lastXICFocussedComponent = null;
     }
 
-    /**
-     * Frees all X Window resources associated with this object.
-     *
-     * @see java.awt.im.spi.InputMethod#dispose
-     */
-    public final void dispose() {
-        boolean call_disposeImpl = false;
-
-        if (!disposed) {
-            synchronized (this) {
-                if (!disposed) {
-                    disposed = call_disposeImpl = true;
-                }
-            }
-        }
-
-        if (call_disposeImpl) {
-            disposeImpl();
-        }
-    }
-
-    /**
-     * Returns null.
-     *
-     * @see java.awt.im.spi.InputMethod#getControlObject
-     */
-    public Object getControlObject() {
-        return null;
-    }
-
-    /**
-     * @see java.awt.im.spi.InputMethod#removeNotify
-     */
-    public synchronized void removeNotify() {
-        dispose();
-    }
-
     /**
      * @see java.awt.im.spi.InputMethod#setCompositionEnabled(boolean)
      */
@@ -835,263 +353,4 @@ public abstract class X11InputMethod extends InputMethodAdapter {
             savedCompositionState = enable;
         }
     }
-
-    /**
-     * @see java.awt.im.spi.InputMethod#isCompositionEnabled
-     */
-    public boolean isCompositionEnabled() {
-        /* isCompositionEnabledNative may throw UnsupportedOperationException.
-           Don't try to catch it since this method may be called by clients.
-           Use package private method 'getCompositionState' if you want the
-           exception to be caught.
-        */
-        return isCompositionEnabledNative();
-    }
-
-    /**
-     * Ends any input composition that may currently be going on in this
-     * context. Depending on the platform and possibly user preferences,
-     * this may commit or delete uncommitted text. Any changes to the text
-     * are communicated to the active component using an input method event.
-     *
-     * <p>
-     * A text editing component may call this in a variety of situations,
-     * for example, when the user moves the insertion point within the text
-     * (but outside the composed text), or when the component's text is
-     * saved to a file or copied to the clipboard.
-     *
-     */
-    public void endComposition() {
-        if (disposed) {
-            return;
-        }
-
-        /* Before calling resetXIC, record the current composition mode
-           so that it can be restored later. */
-        savedCompositionState = getCompositionState();
-        boolean active = haveActiveClient();
-        if (active && composedText == null && committedText == null){
-            needResetXIC = true;
-            needResetXICClient = new WeakReference<>(getClientComponent());
-            return;
-        }
-
-        String text = resetXIC();
-        /* needResetXIC is only set to true for active client. So passive
-           client should not reset the flag to false. */
-        if (active) {
-            needResetXIC = false;
-        }
-
-        // Remove any existing composed text by posting an InputMethodEvent
-        // with null composed text.  It would be desirable to wait for a
-        // dispatchComposedText call from X input method engine, but some
-        // input method does not conform to the XIM specification and does
-        // not call the preedit callback to erase preedit text on calling
-        // XmbResetIC.  To work around this problem, do it here by ourselves.
-        awtLock();
-        composedText = null;
-        postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
-                             null,
-                             0,
-                             null,
-                             null);
-
-        if (text != null && text.length() > 0) {
-            dispatchCommittedText(text);
-        }
-        awtUnlock();
-
-        // Restore the preedit state if it was enabled
-        if (savedCompositionState) {
-            resetCompositionState();
-        }
-    }
-
-    /**
-     * Returns a string with information about the current input method server, or null.
-     * On both Linux & SunOS, the value of environment variable XMODIFIERS is
-     * returned if set. Otherwise, on SunOS, $HOME/.dtprofile will be parsed
-     * to find out the language service engine (atok or wnn) since there is
-     * no API in Xlib which returns the information of native
-     * IM server or language service and we want to try our best to return as much
-     * information as possible.
-     *
-     * Note: This method could return null on Linux if XMODIFIERS is not set properly or
-     * if any IOException is thrown.
-     * See man page of XSetLocaleModifiers(3X11) for the usgae of XMODIFIERS,
-     * atok12setup(1) and wnn6setup(1) for the information written to
-     * $HOME/.dtprofile when you run these two commands.
-     *
-     */
-    public String getNativeInputMethodInfo() {
-        String xmodifiers = System.getenv("XMODIFIERS");
-        String imInfo = null;
-
-        // If XMODIFIERS is set, return the value
-        if (xmodifiers != null) {
-            int imIndex = xmodifiers.indexOf("@im=");
-            if (imIndex != -1) {
-                imInfo = xmodifiers.substring(imIndex + 4);
-            }
-        } else if (System.getProperty("os.name").startsWith("SunOS")) {
-            File dtprofile = new File(System.getProperty("user.home") +
-                                      "/.dtprofile");
-            String languageEngineInfo = null;
-            try {
-                BufferedReader br = new BufferedReader(new FileReader(dtprofile));
-                String line = null;
-
-                while ( languageEngineInfo == null && (line = br.readLine()) != null) {
-                    if (line.contains("atok") || line.contains("wnn")) {
-                        StringTokenizer tokens =  new StringTokenizer(line);
-                        while (tokens.hasMoreTokens()) {
-                            String token = tokens.nextToken();
-                            if (Pattern.matches("atok.*setup", token) ||
-                                Pattern.matches("wnn.*setup", token)){
-                                languageEngineInfo = token.substring(0, token.indexOf("setup"));
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                br.close();
-            } catch(IOException ioex) {
-                // Since this method is provided for internal testing only,
-                // we dump the stack trace for the ease of debugging.
-                ioex.printStackTrace();
-            }
-
-            imInfo = "htt " + languageEngineInfo;
-        }
-
-        return imInfo;
-    }
-
-
-    /**
-     * Performs mapping from an XIM visible feedback value to Java IM highlight.
-     * @return Java input method highlight
-     */
-    private InputMethodHighlight convertVisualFeedbackToHighlight(int feedback) {
-        InputMethodHighlight highlight;
-
-        switch (feedback) {
-        case XIMUnderline:
-            highlight = InputMethodHighlight.UNSELECTED_CONVERTED_TEXT_HIGHLIGHT;
-            break;
-        case XIMReverse:
-            highlight = InputMethodHighlight.SELECTED_CONVERTED_TEXT_HIGHLIGHT;
-            break;
-        case XIMHighlight:
-            highlight = InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT;
-            break;
-        case XIMPrimary:
-            highlight = InputMethodHighlight.UNSELECTED_CONVERTED_TEXT_HIGHLIGHT;
-            break;
-        case XIMSecondary:
-            highlight = InputMethodHighlight.SELECTED_CONVERTED_TEXT_HIGHLIGHT;
-            break;
-        case XIMTertiary:
-            highlight = InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT;
-            break;
-        default:
-            highlight = InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT;
-            break;
-        }
-        return highlight;
-    }
-
-    // initial capacity size for string buffer, etc.
-    private static final int INITIAL_SIZE = 64;
-
-    /**
-     * IntBuffer is an inner class that manipulates an int array and
-     * provides UNIX file io stream-like programming interfaces to
-     * access it. (An alternative would be to use ArrayList which may
-     * be too expensive for the work.)
-     */
-    private final class IntBuffer {
-        private int[] intArray;
-        private int size;
-        private int index;
-
-        IntBuffer(int initialCapacity) {
-            intArray = new int[initialCapacity];
-            size = 0;
-            index = 0;
-        }
-
-        void insert(int offset, int[] values) {
-            int newSize = size + values.length;
-            if (intArray.length < newSize) {
-                int[] newIntArray = new int[newSize * 2];
-                System.arraycopy(intArray, 0, newIntArray, 0, size);
-                intArray = newIntArray;
-            }
-            System.arraycopy(intArray, offset, intArray, offset+values.length,
-                             size - offset);
-            System.arraycopy(values, 0, intArray, offset, values.length);
-            size += values.length;
-            if (index > offset)
-                index = offset;
-        }
-
-        void remove(int offset, int length) {
-            if (offset + length != size)
-                System.arraycopy(intArray, offset+length, intArray, offset,
-                                 size - offset - length);
-            size -= length;
-            if (index > offset)
-                index = offset;
-        }
-
-        void replace(int offset, int[] values) {
-            System.arraycopy(values, 0, intArray, offset, values.length);
-        }
-
-        void removeAll() {
-            size = 0;
-            index = 0;
-        }
-
-        void rewind() {
-            index = 0;
-        }
-
-        int getNext() {
-            if (index == size)
-                return -1;
-            return intArray[index++];
-        }
-
-        void unget() {
-            if (index != 0)
-                index--;
-        }
-
-        int getOffset() {
-            return index;
-        }
-
-        public String toString() {
-            StringBuffer s = new StringBuffer();
-            for (int i = 0; i < size;) {
-                s.append(intArray[i++]);
-                if (i < size)
-                    s.append(",");
-            }
-            return s.toString();
-        }
-    }
-
-    /*
-     * Native methods
-     */
-    private native String resetXIC();
-    private native void disposeXIC();
-    private native boolean setCompositionEnabledNative(boolean enable);
-    private native boolean isCompositionEnabledNative();
-    private native void turnoffStatusWindow();
 }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
new file mode 100644
index 00000000000..3f6a1f4fd73
--- /dev/null
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
@@ -0,0 +1,849 @@
+/*
+ * 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
+ * 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 sun.awt;
+
+import java.awt.AWTEvent;
+import java.awt.AWTException;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.EventQueue;
+import java.awt.Window;
+import java.awt.event.InputMethodEvent;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextHitInfo;
+import java.awt.im.InputMethodHighlight;
+import java.awt.im.spi.InputMethodContext;
+import java.awt.peer.ComponentPeer;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.Character.Subset;
+import java.lang.ref.WeakReference;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+import sun.awt.im.InputMethodAdapter;
+import sun.util.logging.PlatformLogger;
+
+/**
+ * Input Method Adapter for XIM
+ *
+ * @author JavaSoft International
+ */
+public abstract class X11InputMethodBase extends InputMethodAdapter {
+    protected static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11InputMethod");
+    /*
+     * The following XIM* values must be the same as those defined in
+     * Xlib.h
+     */
+    private static final int XIMReverse = (1<<0);
+    private static final int XIMUnderline = (1<<1);
+    private static final int XIMHighlight = (1<<2);
+    private static final int XIMPrimary = (1<<5);
+    private static final int XIMSecondary = (1<<6);
+    private static final int XIMTertiary = (1<<7);
+
+    /*
+     * visible position values
+     */
+    protected static final int XIMVisibleToForward = (1<<8);
+    protected static final int XIMVisibleToBackward = (1<<9);
+    protected static final int XIMVisibleCenter = (1<<10);
+    protected static final int XIMVisibleMask =
+        (XIMVisibleToForward | XIMVisibleToBackward | XIMVisibleCenter);
+
+    private Locale locale;
+    private static boolean isXIMOpened = false;
+    protected Container clientComponentWindow = null;
+    protected Component awtFocussedComponent = null;
+    protected Component lastXICFocussedComponent = null;
+    protected boolean   isLastXICActive = false;
+    protected boolean   isLastTemporary = false;
+    protected boolean   isActive = false;
+    private static Map<TextAttribute, ?>[] highlightStyles;
+    protected boolean disposed = false;
+
+    //reset the XIC if necessary
+    protected boolean   needResetXIC = false;
+    private WeakReference<Component> needResetXICClient = new WeakReference<>(null);
+
+    // The use of compositionEnableSupported is to reduce unnecessary
+    // native calls if set/isCompositionEnabled
+    // throws UnsupportedOperationException.
+    // It is set to false if that exception is thrown first time
+    // either of the two methods are called.
+    protected boolean compositionEnableSupported = true;
+    // The savedCompositionState indicates the composition mode when
+    // endComposition or setCompositionEnabled is called. It doesn't always
+    // reflect the actual composition state because it doesn't get updated
+    // when the user changes the composition state through direct interaction
+    // with the input method. It is used to save the composition mode when
+    // focus is traversed across different client components sharing the
+    // same java input context. Also if set/isCompositionEnabled are not
+    // supported, it remains false.
+    protected boolean savedCompositionState = false;
+
+    // variables to keep track of preedit context.
+    // these variables need to be accessed within AWT_LOCK/UNLOCK
+    protected String committedText = null;
+    protected StringBuffer composedText = null;
+    protected IntBuffer rawFeedbacks;
+
+    // private data (X11InputMethodData structure defined in
+    // awt_InputMethod.c) for native methods
+    // this structure needs to be accessed within AWT_LOCK/UNLOCK
+    protected transient long pData = 0; // accessed by native
+
+    // Initialize highlight mapping table
+    static {
+        @SuppressWarnings({"unchecked", "rawtypes"})
+        Map<TextAttribute, ?> styles[] = new Map[4];
+        HashMap<TextAttribute, Object> map;
+
+        // UNSELECTED_RAW_TEXT_HIGHLIGHT
+        map = new HashMap<>(1);
+        map.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
+        styles[0] = Collections.unmodifiableMap(map);
+
+        // SELECTED_RAW_TEXT_HIGHLIGHT
+        map = new HashMap<>(1);
+        map.put(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON);
+        styles[1] = Collections.unmodifiableMap(map);
+
+        // UNSELECTED_CONVERTED_TEXT_HIGHLIGHT
+        map = new HashMap<>(1);
+        map.put(TextAttribute.INPUT_METHOD_UNDERLINE,
+                TextAttribute.UNDERLINE_LOW_ONE_PIXEL);
+        styles[2] = Collections.unmodifiableMap(map);
+
+        // SELECTED_CONVERTED_TEXT_HIGHLIGHT
+        map = new HashMap<>(1);
+        map.put(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON);
+        styles[3] = Collections.unmodifiableMap(map);
+
+        highlightStyles = styles;
+    }
+
+    static {
+        initIDs();
+    }
+
+    /**
+     * Constructs an X11InputMethod instance. It initializes the XIM
+     * environment if it's not done yet.
+     *
+     * @exception AWTException if XOpenIM() failed.
+     */
+    public X11InputMethodBase() throws AWTException {
+        // supports only the locale in which the VM is started
+        locale = X11InputMethodDescriptor.getSupportedLocale();
+        if (initXIM() == false) {
+            throw new AWTException("Cannot open X Input Method");
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    protected void finalize() throws Throwable {
+        dispose();
+        super.finalize();
+    }
+
+    /**
+     * Invokes openIM() that invokes XOpenIM() if it's not opened yet.
+     * @return  true if openXIM() is successful or it's already been opened.
+     */
+    private synchronized boolean initXIM() {
+        if (isXIMOpened == false)
+            isXIMOpened = openXIM();
+        return isXIMOpened;
+    }
+
+    protected abstract boolean openXIM();
+
+    protected boolean isDisposed() {
+        return disposed;
+    }
+
+    protected abstract void setXICFocus(ComponentPeer peer,
+                                    boolean value, boolean active);
+
+    /**
+     * Does nothing - this adapter doesn't use the input method context.
+     *
+     * @see java.awt.im.spi.InputMethod#setInputMethodContext
+     */
+    public void setInputMethodContext(InputMethodContext context) {
+    }
+
+    /**
+     * Set locale to input. If input method doesn't support specified locale,
+     * false will be returned and its behavior is not changed.
+     *
+     * @param lang locale to input
+     * @return the true is returned when specified locale is supported.
+     */
+    public boolean setLocale(Locale lang) {
+        if (lang.equals(locale)) {
+            return true;
+        }
+        // special compatibility rule for Japanese and Korean
+        if (locale.equals(Locale.JAPAN) && lang.equals(Locale.JAPANESE) ||
+                locale.equals(Locale.KOREA) && lang.equals(Locale.KOREAN)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns current input locale.
+     */
+    public Locale getLocale() {
+        return locale;
+    }
+
+    /**
+     * Does nothing - XIM doesn't let you specify which characters you expect.
+     *
+     * @see java.awt.im.spi.InputMethod#setCharacterSubsets
+     */
+    public void setCharacterSubsets(Subset[] subsets) {
+    }
+
+    /**
+     * Dispatch event to input method. InputContext dispatch event with this
+     * method. Input method set consume flag if event is consumed in
+     * input method.
+     *
+     * @param e event
+     */
+    public void dispatchEvent(AWTEvent e) {
+    }
+
+    protected final void resetXICifneeded(){
+        /* needResetXIC is used to indicate whether to call
+           resetXIC on the active client. resetXIC will always be
+           called on the passive client when endComposition is called.
+        */
+        if (needResetXIC && haveActiveClient() &&
+            getClientComponent() != needResetXICClient.get()){
+            resetXIC();
+
+            // needs to reset the last xic focussed component.
+            lastXICFocussedComponent = null;
+            isLastXICActive = false;
+
+            needResetXICClient.clear();
+            needResetXIC = false;
+        }
+    }
+
+    /**
+     * Reset the composition state to the current composition state.
+     */
+    protected abstract void resetCompositionState();
+
+    /**
+     * Query and then return the current composition state.
+     * @return the composition state if isCompositionEnabled call
+     * is successful. Otherwise, it returns false.
+     */
+    protected boolean getCompositionState() {
+        boolean compositionState = false;
+        if (compositionEnableSupported) {
+            try {
+                compositionState = isCompositionEnabled();
+            } catch (UnsupportedOperationException e) {
+                compositionEnableSupported = false;
+            }
+        }
+        return compositionState;
+    }
+
+    /**
+     * Activate input method.
+     */
+    public abstract void activate();
+
+    protected abstract boolean createXIC();
+
+    /**
+     * Deactivate input method.
+     */
+    public abstract void deactivate(boolean isTemporary);
+
+    /**
+     * Explicitly disable the native IME. Native IME is not disabled when
+     * deactivate is called.
+     */
+    public void disableInputMethod() {
+        if (lastXICFocussedComponent != null) {
+            setXICFocus(getPeer(lastXICFocussedComponent), false, isLastXICActive);
+            lastXICFocussedComponent = null;
+            isLastXICActive = false;
+
+            resetXIC();
+            needResetXICClient.clear();
+            needResetXIC = false;
+        }
+    }
+
+    // implements java.awt.im.spi.InputMethod.hideWindows
+    public abstract void hideWindows();
+
+    /**
+     * @see java.awt.Toolkit#mapInputMethodHighlight
+     */
+    public static Map<TextAttribute, ?> mapInputMethodHighlight(InputMethodHighlight highlight) {
+        int index;
+        int state = highlight.getState();
+        if (state == InputMethodHighlight.RAW_TEXT) {
+            index = 0;
+        } else if (state == InputMethodHighlight.CONVERTED_TEXT) {
+            index = 2;
+        } else {
+            return null;
+        }
+        if (highlight.isSelected()) {
+            index += 1;
+        }
+        return highlightStyles[index];
+    }
+
+    /**
+     * @see sun.awt.im.InputMethodAdapter#setAWTFocussedComponent
+     */
+    protected void setAWTFocussedComponent(Component component) {
+        if (component == null) {
+            return;
+        }
+        if (isActive) {
+            // deactivate/activate are being suppressed during a focus change -
+            // this may happen when an input method window is made visible
+            boolean ac = haveActiveClient();
+            setXICFocus(getPeer(awtFocussedComponent), false, ac);
+            setXICFocus(getPeer(component), true, ac);
+        }
+        awtFocussedComponent = component;
+    }
+
+    /**
+     * @see sun.awt.im.InputMethodAdapter#stopListening
+     */
+    protected void stopListening() {
+        // It is desirable to disable XIM by calling XSetICValues with
+        // XNPreeditState == XIMPreeditDisable.  But Solaris 2.6 and
+        // Solaris 7 do not implement this correctly without a patch,
+        // so just call resetXIC here.  Prior endComposition call commits
+        // the existing composed text.
+        endComposition();
+        // disable the native input method so that the other input
+        // method could get the input focus.
+        disableInputMethod();
+        if (needResetXIC) {
+            resetXIC();
+            needResetXICClient.clear();
+            needResetXIC = false;
+        }
+    }
+
+    /**
+     * Returns the Window instance in which the client component is
+     * contained. If not found, null is returned. (IS THIS POSSIBLE?)
+     */
+    // NOTE: This method may be called by privileged threads.
+    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    protected Window getClientComponentWindow() {
+        Component client = getClientComponent();
+        Container container;
+
+        if (client instanceof Container) {
+            container = (Container) client;
+        } else {
+            container = getParent(client);
+        }
+
+        while (container != null && !(container instanceof java.awt.Window)) {
+            container = getParent(container);
+        }
+        return (Window) container;
+    }
+
+    protected abstract Container getParent(Component client);
+
+    /**
+     * Returns peer of the given client component. If the given client component
+     * doesn't have peer, peer of the native container of the client is returned.
+     */
+    protected abstract ComponentPeer getPeer(Component client);
+
+    /**
+     * Used to protect preedit data
+     */
+    protected abstract void awtLock();
+    protected abstract void awtUnlock();
+
+    /**
+     * Creates an input method event from the arguments given
+     * and posts it on the AWT event queue. For arguments,
+     * see InputMethodEvent. Called by input method.
+     *
+     * @see java.awt.event.InputMethodEvent#InputMethodEvent
+     */
+    protected void postInputMethodEvent(int id,
+                                      AttributedCharacterIterator text,
+                                      int committedCharacterCount,
+                                      TextHitInfo caret,
+                                      TextHitInfo visiblePosition,
+                                      long when) {
+        Component source = getClientComponent();
+        if (source != null) {
+            InputMethodEvent event = new InputMethodEvent(source,
+                id, when, text, committedCharacterCount, caret, visiblePosition);
+            SunToolkit.postEvent(SunToolkit.targetToAppContext(source), (AWTEvent)event);
+        }
+    }
+
+    private void postInputMethodEvent(int id,
+                                      AttributedCharacterIterator text,
+                                      int committedCharacterCount,
+                                      TextHitInfo caret,
+                                      TextHitInfo visiblePosition) {
+        postInputMethodEvent(id, text, committedCharacterCount,
+                             caret, visiblePosition, EventQueue.getMostRecentEventTime());
+    }
+
+    /**
+     * Dispatches committed text from XIM to the awt event queue. This
+     * method is invoked from the event handler in canvas.c in the
+     * AWT Toolkit thread context and thus inside the AWT Lock.
+     * @param   str     committed text
+     * @param   when    when
+     */
+    // NOTE: This method may be called by privileged threads.
+    //       This functionality is implemented in a package-private method
+    //       to insure that it cannot be overridden by client subclasses.
+    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    void dispatchCommittedText(String str, long when) {
+        if (str == null)
+            return;
+
+        if (composedText == null) {
+            AttributedString attrstr = new AttributedString(str);
+            postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                                 attrstr.getIterator(),
+                                 str.length(),
+                                 null,
+                                 null,
+                                 when);
+        } else {
+            // if there is composed text, wait until the preedit
+            // callback is invoked.
+            committedText = str;
+        }
+    }
+
+    private void dispatchCommittedText(String str) {
+        dispatchCommittedText(str, EventQueue.getMostRecentEventTime());
+    }
+
+    /**
+     * Updates composed text with XIM preedit information and
+     * posts composed text to the awt event queue. The args of
+     * this method correspond to the XIM preedit callback
+     * information. The XIM highlight attributes are translated via
+     * fixed mapping (i.e., independent from any underlying input
+     * method engine). This method is invoked in the AWT Toolkit
+     * (X event loop) thread context and thus inside the AWT Lock.
+     */
+    // NOTE: This method may be called by privileged threads.
+    //       This functionality is implemented in a package-private method
+    //       to insure that it cannot be overridden by client subclasses.
+    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    abstract void dispatchComposedText(String chgText,
+                                           int chgStyles[],
+                                           int chgOffset,
+                                           int chgLength,
+                                           int caretPosition,
+                                           long when);
+
+    /**
+     * Flushes composed and committed text held in this context.
+     * This method is invoked in the AWT Toolkit (X event loop) thread context
+     * and thus inside the AWT Lock.
+     */
+    // NOTE: This method may be called by privileged threads.
+    //       This functionality is implemented in a package-private method
+    //       to insure that it cannot be overridden by client subclasses.
+    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    void flushText() {
+        String flush = (committedText != null ? committedText : "");
+        if (composedText != null) {
+            flush += composedText.toString();
+        }
+
+        if (!flush.equals("")) {
+            AttributedString attrstr = new AttributedString(flush);
+            postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                                 attrstr.getIterator(),
+                                 flush.length(),
+                                 null,
+                                 null,
+                                 EventQueue.getMostRecentEventTime());
+            composedText = null;
+            committedText = null;
+        }
+    }
+
+    /*
+     * Subclasses should override disposeImpl() instead of dispose(). Client
+     * code should always invoke dispose(), never disposeImpl().
+     */
+    protected abstract void disposeImpl();
+
+    /**
+     * Frees all X Window resources associated with this object.
+     *
+     * @see java.awt.im.spi.InputMethod#dispose
+     */
+    public final void dispose() {
+        boolean call_disposeImpl = false;
+
+        if (!disposed) {
+            synchronized (this) {
+                if (!disposed) {
+                    disposed = call_disposeImpl = true;
+                }
+            }
+        }
+
+        if (call_disposeImpl) {
+            disposeImpl();
+        }
+    }
+
+    /**
+     * Returns null.
+     *
+     * @see java.awt.im.spi.InputMethod#getControlObject
+     */
+    public Object getControlObject() {
+        return null;
+    }
+
+    /**
+     * @see java.awt.im.spi.InputMethod#removeNotify
+     */
+    public synchronized void removeNotify() {
+        dispose();
+    }
+
+    /**
+     * @see java.awt.im.spi.InputMethod#setCompositionEnabled(boolean)
+     */
+    public abstract void setCompositionEnabled(boolean enable);
+
+    /**
+     * @see java.awt.im.spi.InputMethod#isCompositionEnabled
+     */
+    public boolean isCompositionEnabled() {
+        /* isCompositionEnabledNative may throw UnsupportedOperationException.
+           Don't try to catch it since this method may be called by clients.
+           Use package private method 'getCompositionState' if you want the
+           exception to be caught.
+        */
+        return isCompositionEnabledNative();
+    }
+
+    /**
+     * Ends any input composition that may currently be going on in this
+     * context. Depending on the platform and possibly user preferences,
+     * this may commit or delete uncommitted text. Any changes to the text
+     * are communicated to the active component using an input method event.
+     *
+     * <p>
+     * A text editing component may call this in a variety of situations,
+     * for example, when the user moves the insertion point within the text
+     * (but outside the composed text), or when the component's text is
+     * saved to a file or copied to the clipboard.
+     *
+     */
+    public void endComposition() {
+        if (disposed) {
+            return;
+        }
+
+        /* Before calling resetXIC, record the current composition mode
+           so that it can be restored later. */
+        savedCompositionState = getCompositionState();
+        boolean active = haveActiveClient();
+        if (active && composedText == null && committedText == null){
+            needResetXIC = true;
+            needResetXICClient = new WeakReference<>(getClientComponent());
+            return;
+        }
+
+        String text = resetXIC();
+        /* needResetXIC is only set to true for active client. So passive
+           client should not reset the flag to false. */
+        if (active) {
+            needResetXIC = false;
+        }
+
+        // Remove any existing composed text by posting an InputMethodEvent
+        // with null composed text.  It would be desirable to wait for a
+        // dispatchComposedText call from X input method engine, but some
+        // input method does not conform to the XIM specification and does
+        // not call the preedit callback to erase preedit text on calling
+        // XmbResetIC.  To work around this problem, do it here by ourselves.
+        awtLock();
+        try {
+            composedText = null;
+            postInputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                                 null,
+                                 0,
+                                 null,
+                                 null);
+
+            if (text != null && text.length() > 0) {
+                dispatchCommittedText(text);
+            }
+        } finally {
+            // Put awtUnlock into finally block in case an exception is thrown.
+            awtUnlock();
+        }
+
+        // Restore the preedit state if it was enabled
+        if (savedCompositionState) {
+            resetCompositionState();
+        }
+    }
+
+    /**
+     * Returns a string with information about the current input method server, or null.
+     * On both Linux & SunOS, the value of environment variable XMODIFIERS is
+     * returned if set. Otherwise, on SunOS, $HOME/.dtprofile will be parsed
+     * to find out the language service engine (atok or wnn) since there is
+     * no API in Xlib which returns the information of native
+     * IM server or language service and we want to try our best to return as much
+     * information as possible.
+     *
+     * Note: This method could return null on Linux if XMODIFIERS is not set properly or
+     * if any IOException is thrown.
+     * See man page of XSetLocaleModifiers(3X11) for the usgae of XMODIFIERS,
+     * atok12setup(1) and wnn6setup(1) for the information written to
+     * $HOME/.dtprofile when you run these two commands.
+     *
+     */
+    public String getNativeInputMethodInfo() {
+        String xmodifiers = System.getenv("XMODIFIERS");
+        String imInfo = null;
+
+        // If XMODIFIERS is set, return the value
+        if (xmodifiers != null) {
+            int imIndex = xmodifiers.indexOf("@im=");
+            if (imIndex != -1) {
+                imInfo = xmodifiers.substring(imIndex + 4);
+            }
+        } else if (System.getProperty("os.name").startsWith("SunOS")) {
+            File dtprofile = new File(System.getProperty("user.home") +
+                                      "/.dtprofile");
+            String languageEngineInfo = null;
+            try {
+                BufferedReader br = new BufferedReader(new FileReader(dtprofile));
+                String line = null;
+
+                while ( languageEngineInfo == null && (line = br.readLine()) != null) {
+                    if (line.contains("atok") || line.contains("wnn")) {
+                        StringTokenizer tokens =  new StringTokenizer(line);
+                        while (tokens.hasMoreTokens()) {
+                            String token = tokens.nextToken();
+                            if (Pattern.matches("atok.*setup", token) ||
+                                Pattern.matches("wnn.*setup", token)){
+                                languageEngineInfo = token.substring(0, token.indexOf("setup"));
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                br.close();
+            } catch(IOException ioex) {
+                // Since this method is provided for internal testing only,
+                // we dump the stack trace for the ease of debugging.
+                ioex.printStackTrace();
+            }
+
+            imInfo = "htt " + languageEngineInfo;
+        }
+
+        return imInfo;
+    }
+
+
+    /**
+     * Performs mapping from an XIM visible feedback value to Java IM highlight.
+     * @return Java input method highlight
+     */
+    protected InputMethodHighlight convertVisualFeedbackToHighlight(int feedback) {
+        InputMethodHighlight highlight;
+
+        switch (feedback) {
+        case XIMUnderline:
+            highlight = InputMethodHighlight.UNSELECTED_CONVERTED_TEXT_HIGHLIGHT;
+            break;
+        case XIMReverse:
+            highlight = InputMethodHighlight.SELECTED_CONVERTED_TEXT_HIGHLIGHT;
+            break;
+        case XIMHighlight:
+            highlight = InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT;
+            break;
+        case 0: //None of the values are set by Wnn
+        case XIMPrimary:
+            highlight = InputMethodHighlight.UNSELECTED_CONVERTED_TEXT_HIGHLIGHT;
+            break;
+        case XIMSecondary:
+            highlight = InputMethodHighlight.SELECTED_CONVERTED_TEXT_HIGHLIGHT;
+            break;
+        case XIMTertiary:
+            highlight = InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT;
+            break;
+        default:
+            highlight = InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT;
+            break;
+        }
+        return highlight;
+    }
+
+    // initial capacity size for string buffer, etc.
+    protected static final int INITIAL_SIZE = 64;
+
+    /**
+     * IntBuffer is an inner class that manipulates an int array and
+     * provides UNIX file io stream-like programming interfaces to
+     * access it. (An alternative would be to use ArrayList which may
+     * be too expensive for the work.)
+     */
+    protected final class IntBuffer {
+        private int[] intArray;
+        private int size;
+        private int index;
+
+        IntBuffer(int initialCapacity) {
+            intArray = new int[initialCapacity];
+            size = 0;
+            index = 0;
+        }
+
+        void insert(int offset, int[] values) {
+            int newSize = size + values.length;
+            if (intArray.length < newSize) {
+                int[] newIntArray = new int[newSize * 2];
+                System.arraycopy(intArray, 0, newIntArray, 0, size);
+                intArray = newIntArray;
+            }
+            System.arraycopy(intArray, offset, intArray, offset+values.length,
+                             size - offset);
+            System.arraycopy(values, 0, intArray, offset, values.length);
+            size += values.length;
+            if (index > offset)
+                index = offset;
+        }
+
+        void remove(int offset, int length) {
+            if (offset + length != size)
+                System.arraycopy(intArray, offset+length, intArray, offset,
+                                 size - offset - length);
+            size -= length;
+            if (index > offset)
+                index = offset;
+        }
+
+        void replace(int offset, int[] values) {
+            System.arraycopy(values, 0, intArray, offset, values.length);
+        }
+
+        void removeAll() {
+            size = 0;
+            index = 0;
+        }
+
+        void rewind() {
+            index = 0;
+        }
+
+        int getNext() {
+            if (index == size)
+                return -1;
+            return intArray[index++];
+        }
+
+        void unget() {
+            if (index != 0)
+                index--;
+        }
+
+        int getOffset() {
+            return index;
+        }
+
+        public String toString() {
+            StringBuffer s = new StringBuffer();
+            for (int i = 0; i < size;) {
+                s.append(intArray[i++]);
+                if (i < size)
+                    s.append(",");
+            }
+            return s.toString();
+        }
+    }
+
+    /*
+     * Native methods
+     */
+
+    /**
+     * Initialize JNI field and method IDs for fields that may be
+     * accessed from C.
+     */
+    private static native void initIDs();
+
+    protected native void turnoffStatusWindow();
+
+    protected native void disposeXIC();
+
+    private native String resetXIC();
+
+    protected native boolean setCompositionEnabledNative(boolean enable);
+
+    private native boolean isCompositionEnabledNative();
+}
diff --git a/src/java.desktop/unix/classes/sun/font/FontConfigManager.java b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
index dcb99ba89ce..f45dc09805d 100644
--- a/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
+++ b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
@@ -283,9 +283,8 @@ public class FontConfigManager {
             }
         }
 
-        /* If the font may hide a JRE font (eg fontconfig says it is
-         * Lucida Sans), we want to use the JRE version, so make it
-         * point to the JRE font.
+        /* If the font may hide a JRE font, we want to use the JRE version,
+         * so make it point to the JRE font.
          */
         physFont = fm.findJREDeferredFont(fcInfo.firstFont.familyName,
                                           fcInfo.style);
diff --git a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index aeb95e5fa8f..b3c54bc9264 100644
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -25,6 +25,8 @@
 
 package sun.print;
 
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
 import javax.print.attribute.*;
 import javax.print.attribute.standard.*;
 import javax.print.DocFlavor;
@@ -1071,6 +1073,11 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
             catList.add(PrinterResolution.class);
         }
 
+        if (GraphicsEnvironment.isHeadless() == false) {
+            catList.add(DialogOwner.class);
+            catList.add(DialogTypeSelection.class);
+        }
+
         supportedCats = new Class<?>[catList.size()];
         catList.toArray(supportedCats);
         Class<?>[] copyCats = new Class<?>[supportedCats.length];
@@ -1392,10 +1399,38 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
                 }
             }
             return false;
-        } if (attr.getCategory() == PrinterResolution.class) {
+        } else if (attr.getCategory() == PrinterResolution.class) {
             if (attr instanceof PrinterResolution) {
                 return isSupportedResolution((PrinterResolution)attr);
             }
+        } else if (attr.getCategory() == DialogOwner.class) {
+            DialogOwner owner = (DialogOwner)attr;
+            // ID not supported on any dialog type on Unix platforms.
+            if (DialogOwnerAccessor.getID(owner) != 0) {
+                return false;
+            }
+            // On Mac we have no control over the native dialog.
+            DialogTypeSelection dst = (attributes == null) ? null :
+               (DialogTypeSelection)attributes.get(DialogTypeSelection.class);
+            if (PrintServiceLookupProvider.isMac() &&
+                dst == DialogTypeSelection.NATIVE) {
+                return false;
+            }
+            // The other case is always a Swing dialog on all Unix platforms.
+            // So we only need to check that the toolkit supports
+            // always on top.
+            if (owner.getOwner() != null) {
+                return true;
+            } else {
+                return Toolkit.getDefaultToolkit().isAlwaysOnTopSupported();
+            }
+        } else if (attr.getCategory() == DialogTypeSelection.class) {
+            if (PrintServiceLookupProvider.isMac()) {
+                return true;
+            } else {
+               DialogTypeSelection dst = (DialogTypeSelection)attr;
+               return attr == DialogTypeSelection.COMMON;
+            }
         }
         return true;
     }
diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
index c02a57cdc3e..0abc76d2677 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
@@ -31,6 +31,8 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Locale;
 
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
 import javax.print.DocFlavor;
 import javax.print.DocPrintJob;
 import javax.print.PrintService;
@@ -54,6 +56,8 @@ import javax.print.attribute.standard.ColorSupported;
 import javax.print.attribute.standard.Copies;
 import javax.print.attribute.standard.CopiesSupported;
 import javax.print.attribute.standard.Destination;
+import javax.print.attribute.standard.DialogOwner;
+import javax.print.attribute.standard.DialogTypeSelection;
 import javax.print.attribute.standard.Fidelity;
 import javax.print.attribute.standard.Media;
 import javax.print.attribute.standard.MediaPrintableArea;
@@ -619,10 +623,15 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
     }
 
     public Class<?>[] getSupportedAttributeCategories() {
-        int totalCats = otherAttrCats.length;
-        Class<?>[] cats = new Class<?>[totalCats];
-        System.arraycopy(otherAttrCats, 0, cats, 0, otherAttrCats.length);
-        return cats;
+        ArrayList<Class<?>> categList = new ArrayList<>(otherAttrCats.length);
+        for (Class<?> c : otherAttrCats) {
+            categList.add(c);
+        }
+        if (GraphicsEnvironment.isHeadless() == false) {
+            categList.add(DialogOwner.class);
+            categList.add(DialogTypeSelection.class);
+        }
+        return categList.toArray(new Class<?>[categList.size()]);
     }
 
     public boolean
@@ -1023,6 +1032,24 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE))) {
                 return false;
             }
+        } else if (attr.getCategory() == DialogOwner.class) {
+            DialogOwner owner = (DialogOwner)attr;
+            // ID not supported on any dialog type on Unix platforms.
+            if (DialogOwnerAccessor.getID(owner) != 0) {
+                return false;
+            }
+            // UnixPrintService is not used on Mac, so this is
+            // always some Unix system that does not have CUPS/IPP
+            // Which means we always use a Swing dialog and we need
+            // only check if alwaysOnTop is supported by the toolkit.
+            if (owner.getOwner() != null) {
+                return true;
+            } else {
+                return Toolkit.getDefaultToolkit().isAlwaysOnTopSupported();
+            }
+        } else if (attr.getCategory() == DialogTypeSelection.class) {
+            DialogTypeSelection dts = (DialogTypeSelection)attr;
+            return dts == DialogTypeSelection.COMMON;
         }
         return true;
     }
diff --git a/src/java.desktop/unix/conf/fonts/fonts.dir b/src/java.desktop/unix/conf/fonts/fonts.dir
deleted file mode 100644
index 89b6e748090..00000000000
--- a/src/java.desktop/unix/conf/fonts/fonts.dir
+++ /dev/null
@@ -1,49 +0,0 @@
-48
-LucidaBrightRegular.ttf -b&h-lucidabright-medium-r-normal--0-0-0-0-p-0-iso8859-1
-LucidaBrightItalic.ttf -b&h-lucidabright-medium-i-normal--0-0-0-0-p-0-iso8859-1
-LucidaBrightDemiBold.ttf -b&h-lucidabright-demibold-r-normal--0-0-0-0-p-0-iso8859-1
-LucidaBrightDemiItalic.ttf -b&h-lucidabright-demibold-i-normal--0-0-0-0-p-0-iso8859-1
-LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-1
-LucidaSansDemiBold.ttf -b&h-lucidasans-bold-r-normal-sans-0-0-0-0-p-0-iso8859-1
-LucidaTypewriterRegular.ttf -b&h-lucidatypewriter-medium-r-normal-sans-0-0-0-0-m-0-iso8859-1
-LucidaTypewriterBold.ttf -b&h-lucidatypewriter-bold-r-normal-sans-0-0-0-0-m-0-iso8859-1
-LucidaBrightRegular.ttf -b&h-lucidabright-medium-r-normal--0-0-0-0-p-0-iso8859-2
-LucidaBrightItalic.ttf -b&h-lucidabright-medium-i-normal--0-0-0-0-p-0-iso8859-2
-LucidaBrightDemiBold.ttf -b&h-lucidabright-demibold-r-normal--0-0-0-0-p-0-iso8859-2
-LucidaBrightDemiItalic.ttf -b&h-lucidabright-demibold-i-normal--0-0-0-0-p-0-iso8859-2
-LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-2
-LucidaSansDemiBold.ttf -b&h-lucidasans-bold-r-normal-sans-0-0-0-0-p-0-iso8859-2
-LucidaTypewriterRegular.ttf -b&h-lucidatypewriter-medium-r-normal-sans-0-0-0-0-m-0-iso8859-2
-LucidaTypewriterBold.ttf -b&h-lucidatypewriter-bold-r-normal-sans-0-0-0-0-m-0-iso8859-2
-LucidaBrightRegular.ttf -b&h-lucidabright-medium-r-normal--0-0-0-0-p-0-iso8859-4
-LucidaBrightItalic.ttf -b&h-lucidabright-medium-i-normal--0-0-0-0-p-0-iso8859-4
-LucidaBrightDemiBold.ttf -b&h-lucidabright-demibold-r-normal--0-0-0-0-p-0-iso8859-4
-LucidaBrightDemiItalic.ttf -b&h-lucidabright-demibold-i-normal--0-0-0-0-p-0-iso8859-4
-LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-4
-LucidaSansDemiBold.ttf -b&h-lucidasans-bold-r-normal-sans-0-0-0-0-p-0-iso8859-4
-LucidaTypewriterRegular.ttf -b&h-lucidatypewriter-medium-r-normal-sans-0-0-0-0-m-0-iso8859-4
-LucidaTypewriterBold.ttf -b&h-lucidatypewriter-bold-r-normal-sans-0-0-0-0-m-0-iso8859-4
-LucidaBrightRegular.ttf -b&h-lucidabright-medium-r-normal--0-0-0-0-p-0-iso8859-5
-LucidaBrightItalic.ttf -b&h-lucidabright-medium-i-normal--0-0-0-0-p-0-iso8859-5
-LucidaBrightDemiBold.ttf -b&h-lucidabright-demibold-r-normal--0-0-0-0-p-0-iso8859-5
-LucidaBrightDemiItalic.ttf -b&h-lucidabright-demibold-i-normal--0-0-0-0-p-0-iso8859-5
-LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-5
-LucidaSansDemiBold.ttf -b&h-lucidasans-bold-r-normal-sans-0-0-0-0-p-0-iso8859-5
-LucidaTypewriterRegular.ttf -b&h-lucidatypewriter-medium-r-normal-sans-0-0-0-0-m-0-iso8859-5
-LucidaTypewriterBold.ttf -b&h-lucidatypewriter-bold-r-normal-sans-0-0-0-0-m-0-iso8859-5
-LucidaBrightRegular.ttf -b&h-lucidabright-medium-r-normal--0-0-0-0-p-0-iso8859-7
-LucidaBrightItalic.ttf -b&h-lucidabright-medium-i-normal--0-0-0-0-p-0-iso8859-7
-LucidaBrightDemiBold.ttf -b&h-lucidabright-demibold-r-normal--0-0-0-0-p-0-iso8859-7
-LucidaBrightDemiItalic.ttf -b&h-lucidabright-demibold-i-normal--0-0-0-0-p-0-iso8859-7
-LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-7
-LucidaSansDemiBold.ttf -b&h-lucidasans-bold-r-normal-sans-0-0-0-0-p-0-iso8859-7
-LucidaTypewriterRegular.ttf -b&h-lucidatypewriter-medium-r-normal-sans-0-0-0-0-m-0-iso8859-7
-LucidaTypewriterBold.ttf -b&h-lucidatypewriter-bold-r-normal-sans-0-0-0-0-m-0-iso8859-7
-LucidaBrightRegular.ttf -b&h-lucidabright-medium-r-normal--0-0-0-0-p-0-iso8859-9
-LucidaBrightItalic.ttf -b&h-lucidabright-medium-i-normal--0-0-0-0-p-0-iso8859-9
-LucidaBrightDemiBold.ttf -b&h-lucidabright-demibold-r-normal--0-0-0-0-p-0-iso8859-9
-LucidaBrightDemiItalic.ttf -b&h-lucidabright-demibold-i-normal--0-0-0-0-p-0-iso8859-9
-LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-9
-LucidaSansDemiBold.ttf -b&h-lucidasans-bold-r-normal-sans-0-0-0-0-p-0-iso8859-9
-LucidaTypewriterRegular.ttf -b&h-lucidatypewriter-medium-r-normal-sans-0-0-0-0-m-0-iso8859-9
-LucidaTypewriterBold.ttf -b&h-lucidatypewriter-bold-r-normal-sans-0-0-0-0-m-0-iso8859-9
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
index fbf11575ef7..5044c78d652 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -27,18 +27,18 @@
     #error This file should not be included in headless library
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <sys/time.h>
-
 #include "awt.h"
 #include "awt_p.h"
 
-#include <sun_awt_X11InputMethod.h>
+#include <sun_awt_X11InputMethodBase.h>
 #include <sun_awt_X11_XInputMethod.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+
 #define THROW_OUT_OF_MEMORY_ERROR() \
         JNU_ThrowOutOfMemoryError((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2), NULL)
 
@@ -536,10 +536,10 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
         composing = False;
         /*FALLTHRU*/
     case XLookupChars:
-    /*
-     printf("lookupString: status=XLookupChars, type=%d, state=%x, keycode=%x, keysym=%x\n",
-       event->type, event->state, event->keycode, keysym);
-    */
+        /*
+        printf("lookupString: status=XLookupChars, type=%d, state=%x, keycode=%x, keysym=%x\n",
+               event->type, event->state, event->keycode, keysym);
+        */
         javastr = JNU_NewStringPlatform(env, (const char *)pX11IMData->lookup_buf);
         if (javastr != NULL) {
             JNU_CallMethodByName(env, NULL,
@@ -552,10 +552,10 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
         break;
 
     case XLookupKeySym:
-    /*
-     printf("lookupString: status=XLookupKeySym, type=%d, state=%x, keycode=%x, keysym=%x\n",
-       event->type, event->state, event->keycode, keysym);
-    */
+        /*
+        printf("lookupString: status=XLookupKeySym, type=%d, state=%x, keycode=%x, keysym=%x\n",
+               event->type, event->state, event->keycode, keysym);
+        */
         if (keysym == XK_Multi_key)
             composing = True;
         if (! composing) {
@@ -565,10 +565,10 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
         break;
 
     case XLookupNone:
-    /*
-     printf("lookupString: status=XLookupNone, type=%d, state=%x, keycode=%x, keysym=%x\n",
-        event->type, event->state, event->keycode, keysym);
-    */
+        /*
+        printf("lookupString: status=XLookupNone, type=%d, state=%x, keycode=%x, keysym=%x\n",
+               event->type, event->state, event->keycode, keysym);
+        */
         break;
     }
 
@@ -576,8 +576,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
 }
 
 #if defined(__linux__) || defined(MACOSX)
-static StatusWindow *createStatusWindow(
-                                Window parent) {
+static StatusWindow *createStatusWindow(Window parent) {
     StatusWindow *statusWindow;
     XSetWindowAttributes attrib;
     unsigned long attribmask;
@@ -600,7 +599,7 @@ static StatusWindow *createStatusWindow(
     AwtGraphicsConfigDataPtr adata;
     extern int awt_numScreens;
     /*hardcode the size right now, should get the size base on font*/
-    int   width=80, height=22;
+    int width=80, height=22;
     Window rootWindow;
     Window *ignoreWindowPtr;
     unsigned int ignoreUnit;
@@ -652,10 +651,10 @@ static StatusWindow *createStatusWindow(
     if (xx < 0 ){
         xx = 0;
     }
-    if (xx + width > xxwa.width){
+    if (xx + width > xxwa.width) {
         xx = xxwa.width - width;
     }
-    if (yy + height > xxwa.height){
+    if (yy + height > xxwa.height) {
         yy = xxwa.height - height;
     }
 
@@ -724,7 +723,7 @@ static void onoffStatusWindow(X11InputMethodData* pX11IMData,
         return;
     }
 
-    if (ON == False){
+    if (ON == False) {
         XUnmapWindow(dpy, statusWindow->w);
         statusWindow->on = False;
         return;
@@ -732,7 +731,7 @@ static void onoffStatusWindow(X11InputMethodData* pX11IMData,
     parent = JNU_CallMethodByName(GetJNIEnv(), NULL, pX11IMData->x11inputmethod,
                                   "getCurrentParentWindow",
                                   "()J").j;
-    if (statusWindow->parent != parent){
+    if (statusWindow->parent != parent) {
         statusWindow->parent = parent;
     }
     XGetWindowAttributes(dpy, parent, &xwa);
@@ -741,21 +740,22 @@ static void onoffStatusWindow(X11InputMethodData* pX11IMData,
                           xwa.x, xwa.y,
                           &x, &y,
                           &child);
-    if (statusWindow->x != x
-        || statusWindow->y != y
-        || statusWindow->height != xwa.height){
+    if (statusWindow->x != x ||
+        statusWindow->y != y ||
+        statusWindow->height != xwa.height)
+    {
         statusWindow->x = x;
         statusWindow->y = y;
         statusWindow->height = xwa.height;
         x = statusWindow->x - statusWindow->off_x;
         y = statusWindow->y + statusWindow->height - statusWindow->off_y;
-        if (x < 0 ){
+        if (x < 0 ) {
             x = 0;
         }
-        if (x + statusWindow->statusW > statusWindow->rootW){
+        if (x + statusWindow->statusW > statusWindow->rootW) {
             x = statusWindow->rootW - statusWindow->statusW;
         }
-        if (y + statusWindow->statusH > statusWindow->rootH){
+        if (y + statusWindow->statusH > statusWindow->rootH) {
             y = statusWindow->rootH - statusWindow->statusH;
         }
         XMoveWindow(dpy, statusWindow->w, x, y);
@@ -790,61 +790,19 @@ void paintStatusWindow(StatusWindow *statusWindow){
     XDrawLine(dpy, win, dimgc, 2, height-3, width-bwidth-1, height-3);
     XDrawLine(dpy, win, dimgc, 2, 2, width-bwidth-2, 2);
     XDrawLine(dpy, win, dimgc, width-bwidth, 2, width-bwidth, height-3);
-    if (statusWindow->fontset){
+    if (statusWindow->fontset) {
         XmbDrawString(dpy, win, statusWindow->fontset, fggc,
                       bwidth + 2, height - bwidth - 4,
                       statusWindow->status,
                       strlen(statusWindow->status));
-    }
-    else{
+    } else {
         /*too bad we failed to create a fontset for this locale*/
         XDrawString(dpy, win, fggc, bwidth + 2, height - bwidth - 4,
                     "[InputMethod ON]", strlen("[InputMethod ON]"));
     }
 }
 
-void statusWindowEventHandler(XEvent event){
-    JNIEnv *env = GetJNIEnv();
-    X11InputMethodData *pX11IMData = NULL;
-    StatusWindow *statusWindow;
-
-    if (!isX11InputMethodGRefInList(currentX11InputMethodInstance)) {
-        currentX11InputMethodInstance = NULL;
-        return;
-    }
-
-    if (NULL == currentX11InputMethodInstance
-        || NULL == (pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance))
-        || NULL == (statusWindow = pX11IMData->statusWindow)
-        || statusWindow->w != event.xany.window){
-        return;
-    }
-
-    switch (event.type){
-    case Expose:
-        paintStatusWindow(statusWindow);
-        break;
-    case MapNotify:
-    case ConfigureNotify:
-        {
-          /*need to reset the stackMode...*/
-            XWindowChanges xwc;
-            int value_make = CWStackMode;
-            xwc.stack_mode = TopIf;
-            XConfigureWindow(dpy, statusWindow->w, value_make, &xwc);
-        }
-        break;
-        /*
-    case UnmapNotify:
-    case VisibilityNotify:
-        break;
-        */
-    default:
-        break;
-  }
-}
-
-static void adjustStatusWindow(Window shell){
+static void adjustStatusWindow(Window shell) {
     JNIEnv *env = GetJNIEnv();
     X11InputMethodData *pX11IMData = NULL;
     StatusWindow *statusWindow;
@@ -853,9 +811,11 @@ static void adjustStatusWindow(Window shell){
         || !isX11InputMethodGRefInList(currentX11InputMethodInstance)
         || NULL == (pX11IMData = getX11InputMethodData(env,currentX11InputMethodInstance))
         || NULL == (statusWindow = pX11IMData->statusWindow)
-        || !statusWindow->on) {
+        || !statusWindow->on)
+    {
         return;
     }
+
     {
         XWindowAttributes xwa;
         int x, y;
@@ -875,7 +835,7 @@ static void adjustStatusWindow(Window shell){
 
           x = statusWindow->x - statusWindow->off_x;
           y = statusWindow->y + statusWindow->height - statusWindow->off_y;
-          if (x < 0 ){
+          if (x < 0 ) {
               x = 0;
           }
           if (x + statusWindow->statusW > statusWindow->rootW){
@@ -889,6 +849,7 @@ static void adjustStatusWindow(Window shell){
     }
 }
 #endif  /* __linux__ || MACOSX */
+
 /*
  * Creates two XICs, one for active clients and the other for passive
  * clients. All information on those XICs are stored in the
@@ -931,9 +892,9 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
         return FALSE ;
     }
 
-#if defined(__linux__) || defined(MACOSX)
     on_the_spot_styles |= XIMStatusNothing;
 
+#if defined(__linux__) || defined(MACOSX)
     /*kinput does not support XIMPreeditCallbacks and XIMStatusArea
       at the same time, so use StatusCallback to draw the status
       ourself
@@ -944,8 +905,6 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
             break;
         }
     }
-#else /*! __linux__ && !MACOSX */
-    on_the_spot_styles |= XIMStatusNothing;
 #endif /* __linux__ || MACOSX */
 
     for (i = 0; i < im_styles->count_styles; i++) {
@@ -1023,12 +982,12 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
             XFree((void *)preedit);
         }
 #else /* !__linux__ && !MACOSX */
-            pX11IMData->ic_active = XCreateIC(X11im,
-                                              XNClientWindow, w,
-                                              XNFocusWindow, w,
-                                              XNInputStyle, active_styles,
-                                              XNPreeditAttributes, preedit,
-                                              NULL);
+        pX11IMData->ic_active = XCreateIC(X11im,
+                                          XNClientWindow, w,
+                                          XNFocusWindow, w,
+                                          XNInputStyle, active_styles,
+                                          XNPreeditAttributes, preedit,
+                                          NULL);
         XFree((void *)preedit);
 #endif /* __linux__ || MACOSX */
     } else {
@@ -1075,14 +1034,14 @@ static void
 PreeditStartCallback(XIC ic, XPointer client_data, XPointer call_data)
 {
     /*ARGSUSED*/
-    /* printf("Native: PreeditCaretCallback\n"); */
+    /* printf("Native: PreeditStartCallback\n"); */
 }
 
 static void
 PreeditDoneCallback(XIC ic, XPointer client_data, XPointer call_data)
 {
     /*ARGSUSED*/
-    /* printf("Native: StatusStartCallback\n"); */
+    /* printf("Native: PreeditDoneCallback\n"); */
 }
 
 /*
@@ -1187,7 +1146,6 @@ PreeditCaretCallback(XIC ic, XPointer client_data,
 {
     /*ARGSUSED*/
     /* printf("Native: PreeditCaretCallback\n"); */
-
 }
 
 #if defined(__linux__) || defined(MACOSX)
@@ -1196,7 +1154,6 @@ StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
 {
     /*ARGSUSED*/
     /*printf("StatusStartCallback:\n");  */
-
 }
 
 static void
@@ -1204,7 +1161,6 @@ StatusDoneCallback(XIC ic, XPointer client_data, XPointer call_data)
 {
     /*ARGSUSED*/
     /*printf("StatusDoneCallback:\n"); */
-
 }
 
 static void
@@ -1230,25 +1186,23 @@ StatusDrawCallback(XIC ic, XPointer client_data,
         || NULL == (statusWindow = pX11IMData->statusWindow)){
         goto finally;
     }
-   currentX11InputMethodInstance = (jobject)client_data;
+    currentX11InputMethodInstance = (jobject)client_data;
 
-    if (status_draw->type == XIMTextType){
+    if (status_draw->type == XIMTextType) {
         XIMText *text = (status_draw->data).text;
-        if (text != NULL){
-          if (text->string.multi_byte != NULL) {
-              strncpy(statusWindow->status, text->string.multi_byte, MAX_STATUS_LEN);
-              statusWindow->status[MAX_STATUS_LEN - 1] = '\0';
-          }
-          else {
-              char *mbstr = wcstombsdmp(text->string.wide_char, text->length);
-              strncpy(statusWindow->status, mbstr, MAX_STATUS_LEN);
-              statusWindow->status[MAX_STATUS_LEN - 1] = '\0';
-          }
-          statusWindow->on = True;
-          onoffStatusWindow(pX11IMData, statusWindow->parent, True);
-          paintStatusWindow(statusWindow);
-        }
-        else {
+        if (text != NULL) {
+            if (text->string.multi_byte != NULL) {
+                strncpy(statusWindow->status, text->string.multi_byte, MAX_STATUS_LEN);
+                statusWindow->status[MAX_STATUS_LEN - 1] = '\0';
+            } else {
+                char *mbstr = wcstombsdmp(text->string.wide_char, text->length);
+                strncpy(statusWindow->status, mbstr, MAX_STATUS_LEN);
+                statusWindow->status[MAX_STATUS_LEN - 1] = '\0';
+            }
+            statusWindow->on = True;
+            onoffStatusWindow(pX11IMData, statusWindow->parent, True);
+            paintStatusWindow(statusWindow);
+        } else {
             statusWindow->on = False;
             /*just turnoff the status window
             paintStatusWindow(statusWindow);
@@ -1327,26 +1281,10 @@ static void DestroyXIMCallback(XIM im, XPointer client_data, XPointer call_data)
     X11InputMethodData *pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
 }
 
-/*
- * Class:     sun_awt_X11InputMethod
- * Method:    initIDs
- * Signature: ()V
- */
-
-/* This function gets called from the static initializer for
-   X11InputMethod.java
-   to initialize the fieldIDs for fields that may be accessed from C */
-JNIEXPORT void JNICALL
-Java_sun_awt_X11InputMethod_initIDs(JNIEnv *env, jclass cls)
-{
-    x11InputMethodIDs.pData = (*env)->GetFieldID(env, cls, "pData", "J");
-}
-
-
 JNIEXPORT jboolean JNICALL
 Java_sun_awt_X11_XInputMethod_openXIMNative(JNIEnv *env,
-                                          jobject this,
-                                          jlong display)
+                                            jobject this,
+                                            jlong display)
 {
     Bool registered;
 
@@ -1375,8 +1313,8 @@ Java_sun_awt_X11_XInputMethod_openXIMNative(JNIEnv *env,
 
 JNIEXPORT jboolean JNICALL
 Java_sun_awt_X11_XInputMethod_createXICNative(JNIEnv *env,
-                                                  jobject this,
-                                                  jlong window)
+                                              jobject this,
+                                              jlong window)
 {
     X11InputMethodData *pX11IMData;
     jobject globalRef;
@@ -1423,10 +1361,10 @@ finally:
 
 JNIEXPORT void JNICALL
 Java_sun_awt_X11_XInputMethod_setXICFocusNative(JNIEnv *env,
-                                              jobject this,
-                                              jlong w,
-                                              jboolean req,
-                                              jboolean active)
+                                                jobject this,
+                                                jlong w,
+                                                jboolean req,
+                                                jboolean active)
 {
     X11InputMethodData *pX11IMData;
     AWT_LOCK();
@@ -1471,9 +1409,27 @@ Java_sun_awt_X11_XInputMethod_setXICFocusNative(JNIEnv *env,
     AWT_UNLOCK();
 }
 
-JNIEXPORT void JNICALL
-Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
-                                                jobject this)
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    initIDs
+ * Signature: ()V
+ * This function gets called from the static initializer for
+ * X11InputMethod.java to initialize the fieldIDs for fields
+ * that may be accessed from C
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethodBase_initIDs
+  (JNIEnv *env, jclass cls)
+{
+    x11InputMethodIDs.pData = (*env)->GetFieldID(env, cls, "pData", "J");
+}
+
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    turnoffStatusWindow
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethodBase_turnoffStatusWindow
+  (JNIEnv *env, jobject this)
 {
 #if defined(__linux__) || defined(MACOSX)
     X11InputMethodData *pX11IMData;
@@ -1495,9 +1451,13 @@ Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
 #endif
 }
 
-JNIEXPORT void JNICALL
-Java_sun_awt_X11InputMethod_disposeXIC(JNIEnv *env,
-                                             jobject this)
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    disposeXIC
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_awt_X11InputMethodBase_disposeXIC
+  (JNIEnv *env, jobject this)
 {
     X11InputMethodData *pX11IMData = NULL;
 
@@ -1518,9 +1478,13 @@ Java_sun_awt_X11InputMethod_disposeXIC(JNIEnv *env,
     AWT_UNLOCK();
 }
 
-JNIEXPORT jstring JNICALL
-Java_sun_awt_X11InputMethod_resetXIC(JNIEnv *env,
-                                           jobject this)
+/*
+ * Class:     sun_awt_X11InputMethodBase
+ * Method:    resetXIC
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_sun_awt_X11InputMethodBase_resetXIC
+  (JNIEnv *env, jobject this)
 {
     X11InputMethodData *pX11IMData;
     char *xText = NULL;
@@ -1564,9 +1528,9 @@ Java_sun_awt_X11InputMethod_resetXIC(JNIEnv *env,
 }
 
 /*
- * Class:     sun_awt_X11InputMethod
+ * Class:     sun_awt_X11InputMethodBase
  * Method:    setCompositionEnabledNative
- * Signature: (ZJ)V
+ * Signature: (Z)Z
  *
  * This method tries to set the XNPreeditState attribute associated with the current
  * XIC to the passed in 'enable' state.
@@ -1575,9 +1539,8 @@ Java_sun_awt_X11InputMethod_resetXIC(JNIEnv *env,
  * 'enable' state; Otherwise, if XSetICValues fails to set this attribute,
  * java.lang.UnsupportedOperationException will be thrown. JNI_FALSE is returned if this
  * method fails due to other reasons.
- *
  */
-JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethod_setCompositionEnabledNative
+JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_setCompositionEnabledNative
   (JNIEnv *env, jobject this, jboolean enable)
 {
     X11InputMethodData *pX11IMData;
@@ -1603,18 +1566,17 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethod_setCompositionEnabledNati
 }
 
 /*
- * Class:     sun_awt_X11InputMethod
+ * Class:     sun_awt_X11InputMethodBase
  * Method:    isCompositionEnabledNative
- * Signature: (J)Z
+ * Signature: ()Z
  *
  * This method tries to get the XNPreeditState attribute associated with the current XIC.
  *
  * Return JNI_TRUE if the XNPreeditState is successfully retrieved. Otherwise, if
  * XGetICValues fails to get this attribute, java.lang.UnsupportedOperationException
  * will be thrown. JNI_FALSE is returned if this method fails due to other reasons.
- *
  */
-JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethod_isCompositionEnabledNative
+JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_isCompositionEnabledNative
   (JNIEnv *env, jobject this)
 {
     X11InputMethodData *pX11IMData = NULL;
diff --git a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
index 50b476d4755..fba687ec120 100644
--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,31 +23,32 @@
  * questions.
  */
 
-#include "sun_awt_X11_XlibWrapper.h"
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/Xdbe.h>
-#include <X11/extensions/shape.h>
-#include <string.h>
-#include <stdlib.h>
-#include <X11/Sunkeysym.h>
-
-#include <jni.h>
-#include <jni_util.h>
-#include <jlong.h>
-#include <sizecalc.h>
-
-#include <awt.h>
-#include <awt_util.h>
-#include <jvm.h>
-
-#include <Region.h>
+#include "awt.h"
+#include "awt_util.h"
+#include "jni.h"
+#include "jlong.h"
+#include "Region.h"
+#include "sizecalc.h"
 #include "utility/rect.h"
 
+#include "sun_awt_X11_XlibWrapper.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <X11/extensions/Xdbe.h>
+#include <X11/extensions/shape.h>
+#include <X11/keysym.h>
+#include <X11/Sunkeysym.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #include <X11/XKBlib.h>
+#include <X11/Xos.h>
+#include <X11/Xutil.h>
+
+#if defined(AIX)
+#undef X_HAVE_UTF8_STRING
+extern Bool statusWindowEventHandler(XEvent event);
+#endif
 
 // From XWindow.c
 extern KeySym keycodeToKeysym(Display *display, KeyCode keycode, int index);
@@ -288,7 +289,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_ScreenCount
     return ScreenCount((Display *) jlong_to_ptr(display));
 }
 
-
 /*
  * Class:     XlibWrapper
  * Method:    XCreateWindow
@@ -303,7 +303,6 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XCreateWindow
     return  XCreateWindow((Display *) jlong_to_ptr(display),(Window) window, x, y, w, h,
               border_width, depth, wclass, (Visual *) jlong_to_ptr(visual),
               valuemask, (XSetWindowAttributes *) jlong_to_ptr(attributes));
-
 }
 
 /*
@@ -320,7 +319,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XConvertCase
                          (jlong_to_ptr(keysym_uppercase)));
 }
 
-
 /*
  * Class:     XlibWrapper
  * Method:    XMapWindow
@@ -331,7 +329,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XMapWindow
 {
     AWT_CHECK_HAVE_LOCK();
     XMapWindow( (Display *)jlong_to_ptr(display),(Window) window);
-
 }
 
 /*
@@ -344,7 +341,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XMapRaised
 {
     AWT_CHECK_HAVE_LOCK();
     XMapRaised( (Display *)jlong_to_ptr(display),(Window) window);
-
 }
 
 /*
@@ -355,10 +351,8 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XMapRaised
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XRaiseWindow
 (JNIEnv *env, jclass clazz, jlong display, jlong window)
 {
-
     AWT_CHECK_HAVE_LOCK();
     XRaiseWindow( (Display *)jlong_to_ptr(display),(Window) window);
-
 }
 
 /*
@@ -369,10 +363,8 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XRaiseWindow
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XLowerWindow
 (JNIEnv *env, jclass clazz, jlong display, jlong window)
 {
-
     AWT_CHECK_HAVE_LOCK();
     XLowerWindow( (Display *)jlong_to_ptr(display),(Window) window);
-
 }
 
 /*
@@ -383,10 +375,8 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XLowerWindow
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XRestackWindows
 (JNIEnv *env, jclass clazz, jlong display, jlong windows, jint length)
 {
-
     AWT_CHECK_HAVE_LOCK();
     XRestackWindows( (Display *) jlong_to_ptr(display), (Window *) jlong_to_ptr(windows), length);
-
 }
 
 /*
@@ -411,11 +401,10 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XConfigureWindow
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSetInputFocus
 (JNIEnv *env, jclass clazz, jlong display, jlong window)
 {
-
     AWT_CHECK_HAVE_LOCK();
     XSetInputFocus( (Display *)jlong_to_ptr(display),(Window) window, RevertToPointerRoot, CurrentTime);
-
 }
+
 /*
  * Class:     XlibWrapper
  * Method:    XSetInputFocus2
@@ -424,10 +413,8 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSetInputFocus
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSetInputFocus2
 (JNIEnv *env, jclass clazz, jlong display, jlong window, jlong time)
 {
-
     AWT_CHECK_HAVE_LOCK();
     XSetInputFocus( (Display *)jlong_to_ptr(display),(Window) window, RevertToPointerRoot, time);
-
 }
 
 /*
@@ -438,7 +425,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSetInputFocus2
 JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XGetInputFocus
 (JNIEnv *env, jclass clazz, jlong display)
 {
-
     Window focusOwner;
     int revert_to;
     AWT_CHECK_HAVE_LOCK_RETURN(0);
@@ -446,7 +432,6 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XGetInputFocus
     return focusOwner;
 }
 
-
 /*
  * Class:     XlibWrapper
  * Method:    XDestroyWindow
@@ -525,8 +510,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XUnmapWindow
 
 }
 
-
-
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSelectInput
 (JNIEnv *env, jclass clazz, jlong display, jlong window, jlong mask)
 {
@@ -543,6 +526,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XkbSelectEvents
                    (unsigned long)bits_to_change,
                    (unsigned long)values_for_bits);
 }
+
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XkbSelectEventDetails
 (JNIEnv *env, jclass clazz, jlong display, jlong device, jlong event_type,
               jlong bits_to_change, jlong values_for_bits)
@@ -553,6 +537,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XkbSelectEventDetails
                    (unsigned long)bits_to_change,
                    (unsigned long)values_for_bits);
 }
+
 JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XkbQueryExtension
 (JNIEnv *env, jclass clazz, jlong display, jlong opcode_rtrn, jlong event_rtrn,
               jlong error_rtrn, jlong major_in_out, jlong minor_in_out)
@@ -567,6 +552,7 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XkbQueryExtension
                                (int *) jlong_to_ptr(minor_in_out));
     return status ? JNI_TRUE : JNI_FALSE;
 }
+
 JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XkbLibraryVersion
 (JNIEnv *env, jclass clazz, jlong lib_major_in_out, jlong lib_minor_in_out)
 {
@@ -587,6 +573,7 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XkbGetMap
                               (unsigned int) which,
                               (unsigned int) device_spec);
 }
+
 JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XkbGetUpdatedMap
 (JNIEnv *env, jclass clazz, jlong display, jlong which, jlong xkb)
 {
@@ -626,8 +613,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XkbSetDetectableAutoRepeat
  * Method:    XNextEvent
  * Signature: (JJ)V
  */
-
-
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XNextEvent
 (JNIEnv *env, jclass clazz, jlong display, jlong ptr)
 {
@@ -640,7 +625,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XNextEvent
  * Method:    XMaskEvent
  * Signature: (JJJ)V
  */
-
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XMaskEvent
   (JNIEnv *env, jclass clazz, jlong display, jlong event_mask, jlong event_return)
 {
@@ -653,7 +637,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XMaskEvent
  * Method:    XWindowEvent
  * Signature: (JJJJ)V
  */
-
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XWindowEvent
   (JNIEnv *env, jclass clazz, jlong display, jlong window, jlong event_mask, jlong event_return)
 {
@@ -670,6 +653,11 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XFilterEvent
 (JNIEnv *env, jclass clazz, jlong ptr, jlong window)
 {
     AWT_CHECK_HAVE_LOCK_RETURN(JNI_FALSE);
+#if defined(AIX)
+    if (True == statusWindowEventHandler(*((XEvent *)(uintptr_t)ptr))) {
+        return (jboolean)True;
+    }
+#endif
     return (jboolean) XFilterEvent((XEvent *) jlong_to_ptr(ptr), (Window) window);
 }
 
@@ -727,19 +715,15 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XPeekEvent
     XPeekEvent((Display *) jlong_to_ptr(display),jlong_to_ptr(ptr));
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XMoveResizeWindow
  * Signature: (JJIIII)V
  */
-
 JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XMoveResizeWindow
 (JNIEnv *env, jclass clazz, jlong display, jlong window, jint x , jint y , jint width, jint height) {
-
     AWT_CHECK_HAVE_LOCK();
     XMoveResizeWindow( (Display *) jlong_to_ptr(display), (Window) window, x, y, width, height);
-
 }
 
 /*
@@ -747,10 +731,8 @@ JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XMoveResizeWindow
  * Method:    XResizeWindow
  * Signature: (JJII)V
  */
-
 JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XResizeWindow
-(JNIEnv *env, jclass clazz, jlong display, jlong window, jint width, jint height)
-{
+(JNIEnv *env, jclass clazz, jlong display, jlong window, jint width, jint height) {
     AWT_CHECK_HAVE_LOCK();
     XResizeWindow( (Display *) jlong_to_ptr(display),(Window) window,width,height);
 }
@@ -760,10 +742,8 @@ JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XResizeWindow
  * Method:    XMoveWindow
  * Signature: (JJII)V
  */
-
 JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XMoveWindow
-(JNIEnv *env, jclass clazz, jlong display, jlong window, jint width, jint height)
-{
+(JNIEnv *env, jclass clazz, jlong display, jlong window, jint width, jint height) {
     AWT_CHECK_HAVE_LOCK();
     XMoveWindow( (Display *) jlong_to_ptr(display),(Window) window,width,height);
 }
@@ -774,13 +754,10 @@ JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XMoveWindow
  * Method:    XSetWindowBackground
  * Signature: (JJJ)V
  */
-
 JNIEXPORT void JNICALL  Java_sun_awt_X11_XlibWrapper_XSetWindowBackground
 (JNIEnv *env, jclass clazz, jlong display, jlong window, jlong background_pixel) {
-
     AWT_CHECK_HAVE_LOCK();
     XSetWindowBackground((Display *) jlong_to_ptr(display),window,background_pixel);
-
 }
 
 
@@ -803,10 +780,8 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XFlush
  */
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSync
 (JNIEnv *env, jclass clazz, jlong display, jint discard) {
-
     AWT_CHECK_HAVE_LOCK();
     XSync((Display *) jlong_to_ptr(display), discard);
-
 }
 
 JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XTranslateCoordinates
@@ -855,7 +830,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_SetProperty
         cname = "";
     }
 
-
     AWT_CHECK_HAVE_LOCK();
 
 #ifdef X_HAVE_UTF8_STRING
@@ -866,7 +840,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_SetProperty
                                        XStdICCTextStyle, &tp);
 #endif
 
-
     if (status == Success || status > 0) {
         XChangeProperty((Display *)jlong_to_ptr(display), window, atom, tp.encoding, tp.format, PropModeReplace, tp.value, tp.nitems);
         if (tp.value != NULL) {
@@ -1005,7 +978,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XCreateFontCursor
     return XCreateFontCursor((Display *) jlong_to_ptr(display), (int) shape);
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XCreatePixmapCursor
@@ -1019,7 +991,6 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XCreatePixmapCursor
                                        (XColor *) jlong_to_ptr(fore), (XColor *) jlong_to_ptr(back), x, y);
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XQueryBestCursor
@@ -1038,7 +1009,6 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XQueryBestCursor
     else return JNI_TRUE;
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XFreeCursor
@@ -1084,7 +1054,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XChangeWindowAttributes
                             (XSetWindowAttributes *) jlong_to_ptr(attributes));
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XSetTransientFor
@@ -1181,7 +1150,6 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XlibWrapper_XGetDefault
     }
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    getScreenOfWindow
@@ -1253,7 +1221,6 @@ JNIEXPORT jbyteArray JNICALL Java_sun_awt_X11_XlibWrapper_getStringBytes
     return res;
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    ServerVendor
@@ -1265,6 +1232,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XlibWrapper_ServerVendor
     AWT_CHECK_HAVE_LOCK_RETURN(NULL);
     return JNU_NewStringPlatform(env, ServerVendor((Display*)jlong_to_ptr(display)));
 }
+
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    VendorRelease
@@ -1276,6 +1244,7 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_VendorRelease
     AWT_CHECK_HAVE_LOCK_RETURN(0);
     return VendorRelease((Display*)jlong_to_ptr(display));
 }
+
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    IsXsunKPBehavior
@@ -1309,7 +1278,6 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_IsXsunKPBehavior
     }
 }
 
-
 JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_IsSunKeyboard
 (JNIEnv *env, jclass clazz, jlong display)
 {
@@ -1407,7 +1375,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_CallErrorHandler
     return (*(XErrorHandler)jlong_to_ptr(handler))((Display*) jlong_to_ptr(display), (XErrorEvent*) jlong_to_ptr(event_ptr));
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    PrintXErrorEvent
@@ -1431,7 +1398,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_PrintXErrorEvent
     }
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XInternAtoms
@@ -1451,8 +1417,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XInternAtoms
     return status;
 }
 
-
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XGetWindowAttributes
@@ -1468,7 +1432,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XGetWindowAttributes
     return status;
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XGetGeometry
@@ -1490,7 +1453,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XGetGeometry
     return status;
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XGetWMNormalHints
@@ -1546,7 +1508,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XSendEvent
                       (XEvent*) jlong_to_ptr(event));
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XQueryTree
@@ -1564,7 +1525,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XQueryTree
                       (unsigned int*) jlong_to_ptr(nchildren_return));
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    memcpy
@@ -1576,7 +1536,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_memcpy
     memcpy(jlong_to_ptr(dest_ptr), jlong_to_ptr(src_ptr), length);
 }
 
-
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSetMinMaxHints
 (JNIEnv *env, jclass clazz, jlong display, jlong window, jint x, jint y, jint width, jint height, jlong flags) {
     XSizeHints * hints;
@@ -1595,7 +1554,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSetMinMaxHints
     XFree(hints);
 }
 
-
 JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XGetVisualInfo
 (JNIEnv *env, jclass clazz, jlong display, jlong vinfo_mask, jlong vinfo_template,
  jlong nitems_return)
@@ -1626,7 +1584,6 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XBell
     XBell((Display*)jlong_to_ptr(display), percent);
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XAllocColor
@@ -1643,7 +1600,6 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XAllocColor
     else return JNI_TRUE;
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XCreateBitmapFromData
@@ -1657,7 +1613,6 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XCreateBitmapFromData
                                          (char *) jlong_to_ptr(data), width, height);
 }
 
-
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XFreePixmap
@@ -1772,6 +1727,7 @@ Java_sun_awt_X11_XlibWrapper_XCreatePixmap(JNIEnv *env, jclass clazz, jlong disp
     AWT_CHECK_HAVE_LOCK_RETURN(0);
     return XCreatePixmap((Display*)jlong_to_ptr(display), (Drawable)drawable, width, height, depth);
 }
+
 JNIEXPORT jlong JNICALL
 Java_sun_awt_X11_XlibWrapper_XCreateImage
   (JNIEnv *env, jclass clazz, jlong display, jlong visual_ptr,
@@ -1783,6 +1739,7 @@ Java_sun_awt_X11_XlibWrapper_XCreateImage
                 depth, format, offset, (char*) jlong_to_ptr(data),
                 width, height, bitmap_pad, bytes_per_line));
 }
+
 JNIEXPORT jlong JNICALL
 Java_sun_awt_X11_XlibWrapper_XCreateGC
   (JNIEnv *env, jclass clazz, jlong display, jlong drawable,
@@ -1806,6 +1763,7 @@ Java_sun_awt_X11_XlibWrapper_XDestroyImage(JNIEnv *env, jclass clazz, jlong imag
     img->data = NULL;
     XDestroyImage(img);
 }
+
 JNIEXPORT void JNICALL
 Java_sun_awt_X11_XlibWrapper_XPutImage(JNIEnv *env, jclass clazz, jlong display, jlong drawable, jlong gc, jlong image, jint src_x, jint src_y, jint dest_x, jint dest_y, jint width, jint height)
 {
@@ -1813,18 +1771,21 @@ Java_sun_awt_X11_XlibWrapper_XPutImage(JNIEnv *env, jclass clazz, jlong display,
     XPutImage((Display*)jlong_to_ptr(display), (Drawable)drawable, (GC) jlong_to_ptr(gc), (XImage*) jlong_to_ptr(image), src_x, src_y,
               dest_x, dest_y, width, height);
 }
+
 JNIEXPORT void JNICALL
 Java_sun_awt_X11_XlibWrapper_XFreeGC(JNIEnv *env, jclass clazz, jlong display, jlong gc)
 {
     AWT_CHECK_HAVE_LOCK();
     XFreeGC((Display*) jlong_to_ptr(display), (GC) jlong_to_ptr(gc));
 }
+
 JNIEXPORT void JNICALL
 Java_sun_awt_X11_XlibWrapper_XSetWindowBackgroundPixmap(JNIEnv *env, jclass clazz, jlong display, jlong window, jlong pixmap)
 {
     AWT_CHECK_HAVE_LOCK();
     XSetWindowBackgroundPixmap((Display*) jlong_to_ptr(display), (Window)window, (Pixmap)pixmap);
 }
+
 JNIEXPORT void JNICALL
 Java_sun_awt_X11_XlibWrapper_XClearWindow(JNIEnv *env, jclass clazz, jlong display, jlong window)
 {
@@ -1922,7 +1883,6 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XdbeSwapBuffers
 JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XQueryKeymap
 (JNIEnv *env, jclass clazz, jlong display, jlong vector)
 {
-
     AWT_CHECK_HAVE_LOCK();
     XQueryKeymap( (Display *) jlong_to_ptr(display), (char *) jlong_to_ptr(vector));
 }
@@ -1961,6 +1921,7 @@ Java_sun_awt_X11_XlibWrapper_XkbGetEffectiveGroup(JNIEnv *env, jclass clazz,
 //    printf("-------------------------------------^^^^\n");
     return (jint)(sr.group);
 }
+
 JNIEXPORT jlong JNICALL
 Java_sun_awt_X11_XlibWrapper_XkbKeycodeToKeysym(JNIEnv *env, jclass clazz,
                                               jlong display, jint keycode,
@@ -1989,6 +1950,7 @@ Java_sun_awt_X11_XlibWrapper_XFreeModifiermap(JNIEnv *env, jclass clazz,
     AWT_CHECK_HAVE_LOCK();
     XFreeModifiermap((XModifierKeymap*) jlong_to_ptr(keymap));
 }
+
 /*
  * Class:     sun_awt_X11_XlibWrapper
  * Method:    XRefreshKeyboardMapping
@@ -2034,7 +1996,6 @@ secondary_loop_event(Display* dpy, XEvent* event, XPointer xawt_root_window) {
             ) ? True : False;
 }
 
-
 JNIEXPORT jboolean JNICALL
 Java_sun_awt_X11_XlibWrapper_XNextSecondaryLoopEvent(JNIEnv *env, jclass clazz,
                                                      jlong display, jlong ptr) {
@@ -2062,7 +2023,6 @@ Java_sun_awt_X11_XlibWrapper_ExitSecondaryLoop(JNIEnv *env, jclass clazz) {
     exitSecondaryLoop = True;
     AWT_NOTIFY_ALL();
 }
-/*******************************************************************************/
 
 JNIEXPORT jobjectArray JNICALL
 Java_sun_awt_X11_XlibWrapper_XTextPropertyToStringList(JNIEnv *env,
@@ -2181,7 +2141,6 @@ Java_sun_awt_X11_XlibWrapper_XTextPropertyToStringList(JNIEnv *env,
     return ret;
 }
 
-
 JNIEXPORT void JNICALL
 Java_sun_awt_X11_XlibWrapper_XPutBackEvent(JNIEnv *env,
                                            jclass clazz,
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
index 2f0ee538ae9..57b5f70ca37 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,7 +25,6 @@
 
 package sun.awt.windows;
 
-
 import java.awt.Desktop.Action;
 import java.awt.EventQueue;
 import java.awt.desktop.SystemEventListener;
@@ -38,9 +37,8 @@ import java.awt.peer.DesktopPeer;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import javax.swing.event.EventListenerList;
-import sun.awt.OSInfo;
 
+import javax.swing.event.EventListenerList;
 
 /**
  * Concrete implementation of the interface {@code DesktopPeer} for
@@ -49,19 +47,15 @@ import sun.awt.OSInfo;
  * @see DesktopPeer
  */
 final class WDesktopPeer implements DesktopPeer {
-    /* Contants for the operation verbs */
+    /* Constants for the operation verbs */
     private static String ACTION_OPEN_VERB = "open";
     private static String ACTION_EDIT_VERB = "edit";
     private static String ACTION_PRINT_VERB = "print";
 
-    private static boolean isEventUserSessionSupported = false;
-
     private static native void init();
 
     WDesktopPeer() {
         init();
-        isEventUserSessionSupported = OSInfo.getWindowsVersion()
-                                        .compareTo(OSInfo.WINDOWS_VISTA) >= 0;
     }
 
     @Override
@@ -75,9 +69,8 @@ final class WDesktopPeer implements DesktopPeer {
             case MOVE_TO_TRASH:
             case APP_SUDDEN_TERMINATION:
             case APP_EVENT_SYSTEM_SLEEP:
-                return true;
             case APP_EVENT_USER_SESSION:
-                return isEventUserSessionSupported;
+                return true;
             default:
                 return false;
         }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index cfef03b9286..81b88c106ad 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -79,6 +79,7 @@ import javax.print.attribute.standard.PrinterResolution;
 import javax.print.attribute.standard.SheetCollate;
 import javax.print.attribute.standard.Copies;
 import javax.print.attribute.standard.Destination;
+import javax.print.attribute.standard.DialogOwner;
 import javax.print.attribute.standard.OrientationRequested;
 import javax.print.attribute.standard.Media;
 import javax.print.attribute.standard.MediaSizeName;
@@ -95,7 +96,6 @@ import sun.print.Win32MediaTray;
 import sun.print.Win32PrintService;
 import sun.print.PrintServiceLookupProvider;
 import sun.print.ServiceDialog;
-import sun.print.DialogOwner;
 
 import java.awt.Frame;
 import java.io.FilePermission;
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java
index 8521ec73c05..15ef1306a54 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,9 +25,13 @@
 
 package sun.awt.windows;
 
-import java.awt.*;
+import java.awt.GraphicsDevice;
+import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.peer.RobotPeer;
 
+import sun.java2d.SunGraphicsEnvironment;
+
 final class WRobotPeer extends WObjectPeer implements RobotPeer
 {
     WRobotPeer() {
@@ -48,7 +52,8 @@ final class WRobotPeer extends WObjectPeer implements RobotPeer
     public native void mouseMoveImpl(int x, int y);
     @Override
     public void mouseMove(int x, int y) {
-        mouseMoveImpl(x, y);
+        Point point = SunGraphicsEnvironment.convertToDeviceSpace(x, y);
+        mouseMoveImpl(point.x, point.y);
     }
     @Override
     public native void mousePress(int buttons);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
index 27389d26ee6..5bf4e232de4 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
@@ -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
@@ -61,8 +61,8 @@ import sun.awt.SunToolkit;
 import sun.awt.Win32GraphicsConfig;
 import sun.awt.Win32GraphicsDevice;
 import sun.awt.Win32GraphicsEnvironment;
+import sun.java2d.SunGraphicsEnvironment;
 import sun.java2d.pipe.Region;
-import sun.swing.SwingUtilities2;
 import sun.util.logging.PlatformLogger;
 
 public class WWindowPeer extends WPanelPeer implements WindowPeer,
@@ -659,7 +659,8 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
          int cx = x + width / 2;
          int cy = y + height / 2;
          GraphicsConfiguration current = getGraphicsConfiguration();
-         GraphicsConfiguration other = SwingUtilities2.getGraphicsConfigurationAtPoint(current, cx, cy);
+         GraphicsConfiguration other = SunGraphicsEnvironment
+                 .getGraphicsConfigurationAtPoint(current, cx, cy);
          if (!current.equals(other)) {
              AffineTransform tx = other.getDefaultTransform();
              double otherScaleX = tx.getScaleX();
diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
index c8f74d9e2a9..973e9568de3 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
@@ -25,6 +25,8 @@
 
 package sun.print;
 
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.print.PrinterJob;
 import java.io.File;
@@ -54,6 +56,8 @@ import javax.print.attribute.standard.Chromaticity;
 import javax.print.attribute.standard.Copies;
 import javax.print.attribute.standard.CopiesSupported;
 import javax.print.attribute.standard.Destination;
+import javax.print.attribute.standard.DialogOwner;
+import javax.print.attribute.standard.DialogTypeSelection;
 import javax.print.attribute.standard.Fidelity;
 import javax.print.attribute.standard.Media;
 import javax.print.attribute.standard.MediaSizeName;
@@ -1042,6 +1046,10 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
             categList.add(PrinterResolution.class);
         }
 
+        if (GraphicsEnvironment.isHeadless() == false) {
+            categList.add(DialogOwner.class);
+            categList.add(DialogTypeSelection.class);
+        }
         return categList.toArray(new Class<?>[categList.size()]);
     }
 
@@ -1585,6 +1593,23 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
                 (isColorSup && (attr == ColorSupported.NOT_SUPPORTED))) {
                 return false;
             }
+        } else if (category == DialogTypeSelection.class) {
+            return true; // isHeadless was checked by category support
+        } else if (category == DialogOwner.class) {
+            DialogOwner owner = (DialogOwner)attr;
+            DialogTypeSelection dts = (attributes == null) ? null :
+                (DialogTypeSelection)attributes.get(DialogTypeSelection.class);
+            if (dts == DialogTypeSelection.NATIVE) {
+                return DialogOwnerAccessor.getID(owner) != 0;
+            } else {
+               if (DialogOwnerAccessor.getID(owner) != 0) {
+                  return false;
+               } else if (owner.getOwner() != null) {
+                   return true;
+               } else {
+                   return Toolkit.getDefaultToolkit().isAlwaysOnTopSupported();
+               }
+            }
         }
         return true;
     }
diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp
index 36991f415cb..5e35ac7af34 100644
--- a/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp
+++ b/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, 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
@@ -85,7 +85,11 @@ static POINT *TransformPoly(jint *xpoints, jint *ypoints,
         *pNpoints = outpoints;
     }
     if (outpoints > POLYTEMPSIZE) {
-        pPoints = (POINT *) SAFE_SIZE_ARRAY_ALLOC(safe_Malloc, sizeof(POINT), outpoints);
+        try {
+            pPoints = (POINT *) SAFE_SIZE_ARRAY_ALLOC(safe_Malloc, sizeof(POINT), outpoints);
+        } catch (const std::bad_alloc&) {
+            return NULL;
+        }
     }
     BOOL isempty = fixend;
     for (int i = 0; i < npoints; i++) {
diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp
index f6ba8b01308..bada561fe8c 100644
--- a/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp
+++ b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp
@@ -490,7 +490,7 @@ GDIWindowSurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData)
 JNIEXPORT AwtComponent * JNICALL
 GDIWindowSurfaceData_GetComp(JNIEnv *env, GDIWinSDOps *wsdo)
 {
-    PDATA pData;
+    PDATA pData = NULL;
     jobject localObj = env->NewLocalRef(wsdo->peer);
 
     if (localObj == NULL || (pData = JNI_GET_PDATA(localObj)) == NULL) {
diff --git a/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp b/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
index 4f225a9c069..a9cc185e31f 100644
--- a/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -873,7 +873,13 @@ Java_sun_print_Win32PrintService_getDefaultSettings(JNIEnv *env,
       int numSizes = ::DeviceCapabilities(printerName, printerPort,
                                           DC_PAPERS, NULL, NULL);
       if (numSizes > 0) {
-          LPTSTR papers = (LPTSTR)SAFE_SIZE_ARRAY_ALLOC(safe_Malloc, numSizes, sizeof(WORD));
+          LPTSTR papers;
+          try {
+              papers = (LPTSTR)SAFE_SIZE_ARRAY_ALLOC(safe_Malloc, numSizes, sizeof(WORD));
+          } catch (const std::bad_alloc&) {
+              papers = NULL;
+          }
+
           if (papers != NULL &&
               ::DeviceCapabilities(printerName, printerPort,
                                    DC_PAPERS, papers, NULL) != -1) {
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
index 4c92b2c2b98..49f341b660b 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, 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
@@ -56,11 +56,14 @@ void * operator new[](size_t size, const char * filename, int linenumber) {
     return ptr;
 }
 
-#if _MSC_VER >= 1200
 void operator delete(void *ptr, const char*, int) {
     DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!");
 }
-#endif
+
+void operator delete[](void *ptr, const char*, int) {
+    DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!");
+}
+
 void operator delete(void *ptr) throw() {
     DMem_FreeBlock(ptr);
 }
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Debug.h b/src/java.desktop/windows/native/libawt/windows/awt_Debug.h
index 6e99799541f..0b964a0272f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Debug.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, 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
@@ -50,10 +50,8 @@
     extern void * operator new(size_t size, const char * filename, int linenumber);
     extern void * operator new[](size_t size, const char * filename, int linenumber);
 
-#if _MSC_VER >= 1200
-    /* VC 6.0 is more strict about enforcing matching placement new & delete */
     extern void operator delete(void *ptr, const char*, int);
-#endif
+    extern void operator delete[](void *ptr, const char*, int);
 
     extern void operator delete(void *ptr) throw();
     extern void DumpClipRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
index 4db3de5ad8d..12c733d19b4 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -43,62 +43,20 @@ AwtRobot::~AwtRobot()
 {
 }
 
-#ifndef SPI_GETMOUSESPEED
-#define SPI_GETMOUSESPEED 112
-#endif
-
-#ifndef SPI_SETMOUSESPEED
-#define SPI_SETMOUSESPEED 113
-#endif
+static int signum(int i) {
+  // special version of signum which returns 1 when value is 0
+  return i >= 0 ? 1 : -1;
+}
 
 void AwtRobot::MouseMove( jint x, jint y)
 {
-    // Fix for Bug 4288230. See Q193003 from MSDN.
-      int oldAccel[3], newAccel[3];
-      INT_PTR oldSpeed, newSpeed;
-      BOOL bResult;
-
-   // The following values set mouse ballistics to 1 mickey/pixel.
-      newAccel[0] = 0;
-      newAccel[1] = 0;
-      newAccel[2] = 0;
-      newSpeed = 10;
-
-      // Save the Current Mouse Acceleration Constants
-      bResult = SystemParametersInfo(SPI_GETMOUSE,0,oldAccel,0);
-      bResult = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &oldSpeed,0);
-      // Set the new Mouse Acceleration Constants (Disabled).
-      bResult = SystemParametersInfo(SPI_SETMOUSE,0,newAccel,SPIF_SENDCHANGE);
-      bResult = SystemParametersInfo(SPI_SETMOUSESPEED, 0,
-                // 4504963: Though the third argument to SystemParameterInfo is
-                // declared as a PVOID, as of Windows 2000 it is apparently
-                // interpreted as an int.  (The MSDN docs for SPI_SETMOUSESPEED
-                // say that it's an integer between 1 and 20, the default being
-                // 10).  Instead of passing the @ of the desired value, the
-                // value itself is now passed, cast as a PVOID so as to
-                // compile.  -bchristi 10/02/2001
-                                     (PVOID)newSpeed,
-                                     SPIF_SENDCHANGE);
-
-      int primaryIndex = AwtWin32GraphicsDevice::GetDefaultDeviceIndex();
-      Devices::InstanceAccess devices;
-      AwtWin32GraphicsDevice *device = devices->GetDevice(primaryIndex);
-
-      x = (device == NULL) ? x : device->ScaleUpX(x);
-      y = (device == NULL) ? y : device->ScaleUpY(y);
-
-      POINT curPos;
-      ::GetCursorPos(&curPos);
-      x -= curPos.x;
-      y -= curPos.y;
-
-      mouse_event(MOUSEEVENTF_MOVE,x,y,0,0);
-      // Move the cursor to the desired coordinates.
-
-      // Restore the old Mouse Acceleration Constants.
-      bResult = SystemParametersInfo(SPI_SETMOUSE,0, oldAccel, SPIF_SENDCHANGE);
-      bResult = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)oldSpeed,
-                                     SPIF_SENDCHANGE);
+    INPUT mouseInput = {0};
+    mouseInput.type = INPUT_MOUSE;
+    mouseInput.mi.time = 0;
+    mouseInput.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
+    mouseInput.mi.dx = (x * 65536 /::GetSystemMetrics(SM_CXSCREEN)) + signum(x);
+    mouseInput.mi.dy = (y * 65536 /::GetSystemMetrics(SM_CYSCREEN)) + signum(y);
+    ::SendInput(1, &mouseInput, sizeof(mouseInput));
 }
 
 void AwtRobot::MousePress( jint buttonMask )
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
index abcdc6895ad..a731f7d9f38 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
@@ -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
@@ -3137,11 +3137,11 @@ bool AwtToolkit::IsTouchKeyboardAutoShowSystemEnabled() {
 void AwtToolkit::ShowTouchKeyboard() {
     if (m_isWin8OrLater && m_touchKbrdAutoShowIsEnabled &&
         (m_touchKbrdExeFilePath != NULL)) {
-        HINSTANCE retVal = ::ShellExecute(NULL, _T("open"),
-            m_touchKbrdExeFilePath, NULL, NULL, SW_SHOW);
-        if ((int)((intptr_t)retVal) <= 32) {
+        int retVal = (int)((intptr_t)::ShellExecute(NULL, _T("open"),
+            m_touchKbrdExeFilePath, NULL, NULL, SW_SHOW));
+        if (retVal <= 32) {
             DTRACE_PRINTLN1("AwtToolkit::ShowTouchKeyboard: Failed"
-                ", retVal='%d'", (int)retVal);
+                ", retVal='%d'", retVal);
         }
     }
 }
diff --git a/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m b/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
index 269981aecd5..8a17427af8d 100644
--- a/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
+++ b/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -63,6 +63,7 @@
 #include "jni_util.h"
 #include "jlong.h"
 #include "jvm.h"
+#include "java_util_prefs_MacOSXPreferencesFile.h"
 
 /*
  * Declare library specific JNI_Onload entry if static build
diff --git a/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c b/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c
index 05dc673ae6d..c591f04d30a 100644
--- a/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c
+++ b/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c
@@ -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
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <utime.h>
 #include "jni_util.h"
+#include "java_util_prefs_FileSystemPreferences.h"
 
 /*
  * Declare library specific JNI_Onload entry if static build
diff --git a/src/java.prefs/windows/native/libprefs/WindowsPreferences.c b/src/java.prefs/windows/native/libprefs/WindowsPreferences.c
index 0512b69b45c..0d512a36527 100644
--- a/src/java.prefs/windows/native/libprefs/WindowsPreferences.c
+++ b/src/java.prefs/windows/native/libprefs/WindowsPreferences.c
@@ -28,6 +28,8 @@
 #include "jni.h"
 #include "jni_util.h"
 #include "jvm.h"
+#include "java_util_prefs_WindowsPreferences.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
index 63336da2e78..2fee1d98527 100644
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
@@ -99,6 +99,25 @@ import java.io.OutputStream;
  * mechanism provider. The application will need to ensure that it has the
  * appropriate permissions if such checks are made in the mechanism layer.<p>
  *
+ * The stream-based methods of {@code GSSContext} have been deprecated in
+ * Java SE 11. These methods have also been removed from
+ * <a href="http://tools.ietf.org/html/rfc8353">
+ * RFC 8353: Generic Security Service API Version 2: Java Bindings Update</a>
+ * for the following reasons (see section 11): "The overloaded methods of
+ * GSSContext that use input and output streams as the means to convey
+ * authentication and per-message GSS-API tokens as described in Section 5.15
+ * of RFC 5653 are removed in this update as the wire protocol
+ * should be defined by an application and not a library. It's also impossible
+ * to implement these methods correctly when the token has no self-framing
+ * (where the end cannot be determined), or the library has no knowledge of
+ * the token format (for example, as a bridge talking to another GSS library)".
+ * These methods include {@link #initSecContext(InputStream, OutputStream)},
+ * {@link #acceptSecContext(InputStream, OutputStream)},
+ * {@link #wrap(InputStream, OutputStream, MessageProp)},
+ * {@link #unwrap(InputStream, OutputStream, MessageProp)},
+ * {@link #getMIC(InputStream, OutputStream, MessageProp)},
+ * and {@link #verifyMIC(InputStream, InputStream, MessageProp)}.<p>
+ *
  * The example code presented below demonstrates the usage of the
  * <code>GSSContext</code> interface for the initiating peer.  Different
  * operations on the <code>GSSContext</code> object are presented,
@@ -316,7 +335,10 @@ public interface GSSContext {
      *   {@link GSSException#BAD_NAMETYPE GSSException.BAD_NAMETYPE},
      *   {@link GSSException#BAD_MECH GSSException.BAD_MECH},
      *   {@link GSSException#FAILURE GSSException.FAILURE}
+     * @deprecated The stream-based methods have been removed from RFC 8353.
+     * Use {@link #initSecContext(byte[], int, int)} instead.
      */
+    @Deprecated(since="11")
     public int initSecContext(InputStream inStream,
                               OutputStream outStream) throws GSSException;
 
@@ -459,6 +481,9 @@ public interface GSSContext {
      *   {@link GSSException#DUPLICATE_TOKEN GSSException.DUPLICATE_TOKEN},
      *   {@link GSSException#BAD_MECH GSSException.BAD_MECH},
      *   {@link GSSException#FAILURE GSSException.FAILURE}
+     *
+     * @deprecated The stream-based methods have been removed from RFC 8353.
+     * Use {@link #acceptSecContext(byte[], int, int)} instead.
      */
     /* Missing return value in RFC. int should have been returned.
      * -----------------------------------------------------------
@@ -472,6 +497,7 @@ public interface GSSContext {
      * 0 indicates that no token  needs to be
      * sent.</strong>
      */
+    @Deprecated(since="11")
     public void acceptSecContext(InputStream inStream,
                                  OutputStream outStream) throws GSSException;
 
@@ -613,7 +639,11 @@ public interface GSSContext {
      *   {@link GSSException#CONTEXT_EXPIRED GSSException.CONTEXT_EXPIRED},
      *   {@link GSSException#BAD_QOP GSSException.BAD_QOP},
      *   {@link GSSException#FAILURE GSSException.FAILURE}
+     *
+     * @deprecated The stream-based methods have been removed from RFC 8353.
+     * Use {@link #wrap(byte[], int, int, MessageProp)} instead.
      */
+    @Deprecated(since="11")
     public void wrap(InputStream inStream, OutputStream outStream,
                      MessageProp msgProp) throws GSSException;
 
@@ -696,7 +726,11 @@ public interface GSSContext {
      *   {@link GSSException#BAD_MIC GSSException.BAD_MIC},
      *   {@link GSSException#CONTEXT_EXPIRED GSSException.CONTEXT_EXPIRED},
      *   {@link GSSException#FAILURE GSSException.FAILURE}
+     *
+     * @deprecated The stream-based methods have been removed from RFC 8353.
+     * Use {@link #unwrap(byte[], int, int, MessageProp)} instead.
      */
+    @Deprecated(since="11")
     public void unwrap(InputStream inStream, OutputStream outStream,
                        MessageProp msgProp) throws GSSException;
 
@@ -761,7 +795,11 @@ public interface GSSContext {
      *   {@link GSSException#CONTEXT_EXPIRED GSSException.CONTEXT_EXPIRED},
      *   {@link GSSException#BAD_QOP GSSException.BAD_QOP},
      *   {@link GSSException#FAILURE GSSException.FAILURE}
+     *
+     * @deprecated The stream-based methods have been removed from RFC 8353.
+     * Use {@link #getMIC(byte[], int, int, MessageProp)} instead.
      */
+    @Deprecated(since="11")
     public void getMIC(InputStream inStream, OutputStream outStream,
                        MessageProp msgProp) throws GSSException;
 
@@ -844,7 +882,12 @@ public interface GSSContext {
      *   {@link GSSException#BAD_MIC GSSException.BAD_MIC}
      *   {@link GSSException#CONTEXT_EXPIRED GSSException.CONTEXT_EXPIRED}
      *   {@link GSSException#FAILURE GSSException.FAILURE}
+     *
+     * @deprecated The stream-based methods have been removed from RFC 8353.
+     * Use {@link #verifyMIC(byte[], int, int, byte[], int, int, MessageProp)}
+     * instead.
      */
+    @Deprecated(since="11")
     public void verifyMIC(InputStream tokStream, InputStream msgStream,
                           MessageProp msgProp) throws GSSException;
 
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
index 1f9fe9d337f..9521a33d6e3 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
@@ -197,6 +197,7 @@ public class GSSContextImpl implements GSSContext {
         return (size == 0? null : bos.toByteArray());
     }
 
+    @Deprecated(since="11")
     public int initSecContext(InputStream inStream,
                               OutputStream outStream) throws GSSException {
 
@@ -305,6 +306,7 @@ public class GSSContextImpl implements GSSContext {
         return (out.length == 0) ? null : out;
     }
 
+    @Deprecated(since="11")
     public void acceptSecContext(InputStream inStream,
                                  OutputStream outStream) throws GSSException {
 
@@ -405,6 +407,7 @@ public class GSSContextImpl implements GSSContext {
                                    "No mechanism context yet!");
     }
 
+    @Deprecated(since="11")
     public void wrap(InputStream inStream, OutputStream outStream,
                      MessageProp msgProp) throws GSSException {
         if (mechCtxt != null)
@@ -423,6 +426,7 @@ public class GSSContextImpl implements GSSContext {
                                   "No mechanism context yet!");
     }
 
+    @Deprecated(since="11")
     public void unwrap(InputStream inStream, OutputStream outStream,
                        MessageProp msgProp) throws GSSException {
         if (mechCtxt != null)
@@ -441,6 +445,7 @@ public class GSSContextImpl implements GSSContext {
                                   "No mechanism context yet!");
     }
 
+    @Deprecated(since="11")
     public void getMIC(InputStream inStream, OutputStream outStream,
                        MessageProp msgProp) throws GSSException {
         if (mechCtxt != null)
@@ -461,6 +466,7 @@ public class GSSContextImpl implements GSSContext {
                                   "No mechanism context yet!");
     }
 
+    @Deprecated(since="11")
     public void verifyMIC(InputStream tokStream, InputStream msgStream,
                           MessageProp msgProp) throws GSSException {
         if (mechCtxt != null)
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java
index 416c091d4e6..7327ad97cd0 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java
@@ -281,6 +281,7 @@ public class SpNegoContext implements GSSContextSpi {
      * to its peer for processing.
      * @exception GSSException
      */
+    @Deprecated(since="11")
     public final byte[] initSecContext(InputStream is, int mechTokenSize)
         throws GSSException {
 
@@ -475,6 +476,7 @@ public class SpNegoContext implements GSSContextSpi {
      * to its peer for processing.
      * @exception GSSException
      */
+    @Deprecated(since="11")
     public final byte[] acceptSecContext(InputStream is, int mechTokenSize)
         throws GSSException {
 
@@ -1128,6 +1130,7 @@ public class SpNegoContext implements GSSContextSpi {
         }
     }
 
+    @Deprecated(since="11")
     public final void wrap(InputStream is, OutputStream os,
                             MessageProp msgProp) throws GSSException {
         if (mechContext != null) {
@@ -1149,6 +1152,7 @@ public class SpNegoContext implements GSSContextSpi {
         }
     }
 
+    @Deprecated(since="11")
     public final void unwrap(InputStream is, OutputStream os,
                              MessageProp msgProp) throws GSSException {
         if (mechContext != null) {
@@ -1170,6 +1174,7 @@ public class SpNegoContext implements GSSContextSpi {
         }
     }
 
+    @Deprecated(since="11")
     public final void getMIC(InputStream is, OutputStream os,
                               MessageProp msgProp) throws GSSException {
         if (mechContext != null) {
@@ -1193,6 +1198,7 @@ public class SpNegoContext implements GSSContextSpi {
         }
     }
 
+    @Deprecated(since="11")
     public final void verifyMIC(InputStream is, InputStream msgStr,
                                  MessageProp msgProp) throws GSSException {
         if (mechContext != null) {
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
index baa3d1375fd..89099e07380 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,8 +53,8 @@ public final class SunNativeProvider extends Provider {
         "sun.security.jgss.wrapper.NativeGSSFactory";
     private static final String LIB_PROP = "sun.security.jgss.lib";
     private static final String DEBUG_PROP = "sun.security.nativegss.debug";
-    private static HashMap<String, String> MECH_MAP;
-    static final Provider INSTANCE = new SunNativeProvider();
+    private static final HashMap<String, String> MECH_MAP;
+    static final Provider INSTANCE;
     static boolean DEBUG;
     static void debug(String message) {
         if (DEBUG) {
@@ -117,6 +117,8 @@ public final class SunNativeProvider extends Provider {
                         return null;
                     }
                 });
+        // initialize INSTANCE after MECH_MAP is constructed
+        INSTANCE = new SunNativeProvider();
     }
 
     public SunNativeProvider() {
diff --git a/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c b/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c
index d5424cf4f5f..a973eea330e 100644
--- a/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c
+++ b/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -44,6 +44,7 @@
 #include <jni.h>
 #include "jni_util.h"
 #include <winsock.h>
+#include "sun_security_krb5_Credentials.h"
 
 #undef LSA_SUCCESS
 #define LSA_SUCCESS(Status) ((Status) >= 0)
diff --git a/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c b/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c
index 7466022f752..0edf6ec8bad 100644
--- a/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c
+++ b/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,6 +27,7 @@
 #include <jni.h>
 #include <windows.h>
 #include <stdlib.h>
+#include "sun_security_krb5_Config.h"
 
 /*
  * Class:     sun_security_krb5_Config
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java
new file mode 100644
index 00000000000..1057b7e37ff
--- /dev/null
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c)  2017, 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.
+ */
+
+/**
+ * Standard interfaces and base classes for JDBC <code>RowSet</code>
+ * implementations. This package contains interfaces and classes
+ * that a standard <code>RowSet</code> implementation either implements or extends.
+ *
+ * <h2>Table of Contents</h2>
+ * <ul>
+ * <li><a href="#pkgspec">1.0 Package Specification</a>
+ * <li><a href="#stdrowset">2.0 Standard RowSet Definitions</a>
+ * <li><a href="#impl">3.0 Implementer's Guide</a>
+ * <li><a href="#relspec">4.0 Related Specifications</a>
+ * <li><a href="#reldocs">5.0 Related Documentation</a>
+ * </ul>
+ *
+ * <h3><a id="pkgspec">1.0 Package Specification</a></h3>
+ * This package specifies five standard JDBC <code>RowSet</code> interfaces.
+ * All five extend the
+ * <a href="{@docRoot}/java.sql/javax/sql/RowSet.html">RowSet</a> interface described in the JDBC 3.0
+ * specification.  It is anticipated that additional definitions
+ * of more specialized JDBC <code>RowSet</code> types will emerge as this technology
+ * matures. Future definitions <i>should</i> be specified as subinterfaces using
+ * inheritance similar to the way it is used in this specification.
+ * <p>
+ * <i>Note:</i> The interface definitions provided in this package form the basis for
+ * all compliant JDBC <code>RowSet</code> implementations. Vendors and more advanced
+ * developers who intend to provide their own compliant <code>RowSet</code> implementations
+ * should pay particular attention to the assertions detailed in specification
+ * interfaces.
+ *
+ * <h3><a id="stdrowset">2.0 Standard RowSet Definitions</a></h3>
+ * <ul>
+ * <li><a href="JdbcRowSet.html"><b><code>JdbcRowSet</code></b></a> - A wrapper around
+ * a <code>ResultSet</code> object that makes it possible to use the result set as a
+ * JavaBeans&trade; component. Thus,
+ * a <code>JdbcRowSet</code> object can be a Bean that any tool
+ * makes available for assembling an application as part of a component based
+ * architecture. A <code>JdbcRowSet</code> object is a connected <code>RowSet</code>
+ * object, that is, it
+ * <b>must</b> continually maintain its connection to its data source using a JDBC
+ * technology-enabled driver ("JDBC driver"). In addition, a <code>JdbcRowSet</code>
+ * object provides a fully updatable and scrollable tabular
+ * data structure as defined in the JDBC 3.0 specification.
+ *
+ * <li><a href="CachedRowSet.html">
+ * <b><code>CachedRowSet</code>&trade;</b></a>
+ *  - A <code>CachedRowSet</code> object is a JavaBeans&trade;
+ * component that is scrollable, updatable, serializable, and generally disconnected from
+ * the source of its data. A <code>CachedRowSet</code> object
+ * typically contains rows from a result set, but it can also contain rows from any
+ * file with a tabular format, such as a spreadsheet. <code>CachedRowSet</code> implementations
+ * <b>must</b> use the <code>SyncFactory</code> to manage and obtain pluggable
+ * <code>SyncProvider</code> objects to provide synchronization between the
+ * disconnected <code>RowSet</code> object and the originating data source.
+ * Typically a <code>SyncProvider</code> implementation relies upon a JDBC
+ * driver to obtain connectivity to a particular data source.
+ * Further details on this mechanism are discussed in the <a
+ * href="spi/package-summary.html"><code>javax.sql.rowset.spi</code></a> package
+ * specification.
+ *
+ * <li><a href="WebRowSet.html"><b><code>WebRowSet</code></b></a> - A
+ * <code>WebRowSet</code> object is an extension of <code>CachedRowSet</code>
+ * that can read and write a <code>RowSet</code> object in a well formed XML format.
+ * This class calls an <a href="spi/XmlReader.html"><code>XmlReader</code></a> object
+ * (an extension of the <a href="{@docRoot}/java.sql/javax/sql/RowSetReader.html"><code>RowSetReader</code></a>
+ * interface) to read a rowset in XML format. It calls an
+ * <a href="spi/XmlWriter.html"><code>XmlWriter</code></a> object (an extension of the
+ * <a href="{@docRoot}/java.sql/javax/sql/RowSetWriter.html"><code>RowSetWriter</code></a> interface)
+ * to write a rowset in XML format. The reader and writer required by
+ * <code>WebRowSet</code> objects are provided by the
+ * <code>SyncFactory</code> in the form of <code>SyncProvider</code>
+ * implementations. In order to ensure well formed XML usage, a standard generic XML
+ * Schema is defined and published at
+ * <a href="http://java.sun.com/xml/ns/jdbc/webrowset.xsd">
+ * <code>http://java.sun.com/xml/ns/jdbc/webrowset.xsd</code></a>.
+ *
+ * <li><a href="FilteredRowSet.html"><b><code>FilteredRowSet</code></b></a> - A
+ * <code>FilteredRowSet</code> object provides filtering functionality in a programmatic
+ * and extensible way. There are many instances when a <code>RowSet</code> <code>object</code>
+ * has a need to provide filtering in its contents without sacrificing the disconnected
+ * environment, thus saving the expense of having to create a connection to the data source.
+ * Solutions to this need vary from providing heavyweight full scale
+ * SQL query abilities, to portable components, to more lightweight
+ * approaches. A <code>FilteredRowSet</code> object consumes
+ * an implementation of the <a href="Predicate.html"><code>Predicate</code></a>
+ * interface, which <b>may</b> define a filter at run time. In turn, a
+ * <code>FilteredRowSet</code> object is tasked with enforcing the set filter for both
+ * inbound and outbound read and write operations. That is, all filters can be
+ * considered as bi-directional. No standard filters are defined;
+ * however, sufficient mechanics are specified to permit any required filter to be
+ * implemented.
+ *
+ * <li><a href="JoinRowSet.html"><b><code>JoinRowSet</code></b></a> - The <code>JoinRowSet</code>
+ * interface  describes a mechanism by which relationships can be established between
+ * two or more standard <code>RowSet</code> implementations. Any number of <code>RowSet</code>
+ * objects can be added to a <code>JoinRowSet</code> object provided  the <code>RowSet</code>objects
+ * can be related  in a SQL <code>JOIN</code> like fashion. By definition, the SQL <code>JOIN</code>
+ * statement  is used to combine the data contained in two (<i>or more</i>) relational
+ * database tables based upon a common attribute. By establishing and then enforcing
+ * column matches, a <code>JoinRowSet</code> object establishes relationships between
+ * <code>RowSet</code> instances without the need to touch the originating data source.
+ * </ul>
+ *
+ * <h3><a id="impl">3.0 Implementer's Guide</a></h3>
+ * Compliant implementations of JDBC <code>RowSet</code> Implementations
+ * <b>must</b> follow the assertions described in this specification. In accordance
+ * with the terms of the <a href="http://www.jcp.org">Java Community Process</a>, a
+ * Test Compatibility Kit (TCK) can be licensed to ensure compatibility with the
+ * specification. The following paragraphs outline a number of starting points for
+ * implementers of the standard JDBC <code>RowSet</code> definitions. Implementers
+ * should also consult the <i>Implementer's Guide</i> in the <a
+ * href="spi/package-summary.html">javax.sql.rowset.spi</a> package for guidelines
+ * on <a href="spi/SyncProvider.html"><code>SyncProvider</code></a> implementations.
+ *
+ * <ul>
+ * <li><b>3.1 Constructor</b>
+ * <p>
+ *   All <code>RowSet</code> implementations <strong>must</strong> provide a
+ * no-argument constructor.
+ * </li>
+ * <li><b>3.2 Role of the <code>BaseRowSet</code> Class</b>
+ * <p>
+ * A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more
+ * standard interfaces specified in this package and <b>may</b> extend the
+ * <a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a
+ * <code>CachedRowSet</code> implementation must implement the <code>CachedRowSet</code>
+ * interface and extend the <code>BaseRowSet</code> abstract class. The
+ * <code>BaseRowSet</code> class provides the standard architecture on which all
+ * <code>RowSet</code> implementations should be built, regardless of whether the
+ * <code>RowSet</code> objects exist in a connected or disconnected environment.
+ * The <code>BaseRowSet</code> abstract class provides any <code>RowSet</code> implementation
+ * with its base functionality, including property manipulation and event notification
+ * that is fully compliant with <a href="http://java.sun.com/products/javabeans">JavaBeans</a>
+ * component requirements. As an example, all implementations provided in the
+ * reference implementations (contained in the <code>com.sun.rowset</code> package) use
+ * the <code>BaseRowSet</code> class as a basis for their implementations.
+ * <P>
+ * The following table illustrates the features that the <code>BaseRowSet</code>
+ * abstract class provides.
+ * <blockquote>
+ *   <table class="striped" style="vertical-align:top; width:75%">
+ *     <caption>Features in <code>BaseRowSet</code></caption>
+ *         <thead>
+ *           <tr>
+ *             <th scope="col">Feature</th>
+ *             <th scope="col">Details</th>
+ *           </tr>
+ *         </thead>
+ *         <tbody>
+ *           <tr>
+ *             <th scope="row">Properties</th>
+ *             <td>Provides standard JavaBeans property manipulation
+ * mechanisms to allow applications to get and set <code>RowSet</code> command and
+ * property  values. Refer to the   documentation of the <code>javax.sql.RowSet</code>
+ * interface  (available in the JDBC 3.0 specification) for more details on
+ * the standard  <code>RowSet</code> properties.</td>
+ *           </tr>
+ *           <tr>
+ *             <th scope="row">Event notification</th>
+ *             <td>Provides standard JavaBeans event notifications
+ * to registered event listeners. Refer to the documentation of <code>javax.sql.RowSetEvent</code>
+ * interface (available in the JDBC 3.0 specification) for
+ * more details on how  to register and handle standard RowSet events generated
+ * by  compliant implementations.</td>
+ *           </tr>
+ *           <tr>
+ *             <th scope="row">Setters for a RowSet object's command</th>
+ *             <td>Provides a complete set of setter methods
+ *                for setting RowSet command parameters.</td>
+ *           </tr>
+ *           <tr>
+ *             <th scope="row">Streams</th>
+ *             <td>Provides fields for storing of stream instances
+ * in addition to providing a set of constants for stream type designation.</td>
+ *           </tr>
+ *     </tbody>
+ *   </table>
+ *   </blockquote>
+ *
+ * <li><b>3.3 Connected RowSet Requirements</b>
+ * <p>
+ * The <code>JdbcRowSet</code> describes a <code>RowSet</code> object that <b>must</b> always
+ * be connected to the originating data source. Implementations of the <code>JdbcRowSet</code>
+ * should ensure that this connection is provided solely by a JDBC driver.
+ * Furthermore, <code>RowSet</code> objects that are implementations of the
+ * <code>JdbcRowSet</code> interface and are therefore operating in a connected environment
+ * do not use the <code>SyncFactory</code> to obtain a <code>RowSetReader</code> object
+ * or a <code>RowSetWriter</code> object. They can safely rely on the JDBC driver to
+ * supply their needs by virtue of the presence of an underlying updatable and scrollable
+ * <code>ResultSet</code> implementation.
+ *
+ * <li>
+ * <b>3.4 Disconnected RowSet Requirements</b>
+ * <p>
+ * A disconnected <code>RowSet</code> object, such as a <code>CachedRowSet</code> object,
+ * <b>should</b> delegate
+ * connection management to a <code>SyncProvider</code> object provided by the
+ * <code>SyncFactory</code>. To ensure fully disconnected semantics, all
+ * disconnected <code>RowSet</code> objects <b>must</b> ensure
+ * that the original connection made to the data source to populate the <code>RowSet</code>
+ * object is closed to permit the garbage collector to recover and release resources. The
+ * <code>SyncProvider</code> object ensures that the critical JDBC properties are
+ * maintained in order to re-establish a connection to the data source when a
+ * synchronization is required. A disconnected <code>RowSet</code> object should
+ * therefore ensure that no
+ * extraneous references remain on the <code>Connection</code> object.
+ *
+ * <li><b>3.5 Role of RowSetMetaDataImpl</b>
+ * <p>
+ * The <code>RowsetMetaDataImpl</code> class is a utility class that provides an implementation of the
+ * <a href="{@docRoot}/java.sql/javax/sql/RowSetMetaData.html">RowSetMetaData</a> interface, supplying standard setter
+ * method implementations for metadata for both connected and disconnected
+ * <code>RowSet</code> objects. All implementations are free to use this standard
+ * implementation but are not required to do so.
+ *
+ * <li><b>3.6 RowSetWarning Class</b>
+ * <p>
+ * The <code>RowSetWarning</code> class provides warnings that can be set
+ * on <code>RowSet</code> implementations.
+ * Similar to <a href="{@docRoot}/java.sql/java/sql/SQLWarning.html">SQLWarning</a> objects,
+ * <code>RowSetWarning</code>  objects are silently chained to the object whose method
+ * caused the warning to be thrown. All <code>RowSet</code> implementations <b>should</b>
+ * ensure that this chaining occurs if a warning is generated and also ensure that the
+ * warnings are available via the <code>getRowSetWarnings</code> method defined in either
+ * the <code>JdbcRowSet</code> interface or the <code>CachedRowSet</code> interface.
+ * After a warning has been retrieved with one of the
+ * <code>getRowSetWarnings</code> methods, the <code>RowSetWarning</code> method
+ * <code>getNextWarning</code> can be called on it to retrieve any warnings that might
+ * be chained on it.  If a warning is returned, <code>getNextWarning</code> can be called
+ * on it, and so on until there are no more warnings.
+ *
+ * <li><b>3.7 The Joinable Interface</b>
+ * <P>
+ * The <code>Joinable</code> interface provides both connected and disconnected
+ * <code>RowSet</code> objects with the capability to be added to a
+ * <code>JoinRowSet</code> object in an SQL <code>JOIN</code> operation.
+ * A <code>RowSet</code> object that has  implemented the <code>Joinable</code>
+ * interface can set a match column, retrieve a match column, or unset a match column.
+ * A <code>JoinRowSet</code> object can then use the <code>RowSet</code> object's
+ * match column as a basis for adding the <code>RowSet</code> object.
+ * </li>
+ *
+ * <li><b>3.8 The RowSetFactory Interface</b>
+ *   <p>
+ *       A <code>RowSetFactory</code> implementation <strong>must</strong>
+ *       be provided.
+ * </li>
+ * </ul>
+ *
+ * <h3><a id="relspec">4.0 Related Specifications</a></h3>
+ * <ul>
+ * <li><a href="https://jcp.org/en/jsr/detail?id=221">JDBC 4.3 Specification</a>
+ * <li><a href="http://www.w3.org/XML/Schema">XML Schema</a>
+ * </ul>
+ *
+ * <h3><a id="reldocs">5.0 Related Documentation</a></h3>
+ * <ul>
+ * <li><a href="http://docs.oracle.com/javase/tutorial/jdbc/basics/rowset.html">
+ * JDBC RowSet Tutorial</a>
+ *</ul>
+ */
+package javax.sql.rowset;
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html b/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
deleted file mode 100644
index 12ee65c9b8e..00000000000
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-<!--
-Copyright (c) 2003, 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
-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.
-
--->
-  <title>javax.sql.rowset Package</title>
-</head>
-  <body>
-
-<!-- Description clause -->
-Standard interfaces and base classes for JDBC <code>RowSet</code>
-implementations. This package contains interfaces and classes 
-that a standard <code>RowSet</code> implementation either implements or extends.
-
-
-<h2>Table of Contents</h2>
-<ul>
-<li><a href="#pkgspec">1.0 Package Specification</a>
-<li><a href="#stdrowset">2.0 Standard RowSet Definitions</a>
-<li><a href="#impl">3.0 Implementer's Guide</a>
-<li><a href="#relspec">4.0 Related Specifications</a>
-<li><a href="#reldocs">5.0 Related Documentation</a>
-</ul>
-
-<h3><a id="pkgspec">1.0 Package Specification</a></h3>
-This package specifies five standard JDBC <code>RowSet</code> interfaces.
- All five extend the 
-<a href="../RowSet.html">RowSet</a> interface described in the JDBC 3.0
-specification.  It is anticipated that additional definitions
-of more specialized JDBC <code>RowSet</code> types will emerge as this technology
-matures. Future definitions <i>should</i> be specified as subinterfaces using
-inheritance similar to the way it is used in this specification.
-<p>
-<i>Note:</i> The interface definitions provided in this package form the basis for
-all compliant JDBC <code>RowSet</code> implementations. Vendors and more advanced
-developers who intend to provide their own compliant <code>RowSet</code> implementations
-should pay particular attention to the assertions detailed in specification
-interfaces. 
-
-<h3><a id="stdrowset">2.0 Standard RowSet Definitions</a></h3>
-<ul>
-<li><a href="JdbcRowSet.html"><b><code>JdbcRowSet</code></b></a> - A wrapper around
-a <code>ResultSet</code> object that makes it possible to use the result set as a
-JavaBeans&trade; component. Thus,
-a <code>JdbcRowSet</code> object can be a Bean that any tool
-makes available for assembling an application as part of a component based
-architecture. A <code>JdbcRowSet</code> object is a connected <code>RowSet</code>
-object, that is, it 
-<b>must</b> continually maintain its connection to its data source using a JDBC
-technology-enabled driver ("JDBC driver"). In addition, a <code>JdbcRowSet</code>
-object provides a fully updatable and scrollable tabular
-data structure as defined in the JDBC 3.0 specification.
-
-<li><a href="CachedRowSet.html">
-<b><code>CachedRowSet</code>&trade;</b></a>
- - A <code>CachedRowSet</code> object is a JavaBeans&trade;
- component that is scrollable, updatable, serializable, and generally disconnected from
- the source of its data. A <code>CachedRowSet</code> object
-typically contains rows from a result set, but it can also contain rows from any
-file with a tabular format, such as a spreadsheet. <code>CachedRowSet</code> implementations
-<b>must</b> use the <code>SyncFactory</code> to manage and obtain pluggable
-<code>SyncProvider</code> objects to provide synchronization between the
-disconnected <code>RowSet</code> object and the originating data source.
-Typically a <code>SyncProvider</code> implementation relies upon a JDBC
-driver to obtain connectivity to a particular data source.
-Further details on this mechanism are discussed in the <a
-href="spi/package-summary.html"><code>javax.sql.rowset.spi</code></a> package
-specification.
-
-<li><a href="WebRowSet.html"><b><code>WebRowSet</code></b></a> - A 
-<code>WebRowSet</code> object is an extension of <code>CachedRowSet</code>
-that can read and write a <code>RowSet</code> object in a well formed XML format.
-This class calls an <a href="spi/XmlReader.html"><code>XmlReader</code></a> object
-(an extension of the <a href="../RowSetReader.html"><code>RowSetReader</code></a>
-interface) to read a rowset in XML format. It calls an 
-<a href="spi/XmlWriter.html"><code>XmlWriter</code></a> object (an extension of the
-<a href="../RowSetWriter.html"><code>RowSetWriter</code></a> interface)
-to write a rowset in XML format. The reader and writer required by
-<code>WebRowSet</code> objects are provided by the
-<code>SyncFactory</code> in the form of <code>SyncProvider</code>
-implementations. In order to ensure well formed XML usage, a standard generic XML
-Schema is defined and published at
-<a href="http://java.sun.com/xml/ns/jdbc/webrowset.xsd">
-<code>http://java.sun.com/xml/ns/jdbc/webrowset.xsd</code></a>.
-
-<li><a href="FilteredRowSet.html"><b><code>FilteredRowSet</code></b></a> - A
-<code>FilteredRowSet</code> object provides filtering functionality in a programmatic
-and extensible way. There are many instances when a <code>RowSet</code> <code>object</code>
-has a need to provide filtering in its contents without sacrificing the disconnected
-environment, thus saving the expense of having to create a connection to the data source.
-Solutions to this need vary from providing heavyweight full scale 
-SQL query abilities, to portable components, to more lightweight 
-approaches. A <code>FilteredRowSet</code> object consumes
-an implementation of the <a href="Predicate.html"><code>Predicate</code></a>
-interface, which <b>may</b> define a filter at run time. In turn, a
-<code>FilteredRowSet</code> object is tasked with enforcing the set filter for both
-inbound and outbound read and write operations. That is, all filters can be
-considered as bi-directional. No standard filters are defined;
-however, sufficient mechanics are specified to permit any required filter to be
-implemented.
-
-<li><a href="JoinRowSet.html"><b><code>JoinRowSet</code></b></a> - The <code>JoinRowSet</code>
-interface  describes a mechanism by which relationships can be established between
-two or more standard <code>RowSet</code> implementations. Any number of <code>RowSet</code>
- objects can be added to a <code>JoinRowSet</code> object provided  the <code>RowSet</code>objects
-can be related  in a SQL <code>JOIN</code> like fashion. By definition, the SQL <code>JOIN</code>
-statement  is used to combine the data contained in two (<i>or more</i>) relational
-database tables based upon a common attribute. By establishing and then enforcing
-column matches, a <code>JoinRowSet</code> object establishes relationships between
-<code>RowSet</code> instances without the need to touch the originating data source.
-</ul>
-
-<h3><a id="impl">3.0 Implementer's Guide</a></h3>
-Compliant implementations of JDBC <code>RowSet</code> Implementations
-<b>must</b> follow the assertions described in this specification. In accordance
-with the terms of the <a href="http://www.jcp.org">Java Community Process</a>, a
-Test Compatibility Kit (TCK) can be licensed to ensure compatibility with the
-specification. The following paragraphs outline a number of starting points for
-implementers of the standard JDBC <code>RowSet</code> definitions. Implementers
-should also consult the <i>Implementer's Guide</i> in the <a
-href="spi/package-summary.html">javax.sql.rowset.spi</a> package for guidelines
-on <a href="spi/SyncProvider.html"><code>SyncProvider</code></a> implementations.
-
-<ul>
-<li><b>3.1 Constructor</b>
-<p>
-    All <code>RowSet</code> implementations <strong>must</strong> provide a
-no-argument constructor.
-</li>
-<li><b>3.2 Role of the <code>BaseRowSet</code> Class</b>
-<p>
-A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more
-standard interfaces specified in this package and <b>may</b> extend the
-<a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a
-<code>CachedRowSet</code> implementation must implement the <code>CachedRowSet</code>
-interface and extend the <code>BaseRowSet</code> abstract class. The
-<code>BaseRowSet</code> class provides the standard architecture on which all
-<code>RowSet</code> implementations should be built, regardless of whether the
-<code>RowSet</code> objects exist in a connected or disconnected environment.
-The <code>BaseRowSet</code> abstract class provides any <code>RowSet</code> implementation
-with its base functionality, including property manipulation and event notification
-that is fully compliant with <a href="http://java.sun.com/products/javabeans">JavaBeans</a>
-component requirements. As an example, all implementations provided in the
-reference implementations (contained in the <code>com.sun.rowset</code> package) use
-the <code>BaseRowSet</code> class as a basis for their implementations.
-<P>
-The following table illustrates the features that the <code>BaseRowSet</code>
-abstract class provides.
-  <blockquote>
-    <table class="striped" style="vertical-align:top; width:75%">
-	<caption>Features in <code>BaseRowSet</code></caption>
-          <thead>
-            <tr>
-              <th scope="col">Feature</th>
-              <th scope="col">Details</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <th scope="row">Properties</th>
-              <td>Provides standard JavaBeans property manipulation
-mechanisms to allow applications to get and set <code>RowSet</code> command and
-property  values. Refer to the   documentation of the <code>javax.sql.RowSet</code>
-interface  (available in the JDBC 3.0 specification) for more details on
-the standard  <code>RowSet</code> properties.</td>
-            </tr>
-            <tr>
-              <th scope="row">Event notification</th>
-              <td>Provides standard JavaBeans event notifications
-to registered event listeners. Refer to the documentation of <code>javax.sql.RowSetEvent</code>
-interface (available in the JDBC 3.0 specification) for
-more details on how  to register and handle standard RowSet events generated
-by  compliant implementations.</td>
-            </tr>
-            <tr>
-              <th scope="row">Setters for a RowSet object's command</th>
-              <td>Provides a complete set of setter methods
-                 for setting RowSet command parameters.</td>
-            </tr>
-            <tr>
-              <th scope="row">Streams</th>
-              <td>Provides fields for storing of stream instances
-  in addition to providing a set of constants for stream type designation.</td>
-            </tr>
-      </tbody>
-    </table>
-    </blockquote>
-
-<li><b>3.3 Connected RowSet Requirements</b>
-<p>
-The <code>JdbcRowSet</code> describes a <code>RowSet</code> object that <b>must</b> always
-be connected to the originating data source. Implementations of the <code>JdbcRowSet</code>
-should ensure that this connection is provided solely by a JDBC driver.
-Furthermore, <code>RowSet</code> objects that are implementations of the
-<code>JdbcRowSet</code> interface and are therefore operating in a connected environment
-do not use the <code>SyncFactory</code> to obtain a <code>RowSetReader</code> object
-or a <code>RowSetWriter</code> object. They can safely rely on the JDBC driver to
-supply their needs by virtue of the presence of an underlying updatable and scrollable
-<code>ResultSet</code> implementation.
-
-<li>
-<b>3.4 Disconnected RowSet Requirements</b>
-<p> 
-A disconnected <code>RowSet</code> object, such as a <code>CachedRowSet</code> object,
-<b>should</b> delegate  
-connection management to a <code>SyncProvider</code> object provided by the
-<code>SyncFactory</code>. To ensure fully disconnected semantics, all
-disconnected <code>RowSet</code> objects <b>must</b> ensure
-that the original connection made to the data source to populate the <code>RowSet</code>
-object is closed to permit the garbage collector to recover and release resources. The
-<code>SyncProvider</code> object ensures that the critical JDBC properties are
-maintained in order to re-establish a connection to the data source when a
-synchronization is required. A disconnected <code>RowSet</code> object should
-therefore ensure that no
-extraneous references remain on the <code>Connection</code> object.
-
-<li><b>3.5 Role of RowSetMetaDataImpl</b>
-<p>
-The <code>RowsetMetaDataImpl</code> class is a utility class that provides an implementation of the
-<a href="../RowSetMetaData.html">RowSetMetaData</a> interface, supplying standard setter
-method implementations for metadata for both connected and disconnected
-<code>RowSet</code> objects. All implementations are free to use this standard
-implementation but are not required to do so.
-
-<li><b>3.6 RowSetWarning Class</b>
-<p>
-The <code>RowSetWarning</code> class provides warnings that can be set
-on <code>RowSet</code> implementations.
-Similar to <a href="../../../java/sql/SQLWarning.html">SQLWarning</a> objects,
-<code>RowSetWarning</code>  objects are silently chained to the object whose method
-caused the warning to be thrown. All <code>RowSet</code> implementations <b>should</b>
-ensure that this chaining occurs if a warning is generated and also ensure that the
-warnings are available via the <code>getRowSetWarnings</code> method defined in either
-the <code>JdbcRowSet</code> interface or the <code>CachedRowSet</code> interface.
-After a warning has been retrieved with one of the
-<code>getRowSetWarnings</code> methods, the <code>RowSetWarning</code> method
-<code>getNextWarning</code> can be called on it to retrieve any warnings that might
-be chained on it.  If a warning is returned, <code>getNextWarning</code> can be called
-on it, and so on until there are no more warnings.
-
-<li><b>3.7 The Joinable Interface</b>
-<P>
-The <code>Joinable</code> interface provides both connected and disconnected
-<code>RowSet</code> objects with the capability to be added to a
-<code>JoinRowSet</code> object in an SQL <code>JOIN</code> operation.
-A <code>RowSet</code> object that has  implemented the <code>Joinable</code>
-interface can set a match column, retrieve a match column, or unset a match column.
-A <code>JoinRowSet</code> object can then use the <code>RowSet</code> object's
-match column as a basis for adding the <code>RowSet</code> object.
-</li>
-
-<li><b>3.8 The RowSetFactory Interface</b>
-    <p>
-        A <code>RowSetFactory</code> implementation <strong>must</strong>
-        be provided.
-</li>
-</ul>
-
-<h3><a id="relspec">4.0 Related Specifications</a></h3>
-<ul>
-<li><a href="https://jcp.org/en/jsr/detail?id=221">JDBC 4.3 Specification</a>
-<li><a href="http://www.w3.org/XML/Schema">XML Schema</a>
-</ul>
-
-<h3><a id="reldocs">5.0 Related Documentation</a></h3>
-<ul>
-<li><a href="http://docs.oracle.com/javase/tutorial/jdbc/basics/rowset.html">
-JDBC RowSet Tutorial</a>
-</ul>
-</body>
-</html>
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package-info.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package-info.java
new file mode 100644
index 00000000000..713b4a1a9a7
--- /dev/null
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package-info.java
@@ -0,0 +1,480 @@
+/*
+ * 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
+ * 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.
+ */
+
+/**
+ * The standard classes and interfaces that a third party vendor has to
+ * use in its implementation of a synchronization provider. These classes and
+ * interfaces are referred to as the Service Provider Interface (SPI).  To make it possible
+ * for a <code>RowSet</code> object to use an implementation, the vendor must register
+ * it with the <code>SyncFactory</code> singleton. (See the class comment for
+ * <code>SyncProvider</code> for a full explanation of the registration process and
+ * the naming convention to be used.)
+ *
+ * <h2>Table of Contents</h2>
+ * <ul>
+ * <li><a href="#pkgspec">1.0 Package Specification</a>
+ * <li><a href="#arch">2.0 Service Provider Architecture</a>
+ * <li><a href="#impl">3.0 Implementer's Guide</a>
+ * <li><a href="#resolving">4.0 Resolving Synchronization Conflicts</a>
+ * <li><a href="#relspec">5.0 Related Specifications</a>
+ * <li><a href="#reldocs">6.0 Related Documentation</a>
+ * </ul>
+ *
+ * <h3><a id="pkgspec">1.0 Package Specification</a></h3>
+ * <P>
+ * The following classes and interfaces make up the <code>javax.sql.rowset.spi</code>
+ * package:
+ * <UL>
+ *  <LI><code>SyncFactory</code>
+ *  <LI><code>SyncProvider</code>
+ *  <LI><code>SyncFactoryException</code>
+ *  <LI><code>SyncProviderException</code>
+ *  <LI><code>SyncResolver</code>
+ *  <LI><code>XmlReader</code>
+ *  <LI><code>XmlWriter</code>
+ *  <LI><code>TransactionalWriter</code>
+ * </UL>
+ * The following interfaces, in the <code>javax.sql</code> package, are also part of the SPI:
+ * <UL>
+ *  <LI><code>RowSetReader</code>
+ *  <LI><code>RowSetWriter</code>
+ * </UL>
+ * <P>
+ * A <code>SyncProvider</code> implementation provides a disconnected <code>RowSet</code>
+ * object with the mechanisms for reading data into it and for writing data that has been
+ * modified in it
+ * back to the underlying data source.  A <i>reader</i>, a <code>RowSetReader</code> or
+ * <code>XMLReader</code> object, reads data into a <code>RowSet</code> object when the
+ * <code>CachedRowSet</code> methods <code>execute</code> or <code>populate</code>
+ * are called.  A <i>writer</i>, a <code>RowSetWriter</code> or <code>XMLWriter</code>
+ * object, writes changes back to the underlying data source when the
+ * <code>CachedRowSet</code> method <code>acceptChanges</code> is called.
+ * <P>
+ * The process of writing changes in a <code>RowSet</code> object to its data source
+ * is known as <i>synchronization</i>.  The <code>SyncProvider</code> implementation that a
+ * <code>RowSet</code> object is using determines the level of synchronization that the
+ * <code>RowSet</code> object's writer uses. The various levels of synchronization are
+ * referred to as <i>grades</i>.
+ * <P>
+ * The lower grades of synchronization are
+ * known as <i>optimistic</i> concurrency levels because they optimistically
+ * assume that there will be no conflicts or very few conflicts.  A conflict exists when
+ * the same data modified in the <code>RowSet</code> object has also been modified
+ * in the data source. Using the optimistic concurrency model means that if there
+ * is a conflict, modifications to either the data source or the <code>RowSet</code>
+ * object will be lost.
+ * <P>
+ * Higher grades of synchronization are called <i>pessimistic</i> because they assume
+ * that others will be accessing the data source and making modifications.  These
+ * grades set varying levels of locks to increase the chances that no conflicts
+ * occur.
+ * <P>
+ * The lowest level of synchronization is simply writing any changes made to the
+ * <code>RowSet</code> object to its underlying data source.  The writer does
+ * nothing to check for conflicts.
+ * If there is a conflict and the data
+ * source values are overwritten, the changes other parties have made by to the data
+ * source are lost.
+ * <P>
+ * The <code>RIXMLProvider</code> implementation uses the lowest level
+ * of synchronization and just writes <code>RowSet</code> changes to the data source.
+ *
+ * <P>
+ * For the next level up, the
+ * writer checks to see if there are any conflicts, and if there are,
+ * it does not write anything to the data source.  The problem with this concurrency
+ * level is that if another party has modified the corresponding data in the data source
+ * since the <code>RowSet</code> object got its data,
+ * the changes made to the <code>RowSet</code> object are lost. The
+ * <code>RIOptimisticProvider</code> implementation uses this level of synchronization.
+ * <P>
+ * At higher levels of synchronization, referred to as pessimistic concurrency,
+ * the writer take steps to avoid conflicts by setting locks. Setting locks
+ * can vary from setting a lock on a single row to setting a lock on a table
+ * or the entire data source. The level of synchronization is therefore a tradeoff
+ * between the ability of users to access the data source concurrently and the  ability
+ * of the writer to keep the data in the <code>RowSet</code> object and its data source
+ * synchronized.
+ * <P>
+ * It is a requirement that all disconnected <code>RowSet</code> objects
+ * (<code>CachedRowSet</code>, <code>FilteredRowSet</code>, <code>JoinRowSet</code>,
+ * and <code>WebRowSet</code> objects) obtain their <code>SyncProvider</code> objects
+ * from the <code>SyncFactory</code> mechanism.
+ * <P>
+ * The reference implementation (RI) provides two synchronization providers.
+ *    <UL>
+ *       <LI><b><code>RIOptimisticProvider</code></b> <br>
+ *            The default provider that the <code>SyncFactory</code> instance will
+ *            supply to a disconnected <code>RowSet</code> object when no provider
+ *            implementation is specified.<BR>
+ *            This synchronization provider uses an optimistic concurrency model,
+ *            assuming that there will be few conflicts among users
+ *            who are accessing the same data in a database.  It avoids
+ *            using locks; rather, it checks to see if there is a conflict
+ *            before trying to synchronize the <code>RowSet</code> object and the
+ *            data source. If there is a conflict, it does nothing, meaning that
+ *            changes to the <code>RowSet</code> object are not persisted to the data
+ *            source.
+ *        <LI><B><code>RIXMLProvider</code></B> <BR>
+ *             A synchronization provider that can be used with a
+ *             <code>WebRowSet</code> object, which is a rowset that can be written
+ *             in XML format or read from XML format. The
+ *             <code>RIXMLProvider</code> implementation does no checking at all for
+ *             conflicts and simply writes any updated data in the
+ *             <code>WebRowSet</code> object to the underlying data source.
+ *             <code>WebRowSet</code> objects use this provider when they are
+ *             dealing with XML data.
+ *     </UL>
+ *
+ *  These <code>SyncProvider</code> implementations
+ *  are bundled with the reference implementation, which makes them always available to
+ *  <code>RowSet</code> implementations.
+ *  <code>SyncProvider</code> implementations make themselves available by being
+ *  registered with the <code>SyncFactory</code> singleton.  When a <code>RowSet</code>
+ *  object requests a provider, by specifying it in the constructor or as an argument to the
+ *  <code>CachedRowSet</code> method <code>setSyncProvider</code>,
+ *  the <code>SyncFactory</code> singleton
+ *  checks to see if the requested provider has been registered with it.
+ *  If it has, the <code>SyncFactory</code> creates an instance of it and passes it to the
+ *  requesting <code>RowSet</code> object.
+ *  If the <code>SyncProvider</code> implementation that is specified has not been registered,
+ *  the <code>SyncFactory</code> singleton causes a <code>SyncFactoryException</code> object
+ *  to be thrown.  If no provider is specified,
+ *  the <code>SyncFactory</code> singleton will create an instance of the default
+ *  provider implementation, <code>RIOptimisticProvider</code>,
+ *  and pass it to the requesting <code>RowSet</code> object.
+ *
+ * <P>
+ * If a <code>WebRowSet</code> object does not specify a provider in its constructor, the
+ * <code>SyncFactory</code> will give it an instance of <code>RIOptimisticProvider</code>.
+ * However, the constructor for <code>WebRowSet</code> is implemented to set the provider
+ * to the <code>RIXMLProvider</code>, which reads and writes a <code>RowSet</code> object
+ *  in XML format.
+ *  <P>
+ * See the <a href="SyncProvider.html">SyncProvider</a> class
+ *  specification for further details.
+ * <p>
+ * Vendors may develop a <code>SyncProvider</code> implementation with any one of the possible
+ * levels of synchronization, thus giving <code>RowSet</code> objects a choice of
+ * synchronization mechanisms.
+ *
+ * <h3><a id="arch">2.0 Service Provider Interface Architecture</a></h3>
+ * <b>2.1 Overview</b>
+ * <p>
+ * The Service Provider Interface provides a pluggable mechanism by which
+ * <code>SyncProvider</code> implementations can be registered and then generated when
+ * required. The lazy reference mechanism employed by the <code>SyncFactory</code> limits
+ * unnecessary resource consumption by not creating an instance until it is
+ * required by a disconnected
+ * <code>RowSet</code> object. The <code>SyncFactory</code> class also provides
+ * a standard API to configure logging options and streams that <b>may</b> be provided
+ * by a particular <code>SyncProvider</code> implementation.
+ * <p>
+ * <b>2.2 Registering with the <code>SyncFactory</code></b>
+ * <p>
+ * A third party <code>SyncProvider</code> implementation must be registered with the
+ * <code>SyncFactory</code> in order for a disconnected <code>RowSet</code> object
+ * to obtain it and thereby use its <code>javax.sql.RowSetReader</code> and
+ * <code>javax.sql.RowSetWriter</code>
+ * implementations. The following registration mechanisms are available to all
+ * <code>SyncProvider</code> implementations:
+ * <ul>
+ * <li><b>System properties</b> - Properties set at the command line. These
+ * properties are set at run time and apply system-wide per invocation of the Java
+ * application. See the section <a href="#reldocs">"Related Documentation"</a>
+ * further related information.
+ *
+ * <li><b>Property Files</b> - Properties specified in a standard property file.
+ * This can be specified using a System Property or by modifying a standard
+ * property file located in the platform run-time. The
+ * reference implementation of this technology includes a standard property
+ * file than can be edited to add additional <code>SyncProvider</code> objects.
+ *
+ * <li><b>JNDI Context</b> - Available providers can be registered on a JNDI
+ * context. The <code>SyncFactory</code> will attempt to load <code>SyncProvider</code>
+ * objects bound to the context and register them with the factory. This
+ * context must be supplied to the <code>SyncFactory</code> for the mechanism to
+ * function correctly.
+ * </ul>
+ * <p>
+ * Details on how to specify the system properties or properties in a property file
+ * and how to configure the JNDI Context are explained in detail in the
+ * <a href="SyncFactory.html"><code>SyncFactory</code></a> class description.
+ * <p>
+ * <b>2.3 SyncFactory Provider Instance Generation Policies</b>
+ * <p>
+ * The <code>SyncFactory</code> generates a requested <code>SyncProvider</code>
+ * object if the provider has been correctly registered.  The
+ * following policies are adhered to when either a disconnected <code>RowSet</code> object
+ * is instantiated with a specified <code>SyncProvider</code> implementation or is
+ * reconfigured at runtime with an alternative <code>SyncProvider</code> object.
+ * <ul>
+ * <li> If a <code>SyncProvider</code> object is specified and the <code>SyncFactory</code>
+ * contains <i>no</i> reference to the provider, a <code>SyncFactoryException</code> is
+ * thrown.
+ *
+ * <li> If a <code>SyncProvider</code> object is specified and the <code>SyncFactory</code>
+ * contains a reference to the provider, the requested provider is supplied.
+ *
+ * <li> If no <code>SyncProvider</code> object is specified, the reference
+ * implementation provider <code>RIOptimisticProvider</code> is supplied.
+ * </ul>
+ * <p>
+ * These policies are explored in more detail in the <a href="SyncFactory.html">
+ * <code>SyncFactory</code></a> class.
+ *
+ * <h3><a id="impl">3.0 SyncProvider Implementer's Guide</a></h3>
+ *
+ * <b>3.1 Requirements</b>
+ * <p>
+ * A compliant <code>SyncProvider</code> implementation that is fully pluggable
+ * into the <code>SyncFactory</code> <b>must</b> extend and implement all
+ * abstract methods in the <a href="SyncProvider.html"><code>SyncProvider</code></a>
+ * class. In addition, an implementation <b>must</b> determine the
+ * grade, locking and updatable view capabilities defined in the
+ * <code>SyncProvider</code> class definition. One or more of the
+ * <code>SyncProvider</code> description criteria <b>must</b> be supported. It
+ * is expected that vendor implementations will offer a range of grade, locking, and
+ * updatable view capabilities.
+ * <p>
+ * Furthermore, the <code>SyncProvider</code> naming convention <b>must</b> be followed as
+ * detailed in the <a href="SyncProvider.html"><code>SyncProvider</code></a> class
+ * description.
+ * <p>
+ * <b>3.2 Grades</b>
+ * <p>
+ * JSR 114 defines a set of grades to describe the quality of synchronization
+ * a <code>SyncProvider</code> object can offer a disconnected <code>RowSet</code>
+ * object. These grades are listed from the lowest quality of service to the highest.
+ * <ul>
+ * <li><b>GRADE_NONE</b> - No synchronization with the originating data source is
+ * provided. A <code>SyncProvider</code> implementation returning this grade will simply
+ * attempt to write any data that has changed in the <code>RowSet</code> object to the
+ *underlying data source, overwriting whatever is there. No attempt is made to compare
+ * original values with current values to see if there is a conflict. The
+ * <code>RIXMLProvider</code> is implemented with this grade.
+ *
+ * <li><b>GRADE_CHECK_MODIFIED_AT_COMMIT</b> - A low grade of optimistic synchronization.
+ * A <code>SyncProvider</code> implementation returning this grade
+ * will check for conflicts in rows that have changed between the last synchronization
+ * and the current synchronization under way. Any changes in the originating data source
+ * that have been modified will not be reflected in the disconnected <code>RowSet</code>
+ * object. If there are no conflicts, changes in the <code>RowSet</code> object will be
+ * written to the data source. If there are conflicts, no changes are written.
+ * The <code>RIOptimisticProvider</code> implementation uses this grade.
+ *
+ * <li><b>GRADE_CHECK_ALL_AT_COMMIT</b> - A high grade of optimistic synchronization.
+ * A <code>SyncProvider</code> implementation   returning this grade
+ * will check all rows, including rows that have not changed in the disconnected
+ * <code>RowSet</code> object. In this way, any changes to rows in the underlying
+ * data source will be reflected in the disconnected <code>RowSet</code> object
+ * when the synchronization finishes successfully.
+ *
+ * <li><b>GRADE_LOCK_WHEN_MODIFIED</b> - A pessimistic grade of synchronization.
+ * <code>SyncProvider</code> implementations returning this grade will lock
+ * the row in the originating  data source that corresponds to the row being changed
+ * in the <code>RowSet</code> object to reduce the possibility of other
+ * processes modifying the same data in the data source.
+ *
+ * <li><b>GRADE_LOCK_WHEN_LOADED</b> - A higher pessimistic synchronization grade.
+ * A <code>SyncProvider</code> implementation returning this grade will lock
+ * the entire view and/or  table affected by the original query used to
+ * populate a <code>RowSet</code> object.
+ * </ul>
+ * <p>
+ * <b>3.3 Locks</b>
+ * <p>
+ * JSR 114 defines a set of constants that specify whether any locks have been
+ * placed on a <code>RowSet</code> object's underlying data source and, if so,
+ * on which constructs the locks are placed.  These locks will remain on the data
+ * source while the <code>RowSet</code> object is disconnected from the data source.
+ * <P>
+ * These constants <b>should</b> be considered complementary to the
+ * grade constants. The default setting for the majority of grade settings requires
+ * that no data source locks remain when a <code>RowSet</code> object is disconnected
+ * from its data source.
+ * The grades <code>GRADE_LOCK_WHEN_MODIFIED</code> and
+ * <code>GRADE_LOCK_WHEN_LOADED</code> allow a disconnected <code>RowSet</code> object
+ * to have a fine-grained control over the degree of locking.
+ * <ul>
+ * <li><b>DATASOURCE_NO_LOCK</b> - No locks remain on the originating data source.
+ * This is the default lock setting for all <code>SyncProvider</code> implementations
+ * unless otherwise directed by a <code>RowSet</code> object.
+ *
+ * <li><b>DATASOURCE_ROW_LOCK</b> - A lock is placed on the rows that are touched by
+ * the original SQL query used to populate the <code>RowSet</code> object.
+ *
+ * <li><b>DATASOURCE_TABLE_LOCK</b> - A lock is placed on all tables that are touched
+ * by the query that was used to populate the <code>RowSet</code> object.
+ *
+ * <li><b>DATASOURCE_DB_LOCK</b>
+ * A lock is placed on the entire data source that is used by the <code>RowSet</code>
+ * object.
+ * </ul>
+ * <p>
+ * <b>3.4 Updatable Views</b>
+ * <p>
+ * A <code>RowSet</code> object may be populated with data from an SQL <code>VIEW</code>.
+ * The following constants indicate whether a <code>SyncProvider</code> object can
+ * update data in the table or tables from which the <code>VIEW</code> was derived.
+ * <ul>
+ * <li><b>UPDATABLE_VIEW_SYNC</b>
+ * Indicates that a <code>SyncProvider</code> implementation  supports synchronization
+ * to the table or tables from which the SQL <code>VIEW</code> used to populate
+ * a <code>RowSet</code> object is derived.
+ *
+ * <li><b>NONUPDATABLE_VIEW_SYNC</b>
+ * Indicates that a <code>SyncProvider</code> implementation  does <b>not</b> support
+ * synchronization to the table or tables from which the SQL <code>VIEW</code>
+ * used to populate  a <code>RowSet</code> object is derived.
+ * </ul>
+ * <p>
+ * <b>3.5 Usage of <code>SyncProvider</code> Grading and Locking</b>
+ * <p>
+ * In the example below, the reference <code>CachedRowSetImpl</code> implementation
+ * reconfigures its current <code>SyncProvider</code> object by calling the
+ * <code>setSyncProvider</code> method.<br>
+ *
+ * <PRE>
+ *   CachedRowSetImpl crs = new CachedRowSetImpl();
+ *   crs.setSyncProvider("com.foo.bar.HASyncProvider");
+ * </PRE>
+ *   An application can retrieve the <code>SyncProvider</code> object currently in use
+ * by a disconnected <code>RowSet</code> object. It can also retrieve the
+ * grade of synchronization with which the provider was implemented and the degree of
+ * locking currently in use.  In addition, an application has the flexibility to set
+ * the degree of locking to be used, which can increase the possibilities for successful
+ * synchronization.  These operation are shown in the following code fragment.
+ * <PRE>
+ *   SyncProvider sync = crs.getSyncProvider();
+ *
+ *   switch (sync.getProviderGrade()) {
+ *   case: SyncProvider.GRADE_CHECK_ALL_AT_COMMIT
+ *         //A high grade of optimistic synchronization
+ *    break;
+ *    case: SyncProvider.GRADE_CHECK_MODIFIED_AT_COMMIT
+ *         //A low grade of optimistic synchronization
+ *    break;
+ *    case: SyncProvider.GRADE_LOCK_WHEN_LOADED
+ *         // A pessimistic synchronization grade
+ *    break;
+ *    case: SyncProvider.GRADE_LOCK_WHEN_MODIFIED
+ *         // A pessimistic synchronization grade
+ *    break;
+ *    case: SyncProvider.GRADE_NONE
+ *      // No synchronization with the originating data source provided
+ *    break;
+ *    }
+ *
+ *    switch (sync.getDataSourcLock() {
+ *      case: SyncProvider.DATASOURCE_DB_LOCK
+ *       // A lock is placed on the entire datasource that is used by the
+ *       // <code>RowSet</code> object
+ *       break;
+ *
+ *      case: SyncProvider.DATASOURCE_NO_LOCK
+ *       // No locks remain on the  originating data source.
+ *      break;
+ *
+ *      case: SyncProvider.DATASOURCE_ROW_LOCK
+ *       // A lock is placed on the rows that are  touched by the original
+ *       // SQL statement used to populate
+ *       // the RowSet object that is using the SyncProvider
+ *       break;
+ *
+ *      case: DATASOURCE_TABLE_LOCK
+ *       // A lock is placed on  all tables that are touched by the original
+ *       // SQL statement used to populated
+ *       // the RowSet object that is using the SyncProvider
+ *      break;
+ *
+ * </PRE>
+ *    It is also possible using the static utility method in the
+ * <code>SyncFactory</code> class to determine the list of <code>SyncProvider</code>
+ * implementations currently registered with the <code>SyncFactory</code>.
+ *
+ * <pre>
+ *       Enumeration e = SyncFactory.getRegisteredProviders();
+ * </pre>
+ *
+ *
+ * <h3><a id="resolving">4.0 Resolving Synchronization Conflicts</a></h3>
+ *
+ * The interface <code>SyncResolver</code> provides a way for an application to
+ * decide manually what to do when a conflict occurs. When the <code>CachedRowSet</code>
+ * method <code>acceptChanges</code> finishes and has detected one or more conflicts,
+ * it throws a <code>SyncProviderException</code> object.  An application can
+ * catch the exception and
+ * have it retrieve a <code>SyncResolver</code> object by calling the method
+ * <code>SyncProviderException.getSyncResolver()</code>.
+ * <P>
+ * A <code>SyncResolver</code> object, which is a special kind of
+ * <code>CachedRowSet</code> object or
+ * a <code>JdbcRowSet</code> object that has implemented the <code>SyncResolver</code>
+ * interface,  examines the conflicts row by row. It is a duplicate of the
+ * <code>RowSet</code> object being synchronized except that it contains only the data
+ * from the data source this is causing a conflict. All of the other column values are
+ * set to <code>null</code>. To navigate from one conflict value to another, a
+ * <code>SyncResolver</code> object provides the methods <code>nextConflict</code> and
+ * <code>previousConflict</code>.
+ * <P>
+ * The <code>SyncResolver</code> interface also
+ * provides methods for doing the following:
+ * <UL>
+ *  <LI>finding out whether the conflict involved an update, a delete, or an insert
+ *  <LI>getting the value in the data source that caused the conflict
+ *  <LI>setting the value that should be in the data source if it needs to be changed
+ *      or setting the value that should be in the <code>RowSet</code> object if it needs
+ *      to be changed
+ * </UL>
+ * <P>
+ * When the <code>CachedRowSet</code> method <code>acceptChanges</code> is called, it
+ * delegates to the <code>RowSet</code> object's  <code>SyncProvider</code> object.
+ * How the writer provided by that <code>SyncProvider</code> object is implemented
+ * determines what level (grade) of checking for conflicts will be done.  After all
+ * checking for conflicts is completed and one or more conflicts has been found, the method
+ * <code>acceptChanges</code> throws a <code>SyncProviderException</code> object. The
+ * application can catch the exception and use it to obtain a <code>SyncResolver</code> object.
+ * <P>
+ * The application can then use <code>SyncResolver</code> methods to get information
+ * about each conflict and decide what to do.  If the application logic or the user
+ * decides that a value in the <code>RowSet</code> object should be the one to
+ * persist, the application or user can overwrite the data source value with it.
+ * <P>
+ * The comment for the <code>SyncResolver</code> interface has more detail.
+ *
+ * <h3><a id="relspec">5.0 Related Specifications</a></h3>
+ * <ul>
+ * <li><a href="http://docs.oracle.com/javase/jndi/tutorial/index.html">JNDI</a>
+ * <li><a href="{@docRoot}/java.logging/java/util/logging/package-summary.html">Java Logging
+ * APIs</a>
+ * </ul>
+ * <h3><a id="reldocs">6.0 Related Documentation</a></h3>
+ * <ul>
+ * <li><a href="http://docs.oracle.com/javase/tutorial/jdbc/">DataSource for JDBC
+ * Connections</a>
+ * </ul>
+ */
+package javax.sql.rowset.spi;
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
deleted file mode 100644
index 786b906fec9..00000000000
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
+++ /dev/null
@@ -1,493 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-
-  <meta name="GENERATOR"
- content="Mozilla/4.79 [en] (Windows NT 5.0; U) [Netscape]">
-<!--
-Copyright (c) 2003, 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
-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.
--->
-  <title>javax.sql.rowset.spi</title>
-
-</head>
-  <body>
-
-The standard classes and interfaces that a third party vendor has to
-use in its implementation of a synchronization provider. These classes and
-interfaces are referred to as the Service Provider Interface (SPI).  To make it possible
-for a <code>RowSet</code> object to use an implementation, the vendor must register
-it with the <code>SyncFactory</code> singleton. (See the class comment for
-<code>SyncProvider</code> for a full explanation of the registration process and
-the naming convention to be used.)
-
-<h2>Table of Contents</h2>
-<ul>
-<li><a href="#pkgspec">1.0 Package Specification</a>
-<li><a href="#arch">2.0 Service Provider Architecture</a>
-<li><a href="#impl">3.0 Implementer's Guide</a>
-<li><a href="#resolving">4.0 Resolving Synchronization Conflicts</a>
-<li><a href="#relspec">5.0 Related Specifications</a>
-<li><a href="#reldocs">6.0 Related Documentation</a>
-</ul>
-
-<h3><a id="pkgspec">1.0 Package Specification</a></h3>
-<P>
-The following classes and interfaces make up the <code>javax.sql.rowset.spi</code>
-package:
-<UL>
-  <LI><code>SyncFactory</code>
-  <LI><code>SyncProvider</code>
-  <LI><code>SyncFactoryException</code>
-  <LI><code>SyncProviderException</code>
-  <LI><code>SyncResolver</code>
-  <LI><code>XmlReader</code>
-  <LI><code>XmlWriter</code>
-  <LI><code>TransactionalWriter</code>
-</UL>
-The following interfaces, in the <code>javax.sql</code> package, are also part of the SPI:
-<UL>
-  <LI><code>RowSetReader</code>
-  <LI><code>RowSetWriter</code>
-</UL>
-<P>
-A <code>SyncProvider</code> implementation provides a disconnected <code>RowSet</code>
-object with the mechanisms for reading data into it and for writing data that has been
-modified in it
-back to the underlying data source.  A <i>reader</i>, a <code>RowSetReader</code> or
-<code>XMLReader</code> object, reads data into a <code>RowSet</code> object when the
-<code>CachedRowSet</code> methods <code>execute</code> or <code>populate</code>
-are called.  A <i>writer</i>, a <code>RowSetWriter</code> or <code>XMLWriter</code>
-object, writes changes back to the underlying data source when the
-<code>CachedRowSet</code> method <code>acceptChanges</code> is called.
-<P>
-The process of writing changes in a <code>RowSet</code> object to its data source
-is known as <i>synchronization</i>.  The <code>SyncProvider</code> implementation that a
-<code>RowSet</code> object is using determines the level of synchronization that the
-<code>RowSet</code> object's writer uses. The various levels of synchronization are
-referred to as <i>grades</i>.
-<P>
-The lower grades of synchronization are
-known as <i>optimistic</i> concurrency levels because they optimistically
-assume that there will be no conflicts or very few conflicts.  A conflict exists when
-the same data modified in the <code>RowSet</code> object has also been modified
-in the data source. Using the optimistic concurrency model means that if there
-is a conflict, modifications to either the data source or the <code>RowSet</code>
-object will be lost.
-<P>
-Higher grades of synchronization are called <i>pessimistic</i> because they assume
-that others will be accessing the data source and making modifications.  These
-grades set varying levels of locks to increase the chances that no conflicts
-occur.
-<P>
-The lowest level of synchronization is simply writing any changes made to the
-<code>RowSet</code> object to its underlying data source.  The writer does
-nothing to check for conflicts.
-If there is a conflict and the data
-source values are overwritten, the changes other parties have made by to the data
-source are lost.
-<P>
-The <code>RIXMLProvider</code> implementation uses the lowest level
-of synchronization and just writes <code>RowSet</code> changes to the data source.
-
-<P>
-For the next level up, the
-writer checks to see if there are any conflicts, and if there are,
-it does not write anything to the data source.  The problem with this concurrency
-level is that if another party has modified the corresponding data in the data source
-since the <code>RowSet</code> object got its data,
-the changes made to the <code>RowSet</code> object are lost. The
-<code>RIOptimisticProvider</code> implementation uses this level of synchronization.
-<P>
-At higher levels of synchronization, referred to as pessimistic concurrency,
-the writer take steps to avoid conflicts by setting locks. Setting locks
-can vary from setting a lock on a single row to setting a lock on a table
-or the entire data source. The level of synchronization is therefore a tradeoff
-between the ability of users to access the data source concurrently and the  ability
-of the writer to keep the data in the <code>RowSet</code> object and its data source
-synchronized.
-<P>
-It is a requirement that all disconnected <code>RowSet</code> objects
-(<code>CachedRowSet</code>, <code>FilteredRowSet</code>, <code>JoinRowSet</code>,
-and <code>WebRowSet</code> objects) obtain their <code>SyncProvider</code> objects
-from the <code>SyncFactory</code> mechanism.
-<P>
-The reference implementation (RI) provides two synchronization providers.
-    <UL>
-       <LI><b><code>RIOptimisticProvider</code></b> <br>
-           The default provider that the <code>SyncFactory</code> instance will
-           supply to a disconnected <code>RowSet</code> object when no provider
-           implementation is specified.<BR>
-           This synchronization provider uses an optimistic concurrency model,
-           assuming that there will be few conflicts among users
-           who are accessing the same data in a database.  It avoids
-           using locks; rather, it checks to see if there is a conflict
-           before trying to synchronize the <code>RowSet</code> object and the
-           data source. If there is a conflict, it does nothing, meaning that
-           changes to the <code>RowSet</code> object are not persisted to the data
-           source.
-       <LI><B><code>RIXMLProvider</code></B> <BR>
-            A synchronization provider that can be used with a
-            <code>WebRowSet</code> object, which is a rowset that can be written
-            in XML format or read from XML format. The
-            <code>RIXMLProvider</code> implementation does no checking at all for
-            conflicts and simply writes any updated data in the
-            <code>WebRowSet</code> object to the underlying data source.
-            <code>WebRowSet</code> objects use this provider when they are
-            dealing with XML data.
-    </UL>
-
-These <code>SyncProvider</code> implementations
-are bundled with the reference implementation, which makes them always available to
-<code>RowSet</code> implementations.
-<code>SyncProvider</code> implementations make themselves available by being
-registered with the <code>SyncFactory</code> singleton.  When a <code>RowSet</code>
-object requests a provider, by specifying it in the constructor or as an argument to the
-<code>CachedRowSet</code> method <code>setSyncProvider</code>,
-the <code>SyncFactory</code> singleton
-checks to see if the requested provider has been registered with it.
-If it has, the <code>SyncFactory</code> creates an instance of it and passes it to the
-requesting <code>RowSet</code> object.
-If the <code>SyncProvider</code> implementation that is specified has not been registered,
-the <code>SyncFactory</code> singleton causes a <code>SyncFactoryException</code> object
-to be thrown.  If no provider is specified,
-the <code>SyncFactory</code> singleton will create an instance of the default
-provider implementation, <code>RIOptimisticProvider</code>,
-and pass it to the requesting <code>RowSet</code> object.
-
-<P>
-If a <code>WebRowSet</code> object does not specify a provider in its constructor, the
-<code>SyncFactory</code> will give it an instance of <code>RIOptimisticProvider</code>.
-However, the constructor for <code>WebRowSet</code> is implemented to set the provider
-to the <code>RIXMLProvider</code>, which reads and writes a <code>RowSet</code> object
-in XML format.
-<P>
-See the <a href="SyncProvider.html">SyncProvider</a> class
-specification for further details.
-<p>
-Vendors may develop a <code>SyncProvider</code> implementation with any one of the possible
-levels of synchronization, thus giving <code>RowSet</code> objects a choice of
-synchronization mechanisms.
-
-<h3><a id="arch">2.0 Service Provider Interface Architecture</a></h3>
-<b>2.1 Overview</b>
-<p>
-The Service Provider Interface provides a pluggable mechanism by which
-<code>SyncProvider</code> implementations can be registered and then generated when
-required. The lazy reference mechanism employed by the <code>SyncFactory</code> limits
-unnecessary resource consumption by not creating an instance until it is
-required by a disconnected
-<code>RowSet</code> object. The <code>SyncFactory</code> class also provides
-a standard API to configure logging options and streams that <b>may</b> be provided
-by a particular <code>SyncProvider</code> implementation.
-<p>
-<b>2.2 Registering with the <code>SyncFactory</code></b>
-<p>
-A third party <code>SyncProvider</code> implementation must be registered with the
-<code>SyncFactory</code> in order for a disconnected <code>RowSet</code> object
-to obtain it and thereby use its <code>javax.sql.RowSetReader</code> and
-<code>javax.sql.RowSetWriter</code>
-implementations. The following registration mechanisms are available to all
-<code>SyncProvider</code> implementations:
-<ul>
-<li><b>System properties</b> - Properties set at the command line. These
-properties are set at run time and apply system-wide per invocation of the Java
-application. See the section <a href="#reldocs">"Related Documentation"</a>
-further related information.
-
-<li><b>Property Files</b> - Properties specified in a standard property file.
-This can be specified using a System Property or by modifying a standard
-property file located in the platform run-time. The
-reference implementation of this technology includes a standard property
-file than can be edited to add additional <code>SyncProvider</code> objects.
-
-<li><b>JNDI Context</b> - Available providers can be registered on a JNDI
-context. The <code>SyncFactory</code> will attempt to load <code>SyncProvider</code>
-objects bound to the context and register them with the factory. This
-context must be supplied to the <code>SyncFactory</code> for the mechanism to
-function correctly.
-</ul>
-<p>
-Details on how to specify the system properties or properties in a property file
-and how to configure the JNDI Context are explained in detail in the
-<a href="SyncFactory.html"><code>SyncFactory</code></a> class description.
-<p>
-<b>2.3 SyncFactory Provider Instance Generation Policies</b>
-<p>
-The <code>SyncFactory</code> generates a requested <code>SyncProvider</code>
-object if the provider has been correctly registered.  The
-following policies are adhered to when either a disconnected <code>RowSet</code> object
-is instantiated with a specified <code>SyncProvider</code> implementation or is
-reconfigured at runtime with an alternative <code>SyncProvider</code> object.
-<ul>
-<li> If a <code>SyncProvider</code> object is specified and the <code>SyncFactory</code>
-contains <i>no</i> reference to the provider, a <code>SyncFactoryException</code> is
-thrown.
-
-<li> If a <code>SyncProvider</code> object is specified and the <code>SyncFactory</code>
-contains a reference to the provider, the requested provider is supplied.
-
-<li> If no <code>SyncProvider</code> object is specified, the reference
-implementation provider <code>RIOptimisticProvider</code> is supplied.
-</ul>
-<p>
-These policies are explored in more detail in the <a href="SyncFactory.html">
-<code>SyncFactory</code></a> class.
-
-<h3><a id="impl">3.0 SyncProvider Implementer's Guide</a></h3>
-
-<b>3.1 Requirements</b>
-<p>
-A compliant <code>SyncProvider</code> implementation that is fully pluggable
-into the <code>SyncFactory</code> <b>must</b> extend and implement all
-abstract methods in the <a href="SyncProvider.html"><code>SyncProvider</code></a>
-class. In addition, an implementation <b>must</b> determine the
-grade, locking and updatable view capabilities defined in the
-<code>SyncProvider</code> class definition. One or more of the
-<code>SyncProvider</code> description criteria <b>must</b> be supported. It
-is expected that vendor implementations will offer a range of grade, locking, and
-updatable view capabilities.
-<p>
-Furthermore, the <code>SyncProvider</code> naming convention <b>must</b> be followed as
-detailed in the <a href="SyncProvider.html"><code>SyncProvider</code></a> class
-description.
-<p>
-<b>3.2 Grades</b>
-<p>
-JSR 114 defines a set of grades to describe the quality of synchronization
-a <code>SyncProvider</code> object can offer a disconnected <code>RowSet</code>
-object. These grades are listed from the lowest quality of service to the highest.
-<ul>
-<li><b>GRADE_NONE</b> - No synchronization with the originating data source is
-provided. A <code>SyncProvider</code> implementation returning this grade will simply
-attempt to write any data that has changed in the <code>RowSet</code> object to the
-underlying data source, overwriting whatever is there. No attempt is made to compare
-original values with current values to see if there is a conflict. The
-<code>RIXMLProvider</code> is implemented with this grade.
-
-<li><b>GRADE_CHECK_MODIFIED_AT_COMMIT</b> - A low grade of optimistic synchronization.
-A <code>SyncProvider</code> implementation returning this grade
-will check for conflicts in rows that have changed between the last synchronization
-and the current synchronization under way. Any changes in the originating data source
-that have been modified will not be reflected in the disconnected <code>RowSet</code>
-object. If there are no conflicts, changes in the <code>RowSet</code> object will be
-written to the data source. If there are conflicts, no changes are written.
-The <code>RIOptimisticProvider</code> implementation uses this grade.
-
-<li><b>GRADE_CHECK_ALL_AT_COMMIT</b> - A high grade of optimistic synchronization.
-A <code>SyncProvider</code> implementation   returning this grade
-will check all rows, including rows that have not changed in the disconnected
-<code>RowSet</code> object. In this way, any changes to rows in the underlying
-data source will be reflected in the disconnected <code>RowSet</code> object
-when the synchronization finishes successfully.
-
-<li><b>GRADE_LOCK_WHEN_MODIFIED</b> - A pessimistic grade of synchronization.
-<code>SyncProvider</code> implementations returning this grade will lock
-the row in the originating  data source that corresponds to the row being changed
-in the <code>RowSet</code> object to reduce the possibility of other
-processes modifying the same data in the data source.
-
-<li><b>GRADE_LOCK_WHEN_LOADED</b> - A higher pessimistic synchronization grade.
-A <code>SyncProvider</code> implementation returning this grade will lock
-the entire view and/or  table affected by the original query used to
-populate a <code>RowSet</code> object.
-</ul>
-<p>
-<b>3.3 Locks</b>
-<p>
-JSR 114 defines a set of constants that specify whether any locks have been
-placed on a <code>RowSet</code> object's underlying data source and, if so,
-on which constructs the locks are placed.  These locks will remain on the data
-source while the <code>RowSet</code> object is disconnected from the data source.
-<P>
-These constants <b>should</b> be considered complementary to the
-grade constants. The default setting for the majority of grade settings requires
-that no data source locks remain when a <code>RowSet</code> object is disconnected
-from its data source.
-The grades <code>GRADE_LOCK_WHEN_MODIFIED</code> and
-<code>GRADE_LOCK_WHEN_LOADED</code> allow a disconnected <code>RowSet</code> object
-to have a fine-grained control over the degree of locking.
-<ul>
-<li><b>DATASOURCE_NO_LOCK</b> - No locks remain on the originating data source.
-This is the default lock setting for all <code>SyncProvider</code> implementations
-unless otherwise directed by a <code>RowSet</code> object.
-
-<li><b>DATASOURCE_ROW_LOCK</b> - A lock is placed on the rows that are touched by
-the original SQL query used to populate the <code>RowSet</code> object.
-
-<li><b>DATASOURCE_TABLE_LOCK</b> - A lock is placed on all tables that are touched
-by the query that was used to populate the <code>RowSet</code> object.
-
-<li><b>DATASOURCE_DB_LOCK</b>
-A lock is placed on the entire data source that is used by the <code>RowSet</code>
-object.
-</ul>
-<p>
-<b>3.4 Updatable Views</b>
-<p>
-A <code>RowSet</code> object may be populated with data from an SQL <code>VIEW</code>.
-The following constants indicate whether a <code>SyncProvider</code> object can
-update data in the table or tables from which the <code>VIEW</code> was derived.
-<ul>
-<li><b>UPDATABLE_VIEW_SYNC</b>
-Indicates that a <code>SyncProvider</code> implementation  supports synchronization
-to the table or tables from which the SQL <code>VIEW</code> used to populate
-a <code>RowSet</code> object is derived.
-
-<li><b>NONUPDATABLE_VIEW_SYNC</b>
-Indicates that a <code>SyncProvider</code> implementation  does <b>not</b> support
-synchronization to the table or tables from which the SQL <code>VIEW</code>
-used to populate  a <code>RowSet</code> object is derived.
-</ul>
-<p>
-<b>3.5 Usage of <code>SyncProvider</code> Grading and Locking</b>
-<p>
-In the example below, the reference <code>CachedRowSetImpl</code> implementation
-reconfigures its current <code>SyncProvider</code> object by calling the
-<code>setSyncProvider</code> method.<br>
-
-<PRE>
-    CachedRowSetImpl crs = new CachedRowSetImpl();
-    crs.setSyncProvider("com.foo.bar.HASyncProvider");
-</PRE>
-    An application can retrieve the <code>SyncProvider</code> object currently in use
-by a disconnected <code>RowSet</code> object. It can also retrieve the
-grade of synchronization with which the provider was implemented and the degree of
-locking currently in use.  In addition, an application has the flexibility to set
-the degree of locking to be used, which can increase the possibilities for successful
-synchronization.  These operation are shown in the following code fragment.
-<PRE>
-    SyncProvider sync = crs.getSyncProvider();
-
-    switch (sync.getProviderGrade()) {
-    case: SyncProvider.GRADE_CHECK_ALL_AT_COMMIT
-         //A high grade of optimistic synchronization
-    break;
-    case: SyncProvider.GRADE_CHECK_MODIFIED_AT_COMMIT
-         //A low grade of optimistic synchronization
-    break;
-    case: SyncProvider.GRADE_LOCK_WHEN_LOADED
-         // A pessimistic synchronization grade
-    break;
-    case: SyncProvider.GRADE_LOCK_WHEN_MODIFIED
-         // A pessimistic synchronization grade
-    break;
-    case: SyncProvider.GRADE_NONE
-      // No synchronization with the originating data source provided
-    break;
-    }
-
-    switch (sync.getDataSourcLock() {
-      case: SyncProvider.DATASOURCE_DB_LOCK
-       // A lock is placed on the entire datasource that is used by the
-       // <code>RowSet</code> object
-       break;
-
-      case: SyncProvider.DATASOURCE_NO_LOCK
-       // No locks remain on the  originating data source.
-      break;
-
-      case: SyncProvider.DATASOURCE_ROW_LOCK
-       // A lock is placed on the rows that are  touched by the original
-       // SQL statement used to populate
-       // the RowSet object that is using the SyncProvider
-       break;
-
-      case: DATASOURCE_TABLE_LOCK
-       // A lock is placed on  all tables that are touched by the original
-       // SQL statement used to populated
-       // the RowSet object that is using the SyncProvider
-       break;
-
-</PRE>
-    It is also possible using the static utility method in the
-<code>SyncFactory</code> class to determine the list of <code>SyncProvider</code>
-implementations currently registered with the <code>SyncFactory</code>.
-
-<pre>
-       Enumeration e = SyncFactory.getRegisteredProviders();
-</pre>
-
-
-<h3><a id="resolving">4.0 Resolving Synchronization Conflicts</a></h3>
-
-The interface <code>SyncResolver</code> provides a way for an application to
-decide manually what to do when a conflict occurs. When the <code>CachedRowSet</code>
-method <code>acceptChanges</code> finishes and has detected one or more conflicts,
-it throws a <code>SyncProviderException</code> object.  An application can
-catch the exception and
-have it retrieve a <code>SyncResolver</code> object by calling the method
-<code>SyncProviderException.getSyncResolver()</code>.
-<P>
-A <code>SyncResolver</code> object, which is a special kind of
-<code>CachedRowSet</code> object or
-a <code>JdbcRowSet</code> object that has implemented the <code>SyncResolver</code>
-interface,  examines the conflicts row by row. It is a duplicate of the
-<code>RowSet</code> object being synchronized except that it contains only the data
-from the data source this is causing a conflict. All of the other column values are
-set to <code>null</code>. To navigate from one conflict value to another, a
-<code>SyncResolver</code> object provides the methods <code>nextConflict</code> and
-<code>previousConflict</code>.
-<P>
-The <code>SyncResolver</code> interface also
-provides methods for doing the following:
-<UL>
- <LI>finding out whether the conflict involved an update, a delete, or an insert
- <LI>getting the value in the data source that caused the conflict
- <LI>setting the value that should be in the data source if it needs to be changed
-     or setting the value that should be in the <code>RowSet</code> object if it needs
-     to be changed
-</UL>
-<P>
-When the <code>CachedRowSet</code> method <code>acceptChanges</code> is called, it
-delegates to the <code>RowSet</code> object's  <code>SyncProvider</code> object.
-How the writer provided by that <code>SyncProvider</code> object is implemented
-determines what level (grade) of checking for conflicts will be done.  After all
-checking for conflicts is completed and one or more conflicts has been found, the method
-<code>acceptChanges</code> throws a <code>SyncProviderException</code> object. The
-application can catch the exception and use it to obtain a <code>SyncResolver</code> object.
-<P>
-The application can then use <code>SyncResolver</code> methods to get information
-about each conflict and decide what to do.  If the application logic or the user
-decides that a value in the <code>RowSet</code> object should be the one to
-persist, the application or user can overwrite the data source value with it.
-<P>
-The comment for the <code>SyncResolver</code> interface has more detail.
-
-<h3><a id="relspec">5.0 Related Specifications</a></h3>
-<ul>
-<li><a href="http://docs.oracle.com/javase/jndi/tutorial/index.html">JNDI</a>
-<li><a href="{@docRoot}/java/util/logging/package-summary.html">Java Logging
-APIs</a>
-</ul>
-<h3><a id="reldocs">6.0 Related Documentation</a></h3>
-<ul>
-<li><a href="http://docs.oracle.com/javase/tutorial/jdbc/">DataSource for JDBC
-Connections</a>
-</ul>
-
-</body>
-</html>
diff --git a/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp
index 3fa8fc6f67c..34f61bc967c 100644
--- a/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp
+++ b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp
@@ -452,7 +452,7 @@ WinAccessBridge::queuePackage(char *buffer, long bufsize) {
  */
 BOOL
 WinAccessBridge::receiveAQueuedPackage() {
-    AccessBridgeQueueElement *element;
+    AccessBridgeQueueElement *element = NULL;
 
     PrintDebugString("in WinAccessBridge::receiveAQueuedPackage()");
 
@@ -464,15 +464,6 @@ WinAccessBridge::receiveAQueuedPackage() {
 
         QueueReturns result = messageQueue->remove(&element);
 
-        PrintDebugString("   'element->buffer' contains:");
-        DEBUG_CODE(PackageType *type = (PackageType *) element->buffer);
-        DEBUG_CODE(FocusGainedPackageTag *pkg = (FocusGainedPackageTag *) (((char *) element->buffer) + sizeof(PackageType)));
-        DEBUG_CODE(PrintDebugString("     PackageType = %X", *type));
-#ifdef ACCESSBRIDGE_ARCH_LEGACY // JOBJECT64 is jobject (32 bit pointer)
-        DEBUG_CODE(PrintDebugString("     EventPackage: vmID = %X, event = %p, source = %p", pkg->vmID, pkg->Event, pkg->AccessibleContextSource));
-#else // JOBJECT64 is jlong (64 bit)
-        DEBUG_CODE(PrintDebugString("     EventPackage: vmID = %X, event = %016I64X, source = %016I64X", pkg->vmID, pkg->Event, pkg->AccessibleContextSource));
-#endif
         switch (result) {
 
         case cQueueBroken:
diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java
index d9ae8f72bea..7dd8308bfdc 100644
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java
@@ -139,7 +139,7 @@ final class AOTBackend {
             CompilationResult compilationResult = new CompilationResult(id, isImmutablePIC);
 
             return GraalCompiler.compileGraph(graph, resolvedMethod, providers, backend, graphBuilderSuite, OptimisticOptimizations.ALL, profilingInfo, getSuites(), getLirSuites(),
-                            compilationResult, CompilationResultBuilderFactory.Default);
+                            compilationResult, CompilationResultBuilderFactory.Default, true);
 
         } catch (Throwable e) {
             main.handleError(resolvedMethod, e, " (compiling graph)");
diff --git a/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
index 705ec9a06ed..c181b95da51 100644
--- a/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
@@ -46,6 +46,8 @@
 } while(0)
 
 
+#define ROOT_UID 0
+
 /*
  * Class:     sun_tools_attach_VirtualMachineImpl
  * Method:    socket
@@ -153,11 +155,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         if (res == 0) {
             char msg[100];
             jboolean isError = JNI_FALSE;
-            if (sb.st_uid != uid) {
+            if (sb.st_uid != uid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
-            } else if (sb.st_gid != gid) {
+            } else if (sb.st_gid != gid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
diff --git a/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
index a6cdf0a67ea..c96a45d8fd7 100644
--- a/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
@@ -44,6 +44,8 @@
   } while((_result == -1) && (errno == EINTR)); \
 } while(0)
 
+#define ROOT_UID 0
+
 /*
  * Declare library specific JNI_Onload entry if static build
  */
@@ -156,11 +158,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         if (res == 0) {
             char msg[100];
             jboolean isError = JNI_FALSE;
-            if (sb.st_uid != uid) {
+            if (sb.st_uid != uid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
-            } else if (sb.st_gid != gid) {
+            } else if (sb.st_gid != gid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
diff --git a/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
index 02a214691b0..e265a046fdc 100644
--- a/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
@@ -46,6 +46,8 @@
   } while((_result == -1) && (errno == EINTR)); \
 } while(0)
 
+#define ROOT_UID 0
+
 /*
  * Declare library specific JNI_Onload entry if static build
  */
@@ -158,11 +160,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         if (res == 0) {
             char msg[100];
             jboolean isError = JNI_FALSE;
-            if (sb.st_uid != uid) {
+            if (sb.st_uid != uid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
-            } else if (sb.st_gid != gid) {
+            } else if (sb.st_gid != gid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
diff --git a/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
index 67164a517bd..e6ae3f9761c 100644
--- a/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
@@ -38,6 +38,8 @@
 
 #include "sun_tools_attach_VirtualMachineImpl.h"
 
+#define ROOT_UID 0
+
 #define RESTARTABLE(_cmd, _result) do { \
   do { \
     _result = _cmd; \
@@ -122,11 +124,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         if (res == 0) {
             char msg[100];
             jboolean isError = JNI_FALSE;
-            if (sb.st_uid != uid) {
+            if (sb.st_uid != uid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
-            } else if (sb.st_gid != gid) {
+            } else if (sb.st_gid != gid && uid != ROOT_UID) {
                 snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
index 86b3f1bc2f9..a6879e2569e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
@@ -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
@@ -746,7 +746,8 @@ public abstract class Scope {
         }
 
         protected Scope finalizeSingleScope(Scope impScope) {
-            if (impScope instanceof FilterImportScope && impScope.owner.kind == Kind.TYP) {
+            if (impScope instanceof FilterImportScope && impScope.owner.kind == Kind.TYP &&
+                ((FilterImportScope) impScope).isStaticallyImported()) {
                 WriteableScope finalized = WriteableScope.create(impScope.owner);
 
                 for (Symbol sym : impScope.getSymbols()) {
@@ -973,6 +974,10 @@ public abstract class Scope {
 
         @Override
         public boolean isStaticallyImported(Symbol byName) {
+            return isStaticallyImported();
+        }
+
+        public boolean isStaticallyImported() {
             return imp.staticImport;
         }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 1f223945b05..0c1dc97b989 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -291,7 +291,7 @@ public class Attr extends JCTree.Visitor {
             ((v.flags() & HASINIT) != 0
              ||
              !((base == null ||
-               (base.hasTag(IDENT) && TreeInfo.name(base) == names._this)) &&
+               TreeInfo.isThisQualifier(base)) &&
                isAssignableAsBlankFinal(v, env)))) {
             if (v.isResourceVariable()) { //TWR resource
                 log.error(pos, Errors.TryResourceMayNotBeAssigned(v));
@@ -2562,7 +2562,9 @@ public class Attr extends JCTree.Visitor {
                     Type argType = arityMismatch ?
                             syms.errType :
                             actuals.head;
-                    setSyntheticVariableType(params.head, argType);
+                    if (params.head.isImplicitlyTyped()) {
+                        setSyntheticVariableType(params.head, argType);
+                    }
                     params.head.sym = null;
                     actuals = actuals.isEmpty() ?
                             actuals :
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index 86849f4e41a..1fb91ebcd5f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -2391,31 +2391,18 @@ public class Flow {
         }
 
         public void visitAssign(JCAssign tree) {
-            JCTree lhs = TreeInfo.skipParens(tree.lhs);
-            if (!isIdentOrThisDotIdent(lhs))
-                scanExpr(lhs);
+            if (!TreeInfo.isIdentOrThisDotIdent(tree.lhs))
+                scanExpr(tree.lhs);
             scanExpr(tree.rhs);
-            letInit(lhs);
-        }
-        private boolean isIdentOrThisDotIdent(JCTree lhs) {
-            if (lhs.hasTag(IDENT))
-                return true;
-            if (!lhs.hasTag(SELECT))
-                return false;
-
-            JCFieldAccess fa = (JCFieldAccess)lhs;
-            return fa.selected.hasTag(IDENT) &&
-                   ((JCIdent)fa.selected).name == names._this;
+            letInit(tree.lhs);
         }
 
         // check fields accessed through this.<field> are definitely
         // assigned before reading their value
         public void visitSelect(JCFieldAccess tree) {
             super.visitSelect(tree);
-            JCTree sel = TreeInfo.skipParens(tree.selected);
             if (enforceThisDotInit &&
-                    sel.hasTag(IDENT) &&
-                    ((JCIdent)sel).name == names._this &&
+                    TreeInfo.isThisQualifier(tree.selected) &&
                     tree.sym.kind == VAR) {
                 checkInit(tree.pos(), (VarSymbol)tree.sym);
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index b3ac4f40901..4d56df7e231 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1140,6 +1140,7 @@ public class LambdaToMethod extends TreeTranslator {
             for (Type t : targets) {
                 t = types.erasure(t);
                 if (t.tsym != syms.serializableType.tsym &&
+                    t.tsym != tree.type.tsym &&
                     t.tsym != syms.objectType.tsym) {
                     markers.append(t.tsym);
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index c4829ee0bd5..43d0f23678e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -1257,15 +1257,19 @@ public class Lower extends TreeTranslator {
     ClassSymbol accessConstructorTag() {
         ClassSymbol topClass = currentClass.outermostClass();
         ModuleSymbol topModle = topClass.packge().modle;
-        Name flatname = names.fromString("" + topClass.getQualifiedName() +
-                                         target.syntheticNameChar() +
-                                         "1");
-        ClassSymbol ctag = chk.getCompiled(topModle, flatname);
-        if (ctag == null)
-            ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym;
-        // keep a record of all tags, to verify that all are generated as required
-        accessConstrTags = accessConstrTags.prepend(ctag);
-        return ctag;
+        for (int i = 1; ; i++) {
+            Name flatname = names.fromString("" + topClass.getQualifiedName() +
+                                            target.syntheticNameChar() +
+                                            i);
+            ClassSymbol ctag = chk.getCompiled(topModle, flatname);
+            if (ctag == null)
+                ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym;
+            else if (!ctag.isAnonymous())
+                continue;
+            // keep a record of all tags, to verify that all are generated as required
+            accessConstrTags = accessConstrTags.prepend(ctag);
+            return ctag;
+        }
     }
 
     /** Add all required access methods for a private symbol to enclosing class.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 87ac2956a87..c4b5f41e712 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -1978,7 +1978,7 @@ public class Resolve {
             ClassSymbol c = finder.loadClass(env.toplevel.modle, name);
             return isAccessible(env, c) ? c : new AccessError(env, null, c);
         } catch (ClassFinder.BadClassFile err) {
-            throw err;
+            return new BadClassFileError(err);
         } catch (CompletionFailure ex) {
             Symbol candidate = recoveryLoadClass.loadClass(env, name);
 
@@ -4499,6 +4499,27 @@ public class Resolve {
         }
     }
 
+    class BadClassFileError extends InvalidSymbolError {
+
+        private final CompletionFailure ex;
+
+        public BadClassFileError(CompletionFailure ex) {
+            super(HIDDEN, ex.sym, "BadClassFileError");
+            this.name = sym.name;
+            this.ex = ex;
+        }
+
+        @Override
+        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
+            JCDiagnostic d = diags.create(dkind, log.currentSource(), pos,
+                "cant.access", ex.sym, ex.getDetailValue());
+
+            d.setFlag(DiagnosticFlag.NON_DEFERRABLE);
+            return d;
+        }
+
+    }
+
     /**
      * Helper class for method resolution diagnostic simplification.
      * Certain resolution diagnostic are rewritten as simpler diagnostic
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index 477eb668a90..a64efed838c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -223,6 +223,8 @@ public class TypeEnter implements Completer {
             chk.checkImportedPackagesObservable(toplevel);
             toplevel.namedImportScope.finalizeScope();
             toplevel.starImportScope.finalizeScope();
+        } catch (CompletionFailure cf) {
+            chk.completionError(toplevel.pos(), cf);
         } finally {
             log.useSource(prev);
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
index 90a391f1f1d..4ade741a590 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -261,18 +261,20 @@ public abstract class StringConcat {
         public Item makeConcat(JCTree.JCAssignOp tree) {
             List<JCTree> args = collectAll(tree.lhs, tree.rhs);
             Item l = gen.genExpr(tree.lhs, tree.lhs.type);
-            emit(args, tree.type, tree.pos());
+            l.duplicate();
+            l.load();
+            emit(tree.pos(), args, false, tree.type);
             return l;
         }
 
         @Override
         public Item makeConcat(JCTree.JCBinary tree) {
             List<JCTree> args = collectAll(tree.lhs, tree.rhs);
-            emit(args, tree.type, tree.pos());
+            emit(tree.pos(), args, true, tree.type);
             return gen.getItems().makeStackItem(syms.stringType);
         }
 
-        protected abstract void emit(List<JCTree> args, Type type, JCDiagnostic.DiagnosticPosition pos);
+        protected abstract void emit(JCDiagnostic.DiagnosticPosition pos, List<JCTree> args, boolean generateFirstArg, Type type);
 
         /** Peel the argument list into smaller chunks. */
         protected List<List<JCTree>> split(List<JCTree> args) {
@@ -318,9 +320,10 @@ public abstract class StringConcat {
         }
 
         /** Emit the indy concat for all these arguments, possibly peeling along the way */
-        protected void emit(List<JCTree> args, Type type, JCDiagnostic.DiagnosticPosition pos) {
+        protected void emit(JCDiagnostic.DiagnosticPosition pos, List<JCTree> args, boolean generateFirstArg, Type type) {
             List<List<JCTree>> split = split(args);
 
+            boolean first = true;
             for (List<JCTree> t : split) {
                 Assert.check(!t.isEmpty(), "Arguments list is empty");
 
@@ -333,9 +336,11 @@ public abstract class StringConcat {
                     } else {
                         dynamicArgs.add(sharpestAccessible(arg.type));
                     }
-                    gen.genExpr(arg, arg.type).load();
+                    if (!first || generateFirstArg) {
+                        gen.genExpr(arg, arg.type).load();
+                    }
+                    first = false;
                 }
-
                 doCall(type, pos, dynamicArgs.toList());
             }
 
@@ -402,9 +407,10 @@ public abstract class StringConcat {
         }
 
         @Override
-        protected void emit(List<JCTree> args, Type type, JCDiagnostic.DiagnosticPosition pos) {
+        protected void emit(JCDiagnostic.DiagnosticPosition pos, List<JCTree> args, boolean generateFirstArg, Type type) {
             List<List<JCTree>> split = split(args);
 
+            boolean first = true;
             for (List<JCTree> t : split) {
                 Assert.check(!t.isEmpty(), "Arguments list is empty");
 
@@ -433,7 +439,10 @@ public abstract class StringConcat {
                         // Ordinary arguments come through the dynamic arguments.
                         recipe.append(TAG_ARG);
                         dynamicArgs.add(sharpestAccessible(arg.type));
-                        gen.genExpr(arg, arg.type).load();
+                        if (!first || generateFirstArg) {
+                            gen.genExpr(arg, arg.type).load();
+                        }
+                        first = false;
                     }
                 }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java
new file mode 100644
index 00000000000..c3afaea1945
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java
@@ -0,0 +1,550 @@
+/*
+ * 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 com.sun.tools.javac.launcher;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.NestingKind;
+import javax.lang.model.element.TypeElement;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileManager.Location;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.resources.LauncherProperties.Errors;
+import com.sun.tools.javac.util.JCDiagnostic.Error;
+
+import jdk.internal.misc.VM;
+
+import static javax.tools.JavaFileObject.Kind.SOURCE;
+
+/**
+ * Compiles a source file, and executes the main method it contains.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk.  This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Main {
+    /**
+     * An exception used to report errors.
+     */
+    public class Fault extends Exception {
+        private static final long serialVersionUID = 1L;
+        Fault(Error error) {
+            super(Main.this.getMessage(error));
+        }
+    }
+
+    /**
+     * Compiles a source file, and executes the main method it contains.
+     *
+     * <p>This is normally invoked from the Java launcher, either when
+     * the {@code --source} option is used, or when the first argument
+     * that is not part of a runtime option ends in {@code .java}.
+     *
+     * <p>The first entry in the {@code args} array is the source file
+     * to be compiled and run; all subsequent entries are passed as
+     * arguments to the main method of the first class found in the file.
+     *
+     * <p>If any problem occurs before executing the main class, it will
+     * be reported to the standard error stream, and the the JVM will be
+     * terminated by calling {@code System.exit} with a non-zero return code.
+     *
+     * @param args the arguments
+     * @throws Throwable if the main method throws an exception
+     */
+    public static void main(String... args) throws Throwable {
+        try {
+            new Main(System.err).run(VM.getRuntimeArguments(), args);
+        } catch (Fault f) {
+            System.err.println(f.getMessage());
+            System.exit(1);
+        } catch (InvocationTargetException e) {
+            // leave VM to handle the stacktrace, in the standard manner
+            throw e.getTargetException();
+        }
+    }
+
+    /** Stream for reporting errors, such as compilation errors. */
+    private PrintWriter out;
+
+    /**
+     * Creates an instance of this class, providing a stream to which to report
+     * any errors.
+     *
+     * @param out the stream
+     */
+    public Main(PrintStream out) {
+        this(new PrintWriter(new OutputStreamWriter(out), true));
+    }
+
+    /**
+     * Creates an instance of this class, providing a stream to which to report
+     * any errors.
+     *
+     * @param out the stream
+     */
+    public Main(PrintWriter out) {
+        this.out = out;
+    }
+
+    /**
+     * Compiles a source file, and executes the main method it contains.
+     *
+     * <p>The first entry in the {@code args} array is the source file
+     * to be compiled and run; all subsequent entries are passed as
+     * arguments to the main method of the first class found in the file.
+     *
+     * <p>Options for {@code javac} are obtained by filtering the runtime arguments.
+     *
+     * <p>If the main method throws an exception, it will be propagated in an
+     * {@code InvocationTargetException}. In that case, the stack trace of the
+     * target exception will be truncated such that the main method will be the
+     * last entry on the stack. In other words, the stack frames leading up to the
+     * invocation of the main method will be removed.
+     *
+     * @param runtimeArgs the runtime arguments
+     * @param args the arguments
+     * @throws Fault if a problem is detected before the main method can be executed
+     * @throws InvocationTargetException if the main method throws an exception
+     */
+    public void run(String[] runtimeArgs, String[] args) throws Fault, InvocationTargetException {
+        Path file = getFile(args);
+
+        Context context = new Context();
+        String mainClassName = compile(file, getJavacOpts(runtimeArgs), context);
+
+        String[] appArgs = Arrays.copyOfRange(args, 1, args.length);
+        execute(mainClassName, appArgs, context);
+    }
+
+    /**
+     * Returns the path for the filename found in the first of an array of arguments.
+     *
+     * @param args the array
+     * @return the path
+     * @throws Fault if there is a problem determining the path, or if the file does not exist
+     */
+    private Path getFile(String[] args) throws Fault {
+        if (args.length == 0) {
+            // should not happen when invoked from launcher
+            throw new Fault(Errors.NoArgs);
+        }
+        Path file;
+        try {
+            file = Paths.get(args[0]);
+        } catch (InvalidPathException e) {
+            throw new Fault(Errors.InvalidFilename(args[0]));
+        }
+        if (!Files.exists(file)) {
+            // should not happen when invoked from launcher
+            throw new Fault(Errors.FileNotFound(file));
+        }
+        return file;
+    }
+
+    /**
+     * Reads a source file, ignoring the first line if it is not a Java source file and
+     * it begins with {@code #!}.
+     *
+     * <p>If it is not a Java source file, and if the first two bytes are {@code #!},
+     * indicating a "magic number" of an executable text file, the rest of the first line
+     * up to but not including the newline is ignored. All characters after the first two are
+     * read in the {@link Charset#defaultCharset default platform encoding}.
+     *
+     * @param file the file
+     * @return a file object containing the content of the file
+     * @throws Fault if an error occurs while reading the file
+     */
+    private JavaFileObject readFile(Path file) throws Fault {
+        // use a BufferedInputStream to guarantee that we can use mark and reset.
+        try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(file))) {
+            boolean ignoreFirstLine;
+            if (file.getFileName().toString().endsWith(".java")) {
+                ignoreFirstLine = false;
+            } else {
+                in.mark(2);
+                ignoreFirstLine = (in.read() == '#') && (in.read() == '!');
+                if (!ignoreFirstLine) {
+                    in.reset();
+                }
+            }
+            try (BufferedReader r = new BufferedReader(new InputStreamReader(in, Charset.defaultCharset()))) {
+                StringBuilder sb = new StringBuilder();
+                if (ignoreFirstLine) {
+                    r.readLine();
+                    sb.append("\n"); // preserve line numbers
+                }
+                char[] buf = new char[1024];
+                int n;
+                while ((n = r.read(buf, 0, buf.length)) != -1)  {
+                    sb.append(buf, 0, n);
+                }
+                return new SimpleJavaFileObject(file.toUri(), SOURCE) {
+                    @Override
+                    public String getName() {
+                        return file.toString();
+                    }
+                    @Override
+                    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+                        return sb;
+                    }
+                    @Override
+                    public boolean isNameCompatible(String simpleName, JavaFileObject.Kind kind) {
+                        // reject package-info and module-info; accept other names
+                        return (kind == JavaFileObject.Kind.SOURCE)
+                                && SourceVersion.isIdentifier(simpleName);
+                    }
+                    @Override
+                    public String toString() {
+                        return "JavacSourceLauncher[" + file + "]";
+                    }
+                };
+            }
+        } catch (IOException e) {
+            throw new Fault(Errors.CantReadFile(file, e));
+        }
+    }
+
+    /**
+     * Returns the subset of the runtime arguments that are relevant to {@code javac}.
+     * Generally, the relevant options are those for setting paths and for configuring the
+     * module system.
+     *
+     * @param runtimeArgs the runtime arguments
+     * @return the subset of the runtime arguments
+     **/
+    private List<String> getJavacOpts(String... runtimeArgs) throws Fault {
+        List<String> javacOpts = new ArrayList<>();
+
+        String sourceOpt = System.getProperty("jdk.internal.javac.source");
+        if (sourceOpt != null) {
+            Source source = Source.lookup(sourceOpt);
+            if (source == null) {
+                throw new Fault(Errors.InvalidValueForSource(sourceOpt));
+            }
+            javacOpts.addAll(List.of("--release", sourceOpt));
+        }
+
+        for (int i = 0; i < runtimeArgs.length; i++) {
+            String arg = runtimeArgs[i];
+            String opt = arg, value = null;
+            if (arg.startsWith("--")) {
+                int eq = arg.indexOf('=');
+                if (eq > 0) {
+                    opt = arg.substring(0, eq);
+                    value = arg.substring(eq + 1);
+                }
+            }
+            switch (opt) {
+                // The following options all expect a value, either in the following
+                // position, or after '=', for options beginning "--".
+                case "--class-path": case "-classpath": case "-cp":
+                case "--module-path": case "-p":
+                case "--add-exports":
+                case "--add-modules":
+                case "--limit-modules":
+                case "--patch-module":
+                case "--upgrade-module-path":
+                    if (value == null) {
+                        if (i== runtimeArgs.length - 1) {
+                            // should not happen when invoked from launcher
+                            throw new Fault(Errors.NoValueForOption(opt));
+                        }
+                        value = runtimeArgs[++i];
+                    }
+                    if (opt.equals("--add-modules") && value.equals("ALL-DEFAULT")) {
+                        // this option is only supported at run time;
+                        // it is not required or supported at compile time
+                        break;
+                    }
+                    javacOpts.add(opt);
+                    javacOpts.add(value);
+                    break;
+                case "--enable-preview":
+                    javacOpts.add(opt);
+                    if (sourceOpt == null) {
+                        throw new Fault(Errors.EnablePreviewRequiresSource);
+                    }
+                    break;
+                default:
+                    // ignore all other runtime args
+            }
+        }
+
+        // add implicit options
+        javacOpts.add("-proc:none");
+
+        return javacOpts;
+    }
+
+    /**
+     * Compiles a source file, placing the class files in a map in memory.
+     * Any messages generated during compilation will be written to the stream
+     * provided when this object was created.
+     *
+     * @param file the source file
+     * @param javacOpts compilation options for {@code javac}
+     * @param context the context for the compilation
+     * @return the name of the first class found in the source file
+     * @throws Fault if any compilation errors occur, or if no class was found
+     */
+    private String compile(Path file, List<String> javacOpts, Context context) throws Fault {
+        JavaFileObject fo = readFile(file);
+
+        JavacTool javaCompiler = JavacTool.create();
+        StandardJavaFileManager stdFileMgr = javaCompiler.getStandardFileManager(null, null, null);
+        try {
+            stdFileMgr.setLocation(StandardLocation.SOURCE_PATH, Collections.emptyList());
+        } catch (IOException e) {
+            throw new java.lang.Error("unexpected exception from file manager", e);
+        }
+        JavaFileManager fm = context.getFileManager(stdFileMgr);
+        JavacTask t = javaCompiler.getTask(out, fm, null, javacOpts, null, List.of(fo));
+        MainClassListener l = new MainClassListener(t);
+        Boolean ok = t.call();
+        if (!ok) {
+            throw new Fault(Errors.CompilationFailed);
+        }
+        if (l.mainClass == null) {
+            throw new Fault(Errors.NoClass);
+        }
+        String mainClassName = l.mainClass.getQualifiedName().toString();
+        return mainClassName;
+    }
+
+    /**
+     * Invokes the {@code main} method of a specified class, using a class loader that
+     * will load recently compiled classes from memory.
+     *
+     * @param mainClassName the class to be executed
+     * @param appArgs the arguments for the {@code main} method
+     * @param context the context for the class to be executed
+     * @throws Fault if there is a problem finding or invoking the {@code main} method
+     * @throws InvocationTargetException if the {@code main} method throws an exception
+     */
+    private void execute(String mainClassName, String[] appArgs, Context context)
+            throws Fault, InvocationTargetException {
+        ClassLoader cl = context.getClassLoader(ClassLoader.getSystemClassLoader());
+        try {
+            Class<?> appClass = Class.forName(mainClassName, true, cl);
+            if (appClass.getClassLoader() != cl) {
+                throw new Fault(Errors.UnexpectedClass(mainClassName));
+            }
+            Method main = appClass.getDeclaredMethod("main", String[].class);
+            int PUBLIC_STATIC = Modifier.PUBLIC | Modifier.STATIC;
+            if ((main.getModifiers() & PUBLIC_STATIC) != PUBLIC_STATIC) {
+                throw new Fault(Errors.MainNotPublicStatic);
+            }
+            if (!main.getReturnType().equals(void.class)) {
+                throw new Fault(Errors.MainNotVoid);
+            }
+            main.setAccessible(true);
+            main.invoke(0, (Object) appArgs);
+        } catch (ClassNotFoundException e) {
+            throw new Fault(Errors.CantFindClass(mainClassName));
+        } catch (NoSuchMethodException e) {
+            throw new Fault(Errors.CantFindMainMethod(mainClassName));
+        } catch (IllegalAccessException e) {
+            throw new Fault(Errors.CantAccessMainMethod(mainClassName));
+        } catch (InvocationTargetException e) {
+            // remove stack frames for source launcher
+            int invocationFrames = e.getStackTrace().length;
+            Throwable target = e.getTargetException();
+            StackTraceElement[] targetTrace = target.getStackTrace();
+            target.setStackTrace(Arrays.copyOfRange(targetTrace, 0, targetTrace.length - invocationFrames));
+            throw e;
+        }
+    }
+
+    private static final String bundleName = "com.sun.tools.javac.resources.launcher";
+    private ResourceBundle resourceBundle = null;
+    private String errorPrefix;
+
+    /**
+     * Returns a localized string from a resource bundle.
+     *
+     * @param error the error for which to get the localized text
+     * @return the localized string
+     */
+    private String getMessage(Error error) {
+        String key = error.key();
+        Object[] args = error.getArgs();
+        try {
+            if (resourceBundle == null) {
+                resourceBundle = ResourceBundle.getBundle(bundleName);
+                errorPrefix = resourceBundle.getString("launcher.error");
+            }
+            String resource = resourceBundle.getString(key);
+            String message = MessageFormat.format(resource, args);
+            return errorPrefix + message;
+        } catch (MissingResourceException e) {
+            return "Cannot access resource; " + key + Arrays.toString(args);
+        }
+    }
+
+    /**
+     * A listener to detect the first class found in a compilation.
+     */
+    static class MainClassListener implements TaskListener {
+        TypeElement mainClass;
+
+        MainClassListener(JavacTask t) {
+            t.addTaskListener(this);
+        }
+
+        @Override
+        public void started(TaskEvent ev) {
+            if (ev.getKind() == TaskEvent.Kind.ANALYZE && mainClass == null) {
+                TypeElement te = ev.getTypeElement();
+                if (te.getNestingKind() == NestingKind.TOP_LEVEL) {
+                    mainClass = te;
+                }
+            }
+        }
+    }
+
+    /**
+     * An object to encapulate the set of in-memory classes, such that
+     * they can be written by a file manager and subsequently used by
+     * a class loader.
+     */
+    private static class Context {
+        private Map<String, byte[]> inMemoryClasses = new HashMap<>();
+
+        JavaFileManager getFileManager(StandardJavaFileManager delegate) {
+            return new MemoryFileManager(inMemoryClasses, delegate);
+        }
+
+        ClassLoader getClassLoader(ClassLoader parent) {
+            return new MemoryClassLoader(inMemoryClasses, parent);
+        }
+    }
+
+    /**
+     * An in-memory file manager.
+     *
+     * <p>Class files (of kind {@link JavaFileObject.Kind#CLASS CLASS} written to
+     * {@link StandardLocation#CLASS_OUTPUT} will be written to an in-memory cache.
+     * All other file manager operations will be delegated to a specified file manager.
+     */
+    private static class MemoryFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+        private final Map<String, byte[]> map;
+
+        MemoryFileManager(Map<String, byte[]> map, JavaFileManager delegate) {
+            super(delegate);
+            this.map = map;
+        }
+
+        @Override
+        public JavaFileObject getJavaFileForOutput(Location location, String className,
+                JavaFileObject.Kind kind, FileObject sibling) throws IOException {
+            if (location == StandardLocation.CLASS_OUTPUT && kind == JavaFileObject.Kind.CLASS) {
+                return createInMemoryClassFile(className);
+            } else {
+                return super.getJavaFileForOutput(location, className, kind, sibling);
+            }
+        }
+
+        private JavaFileObject createInMemoryClassFile(String className) {
+            URI uri = URI.create("memory:///" + className.replace('.', '/') + ".class");
+            return new SimpleJavaFileObject(uri, JavaFileObject.Kind.CLASS) {
+                @Override
+                public OutputStream openOutputStream() {
+                    return new ByteArrayOutputStream() {
+                        @Override
+                        public void close() throws IOException {
+                            super.close();
+                            map.put(className, toByteArray());
+                        }
+                    };
+                }
+            };
+        }
+    }
+
+    /**
+     * An in-memory classloader, that uses an in-memory cache written by {@link MemoryFileManager}.
+     *
+     * <p>The classloader uses the standard parent-delegation model, just providing
+     * {@code findClass} to find classes in the in-memory cache.
+     */
+    private static class MemoryClassLoader extends ClassLoader {
+        private final Map<String, byte[]> map;
+
+        MemoryClassLoader(Map<String, byte[]> map, ClassLoader parent) {
+            super(parent);
+            this.map = map;
+        }
+
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            byte[] bytes = map.get(name);
+            if (bytes == null) {
+                throw new ClassNotFoundException(name);
+            }
+            return defineClass(name, bytes, 0, bytes.length);
+        }
+    }
+}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 82dddd48d77..1015702b6da 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -1702,6 +1702,7 @@ public class JavacParser implements Parser {
             }
             for (JCVariableDecl param: params) {
                 if (param.vartype != null && isRestrictedLocalVarTypeName(param.vartype)) {
+                    param.startPos = TreeInfo.getStartPos(param.vartype);
                     param.vartype = null;
                 }
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
new file mode 100644
index 00000000000..1721f9b5fc4
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
@@ -0,0 +1,136 @@
+#
+# 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.
+#
+
+# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
+# are preceded by a stylized comment describing the type of the corresponding
+# values.
+# The simple types currently in use are:
+#
+# annotation        annotation compound
+# boolean           true or false
+# diagnostic        a sub-message; see compiler.misc.*
+# fragment          similar to 'message segment', but with more specific type
+# modifier          a Java modifier; e.g. public, private, protected
+# file              a file URL
+# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
+# flag              a Flags.Flag instance
+# name              a name, typically a Java identifier
+# number            an integer
+# option name       the name of a command line option
+# source version    a source version number, such as 1.5, 1.6, 1.7
+# string            a general string
+# symbol            the name of a declared type
+# symbol kind       the kind of a symbol (i.e. method, variable)
+# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# token             the name of a non-terminal in source code; see compiler.misc.token.*
+# type              a Java type; e.g. int, X, X<T>
+# object            a Java object (unspecified)
+# unused            the value is not used in this message
+#
+# The following compound types are also used:
+#
+# collection of X   a comma-separated collection of items; e.g. collection of type
+# list of X         a comma-separated list of items; e.g. list of type
+# set of X          a comma-separated set of items; e.g. set of modifier
+#
+# These may be composed:
+#
+# list of type or message segment
+#
+# The following type aliases are supported:
+#
+# message segment --> diagnostic or fragment
+# file name --> file, path or file object
+#
+# Custom comments are supported in parenthesis i.e.
+#
+# number (classfile major version)
+#
+# These comments are used internally in order to generate an enum-like class declaration containing
+# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
+# by javac code to build diagnostics in a type-safe fashion.
+#
+# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
+# using info derived from the collected set of examples in test/tools/javac/diags/examples.
+# MessageInfo can also be run as a standalone utility providing more facilities
+# for manipulating this file. For more details, see MessageInfo.java.
+
+## All errors are preceded by this string.
+launcher.error=\
+    error:\u0020
+
+launcher.err.no.args=\
+    no filename
+
+# 0: string
+launcher.err.invalid.filename=\
+    invalid filename: {0}
+
+# 0: path
+launcher.err.file.not.found=\
+    file not found: {0}
+
+launcher.err.compilation.failed=\
+    compilation failed
+
+launcher.err.no.class=\
+    no class declared in file
+
+launcher.err.main.not.public.static=\
+    ''main'' method is not declared ''public static''
+
+launcher.err.main.not.void=\
+    ''main'' method is not declared with a return type of ''void''
+
+# 0: string
+launcher.err.cant.find.class=\
+    can''t find class: {0}
+
+# 0: string
+launcher.err.unexpected.class=\
+    class found on application class path: {0}
+
+# 0: string
+launcher.err.cant.find.main.method=\
+    can''t find main(String[]) method in class: {0}
+
+# 0: string
+launcher.err.cant.access.main.method=\
+    can''t access main method in class: {0}
+
+# 0: path, 1: object
+launcher.err.cant.read.file=\
+    error reading file {0}: {1}
+
+# 0: string
+launcher.err.no.value.for.option=\
+    no value given for option: {0}
+
+# 0: string
+launcher.err.invalid.value.for.source=\
+    invalid value for --source option: {0}
+
+launcher.err.enable.preview.requires.source=\
+    --enable-preview must be used with --source
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 27553a36027..bcc14ac0762 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -148,6 +148,36 @@ public class TreeInfo {
         }
     }
 
+    /** Is this tree a 'this' identifier?
+     */
+    public static boolean isThisQualifier(JCTree tree) {
+        switch (tree.getTag()) {
+            case PARENS:
+                return isThisQualifier(skipParens(tree));
+            case IDENT: {
+                JCIdent id = (JCIdent)tree;
+                return id.name == id.name.table.names._this;
+            }
+            default:
+                return false;
+        }
+    }
+
+    /** Is this tree an identifier, possibly qualified by 'this'?
+     */
+    public static boolean isIdentOrThisDotIdent(JCTree tree) {
+        switch (tree.getTag()) {
+            case PARENS:
+                return isIdentOrThisDotIdent(skipParens(tree));
+            case IDENT:
+                return true;
+            case SELECT:
+                return isThisQualifier(((JCFieldAccess)tree).selected);
+            default:
+                return false;
+        }
+    }
+
     /** Is this a call to super?
      */
     public static boolean isSuperCall(JCTree tree) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
index 4a35c665656..68dc7b959d4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
@@ -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
@@ -30,6 +30,7 @@ import java.util.Iterator;
 import com.sun.source.tree.ModuleTree.ModuleKind;
 import com.sun.source.tree.Tree.Kind;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Attribute.UnresolvedClass;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.util.*;
@@ -872,7 +873,11 @@ public class TreeMaker implements JCTree.Factory {
             result = QualIdent(e.value);
         }
         public void visitError(Attribute.Error e) {
-            result = Erroneous();
+            if (e instanceof UnresolvedClass) {
+                result = ClassLiteral(((UnresolvedClass) e).classType).setType(syms.classType);
+            } else {
+                result = Erroneous();
+            }
         }
         public void visitCompound(Attribute.Compound compound) {
             if (compound instanceof Attribute.TypeCompound) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
index 9c00ec9c261..ebb541623b8 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
@@ -283,47 +283,51 @@ final class P11Signature extends SignatureSpi {
             session = token.killSession(session);
             return;
         }
-        // "cancel" operation by finishing it
-        // XXX make sure all this always works correctly
-        if (mode == M_SIGN) {
-            try {
-                if (type == T_UPDATE) {
-                    token.p11.C_SignFinal(session.id(), 0);
-                } else {
-                    byte[] digest;
-                    if (type == T_DIGEST) {
-                        digest = md.digest();
-                    } else { // T_RAW
-                        digest = buffer;
+        try {
+            // "cancel" operation by finishing it
+            // XXX make sure all this always works correctly
+            if (mode == M_SIGN) {
+                try {
+                    if (type == T_UPDATE) {
+                        token.p11.C_SignFinal(session.id(), 0);
+                    } else {
+                        byte[] digest;
+                        if (type == T_DIGEST) {
+                            digest = md.digest();
+                        } else { // T_RAW
+                            digest = buffer;
+                        }
+                        token.p11.C_Sign(session.id(), digest);
                     }
-                    token.p11.C_Sign(session.id(), digest);
+                } catch (PKCS11Exception e) {
+                    throw new ProviderException("cancel failed", e);
                 }
-            } catch (PKCS11Exception e) {
-                throw new ProviderException("cancel failed", e);
-            }
-        } else { // M_VERIFY
-            try {
-                byte[] signature;
-                if (keyAlgorithm.equals("DSA")) {
-                    signature = new byte[40];
-                } else {
-                    signature = new byte[(p11Key.length() + 7) >> 3];
-                }
-                if (type == T_UPDATE) {
-                    token.p11.C_VerifyFinal(session.id(), signature);
-                } else {
-                    byte[] digest;
-                    if (type == T_DIGEST) {
-                        digest = md.digest();
-                    } else { // T_RAW
-                        digest = buffer;
+            } else { // M_VERIFY
+                try {
+                    byte[] signature;
+                    if (keyAlgorithm.equals("DSA")) {
+                        signature = new byte[40];
+                    } else {
+                        signature = new byte[(p11Key.length() + 7) >> 3];
                     }
-                    token.p11.C_Verify(session.id(), digest, signature);
+                    if (type == T_UPDATE) {
+                        token.p11.C_VerifyFinal(session.id(), signature);
+                    } else {
+                        byte[] digest;
+                        if (type == T_DIGEST) {
+                            digest = md.digest();
+                        } else { // T_RAW
+                            digest = buffer;
+                        }
+                        token.p11.C_Verify(session.id(), digest, signature);
+                    }
+                } catch (PKCS11Exception e) {
+                    // will fail since the signature is incorrect
+                    // XXX check error code
                 }
-            } catch (PKCS11Exception e) {
-                // will fail since the signature is incorrect
-                // XXX check error code
             }
+        } finally {
+            session = token.releaseSession(session);
         }
     }
 
@@ -342,6 +346,8 @@ final class P11Signature extends SignatureSpi {
             }
             initialized = true;
         } catch (PKCS11Exception e) {
+            // release session when initialization failed
+            session = token.releaseSession(session);
             throw new ProviderException("Initialization failed", e);
         }
         if (bytesProcessed != 0) {
@@ -511,6 +517,8 @@ final class P11Signature extends SignatureSpi {
                 }
                 bytesProcessed += len;
             } catch (PKCS11Exception e) {
+                initialized = false;
+                session = token.releaseSession(session);
                 throw new ProviderException(e);
             }
             break;
@@ -559,6 +567,8 @@ final class P11Signature extends SignatureSpi {
                 bytesProcessed += len;
                 byteBuffer.position(ofs + len);
             } catch (PKCS11Exception e) {
+                initialized = false;
+                session = token.releaseSession(session);
                 throw new ProviderException("Update failed", e);
             }
             break;
diff --git a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
index c093b75a490..eeae66e7cde 100644
--- a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+++ b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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,9 @@
 #include <jni.h>
 #include "jni_util.h"
 #include "impl/ecc_impl.h"
+#include "sun_security_ec_ECDHKeyAgreement.h"
+#include "sun_security_ec_ECKeyPairGenerator.h"
+#include "sun_security_ec_ECDSASignature.h"
 
 #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
 #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
diff --git a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
index 223002661f2..8bf3f441532 100644
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
@@ -37,7 +37,13 @@
 #include <wincrypt.h>
 #include <stdio.h>
 #include <memory>
-
+#include "sun_security_mscapi_Key.h"
+#include "sun_security_mscapi_KeyStore.h"
+#include "sun_security_mscapi_PRNG.h"
+#include "sun_security_mscapi_RSACipher.h"
+#include "sun_security_mscapi_RSAKeyPairGenerator.h"
+#include "sun_security_mscapi_RSAPublicKey.h"
+#include "sun_security_mscapi_RSASignature.h"
 
 #define OID_EKU_ANY         "2.5.29.37.0"
 
@@ -1313,7 +1319,7 @@ JNIEXPORT void JNICALL Java_sun_security_mscapi_KeyStore_removeCertificate
  * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_sun_security_mscapi_KeyStore_destroyKeyContainer
-  (JNIEnv *env, jclass clazz, jstring keyContainerName)
+  (JNIEnv *env, jobject clazz, jstring keyContainerName)
 {
     HCRYPTPROV hCryptProv = NULL;
     const char* pszKeyContainerName = NULL;
@@ -1435,7 +1441,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSACipher_encryptDecrypt
  * Signature: (J)[B
  */
 JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getPublicKeyBlob
-    (JNIEnv *env, jclass clazz, jlong hCryptKey) {
+    (JNIEnv *env, jobject clazz, jlong hCryptKey) {
 
     jbyteArray blob = NULL;
     DWORD dwBlobLen;
@@ -1486,7 +1492,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getPublicKeyB
  * Signature: ([B)[B
  */
 JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getExponent
-    (JNIEnv *env, jclass clazz, jbyteArray jKeyBlob) {
+    (JNIEnv *env, jobject clazz, jbyteArray jKeyBlob) {
 
     jbyteArray exponent = NULL;
     jbyte*     exponentBytes = NULL;
@@ -1542,7 +1548,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getExponent
  * Signature: ([B)[B
  */
 JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getModulus
-    (JNIEnv *env, jclass clazz, jbyteArray jKeyBlob) {
+    (JNIEnv *env, jobject clazz, jbyteArray jKeyBlob) {
 
     jbyteArray modulus = NULL;
     jbyte*     modulusBytes = NULL;
@@ -1815,7 +1821,7 @@ jbyteArray generateKeyBlob(
  * Signature: (I[B[B[B[B[B[B[B[B)[B
  */
 JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_KeyStore_generatePrivateKeyBlob
-    (JNIEnv *env, jclass clazz,
+    (JNIEnv *env, jobject clazz,
         jint jKeyBitLength,
         jbyteArray jModulus,
         jbyteArray jPublicExponent,
@@ -1852,7 +1858,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSASignature_generatePubli
  * Signature: ([BLjava/lang/String;I)Lsun/security/mscapi/RSAPrivateKey;
  */
 JNIEXPORT jobject JNICALL Java_sun_security_mscapi_KeyStore_storePrivateKey
-    (JNIEnv *env, jclass clazz, jbyteArray keyBlob, jstring keyContainerName,
+    (JNIEnv *env, jobject clazz, jbyteArray keyBlob, jstring keyContainerName,
      jint keySize)
 {
     HCRYPTPROV hCryptProv = NULL;
diff --git a/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c
index b23910b5469..064ad2f9933 100644
--- a/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c
+++ b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c
@@ -30,6 +30,13 @@
 #include "jni_util.h"
 #include "nativeCrypto.h"
 #include "nativeFunc.h"
+#include "com_oracle_security_ucrypto_NativeCipher.h"
+#include "com_oracle_security_ucrypto_NativeDigest.h"
+#include "com_oracle_security_ucrypto_NativeKey.h"
+#include "com_oracle_security_ucrypto_NativeKey.h"
+#include "com_oracle_security_ucrypto_NativeRSACipher.h"
+#include "com_oracle_security_ucrypto_NativeRSASignature.h"
+#include "com_oracle_security_ucrypto_UcryptoProvider.h"
 
 /*
  * Dumps out byte array in hex with and name and length info
diff --git a/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c
index bac407d3f72..6bc951fa3ba 100644
--- a/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c
+++ b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c
@@ -30,7 +30,7 @@
 #include "jni_util.h"
 #include "nativeCrypto.h"
 #include "nativeFunc.h"
-
+#include "com_oracle_security_ucrypto_NativeDigestMD.h"
 
 extern void throwOutOfMemoryError(JNIEnv *env, const char *msg);
 extern jbyte* getBytes(JNIEnv *env, jbyteArray bytes, int offset, int len);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
index c227c4d82c4..c642da22f2b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -49,6 +49,7 @@ import sun.jvm.hotspot.code.NMethod;
 import sun.jvm.hotspot.debugger.Address;
 import sun.jvm.hotspot.debugger.OopHandle;
 import sun.jvm.hotspot.classfile.ClassLoaderDataGraph;
+import sun.jvm.hotspot.memory.FileMapInfo;
 import sun.jvm.hotspot.memory.SymbolTable;
 import sun.jvm.hotspot.memory.SystemDictionary;
 import sun.jvm.hotspot.memory.Universe;
@@ -89,6 +90,7 @@ import sun.jvm.hotspot.ui.tree.OopTreeNodeAdapter;
 import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
 import sun.jvm.hotspot.utilities.AddressOps;
 import sun.jvm.hotspot.utilities.Assert;
+import sun.jvm.hotspot.utilities.CompactHashTable;
 import sun.jvm.hotspot.utilities.HeapProgressThunk;
 import sun.jvm.hotspot.utilities.LivenessPathElement;
 import sun.jvm.hotspot.utilities.MethodArray;
@@ -637,12 +639,22 @@ public class CommandProcessor {
         },
         new Command("symboldump", "symboldump", false) {
             public void doit(Tokens t) {
-                SymbolTable.getTheTable().symbolsDo(new SymbolTable.SymbolVisitor() {
+                SymbolTable theTable = SymbolTable.getTheTable();
+                theTable.symbolsDo(new SymbolTable.SymbolVisitor() {
                         public void visit(Symbol sym) {
                             sym.printValueOn(out);
                             out.println();
                         }
                     });
+                CompactHashTable sharedTable = theTable.getSharedTable();
+                if (sharedTable != null) {
+                    sharedTable.symbolsDo(new CompactHashTable.SymbolVisitor() {
+                            public void visit(Symbol sym) {
+                                sym.printValueOn(out);
+                                out.println();
+                            }
+                        });
+                }
             }
         },
         new Command("flags", "flags [ flag | -nd ]", false) {
@@ -1048,6 +1060,15 @@ public class CommandProcessor {
                     }
                     if (node == null) {
                         Type type = VM.getVM().getTypeDataBase().guessTypeForAddress(a);
+                        if (type == null && VM.getVM().isSharingEnabled()) {
+                            // Check if the value falls in the _md_region
+                            Address loc1 = a.getAddressAt(0);
+                            FileMapInfo cdsFileMapInfo = VM.getVM().getFileMapInfo();
+                            if (cdsFileMapInfo.inCopiedVtableSpace(loc1)) {
+                               type = cdsFileMapInfo.getTypeForVptrAddress(loc1);
+                            }
+
+                        }
                         if (type != null) {
                             out.println("Type is " + type.getName() + " (size of " + type.getSize() + ")");
                             node = new CTypeTreeNodeAdapter(a, type, null);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
index 6d5720b63a6..5f4bc5206c4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -33,9 +33,11 @@ import java.util.*;
 import sun.jvm.hotspot.code.*;
 import sun.jvm.hotspot.compiler.*;
 import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.epsilon.*;
 import sun.jvm.hotspot.gc.parallel.*;
 import sun.jvm.hotspot.gc.shared.*;
 import sun.jvm.hotspot.gc.g1.*;
+import sun.jvm.hotspot.gc.z.*;
 import sun.jvm.hotspot.interpreter.*;
 import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.oops.*;
@@ -1108,6 +1110,13 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
                             anno = "PSOldGen ";
                             bad = false;
                           }
+                        } else if (collHeap instanceof EpsilonHeap) {
+                          anno = "Epsilon ";
+                          bad = false;
+                        } else if (collHeap instanceof ZCollectedHeap) {
+                          ZCollectedHeap heap = (ZCollectedHeap) collHeap;
+                          anno = "ZHeap ";
+                          bad = false;
                         } else {
                           // Optimistically assume the oop isn't bad
                           anno = "[Unknown generation] ";
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/epsilon/EpsilonHeap.java
similarity index 51%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java
rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/epsilon/EpsilonHeap.java
index 8bf42f0415e..0c82492a22a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/epsilon/EpsilonHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,17 +22,25 @@
  *
  */
 
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.epsilon;
 
 import java.io.*;
 import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.utilities.*;
 
-public class StringTable extends sun.jvm.hotspot.utilities.Hashtable {
+import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.code.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.memory.*;
+
+public class EpsilonHeap extends CollectedHeap {
+
+  private static AddressField spaceField;
+  private static Field virtualSpaceField;
+  private ContiguousSpace space;
+  private VirtualSpace virtualSpace;
+
   static {
     VM.registerVMInitializedObserver(new Observer() {
         public void update(Observable o, Object data) {
@@ -41,37 +49,34 @@ public class StringTable extends sun.jvm.hotspot.utilities.Hashtable {
       });
   }
 
-  private static synchronized void initialize(TypeDataBase db) {
-    Type type = db.lookupType("StringTable");
-    theTableField  = type.getAddressField("_the_table");
+  private static void initialize(TypeDataBase db) {
+    Type type = db.lookupType("EpsilonHeap");
+    spaceField = type.getAddressField("_space");
+    virtualSpaceField = type.getField("_virtual_space");
   }
 
-  // Fields
-  private static AddressField theTableField;
-
-  // Accessors
-  public static StringTable getTheTable() {
-    Address tmp = theTableField.getValue();
-    return (StringTable) VMObjectFactory.newObject(StringTable.class, tmp);
-  }
-
-  public StringTable(Address addr) {
+  public EpsilonHeap(Address addr) {
     super(addr);
+    space = new ContiguousSpace(spaceField.getValue(addr));
+    virtualSpace = new VirtualSpace(addr.addOffsetTo(virtualSpaceField.getOffset()));
   }
 
-  public interface StringVisitor {
-    public void visit(Instance string);
+  @Override
+  public CollectedHeapName kind() {
+    return CollectedHeapName.EPSILON;
   }
 
-  public void stringsDo(StringVisitor visitor) {
-    ObjectHeap oh = VM.getVM().getObjectHeap();
-    int numBuckets = tableSize();
-    for (int i = 0; i < numBuckets; i++) {
-      for (HashtableEntry e = (HashtableEntry) bucket(i); e != null;
-           e = (HashtableEntry) e.next()) {
-        Instance s = (Instance)oh.newOop(e.literalValue().addOffsetToAsOopHandle(0));
-        visitor.visit(s);
-      }
-    }
+  public ContiguousSpace space() {
+    return space;
   }
+
+  @Override
+  public void printOn(PrintStream tty) {
+     MemRegion mr = reservedRegion();
+     tty.println("Epsilon heap");
+     tty.println(" reserved:  [" + mr.start() + ", " + mr.end() + "]");
+     tty.println(" committed: [" + virtualSpace.low() + ", " + virtualSpace.high() + "]");
+     tty.println(" used:      [" + space.bottom() + ", " + space.top() + "]");
+  }
+
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
index 7646a2ced6c..ec47fab40d3 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
@@ -75,6 +75,14 @@ public abstract class CollectedHeap extends VMObject {
 
   public abstract CollectedHeapName kind();
 
+  public String oopAddressDescription(OopHandle handle) {
+      return handle.toString();
+  }
+
+  public OopHandle oop_load_at(OopHandle handle, long offset) {
+      return handle.getOopHandleAt(offset);
+  }
+
   public void print() { printOn(System.out); }
   public void printOn(PrintStream tty) {
     MemRegion mr = reservedRegion();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
index e3d2d2929a4..654bb5bc241 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
@@ -35,6 +35,8 @@ public class CollectedHeapName {
   public static final CollectedHeapName PARALLEL = new CollectedHeapName("Parallel");
   public static final CollectedHeapName CMS = new CollectedHeapName("CMS");
   public static final CollectedHeapName G1 = new CollectedHeapName("G1");
+  public static final CollectedHeapName EPSILON = new CollectedHeapName("Epsilon");
+  public static final CollectedHeapName Z = new CollectedHeapName("Z");
 
   public String toString() {
     return name;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
index ca42ae805c8..9e3de41e606 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, 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
@@ -61,6 +61,12 @@ public enum GCCause {
 
   _dcmd_gc_run ("Diagnostic Command"),
 
+  _z_timer ("Timer"),
+  _z_warmup ("Warmup"),
+  _z_allocation_rate ("Allocation Rate"),
+  _z_allocation_stall ("Allocation Stall"),
+  _z_proactive ("Proactive"),
+
   _last_gc_cause ("ILLEGAL VALUE - last gc cause - ILLEGAL VALUE");
 
   private final String value;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
index 734cf496559..9bd81ff7a1d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
@@ -37,6 +37,8 @@ public enum GCName {
   ConcurrentMarkSweep ("ConcurrentMarkSweep"),
   G1Old ("G1Old"),
   G1Full ("G1Full"),
+  Z ("Z"),
+  NA ("N/A"),
   GCNameEndSentinel ("GCNameEndSentinel");
 
   private final String value;
@@ -48,4 +50,3 @@ public enum GCName {
     return value;
   }
 }
-
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddress.java
new file mode 100644
index 00000000000..b9ff2a1301e
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddress.java
@@ -0,0 +1,74 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+
+class ZAddress {
+    static long as_long(Address value) {
+        if (value == null) {
+            return 0;
+        }
+        return value.asLongValue();
+    };
+
+    static boolean is_null(Address value) {
+        return value == null;
+    }
+
+    static boolean is_weak_bad(Address value) {
+        return (as_long(value) & ZGlobals.ZAddressWeakBadMask()) != 0;
+    }
+
+    static boolean is_weak_good(Address value) {
+        return !is_weak_bad(value) && !is_null(value);
+    }
+
+    static boolean is_weak_good_or_null(Address value) {
+        return !is_weak_bad(value);
+    }
+
+    static long offset(Address address) {
+        return as_long(address) & ZGlobals.ZAddressOffsetMask;
+    }
+
+    static Address address(long value) {
+        VM vm = VM.getVM();
+        if (vm.getOS().equals("solaris") && vm.getCPU().equals("sparc")) {
+            value |= ZGlobals.ZAddressSpaceStart;
+        }
+
+        return ZOop.to_address(value);
+    }
+
+    static Address good(Address value) {
+        return address(offset(value) | ZGlobals.ZAddressGoodMask());
+    }
+
+    static Address good_or_null(Address value) {
+        return is_null(value) ? value : good(value);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java
new file mode 100644
index 00000000000..3d2d2c90869
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java
@@ -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.
+ *
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZAddressRangeMapForPageTable  extends VMObject {
+    private static AddressField mapField;
+
+    private static long AddressRangeShift = ZGlobals.ZPageSizeMinShift;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZAddressRangeMapForPageTable");
+
+        mapField = type.getAddressField("_map");
+    }
+
+    public ZAddressRangeMapForPageTable(Address addr) {
+        super(addr);
+    }
+
+    private Address map() {
+        return mapField.getValue(addr);
+    }
+
+    private long index_for_addr(Address addr) {
+        long index = ZAddress.offset(addr) >> AddressRangeShift;
+
+        return index;
+    }
+
+    Address get(Address addr) {
+        long index = index_for_addr(addr);
+
+        return map().getAddressAt(index * VM.getVM().getBytesPerLong());
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZBarrier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZBarrier.java
new file mode 100644
index 00000000000..64f494ba520
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZBarrier.java
@@ -0,0 +1,85 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+
+class ZBarrier {
+    private static boolean is_weak_good_or_null_fast_path(Address addr) {
+        return ZAddress.is_weak_good_or_null(addr);
+    }
+
+    private static Address weak_load_barrier_on_oop_slow_path(Address addr) {
+        return ZAddress.is_weak_good(addr) ? ZAddress.good(addr) : relocate_or_remap(addr);
+    }
+
+    private static boolean during_relocate() {
+        return ZGlobals.ZGlobalPhase() == ZGlobals.ZPhaseRelocate;
+    }
+
+    private static Address relocate(Address addr) {
+        ZHeap heap = zheap();
+        if (heap.is_relocating(addr)) {
+            // Forward
+            return heap.relocate_object(addr);
+        }
+
+        // Remap
+        return ZAddress.good(addr);
+    }
+
+    private static ZHeap zheap() {
+        ZCollectedHeap zCollectedHeap = (ZCollectedHeap)VM.getVM().getUniverse().heap();
+        return zCollectedHeap.heap();
+    }
+
+    private static Address remap(Address addr) {
+        ZHeap heap = zheap();
+        if (heap.is_relocating(addr)) {
+            // Forward
+            return heap.forward_object(addr);
+        }
+
+        // Remap
+        return ZAddress.good(addr);
+    }
+
+    private static Address relocate_or_remap(Address addr) {
+        return during_relocate() ? relocate(addr) : remap(addr);
+    }
+
+    static Address weak_barrier(Address o) {
+        // Fast path
+        if (is_weak_good_or_null_fast_path(o)) {
+            // Return the good address instead of the weak good address
+            // to ensure that the currently active heap view is used.
+            return ZAddress.good_or_null(o);
+        }
+
+        // Slow path
+        return weak_load_barrier_on_oop_slow_path(o);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZCollectedHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZCollectedHeap.java
new file mode 100644
index 00000000000..da30683387a
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZCollectedHeap.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, 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 sun.jvm.hotspot.gc.z;
+
+import java.io.PrintStream;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.debugger.OopHandle;
+import sun.jvm.hotspot.gc.shared.CollectedHeap;
+import sun.jvm.hotspot.gc.shared.CollectedHeapName;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for ZCollectedHeap.
+
+public class ZCollectedHeap extends CollectedHeap {
+
+    private static long zHeapFieldOffset;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    private static synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZCollectedHeap");
+
+        zHeapFieldOffset = type.getAddressField("_heap").getOffset();
+    }
+
+    public ZHeap heap() {
+        Address heapAddr = addr.addOffsetTo(zHeapFieldOffset);
+        return (ZHeap)VMObjectFactory.newObject(ZHeap.class, heapAddr);
+    }
+
+    @Override
+    public CollectedHeapName kind() {
+        return CollectedHeapName.Z;
+    }
+
+    @Override
+    public void printOn(PrintStream tty) {
+        heap().printOn(tty);
+    }
+
+    public ZCollectedHeap(Address addr) {
+        super(addr);
+    }
+
+    public OopHandle oop_load_at(OopHandle handle, long offset) {
+        assert(!VM.getVM().isCompressedOopsEnabled());
+
+        Address oopAddress = handle.getAddressAt(offset);
+
+        oopAddress = ZBarrier.weak_barrier(oopAddress);
+        if (oopAddress == null) {
+            return null;
+        }
+
+        return oopAddress.addOffsetToAsOopHandle(0);
+    }
+
+    public String oopAddressDescription(OopHandle handle) {
+        Address origOop = ZOop.to_address(handle);
+        Address loadBarrieredOop = ZBarrier.weak_barrier(origOop);
+        if (!origOop.equals(loadBarrieredOop)) {
+            return origOop + " (" + loadBarrieredOop.toString() + ")";
+        } else {
+            return handle.toString();
+        }
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTable.java
new file mode 100644
index 00000000000..bae77c55cd4
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTable.java
@@ -0,0 +1,117 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZForwardingTable extends VMObject {
+    private static AddressField tableField;
+    private static CIntegerField sizeField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZForwardingTable");
+
+        tableField = type.getAddressField("_table");
+        sizeField = type.getCIntegerField("_size");
+    }
+
+    public ZForwardingTable(Address addr) {
+        super(addr);
+    }
+
+    Address table() {
+        return tableField.getAddress(addr);
+    }
+
+    long size() {
+        return sizeField.getJLong(addr);
+    }
+
+    ZForwardingTableEntry at(ZForwardingTableCursor cursor) {
+        return new ZForwardingTableEntry(table().getAddressAt(cursor._value * VM.getVM().getBytesPerLong()));
+    }
+
+    ZForwardingTableEntry first(long from_index, ZForwardingTableCursor cursor) {
+        long mask = size() - 1;
+        long hash = ZHash.uint32_to_uint32(from_index);
+        cursor._value = hash & mask;
+        return at(cursor);
+    }
+
+    ZForwardingTableEntry next(ZForwardingTableCursor cursor) {
+        long mask = size() - 1;
+        cursor._value = (cursor._value + 1) & mask;
+        return at(cursor);
+    }
+
+    ZForwardingTableEntry find(long from_index, ZForwardingTableCursor cursor) {
+        // Reading entries in the table races with the atomic cas done for
+        // insertion into the table. This is safe because each entry is at
+        // most updated once (from -1 to something else).
+        ZForwardingTableEntry entry = first(from_index, cursor);
+        while (!entry.is_empty()) {
+            if (entry.from_index() == from_index) {
+                // Match found, return matching entry
+                return entry;
+            }
+
+            entry = next(cursor);
+        }
+
+        // Match not found, return empty entry
+        return entry;
+    }
+
+    ZForwardingTableEntry find(long from_index) {
+        ZForwardingTableCursor dummy = new ZForwardingTableCursor();
+        return find(from_index, dummy);
+    }
+
+    void dump() {
+        long s = size();
+        long count = 0;
+        System.out.println("Dumping ZForwardingTable[" + s + "]:");
+        ZForwardingTableCursor cursor = new ZForwardingTableCursor();
+        for (long i = 0; i < s; i++) {
+            cursor._value = i;
+            ZForwardingTableEntry entry = at(cursor);
+            if (!entry.is_empty()) {
+                long hash = ZHash.uint32_to_uint32(entry.from_index());
+                System.out.println(i + " " + count + " " + entry + " hash: " + hash + " masked_hash: " + (hash & (s - 1)));
+                count++;
+            }
+        }
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTableCursor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTableCursor.java
new file mode 100644
index 00000000000..034e3b6ab8a
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTableCursor.java
@@ -0,0 +1,29 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+class ZForwardingTableCursor {
+    long _value;
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTableEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTableEntry.java
new file mode 100644
index 00000000000..52b57699e5a
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZForwardingTableEntry.java
@@ -0,0 +1,55 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+
+class ZForwardingTableEntry {
+    private Address entry;
+
+    ZForwardingTableEntry(Address addr) {
+        entry = addr;
+    }
+
+    private static long empty() {
+        return ~0L;
+    }
+
+    boolean is_empty() {
+        return entry.asLongValue() == empty();
+    }
+
+    Address to_offset() {
+        return entry.andWithMask((1L << 42) - 1);
+    }
+
+    long from_index() {
+        return entry.asLongValue() >>> 42;
+    }
+
+    public String toString() {
+        return entry + " - from_index: " + from_index() + " to_offset: " + to_offset();
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java
new file mode 100644
index 00000000000..174e7a62553
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java
@@ -0,0 +1,118 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.types.Field;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZGlobals {
+    private static Field instanceField;
+
+    // Global phase state
+    public static int ZPhaseRelocate;
+
+    public static byte ZPageTypeSmall;
+    public static byte ZPageTypeMedium;
+    public static byte ZPageTypeLarge;
+
+    // Page size shifts
+    public static long ZPageSizeSmallShift;
+    public static long ZPageSizeMediumShift;
+    public static long ZPageSizeMinShift;
+
+    // Object alignment shifts
+    public static int  ZObjectAlignmentMediumShift;
+    public static int  ZObjectAlignmentLargeShift;
+
+    // Pointer part of address
+    public static long ZAddressOffsetShift;
+
+    // Pointer part of address
+    public static long ZAddressOffsetBits;
+    public static long ZAddressOffsetMask;
+
+    // Address space start/end/size
+    public static long ZAddressSpaceStart;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZGlobalsForVMStructs");
+
+        instanceField = type.getField("_instance_p");
+
+        ZPhaseRelocate = db.lookupIntConstant("ZPhaseRelocate").intValue();
+
+        ZPageTypeSmall = db.lookupIntConstant("ZPageTypeSmall").byteValue();
+        ZPageTypeMedium = db.lookupIntConstant("ZPageTypeMedium").byteValue();
+        ZPageTypeLarge = db.lookupIntConstant("ZPageTypeLarge").byteValue();
+
+        ZPageSizeSmallShift = db.lookupLongConstant("ZPageSizeSmallShift").longValue();
+        ZPageSizeMediumShift = db.lookupLongConstant("ZPageSizeMediumShift").longValue();
+        ZPageSizeMinShift = db.lookupLongConstant("ZPageSizeMinShift").longValue();
+
+        ZObjectAlignmentMediumShift = db.lookupIntConstant("ZObjectAlignmentMediumShift").intValue();
+        ZObjectAlignmentLargeShift = db.lookupIntConstant("ZObjectAlignmentLargeShift").intValue();;
+
+        ZAddressOffsetShift = db.lookupLongConstant("ZAddressOffsetShift").longValue();
+
+        ZAddressOffsetBits = db.lookupLongConstant("ZAddressOffsetBits").longValue();
+        ZAddressOffsetMask = db.lookupLongConstant("ZAddressOffsetMask").longValue();
+
+        ZAddressSpaceStart = db.lookupLongConstant("ZAddressSpaceStart").longValue();
+    }
+
+    private static ZGlobalsForVMStructs instance() {
+        return new ZGlobalsForVMStructs(instanceField.getAddress());
+    }
+
+    public static int ZGlobalPhase() {
+        return instance().ZGlobalPhase();
+    }
+
+    public static long ZAddressGoodMask() {
+        return instance().ZAddressGoodMask();
+    }
+
+    public static long ZAddressBadMask() {
+        return instance().ZAddressBadMask();
+    }
+
+    public static long ZAddressWeakBadMask() {
+        return instance().ZAddressWeakBadMask();
+    }
+
+    public static int ZObjectAlignmentSmallShift() {
+        return instance().ZObjectAlignmentSmallShift();
+    }
+
+    public static int ZObjectAlignmentSmall() {
+        return instance().ZObjectAlignmentSmall();
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobalsForVMStructs.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobalsForVMStructs.java
new file mode 100644
index 00000000000..a6bfb3a33c2
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobalsForVMStructs.java
@@ -0,0 +1,84 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+class ZGlobalsForVMStructs extends VMObject {
+    private static AddressField ZGlobalPhaseField;
+    private static AddressField ZAddressGoodMaskField;
+    private static AddressField ZAddressBadMaskField;
+    private static AddressField ZAddressWeakBadMaskField;
+    private static AddressField ZObjectAlignmentSmallShiftField;
+    private static AddressField ZObjectAlignmentSmallField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZGlobalsForVMStructs");
+
+        ZGlobalPhaseField = type.getAddressField("_ZGlobalPhase");
+        ZAddressGoodMaskField = type.getAddressField("_ZAddressGoodMask");
+        ZAddressBadMaskField = type.getAddressField("_ZAddressBadMask");
+        ZAddressWeakBadMaskField = type.getAddressField("_ZAddressWeakBadMask");
+        ZObjectAlignmentSmallShiftField = type.getAddressField("_ZObjectAlignmentSmallShift");
+        ZObjectAlignmentSmallField = type.getAddressField("_ZObjectAlignmentSmall");
+    }
+
+    ZGlobalsForVMStructs(Address addr) {
+        super(addr);
+    }
+
+    int ZGlobalPhase() {
+        return ZGlobalPhaseField.getValue(addr).getJIntAt(0);
+    }
+
+    long ZAddressGoodMask() {
+        return ZAddressGoodMaskField.getValue(addr).getJLongAt(0);
+    }
+
+    long ZAddressBadMask() {
+        return ZAddressBadMaskField.getValue(addr).getJLongAt(0);
+    }
+
+    long ZAddressWeakBadMask() {
+        return ZAddressWeakBadMaskField.getValue(addr).getJLongAt(0);
+    }
+
+    int ZObjectAlignmentSmallShift() {
+        return ZObjectAlignmentSmallShiftField.getValue(addr).getJIntAt(0);
+    }
+
+    int ZObjectAlignmentSmall() {
+        return ZObjectAlignmentSmallField.getValue(addr).getJIntAt(0);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZHash.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZHash.java
new file mode 100644
index 00000000000..b4300a9304a
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZHash.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 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
+ * 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 sun.jvm.hotspot.gc.z;
+
+class ZHash {
+    private static long uint32(long value) {
+        return value & 0xFFFFFFFFL;
+    }
+
+    static long uint32_to_uint32(long key) {
+        key = uint32(~key + (key << 15));
+        key = uint32(key ^ (key >> 12));
+        key = uint32(key + (key << 2));
+        key = uint32(key ^ (key >> 4));
+        key = uint32(key * 2057);
+        key = uint32(key ^ (key >> 16));
+        return key;
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZHeap.java
new file mode 100644
index 00000000000..f6b7a70aa5a
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZHeap.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2017, 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 sun.jvm.hotspot.gc.z;
+
+import java.io.PrintStream;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for ZHeap
+
+public class ZHeap extends VMObject {
+
+    private static long pageAllocatorFieldOffset;
+    private static long pageTableFieldOffset;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    private static synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZHeap");
+
+        pageAllocatorFieldOffset = type.getAddressField("_page_allocator").getOffset();
+        pageTableFieldOffset = type.getAddressField("_pagetable").getOffset();
+    }
+
+    public ZHeap(Address addr) {
+        super(addr);
+    }
+
+    private ZPageAllocator pageAllocator() {
+        Address pageAllocatorAddr = addr.addOffsetTo(pageAllocatorFieldOffset);
+        return (ZPageAllocator)VMObjectFactory.newObject(ZPageAllocator.class, pageAllocatorAddr);
+    }
+
+    ZPageTable pageTable() {
+        return (ZPageTable)VMObjectFactory.newObject(ZPageTable.class, addr.addOffsetTo(pageTableFieldOffset));
+    }
+
+    public long maxCapacity() {
+        return pageAllocator().maxCapacity();
+    }
+
+    public long capacity() {
+        return pageAllocator().capacity();
+    }
+
+    public long used() {
+        return pageAllocator().used();
+    }
+
+    boolean is_relocating(Address o) {
+        return pageTable().is_relocating(o);
+    }
+
+    Address forward_object(Address addr) {
+        ZPage page = pageTable().get(addr);
+        return page.forward_object(addr);
+    }
+
+    Address relocate_object(Address addr) {
+        ZPage page = pageTable().get(addr);
+        return page.relocate_object(addr);
+    }
+
+    public void printOn(PrintStream tty) {
+        tty.print(" ZHeap          ");
+        tty.print("used " + (used() / 1024 / 1024) + "M, ");
+        tty.print("capacity " + (capacity() / 1024 / 1024) + "M, ");
+        tty.println("max capacity " + (maxCapacity() / 1024 / 1024) + "M");
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZOop.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZOop.java
new file mode 100644
index 00000000000..20d8e0decbc
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZOop.java
@@ -0,0 +1,48 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.debugger.OopHandle;
+import sun.jvm.hotspot.runtime.VM;
+
+class ZOop {
+    private static final long MSB = ~0L ^ (~0L >>> 1);
+
+    private static Address msbAddress() {
+        return VM.getVM().getUniverse().heap().start().orWithMask(MSB).andWithMask(MSB);
+    }
+
+    static Address to_address(long value) {
+        // If the value of an Address becomes 0, null is returned instead of an Address.
+        // Start with a one-bit address and as a last step, remove that bit.
+        Address oneAddress = msbAddress();
+        return oneAddress.orWithMask(value).xorWithMask(ZAddress.as_long(oneAddress));
+    }
+
+    static Address to_address(OopHandle oop) {
+        return to_address(ZAddress.as_long(oop));
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPage.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPage.java
new file mode 100644
index 00000000000..806b1d66774
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPage.java
@@ -0,0 +1,108 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZPage extends VMObject {
+    private static CIntegerField typeField;
+    private static long virtualFieldOffset;
+    private static long forwardingFieldOffset;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZPage");
+
+        typeField = type.getCIntegerField("_type");
+        virtualFieldOffset = type.getField("_virtual").getOffset();
+        forwardingFieldOffset = type.getField("_forwarding").getOffset();
+    }
+
+    public ZPage(Address addr) {
+        super(addr);
+    }
+
+    private byte type() {
+        return typeField.getJByte(addr);
+    }
+
+    private ZVirtualMemory virtual() {
+        return (ZVirtualMemory)VMObjectFactory.newObject(ZVirtualMemory.class, addr.addOffsetTo(virtualFieldOffset));
+    }
+
+    private ZForwardingTable forwarding() {
+        return (ZForwardingTable)VMObjectFactory.newObject(ZForwardingTable.class, addr.addOffsetTo(forwardingFieldOffset));
+    }
+
+    private long start() {
+        return virtual().start();
+    }
+
+    Address forward_object(Address from) {
+        // Lookup address in forwarding table
+        long from_offset = ZAddress.offset(from);
+        long from_index = (from_offset - start()) >> object_alignment_shift();
+        ZForwardingTableEntry entry = forwarding().find(from_index);
+        assert(!entry.is_empty());
+        assert(entry.from_index() == from_index);
+
+        return ZAddress.good(entry.to_offset());
+    }
+
+    Address relocate_object(Address from) {
+        // Lookup address in forwarding table
+        long from_offset = ZAddress.offset(from);
+        long from_index = (from_offset - start()) >> object_alignment_shift();
+        ZForwardingTableEntry entry = forwarding().find(from_index);
+        if (!entry.is_empty() && entry.from_index() == from_index) {
+          return ZAddress.good(entry.to_offset());
+        }
+
+        // There's no relocate operation in the SA.
+        // Mimic object pinning and return the good view of the from object.
+        return ZAddress.good(from);
+    }
+
+
+    long object_alignment_shift() {
+        if (type() == ZGlobals.ZPageTypeSmall) {
+            return ZGlobals.ZObjectAlignmentSmallShift();
+        } else if (type() == ZGlobals.ZPageTypeMedium) {
+            return ZGlobals.ZObjectAlignmentMediumShift;
+        } else {
+            assert(type() == ZGlobals.ZPageTypeLarge);
+            return ZGlobals.ZObjectAlignmentLargeShift;
+        }
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageAllocator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageAllocator.java
new file mode 100644
index 00000000000..07e859097fa
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageAllocator.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 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
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for ZPageAllocator
+
+public class ZPageAllocator extends VMObject {
+
+    private static AddressField physicalField;
+    private static CIntegerField usedField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZPageAllocator");
+
+        physicalField = type.getAddressField("_physical");
+        usedField = type.getCIntegerField("_used");
+    }
+
+    private ZPhysicalMemoryManager physical() {
+      Address physicalAddr = physicalField.getValue(addr);
+      return (ZPhysicalMemoryManager)VMObjectFactory.newObject(ZPhysicalMemoryManager.class, physicalAddr);
+    }
+
+    public long maxCapacity() {
+        return physical().maxCapacity();
+    }
+
+    public long capacity() {
+        return physical().capacity();
+    }
+
+    public long used() {
+        return usedField.getValue(addr);
+    }
+
+    public ZPageAllocator(Address addr) {
+        super(addr);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTable.java
new file mode 100644
index 00000000000..128f03d63db
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTable.java
@@ -0,0 +1,66 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZPageTable extends VMObject {
+    private static long mapFieldOffset;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZPageTable");
+
+        mapFieldOffset = type.getAddressField("_map").getOffset();
+    }
+
+    public ZPageTable(Address addr) {
+        super(addr);
+    }
+
+    private ZAddressRangeMapForPageTable map() {
+        return (ZAddressRangeMapForPageTable)VMObjectFactory.newObject(ZAddressRangeMapForPageTable.class, addr.addOffsetTo(mapFieldOffset));
+    }
+
+    private ZPageTableEntry getEntry(Address o) {
+        return new ZPageTableEntry(map().get(o));
+    }
+
+    ZPage get(Address o) {
+        return getEntry(o).page();
+    }
+
+    boolean is_relocating(Address o) {
+        return getEntry(o).relocating();
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTableEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTableEntry.java
new file mode 100644
index 00000000000..8b7af88213f
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTableEntry.java
@@ -0,0 +1,44 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+
+class ZPageTableEntry {
+    Address entry;
+
+    ZPageTableEntry(Address address) {
+        entry = address;
+    }
+
+    ZPage page() {
+        return (ZPage)VMObjectFactory.newObject(ZPage.class, entry.andWithMask(~1L));
+    }
+
+    boolean relocating() {
+        return (entry.asLongValue() & 1) == 1;
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPhysicalMemoryManager.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPhysicalMemoryManager.java
new file mode 100644
index 00000000000..32e006a9fb9
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPhysicalMemoryManager.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 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
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for ZPhysicalMemoryManager
+
+public class ZPhysicalMemoryManager extends VMObject {
+
+    private static CIntegerField capacityField;
+
+    private static CIntegerField maxCapacityField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    private static synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZPhysicalMemoryManager");
+
+        capacityField = type.getCIntegerField("_capacity");
+        maxCapacityField = type.getCIntegerField("_max_capacity");
+    }
+
+    public long capacity() {
+        return capacityField.getValue(addr);
+    }
+
+    public long maxCapacity() {
+        return maxCapacityField.getValue(addr);
+    }
+
+    public ZPhysicalMemoryManager(Address addr) {
+        super(addr);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZVirtualMemory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZVirtualMemory.java
new file mode 100644
index 00000000000..60d0babc0cb
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZVirtualMemory.java
@@ -0,0 +1,60 @@
+/*
+ * 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 sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZVirtualMemory extends VMObject {
+    private static CIntegerField startField;
+    private static CIntegerField endField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZVirtualMemory");
+
+        startField = type.getCIntegerField("_start");
+        endField = type.getCIntegerField("_end");
+    }
+
+    public ZVirtualMemory(Address addr) {
+        super(addr);
+    }
+
+    long start() {
+        return startField.getJLong(addr);
+    }
+
+    long end() {
+        return endField.getJLong(addr);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java
index e2231b53ecb..f1082d5538f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, 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
@@ -65,6 +65,10 @@ public class SymbolTable extends sun.jvm.hotspot.utilities.Hashtable {
     return table;
   }
 
+  public CompactHashTable getSharedTable() {
+      return sharedTable;
+  }
+
   public static long getSeed() {
       return (long) seedField.getValue();
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java
index 2681910c314..45257e126fb 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java
@@ -24,17 +24,27 @@
 
 package sun.jvm.hotspot.memory;
 
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
+import java.io.PrintStream;
+import java.util.Observable;
+import java.util.Observer;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.debugger.OopHandle;
 import sun.jvm.hotspot.gc.cms.CMSHeap;
-import sun.jvm.hotspot.gc.serial.SerialHeap;
-import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.gc.epsilon.EpsilonHeap;
 import sun.jvm.hotspot.gc.g1.G1CollectedHeap;
-import sun.jvm.hotspot.gc.parallel.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.gc.parallel.ParallelScavengeHeap;
+import sun.jvm.hotspot.gc.serial.SerialHeap;
+import sun.jvm.hotspot.gc.shared.CollectedHeap;
+import sun.jvm.hotspot.gc.z.ZCollectedHeap;
+import sun.jvm.hotspot.oops.Oop;
+import sun.jvm.hotspot.runtime.BasicType;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VirtualConstructor;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
 
 
 public class Universe {
@@ -72,16 +82,34 @@ public class Universe {
       });
   }
 
+  private static boolean typeExists(TypeDataBase db, String type) {
+      try {
+          db.lookupType(type);
+      } catch (RuntimeException e) {
+          return false;
+      }
+      return true;
+  }
+
+  private static void addHeapTypeIfInDB(TypeDataBase db, Class heapClass) {
+      String heapName = heapClass.getSimpleName();
+      if (typeExists(db, heapName)) {
+          heapConstructor.addMapping(heapName, heapClass);
+      }
+  }
+
   private static synchronized void initialize(TypeDataBase db) {
     Type type = db.lookupType("Universe");
 
     collectedHeapField = type.getAddressField("_collectedHeap");
 
     heapConstructor = new VirtualConstructor(db);
-    heapConstructor.addMapping("CMSHeap", CMSHeap.class);
-    heapConstructor.addMapping("SerialHeap", SerialHeap.class);
-    heapConstructor.addMapping("ParallelScavengeHeap", ParallelScavengeHeap.class);
-    heapConstructor.addMapping("G1CollectedHeap", G1CollectedHeap.class);
+    addHeapTypeIfInDB(db, CMSHeap.class);
+    addHeapTypeIfInDB(db, SerialHeap.class);
+    addHeapTypeIfInDB(db, ParallelScavengeHeap.class);
+    addHeapTypeIfInDB(db, G1CollectedHeap.class);
+    addHeapTypeIfInDB(db, EpsilonHeap.class);
+    addHeapTypeIfInDB(db, ZCollectedHeap.class);
 
     mainThreadGroupField   = type.getOopField("_main_thread_group");
     systemThreadGroupField = type.getOopField("_system_thread_group");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
index f7c0a625942..7bb9a8280ab 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
@@ -34,6 +34,7 @@ import java.util.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.gc.cms.*;
 import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.gc.epsilon.*;
 import sun.jvm.hotspot.gc.g1.*;
 import sun.jvm.hotspot.gc.parallel.*;
 import sun.jvm.hotspot.memory.*;
@@ -438,11 +439,13 @@ public class ObjectHeap {
     } else if (heap instanceof G1CollectedHeap) {
         G1CollectedHeap g1h = (G1CollectedHeap) heap;
         g1h.heapRegionIterate(lrc);
+    } else if (heap instanceof EpsilonHeap) {
+       EpsilonHeap eh = (EpsilonHeap) heap;
+       liveRegions.add(eh.space().top());
+       liveRegions.add(eh.space().bottom());
     } else {
        if (Assert.ASSERTS_ENABLED) {
-          Assert.that(false, "Expecting GenCollectedHeap, G1CollectedHeap, " +
-                      "or ParallelScavengeHeap, but got " +
-                      heap.getClass().getName());
+          Assert.that(false, "Unexpected CollectedHeap type: " + heap.getClass().getName());
        }
     }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
index c0776dbad2b..7ecd13ddbd2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
@@ -164,7 +164,7 @@ public class Oop {
       tty.print("null");
     } else {
       obj.printValueOn(tty);
-      tty.print(" @ " + obj.getHandle());
+      tty.print(" @ " + VM.getVM().getUniverse().heap().oopAddressDescription(obj.getHandle()));
     }
   }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java
index 2fb7f5ace8a..7e85349a104 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java
@@ -54,7 +54,8 @@ public class OopField extends Field {
     if (!isVMField() && !obj.isInstance() && !obj.isArray()) {
       throw new InternalError(obj.toString());
     }
-    return obj.getHandle().getOopHandleAt(getOffset());
+
+    return VM.getVM().getUniverse().heap().oop_load_at(obj.getHandle(), getOffset());
   }
 
   public Oop getValue(VMObject obj) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
index bbfe6e65e99..05e695386d4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
@@ -79,7 +79,6 @@ public class VM {
   private Universe     universe;
   private ObjectHeap   heap;
   private SymbolTable  symbols;
-  private StringTable  strings;
   private SystemDictionary dict;
   private ClassLoaderDataGraph cldGraph;
   private Threads      threads;
@@ -655,13 +654,6 @@ public class VM {
     return symbols;
   }
 
-  public StringTable getStringTable() {
-    if (strings == null) {
-      strings = StringTable.getTheTable();
-    }
-    return strings;
-  }
-
   public SystemDictionary getSystemDictionary() {
     if (dict == null) {
       dict = new SystemDictionary();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java
index 1ff5ee777c1..d7530286f87 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -54,6 +54,7 @@ public enum VMOps {
   CMS_Initial_Mark,
   CMS_Final_Remark,
   G1CollectFull,
+  ZOperation,
   G1CollectForAllocation,
   G1IncCollectionPause,
   EnableBiasedLocking,
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
index 0d81604e7d5..5496dc38b56 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
@@ -25,10 +25,12 @@
 package sun.jvm.hotspot.tools;
 
 import java.util.*;
+import sun.jvm.hotspot.gc.epsilon.*;
 import sun.jvm.hotspot.gc.g1.*;
 import sun.jvm.hotspot.gc.parallel.*;
 import sun.jvm.hotspot.gc.serial.*;
 import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.gc.z.*;
 import sun.jvm.hotspot.debugger.JVMDebugger;
 import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.oops.*;
@@ -124,12 +126,17 @@ public class HeapSummary extends Tool {
          printValMB("used     = ", oldGen.used());
          printValMB("free     = ", oldFree);
          System.out.println(alignment + (double)oldGen.used() * 100.0 / oldGen.capacity() + "% used");
+      } else if (heap instanceof EpsilonHeap) {
+         EpsilonHeap eh = (EpsilonHeap) heap;
+         printSpace(eh.space());
+      } else if (heap instanceof ZCollectedHeap) {
+         ZCollectedHeap zheap = (ZCollectedHeap) heap;
+         zheap.printOn(System.out);
       } else {
          throw new RuntimeException("unknown CollectedHeap type : " + heap.getClass());
       }
 
       System.out.println();
-      printInternStringStatistics();
    }
 
    // Helper methods
@@ -162,6 +169,20 @@ public class HeapSummary extends Tool {
            return;
        }
 
+       l = getFlagValue("UseEpsilonGC", flagMap);
+       if (l == 1L) {
+           System.out.println("Epsilon (no-op) GC");
+           return;
+       }
+
+       l = getFlagValue("UseZGC", flagMap);
+       if (l == 1L) {
+           System.out.print("ZGC ");
+           l = getFlagValue("ParallelGCThreads", flagMap);
+           System.out.println("with " + l + " thread(s)");
+           return;
+       }
+
        System.out.println("Mark Sweep Compact GC");
    }
 
@@ -258,41 +279,4 @@ public class HeapSummary extends Tool {
          return -1;
       }
    }
-
-   private void printInternStringStatistics() {
-      class StringStat implements StringTable.StringVisitor {
-         private int count;
-         private long size;
-         private OopField stringValueField;
-
-         StringStat() {
-            VM vm = VM.getVM();
-            SystemDictionary sysDict = vm.getSystemDictionary();
-            InstanceKlass strKlass = sysDict.getStringKlass();
-            // String has a field named 'value' of type 'byte[]'.
-            stringValueField = (OopField) strKlass.findField("value", "[B");
-         }
-
-         private long stringSize(Instance instance) {
-            // We include String content in size calculation.
-            return instance.getObjectSize() +
-                   stringValueField.getValue(instance).getObjectSize();
-         }
-
-         public void visit(Instance str) {
-            count++;
-            size += stringSize(str);
-         }
-
-         public void print() {
-            System.out.println(count +
-                  " interned Strings occupying " + size + " bytes.");
-         }
-      }
-
-      StringStat stat = new StringStat();
-      StringTable strTable = VM.getVM().getStringTable();
-      strTable.stringsDo(stat);
-      stat.print();
-   }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java
index e03a85531fe..a136a3cf35f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -119,4 +119,39 @@ public class CompactHashTable extends VMObject {
     }
     return null;
   }
+
+  public interface SymbolVisitor {
+    public void visit(Symbol sym);
+  }
+
+  public void symbolsDo(SymbolVisitor visitor) {
+    long    symOffset;
+    Symbol  sym;
+    Address baseAddress = baseAddressField.getValue(addr);
+    Address bucket = bucketsField.getValue(addr);
+    for (long index = 0; index < bucketCount(); index++) {
+      int bucketInfo = (int)bucket.getCIntegerAt(index * uintSize, uintSize, true);
+      int bucketOffset = bucketOffset(bucketInfo);
+      int nextBucketInfo = (int)bucket.getCIntegerAt((index+1) * uintSize, uintSize, true);
+      int nextBucketOffset = bucketOffset(nextBucketInfo);
+
+      Address entry = entriesField.getValue(addr).addOffsetTo(bucketOffset * uintSize);
+
+      if (isValueOnlyBucket(bucketInfo)) {
+        symOffset = entry.getCIntegerAt(0, uintSize, true);
+        sym = Symbol.create(baseAddress.addOffsetTo(symOffset));
+        visitor.visit(sym);
+      } else {
+        Address entryMax = entriesField.getValue(addr).addOffsetTo(nextBucketOffset * uintSize);
+        while (entry.lessThan(entryMax)) {
+          symOffset = entry.getCIntegerAt(uintSize, uintSize, true);
+          Address symAddr = baseAddress.addOffsetTo(symOffset);
+          sym = Symbol.create(symAddr);
+          visitor.visit(sym);
+          entry = entry.addOffsetTo(2 * uintSize);
+        }
+      }
+    }
+  }
 }
+
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/DefaultTerminal2.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/DefaultTerminal2.java
new file mode 100644
index 00000000000..56fe18050cc
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/DefaultTerminal2.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import jdk.internal.jline.internal.InfoCmp;
+
+/**
+ * Terminal wrapper with default ansi capabilities
+ */
+public class DefaultTerminal2 implements Terminal2 {
+
+    private final Terminal terminal;
+    private final Set<String> bools = new HashSet<String>();
+    private final Map<String, String> strings = new HashMap<String, String>();
+
+    public DefaultTerminal2(Terminal terminal) {
+        this.terminal = terminal;
+        registerCap("key_backspace", "^H");
+        registerCap("bell", "^G");
+        registerCap("carriage_return", "^M");
+        if (true/*isSupported() && isAnsiSupported()*/) {
+            registerCap("clr_eol", "\\E[K");
+            registerCap("clr_bol", "\\E[1K");
+            registerCap("cursor_up", "\\E[A");
+            registerCap("cursor_down", "^J");
+            registerCap("column_address", "\\E[%i%p1%dG");
+            registerCap("clear_screen", "\\E[H\\E[2J");
+            registerCap("parm_down_cursor", "\\E[%p1%dB");
+            registerCap("cursor_left", "^H");
+            registerCap("cursor_right", "\\E[C");
+        }
+        if (hasWeirdWrap()) {
+            registerCap("eat_newline_glitch");
+            registerCap("auto_right_margin");
+        }
+    }
+
+    public void init() throws Exception {
+        terminal.init();
+    }
+
+    public void restore() throws Exception {
+        terminal.restore();
+    }
+
+    public void reset() throws Exception {
+        terminal.reset();
+    }
+
+    public boolean isSupported() {
+        return terminal.isSupported();
+    }
+
+    public int getWidth() {
+        return terminal.getWidth();
+    }
+
+    public int getHeight() {
+        return terminal.getHeight();
+    }
+
+    public boolean isAnsiSupported() {
+        return terminal.isAnsiSupported();
+    }
+
+    public OutputStream wrapOutIfNeeded(OutputStream out) {
+        return terminal.wrapOutIfNeeded(out);
+    }
+
+    public InputStream wrapInIfNeeded(InputStream in) throws IOException {
+        return terminal.wrapInIfNeeded(in);
+    }
+
+    public boolean hasWeirdWrap() {
+        return terminal.hasWeirdWrap();
+    }
+
+    public boolean isEchoEnabled() {
+        return terminal.isEchoEnabled();
+    }
+
+    public void setEchoEnabled(boolean enabled) {
+        terminal.setEchoEnabled(enabled);
+    }
+
+    public void disableInterruptCharacter() {
+        terminal.disableInterruptCharacter();
+    }
+
+    public void enableInterruptCharacter() {
+        terminal.enableInterruptCharacter();
+    }
+
+    public String getOutputEncoding() {
+        return terminal.getOutputEncoding();
+    }
+
+    private void registerCap(String cap, String value) {
+        for (String key : InfoCmp.getNames(cap)) {
+            strings.put(key, value);
+        }
+    }
+
+    private void registerCap(String cap) {
+        Collections.addAll(bools, InfoCmp.getNames(cap));
+    }
+
+    public boolean getBooleanCapability(String capability) {
+        return bools.contains(capability);
+    }
+
+    public Integer getNumericCapability(String capability) {
+        return null;
+    }
+
+    public String getStringCapability(String capability) {
+        return strings.get(capability);
+    }
+
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java
index 7f27a61d511..a5b337c1006 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,6 +18,8 @@ package jdk.internal.jline;
 public class NoInterruptUnixTerminal
     extends UnixTerminal
 {
+    private String intr;
+
     public NoInterruptUnixTerminal() throws Exception {
         super();
     }
@@ -25,12 +27,20 @@ public class NoInterruptUnixTerminal
     @Override
     public void init() throws Exception {
         super.init();
-        getSettings().set("intr undef");
+        intr = getSettings().getPropertyAsString("intr");
+        if ("<undef>".equals(intr)) {
+            intr = null;
+        }
+        if (intr != null) {
+            getSettings().undef("intr");
+        }
     }
 
     @Override
     public void restore() throws Exception {
-        getSettings().set("intr ^C");
+        if (intr != null) {
+            getSettings().set("intr", intr);
+        }
         super.restore();
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/OSvTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/OSvTerminal.java
new file mode 100644
index 00000000000..f0cca172f78
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/OSvTerminal.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline;
+
+import jdk.internal.jline.internal.Log;
+
+/**
+ * Terminal that is used for OSv. This is seperate to unix terminal
+ * implementation because exec cannot be used as currently used by UnixTerminal.
+ *
+ * This implimentation is derrived from the implementation at
+ * https://github.com/cloudius-systems/mgmt/blob/master/crash/src/main/java/com/cloudius/cli/OSvTerminal.java
+ * authored by Or Cohen.
+ *
+ * @author <a href-"mailto:orc@fewbytes.com">Or Cohen</a>
+ * @author <a href="mailto:arun.neelicattu@gmail.com">Arun Neelicattu</a>
+ * @since 2.13
+ */
+public class OSvTerminal
+    extends TerminalSupport
+{
+
+    public Class<?> sttyClass = null;
+    public Object stty = null;
+
+    @SuppressWarnings("deprecation")
+    public OSvTerminal() {
+        super(true);
+
+        setAnsiSupported(true);
+
+        try {
+            if (stty == null) {
+                sttyClass = Class.forName("com.cloudius.util.Stty");
+                stty = sttyClass.newInstance();
+            }
+        } catch (Exception e) {
+            Log.warn("Failed to load com.cloudius.util.Stty", e);
+        }
+    }
+
+    @Override
+    public void init() throws Exception {
+        super.init();
+
+        if (stty != null) {
+            sttyClass.getMethod("jlineMode").invoke(stty);
+        }
+    }
+
+    @Override
+    public void restore() throws Exception {
+        if (stty != null) {
+            sttyClass.getMethod("reset").invoke(stty);
+        }
+        super.restore();
+
+        // Newline in end of restore like in jline.UnixTerminal
+        System.out.println();
+    }
+
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java
index 18f634e9282..391ccaa2d3d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -60,6 +60,9 @@ public interface Terminal
 
     void setEchoEnabled(boolean enabled);
 
+    void disableInterruptCharacter();
+    void enableInterruptCharacter();
+
     String getOutputEncoding();
 
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal2.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal2.java
new file mode 100644
index 00000000000..c73b83d3605
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal2.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline;
+
+/**
+ * Terminal extension.
+ *
+ * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
+ * @since 2.13
+ */
+public interface Terminal2 extends Terminal
+{
+    boolean getBooleanCapability(String capability);
+
+    Integer getNumericCapability(String capability);
+
+    String getStringCapability(String capability);
+
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java
index 9065d2caebe..eb2e9214f0c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -11,11 +11,9 @@ package jdk.internal.jline;
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 import jdk.internal.jline.internal.Configuration;
 import jdk.internal.jline.internal.Log;
-import jdk.internal.jline.internal.Preconditions;
 import static jdk.internal.jline.internal.Preconditions.checkNotNull;
 
 /**
@@ -32,10 +30,14 @@ public class TerminalFactory
 
     public static final String UNIX = "unix";
 
+    public static final String OSV = "osv";
+
     public static final String WIN = "win";
 
     public static final String WINDOWS = "windows";
 
+    public static final String FREEBSD = "freebsd";
+
     public static final String NONE = "none";
 
     public static final String OFF = "off";
@@ -45,16 +47,17 @@ public class TerminalFactory
     private static Terminal term = null;
 
     public static synchronized Terminal create() {
+        return create(null);
+    }
+
+    public static synchronized Terminal create(String ttyDevice) {
         if (Log.TRACE) {
             //noinspection ThrowableInstanceNeverThrown
             Log.trace(new Throwable("CREATE MARKER"));
         }
 
-        String type = Configuration.getString(JLINE_TERMINAL, AUTO);
-        if ("dumb".equals(System.getenv("TERM"))) {
-            type = "none";
-            Log.debug("$TERM=dumb; setting type=", type);
-        }
+        String defaultType = "dumb".equals(System.getenv("TERM")) ? NONE : AUTO;
+        String type  = Configuration.getString(JLINE_TERMINAL, defaultType);
 
         Log.debug("Creating terminal; type=", type);
 
@@ -65,11 +68,20 @@ public class TerminalFactory
             if (tmp.equals(UNIX)) {
                 t = getFlavor(Flavor.UNIX);
             }
-            else if (tmp.equals(WIN) | tmp.equals(WINDOWS)) {
+            else if (tmp.equals(OSV)) {
+                t = getFlavor(Flavor.OSV);
+            }
+            else if (tmp.equals(WIN) || tmp.equals(WINDOWS)) {
                 t = getFlavor(Flavor.WINDOWS);
             }
             else if (tmp.equals(NONE) || tmp.equals(OFF) || tmp.equals(FALSE)) {
-                t = new UnsupportedTerminal();
+                if (System.getenv("INSIDE_EMACS") != null) {
+                    // emacs requires ansi on and echo off
+                    t = new UnsupportedTerminal(true, false);
+                } else  {
+                    // others the other way round
+                    t = new UnsupportedTerminal(false, true);
+                }
             }
             else {
                 if (tmp.equals(AUTO)) {
@@ -77,8 +89,10 @@ public class TerminalFactory
                     Flavor flavor = Flavor.UNIX;
                     if (os.contains(WINDOWS)) {
                         flavor = Flavor.WINDOWS;
+                    } else if (System.getenv("OSV_CPUS") != null) {
+                        flavor = Flavor.OSV;
                     }
-                    t = getFlavor(flavor);
+                    t = getFlavor(flavor, ttyDevice);
                 }
                 else {
                     try {
@@ -125,6 +139,7 @@ public class TerminalFactory
         AUTO,
         WINDOWS,
         UNIX,
+        OSV,
         NONE
     }
 
@@ -145,31 +160,52 @@ public class TerminalFactory
     public static enum Flavor
     {
         WINDOWS,
-        UNIX
+        UNIX,
+        OSV
     }
 
-    private static final Map<Flavor, Callable<? extends Terminal>> FLAVORS = new HashMap<>();
+    private static final Map<Flavor, TerminalConstructor> FLAVORS = new HashMap<>();
 
     static {
-//        registerFlavor(Flavor.WINDOWS, AnsiWindowsTerminal.class);
-//        registerFlavor(Flavor.UNIX, UnixTerminal.class);
-        registerFlavor(Flavor.WINDOWS, WindowsTerminal :: new);
-        registerFlavor(Flavor.UNIX, UnixTerminal :: new);
+        registerFlavor(Flavor.WINDOWS, ttyDevice -> new WindowsTerminal());
+        registerFlavor(Flavor.UNIX, ttyDevice -> new UnixTerminal(ttyDevice));
+        registerFlavor(Flavor.OSV, ttyDevice -> new OSvTerminal());
     }
 
-    public static synchronized Terminal get() {
+    public static synchronized Terminal get(String ttyDevice) {
+        // The code is assuming we've got only one terminal per process.
+        // Continuing this assumption, if this terminal is already initialized,
+        // we don't check if it's using the same tty line either. Both assumptions
+        // are a bit crude. TODO: check single terminal assumption.
         if (term == null) {
-            term = create();
+            term = create(ttyDevice);
         }
         return term;
     }
 
+    public static synchronized Terminal get() {
+        return get(null);
+    }
+
     public static Terminal getFlavor(final Flavor flavor) throws Exception {
-        return FLAVORS.getOrDefault(flavor, () -> {throw new InternalError();}).call();
+        return getFlavor(flavor, null);
     }
 
-    public static void registerFlavor(final Flavor flavor, final Callable<? extends Terminal> sup) {
-        FLAVORS.put(flavor, sup);
+    @SuppressWarnings("deprecation")
+    public static Terminal getFlavor(final Flavor flavor, String ttyDevice) throws Exception {
+        TerminalConstructor factory = FLAVORS.get(flavor);
+        if (factory != null) {
+            return factory.createTerminal(ttyDevice);
+        } else {
+            throw new InternalError();
+        }
     }
 
+    public static void registerFlavor(final Flavor flavor, final TerminalConstructor factory) {
+        FLAVORS.put(flavor, factory);
+    }
+
+    public interface TerminalConstructor {
+        public Terminal createTerminal(String str) throws Exception;
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java
index cf15ec4b383..a733b305ed6 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -112,6 +112,12 @@ public abstract class TerminalSupport
         Log.debug("Echo enabled: ", enabled);
     }
 
+    public void disableInterruptCharacter() {
+    }
+
+    public void enableInterruptCharacter() {
+    }
+
     public InputStream wrapInIfNeeded(InputStream in) throws IOException {
         return in;
     }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java
index a3699ad6752..fa2cd73a3c3 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,9 +8,18 @@
  */
 package jdk.internal.jline;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import jdk.internal.jline.internal.Configuration;
+import jdk.internal.jline.internal.InfoCmp;
 import jdk.internal.jline.internal.Log;
 import jdk.internal.jline.internal.TerminalLineSettings;
 
+import static jdk.internal.jline.internal.Preconditions.checkNotNull;
+
 /**
  * Terminal that is used for unix platforms. Terminal initialization
  * is handled by issuing the <em>stty</em> command against the
@@ -27,14 +36,36 @@ import jdk.internal.jline.internal.TerminalLineSettings;
  */
 public class UnixTerminal
     extends TerminalSupport
+    implements Terminal2
 {
-    private final TerminalLineSettings settings = new TerminalLineSettings();
+    private final TerminalLineSettings settings;
+    private final String type;
+    private String intr;
+    private String lnext;
+    private Set<String> bools = new HashSet<String>();
+    private Map<String, Integer> ints = new HashMap<String, Integer>();
+    private Map<String, String> strings = new HashMap<String, String>();
 
     public UnixTerminal() throws Exception {
-        super(true);
+        this(TerminalLineSettings.DEFAULT_TTY, null);
     }
 
-    protected TerminalLineSettings getSettings() {
+    public UnixTerminal(String ttyDevice) throws Exception {
+        this(ttyDevice, null);
+    }
+
+    public UnixTerminal(String ttyDevice, String type) throws Exception {
+        super(true);
+        checkNotNull(ttyDevice);
+        this.settings = TerminalLineSettings.getSettings(ttyDevice);
+        if (type == null) {
+            type = System.getenv("TERM");
+        }
+        this.type = type;
+        parseInfoCmp();
+    }
+
+    public TerminalLineSettings getSettings() {
         return settings;
     }
 
@@ -51,10 +82,20 @@ public class UnixTerminal
         // Set the console to be character-buffered instead of line-buffered.
         // Make sure we're distinguishing carriage return from newline.
         // Allow ctrl-s keypress to be used (as forward search)
-        settings.set("-icanon min 1 -icrnl -inlcr -ixon");
-        settings.set("dsusp undef");
+        //
+        // Please note that FreeBSD does not seem to support -icrnl and thus
+        // has to be handled separately. Otherwise the console will be "stuck"
+        // and will neither accept input nor print anything to stdout.
+        if (Configuration.getOsName().contains(TerminalFactory.FREEBSD)) {
+            settings.set("-icanon min 1 -inlcr -ixon");
+        } else {
+            settings.set("-icanon min 1 -icrnl -inlcr -ixon");
+        }
+        settings.undef("dsusp");
 
         setEchoEnabled(false);
+
+        parseInfoCmp();
     }
 
     /**
@@ -86,6 +127,12 @@ public class UnixTerminal
         return h < 1 ? DEFAULT_HEIGHT : h;
     }
 
+    @Override
+    public boolean hasWeirdWrap() {
+        return getBooleanCapability("auto_right_margin")
+                && getBooleanCapability("eat_newline_glitch");
+    }
+
     @Override
     public synchronized void setEchoEnabled(final boolean enabled) {
         try {
@@ -101,14 +148,18 @@ public class UnixTerminal
             if (e instanceof InterruptedException) {
                 Thread.currentThread().interrupt();
             }
-            Log.error("Failed to ", (enabled ? "enable" : "disable"), " echo", e);
+            Log.error("Failed to ", enabled ? "enable" : "disable", " echo", e);
         }
     }
 
     public void disableInterruptCharacter()
     {
         try {
-            settings.set("intr undef");
+            intr = getSettings().getPropertyAsString("intr");
+            if ("<undef>".equals(intr)) {
+                intr = null;
+            }
+            settings.undef("intr");
         }
         catch (Exception e) {
             if (e instanceof InterruptedException) {
@@ -121,7 +172,9 @@ public class UnixTerminal
     public void enableInterruptCharacter()
     {
         try {
-            settings.set("intr ^C");
+            if (intr != null) {
+                settings.set("intr", intr);
+            }
         }
         catch (Exception e) {
             if (e instanceof InterruptedException) {
@@ -130,4 +183,62 @@ public class UnixTerminal
             Log.error("Failed to enable interrupt character", e);
         }
     }
+
+    public void disableLitteralNextCharacter()
+    {
+        try {
+            lnext = getSettings().getPropertyAsString("lnext");
+            if ("<undef>".equals(lnext)) {
+                lnext = null;
+            }
+            settings.undef("lnext");
+        }
+        catch (Exception e) {
+            if (e instanceof InterruptedException) {
+                Thread.currentThread().interrupt();
+            }
+            Log.error("Failed to disable litteral next character", e);
+        }
+    }
+
+    public void enableLitteralNextCharacter()
+    {
+        try {
+            if (lnext != null) {
+                settings.set("lnext", lnext);
+            }
+        }
+        catch (Exception e) {
+            if (e instanceof InterruptedException) {
+                Thread.currentThread().interrupt();
+            }
+            Log.error("Failed to enable litteral next character", e);
+        }
+    }
+
+    public boolean getBooleanCapability(String capability) {
+        return bools.contains(capability);
+    }
+
+    public Integer getNumericCapability(String capability) {
+        return ints.get(capability);
+    }
+
+    public String getStringCapability(String capability) {
+        return strings.get(capability);
+    }
+
+    private void parseInfoCmp() {
+        String capabilities = null;
+        if (type != null) {
+            try {
+                capabilities = InfoCmp.getInfoCmp(type);
+            } catch (Exception e) {
+            }
+        }
+        if (capabilities == null) {
+            capabilities = InfoCmp.getAnsiCaps();
+        }
+        InfoCmp.parseInfoCmp(capabilities, bools, ints, strings);
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java
index 0ad67a53bae..fbf2c0d07e7 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -19,8 +19,12 @@ public class UnsupportedTerminal
     extends TerminalSupport
 {
     public UnsupportedTerminal() {
+        this(false, true);
+    }
+
+    public UnsupportedTerminal(boolean ansiSupported, boolean echoEnabled) {
         super(false);
-        setAnsiSupported(false);
-        setEchoEnabled(true);
+        setAnsiSupported(ansiSupported);
+        setEchoEnabled(echoEnabled);
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java
index c9d471d2ae5..29cd71d9632 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -12,7 +12,11 @@ import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 
+import jdk.internal.jline.extra.AnsiInterpretingOutputStream;
+import jdk.internal.jline.extra.AnsiInterpretingOutputStream.BufferState;
+import jdk.internal.jline.extra.AnsiInterpretingOutputStream.Performer;
 import jdk.internal.jline.internal.Configuration;
 import jdk.internal.jline.internal.Log;
 //import org.fusesource.jansi.internal.WindowsSupport;
@@ -71,7 +75,7 @@ public class WindowsTerminal
         super.init();
 
 //        setAnsiSupported(Configuration.getBoolean(ANSI, true));
-        setAnsiSupported(false);
+        setAnsiSupported(true);
 
         //
         // FIXME: Need a way to disable direct console and sysin detection muck
@@ -115,19 +119,27 @@ public class WindowsTerminal
             setConsoleMode(getConsoleMode() |
                 ENABLE_ECHO_INPUT.code |
                 ENABLE_LINE_INPUT.code |
-                ENABLE_PROCESSED_INPUT.code |
                 ENABLE_WINDOW_INPUT.code);
         }
         else {
             setConsoleMode(getConsoleMode() &
                 ~(ENABLE_LINE_INPUT.code |
                     ENABLE_ECHO_INPUT.code |
-                    ENABLE_PROCESSED_INPUT.code |
                     ENABLE_WINDOW_INPUT.code));
         }
         super.setEchoEnabled(enabled);
     }
 
+    public void disableInterruptCharacter() {
+        setConsoleMode(getConsoleMode() &
+            ~(ENABLE_PROCESSED_INPUT.code));
+    }
+
+    public void enableInterruptCharacter() {
+        setConsoleMode(getConsoleMode() |
+            ENABLE_PROCESSED_INPUT.code);
+    }
+
     /**
      * Whether or not to allow the use of the JNI console interaction.
      */
@@ -181,6 +193,22 @@ public class WindowsTerminal
         return false;
     }
 
+    @Override
+    public OutputStream wrapOutIfNeeded(OutputStream out) {
+        return new AnsiInterpretingOutputStream(getOutputEncoding(), out, new Performer() {
+            @Override
+            public BufferState getBufferState() throws IOException {
+                out.flush();
+                return WindowsTerminal.this.getBufferState();
+            }
+            @Override
+            public void setCursorPosition(int cursorX, int cursorY) throws IOException {
+                out.flush();
+                WindowsTerminal.this.setCursorPosition(cursorX, cursorY);
+            }
+        });
+    }
+
     @Override
     public String getOutputEncoding() {
         int codepage = getConsoleOutputCodepage();
@@ -511,6 +539,10 @@ public class WindowsTerminal
 
     private native int getWindowsTerminalHeight();
 
+    private native BufferState getBufferState();
+
+    private native void setCursorPosition(int x, int y);
+
     /**
      * Console mode
      * <p/>
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java
index d0759318d92..3c11836b7ab 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -32,11 +32,14 @@ public class ConsoleKeys {
 
     public ConsoleKeys(String appName, URL inputrcUrl) {
         keyMaps = KeyMap.keyMaps();
+        setVar("editing-mode", "emacs");
         loadKeys(appName, inputrcUrl);
-    }
-
-    protected boolean isViEditMode() {
-        return keys.isViKeyMap();
+        String editingMode = variables.get("editing-mode");
+        if ("vi".equalsIgnoreCase(editingMode)) {
+            keys = keyMaps.get(KeyMap.VI_INSERT);
+        } else if ("emacs".equalsIgnoreCase(editingMode)) {
+            keys = keyMaps.get(KeyMap.EMACS);
+        }
     }
 
     protected boolean setKeyMap (String name) {
@@ -60,10 +63,6 @@ public class ConsoleKeys {
         this.keys = keys;
     }
 
-    protected boolean getViEditMode() {
-        return keys.isViKeyMap ();
-    }
-
     protected void loadKeys(String appName, URL inputrcUrl) {
         keys = keyMaps.get(KeyMap.EMACS);
 
@@ -127,13 +126,8 @@ public class ConsoleKeys {
                         if (args.startsWith("term=")) {
                             // TODO
                         } else if (args.startsWith("mode=")) {
-                            if (args.equalsIgnoreCase("mode=vi")) {
-                                parsing = isViEditMode();
-                            } else if (args.equals("mode=emacs")) {
-                                parsing = !isViEditMode();
-                            } else {
-                                parsing = false;
-                            }
+                            String mode = variables.get("editing-mode");
+                            parsing = args.substring("mode=".length()).equalsIgnoreCase(mode);
                         } else {
                             parsing = args.equalsIgnoreCase(appName);
                         }
@@ -185,7 +179,7 @@ public class ConsoleKeys {
                         && line.charAt(i) != ' ' && line.charAt(i) != '\t'
                         ; i++);
                 keySeq = line.substring(0, i);
-                equivalency = (i + 1 < line.length() && line.charAt(i) == ':' && line.charAt(i + 1) == '=');
+                equivalency = i + 1 < line.length() && line.charAt(i) == ':' && line.charAt(i + 1) == '=';
                 i++;
                 if (equivalency) {
                     i++;
@@ -256,7 +250,7 @@ public class ConsoleKeys {
         }
     }
 
-    private String translateQuoted(String keySeq) {
+    private static String translateQuoted(String keySeq) {
         int i;
         String str = keySeq.substring( 1, keySeq.length() - 1 );
         keySeq = "";
@@ -342,7 +336,7 @@ public class ConsoleKeys {
         return keySeq;
     }
 
-    private char getKeyFromName(String name) {
+    private static char getKeyFromName(String name) {
         if ("DEL".equalsIgnoreCase(name) || "Rubout".equalsIgnoreCase(name)) {
             return 0x7f;
         } else if ("ESC".equalsIgnoreCase(name) || "Escape".equalsIgnoreCase(name)) {
@@ -365,12 +359,6 @@ public class ConsoleKeys {
             if (keyMaps.containsKey(val)) {
                 keys = keyMaps.get(val);
             }
-        } else if ("editing-mode".equals(key)) {
-            if ("vi".equalsIgnoreCase(val)) {
-                keys = keyMaps.get(KeyMap.VI_INSERT);
-            } else if ("emacs".equalsIgnoreCase(key)) {
-                keys = keyMaps.get(KeyMap.EMACS);
-            }
         } else if ("blink-matching-paren".equals(key)) {
             if ("on".equalsIgnoreCase(val)) {
               keys.setBlinkMatchingParen(true);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
index 2a81d73751b..1febbf99654 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,9 +14,8 @@ package jdk.internal.jline.console;
 //import java.awt.datatransfer.Transferable;
 //import java.awt.datatransfer.UnsupportedFlavorException;
 //import java.awt.event.ActionListener;
-//import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-//import java.io.ByteArrayOutputStream;
+import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
@@ -26,24 +25,27 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
-import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.lang.System;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-//import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-//import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Stack;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.jline.DefaultTerminal2;
 import jdk.internal.jline.Terminal;
+import jdk.internal.jline.Terminal2;
 import jdk.internal.jline.TerminalFactory;
 import jdk.internal.jline.UnixTerminal;
 import jdk.internal.jline.console.completer.CandidateListCompletionHandler;
@@ -51,13 +53,15 @@ import jdk.internal.jline.console.completer.Completer;
 import jdk.internal.jline.console.completer.CompletionHandler;
 import jdk.internal.jline.console.history.History;
 import jdk.internal.jline.console.history.MemoryHistory;
+import jdk.internal.jline.internal.Ansi;
 import jdk.internal.jline.internal.Configuration;
+import jdk.internal.jline.internal.Curses;
 import jdk.internal.jline.internal.InputStreamReader;
 import jdk.internal.jline.internal.Log;
 import jdk.internal.jline.internal.NonBlockingInputStream;
 import jdk.internal.jline.internal.Nullable;
+import jdk.internal.jline.internal.TerminalLineSettings;
 import jdk.internal.jline.internal.Urls;
-//import org.fusesource.jansi.AnsiOutputStream;
 
 import static jdk.internal.jline.internal.Preconditions.checkNotNull;
 
@@ -72,7 +76,7 @@ import static jdk.internal.jline.internal.Preconditions.checkNotNull;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  */
-public class ConsoleReader
+public class ConsoleReader implements Closeable
 {
     public static final String JLINE_NOBELL = "jline.nobell";
 
@@ -84,6 +88,8 @@ public class ConsoleReader
 
     public static final String DEFAULT_INPUT_RC = "/etc/inputrc";
 
+    public static final String JLINE_EXPAND_EVENTS = "jline.expandevents";
+
     public static final char BACKSPACE = '\b';
 
     public static final char RESET_LINE = '\r';
@@ -92,30 +98,38 @@ public class ConsoleReader
 
     public static final char NULL_MASK = 0;
 
-    public static final int TAB_WIDTH = 4;
+    public static final int TAB_WIDTH = 8;
 
     private static final ResourceBundle
         resources = ResourceBundle.getBundle(CandidateListCompletionHandler.class.getName());
 
-    private final Terminal terminal;
+    private static final int ESCAPE = 27;
+    private static final int READ_EXPIRED = -2;
+
+    private final Terminal2 terminal;
 
     private final Writer out;
 
     private final CursorBuffer buf = new CursorBuffer();
+    private boolean cursorOk;
 
     private String prompt;
     private int    promptLen;
 
-    private boolean expandEvents = true;
+    private boolean expandEvents = Configuration.getBoolean(JLINE_EXPAND_EVENTS, true);
 
     private boolean bellEnabled = !Configuration.getBoolean(JLINE_NOBELL, true);
 
     private boolean handleUserInterrupt = false;
 
+    private boolean handleLitteralNext = true;
+
     private Character mask;
 
     private Character echoCharacter;
 
+    private CursorBuffer originalBuffer = null;
+
     private StringBuffer searchTerm = null;
 
     private String previousSearchTerm = "";
@@ -124,6 +138,10 @@ public class ConsoleReader
 
     private int parenBlinkTimeout = 500;
 
+    // Reading buffers
+    private final StringBuilder opBuffer = new StringBuilder();
+    private final Stack<Character> pushBackChar = new Stack<Character>();
+
     /*
      * The reader and the nonBlockingInput go hand-in-hand.  The reader wraps
      * the nonBlockingInput, but we have to retain a handle to it so that
@@ -133,12 +151,6 @@ public class ConsoleReader
     private long                   escapeTimeout;
     private Reader                 reader;
 
-    /*
-     * TODO: Please read the comments about this in setInput(), but this needs
-     * to be done away with.
-     */
-    private boolean                isUnitTestInput;
-
     /**
      * Last character searched for with a vi character search
      */
@@ -155,6 +167,8 @@ public class ConsoleReader
 
     private String encoding;
 
+    private boolean quotedInsert;
+
     private boolean recording;
 
     private String macro = "";
@@ -231,7 +245,8 @@ public class ConsoleReader
     {
         this.appName = appName != null ? appName : "JLine";
         this.encoding = encoding != null ? encoding : Configuration.getEncoding();
-        this.terminal = term != null ? term : TerminalFactory.get();
+        Terminal terminal = term != null ? term : TerminalFactory.get();
+        this.terminal = terminal instanceof Terminal2 ? (Terminal2) terminal : new DefaultTerminal2(terminal);
         String outEncoding = terminal.getOutputEncoding() != null? terminal.getOutputEncoding() : this.encoding;
         this.out = new OutputStreamWriter(terminal.wrapOutIfNeeded(out), outEncoding);
         setInput( in );
@@ -239,9 +254,49 @@ public class ConsoleReader
         this.inputrcUrl = getInputRc();
 
         consoleKeys = new ConsoleKeys(this.appName, inputrcUrl);
+
+        if (terminal instanceof UnixTerminal
+                && TerminalLineSettings.DEFAULT_TTY.equals(((UnixTerminal) terminal).getSettings().getTtyDevice())
+                && Configuration.getBoolean("jline.sigcont", false)) {
+            setupSigCont();
+        }
     }
 
-    private URL getInputRc() throws IOException {
+    private void setupSigCont() {
+        // Check that sun.misc.SignalHandler and sun.misc.Signal exists
+        try {
+            Class<?> signalClass = Class.forName("sun.misc.Signal");
+            Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
+            // Implement signal handler
+            Object signalHandler = Proxy.newProxyInstance(getClass().getClassLoader(),
+                    new Class<?>[]{signalHandlerClass}, new InvocationHandler() {
+                        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                            // only method we are proxying is handle()
+                            terminal.init();
+                            try {
+                                drawLine();
+                                flush();
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                            return null;
+                        }
+                    });
+            // Register the signal handler, this code is equivalent to:
+            // Signal.handle(new Signal("CONT"), signalHandler);
+            signalClass.getMethod("handle", signalClass, signalHandlerClass).invoke(null, signalClass.getConstructor(String.class).newInstance("CONT"), signalHandler);
+        } catch (ClassNotFoundException cnfe) {
+            // sun.misc Signal handler classes don't exist
+        } catch (Exception e) {
+            // Ignore this one too, if the above failed, the signal API is incompatible with what we're expecting
+        }
+    }
+
+    /**
+     * Retrieve the URL for the inputrc configuration file in effect. Intended
+     * use is for instantiating ConsoleKeys, to read inputrc variables.
+     */
+    public static URL getInputRc() throws IOException {
         String path = Configuration.getString(JLINE_INPUTRC);
         if (path == null) {
             File f = new File(Configuration.getUserHome(), INPUT_RC);
@@ -260,19 +315,6 @@ public class ConsoleReader
 
     void setInput(final InputStream in) throws IOException {
         this.escapeTimeout = Configuration.getLong(JLINE_ESC_TIMEOUT, 100);
-        /*
-         * This is gross and here is how to fix it. In getCurrentPosition()
-         * and getCurrentAnsiRow(), the logic is disabled when running unit
-         * tests and the fact that it is a unit test is determined by knowing
-         * if the original input stream was a ByteArrayInputStream. So, this
-         * is our test to do this.  What SHOULD happen is that the unit
-         * tests should pass in a terminal that is appropriately configured
-         * such that whatever behavior they expect to happen (or not happen)
-         * happens (or doesn't).
-         *
-         * So, TODO, get rid of this and fix the unit tests.
-         */
-        this.isUnitTestInput = in instanceof ByteArrayInputStream;
         boolean nonBlockingEnabled =
                escapeTimeout > 0L
             && terminal.isSupported()
@@ -297,12 +339,22 @@ public class ConsoleReader
      * have completed using the reader as it shuts down and cleans up resources
      * that would otherwise be "leaked".
      */
-    public void shutdown() {
+    @Override
+    public void close() {
         if (in != null) {
             in.shutdown();
         }
     }
 
+    /**
+     * Shuts the console reader down.  The same as {@link #close()}.
+     * @deprecated Use {@link #close()} instead.
+     */
+    @Deprecated
+    public void shutdown() {
+        this.close();
+    }
+
     /**
      * Shuts down the ConsoleReader if the JVM attempts to clean it up.
      */
@@ -310,7 +362,7 @@ public class ConsoleReader
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
         try {
-            shutdown();
+            close();
         }
         finally {
             super.finalize();
@@ -402,6 +454,24 @@ public class ConsoleReader
         return handleUserInterrupt;
     }
 
+    /**
+     * Set wether literal next are handled by JLine.
+     *
+     * @since 2.13
+     */
+    public void setHandleLitteralNext(boolean handleLitteralNext) {
+        this.handleLitteralNext = handleLitteralNext;
+    }
+
+    /**
+     * Get wether literal next are handled by JLine.
+     *
+     * @since 2.13
+     */
+    public boolean getHandleLitteralNext() {
+        return handleLitteralNext;
+    }
+
     /**
      * Sets the string that will be used to start a comment when the
      * insert-comment key is struck.
@@ -431,7 +501,7 @@ public class ConsoleReader
 
     public void setPrompt(final String prompt) {
         this.prompt = prompt;
-        this.promptLen = ((prompt == null) ? 0 : stripAnsi(lastLine(prompt)).length());
+        this.promptLen = (prompt == null) ? 0 : wcwidth(Ansi.stripAnsi(lastLine(prompt)), 0);
     }
 
     public String getPrompt() {
@@ -440,24 +510,11 @@ public class ConsoleReader
 
     /**
      * Set the echo character. For example, to have "*" entered when a password is typed:
-     * <p/>
      * <pre>
      * myConsoleReader.setEchoCharacter(new Character('*'));
      * </pre>
-     * <p/>
-     * Setting the character to
-     * <p/>
-     * <pre>
-     * null
-     * </pre>
-     * <p/>
-     * will restore normal character echoing. Setting the character to
-     * <p/>
-     * <pre>
-     * new Character(0)
-     * </pre>
-     * <p/>
-     * will cause nothing to be echoed.
+     * Setting the character to <code>null</code> will restore normal character echoing.<p/>
+     * Setting the character to <code>Character.valueOf(0)</code> will cause nothing to be echoed.
      *
      * @param c the character to echo to the console in place of the typed character.
      */
@@ -500,9 +557,52 @@ public class ConsoleReader
         return true;
     }
 
+    int wcwidth(CharSequence str, int pos) {
+        return wcwidth(str, 0, str.length(), pos);
+    }
+
+    int wcwidth(CharSequence str, int start, int end, int pos) {
+        int cur = pos;
+        for (int i = start; i < end;) {
+            int ucs;
+            char c1 = str.charAt(i++);
+            if (!Character.isHighSurrogate(c1) || i >= end) {
+                ucs = c1;
+            } else {
+                char c2 = str.charAt(i);
+                if (Character.isLowSurrogate(c2)) {
+                    i++;
+                    ucs = Character.toCodePoint(c1, c2);
+                } else {
+                    ucs = c1;
+                }
+            }
+            cur += wcwidth(ucs, cur);
+        }
+        return cur - pos;
+    }
+
+    int wcwidth(int ucs, int pos) {
+        if (ucs == '\t') {
+            return nextTabStop(pos);
+        } else if (ucs < 32) {
+            return 2;
+        } else  {
+            int w = WCWidth.wcwidth(ucs);
+            return w > 0 ? w : 0;
+        }
+    }
+
+    int nextTabStop(int pos) {
+        int tabWidth = TAB_WIDTH;
+        int width = getTerminal().getWidth();
+        int mod = (pos + tabWidth - 1) % tabWidth;
+        int npos = pos + tabWidth - mod;
+        return npos < width ? npos - pos : width - pos;
+    }
+
     int getCursorPosition() {
-        // FIXME: does not handle anything but a line with a prompt absolute position
-        return promptLen + buf.cursor;
+        return promptLen + wcwidth(buf.buffer, 0, buf.cursor, promptLen);
     }
 
     /**
@@ -510,7 +610,7 @@ public class ConsoleReader
      * prompt is returned if no '\n' characters are present.
      * null is returned if prompt is null.
      */
-    private String lastLine(String str) {
+    private static String lastLine(String str) {
         if (str == null) return "";
         int last = str.lastIndexOf("\n");
 
@@ -521,26 +621,10 @@ public class ConsoleReader
         return str;
     }
 
-    String stripAnsi(String str) {
-        if (str == null) return "";
-        return ANSI_CODE_PATTERN.matcher(str).replaceAll("");
-//        try {
-//            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-//            AnsiOutputStream aos = new AnsiOutputStream(baos);
-//            aos.write(str.getBytes());
-//            aos.flush();
-//            return baos.toString();
-//        } catch (IOException e) {
-//            return str;
-//        }
-    }
-    //where:
-        private static final Pattern ANSI_CODE_PATTERN = Pattern.compile("\033\\[[^@-~]*[@-~]");
-
     /**
      * Move the cursor position to the specified absolute index.
      */
-    public final boolean setCursorPosition(final int position) throws IOException {
+    public boolean setCursorPosition(final int position) throws IOException {
         if (position == buf.cursor) {
             return true;
         }
@@ -602,17 +686,14 @@ public class ConsoleReader
     /**
      * Output put the prompt + the current buffer
      */
-    public final void drawLine() throws IOException {
+    public void drawLine() throws IOException {
         String prompt = getPrompt();
         if (prompt != null) {
-            print(prompt);
+            rawPrint(prompt);
         }
 
-        print(buf.buffer.toString());
+        fmtPrint(buf.buffer, 0, buf.cursor, promptLen);
 
-        if (buf.length() != buf.cursor) { // not at end of line
-            back(buf.length() - buf.cursor - 1);
-        }
         // force drawBuffer to check for weird wrap (after clear screen)
         drawBuffer();
     }
@@ -620,9 +701,8 @@ public class ConsoleReader
     /**
      * Clear the line and redraw it.
      */
-    public final void redrawLine() throws IOException {
-        print(RESET_LINE);
-//        flush();
+    public void redrawLine() throws IOException {
+        tputs("carriage_return");
         drawLine();
     }
 
@@ -824,7 +904,7 @@ public class ConsoleReader
         }
         String result = sb.toString();
         if (!str.equals(result)) {
-            print(result);
+            fmtPrint(result, getCursorPosition());
             println();
             flush();
         }
@@ -835,15 +915,16 @@ public class ConsoleReader
     /**
      * Write out the specified string to the buffer and the output stream.
      */
-    public final void putString(final CharSequence str) throws IOException {
+    public void putString(final CharSequence str) throws IOException {
+        int pos = getCursorPosition();
         buf.write(str);
         if (mask == null) {
             // no masking
-            print(str);
+            fmtPrint(str, pos);
         } else if (mask == NULL_MASK) {
             // don't print anything
         } else {
-            print(mask, str.length());
+            rawPrint(mask, str.length());
         }
         drawBuffer();
     }
@@ -856,48 +937,34 @@ public class ConsoleReader
      */
     private void drawBuffer(final int clear) throws IOException {
         // debug ("drawBuffer: " + clear);
-        if (buf.cursor == buf.length() && clear == 0) {
-        } else {
-            char[] chars = buf.buffer.substring(buf.cursor).toCharArray();
+        int nbChars = buf.length() - buf.cursor;
+        if (buf.cursor != buf.length() || clear != 0) {
             if (mask != null) {
-                Arrays.fill(chars, mask);
-            }
-            if (terminal.hasWeirdWrap()) {
-                // need to determine if wrapping will occur:
-                int width = terminal.getWidth();
-                int pos = getCursorPosition();
-                for (int i = 0; i < chars.length; i++) {
-                    print(chars[i]);
-                    if ((pos + i + 1) % width == 0) {
-                        print(32); // move cursor to next line by printing dummy space
-                        print(13); // CR / not newline.
-                    }
+                if (mask != NULL_MASK) {
+                    rawPrint(mask, nbChars);
+                } else {
+                    nbChars = 0;
                 }
             } else {
-                print(chars);
-            }
-            clearAhead(clear, chars.length);
-            if (terminal.isAnsiSupported()) {
-                if (chars.length > 0) {
-                    back(chars.length);
-                }
-            } else {
-                back(chars.length);
+                fmtPrint(buf.buffer, buf.cursor, buf.length());
             }
         }
-        if (terminal.hasWeirdWrap()) {
+        int cursorPos = promptLen + wcwidth(buf.buffer, 0, buf.length(), promptLen);
+        if (terminal.hasWeirdWrap() && !cursorOk) {
             int width = terminal.getWidth();
             // best guess on whether the cursor is in that weird location...
             // Need to do this without calling ansi cursor location methods
             // otherwise it breaks paste of wrapped lines in xterm.
-            if (getCursorPosition() > 0 && (getCursorPosition() % width == 0)
-                    && buf.cursor == buf.length() && clear == 0) {
+            if (cursorPos > 0 && (cursorPos % width == 0)) {
                 // the following workaround is reverse-engineered from looking
                 // at what bash sent to the terminal in the same situation
-                print(32); // move cursor to next line by printing dummy space
-                print(13); // CR / not newline.
+                rawPrint(' '); // move cursor to next line by printing dummy space
+                tputs("carriage_return"); // CR / not newline.
             }
+            cursorOk = true;
         }
+        clearAhead(clear, cursorPos);
+        back(nbChars);
     }
 
     /**
@@ -912,70 +979,69 @@ public class ConsoleReader
      * Clear ahead the specified number of characters without moving the cursor.
      *
      * @param num the number of characters to clear
-     * @param delta the difference between the internal cursor and the screen
-     * cursor - if > 0, assume some stuff was printed and weird wrap has to be
-     * checked
+     * @param pos the current screen cursor position
      */
-    private void clearAhead(final int num, int delta) throws IOException {
-        if (num == 0) {
-            return;
-        }
+    private void clearAhead(int num, final int pos) throws IOException {
+        if (num == 0) return;
 
-        if (terminal.isAnsiSupported()) {
-            int width = terminal.getWidth();
-            int screenCursorCol = getCursorPosition() + delta;
-            // clear current line
-            printAnsiSequence("K");
-            // if cursor+num wraps, then we need to clear the line(s) below too
-            int curCol = screenCursorCol % width;
-            int endCol = (screenCursorCol + num - 1) % width;
-            int lines = num / width;
-            if (endCol < curCol) lines++;
-            for (int i = 0; i < lines; i++) {
-                printAnsiSequence("B");
-                printAnsiSequence("2K");
+        int width = terminal.getWidth();
+        // Use kill line
+        if (terminal.getStringCapability("clr_eol") != null) {
+            int cur = pos;
+            int c0 = cur % width;
+            // Erase end of current line
+            int nb = Math.min(num, width - c0);
+            tputs("clr_eol");
+            num -= nb;
+            // Loop
+            while (num > 0) {
+                // Move to beginning of next line
+                int prev = cur;
+                cur = cur - cur % width + width;
+                moveCursorFromTo(prev, cur);
+                // Erase
+                nb = Math.min(num, width);
+                tputs("clr_eol");
+                num -= nb;
             }
-            for (int i = 0; i < lines; i++) {
-                printAnsiSequence("A");
-            }
-            return;
+            moveCursorFromTo(cur, pos);
+        }
+        // Terminal does not wrap on the right margin
+        else if (!terminal.getBooleanCapability("auto_right_margin")) {
+            int cur = pos;
+            int c0 = cur % width;
+            // Erase end of current line
+            int nb = Math.min(num, width - c0);
+            rawPrint(' ', nb);
+            num -= nb;
+            cur += nb;
+            // Loop
+            while (num > 0) {
+                // Move to beginning of next line
+                moveCursorFromTo(cur, ++cur);
+                // Erase
+                nb = Math.min(num, width);
+                rawPrint(' ', nb);
+                num -= nb;
+                cur += nb;
+            }
+            moveCursorFromTo(cur, pos);
+        }
+        // Simple erasure
+        else {
+            rawPrint(' ', num);
+            moveCursorFromTo(pos + num, pos);
         }
-
-        // print blank extra characters
-        print(' ', num);
-
-        // we need to flush here so a "clever" console doesn't just ignore the redundancy
-        // of a space followed by a backspace.
-//        flush();
-
-        // reset the visual cursor
-        back(num);
-
-//        flush();
     }
 
     /**
-     * Move the visual cursor backwards without modifying the buffer cursor.
+     * Move the visual cursor backward without modifying the buffer cursor.
      */
     protected void back(final int num) throws IOException {
         if (num == 0) return;
-        if (terminal.isAnsiSupported()) {
-            int width = getTerminal().getWidth();
-            int cursor = getCursorPosition();
-            int realCursor = cursor + num;
-            int realCol  = realCursor % width;
-            int newCol = cursor % width;
-            int moveup = num / width;
-            int delta = realCol - newCol;
-            if (delta < 0) moveup++;
-            if (moveup > 0) {
-                printAnsiSequence(moveup + "A");
-            }
-            printAnsiSequence((1 + newCol) + "G");
-            return;
-        }
-        print(BACKSPACE, num);
-//        flush();
+        int i0 = promptLen + wcwidth(buf.buffer, 0, buf.cursor, promptLen);
+        int i1 = i0 + ((mask != null) ? num : wcwidth(buf.buffer, buf.cursor, buf.cursor + num, i0));
+        moveCursorFromTo(i1, i0);
     }
 
     /**
@@ -1000,37 +1066,11 @@ public class ConsoleReader
             return 0;
         }
 
-        int count = 0;
-
-        int termwidth = getTerminal().getWidth();
-        int lines = getCursorPosition() / termwidth;
-        count = moveCursor(-1 * num) * -1;
+        int count = - moveCursor(-num);
+        int clear = wcwidth(buf.buffer, buf.cursor, buf.cursor + count, getCursorPosition());
         buf.buffer.delete(buf.cursor, buf.cursor + count);
-        if (getCursorPosition() / termwidth != lines) {
-            if (terminal.isAnsiSupported()) {
-                // debug("doing backspace redraw: " + getCursorPosition() + " on " + termwidth + ": " + lines);
-                printAnsiSequence("K");
-                // if cursor+num wraps, then we need to clear the line(s) below too
-                // last char printed is one pos less than cursor so we subtract
-                // one
-/*
-                // TODO: fixme (does not work - test with reverse search with wrapping line and CTRL-E)
-                int endCol = (getCursorPosition() + num - 1) % termwidth;
-                int curCol = getCursorPosition() % termwidth;
-                if (endCol < curCol) lines++;
-                for (int i = 1; i < lines; i++) {
-                    printAnsiSequence("B");
-                    printAnsiSequence("2K");
-                }
-                for (int i = 1; i < lines; i++) {
-                    printAnsiSequence("A");
-                }
-                return count;
-*/
-            }
-        }
-        drawBuffer(count);
 
+        drawBuffer(clear);
         return count;
     }
 
@@ -1080,7 +1120,7 @@ public class ConsoleReader
             case FORWARD_CHAR:
             case END_OF_LINE:
             case VI_MATCH:
-            case VI_BEGNNING_OF_LINE_OR_ARG_DIGIT:
+            case VI_BEGINNING_OF_LINE_OR_ARG_DIGIT:
             case VI_ARG_DIGIT:
             case VI_PREV_WORD:
             case VI_END_WORD:
@@ -1103,7 +1143,6 @@ public class ConsoleReader
      * Deletes the previous character from the cursor position
      * @param count number of times to do it.
      * @return true if it was done.
-     * @throws IOException
      */
     private boolean viRubout(int count) throws IOException {
         boolean ok = true;
@@ -1118,7 +1157,6 @@ public class ConsoleReader
      * the line in from the right.
      * @param count Number of times to perform the operation.
      * @return true if its works, false if it didn't
-     * @throws IOException
      */
     private boolean viDelete(int count) throws IOException {
         boolean ok = true;
@@ -1135,7 +1173,6 @@ public class ConsoleReader
      * @param count The number of times to repeat
      * @return true if it completed successfully, false if not all
      *   case changes could be completed.
-     * @throws IOException
      */
     private boolean viChangeCase(int count) throws IOException {
         boolean ok = true;
@@ -1164,7 +1201,6 @@ public class ConsoleReader
      * @param count Number of times to perform the action
      * @param c The character to change to
      * @return Whether or not there were problems encountered
-     * @throws IOException
      */
     private boolean viChangeChar(int count, int c) throws IOException {
         // EOF, ESC, or CTRL-C aborts.
@@ -1194,7 +1230,6 @@ public class ConsoleReader
      *
      * @param count number of iterations
      * @return true if the move was successful, false otherwise
-     * @throws IOException
      */
     private boolean viPreviousWord(int count) throws IOException {
         boolean ok = true;
@@ -1230,7 +1265,6 @@ public class ConsoleReader
      *    (e.g. "c$" is change-to-end-of line, so we first must delete to end
      *    of line to start the change
      * @return true if it succeeded, false otherwise
-     * @throws IOException
      */
     private boolean viDeleteTo(int startPos, int endPos, boolean isChange) throws IOException {
         if (startPos == endPos) {
@@ -1267,7 +1301,6 @@ public class ConsoleReader
      * @param startPos The starting position from which to yank
      * @param endPos The ending position to which to yank
      * @return true if the yank succeeded
-     * @throws IOException
      */
     private boolean viYankTo(int startPos, int endPos) throws IOException {
         int cursorPos = startPos;
@@ -1299,7 +1332,6 @@ public class ConsoleReader
      *
      * @param count Number of times to perform the operation.
      * @return true if it worked, false otherwise
-     * @throws IOException
      */
     private boolean viPut(int count) throws IOException {
         if (yankBuffer.length () == 0) {
@@ -1321,7 +1353,6 @@ public class ConsoleReader
      * @param count Number of times to repeat the process.
      * @param ch The character to search for
      * @return true if the char was found, false otherwise
-     * @throws IOException
      */
     private boolean viCharSearch(int count, int invokeChar, int ch) throws IOException {
         if (ch < 0 || invokeChar < 0) {
@@ -1421,7 +1452,7 @@ public class ConsoleReader
         return ok;
     }
 
-    private char switchCase(char ch) {
+    private static char switchCase(char ch) {
         if (Character.isUpperCase(ch)) {
             return Character.toLowerCase(ch);
         }
@@ -1445,7 +1476,6 @@ public class ConsoleReader
      *
      * @param count number of iterations
      * @return true if the move was successful, false otherwise
-     * @throws IOException
      */
     private boolean viNextWord(int count) throws IOException {
         int pos = buf.cursor;
@@ -1483,7 +1513,6 @@ public class ConsoleReader
      *
      * @param count Number of times to repeat the action
      * @return true if it worked.
-     * @throws IOException
      */
     private boolean viEndWord(int count) throws IOException {
         int pos = buf.cursor;
@@ -1541,7 +1570,6 @@ public class ConsoleReader
      *
      * @param count Number of times to perform the operation
      * @return true if it worked, false if you tried to delete too many words
-     * @throws IOException
      */
     private boolean unixWordRubout(int count) throws IOException {
         boolean success = true;
@@ -1581,7 +1609,7 @@ public class ConsoleReader
     }
 
     private String insertComment(boolean isViMode) throws IOException {
-        String comment = this.getCommentBegin ();
+        String comment = this.getCommentBegin();
         setCursorPosition(0);
         putString(comment);
         if (isViMode) {
@@ -1590,35 +1618,8 @@ public class ConsoleReader
         return accept();
     }
 
-    /**
-     * Similar to putString() but allows the string to be repeated a specific
-     * number of times, allowing easy support of vi digit arguments to a given
-     * command. The string is placed as the current cursor position.
-     *
-     * @param count The count of times to insert the string.
-     * @param str The string to insert
-     * @return true if the operation is a success, false otherwise
-     * @throws IOException
-     */
-    private boolean insert(int count, final CharSequence str) throws IOException {
-        for (int i = 0; i < count; i++) {
-            buf.write(str);
-            if (mask == null) {
-                // no masking
-                print(str);
-            } else if (mask == NULL_MASK) {
-                // don't print anything
-            } else {
-                print(mask, str.length());
-            }
-        }
-        drawBuffer();
-        return true;
-    }
-
     /**
      * Implements vi search ("/" or "?").
-     * @throws IOException
      */
     @SuppressWarnings("fallthrough")
     private int viSearch(char searchChar) throws IOException {
@@ -1793,18 +1794,19 @@ public class ConsoleReader
     }
 
     private void insertClose(String s) throws IOException {
-         putString(s);
-         int closePosition = buf.cursor;
+        putString(s);
+        int closePosition = buf.cursor;
 
-         moveCursor(-1);
-         viMatch();
+        moveCursor(-1);
+        viMatch();
 
 
-         if (in.isNonBlockingEnabled()) {
+        if (in.isNonBlockingEnabled()) {
             in.peek(parenBlinkTimeout);
-         }
+        }
 
-         setCursorPosition(closePosition);
+        setCursorPosition(closePosition);
+        flush();
     }
 
     /**
@@ -1813,7 +1815,6 @@ public class ConsoleReader
      * The logic works like so:
      * @return true if it worked, false if the cursor was not on a bracket
      *   character or if there was no matching bracket.
-     * @throws IOException
      */
     private boolean viMatch() throws IOException {
         int pos        = buf.cursor;
@@ -1854,6 +1855,7 @@ public class ConsoleReader
             ++pos;
 
         setCursorPosition(pos);
+        flush();
         return true;
     }
 
@@ -1864,7 +1866,7 @@ public class ConsoleReader
      * @return 1 is square, 2 curly, 3 parent, or zero for none.  The value
      *   will be negated if it is the closing form of the bracket.
      */
-    private int getBracketType (char ch) {
+    private static int getBracketType (char ch) {
         switch (ch) {
             case '[': return  1;
             case ']': return -1;
@@ -1976,7 +1978,6 @@ public class ConsoleReader
      * @param count The number of times to perform the transpose
      * @return true if the operation succeeded, false otherwise (e.g. transpose
      *   cannot happen at the beginning of the line).
-     * @throws IOException
      */
     private boolean transposeChars(int count) throws IOException {
         for (; count > 0; --count) {
@@ -2021,7 +2022,6 @@ public class ConsoleReader
      * complete and is returned.
      *
      * @return The completed line of text.
-     * @throws IOException
      */
     public String accept() throws IOException {
         moveToEnd();
@@ -2076,75 +2076,65 @@ public class ConsoleReader
         // + buf.cursor + " => " + (buf.cursor + where) + ")");
         buf.cursor += where;
 
-        if (terminal.isAnsiSupported()) {
+        int i0;
+        int i1;
+        if (mask == null) {
             if (where < 0) {
-                back(Math.abs(where));
+                i1 = promptLen + wcwidth(buf.buffer, 0, buf.cursor, promptLen);
+                i0 = i1 + wcwidth(buf.buffer, buf.cursor, buf.cursor - where, i1);
             } else {
-                int width = getTerminal().getWidth();
-                int cursor = getCursorPosition();
-                int oldLine = (cursor - where) / width;
-                int newLine = cursor / width;
-                if (newLine > oldLine) {
-                    printAnsiSequence((newLine - oldLine) + "B");
-                }
-                printAnsiSequence(1 +(cursor % width) + "G");
+                i0 = promptLen + wcwidth(buf.buffer, 0, buf.cursor - where, promptLen);
+                i1 = i0 + wcwidth(buf.buffer, buf.cursor - where, buf.cursor, i0);
             }
-//            flush();
+        } else if (mask != NULL_MASK) {
+            i1 = promptLen + buf.cursor;
+            i0 = i1 - where;
+        } else {
             return;
         }
-
-        char c;
-
-        if (where < 0) {
-            int len = 0;
-            for (int i = buf.cursor; i < buf.cursor - where; i++) {
-                if (buf.buffer.charAt(i) == '\t') {
-                    len += TAB_WIDTH;
-                }
-                else {
-                    len++;
-                }
-            }
-
-            char chars[] = new char[len];
-            Arrays.fill(chars, BACKSPACE);
-            out.write(chars);
-
-            return;
-        }
-        else if (buf.cursor == 0) {
-            return;
-        }
-        else if (mask != null) {
-            c = mask;
-        }
-        else {
-            print(buf.buffer.substring(buf.cursor - where, buf.cursor).toCharArray());
-            return;
-        }
-
-        // null character mask: don't output anything
-        if (mask == NULL_MASK) {
-            return;
-        }
-
-        print(c, Math.abs(where));
+        moveCursorFromTo(i0, i1);
     }
 
-    // FIXME: replace() is not used
-
-    public final boolean replace(final int num, final String replacement) {
-        buf.buffer.replace(buf.cursor - num, buf.cursor, replacement);
-        try {
-            moveCursor(-num);
-            drawBuffer(Math.max(0, num - replacement.length()));
-            moveCursor(replacement.length());
+    private void moveCursorFromTo(int i0, int i1) throws IOException {
+        if (i0 == i1) return;
+        int width = getTerminal().getWidth();
+        int l0 = i0 / width;
+        int c0 = i0 % width;
+        int l1 = i1 / width;
+        int c1 = i1 % width;
+        if (l0 == l1 + 1) {
+            if (!tputs("cursor_up")) {
+                tputs("parm_up_cursor", 1);
+            }
+        } else if (l0 > l1) {
+            if (!tputs("parm_up_cursor", l0 - l1)) {
+                for (int i = l1; i < l0; i++) {
+                    tputs("cursor_up");
+                }
+            }
+        } else if (l0 < l1) {
+            tputs("carriage_return");
+            rawPrint('\n', l1 - l0);
+            c0 = 0;
         }
-        catch (IOException e) {
-            e.printStackTrace();
-            return false;
+        if (c0 == c1 - 1) {
+            tputs("cursor_right");
+        } else if (c0 == c1 + 1) {
+            tputs("cursor_left");
+        } else if (c0 < c1) {
+            if (!tputs("parm_right_cursor", c1 - c0)) {
+                for (int i = c0; i < c1; i++) {
+                    tputs("cursor_right");
+                }
+            }
+        } else if (c0 > c1) {
+            if (!tputs("parm_left_cursor", c0 - c1)) {
+                for (int i = c1; i < c0; i++) {
+                    tputs("cursor_left");
+                }
+            }
         }
-        return true;
+        cursorOk = true;
     }
 
     /**
@@ -2152,7 +2142,17 @@ public class ConsoleReader
      *
      * @return the character, or -1 if an EOF is received.
      */
-    public final int readCharacter() throws IOException {
+    public int readCharacter() throws IOException {
+      return readCharacter(false);
+    }
+
+    /**
+     * Read a character from the console.  If boolean parameter is "true", it will check whether the keystroke was an "alt-" key combination, and
+     * if so add 1000 to the value returned.  Better way...?
+     *
+     * @return the character, or -1 if an EOF is received.
+     */
+    public int readCharacter(boolean checkForAltKeyCombo) throws IOException {
         int c = reader.read();
         if (c >= 0) {
             Log.trace("Keystroke: ", c);
@@ -2160,6 +2160,20 @@ public class ConsoleReader
             if (terminal.isSupported()) {
                 clearEcho(c);
             }
+            if (c == ESCAPE && checkForAltKeyCombo && in.peek(escapeTimeout) >= 32) {
+              /* When ESC is encountered and there is a pending
+               * character in the pushback queue, then it seems to be
+               * an Alt-[key] combination.  Is this true, cross-platform?
+               * It's working for me on Debian GNU/Linux at the moment anyway.
+               * I removed the "isNonBlockingEnabled" check, though it was
+               * in the similar code in "readLine(String prompt, final Character mask)" (way down),
+               * as I am not sure / didn't look up what it's about, and things are working so far w/o it.
+               */
+              int next = reader.read();
+              // with research, there's probably a much cleaner way to do this, but, this is now it flags an Alt key combination for now:
+              next = next + 1000;
+              return next;
+            }
         }
         return c;
     }
@@ -2174,83 +2188,160 @@ public class ConsoleReader
         }
 
         // otherwise, clear
-        int num = countEchoCharacters(c);
-        back(num);
+        int pos = getCursorPosition();
+        int num = wcwidth(c, pos);
+        moveCursorFromTo(pos + num, pos);
         drawBuffer(num);
 
         return num;
     }
 
-    private int countEchoCharacters(final int c) {
-        // tabs as special: we need to determine the number of spaces
-        // to cancel based on what out current cursor position is
-        if (c == 9) {
-            int tabStop = 8; // will this ever be different?
-            int position = getCursorPosition();
-
-            return tabStop - (position % tabStop);
-        }
-
-        return getPrintableCharacters(c).length();
+    public int readCharacter(final char... allowed) throws IOException {
+      return readCharacter(false, allowed);
     }
 
-    /**
-     * Return the number of characters that will be printed when the specified
-     * character is echoed to the screen
-     *
-     * Adapted from cat by Torbjorn Granlund, as repeated in stty by David MacKenzie.
-     */
-    private StringBuilder getPrintableCharacters(final int ch) {
-        StringBuilder sbuff = new StringBuilder();
-
-        if (ch >= 32) {
-            if (ch < 127) {
-                sbuff.append(ch);
-            }
-            else if (ch == 127) {
-                sbuff.append('^');
-                sbuff.append('?');
-            }
-            else {
-                sbuff.append('M');
-                sbuff.append('-');
-
-                if (ch >= (128 + 32)) {
-                    if (ch < (128 + 127)) {
-                        sbuff.append((char) (ch - 128));
-                    }
-                    else {
-                        sbuff.append('^');
-                        sbuff.append('?');
-                    }
-                }
-                else {
-                    sbuff.append('^');
-                    sbuff.append((char) (ch - 128 + 64));
-                }
-            }
-        }
-        else {
-            sbuff.append('^');
-            sbuff.append((char) (ch + 64));
-        }
-
-        return sbuff;
-    }
-
-    public final int readCharacter(final char... allowed) throws IOException {
+    public int readCharacter(boolean checkForAltKeyCombo, final char... allowed) throws IOException {
         // if we restrict to a limited set and the current character is not in the set, then try again.
         char c;
 
         Arrays.sort(allowed); // always need to sort before binarySearch
 
-        while (Arrays.binarySearch(allowed, c = (char) readCharacter()) < 0) {
+        while (Arrays.binarySearch(allowed, c = (char) readCharacter(checkForAltKeyCombo)) < 0) {
             // nothing
         }
 
         return c;
     }
 
+    /**
+     * Read from the input stream and decode an operation from the key map.
+     *
+     * The input stream will be read character by character until a matching
+     * binding can be found.  Characters that can't possibly be matched to
+     * any binding will be discarded.
+     *
+     * @param keys the KeyMap to use for decoding the input stream
+     * @return the decoded binding or <code>null</code> if the end of
+     *         stream has been reached
+     */
+    public Object readBinding(KeyMap keys) throws IOException {
+        Object o;
+        opBuffer.setLength(0);
+        do {
+            int c = pushBackChar.isEmpty() ? readCharacter() : pushBackChar.pop();
+            if (c == -1) {
+                return null;
+            }
+            opBuffer.appendCodePoint(c);
+
+            if (recording) {
+                macro += new String(Character.toChars(c));
+            }
+
+            if (quotedInsert) {
+                o = Operation.SELF_INSERT;
+                quotedInsert = false;
+            } else {
+                o = keys.getBound(opBuffer);
+            }
+
+            /*
+             * The kill ring keeps record of whether or not the
+             * previous command was a yank or a kill. We reset
+             * that state here if needed.
+             */
+            if (!recording && !(o instanceof KeyMap)) {
+                if (o != Operation.YANK_POP && o != Operation.YANK) {
+                    killRing.resetLastYank();
+                }
+                if (o != Operation.KILL_LINE && o != Operation.KILL_WHOLE_LINE
+                        && o != Operation.BACKWARD_KILL_WORD && o != Operation.KILL_WORD
+                        && o != Operation.UNIX_LINE_DISCARD && o != Operation.UNIX_WORD_RUBOUT) {
+                    killRing.resetLastKill();
+                }
+            }
+
+            if (o == Operation.DO_LOWERCASE_VERSION) {
+                opBuffer.setLength(opBuffer.length() - 1);
+                opBuffer.append(Character.toLowerCase((char) c));
+                o = keys.getBound(opBuffer);
+            }
+
+            /*
+             * A KeyMap indicates that the key that was struck has a
+             * number of keys that can follow it as indicated in the
+             * map. This is used primarily for Emacs style ESC-META-x
+             * lookups. Since more keys must follow, go back to waiting
+             * for the next key.
+             */
+            if (o instanceof KeyMap) {
+                /*
+                 * The ESC key (#27) is special in that it is ambiguous until
+                 * you know what is coming next.  The ESC could be a literal
+                 * escape, like the user entering vi-move mode, or it could
+                 * be part of a terminal control sequence.  The following
+                 * logic attempts to disambiguate things in the same
+                 * fashion as regular vi or readline.
+                 *
+                 * When ESC is encountered and there is no other pending
+                 * character in the pushback queue, then attempt to peek
+                 * into the input stream (if the feature is enabled) for
+                 * 150ms. If nothing else is coming, then assume it is
+                 * not a terminal control sequence, but a raw escape.
+                 */
+                if (c == ESCAPE
+                        && pushBackChar.isEmpty()
+                        && in.isNonBlockingEnabled()
+                        && in.peek(escapeTimeout) == READ_EXPIRED) {
+                    o = ((KeyMap) o).getAnotherKey();
+                    if (o == null || o instanceof KeyMap) {
+                        continue;
+                    }
+                    opBuffer.setLength(0);
+                } else {
+                    continue;
+                }
+            }
+
+            /*
+             * If we didn't find a binding for the key and there is
+             * more than one character accumulated then start checking
+             * the largest span of characters from the beginning to
+             * see if there is a binding for them.
+             *
+             * For example if our buffer has ESC,CTRL-M,C the getBound()
+             * called previously indicated that there is no binding for
+             * this sequence, so this then checks ESC,CTRL-M, and failing
+             * that, just ESC. Each keystroke that is pealed off the end
+             * during these tests is stuffed onto the pushback buffer so
+             * they won't be lost.
+             *
+             * If there is no binding found, then we go back to waiting for
+             * input.
+             */
+            while (o == null && opBuffer.length() > 0) {
+                c = opBuffer.charAt(opBuffer.length() - 1);
+                opBuffer.setLength(opBuffer.length() - 1);
+                Object o2 = keys.getBound(opBuffer);
+                if (o2 instanceof KeyMap) {
+                    o = ((KeyMap) o2).getAnotherKey();
+                    if (o == null) {
+                        continue;
+                    } else {
+                        pushBackChar.push((char) c);
+                    }
+                }
+            }
+
+        } while (o == null || o instanceof KeyMap);
+
+        return o;
+    }
+
+    public String getLastBinding() {
+        return opBuffer.toString();
+    }
+
     //
     // Key Bindings
     //
@@ -2280,6 +2371,18 @@ public class ConsoleReader
         return readLine(prompt, null);
     }
 
+    /**
+     * Read a line from the <i>in</i> {@link InputStream}, and return the line
+     * (without any trailing newlines).
+     *
+     * @param prompt    The prompt to issue to the console, may be null.
+     * @return          A line that is read from the terminal, or null if there was null input (e.g., <i>CTRL-D</i>
+     *                  was pressed).
+     */
+    public String readLine(String prompt, final Character mask) throws IOException {
+        return readLine(prompt, mask, null);
+    }
+
     /**
      * Sets the current keymap by name. Supported keymaps are "emacs",
      * "vi-insert", "vi-move".
@@ -2309,9 +2412,10 @@ public class ConsoleReader
      * @return          A line that is read from the terminal, or null if there was null input (e.g., <i>CTRL-D</i>
      *                  was pressed).
      */
-    public String readLine(String prompt, final Character mask) throws IOException {
+    public String readLine(String prompt, final Character mask, String buffer) throws IOException {
         // prompt may be null
         // mask may be null
+        // buffer may be null
 
         /*
          * This is the accumulator for VI-mode repeat count. That is, while in
@@ -2321,7 +2425,7 @@ public class ConsoleReader
         int repeatCount = 0;
 
         // FIXME: This blows, each call to readLine will reset the console's state which doesn't seem very nice.
-        this.mask = mask;
+        this.mask = mask != null ? mask : this.echoCharacter;
         if (prompt != null) {
             setPrompt(prompt);
         }
@@ -2330,12 +2434,17 @@ public class ConsoleReader
         }
 
         try {
+            if (buffer != null) {
+                buf.write(buffer);
+            }
+
             if (!terminal.isSupported()) {
                 beforeReadLine(prompt, mask);
             }
 
-            if (prompt != null && prompt.length() > 0) {
-                out.write(prompt);
+            if (buffer != null && buffer.length() > 0
+                    || prompt != null && prompt.length() > 0) {
+                drawLine();
                 out.flush();
             }
 
@@ -2371,8 +2480,11 @@ public class ConsoleReader
                 return readLineSimple();
             }
 
-            if (handleUserInterrupt && (terminal instanceof UnixTerminal)) {
-                ((UnixTerminal) terminal).disableInterruptCharacter();
+            if (handleUserInterrupt) {
+                terminal.disableInterruptCharacter();
+            }
+            if (handleLitteralNext && (terminal instanceof UnixTerminal)) {
+                ((UnixTerminal) terminal).disableLitteralNextCharacter();
             }
 
             String originalPrompt = this.prompt;
@@ -2381,110 +2493,15 @@ public class ConsoleReader
 
             boolean success = true;
 
-            StringBuilder sb = new StringBuilder();
             while (true) {
-                int c = pushBackChar.isEmpty() ? readCharacter() : pushBackChar.pop ();
-                if (c == -1) {
+
+                Object o = readBinding(getKeys());
+                if (o == null) {
                     return null;
                 }
-                sb.appendCodePoint(c);
-
-                if (recording) {
-                    macro += new String(new int[]{c}, 0, 1);
-                }
-
-                Object o = getKeys().getBound( sb );
-                /*
-                 * The kill ring keeps record of whether or not the
-                 * previous command was a yank or a kill. We reset
-                 * that state here if needed.
-                 */
-                if (!recording && !(o instanceof KeyMap)) {
-                    if (o != Operation.YANK_POP && o != Operation.YANK) {
-                        killRing.resetLastYank();
-                    }
-                    if (o != Operation.KILL_LINE && o != Operation.KILL_WHOLE_LINE
-                        && o != Operation.BACKWARD_KILL_WORD && o != Operation.KILL_WORD
-                        && o != Operation.UNIX_LINE_DISCARD && o != Operation.UNIX_WORD_RUBOUT) {
-                        killRing.resetLastKill();
-                    }
-                }
-
-                if (o == Operation.DO_LOWERCASE_VERSION) {
-                    sb.setLength( sb.length() - 1);
-                    sb.append( Character.toLowerCase( (char) c ));
-                    o = getKeys().getBound( sb );
-                }
-
-                /*
-                 * A KeyMap indicates that the key that was struck has a
-                 * number of keys that can follow it as indicated in the
-                 * map. This is used primarily for Emacs style ESC-META-x
-                 * lookups. Since more keys must follow, go back to waiting
-                 * for the next key.
-                 */
-                if ( o instanceof KeyMap ) {
-                    /*
-                     * The ESC key (#27) is special in that it is ambiguous until
-                     * you know what is coming next.  The ESC could be a literal
-                     * escape, like the user entering vi-move mode, or it could
-                     * be part of a terminal control sequence.  The following
-                     * logic attempts to disambiguate things in the same
-                     * fashion as regular vi or readline.
-                     *
-                     * When ESC is encountered and there is no other pending
-                     * character in the pushback queue, then attempt to peek
-                     * into the input stream (if the feature is enabled) for
-                     * 150ms. If nothing else is coming, then assume it is
-                     * not a terminal control sequence, but a raw escape.
-                     */
-                    if (c == 27
-                            && pushBackChar.isEmpty()
-                            && in.isNonBlockingEnabled()
-                            && in.peek(escapeTimeout) == -2) {
-                        o = ((KeyMap) o).getAnotherKey();
-                        if (o == null || o instanceof KeyMap) {
-                            continue;
-                        }
-                        sb.setLength(0);
-                    }
-                    else {
-                        continue;
-                    }
-                }
-
-                /*
-                 * If we didn't find a binding for the key and there is
-                 * more than one character accumulated then start checking
-                 * the largest span of characters from the beginning to
-                 * see if there is a binding for them.
-                 *
-                 * For example if our buffer has ESC,CTRL-M,C the getBound()
-                 * called previously indicated that there is no binding for
-                 * this sequence, so this then checks ESC,CTRL-M, and failing
-                 * that, just ESC. Each keystroke that is pealed off the end
-                 * during these tests is stuffed onto the pushback buffer so
-                 * they won't be lost.
-                 *
-                 * If there is no binding found, then we go back to waiting for
-                 * input.
-                 */
-                while ( o == null && sb.length() > 0 ) {
-                    c = sb.charAt( sb.length() - 1 );
-                    sb.setLength( sb.length() - 1 );
-                    Object o2 = getKeys().getBound( sb );
-                    if ( o2 instanceof KeyMap ) {
-                        o = ((KeyMap) o2).getAnotherKey();
-                        if ( o == null ) {
-                            continue;
-                        } else {
-                            pushBackChar.push( (char) c );
-                        }
-                    }
-                }
-
-                if ( o == null ) {
-                    continue;
+                int c = 0;
+                if (opBuffer.length() > 0) {
+                    c = opBuffer.codePointBefore(opBuffer.length());
                 }
                 Log.trace("Binding: ", o);
 
@@ -2495,7 +2512,7 @@ public class ConsoleReader
                     for (int i = 0; i < macro.length(); i++) {
                         pushBackChar.push(macro.charAt(macro.length() - 1 - i));
                     }
-                    sb.setLength( 0 );
+                    opBuffer.setLength(0);
                     continue;
                 }
 
@@ -2520,7 +2537,7 @@ public class ConsoleReader
                         } catch (InvocationTargetException ex ) {
                             Log.error("Exception while running registered action", ex);
                         }
-                        sb.setLength( 0 );
+                        opBuffer.setLength(0);
                         continue;
                     }
                 } catch (ReflectiveOperationException ex) {
@@ -2529,10 +2546,14 @@ public class ConsoleReader
 
                 if (o instanceof Runnable) {
                     ((Runnable) o).run();
-                    sb.setLength(0);
+                    opBuffer.setLength(0);
                     continue;
                 }
 
+                CursorBuffer oldBuf = new CursorBuffer();
+                oldBuf.buffer.append(buf.buffer);
+                oldBuf.cursor = buf.cursor;
+
                 // Search mode.
                 //
                 // Note that we have to do this first, because if there is a command
@@ -2540,11 +2561,13 @@ public class ConsoleReader
                 // through to the normal state.
                 if (state == State.SEARCH || state == State.FORWARD_SEARCH) {
                     int cursorDest = -1;
+                    // TODO: check the isearch-terminators variable terminating the search
                     switch ( ((Operation) o )) {
                         case ABORT:
                             state = State.NORMAL;
                             buf.clear();
-                            buf.buffer.append(searchTerm);
+                            buf.write(originalBuffer.buffer);
+                            buf.cursor = originalBuffer.cursor;
                             break;
 
                         case REVERSE_SEARCH_HISTORY:
@@ -2596,6 +2619,9 @@ public class ConsoleReader
                                 // set cursor position to the found string
                                 cursorDest = history.current().toString().indexOf(searchTerm.toString());
                             }
+                            if (o != Operation.ACCEPT_LINE) {
+                                o = null;
+                            }
                             state = State.NORMAL;
                             break;
                     }
@@ -2685,7 +2711,7 @@ public class ConsoleReader
                                     success = complete();
                                 }
                                 else {
-                                    putString(sb);
+                                    putString(opBuffer);
                                 }
                                 break;
 
@@ -2723,7 +2749,7 @@ public class ConsoleReader
                                 break;
 
                             case SELF_INSERT:
-                                putString(sb);
+                                putString(opBuffer);
                                 break;
 
                             case ACCEPT_LINE:
@@ -2884,6 +2910,9 @@ public class ConsoleReader
                                 break;
 
                             case REVERSE_SEARCH_HISTORY:
+                                originalBuffer = new CursorBuffer();
+                                originalBuffer.write(buf.buffer);
+                                originalBuffer.cursor = buf.cursor;
                                 if (searchTerm != null) {
                                     previousSearchTerm = searchTerm.toString();
                                 }
@@ -2903,6 +2932,9 @@ public class ConsoleReader
                                 break;
 
                             case FORWARD_SEARCH_HISTORY:
+                                originalBuffer = new CursorBuffer();
+                                originalBuffer.write(buf.buffer);
+                                originalBuffer.cursor = buf.cursor;
                                 if (searchTerm != null) {
                                     previousSearchTerm = searchTerm.toString();
                                 }
@@ -2951,14 +2983,14 @@ public class ConsoleReader
 
                             case END_KBD_MACRO:
                                 recording = false;
-                                macro = macro.substring(0, macro.length() - sb.length());
+                                macro = macro.substring(0, macro.length() - opBuffer.length());
                                 break;
 
                             case CALL_LAST_KBD_MACRO:
                                 for (int i = 0; i < macro.length(); i++) {
                                     pushBackChar.push(macro.charAt(macro.length() - 1 - i));
                                 }
-                                sb.setLength( 0 );
+                                opBuffer.setLength(0);
                                 break;
 
                             case VI_EDITING_MODE:
@@ -3031,20 +3063,20 @@ public class ConsoleReader
                                 break;
 
                             case VI_SEARCH:
-                                int lastChar = viSearch(sb.charAt (0));
+                                int lastChar = viSearch(opBuffer.charAt(0));
                                 if (lastChar != -1) {
                                     pushBackChar.push((char)lastChar);
                                 }
                                 break;
 
                             case VI_ARG_DIGIT:
-                                repeatCount = (repeatCount * 10) + sb.charAt(0) - '0';
+                                repeatCount = (repeatCount * 10) + opBuffer.charAt(0) - '0';
                                 isArgDigit = true;
                                 break;
 
-                            case VI_BEGNNING_OF_LINE_OR_ARG_DIGIT:
+                            case VI_BEGINNING_OF_LINE_OR_ARG_DIGIT:
                                 if (repeatCount > 0) {
-                                    repeatCount = (repeatCount * 10) + sb.charAt(0) - '0';
+                                    repeatCount = (repeatCount * 10) + opBuffer.charAt(0) - '0';
                                     isArgDigit = true;
                                 }
                                 else {
@@ -3164,6 +3196,18 @@ public class ConsoleReader
                                 consoleKeys.setKeyMap(KeyMap.EMACS);
                                 break;
 
+                            case QUIT:
+                                getCursorBuffer().clear();
+                                return accept();
+
+                            case QUOTED_INSERT:
+                                quotedInsert = true;
+                                break;
+
+                            case PASTE_FROM_CLIPBOARD:
+//                                paste();
+                                break;
+
                             default:
                                 break;
                         }
@@ -3200,6 +3244,7 @@ public class ConsoleReader
                         }
 
                         if (state != State.SEARCH && state != State.FORWARD_SEARCH) {
+                            originalBuffer = null;
                             previousSearchTerm = "";
                             searchTerm = null;
                             searchIndex = -1;
@@ -3209,7 +3254,8 @@ public class ConsoleReader
                 if (!success) {
                     beep();
                 }
-                sb.setLength( 0 );
+                opBuffer.setLength(0);
+
                 flush();
             }
         }
@@ -3217,21 +3263,19 @@ public class ConsoleReader
             if (!terminal.isSupported()) {
                 afterReadLine();
             }
-            if (handleUserInterrupt && (terminal instanceof UnixTerminal)) {
-                ((UnixTerminal) terminal).enableInterruptCharacter();
+            if (handleUserInterrupt) {
+                terminal.enableInterruptCharacter();
             }
         }
     }
     //where:
         private Pattern CURSOR_COLUMN_PATTERN =
                 Pattern.compile("(?<prefix>.*)\033\\[[0-9]+;(?<column>[0-9]+)R", Pattern.DOTALL);
-        private Stack<Character> pushBackChar = new Stack<Character>();
 
     /**
      * Read a line for unsupported terminals.
      */
     private String readLineSimple() throws IOException {
-        StringBuilder buff = new StringBuilder();
 
         if (skipLF) {
             skipLF = false;
@@ -3239,28 +3283,28 @@ public class ConsoleReader
             int i = readCharacter();
 
             if (i == -1 || i == '\r') {
-                return buff.toString();
+                return finishBuffer();
             } else if (i == '\n') {
                 // ignore
             } else {
-                buff.append((char) i);
+                buf.buffer.append((char) i);
             }
         }
 
         while (true) {
             int i = readCharacter();
 
-            if (i == -1 && buff.length() == 0) {
+            if (i == -1 && buf.buffer.length() == 0) {
               return null;
             }
 
             if (i == -1 || i == '\n') {
-                return buff.toString();
+                return finishBuffer();
             } else if (i == '\r') {
                 skipLF = true;
-                return buff.toString();
+                return finishBuffer();
             } else {
-                buff.append((char) i);
+                buf.buffer.append((char) i);
             }
         }
     }
@@ -3426,7 +3470,6 @@ public class ConsoleReader
      * @param next If true, move forward
      * @param count The number of entries to move
      * @return true if the move was successful
-     * @throws IOException
      */
     private boolean moveHistory(final boolean next, int count) throws IOException {
         boolean ok = true;
@@ -3456,89 +3499,89 @@ public class ConsoleReader
     // Printing
     //
 
-    public static final String CR = Configuration.getLineSeparator();
-
-    /**
-     * Output the specified character to the output stream without manipulating the current buffer.
-     */
-    private void print(final int c) throws IOException {
-        if (c == '\t') {
-            char chars[] = new char[TAB_WIDTH];
-            Arrays.fill(chars, ' ');
-            out.write(chars);
-            return;
-        }
-
-        out.write(c);
-    }
-
     /**
      * Output the specified characters to the output stream without manipulating the current buffer.
      */
-    private void print(final char... buff) throws IOException {
-        int len = 0;
-        for (char c : buff) {
-            if (c == '\t') {
-                len += TAB_WIDTH;
-            }
-            else {
-                len++;
-            }
-        }
-
-        char chars[];
-        if (len == buff.length) {
-            chars = buff;
-        }
-        else {
-            chars = new char[len];
-            int pos = 0;
-            for (char c : buff) {
-                if (c == '\t') {
-                    Arrays.fill(chars, pos, pos + TAB_WIDTH, ' ');
-                    pos += TAB_WIDTH;
-                }
-                else {
-                    chars[pos] = c;
-                    pos++;
-                }
-            }
-        }
-
-        out.write(chars);
+    private int fmtPrint(final CharSequence buff, int cursorPos) throws IOException {
+        return fmtPrint(buff, 0, buff.length(), cursorPos);
     }
 
-    private void print(final char c, final int num) throws IOException {
-        if (num == 1) {
-            print(c);
-        }
-        else {
-            char[] chars = new char[num];
-            Arrays.fill(chars, c);
-            print(chars);
+    private int fmtPrint(final CharSequence buff, int start, int end) throws IOException {
+        return fmtPrint(buff, start, end, getCursorPosition());
+    }
+
+    private int fmtPrint(final CharSequence buff, int start, int end, int cursorPos) throws IOException {
+        checkNotNull(buff);
+        for (int i = start; i < end; i++) {
+            char c = buff.charAt(i);
+            if (c == '\t') {
+                int nb = nextTabStop(cursorPos);
+                cursorPos += nb;
+                while (nb-- > 0) {
+                    out.write(' ');
+                }
+            } else if (c < 32) {
+                out.write('^');
+                out.write((char) (c + '@'));
+                cursorPos += 2;
+            } else {
+                int w = WCWidth.wcwidth(c);
+                if (w > 0) {
+                    out.write(c);
+                    cursorPos += w;
+                }
+            }
         }
+        cursorOk = false;
+        return cursorPos;
     }
 
     /**
      * Output the specified string to the output stream (but not the buffer).
      */
-    public final void print(final CharSequence s) throws IOException {
-        print(checkNotNull(s).toString().toCharArray());
+    public void print(final CharSequence s) throws IOException {
+        rawPrint(s.toString());
     }
 
-    public final void println(final CharSequence s) throws IOException {
-        print(checkNotNull(s).toString().toCharArray());
+    public void println(final CharSequence s) throws IOException {
+        print(s);
         println();
     }
 
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
     /**
      * Output a platform-dependent newline.
      */
-    public final void println() throws IOException {
-        print(CR);
-//        flush();
+    public void println() throws IOException {
+        rawPrint(LINE_SEPARATOR);
     }
 
+    /**
+     * Raw output printing
+     */
+    final void rawPrint(final int c) throws IOException {
+        out.write(c);
+        cursorOk = false;
+    }
+
+    final void rawPrint(final String str) throws IOException {
+        out.write(str);
+        cursorOk = false;
+    }
+
+    private void rawPrint(final char c, final int num) throws IOException {
+        for (int i = 0; i < num; i++) {
+            rawPrint(c);
+        }
+    }
+
+    private void rawPrintln(final String s) throws IOException {
+        rawPrint(s);
+        println();
+    }
+
+
     //
     // Actions
     //
@@ -3548,7 +3591,7 @@ public class ConsoleReader
      *
      * @return true if successful
      */
-    public final boolean delete() throws IOException {
+    public boolean delete() throws IOException {
         if (buf.cursor == buf.buffer.length()) {
           return false;
         }
@@ -3573,7 +3616,9 @@ public class ConsoleReader
         }
 
         int num = len - cp;
-        clearAhead(num, 0);
+        int pos = getCursorPosition();
+        int width = wcwidth(buf.buffer, cp, len, pos);
+        clearAhead(width, pos);
 
         char[] killed = new char[num];
         buf.buffer.getChars(cp, (cp + num), killed, 0);
@@ -3619,16 +3664,9 @@ public class ConsoleReader
      * Clear the screen by issuing the ANSI "clear screen" code.
      */
     public boolean clearScreen() throws IOException {
-        if (!terminal.isAnsiSupported()) {
-            return false;
+        if (!tputs("clear_screen")) {
+            println();
         }
-
-        // send the ANSI code to clear the screen
-        printAnsiSequence("2J");
-
-        // then send the ANSI code to go to position 1,1
-        printAnsiSequence("1;1H");
-
         return true;
     }
 
@@ -3637,9 +3675,10 @@ public class ConsoleReader
      */
     public void beep() throws IOException {
         if (bellEnabled) {
-            print(KEYBOARD_BELL);
-            // need to flush so the console actually beeps
-            flush();
+            if (tputs("bell")) {
+                // need to flush so the console actually beeps
+                flush();
+            }
         }
     }
 
@@ -3727,12 +3766,6 @@ public class ConsoleReader
 //    }
 
     //disabled to avoid dependency on java.desktop:
-//    //
-//    // Triggered Actions
-//    //
-//
-//    private final Map<Character, ActionListener> triggeredActions = new HashMap<Character, ActionListener>();
-//
 //    /**
 //     * Adding a triggered Action allows to give another curse of action if a character passed the pre-processing.
 //     * <p/>
@@ -3740,7 +3773,7 @@ public class ConsoleReader
 //     * addTriggerAction('q', new ActionListener(){ System.exit(0); }); would do the trick.
 //     */
 //    public void addTriggeredAction(final char c, final ActionListener listener) {
-//        triggeredActions.put(c, listener);
+//        getKeys().bind(Character.toString(c), listener);
 //    }
 
     //
@@ -3760,7 +3793,9 @@ public class ConsoleReader
 
         int maxWidth = 0;
         for (CharSequence item : items) {
-            maxWidth = Math.max(maxWidth, item.length());
+            // we use 0 here, as we don't really support tabulations inside candidates
+            int len = wcwidth(Ansi.stripAnsi(item.toString()), 0);
+            maxWidth = Math.max(maxWidth, len);
         }
         maxWidth = maxWidth + 3;
         Log.debug("Max width: ", maxWidth);
@@ -3774,10 +3809,12 @@ public class ConsoleReader
         }
 
         StringBuilder buff = new StringBuilder();
+        int realLength = 0;
         for (CharSequence item : items) {
-            if ((buff.length() + maxWidth) > width) {
-                println(buff);
+            if ((realLength + maxWidth) > width) {
+                rawPrintln(buff.toString());
                 buff.setLength(0);
+                realLength = 0;
 
                 if (--showLines == 0) {
                     // Overflow
@@ -3793,7 +3830,7 @@ public class ConsoleReader
                         showLines = height - 1;
                     }
 
-                    back(resources.getString("DISPLAY_MORE").length());
+                    tputs("carriage_return");
                     if (c == 'q') {
                         // cancel
                         break;
@@ -3803,13 +3840,15 @@ public class ConsoleReader
 
             // NOTE: toString() is important here due to AnsiString being retarded
             buff.append(item.toString());
-            for (int i = 0; i < (maxWidth - item.length()); i++) {
+            int strippedItemLength = wcwidth(Ansi.stripAnsi(item.toString()), 0);
+            for (int i = 0; i < (maxWidth - strippedItemLength); i++) {
                 buff.append(' ');
             }
+            realLength += maxWidth;
         }
 
         if (buff.length() > 0) {
-            println(buff);
+            rawPrintln(buff.toString());
         }
     }
 
@@ -4018,7 +4057,7 @@ public class ConsoleReader
      * @param c     The character to test
      * @return      True if it is a delimiter
      */
-    private boolean isDelimiter(final char c) {
+    private static boolean isDelimiter(final char c) {
         return !Character.isLetterOrDigit(c);
     }
 
@@ -4031,15 +4070,17 @@ public class ConsoleReader
      * @param c The character to check
      * @return true if the character is a whitespace
      */
-    private boolean isWhitespace(final char c) {
+    private static boolean isWhitespace(final char c) {
         return Character.isWhitespace (c);
     }
 
-    private void printAnsiSequence(String sequence) throws IOException {
-        print(27);
-        print('[');
-        print(sequence);
-        flush(); // helps with step debugging
+    private boolean tputs(String cap, Object... params) throws IOException {
+        String str = terminal.getStringCapability(cap);
+        if (str == null) {
+            return false;
+        }
+        Curses.tputs(out, str, params);
+        return true;
     }
 
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java
index 2866d6f5ae6..398dc306bee 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -92,7 +92,7 @@ public class CursorBuffer
         cursor += str.length();
 
         if (isOverTyping() && cursor < buffer.length()) {
-            buffer.delete(cursor, (cursor + str.length()));
+            buffer.delete(cursor, cursor + str.length());
         }
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java
index d0bca43b97d..3e21c8ec005 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -33,20 +33,19 @@ public class KeyMap {
     private Object[] mapping = new Object[KEYMAP_LENGTH];
     private Object anotherKey = null;
     private String name;
-    private boolean isViKeyMap;
 
-    public KeyMap(String name, boolean isViKeyMap) {
-        this(name, new Object[KEYMAP_LENGTH], isViKeyMap);
+    public KeyMap(String name) {
+        this(name, new Object[KEYMAP_LENGTH]);
     }
 
-    protected KeyMap(String name, Object[] mapping, boolean isViKeyMap) {
+    @Deprecated
+    public KeyMap(String name, boolean unused) {
+        this(name);
+    }
+
+    protected KeyMap(String name, Object[] mapping) {
         this.mapping = mapping;
         this.name = name;
-        this.isViKeyMap = isViKeyMap;
-    }
-
-    public boolean isViKeyMap() {
-        return isViKeyMap;
     }
 
     public String getName() {
@@ -110,7 +109,7 @@ public class KeyMap {
                 }
                 if (i < keySeq.length() - 1) {
                     if (!(map.mapping[c] instanceof KeyMap)) {
-                        KeyMap m = new KeyMap("anonymous", false);
+                        KeyMap m = new KeyMap("anonymous");
                         if (map.mapping[c] != Operation.DO_LOWERCASE_VERSION) {
                             m.anotherKey = map.mapping[c];
                         }
@@ -239,11 +238,11 @@ public class KeyMap {
         bindArrowKeys(viMov);
         keyMaps.put(VI_MOVE, viMov);
         keyMaps.put("vi-command", viMov);
+        keyMaps.put("vi", viMov);
 
         KeyMap viIns = viInsertion();
         bindArrowKeys(viIns);
         keyMaps.put(VI_INSERT, viIns);
-        keyMaps.put("vi", viIns);
 
         return keyMaps;
     }
@@ -290,7 +289,7 @@ public class KeyMap {
             map[i] = Operation.SELF_INSERT;
         }
         map[DELETE] = Operation.BACKWARD_DELETE_CHAR;
-        return new KeyMap(EMACS, map, false);
+        return new KeyMap(EMACS, map);
     }
 
     public static final char CTRL_D = (char) 4;
@@ -323,7 +322,7 @@ public class KeyMap {
         }
         map['e'] = Operation.CALL_LAST_KBD_MACRO;
         map[DELETE] = Operation.KILL_LINE;
-        return new KeyMap(EMACS_CTLX, map, false);
+        return new KeyMap(EMACS_CTLX, map);
     }
 
     public static KeyMap emacsMeta() {
@@ -364,7 +363,7 @@ public class KeyMap {
         map['y'] = Operation.YANK_POP;
         map['~'] = Operation.TILDE_EXPAND;
         map[DELETE] = Operation.BACKWARD_KILL_WORD;
-        return new KeyMap(EMACS_META, map, false);
+        return new KeyMap(EMACS_META, map);
     }
 
     public static KeyMap viInsertion() {
@@ -409,7 +408,7 @@ public class KeyMap {
             map[i] = Operation.SELF_INSERT;
         }
         map[DELETE] = Operation.BACKWARD_DELETE_CHAR;
-        return new KeyMap(VI_INSERT, map, false);
+        return new KeyMap(VI_INSERT, map);
     }
 
     public static KeyMap viMovement() {
@@ -485,7 +484,7 @@ public class KeyMap {
                         /* TODO */
                         Operation.VI_REDO,                  /* . */
                         Operation.VI_SEARCH,                /* / */
-                        Operation.VI_BEGNNING_OF_LINE_OR_ARG_DIGIT, /* 0 */
+                        Operation.VI_BEGINNING_OF_LINE_OR_ARG_DIGIT, /* 0 */
                         Operation.VI_ARG_DIGIT,             /* 1 */
                         Operation.VI_ARG_DIGIT,             /* 2 */
                         Operation.VI_ARG_DIGIT,             /* 3 */
@@ -573,6 +572,6 @@ public class KeyMap {
         for (int i = 128; i < 256; i++) {
             map[i] = null;
         }
-        return new KeyMap(VI_MOVE, map, false);
+        return new KeyMap(VI_MOVE, map);
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java
index 0d6c6bf39ab..689e4ad3ed7 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2013, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,7 +38,7 @@ public final class KillRing {
     }
 
     /**
-     * Creates a new kill ring of the default size. {@see DEFAULT_SIZE}.
+     * Creates a new kill ring of the default size. See {@link #DEFAULT_SIZE}.
      */
     public KillRing() {
         this(DEFAULT_SIZE);
@@ -152,7 +152,7 @@ public final class KillRing {
     private void prev() {
         head--;
         if (head == -1) {
-            int x = (slots.length - 1);
+            int x = slots.length - 1;
             for (; x >= 0; x--) {
                 if (slots[x] != null) {
                     break;
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java
index 755b657dd6f..b80d7c68166 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -81,6 +81,7 @@ public enum Operation {
     POSSIBLE_COMPLETIONS,
     PREVIOUS_HISTORY,
     QUOTED_INSERT,
+    QUIT,
     RE_READ_INIT_FILE,
     REDRAW_CURRENT_LINE,
     REVERSE_SEARCH_HISTORY,
@@ -156,5 +157,5 @@ public enum Operation {
     VI_NEXT_HISTORY,
     VI_PREVIOUS_HISTORY,
     VI_INSERT_COMMENT,
-    VI_BEGNNING_OF_LINE_OR_ARG_DIGIT,
+    VI_BEGINNING_OF_LINE_OR_ARG_DIGIT,
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java
index 81021b9f860..ad95870d4c1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/WCWidth.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/WCWidth.java
new file mode 100644
index 00000000000..ff212c48be3
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/WCWidth.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline.console;
+
+public class WCWidth {
+
+    /* The following two functions define the column width of an ISO 10646
+     * character as follows:
+     *
+     *    - The null character (U+0000) has a column width of 0.
+     *
+     *    - Other C0/C1 control characters and DEL will lead to a return
+     *      value of -1.
+     *
+     *    - Non-spacing and enclosing combining characters (general
+     *      category code Mn or Me in the Unicode database) have a
+     *      column width of 0.
+     *
+     *    - SOFT HYPHEN (U+00AD) has a column width of 1.
+     *
+     *    - Other format characters (general category code Cf in the Unicode
+     *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+     *
+     *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+     *      have a column width of 0.
+     *
+     *    - Spacing characters in the East Asian Wide (W) or East Asian
+     *      Full-width (F) category as defined in Unicode Technical
+     *      Report #11 have a column width of 2.
+     *
+     *    - All remaining characters (including all printable
+     *      ISO 8859-1 and WGL4 characters, Unicode control characters,
+     *      etc.) have a column width of 1.
+     *
+     * This implementation assumes that wchar_t characters are encoded
+     * in ISO 10646.
+     */
+    public static int wcwidth(int ucs)
+    {
+
+        /* test for 8-bit control characters */
+        if (ucs == 0)
+            return 0;
+        if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+            return -1;
+
+        /* binary search in table of non-spacing characters */
+        if (bisearch(ucs, combining, combining.length - 1))
+            return 0;
+
+        /* if we arrive here, ucs is not a combining or C0/C1 control character */
+        return 1 +
+                ((ucs >= 0x1100 &&
+                        (ucs <= 0x115f ||                           /* Hangul Jamo init. consonants */
+                                ucs == 0x2329 || ucs == 0x232a ||
+                                (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+                                        ucs != 0x303f) ||           /* CJK ... Yi */
+                                (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+                                (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+                                (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+                                (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+                                (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+                                (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+                                (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+                                (ucs >= 0x30000 && ucs <= 0x3fffd))) ? 1 : 0);
+    }
+
+    /* sorted list of non-overlapping intervals of non-spacing characters */
+    /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
+    static Interval[] combining = {
+            new Interval( 0x0300, 0x036F ), new Interval( 0x0483, 0x0486 ), new Interval( 0x0488, 0x0489 ),
+            new Interval( 0x0591, 0x05BD ), new Interval( 0x05BF, 0x05BF ), new Interval( 0x05C1, 0x05C2 ),
+            new Interval( 0x05C4, 0x05C5 ), new Interval( 0x05C7, 0x05C7 ), new Interval( 0x0600, 0x0603 ),
+            new Interval( 0x0610, 0x0615 ), new Interval( 0x064B, 0x065E ), new Interval( 0x0670, 0x0670 ),
+            new Interval( 0x06D6, 0x06E4 ), new Interval( 0x06E7, 0x06E8 ), new Interval( 0x06EA, 0x06ED ),
+            new Interval( 0x070F, 0x070F ), new Interval( 0x0711, 0x0711 ), new Interval( 0x0730, 0x074A ),
+            new Interval( 0x07A6, 0x07B0 ), new Interval( 0x07EB, 0x07F3 ), new Interval( 0x0901, 0x0902 ),
+            new Interval( 0x093C, 0x093C ), new Interval( 0x0941, 0x0948 ), new Interval( 0x094D, 0x094D ),
+            new Interval( 0x0951, 0x0954 ), new Interval( 0x0962, 0x0963 ), new Interval( 0x0981, 0x0981 ),
+            new Interval( 0x09BC, 0x09BC ), new Interval( 0x09C1, 0x09C4 ), new Interval( 0x09CD, 0x09CD ),
+            new Interval( 0x09E2, 0x09E3 ), new Interval( 0x0A01, 0x0A02 ), new Interval( 0x0A3C, 0x0A3C ),
+            new Interval( 0x0A41, 0x0A42 ), new Interval( 0x0A47, 0x0A48 ), new Interval( 0x0A4B, 0x0A4D ),
+            new Interval( 0x0A70, 0x0A71 ), new Interval( 0x0A81, 0x0A82 ), new Interval( 0x0ABC, 0x0ABC ),
+            new Interval( 0x0AC1, 0x0AC5 ), new Interval( 0x0AC7, 0x0AC8 ), new Interval( 0x0ACD, 0x0ACD ),
+            new Interval( 0x0AE2, 0x0AE3 ), new Interval( 0x0B01, 0x0B01 ), new Interval( 0x0B3C, 0x0B3C ),
+            new Interval( 0x0B3F, 0x0B3F ), new Interval( 0x0B41, 0x0B43 ), new Interval( 0x0B4D, 0x0B4D ),
+            new Interval( 0x0B56, 0x0B56 ), new Interval( 0x0B82, 0x0B82 ), new Interval( 0x0BC0, 0x0BC0 ),
+            new Interval( 0x0BCD, 0x0BCD ), new Interval( 0x0C3E, 0x0C40 ), new Interval( 0x0C46, 0x0C48 ),
+            new Interval( 0x0C4A, 0x0C4D ), new Interval( 0x0C55, 0x0C56 ), new Interval( 0x0CBC, 0x0CBC ),
+            new Interval( 0x0CBF, 0x0CBF ), new Interval( 0x0CC6, 0x0CC6 ), new Interval( 0x0CCC, 0x0CCD ),
+            new Interval( 0x0CE2, 0x0CE3 ), new Interval( 0x0D41, 0x0D43 ), new Interval( 0x0D4D, 0x0D4D ),
+            new Interval( 0x0DCA, 0x0DCA ), new Interval( 0x0DD2, 0x0DD4 ), new Interval( 0x0DD6, 0x0DD6 ),
+            new Interval( 0x0E31, 0x0E31 ), new Interval( 0x0E34, 0x0E3A ), new Interval( 0x0E47, 0x0E4E ),
+            new Interval( 0x0EB1, 0x0EB1 ), new Interval( 0x0EB4, 0x0EB9 ), new Interval( 0x0EBB, 0x0EBC ),
+            new Interval( 0x0EC8, 0x0ECD ), new Interval( 0x0F18, 0x0F19 ), new Interval( 0x0F35, 0x0F35 ),
+            new Interval( 0x0F37, 0x0F37 ), new Interval( 0x0F39, 0x0F39 ), new Interval( 0x0F71, 0x0F7E ),
+            new Interval( 0x0F80, 0x0F84 ), new Interval( 0x0F86, 0x0F87 ), new Interval( 0x0F90, 0x0F97 ),
+            new Interval( 0x0F99, 0x0FBC ), new Interval( 0x0FC6, 0x0FC6 ), new Interval( 0x102D, 0x1030 ),
+            new Interval( 0x1032, 0x1032 ), new Interval( 0x1036, 0x1037 ), new Interval( 0x1039, 0x1039 ),
+            new Interval( 0x1058, 0x1059 ), new Interval( 0x1160, 0x11FF ), new Interval( 0x135F, 0x135F ),
+            new Interval( 0x1712, 0x1714 ), new Interval( 0x1732, 0x1734 ), new Interval( 0x1752, 0x1753 ),
+            new Interval( 0x1772, 0x1773 ), new Interval( 0x17B4, 0x17B5 ), new Interval( 0x17B7, 0x17BD ),
+            new Interval( 0x17C6, 0x17C6 ), new Interval( 0x17C9, 0x17D3 ), new Interval( 0x17DD, 0x17DD ),
+            new Interval( 0x180B, 0x180D ), new Interval( 0x18A9, 0x18A9 ), new Interval( 0x1920, 0x1922 ),
+            new Interval( 0x1927, 0x1928 ), new Interval( 0x1932, 0x1932 ), new Interval( 0x1939, 0x193B ),
+            new Interval( 0x1A17, 0x1A18 ), new Interval( 0x1B00, 0x1B03 ), new Interval( 0x1B34, 0x1B34 ),
+            new Interval( 0x1B36, 0x1B3A ), new Interval( 0x1B3C, 0x1B3C ), new Interval( 0x1B42, 0x1B42 ),
+            new Interval( 0x1B6B, 0x1B73 ), new Interval( 0x1DC0, 0x1DCA ), new Interval( 0x1DFE, 0x1DFF ),
+            new Interval( 0x200B, 0x200F ), new Interval( 0x202A, 0x202E ), new Interval( 0x2060, 0x2063 ),
+            new Interval( 0x206A, 0x206F ), new Interval( 0x20D0, 0x20EF ), new Interval( 0x302A, 0x302F ),
+            new Interval( 0x3099, 0x309A ), new Interval( 0xA806, 0xA806 ), new Interval( 0xA80B, 0xA80B ),
+            new Interval( 0xA825, 0xA826 ), new Interval( 0xFB1E, 0xFB1E ), new Interval( 0xFE00, 0xFE0F ),
+            new Interval( 0xFE20, 0xFE23 ), new Interval( 0xFEFF, 0xFEFF ), new Interval( 0xFFF9, 0xFFFB ),
+            new Interval( 0x10A01, 0x10A03 ), new Interval( 0x10A05, 0x10A06 ), new Interval( 0x10A0C, 0x10A0F ),
+            new Interval( 0x10A38, 0x10A3A ), new Interval( 0x10A3F, 0x10A3F ), new Interval( 0x1D167, 0x1D169 ),
+            new Interval( 0x1D173, 0x1D182 ), new Interval( 0x1D185, 0x1D18B ), new Interval( 0x1D1AA, 0x1D1AD ),
+            new Interval( 0x1D242, 0x1D244 ), new Interval( 0xE0001, 0xE0001 ), new Interval( 0xE0020, 0xE007F ),
+            new Interval( 0xE0100, 0xE01EF )
+    };
+
+    private static class Interval {
+        public final int first;
+        public final int last;
+
+        public Interval(int first, int last) {
+            this.first = first;
+            this.last = last;
+        }
+    }
+
+    /* auxiliary function for binary search in interval table */
+    private static boolean bisearch(int ucs, Interval[] table, int max) {
+        int min = 0;
+        int mid;
+
+        if (ucs < table[0].first || ucs > table[max].last)
+            return false;
+        while (max >= min) {
+            mid = (min + max) / 2;
+            if (ucs > table[mid].last)
+                min = mid + 1;
+            else if (ucs < table[mid].first)
+                max = mid - 1;
+            else
+                return true;
+        }
+
+        return false;
+    }
+
+
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java
index f3ea1964d2c..eacde2dae72 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AnsiStringsCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AnsiStringsCompleter.java
new file mode 100644
index 00000000000..9c75df1299f
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AnsiStringsCompleter.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline.console.completer;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import jdk.internal.jline.internal.Ansi;
+
+import static jdk.internal.jline.internal.Preconditions.checkNotNull;
+
+/**
+ * Completer for a set of strings.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 2.3
+ */
+public class AnsiStringsCompleter
+    implements Completer
+{
+    private final SortedMap<String, String> strings = new TreeMap<String, String>();
+
+    public AnsiStringsCompleter() {
+        // empty
+    }
+
+    public AnsiStringsCompleter(final Collection<String> strings) {
+        checkNotNull(strings);
+        for (String str : strings) {
+            this.strings.put(Ansi.stripAnsi(str), str);
+        }
+    }
+
+    public AnsiStringsCompleter(final String... strings) {
+        this(Arrays.asList(strings));
+    }
+
+    public Collection<String> getStrings() {
+        return strings.values();
+    }
+
+    public int complete(String buffer, final int cursor, final List<CharSequence> candidates) {
+        // buffer could be null
+        checkNotNull(candidates);
+
+        if (buffer == null) {
+            candidates.addAll(strings.values());
+        }
+        else {
+            buffer = Ansi.stripAnsi(buffer);
+            for (Map.Entry<String, String> match : strings.tailMap(buffer).entrySet()) {
+                if (!match.getKey().startsWith(buffer)) {
+                    break;
+                }
+
+                candidates.add(match.getValue());
+            }
+        }
+
+        return candidates.isEmpty() ? -1 : 0;
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java
index b7ffce465c4..7db8be5adb5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -144,7 +144,7 @@ public class ArgumentCompleter
                 return -1;
             }
 
-            if (subCandidates.size() == 0) {
+            if (!subCandidates.contains(arg)) {
                 return -1;
             }
         }
@@ -326,10 +326,6 @@ public class ArgumentCompleter
 
         /**
          * Check if this character is a valid escape char (i.e. one that has not been escaped)
-         *
-         * @param buffer
-         * @param pos
-         * @return
          */
         public boolean isEscapeChar(final CharSequence buffer, final int pos) {
             if (pos < 0) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java
index 166493d3c98..9ff4cf85eb7 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,6 +10,7 @@ package jdk.internal.jline.console.completer;
 
 import jdk.internal.jline.console.ConsoleReader;
 import jdk.internal.jline.console.CursorBuffer;
+import jdk.internal.jline.internal.Ansi;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,6 +34,25 @@ import java.util.Set;
 public class CandidateListCompletionHandler
     implements CompletionHandler
 {
+    private boolean printSpaceAfterFullCompletion = true;
+    private boolean stripAnsi;
+
+    public boolean getPrintSpaceAfterFullCompletion() {
+        return printSpaceAfterFullCompletion;
+    }
+
+    public void setPrintSpaceAfterFullCompletion(boolean printSpaceAfterFullCompletion) {
+        this.printSpaceAfterFullCompletion = printSpaceAfterFullCompletion;
+    }
+
+    public boolean isStripAnsi() {
+        return stripAnsi;
+    }
+
+    public void setStripAnsi(boolean stripAnsi) {
+        this.stripAnsi = stripAnsi;
+    }
+
     // TODO: handle quotes and escaped quotes && enable automatic escaping of whitespace
 
     public boolean complete(final ConsoleReader reader, final List<CharSequence> candidates, final int pos) throws
@@ -42,7 +62,13 @@ public class CandidateListCompletionHandler
 
         // if there is only one completion, then fill in the buffer
         if (candidates.size() == 1) {
-            CharSequence value = candidates.get(0);
+            String value = Ansi.stripAnsi(candidates.get(0).toString());
+
+            if (buf.cursor == buf.buffer.length()
+                    && printSpaceAfterFullCompletion
+                    && !value.endsWith(" ")) {
+                value += " ";
+            }
 
             // fail if the only candidate is the same as the current buffer
             if (value.equals(buf.toString())) {
@@ -90,7 +116,8 @@ public class CandidateListCompletionHandler
 
         if (distinct.size() > reader.getAutoprintThreshold()) {
             //noinspection StringConcatenation
-            reader.print(Messages.DISPLAY_CANDIDATES.format(candidates.size()));
+            reader.println();
+            reader.print(Messages.DISPLAY_CANDIDATES.format(distinct.size()));
             reader.flush();
 
             int c;
@@ -142,10 +169,25 @@ public class CandidateListCompletionHandler
             return null;
         }
 
-        // convert to an array for speed
-        String[] strings = candidates.toArray(new String[candidates.size()]);
+        if (candidates.size() == 1) {
+            return candidates.get(0).toString();
+        }
+
+        // convert to an array for speed
+        String first = null;
+        String[] strings = new String[candidates.size() - 1];
+        for (int i = 0; i < candidates.size(); i++) {
+            String str = candidates.get(i).toString();
+            if (stripAnsi) {
+                str = Ansi.stripAnsi(str);
+            }
+            if (first == null) {
+                first = str;
+            } else {
+                strings[i - 1] = str;
+            }
+        }
 
-        String first = strings[0];
         StringBuilder candidate = new StringBuilder();
 
         for (int i = 0; i < first.length(); i++) {
@@ -163,9 +205,9 @@ public class CandidateListCompletionHandler
     /**
      * @return true is all the elements of <i>candidates</i> start with <i>starts</i>
      */
-    private boolean startsWith(final String starts, final String[] candidates) {
+    private static boolean startsWith(final String starts, final String[] candidates) {
         for (String candidate : candidates) {
-            if (!candidate.startsWith(starts)) {
+            if (!candidate.toLowerCase().startsWith(starts.toLowerCase())) {
                 return false;
             }
         }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties
index 3d7af092633..331256bbf90 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002-2012, the original author or authors.
+# Copyright (c) 2002-2016, the original author or authors.
 #
 # This software is distributable under the BSD license. See the terms of the
 # BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java
index 3c88ec22ccd..9fa8da43f66 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java
index a441fe918b8..a92443467d4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java
index 78b39d9ba63..3cfef789999 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -20,10 +20,14 @@ public class EnumCompleter
     extends StringsCompleter
 {
     public EnumCompleter(Class<? extends Enum<?>> source) {
+        this(source, true);
+    }
+
+    public EnumCompleter(Class<? extends Enum<?>> source, boolean toLowerCase) {
         checkNotNull(source);
 
         for (Enum<?> n : source.getEnumConstants()) {
-            this.getStrings().add(n.name().toLowerCase());
+            this.getStrings().add(toLowerCase ? n.name().toLowerCase() : n.name());
         }
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java
index 110b25680c8..9c746283af0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java
index de5c10c048d..66e8057d132 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java
index c77fb5ce995..83abb522c50 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -61,10 +61,6 @@ public class StringsCompleter
             }
         }
 
-        if (candidates.size() == 1) {
-            candidates.set(0, candidates.get(0) + " ");
-        }
-
         return candidates.isEmpty() ? -1 : 0;
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java
index 410d621a092..095ac4e9a80 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java
index 47344e5da4c..c972cc9d7b2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,8 +38,29 @@ public class FileHistory
 {
     private final File file;
 
+    /**
+     * Load a history file into memory, truncating to default max size.
+     */
     public FileHistory(final File file) throws IOException {
-        this.file = checkNotNull(file);
+        this(file, true);
+    }
+
+    /**
+     * Create a FileHistory, but only initialize if doInit is true. This allows
+     * setting maxSize or other settings; call load() before using if doInit is
+     * false.
+     */
+    public FileHistory(final File file, final boolean doInit) throws IOException {
+        this.file = checkNotNull(file).getAbsoluteFile();
+        if (doInit) {
+            load();
+        }
+    }
+
+    /**
+     * Load history from file, e.g. if using delayed init.
+     */
+    public void load() throws IOException {
         load(file);
     }
 
@@ -51,7 +72,15 @@ public class FileHistory
         checkNotNull(file);
         if (file.exists()) {
             Log.trace("Loading history from: ", file);
-            load(new FileReader(file));
+            FileReader reader = null;
+            try{
+                reader = new FileReader(file);
+                load(reader);
+            } finally{
+                if(reader != null){
+                    reader.close();
+                }
+            }
         }
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java
index 3188b152824..f16788da2ca 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java
index e01584edd71..356ab2f1b4a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -261,8 +261,6 @@ public class MemoryHistory
 
     /**
      * Move to the specified index in the history
-     * @param index
-     * @return
      */
     public boolean moveTo(int index) {
         index -= offset;
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java
index f3e573cfff3..b7fd2bd7f45 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java
index 48410fefb09..0101144ef69 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java
index f2b8bdfc129..8ccafe25d4b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java
index 0abbc55eb12..2a92aa911e9 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -12,6 +12,7 @@ import jdk.internal.jline.console.ConsoleReader;
 import jdk.internal.jline.console.completer.ArgumentCompleter;
 import jdk.internal.jline.console.completer.Completer;
 import jdk.internal.jline.console.history.FileHistory;
+import jdk.internal.jline.console.history.PersistentHistory;
 import jdk.internal.jline.internal.Configuration;
 
 import java.io.File;
@@ -75,11 +76,15 @@ public class ConsoleRunner
         try {
             Class<?> type = Class.forName(mainClass);
             Method method = type.getMethod("main", String[].class);
-            method.invoke(null);
+            String[] mainArgs = argList.toArray(new String[argList.size()]);
+            method.invoke(null, (Object) mainArgs);
         }
         finally {
             // just in case this main method is called from another program
             ConsoleReaderInputStream.restoreIn();
+            if (reader.getHistory() instanceof PersistentHistory) {
+                ((PersistentHistory) reader.getHistory()).flush();
+            }
         }
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java
index 265518fb258..a4f1066a8d4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/AnsiInterpretingOutputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/AnsiInterpretingOutputStream.java
new file mode 100644
index 00000000000..11f412fdf69
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/AnsiInterpretingOutputStream.java
@@ -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.  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 jdk.internal.jline.extra;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import jdk.internal.jline.internal.Ansi;
+
+/**A stream that interprets some escape code sequences, and ignores those it does not support.
+ */
+public class AnsiInterpretingOutputStream extends OutputStream {
+    private final String encoding;
+    private final OutputStream out;
+    private final Performer performer;
+    private final Map<Character, AnsiCodeHandler> ESCAPE_CODE_ACTIONS = new HashMap<>();
+
+    private boolean inEscapeSequence;
+    private ByteArrayOutputStream escape = new ByteArrayOutputStream();
+
+    public AnsiInterpretingOutputStream(String encoding, OutputStream output, Performer performer) {
+        this.encoding = encoding;
+        this.out = output;
+        this.performer = performer;
+        ESCAPE_CODE_ACTIONS.put('A', code -> {
+            moveCursor(code, 0, -1);
+        });
+        ESCAPE_CODE_ACTIONS.put('B', code -> {
+            moveCursor(code, 0, +1);
+        });
+        ESCAPE_CODE_ACTIONS.put('C', code -> {
+            moveCursor(code, +1, 0);
+        });
+        ESCAPE_CODE_ACTIONS.put('D', code -> {
+            moveCursor(code, -1, 0);
+        });
+        ESCAPE_CODE_ACTIONS.put('K', code -> {
+            BufferState buffer = performer.getBufferState();
+            switch (parseOutIntValue(code, 0)) {
+                case 0:
+                    for (int i = buffer.cursorX; i < buffer.sizeX - 1; i++) {
+                        out.write(' ');
+                    }
+                    performer.setCursorPosition(buffer.cursorX, buffer.cursorY);
+                    break;
+                case 1:
+                    performer.setCursorPosition(0, buffer.cursorY);
+                    for (int i = 0; i < buffer.cursorX; i++) {
+                        out.write(' ');
+                    }
+                    break;
+                case 2:
+                    for (int i = 0; i < buffer.sizeX - 1; i++) {
+                        out.write(' ');
+                    }
+                    performer.setCursorPosition(buffer.cursorX, buffer.cursorY);
+                    break;
+            }
+            out.flush();
+        });
+    }
+
+    @Override
+    public void write(int d) throws IOException {
+        if (inEscapeSequence) {
+            escape.write(d);
+            String escapeCandidate = new String(escape.toByteArray(), encoding);
+            if (Ansi.ANSI_CODE_PATTERN.asPredicate().test(escapeCandidate)) {
+                //escape sequence:
+                char key = escapeCandidate.charAt(escapeCandidate.length() - 1);
+                AnsiCodeHandler handler =
+                        ESCAPE_CODE_ACTIONS.get(key);
+                if (handler != null) {
+                    handler.handle(escapeCandidate);
+                } else {
+                    //unknown escape sequence, ignore
+                }
+                inEscapeSequence = false;
+                escape = null;
+            }
+        } else if (d == '\033') {
+            inEscapeSequence = true;
+            escape = new ByteArrayOutputStream();
+            escape.write(d);
+        } else {
+            out.write(d);
+        }
+    }
+    @Override
+    public void flush() throws IOException {
+        out.flush();
+    }
+
+    private void moveCursor(String code, int dx, int dy) throws IOException {
+        int delta = parseOutIntValue(code, 1);
+        BufferState buffer = performer.getBufferState();
+        int tx = buffer.cursorX + dx * delta;
+        int ty = buffer.cursorY + dy * delta;
+
+        tx = Math.max(0, Math.min(buffer.sizeX - 1, tx));
+        ty = Math.max(0, Math.min(buffer.sizeY - 1, ty));
+
+        performer.setCursorPosition(tx, ty);
+    }
+
+    private int parseOutIntValue(String code, int def) {
+        try {
+            return Integer.parseInt(code.substring(code.indexOf('[') + 1, code.length() - 1));
+        } catch (NumberFormatException ex) {
+            return def;
+        }
+    }
+
+    interface AnsiCodeHandler {
+        public void handle(String code) throws IOException;
+    }
+
+    public interface Performer {
+        public BufferState getBufferState() throws IOException;
+        public void setCursorPosition(int cursorX, int cursorY) throws IOException;
+    }
+
+    public static class BufferState {
+        public final int cursorX;
+        public final int cursorY;
+        public final int sizeX;
+        public final int sizeY;
+
+        public BufferState(int cursorX, int cursorY, int sizeX, int sizeY) {
+            this.cursorX = cursorX;
+            this.cursorY = cursorY;
+            this.sizeX = sizeX;
+            this.sizeY = sizeY;
+        }
+
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Ansi.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Ansi.java
new file mode 100644
index 00000000000..e5aa565b5e7
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Ansi.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline.internal;
+
+import java.util.regex.Pattern;
+
+/**
+ * Ansi support.
+ *
+ * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
+ * @since 2.13
+ */
+public class Ansi {
+
+    public static String stripAnsi(String str) {
+        if (str == null) return "";
+        return ANSI_CODE_PATTERN.matcher(str).replaceAll("");
+        //was:
+//        try {
+//            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+//            AnsiOutputStream aos = new AnsiOutputStream(baos);
+//            aos.write(str.getBytes());
+//            aos.close();
+//            return baos.toString();
+//        } catch (IOException e) {
+//            return str;
+//        }
+    }
+
+    public static final Pattern ANSI_CODE_PATTERN = Pattern.compile("\033\\[[\060-\077]*[\040-\057]*[\100-\176]");
+
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java
index 7011cf7764a..13169e45997 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -12,8 +12,10 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.FileNotFoundException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
 import java.util.Map;
 import java.util.Properties;
 
@@ -48,9 +50,12 @@ public class Configuration
         try {
             loadProperties(url, props);
         }
+        catch (FileNotFoundException e) {
+            // debug here and no stack trace, as this can happen normally if default jline.rc file is missing
+            Log.debug("Unable to read configuration: ", e.toString());
+        }
         catch (IOException e) {
-            // debug here instead of warn, as this can happen normally if default jline.rc file is missing
-            Log.debug("Unable to read configuration from: ", url, e);
+            Log.warn("Unable to read configuration from: ", url, e);
         }
         return props;
     }
@@ -138,6 +143,10 @@ public class Configuration
         return getString(name, null);
     }
 
+    public static boolean getBoolean(final String name) {
+        return getBoolean(name, false);
+    }
+
     public static boolean getBoolean(final String name, final boolean defaultValue) {
         String value = getString(name);
         if (value == null) {
@@ -197,25 +206,38 @@ public class Configuration
         return getOsName().startsWith("windows");
     }
 
-    // FIXME: Sort out use of property access of file.encoding in InputStreamReader, consolidate should configuration access here
+    public static boolean isHpux() {
+        return getOsName().startsWith("hp");
+    }
+
+    // FIXME: Sort out use of property access of file.encoding in InputStreamReader, should consolidate configuration access here
 
     public static String getFileEncoding() {
         return System.getProperty("file.encoding");
     }
 
     /**
-     * Get the default encoding.  Will first look at the LC_CTYPE environment variable, then the input.encoding
+     * Get the default encoding.  Will first look at the LC_ALL, LC_CTYPE, and LANG environment variables, then the input.encoding
      * system property, then the default charset according to the JVM.
      *
      * @return The default encoding to use when none is specified.
      */
     public static String getEncoding() {
-        // LC_CTYPE is usually in the form en_US.UTF-8
-        String envEncoding = extractEncodingFromCtype(System.getenv("LC_CTYPE"));
-        if (envEncoding != null) {
-            return envEncoding;
+        // Check for standard locale environment variables, in order of precedence, first.
+        // See http://www.gnu.org/s/libc/manual/html_node/Locale-Categories.html
+        for (String envOption : new String[]{"LC_ALL", "LC_CTYPE", "LANG"}) {
+            String envEncoding = extractEncodingFromCtype(System.getenv(envOption));
+            if (envEncoding != null) {
+                try {
+                    if (Charset.isSupported(envEncoding)) {
+                        return envEncoding;
+                    }
+                } catch (IllegalCharsetNameException e) {
+                    continue;
+                }
+            }
         }
-        return System.getProperty("input.encoding", Charset.defaultCharset().name());
+        return getString("input.encoding", Charset.defaultCharset().name());
     }
 
     /**
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Curses.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Curses.java
new file mode 100644
index 00000000000..6e8d9b8630d
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Curses.java
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline.internal;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Stack;
+
+/**
+ * Curses helper methods.
+ *
+ * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
+ */
+public class Curses {
+
+    private static Object[] sv = new Object[26];
+    private static Object[] dv = new Object[26];
+
+    private static final int IFTE_NONE = 0;
+    private static final int IFTE_IF = 1;
+    private static final int IFTE_THEN = 2;
+    private static final int IFTE_ELSE = 3;
+
+    /**
+     * Print the given terminal capabilities
+     *
+     * @param out the output stream
+     * @param str the capability to output
+     * @param params optional parameters
+     * @throws IOException if an error occurs
+     */
+    public static void tputs(Writer out, String str, Object... params) throws IOException {
+        int index = 0;
+        int length = str.length();
+        int ifte = IFTE_NONE;
+        boolean exec = true;
+        Stack<Object> stack = new Stack<Object>();
+        while (index < length) {
+            char ch = str.charAt(index++);
+            switch (ch) {
+                case '\\':
+                    ch = str.charAt(index++);
+                    if (ch >= '0' && ch <= '9') {
+                        throw new UnsupportedOperationException(); // todo
+                    } else {
+                        switch (ch) {
+                            case 'e':
+                            case 'E':
+                                if (exec) {
+                                    out.write(27); // escape
+                                }
+                                break;
+                            case 'n':
+                                out.write('\n');
+                                break;
+//                        case 'l':
+//                            rawPrint('\l');
+//                            break;
+                            case 'r':
+                                if (exec) {
+                                    out.write('\r');
+                                }
+                                break;
+                            case 't':
+                                if (exec) {
+                                    out.write('\t');
+                                }
+                                break;
+                            case 'b':
+                                if (exec) {
+                                    out.write('\b');
+                                }
+                                break;
+                            case 'f':
+                                if (exec) {
+                                    out.write('\f');
+                                }
+                                break;
+                            case 's':
+                                if (exec) {
+                                    out.write(' ');
+                                }
+                                break;
+                            case ':':
+                            case '^':
+                            case '\\':
+                                if (exec) {
+                                    out.write(ch);
+                                }
+                                break;
+                            default:
+                                throw new IllegalArgumentException();
+                        }
+                    }
+                    break;
+                case '^':
+                    ch = str.charAt(index++);
+                    if (exec) {
+                        out.write(ch - '@');
+                    }
+                    break;
+                case '%':
+                    ch = str.charAt(index++);
+                    switch (ch) {
+                        case '%':
+                            if (exec) {
+                                out.write('%');
+                            }
+                            break;
+                        case 'p':
+                            ch = str.charAt(index++);
+                            if (exec) {
+                                stack.push(params[ch - '1']);
+                            }
+                            break;
+                        case 'P':
+                            ch = str.charAt(index++);
+                            if (ch >= 'a' && ch <= 'z') {
+                                if (exec) {
+                                    dv[ch - 'a'] = stack.pop();
+                                }
+                            } else if (ch >= 'A' && ch <= 'Z') {
+                                if (exec) {
+                                    sv[ch - 'A'] = stack.pop();
+                                }
+                            } else {
+                                throw new IllegalArgumentException();
+                            }
+                            break;
+                        case 'g':
+                            ch = str.charAt(index++);
+                            if (ch >= 'a' && ch <= 'z') {
+                                if (exec) {
+                                    stack.push(dv[ch - 'a']);
+                                }
+                            } else if (ch >= 'A' && ch <= 'Z') {
+                                if (exec) {
+                                    stack.push(sv[ch - 'A']);
+                                }
+                            } else {
+                                throw new IllegalArgumentException();
+                            }
+                            break;
+                        case '\'':
+                            ch = str.charAt(index++);
+                            if (exec) {
+                                stack.push((int) ch);
+                            }
+                            ch = str.charAt(index++);
+                            if (ch != '\'') {
+                                throw new IllegalArgumentException();
+                            }
+                            break;
+                        case '{':
+                            int start = index;
+                            while (str.charAt(index++) != '}') ;
+                            if (exec) {
+                                int v = Integer.valueOf(str.substring(start, index - 1));
+                                stack.push(v);
+                            }
+                            break;
+                        case 'l':
+                            if (exec) {
+                                stack.push(stack.pop().toString().length());
+                            }
+                            break;
+                        case '+':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 + v2);
+                            }
+                            break;
+                        case '-':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 - v2);
+                            }
+                            break;
+                        case '*':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 * v2);
+                            }
+                            break;
+                        case '/':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 / v2);
+                            }
+                            break;
+                        case 'm':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 % v2);
+                            }
+                            break;
+                        case '&':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 & v2);
+                            }
+                            break;
+                        case '|':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 | v2);
+                            }
+                            break;
+                        case '^':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 ^ v2);
+                            }
+                            break;
+                        case '=':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 == v2);
+                            }
+                            break;
+                        case '>':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 > v2);
+                            }
+                            break;
+                        case '<':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 < v2);
+                            }
+                            break;
+                        case 'A':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 != 0 && v2 != 0);
+                            }
+                            break;
+                        case '!':
+                            if (exec) {
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 == 0);
+                            }
+                            break;
+                        case '~':
+                            if (exec) {
+                                int v1 = toInteger(stack.pop());
+                                stack.push(~v1);
+                            }
+                            break;
+                        case 'O':
+                            if (exec) {
+                                int v2 = toInteger(stack.pop());
+                                int v1 = toInteger(stack.pop());
+                                stack.push(v1 != 0 || v2 != 0);
+                            }
+                            break;
+                        case '?':
+                            if (ifte != IFTE_NONE) {
+                                throw new IllegalArgumentException();
+                            } else {
+                                ifte = IFTE_IF;
+                            }
+                            break;
+                        case 't':
+                            if (ifte != IFTE_IF && ifte != IFTE_ELSE) {
+                                throw new IllegalArgumentException();
+                            } else {
+                                ifte = IFTE_THEN;
+                            }
+                            exec = toInteger(stack.pop()) != 0;
+                            break;
+                        case 'e':
+                            if (ifte != IFTE_THEN) {
+                                throw new IllegalArgumentException();
+                            } else {
+                                ifte = IFTE_ELSE;
+                            }
+                            exec = !exec;
+                            break;
+                        case ';':
+                            if (ifte == IFTE_NONE || ifte == IFTE_IF) {
+                                throw new IllegalArgumentException();
+                            } else {
+                                ifte = IFTE_NONE;
+                            }
+                            exec = true;
+                            break;
+                        case 'i':
+                            if (params.length >= 1) {
+                                params[0] = toInteger(params[0]) + 1;
+                            }
+                            if (params.length >= 2) {
+                                params[1] = toInteger(params[1]) + 1;
+                            }
+                            break;
+                        case 'd':
+                            out.write(Integer.toString(toInteger(stack.pop())));
+                            break;
+                        default:
+                            throw new UnsupportedOperationException();
+                    }
+                    break;
+                default:
+                    if (exec) {
+                        out.write(ch);
+                    }
+                    break;
+            }
+        }
+    }
+
+    private static int toInteger(Object pop) {
+        if (pop instanceof Number) {
+            return ((Number) pop).intValue();
+        } else if (pop instanceof Boolean) {
+            return (Boolean) pop ? 1 : 0;
+        } else {
+            return Integer.valueOf(pop.toString());
+        }
+    }
+
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InfoCmp.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InfoCmp.java
new file mode 100644
index 00000000000..d99749822c0
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InfoCmp.java
@@ -0,0 +1,591 @@
+/*
+ * Copyright (c) 2002-2016, the original author or authors.
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * http://www.opensource.org/licenses/bsd-license.php
+ */
+package jdk.internal.jline.internal;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Infocmp helper methods.
+ *
+ * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
+ */
+public class InfoCmp {
+
+    private static final Map<String, String> CAPS = new HashMap<String, String>();
+
+    public static String getInfoCmp(
+            String terminal
+    ) throws IOException, InterruptedException {
+        String caps = CAPS.get(terminal);
+        if (caps == null) {
+            Process p = new ProcessBuilder("infocmp", terminal).start();
+            caps = TerminalLineSettings.waitAndCapture(p);
+            CAPS.put(terminal, caps);
+        }
+        return caps;
+    }
+
+    public static String getAnsiCaps() {
+        return ANSI_CAPS;
+    }
+
+    public static void parseInfoCmp(
+            String capabilities,
+            Set<String> bools,
+            Map<String, Integer> ints,
+            Map<String, String> strings
+    ) {
+        String[] lines = capabilities.split("\n");
+        for (int i = 2; i < lines.length; i++) {
+            Matcher m = Pattern.compile("\\s*(([^,]|\\\\,)+)\\s*[,$]").matcher(lines[i]);
+            while (m.find()) {
+                String cap = m.group(1);
+                if (cap.contains("#")) {
+                    int index = cap.indexOf('#');
+                    String key = cap.substring(0, index);
+                    String val = cap.substring(index + 1);
+                    int iVal;
+                    if (val.startsWith("0x")) {
+                        iVal = Integer.parseInt(val.substring(2), 16);
+                    } else {
+                        iVal = Integer.parseInt(val);
+                    }
+                    for (String name : getNames(key)) {
+                        ints.put(name, iVal);
+                    }
+                } else if (cap.contains("=")) {
+                    int index = cap.indexOf('=');
+                    String key = cap.substring(0, index);
+                    String val = cap.substring(index + 1);
+                    for (String name : getNames(key)) {
+                        strings.put(name, val);
+                    }
+                } else {
+                    for (String name : getNames(cap)) {
+                        bools.add(name);
+                    }
+                }
+            }
+        }
+    }
+
+    public static String[] getNames(String name) {
+        String[] names = NAMES.get(name);
+        return names != null ? names : new String[] { name };
+    }
+
+    private static final Map<String, String[]> NAMES;
+    static {
+        String[][] list = {
+                { "auto_left_margin", "bw", "bw" },
+                { "auto_right_margin", "am", "am" },
+                { "back_color_erase", "bce", "ut" },
+                { "can_change", "ccc", "cc" },
+                { "ceol_standout_glitch", "xhp", "xs" },
+                { "col_addr_glitch", "xhpa", "YA" },
+                { "cpi_changes_res", "cpix", "YF" },
+                { "cr_cancels_micro_mode", "crxm", "YB" },
+                { "dest_tabs_magic_smso", "xt", "xt" },
+                { "eat_newline_glitch", "xenl", "xn" },
+                { "erase_overstrike", "eo", "eo" },
+                { "generic_type", "gn", "gn" },
+                { "hard_copy", "hc", "hc" },
+                { "hard_cursor", "chts", "HC" },
+                { "has_meta_key", "km", "km" },
+                { "has_print_wheel", "daisy", "YC" },
+                { "has_status_line", "hs", "hs" },
+                { "hue_lightness_saturation", "hls", "hl" },
+                { "insert_null_glitch", "in", "in" },
+                { "lpi_changes_res", "lpix", "YG" },
+                { "memory_above", "da", "da" },
+                { "memory_below", "db", "db" },
+                { "move_insert_mode", "mir", "mi" },
+                { "move_standout_mode", "msgr", "ms" },
+                { "needs_xon_xoff", "nxon", "nx" },
+                { "no_esc_ctlc", "xsb", "xb" },
+                { "no_pad_char", "npc", "NP" },
+                { "non_dest_scroll_region", "ndscr", "ND" },
+                { "non_rev_rmcup", "nrrmc", "NR" },
+                { "over_strike", "os", "os" },
+                { "prtr_silent", "mc5i", "5i" },
+                { "row_addr_glitch", "xvpa", "YD" },
+                { "semi_auto_right_margin", "sam", "YE" },
+                { "status_line_esc_ok", "eslok", "es" },
+                { "tilde_glitch", "hz", "hz" },
+                { "transparent_underline", "ul", "ul" },
+                { "xon_xoff", "xon", "xo" },
+                { "columns", "cols", "co" },
+                { "init_tabs", "it", "it" },
+                { "label_height", "lh", "lh" },
+                { "label_width", "lw", "lw" },
+                { "lines", "lines", "li" },
+                { "lines_of_memory", "lm", "lm" },
+                { "magic_cookie_glitch", "xmc", "sg" },
+                { "max_attributes", "ma", "ma" },
+                { "max_colors", "colors", "Co" },
+                { "max_pairs", "pairs", "pa" },
+                { "maximum_windows", "wnum", "MW" },
+                { "no_color_video", "ncv", "NC" },
+                { "num_labels", "nlab", "Nl" },
+                { "padding_baud_rate", "pb", "pb" },
+                { "virtual_terminal", "vt", "vt" },
+                { "width_status_line", "wsl", "ws" },
+                { "bit_image_entwining", "bitwin", "Yo" },
+                { "bit_image_type", "bitype", "Yp" },
+                { "buffer_capacity", "bufsz", "Ya" },
+                { "buttons", "btns", "BT" },
+                { "dot_horz_spacing", "spinh", "Yc" },
+                { "dot_vert_spacing", "spinv", "Yb" },
+                { "max_micro_address", "maddr", "Yd" },
+                { "max_micro_jump", "mjump", "Ye" },
+                { "micro_col_size", "mcs", "Yf" },
+                { "micro_line_size", "mls", "Yg" },
+                { "number_of_pins", "npins", "Yh" },
+                { "output_res_char", "orc", "Yi" },
+                { "output_res_horz_inch", "orhi", "Yk" },
+                { "output_res_line", "orl", "Yj" },
+                { "output_res_vert_inch", "orvi", "Yl" },
+                { "print_rate", "cps", "Ym" },
+                { "wide_char_size", "widcs", "Yn" },
+                { "acs_chars", "acsc", "ac" },
+                { "back_tab", "cbt", "bt" },
+                { "bell", "bel", "bl" },
+                { "carriage_return", "cr", "cr" },
+                { "change_char_pitch", "cpi", "ZA" },
+                { "change_line_pitch", "lpi", "ZB" },
+                { "change_res_horz", "chr", "ZC" },
+                { "change_res_vert", "cvr", "ZD" },
+                { "change_scroll_region", "csr", "cs" },
+                { "char_padding", "rmp", "rP" },
+                { "clear_all_tabs", "tbc", "ct" },
+                { "clear_margins", "mgc", "MC" },
+                { "clear_screen", "clear", "cl" },
+                { "clr_bol", "el1", "cb" },
+                { "clr_eol", "el", "ce" },
+                { "clr_eos", "ed", "cd" },
+                { "column_address", "hpa", "ch" },
+                { "command_character", "cmdch", "CC" },
+                { "create_window", "cwin", "CW" },
+                { "cursor_address", "cup", "cm" },
+                { "cursor_down", "cud1", "do" },
+                { "cursor_home", "home", "ho" },
+                { "cursor_invisible", "civis", "vi" },
+                { "cursor_left", "cub1", "le" },
+                { "cursor_mem_address", "mrcup", "CM" },
+                { "cursor_normal", "cnorm", "ve" },
+                { "cursor_right", "cuf1", "nd" },
+                { "cursor_to_ll", "ll", "ll" },
+                { "cursor_up", "cuu1", "up" },
+                { "cursor_visible", "cvvis", "vs" },
+                { "define_char", "defc", "ZE" },
+                { "delete_character", "dch1", "dc" },
+                { "delete_line", "dl1", "dl" },
+                { "dial_phone", "dial", "DI" },
+                { "dis_status_line", "dsl", "ds" },
+                { "display_clock", "dclk", "DK" },
+                { "down_half_line", "hd", "hd" },
+                { "ena_acs", "enacs", "eA" },
+                { "enter_alt_charset_mode", "smacs", "as" },
+                { "enter_am_mode", "smam", "SA" },
+                { "enter_blink_mode", "blink", "mb" },
+                { "enter_bold_mode", "bold", "md" },
+                { "enter_ca_mode", "smcup", "ti" },
+                { "enter_delete_mode", "smdc", "dm" },
+                { "enter_dim_mode", "dim", "mh" },
+                { "enter_doublewide_mode", "swidm", "ZF" },
+                { "enter_draft_quality", "sdrfq", "ZG" },
+                { "enter_insert_mode", "smir", "im" },
+                { "enter_italics_mode", "sitm", "ZH" },
+                { "enter_leftward_mode", "slm", "ZI" },
+                { "enter_micro_mode", "smicm", "ZJ" },
+                { "enter_near_letter_quality", "snlq", "ZK" },
+                { "enter_normal_quality", "snrmq", "ZL" },
+                { "enter_protected_mode", "prot", "mp" },
+                { "enter_reverse_mode", "rev", "mr" },
+                { "enter_secure_mode", "invis", "mk" },
+                { "enter_shadow_mode", "sshm", "ZM" },
+                { "enter_standout_mode", "smso", "so" },
+                { "enter_subscript_mode", "ssubm", "ZN" },
+                { "enter_superscript_mode", "ssupm", "ZO" },
+                { "enter_underline_mode", "smul", "us" },
+                { "enter_upward_mode", "sum", "ZP" },
+                { "enter_xon_mode", "smxon", "SX" },
+                { "erase_chars", "ech", "ec" },
+                { "exit_alt_charset_mode", "rmacs", "ae" },
+                { "exit_am_mode", "rmam", "RA" },
+                { "exit_attribute_mode", "sgr0", "me" },
+                { "exit_ca_mode", "rmcup", "te" },
+                { "exit_delete_mode", "rmdc", "ed" },
+                { "exit_doublewide_mode", "rwidm", "ZQ" },
+                { "exit_insert_mode", "rmir", "ei" },
+                { "exit_italics_mode", "ritm", "ZR" },
+                { "exit_leftward_mode", "rlm", "ZS" },
+                { "exit_micro_mode", "rmicm", "ZT" },
+                { "exit_shadow_mode", "rshm", "ZU" },
+                { "exit_standout_mode", "rmso", "se" },
+                { "exit_subscript_mode", "rsubm", "ZV" },
+                { "exit_superscript_mode", "rsupm", "ZW" },
+                { "exit_underline_mode", "rmul", "ue" },
+                { "exit_upward_mode", "rum", "ZX" },
+                { "exit_xon_mode", "rmxon", "RX" },
+                { "fixed_pause", "pause", "PA" },
+                { "flash_hook", "hook", "fh" },
+                { "flash_screen", "flash", "vb" },
+                { "form_feed", "ff", "ff" },
+                { "from_status_line", "fsl", "fs" },
+                { "goto_window", "wingo", "WG" },
+                { "hangup", "hup", "HU" },
+                { "init_1string", "is1", "i1" },
+                { "init_2string", "is2", "is" },
+                { "init_3string", "is3", "i3" },
+                { "init_file", "if", "if" },
+                { "init_prog", "iprog", "iP" },
+                { "initialize_color", "initc", "Ic" },
+                { "initialize_pair", "initp", "Ip" },
+                { "insert_character", "ich1", "ic" },
+                { "insert_line", "il1", "al" },
+                { "insert_padding", "ip", "ip" },
+                { "key_a1", "ka1", "K1" },
+                { "key_a3", "ka3", "K3" },
+                { "key_b2", "kb2", "K2" },
+                { "key_backspace", "kbs", "kb" },
+                { "key_beg", "kbeg", "@1" },
+                { "key_btab", "kcbt", "kB" },
+                { "key_c1", "kc1", "K4" },
+                { "key_c3", "kc3", "K5" },
+                { "key_cancel", "kcan", "@2" },
+                { "key_catab", "ktbc", "ka" },
+                { "key_clear", "kclr", "kC" },
+                { "key_close", "kclo", "@3" },
+                { "key_command", "kcmd", "@4" },
+                { "key_copy", "kcpy", "@5" },
+                { "key_create", "kcrt", "@6" },
+                { "key_ctab", "kctab", "kt" },
+                { "key_dc", "kdch1", "kD" },
+                { "key_dl", "kdl1", "kL" },
+                { "key_down", "kcud1", "kd" },
+                { "key_eic", "krmir", "kM" },
+                { "key_end", "kend", "@7" },
+                { "key_enter", "kent", "@8" },
+                { "key_eol", "kel", "kE" },
+                { "key_eos", "ked", "kS" },
+                { "key_exit", "kext", "@9" },
+                { "key_f0", "kf0", "k0" },
+                { "key_f1", "kf1", "k1" },
+                { "key_f10", "kf10", "k;" },
+                { "key_f11", "kf11", "F1" },
+                { "key_f12", "kf12", "F2" },
+                { "key_f13", "kf13", "F3" },
+                { "key_f14", "kf14", "F4" },
+                { "key_f15", "kf15", "F5" },
+                { "key_f16", "kf16", "F6" },
+                { "key_f17", "kf17", "F7" },
+                { "key_f18", "kf18", "F8" },
+                { "key_f19", "kf19", "F9" },
+                { "key_f2", "kf2", "k2" },
+                { "key_f20", "kf20", "FA" },
+                { "key_f21", "kf21", "FB" },
+                { "key_f22", "kf22", "FC" },
+                { "key_f23", "kf23", "FD" },
+                { "key_f24", "kf24", "FE" },
+                { "key_f25", "kf25", "FF" },
+                { "key_f26", "kf26", "FG" },
+                { "key_f27", "kf27", "FH" },
+                { "key_f28", "kf28", "FI" },
+                { "key_f29", "kf29", "FJ" },
+                { "key_f3", "kf3", "k3" },
+                { "key_f30", "kf30", "FK" },
+                { "key_f31", "kf31", "FL" },
+                { "key_f32", "kf32", "FM" },
+                { "key_f33", "kf33", "FN" },
+                { "key_f34", "kf34", "FO" },
+                { "key_f35", "kf35", "FP" },
+                { "key_f36", "kf36", "FQ" },
+                { "key_f37", "kf37", "FR" },
+                { "key_f38", "kf38", "FS" },
+                { "key_f39", "kf39", "FT" },
+                { "key_f4", "kf4", "k4" },
+                { "key_f40", "kf40", "FU" },
+                { "key_f41", "kf41", "FV" },
+                { "key_f42", "kf42", "FW" },
+                { "key_f43", "kf43", "FX" },
+                { "key_f44", "kf44", "FY" },
+                { "key_f45", "kf45", "FZ" },
+                { "key_f46", "kf46", "Fa" },
+                { "key_f47", "kf47", "Fb" },
+                { "key_f48", "kf48", "Fc" },
+                { "key_f49", "kf49", "Fd" },
+                { "key_f5", "kf5", "k5" },
+                { "key_f50", "kf50", "Fe" },
+                { "key_f51", "kf51", "Ff" },
+                { "key_f52", "kf52", "Fg" },
+                { "key_f53", "kf53", "Fh" },
+                { "key_f54", "kf54", "Fi" },
+                { "key_f55", "kf55", "Fj" },
+                { "key_f56", "kf56", "Fk" },
+                { "key_f57", "kf57", "Fl" },
+                { "key_f58", "kf58", "Fm" },
+                { "key_f59", "kf59", "Fn" },
+                { "key_f6", "kf6", "k6" },
+                { "key_f60", "kf60", "Fo" },
+                { "key_f61", "kf61", "Fp" },
+                { "key_f62", "kf62", "Fq" },
+                { "key_f63", "kf63", "Fr" },
+                { "key_f7", "kf7", "k7" },
+                { "key_f8", "kf8", "k8" },
+                { "key_f9", "kf9", "k9" },
+                { "key_find", "kfnd", "@0" },
+                { "key_help", "khlp", "%1" },
+                { "key_home", "khome", "kh" },
+                { "key_ic", "kich1", "kI" },
+                { "key_il", "kil1", "kA" },
+                { "key_left", "kcub1", "kl" },
+                { "key_ll", "kll", "kH" },
+                { "key_mark", "kmrk", "%2" },
+                { "key_message", "kmsg", "%3" },
+                { "key_move", "kmov", "%4" },
+                { "key_next", "knxt", "%5" },
+                { "key_npage", "knp", "kN" },
+                { "key_open", "kopn", "%6" },
+                { "key_options", "kopt", "%7" },
+                { "key_ppage", "kpp", "kP" },
+                { "key_previous", "kprv", "%8" },
+                { "key_print", "kprt", "%9" },
+                { "key_redo", "krdo", "%0" },
+                { "key_reference", "kref", "&1" },
+                { "key_refresh", "krfr", "&2" },
+                { "key_replace", "krpl", "&3" },
+                { "key_restart", "krst", "&4" },
+                { "key_resume", "kres", "&5" },
+                { "key_right", "kcuf1", "kr" },
+                { "key_save", "ksav", "&6" },
+                { "key_sbeg", "kBEG", "&9" },
+                { "key_scancel", "kCAN", "&0" },
+                { "key_scommand", "kCMD", "*1" },
+                { "key_scopy", "kCPY", "*2" },
+                { "key_screate", "kCRT", "*3" },
+                { "key_sdc", "kDC", "*4" },
+                { "key_sdl", "kDL", "*5" },
+                { "key_select", "kslt", "*6" },
+                { "key_send", "kEND", "*7" },
+                { "key_seol", "kEOL", "*8" },
+                { "key_sexit", "kEXT", "*9" },
+                { "key_sf", "kind", "kF" },
+                { "key_sfind", "kFND", "*0" },
+                { "key_shelp", "kHLP", "#1" },
+                { "key_shome", "kHOM", "#2" },
+                { "key_sic", "kIC", "#3" },
+                { "key_sleft", "kLFT", "#4" },
+                { "key_smessage", "kMSG", "%a" },
+                { "key_smove", "kMOV", "%b" },
+                { "key_snext", "kNXT", "%c" },
+                { "key_soptions", "kOPT", "%d" },
+                { "key_sprevious", "kPRV", "%e" },
+                { "key_sprint", "kPRT", "%f" },
+                { "key_sr", "kri", "kR" },
+                { "key_sredo", "kRDO", "%g" },
+                { "key_sreplace", "kRPL", "%h" },
+                { "key_sright", "kRIT", "%i" },
+                { "key_srsume", "kRES", "%j" },
+                { "key_ssave", "kSAV", "!1" },
+                { "key_ssuspend", "kSPD", "!2" },
+                { "key_stab", "khts", "kT" },
+                { "key_sundo", "kUND", "!3" },
+                { "key_suspend", "kspd", "&7" },
+                { "key_undo", "kund", "&8" },
+                { "key_up", "kcuu1", "ku" },
+                { "keypad_local", "rmkx", "ke" },
+                { "keypad_xmit", "smkx", "ks" },
+                { "lab_f0", "lf0", "l0" },
+                { "lab_f1", "lf1", "l1" },
+                { "lab_f10", "lf10", "la" },
+                { "lab_f2", "lf2", "l2" },
+                { "lab_f3", "lf3", "l3" },
+                { "lab_f4", "lf4", "l4" },
+                { "lab_f5", "lf5", "l5" },
+                { "lab_f6", "lf6", "l6" },
+                { "lab_f7", "lf7", "l7" },
+                { "lab_f8", "lf8", "l8" },
+                { "lab_f9", "lf9", "l9" },
+                { "label_format", "fln", "Lf" },
+                { "label_off", "rmln", "LF" },
+                { "label_on", "smln", "LO" },
+                { "meta_off", "rmm", "mo" },
+                { "meta_on", "smm", "mm" },
+                { "micro_column_address", "mhpa", "ZY" },
+                { "micro_down", "mcud1", "ZZ" },
+                { "micro_left", "mcub1", "Za" },
+                { "micro_right", "mcuf1", "Zb" },
+                { "micro_row_address", "mvpa", "Zc" },
+                { "micro_up", "mcuu1", "Zd" },
+                { "newline", "nel", "nw" },
+                { "order_of_pins", "porder", "Ze" },
+                { "orig_colors", "oc", "oc" },
+                { "orig_pair", "op", "op" },
+                { "pad_char", "pad", "pc" },
+                { "parm_dch", "dch", "DC" },
+                { "parm_delete_line", "dl", "DL" },
+                { "parm_down_cursor", "cud", "DO" },
+                { "parm_down_micro", "mcud", "Zf" },
+                { "parm_ich", "ich", "IC" },
+                { "parm_index", "indn", "SF" },
+                { "parm_insert_line", "il", "AL" },
+                { "parm_left_cursor", "cub", "LE" },
+                { "parm_left_micro", "mcub", "Zg" },
+                { "parm_right_cursor", "cuf", "RI" },
+                { "parm_right_micro", "mcuf", "Zh" },
+                { "parm_rindex", "rin", "SR" },
+                { "parm_up_cursor", "cuu", "UP" },
+                { "parm_up_micro", "mcuu", "Zi" },
+                { "pkey_key", "pfkey", "pk" },
+                { "pkey_local", "pfloc", "pl" },
+                { "pkey_xmit", "pfx", "px" },
+                { "plab_norm", "pln", "pn" },
+                { "print_screen", "mc0", "ps" },
+                { "prtr_non", "mc5p", "pO" },
+                { "prtr_off", "mc4", "pf" },
+                { "prtr_on", "mc5", "po" },
+                { "pulse", "pulse", "PU" },
+                { "quick_dial", "qdial", "QD" },
+                { "remove_clock", "rmclk", "RC" },
+                { "repeat_char", "rep", "rp" },
+                { "req_for_input", "rfi", "RF" },
+                { "reset_1string", "rs1", "r1" },
+                { "reset_2string", "rs2", "r2" },
+                { "reset_3string", "rs3", "r3" },
+                { "reset_file", "rf", "rf" },
+                { "restore_cursor", "rc", "rc" },
+                { "row_address", "vpa", "cv" },
+                { "save_cursor", "sc", "sc" },
+                { "scroll_forward", "ind", "sf" },
+                { "scroll_reverse", "ri", "sr" },
+                { "select_char_set", "scs", "Zj" },
+                { "set_attributes", "sgr", "sa" },
+                { "set_background", "setb", "Sb" },
+                { "set_bottom_margin", "smgb", "Zk" },
+                { "set_bottom_margin_parm", "smgbp", "Zl" },
+                { "set_clock", "sclk", "SC" },
+                { "set_color_pair", "scp", "sp" },
+                { "set_foreground", "setf", "Sf" },
+                { "set_left_margin", "smgl", "ML" },
+                { "set_left_margin_parm", "smglp", "Zm" },
+                { "set_right_margin", "smgr", "MR" },
+                { "set_right_margin_parm", "smgrp", "Zn" },
+                { "set_tab", "hts", "st" },
+                { "set_top_margin", "smgt", "Zo" },
+                { "set_top_margin_parm", "smgtp", "Zp" },
+                { "set_window", "wind", "wi" },
+                { "start_bit_image", "sbim", "Zq" },
+                { "start_char_set_def", "scsd", "Zr" },
+                { "stop_bit_image", "rbim", "Zs" },
+                { "stop_char_set_def", "rcsd", "Zt" },
+                { "subscript_characters", "subcs", "Zu" },
+                { "superscript_characters", "supcs", "Zv" },
+                { "tab", "ht", "ta" },
+                { "these_cause_cr", "docr", "Zw" },
+                { "to_status_line", "tsl", "ts" },
+                { "tone", "tone", "TO" },
+                { "underline_char", "uc", "uc" },
+                { "up_half_line", "hu", "hu" },
+                { "user0", "u0", "u0" },
+                { "user1", "u1", "u1" },
+                { "user2", "u2", "u2" },
+                { "user3", "u3", "u3" },
+                { "user4", "u4", "u4" },
+                { "user5", "u5", "u5" },
+                { "user6", "u6", "u6" },
+                { "user7", "u7", "u7" },
+                { "user8", "u8", "u8" },
+                { "user9", "u9", "u9" },
+                { "wait_tone", "wait", "WA" },
+                { "xoff_character", "xoffc", "XF" },
+                { "xon_character", "xonc", "XN" },
+                { "zero_motion", "zerom", "Zx" },
+                { "alt_scancode_esc", "scesa", "S8" },
+                { "bit_image_carriage_return", "bicr", "Yv" },
+                { "bit_image_newline", "binel", "Zz" },
+                { "bit_image_repeat", "birep", "Xy" },
+                { "char_set_names", "csnm", "Zy" },
+                { "code_set_init", "csin", "ci" },
+                { "color_names", "colornm", "Yw" },
+                { "define_bit_image_region", "defbi", "Yx" },
+                { "device_type", "devt", "dv" },
+                { "display_pc_char", "dispc", "S1" },
+                { "end_bit_image_region", "endbi", "Yy" },
+                { "enter_pc_charset_mode", "smpch", "S2" },
+                { "enter_scancode_mode", "smsc", "S4" },
+                { "exit_pc_charset_mode", "rmpch", "S3" },
+                { "exit_scancode_mode", "rmsc", "S5" },
+                { "get_mouse", "getm", "Gm" },
+                { "key_mouse", "kmous", "Km" },
+                { "mouse_info", "minfo", "Mi" },
+                { "pc_term_options", "pctrm", "S6" },
+                { "pkey_plab", "pfxl", "xl" },
+                { "req_mouse_pos", "reqmp", "RQ" },
+                { "scancode_escape", "scesc", "S7" },
+                { "set0_des_seq", "s0ds", "s0" },
+                { "set1_des_seq", "s1ds", "s1" },
+                { "set2_des_seq", "s2ds", "s2" },
+                { "set3_des_seq", "s3ds", "s3" },
+                { "set_a_background", "setab", "AB" },
+                { "set_a_foreground", "setaf", "AF" },
+                { "set_color_band", "setcolor", "Yz" },
+                { "set_lr_margin", "smglr", "ML" },
+                { "set_page_length", "slines", "YZ" },
+                { "set_tb_margin", "smgtb", "MT" },
+                { "enter_horizontal_hl_mode", "ehhlm", "Xh" },
+                { "enter_left_hl_mode", "elhlm", "Xl" },
+                { "enter_low_hl_mode", "elohlm", "Xo" },
+                { "enter_right_hl_mode", "erhlm", "Xr" },
+                { "enter_top_hl_mode", "ethlm", "Xt" },
+                { "enter_vertical_hl_mode", "evhlm", "Xv" },
+                { "set_a_attributes", "sgr1", "sA" },
+                { "set_pglen_inch", "slength", "sL" }
+        };
+
+        Map<String, String[]> map = new HashMap<String, String[]>();
+        for (String[] names : list) {
+            for (String name : names) {
+                map.put(name, names);
+            }
+        }
+        NAMES = Collections.unmodifiableMap(map);
+    }
+
+    private static String ANSI_CAPS =
+            "#\tReconstructed via infocmp from file: /usr/share/terminfo/61/ansi\n" +
+            "ansi|ansi/pc-term compatible with color,\n" +
+            "\tam, mc5i, mir, msgr,\n" +
+            "\tcolors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,\n" +
+            "\tacsc=+\\020\\,\\021-\\030.^Y0\\333`\\004a\\261f\\370g\\361h\\260j\\331k\\277l\\332m\\300n\\305o~p\\304q\\304r\\304s_t\\303u\\264v\\301w\\302x\\263y\\363z\\362{\\343|\\330}\\234~\\376,\n" +
+            "\tbel=^G, blink=\\E[5m, bold=\\E[1m, cbt=\\E[Z, clear=\\E[H\\E[J,\n" +
+            "\tcr=^M, cub=\\E[%p1%dD, cub1=\\E[D, cud=\\E[%p1%dB, cud1=\\E[B,\n" +
+            "\tcuf=\\E[%p1%dC, cuf1=\\E[C, cup=\\E[%i%p1%d;%p2%dH,\n" +
+            "\tcuu=\\E[%p1%dA, cuu1=\\E[A, dch=\\E[%p1%dP, dch1=\\E[P,\n" +
+            "\tdl=\\E[%p1%dM, dl1=\\E[M, ech=\\E[%p1%dX, ed=\\E[J, el=\\E[K,\n" +
+            "\tel1=\\E[1K, home=\\E[H, hpa=\\E[%i%p1%dG, ht=\\E[I, hts=\\EH,\n" +
+            "\tich=\\E[%p1%d@, il=\\E[%p1%dL, il1=\\E[L, ind=^J,\n" +
+            "\tindn=\\E[%p1%dS, invis=\\E[8m, kbs=^H, kcbt=\\E[Z, kcub1=\\E[D,\n" +
+            "\tkcud1=\\E[B, kcuf1=\\E[C, kcuu1=\\E[A, khome=\\E[H, kich1=\\E[L,\n" +
+            "\tmc4=\\E[4i, mc5=\\E[5i, nel=\\r\\E[S, op=\\E[39;49m,\n" +
+            "\trep=%p1%c\\E[%p2%{1}%-%db, rev=\\E[7m, rin=\\E[%p1%dT,\n" +
+            "\trmacs=\\E[10m, rmpch=\\E[10m, rmso=\\E[m, rmul=\\E[m,\n" +
+            "\ts0ds=\\E(B, s1ds=\\E)B, s2ds=\\E*B, s3ds=\\E+B,\n" +
+            "\tsetab=\\E[4%p1%dm, setaf=\\E[3%p1%dm,\n" +
+            "\tsgr=\\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,\n" +
+            "\tsgr0=\\E[0;10m, smacs=\\E[11m, smpch=\\E[11m, smso=\\E[7m,\n" +
+            "\tsmul=\\E[4m, tbc=\\E[2g, u6=\\E[%i%d;%dR, u7=\\E[6n,\n" +
+            "\tu8=\\E[?%[;0123456789]c, u9=\\E[c, vpa=\\E[%i%p1%dd,";
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java
index 77d3f457e17..1c1ab8a433d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -49,8 +49,6 @@ public class InputStreamReader extends Reader {
 
     private boolean endOfInput = false;
 
-    String encoding;
-
     CharsetDecoder decoder;
 
     ByteBuffer bytes = ByteBuffer.allocate(BUFFER_SIZE);
@@ -67,9 +65,7 @@ public class InputStreamReader extends Reader {
     public InputStreamReader(InputStream in) {
         super(in);
         this.in = in;
-        // FIXME: This should probably use Configuration.getFileEncoding()
-        encoding = System.getProperty("file.encoding", "ISO8859_1"); //$NON-NLS-1$//$NON-NLS-2$
-        decoder = Charset.forName(encoding).newDecoder().onMalformedInput(
+        decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
                 CodingErrorAction.REPLACE).onUnmappableCharacter(
                 CodingErrorAction.REPLACE);
         bytes.limit(0);
@@ -172,7 +168,7 @@ public class InputStreamReader extends Reader {
         if (!isOpen()) {
             return null;
         }
-        return encoding;
+        return decoder.charset().name();
     }
 
     /**
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java
index 1c9106221f5..17bce49f8af 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,7 +8,10 @@
  */
 package jdk.internal.jline.internal;
 
+import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+//import java.util.logging.LogRecord;
+//import java.util.logging.Logger;
 
 import static jdk.internal.jline.internal.Preconditions.checkNotNull;
 
@@ -16,6 +19,7 @@ import static jdk.internal.jline.internal.Preconditions.checkNotNull;
  * Internal logger.
  *
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  * @since 2.0
  */
 public final class Log
@@ -31,14 +35,14 @@ public final class Log
         ERROR
     }
 
-    @SuppressWarnings({"StringConcatenation"})
-    public static final boolean TRACE = Boolean.getBoolean(Log.class.getName() + ".trace");
+    public static final boolean TRACE = Configuration.getBoolean(Log.class.getName() + ".trace");
 
-    @SuppressWarnings({"StringConcatenation"})
-    public static final boolean DEBUG = TRACE || Boolean.getBoolean(Log.class.getName() + ".debug");
+    public static final boolean DEBUG = TRACE || Configuration.getBoolean(Log.class.getName() + ".debug");
 
     private static PrintStream output = System.err;
 
+    private static boolean useJul = Configuration.getBoolean("jline.log.jul");
+
     public static PrintStream getOutput() {
         return output;
     }
@@ -71,6 +75,10 @@ public final class Log
 
     @TestAccessible
     static void log(final Level level, final Object... messages) {
+        if (useJul) {
+            logWithJul(level, messages);
+            return;
+        }
         //noinspection SynchronizeOnNonFinalField
         synchronized (output) {
             output.format("[%s] ", level);
@@ -91,6 +99,43 @@ public final class Log
         }
     }
 
+    static void logWithJul(Level level, Object... messages) {
+//        Logger logger = Logger.getLogger("jline");
+//        Throwable cause = null;
+//        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+//        PrintStream ps = new PrintStream(baos);
+//        for (int i = 0; i < messages.length; i++) {
+//            // Special handling for the last message if its a throwable, render its stack on the next line
+//            if (i + 1 == messages.length && messages[i] instanceof Throwable) {
+//                cause = (Throwable) messages[i];
+//            }
+//            else {
+//                render(ps, messages[i]);
+//            }
+//        }
+//        ps.close();
+//        LogRecord r = new LogRecord(toJulLevel(level), baos.toString());
+//        r.setThrown(cause);
+//        logger.log(r);
+    }
+
+//    private static java.util.logging.Level toJulLevel(Level level) {
+//        switch (level) {
+//            case TRACE:
+//                return java.util.logging.Level.FINEST;
+//            case DEBUG:
+//                return java.util.logging.Level.FINE;
+//            case INFO:
+//                return java.util.logging.Level.INFO;
+//            case WARN:
+//                return java.util.logging.Level.WARNING;
+//            case ERROR:
+//                return java.util.logging.Level.SEVERE;
+//            default:
+//                throw new IllegalArgumentException();
+//        }
+//    }
+
     public static void trace(final Object... messages) {
         if (TRACE) {
             log(Level.TRACE, messages);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java
index 44933dbdbe7..b7b7e597cee 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -111,7 +111,6 @@ public class NonBlockingInputStream
      * @param timeout The amount of time to wait, 0 == forever
      * @return -1 on eof, -2 if the timeout expired with no available input
      *   or the character that was read (without consuming it).
-     * @throws IOException
      */
     public int peek(long timeout) throws IOException {
         if (!nonBlockingEnabled || isShutdown) {
@@ -127,7 +126,6 @@ public class NonBlockingInputStream
      * @param timeout The amount of time to wait for the character
      * @return The character read, -1 if EOF is reached, or -2 if the
      *   read timed out.
-     * @throws IOException
      */
     public int read(long timeout) throws IOException {
         if (!nonBlockingEnabled || isShutdown) {
@@ -143,7 +141,6 @@ public class NonBlockingInputStream
      * @param timeout The amount of time to wait for the character
      * @return The character read, -1 if EOF is reached, or -2 if the
      *   read timed out.
-     * @throws IOException
      */
     private synchronized int read(long timeout, boolean isPeek) throws IOException {
         /*
@@ -177,7 +174,7 @@ public class NonBlockingInputStream
                 notify();
             }
 
-            boolean isInfinite = (timeout <= 0L);
+            boolean isInfinite = timeout <= 0L;
 
             /*
              * So the thread is currently doing the reading for us. So
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java
index 5d783f0c683..09a3682222b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java
index a14b9682b34..74303dee179 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java
index ddd11f9a91e..01daa3090a8 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java
index acab9c30df0..b26cef1eed9 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,7 +13,10 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Method;
 import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -26,6 +29,7 @@ import static jdk.internal.jline.internal.Preconditions.checkNotNull;
  * @author <a href="mailto:dwkemp@gmail.com">Dale Kemp</a>
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @author <a href="mailto:jbonofre@apache.org">Jean-Baptiste Onofr\u00E9</a>
+ * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  * @since 2.0
  */
 public final class TerminalLineSettings
@@ -38,21 +42,72 @@ public final class TerminalLineSettings
 
     public static final String DEFAULT_SH = "sh";
 
+    private static final String UNDEFINED;
+
+    public static final String DEFAULT_TTY = "/dev/tty";
+
+    private static final boolean SUPPORTS_REDIRECT;
+
+    private static final Object REDIRECT_INHERIT;
+    private static final Method REDIRECT_INPUT_METHOD;
+
+    private static final Map<String, TerminalLineSettings> SETTINGS = new HashMap<String, TerminalLineSettings>();
+
+    static {
+        if (Configuration.isHpux()) {
+            UNDEFINED = "^-";
+        } else {
+            UNDEFINED = "undef";
+        }
+
+        boolean supportsRedirect;
+        Object redirectInherit = null;
+        Method redirectInputMethod = null;
+        try {
+            Class<?> redirect = Class.forName("java.lang.ProcessBuilder$Redirect");
+            redirectInherit = redirect.getField("INHERIT").get(null);
+            redirectInputMethod = ProcessBuilder.class.getMethod("redirectInput", redirect);
+            supportsRedirect = System.class.getMethod("console").invoke(null) != null;
+        } catch (Throwable t) {
+            supportsRedirect = false;
+        }
+        SUPPORTS_REDIRECT = supportsRedirect;
+        REDIRECT_INHERIT = redirectInherit;
+        REDIRECT_INPUT_METHOD = redirectInputMethod;
+    }
+
     private String sttyCommand;
 
     private String shCommand;
 
+    private String ttyDevice;
+
     private String config;
     private String initialConfig;
 
     private long configLastFetched;
 
+    private boolean useRedirect;
+
+    @Deprecated
     public TerminalLineSettings() throws IOException, InterruptedException {
-        sttyCommand = Configuration.getString(JLINE_STTY, DEFAULT_STTY);
-        shCommand = Configuration.getString(JLINE_SH, DEFAULT_SH);
-        initialConfig = get("-g").trim();
-        config = get("-a");
-        configLastFetched = System.currentTimeMillis();
+        this(DEFAULT_TTY);
+    }
+
+    @Deprecated
+    public TerminalLineSettings(String ttyDevice) throws IOException, InterruptedException {
+        this(ttyDevice, false);
+    }
+
+    private TerminalLineSettings(String ttyDevice, boolean unused) throws IOException, InterruptedException {
+        checkNotNull(ttyDevice);
+        this.sttyCommand = Configuration.getString(JLINE_STTY, DEFAULT_STTY);
+        this.shCommand = Configuration.getString(JLINE_SH, DEFAULT_SH);
+        this.ttyDevice = ttyDevice;
+        this.useRedirect = SUPPORTS_REDIRECT && DEFAULT_TTY.equals(ttyDevice);
+        this.initialConfig = get("-g").trim();
+        this.config = get("-a");
+        this.configLastFetched = System.currentTimeMillis();
 
         Log.debug("Config: ", config);
 
@@ -62,6 +117,19 @@ public final class TerminalLineSettings
         }
     }
 
+    public static synchronized TerminalLineSettings getSettings(String device) throws IOException, InterruptedException {
+        TerminalLineSettings settings = SETTINGS.get(device);
+        if (settings == null) {
+            settings = new TerminalLineSettings(device, false);
+            SETTINGS.put(device, settings);
+        }
+        return settings;
+    }
+
+    public String getTtyDevice() {
+        return ttyDevice;
+    }
+
     public String getConfig() {
         return config;
     }
@@ -71,13 +139,25 @@ public final class TerminalLineSettings
     }
 
     public String get(final String args) throws IOException, InterruptedException {
+        checkNotNull(args);
         return stty(args);
     }
 
     public void set(final String args) throws IOException, InterruptedException {
+        checkNotNull(args);
+        stty(args.split(" "));
+    }
+
+    public void set(final String... args) throws IOException, InterruptedException {
+        checkNotNull(args);
         stty(args);
     }
 
+    public void undef(final String name) throws IOException, InterruptedException {
+        checkNotNull(name);
+        stty(name, UNDEFINED);
+    }
+
     /**
      * <p>
      * Get the value of a stty property, including the management of a cache.
@@ -88,6 +168,21 @@ public final class TerminalLineSettings
      */
     public int getProperty(String name) {
         checkNotNull(name);
+        if (!fetchConfig(name)) {
+            return -1;
+        }
+        return getProperty(name, config);
+    }
+
+    public String getPropertyAsString(String name) {
+        checkNotNull(name);
+        if (!fetchConfig(name)) {
+            return null;
+        }
+        return getPropertyAsString(name, config);
+    }
+
+    private boolean fetchConfig(String name) {
         long currentTime = System.currentTimeMillis();
         try {
             // tty properties are cached so we don't have to worry too much about getting term width/height
@@ -100,7 +195,7 @@ public final class TerminalLineSettings
             }
             Log.debug("Failed to query stty ", name, "\n", e);
             if (config == null) {
-                return -1;
+                return false;
             }
         }
 
@@ -108,8 +203,7 @@ public final class TerminalLineSettings
         if (currentTime - configLastFetched > 1000) {
             configLastFetched = currentTime;
         }
-
-        return getProperty(name, config);
+        return true;
     }
 
     /**
@@ -121,7 +215,7 @@ public final class TerminalLineSettings
      * @param stty string resulting of stty -a execution.
      * @return value of the given property.
      */
-    protected static int getProperty(String name, String stty) {
+    protected static String getPropertyAsString(String name, String stty) {
         // try the first kind of regex
         Pattern pattern = Pattern.compile(name + "\\s+=\\s+(.*?)[;\\n\\r]");
         Matcher matcher = pattern.matcher(stty);
@@ -134,11 +228,16 @@ public final class TerminalLineSettings
                 pattern = Pattern.compile("(\\S*)\\s+" + name);
                 matcher = pattern.matcher(stty);
                 if (!matcher.find()) {
-                    return -1;
+                    return null;
                 }
             }
         }
-        return parseControlChar(matcher.group(1));
+        return matcher.group(1);
+    }
+
+    protected static int getProperty(String name, String stty) {
+        String str = getPropertyAsString(name, stty);
+        return str != null ? parseControlChar(str) : -1;
     }
 
     private static int parseControlChar(String str) {
@@ -176,25 +275,53 @@ public final class TerminalLineSettings
         }
     }
 
-    private String stty(final String args) throws IOException, InterruptedException {
-        checkNotNull(args);
-        return exec(String.format("%s %s < /dev/tty", sttyCommand, args));
-    }
-
-    private String exec(final String cmd) throws IOException, InterruptedException {
-        checkNotNull(cmd);
-        return exec(shCommand, "-c", cmd);
+    private String stty(final String... args) throws IOException, InterruptedException {
+        String[] s = new String[args.length + 1];
+        s[0] = sttyCommand;
+        System.arraycopy(args, 0, s, 1, args.length);
+        return exec(s);
     }
 
     private String exec(final String... cmd) throws IOException, InterruptedException {
         checkNotNull(cmd);
 
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-
         Log.trace("Running: ", cmd);
 
-        Process p = Runtime.getRuntime().exec(cmd);
+        Process p = null;
+        if (useRedirect) {
+            try {
+                p = inheritInput(new ProcessBuilder(cmd)).start();
+            } catch (Throwable t) {
+                useRedirect = false;
+            }
+        }
+        if (p == null) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < cmd.length; i++) {
+                if (i > 0) {
+                    sb.append(' ');
+                }
+                sb.append(cmd[i]);
+            }
+            sb.append(" < ");
+            sb.append(ttyDevice);
+            p = new ProcessBuilder(shCommand, "-c", sb.toString()).start();
+        }
 
+        String result = waitAndCapture(p);
+
+        Log.trace("Result: ", result);
+
+        return result;
+    }
+
+    private static ProcessBuilder inheritInput(ProcessBuilder pb) throws Exception {
+        REDIRECT_INPUT_METHOD.invoke(pb, REDIRECT_INHERIT);
+        return pb;
+    }
+
+    public static String waitAndCapture(Process p) throws IOException, InterruptedException {
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
         InputStream in = null;
         InputStream err = null;
         OutputStream out = null;
@@ -215,20 +342,17 @@ public final class TerminalLineSettings
             close(in, out, err);
         }
 
-        String result = bout.toString();
-
-        Log.trace("Result: ", result);
-
-        return result;
+        return bout.toString();
     }
 
     private static void close(final Closeable... closeables) {
         for (Closeable c : closeables) {
-            try {
-                c.close();
-            }
-            catch (Exception e) {
-                // Ignore
+            if (c != null) {
+                try {
+                    c.close();
+                } catch (Exception e) {
+                    // Ignore
+                }
             }
         }
     }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java
index b28f0405b47..03f4caaa675 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java
index 835064ee445..292de51ae24 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java
index 78a11dba932..fc3a5e772cb 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java
index 52b00aea6d3..375ed28f2aa 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2012, the original author or authors.
+ * Copyright (c) 2002-2016, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/legal/jline.md b/src/jdk.internal.le/share/legal/jline.md
index c3c114ba4be..0924a8e5638 100644
--- a/src/jdk.internal.le/share/legal/jline.md
+++ b/src/jdk.internal.le/share/legal/jline.md
@@ -1,11 +1,13 @@
-## JLine v2.12.1
+## JLine v2.14.6
 
 ### JLine License
 <pre>
 
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+Copyright (c) 2002-2016, the original author or authors.
 All rights reserved.
 
+http://www.opensource.org/licenses/bsd-license.php
+
 Redistribution and use in source and binary forms, with or
 without modification, are permitted provided that the following
 conditions are met:
diff --git a/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp b/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp
index f024a01ddad..8b87b4402a0 100644
--- a/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp
+++ b/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -34,6 +34,8 @@
 
 static jclass recordClass;
 static jmethodID recordConstructor;
+static jclass bufferStateClass;
+static jmethodID bufferStateConstructor;
 
 JNIEXPORT void JNICALL Java_jdk_internal_jline_WindowsTerminal_initIDs
   (JNIEnv *env, jclass) {
@@ -43,6 +45,12 @@ JNIEXPORT void JNICALL Java_jdk_internal_jline_WindowsTerminal_initIDs
     CHECK_NULL(recordClass);
     recordConstructor = env->GetMethodID(cls, "<init>", "(ZCIII)V");
     CHECK_NULL(recordConstructor);
+    cls = env->FindClass("jdk/internal/jline/extra/AnsiInterpretingOutputStream$BufferState");
+    CHECK_NULL(cls);
+    bufferStateClass = (jclass) env->NewGlobalRef(cls);
+    CHECK_NULL(bufferStateClass);
+    bufferStateConstructor = env->GetMethodID(cls, "<init>", "(IIII)V");
+    CHECK_NULL(bufferStateConstructor);
 }
 
 JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getConsoleMode
@@ -81,8 +89,6 @@ JNIEXPORT jobject JNICALL Java_jdk_internal_jline_WindowsTerminal_readKeyEvent
             return NULL;
         }
         if (record.EventType == KEY_EVENT) {
-            jclass clazz = env->FindClass("jdk/internal/jline/WindowsTerminal$KEY_EVENT_RECORD");
-            jmethodID constr = env->GetMethodID(clazz, "<init>", "(ZCIII)V");
             return env->NewObject(recordClass,
                                   recordConstructor,
                                   record.Event.KeyEvent.bKeyDown,
@@ -125,3 +131,31 @@ JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getWindowsTermina
     }
     return info.srWindow.Bottom - info.srWindow.Top + 1;
 }
+
+JNIEXPORT jobject JNICALL Java_jdk_internal_jline_WindowsTerminal_getBufferState
+  (JNIEnv *env, jobject) {
+    HANDLE hStdOut;
+    if ((hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) == INVALID_HANDLE_VALUE) {
+        return NULL;
+    }
+    CONSOLE_SCREEN_BUFFER_INFO info;
+    if (! GetConsoleScreenBufferInfo(hStdOut, &info)) {
+        return NULL;
+    }
+    return env->NewObject(bufferStateClass,
+                          bufferStateConstructor,
+                          info.dwCursorPosition.X,
+                          info.dwCursorPosition.Y,
+                          info.dwSize.X,
+                          info.dwSize.Y);
+}
+
+JNIEXPORT void JNICALL Java_jdk_internal_jline_WindowsTerminal_setCursorPosition
+  (JNIEnv *, jobject, jint x, jint y) {
+    HANDLE hStdOut;
+    if ((hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) == INVALID_HANDLE_VALUE) {
+        return ;
+    }
+    COORD coord = {(SHORT) x, (SHORT) y};
+    SetConsoleCursorPosition(hStdOut, coord);
+}
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java
index 0d39af447f7..f101a2aa19f 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -56,7 +56,6 @@
 package jdk.internal.joptsimple;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import static java.util.Collections.*;
@@ -70,22 +69,22 @@ import static jdk.internal.joptsimple.internal.Strings.*;
  * @param <V> represents the type of the arguments this option accepts
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  */
-abstract class AbstractOptionSpec<V> implements OptionSpec<V>, OptionDescriptor {
-    private final List<String> options = new ArrayList<String>();
+public abstract class AbstractOptionSpec<V> implements OptionSpec<V>, OptionDescriptor {
+    private final List<String> options = new ArrayList<>();
     private final String description;
     private boolean forHelp;
 
-    protected AbstractOptionSpec( String option ) {
+    AbstractOptionSpec( String option ) {
         this( singletonList( option ), EMPTY );
     }
 
-    protected AbstractOptionSpec( Collection<String> options, String description ) {
+    AbstractOptionSpec( List<String> options, String description ) {
         arrangeOptions( options );
 
         this.description = description;
     }
 
-    public final Collection<String> options() {
+    public final List<String> options() {
         return unmodifiableList( options );
     }
 
@@ -119,12 +118,8 @@ abstract class AbstractOptionSpec<V> implements OptionSpec<V>, OptionDescriptor
     protected V convertWith( ValueConverter<V> converter, String argument ) {
         try {
             return Reflection.convertWith( converter, argument );
-        }
-        catch ( ReflectionException ex ) {
-            throw new OptionArgumentConversionException( options(), argument, ex );
-        }
-        catch ( ValueConversionException ex ) {
-            throw new OptionArgumentConversionException( options(), argument, ex );
+        } catch ( ReflectionException | ValueConversionException ex ) {
+            throw new OptionArgumentConversionException( this, argument, ex );
         }
     }
 
@@ -139,14 +134,14 @@ abstract class AbstractOptionSpec<V> implements OptionSpec<V>, OptionDescriptor
     abstract void handleOption( OptionParser parser, ArgumentList arguments, OptionSet detectedOptions,
         String detectedArgument );
 
-    private void arrangeOptions( Collection<String> unarranged ) {
+    private void arrangeOptions( List<String> unarranged ) {
         if ( unarranged.size() == 1 ) {
             options.addAll( unarranged );
             return;
         }
 
-        List<String> shortOptions = new ArrayList<String>();
-        List<String> longOptions = new ArrayList<String>();
+        List<String> shortOptions = new ArrayList<>();
+        List<String> longOptions = new ArrayList<>();
 
         for ( String each : unarranged ) {
             if ( each.length() == 1 )
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java
index 12532c6b3bc..68bcd0ec7ea 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,26 +55,40 @@
 
 package jdk.internal.joptsimple;
 
+import jdk.internal.joptsimple.internal.Messages;
+
+import java.util.Locale;
+
 import static java.util.Collections.*;
 
 import static jdk.internal.joptsimple.ParserRules.*;
 
 /**
- * Represents the <kbd>"-W"</kbd> form of long option specification.
+ * Represents the {@code "-W"} form of long option specification.
  *
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  */
 class AlternativeLongOptionSpec extends ArgumentAcceptingOptionSpec<String> {
     AlternativeLongOptionSpec() {
-        super( singletonList( RESERVED_FOR_EXTENSIONS ), true, "Alternative form of long options" );
+        super( singletonList( RESERVED_FOR_EXTENSIONS ),
+            true,
+            Messages.message(
+                Locale.getDefault(),
+                "jdk.internal.joptsimple.HelpFormatterMessages",
+                AlternativeLongOptionSpec.class,
+                "description" ) );
 
-        describedAs( "opt=value" );
+        describedAs( Messages.message(
+            Locale.getDefault(),
+            "jdk.internal.joptsimple.HelpFormatterMessages",
+            AlternativeLongOptionSpec.class,
+            "arg.description" ) );
     }
 
     @Override
     protected void detectOptionArgument( OptionParser parser, ArgumentList arguments, OptionSet detectedOptions ) {
         if ( !arguments.hasMore() )
-            throw new OptionMissingRequiredArgumentException( options() );
+            throw new OptionMissingRequiredArgumentException( this );
 
         arguments.treatNextAsLongOption();
     }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java
index ffb083746e9..b3064afe6a0 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -56,13 +56,12 @@
 package jdk.internal.joptsimple;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.StringTokenizer;
 
 import static java.util.Collections.*;
+import static java.util.Objects.*;
 
-import static jdk.internal.joptsimple.internal.Objects.*;
 import static jdk.internal.joptsimple.internal.Reflection.*;
 import static jdk.internal.joptsimple.internal.Strings.*;
 
@@ -88,12 +87,13 @@ import static jdk.internal.joptsimple.internal.Strings.*;
 public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<V> {
     private static final char NIL_VALUE_SEPARATOR = '\u0000';
 
-    private boolean optionRequired;
     private final boolean argumentRequired;
+    private final List<V> defaultValues = new ArrayList<>();
+
+    private boolean optionRequired;
     private ValueConverter<V> converter;
     private String argumentDescription = "";
     private String valueSeparator = String.valueOf( NIL_VALUE_SEPARATOR );
-    private final List<V> defaultValues = new ArrayList<V>();
 
     ArgumentAcceptingOptionSpec( String option, boolean argumentRequired ) {
         super( option );
@@ -101,7 +101,7 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
         this.argumentRequired = argumentRequired;
     }
 
-    ArgumentAcceptingOptionSpec( Collection<String> options, boolean argumentRequired, String description ) {
+    ArgumentAcceptingOptionSpec( List<String> options, boolean argumentRequired, String description ) {
         super( options, description );
 
         this.argumentRequired = argumentRequired;
@@ -182,7 +182,7 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
      *   </code>
      * </pre>
      *
-     * <p>Then {@code options.valuesOf( "z" )} would yield the list {@code [foo, bar, baz, fizz, buzz]}.</p>
+     * <p>Then <code>options.valuesOf( "z" )</code> would yield the list {@code [foo, bar, baz, fizz, buzz]}.</p>
      *
      * <p>You cannot use Unicode U+0000 as the separator.</p>
      *
@@ -211,7 +211,7 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
      *   </code>
      * </pre>
      *
-     * <p>Then {@code options.valuesOf( "z" )} would yield the list {@code [foo, bar, baz, fizz, buzz]}.</p>
+     * <p>Then <code>options.valuesOf( "z" )</code> would yield the list {@code [foo, bar, baz, fizz, buzz]}.</p>
      *
      * <p>You cannot use Unicode U+0000 in the separator.</p>
      *
@@ -236,8 +236,9 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
      * @throws NullPointerException if {@code value}, {@code values}, or any elements of {@code values} are
      * {@code null}
      */
-    @SuppressWarnings("unchecked")
-    public ArgumentAcceptingOptionSpec<V> defaultsTo( V value, V... values ) {
+    @SafeVarargs
+    @SuppressWarnings("varargs")
+    public final ArgumentAcceptingOptionSpec<V> defaultsTo( V value, V... values ) {
         addDefaultValue( value );
         defaultsTo( values );
 
@@ -275,7 +276,7 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
     }
 
     private void addDefaultValue( V value ) {
-        ensureNotNull( value );
+        requireNonNull( value );
         defaultValues.add( value );
     }
 
@@ -283,7 +284,7 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
     final void handleOption( OptionParser parser, ArgumentList arguments, OptionSet detectedOptions,
         String detectedArgument ) {
 
-        if ( isNullOrEmpty( detectedArgument ) )
+        if ( detectedArgument == null )
             detectOptionArgument( parser, arguments, detectedOptions );
         else
             addArguments( detectedOptions, detectedArgument );
@@ -314,8 +315,7 @@ public abstract class ArgumentAcceptingOptionSpec<V> extends AbstractOptionSpec<
             while ( lexer.hasMoreTokens() )
                 convert( lexer.nextToken() );
             return true;
-        }
-        catch ( OptionException ignored ) {
+        } catch ( OptionException ignored ) {
             return false;
         }
     }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java
index e8cf157f99c..04af7965aea 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java
index ba72af36f90..8e7fe5146ad 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,14 +55,9 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
+import jdk.internal.joptsimple.internal.Messages;
 import jdk.internal.joptsimple.internal.Rows;
 import jdk.internal.joptsimple.internal.Strings;
 
@@ -73,10 +68,17 @@ import static jdk.internal.joptsimple.internal.Strings.*;
 /**
  * <p>A help formatter that allows configuration of overall row width and column separator width.</p>
  *
- * <p>The formatter produces a two-column output. The left column is for the options, and the right column for their
+ * <p>The formatter produces output in two sections: one for the options, and one for non-option arguments.</p>
+ *
+ * <p>The options section has two columns: the left column for the options, and the right column for their
  * descriptions. The formatter will allow as much space as possible for the descriptions, by minimizing the option
  * column's width, no greater than slightly less than half the overall desired width.</p>
  *
+ * <p>The non-option arguments section is one column, occupying as much width as it can.</p>
+ *
+ * <p>Subclasses are free to override bits of this implementation as they see fit. Inspect the code
+ * carefully to understand the flow of control that this implementation guarantees.</p>
+ *
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  */
 public class BuiltinHelpFormatter implements HelpFormatter {
@@ -102,7 +104,20 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         optionRows = new Rows( desiredOverallWidth, desiredColumnSeparatorWidth );
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation:</p>
+     * <ul>
+     *     <li>Sorts the given descriptors by their first elements of {@link OptionDescriptor#options()}</li>
+     *     <li>Passes the resulting sorted set to {@link #addRows(java.util.Collection)}</li>
+     *     <li>Returns the result of {@link #formattedHelpOutput()}</li>
+     * </ul>
+     */
     public String format( Map<String, ? extends OptionDescriptor> options ) {
+        optionRows.reset();
+        nonOptionRows.reset();
+
         Comparator<OptionDescriptor> comparator =
             new Comparator<OptionDescriptor>() {
                 public int compare( OptionDescriptor first, OptionDescriptor second ) {
@@ -110,7 +125,7 @@ public class BuiltinHelpFormatter implements HelpFormatter {
                 }
             };
 
-        Set<OptionDescriptor> sorted = new TreeSet<OptionDescriptor>( comparator );
+        Set<OptionDescriptor> sorted = new TreeSet<>( comparator );
         sorted.addAll( options.values() );
 
         addRows( sorted );
@@ -118,21 +133,102 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         return formattedHelpOutput();
     }
 
-    private String formattedHelpOutput() {
+    /**
+     * Adds a row of option help output in the left column, with empty space in the right column.
+     *
+     * @param single text to put in the left column
+     */
+    protected void addOptionRow( String single ) {
+        addOptionRow( single, "" );
+    }
+
+    /**
+     * Adds a row of option help output in the left and right columns.
+     *
+     * @param left text to put in the left column
+     * @param right text to put in the right column
+     */
+    protected void addOptionRow( String left, String right ) {
+        optionRows.add( left, right );
+    }
+
+    /**
+     * Adds a single row of non-option argument help.
+     *
+     * @param single single row of non-option argument help text
+     */
+    protected void addNonOptionRow( String single ) {
+        nonOptionRows.add( single, "" );
+    }
+
+    /**
+     * Resizes the columns of all the rows to be no wider than the widest element in that column.
+     */
+    protected void fitRowsToWidth() {
+        nonOptionRows.fitToWidth();
+        optionRows.fitToWidth();
+    }
+
+    /**
+     * Produces non-option argument help.
+     *
+     * @return non-option argument help
+     */
+    protected String nonOptionOutput() {
+        return nonOptionRows.render();
+    }
+
+    /**
+     * Produces help for options and their descriptions.
+     *
+     * @return option help
+     */
+    protected String optionOutput() {
+        return optionRows.render();
+    }
+
+    /**
+     * <p>Produces help output for an entire set of options and non-option arguments.</p>
+     *
+     * <p>This implementation concatenates:</p>
+     * <ul>
+     *     <li>the result of {@link #nonOptionOutput()}</li>
+     *     <li>if there is non-option output, a line separator</li>
+     *     <li>the result of {@link #optionOutput()}</li>
+     * </ul>
+     *
+     * @return help output for entire set of options and non-option arguments
+     */
+    protected String formattedHelpOutput() {
         StringBuilder formatted = new StringBuilder();
-        String nonOptionDisplay = nonOptionRows.render();
+        String nonOptionDisplay = nonOptionOutput();
         if ( !Strings.isNullOrEmpty( nonOptionDisplay ) )
             formatted.append( nonOptionDisplay ).append( LINE_SEPARATOR );
-        formatted.append( optionRows.render() );
+        formatted.append( optionOutput() );
 
         return formatted.toString();
     }
 
-    private void addRows( Collection<? extends OptionDescriptor> options ) {
+    /**
+     * <p>Adds rows of help output for the given options.</p>
+     *
+     * <p>This implementation:</p>
+     * <ul>
+     *     <li>Calls {@link #addNonOptionsDescription(java.util.Collection)} with the options as the argument</li>
+ *         <li>If there are no options, calls {@link #addOptionRow(String)} with an argument that indicates
+ *         that no options are specified.</li>
+ *         <li>Otherwise, calls {@link #addHeaders(java.util.Collection)} with the options as the argument,
+ *         followed by {@link #addOptions(java.util.Collection)} with the options as the argument.</li>
+     *     <li>Calls {@link #fitRowsToWidth()}.</li>
+     * </ul>
+     *
+     * @param options descriptors for the configured options of a parser
+     */
+    protected void addRows( Collection<? extends OptionDescriptor> options ) {
         addNonOptionsDescription( options );
 
         if ( options.isEmpty() )
-            optionRows.add( "No options specified", "" );
+            addOptionRow( message( "no.options.specified" ) );
         else {
             addHeaders( options );
             addOptions( options );
@@ -141,34 +237,87 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         fitRowsToWidth();
     }
 
-    private void addNonOptionsDescription( Collection<? extends OptionDescriptor> options ) {
+    /**
+     * <p>Adds non-option arguments descriptions to the help output.</p>
+     *
+     * <p>This implementation:</p>
+     * <ul>
+     *     <li>{@linkplain #findAndRemoveNonOptionsSpec(java.util.Collection) Finds and removes the non-option
+     *     arguments descriptor}</li>
+     *     <li>{@linkplain #shouldShowNonOptionArgumentDisplay(OptionDescriptor) Decides whether there is
+     *     anything to show for non-option arguments}</li>
+     *     <li>If there is, {@linkplain #addNonOptionRow(String) adds a header row} and
+     *     {@linkplain #addNonOptionRow(String) adds a}
+     *     {@linkplain #createNonOptionArgumentsDisplay(OptionDescriptor) non-option arguments description} </li>
+     * </ul>
+     *
+     * @param options descriptors for the configured options of a parser
+     */
+    protected void addNonOptionsDescription( Collection<? extends OptionDescriptor> options ) {
         OptionDescriptor nonOptions = findAndRemoveNonOptionsSpec( options );
         if ( shouldShowNonOptionArgumentDisplay( nonOptions ) ) {
-            nonOptionRows.add( "Non-option arguments:", "" );
-            nonOptionRows.add(createNonOptionArgumentsDisplay(nonOptions), "");
+            addNonOptionRow( message( "non.option.arguments.header" ) );
+            addNonOptionRow( createNonOptionArgumentsDisplay( nonOptions ) );
         }
     }
 
-    private boolean shouldShowNonOptionArgumentDisplay( OptionDescriptor nonOptions ) {
-        return !Strings.isNullOrEmpty( nonOptions.description() )
-            || !Strings.isNullOrEmpty( nonOptions.argumentTypeIndicator() )
-            || !Strings.isNullOrEmpty( nonOptions.argumentDescription() );
+    /**
+     * <p>Decides whether or not to show a non-option arguments help.</p>
+     *
+     * <p>This implementation responds with {@code true} if the non-option descriptor has a non-{@code null},
+     * non-empty value for any of {@link OptionDescriptor#description()},
+     * {@link OptionDescriptor#argumentTypeIndicator()}, or {@link OptionDescriptor#argumentDescription()}.</p>
+     *
+     * @param nonOptionDescriptor non-option argument descriptor
+     * @return {@code true} if non-options argument help should be shown
+     */
+    protected boolean shouldShowNonOptionArgumentDisplay( OptionDescriptor nonOptionDescriptor ) {
+        return !Strings.isNullOrEmpty( nonOptionDescriptor.description() )
+            || !Strings.isNullOrEmpty( nonOptionDescriptor.argumentTypeIndicator() )
+            || !Strings.isNullOrEmpty( nonOptionDescriptor.argumentDescription() );
     }
 
-    private String createNonOptionArgumentsDisplay(OptionDescriptor nonOptions) {
+    /**
+     * <p>Creates a non-options argument help string.</p>
+     *
+     * <p>This implementation creates an empty string buffer and calls
+     * {@link #maybeAppendOptionInfo(StringBuilder, OptionDescriptor)}
+     * and {@link #maybeAppendNonOptionsDescription(StringBuilder, OptionDescriptor)}, passing them the
+     * buffer and the non-option arguments descriptor.</p>
+     *
+     * @param nonOptionDescriptor non-option argument descriptor
+     * @return help string for non-options
+     */
+    protected String createNonOptionArgumentsDisplay( OptionDescriptor nonOptionDescriptor ) {
         StringBuilder buffer = new StringBuilder();
-        maybeAppendOptionInfo( buffer, nonOptions );
-        maybeAppendNonOptionsDescription( buffer, nonOptions );
+        maybeAppendOptionInfo( buffer, nonOptionDescriptor );
+        maybeAppendNonOptionsDescription( buffer, nonOptionDescriptor );
 
         return buffer.toString();
     }
 
-    private void maybeAppendNonOptionsDescription( StringBuilder buffer, OptionDescriptor nonOptions ) {
+    /**
+     * <p>Appends help for the given non-option arguments descriptor to the given buffer.</p>
+     *
+     * <p>This implementation appends {@code " -- "} if the buffer has text in it and the non-option arguments
+     * descriptor has a {@link OptionDescriptor#description()}; followed by the
+     * {@link OptionDescriptor#description()}.</p>
+     *
+     * @param buffer string buffer
+     * @param nonOptions non-option arguments descriptor
+     */
+    protected void maybeAppendNonOptionsDescription( StringBuilder buffer, OptionDescriptor nonOptions ) {
         buffer.append( buffer.length() > 0 && !Strings.isNullOrEmpty( nonOptions.description() ) ? " -- " : "" )
             .append( nonOptions.description() );
     }
 
-    private OptionDescriptor findAndRemoveNonOptionsSpec( Collection<? extends OptionDescriptor> options ) {
+    /**
+     * Finds the non-option arguments descriptor in the given collection, removes it, and returns it.
+     *
+     * @param options descriptors for the configured options of a parser
+     * @return the non-option arguments descriptor
+     */
+    protected OptionDescriptor findAndRemoveNonOptionsSpec( Collection<? extends OptionDescriptor> options ) {
         for ( Iterator<? extends OptionDescriptor> it = options.iterator(); it.hasNext(); ) {
             OptionDescriptor next = it.next();
             if ( next.representsNonOptions() ) {
@@ -180,17 +329,32 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         throw new AssertionError( "no non-options argument spec" );
     }
 
-    private void addHeaders( Collection<? extends OptionDescriptor> options ) {
+    /**
+     * <p>Adds help row headers for option help columns.</p>
+     *
+     * <p>This implementation uses the headers {@code "Option"} and {@code "Description"}. If the options contain
+     * a "required" option, the {@code "Option"} header looks like {@code "Option (* = required)}. Both headers
+     * are "underlined" using {@code "-"}.</p>
+     *
+     * @param options descriptors for the configured options of a parser
+     */
+    protected void addHeaders( Collection<? extends OptionDescriptor> options ) {
         if ( hasRequiredOption( options ) ) {
-            optionRows.add("Option (* = required)", "Description");
-            optionRows.add("---------------------", "-----------");
+            addOptionRow( message( "option.header.with.required.indicator" ), message( "description.header" ) );
+            addOptionRow( message( "option.divider.with.required.indicator" ), message( "description.divider" ) );
         } else {
-            optionRows.add("Option", "Description");
-            optionRows.add("------", "-----------");
+            addOptionRow( message( "option.header" ), message( "description.header" ) );
+            addOptionRow( message( "option.divider" ), message( "description.divider" ) );
         }
     }
 
-    private boolean hasRequiredOption( Collection<? extends OptionDescriptor> options ) {
+    /**
+     * Tells whether the given option descriptors contain a "required" option.
+     *
+     * @param options descriptors for the configured options of a parser
+     * @return {@code true} if at least one of the options is "required"
+     */
+    protected final boolean hasRequiredOption( Collection<? extends OptionDescriptor> options ) {
         for ( OptionDescriptor each : options ) {
             if ( each.isRequired() )
                 return true;
@@ -199,19 +363,46 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         return false;
     }
 
-    private void addOptions( Collection<? extends OptionDescriptor> options ) {
+    /**
+     * <p>Adds help rows for the given options.</p>
+     *
+     * <p>This implementation loops over the given options, and for each, calls {@link #addOptionRow(String, String)}
+     * using the results of {@link #createOptionDisplay(OptionDescriptor)} and
+     * {@link #createDescriptionDisplay(OptionDescriptor)}, respectively, as arguments.</p>
+     *
+     * @param options descriptors for the configured options of a parser
+     */
+    protected void addOptions( Collection<? extends OptionDescriptor> options ) {
         for ( OptionDescriptor each : options ) {
             if ( !each.representsNonOptions() )
-                optionRows.add( createOptionDisplay( each ), createDescriptionDisplay( each ) );
+                addOptionRow( createOptionDisplay( each ), createDescriptionDisplay( each ) );
         }
     }
 
-    private String createOptionDisplay( OptionDescriptor descriptor ) {
+    /**
+     * <p>Creates a string for how the given option descriptor is to be represented in help.</p>
+     *
+     * <p>This implementation gives a string consisting of the concatenation of:</p>
+     * <ul>
+     *     <li>{@code "* "} for "required" options, otherwise {@code ""}</li>
+     *     <li>For each of the {@link OptionDescriptor#options()} of the descriptor, separated by {@code ", "}:
+     *         <ul>
+     *             <li>{@link #optionLeader(String)} of the option</li>
+     *             <li>the option</li>
+     *         </ul>
+     *     </li>
+     *     <li>the result of {@link #maybeAppendOptionInfo(StringBuilder, OptionDescriptor)}</li>
+     * </ul>
+     *
+     * @param descriptor a descriptor for a configured option of a parser
+     * @return help string
+     */
+    protected String createOptionDisplay( OptionDescriptor descriptor ) {
         StringBuilder buffer = new StringBuilder( descriptor.isRequired() ? "* " : "" );
 
         for ( Iterator<String> i = descriptor.options().iterator(); i.hasNext(); ) {
             String option = i.next();
-            buffer.append( option.length() > 1 ? DOUBLE_HYPHEN : HYPHEN );
+            buffer.append( optionLeader( option ) );
             buffer.append( option );
 
             if ( i.hasNext() )
@@ -223,31 +414,105 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         return buffer.toString();
     }
 
-    private void maybeAppendOptionInfo( StringBuilder buffer, OptionDescriptor descriptor ) {
-        String indicator = extractTypeIndicator( descriptor );
-        String description = descriptor.argumentDescription();
-        if ( indicator != null || !isNullOrEmpty( description ) )
-            appendOptionHelp( buffer, indicator, description, descriptor.requiresArgument() );
+    /**
+     * <p>Gives a string that represents the given option's "option leader" in help.</p>
+     *
+     * <p>This implementation answers with {@code "--"} for options of length greater than one; otherwise answers
+     * with {@code "-"}.</p>
+     *
+     * @param option a string option
+     * @return an "option leader" string
+     */
+    protected String optionLeader( String option ) {
+        return option.length() > 1 ? DOUBLE_HYPHEN : HYPHEN;
     }
 
-    private String extractTypeIndicator( OptionDescriptor descriptor ) {
+    /**
+     * <p>Appends additional info about the given option to the given buffer.</p>
+     *
+     * <p>This implementation:</p>
+     * <ul>
+     *     <li>calls {@link #extractTypeIndicator(OptionDescriptor)} for the descriptor</li>
+     *     <li>calls {@link jdk.internal.joptsimple.OptionDescriptor#argumentDescription()} for the descriptor</li>
+     *     <li>if either of the above is present, calls
+     *     {@link #appendOptionHelp(StringBuilder, String, String, boolean)}</li>
+     * </ul>
+     *
+     * @param buffer string buffer
+     * @param descriptor a descriptor for a configured option of a parser
+     */
+    protected void maybeAppendOptionInfo( StringBuilder buffer, OptionDescriptor descriptor ) {
+        String indicator = extractTypeIndicator( descriptor );
+        String description = descriptor.argumentDescription();
+        if ( descriptor.acceptsArguments()
+            || !isNullOrEmpty( description )
+            || descriptor.representsNonOptions() ) {
+
+            appendOptionHelp( buffer, indicator, description, descriptor.requiresArgument() );
+        }
+    }
+
+    /**
+     * <p>Gives an indicator of the type of arguments of the option described by the given descriptor,
+     * for use in help.</p>
+     *
+     * <p>This implementation asks for the {@link OptionDescriptor#argumentTypeIndicator()} of the given
+     * descriptor, and if it is present and not {@code "java.lang.String"}, parses it as a fully qualified
+     * class name and returns the base name of that class; otherwise returns {@code "String"}.</p>
+     *
+     * @param descriptor a descriptor for a configured option of a parser
+     * @return type indicator text
+     */
+    protected String extractTypeIndicator( OptionDescriptor descriptor ) {
         String indicator = descriptor.argumentTypeIndicator();
 
         if ( !isNullOrEmpty( indicator ) && !String.class.getName().equals( indicator ) )
             return shortNameOf( indicator );
 
-        return null;
+        return "String";
     }
 
-    private void appendOptionHelp( StringBuilder buffer, String typeIndicator, String description, boolean required ) {
+    /**
+     * <p>Appends info about an option's argument to the given buffer.</p>
+     *
+     * <p>This implementation calls {@link #appendTypeIndicator(StringBuilder, String, String, char, char)} with
+     * the surrounding characters {@code '<'} and {@code '>'} for options with {@code required} arguments, and
+     * with the surrounding characters {@code '['} and {@code ']'} for options with optional arguments.</p>
+     *
+     * @param buffer string buffer
+     * @param typeIndicator type indicator
+     * @param description type description
+     * @param required indicator of "required"-ness of the argument of the option
+     */
+    protected void appendOptionHelp( StringBuilder buffer, String typeIndicator, String description,
+                                     boolean required ) {
         if ( required )
             appendTypeIndicator( buffer, typeIndicator, description, '<', '>' );
         else
             appendTypeIndicator( buffer, typeIndicator, description, '[', ']' );
     }
 
-    private void appendTypeIndicator( StringBuilder buffer, String typeIndicator, String description,
-                                      char start, char end ) {
+    /**
+     * <p>Appends a type indicator for an option's argument to the given buffer.</p>
+     *
+     * <p>This implementation appends, in order:</p>
+     * <ul>
+     *     <li>{@code ' '}</li>
+     *     <li>{@code start}</li>
+     *     <li>the type indicator, if not {@code null}</li>
+     *     <li>if the description is present, then {@code ": "} plus the description if the type indicator is
+     *     present; otherwise the description only</li>
+     *     <li>{@code end}</li>
+     * </ul>
+     *
+     * @param buffer string buffer
+     * @param typeIndicator type indicator
+     * @param description type description
+     * @param start starting character
+     * @param end ending character
+     */
+    protected void appendTypeIndicator( StringBuilder buffer, String typeIndicator, String description,
+                                        char start, char end ) {
         buffer.append( ' ' ).append( start );
         if ( typeIndicator != null )
             buffer.append( typeIndicator );
@@ -262,21 +527,69 @@ public class BuiltinHelpFormatter implements HelpFormatter {
         buffer.append( end );
     }
 
-    private String createDescriptionDisplay( OptionDescriptor descriptor ) {
+    /**
+     * <p>Gives a string representing a description of the option with the given descriptor.</p>
+     *
+     * <p>This implementation:</p>
+     * <ul>
+     *     <li>Asks for the descriptor's {@link OptionDescriptor#defaultValues()}</li>
+     *     <li>If they're not present, answers the descriptor's {@link OptionDescriptor#description()}.</li>
+     *     <li>If they are present, concatenates and returns:
+     *         <ul>
+     *             <li>the descriptor's {@link OptionDescriptor#description()}</li>
+     *             <li>{@code ' '}</li>
+     *             <li>{@code "default: "} plus the result of {@link #createDefaultValuesDisplay(java.util.List)},
+     *             surrounded by parentheses</li>
+     *         </ul>
+     *     </li>
+     * </ul>
+     *
+     * @param descriptor a descriptor for a configured option of a parser
+     * @return display text for the option's description
+     */
+    protected String createDescriptionDisplay( OptionDescriptor descriptor ) {
         List<?> defaultValues = descriptor.defaultValues();
         if ( defaultValues.isEmpty() )
             return descriptor.description();
 
         String defaultValuesDisplay = createDefaultValuesDisplay( defaultValues );
-        return ( descriptor.description() + ' ' + surround( "default: " + defaultValuesDisplay, '(', ')' ) ).trim();
+        return ( descriptor.description()
+            + ' '
+            + surround( message( "default.value.header" ) + ' ' + defaultValuesDisplay, '(', ')' )
+        ).trim();
     }
 
-    private String createDefaultValuesDisplay( List<?> defaultValues ) {
+    /**
+     * <p>Gives a display string for the default values of an option's argument.</p>
+     *
+     * <p>This implementation gives the {@link Object#toString()} of the first value if there is only one value,
+     * otherwise gives the {@link Object#toString()} of the whole list.</p>
+     *
+     * @param defaultValues some default values for a given option's argument
+     * @return a display string for those default values
+     */
+    protected String createDefaultValuesDisplay( List<?> defaultValues ) {
         return defaultValues.size() == 1 ? defaultValues.get( 0 ).toString() : defaultValues.toString();
     }
 
-    private void fitRowsToWidth() {
-        nonOptionRows.fitToWidth();
-        optionRows.fitToWidth();
+    /**
+     * <p>Looks up and gives a resource bundle message.</p>
+     *
+     * <p>This implementation looks in the bundle {@code "jdk.internal.joptsimple.HelpFormatterMessages"} in the default
+     * locale, using a key that is the concatenation of this class's fully qualified name, {@code '.'},
+     * and the given key suffix, formats the corresponding value using the given arguments, and returns
+     * the result.</p>
+     *
+     * @param keySuffix suffix to use when looking up the bundle message
+     * @param args arguments to fill in the message template with
+     * @return a formatted localized message
+     */
+    protected String message( String keySuffix, Object... args ) {
+        return Messages.message(
+            Locale.getDefault(),
+            "jdk.internal.joptsimple.HelpFormatterMessages",
+            BuiltinHelpFormatter.class,
+            keySuffix,
+            args );
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties
new file mode 100644
index 00000000000..c12fc25bb33
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+jdk.internal.joptsimple.IllegalOptionSpecificationException.message = {0} is not a legal option character
+jdk.internal.joptsimple.MissingRequiredOptionsException.message = Missing required option(s) {0}
+jdk.internal.joptsimple.MultipleArgumentsForOptionException.message = Found multiple arguments for option {0}, but you asked for only one
+jdk.internal.joptsimple.OptionArgumentConversionException.message = Cannot parse argument ''{0}'' of option {1}
+jdk.internal.joptsimple.OptionMissingRequiredArgumentException.message = Option {0} requires an argument
+jdk.internal.joptsimple.UnavailableOptionException.message = Option(s) {0} are unavailable given other options on the command line
+jdk.internal.joptsimple.UnconfiguredOptionException.message = Option(s) {0} not configured on this parser
+jdk.internal.joptsimple.UnrecognizedOptionException.message = {0} is not a recognized option
+jdk.internal.joptsimple.util.DateConverter.without.pattern.message = Value [{0}] does not match date/time pattern
+jdk.internal.joptsimple.util.DateConverter.with.pattern.message = Value [{0}] does not match date/time pattern [{1}]
+jdk.internal.joptsimple.util.RegexMatcher.message = Value [{0}] did not match regex [{1}]
+jdk.internal.joptsimple.util.EnumConverter.message = Value [{0}] is not one of [{1}]
+jdk.internal.joptsimple.util.PathConverter.file.existing.message = File [{0}] does not exist
+jdk.internal.joptsimple.util.PathConverter.directory.existing.message = Directory [{0}] does not exist
+jdk.internal.joptsimple.util.PathConverter.file.not.existing.message = File [{0}] does already exist
+jdk.internal.joptsimple.util.PathConverter.file.overwritable.message = File [{0}] is not overwritable
+jdk.internal.joptsimple.util.PathConverter.file.readable.message = File [{0}] is not readable
+jdk.internal.joptsimple.util.PathConverter.file.writable.message = File [{0}] is not writable
+jdk.internal.joptsimple.util.InetAddressConverter.message = Cannot convert value [{0}] into an InetAddress
\ No newline at end of file
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java
index e5dd316f1d7..f3e111158e8 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatterMessages.properties b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatterMessages.properties
new file mode 100644
index 00000000000..31f060029aa
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatterMessages.properties
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+jdk.internal.joptsimple.BuiltinHelpFormatter.no.options.specified = No options specified
+jdk.internal.joptsimple.BuiltinHelpFormatter.non.option.arguments.header = Non-option arguments:
+jdk.internal.joptsimple.BuiltinHelpFormatter.option.header.with.required.indicator = Option (* = required)
+jdk.internal.joptsimple.BuiltinHelpFormatter.option.divider.with.required.indicator = ---------------------
+jdk.internal.joptsimple.BuiltinHelpFormatter.option.header = Option
+jdk.internal.joptsimple.BuiltinHelpFormatter.option.divider = ------
+jdk.internal.joptsimple.BuiltinHelpFormatter.description.header = Description
+jdk.internal.joptsimple.BuiltinHelpFormatter.description.divider = -----------
+jdk.internal.joptsimple.BuiltinHelpFormatter.default.value.header = default:
+jdk.internal.joptsimple.AlternativeLongOptionSpec.description = Alternative form of long options
+jdk.internal.joptsimple.AlternativeLongOptionSpec.arg.description = opt=value
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java
index 8696bf1a150..acf554cb8c9 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -70,7 +70,7 @@ class IllegalOptionSpecificationException extends OptionException {
     }
 
     @Override
-    public String getMessage() {
-        return singleOptionMessage() + " is not a legal option character";
+    Object[] messageArguments() {
+        return new Object[] { singleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionsException.java
similarity index 83%
rename from src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java
rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionsException.java
index 2c997e2052c..44a5a2e9453 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,22 +55,22 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import java.util.List;
 
 /**
- * Thrown when an option is marked as required, but not specified on the command line.
+ * Thrown when options marked as required are not specified on the command line.
  *
  * @author <a href="https://github.com/TC1">Emils Solmanis</a>
  */
-class MissingRequiredOptionException extends OptionException {
+class MissingRequiredOptionsException extends OptionException {
     private static final long serialVersionUID = -1L;
 
-    protected MissingRequiredOptionException( Collection<String> options ) {
-        super( options );
+    protected MissingRequiredOptionsException( List<? extends OptionSpec<?>> missingRequiredOptions ) {
+        super( missingRequiredOptions );
     }
 
     @Override
-    public String getMessage() {
-        return "Missing required option(s) " + multipleOptionMessage();
+    Object[] messageArguments() {
+        return new Object[] { multipleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java
index e96cea33918..39c07fe3201 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import static java.util.Collections.*;
 
 /**
  * Thrown when asking an {@link OptionSet} for a single argument of an option when many have been specified.
@@ -65,12 +65,12 @@ import java.util.Collection;
 class MultipleArgumentsForOptionException extends OptionException {
     private static final long serialVersionUID = -1L;
 
-    MultipleArgumentsForOptionException( Collection<String> options ) {
-        super( options );
+    MultipleArgumentsForOptionException( OptionSpec<?> options ) {
+        super( singleton( options ) );
     }
 
     @Override
-    public String getMessage() {
-        return "Found multiple arguments for option " + multipleOptionMessage() + ", but you asked for only one";
+    Object[] messageArguments() {
+        return new Object[] { singleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java
index 9647ff1bad2..c2ee67f7536 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,6 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
 import java.util.List;
 
 import static java.util.Collections.*;
@@ -70,7 +69,7 @@ class NoArgumentOptionSpec extends AbstractOptionSpec<Void> {
         this( singletonList( option ), "" );
     }
 
-    NoArgumentOptionSpec( Collection<String> options, String description ) {
+    NoArgumentOptionSpec( List<String> options, String description ) {
         super( options, description );
     }
 
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java
index 8124a05e366..5332cf5b781 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -87,7 +87,7 @@ public class NonOptionArgumentSpec<V> extends AbstractOptionSpec<V> {
     private String argumentDescription = "";
 
     NonOptionArgumentSpec() {
-        this("");
+        this( "" );
     }
 
     NonOptionArgumentSpec( String description ) {
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java
index 063b97200f8..84c076efbe6 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import static java.util.Collections.*;
 
 /**
  * Thrown when a problem occurs converting an argument of an option from {@link String} to another type.
@@ -67,14 +67,14 @@ class OptionArgumentConversionException extends OptionException {
 
     private final String argument;
 
-    OptionArgumentConversionException( Collection<String> options, String argument, Throwable cause ) {
-        super( options, cause );
+    OptionArgumentConversionException( OptionSpec<?> options, String argument, Throwable cause ) {
+        super( singleton( options ), cause );
 
         this.argument = argument;
     }
 
     @Override
-    public String getMessage() {
-        return "Cannot parse argument '" + argument + "' of option " + multipleOptionMessage();
+    Object[] messageArguments() {
+        return new Object[] { argument, singleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java
index 2a85e25901a..35ddac0af86 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java
@@ -25,14 +25,20 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import java.util.List;
 
 /**
- * Trains the option parser. This interface aids integration with other code which may expose declaration of options but
- * not actual command-line parsing.
+ * Trains the option parser. This interface aids integration that disposes declaration of options but not actual
+ * command-line parsing.
+ *
+ * Typical use is for another class to implement {@code OptionDeclarer} as a facade, forwarding calls to an
+ * {@code OptionParser} instance.
+ *
+ * Note that although this is an interface, the returned values of calls are concrete jopt-simple classes.
  *
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  * @see OptionParser
+ * @since 4.6
  */
 public interface OptionDeclarer {
     /**
@@ -78,12 +84,12 @@ public interface OptionDeclarer {
      * @throws OptionException if any of the options contain illegal characters
      * @throws NullPointerException if the option list or any of its elements are {@code null}
      */
-    OptionSpecBuilder acceptsAll( Collection<String> options );
+    OptionSpecBuilder acceptsAll( List<String> options );
 
     /**
      * Tells the parser to recognize the given options, and treat them as synonymous.
      *
-     * @see #acceptsAll(Collection)
+     * @see #acceptsAll(List)
      * @param options the options to recognize and treat as synonymous
      * @param description a string that describes the purpose of the option.  This is used when generating help
      * information about the parser.
@@ -92,7 +98,7 @@ public interface OptionDeclarer {
      * @throws NullPointerException if the option list or any of its elements are {@code null}
      * @throws IllegalArgumentException if the option list is empty
      */
-    OptionSpecBuilder acceptsAll( Collection<String> options, String description );
+    OptionSpecBuilder acceptsAll( List<String> options, String description );
 
     /**
      * Gives an object that represents an access point for non-option arguments on a command line.
@@ -127,7 +133,7 @@ public interface OptionDeclarer {
     void allowsUnrecognizedOptions();
 
     /**
-     * Tells the parser either to recognize or ignore <kbd>"-W"</kbd>-style long options.
+     * Tells the parser either to recognize or ignore {@code -W}-style long options.
      *
      * @param recognize {@code true} if the parser is to recognize the special style of long options
      */
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java
index 4a6694814f3..4707df23f23 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,6 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -70,7 +69,7 @@ public interface OptionDescriptor {
      *
      * @return synonymous options
      */
-    Collection<String> options();
+    List<String> options();
 
     /**
      * Description of this option's purpose.
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java
index 15977b63801..96cc928ad6b 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -58,11 +58,15 @@ package jdk.internal.joptsimple;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import jdk.internal.joptsimple.internal.Strings;
 
 import static java.util.Collections.*;
-
-import static jdk.internal.joptsimple.internal.Strings.*;
+import static jdk.internal.joptsimple.internal.Messages.*;
 
 /**
  * Thrown when a problem occurs during option parsing.
@@ -72,16 +76,30 @@ import static jdk.internal.joptsimple.internal.Strings.*;
 public abstract class OptionException extends RuntimeException {
     private static final long serialVersionUID = -1L;
 
-    private final List<String> options = new ArrayList<String>();
+    private final List<String> options = new ArrayList<>();
 
-    protected OptionException( Collection<String> options ) {
+    protected OptionException( List<String> options ) {
         this.options.addAll( options );
     }
 
-    protected OptionException( Collection<String> options, Throwable cause ) {
-        super( cause );
+    protected OptionException( Collection<? extends OptionSpec<?>> options ) {
+        this.options.addAll( specsToStrings( options ) );
+    }
 
-        this.options.addAll( options );
+    protected OptionException( Collection<? extends OptionSpec<?>> options, Throwable cause ) {
+        super( cause );
+        this.options.addAll( specsToStrings( options ) );
+    }
+
+    private List<String> specsToStrings( Collection<? extends OptionSpec<?>> options ) {
+        List<String> strings = new ArrayList<>();
+        for ( OptionSpec<?> each : options )
+            strings.add( specToString( each ) );
+        return strings;
+    }
+
+    private String specToString( OptionSpec<?> option ) {
+        return Strings.join( new ArrayList<>( option.options() ), "/" );
     }
 
     /**
@@ -89,23 +107,24 @@ public abstract class OptionException extends RuntimeException {
      *
      * @return the option being considered when the exception was created
      */
-    public Collection<String> options() {
-        return unmodifiableCollection( options );
+    public List<String> options() {
+        return unmodifiableList( options );
     }
 
-    protected final String singleOptionMessage() {
-        return singleOptionMessage( options.get( 0 ) );
+    protected final String singleOptionString() {
+        return singleOptionString( options.get( 0 ) );
     }
 
-    protected final String singleOptionMessage( String option ) {
-        return SINGLE_QUOTE + option + SINGLE_QUOTE;
+    protected final String singleOptionString( String option ) {
+        return option;
     }
 
-    protected final String multipleOptionMessage() {
+    protected final String multipleOptionString() {
         StringBuilder buffer = new StringBuilder( "[" );
 
-        for ( Iterator<String> iter = options.iterator(); iter.hasNext(); ) {
-            buffer.append( singleOptionMessage( iter.next() ) );
+        Set<String> asSet = new LinkedHashSet<String>( options );
+        for ( Iterator<String> iter = asSet.iterator(); iter.hasNext(); ) {
+            buffer.append( singleOptionString(iter.next()) );
             if ( iter.hasNext() )
                 buffer.append( ", " );
         }
@@ -118,4 +137,19 @@ public abstract class OptionException extends RuntimeException {
     static OptionException unrecognizedOption( String option ) {
         return new UnrecognizedOptionException( option );
     }
+
+    @Override
+    public final String getMessage() {
+        return localizedMessage( Locale.getDefault() );
+    }
+
+    final String localizedMessage( Locale locale ) {
+        return formattedMessage( locale );
+    }
+
+    private String formattedMessage( Locale locale ) {
+        return message( locale, "jdk.internal.joptsimple.ExceptionMessages", getClass(), "message", messageArguments() );
+    }
+
+    abstract Object[] messageArguments();
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java
index f667b446527..f0fa6b3d24d 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,22 +55,22 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import static java.util.Arrays.*;
 
 /**
- * Thrown when the option parser discovers an option that requires an argument, but that argument is missing.
+ * Thrown when the option parser discovers options that require an argument, but are missing an argument.
  *
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  */
 class OptionMissingRequiredArgumentException extends OptionException {
     private static final long serialVersionUID = -1L;
 
-    OptionMissingRequiredArgumentException( Collection<String> options ) {
-        super( options );
+    OptionMissingRequiredArgumentException( OptionSpec<?> option ) {
+        super( asList( option ) );
     }
 
     @Override
-    public String getMessage() {
-        return "Option " + multipleOptionMessage() + " requires an argument";
+    Object[] messageArguments() {
+        return new Object[] { singleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java
index c6c319a329a..403a63927cf 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,18 +55,16 @@
 
 package jdk.internal.joptsimple;
 
-import jdk.internal.joptsimple.internal.AbbreviationMap;
-import jdk.internal.joptsimple.util.KeyValuePair;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+
+import jdk.internal.joptsimple.internal.AbbreviationMap;
+import jdk.internal.joptsimple.internal.SimpleOptionNameMap;
+import jdk.internal.joptsimple.internal.OptionNameMap;
+import jdk.internal.joptsimple.util.KeyValuePair;
 
 import static java.util.Collections.*;
 import static jdk.internal.joptsimple.OptionException.*;
@@ -80,57 +78,58 @@ import static jdk.internal.joptsimple.ParserRules.*;
  * <p>This parser supports short options and long options.</p>
  *
  * <ul>
- *   <li><dfn>Short options</dfn> begin with a single hyphen ("<kbd>-</kbd>") followed by a single letter or digit,
- *   or question mark ("<kbd>?</kbd>"), or dot ("<kbd>.</kbd>").</li>
+ *   <li><dfn>Short options</dfn> begin with a single hyphen ("{@code -}") followed by a single letter or digit,
+ *   or question mark ("{@code ?}"), or dot ("{@code .}"), or underscore ("{@code _}").</li>
  *
  *   <li>Short options can accept single arguments. The argument can be made required or optional. The option's
  *   argument can occur:
  *     <ul>
- *       <li>in the slot after the option, as in <kbd>-d /tmp</kbd></li>
- *       <li>right up against the option, as in <kbd>-d/tmp</kbd></li>
- *       <li>right up against the option separated by an equals sign (<kbd>"="</kbd>), as in <kbd>-d=/tmp</kbd></li>
+ *       <li>in the slot after the option, as in {@code -d /tmp}</li>
+ *       <li>right up against the option, as in {@code -d/tmp}</li>
+ *       <li>right up against the option separated by an equals sign ({@code "="}), as in {@code -d=/tmp}</li>
  *     </ul>
  *   To specify <em>n</em> arguments for an option, specify the option <em>n</em> times, once for each argument,
- *   as in <kbd>-d /tmp -d /var -d /opt</kbd>; or, when using the
+ *   as in {@code -d /tmp -d /var -d /opt}; or, when using the
  *   {@linkplain ArgumentAcceptingOptionSpec#withValuesSeparatedBy(char) "separated values"} clause of the "fluent
  *   interface" (see below), give multiple values separated by a given character as a single argument to the
  *   option.</li>
  *
- *   <li>Short options can be clustered, so that <kbd>-abc</kbd> is treated as <kbd>-a -b -c</kbd>. If a short option
+ *   <li>Short options can be clustered, so that {@code -abc} is treated as {@code -a -b -c}. If a short option
  *   in the cluster can accept an argument, the remaining characters are interpreted as the argument for that
  *   option.</li>
  *
- *   <li>An argument consisting only of two hyphens (<kbd>"--"</kbd>) signals that the remaining arguments are to be
+ *   <li>An argument consisting only of two hyphens ({@code "--"}) signals that the remaining arguments are to be
  *   treated as non-options.</li>
  *
  *   <li>An argument consisting only of a single hyphen is considered a non-option argument (though it can be an
  *   argument of an option). Many Unix programs treat single hyphens as stand-ins for the standard input or standard
  *   output streams.</li>
  *
- *   <li><dfn>Long options</dfn> begin with two hyphens (<kbd>"--"</kbd>), followed by multiple letters, digits,
+ *   <li><dfn>Long options</dfn> begin with two hyphens ({@code "--"}), followed by multiple letters, digits,
  *   hyphens, question marks, or dots. A hyphen cannot be the first character of a long option specification when
  *   configuring the parser.</li>
  *
- *   <li>You can abbreviate long options, so long as the abbreviation is unique.</li>
+ *   <li>You can abbreviate long options, so long as the abbreviation is unique. Suppress this behavior if
+ *   you wish using {@linkplain OptionParser#OptionParser(boolean) this constructor}.</li>
  *
  *   <li>Long options can accept single arguments.  The argument can be made required or optional.  The option's
  *   argument can occur:
  *     <ul>
- *       <li>in the slot after the option, as in <kbd>--directory /tmp</kbd></li>
- *       <li>right up against the option separated by an equals sign (<kbd>"="</kbd>), as in
- *       <kbd>--directory=/tmp</kbd>
+ *       <li>in the slot after the option, as in {@code --directory /tmp}</li>
+ *       <li>right up against the option separated by an equals sign ({@code "="}), as in
+ *       {@code --directory=/tmp}
  *     </ul>
  *   Specify multiple arguments for a long option in the same manner as for short options (see above).</li>
  *
- *   <li>You can use a single hyphen (<kbd>"-"</kbd>) instead of a double hyphen (<kbd>"--"</kbd>) for a long
+ *   <li>You can use a single hyphen ({@code "-"}) instead of a double hyphen ({@code "--"}) for a long
  *   option.</li>
  *
- *   <li>The option <kbd>-W</kbd> is reserved.  If you tell the parser to {@linkplain
+ *   <li>The option {@code -W} is reserved.  If you tell the parser to {@linkplain
  *   #recognizeAlternativeLongOptions(boolean) recognize alternative long options}, then it will treat, for example,
- *   <kbd>-W foo=bar</kbd> as the long option <kbd>foo</kbd> with argument <kbd>bar</kbd>, as though you had written
- *   <kbd>--foo=bar</kbd>.</li>
+ *   {@code -W foo=bar} as the long option {@code foo} with argument {@code bar}, as though you had written
+ *   {@code --foo=bar}.</li>
  *
- *   <li>You can specify <kbd>-W</kbd> as a valid short option, or use it as an abbreviation for a long option, but
+ *   <li>You can specify {@code -W} as a valid short option, or use it as an abbreviation for a long option, but
  *   {@linkplain #recognizeAlternativeLongOptions(boolean) recognizing alternative long options} will always supersede
  *   this behavior.</li>
  *
@@ -148,15 +147,15 @@ import static jdk.internal.joptsimple.ParserRules.*;
  *     parser.accepts( "2" );
  *     OptionSet options = parser.parse( "-a", "-2" );
  *   </code></pre>
- *   In this case, the option set contains <kbd>"a"</kbd> with argument <kbd>-2</kbd>, not both <kbd>"a"</kbd> and
- *   <kbd>"2"</kbd>. Swapping the elements in the <em>args</em> array gives the latter.</li>
+ *   In this case, the option set contains {@code "a"} with argument {@code -2}, not both {@code "a"} and
+ *   {@code "2"}. Swapping the elements in the <em>args</em> array gives the latter.</li>
  * </ul>
  *
  * <p>There are two ways to tell the parser what options to recognize:</p>
  *
  * <ol>
  *   <li>A "fluent interface"-style API for specifying options, available since version 2. Sentences in this fluent
- *   interface language begin with a call to {@link #accepts(String) accepts} or {@link #acceptsAll(Collection)
+ *   interface language begin with a call to {@link #accepts(String) accepts} or {@link #acceptsAll(List)
  *   acceptsAll} methods; calls on the ensuing chain of objects describe whether the options can take an argument,
  *   whether the argument is required or optional, to what type arguments of the options should be converted if any,
  *   etc. Since version 3, these calls return an instance of {@link OptionSpec}, which can subsequently be used to
@@ -169,28 +168,28 @@ import static jdk.internal.joptsimple.ParserRules.*;
  *     <ul>
  *       <li>Any letter or digit is treated as an option character.</li>
  *
- *       <li>An option character can be immediately followed by an asterisk (*) to indicate that the option is a
- *       "help" option.</li>
+ *       <li>An option character can be immediately followed by an asterisk ({@code *)} to indicate that
+ *       the option is a "help" option.</li>
  *
- *       <li>If an option character (with possible trailing asterisk) is followed by a single colon (<kbd>":"</kbd>),
+ *       <li>If an option character (with possible trailing asterisk) is followed by a single colon ({@code ":"}),
  *       then the option requires an argument.</li>
  *
- *       <li>If an option character (with possible trailing asterisk) is followed by two colons (<kbd>"::"</kbd>),
+ *       <li>If an option character (with possible trailing asterisk) is followed by two colons ({@code "::"}),
  *       then the option accepts an optional argument.</li>
  *
  *       <li>Otherwise, the option character accepts no argument.</li>
  *
- *       <li>If the option specification string begins with a plus sign (<kbd>"+"</kbd>), the parser will behave
+ *       <li>If the option specification string begins with a plus sign ({@code "+" }), the parser will behave
  *       "POSIX-ly correct".</li>
  *
- *       <li>If the option specification string contains the sequence <kbd>"W;"</kbd> (capital W followed by a
+ *       <li>If the option specification string contains the sequence {@code "W;"} (capital W followed by a
  *       semicolon), the parser will recognize the alternative form of long options.</li>
  *     </ul>
  *   </li>
  * </ol>
  *
- * <p>Each of the options in a list of options given to {@link #acceptsAll(Collection) acceptsAll} is treated as a
- * synonym of the others.  For example:
+ * <p>Each of the options in a list of options given to {@link #acceptsAll(List) acceptsAll} is treated as a
+ * synonym of the others.  For example:</p>
  *   <pre>
  *     <code>
  *     OptionParser parser = new OptionParser();
@@ -198,14 +197,14 @@ import static jdk.internal.joptsimple.ParserRules.*;
  *     OptionSet options = parser.parse( "-w" );
  *     </code>
  *   </pre>
- * In this case, <code>options.{@link OptionSet#has(String) has}</code> would answer {@code true} when given arguments
- * <kbd>"w"</kbd>, <kbd>"interactive"</kbd>, and <kbd>"confirmation"</kbd>. The {@link OptionSet} would give the same
+ * <p>In this case, <code>options.{@link OptionSet#has(String) has}</code> would answer {@code true} when given arguments
+ * {@code "w"}, {@code "interactive"}, and {@code "confirmation"}. The {@link OptionSet} would give the same
  * responses to these arguments for its other methods as well.</p>
  *
  * <p>By default, as with GNU {@code getopt()}, the parser allows intermixing of options and non-options. If, however,
  * the parser has been created to be "POSIX-ly correct", then the first argument that does not look lexically like an
  * option, and is not a required argument of a preceding option, signals the end of options. You can still bind
- * optional arguments to their options using the abutting (for short options) or <kbd>=</kbd> syntax.</p>
+ * optional arguments to their options using the abutting (for short options) or {@code =} syntax.</p>
  *
  * <p>Unlike GNU {@code getopt()}, this parser does not honor the environment variable {@code POSIXLY_CORRECT}.
  * "POSIX-ly correct" parsers are configured by either:</p>
@@ -214,16 +213,20 @@ import static jdk.internal.joptsimple.ParserRules.*;
  *   <li>using the method {@link #posixlyCorrect(boolean)}, or</li>
  *
  *   <li>using the {@linkplain #OptionParser(String) constructor} with an argument whose first character is a plus sign
- *   (<kbd>"+"</kbd>)</li>
+ *   ({@code "+"})</li>
  * </ol>
  *
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  * @see <a href="http://www.gnu.org/software/libc/manual">The GNU C Library</a>
  */
 public class OptionParser implements OptionDeclarer {
-    private final AbbreviationMap<AbstractOptionSpec<?>> recognizedOptions;
-    private final Map<Collection<String>, Set<OptionSpec<?>>> requiredIf;
-    private final Map<Collection<String>, Set<OptionSpec<?>>> requiredUnless;
+    private final OptionNameMap<AbstractOptionSpec<?>> recognizedOptions;
+    private final ArrayList<AbstractOptionSpec<?>> trainingOrder;
+    private final Map<List<String>, Set<OptionSpec<?>>> requiredIf;
+    private final Map<List<String>, Set<OptionSpec<?>>> requiredUnless;
+    private final Map<List<String>, Set<OptionSpec<?>>> availableIf;
+    private final Map<List<String>, Set<OptionSpec<?>>> availableUnless;
+
     private OptionParserState state;
     private boolean posixlyCorrect;
     private boolean allowsUnrecognizedOptions;
@@ -234,11 +237,28 @@ public class OptionParser implements OptionDeclarer {
      * behavior.
      */
     public OptionParser() {
-        recognizedOptions = new AbbreviationMap<AbstractOptionSpec<?>>();
-        requiredIf = new HashMap<Collection<String>, Set<OptionSpec<?>>>();
-        requiredUnless = new HashMap<Collection<String>, Set<OptionSpec<?>>>();
+        this(true);
+    }
+
+    /**
+     * Creates an option parser that initially recognizes no options, and does not exhibit "POSIX-ly correct"
+     * behavior.
+     *
+     * @param allowAbbreviations whether unambiguous abbreviations of long options should be recognized
+     * by the parser
+     */
+    public OptionParser( boolean allowAbbreviations ) {
+        trainingOrder = new ArrayList<>();
+        requiredIf = new HashMap<>();
+        requiredUnless = new HashMap<>();
+        availableIf = new HashMap<>();
+        availableUnless = new HashMap<>();
         state = moreOptions( false );
 
+        recognizedOptions = allowAbbreviations
+            ? new AbbreviationMap<AbstractOptionSpec<?>>()
+            : new SimpleOptionNameMap<AbstractOptionSpec<?>>();
+
         recognize( new NonOptionArgumentSpec<String>() );
     }
 
@@ -266,11 +286,11 @@ public class OptionParser implements OptionDeclarer {
         return acceptsAll( singletonList( option ), description );
     }
 
-    public OptionSpecBuilder acceptsAll( Collection<String> options ) {
+    public OptionSpecBuilder acceptsAll( List<String> options ) {
         return acceptsAll( options, "" );
     }
 
-    public OptionSpecBuilder acceptsAll( Collection<String> options, String description ) {
+    public OptionSpecBuilder acceptsAll( List<String> options, String description ) {
         if ( options.isEmpty() )
             throw new IllegalArgumentException( "need at least one option" );
 
@@ -280,7 +300,7 @@ public class OptionParser implements OptionDeclarer {
     }
 
     public NonOptionArgumentSpec<String> nonOptions() {
-        NonOptionArgumentSpec<String> spec = new NonOptionArgumentSpec<String>();
+        NonOptionArgumentSpec<String> spec = new NonOptionArgumentSpec<>();
 
         recognize( spec );
 
@@ -288,7 +308,7 @@ public class OptionParser implements OptionDeclarer {
     }
 
     public NonOptionArgumentSpec<String> nonOptions( String description ) {
-        NonOptionArgumentSpec<String> spec = new NonOptionArgumentSpec<String>( description );
+        NonOptionArgumentSpec<String> spec = new NonOptionArgumentSpec<>( description );
 
         recognize( spec );
 
@@ -321,6 +341,7 @@ public class OptionParser implements OptionDeclarer {
 
     void recognize( AbstractOptionSpec<?> spec ) {
         recognizedOptions.putAll( spec.options(), spec );
+        trainingOrder.add( spec );
     }
 
     /**
@@ -348,7 +369,7 @@ public class OptionParser implements OptionDeclarer {
      * @see #printHelpOn(OutputStream)
      */
     public void printHelpOn( Writer sink ) throws IOException {
-        sink.write( helpFormatter.format( recognizedOptions.toJavaUtilMap() ) );
+        sink.write( helpFormatter.format( _recognizedOptions() ) );
         sink.flush();
     }
 
@@ -366,15 +387,29 @@ public class OptionParser implements OptionDeclarer {
     }
 
     /**
-     * Retrieves all the options which have been configured for the parser.
+     * Retrieves all options-spec pairings which have been configured for the parser in the same order as declared
+     * during training. Option flags for specs are alphabetized by {@link OptionSpec#options()}; only the order of the
+     * specs is preserved.
      *
-     * @return a {@link Map} containing all the configured options and their corresponding {@link OptionSpec}
+     * (Note: prior to 4.7 the order was alphabetical across all options regardless of spec.)
+     *
+     * @return a map containing all the configured options and their corresponding {@link OptionSpec}
+     * @since 4.6
      */
     public Map<String, OptionSpec<?>> recognizedOptions() {
-        return new HashMap<String, OptionSpec<?>>( recognizedOptions.toJavaUtilMap() );
+        return new LinkedHashMap<String, OptionSpec<?>>( _recognizedOptions() );
     }
 
-    /**
+    private Map<String, AbstractOptionSpec<?>> _recognizedOptions() {
+        Map<String, AbstractOptionSpec<?>> options = new LinkedHashMap<>();
+        for ( AbstractOptionSpec<?> spec : trainingOrder ) {
+            for ( String option : spec.options() )
+                options.put( option, spec );
+        }
+        return options;
+    }
+
+   /**
      * Parses the given command line arguments according to the option specifications given to the parser.
      *
      * @param arguments arguments to parse
@@ -393,45 +428,89 @@ public class OptionParser implements OptionDeclarer {
         reset();
 
         ensureRequiredOptions( detected );
+        ensureAllowedOptions( detected );
 
         return detected;
     }
 
+    /**
+     * Mandates mutual exclusiveness for the options built by the specified builders.
+     *
+     * @param specs descriptors for options that should be mutually exclusive on a command line.
+     * @throws NullPointerException if {@code specs} is {@code null}
+     */
+    public void mutuallyExclusive( OptionSpecBuilder... specs ) {
+        for ( int i = 0; i < specs.length; i++ ) {
+            for ( int j = 0; j < specs.length; j++ ) {
+                if ( i != j )
+                    specs[i].availableUnless( specs[j] );
+            }
+        }
+    }
+
     private void ensureRequiredOptions( OptionSet options ) {
-        Collection<String> missingRequiredOptions = missingRequiredOptions( options );
+        List<AbstractOptionSpec<?>> missingRequiredOptions = missingRequiredOptions(options);
         boolean helpOptionPresent = isHelpOptionPresent( options );
 
         if ( !missingRequiredOptions.isEmpty() && !helpOptionPresent )
-            throw new MissingRequiredOptionException( missingRequiredOptions );
+            throw new MissingRequiredOptionsException( missingRequiredOptions );
     }
 
-    private Collection<String> missingRequiredOptions( OptionSet options ) {
-        Collection<String> missingRequiredOptions = new HashSet<String>();
+    private void ensureAllowedOptions( OptionSet options ) {
+        List<AbstractOptionSpec<?>> forbiddenOptions = unavailableOptions( options );
+        boolean helpOptionPresent = isHelpOptionPresent( options );
+
+        if ( !forbiddenOptions.isEmpty() && !helpOptionPresent )
+            throw new UnavailableOptionException( forbiddenOptions );
+    }
+
+    private List<AbstractOptionSpec<?>> missingRequiredOptions( OptionSet options ) {
+        List<AbstractOptionSpec<?>> missingRequiredOptions = new ArrayList<>();
 
         for ( AbstractOptionSpec<?> each : recognizedOptions.toJavaUtilMap().values() ) {
             if ( each.isRequired() && !options.has( each ) )
-                missingRequiredOptions.addAll( each.options() );
+                missingRequiredOptions.add(each);
         }
 
-        for ( Map.Entry<Collection<String>, Set<OptionSpec<?>>> eachEntry : requiredIf.entrySet() ) {
-            AbstractOptionSpec<?> required = specFor( eachEntry.getKey().iterator().next() );
+        for ( Map.Entry<List<String>, Set<OptionSpec<?>>> each : requiredIf.entrySet() ) {
+            AbstractOptionSpec<?> required = specFor( each.getKey().iterator().next() );
 
-            if ( optionsHasAnyOf( options, eachEntry.getValue() ) && !options.has( required ) ) {
-                missingRequiredOptions.addAll( required.options() );
-            }
+            if ( optionsHasAnyOf( options, each.getValue() ) && !options.has( required ) )
+                missingRequiredOptions.add( required );
         }
 
-        for ( Map.Entry<Collection<String>, Set<OptionSpec<?>>> eachEntry : requiredUnless.entrySet() ) {
-            AbstractOptionSpec<?> required = specFor( eachEntry.getKey().iterator().next() );
+        for ( Map.Entry<List<String>, Set<OptionSpec<?>>> each : requiredUnless.entrySet() ) {
+            AbstractOptionSpec<?> required = specFor(each.getKey().iterator().next());
 
-            if ( !optionsHasAnyOf( options, eachEntry.getValue() ) && !options.has( required ) ) {
-                missingRequiredOptions.addAll( required.options() );
-            }
+            if ( !optionsHasAnyOf( options, each.getValue() ) && !options.has( required ) )
+                missingRequiredOptions.add( required );
         }
 
         return missingRequiredOptions;
     }
 
+    private List<AbstractOptionSpec<?>> unavailableOptions(OptionSet options) {
+        List<AbstractOptionSpec<?>> unavailableOptions = new ArrayList<>();
+
+        for ( Map.Entry<List<String>, Set<OptionSpec<?>>> eachEntry : availableIf.entrySet() ) {
+            AbstractOptionSpec<?> forbidden = specFor( eachEntry.getKey().iterator().next() );
+
+            if ( !optionsHasAnyOf( options, eachEntry.getValue() ) && options.has( forbidden ) ) {
+                unavailableOptions.add(forbidden);
+            }
+        }
+
+        for ( Map.Entry<List<String>, Set<OptionSpec<?>>> eachEntry : availableUnless.entrySet() ) {
+            AbstractOptionSpec<?> forbidden = specFor( eachEntry.getKey().iterator().next() );
+
+            if ( optionsHasAnyOf( options, eachEntry.getValue() ) && options.has( forbidden ) ) {
+                unavailableOptions.add(forbidden);
+            }
+        }
+
+        return unavailableOptions;
+    }
+
     private boolean optionsHasAnyOf( OptionSet options, Collection<OptionSpec<?>> specs ) {
         for ( OptionSpec<?> each : specs ) {
             if ( options.has( each ) )
@@ -443,12 +522,14 @@ public class OptionParser implements OptionDeclarer {
 
     private boolean isHelpOptionPresent( OptionSet options ) {
         boolean helpOptionPresent = false;
+
         for ( AbstractOptionSpec<?> each : recognizedOptions.toJavaUtilMap().values() ) {
             if ( each.isForHelp() && options.has( each ) ) {
                 helpOptionPresent = true;
                 break;
             }
         }
+
         return helpOptionPresent;
     }
 
@@ -505,24 +586,40 @@ public class OptionParser implements OptionDeclarer {
         return recognizedOptions.contains( option );
     }
 
-    void requiredIf( Collection<String> precedentSynonyms, String required ) {
+    void requiredIf( List<String> precedentSynonyms, String required ) {
         requiredIf( precedentSynonyms, specFor( required ) );
     }
 
-    void requiredIf( Collection<String> precedentSynonyms, OptionSpec<?> required ) {
-        putRequiredOption( precedentSynonyms, required, requiredIf );
+    void requiredIf( List<String> precedentSynonyms, OptionSpec<?> required ) {
+        putDependentOption( precedentSynonyms, required, requiredIf );
     }
 
-    void requiredUnless( Collection<String> precedentSynonyms, String required ) {
+    void requiredUnless( List<String> precedentSynonyms, String required ) {
         requiredUnless( precedentSynonyms, specFor( required ) );
     }
 
-    void requiredUnless( Collection<String> precedentSynonyms, OptionSpec<?> required ) {
-        putRequiredOption( precedentSynonyms, required, requiredUnless );
+    void requiredUnless( List<String> precedentSynonyms, OptionSpec<?> required ) {
+        putDependentOption( precedentSynonyms, required, requiredUnless );
     }
 
-    private void putRequiredOption( Collection<String> precedentSynonyms, OptionSpec<?> required,
-        Map<Collection<String>, Set<OptionSpec<?>>> target ) {
+    void availableIf( List<String> precedentSynonyms, String available ) {
+        availableIf( precedentSynonyms, specFor( available ) );
+    }
+
+    void availableIf( List<String> precedentSynonyms, OptionSpec<?> available) {
+        putDependentOption( precedentSynonyms, available, availableIf );
+    }
+
+    void availableUnless( List<String> precedentSynonyms, String available ) {
+        availableUnless( precedentSynonyms, specFor( available ) );
+    }
+
+    void availableUnless( List<String> precedentSynonyms, OptionSpec<?> available ) {
+        putDependentOption( precedentSynonyms, available, availableUnless );
+    }
+
+    private void putDependentOption( List<String> precedentSynonyms, OptionSpec<?> required,
+        Map<List<String>, Set<OptionSpec<?>>> target ) {
 
         for ( String each : precedentSynonyms ) {
             AbstractOptionSpec<?> spec = specFor( each );
@@ -532,7 +629,7 @@ public class OptionParser implements OptionDeclarer {
 
         Set<OptionSpec<?>> associated = target.get( precedentSynonyms );
         if ( associated == null ) {
-            associated = new HashSet<OptionSpec<?>>();
+            associated = new HashSet<>();
             target.put( precedentSynonyms, associated );
         }
 
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java
index 7fdbcbf3618..d2affe8e48d 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java
index 71061156fa0..ef781f2d223 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,11 +55,14 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
 
 import static java.util.Collections.*;
-
-import static jdk.internal.joptsimple.internal.Objects.*;
+import static java.util.Objects.*;
 
 /**
  * Representation of a group of detected command line options, their arguments, and non-option arguments.
@@ -77,9 +80,9 @@ public class OptionSet {
      * Package-private because clients don't create these.
      */
     OptionSet( Map<String, AbstractOptionSpec<?>> recognizedSpecs ) {
-        detectedSpecs = new ArrayList<OptionSpec<?>>();
-        detectedOptions = new HashMap<String, AbstractOptionSpec<?>>();
-        optionsToArguments = new IdentityHashMap<AbstractOptionSpec<?>, List<String>>();
+        detectedSpecs = new ArrayList<>();
+        detectedOptions = new HashMap<>();
+        optionsToArguments = new IdentityHashMap<>();
         defaultValues = defaultValues( recognizedSpecs );
         this.recognizedSpecs = recognizedSpecs;
     }
@@ -90,7 +93,7 @@ public class OptionSet {
      * @return {@code true} if any options were detected
      */
     public boolean hasOptions() {
-        return !detectedOptions.isEmpty();
+        return !( detectedOptions.size() == 1 && detectedOptions.values().iterator().next().representsNonOptions() );
     }
 
     /**
@@ -148,7 +151,7 @@ public class OptionSet {
      * @see #hasArgument(String)
      */
     public boolean hasArgument( OptionSpec<?> option ) {
-        ensureNotNull( option );
+        requireNonNull( option );
 
         List<String> values = optionsToArguments.get( option );
         return values != null && !values.isEmpty();
@@ -169,7 +172,7 @@ public class OptionSet {
      * @throws OptionException if more than one argument was detected for the option
      */
     public Object valueOf( String option ) {
-        ensureNotNull( option );
+        requireNonNull( option );
 
         AbstractOptionSpec<?> spec = detectedOptions.get( option );
         if ( spec == null ) {
@@ -194,7 +197,7 @@ public class OptionSet {
      * @throws ClassCastException if the arguments of this option are not of the expected type
      */
     public <V> V valueOf( OptionSpec<V> option ) {
-        ensureNotNull( option );
+        requireNonNull( option );
 
         List<V> values = valuesOf( option );
         switch ( values.size() ) {
@@ -203,7 +206,7 @@ public class OptionSet {
             case 1:
                 return values.get( 0 );
             default:
-                throw new MultipleArgumentsForOptionException( option.options() );
+                throw new MultipleArgumentsForOptionException( option );
         }
     }
 
@@ -217,7 +220,7 @@ public class OptionSet {
      * @throws NullPointerException if {@code option} is {@code null}
      */
     public List<?> valuesOf( String option ) {
-        ensureNotNull( option );
+        requireNonNull( option );
 
         AbstractOptionSpec<?> spec = detectedOptions.get( option );
         return spec == null ? defaultValuesFor( option ) : valuesOf( spec );
@@ -238,14 +241,14 @@ public class OptionSet {
      * example, if the type does not implement a correct conversion constructor or method
      */
     public <V> List<V> valuesOf( OptionSpec<V> option ) {
-        ensureNotNull( option );
+        requireNonNull( option );
 
         List<String> values = optionsToArguments.get( option );
         if ( values == null || values.isEmpty() )
             return defaultValueFor( option );
 
         AbstractOptionSpec<V> spec = (AbstractOptionSpec<V>) option;
-        List<V> convertedValues = new ArrayList<V>();
+        List<V> convertedValues = new ArrayList<>();
         for ( String each : values )
             convertedValues.add( spec.convert( each ) );
 
@@ -260,7 +263,7 @@ public class OptionSet {
      */
     public List<OptionSpec<?>> specs() {
         List<OptionSpec<?>> specs = detectedSpecs;
-        specs.remove( detectedOptions.get( NonOptionArgumentSpec.NAME ) );
+        specs.removeAll( singletonList( detectedOptions.get( NonOptionArgumentSpec.NAME ) ) );
 
         return unmodifiableList( specs );
     }
@@ -271,10 +274,13 @@ public class OptionSet {
      * @return the declared options as a map
      */
     public Map<OptionSpec<?>, List<?>> asMap() {
-        Map<OptionSpec<?>, List<?>> map = new HashMap<OptionSpec<?>, List<?>>();
-        for ( AbstractOptionSpec<?> spec : recognizedSpecs.values() )
+        Map<OptionSpec<?>, List<?>> map = new HashMap<>();
+
+        for ( AbstractOptionSpec<?> spec : recognizedSpecs.values() ) {
             if ( !spec.representsNonOptions() )
                 map.put( spec, valuesOf( spec ) );
+        }
+
         return unmodifiableMap( map );
     }
 
@@ -282,7 +288,8 @@ public class OptionSet {
      * @return the detected non-option arguments
      */
     public List<?> nonOptionArguments() {
-        return unmodifiableList( valuesOf( detectedOptions.get( NonOptionArgumentSpec.NAME ) ) );
+        AbstractOptionSpec<?> spec = detectedOptions.get( NonOptionArgumentSpec.NAME );
+        return valuesOf( spec );
     }
 
     void add( AbstractOptionSpec<?> spec ) {
@@ -298,7 +305,7 @@ public class OptionSet {
         List<String> optionArguments = optionsToArguments.get( spec );
 
         if ( optionArguments == null ) {
-            optionArguments = new ArrayList<String>();
+            optionArguments = new ArrayList<>();
             optionsToArguments.put( spec, optionArguments );
         }
 
@@ -315,25 +322,22 @@ public class OptionSet {
             return false;
 
         OptionSet other = (OptionSet) that;
-        Map<AbstractOptionSpec<?>, List<String>> thisOptionsToArguments =
-            new HashMap<AbstractOptionSpec<?>, List<String>>( optionsToArguments );
-        Map<AbstractOptionSpec<?>, List<String>> otherOptionsToArguments =
-            new HashMap<AbstractOptionSpec<?>, List<String>>( other.optionsToArguments );
+        Map<AbstractOptionSpec<?>, List<String>> thisOptionsToArguments = new HashMap<>( optionsToArguments );
+        Map<AbstractOptionSpec<?>, List<String>> otherOptionsToArguments = new HashMap<>( other.optionsToArguments );
         return detectedOptions.equals( other.detectedOptions )
             && thisOptionsToArguments.equals( otherOptionsToArguments );
     }
 
     @Override
     public int hashCode() {
-        Map<AbstractOptionSpec<?>, List<String>> thisOptionsToArguments =
-            new HashMap<AbstractOptionSpec<?>, List<String>>( optionsToArguments );
+        Map<AbstractOptionSpec<?>, List<String>> thisOptionsToArguments = new HashMap<>( optionsToArguments );
         return detectedOptions.hashCode() ^ thisOptionsToArguments.hashCode();
     }
 
     @SuppressWarnings( "unchecked" )
     private <V> List<V> defaultValuesFor( String option ) {
         if ( defaultValues.containsKey( option ) )
-            return (List<V>) defaultValues.get( option );
+            return unmodifiableList( (List<V>) defaultValues.get( option ) );
 
         return emptyList();
     }
@@ -343,7 +347,7 @@ public class OptionSet {
     }
 
     private static Map<String, List<?>> defaultValues( Map<String, AbstractOptionSpec<?>> recognizedSpecs ) {
-        Map<String, List<?>> defaults = new HashMap<String, List<?>>();
+        Map<String, List<?>> defaults = new HashMap<>();
         for ( Map.Entry<String, AbstractOptionSpec<?>> each : recognizedSpecs.entrySet() )
             defaults.put( each.getKey(), each.getValue().defaultValues() );
         return defaults;
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java
index 666230b05d4..030e6f7a5a0 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,6 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -116,7 +115,7 @@ public interface OptionSpec<V> {
     /**
      * @return the string representations of this option
      */
-    Collection<String> options();
+    List<String> options();
 
     /**
      * Tells whether this option is designated as a "help" option. The presence of a "help" option on a command line
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java
index 4f171091ec0..d7d02f00a87 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -56,7 +56,6 @@
 package jdk.internal.joptsimple;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -90,7 +89,7 @@ import java.util.List;
 public class OptionSpecBuilder extends NoArgumentOptionSpec {
     private final OptionParser parser;
 
-    OptionSpecBuilder( OptionParser parser, Collection<String> options, String description ) {
+    OptionSpecBuilder( OptionParser parser, List<String> options, String description ) {
         super( options, description );
 
         this.parser = parser;
@@ -107,8 +106,7 @@ public class OptionSpecBuilder extends NoArgumentOptionSpec {
      * @return a specification for the option
      */
     public ArgumentAcceptingOptionSpec<String> withRequiredArg() {
-        ArgumentAcceptingOptionSpec<String> newSpec =
-            new RequiredArgumentOptionSpec<String>( options(), description() );
+        ArgumentAcceptingOptionSpec<String> newSpec = new RequiredArgumentOptionSpec<>( options(), description() );
         parser.recognize( newSpec );
 
         return newSpec;
@@ -121,7 +119,7 @@ public class OptionSpecBuilder extends NoArgumentOptionSpec {
      */
     public ArgumentAcceptingOptionSpec<String> withOptionalArg() {
         ArgumentAcceptingOptionSpec<String> newSpec =
-            new OptionalArgumentOptionSpec<String>( options(), description() );
+            new OptionalArgumentOptionSpec<>( options(), description() );
         parser.recognize( newSpec );
 
         return newSpec;
@@ -141,9 +139,8 @@ public class OptionSpecBuilder extends NoArgumentOptionSpec {
      */
     public OptionSpecBuilder requiredIf( String dependent, String... otherDependents ) {
         List<String> dependents = validatedDependents( dependent, otherDependents );
-        for ( String each : dependents ) {
+        for ( String each : dependents )
             parser.requiredIf( options(), each );
-        }
 
         return this;
     }
@@ -210,8 +207,91 @@ public class OptionSpecBuilder extends NoArgumentOptionSpec {
         return this;
     }
 
+    /**
+     * <p>Informs an option parser that this builder's option is allowed if the given option is present on the command
+     * line.</p>
+     *
+     * <p>For a given option, you <em>should not</em> mix this with {@link #availableUnless(String, String...)
+     * availableUnless} to avoid conflicts.</p>
+     *
+     * @param dependent an option whose presence on a command line makes this builder's option allowed
+     * @param otherDependents other options whose presence on a command line makes this builder's option allowed
+     * @return self, so that the caller can add clauses to the fluent interface sentence
+     * @throws OptionException if any of the dependent options haven't been configured in the parser yet
+     */
+    public OptionSpecBuilder availableIf( String dependent, String... otherDependents ) {
+        List<String> dependents = validatedDependents( dependent, otherDependents );
+        for ( String each : dependents )
+            parser.availableIf( options(), each );
+
+        return this;
+    }
+
+    /**
+     * <p>Informs an option parser that this builder's option is allowed if the given option is present on the command
+     * line.</p>
+     *
+     * <p>For a given option, you <em>should not</em> mix this with {@link #availableUnless(OptionSpec, OptionSpec[])
+     * requiredUnless} to avoid conflicts.</p>
+     *
+     * <p>This method recognizes only instances of options returned from the fluent interface methods.</p>
+     *
+     * @param dependent the option whose presence on a command line makes this builder's option allowed
+     * @param otherDependents other options whose presence on a command line makes this builder's option allowed
+     * @return self, so that the caller can add clauses to the fluent interface sentence
+     */
+    public OptionSpecBuilder availableIf( OptionSpec<?> dependent, OptionSpec<?>... otherDependents ) {
+        parser.availableIf( options(), dependent );
+
+        for ( OptionSpec<?> each : otherDependents )
+            parser.availableIf( options(), each );
+
+        return this;
+    }
+
+    /**
+     * <p>Informs an option parser that this builder's option is allowed if the given option is absent on the command
+     * line.</p>
+     *
+     * <p>For a given option, you <em>should not</em> mix this with {@link #availableIf(OptionSpec, OptionSpec[])
+     * requiredIf} to avoid conflicts.</p>
+     *
+     * @param dependent an option whose absence on a command line makes this builder's option allowed
+     * @param otherDependents other options whose absence on a command line makes this builder's option allowed
+     * @return self, so that the caller can add clauses to the fluent interface sentence
+     * @throws OptionException if any of the dependent options haven't been configured in the parser yet
+     */
+    public OptionSpecBuilder availableUnless( String dependent, String... otherDependents ) {
+        List<String> dependents = validatedDependents( dependent, otherDependents );
+        for ( String each : dependents )
+            parser.availableUnless( options(), each );
+
+        return this;
+    }
+
+    /**
+     * <p>Informs an option parser that this builder's option is allowed if the given option is absent on the command
+     * line.</p>
+     *
+     * <p>For a given option, you <em>should not</em> mix this with {@link #availableIf(OptionSpec, OptionSpec[])
+     * requiredIf} to avoid conflicts.</p>
+     *
+     * <p>This method recognizes only instances of options returned from the fluent interface methods.</p>
+     *
+     * @param dependent the option whose absence on a command line makes this builder's option allowed
+     * @param otherDependents other options whose absence on a command line makes this builder's option allowed
+     * @return self, so that the caller can add clauses to the fluent interface sentence
+     */
+    public OptionSpecBuilder availableUnless( OptionSpec<?> dependent, OptionSpec<?>... otherDependents ) {
+        parser.availableUnless( options(), dependent );
+        for ( OptionSpec<?> each : otherDependents )
+            parser.availableUnless(options(), each);
+
+        return this;
+    }
+
     private List<String> validatedDependents( String dependent, String... otherDependents ) {
-        List<String> dependents = new ArrayList<String>();
+        List<String> dependents = new ArrayList<>();
         dependents.add( dependent );
         Collections.addAll( dependents, otherDependents );
 
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java
index d878daba6eb..9b45354f621 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java
index 894e00e3a29..7e20779b962 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import java.util.List;
 
 /**
  * Specification of an option that accepts an optional argument.
@@ -68,7 +68,7 @@ class OptionalArgumentOptionSpec<V> extends ArgumentAcceptingOptionSpec<V> {
         super( option, false );
     }
 
-    OptionalArgumentOptionSpec( Collection<String> options, String description ) {
+    OptionalArgumentOptionSpec( List<String> options, String description ) {
         super( options, false, description );
     }
 
@@ -77,7 +77,7 @@ class OptionalArgumentOptionSpec<V> extends ArgumentAcceptingOptionSpec<V> {
         if ( arguments.hasMore() ) {
             String nextArgument = arguments.peek();
 
-            if ( !parser.looksLikeAnOption( nextArgument ) )
+            if ( !parser.looksLikeAnOption( nextArgument ) && canConvertArgument( nextArgument ) )
                 handleOptionArgument( parser, detectedOptions, arguments );
             else if ( isArgumentOfNumberType() && canConvertArgument( nextArgument ) )
                 addArguments( detectedOptions, arguments.next() );
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java
index e981d878adc..dae98e3b008 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import java.util.List;
 
 import static java.lang.Character.*;
 
@@ -97,7 +97,7 @@ final class ParserRules {
             ensureLegalOptionCharacter( option.charAt( i ) );
     }
 
-    static void ensureLegalOptions( Collection<String> options ) {
+    static void ensureLegalOptions( List<String> options ) {
         for ( String each : options )
             ensureLegalOption( each );
     }
@@ -108,7 +108,7 @@ final class ParserRules {
     }
 
     private static boolean isAllowedPunctuation( char option ) {
-        String allowedPunctuation = "?." + HYPHEN_CHAR;
+        String allowedPunctuation = "?._" + HYPHEN_CHAR;
         return allowedPunctuation.indexOf( option ) != -1;
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README
index ad0d0f64db5..fccb4f62f52 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README
@@ -1,3 +1,3 @@
-JOpt Simple, Version 4.6
+JOpt Simple, Version 5.0.4
 https://pholser.github.io/jopt-simple/
 
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java
index 9972f8d1cff..26608a827c7 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import java.util.List;
 
 /**
  * Specification of an option that accepts a required argument.
@@ -68,14 +68,14 @@ class RequiredArgumentOptionSpec<V> extends ArgumentAcceptingOptionSpec<V> {
         super( option, true );
     }
 
-    RequiredArgumentOptionSpec( Collection<String> options, String description ) {
+    RequiredArgumentOptionSpec( List<String> options, String description ) {
         super( options, true, description );
     }
 
     @Override
     protected void detectOptionArgument( OptionParser parser, ArgumentList arguments, OptionSet detectedOptions ) {
         if ( !arguments.hasMore() )
-            throw new OptionMissingRequiredArgumentException( options() );
+            throw new OptionMissingRequiredArgumentException( this );
 
         addArguments( detectedOptions, arguments.next() );
     }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnavailableOptionException.java
similarity index 74%
rename from src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java
rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnavailableOptionException.java
index c5775fb3458..d4d0655ebe6 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnavailableOptionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,30 +55,21 @@
 
 package jdk.internal.joptsimple;
 
-import static java.util.Collections.*;
+import java.util.List;
 
 /**
- * Thrown when the option parser detects an unacceptable number of {@code linkplain NonOptionArgumentSpec
- * non-option arguments}.
- *
- * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
+ * Thrown when options marked as allowed are specified on the command line, but the options they depend upon are
+ * present/not present.
  */
-class UnacceptableNumberOfNonOptionsException extends OptionException {
+class UnavailableOptionException extends OptionException {
     private static final long serialVersionUID = -1L;
-    private final int minimum;
-    private final int maximum;
-    private final int actual;
 
-    UnacceptableNumberOfNonOptionsException( int minimum, int maximum, int actual ) {
-        super( singletonList( NonOptionArgumentSpec.NAME ) );
-
-        this.minimum = minimum;
-        this.maximum = maximum;
-        this.actual = actual;
+    UnavailableOptionException( List<? extends OptionSpec<?>> forbiddenOptions ) {
+        super( forbiddenOptions );
     }
 
     @Override
-    public String getMessage() {
-        return String.format( "actual = %d, minimum = %d, maximum = %d", actual, minimum, maximum );
+    Object[] messageArguments() {
+        return new Object[] { multipleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java
index 0783b7a684b..6f66ee8bccb 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@
 
 package jdk.internal.joptsimple;
 
-import java.util.Collection;
+import java.util.List;
 
 import static java.util.Collections.*;
 
@@ -71,12 +71,12 @@ class UnconfiguredOptionException extends OptionException {
         this( singletonList( option ) );
     }
 
-    UnconfiguredOptionException( Collection<String> options ) {
+    UnconfiguredOptionException( List<String> options ) {
         super( options );
     }
 
     @Override
-    public String getMessage() {
-        return "Option " + multipleOptionMessage() + " has not been configured on this parser";
+    Object[] messageArguments() {
+        return new Object[] { multipleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java
index b9ec16abb0a..cbf93943aa4 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -70,7 +70,7 @@ class UnrecognizedOptionException extends OptionException {
     }
 
     @Override
-    public String getMessage() {
-        return singleOptionMessage() + " is not a recognized option";
+    Object[] messageArguments() {
+        return new Object[] { singleOptionString() };
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java
index 3ea4938d21c..767b994fd8e 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java
index db08b2550d1..2a761262c27 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -76,7 +76,7 @@ public interface ValueConverter<V> {
      *
      * @return the target class for conversion
      */
-    Class<V> valueType();
+    Class<? extends V> valueType();
 
     /**
      * Gives a string that describes the pattern of the values this converter expects, if any.  For example, a date
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java
index 2646b7372b7..8df4556b02e 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -84,37 +84,41 @@ import java.util.TreeMap;
  *
  * @param <V> a constraint on the types of the values in the map
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
- * @see <a href="http://www.perldoc.com/perl5.8.0/lib/Text/Abbrev.html">Perl's Text::Abbrev module</a>
+ * @see <a href="http://perldoc.perl.org/Text/Abbrev.html">Perl's Text::Abbrev module</a>
+ * @see <a href="https://en.wikipedia.org/wiki/Radix_tree">Radix tree</a>
  */
-public class AbbreviationMap<V> {
+public class AbbreviationMap<V> implements OptionNameMap<V> {
+    private final Map<Character, AbbreviationMap<V>> children = new TreeMap<>();
+
     private String key;
     private V value;
-    private final Map<Character, AbbreviationMap<V>> children = new TreeMap<Character, AbbreviationMap<V>>();
     private int keysBeyond;
 
     /**
      * <p>Tells whether the given key is in the map, or whether the given key is a unique
      * abbreviation of a key that is in the map.</p>
      *
-     * @param aKey key to look up
+     * @param key key to look up
      * @return {@code true} if {@code key} is present in the map
      * @throws NullPointerException if {@code key} is {@code null}
      */
-    public boolean contains( String aKey ) {
-        return get( aKey ) != null;
+    @Override
+    public boolean contains(String key) {
+        return get(key) != null;
     }
 
     /**
      * <p>Answers the value associated with the given key.  The key can be a unique
      * abbreviation of a key that is in the map. </p>
      *
-     * @param aKey key to look up
+     * @param key key to look up
      * @return the value associated with {@code aKey}; or {@code null} if there is no
      * such value or {@code aKey} is not a unique abbreviation of a key in the map
      * @throws NullPointerException if {@code aKey} is {@code null}
      */
-    public V get( String aKey ) {
-        char[] chars = charsOf( aKey );
+    @Override
+    public V get( String key ) {
+        char[] chars = charsOf( key );
 
         AbbreviationMap<V> child = this;
         for ( char each : chars ) {
@@ -130,18 +134,19 @@ public class AbbreviationMap<V> {
      * <p>Associates a given value with a given key.  If there was a previous
      * association, the old value is replaced with the new one.</p>
      *
-     * @param aKey key to create in the map
+     * @param key key to create in the map
      * @param newValue value to associate with the key
      * @throws NullPointerException if {@code aKey} or {@code newValue} is {@code null}
      * @throws IllegalArgumentException if {@code aKey} is a zero-length string
      */
-    public void put( String aKey, V newValue ) {
+    @Override
+    public void put( String key, V newValue ) {
         if ( newValue == null )
             throw new NullPointerException();
-        if ( aKey.length() == 0 )
+        if ( key.length() == 0 )
             throw new IllegalArgumentException();
 
-        char[] chars = charsOf( aKey );
+        char[] chars = charsOf(key);
         add( chars, newValue, 0, chars.length );
     }
 
@@ -154,6 +159,7 @@ public class AbbreviationMap<V> {
      * @throws NullPointerException if {@code keys} or {@code newValue} is {@code null}
      * @throws IllegalArgumentException if any of {@code keys} is a zero-length string
      */
+    @Override
     public void putAll( Iterable<String> keys, V newValue ) {
         for ( String each : keys )
             put( each, newValue );
@@ -170,7 +176,7 @@ public class AbbreviationMap<V> {
         char nextChar = chars[ offset ];
         AbbreviationMap<V> child = children.get( nextChar );
         if ( child == null ) {
-            child = new AbbreviationMap<V>();
+            child = new AbbreviationMap<>();
             children.put( nextChar, child );
         }
 
@@ -188,15 +194,16 @@ public class AbbreviationMap<V> {
     /**
      * <p>If the map contains the given key, dissociates the key from its value.</p>
      *
-     * @param aKey key to remove
+     * @param key key to remove
      * @throws NullPointerException if {@code aKey} is {@code null}
      * @throws IllegalArgumentException if {@code aKey} is a zero-length string
      */
-    public void remove( String aKey ) {
-        if ( aKey.length() == 0 )
+    @Override
+    public void remove( String key ) {
+        if ( key.length() == 0 )
             throw new IllegalArgumentException();
 
-        char[] keyChars = charsOf( aKey );
+        char[] keyChars = charsOf(key);
         remove( keyChars, 0, keyChars.length );
     }
 
@@ -242,8 +249,9 @@ public class AbbreviationMap<V> {
      *
      * @return a Java map corresponding to this abbreviation map
      */
+    @Override
     public Map<String, V> toJavaUtilMap() {
-        Map<String, V> mappings = new TreeMap<String, V>();
+        Map<String, V> mappings = new TreeMap<>();
         addToMappings( mappings );
         return mappings;
     }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java
index f75025ccd19..e5e47469789 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -62,7 +62,7 @@ import java.util.Map;
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
  */
 public final class Classes {
-    private static final Map<Class<?>, Class<?>> WRAPPERS = new HashMap<Class<?>, Class<?>>( 13 );
+    private static final Map<Class<?>, Class<?>> WRAPPERS = new HashMap<>( 13 );
 
     static {
         WRAPPERS.put( boolean.class, Boolean.class );
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java
index a3859f7d1cf..283f102e0d4 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -58,7 +58,6 @@ package jdk.internal.joptsimple.internal;
 import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import static java.text.BreakIterator.*;
 
@@ -82,7 +81,7 @@ class Columns {
         List<String> options = piecesOf( row.option, optionWidth );
         List<String> descriptions = piecesOf( row.description, descriptionWidth );
 
-        List<Row> rows = new ArrayList<Row>();
+        List<Row> rows = new ArrayList<>();
         for ( int i = 0; i < Math.max( options.size(), descriptions.size() ); ++i )
             rows.add( new Row( itemOrEmpty( options, i ), itemOrEmpty( descriptions, i ) ) );
 
@@ -94,7 +93,7 @@ class Columns {
     }
 
     private List<String> piecesOf( String raw, int width ) {
-        List<String> pieces = new ArrayList<String>();
+        List<String> pieces = new ArrayList<>();
 
         for ( String each : raw.trim().split( LINE_SEPARATOR ) )
             pieces.addAll( piecesOfEmbeddedLine( each, width ) );
@@ -103,9 +102,9 @@ class Columns {
     }
 
     private List<String> piecesOfEmbeddedLine( String line, int width ) {
-        List<String> pieces = new ArrayList<String>();
+        List<String> pieces = new ArrayList<>();
 
-        BreakIterator words = BreakIterator.getLineInstance( Locale.US );
+        BreakIterator words = BreakIterator.getLineInstance();
         words.setText( line );
 
         StringBuilder nextPiece = new StringBuilder();
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java
index 720c6e4b8c2..5ff8f7ce55d 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Messages.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Messages.java
new file mode 100644
index 00000000000..05c593e1ac9
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Messages.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package jdk.internal.joptsimple.internal;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
+ */
+public class Messages {
+    private Messages() {
+        throw new UnsupportedOperationException();
+    }
+
+    public static String message( Locale locale, String bundleName, Class<?> type, String key, Object... args ) {
+        ResourceBundle bundle = ResourceBundle.getBundle( bundleName, locale );
+        String template = bundle.getString( type.getName() + '.' + key );
+        MessageFormat format = new MessageFormat( template );
+        format.setLocale( locale );
+        return format.format( args );
+    }
+}
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java
index 599728bb67b..1546110f7fb 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/OptionNameMap.java
similarity index 80%
rename from src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java
rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/OptionNameMap.java
index 2c2b696cd0a..606f5111454 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/OptionNameMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,22 +55,23 @@
 
 package jdk.internal.joptsimple.internal;
 
-/**
- * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
- */
-public final class Objects {
-    private Objects() {
-        throw new UnsupportedOperationException();
-    }
+import java.util.Map;
 
-    /**
-     * Rejects {@code null} references.
-     *
-     * @param target reference to check
-     * @throws NullPointerException if {@code target} is {@code null}
-     */
-    public static void ensureNotNull( Object target ) {
-        if ( target == null )
-            throw new NullPointerException();
-    }
+/**
+ * Map-like interface for storing String-value pairs.
+ *
+ * @param <V> type of values stored in the map
+ */
+public interface OptionNameMap<V> {
+    boolean contains( String key );
+
+    V get( String key );
+
+    void put( String key, V newValue );
+
+    void putAll( Iterable<String> keys, V newValue );
+
+    void remove( String key );
+
+    Map<String, V> toJavaUtilMap();
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java
index 240ad24394c..16237447e37 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -98,22 +98,20 @@ public final class Reflection {
 
     private static <V> ValueConverter<V> valueOfConverter( Class<V> clazz ) {
         try {
-            Method valueOf = clazz.getDeclaredMethod( "valueOf", String.class );
+            Method valueOf = clazz.getMethod( "valueOf", String.class );
             if ( meetsConverterRequirements( valueOf, clazz ) )
-                return new MethodInvokingValueConverter<V>( valueOf, clazz );
+                return new MethodInvokingValueConverter<>( valueOf, clazz );
 
             return null;
-        }
-        catch ( NoSuchMethodException ignored ) {
+        } catch ( NoSuchMethodException ignored ) {
             return null;
         }
     }
 
     private static <V> ValueConverter<V> constructorConverter( Class<V> clazz ) {
         try {
-            return new ConstructorInvokingValueConverter<V>( clazz.getConstructor( String.class ) );
-        }
-        catch ( NoSuchMethodException ignored ) {
+            return new ConstructorInvokingValueConverter<>( clazz.getConstructor( String.class ) );
+        } catch ( NoSuchMethodException ignored ) {
             return null;
         }
     }
@@ -130,8 +128,7 @@ public final class Reflection {
     public static <T> T instantiate( Constructor<T> constructor, Object... args ) {
         try {
             return constructor.newInstance( args );
-        }
-        catch ( Exception ex ) {
+        } catch ( Exception ex ) {
             throw reflectionException( ex );
         }
     }
@@ -147,8 +144,7 @@ public final class Reflection {
     public static Object invoke( Method method, Object... args ) {
         try {
             return method.invoke( null, args );
-        }
-        catch ( Exception ex ) {
+        } catch ( Exception ex ) {
             throw reflectionException( ex );
         }
     }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java
index 3e98d8f244c..5a62a18e235 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java
index 0ce8bcf0cc9..dfce9b70d22 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java
index 0d0e4c2d0e0..a6552e6d63c 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,8 +55,8 @@
 
 package jdk.internal.joptsimple.internal;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import static java.lang.Math.*;
 
@@ -68,7 +68,8 @@ import static jdk.internal.joptsimple.internal.Strings.*;
 public class Rows {
     private final int overallWidth;
     private final int columnSeparatorWidth;
-    private final Set<Row> rows = new LinkedHashSet<Row>();
+    private final List<Row> rows = new ArrayList<>();
+
     private int widthOfWidestOption;
     private int widthOfWidestDescription;
 
@@ -87,7 +88,7 @@ public class Rows {
         widthOfWidestDescription = max( widthOfWidestDescription, row.description.length() );
     }
 
-    private void reset() {
+    public void reset() {
         rows.clear();
         widthOfWidestOption = 0;
         widthOfWidestDescription = 0;
@@ -96,7 +97,7 @@ public class Rows {
     public void fitToWidth() {
         Columns columns = new Columns( optionWidth(), descriptionWidth() );
 
-        Set<Row> fitted = new LinkedHashSet<Row>();
+        List<Row> fitted = new ArrayList<>();
         for ( Row each : rows )
             fitted.addAll( columns.fit( each ) );
 
@@ -122,7 +123,7 @@ public class Rows {
     }
 
     private int descriptionWidth() {
-        return min( ( overallWidth - columnSeparatorWidth ) / 2, widthOfWidestDescription );
+        return min( overallWidth - optionWidth() - columnSeparatorWidth, widthOfWidestDescription );
     }
 
     private StringBuilder pad( StringBuilder buffer, String s, int length ) {
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/SimpleOptionNameMap.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/SimpleOptionNameMap.java
new file mode 100644
index 00000000000..860937794d0
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/SimpleOptionNameMap.java
@@ -0,0 +1,97 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package jdk.internal.joptsimple.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>An {@code OptionNameMap} which wraps and behaves like {@code HashMap}.</p>
+ */
+public class SimpleOptionNameMap<V> implements OptionNameMap<V> {
+    private final Map<String, V> map = new HashMap<>();
+
+    @Override
+    public boolean contains( String key ) {
+        return map.containsKey( key );
+    }
+
+    @Override
+    public V get( String key ) {
+        return map.get( key );
+    }
+
+    @Override
+    public void put( String key, V newValue ) {
+        map.put( key, newValue );
+    }
+
+    @Override
+    public void putAll( Iterable<String> keys, V newValue ) {
+        for ( String each : keys )
+            map.put( each, newValue );
+    }
+
+    @Override
+    public void remove( String key ) {
+        map.remove( key );
+    }
+
+    @Override
+    public Map<String, V> toJavaUtilMap() {
+        return new HashMap<>( map );
+    }
+}
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java
index 038b3f0ce6b..e989e0cd5da 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -56,7 +56,6 @@
 package jdk.internal.joptsimple.internal;
 
 import java.util.Iterator;
-import java.util.List;
 
 import static java.lang.System.*;
 import static java.util.Arrays.*;
@@ -66,7 +65,6 @@ import static java.util.Arrays.*;
  */
 public final class Strings {
     public static final String EMPTY = "";
-    public static final String SINGLE_QUOTE = "'";
     public static final String LINE_SEPARATOR = getProperty( "line.separator" );
 
     private Strings() {
@@ -96,7 +94,7 @@ public final class Strings {
      * @return {@code true} if the target string is null or empty
      */
     public static boolean isNullOrEmpty( String target ) {
-        return target == null || EMPTY.equals( target );
+        return target == null || target.isEmpty();
     }
 
 
@@ -132,7 +130,7 @@ public final class Strings {
      * @param separator the separator
      * @return the joined string
      */
-    public static String join( List<String> pieces, String separator ) {
+    public static String join( Iterable<String> pieces, String separator ) {
         StringBuilder buffer = new StringBuilder();
 
         for ( Iterator<String> iter = pieces.iterator(); iter.hasNext(); ) {
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java
index f90585300d1..0f3cabed5f5 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -59,9 +59,11 @@ import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import jdk.internal.joptsimple.ValueConversionException;
 import jdk.internal.joptsimple.ValueConverter;
+import jdk.internal.joptsimple.internal.Messages;
 
 /**
  * Converts values to {@link Date}s using a {@link DateFormat} object.
@@ -121,10 +123,22 @@ public class DateConverter implements ValueConverter<Date> {
     }
 
     private String message( String value ) {
-        String message = "Value [" + value + "] does not match date/time pattern";
-        if ( formatter instanceof SimpleDateFormat )
-            message += " [" + ( (SimpleDateFormat) formatter ).toPattern() + ']';
+        String key;
+        Object[] arguments;
 
-        return message;
+        if ( formatter instanceof SimpleDateFormat ) {
+            key = "with.pattern.message";
+            arguments = new Object[] { value, ( (SimpleDateFormat) formatter ).toPattern() };
+        } else {
+            key = "without.pattern.message";
+            arguments = new Object[] { value };
+        }
+
+        return Messages.message(
+            Locale.getDefault(),
+            "jdk.internal.joptsimple.ExceptionMessages",
+            DateConverter.class,
+            key,
+            arguments );
     }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/EnumConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/EnumConverter.java
new file mode 100644
index 00000000000..7d2a2388a68
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/EnumConverter.java
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package jdk.internal.joptsimple.util;
+
+import java.text.MessageFormat;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.ResourceBundle;
+
+import jdk.internal.joptsimple.ValueConversionException;
+import jdk.internal.joptsimple.ValueConverter;
+
+/**
+ * Converts values to {@link java.lang.Enum}s.
+ *
+ * @author <a href="mailto:christian.ohr@gmail.com">Christian Ohr</a>
+ */
+public abstract class EnumConverter<E extends Enum<E>> implements ValueConverter<E> {
+    private final Class<E> clazz;
+
+    private String delimiters = "[,]";
+
+    /**
+     * This constructor must be called by subclasses, providing the enum class as the parameter.
+     *
+     * @param clazz enum class
+     */
+    protected EnumConverter( Class<E> clazz ) {
+        this.clazz = clazz;
+    }
+
+    @Override
+    public E convert( String value ) {
+        for ( E each : valueType().getEnumConstants() ) {
+            if ( each.name().equalsIgnoreCase( value ) ) {
+                return each;
+            }
+        }
+
+        throw new ValueConversionException( message( value ) );
+    }
+
+    @Override
+    public Class<E> valueType() {
+        return clazz;
+    }
+
+    /**
+     * Sets the delimiters for the message string. Must be a 3-letter string,
+     * where the first character is the prefix, the second character is the
+     * delimiter between the values, and the 3rd character is the suffix.
+     *
+     * @param delimiters delimiters for message string. Default is [,]
+     */
+    public void setDelimiters( String delimiters ) {
+        this.delimiters = delimiters;
+    }
+
+    @Override
+    public String valuePattern() {
+        EnumSet<E> values = EnumSet.allOf( valueType() );
+
+        StringBuilder builder = new StringBuilder();
+        builder.append( delimiters.charAt(0) );
+        for ( Iterator<E> i = values.iterator(); i.hasNext(); ) {
+            builder.append( i.next().toString() );
+            if ( i.hasNext() )
+                builder.append( delimiters.charAt( 1 ) );
+        }
+        builder.append( delimiters.charAt( 2 ) );
+
+        return builder.toString();
+    }
+
+    private String message( String value ) {
+        ResourceBundle bundle = ResourceBundle.getBundle( "jdk.internal.joptsimple.ExceptionMessages" );
+        Object[] arguments = new Object[] { value, valuePattern() };
+        String template = bundle.getString( EnumConverter.class.getName() + ".message" );
+        return new MessageFormat( template ).format( arguments );
+    }
+}
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
index c6c7366509c..6d7056cd616 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -57,9 +57,11 @@ package jdk.internal.joptsimple.util;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Locale;
 
 import jdk.internal.joptsimple.ValueConversionException;
 import jdk.internal.joptsimple.ValueConverter;
+import jdk.internal.joptsimple.internal.Messages;
 
 /**
  * Converts values to {@link java.net.InetAddress} using {@link InetAddress#getByName(String) getByName}.
@@ -70,8 +72,9 @@ public class InetAddressConverter implements ValueConverter<InetAddress> {
     public InetAddress convert( String value ) {
         try {
             return InetAddress.getByName( value );
-        } catch ( UnknownHostException e ) {
-            throw new ValueConversionException( "Cannot convert value [" + value + " into an InetAddress", e );
+        }
+        catch ( UnknownHostException e ) {
+            throw new ValueConversionException( message( value ) );
         }
     }
 
@@ -82,4 +85,13 @@ public class InetAddressConverter implements ValueConverter<InetAddress> {
     public String valuePattern() {
         return null;
     }
+
+    private String message( String value ) {
+        return Messages.message(
+            Locale.getDefault(),
+            "jdk.internal.joptsimple.ExceptionMessages",
+            InetAddressConverter.class,
+            "message",
+            value );
+    }
 }
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java
index 430e0c89b75..47603adfca4 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -60,7 +60,7 @@ import static jdk.internal.joptsimple.internal.Strings.*;
 /**
  * <p>A simple string key/string value pair.</p>
  *
- * <p>This is useful as an argument type for options whose values take on the form <kbd>key=value</kbd>, such as JVM
+ * <p>This is useful as an argument type for options whose values take on the form {@code key=value}, such as JVM
  * command line system properties.</p>
  *
  * @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
@@ -75,7 +75,7 @@ public final class KeyValuePair {
     }
 
     /**
-     * Parses a string assumed to be of the form <kbd>key=value</kbd> into its parts.
+     * Parses a string assumed to be of the form {@code key=value} into its parts.
      *
      * @param asString key-value string
      * @return a key-value pair
@@ -84,7 +84,7 @@ public final class KeyValuePair {
     public static KeyValuePair valueOf( String asString ) {
         int equalsIndex = asString.indexOf( '=' );
         if ( equalsIndex == -1 )
-            return new KeyValuePair( asString, EMPTY );
+            return new KeyValuePair( asString, null );
 
         String aKey = asString.substring( 0, equalsIndex );
         String aValue = equalsIndex == asString.length() - 1 ? EMPTY : asString.substring( equalsIndex + 1 );
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/PathConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/PathConverter.java
new file mode 100644
index 00000000000..f542e8e0a65
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/PathConverter.java
@@ -0,0 +1,76 @@
+/*
+ * 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 jdk.internal.joptsimple.util;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+import jdk.internal.joptsimple.ValueConversionException;
+import jdk.internal.joptsimple.ValueConverter;
+
+/**
+ * Converts command line options to {@link Path} objects and checks the status of the underlying file.
+ */
+public class PathConverter implements ValueConverter<Path> {
+    private final PathProperties[] pathProperties;
+
+    public PathConverter( PathProperties... pathProperties ) {
+        this.pathProperties = pathProperties;
+    }
+
+    @Override
+    public Path convert( String value ) {
+        Path path = Paths.get(value);
+
+        if ( pathProperties != null ) {
+            for ( PathProperties each : pathProperties ) {
+                if ( !each.accept( path ) )
+                    throw new ValueConversionException( message( each.getMessageKey(), path.toString() ) );
+            }
+        }
+
+        return path;
+    }
+
+    @Override
+    public Class<Path> valueType() {
+        return Path.class;
+    }
+
+    @Override
+    public String valuePattern() {
+        return null;
+    }
+
+    private String message( String errorKey, String value ) {
+        ResourceBundle bundle = ResourceBundle.getBundle( "jdk.internal.joptsimple.ExceptionMessages" );
+        Object[] arguments = new Object[] { value, valuePattern() };
+        String template = bundle.getString( PathConverter.class.getName() + "." + errorKey + ".message" );
+        return new MessageFormat( template ).format( arguments );
+    }
+}
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/PathProperties.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/PathProperties.java
new file mode 100644
index 00000000000..22066da2bc2
--- /dev/null
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/PathProperties.java
@@ -0,0 +1,85 @@
+/*
+ * 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 jdk.internal.joptsimple.util;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Enum for checking common conditions of files and directories.
+ *
+ * @see jdk.internal.joptsimple.util.PathConverter
+ */
+public enum PathProperties {
+    FILE_EXISTING( "file.existing" ) {
+        @Override
+        boolean accept( Path path ) {
+            return Files.isRegularFile( path );
+        }
+    },
+    DIRECTORY_EXISTING( "directory.existing" ) {
+        @Override
+        boolean accept( Path path ) {
+            return Files.isDirectory( path );
+        }
+    },
+    NOT_EXISTING( "file.not.existing" ) {
+        @Override
+        boolean accept( Path path ) {
+            return Files.notExists( path );
+        }
+    },
+    FILE_OVERWRITABLE( "file.overwritable" ) {
+        @Override
+        boolean accept( Path path ) {
+            return FILE_EXISTING.accept( path ) && WRITABLE.accept( path );
+        }
+    },
+    READABLE( "file.readable" ) {
+        @Override
+        boolean accept( Path path ) {
+            return Files.isReadable( path );
+        }
+    },
+    WRITABLE( "file.writable" ) {
+        @Override
+        boolean accept( Path path ) {
+            return Files.isWritable( path );
+        }
+    };
+
+    private final String messageKey;
+
+    private PathProperties( String messageKey ) {
+        this.messageKey = messageKey;
+    }
+
+    abstract boolean accept( Path path );
+
+    String getMessageKey() {
+        return messageKey;
+    }
+}
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java
index b6ceee5557e..f51b375d86f 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java
@@ -31,7 +31,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2004-2014 Paul R. Holser, Jr.
+ * Copyright (c) 2004-2015 Paul R. Holser, Jr.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,9 +55,11 @@
 
 package jdk.internal.joptsimple.util;
 
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 import static java.util.regex.Pattern.*;
+import static jdk.internal.joptsimple.internal.Messages.message;
 
 import jdk.internal.joptsimple.ValueConversionException;
 import jdk.internal.joptsimple.ValueConverter;
@@ -96,8 +98,7 @@ public class RegexMatcher implements ValueConverter<String> {
 
     public String convert( String value ) {
         if ( !pattern.matcher( value ).matches() ) {
-            throw new ValueConversionException(
-                "Value [" + value + "] did not match regex [" + pattern.pattern() + ']' );
+            raiseValueConversionFailure( value );
         }
 
         return value;
@@ -110,4 +111,15 @@ public class RegexMatcher implements ValueConverter<String> {
     public String valuePattern() {
         return pattern.pattern();
     }
+
+    private void raiseValueConversionFailure( String value ) {
+        String message = message(
+            Locale.getDefault(),
+            "jdk.internal.joptsimple.ExceptionMessages",
+            RegexMatcher.class,
+            "message",
+            value,
+            pattern.pattern() );
+        throw new ValueConversionException( message );
+    }
 }
diff --git a/src/jdk.internal.opt/share/legal/jopt-simple.md b/src/jdk.internal.opt/share/legal/jopt-simple.md
index 0d40507edaf..c08b3b4b94c 100644
--- a/src/jdk.internal.opt/share/legal/jopt-simple.md
+++ b/src/jdk.internal.opt/share/legal/jopt-simple.md
@@ -1,4 +1,4 @@
-## jopt-simple v4.6
+## jopt-simple v5.0.4
 
 ### MIT License
 <pre>
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
index 961c0d947be..458c0b68f6c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -63,11 +63,15 @@ import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMOV
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMSUB;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMUL;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FNEG;
+import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTM;
+import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTN;
+import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTP;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTZ;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FSQRT;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FSUB;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.HINT;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.HLT;
+import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDADD;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDAR;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDAXR;
 import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDP;
@@ -480,6 +484,9 @@ public abstract class AArch64Assembler extends Assembler {
     private static final int CASAcquireOffset = 22;
     private static final int CASReleaseOffset = 15;
 
+    private static final int LDADDAcquireOffset = 23;
+    private static final int LDADDReleaseOffset = 22;
+
     /**
      * Encoding for all instructions.
      */
@@ -511,6 +518,7 @@ public abstract class AArch64Assembler extends Assembler {
         STP(0b0 << 22),
 
         CAS(0x08A07C00),
+        LDADD(0x38200000),
 
         ADR(0x00000000),
         ADRP(0x80000000),
@@ -573,6 +581,9 @@ public abstract class AArch64Assembler extends Assembler {
         FSQRT(0x00018000),
         FNEG(0x00010000),
 
+        FRINTM(0x00050000),
+        FRINTN(0x00040000),
+        FRINTP(0x00048000),
         FRINTZ(0x00058000),
 
         FADD(0x00002000),
@@ -1330,7 +1341,18 @@ public abstract class AArch64Assembler extends Assembler {
         emitInt(transferSizeEncoding | instr.encoding | rs2(rs) | rn(rn) | rt(rt));
     }
 
-    /* Compare And Swap */
+    /**
+     * Compare And Swap word or doubleword in memory. This reads a value from an address rn,
+     * compares it against a given value rs, and, if equal, stores the value rt to memory. The value
+     * read from address rn is stored in register rs.
+     *
+     * @param size size of bits read from memory. Must be 32 or 64.
+     * @param rs general purpose register to be compared and loaded. May not be null.
+     * @param rt general purpose register to be conditionally stored. May not be null.
+     * @param rn general purpose register containing the address from which to read.
+     * @param acquire boolean value signifying if the load should use acquire semantics.
+     * @param release boolean value signifying if the store should use release semantics.
+     */
     public void cas(int size, Register rs, Register rt, Register rn, boolean acquire, boolean release) {
         assert size == 32 || size == 64;
         int transferSize = NumUtil.log2Ceil(size / 8);
@@ -1344,17 +1366,42 @@ public abstract class AArch64Assembler extends Assembler {
         emitInt(transferSizeEncoding | instr.encoding | rs2(rs) | rn(rn) | rt(rt) | (acquire ? 1 : 0) << CASAcquireOffset | (release ? 1 : 0) << CASReleaseOffset);
     }
 
+    /**
+     * Atomic add. This reads a value from an address rn, stores the value in rt, and adds the value
+     * in rs to it, and stores the result back at address rn. The initial value read from memory is
+     * stored in rt.
+     *
+     * @param size size of operand to read from memory. Must be 8, 16, 32, or 64.
+     * @param rs general purpose register to be added to contents. May not be null.
+     * @param rt general purpose register to be loaded. May not be null.
+     * @param rn general purpose register or stack pointer holding an address from which to load.
+     * @param acquire boolean value signifying if the load should use acquire semantics.
+     * @param release boolean value signifying if the store should use release semantics.
+     */
+    public void ldadd(int size, Register rs, Register rt, Register rn, boolean acquire, boolean release) {
+        assert size == 8 || size == 16 || size == 32 || size == 64;
+        int transferSize = NumUtil.log2Ceil(size / 8);
+        loadAndAddInstruction(LDADD, rs, rt, rn, transferSize, acquire, release);
+    }
+
+    private void loadAndAddInstruction(Instruction instr, Register rs, Register rt, Register rn, int log2TransferSize, boolean acquire, boolean release) {
+        assert log2TransferSize >= 0 && log2TransferSize < 4;
+        assert rt.getRegisterCategory().equals(CPU) && rs.getRegisterCategory().equals(CPU) && !rs.equals(rt);
+        int transferSizeEncoding = log2TransferSize << LoadStoreTransferSizeOffset;
+        emitInt(transferSizeEncoding | instr.encoding | rs2(rs) | rn(rn) | rt(rt) | (acquire ? 1 : 0) << LDADDAcquireOffset | (release ? 1 : 0) << LDADDReleaseOffset);
+    }
+
     /* PC-relative Address Calculation (5.4.4) */
 
     /**
      * Address of page: sign extends 21-bit offset, shifts if left by 12 and adds it to the value of
-     * the PC with its bottom 12-bits cleared, writing the result to dst.
-     * No offset is emiited; the instruction will be patched later.
+     * the PC with its bottom 12-bits cleared, writing the result to dst. No offset is emitted; the
+     * instruction will be patched later.
      *
      * @param dst general purpose register. May not be null, zero-register or stackpointer.
      */
     public void adrp(Register dst) {
-        emitInt(ADRP.encoding | PcRelImmOp | rd(dst) );
+        emitInt(ADRP.encoding | PcRelImmOp | rd(dst));
     }
 
     /**
@@ -1367,14 +1414,17 @@ public abstract class AArch64Assembler extends Assembler {
         emitInt(ADR.encoding | PcRelImmOp | rd(dst) | getPcRelativeImmEncoding(imm21));
     }
 
+    /**
+     * Adds a 21-bit signed offset to the program counter and writes the result to dst.
+     *
+     * @param dst general purpose register. May not be null, zero-register or stackpointer.
+     * @param imm21 Signed 21-bit offset.
+     * @param pos the position in the code that the instruction is emitted.
+     */
     public void adr(Register dst, int imm21, int pos) {
         emitInt(ADR.encoding | PcRelImmOp | rd(dst) | getPcRelativeImmEncoding(imm21), pos);
     }
 
-    public void adrp(Register dst, int pageOffset) {
-        emitInt(ADRP.encoding | PcRelImmOp | rd(dst) | getPcRelativeImmEncoding(pageOffset));
-    }
-
     private static int getPcRelativeImmEncoding(int imm21) {
         assert NumUtil.isSignedNbit(21, imm21);
         int imm = imm21 & NumUtil.getNbitNumberInt(21);
@@ -2432,6 +2482,39 @@ public abstract class AArch64Assembler extends Assembler {
         fpDataProcessing1Source(FRINTZ, dst, src, floatFromSize(size));
     }
 
+    /**
+     * Rounds floating-point to integral. Rounds towards nearest with ties to even.
+     *
+     * @param size register size.
+     * @param dst floating point register. May not be null.
+     * @param src floating point register. May not be null.
+     */
+    public void frintn(int size, Register dst, Register src) {
+        fpDataProcessing1Source(FRINTN, dst, src, floatFromSize(size));
+    }
+
+    /**
+     * Rounds floating-point to integral. Rounds towards minus infinity.
+     *
+     * @param size register size.
+     * @param dst floating point register. May not be null.
+     * @param src floating point register. May not be null.
+     */
+    public void frintm(int size, Register dst, Register src) {
+        fpDataProcessing1Source(FRINTM, dst, src, floatFromSize(size));
+    }
+
+    /**
+     * Rounds floating-point to integral. Rounds towards plus infinity.
+     *
+     * @param size register size.
+     * @param dst floating point register. May not be null.
+     * @param src floating point register. May not be null.
+     */
+    public void frintp(int size, Register dst, Register src) {
+        fpDataProcessing1Source(FRINTP, dst, src, floatFromSize(size));
+    }
+
     /* Floating-point Arithmetic (1 source) (5.7.6) */
 
     /**
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
index 56897cb36d2..af6a6d00b6c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, Red Hat 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
@@ -38,7 +37,6 @@ import static jdk.vm.ci.aarch64.AArch64.r9;
 import static jdk.vm.ci.aarch64.AArch64.sp;
 import static jdk.vm.ci.aarch64.AArch64.zr;
 
-import org.graalvm.compiler.asm.AbstractAddress;
 import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.debug.GraalError;
@@ -307,9 +305,10 @@ public class AArch64MacroAssembler extends AArch64Assembler {
             case EXTENDED_REGISTER_OFFSET:
                 add(64, dst, address.getBase(), address.getOffset(), address.getExtendType(), address.isScaled() ? shiftAmt : 0);
                 break;
-            case PC_LITERAL:
-                super.adr(dst, address.getImmediateRaw());
+            case PC_LITERAL: {
+                addressOf(dst);
                 break;
+            }
             case BASE_REGISTER_ONLY:
                 movx(dst, address.getBase());
                 break;
@@ -1561,7 +1560,7 @@ public class AArch64MacroAssembler extends AArch64Assembler {
     }
 
     @Override
-    public AbstractAddress getPlaceholder(int instructionStartPosition) {
+    public AArch64Address getPlaceholder(int instructionStartPosition) {
         return AArch64Address.PLACEHOLDER;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
index 6bc4f378dc2..c479ac7cf75 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
@@ -1853,9 +1853,36 @@ public class AMD64Assembler extends Assembler {
         CMP.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32);
     }
 
-    // The 32-bit cmpxchg compares the value at adr with the contents of X86.rax,
-    // and stores reg into adr if so; otherwise, the value at adr is loaded into X86.rax,.
-    // The ZF is set if the compared values were equal, and cleared otherwise.
+    /**
+     * The 8-bit cmpxchg compares the value at adr with the contents of X86.rax, and stores reg into
+     * adr if so; otherwise, the value at adr is loaded into X86.rax,. The ZF is set if the compared
+     * values were equal, and cleared otherwise.
+     */
+    public final void cmpxchgb(Register reg, AMD64Address adr) { // cmpxchg
+        prefix(adr, reg);
+        emitByte(0x0F);
+        emitByte(0xB0);
+        emitOperandHelper(reg, adr, 0);
+    }
+
+    /**
+     * The 16-bit cmpxchg compares the value at adr with the contents of X86.rax, and stores reg
+     * into adr if so; otherwise, the value at adr is loaded into X86.rax,. The ZF is set if the
+     * compared values were equal, and cleared otherwise.
+     */
+    public final void cmpxchgw(Register reg, AMD64Address adr) { // cmpxchg
+        emitByte(0x66); // Switch to 16-bit mode.
+        prefix(adr, reg);
+        emitByte(0x0F);
+        emitByte(0xB1);
+        emitOperandHelper(reg, adr, 0);
+    }
+
+    /**
+     * The 32-bit cmpxchg compares the value at adr with the contents of X86.rax, and stores reg
+     * into adr if so; otherwise, the value at adr is loaded into X86.rax,. The ZF is set if the
+     * compared values were equal, and cleared otherwise.
+     */
     public final void cmpxchgl(Register reg, AMD64Address adr) { // cmpxchg
         prefix(adr, reg);
         emitByte(0x0F);
@@ -3677,6 +3704,21 @@ public class AMD64Assembler extends Assembler {
         emitByte(imm8);
     }
 
+    public final void xaddb(AMD64Address dst, Register src) {
+        prefix(dst, src);
+        emitByte(0x0F);
+        emitByte(0xC0);
+        emitOperandHelper(src, dst, 0);
+    }
+
+    public final void xaddw(AMD64Address dst, Register src) {
+        emitByte(0x66); // Switch to 16-bit mode.
+        prefix(dst, src);
+        emitByte(0x0F);
+        emitByte(0xC1);
+        emitOperandHelper(src, dst, 0);
+    }
+
     public final void xaddl(AMD64Address dst, Register src) {
         prefix(dst, src);
         emitByte(0x0F);
@@ -3691,6 +3733,19 @@ public class AMD64Assembler extends Assembler {
         emitOperandHelper(src, dst, 0);
     }
 
+    public final void xchgb(Register dst, AMD64Address src) {
+        prefix(src, dst);
+        emitByte(0x86);
+        emitOperandHelper(dst, src, 0);
+    }
+
+    public final void xchgw(Register dst, AMD64Address src) {
+        emitByte(0x66);
+        prefix(src, dst);
+        emitByte(0x87);
+        emitOperandHelper(dst, src, 0);
+    }
+
     public final void xchgl(Register dst, AMD64Address src) {
         prefix(src, dst);
         emitByte(0x87);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java
index d2d04366357..940e8346333 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java
@@ -837,4 +837,27 @@ public class Bytecodes {
 
         assert !isConditionalBranch(opcode) || isBranch(opcode) : "a conditional branch must also be a branch";
     }
+
+    public static boolean isIfBytecode(int bytecode) {
+        switch (bytecode) {
+            case IFEQ:
+            case IFNE:
+            case IFLT:
+            case IFGE:
+            case IFGT:
+            case IFLE:
+            case IF_ICMPEQ:
+            case IF_ICMPNE:
+            case IF_ICMPLT:
+            case IF_ICMPGE:
+            case IF_ICMPGT:
+            case IF_ICMPLE:
+            case IF_ACMPEQ:
+            case IF_ACMPNE:
+            case IFNULL:
+            case IFNONNULL:
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
index b17843f37e2..01d71c04b2f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
@@ -32,9 +32,9 @@ import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManip
 import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CLZ;
 import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CTZ;
 
-import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.calc.FloatConvert;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.lir.ConstantValue;
@@ -491,4 +491,23 @@ public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implem
         throw GraalError.unimplemented();
     }
 
+    @Override
+    public Value emitRound(Value value, RoundingMode mode) {
+        AArch64ArithmeticOp op;
+        switch (mode) {
+            case NEAREST:
+                op = AArch64ArithmeticOp.FRINTN;
+                break;
+            case UP:
+                op = AArch64ArithmeticOp.FRINTP;
+                break;
+            case DOWN:
+                op = AArch64ArithmeticOp.FRINTM;
+                break;
+            default:
+                throw GraalError.shouldNotReachHere();
+        }
+
+        return emitUnary(op, value);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java
index 59ad70431e2..897ed187bd8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java
@@ -52,6 +52,7 @@ import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CondMoveOp;
 import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp;
 import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.TableSwitchOp;
 import org.graalvm.compiler.lir.aarch64.AArch64Move;
+import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove.AtomicReadAndAddOp;
 import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove.CompareAndSwapOp;
 import org.graalvm.compiler.lir.aarch64.AArch64Move.MembarOp;
 import org.graalvm.compiler.lir.aarch64.AArch64PauseOp;
@@ -127,7 +128,7 @@ public abstract class AArch64LIRGenerator extends LIRGenerator {
     }
 
     @Override
-    public Variable emitLogicCompareAndSwap(Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
+    public Variable emitLogicCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
         Variable prevValue = newVariable(expectedValue.getValueKind());
         Variable scratch = newVariable(LIRKind.value(AArch64Kind.DWORD));
         append(new CompareAndSwapOp(prevValue, loadReg(expectedValue), loadReg(newValue), asAllocatable(address), scratch));
@@ -138,13 +139,23 @@ public abstract class AArch64LIRGenerator extends LIRGenerator {
     }
 
     @Override
-    public Variable emitValueCompareAndSwap(Value address, Value expectedValue, Value newValue) {
+    public Variable emitValueCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue) {
         Variable result = newVariable(newValue.getValueKind());
         Variable scratch = newVariable(LIRKind.value(AArch64Kind.WORD));
         append(new CompareAndSwapOp(result, loadNonCompareConst(expectedValue), loadReg(newValue), asAllocatable(address), scratch));
         return result;
     }
 
+    @Override
+    public Value emitAtomicReadAndAdd(Value address, ValueKind<?> kind, Value delta) {
+        Variable result = newVariable(kind);
+        Variable scratch1 = newVariable(kind);
+        Variable scratch2 = newVariable(kind);
+
+        append(new AtomicReadAndAddOp((AArch64Kind) kind.getPlatformKind(), asAllocatable(result), asAllocatable(address), asAllocatable(delta), asAllocatable(scratch1), asAllocatable(scratch2)));
+        return result;
+    }
+
     @Override
     public void emitMembar(int barriers) {
         int necessaryBarriers = target().arch.requiredBarriers(barriers);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
index 9abd808ab4b..13e38dfb713 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
@@ -23,13 +23,16 @@
 
 package org.graalvm.compiler.core.amd64;
 
+import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isAllocatableValue;
+import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.OperandSize.DWORD;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.OperandSize.PD;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.OperandSize.PS;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.OperandSize.QWORD;
 import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
+import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue;
 import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
@@ -190,36 +193,68 @@ public abstract class AMD64LIRGenerator extends LIRGenerator {
         }
     }
 
-    @Override
-    public Variable emitLogicCompareAndSwap(Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
+    private AllocatableValue asAllocatable(Value value, ValueKind<?> kind) {
+        if (value.getValueKind().equals(kind)) {
+            return asAllocatable(value);
+        } else if (isRegister(value)) {
+            return asRegister(value).asValue(kind);
+        } else if (isConstantValue(value)) {
+            return emitLoadConstant(kind, asConstant(value));
+        } else {
+            Variable variable = newVariable(kind);
+            emitMove(variable, value);
+            return variable;
+        }
+    }
+
+    private Value emitCompareAndSwap(boolean isLogic, LIRKind accessKind, Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
         ValueKind<?> kind = newValue.getValueKind();
         assert kind.equals(expectedValue.getValueKind());
-        AMD64Kind memKind = (AMD64Kind) kind.getPlatformKind();
 
         AMD64AddressValue addressValue = asAddressValue(address);
-        RegisterValue raxRes = AMD64.rax.asValue(kind);
-        emitMove(raxRes, expectedValue);
-        append(new CompareAndSwapOp(memKind, raxRes, addressValue, raxRes, asAllocatable(newValue)));
+        LIRKind integralAccessKind = accessKind;
+        Value reinterpretedExpectedValue = expectedValue;
+        Value reinterpretedNewValue = newValue;
+        boolean isXmm = ((AMD64Kind) accessKind.getPlatformKind()).isXMM();
+        if (isXmm) {
+            if (accessKind.getPlatformKind().equals(AMD64Kind.SINGLE)) {
+                integralAccessKind = LIRKind.fromJavaKind(target().arch, JavaKind.Int);
+            } else {
+                integralAccessKind = LIRKind.fromJavaKind(target().arch, JavaKind.Long);
+            }
+            reinterpretedExpectedValue = arithmeticLIRGen.emitReinterpret(integralAccessKind, expectedValue);
+            reinterpretedNewValue = arithmeticLIRGen.emitReinterpret(integralAccessKind, newValue);
+        }
+        AMD64Kind memKind = (AMD64Kind) integralAccessKind.getPlatformKind();
+        RegisterValue aRes = AMD64.rax.asValue(integralAccessKind);
+        AllocatableValue allocatableNewValue = asAllocatable(reinterpretedNewValue, integralAccessKind);
+        emitMove(aRes, reinterpretedExpectedValue);
+        append(new CompareAndSwapOp(memKind, aRes, addressValue, aRes, allocatableNewValue));
 
-        assert trueValue.getValueKind().equals(falseValue.getValueKind());
-        Variable result = newVariable(trueValue.getValueKind());
-        append(new CondMoveOp(result, Condition.EQ, asAllocatable(trueValue), falseValue));
-        return result;
+        if (isLogic) {
+            assert trueValue.getValueKind().equals(falseValue.getValueKind());
+            Variable result = newVariable(trueValue.getValueKind());
+            append(new CondMoveOp(result, Condition.EQ, asAllocatable(trueValue), falseValue));
+            return result;
+        } else {
+            if (isXmm) {
+                return arithmeticLIRGen.emitReinterpret(accessKind, aRes);
+            } else {
+                Variable result = newVariable(kind);
+                emitMove(result, aRes);
+                return result;
+            }
+        }
     }
 
     @Override
-    public Value emitValueCompareAndSwap(Value address, Value expectedValue, Value newValue) {
-        ValueKind<?> kind = newValue.getValueKind();
-        assert kind.equals(expectedValue.getValueKind());
-        AMD64Kind memKind = (AMD64Kind) kind.getPlatformKind();
+    public Variable emitLogicCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
+        return (Variable) emitCompareAndSwap(true, accessKind, address, expectedValue, newValue, trueValue, falseValue);
+    }
 
-        AMD64AddressValue addressValue = asAddressValue(address);
-        RegisterValue raxRes = AMD64.rax.asValue(kind);
-        emitMove(raxRes, expectedValue);
-        append(new CompareAndSwapOp(memKind, raxRes, addressValue, raxRes, asAllocatable(newValue)));
-        Variable result = newVariable(kind);
-        emitMove(result, raxRes);
-        return result;
+    @Override
+    public Value emitValueCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue) {
+        return emitCompareAndSwap(false, accessKind, address, expectedValue, newValue, null, null);
     }
 
     public void emitCompareAndSwapBranch(ValueKind<?> kind, AMD64AddressValue address, Value expectedValue, Value newValue, Condition condition, LabelRef trueLabel, LabelRef falseLabel,
@@ -235,8 +270,7 @@ public abstract class AMD64LIRGenerator extends LIRGenerator {
     }
 
     @Override
-    public Value emitAtomicReadAndAdd(Value address, Value delta) {
-        ValueKind<?> kind = delta.getValueKind();
+    public Value emitAtomicReadAndAdd(Value address, ValueKind<?> kind, Value delta) {
         Variable result = newVariable(kind);
         AMD64AddressValue addressValue = asAddressValue(address);
         append(new AMD64Move.AtomicReadAndAddOp((AMD64Kind) kind.getPlatformKind(), result, addressValue, asAllocatable(delta)));
@@ -244,8 +278,7 @@ public abstract class AMD64LIRGenerator extends LIRGenerator {
     }
 
     @Override
-    public Value emitAtomicReadAndWrite(Value address, Value newValue) {
-        ValueKind<?> kind = newValue.getValueKind();
+    public Value emitAtomicReadAndWrite(Value address, ValueKind<?> kind, Value newValue) {
         Variable result = newVariable(kind);
         AMD64AddressValue addressValue = asAddressValue(address);
         append(new AMD64Move.AtomicReadAndWriteOp((AMD64Kind) kind.getPlatformKind(), result, addressValue, asAllocatable(newValue)));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalBailoutException.java
new file mode 100644
index 00000000000..ccc3dc733c1
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalBailoutException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016, 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.common;
+
+import jdk.vm.ci.code.BailoutException;
+import org.graalvm.compiler.debug.CausableByCompilerAssert;
+
+@SuppressWarnings("serial")
+public class GraalBailoutException extends BailoutException implements CausableByCompilerAssert {
+
+    public GraalBailoutException(String format, Object... args) {
+        super(format, args);
+    }
+
+    public GraalBailoutException(Throwable cause, String format, Object... args) {
+        super(cause, format, args);
+    }
+
+    public GraalBailoutException(boolean permanent, String format, Object... args) {
+        super(permanent, format, args);
+    }
+
+    @Override
+    public boolean isCausedByCompilerAssert() {
+        return false;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java
index 2dbffe9a7ca..4fb1460b8bb 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java
@@ -22,9 +22,7 @@
  */
 package org.graalvm.compiler.core.common;
 
-import jdk.vm.ci.code.BailoutException;
-
-public class PermanentBailoutException extends BailoutException {
+public class PermanentBailoutException extends GraalBailoutException {
 
     private static final long serialVersionUID = -2683649650135362549L;
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java
index 39fc8990bee..d9b7a658e5a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java
@@ -22,9 +22,7 @@
  */
 package org.graalvm.compiler.core.common;
 
-import jdk.vm.ci.code.BailoutException;
-
-public class RetryableBailoutException extends BailoutException {
+public class RetryableBailoutException extends GraalBailoutException {
 
     private static final long serialVersionUID = -7145365025679144525L;
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
index 28054cb3e5a..77c21933a64 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
@@ -1545,6 +1545,9 @@ public final class IntegerStamp extends PrimitiveStamp {
 
                         @Override
                         public Stamp invertStamp(int inputBits, int resultBits, Stamp outStamp) {
+                            if (outStamp.isEmpty()) {
+                                return StampFactory.forInteger(inputBits).empty();
+                            }
                             IntegerStamp stamp = (IntegerStamp) outStamp;
                             long mask = CodeUtil.mask(inputBits);
                             return StampFactory.forIntegerWithMask(inputBits, stamp.lowerBound(), stamp.upperBound(), stamp.downMask() & mask, stamp.upMask() & mask);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java
index 86497dc7846..a1620f2b42d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -27,19 +27,20 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -48,9 +49,7 @@ import javax.lang.model.element.Name;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.AbstractAnnotationValueVisitor7;
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic.Kind;
@@ -58,24 +57,10 @@ import javax.tools.FileObject;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 
-import jdk.internal.vm.compiler.collections.EconomicMap;
-import jdk.internal.vm.compiler.collections.EconomicSet;
-import jdk.internal.vm.compiler.collections.Equivalence;
-import org.graalvm.compiler.core.gen.NodeMatchRules;
-import org.graalvm.compiler.core.match.ComplexMatchResult;
-import org.graalvm.compiler.core.match.MatchRule;
-import org.graalvm.compiler.core.match.MatchRules;
-import org.graalvm.compiler.core.match.MatchStatement;
-import org.graalvm.compiler.core.match.MatchStatementSet;
-import org.graalvm.compiler.core.match.MatchableNode;
-import org.graalvm.compiler.core.match.MatchableNodes;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
 /**
- * Processes classes annotated with {@link MatchRule}. A {@link MatchStatementSet} service is
+ * Processes classes annotated with {@code MatchRule}. A {@code MatchStatementSet} service is
  * generated for each top level class containing at least one such field. These service objects can
  * be retrieved as follows:
  *
@@ -90,6 +75,13 @@ import org.graalvm.compiler.serviceprovider.ServiceProvider;
                 "org.graalvm.compiler.core.match.MatchableNodes"})
 public class MatchProcessor extends AbstractProcessor {
 
+    private static final String VALUE_NODE_CLASS_NAME = "org.graalvm.compiler.nodes.ValueNode";
+    private static final String COMPLEX_MATCH_RESULT_CLASS_NAME = "org.graalvm.compiler.core.match.ComplexMatchResult";
+    private static final String MATCHABLE_NODES_CLASS_NAME = "org.graalvm.compiler.core.match.MatchableNodes";
+    private static final String MATCHABLE_NODE_CLASS_NAME = "org.graalvm.compiler.core.match.MatchableNode";
+    private static final String MATCH_RULE_CLASS_NAME = "org.graalvm.compiler.core.match.MatchRule";
+    private static final String MATCH_RULES_CLASS_NAME = "org.graalvm.compiler.core.match.MatchRules";
+
     public MatchProcessor() {
     }
 
@@ -98,8 +90,8 @@ public class MatchProcessor extends AbstractProcessor {
         return SourceVersion.latest();
     }
 
-    private final Set<Element> processedMatchRule = new HashSet<>();
-    private final Set<Element> processedMatchableNode = new HashSet<>();
+    private final Set<Element> processedMatchRules = new HashSet<>();
+    private final Set<Element> processedMatchableNodes = new HashSet<>();
 
     private static class RuleParseError extends RuntimeException {
         private static final long serialVersionUID = 6456128283609257490L;
@@ -170,14 +162,14 @@ public class MatchProcessor extends AbstractProcessor {
             if (peek("(").equals("(")) {
                 next();
                 MatchDescriptor descriptor = parseType(true);
-                for (int n = 0; n < descriptor.nodeType.inputs.length; n++) {
+                for (int n = 0; n < descriptor.nodeType.inputs.size(); n++) {
                     if (peek("(").equals("(")) {
                         descriptor.inputs[n] = parseExpression();
                     } else {
                         descriptor.inputs[n] = parseType(false);
                     }
                 }
-                for (int n = 0; n < descriptor.nodeType.inputs.length; n++) {
+                for (int n = 0; n < descriptor.nodeType.inputs.size(); n++) {
                     if (descriptor.inputs[n] == null) {
                         throw new RuleParseError("not enough inputs for " + descriptor.name);
                     }
@@ -233,7 +225,7 @@ public class MatchProcessor extends AbstractProcessor {
         /**
          * Recursively accumulate any required Position declarations.
          */
-        void generatePositionDeclarations(EconomicSet<String> declarations) {
+        void generatePositionDeclarations(Set<String> declarations) {
             matchDescriptor.generatePositionDeclarations(declarations);
         }
 
@@ -251,9 +243,8 @@ public class MatchProcessor extends AbstractProcessor {
     }
 
     /**
-     * Set to true to enable logging to a local file during annotation processing. There's no normal
-     * channel for any debug messages and debugging annotation processors requires some special
-     * setup.
+     * Set to true to enable logging during annotation processing. There's no normal channel for any
+     * debug messages and debugging annotation processors requires some special setup.
      */
     private static final boolean DEBUG = false;
 
@@ -265,14 +256,21 @@ public class MatchProcessor extends AbstractProcessor {
 
     private PrintWriter getLog() {
         if (log == null) {
-            try {
-                // Create the log file within the generated source directory so it's easy to find.
-                // /tmp isn't platform independent and java.io.tmpdir can map anywhere, particularly
-                // on the mac.
-                FileObject file = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", getClass().getSimpleName() + "log");
-                log = new PrintWriter(new FileWriter(file.toUri().getPath(), true));
-            } catch (IOException e) {
-                // Do nothing
+            if (processingEnv.getClass().getName().contains(".javac.")) {
+                // For javac, just log to System.err
+                log = new PrintWriter(System.err);
+            } else {
+                try {
+                    // Create the log file within the generated source directory so it's easy to
+                    // find.
+                    // /tmp isn't platform independent and java.io.tmpdir can map anywhere,
+                    // particularly
+                    // on the mac.
+                    FileObject file = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", getClass().getSimpleName() + "log");
+                    log = new PrintWriter(new FileWriter(file.toUri().getPath(), true));
+                } catch (IOException e) {
+                    // Do nothing
+                }
             }
         }
         return log;
@@ -309,7 +307,7 @@ public class MatchProcessor extends AbstractProcessor {
             logMessage("throw for %s:\n", element);
         }
         logException(t);
-        errorMessage(element, "Exception throw during processing: %s %s", t, Arrays.toString(Arrays.copyOf(t.getStackTrace(), 4)));
+        printError(element, "Exception throw during processing: %s %s", t, Arrays.toString(Arrays.copyOf(t.getStackTrace(), 4)));
     }
 
     static class TypeDescriptor {
@@ -321,19 +319,19 @@ public class MatchProcessor extends AbstractProcessor {
         final String shortName;
 
         /**
-         * The simple name of the {@link ValueNode} class represented by this type.
+         * The simple name of the {@code ValueNode} class represented by this type.
          */
         final String nodeClass;
 
         /**
-         * The package of {@link ValueNode} class represented by this type.
+         * The package of {@code ValueNode} class represented by this type.
          */
         final String nodePackage;
 
         /**
          * The matchable inputs of the node.
          */
-        final String[] inputs;
+        final List<String> inputs;
 
         /**
          * Should swapped variants of this match be generated. The user of the match is expected to
@@ -350,7 +348,7 @@ public class MatchProcessor extends AbstractProcessor {
 
         final Set<Element> originatingElements = new HashSet<>();
 
-        TypeDescriptor(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, String[] inputs, boolean commutative, boolean shareable) {
+        TypeDescriptor(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, List<String> inputs, boolean commutative, boolean shareable) {
             this.mirror = mirror;
             this.shortName = shortName;
             this.nodeClass = nodeClass;
@@ -358,26 +356,18 @@ public class MatchProcessor extends AbstractProcessor {
             this.inputs = inputs;
             this.commutative = commutative;
             this.shareable = shareable;
-            assert !commutative || inputs.length == 2;
+            assert !commutative || inputs.size() == 2;
         }
     }
 
     /**
      * The types which are know for purpose of parsing MatchRule expressions.
      */
-    EconomicMap<String, TypeDescriptor> knownTypes = EconomicMap.create(Equivalence.DEFAULT);
+    Map<String, TypeDescriptor> knownTypes = new HashMap<>();
 
     private TypeDescriptor valueType;
 
-    private TypeMirror matchRulesTypeMirror;
-
-    private TypeMirror matchRuleTypeMirror;
-
-    private TypeMirror matchableNodeTypeMirror;
-
-    private TypeMirror matchableNodesTypeMirror;
-
-    private void declareType(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, String[] inputs, boolean commutative, boolean shareable, Element element) {
+    private void declareType(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, List<String> inputs, boolean commutative, boolean shareable, Element element) {
         TypeDescriptor descriptor = new TypeDescriptor(mirror, shortName, nodeClass, nodePackage, inputs, commutative, shareable);
         descriptor.originatingElements.add(element);
         knownTypes.put(shortName, descriptor);
@@ -388,7 +378,7 @@ public class MatchProcessor extends AbstractProcessor {
         if (p != null) {
             return p.getQualifiedName().toString();
         }
-        throw new GraalError("can't find package for %s", type);
+        throw new InternalError("Can't find package for " + type);
     }
 
     class MatchDescriptor {
@@ -400,13 +390,13 @@ public class MatchProcessor extends AbstractProcessor {
             this.nodeType = nodeType;
             this.name = name;
             if (forExpression) {
-                this.inputs = new MatchDescriptor[nodeType.inputs.length];
+                this.inputs = new MatchDescriptor[nodeType.inputs.size()];
             } else {
                 this.inputs = new MatchDescriptor[0];
             }
         }
 
-        public void generatePositionDeclarations(EconomicSet<String> declarations) {
+        public void generatePositionDeclarations(Set<String> declarations) {
             if (inputs.length == 0) {
                 return;
             }
@@ -469,10 +459,10 @@ public class MatchProcessor extends AbstractProcessor {
 
         private String formatSuffix() {
             if (nodeType != null) {
-                if (inputs.length != nodeType.inputs.length) {
+                if (inputs.length != nodeType.inputs.size()) {
                     return ", true)";
                 } else {
-                    if (nodeType.inputs.length > 0) {
+                    if (nodeType.inputs.size() > 0) {
                         return ", " + nodeType.nodeClass + "_positions, " + !nodeType.shareable + ")";
                     }
                     if (nodeType.shareable) {
@@ -502,7 +492,7 @@ public class MatchProcessor extends AbstractProcessor {
         String pkg = ((PackageElement) info.topDeclaringType.getEnclosingElement()).getQualifiedName().toString();
         Name topDeclaringClass = info.topDeclaringType.getSimpleName();
 
-        String matchStatementClassName = topDeclaringClass + "_" + MatchStatementSet.class.getSimpleName();
+        String matchStatementClassName = topDeclaringClass + "_MatchStatementSet";
         Element[] originatingElements = info.originatingElements.toArray(new Element[info.originatingElements.size()]);
 
         Types typeUtils = typeUtils();
@@ -516,22 +506,20 @@ public class MatchProcessor extends AbstractProcessor {
             out.println("package " + pkg + ";");
             out.println("");
             out.println("import java.util.*;");
-            out.println("import " + MatchStatementSet.class.getPackage().getName() + ".*;");
-            out.println("import " + NodeMatchRules.class.getName() + ";");
-            out.println("import " + Position.class.getName() + ";");
-            out.println("import " + ServiceProvider.class.getName() + ";");
+            out.println("import org.graalvm.compiler.core.match.*;");
+            out.println("import org.graalvm.compiler.core.gen.NodeMatchRules;");
+            out.println("import org.graalvm.compiler.graph.Position;");
             for (String p : info.requiredPackages) {
                 out.println("import " + p + ".*;");
             }
             out.println("");
 
-            out.println("@" + ServiceProvider.class.getSimpleName() + "(" + MatchStatementSet.class.getSimpleName() + ".class)");
-            out.println("public class " + matchStatementClassName + " implements " + MatchStatementSet.class.getSimpleName() + " {");
+            out.println("public class " + matchStatementClassName + " implements MatchStatementSet {");
 
             out.println();
 
             // Generate declarations for the wrapper class to invoke the code generation methods.
-            for (MethodInvokerItem invoker : info.invokers.getValues()) {
+            for (MethodInvokerItem invoker : info.invokers.values()) {
                 StringBuilder args = new StringBuilder();
                 StringBuilder types = new StringBuilder();
                 int count = invoker.fields.size();
@@ -562,7 +550,7 @@ public class MatchProcessor extends AbstractProcessor {
 
             }
 
-            String desc = MatchStatement.class.getSimpleName();
+            String desc = "MatchStatement";
 
             out.println("    @Override");
             out.println("    public Class<? extends NodeMatchRules> forClass() {");
@@ -595,6 +583,7 @@ public class MatchProcessor extends AbstractProcessor {
 
             out.println("}");
         }
+        this.createProviderFile(pkg + "." + matchStatementClassName, "org.graalvm.compiler.core.match.MatchStatementSet", originatingElements);
     }
 
     protected PrintWriter createSourceFile(String pkg, String relativeName, Filer filer, Element... originatingElements) {
@@ -662,17 +651,17 @@ public class MatchProcessor extends AbstractProcessor {
 
         final TypeElement topDeclaringType;
         final List<MatchRuleItem> matchRules = new ArrayList<>();
-        private final EconomicSet<Element> originatingElements = EconomicSet.create(Equivalence.DEFAULT);
-        public EconomicSet<String> positionDeclarations = EconomicSet.create(Equivalence.DEFAULT);
+        private final Set<Element> originatingElements = new HashSet<>();
+        public Set<String> positionDeclarations = new HashSet<>();
 
         /**
          * The mapping between elements with MatchRules and the wrapper class used invoke the code
          * generation after the match.
          */
-        EconomicMap<String, MethodInvokerItem> invokers = EconomicMap.create(Equivalence.DEFAULT);
+        Map<String, MethodInvokerItem> invokers = new HashMap<>();
 
         /**
-         * The set of packages which must be imported to refer the classes mention in matchRules.
+         * The set of packages which must be imported to refer the classes mentioned in matchRules.
          */
         Set<String> requiredPackages = new HashSet<>();
 
@@ -690,14 +679,15 @@ public class MatchProcessor extends AbstractProcessor {
         return topDeclaringType(enclosing);
     }
 
-    private AnnotationMirror findAnnotationMirror(Element element, TypeMirror typeMirror) {
-        for (AnnotationMirror mirror : element.getAnnotationMirrors()) {
-            if (typeUtils().isSameType(mirror.getAnnotationType(), typeMirror)) {
-                return mirror;
-            }
-        }
-        return null;
-    }
+    /**
+     * The element currently being processed.
+     */
+    private Element currentElement;
+
+    /**
+     * The current processing round.
+     */
+    private RoundEnvironment currentRound;
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
@@ -706,45 +696,58 @@ public class MatchProcessor extends AbstractProcessor {
         }
 
         logMessage("Starting round %s\n", roundEnv);
-        matchRulesTypeMirror = processingEnv.getElementUtils().getTypeElement(MatchRules.class.getCanonicalName()).asType();
-        matchRuleTypeMirror = processingEnv.getElementUtils().getTypeElement(MatchRule.class.getCanonicalName()).asType();
 
-        matchableNodeTypeMirror = processingEnv.getElementUtils().getTypeElement(MatchableNode.class.getCanonicalName()).asType();
-        matchableNodesTypeMirror = processingEnv.getElementUtils().getTypeElement(MatchableNodes.class.getCanonicalName()).asType();
+        TypeElement matchRulesTypeElement = getTypeElement(MATCH_RULES_CLASS_NAME);
+        TypeElement matchRuleTypeElement = getTypeElement(MATCH_RULE_CLASS_NAME);
 
-        Element currentElement = null;
+        TypeMirror matchRulesTypeMirror = matchRulesTypeElement.asType();
+        TypeMirror matchRuleTypeMirror = matchRuleTypeElement.asType();
+
+        TypeElement matchableNodeTypeElement = getTypeElement(MATCHABLE_NODE_CLASS_NAME);
+        TypeElement matchableNodesTypeElement = getTypeElement(MATCHABLE_NODES_CLASS_NAME);
+
+        currentRound = roundEnv;
         try {
-            for (Element element : roundEnv.getElementsAnnotatedWith(MatchableNode.class)) {
+            for (Element element : roundEnv.getElementsAnnotatedWith(matchableNodeTypeElement)) {
+                currentElement = element;
                 logMessage("%s\n", element);
-                processMatchableNode(element);
+                processMatchableNodes(element);
             }
-            for (Element element : roundEnv.getElementsAnnotatedWith(MatchableNodes.class)) {
+            for (Element element : roundEnv.getElementsAnnotatedWith(matchableNodesTypeElement)) {
+                currentElement = element;
                 logMessage("%s\n", element);
-                processMatchableNode(element);
+                processMatchableNodes(element);
             }
             // Define a TypeDescriptor for the generic node but don't enter it into the nodeTypes
             // table since it shouldn't be mentioned in match rules.
-            TypeMirror valueTypeMirror = processingEnv.getElementUtils().getTypeElement(ValueNode.class.getName()).asType();
-            valueType = new TypeDescriptor(valueTypeMirror, "Value", ValueNode.class.getSimpleName(), ValueNode.class.getPackage().getName(), new String[0], false, false);
+            TypeMirror valueTypeMirror = getTypeElement(VALUE_NODE_CLASS_NAME).asType();
+            valueType = new TypeDescriptor(valueTypeMirror, "Value", "ValueNode", "org.graalvm.compiler.nodes", Collections.emptyList(), false, false);
 
-            EconomicMap<TypeElement, MatchRuleDescriptor> map = EconomicMap.create(Equivalence.DEFAULT);
+            Map<TypeElement, MatchRuleDescriptor> map = new HashMap<>();
 
-            for (Element element : roundEnv.getElementsAnnotatedWith(MatchRule.class)) {
+            for (Element element : roundEnv.getElementsAnnotatedWith(matchRuleTypeElement)) {
                 currentElement = element;
-                processMatchRule(map, element, findAnnotationMirror(element, matchRuleTypeMirror));
+                AnnotationMirror matchRule = getAnnotation(element, matchRuleTypeMirror);
+                List<AnnotationMirror> matchRuleAnnotations = Collections.singletonList(matchRule);
+                processMatchRules(map, element, matchRuleAnnotations);
             }
-            for (Element element : roundEnv.getElementsAnnotatedWith(MatchRules.class)) {
+            for (Element element : roundEnv.getElementsAnnotatedWith(matchRulesTypeElement)) {
                 currentElement = element;
-                processMatchRule(map, element, findAnnotationMirror(element, matchRulesTypeMirror));
+                AnnotationMirror matchRules = getAnnotation(element, matchRulesTypeMirror);
+                List<AnnotationMirror> matchRuleAnnotations = getAnnotationValueList(matchRules, "value", AnnotationMirror.class);
+                processMatchRules(map, element, matchRuleAnnotations);
             }
 
             currentElement = null;
-            for (MatchRuleDescriptor info : map.getValues()) {
+            for (MatchRuleDescriptor info : map.values()) {
                 createFiles(info);
             }
 
         } catch (Throwable t) {
             reportExceptionThrow(currentElement, t);
+        } finally {
+            currentElement = null;
+            currentRound = null;
         }
 
         return true;
@@ -753,27 +756,27 @@ public class MatchProcessor extends AbstractProcessor {
     /**
      * Build up the type table to be used during parsing of the MatchRule.
      */
-    private void processMatchableNode(Element element) {
-        if (!processedMatchableNode.contains(element)) {
+    private void processMatchableNodes(Element element) {
+        if (!processedMatchableNodes.contains(element)) {
             try {
-                processedMatchableNode.add(element);
+                processedMatchableNodes.add(element);
 
-                AnnotationMirror mirror = findAnnotationMirror(element, matchableNodesTypeMirror);
-                if (mirror == null) {
-                    mirror = findAnnotationMirror(element, matchableNodeTypeMirror);
-                }
-                if (mirror == null) {
-                    return;
+                List<AnnotationMirror> matchableNodeAnnotations;
+                AnnotationMirror mirror = getAnnotation(element, getType(MATCHABLE_NODES_CLASS_NAME));
+                if (mirror != null) {
+                    matchableNodeAnnotations = getAnnotationValueList(mirror, "value", AnnotationMirror.class);
+                } else {
+                    mirror = getAnnotation(element, getType(MATCHABLE_NODES_CLASS_NAME));
+                    if (mirror != null) {
+                        matchableNodeAnnotations = Collections.singletonList(mirror);
+                    } else {
+                        return;
+                    }
                 }
+
                 TypeElement topDeclaringType = topDeclaringType(element);
-                List<AnnotationMirror> mirrors = null;
-                if (typeUtils().isSameType(mirror.getAnnotationType(), matchableNodesTypeMirror)) {
-                    // Unpack the mirrors for a repeatable annotation
-                    mirrors = getAnnotationValueList(AnnotationMirror.class, mirror, "value");
-                }
-                int i = 0;
-                for (MatchableNode matchableNode : element.getAnnotationsByType(MatchableNode.class)) {
-                    processMatchableNode(element, topDeclaringType, matchableNode, mirrors != null ? mirrors.get(i++) : mirror);
+                for (AnnotationMirror matchableNode : matchableNodeAnnotations) {
+                    processMatchableNode(element, topDeclaringType, matchableNode);
                 }
             } catch (Throwable t) {
                 reportExceptionThrow(element, t);
@@ -781,27 +784,22 @@ public class MatchProcessor extends AbstractProcessor {
         }
     }
 
-    private void processMatchableNode(Element element, TypeElement topDeclaringType, MatchableNode matchable, AnnotationMirror mirror) throws GraalError {
+    private void processMatchableNode(Element element, TypeElement topDeclaringType, AnnotationMirror matchable) {
         logMessage("processMatchableNode %s %s %s\n", topDeclaringType, element, matchable);
         String nodeClass;
         String nodePackage;
-        TypeMirror nodeClassMirror = null;
-        try {
-            matchable.nodeClass();
-        } catch (MirroredTypeException e) {
-            nodeClassMirror = e.getTypeMirror();
-        }
+        TypeMirror nodeClassMirror = getAnnotationValue(matchable, "nodeClass", TypeMirror.class);
         if (nodeClassMirror == null) {
-            throw new GraalError("Can't get mirror for node class %s", element);
+            throw new InternalError("Can't get mirror for node class " + element);
         }
-        if (nodeClassMirror.toString().equals(MatchableNode.class.getName())) {
+        if (nodeClassMirror.toString().equals(MATCHABLE_NODE_CLASS_NAME)) {
             nodeClass = topDeclaringType.getQualifiedName().toString();
         } else {
             nodeClass = nodeClassMirror.toString();
         }
         TypeElement typeElement = processingEnv.getElementUtils().getTypeElement(nodeClass);
         if (typeElement == null) {
-            errorMessage(element, mirror, "Class \"%s\" cannot be resolved to a type", nodeClass);
+            printError(element, matchable, "Class \"%s\" cannot be resolved to a type", nodeClass);
             return;
         }
         nodePackage = findPackage(typeElement);
@@ -812,7 +810,8 @@ public class MatchProcessor extends AbstractProcessor {
 
         Types typeUtils = processingEnv.getTypeUtils();
         TypeElement nodeClassElement = (TypeElement) typeUtils.asElement(nodeClassMirror);
-        for (String input : matchable.inputs()) {
+        List<String> inputs = getAnnotationValueList(matchable, "inputs", String.class);
+        for (String input : inputs) {
             boolean ok = false;
             TypeElement current = nodeClassElement;
             while (!ok && current != null) {
@@ -826,17 +825,19 @@ public class MatchProcessor extends AbstractProcessor {
                 current = (TypeElement) typeUtils.asElement(theSuper);
             }
             if (!ok) {
-                errorMessage(element, mirror, "Input named \"%s\" doesn't exist in %s", input, nodeClassElement.getSimpleName());
+                printError(element, matchable, "Input named \"%s\" doesn't exist in %s", input, nodeClassElement.getSimpleName());
             }
         }
 
-        declareType(nodeClassMirror, shortName, nodeClass, nodePackage, matchable.inputs(), matchable.commutative(), matchable.shareable(), element);
+        boolean commutative = getAnnotationValue(matchable, "commutative", Boolean.class);
+        boolean shareable = getAnnotationValue(matchable, "shareable", Boolean.class);
+        declareType(nodeClassMirror, shortName, nodeClass, nodePackage, inputs, commutative, shareable, element);
     }
 
-    private void processMatchRule(EconomicMap<TypeElement, MatchRuleDescriptor> map, Element element, AnnotationMirror mirror) {
-        if (!processedMatchRule.contains(element)) {
+    private void processMatchRules(Map<TypeElement, MatchRuleDescriptor> map, Element element, List<AnnotationMirror> matchRules) {
+        if (!processedMatchRules.contains(element)) {
             try {
-                processedMatchRule.add(element);
+                processedMatchRules.add(element);
 
                 // The annotation element type should ensure this is true.
                 assert element instanceof ExecutableElement;
@@ -849,14 +850,8 @@ public class MatchProcessor extends AbstractProcessor {
                     info = new MatchRuleDescriptor(topDeclaringType);
                     map.put(topDeclaringType, info);
                 }
-                List<AnnotationMirror> mirrors = null;
-                if (typeUtils().isSameType(mirror.getAnnotationType(), matchRulesTypeMirror)) {
-                    // Unpack the mirrors for a repeatable annotation
-                    mirrors = getAnnotationValueList(AnnotationMirror.class, mirror, "value");
-                }
-                int i = 0;
-                for (MatchRule matchRule : element.getAnnotationsByType(MatchRule.class)) {
-                    processMethodMatchRule((ExecutableElement) element, info, matchRule, mirrors != null ? mirrors.get(i++) : mirror);
+                for (AnnotationMirror matchRule : matchRules) {
+                    processMatchRule((ExecutableElement) element, info, matchRule);
                 }
             } catch (Throwable t) {
                 reportExceptionThrow(element, t);
@@ -871,16 +866,16 @@ public class MatchProcessor extends AbstractProcessor {
      * @param element
      */
     private void findMatchableNodes(Element element) {
-        processMatchableNode(element);
+        processMatchableNodes(element);
         Element enclosing = element.getEnclosingElement();
         while (enclosing != null) {
             if (enclosing.getKind() == ElementKind.CLASS || enclosing.getKind() == ElementKind.INTERFACE) {
                 TypeElement current = (TypeElement) enclosing;
                 while (current != null) {
-                    processMatchableNode(current);
+                    processMatchableNodes(current);
                     for (TypeMirror intf : current.getInterfaces()) {
                         Element interfaceElement = typeUtils().asElement(intf);
-                        processMatchableNode(interfaceElement);
+                        processMatchableNodes(interfaceElement);
                         // Recurse
                         findMatchableNodes(interfaceElement);
                     }
@@ -896,34 +891,34 @@ public class MatchProcessor extends AbstractProcessor {
         return processingEnv.getTypeUtils();
     }
 
-    private void processMethodMatchRule(ExecutableElement method, MatchRuleDescriptor info, MatchRule matchRule, AnnotationMirror mirror) {
-        logMessage("processMethodMatchRule %s %s\n", method, mirror);
+    private void processMatchRule(ExecutableElement method, MatchRuleDescriptor info, AnnotationMirror matchRule) {
+        logMessage("processMatchRule %s\n", method);
 
         Types typeUtils = typeUtils();
 
         if (!method.getModifiers().contains(Modifier.PUBLIC)) {
-            errorMessage(method, "MatchRule method %s must be public", method.getSimpleName());
+            printError(method, "MatchRule method %s must be public", method.getSimpleName());
             return;
         }
         if (method.getModifiers().contains(Modifier.STATIC)) {
-            errorMessage(method, "MatchRule method %s must be non-static", method.getSimpleName());
+            printError(method, "MatchRule method %s must be non-static", method.getSimpleName());
             return;
         }
 
         try {
             TypeMirror returnType = method.getReturnType();
-            if (!typeUtils.isSameType(returnType, processingEnv.getElementUtils().getTypeElement(ComplexMatchResult.class.getName()).asType())) {
-                errorMessage(method, "MatchRule method return type must be %s", ComplexMatchResult.class.getName());
+            if (!typeUtils.isSameType(returnType, processingEnv.getElementUtils().getTypeElement(COMPLEX_MATCH_RESULT_CLASS_NAME).asType())) {
+                printError(method, "MatchRule method return type must be %s", COMPLEX_MATCH_RESULT_CLASS_NAME);
                 return;
             }
 
-            String rule = matchRule.value();
+            String rule = getAnnotationValue(matchRule, "value", String.class);
             RuleParser parser = new RuleParser(rule);
             ArrayList<TypeDescriptor> expectedTypes = parser.capturedTypes();
             ArrayList<String> expectedNames = parser.capturedNames();
             List<? extends VariableElement> actualParameters = method.getParameters();
             if (expectedTypes.size() + 1 < actualParameters.size()) {
-                errorMessage(method, "Too many arguments for match method %s != %s", expectedTypes.size() + 1, actualParameters.size());
+                printError(method, "Too many arguments for match method %s != %s", expectedTypes.size() + 1, actualParameters.size());
                 return;
             }
 
@@ -934,12 +929,12 @@ public class MatchProcessor extends AbstractProcessor {
                 String name = parameter.getSimpleName().toString();
                 int nameIndex = expectedNames.indexOf(name);
                 if (nameIndex == -1) {
-                    errorMessage(method, "Argument \"%s\" isn't captured in the match rule", name);
+                    printError(method, "Argument \"%s\" isn't captured in the match rule", name);
                     return;
                 }
                 TypeMirror type = parameter.asType();
                 if (!typeUtils.isAssignable(expectedTypes.get(nameIndex).mirror, type)) {
-                    errorMessage(method, "Captured value \"%s\" of type %s is not assignable to argument of type %s", name, expectedTypes.get(nameIndex).mirror, type);
+                    printError(method, "Captured value \"%s\" of type %s is not assignable to argument of type %s", name, expectedTypes.get(nameIndex).mirror, type);
                     return;
                 }
             }
@@ -952,7 +947,7 @@ public class MatchProcessor extends AbstractProcessor {
             } else if (invoker.method != method) {
                 // This could be supported but it's easier if they are unique since the names
                 // are used in log output and snippet counters.
-                errorMessage(method, "Use unique method names for match methods: %s.%s != %s.%s", method.getReceiverType(), method.getSimpleName(), invoker.method.getReceiverType(),
+                printError(method, "Use unique method names for match methods: %s.%s != %s.%s", method.getReceiverType(), method.getSimpleName(), invoker.method.getReceiverType(),
                                 invoker.method.getSimpleName());
                 return;
             }
@@ -960,12 +955,12 @@ public class MatchProcessor extends AbstractProcessor {
             Element enclosing = method.getEnclosingElement();
             String declaringClass = "";
             String separator = "";
-            EconomicSet<Element> originatingElementsList = info.originatingElements;
+            Set<Element> originatingElementsList = info.originatingElements;
             originatingElementsList.add(method);
             while (enclosing != null) {
                 if (enclosing.getKind() == ElementKind.CLASS || enclosing.getKind() == ElementKind.INTERFACE) {
                     if (enclosing.getModifiers().contains(Modifier.PRIVATE)) {
-                        errorMessage(method, "MatchRule cannot be declared in a private %s %s", enclosing.getKind().name().toLowerCase(), enclosing);
+                        printError(method, "MatchRule cannot be declared in a private %s %s", enclosing.getKind().name().toLowerCase(), enclosing);
                         return;
                     }
                     originatingElementsList.add(enclosing);
@@ -988,144 +983,26 @@ public class MatchProcessor extends AbstractProcessor {
                 info.matchRules.add(new MatchRuleItem(match, invoker));
             }
         } catch (RuleParseError e) {
-            errorMessage(method, mirror, e.getMessage());
+            printError(method, matchRule, e.getMessage());
         }
     }
 
-    private void errorMessage(Element element, String format, Object... args) {
-        processingEnv.getMessager().printMessage(Kind.ERROR, String.format(format, args), element);
+    private Element elementForMessage(Element e) {
+        if (currentRound != null && !currentRound.getRootElements().contains(e) && currentElement != null) {
+            return currentElement;
+        }
+        return e;
     }
 
-    private void errorMessage(Element element, AnnotationMirror mirror, String format, Object... args) {
-        processingEnv.getMessager().printMessage(Kind.ERROR, String.format(format, args), element, mirror);
+    private void printError(Element annotatedElement, String format, Object... args) {
+        Element e = elementForMessage(annotatedElement);
+        String prefix = e == annotatedElement ? "" : annotatedElement + ": ";
+        processingEnv.getMessager().printMessage(Kind.ERROR, prefix + String.format(format, args), e);
     }
 
-    // TODO borrowed from com.oracle.truffle.dsl.processor.Utils
-    @SuppressWarnings("unchecked")
-    private static <T> List<T> getAnnotationValueList(Class<T> expectedListType, AnnotationMirror mirror, String name) {
-        List<? extends AnnotationValue> values = getAnnotationValue(List.class, mirror, name);
-        List<T> result = new ArrayList<>();
-
-        if (values != null) {
-            for (AnnotationValue value : values) {
-                T annotationValue = resolveAnnotationValue(expectedListType, value);
-                if (annotationValue != null) {
-                    result.add(annotationValue);
-                }
-            }
-        }
-        return result;
-    }
-
-    private static <T> T getAnnotationValue(Class<T> expectedType, AnnotationMirror mirror, String name) {
-        return resolveAnnotationValue(expectedType, getAnnotationValue(mirror, name));
-    }
-
-    @SuppressWarnings({"unchecked"})
-    private static <T> T resolveAnnotationValue(Class<T> expectedType, AnnotationValue value) {
-        if (value == null) {
-            return null;
-        }
-
-        Object unboxedValue = value.accept(new AnnotationValueVisitorImpl(), null);
-        if (unboxedValue != null) {
-            if (expectedType == TypeMirror.class && unboxedValue instanceof String) {
-                return null;
-            }
-            if (!expectedType.isAssignableFrom(unboxedValue.getClass())) {
-                throw new ClassCastException(unboxedValue.getClass().getName() + " not assignable from " + expectedType.getName());
-            }
-        }
-        return (T) unboxedValue;
-    }
-
-    private static AnnotationValue getAnnotationValue(AnnotationMirror mirror, String name) {
-        ExecutableElement valueMethod = null;
-        for (ExecutableElement method : ElementFilter.methodsIn(mirror.getAnnotationType().asElement().getEnclosedElements())) {
-            if (method.getSimpleName().toString().equals(name)) {
-                valueMethod = method;
-                break;
-            }
-        }
-
-        if (valueMethod == null) {
-            return null;
-        }
-
-        AnnotationValue value = mirror.getElementValues().get(valueMethod);
-        if (value == null) {
-            value = valueMethod.getDefaultValue();
-        }
-
-        return value;
-    }
-
-    private static class AnnotationValueVisitorImpl extends AbstractAnnotationValueVisitor7<Object, Void> {
-
-        @Override
-        public Object visitBoolean(boolean b, Void p) {
-            return Boolean.valueOf(b);
-        }
-
-        @Override
-        public Object visitByte(byte b, Void p) {
-            return Byte.valueOf(b);
-        }
-
-        @Override
-        public Object visitChar(char c, Void p) {
-            return c;
-        }
-
-        @Override
-        public Object visitDouble(double d, Void p) {
-            return d;
-        }
-
-        @Override
-        public Object visitFloat(float f, Void p) {
-            return f;
-        }
-
-        @Override
-        public Object visitInt(int i, Void p) {
-            return i;
-        }
-
-        @Override
-        public Object visitLong(long i, Void p) {
-            return i;
-        }
-
-        @Override
-        public Object visitShort(short s, Void p) {
-            return s;
-        }
-
-        @Override
-        public Object visitString(String s, Void p) {
-            return s;
-        }
-
-        @Override
-        public Object visitType(TypeMirror t, Void p) {
-            return t;
-        }
-
-        @Override
-        public Object visitEnumConstant(VariableElement c, Void p) {
-            return c;
-        }
-
-        @Override
-        public Object visitAnnotation(AnnotationMirror a, Void p) {
-            return a;
-        }
-
-        @Override
-        public Object visitArray(List<? extends AnnotationValue> vals, Void p) {
-            return vals;
-        }
-
+    private void printError(Element annotatedElement, AnnotationMirror annotation, String format, Object... args) {
+        Element e = elementForMessage(annotatedElement);
+        String prefix = e == annotatedElement ? "" : annotation + " on " + annotatedElement + ": ";
+        processingEnv.getMessager().printMessage(Kind.ERROR, prefix + String.format(format, args), e, annotation);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java
index 968e479ef85..a06fc5efd95 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java
@@ -169,7 +169,7 @@ public class SPARCNodeMatchRules extends NodeMatchRules {
                 SPARCAddressValue address = (SPARCAddressValue) operand(cas.getAddress());
                 Condition condition = successIsTrue ? Condition.EQ : Condition.NE;
 
-                Value result = getLIRGeneratorTool().emitValueCompareAndSwap(address, expectedValue, newValue);
+                Value result = getLIRGeneratorTool().emitValueCompareAndSwap(kind, address, expectedValue, newValue);
                 getLIRGeneratorTool().emitCompareBranch(kind.getPlatformKind(), result, expectedValue, condition, false, trueLabel, falseLabel, trueLabelProbability);
                 return null;
             };
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ArrayLengthProviderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ArrayLengthProviderTest.java
new file mode 100644
index 00000000000..3af3d8ca5aa
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ArrayLengthProviderTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015, 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.core.test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class ArrayLengthProviderTest extends GraalCompilerTest {
+
+    public static Object test0Snippet(ArrayList<?> list, boolean a) {
+        while (true) {
+            Object[] array = toArray(list);
+            if (array.length < 1) {
+                return null;
+            }
+            if (array[0] instanceof String || a) {
+                /*
+                 * This code is outside of the loop. Accessing the array reqires a ValueProxyNode.
+                 * When the simplification of the ArrayLengthNode replaces the length access with
+                 * the ArrayList.size used to create the array, then the value needs to have a
+                 * ValueProxyNode too. In addition, the two parts of the if-condition actually lead
+                 * to two separate loop exits, with two separate proxy nodes. A ValuePhiNode is
+                 * present originally for the array, and the array length simplification needs to
+                 * create a new ValuePhiNode for the two newly introduced ValueProxyNode.
+                 */
+                if (array.length < 1) {
+                    return null;
+                }
+                return array[0];
+            }
+        }
+    }
+
+    public static Object test1Snippet(ArrayList<?> list, boolean a, boolean b) {
+        while (true) {
+            Object[] array = toArray(list);
+            if (a || b) {
+                if (array.length < 1) {
+                    return null;
+                }
+                return array[0];
+            }
+        }
+    }
+
+    public static Object[] toArray(List<?> list) {
+        return new Object[list.size()];
+    }
+
+    @Test
+    public void test0() {
+        test("test0Snippet", new ArrayList<>(Arrays.asList("a", "b")), true);
+    }
+
+    @Test
+    public void test1() {
+        test("test1Snippet", new ArrayList<>(Arrays.asList("a", "b")), true, true);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CanonicalizedConversionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CanonicalizedConversionTest.java
new file mode 100644
index 00000000000..380bcc8b0dc
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CanonicalizedConversionTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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 org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.calc.AddNode;
+import org.graalvm.compiler.nodes.calc.FloatEqualsNode;
+import org.graalvm.compiler.nodes.calc.ReinterpretNode;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests that substitutions for {@link Double#doubleToLongBits(double)} and
+ * {@link Float#floatToIntBits(float)} produce graphs such that multiple calls to these methods with
+ * the same input are canonicalized.
+ */
+public class CanonicalizedConversionTest extends GraalCompilerTest {
+
+    @Override
+    protected boolean checkLowTierGraph(StructuredGraph graph) {
+        int reinterpretCount = 0;
+        int floatEqualsCount = 0;
+        int addCount = 0;
+        for (Node node : graph.getNodes()) {
+            if (node instanceof ReinterpretNode) {
+                reinterpretCount++;
+            } else if (node instanceof FloatEqualsNode) {
+                floatEqualsCount++;
+            } else if (node instanceof IfNode) {
+                Assert.fail("Unexpected node: " + node);
+            } else if (node instanceof AddNode) {
+                addCount++;
+            }
+        }
+        Assert.assertEquals(1, reinterpretCount);
+        Assert.assertEquals(1, floatEqualsCount);
+        Assert.assertEquals(2, addCount);
+        return true;
+    }
+
+    @Test
+    public void test4() {
+        test("snippet4", 567.890F);
+        test("snippet4", -567.890F);
+        test("snippet4", Float.NaN);
+    }
+
+    public static int snippet4(float value) {
+        return Float.floatToIntBits(value) + Float.floatToIntBits(value) + Float.floatToIntBits(value);
+    }
+
+    @Test
+    public void test5() {
+        test("snippet5", 567.890D);
+        test("snippet5", -567.890D);
+        test("snippet5", Double.NaN);
+    }
+
+    public static long snippet5(double value) {
+        return Double.doubleToLongBits(value) + Double.doubleToLongBits(value) + Double.doubleToLongBits(value);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java
new file mode 100644
index 00000000000..5654c7e58e7
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java
@@ -0,0 +1,86 @@
+/*
+ * 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 org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
+import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
+import org.graalvm.compiler.phases.common.LoweringPhase;
+import org.graalvm.compiler.phases.tiers.PhaseContext;
+import org.graalvm.compiler.virtual.phases.ea.EarlyReadEliminationPhase;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase}
+ * including those that triggered bugs in this phase.
+ */
+public class ConditionalEliminationTest15 extends ConditionalEliminationTestBase {
+
+    private void checkNodeCount(String methodName, Class<? extends Node> nodeClass, int count) {
+        StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
+
+        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        PhaseContext context = new PhaseContext(getProviders());
+
+        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        canonicalizer.apply(graph, context);
+
+        // Merge arr.length reads.
+        new EarlyReadEliminationPhase(canonicalizer).apply(graph, context);
+        new IterativeConditionalEliminationPhase(canonicalizer, true).apply(graph, context);
+
+        getDebugContext().dump(DebugContext.BASIC_LEVEL, graph, "After ConditionalEliminationPhase");
+
+        Assert.assertEquals(count, graph.getNodes().filter(nodeClass).count());
+    }
+
+    public static int testRedundantIntegerLessThanNode(int index, int[] arr) {
+        while (arr[index] != 42) {
+            if (index >= 0) { // redundant
+                return 1;
+            }
+        }
+        return 2;
+    }
+
+    public static int testRedundantIntegerLessThanNode2(int index, int[] arr) {
+        while (arr[index] != 42) {
+            if (index < arr.length) { // redundant
+                return 1;
+            }
+        }
+        return 2;
+    }
+
+    @Test
+    public void testRedundantSignedLessThanNode() {
+        checkNodeCount("testRedundantIntegerLessThanNode", IntegerLessThanNode.class, 0);
+        checkNodeCount("testRedundantIntegerLessThanNode2", IntegerLessThanNode.class, 0);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java
index d1b7a123b69..9941162055e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java
@@ -22,15 +22,18 @@
  */
 package org.graalvm.compiler.core.test;
 
+import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.GuardNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.graalvm.compiler.nodes.java.InstanceOfNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
 import org.graalvm.compiler.phases.common.FloatingReadPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
 import org.graalvm.compiler.phases.tiers.PhaseContext;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -60,6 +63,15 @@ public class ConditionalEliminationTest2 extends ConditionalEliminationTestBase
         final Entry next;
     }
 
+    static class A {
+    }
+
+    static class B extends A {
+    }
+
+    static class C extends A {
+    }
+
     public static Entry search(Entry start, String name, Entry alternative) {
         Entry current = start;
         do {
@@ -129,4 +141,81 @@ public class ConditionalEliminationTest2 extends ConditionalEliminationTestBase
         assertDeepEquals(0, graph.getNodes().filter(GuardNode.class).count());
     }
 
+    private void checkInstanceOfCount(String methodName, int count) {
+        StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
+
+        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        PhaseContext context = new PhaseContext(getProviders());
+
+        canonicalizer.apply(graph, context);
+        new ConditionalEliminationPhase(true).apply(graph, context);
+        getDebugContext().dump(DebugContext.BASIC_LEVEL, graph, "After ConditionalEliminationPhase");
+        canonicalizer.apply(graph, context);
+
+        Assert.assertEquals(count, graph.getNodes().filter(InstanceOfNode.class).count());
+    }
+
+    public static A testRedundantInstanceOfClass(Object value) {
+        if (value != null && value.getClass() == A.class) {
+            return (A) value;
+        }
+        return null;
+    }
+
+    public static Object testRedundantInstanceOfArray(Object value) {
+        if (value != null && value.getClass() == Object[].class) {
+            return ((Object[]) value)[0];
+        }
+        return null;
+    }
+
+    public static boolean testRedundantInstanceOfPrecise(Object value) {
+        if (value != null && value.getClass() == A.class) {
+            return value instanceof A;
+        }
+        return false;
+    }
+
+    public static boolean testRedundantInstanceOfImplicitNonNull(Object value) {
+        if (value.getClass() == A.class) {
+            return value instanceof A;
+        }
+        return false;
+    }
+
+    @Test
+    public void testRedundantInstanceOf() {
+        checkInstanceOfCount("testRedundantInstanceOfClass", 1);
+        checkInstanceOfCount("testRedundantInstanceOfArray", 1);
+        checkInstanceOfCount("testRedundantInstanceOfPrecise", 1);
+        checkInstanceOfCount("testRedundantInstanceOfImplicitNonNull", 1);
+    }
+
+    public static boolean testNonRedundantInstanceOfClass(Object value) {
+        if (value instanceof A) {
+            return (value != null && value.getClass() == A.class);
+        }
+        return false;
+    }
+
+    public static boolean testNonRedundantInstanceOfArray(Object value) {
+        if (value instanceof Object[]) {
+            return (value != null && value.getClass() == Object[].class);
+        }
+        return false;
+    }
+
+    public static boolean testNonRedundantInstanceOfImplicitNonNull(Object value) {
+        if (value instanceof Object[]) {
+            return value.getClass() == Object[].class;
+        }
+        return false;
+    }
+
+    @Test
+    public void testNonRedundantInstanceOf() {
+        checkInstanceOfCount("testNonRedundantInstanceOfClass", 2);
+        checkInstanceOfCount("testNonRedundantInstanceOfArray", 2);
+        checkInstanceOfCount("testNonRedundantInstanceOfImplicitNonNull", 2);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
index 991fab6af30..18e072f8d22 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
@@ -1054,7 +1054,7 @@ public abstract class GraalCompilerTest extends GraalTest {
         try (DebugContext.Scope s = debug.scope("Compile", graphToCompile)) {
             assert options != null;
             Request<CompilationResult> request = new Request<>(graphToCompile, installedCodeOwner, getProviders(), getBackend(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL,
-                            graphToCompile.getProfilingInfo(), createSuites(options), createLIRSuites(options), compilationResult, CompilationResultBuilderFactory.Default);
+                            graphToCompile.getProfilingInfo(), createSuites(options), createLIRSuites(options), compilationResult, CompilationResultBuilderFactory.Default, true);
             return GraalCompiler.compile(request);
         } catch (Throwable e) {
             throw debug.handle(e);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java
index 86baed4cbc6..08f1042dc96 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java
@@ -68,7 +68,7 @@ public class InfopointReasonTest extends GraalCompilerTest {
         final ResolvedJavaMethod method = getResolvedJavaMethod("testMethod");
         final StructuredGraph graph = parseEager(method, AllowAssumptions.YES);
         final CompilationResult cr = compileGraph(graph, graph.method(), getProviders(), getBackend(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, graph.getProfilingInfo(),
-                        createSuites(graph.getOptions()), createLIRSuites(graph.getOptions()), new CompilationResult(graph.compilationId()), CompilationResultBuilderFactory.Default);
+                        createSuites(graph.getOptions()), createLIRSuites(graph.getOptions()), new CompilationResult(graph.compilationId()), CompilationResultBuilderFactory.Default, true);
         for (Infopoint sp : cr.getInfopoints()) {
             assertNotNull(sp.reason);
             if (sp instanceof Call) {
@@ -90,7 +90,7 @@ public class InfopointReasonTest extends GraalCompilerTest {
         assertTrue(graphLineSPs > 0);
         PhaseSuite<HighTierContext> graphBuilderSuite = getCustomGraphBuilderSuite(GraphBuilderConfiguration.getDefault(getDefaultGraphBuilderPlugins()).withFullInfopoints(true));
         final CompilationResult cr = compileGraph(graph, graph.method(), getProviders(), getBackend(), graphBuilderSuite, OptimisticOptimizations.ALL, graph.getProfilingInfo(),
-                        createSuites(graph.getOptions()), createLIRSuites(graph.getOptions()), new CompilationResult(graph.compilationId()), CompilationResultBuilderFactory.Default);
+                        createSuites(graph.getOptions()), createLIRSuites(graph.getOptions()), new CompilationResult(graph.compilationId()), CompilationResultBuilderFactory.Default, true);
         int lineSPs = 0;
         for (Infopoint sp : cr.getInfopoints()) {
             assertNotNull(sp.reason);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java
index a84c6725cb2..fffd195a0c6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java
@@ -127,7 +127,7 @@ public class InvokeGraal {
             CompilationResultBuilderFactory factory = CompilationResultBuilderFactory.Default;
 
             /* Invoke the whole Graal compilation pipeline. */
-            GraalCompiler.compileGraph(graph, method, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, compilationResult, factory);
+            GraalCompiler.compileGraph(graph, method, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, compilationResult, factory, true);
 
             /*
              * Install the compilation result into the VM, i.e., copy the byte[] array that contains
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java
index 047b5d2fa90..8671415bfec 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java
@@ -106,6 +106,7 @@ public class GraalCompiler {
         public final LIRSuites lirSuites;
         public final T compilationResult;
         public final CompilationResultBuilderFactory factory;
+        public final boolean verifySourcePositions;
 
         /**
          * @param graph the graph to be compiled
@@ -122,7 +123,8 @@ public class GraalCompiler {
          * @param factory
          */
         public Request(StructuredGraph graph, ResolvedJavaMethod installedCodeOwner, Providers providers, Backend backend, PhaseSuite<HighTierContext> graphBuilderSuite,
-                        OptimisticOptimizations optimisticOpts, ProfilingInfo profilingInfo, Suites suites, LIRSuites lirSuites, T compilationResult, CompilationResultBuilderFactory factory) {
+                        OptimisticOptimizations optimisticOpts, ProfilingInfo profilingInfo, Suites suites, LIRSuites lirSuites, T compilationResult, CompilationResultBuilderFactory factory,
+                        boolean verifySourcePositions) {
             this.graph = graph;
             this.installedCodeOwner = installedCodeOwner;
             this.providers = providers;
@@ -134,6 +136,7 @@ public class GraalCompiler {
             this.lirSuites = lirSuites;
             this.compilationResult = compilationResult;
             this.factory = factory;
+            this.verifySourcePositions = verifySourcePositions;
         }
 
         /**
@@ -156,8 +159,9 @@ public class GraalCompiler {
      */
     public static <T extends CompilationResult> T compileGraph(StructuredGraph graph, ResolvedJavaMethod installedCodeOwner, Providers providers, Backend backend,
                     PhaseSuite<HighTierContext> graphBuilderSuite, OptimisticOptimizations optimisticOpts, ProfilingInfo profilingInfo, Suites suites, LIRSuites lirSuites, T compilationResult,
-                    CompilationResultBuilderFactory factory) {
-        return compile(new Request<>(graph, installedCodeOwner, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, compilationResult, factory));
+                    CompilationResultBuilderFactory factory, boolean verifySourcePositions) {
+        return compile(new Request<>(graph, installedCodeOwner, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, compilationResult, factory,
+                        verifySourcePositions));
     }
 
     /**
@@ -173,6 +177,9 @@ public class GraalCompiler {
             try (DebugContext.Scope s0 = debug.scope("GraalCompiler", r.graph, r.providers.getCodeCache()); DebugCloseable a = CompilerTimer.start(debug)) {
                 emitFrontEnd(r.providers, r.backend, r.graph, r.graphBuilderSuite, r.optimisticOpts, r.profilingInfo, r.suites);
                 emitBackEnd(r.graph, null, r.installedCodeOwner, r.backend, r.compilationResult, r.factory, null, r.lirSuites);
+                if (r.verifySourcePositions) {
+                    assert r.graph.verifySourcePositions(true);
+                }
             } catch (Throwable e) {
                 throw debug.handle(e);
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java
index 2e281b6cdfe..bff25657b9e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,8 +22,6 @@
  */
 package org.graalvm.compiler.core.gen;
 
-import jdk.vm.ci.meta.Value;
-
 import org.graalvm.compiler.core.match.MatchableNode;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.lir.LIRFrameState;
@@ -62,6 +60,8 @@ import org.graalvm.compiler.nodes.memory.FloatingReadNode;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.WriteNode;
 
+import jdk.vm.ci.meta.Value;
+
 @MatchableNode(nodeClass = ConstantNode.class, shareable = true)
 @MatchableNode(nodeClass = FloatConvertNode.class, inputs = {"value"})
 @MatchableNode(nodeClass = FloatingReadNode.class, inputs = {"address"})
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java
index af918c2d677..9a9a599d53f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java
@@ -166,6 +166,32 @@ public class DebugContextTest {
         Assert.assertEquals(expect, log);
     }
 
+    @Test
+    public void testContextScope() {
+        OptionValues options = new OptionValues(EconomicMap.create());
+        options = new OptionValues(options, DebugOptions.Log, ":5");
+        DebugContextSetup setup = new DebugContextSetup();
+        try (DebugContext debug = setup.openDebugContext(options)) {
+            try (DebugContext.Scope s0 = debug.scope("TestLogging")) {
+                try (DebugContext.Scope s1 = debug.withContext("A")) {
+                    for (Object o : debug.context()) {
+                        Assert.assertEquals(o, "A");
+                    }
+                } catch (Throwable t) {
+                    throw debug.handle(t);
+                }
+                try (DebugContext.Scope s1 = debug.withContext("B")) {
+                    for (Object o : debug.context()) {
+                        Assert.assertEquals(o, "B");
+                    }
+                } catch (Throwable t) {
+                    throw debug.handle(t);
+                }
+            }
+        }
+
+    }
+
     @Test
     public void testEnabledSandbox() {
         EconomicMap<OptionKey<?>, Object> map = EconomicMap.create();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CausableByCompilerAssert.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CausableByCompilerAssert.java
new file mode 100644
index 00000000000..ed7f8d18086
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CausableByCompilerAssert.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016, 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.debug;
+
+public interface CausableByCompilerAssert {
+    boolean isCausedByCompilerAssert();
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java
index 07d0cbfa63e..2c92614f11b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java
@@ -239,8 +239,11 @@ final class DebugConfigImpl implements DebugConfig {
 
     @Override
     public RuntimeException interceptException(DebugContext debug, Throwable e) {
-        if (e instanceof BailoutException && !DebugOptions.InterceptBailout.getValue(options)) {
-            return null;
+        if (e instanceof BailoutException) {
+            final boolean causedByCompilerAssert = e instanceof CausableByCompilerAssert && ((CausableByCompilerAssert) e).isCausedByCompilerAssert();
+            if (!DebugOptions.InterceptBailout.getValue(options) && !causedByCompilerAssert) {
+                return null;
+            }
         }
 
         OptionValues interceptOptions = new OptionValues(options,
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
index 183916eca54..058aa5e0308 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
@@ -96,7 +96,7 @@ public final class DebugContext implements AutoCloseable {
      */
     boolean metricsEnabled;
 
-    DebugConfig currentConfig;
+    DebugConfigImpl currentConfig;
     ScopeImpl currentScope;
     CloseableCounter currentTimer;
     CloseableCounter currentMemUseTracker;
@@ -738,6 +738,19 @@ public final class DebugContext implements AutoCloseable {
         }
     }
 
+    /**
+     * Create an unnamed scope that appends some context to the current scope.
+     *
+     * @param context an object to be appended to the {@linkplain #context() current} debug context
+     */
+    public DebugContext.Scope withContext(Object context) throws Throwable {
+        if (currentScope != null) {
+            return enterScope("", null, context);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Creates and enters a new debug scope which will be disjoint from the current debug scope.
      * <p>
@@ -787,7 +800,7 @@ public final class DebugContext implements AutoCloseable {
     class DisabledScope implements DebugContext.Scope {
         final boolean savedMetricsEnabled;
         final ScopeImpl savedScope;
-        final DebugConfig savedConfig;
+        final DebugConfigImpl savedConfig;
 
         DisabledScope() {
             this.savedMetricsEnabled = metricsEnabled;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java
deleted file mode 100644
index 08b72bd0245..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2012, 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.debug;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A node in a tree of values.
- */
-public class DebugValueMap {
-
-    /**
-     * The top level maps for all threads.
-     */
-    private static final List<DebugValueMap> topLevelMaps = new ArrayList<>();
-
-    private long[] values;
-    private List<DebugValueMap> children;
-    private String name;
-
-    public DebugValueMap(String name) {
-        this.name = name;
-    }
-
-    public void setCurrentValue(int index, long l) {
-        ensureSize(index);
-        values[index] = l;
-    }
-
-    public long getCurrentValue(int index) {
-        ensureSize(index);
-        return values[index];
-    }
-
-    public void clearChildren() {
-        if (children != null) {
-            children.clear();
-        }
-    }
-
-    public void reset() {
-        if (values != null) {
-            Arrays.fill(values, 0L);
-        }
-        if (children != null) {
-            for (DebugValueMap child : children) {
-                child.reset();
-            }
-        }
-    }
-
-    private void ensureSize(int index) {
-        if (values == null) {
-            values = new long[index + 1];
-        }
-        if (values.length <= index) {
-            values = Arrays.copyOf(values, index + 1);
-        }
-    }
-
-    private int capacity() {
-        return (values == null) ? 0 : values.length;
-    }
-
-    public void addChild(DebugValueMap map) {
-        if (children == null) {
-            children = new ArrayList<>(4);
-        }
-        children.add(map);
-    }
-
-    public List<DebugValueMap> getChildren() {
-        if (children == null) {
-            return Collections.emptyList();
-        } else {
-            return Collections.unmodifiableList(children);
-        }
-    }
-
-    public boolean hasChildren() {
-        return children != null && !children.isEmpty();
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public String toString() {
-        return "DebugValueMap<" + getName() + ">";
-    }
-
-    public static synchronized void registerTopLevel(DebugValueMap map) {
-        topLevelMaps.add(map);
-    }
-
-    public static synchronized List<DebugValueMap> getTopLevelMaps() {
-        return topLevelMaps;
-    }
-
-    /**
-     * The top level map for the current thread.
-     */
-    private static final ThreadLocal<DebugValueMap> topLevelMap = new ThreadLocal<>();
-
-    static DebugValueMap getTopLevelMap() {
-        DebugValueMap map = topLevelMap.get();
-        if (map == null) {
-            map = new DebugValueMap(Thread.currentThread().getName());
-            topLevelMap.set(map);
-            registerTopLevel(map);
-        }
-        return map;
-    }
-
-    public void normalize() {
-        if (hasChildren()) {
-            Map<String, DebugValueMap> occurred = new HashMap<>();
-            for (DebugValueMap map : children) {
-                String mapName = map.getName();
-                if (!occurred.containsKey(mapName)) {
-                    occurred.put(mapName, map);
-                    map.normalize();
-                } else {
-                    occurred.get(mapName).mergeWith(map);
-                    occurred.get(mapName).normalize();
-                }
-            }
-
-            if (occurred.values().size() < children.size()) {
-                // At least one duplicate was found.
-                children.clear();
-                for (DebugValueMap map : occurred.values()) {
-                    addChild(map);
-                    map.normalize();
-                }
-            }
-        }
-    }
-
-    private void mergeWith(DebugValueMap map) {
-        if (map.hasChildren()) {
-            if (hasChildren()) {
-                children.addAll(map.children);
-            } else {
-                children = map.children;
-            }
-            map.children = null;
-        }
-
-        int size = Math.max(this.capacity(), map.capacity());
-        ensureSize(size);
-        for (int i = 0; i < size; ++i) {
-            long curValue = getCurrentValue(i);
-            long otherValue = map.getCurrentValue(i);
-            setCurrentValue(i, curValue + otherValue);
-        }
-    }
-
-    public void group() {
-        if (this.hasChildren()) {
-            List<DebugValueMap> oldChildren = new ArrayList<>(this.children);
-            this.children.clear();
-            for (DebugValueMap map : oldChildren) {
-                mergeWith(map);
-            }
-        }
-    }
-}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java
index 45af5e12981..c12bbf6f6b1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java
@@ -72,9 +72,10 @@ public class PathUtilities {
 
     /**
      * A maximum file name length supported by most file systems. There is no platform independent
-     * way to get this in Java.
+     * way to get this in Java. Normally it is 255. But for AUFS it is 242. Refer AUFS_MAX_NAMELEN
+     * in http://aufs.sourceforge.net/aufs3/man.html.
      */
-    private static final int MAX_FILE_NAME_LENGTH = 255;
+    private static final int MAX_FILE_NAME_LENGTH = 242;
 
     private static final String ELLIPSIS = "...";
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java
index b4f15ada43c..3312053cd75 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java
@@ -38,31 +38,35 @@ public final class ScopeImpl implements DebugContext.Scope {
         final String indent;
         final IndentImpl parentIndent;
 
+        boolean isEmitted() {
+            return emitted;
+        }
+
+        private boolean emitted;
+
         IndentImpl(IndentImpl parentIndent) {
             this.parentIndent = parentIndent;
             this.indent = (parentIndent == null ? "" : parentIndent.indent + INDENTATION_INCREMENT);
         }
 
-        private boolean logScopeName() {
-            return logScopeName;
-        }
-
         private void printScopeName(StringBuilder str, boolean isCurrent) {
-            if (logScopeName) {
-                boolean parentPrinted = false;
+            if (!emitted) {
+                boolean mustPrint = true;
                 if (parentIndent != null) {
-                    parentPrinted = parentIndent.logScopeName();
-                    parentIndent.printScopeName(str, false);
+                    if (!parentIndent.isEmitted()) {
+                        parentIndent.printScopeName(str, false);
+                        mustPrint = false;
+                    }
                 }
                 /*
-                 * Always print the current scope, scopes with context and the any scope whose
-                 * parent didn't print. This ensure the first new scope always shows up.
+                 * Always print the current scope, scopes with context and any scope whose parent
+                 * didn't print. This ensure the first new scope always shows up.
                  */
-                if (isCurrent || printContext(null) != 0 || !parentPrinted) {
+                if (isCurrent || printContext(null) != 0 || mustPrint) {
                     str.append(indent).append("[thread:").append(Thread.currentThread().getId()).append("] scope: ").append(getQualifiedName()).append(System.lineSeparator());
                 }
                 printContext(str);
-                logScopeName = false;
+                emitted = true;
             }
         }
 
@@ -116,7 +120,12 @@ public final class ScopeImpl implements DebugContext.Scope {
     private final ScopeImpl parent;
     private final boolean sandbox;
     private IndentImpl lastUsedIndent;
-    private boolean logScopeName;
+
+    private boolean isEmptyScope() {
+        return emptyScope;
+    }
+
+    private final boolean emptyScope;
 
     private final Object[] context;
 
@@ -136,23 +145,24 @@ public final class ScopeImpl implements DebugContext.Scope {
     private PrintStream output;
     private boolean interceptDisabled;
 
-    static final Object[] EMPTY_CONTEXT = new Object[0];
-
     ScopeImpl(DebugContext owner, Thread thread) {
         this(owner, thread.getName(), null, false);
     }
 
-    ScopeImpl(DebugContext owner, String unqualifiedName, ScopeImpl parent, boolean sandbox, Object... context) {
+    private ScopeImpl(DebugContext owner, String unqualifiedName, ScopeImpl parent, boolean sandbox, Object... context) {
         this.owner = owner;
         this.parent = parent;
         this.sandbox = sandbox;
         this.context = context;
         this.unqualifiedName = unqualifiedName;
         if (parent != null) {
-            logScopeName = !unqualifiedName.equals("");
+            emptyScope = unqualifiedName.equals("");
             this.interceptDisabled = parent.interceptDisabled;
         } else {
-            logScopeName = true;
+            if (unqualifiedName.isEmpty()) {
+                throw new IllegalArgumentException("root scope name must be non-empty");
+            }
+            emptyScope = false;
         }
 
         this.output = TTY.out;
@@ -169,29 +179,29 @@ public final class ScopeImpl implements DebugContext.Scope {
         return parent == null;
     }
 
-    public boolean isDumpEnabled(int dumpLevel) {
+    boolean isDumpEnabled(int dumpLevel) {
         assert dumpLevel >= 0;
         return currentDumpLevel >= dumpLevel;
     }
 
-    public boolean isVerifyEnabled() {
+    boolean isVerifyEnabled() {
         return verifyEnabled;
     }
 
-    public boolean isLogEnabled(int logLevel) {
+    boolean isLogEnabled(int logLevel) {
         assert logLevel > 0;
         return currentLogLevel >= logLevel;
     }
 
-    public boolean isCountEnabled() {
+    boolean isCountEnabled() {
         return countEnabled;
     }
 
-    public boolean isTimeEnabled() {
+    boolean isTimeEnabled() {
         return timeEnabled;
     }
 
-    public boolean isMemUseTrackingEnabled() {
+    boolean isMemUseTrackingEnabled() {
         return memUseTrackingEnabled;
     }
 
@@ -307,7 +317,7 @@ public final class ScopeImpl implements DebugContext.Scope {
         throw silenceException(RuntimeException.class, e);
     }
 
-    void updateFlags(DebugConfig config) {
+    void updateFlags(DebugConfigImpl config) {
         if (config == null) {
             countEnabled = false;
             memUseTrackingEnabled = false;
@@ -317,6 +327,14 @@ public final class ScopeImpl implements DebugContext.Scope {
             // Be pragmatic: provide a default log stream to prevent a crash if the stream is not
             // set while logging
             output = TTY.out;
+        } else if (isEmptyScope()) {
+            countEnabled = parent.countEnabled;
+            memUseTrackingEnabled = parent.memUseTrackingEnabled;
+            timeEnabled = parent.timeEnabled;
+            verifyEnabled = parent.verifyEnabled;
+            output = parent.output;
+            currentDumpLevel = parent.currentDumpLevel;
+            currentLogLevel = parent.currentLogLevel;
         } else {
             countEnabled = config.isCountEnabled(this);
             memUseTrackingEnabled = config.isMemUseTrackingEnabled(this);
@@ -404,18 +422,21 @@ public final class ScopeImpl implements DebugContext.Scope {
             if (parent == null) {
                 qualifiedName = unqualifiedName;
             } else {
-                qualifiedName = parent.getQualifiedName() + SCOPE_SEP + unqualifiedName;
+                qualifiedName = parent.getQualifiedName();
+                if (!isEmptyScope()) {
+                    qualifiedName += SCOPE_SEP + unqualifiedName;
+                }
             }
         }
         return qualifiedName;
     }
 
-    public Indent pushIndentLogger() {
+    Indent pushIndentLogger() {
         lastUsedIndent = getLastUsedIndent().indent();
         return lastUsedIndent;
     }
 
-    public IndentImpl getLastUsedIndent() {
+    private IndentImpl getLastUsedIndent() {
         if (lastUsedIndent == null) {
             if (parent != null) {
                 lastUsedIndent = new IndentImpl(parent.getLastUsedIndent());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java
index 482de328b49..2634b693daa 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java
@@ -1199,7 +1199,7 @@ public class Graph {
         return true;
     }
 
-    public boolean verifySourcePositions() {
+    public boolean verifySourcePositions(boolean performConsistencyCheck) {
         if (trackNodeSourcePosition()) {
             ResolvedJavaMethod root = null;
             for (Node node : getNodes()) {
@@ -1211,6 +1211,11 @@ public class Graph {
                         assert pos.verifyRootMethod(root) : node;
                     }
                 }
+
+                // More strict node-type-specific check
+                if (performConsistencyCheck) {
+                    node.verifySourcePosition();
+                }
             }
         }
         return true;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index 850eb49bd42..23816ad1c18 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -263,7 +263,7 @@ public abstract class Node implements Cloneable, Formattable, NodeInterface {
     static class NodeCreationStackTrace extends NodeStackTrace {
     }
 
-    static class NodeInsertionStackTrace extends NodeStackTrace {
+    public static class NodeInsertionStackTrace extends NodeStackTrace {
     }
 
     public Node(NodeClass<? extends Node> c) {
@@ -1063,6 +1063,10 @@ public abstract class Node implements Cloneable, Formattable, NodeInterface {
         return true;
     }
 
+    public boolean verifySourcePosition() {
+        return true;
+    }
+
     /**
      * Perform expensive verification of inputs, usages, predecessors and successors.
      *
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
index a18ef7f8bdc..1b3405bf477 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
@@ -51,6 +51,7 @@ import org.graalvm.compiler.debug.CounterKey;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.debug.TTY;
 import org.graalvm.compiler.debug.TimerKey;
 import org.graalvm.compiler.graph.Edges.Type;
 import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
@@ -125,11 +126,33 @@ public final class NodeClass<T> extends FieldIntrospection<T> {
     }
 
     public static <T> NodeClass<T> get(Class<T> clazz) {
-        NodeClass<T> result = getUnchecked(clazz);
-        if (result == null && clazz != NODE_CLASS) {
-            throw GraalError.shouldNotReachHere("TYPE field not initialized for class " + clazz.getTypeName());
+        int numTries = 0;
+        while (true) {
+            boolean shouldBeInitializedBefore = UnsafeAccess.UNSAFE.shouldBeInitialized(clazz);
+
+            NodeClass<T> result = getUnchecked(clazz);
+            if (result != null || clazz == NODE_CLASS) {
+                return result;
+            }
+
+            /*
+             * GR-9537: We observed a transient problem with TYPE fields being null. Retry a couple
+             * of times and print something to the log so that we can gather more diagnostic
+             * information without failing gates.
+             */
+            numTries++;
+            boolean shouldBeInitializedAfter = UnsafeAccess.UNSAFE.shouldBeInitialized(clazz);
+            String msg = "GR-9537 Reflective field access of TYPE field returned null. This is probably a bug in HotSpot class initialization. " +
+                            " clazz: " + clazz.getTypeName() + ", numTries: " + numTries +
+                            ", shouldBeInitializedBefore: " + shouldBeInitializedBefore + ", shouldBeInitializedAfter: " + shouldBeInitializedAfter;
+            if (numTries <= 100) {
+                TTY.println(msg);
+                UnsafeAccess.UNSAFE.ensureClassInitialized(clazz);
+            } else {
+                throw GraalError.shouldNotReachHere(msg);
+            }
+            return result;
         }
-        return result;
     }
 
     private static final Class<?> NODE_CLASS = Node.class;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java
index 34844a51feb..8e69c45642a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java
@@ -29,6 +29,7 @@ import static jdk.vm.ci.aarch64.AArch64.sp;
 import static jdk.vm.ci.aarch64.AArch64.zr;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp;
+import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
 
 import jdk.internal.vm.compiler.collections.EconomicSet;
@@ -41,6 +42,7 @@ import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules;
 import org.graalvm.compiler.core.common.CompilationIdentifier;
+import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
@@ -48,6 +50,7 @@ import org.graalvm.compiler.hotspot.HotSpotDataBuilder;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
 import org.graalvm.compiler.hotspot.HotSpotHostBackend;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
+import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -66,12 +69,15 @@ import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
+import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
+import jdk.vm.ci.hotspot.HotSpotSentinelConstant;
 import jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
@@ -269,7 +275,7 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend {
             Register klass = r10;
             if (config.useCompressedClassPointers) {
                 masm.ldr(32, klass, klassAddress);
-                AArch64HotSpotMove.decodeKlassPointer(masm, klass, klass, providers.getRegisters().getHeapBaseRegister(), config.getKlassEncoding());
+                AArch64HotSpotMove.decodeKlassPointer(crb, masm, klass, klass, config.getKlassEncoding(), config);
             } else {
                 masm.ldr(64, klass, klassAddress);
             }
@@ -285,6 +291,23 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend {
         crb.recordMark(config.MARKID_OSR_ENTRY);
         masm.bind(verifiedStub);
         crb.recordMark(config.MARKID_VERIFIED_ENTRY);
+
+        if (GeneratePIC.getValue(crb.getOptions())) {
+            // Check for method state
+            HotSpotFrameContext frameContext = (HotSpotFrameContext) crb.frameContext;
+            if (!frameContext.isStub) {
+                crb.recordInlineDataInCodeWithNote(new HotSpotSentinelConstant(LIRKind.value(AArch64Kind.QWORD), JavaKind.Long), HotSpotConstantLoadAction.MAKE_NOT_ENTRANT);
+                try (ScratchRegister sc = masm.getScratchRegister()) {
+                    Register scratch = sc.getRegister();
+                    masm.addressOf(scratch);
+                    masm.ldr(64, scratch, AArch64Address.createBaseRegisterOnlyAddress(scratch));
+                    Label noCall = new Label();
+                    masm.cbz(64, scratch, noCall);
+                    AArch64Call.directJmp(crb, masm, getForeignCalls().lookupForeignCall(WRONG_METHOD_HANDLER));
+                    masm.bind(noCall);
+                }
+            }
+        }
     }
 
     private static void emitCodeBody(CompilationResultBuilder crb, LIR lir, AArch64MacroAssembler masm) {
@@ -299,8 +322,10 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend {
      * @see "http://mail.openjdk.java.net/pipermail/aarch64-port-dev/2013-September/000273.html"
      */
     public static void emitInvalidatePlaceholder(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-        crb.blockComment("[nop for method invalidation]");
-        masm.nop();
+        if (!GeneratePIC.getValue(crb.getOptions())) {
+            crb.blockComment("[nop for method invalidation]");
+            masm.nop();
+        }
     }
 
     private void emitCodeSuffix(CompilationResultBuilder crb, AArch64MacroAssembler masm, FrameMap frameMap) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
index 020459cb798..35a8c7e992b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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
@@ -25,6 +26,10 @@ package org.graalvm.compiler.hotspot.aarch64;
 import static jdk.vm.ci.aarch64.AArch64.sp;
 import static jdk.vm.ci.common.InitTimer.timer;
 
+import jdk.vm.ci.code.Architecture;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterConfig;
+import jdk.vm.ci.code.TargetDescription;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.aarch64.AArch64AddressLoweringByUse;
@@ -64,10 +69,6 @@ import org.graalvm.compiler.serviceprovider.ServiceProvider;
 import org.graalvm.compiler.word.WordTypes;
 
 import jdk.vm.ci.aarch64.AArch64;
-import jdk.vm.ci.code.Architecture;
-import jdk.vm.ci.code.RegisterArray;
-import jdk.vm.ci.code.RegisterConfig;
-import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
@@ -77,6 +78,9 @@ import jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig;
 import jdk.vm.ci.meta.Value;
 import jdk.vm.ci.runtime.JVMCIBackend;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @ServiceProvider(HotSpotBackendFactory.class)
 public class AArch64HotSpotBackendFactory implements HotSpotBackendFactory {
 
@@ -200,12 +204,20 @@ public class AArch64HotSpotBackendFactory implements HotSpotBackendFactory {
     }
 
     protected static Value[] createNativeABICallerSaveRegisters(@SuppressWarnings("unused") GraalHotSpotVMConfig config, RegisterConfig regConfig) {
-        AArch64HotSpotRegisterConfig conf = (AArch64HotSpotRegisterConfig) regConfig;
-        RegisterArray callerSavedRegisters = conf.getCallerSaveRegisters();
-        int size = callerSavedRegisters.size();
-        Value[] nativeABICallerSaveRegisters = new Value[size];
-        for (int i = 0; i < size; i++) {
-            nativeABICallerSaveRegisters[i] = callerSavedRegisters.get(i).asValue();
+        List<Register> callerSave = new ArrayList<>(regConfig.getAllocatableRegisters().asList());
+        callerSave.remove(AArch64.r19);
+        callerSave.remove(AArch64.r20);
+        callerSave.remove(AArch64.r21);
+        callerSave.remove(AArch64.r22);
+        callerSave.remove(AArch64.r23);
+        callerSave.remove(AArch64.r24);
+        callerSave.remove(AArch64.r25);
+        callerSave.remove(AArch64.r26);
+        callerSave.remove(AArch64.r27);
+        callerSave.remove(AArch64.r28);
+        Value[] nativeABICallerSaveRegisters = new Value[callerSave.size()];
+        for (int i = 0; i < callerSave.size(); i++) {
+            nativeABICallerSaveRegisters[i] = callerSave.get(i).asValue();
         }
         return nativeABICallerSaveRegisters;
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java
index ee841e6195a..f931780ff4e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java
@@ -24,6 +24,7 @@ package org.graalvm.compiler.hotspot.aarch64;
 
 import static jdk.vm.ci.aarch64.AArch64.zr;
 
+import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.Opcode;
@@ -37,20 +38,22 @@ public class AArch64HotSpotCRuntimeCallEpilogueOp extends AArch64LIRInstruction
     public static final LIRInstructionClass<AArch64HotSpotCRuntimeCallEpilogueOp> TYPE = LIRInstructionClass.create(AArch64HotSpotCRuntimeCallEpilogueOp.class);
 
     private final int threadLastJavaSpOffset;
-    private final int threadLastJavaFpOffset;
+    private final int threadLastJavaPcOffset;
     private final Register thread;
+    @SuppressWarnings("unused") private final Label label;
 
-    public AArch64HotSpotCRuntimeCallEpilogueOp(int threadLastJavaSpOffset, int threadLastJavaFpOffset, Register thread) {
+    public AArch64HotSpotCRuntimeCallEpilogueOp(int threadLastJavaSpOffset, int threadLastJavaPcOffset, Register thread, Label label) {
         super(TYPE);
         this.threadLastJavaSpOffset = threadLastJavaSpOffset;
-        this.threadLastJavaFpOffset = threadLastJavaFpOffset;
+        this.threadLastJavaPcOffset = threadLastJavaPcOffset;
         this.thread = thread;
+        this.label = label;
     }
 
     @Override
     public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
         // Reset last Java frame:
         masm.str(64, zr, masm.makeAddress(thread, threadLastJavaSpOffset, 8));
-        masm.str(64, zr, masm.makeAddress(thread, threadLastJavaFpOffset, 8));
+        masm.str(64, zr, masm.makeAddress(thread, threadLastJavaPcOffset, 8));
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java
index c28be7f236a..295761b8936 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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
@@ -25,7 +26,6 @@ package org.graalvm.compiler.hotspot.aarch64;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static jdk.vm.ci.aarch64.AArch64.sp;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp;
 
 import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
@@ -43,16 +43,14 @@ public class AArch64HotSpotCRuntimeCallPrologueOp extends AArch64LIRInstruction
 
     private final int threadLastJavaSpOffset;
     private final int threadLastJavaPcOffset;
-    private final int threadLastJavaFpOffset;
     private final Register thread;
     @Temp({REG}) protected AllocatableValue scratch;
     private final Label label;
 
-    public AArch64HotSpotCRuntimeCallPrologueOp(int threadLastJavaSpOffset, int threadLastJavaPcOffset, int threadLastJavaFpOffset, Register thread, AllocatableValue scratch, Label label) {
+    public AArch64HotSpotCRuntimeCallPrologueOp(int threadLastJavaSpOffset, int threadLastJavaPcOffset, Register thread, AllocatableValue scratch, Label label) {
         super(TYPE);
         this.threadLastJavaSpOffset = threadLastJavaSpOffset;
         this.threadLastJavaPcOffset = threadLastJavaPcOffset;
-        this.threadLastJavaFpOffset = threadLastJavaFpOffset;
         this.thread = thread;
         this.scratch = scratch;
         this.label = label;
@@ -69,7 +67,5 @@ public class AArch64HotSpotCRuntimeCallPrologueOp extends AArch64LIRInstruction
         // Get the current PC. Use a label to patch the return address.
         masm.adr(scratchRegister, label);
         masm.str(64, scratchRegister, masm.makeAddress(thread, threadLastJavaPcOffset, 8));
-
-        masm.str(64, fp, masm.makeAddress(thread, threadLastJavaFpOffset, 8));
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java
new file mode 100644
index 00000000000..4aeebf4b250
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 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.aarch64;
+
+import static jdk.vm.ci.code.ValueUtil.asRegister;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+import jdk.vm.ci.code.CallingConvention;
+import jdk.vm.ci.meta.AllocatableValue;
+import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.Value;
+
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
+import org.graalvm.compiler.lir.LIRFrameState;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.LIRValueUtil;
+import org.graalvm.compiler.lir.ValueProcedure;
+import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+public final class AArch64HotSpotConstantRetrievalOp extends AArch64LIRInstruction {
+    public static final LIRInstructionClass<AArch64HotSpotConstantRetrievalOp> TYPE = LIRInstructionClass.create(AArch64HotSpotConstantRetrievalOp.class);
+
+    @Def protected AllocatableValue result;
+    protected final Constant[] constants;
+    @Alive protected AllocatableValue[] constantDescriptions;
+    @Temp protected AllocatableValue[] gotSlotOffsetParameters;
+    @Temp protected AllocatableValue[] descriptionParameters;
+    @Temp protected Value[] callTemps;
+    @State protected LIRFrameState frameState;
+    private final ForeignCallLinkage callLinkage;
+    private final Object[] notes;
+
+    private class CollectTemporaries implements ValueProcedure {
+        ArrayList<Value> values = new ArrayList<>();
+
+        CollectTemporaries() {
+            forEachTemp(this);
+        }
+
+        public Value[] asArray() {
+            Value[] copy = new Value[values.size()];
+            return values.toArray(copy);
+        }
+
+        @Override
+        public Value doValue(Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
+            values.add(value);
+            return value;
+        }
+    }
+
+    public AArch64HotSpotConstantRetrievalOp(Constant[] constants, AllocatableValue[] constantDescriptions, LIRFrameState frameState, ForeignCallLinkage callLinkage, Object[] notes) {
+        super(TYPE);
+        this.constantDescriptions = constantDescriptions;
+        this.constants = constants;
+        this.frameState = frameState;
+        this.notes = notes;
+        assert constants.length == notes.length;
+
+        // call arguments
+        CallingConvention callingConvention = callLinkage.getOutgoingCallingConvention();
+        this.gotSlotOffsetParameters = new AllocatableValue[constants.length];
+        int argIndex = 0;
+        for (int i = 0; i < constants.length; i++, argIndex++) {
+            this.gotSlotOffsetParameters[i] = callingConvention.getArgument(argIndex);
+        }
+        this.descriptionParameters = new AllocatableValue[constantDescriptions.length];
+        for (int i = 0; i < constantDescriptions.length; i++, argIndex++) {
+            this.descriptionParameters[i] = callingConvention.getArgument(argIndex);
+        }
+        this.result = callingConvention.getReturn();
+
+        this.callLinkage = callLinkage;
+
+        // compute registers that are killed by the stub, but are not used as other temps.
+        this.callTemps = new Value[0];
+        this.callTemps = LIRValueUtil.subtractRegisters(callLinkage.getTemporaries(), new CollectTemporaries().asArray());
+    }
+
+    @Override
+    public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+        // metadata_adr
+        for (int i = 0; i < constants.length; i++) {
+            crb.recordInlineDataInCodeWithNote(constants[i], notes[i]);
+            masm.addressOf(asRegister(gotSlotOffsetParameters[i]));
+        }
+
+        for (int i = 0; i < constantDescriptions.length; i++) {
+            masm.mov(64, asRegister(descriptionParameters[i]), asRegister(constantDescriptions[i]));
+        }
+
+        final int before = masm.position();
+        masm.bl(before);
+        final int after = masm.position();
+        crb.recordDirectCall(before, after, callLinkage, frameState);
+    }
+
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
index 3e9d19ae1a4..2a899813e1e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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
@@ -23,11 +24,21 @@
 
 package org.graalvm.compiler.hotspot.aarch64;
 
+import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.INITIALIZE_KLASS_BY_SYMBOL;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_KLASS_BY_SYMBOL;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_STRING_BY_SYMBOL;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_DYNAMIC_INVOKE;
+import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.RESOLVE;
+import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.INITIALIZE;
+import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.LOAD_COUNTERS;
 import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
 
 import java.util.function.Function;
 
+import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
 import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode;
 import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
@@ -38,6 +49,7 @@ import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool;
 import org.graalvm.compiler.core.common.CompressEncoding;
 import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.calc.Condition;
+import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.core.common.spi.LIRKindTool;
 import org.graalvm.compiler.debug.GraalError;
@@ -48,6 +60,7 @@ import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
 import org.graalvm.compiler.hotspot.HotSpotLockStack;
+import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -66,6 +79,9 @@ import org.graalvm.compiler.lir.aarch64.AArch64FrameMapBuilder;
 import org.graalvm.compiler.lir.aarch64.AArch64Move;
 import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreOp;
 import org.graalvm.compiler.lir.aarch64.AArch64PrefetchOp;
+import org.graalvm.compiler.lir.aarch64.AArch64SaveRegistersOp;
+import org.graalvm.compiler.lir.aarch64.AArch64RestoreRegistersOp;
+
 import org.graalvm.compiler.lir.gen.LIRGenerationResult;
 
 import jdk.vm.ci.aarch64.AArch64;
@@ -84,6 +100,7 @@ import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 import jdk.vm.ci.meta.Value;
+import org.graalvm.compiler.options.OptionValues;
 
 /**
  * LIR generator specialized for AArch64 HotSpot.
@@ -114,7 +131,7 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
         return getResult().getStub() != null;
     }
 
-    @SuppressWarnings("unused") private LIRFrameState currentRuntimeCallInfo;
+    private LIRFrameState currentRuntimeCallInfo;
 
     @Override
     protected void emitForeignCallOp(ForeignCallLinkage linkage, Value result, Value[] arguments, Value[] temps, LIRFrameState info) {
@@ -145,8 +162,45 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
         append(new AArch64CCall(nativeCallingConvention.getReturn(), ptr, argLocations));
     }
 
-    public SaveRegistersOp emitSaveAllRegisters() {
-        throw GraalError.unimplemented();
+    /**
+     * @param savedRegisters the registers saved by this operation which may be subject to pruning
+     * @param savedRegisterLocations the slots to which the registers are saved
+     * @param supportsRemove determines if registers can be pruned
+     */
+    protected AArch64SaveRegistersOp emitSaveRegisters(Register[] savedRegisters, AllocatableValue[] savedRegisterLocations, boolean supportsRemove) {
+        AArch64SaveRegistersOp save = new AArch64SaveRegistersOp(savedRegisters, savedRegisterLocations, supportsRemove);
+        append(save);
+        return save;
+    }
+
+    /**
+     * Allocate a stack slot for saving a register.
+     */
+    protected VirtualStackSlot allocateSaveRegisterLocation(Register register) {
+        PlatformKind kind = target().arch.getLargestStorableKind(register.getRegisterCategory());
+        if (kind.getVectorLength() > 1) {
+            // we don't use vector registers, so there is no need to save them
+            kind = AArch64Kind.QWORD;
+        }
+        return getResult().getFrameMapBuilder().allocateSpillSlot(LIRKind.value(kind));
+    }
+
+    /**
+     * Adds a node to the graph that saves all allocatable registers to the stack.
+     *
+     * @param supportsRemove determines if registers can be pruned
+     * @return the register save node
+     */
+    private AArch64SaveRegistersOp emitSaveAllRegisters(Register[] savedRegisters, boolean supportsRemove) {
+        AllocatableValue[] savedRegisterLocations = new AllocatableValue[savedRegisters.length];
+        for (int i = 0; i < savedRegisters.length; i++) {
+            savedRegisterLocations[i] = allocateSaveRegisterLocation(savedRegisters[i]);
+        }
+        return emitSaveRegisters(savedRegisters, savedRegisterLocations, supportsRemove);
+    }
+
+    protected void emitRestoreRegisters(AArch64SaveRegistersOp save) {
+        append(new AArch64RestoreRegistersOp(save.getSlots().clone(), save));
     }
 
     @Override
@@ -199,6 +253,7 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
     @Override
     public Value emitCompress(Value pointer, CompressEncoding encoding, boolean nonNull) {
         LIRKind inputKind = pointer.getValueKind(LIRKind.class);
+        LIRKindTool lirKindTool = getLIRKindTool();
         assert inputKind.getPlatformKind() == AArch64Kind.QWORD;
         if (inputKind.isReference(0)) {
             // oop
@@ -209,8 +264,16 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
             // metaspace pointer
             Variable result = newVariable(LIRKind.value(AArch64Kind.DWORD));
             AllocatableValue base = Value.ILLEGAL;
-            if (encoding.hasBase()) {
-                base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
+            OptionValues options = getResult().getLIR().getOptions();
+            if (encoding.hasBase() || GeneratePIC.getValue(options)) {
+                if (GeneratePIC.getValue(options)) {
+                    Variable baseAddress = newVariable(lirKindTool.getWordKind());
+                    AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress, config);
+                    append(move);
+                    base = baseAddress;
+                } else {
+                    base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
+                }
             }
             append(new AArch64HotSpotMove.CompressPointer(result, asAllocatable(pointer), base, encoding, nonNull));
             return result;
@@ -230,8 +293,16 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
             // metaspace pointer
             Variable result = newVariable(LIRKind.value(AArch64Kind.QWORD));
             AllocatableValue base = Value.ILLEGAL;
-            if (encoding.hasBase()) {
-                base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
+            OptionValues options = getResult().getLIR().getOptions();
+            if (encoding.hasBase() || GeneratePIC.getValue(options)) {
+                if (GeneratePIC.getValue(options)) {
+                    Variable baseAddress = newVariable(LIRKind.value(AArch64Kind.QWORD));
+                    AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress, config);
+                    append(move);
+                    base = baseAddress;
+                } else {
+                    base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
+                }
             }
             append(new AArch64HotSpotMove.UncompressPointer(result, asAllocatable(pointer), base, encoding, nonNull));
             return result;
@@ -270,6 +341,17 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
     @Override
     public Variable emitForeignCall(ForeignCallLinkage linkage, LIRFrameState state, Value... args) {
         HotSpotForeignCallLinkage hotspotLinkage = (HotSpotForeignCallLinkage) linkage;
+        boolean destroysRegisters = hotspotLinkage.destroysRegisters();
+
+        AArch64SaveRegistersOp save = null;
+        Stub stub = getStub();
+        if (destroysRegisters) {
+            if (stub != null && stub.preservesRegisters()) {
+                Register[] savedRegisters = getRegisterConfig().getAllocatableRegisters().toArray();
+                save = emitSaveAllRegisters(savedRegisters, true);
+            }
+        }
+
         Variable result;
         LIRFrameState debugInfo = null;
         if (hotspotLinkage.needsDebugInfo()) {
@@ -277,7 +359,7 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
             assert debugInfo != null || getStub() != null;
         }
 
-        if (linkage.destroysRegisters() || hotspotLinkage.needsJavaFrameAnchor()) {
+        if (destroysRegisters || hotspotLinkage.needsJavaFrameAnchor()) {
             HotSpotRegistersProvider registers = getProviders().getRegisters();
             Register thread = registers.getThreadRegister();
             Variable scratch = newVariable(LIRKind.value(target().arch.getWordKind()));
@@ -285,9 +367,9 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
             // We need a label for the return address.
             label = new Label();
 
-            append(new AArch64HotSpotCRuntimeCallPrologueOp(config.threadLastJavaSpOffset(), config.threadLastJavaPcOffset(), config.threadLastJavaFpOffset(), thread, scratch, label));
+            append(new AArch64HotSpotCRuntimeCallPrologueOp(config.threadLastJavaSpOffset(), config.threadLastJavaPcOffset(), thread, scratch, label));
             result = super.emitForeignCall(hotspotLinkage, debugInfo, args);
-            append(new AArch64HotSpotCRuntimeCallEpilogueOp(config.threadLastJavaSpOffset(), config.threadLastJavaFpOffset(), thread));
+            append(new AArch64HotSpotCRuntimeCallEpilogueOp(config.threadLastJavaSpOffset(), config.threadLastJavaPcOffset(), thread, label));
 
             // Clear it out so it's not being reused later.
             label = null;
@@ -295,6 +377,21 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
             result = super.emitForeignCall(hotspotLinkage, debugInfo, args);
         }
 
+        if (destroysRegisters) {
+            if (stub != null) {
+                if (stub.preservesRegisters()) {
+                    HotSpotLIRGenerationResult generationResult = getResult();
+                    LIRFrameState key = currentRuntimeCallInfo;
+                    if (key == null) {
+                        key = LIRFrameState.NO_STATE;
+                    }
+                    assert !generationResult.getCalleeSaveInfo().containsKey(key);
+                    generationResult.getCalleeSaveInfo().put(key, save);
+                    emitRestoreRegisters(save);
+                }
+            }
+        }
+
         return result;
     }
 
@@ -335,6 +432,65 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
         append(new AArch64HotSpotUnwindOp(config, exceptionParameter));
     }
 
+    @Override
+    public Value emitLoadObjectAddress(Constant constant) {
+        HotSpotObjectConstant objectConstant = (HotSpotObjectConstant) constant;
+        LIRKind kind = objectConstant.isCompressed() ? getLIRKindTool().getNarrowOopKind() : getLIRKindTool().getObjectKind();
+        Variable result = newVariable(kind);
+        append(new AArch64HotSpotLoadAddressOp(result, constant, HotSpotConstantLoadAction.RESOLVE));
+        return result;
+    }
+
+    @Override
+    public Value emitLoadMetaspaceAddress(Constant constant, HotSpotConstantLoadAction action) {
+        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) constant;
+        LIRKind kind = metaspaceConstant.isCompressed() ? getLIRKindTool().getNarrowPointerKind() : getLIRKindTool().getWordKind();
+        Variable result = newVariable(kind);
+        append(new AArch64HotSpotLoadAddressOp(result, constant, action));
+        return result;
+    }
+
+    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, Object[] notes, Constant[] constants, AllocatableValue[] constantDescriptions, LIRFrameState frameState) {
+        ForeignCallLinkage linkage = getForeignCalls().lookupForeignCall(foreignCall);
+        append(new AArch64HotSpotConstantRetrievalOp(constants, constantDescriptions, frameState, linkage, notes));
+        AllocatableValue result = linkage.getOutgoingCallingConvention().getReturn();
+        return emitMove(result);
+    }
+
+    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, HotSpotConstantLoadAction action, Constant constant, AllocatableValue[] constantDescriptions, LIRFrameState frameState) {
+        Constant[] constants = new Constant[]{constant};
+        Object[] notes = new Object[]{action};
+        return emitConstantRetrieval(foreignCall, notes, constants, constantDescriptions, frameState);
+    }
+
+    @Override
+    public Value emitResolveDynamicInvoke(Constant appendix, LIRFrameState frameState) {
+        AllocatableValue[] constantDescriptions = new AllocatableValue[0];
+        return emitConstantRetrieval(RESOLVE_DYNAMIC_INVOKE, INITIALIZE, appendix, constantDescriptions, frameState);
+    }
+
+    @Override
+    public Value emitLoadConfigValue(int markId, LIRKind kind) {
+        Variable result = newVariable(kind);
+        append(new AArch64HotSpotLoadConfigValueOp(markId, result));
+        return result;
+    }
+
+    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, HotSpotConstantLoadAction action, Constant constant, Value constantDescription, LIRFrameState frameState) {
+        AllocatableValue[] constantDescriptions = new AllocatableValue[]{asAllocatable(constantDescription)};
+        return emitConstantRetrieval(foreignCall, action, constant, constantDescriptions, frameState);
+    }
+
+    @Override
+    public Value emitObjectConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
+        return emitConstantRetrieval(RESOLVE_STRING_BY_SYMBOL, RESOLVE, constant, constantDescription, frameState);
+    }
+
+    @Override
+    public Value emitMetaspaceConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
+        return emitConstantRetrieval(RESOLVE_KLASS_BY_SYMBOL, RESOLVE, constant, constantDescription, frameState);
+    }
+
     @Override
     public void emitReturn(JavaKind kind, Value input) {
         AllocatableValue operand = Value.ILLEGAL;
@@ -346,6 +502,17 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
         append(new AArch64HotSpotReturnOp(operand, getStub() != null, config, thread));
     }
 
+    @Override
+    public Value emitKlassInitializationAndRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
+        return emitConstantRetrieval(INITIALIZE_KLASS_BY_SYMBOL, INITIALIZE, constant, constantDescription, frameState);
+    }
+
+    @Override
+    public Value emitResolveMethodAndLoadCounters(Constant method, Value klassHint, Value methodDescription, LIRFrameState frameState) {
+        AllocatableValue[] constantDescriptions = new AllocatableValue[]{asAllocatable(klassHint), asAllocatable(methodDescription)};
+        return emitConstantRetrieval(RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS, LOAD_COUNTERS, method, constantDescriptions, frameState);
+    }
+
     /**
      * Gets the {@link Stub} this generator is generating code for or {@code null} if a stub is not
      * being generated.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java
new file mode 100644
index 00000000000..2c774c839f5
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 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.aarch64;
+
+import static jdk.vm.ci.code.ValueUtil.asRegister;
+
+import jdk.vm.ci.aarch64.AArch64Kind;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.meta.AllocatableValue;
+import jdk.vm.ci.meta.Constant;
+
+import org.graalvm.compiler.asm.aarch64.AArch64Address;
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+public final class AArch64HotSpotLoadAddressOp extends AArch64LIRInstruction {
+
+    public static final LIRInstructionClass<AArch64HotSpotLoadAddressOp> TYPE = LIRInstructionClass.create(AArch64HotSpotLoadAddressOp.class);
+
+    @Def({OperandFlag.REG}) protected AllocatableValue result;
+    private final Constant constant;
+    private final Object note;
+
+    public AArch64HotSpotLoadAddressOp(AllocatableValue result, Constant constant, Object note) {
+        super(TYPE);
+        this.result = result;
+        this.constant = constant;
+        this.note = note;
+    }
+
+    @Override
+    public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+        crb.recordInlineDataInCodeWithNote(constant, note);
+        AArch64Kind kind = (AArch64Kind) result.getPlatformKind();
+        int size = 0;
+        switch (kind) {
+            case DWORD:
+                size = 32;
+                break;
+            case QWORD:
+                size = 64;
+                break;
+            default:
+                throw GraalError.shouldNotReachHere("unexpected kind: " + kind);
+        }
+        if (crb.compilationResult.isImmutablePIC()) {
+            Register dst = asRegister(result);
+            masm.addressOf(dst);
+            masm.ldr(size, dst, AArch64Address.createBaseRegisterOnlyAddress(dst));
+        } else {
+            masm.ldr(size, asRegister(result), masm.getPlaceholder(-1));
+        }
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java
new file mode 100644
index 00000000000..62b34609c89
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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.
+ *
+ * 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.aarch64;
+
+import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
+import static jdk.vm.ci.code.ValueUtil.asRegister;
+
+import jdk.vm.ci.aarch64.AArch64Kind;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.meta.AllocatableValue;
+
+import org.graalvm.compiler.asm.aarch64.AArch64Address;
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+public final class AArch64HotSpotLoadConfigValueOp extends AArch64LIRInstruction {
+
+    public static final LIRInstructionClass<AArch64HotSpotLoadConfigValueOp> TYPE = LIRInstructionClass.create(AArch64HotSpotLoadConfigValueOp.class);
+
+    @Def({OperandFlag.REG}) protected AllocatableValue result;
+    private final int markId;
+
+    public AArch64HotSpotLoadConfigValueOp(int markId, AllocatableValue result) {
+        super(TYPE);
+        this.result = result;
+        this.markId = markId;
+    }
+
+    @Override
+    public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+        if (GeneratePIC.getValue(crb.getOptions())) {
+            AArch64Kind kind = (AArch64Kind) result.getPlatformKind();
+            Register reg = asRegister(result);
+            masm.adrp(reg);
+            masm.add(64, reg, reg, 1);
+            switch (kind) {
+                case BYTE:
+                    masm.ldrs(8, 32, reg, AArch64Address.createBaseRegisterOnlyAddress(reg));
+                    break;
+                case WORD:
+                    masm.ldrs(16, 32, reg, AArch64Address.createBaseRegisterOnlyAddress(reg));
+                    break;
+                case DWORD:
+                    masm.ldr(32, reg, AArch64Address.createBaseRegisterOnlyAddress(reg));
+                    break;
+                case QWORD:
+                    masm.ldr(64, reg, AArch64Address.createBaseRegisterOnlyAddress(reg));
+                    break;
+                default:
+                    throw GraalError.unimplemented();
+            }
+            masm.nop();
+        } else {
+            throw GraalError.unimplemented();
+        }
+        crb.recordMark(markId);
+    }
+
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
index ab0c674bdf5..4b6fd2858c2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
@@ -26,13 +26,13 @@ package org.graalvm.compiler.hotspot.aarch64;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
+import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
 import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
 import org.graalvm.compiler.nodes.calc.FloatConvertNode;
+import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
 import org.graalvm.compiler.nodes.calc.RemNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
@@ -62,8 +62,8 @@ public class AArch64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvid
 
     @Override
     public void lower(Node n, LoweringTool tool) {
-        if (n instanceof FixedBinaryNode) {
-            integerArithmeticSnippets.lower((FixedBinaryNode) n, tool);
+        if (n instanceof IntegerDivRemNode) {
+            integerArithmeticSnippets.lower((IntegerDivRemNode) n, tool);
         } else if (n instanceof RemNode) {
             floatArithmeticSnippets.lower((RemNode) n, tool);
         } else if (n instanceof FloatConvertNode) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java
index 8766ddd1fd0..77d6caf9069 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java
@@ -25,15 +25,19 @@ package org.graalvm.compiler.hotspot.aarch64;
 import static jdk.vm.ci.aarch64.AArch64.zr;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
+import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
 import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.aarch64.AArch64Address;
 import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.core.common.CompressEncoding;
+import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
+import org.graalvm.compiler.lir.LIRInstruction;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
 import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
@@ -80,6 +84,32 @@ public class AArch64HotSpotMove {
         }
     }
 
+    public static final class BaseMove extends AArch64LIRInstruction {
+        public static final LIRInstructionClass<BaseMove> TYPE = LIRInstructionClass.create(BaseMove.class);
+
+        @LIRInstruction.Def({REG, HINT}) protected AllocatableValue result;
+        private final GraalHotSpotVMConfig config;
+
+        public BaseMove(AllocatableValue result, GraalHotSpotVMConfig config) {
+            super(TYPE);
+            this.result = result;
+            this.config = config;
+        }
+
+        @Override
+        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+            try (AArch64MacroAssembler.ScratchRegister sc = masm.getScratchRegister()) {
+                Register scratch = sc.getRegister();
+                masm.adrp(scratch);
+                masm.add(64, scratch, scratch, 1);
+                masm.ldr(64, asRegister(result), AArch64Address.createBaseRegisterOnlyAddress(scratch));
+                masm.nop();
+                crb.recordMark(config.MARKID_NARROW_KLASS_BASE_ADDRESS);
+            }
+        }
+
+    }
+
     /**
      * Compresses a 8-byte pointer as a 4-byte int.
      */
@@ -117,7 +147,7 @@ public class AArch64HotSpotMove {
             } else if (nonNull) {
                 masm.sub(64, resultRegister, ptr, base);
                 if (encoding.hasShift()) {
-                    masm.shl(64, resultRegister, resultRegister, encoding.getShift());
+                    masm.lshr(64, resultRegister, resultRegister, encoding.getShift());
                 }
             } else {
                 // if ptr is null it still has to be null after compression
@@ -192,11 +222,21 @@ public class AArch64HotSpotMove {
     // masm.cmov(64, result, result, ARMv8.zr, ARMv8Assembler.ConditionFlag.NE);
     // }
 
-    public static void decodeKlassPointer(AArch64MacroAssembler masm, Register result, Register ptr, Register klassBase, CompressEncoding encoding) {
-        // result = klassBase + ptr << shift
-        if (encoding.hasShift() || encoding.hasBase()) {
-            masm.add(64, result, klassBase, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift());
+    public static void decodeKlassPointer(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, Register ptr, CompressEncoding encoding, GraalHotSpotVMConfig config) {
+        try (AArch64MacroAssembler.ScratchRegister sc = masm.getScratchRegister()) {
+            Register scratch = sc.getRegister();
+            boolean pic = GeneratePIC.getValue(crb.getOptions());
+            if (pic || encoding.hasBase() || encoding.getShift() != 0) {
+                if (pic) {
+                    masm.addressOf(scratch);
+                    masm.ldr(64, scratch, AArch64Address.createBaseRegisterOnlyAddress(scratch));
+                    masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift());
+                    crb.recordMark(config.MARKID_NARROW_KLASS_BASE_ADDRESS);
+                } else {
+                    masm.mov(scratch, encoding.getBase());
+                    masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift());
+                }
+            }
         }
     }
-
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java
index 7665a7e95a0..fea1cbb16d6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java
@@ -236,7 +236,7 @@ public class SPARCHotSpotLIRGenerator extends SPARCLIRGenerator implements HotSp
     }
 
     @Override
-    public Variable emitLogicCompareAndSwap(Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
+    public Variable emitLogicCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue) {
         ValueKind<?> kind = newValue.getValueKind();
         assert kind.equals(expectedValue.getValueKind());
         SPARCKind memKind = (SPARCKind) kind.getPlatformKind();
@@ -246,7 +246,7 @@ public class SPARCHotSpotLIRGenerator extends SPARCLIRGenerator implements HotSp
     }
 
     @Override
-    public Variable emitValueCompareAndSwap(Value address, Value expectedValue, Value newValue) {
+    public Variable emitValueCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue) {
         ValueKind<?> kind = newValue.getValueKind();
         assert kind.equals(expectedValue.getValueKind());
         Variable result = newVariable(newValue.getValueKind());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
index bd68a9021de..446618a58ec 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
@@ -422,6 +422,12 @@ public class CheckGraalIntrinsics extends GraalTest {
                             "jdk/internal/util/ArraysSupport.vectorizedMismatch(Ljava/lang/Object;JLjava/lang/Object;JII)I");
         }
 
+        if (isJDK11OrHigher()) {
+            // Relevant for Java flight recorder
+            add(TO_BE_INVESTIGATED,
+                            "jdk/jfr/internal/JVM.getEventWriter()Ljava/lang/Object;");
+        }
+
         if (!getHostArchitectureName().equals("amd64")) {
             // Can we implement these on non-AMD64 platforms? C2 seems to.
             add(TO_BE_INVESTIGATED,
@@ -549,6 +555,10 @@ public class CheckGraalIntrinsics extends GraalTest {
         return GraalServices.JAVA_SPECIFICATION_VERSION >= 10;
     }
 
+    private static boolean isJDK11OrHigher() {
+        return GraalServices.JAVA_SPECIFICATION_VERSION >= 11;
+    }
+
     private static String getHostArchitectureName() {
         String arch = System.getProperty("os.arch");
         if (arch.equals("x86_64")) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java
index c990c8a2d7a..5c6b23dbdf8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java
@@ -223,25 +223,19 @@ public class CompilationWrapperTest extends GraalCompilerTest {
             Assert.assertTrue(zip.toString(), zip.exists());
             Assert.assertTrue(zip + " not in " + dumpPathEntries, dumpPathEntries.contains(zip.getName()));
             try {
-                int bgv = 0;
-                int cfg = 0;
+                int bgvOrCfgFiles = 0;
                 ZipFile dd = new ZipFile(diagnosticOutputZip);
                 List<String> entries = new ArrayList<>();
                 for (Enumeration<? extends ZipEntry> e = dd.entries(); e.hasMoreElements();) {
                     ZipEntry ze = e.nextElement();
                     String name = ze.getName();
                     entries.add(name);
-                    if (name.endsWith(".bgv")) {
-                        bgv++;
-                    } else if (name.endsWith(".cfg")) {
-                        cfg++;
+                    if (name.endsWith(".bgv") || name.endsWith(".cfg")) {
+                        bgvOrCfgFiles++;
                     }
                 }
-                if (bgv == 0) {
-                    Assert.fail(String.format("Expected at least one .bgv file in %s: %s%n%s", diagnosticOutputZip, entries, proc));
-                }
-                if (cfg == 0) {
-                    Assert.fail(String.format("Expected at least one .cfg file in %s: %s%n%s", diagnosticOutputZip, entries, proc));
+                if (bgvOrCfgFiles == 0) {
+                    Assert.fail(String.format("Expected at least one .bgv or .cfg file in %s: %s%n%s", diagnosticOutputZip, entries, proc));
                 }
             } finally {
                 zip.delete();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/aaa b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/aaa
deleted file mode 100644
index 9b123f4703b..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/aaa
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.hotspot.test;
-
-import org.graalvm.compiler.core.test.GraalCompilerTest;
-import org.graalvm.compiler.hotspot.meta.HotSpotClassInitializationPlugin;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
-import jdk.vm.ci.meta.ConstantPool;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public class HotSpotLazyInitializationTest extends GraalCompilerTest {
-
-    HotSpotClassInitializationPlugin classInitPlugin = new HotSpotClassInitializationPlugin();
-
-    @Override
-    protected Plugins getDefaultGraphBuilderPlugins() {
-        Plugins plugins = super.getDefaultGraphBuilderPlugins();
-        plugins.setClassInitializationPlugin(classInitPlugin);
-        return plugins;
-    }
-
-    static boolean X_initialized = false;
-
-    static class X {
-        static {
-            X_initialized = true;
-        }
-        static void foo() {}
-    }
-
-    public static void invokeStatic() {
-        X.foo();
-    }
-
-    private void test(String name) {
-        ResolvedJavaMethod method = getResolvedJavaMethod(name);
-        Assume.assumeTrue("skipping for old JVMCI", classInitPlugin.supportsLazyInitialization(method.getConstantPool()));
-        StructuredGraph graph = parseEager(method, AllowAssumptions.NO);
-        Assert.assertFalse(X_initialized);
-    }
-
-    @Test
-    public void test1() {
-        test("invokeStatic");
-    }
-
-}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java
index f70d20d4bd2..6f254fb5165 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java
@@ -101,6 +101,13 @@ public abstract class CompilerConfigurationFactory implements Comparable<Compile
         return new DefaultBackendMap(name);
     }
 
+    /**
+     * Returns a name that should uniquely identify this compiler configuration.
+     */
+    public final String getName() {
+        return name;
+    }
+
     public interface BackendMap {
         HotSpotBackendFactory getBackendFactory(Architecture arch);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
index ce458df79ac..4fc3bbe7e2a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
@@ -80,6 +80,9 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase {
     public final boolean foldStableValues = getFlag("FoldStableValues", Boolean.class);
     public final int maxVectorSize = getFlag("MaxVectorSize", Integer.class);
 
+    public final boolean verifyBeforeGC = getFlag("VerifyBeforeGC", Boolean.class);
+    public final boolean verifyAfterGC = getFlag("VerifyAfterGC", Boolean.class);
+
     public final boolean useTLAB = getFlag("UseTLAB", Boolean.class);
     public final boolean useBiasedLocking = getFlag("UseBiasedLocking", Boolean.class);
     public final boolean usePopCountInstruction = getFlag("UsePopCountInstruction", Boolean.class);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java
index 8bd6223e004..a7e66c5c472 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java
@@ -40,12 +40,12 @@ final class GraalHotSpotVMConfigVersioned extends HotSpotVMConfigAccess {
         super(store);
     }
 
+    // JSK-8132287
+    final boolean inlineNotify = !getFlag("SyncKnobs", String.class, "").contains("InlineNotify=0");
+
     // JDK-8073583
     final boolean useCRC32CIntrinsics = getFlag("UseCRC32CIntrinsics", Boolean.class);
 
-    // JDK-8075171
-    final boolean inlineNotify = getFlag("InlineNotify", Boolean.class, true);
-
     // JDK-8046936
     final int javaThreadReservedStackActivationOffset = getFieldOffset("JavaThread::_reserved_stack_activation", Integer.class, "address");
     final int methodFlagsOffset = getFieldOffset("Method::_flags", Integer.class, "u2");
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java
index 8d95fa2d8b5..783c2b5eec9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java
@@ -185,7 +185,7 @@ public class HotSpotGraalCompiler implements GraalJVMCICompiler {
         result.setEntryBCI(entryBCI);
         boolean shouldDebugNonSafepoints = providers.getCodeCache().shouldDebugNonSafepoints();
         PhaseSuite<HighTierContext> graphBuilderSuite = configGraphBuilderSuite(providers.getSuites().getDefaultGraphBuilderSuite(), shouldDebugNonSafepoints, isOSR);
-        GraalCompiler.compileGraph(graph, method, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, result, crbf);
+        GraalCompiler.compileGraph(graph, method, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, result, crbf, true);
 
         if (!isOSR && useProfilingInfo) {
             ProfilingInfo profile = profilingInfo;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
index cd8fa1697e4..e83e3915355 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
@@ -105,6 +105,7 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
     }
 
     private final String runtimeName;
+    private final String compilerConfigurationName;
     private final HotSpotBackend hostBackend;
     private final GlobalMetrics metricValues = new GlobalMetrics();
     private final List<SnippetCounter.Group> snippetCounterGroups;
@@ -155,6 +156,7 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
         compilationProblemsPerAction = new EnumMap<>(ExceptionAction.class);
         snippetCounterGroups = GraalOptions.SnippetCounters.getValue(options) ? new ArrayList<>() : null;
         CompilerConfiguration compilerConfiguration = compilerConfigurationFactory.createCompilerConfiguration();
+        compilerConfigurationName = compilerConfigurationFactory.getName();
 
         compiler = new HotSpotGraalCompiler(jvmciRuntime, this, options);
         management = GraalServices.loadSingle(HotSpotGraalManagementRegistration.class, false);
@@ -296,6 +298,11 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
         return backends.get(arch);
     }
 
+    @Override
+    public String getCompilerConfigurationName() {
+        return compilerConfigurationName;
+    }
+
     private long runtimeStartTime;
     private boolean shutdown;
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java
index e12b597453b..909f249302d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java
@@ -94,4 +94,10 @@ public interface HotSpotGraalRuntimeProvider extends GraalRuntime, RuntimeProvid
      * Gets the map used to count compilation problems at each {@link ExceptionAction} level.
      */
     Map<ExceptionAction, Integer> getCompilationProblemsPerAction();
+
+    /**
+     * Returns the unique compiler configuration name that is in use. Useful for users to find out
+     * which configuration is in use.
+     */
+    String getCompilerConfigurationName();
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
index e493d920852..41c4f128105 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -39,6 +39,7 @@ import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.
 import static jdk.internal.vm.compiler.word.LocationIdentity.any;
 
 import java.lang.ref.Reference;
+import java.util.EnumMap;
 
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.core.common.CompressEncoding;
@@ -49,6 +50,7 @@ import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.StampPair;
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
@@ -91,8 +93,8 @@ import org.graalvm.compiler.hotspot.replacements.UnsafeLoadSnippets;
 import org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets;
 import org.graalvm.compiler.hotspot.replacements.aot.ResolveConstantSnippets;
 import org.graalvm.compiler.hotspot.replacements.arraycopy.ArrayCopyNode;
-import org.graalvm.compiler.hotspot.replacements.arraycopy.ArrayCopyWithSlowPathNode;
 import org.graalvm.compiler.hotspot.replacements.arraycopy.ArrayCopySnippets;
+import org.graalvm.compiler.hotspot.replacements.arraycopy.ArrayCopyWithSlowPathNode;
 import org.graalvm.compiler.hotspot.replacements.profiling.ProfileSnippets;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
@@ -118,6 +120,7 @@ import org.graalvm.compiler.nodes.calc.RemNode;
 import org.graalvm.compiler.nodes.debug.StringToBytesNode;
 import org.graalvm.compiler.nodes.debug.VerifyHeapNode;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.GetClassNode;
 import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode;
@@ -207,7 +210,7 @@ public class DefaultHotSpotLoweringProvider extends DefaultJavaLoweringProvider
         instanceofSnippets = new InstanceOfSnippets.Templates(options, factories, runtime, providers, target);
         newObjectSnippets = new NewObjectSnippets.Templates(options, factories, runtime, providers, target, config);
         monitorSnippets = new MonitorSnippets.Templates(options, factories, runtime, providers, target, config.useFastLocking);
-        writeBarrierSnippets = new WriteBarrierSnippets.Templates(options, factories, runtime, providers, target, config.useCompressedOops ? config.getOopEncoding() : null);
+        writeBarrierSnippets = new WriteBarrierSnippets.Templates(options, factories, runtime, providers, target, config);
         exceptionObjectSnippets = new LoadExceptionObjectSnippets.Templates(options, factories, providers, target);
         unsafeLoadSnippets = new UnsafeLoadSnippets.Templates(options, factories, providers, target);
         assertionSnippets = new AssertionSnippets.Templates(options, factories, providers, target);
@@ -223,162 +226,165 @@ public class DefaultHotSpotLoweringProvider extends DefaultJavaLoweringProvider
     }
 
     @Override
+    @SuppressWarnings("try")
     public void lower(Node n, LoweringTool tool) {
         StructuredGraph graph = (StructuredGraph) n.graph();
-        if (n instanceof Invoke) {
-            lowerInvoke((Invoke) n, tool, graph);
-        } else if (n instanceof LoadMethodNode) {
-            lowerLoadMethodNode((LoadMethodNode) n);
-        } else if (n instanceof GetClassNode) {
-            lowerGetClassNode((GetClassNode) n, tool, graph);
-        } else if (n instanceof StoreHubNode) {
-            lowerStoreHubNode((StoreHubNode) n, graph);
-        } else if (n instanceof OSRStartNode) {
-            lowerOSRStartNode((OSRStartNode) n);
-        } else if (n instanceof BytecodeExceptionNode) {
-            lowerBytecodeExceptionNode((BytecodeExceptionNode) n);
-        } else if (n instanceof InstanceOfNode) {
-            InstanceOfNode instanceOfNode = (InstanceOfNode) n;
-            if (graph.getGuardsStage().areDeoptsFixed()) {
-                instanceofSnippets.lower(instanceOfNode, tool);
-            } else {
-                if (instanceOfNode.allowsNull()) {
-                    ValueNode object = instanceOfNode.getValue();
-                    LogicNode newTypeCheck = graph.addOrUniqueWithInputs(InstanceOfNode.create(instanceOfNode.type(), object, instanceOfNode.profile(), instanceOfNode.getAnchor()));
-                    LogicNode newNode = LogicNode.or(graph.unique(IsNullNode.create(object)), newTypeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
-                    instanceOfNode.replaceAndDelete(newNode);
-                }
-            }
-        } else if (n instanceof InstanceOfDynamicNode) {
-            InstanceOfDynamicNode instanceOfDynamicNode = (InstanceOfDynamicNode) n;
-            if (graph.getGuardsStage().areDeoptsFixed()) {
-                instanceofSnippets.lower(instanceOfDynamicNode, tool);
-            } else {
-                ValueNode mirror = instanceOfDynamicNode.getMirrorOrHub();
-                if (mirror.stamp(NodeView.DEFAULT).getStackKind() == JavaKind.Object) {
-                    ClassGetHubNode classGetHub = graph.unique(new ClassGetHubNode(mirror));
-                    instanceOfDynamicNode.setMirror(classGetHub);
+        try (DebugCloseable context = n.withNodeSourcePosition()) {
+            if (n instanceof Invoke) {
+                lowerInvoke((Invoke) n, tool, graph);
+            } else if (n instanceof LoadMethodNode) {
+                lowerLoadMethodNode((LoadMethodNode) n);
+            } else if (n instanceof GetClassNode) {
+                lowerGetClassNode((GetClassNode) n, tool, graph);
+            } else if (n instanceof StoreHubNode) {
+                lowerStoreHubNode((StoreHubNode) n, graph);
+            } else if (n instanceof OSRStartNode) {
+                lowerOSRStartNode((OSRStartNode) n);
+            } else if (n instanceof BytecodeExceptionNode) {
+                lowerBytecodeExceptionNode((BytecodeExceptionNode) n);
+            } else if (n instanceof InstanceOfNode) {
+                InstanceOfNode instanceOfNode = (InstanceOfNode) n;
+                if (graph.getGuardsStage().areDeoptsFixed()) {
+                    instanceofSnippets.lower(instanceOfNode, tool);
+                } else {
+                    if (instanceOfNode.allowsNull()) {
+                        ValueNode object = instanceOfNode.getValue();
+                        LogicNode newTypeCheck = graph.addOrUniqueWithInputs(InstanceOfNode.create(instanceOfNode.type(), object, instanceOfNode.profile(), instanceOfNode.getAnchor()));
+                        LogicNode newNode = LogicNode.or(graph.unique(IsNullNode.create(object)), newTypeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
+                        instanceOfNode.replaceAndDelete(newNode);
+                    }
                 }
+            } else if (n instanceof InstanceOfDynamicNode) {
+                InstanceOfDynamicNode instanceOfDynamicNode = (InstanceOfDynamicNode) n;
+                if (graph.getGuardsStage().areDeoptsFixed()) {
+                    instanceofSnippets.lower(instanceOfDynamicNode, tool);
+                } else {
+                    ValueNode mirror = instanceOfDynamicNode.getMirrorOrHub();
+                    if (mirror.stamp(NodeView.DEFAULT).getStackKind() == JavaKind.Object) {
+                        ClassGetHubNode classGetHub = graph.unique(new ClassGetHubNode(mirror));
+                        instanceOfDynamicNode.setMirror(classGetHub);
+                    }
 
-                if (instanceOfDynamicNode.allowsNull()) {
-                    ValueNode object = instanceOfDynamicNode.getObject();
-                    LogicNode newTypeCheck = graph.addOrUniqueWithInputs(
-                                    InstanceOfDynamicNode.create(graph.getAssumptions(), tool.getConstantReflection(), instanceOfDynamicNode.getMirrorOrHub(), object, false));
-                    LogicNode newNode = LogicNode.or(graph.unique(IsNullNode.create(object)), newTypeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
-                    instanceOfDynamicNode.replaceAndDelete(newNode);
+                    if (instanceOfDynamicNode.allowsNull()) {
+                        ValueNode object = instanceOfDynamicNode.getObject();
+                        LogicNode newTypeCheck = graph.addOrUniqueWithInputs(
+                                        InstanceOfDynamicNode.create(graph.getAssumptions(), tool.getConstantReflection(), instanceOfDynamicNode.getMirrorOrHub(), object, false));
+                        LogicNode newNode = LogicNode.or(graph.unique(IsNullNode.create(object)), newTypeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
+                        instanceOfDynamicNode.replaceAndDelete(newNode);
+                    }
                 }
+            } else if (n instanceof ClassIsAssignableFromNode) {
+                if (graph.getGuardsStage().areDeoptsFixed()) {
+                    instanceofSnippets.lower((ClassIsAssignableFromNode) n, tool);
+                }
+            } else if (n instanceof NewInstanceNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    newObjectSnippets.lower((NewInstanceNode) n, registers, tool);
+                }
+            } else if (n instanceof DynamicNewInstanceNode) {
+                DynamicNewInstanceNode newInstanceNode = (DynamicNewInstanceNode) n;
+                if (newInstanceNode.getClassClass() == null) {
+                    JavaConstant classClassMirror = constantReflection.forObject(Class.class);
+                    ConstantNode classClass = ConstantNode.forConstant(classClassMirror, tool.getMetaAccess(), graph);
+                    newInstanceNode.setClassClass(classClass);
+                }
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    newObjectSnippets.lower(newInstanceNode, registers, tool);
+                }
+            } else if (n instanceof NewArrayNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    newObjectSnippets.lower((NewArrayNode) n, registers, tool);
+                }
+            } else if (n instanceof DynamicNewArrayNode) {
+                DynamicNewArrayNode dynamicNewArrayNode = (DynamicNewArrayNode) n;
+                if (dynamicNewArrayNode.getVoidClass() == null) {
+                    JavaConstant voidClassMirror = constantReflection.forObject(void.class);
+                    ConstantNode voidClass = ConstantNode.forConstant(voidClassMirror, tool.getMetaAccess(), graph);
+                    dynamicNewArrayNode.setVoidClass(voidClass);
+                }
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    newObjectSnippets.lower(dynamicNewArrayNode, registers, tool);
+                }
+            } else if (n instanceof VerifyHeapNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    newObjectSnippets.lower((VerifyHeapNode) n, registers, tool);
+                }
+            } else if (n instanceof RawMonitorEnterNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    monitorSnippets.lower((RawMonitorEnterNode) n, registers, tool);
+                }
+            } else if (n instanceof MonitorExitNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    monitorSnippets.lower((MonitorExitNode) n, registers, tool);
+                }
+            } else if (n instanceof ArrayCopyNode) {
+                arraycopySnippets.lower((ArrayCopyNode) n, tool);
+            } else if (n instanceof ArrayCopyWithSlowPathNode) {
+                arraycopySnippets.lower((ArrayCopyWithSlowPathNode) n, tool);
+            } else if (n instanceof G1PreWriteBarrier) {
+                writeBarrierSnippets.lower((G1PreWriteBarrier) n, registers, tool);
+            } else if (n instanceof G1PostWriteBarrier) {
+                writeBarrierSnippets.lower((G1PostWriteBarrier) n, registers, tool);
+            } else if (n instanceof G1ReferentFieldReadBarrier) {
+                writeBarrierSnippets.lower((G1ReferentFieldReadBarrier) n, registers, tool);
+            } else if (n instanceof SerialWriteBarrier) {
+                writeBarrierSnippets.lower((SerialWriteBarrier) n, tool);
+            } else if (n instanceof SerialArrayRangeWriteBarrier) {
+                writeBarrierSnippets.lower((SerialArrayRangeWriteBarrier) n, tool);
+            } else if (n instanceof G1ArrayRangePreWriteBarrier) {
+                writeBarrierSnippets.lower((G1ArrayRangePreWriteBarrier) n, registers, tool);
+            } else if (n instanceof G1ArrayRangePostWriteBarrier) {
+                writeBarrierSnippets.lower((G1ArrayRangePostWriteBarrier) n, registers, tool);
+            } else if (n instanceof NewMultiArrayNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    newObjectSnippets.lower((NewMultiArrayNode) n, tool);
+                }
+            } else if (n instanceof LoadExceptionObjectNode) {
+                exceptionObjectSnippets.lower((LoadExceptionObjectNode) n, registers, tool);
+            } else if (n instanceof AssertionNode) {
+                assertionSnippets.lower((AssertionNode) n, tool);
+            } else if (n instanceof StringToBytesNode) {
+                if (graph.getGuardsStage().areDeoptsFixed()) {
+                    stringToBytesSnippets.lower((StringToBytesNode) n, tool);
+                }
+            } else if (n instanceof IntegerDivRemNode) {
+                // Nothing to do for division nodes. The HotSpot signal handler catches divisions by
+                // zero and the MIN_VALUE / -1 cases.
+            } else if (n instanceof AbstractDeoptimizeNode || n instanceof UnwindNode || n instanceof RemNode || n instanceof SafepointNode) {
+                /* No lowering, we generate LIR directly for these nodes. */
+            } else if (n instanceof ClassGetHubNode) {
+                lowerClassGetHubNode((ClassGetHubNode) n, tool);
+            } else if (n instanceof HubGetClassNode) {
+                lowerHubGetClassNode((HubGetClassNode) n, tool);
+            } else if (n instanceof KlassLayoutHelperNode) {
+                lowerKlassLayoutHelperNode((KlassLayoutHelperNode) n, tool);
+            } else if (n instanceof ComputeObjectAddressNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    lowerComputeObjectAddressNode((ComputeObjectAddressNode) n);
+                }
+            } else if (n instanceof IdentityHashCodeNode) {
+                hashCodeSnippets.lower((IdentityHashCodeNode) n, tool);
+            } else if (n instanceof ResolveDynamicConstantNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    resolveConstantSnippets.lower((ResolveDynamicConstantNode) n, tool);
+                }
+            } else if (n instanceof ResolveConstantNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    resolveConstantSnippets.lower((ResolveConstantNode) n, tool);
+                }
+            } else if (n instanceof ResolveMethodAndLoadCountersNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    resolveConstantSnippets.lower((ResolveMethodAndLoadCountersNode) n, tool);
+                }
+            } else if (n instanceof InitializeKlassNode) {
+                if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
+                    resolveConstantSnippets.lower((InitializeKlassNode) n, tool);
+                }
+            } else if (n instanceof ProfileNode) {
+                profileSnippets.lower((ProfileNode) n, tool);
+            } else {
+                super.lower(n, tool);
             }
-        } else if (n instanceof ClassIsAssignableFromNode) {
-            if (graph.getGuardsStage().areDeoptsFixed()) {
-                instanceofSnippets.lower((ClassIsAssignableFromNode) n, tool);
-            }
-        } else if (n instanceof NewInstanceNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                newObjectSnippets.lower((NewInstanceNode) n, registers, tool);
-            }
-        } else if (n instanceof DynamicNewInstanceNode) {
-            DynamicNewInstanceNode newInstanceNode = (DynamicNewInstanceNode) n;
-            if (newInstanceNode.getClassClass() == null) {
-                JavaConstant classClassMirror = constantReflection.forObject(Class.class);
-                ConstantNode classClass = ConstantNode.forConstant(classClassMirror, tool.getMetaAccess(), graph);
-                newInstanceNode.setClassClass(classClass);
-            }
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                newObjectSnippets.lower(newInstanceNode, registers, tool);
-            }
-        } else if (n instanceof NewArrayNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                newObjectSnippets.lower((NewArrayNode) n, registers, tool);
-            }
-        } else if (n instanceof DynamicNewArrayNode) {
-            DynamicNewArrayNode dynamicNewArrayNode = (DynamicNewArrayNode) n;
-            if (dynamicNewArrayNode.getVoidClass() == null) {
-                JavaConstant voidClassMirror = constantReflection.forObject(void.class);
-                ConstantNode voidClass = ConstantNode.forConstant(voidClassMirror, tool.getMetaAccess(), graph);
-                dynamicNewArrayNode.setVoidClass(voidClass);
-            }
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                newObjectSnippets.lower(dynamicNewArrayNode, registers, tool);
-            }
-        } else if (n instanceof VerifyHeapNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                newObjectSnippets.lower((VerifyHeapNode) n, registers, tool);
-            }
-        } else if (n instanceof RawMonitorEnterNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                monitorSnippets.lower((RawMonitorEnterNode) n, registers, tool);
-            }
-        } else if (n instanceof MonitorExitNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                monitorSnippets.lower((MonitorExitNode) n, registers, tool);
-            }
-        } else if (n instanceof ArrayCopyNode) {
-            arraycopySnippets.lower((ArrayCopyNode) n, tool);
-        } else if (n instanceof ArrayCopyWithSlowPathNode) {
-            arraycopySnippets.lower((ArrayCopyWithSlowPathNode) n, tool);
-        } else if (n instanceof G1PreWriteBarrier) {
-            writeBarrierSnippets.lower((G1PreWriteBarrier) n, registers, tool);
-        } else if (n instanceof G1PostWriteBarrier) {
-            writeBarrierSnippets.lower((G1PostWriteBarrier) n, registers, tool);
-        } else if (n instanceof G1ReferentFieldReadBarrier) {
-            writeBarrierSnippets.lower((G1ReferentFieldReadBarrier) n, registers, tool);
-        } else if (n instanceof SerialWriteBarrier) {
-            writeBarrierSnippets.lower((SerialWriteBarrier) n, tool);
-        } else if (n instanceof SerialArrayRangeWriteBarrier) {
-            writeBarrierSnippets.lower((SerialArrayRangeWriteBarrier) n, tool);
-        } else if (n instanceof G1ArrayRangePreWriteBarrier) {
-            writeBarrierSnippets.lower((G1ArrayRangePreWriteBarrier) n, registers, tool);
-        } else if (n instanceof G1ArrayRangePostWriteBarrier) {
-            writeBarrierSnippets.lower((G1ArrayRangePostWriteBarrier) n, registers, tool);
-        } else if (n instanceof NewMultiArrayNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                newObjectSnippets.lower((NewMultiArrayNode) n, tool);
-            }
-        } else if (n instanceof LoadExceptionObjectNode) {
-            exceptionObjectSnippets.lower((LoadExceptionObjectNode) n, registers, tool);
-        } else if (n instanceof AssertionNode) {
-            assertionSnippets.lower((AssertionNode) n, tool);
-        } else if (n instanceof StringToBytesNode) {
-            if (graph.getGuardsStage().areDeoptsFixed()) {
-                stringToBytesSnippets.lower((StringToBytesNode) n, tool);
-            }
-        } else if (n instanceof IntegerDivRemNode) {
-            // Nothing to do for division nodes. The HotSpot signal handler catches divisions by
-            // zero and the MIN_VALUE / -1 cases.
-        } else if (n instanceof AbstractDeoptimizeNode || n instanceof UnwindNode || n instanceof RemNode || n instanceof SafepointNode) {
-            /* No lowering, we generate LIR directly for these nodes. */
-        } else if (n instanceof ClassGetHubNode) {
-            lowerClassGetHubNode((ClassGetHubNode) n, tool);
-        } else if (n instanceof HubGetClassNode) {
-            lowerHubGetClassNode((HubGetClassNode) n, tool);
-        } else if (n instanceof KlassLayoutHelperNode) {
-            lowerKlassLayoutHelperNode((KlassLayoutHelperNode) n, tool);
-        } else if (n instanceof ComputeObjectAddressNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                lowerComputeObjectAddressNode((ComputeObjectAddressNode) n);
-            }
-        } else if (n instanceof IdentityHashCodeNode) {
-            hashCodeSnippets.lower((IdentityHashCodeNode) n, tool);
-        } else if (n instanceof ResolveDynamicConstantNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((ResolveDynamicConstantNode) n, tool);
-            }
-        } else if (n instanceof ResolveConstantNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((ResolveConstantNode) n, tool);
-            }
-        } else if (n instanceof ResolveMethodAndLoadCountersNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((ResolveMethodAndLoadCountersNode) n, tool);
-            }
-        } else if (n instanceof InitializeKlassNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((InitializeKlassNode) n, tool);
-            }
-        } else if (n instanceof ProfileNode) {
-            profileSnippets.lower((ProfileNode) n, tool);
-        } else {
-            super.lower(n, tool);
         }
     }
 
@@ -635,59 +641,53 @@ public class DefaultHotSpotLoweringProvider extends DefaultJavaLoweringProvider
     }
 
     static final class Exceptions {
-        protected static final ArrayIndexOutOfBoundsException cachedArrayIndexOutOfBoundsException;
-        protected static final NullPointerException cachedNullPointerException;
+        protected static final EnumMap<BytecodeExceptionKind, RuntimeException> cachedExceptions;
 
         static {
-            cachedArrayIndexOutOfBoundsException = new ArrayIndexOutOfBoundsException();
-            cachedArrayIndexOutOfBoundsException.setStackTrace(new StackTraceElement[0]);
-            cachedNullPointerException = new NullPointerException();
-            cachedNullPointerException.setStackTrace(new StackTraceElement[0]);
+            cachedExceptions = new EnumMap<>(BytecodeExceptionKind.class);
+            cachedExceptions.put(BytecodeExceptionKind.NULL_POINTER, clearStackTrace(new NullPointerException()));
+            cachedExceptions.put(BytecodeExceptionKind.OUT_OF_BOUNDS, clearStackTrace(new ArrayIndexOutOfBoundsException()));
+            cachedExceptions.put(BytecodeExceptionKind.CLASS_CAST, clearStackTrace(new ClassCastException()));
+            cachedExceptions.put(BytecodeExceptionKind.ARRAY_STORE, clearStackTrace(new ArrayStoreException()));
+            cachedExceptions.put(BytecodeExceptionKind.DIVISION_BY_ZERO, clearStackTrace(new ArithmeticException()));
+        }
+
+        private static RuntimeException clearStackTrace(RuntimeException ex) {
+            ex.setStackTrace(new StackTraceElement[0]);
+            return ex;
         }
     }
 
     public static final class RuntimeCalls {
-        public static final ForeignCallDescriptor CREATE_ARRAY_STORE_EXCEPTION = new ForeignCallDescriptor("createArrayStoreException", ArrayStoreException.class, Object.class);
-        public static final ForeignCallDescriptor CREATE_CLASS_CAST_EXCEPTION = new ForeignCallDescriptor("createClassCastException", ClassCastException.class, Object.class, KlassPointer.class);
-        public static final ForeignCallDescriptor CREATE_NULL_POINTER_EXCEPTION = new ForeignCallDescriptor("createNullPointerException", NullPointerException.class);
-        public static final ForeignCallDescriptor CREATE_OUT_OF_BOUNDS_EXCEPTION = new ForeignCallDescriptor("createOutOfBoundsException", ArrayIndexOutOfBoundsException.class, int.class);
+        public static final EnumMap<BytecodeExceptionKind, ForeignCallDescriptor> runtimeCalls;
+
+        static {
+            runtimeCalls = new EnumMap<>(BytecodeExceptionKind.class);
+            runtimeCalls.put(BytecodeExceptionKind.ARRAY_STORE, new ForeignCallDescriptor("createArrayStoreException", ArrayStoreException.class, Object.class));
+            runtimeCalls.put(BytecodeExceptionKind.CLASS_CAST, new ForeignCallDescriptor("createClassCastException", ClassCastException.class, Object.class, KlassPointer.class));
+            runtimeCalls.put(BytecodeExceptionKind.NULL_POINTER, new ForeignCallDescriptor("createNullPointerException", NullPointerException.class));
+            runtimeCalls.put(BytecodeExceptionKind.OUT_OF_BOUNDS, new ForeignCallDescriptor("createOutOfBoundsException", ArrayIndexOutOfBoundsException.class, int.class, int.class));
+            runtimeCalls.put(BytecodeExceptionKind.DIVISION_BY_ZERO, new ForeignCallDescriptor("createDivisionByZeroException", ArithmeticException.class));
+        }
     }
 
-    private boolean throwCachedException(BytecodeExceptionNode node) {
-        Throwable exception;
-        if (node.getExceptionClass() == NullPointerException.class) {
-            exception = Exceptions.cachedNullPointerException;
-        } else if (node.getExceptionClass() == ArrayIndexOutOfBoundsException.class) {
-            exception = Exceptions.cachedArrayIndexOutOfBoundsException;
-        } else {
-            return false;
-        }
+    private void throwCachedException(BytecodeExceptionNode node) {
+        Throwable exception = Exceptions.cachedExceptions.get(node.getExceptionKind());
+        assert exception != null;
 
         StructuredGraph graph = node.graph();
         FloatingNode exceptionNode = ConstantNode.forConstant(constantReflection.forObject(exception), metaAccess, graph);
         graph.replaceFixedWithFloating(node, exceptionNode);
-        return true;
     }
 
     private void lowerBytecodeExceptionNode(BytecodeExceptionNode node) {
         if (OmitHotExceptionStacktrace.getValue(node.getOptions())) {
-            if (throwCachedException(node)) {
-                return;
-            }
+            throwCachedException(node);
+            return;
         }
 
-        ForeignCallDescriptor descriptor;
-        if (node.getExceptionClass() == NullPointerException.class) {
-            descriptor = RuntimeCalls.CREATE_NULL_POINTER_EXCEPTION;
-        } else if (node.getExceptionClass() == ArrayIndexOutOfBoundsException.class) {
-            descriptor = RuntimeCalls.CREATE_OUT_OF_BOUNDS_EXCEPTION;
-        } else if (node.getExceptionClass() == ArrayStoreException.class) {
-            descriptor = RuntimeCalls.CREATE_ARRAY_STORE_EXCEPTION;
-        } else if (node.getExceptionClass() == ClassCastException.class) {
-            descriptor = RuntimeCalls.CREATE_CLASS_CAST_EXCEPTION;
-        } else {
-            throw GraalError.shouldNotReachHere();
-        }
+        ForeignCallDescriptor descriptor = RuntimeCalls.runtimeCalls.get(node.getExceptionKind());
+        assert descriptor != null;
 
         StructuredGraph graph = node.graph();
         ForeignCallNode foreignCallNode = graph.add(new ForeignCallNode(foreignCalls, descriptor, node.stamp(NodeView.DEFAULT), node.getArguments()));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index 87d1f595c93..6ba3c770086 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -65,10 +65,6 @@ import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.
 import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.STACK_INSPECTABLE_LEAF;
 import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPTIMIZATION_HANDLER;
 import static org.graalvm.compiler.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER;
-import static org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.CREATE_ARRAY_STORE_EXCEPTION;
-import static org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.CREATE_CLASS_CAST_EXCEPTION;
-import static org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.CREATE_NULL_POINTER_EXCEPTION;
-import static org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.CREATE_OUT_OF_BOUNDS_EXCEPTION;
 import static org.graalvm.compiler.hotspot.replacements.AssertionSnippets.ASSERTION_VM_MESSAGE_C;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION;
@@ -112,6 +108,7 @@ import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
 import org.graalvm.compiler.hotspot.stubs.ArrayStoreExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.ClassCastExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.CreateExceptionStub;
+import org.graalvm.compiler.hotspot.stubs.DivisionByZeroExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub;
 import org.graalvm.compiler.hotspot.stubs.NewArrayStub;
 import org.graalvm.compiler.hotspot.stubs.NewInstanceStub;
@@ -121,6 +118,7 @@ import org.graalvm.compiler.hotspot.stubs.Stub;
 import org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub;
 import org.graalvm.compiler.hotspot.stubs.VerifyOopStub;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.compiler.word.WordTypes;
@@ -285,10 +283,13 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall
         link(new ExceptionHandlerStub(options, providers, foreignCalls.get(EXCEPTION_HANDLER)));
         link(new UnwindExceptionToCallerStub(options, providers, registerStubCall(UNWIND_EXCEPTION_TO_CALLER, NOT_REEXECUTABLE, SAFEPOINT, any())));
         link(new VerifyOopStub(options, providers, registerStubCall(VERIFY_OOP, REEXECUTABLE, LEAF_NOFP, NO_LOCATIONS)));
-        link(new ArrayStoreExceptionStub(options, providers, registerStubCall(CREATE_ARRAY_STORE_EXCEPTION, REEXECUTABLE, SAFEPOINT, any())));
-        link(new ClassCastExceptionStub(options, providers, registerStubCall(CREATE_CLASS_CAST_EXCEPTION, REEXECUTABLE, SAFEPOINT, any())));
-        link(new NullPointerExceptionStub(options, providers, registerStubCall(CREATE_NULL_POINTER_EXCEPTION, REEXECUTABLE, SAFEPOINT, any())));
-        link(new OutOfBoundsExceptionStub(options, providers, registerStubCall(CREATE_OUT_OF_BOUNDS_EXCEPTION, REEXECUTABLE, SAFEPOINT, any())));
+
+        EnumMap<BytecodeExceptionKind, ForeignCallDescriptor> exceptionRuntimeCalls = DefaultHotSpotLoweringProvider.RuntimeCalls.runtimeCalls;
+        link(new ArrayStoreExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.ARRAY_STORE), REEXECUTABLE, SAFEPOINT, any())));
+        link(new ClassCastExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.CLASS_CAST), REEXECUTABLE, SAFEPOINT, any())));
+        link(new NullPointerExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NULL_POINTER), REEXECUTABLE, SAFEPOINT, any())));
+        link(new OutOfBoundsExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.OUT_OF_BOUNDS), REEXECUTABLE, SAFEPOINT, any())));
+        link(new DivisionByZeroExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.DIVISION_BY_ZERO), REEXECUTABLE, SAFEPOINT, any())));
 
         linkForeignCall(options, providers, IDENTITY_HASHCODE, c.identityHashCodeAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, MARK_WORD_LOCATION);
         linkForeignCall(options, providers, REGISTER_FINALIZER, c.registerFinalizerAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java
index c0f91779bfb..b8a08d64b3b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java
@@ -27,6 +27,7 @@ import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
 import org.graalvm.compiler.core.common.type.StampPair;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
 import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
@@ -147,16 +148,16 @@ public final class HotSpotNodePlugin implements NodePlugin, TypePlugin {
     }
 
     @Override
-    public boolean handleLoadIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, JavaKind elementKind) {
-        if (b.parsingIntrinsic() && wordOperationPlugin.handleLoadIndexed(b, array, index, elementKind)) {
+    public boolean handleLoadIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind) {
+        if (b.parsingIntrinsic() && wordOperationPlugin.handleLoadIndexed(b, array, index, boundsCheck, elementKind)) {
             return true;
         }
         return false;
     }
 
     @Override
-    public boolean handleStoreIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, JavaKind elementKind, ValueNode value) {
-        if (b.parsingIntrinsic() && wordOperationPlugin.handleStoreIndexed(b, array, index, elementKind, value)) {
+    public boolean handleStoreIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, GuardingNode boundsCheck, GuardingNode storeCheck, JavaKind elementKind, ValueNode value) {
+        if (b.parsingIntrinsic() && wordOperationPlugin.handleStoreIndexed(b, array, index, boundsCheck, storeCheck, elementKind, value)) {
             return true;
         }
         return false;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java
index 0b6c70eb25c..5c508f5de1c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java
@@ -45,6 +45,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.ConditionalNode;
 import org.graalvm.compiler.nodes.calc.IsNullNode;
 import org.graalvm.compiler.nodes.calc.PointerEqualsNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
 import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
@@ -69,13 +70,13 @@ class HotSpotWordOperationPlugin extends WordOperationPlugin {
     }
 
     @Override
-    protected LoadIndexedNode createLoadIndexedNode(ValueNode array, ValueNode index) {
+    protected LoadIndexedNode createLoadIndexedNode(ValueNode array, ValueNode index, GuardingNode boundsCheck) {
         ResolvedJavaType arrayType = StampTool.typeOrNull(array);
         Stamp componentStamp = wordTypes.getWordStamp(arrayType.getComponentType());
         if (componentStamp instanceof MetaspacePointerStamp) {
-            return new LoadIndexedPointerNode(componentStamp, array, index);
+            return new LoadIndexedPointerNode(componentStamp, array, index, boundsCheck);
         } else {
-            return super.createLoadIndexedNode(array, index);
+            return super.createLoadIndexedNode(array, index, boundsCheck);
         }
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java
index b2771d038ed..f230a0ba3f9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java
@@ -26,6 +26,7 @@ import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -35,8 +36,8 @@ public final class LoadIndexedPointerNode extends LoadIndexedNode {
 
     public static final NodeClass<LoadIndexedPointerNode> TYPE = NodeClass.create(LoadIndexedPointerNode.class);
 
-    public LoadIndexedPointerNode(Stamp stamp, ValueNode array, ValueNode index) {
-        super(TYPE, stamp, array, index, JavaKind.Illegal);
+    public LoadIndexedPointerNode(Stamp stamp, ValueNode array, ValueNode index, GuardingNode boundsCheck) {
+        super(TYPE, stamp, array, index, boundsCheck, JavaKind.Illegal);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java
index 1173734b9c4..7848b0a70fd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java
@@ -121,6 +121,8 @@ public class WriteBarrierAdditionPhase extends Phase {
                 boolean precise = barrierType == BarrierType.PRECISE;
                 if (config.useG1GC) {
                     if (!node.getLocationIdentity().isInit()) {
+                        // The pre barrier does nothing if the value being read is null, so it can
+                        // be explicitly skipped when this is an initializing store.
                         addG1PreWriteBarrier(node, node.getAddress(), null, true, node.getNullCheck(), graph);
                     }
                     addG1PostWriteBarrier(node, node.getAddress(), node.value(), precise, graph);
@@ -178,6 +180,8 @@ public class WriteBarrierAdditionPhase extends Phase {
     private void addArrayRangeBarriers(ArrayRangeWrite write, StructuredGraph graph) {
         if (config.useG1GC) {
             if (!write.isInitialization()) {
+                // The pre barrier does nothing if the value being read is null, so it can
+                // be explicitly skipped when this is an initializing store.
                 G1ArrayRangePreWriteBarrier g1ArrayRangePreWriteBarrier = graph.add(new G1ArrayRangePreWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
                 graph.addBeforeFixed(write.asNode(), g1ArrayRangePreWriteBarrier);
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java
index 032a5a85da0..825a1ee39c5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java
@@ -40,10 +40,8 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.compiler.nodes.java.NewInstanceNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
 import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.replacements.nodes.BasicObjectCloneNode;
 
@@ -53,7 +51,7 @@ import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 @NodeInfo
-public final class ObjectCloneNode extends BasicObjectCloneNode implements VirtualizableAllocation, ArrayLengthProvider {
+public final class ObjectCloneNode extends BasicObjectCloneNode {
 
     public static final NodeClass<ObjectCloneNode> TYPE = NodeClass.create(ObjectCloneNode.class);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java
index ab972c66e32..14e899a3f1d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java
@@ -51,6 +51,7 @@ import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
 import org.graalvm.compiler.graph.Node.NodeIntrinsic;
+import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
 import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;
@@ -65,6 +66,7 @@ import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
 import org.graalvm.compiler.hotspot.nodes.VMErrorNode;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
@@ -79,12 +81,14 @@ import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.type.NarrowOopStamp;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.replacements.Log;
+import org.graalvm.compiler.replacements.ReplacementsUtil;
 import org.graalvm.compiler.replacements.SnippetCounter;
 import org.graalvm.compiler.replacements.SnippetCounter.Group;
 import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
 import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
 import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
 import org.graalvm.compiler.replacements.Snippets;
+import org.graalvm.compiler.replacements.nodes.AssertionNode;
 import org.graalvm.compiler.replacements.nodes.DirectStoreNode;
 import org.graalvm.compiler.word.Word;
 import jdk.internal.vm.compiler.word.LocationIdentity;
@@ -140,7 +144,10 @@ public class WriteBarrierSnippets implements Snippets {
     }
 
     @Snippet
-    public static void serialImpreciseWriteBarrier(Object object, @ConstantParameter Counters counters) {
+    public static void serialImpreciseWriteBarrier(Object object, @ConstantParameter boolean verifyBarrier, @ConstantParameter Counters counters) {
+        if (verifyBarrier) {
+            verifyNotArray(object);
+        }
         serialWriteBarrier(Word.objectToTrackedPointer(object), counters);
     }
 
@@ -221,8 +228,8 @@ public class WriteBarrierSnippets implements Snippets {
     }
 
     @Snippet
-    public static void g1PostWriteBarrier(Address address, Object object, Object value, @ConstantParameter boolean usePrecise, @ConstantParameter Register threadRegister,
-                    @ConstantParameter boolean trace, @ConstantParameter Counters counters) {
+    public static void g1PostWriteBarrier(Address address, Object object, Object value, @ConstantParameter boolean usePrecise, @ConstantParameter boolean verifyBarrier,
+                    @ConstantParameter Register threadRegister, @ConstantParameter boolean trace, @ConstantParameter Counters counters) {
         Word thread = registerAsWord(threadRegister);
         Object fixedValue = FixedValueAnchorNode.getObject(value);
         verifyOop(object);
@@ -232,6 +239,9 @@ public class WriteBarrierSnippets implements Snippets {
         if (usePrecise) {
             oop = Word.fromAddress(address);
         } else {
+            if (verifyBarrier) {
+                verifyNotArray(object);
+            }
             oop = Word.objectToTrackedPointer(object);
         }
         int gcCycle = 0;
@@ -298,6 +308,13 @@ public class WriteBarrierSnippets implements Snippets {
         }
     }
 
+    private static void verifyNotArray(Object object) {
+        if (object != null) {
+            // Manually build the null check and cast because we're in snippet that's lowered late.
+            AssertionNode.assertion(false, !PiNode.piCastNonNull(object, Object.class).getClass().isArray(), "imprecise card mark used with array");
+        }
+    }
+
     @Snippet
     public static void g1ArrayRangePreWriteBarrier(Address address, int length, @ConstantParameter int elementStride, @ConstantParameter Register threadRegister) {
         Word thread = registerAsWord(threadRegister);
@@ -415,11 +432,13 @@ public class WriteBarrierSnippets implements Snippets {
 
         private final CompressEncoding oopEncoding;
         private final Counters counters;
+        private final boolean verifyBarrier;
 
-        public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, SnippetCounter.Group.Factory factory, HotSpotProviders providers, TargetDescription target,
-                        CompressEncoding oopEncoding) {
+        public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, Group.Factory factory, HotSpotProviders providers, TargetDescription target,
+                        GraalHotSpotVMConfig config) {
             super(options, factories, providers, providers.getSnippetReflection(), target);
-            this.oopEncoding = oopEncoding;
+            this.oopEncoding = config.useCompressedOops ? config.getOopEncoding() : null;
+            this.verifyBarrier = ReplacementsUtil.REPLACEMENTS_ASSERTIONS_ENABLED || config.verifyBeforeGC || config.verifyAfterGC;
             this.counters = new Counters(factory);
         }
 
@@ -432,6 +451,7 @@ public class WriteBarrierSnippets implements Snippets {
                 args = new Arguments(serialImpreciseWriteBarrier, writeBarrier.graph().getGuardsStage(), tool.getLoweringStage());
                 OffsetAddressNode address = (OffsetAddressNode) writeBarrier.getAddress();
                 args.add("object", address.getBase());
+                args.addConst("verifyBarrier", verifyBarrier);
             }
             args.addConst("counters", counters);
             template(writeBarrier, args).instantiate(providers.getMetaAccess(), writeBarrier, DEFAULT_REPLACER, args);
@@ -519,6 +539,7 @@ public class WriteBarrierSnippets implements Snippets {
             args.add("value", value);
 
             args.addConst("usePrecise", writeBarrierPost.usePrecise());
+            args.addConst("verifyBarrier", verifyBarrier);
             args.addConst("threadRegister", registers.getThreadRegister());
             args.addConst("trace", traceBarrier(writeBarrierPost.graph()));
             args.addConst("counters", counters);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java
new file mode 100644
index 00000000000..1b773b166ed
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018, 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.hotspot.stubs;
+
+import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
+import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.replacements.nodes.CStringConstant;
+import org.graalvm.compiler.word.Word;
+
+import jdk.vm.ci.code.Register;
+
+/**
+ * Stub to allocate an {@link ArithmeticException} thrown by a bytecode for a division by zero.
+ */
+public class DivisionByZeroExceptionStub extends CreateExceptionStub {
+    public DivisionByZeroExceptionStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+        super("createDivisionByZeroException", options, providers, linkage);
+    }
+
+    @Override
+    protected Object getConstantParameterValue(int index, String name) {
+        GraalError.guarantee(index == 0, "unknown parameter %s at index %d", name, index);
+        return providers.getRegisters().getThreadRegister();
+    }
+
+    @Snippet
+    private static Object createDivisionByZeroException(@ConstantParameter Register threadRegister) {
+        Word msg = CStringConstant.cstring("/ by zero");
+        return createException(threadRegister, ArithmeticException.class, msg);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java
index c162328ae94..d544f6239ac 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -22,6 +22,9 @@
  */
 package org.graalvm.compiler.hotspot.stubs;
 
+import static org.graalvm.compiler.hotspot.stubs.StubUtil.printNumber;
+import static org.graalvm.compiler.hotspot.stubs.StubUtil.printString;
+
 import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
 import org.graalvm.compiler.debug.GraalError;
@@ -29,6 +32,7 @@ import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.nodes.AllocaNode;
 import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.serviceprovider.GraalServices;
 import org.graalvm.compiler.word.Word;
 
 import jdk.vm.ci.code.Register;
@@ -37,51 +41,52 @@ import jdk.vm.ci.code.Register;
  * Stub to allocate an {@link ArrayIndexOutOfBoundsException} thrown by a bytecode.
  */
 public class OutOfBoundsExceptionStub extends CreateExceptionStub {
-
     public OutOfBoundsExceptionStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
         super("createOutOfBoundsException", options, providers, linkage);
     }
 
+    // JDK-8201593: Print array length in ArrayIndexOutOfBoundsException.
+    private static final boolean PRINT_LENGTH_IN_EXCEPTION = GraalServices.JAVA_SPECIFICATION_VERSION >= 11;
     private static final int MAX_INT_STRING_SIZE = Integer.toString(Integer.MIN_VALUE).length();
+    private static final String STR_INDEX = "Index ";
+    private static final String STR_OUTOFBOUNDSFORLENGTH = " out of bounds for length ";
 
     @Override
     protected Object getConstantParameterValue(int index, String name) {
         switch (index) {
-            case 1:
-                return providers.getRegisters().getThreadRegister();
             case 2:
+                return providers.getRegisters().getThreadRegister();
+            case 3:
                 int wordSize = providers.getWordTypes().getWordKind().getByteCount();
-                // (MAX_INT_STRING_SIZE + 1) / wordSize, rounded up
-                return MAX_INT_STRING_SIZE / wordSize + 1;
+                int bytes;
+                if (PRINT_LENGTH_IN_EXCEPTION) {
+                    bytes = STR_INDEX.length() + STR_OUTOFBOUNDSFORLENGTH.length() + 2 * MAX_INT_STRING_SIZE;
+                } else {
+                    bytes = MAX_INT_STRING_SIZE;
+                }
+                // (required words for maximum length + nullbyte), rounded up
+                return (bytes + 1) / wordSize + 1;
+            case 4:
+                return PRINT_LENGTH_IN_EXCEPTION;
             default:
                 throw GraalError.shouldNotReachHere("unknown parameter " + name + " at index " + index);
         }
     }
 
     @Snippet
-    private static Object createOutOfBoundsException(int idx, @ConstantParameter Register threadRegister, @ConstantParameter int bufferSizeInWords) {
+    private static Object createOutOfBoundsException(int idx, int length, @ConstantParameter Register threadRegister, @ConstantParameter int bufferSizeInWords,
+                    @ConstantParameter boolean printLengthInException) {
         Word buffer = AllocaNode.alloca(bufferSizeInWords);
-
-        long number = idx;
-        if (number < 0) {
-            number = -number;
+        Word ptr;
+        if (printLengthInException) {
+            ptr = printString(buffer, STR_INDEX);
+            ptr = printNumber(ptr, idx);
+            ptr = printString(ptr, STR_OUTOFBOUNDSFORLENGTH);
+            ptr = printNumber(ptr, length);
+        } else {
+            ptr = printNumber(buffer, idx);
         }
-
-        Word ptr = buffer.add(MAX_INT_STRING_SIZE);
         ptr.writeByte(0, (byte) 0);
-        do {
-            long digit = number % 10;
-            number /= 10;
-
-            ptr = ptr.subtract(1);
-            ptr.writeByte(0, (byte) ('0' + digit));
-        } while (number > 0);
-
-        if (idx < 0) {
-            ptr = ptr.subtract(1);
-            ptr.writeByte(0, (byte) '-');
-        }
-
-        return createException(threadRegister, ArrayIndexOutOfBoundsException.class, ptr);
+        return createException(threadRegister, ArrayIndexOutOfBoundsException.class, buffer);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java
index 0a0856bf337..e7845fd73ca 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java
@@ -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
@@ -23,7 +23,7 @@
 package org.graalvm.compiler.hotspot.stubs;
 
 import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint;
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.clearPendingException;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.getAndClearObjectResult;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic;
@@ -272,4 +272,59 @@ public class StubUtil {
     static int hubOffset(@InjectedParameter GraalHotSpotVMConfig config) {
         return config.hubOffset;
     }
+
+    /**
+     * Print {@code number} as decimal string to {@code buffer}.
+     *
+     * @param buffer
+     * @param number
+     * @return A pointer pointing one byte right after the last printed digit in {@code buffer}.
+     */
+    public static Word printNumber(Word buffer, long number) {
+        long tmpNumber = number;
+        int offset;
+        if (tmpNumber <= 0) {
+            tmpNumber = -tmpNumber;
+            offset = 1;
+        } else {
+            offset = 0;
+        }
+        while (tmpNumber > 0) {
+            tmpNumber /= 10;
+            offset++;
+        }
+        tmpNumber = number < 0 ? -number : number;
+        Word ptr = buffer.add(offset);
+        do {
+            long digit = tmpNumber % 10;
+            tmpNumber /= 10;
+            ptr = ptr.subtract(1);
+            ptr.writeByte(0, (byte) ('0' + digit));
+        } while (tmpNumber > 0);
+
+        if (number < 0) {
+            ptr = ptr.subtract(1);
+            ptr.writeByte(0, (byte) '-');
+        }
+        return buffer.add(offset);
+    }
+
+    /**
+     * Copy {@code javaString} bytes to the memory location {@code ptr}.
+     *
+     * @param buffer
+     * @param javaString
+     * @return A pointer pointing one byte right after the last byte copied from {@code javaString}
+     *         to {@code ptr}
+     */
+    public static Word printString(Word buffer, String javaString) {
+        Word string = cstring(javaString);
+        int i = 0;
+        byte b;
+        while ((b = string.readByte(i)) != 0) {
+            buffer.writeByte(i, b);
+            i++;
+        }
+        return buffer.add(i);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java
index c3f5c13b2c0..4b76d2cbd8b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java
@@ -31,6 +31,7 @@ import static org.graalvm.compiler.bytecode.Bytecodes.BALOAD;
 import static org.graalvm.compiler.bytecode.Bytecodes.BASTORE;
 import static org.graalvm.compiler.bytecode.Bytecodes.CALOAD;
 import static org.graalvm.compiler.bytecode.Bytecodes.CASTORE;
+import static org.graalvm.compiler.bytecode.Bytecodes.CHECKCAST;
 import static org.graalvm.compiler.bytecode.Bytecodes.DALOAD;
 import static org.graalvm.compiler.bytecode.Bytecodes.DASTORE;
 import static org.graalvm.compiler.bytecode.Bytecodes.DRETURN;
@@ -43,6 +44,7 @@ import static org.graalvm.compiler.bytecode.Bytecodes.GOTO;
 import static org.graalvm.compiler.bytecode.Bytecodes.GOTO_W;
 import static org.graalvm.compiler.bytecode.Bytecodes.IALOAD;
 import static org.graalvm.compiler.bytecode.Bytecodes.IASTORE;
+import static org.graalvm.compiler.bytecode.Bytecodes.IDIV;
 import static org.graalvm.compiler.bytecode.Bytecodes.IFEQ;
 import static org.graalvm.compiler.bytecode.Bytecodes.IFGE;
 import static org.graalvm.compiler.bytecode.Bytecodes.IFGT;
@@ -64,12 +66,15 @@ import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEINTERFACE;
 import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESPECIAL;
 import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESTATIC;
 import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEVIRTUAL;
+import static org.graalvm.compiler.bytecode.Bytecodes.IREM;
 import static org.graalvm.compiler.bytecode.Bytecodes.IRETURN;
 import static org.graalvm.compiler.bytecode.Bytecodes.JSR;
 import static org.graalvm.compiler.bytecode.Bytecodes.JSR_W;
 import static org.graalvm.compiler.bytecode.Bytecodes.LALOAD;
 import static org.graalvm.compiler.bytecode.Bytecodes.LASTORE;
+import static org.graalvm.compiler.bytecode.Bytecodes.LDIV;
 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.PUTFIELD;
 import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC;
@@ -650,6 +655,10 @@ public final class BciBlockMapping {
                     }
                     break;
                 }
+                case IDIV:
+                case IREM:
+                case LDIV:
+                case LREM:
                 case IASTORE:
                 case LASTORE:
                 case FASTORE:
@@ -667,6 +676,7 @@ public final class BciBlockMapping {
                 case CALOAD:
                 case SALOAD:
                 case ARRAYLENGTH:
+                case CHECKCAST:
                 case PUTSTATIC:
                 case GETSTATIC:
                 case PUTFIELD:
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index 9a553709b08..b67444de5f3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -377,7 +377,10 @@ import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
 import org.graalvm.compiler.nodes.extended.AnchoringNode;
 import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
+import org.graalvm.compiler.nodes.extended.LoadArrayComponentHubNode;
 import org.graalvm.compiler.nodes.extended.LoadHubNode;
 import org.graalvm.compiler.nodes.extended.LoadMethodNode;
 import org.graalvm.compiler.nodes.extended.MembarNode;
@@ -398,6 +401,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.ProfilingPlugin;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.compiler.nodes.java.FinalFieldBarrierNode;
+import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
 import org.graalvm.compiler.nodes.java.InstanceOfNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
@@ -423,6 +427,7 @@ import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.code.site.InfopointReason;
+import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
@@ -1133,12 +1138,12 @@ public class BytecodeParser implements GraphBuilderContext {
         finishedDispatch.setNext(target);
     }
 
-    protected ValueNode genLoadIndexed(ValueNode array, ValueNode index, JavaKind kind) {
-        return LoadIndexedNode.create(graph.getAssumptions(), array, index, kind, metaAccess, constantReflection);
+    protected ValueNode genLoadIndexed(ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind kind) {
+        return LoadIndexedNode.create(graph.getAssumptions(), array, index, boundsCheck, kind, metaAccess, constantReflection);
     }
 
-    protected void genStoreIndexed(ValueNode array, ValueNode index, JavaKind kind, ValueNode value) {
-        add(new StoreIndexedNode(array, index, kind, value));
+    protected void genStoreIndexed(ValueNode array, ValueNode index, GuardingNode boundsCheck, GuardingNode storeCheck, JavaKind kind, ValueNode value) {
+        add(new StoreIndexedNode(array, index, boundsCheck, storeCheck, kind, value));
     }
 
     protected ValueNode genIntegerAdd(ValueNode x, ValueNode y) {
@@ -1173,12 +1178,12 @@ public class BytecodeParser implements GraphBuilderContext {
         return RemNode.create(x, y, NodeView.DEFAULT);
     }
 
-    protected ValueNode genIntegerDiv(ValueNode x, ValueNode y) {
-        return SignedDivNode.create(x, y, NodeView.DEFAULT);
+    protected ValueNode genIntegerDiv(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        return SignedDivNode.create(x, y, zeroCheck, NodeView.DEFAULT);
     }
 
-    protected ValueNode genIntegerRem(ValueNode x, ValueNode y) {
-        return SignedRemNode.create(x, y, NodeView.DEFAULT);
+    protected ValueNode genIntegerRem(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        return SignedRemNode.create(x, y, zeroCheck, NodeView.DEFAULT);
     }
 
     protected ValueNode genNegateOp(ValueNode x) {
@@ -1267,10 +1272,12 @@ public class BytecodeParser implements GraphBuilderContext {
     protected void genThrow() {
         genInfoPointNode(InfopointReason.BYTECODE_POSITION, null);
 
-        ValueNode exception = frameState.pop(JavaKind.Object);
-        FixedGuardNode nullCheck = append(new FixedGuardNode(graph.addOrUniqueWithInputs(IsNullNode.create(exception)), NullCheckException, InvalidateReprofile, true));
-        ValueNode nonNullException = graph.maybeAddOrUnique(PiNode.create(exception, exception.stamp(NodeView.DEFAULT).join(objectNonNull()), nullCheck));
-        lastInstr.setNext(handleException(nonNullException, bci(), false));
+        ValueNode exception = maybeEmitExplicitNullCheck(frameState.pop(JavaKind.Object));
+        if (!StampTool.isPointerNonNull(exception.stamp(NodeView.DEFAULT))) {
+            FixedGuardNode nullCheck = append(new FixedGuardNode(graph.addOrUniqueWithInputs(IsNullNode.create(exception)), NullCheckException, InvalidateReprofile, true));
+            exception = graph.maybeAddOrUnique(PiNode.create(exception, exception.stamp(NodeView.DEFAULT).join(objectNonNull()), nullCheck));
+        }
+        lastInstr.setNext(handleException(exception, bci(), false));
     }
 
     protected LogicNode createInstanceOf(TypeReference type, ValueNode object) {
@@ -1324,30 +1331,61 @@ public class BytecodeParser implements GraphBuilderContext {
         return new StateSplitProxyNode(fieldRead);
     }
 
-    protected ValueNode emitExplicitNullCheck(ValueNode receiver) {
-        if (StampTool.isPointerNonNull(receiver.stamp(NodeView.DEFAULT))) {
+    protected ValueNode maybeEmitExplicitNullCheck(ValueNode receiver) {
+        if (StampTool.isPointerNonNull(receiver.stamp(NodeView.DEFAULT)) || !needsExplicitNullCheckException(receiver)) {
             return receiver;
         }
-        BytecodeExceptionNode exception = graph.add(new BytecodeExceptionNode(metaAccess, NullPointerException.class));
-        AbstractBeginNode falseSucc = graph.add(new BeginNode());
-        ValueNode nonNullReceiver = graph.addOrUniqueWithInputs(PiNode.create(receiver, objectNonNull(), falseSucc));
-        append(new IfNode(graph.addOrUniqueWithInputs(IsNullNode.create(receiver)), exception, falseSucc, SLOW_PATH_PROBABILITY));
-        lastInstr = falseSucc;
+        LogicNode condition = genUnique(IsNullNode.create(receiver));
+        AbstractBeginNode passingSuccessor = emitBytecodeExceptionCheck(condition, false, BytecodeExceptionKind.NULL_POINTER);
+        return genUnique(PiNode.create(receiver, objectNonNull(), passingSuccessor));
+    }
+
+    protected GuardingNode maybeEmitExplicitBoundsCheck(ValueNode receiver, ValueNode index) {
+        if (!needsExplicitBoundsCheckException(receiver, index)) {
+            return null;
+        }
+        ValueNode length = append(genArrayLength(receiver));
+        LogicNode condition = genUnique(IntegerBelowNode.create(constantReflection, metaAccess, options, null, index, length, NodeView.DEFAULT));
+        return emitBytecodeExceptionCheck(condition, true, BytecodeExceptionKind.OUT_OF_BOUNDS, index, length);
+    }
+
+    protected GuardingNode maybeEmitExplicitStoreCheck(ValueNode array, JavaKind elementKind, ValueNode value) {
+        if (elementKind != JavaKind.Object || StampTool.isPointerAlwaysNull(value) || !needsExplicitStoreCheckException(array, value)) {
+            return null;
+        }
+        ValueNode arrayClass = genUnique(LoadHubNode.create(array, stampProvider, metaAccess, constantReflection));
+        ValueNode componentHub = append(LoadArrayComponentHubNode.create(arrayClass, stampProvider, metaAccess, constantReflection));
+        LogicNode condition = genUnique(InstanceOfDynamicNode.create(graph.getAssumptions(), getConstantReflection(), componentHub, value, true));
+        return emitBytecodeExceptionCheck(condition, true, BytecodeExceptionKind.ARRAY_STORE, value);
+    }
+
+    protected GuardingNode maybeEmitExplicitDivisionByZeroCheck(ValueNode y) {
+        if (!((IntegerStamp) y.stamp(NodeView.DEFAULT)).contains(0) || !needsExplicitDivisionByZeroException(y)) {
+            return null;
+        }
+        ConstantNode zero = ConstantNode.defaultForKind(y.getStackKind(), graph);
+        LogicNode condition = genUnique(IntegerEqualsNode.create(constantReflection, metaAccess, options, null, y, zero, NodeView.DEFAULT));
+        return emitBytecodeExceptionCheck(condition, false, BytecodeExceptionKind.DIVISION_BY_ZERO);
+    }
+
+    private AbstractBeginNode emitBytecodeExceptionCheck(LogicNode condition, boolean passingOnTrue, BytecodeExceptionKind exceptionKind, ValueNode... arguments) {
+        if (passingOnTrue ? condition.isTautology() : condition.isContradiction()) {
+            return null;
+        }
+
+        BytecodeExceptionNode exception = graph.add(new BytecodeExceptionNode(metaAccess, exceptionKind, arguments));
+        AbstractBeginNode passingSuccessor = graph.add(new BeginNode());
+
+        FixedNode trueSuccessor = passingOnTrue ? passingSuccessor : exception;
+        FixedNode falseSuccessor = passingOnTrue ? exception : passingSuccessor;
+        append(new IfNode(condition, trueSuccessor, falseSuccessor, SLOW_PATH_PROBABILITY));
+        lastInstr = passingSuccessor;
 
         exception.setStateAfter(createFrameState(bci(), exception));
         exception.setNext(handleException(exception, bci(), false));
         EXPLICIT_EXCEPTIONS.increment(debug);
-        return nonNullReceiver;
-    }
 
-    protected void emitExplicitBoundsCheck(ValueNode index, ValueNode length) {
-        AbstractBeginNode trueSucc = graph.add(new BeginNode());
-        BytecodeExceptionNode exception = graph.add(new BytecodeExceptionNode(metaAccess, ArrayIndexOutOfBoundsException.class, index));
-        append(new IfNode(genUnique(IntegerBelowNode.create(constantReflection, metaAccess, options, null, index, length, NodeView.DEFAULT)), trueSucc, exception, FAST_PATH_PROBABILITY));
-        lastInstr = trueSucc;
-
-        exception.setStateAfter(createFrameState(bci(), exception));
-        exception.setNext(handleException(exception, bci(), false));
+        return passingSuccessor;
     }
 
     protected ValueNode genArrayLength(ValueNode x) {
@@ -1617,7 +1655,7 @@ public class BytecodeParser implements GraphBuilderContext {
             returnType = returnType.resolve(targetMethod.getDeclaringClass());
         }
         if (invokeKind.hasReceiver()) {
-            args[0] = emitExplicitExceptions(args[0]);
+            args[0] = maybeEmitExplicitNullCheck(args[0]);
         }
 
         if (initialInvokeKind == InvokeKind.Special && !targetMethod.isConstructor()) {
@@ -1910,8 +1948,8 @@ public class BytecodeParser implements GraphBuilderContext {
 
     /**
      * Weaves a test of the receiver type to ensure the dispatch will select {@code targetMethod}
-     * and not another method that overrides it. This should only be called if there is an intrinsic
-     * (i.e., an {@link InvocationPlugin}) for {@code targetMethod} and the invocation is indirect.
+     * and not another method that overrides it. This should only be called if there is an
+     * {@link InvocationPlugin} for {@code targetMethod} and the invocation is indirect.
      *
      * The control flow woven around the intrinsic is as follows:
      *
@@ -2066,9 +2104,7 @@ public class BytecodeParser implements GraphBuilderContext {
         if (plugin != null) {
 
             if (intrinsicContext != null && intrinsicContext.isCallToOriginal(targetMethod)) {
-                // Self recursive intrinsic means the original
-                // method should be called.
-                assert !targetMethod.hasBytecodes() : "TODO: when does this happen?";
+                // Self recursive intrinsic means the original method should be called.
                 return false;
             }
 
@@ -2088,7 +2124,7 @@ public class BytecodeParser implements GraphBuilderContext {
             try (DebugCloseable context = openNodeContext(targetMethod)) {
                 if (plugin.execute(this, targetMethod, pluginReceiver, args)) {
                     afterInvocationPluginExecution(true, assertions, intrinsicGuard, invokeKind, args, targetMethod, resultType, returnType);
-                    return true;
+                    return !plugin.isDecorator();
                 } else {
                     afterInvocationPluginExecution(false, assertions, intrinsicGuard, invokeKind, args, targetMethod, resultType, returnType);
                 }
@@ -2911,75 +2947,87 @@ public class BytecodeParser implements GraphBuilderContext {
         }
     }
 
+    @SuppressWarnings("try")
     private void createUnwind() {
         assert frameState.stackSize() == 1 : frameState;
         synchronizedEpilogue(BytecodeFrame.AFTER_EXCEPTION_BCI, null, null);
-        ValueNode exception = frameState.pop(JavaKind.Object);
-        append(new UnwindNode(exception));
+        try (DebugCloseable context = openNodeContext(frameState, BytecodeFrame.UNWIND_BCI)) {
+            ValueNode exception = frameState.pop(JavaKind.Object);
+            append(new UnwindNode(exception));
+        }
     }
 
+    @SuppressWarnings("try")
     private void synchronizedEpilogue(int bci, ValueNode currentReturnValue, JavaKind currentReturnValueKind) {
-        if (method.isSynchronized()) {
-            if (currentReturnValue != null) {
-                frameState.push(currentReturnValueKind, currentReturnValue);
+        try (DebugCloseable context = openNodeContext(frameState, bci)) {
+            if (method.isSynchronized()) {
+                if (currentReturnValue != null) {
+                    frameState.push(currentReturnValueKind, currentReturnValue);
+                }
+                genMonitorExit(methodSynchronizedObject, currentReturnValue, bci);
+                assert !frameState.rethrowException();
+                finishPrepare(lastInstr, bci);
+            }
+            if (frameState.lockDepth(false) != 0) {
+                throw bailout("unbalanced monitors: too few exits exiting frame");
             }
-            genMonitorExit(methodSynchronizedObject, currentReturnValue, bci);
-            assert !frameState.rethrowException();
-            finishPrepare(lastInstr, bci);
-        }
-        if (frameState.lockDepth(false) != 0) {
-            throw bailout("unbalanced monitors: too few exits exiting frame");
         }
     }
 
+    @SuppressWarnings("try")
     private void createExceptionDispatch(ExceptionDispatchBlock block) {
-        lastInstr = finishInstruction(lastInstr, frameState);
+        try (DebugCloseable context = openNodeContext(frameState, BytecodeFrame.AFTER_EXCEPTION_BCI)) {
+            lastInstr = finishInstruction(lastInstr, frameState);
 
-        assert frameState.stackSize() == 1 : frameState;
-        if (block.handler.isCatchAll()) {
-            assert block.getSuccessorCount() == 1;
-            appendGoto(block.getSuccessor(0));
-            return;
-        }
+            assert frameState.stackSize() == 1 : frameState;
+            if (block.handler.isCatchAll()) {
+                assert block.getSuccessorCount() == 1;
+                appendGoto(block.getSuccessor(0));
+                return;
+            }
 
-        JavaType catchType = block.handler.getCatchType();
-        if (graphBuilderConfig.eagerResolving()) {
-            catchType = lookupType(block.handler.catchTypeCPI(), INSTANCEOF);
-        }
-        if (catchType instanceof ResolvedJavaType) {
-            TypeReference checkedCatchType = TypeReference.createTrusted(graph.getAssumptions(), (ResolvedJavaType) catchType);
+            JavaType catchType = block.handler.getCatchType();
+            if (graphBuilderConfig.eagerResolving()) {
+                catchType = lookupType(block.handler.catchTypeCPI(), INSTANCEOF);
+            }
+            if (catchType instanceof ResolvedJavaType) {
+                TypeReference checkedCatchType = TypeReference.createTrusted(graph.getAssumptions(), (ResolvedJavaType) catchType);
 
-            if (graphBuilderConfig.getSkippedExceptionTypes() != null) {
-                for (ResolvedJavaType skippedType : graphBuilderConfig.getSkippedExceptionTypes()) {
-                    if (skippedType.isAssignableFrom(checkedCatchType.getType())) {
-                        BciBlock nextBlock = block.getSuccessorCount() == 1 ? blockMap.getUnwindBlock() : block.getSuccessor(1);
-                        ValueNode exception = frameState.stack[0];
-                        FixedNode trueSuccessor = graph.add(new DeoptimizeNode(InvalidateReprofile, UnreachedCode));
-                        FixedNode nextDispatch = createTarget(nextBlock, frameState);
-                        append(new IfNode(graph.addOrUniqueWithInputs(createInstanceOf(checkedCatchType, exception)), trueSuccessor, nextDispatch, 0));
-                        return;
+                if (graphBuilderConfig.getSkippedExceptionTypes() != null) {
+                    for (ResolvedJavaType skippedType : graphBuilderConfig.getSkippedExceptionTypes()) {
+                        if (skippedType.isAssignableFrom(checkedCatchType.getType())) {
+                            BciBlock nextBlock = block.getSuccessorCount() == 1 ? blockMap.getUnwindBlock() : block.getSuccessor(1);
+                            ValueNode exception = frameState.stack[0];
+                            FixedNode trueSuccessor = graph.add(new DeoptimizeNode(InvalidateReprofile, UnreachedCode));
+                            FixedNode nextDispatch = createTarget(nextBlock, frameState);
+                            append(new IfNode(graph.addOrUniqueWithInputs(createInstanceOf(checkedCatchType, exception)), trueSuccessor, nextDispatch, 0));
+                            return;
+                        }
                     }
                 }
-            }
 
-            BciBlock nextBlock = block.getSuccessorCount() == 1 ? blockMap.getUnwindBlock() : block.getSuccessor(1);
-            ValueNode exception = frameState.stack[0];
-            /* Anchor for the piNode, which must be before any LoopExit inserted by createTarget. */
-            BeginNode piNodeAnchor = graph.add(new BeginNode());
-            ObjectStamp checkedStamp = StampFactory.objectNonNull(checkedCatchType);
-            PiNode piNode = graph.addWithoutUnique(new PiNode(exception, checkedStamp));
-            frameState.pop(JavaKind.Object);
-            frameState.push(JavaKind.Object, piNode);
-            FixedNode catchSuccessor = createTarget(block.getSuccessor(0), frameState);
-            frameState.pop(JavaKind.Object);
-            frameState.push(JavaKind.Object, exception);
-            FixedNode nextDispatch = createTarget(nextBlock, frameState);
-            piNodeAnchor.setNext(catchSuccessor);
-            IfNode ifNode = append(new IfNode(graph.unique(createInstanceOf(checkedCatchType, exception)), piNodeAnchor, nextDispatch, 0.5));
-            assert ifNode.trueSuccessor() == piNodeAnchor;
-            piNode.setGuard(ifNode.trueSuccessor());
-        } else {
-            handleUnresolvedExceptionType(catchType);
+                BciBlock nextBlock = block.getSuccessorCount() == 1 ? blockMap.getUnwindBlock() : block.getSuccessor(1);
+                ValueNode exception = frameState.stack[0];
+                /*
+                 * Anchor for the piNode, which must be before any LoopExit inserted by
+                 * createTarget.
+                 */
+                BeginNode piNodeAnchor = graph.add(new BeginNode());
+                ObjectStamp checkedStamp = StampFactory.objectNonNull(checkedCatchType);
+                PiNode piNode = graph.addWithoutUnique(new PiNode(exception, checkedStamp));
+                frameState.pop(JavaKind.Object);
+                frameState.push(JavaKind.Object, piNode);
+                FixedNode catchSuccessor = createTarget(block.getSuccessor(0), frameState);
+                frameState.pop(JavaKind.Object);
+                frameState.push(JavaKind.Object, exception);
+                FixedNode nextDispatch = createTarget(nextBlock, frameState);
+                piNodeAnchor.setNext(catchSuccessor);
+                IfNode ifNode = append(new IfNode(graph.unique(createInstanceOf(checkedCatchType, exception)), piNodeAnchor, nextDispatch, 0.5));
+                assert ifNode.trueSuccessor() == piNodeAnchor;
+                piNode.setGuard(ifNode.trueSuccessor());
+            } else {
+                handleUnresolvedExceptionType(catchType);
+            }
         }
     }
 
@@ -3220,22 +3268,22 @@ public class BytecodeParser implements GraphBuilderContext {
     }
 
     protected double getProfileProbability(boolean negate) {
-        double probability;
         if (profilingInfo == null) {
-            probability = 0.5;
-        } else {
-            assert assertAtIfBytecode();
-            probability = profilingInfo.getBranchTakenProbability(bci());
-            if (probability < 0) {
-                assert probability == -1 : "invalid probability";
-                debug.log("missing probability in %s at bci %d", code, bci());
-                probability = 0.5;
-            } else {
-                if (negate) {
-                    // the probability coming from profile is about the original condition
-                    probability = 1 - probability;
-                }
-            }
+            return 0.5;
+        }
+
+        assert assertAtIfBytecode();
+        double probability = profilingInfo.getBranchTakenProbability(bci());
+
+        if (probability < 0) {
+            assert probability == -1 : "invalid probability";
+            debug.log("missing probability in %s at bci %d", code, bci());
+            return 0.5;
+        }
+
+        if (negate && shouldComplementProbability()) {
+            // the probability coming from profile is about the original condition
+            probability = 1 - probability;
         }
         return probability;
     }
@@ -3277,7 +3325,10 @@ public class BytecodeParser implements GraphBuilderContext {
             BciBlock tmpBlock = trueBlock;
             trueBlock = falseBlock;
             falseBlock = tmpBlock;
-            probability = 1 - probability;
+            if (shouldComplementProbability()) {
+                // the probability coming from profile is about the original condition
+                probability = 1 - probability;
+            }
             condition = logicNegationNode.getValue();
         }
 
@@ -3288,9 +3339,13 @@ public class BytecodeParser implements GraphBuilderContext {
                 condition = genUnique(condition);
             }
 
+            NodeSourcePosition currentPosition = graph.currentNodeSourcePosition();
             if (isNeverExecutedCode(probability)) {
                 if (!graph.isOSR() || getParent() != null || graph.getEntryBCI() != trueBlock.startBci) {
-                    append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, true));
+                    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);
                     }
@@ -3299,7 +3354,10 @@ public class BytecodeParser implements GraphBuilderContext {
                 }
             } else if (isNeverExecutedCode(1 - probability)) {
                 if (!graph.isOSR() || getParent() != null || graph.getEntryBCI() != falseBlock.startBci) {
-                    append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, false));
+                    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);
                     }
@@ -3332,6 +3390,14 @@ public class BytecodeParser implements GraphBuilderContext {
         }
     }
 
+    /**
+     * Hook for subclasses to decide whether the IfNode probability should be complemented during
+     * conversion to Graal IR.
+     */
+    protected boolean shouldComplementProbability() {
+        return true;
+    }
+
     /**
      * Hook for subclasses to generate custom nodes before an IfNode.
      */
@@ -3587,29 +3653,36 @@ public class BytecodeParser implements GraphBuilderContext {
 
     private void genLoadIndexed(JavaKind kind) {
         ValueNode index = frameState.pop(JavaKind.Int);
-        ValueNode array = emitExplicitExceptions(frameState.pop(JavaKind.Object), index);
+        ValueNode array = frameState.pop(JavaKind.Object);
+
+        array = maybeEmitExplicitNullCheck(array);
+        GuardingNode boundsCheck = maybeEmitExplicitBoundsCheck(array, index);
 
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
-            if (plugin.handleLoadIndexed(this, array, index, kind)) {
+            if (plugin.handleLoadIndexed(this, array, index, boundsCheck, kind)) {
                 return;
             }
         }
 
-        frameState.push(kind, append(genLoadIndexed(array, index, kind)));
+        frameState.push(kind, append(genLoadIndexed(array, index, boundsCheck, kind)));
     }
 
     private void genStoreIndexed(JavaKind kind) {
         ValueNode value = frameState.pop(kind);
         ValueNode index = frameState.pop(JavaKind.Int);
-        ValueNode array = emitExplicitExceptions(frameState.pop(JavaKind.Object), index);
+        ValueNode array = frameState.pop(JavaKind.Object);
+
+        array = maybeEmitExplicitNullCheck(array);
+        GuardingNode boundsCheck = maybeEmitExplicitBoundsCheck(array, index);
+        GuardingNode storeCheck = maybeEmitExplicitStoreCheck(array, kind, value);
 
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
-            if (plugin.handleStoreIndexed(this, array, index, kind, value)) {
+            if (plugin.handleStoreIndexed(this, array, index, boundsCheck, storeCheck, kind, value)) {
                 return;
             }
         }
 
-        genStoreIndexed(array, index, kind, value);
+        genStoreIndexed(array, index, boundsCheck, storeCheck, kind, value);
     }
 
     private void genArithmeticOp(JavaKind kind, int opcode) {
@@ -3658,15 +3731,18 @@ public class BytecodeParser implements GraphBuilderContext {
     private void genIntegerDivOp(JavaKind kind, int opcode) {
         ValueNode y = frameState.pop(kind);
         ValueNode x = frameState.pop(kind);
+
+        GuardingNode zeroCheck = maybeEmitExplicitDivisionByZeroCheck(y);
+
         ValueNode v;
         switch (opcode) {
             case IDIV:
             case LDIV:
-                v = genIntegerDiv(x, y);
+                v = genIntegerDiv(x, y, zeroCheck);
                 break;
             case IREM:
             case LREM:
-                v = genIntegerRem(x, y);
+                v = genIntegerRem(x, y, zeroCheck);
                 break;
             default:
                 throw shouldNotReachHere();
@@ -3871,7 +3947,8 @@ public class BytecodeParser implements GraphBuilderContext {
             handleUnresolvedCheckCast(type, object);
             return;
         }
-        TypeReference checkedType = TypeReference.createTrusted(graph.getAssumptions(), (ResolvedJavaType) type);
+        ResolvedJavaType resolvedType = (ResolvedJavaType) type;
+        TypeReference checkedType = TypeReference.createTrusted(graph.getAssumptions(), resolvedType);
         JavaTypeProfile profile = getProfileForTypeCheck(checkedType);
 
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
@@ -3903,8 +3980,16 @@ public class BytecodeParser implements GraphBuilderContext {
             if (condition.isTautology()) {
                 castNode = object;
             } else {
-                FixedGuardNode fixedGuard = append(new FixedGuardNode(condition, DeoptimizationReason.ClassCastException, DeoptimizationAction.InvalidateReprofile, false));
-                castNode = append(PiNode.create(object, StampFactory.object(checkedType, nonNull), fixedGuard));
+                GuardingNode guard;
+                if (needsExplicitClassCastException(object)) {
+                    Constant hub = getConstantReflection().asObjectHub(resolvedType);
+                    Stamp hubStamp = getStampProvider().createHubStamp(StampFactory.object(TypeReference.createExactTrusted(resolvedType)));
+                    ConstantNode hubConstant = ConstantNode.forConstant(hubStamp, hub, getMetaAccess(), graph);
+                    guard = emitBytecodeExceptionCheck(condition, true, BytecodeExceptionKind.CLASS_CAST, object, hubConstant);
+                } else {
+                    guard = append(new FixedGuardNode(condition, DeoptimizationReason.ClassCastException, DeoptimizationAction.InvalidateReprofile, false));
+                }
+                castNode = append(PiNode.create(object, StampFactory.object(checkedType, nonNull), guard.asNode()));
             }
         }
         frameState.push(JavaKind.Object, castNode);
@@ -4124,7 +4209,7 @@ public class BytecodeParser implements GraphBuilderContext {
     }
 
     private void genGetField(JavaField field, ValueNode receiverInput) {
-        ValueNode receiver = emitExplicitExceptions(receiverInput);
+        ValueNode receiver = maybeEmitExplicitNullCheck(receiverInput);
         if (field instanceof ResolvedJavaField) {
             ResolvedJavaField resolvedField = (ResolvedJavaField) field;
             genGetField(resolvedField, receiver);
@@ -4163,29 +4248,56 @@ public class BytecodeParser implements GraphBuilderContext {
     }
 
     /**
-     * @param receiver the receiver of an object based operation
-     * @param index the index of an array based operation that is to be tested for out of bounds.
-     *            This is null for a non-array operation.
-     * @return the receiver value possibly modified to have a non-null stamp
+     * Returns true if an explicit null check should be emitted for the given object.
+     *
+     * @param object The object that is accessed.
      */
-    protected ValueNode emitExplicitExceptions(ValueNode receiver, ValueNode index) {
-        if (needsExplicitException()) {
-            ValueNode nonNullReceiver = emitExplicitNullCheck(receiver);
-            ValueNode length = append(genArrayLength(nonNullReceiver));
-            emitExplicitBoundsCheck(index, length);
-            return nonNullReceiver;
-        }
-        return receiver;
+    protected boolean needsExplicitNullCheckException(ValueNode object) {
+        return needsExplicitException();
     }
 
-    protected ValueNode emitExplicitExceptions(ValueNode receiver) {
-        if (StampTool.isPointerNonNull(receiver) || !needsExplicitException()) {
-            return receiver;
-        } else {
-            return emitExplicitNullCheck(receiver);
-        }
+    /**
+     * Returns true if an explicit null check should be emitted for the given object.
+     *
+     * @param array The array that is accessed.
+     * @param index The array index that is accessed.
+     */
+    protected boolean needsExplicitBoundsCheckException(ValueNode array, ValueNode index) {
+        return needsExplicitException();
     }
 
+    /**
+     * Returns true if an explicit check for a {@link ClassCastException} should be emitted for the
+     * given object.
+     *
+     * @param object The object that is accessed.
+     */
+    protected boolean needsExplicitClassCastException(ValueNode object) {
+        return needsExplicitException();
+    }
+
+    /**
+     * Returns true if an explicit null check should be emitted for the given object.
+     *
+     * @param array The array that is accessed.
+     * @param value The value that is stored into the array.
+     */
+    protected boolean needsExplicitStoreCheckException(ValueNode array, ValueNode value) {
+        return needsExplicitException();
+    }
+
+    /**
+     * Returns true if an explicit null check should be emitted for the given object.
+     *
+     * @param y The dividend.
+     */
+    protected boolean needsExplicitDivisionByZeroException(ValueNode y) {
+        return needsExplicitException();
+    }
+
+    /**
+     * Returns true if an explicit exception check should be emitted.
+     */
     protected boolean needsExplicitException() {
         BytecodeExceptionMode exceptionMode = graphBuilderConfig.getBytecodeExceptionMode();
         if (exceptionMode == BytecodeExceptionMode.CheckAll || StressExplicitExceptionCode.getValue(options)) {
@@ -4206,7 +4318,8 @@ public class BytecodeParser implements GraphBuilderContext {
     }
 
     private void genPutField(JavaField field, ValueNode value) {
-        ValueNode receiver = emitExplicitExceptions(frameState.pop(JavaKind.Object));
+        ValueNode receiver = maybeEmitExplicitNullCheck(frameState.pop(JavaKind.Object));
+
         if (field instanceof ResolvedJavaField) {
             ResolvedJavaField resolvedField = (ResolvedJavaField) field;
 
@@ -4703,7 +4816,7 @@ public class BytecodeParser implements GraphBuilderContext {
     }
 
     private void genArrayLength() {
-        ValueNode array = emitExplicitExceptions(frameState.pop(JavaKind.Object));
+        ValueNode array = maybeEmitExplicitNullCheck(frameState.pop(JavaKind.Object));
         frameState.push(JavaKind.Int, append(genArrayLength(array)));
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java
index 6df268c5f1d..72d8523a680 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java
@@ -67,6 +67,7 @@ public class UnsafeAllocateInstance01 extends JTTTest {
         runTest("testInstance");
     }
 
+    @Ignore("https://bugs.openjdk.java.net/browse/JDK-8153540")
     @Test
     public void run1() throws Throwable {
         runTest("testClassForException", UnsafeAllocateInstance01[].class);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/CE_InstanceOf.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/CE_InstanceOf.java
new file mode 100644
index 00000000000..8ef3eac91c3
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/CE_InstanceOf.java
@@ -0,0 +1,114 @@
+/*
+ * 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.jtt.optimize;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
+
+public class CE_InstanceOf extends JTTTest {
+
+    static class A {
+    }
+
+    static class B extends A {
+    }
+
+    static class C extends A {
+    }
+
+    public static A testRedundantCast(Object value) {
+        if (value != null && value.getClass() == A.class) {
+            return (A) value;
+        }
+        return null;
+    }
+
+    public static boolean testRedundantInstanceOf(Object value) {
+        if (value != null && value.getClass() == A.class) {
+            return (value instanceof A);
+        }
+        return false;
+    }
+
+    public static boolean testRedundantInstanceOf2(Object value) {
+        if (value.getClass() == A.class) {
+            return (value instanceof A);
+        }
+        return false;
+    }
+
+    public static boolean testNonRedundantInstanceOf(Object value) {
+        if (value instanceof A) {
+            return (value != null && value.getClass() == A.class);
+        }
+        return false;
+    }
+
+    public static Object testNonRedundantInstanceOf2(Object value) {
+        if (value != null && value.getClass() == Object[].class) {
+            return ((Object[]) value)[0];
+        }
+        return null;
+    }
+
+    private static final List<A> testArgs = Collections.unmodifiableList(Arrays.asList(new A(), new B(), null));
+
+    @Test
+    public void run0() throws Throwable {
+        for (A a : testArgs) {
+            runTest("testRedundantCast", a);
+        }
+    }
+
+    @Test
+    public void run1() throws Throwable {
+        for (A a : testArgs) {
+            runTest("testRedundantInstanceOf", a);
+        }
+    }
+
+    @Test
+    public void run2() throws Throwable {
+        for (A a : testArgs) {
+            runTest("testRedundantInstanceOf2", a);
+        }
+    }
+
+    @Test
+    public void run3() throws Throwable {
+        for (A a : testArgs) {
+            runTest("testNonRedundantInstanceOf", a);
+        }
+    }
+
+    @Test
+    public void run4() throws Throwable {
+        for (A a : testArgs) {
+            runTest("testNonRedundantInstanceOf2", a);
+        }
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InstanceOf.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InstanceOf.java
new file mode 100644
index 00000000000..c839ac0736e
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InstanceOf.java
@@ -0,0 +1,74 @@
+/*
+ * 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.jtt.optimize;
+
+import org.graalvm.compiler.jtt.JTTTest;
+import org.graalvm.compiler.nodes.LogicNode;
+import org.graalvm.compiler.nodes.java.InstanceOfNode;
+import org.junit.Test;
+
+/**
+ * A few tests of expected simplifications by {@link InstanceOfNode#implies(boolean, LogicNode)}.
+ */
+public class InstanceOf extends JTTTest {
+
+    static class A {
+    }
+
+    static class B extends A {
+    }
+
+    static class C extends B {
+    }
+
+    public boolean testSnippet1(Object o) {
+        if (o instanceof B) {
+            if (o instanceof A) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean testSnippet2(Object o) {
+        if (o instanceof A) {
+            return true;
+        } else {
+            return o instanceof B;
+        }
+    }
+
+    @Test
+    public void test1() {
+        runTest("testSnippet1", new A());
+        runTest("testSnippet1", new B());
+        runTest("testSnippet1", new C());
+    }
+
+    @Test
+    public void test2() {
+        runTest("testSnippet2", new A());
+        runTest("testSnippet2", new B());
+        runTest("testSnippet2", new C());
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java
index 8c84dbca0d4..1bc93a21d29 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java
@@ -37,5 +37,20 @@ public interface AArch64ArithmeticLIRGeneratorTool extends ArithmeticLIRGenerato
 
     Value emitCountTrailingZeros(Value value);
 
+    enum RoundingMode {
+        NEAREST(0),
+        DOWN(1),
+        UP(2),
+        TRUNCATE(3);
+
+        public final int encoding;
+
+        RoundingMode(int encoding) {
+            this.encoding = encoding;
+        }
+    }
+
+    Value emitRound(Value value, RoundingMode mode);
+
     void emitCompareOp(AArch64Kind cmpKind, Variable left, Value right);
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
index cbe7676a382..bcc7dafa336 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
@@ -74,6 +74,9 @@ public enum AArch64ArithmeticOp {
     FREM,
     FNEG,
     FABS,
+    FRINTM,
+    FRINTN,
+    FRINTP,
     SQRT;
 
     /**
@@ -133,6 +136,15 @@ public enum AArch64ArithmeticOp {
                 case FABS:
                     masm.fabs(size, dst, src);
                     break;
+                case FRINTM:
+                    masm.frintm(size, dst, src);
+                    break;
+                case FRINTN:
+                    masm.frintn(size, dst, src);
+                    break;
+                case FRINTP:
+                    masm.frintp(size, dst, src);
+                    break;
                 case SQRT:
                     masm.fsqrt(size, dst, src);
                     break;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java
index d357f52bd69..a63169360ae 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java
@@ -26,13 +26,12 @@ import static jdk.vm.ci.code.ValueUtil.asRegister;
 
 import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
+import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.Opcode;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
 
-import jdk.vm.ci.aarch64.AArch64.CPUFeature;
-import jdk.vm.ci.aarch64.AArch64.Flag;
 import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -76,15 +75,15 @@ public class AArch64AtomicMove {
             Register address = asRegister(addressValue);
             Register result = asRegister(resultValue);
             Register newVal = asRegister(newValue);
-             if (masm.supports(CPUFeature.LSE) || masm.isFlagSet(Flag.UseLSE)) {
+            if (AArch64LIRFlagsVersioned.useLSE(masm)) {
                 Register expected = asRegister(expectedValue);
                 masm.mov(size, result, expected);
-                masm.cas(size, expected, newVal, address, true /*acquire*/, true /*release*/);
+                masm.cas(size, expected, newVal, address, true /* acquire */, true /* release */);
                 AArch64Compare.gpCompare(masm, resultValue, expectedValue);
             } else {
-                // We could avoid using a scratch register here, by reusing resultValue for the stlxr
-                // success flag and issue a mov resultValue, expectedValue in case of success before
-                // returning.
+                // We could avoid using a scratch register here, by reusing resultValue for the
+                // stlxr success flag and issue a mov resultValue, expectedValue in case of success
+                // before returning.
                 Register scratch = asRegister(scratchValue);
                 Label retry = new Label();
                 Label fail = new Label();
@@ -99,4 +98,59 @@ public class AArch64AtomicMove {
             }
         }
     }
+
+    /**
+     * Load (Read) and Add instruction. Does the following atomically: <code>
+     *  ATOMIC_READ_AND_ADD(addend, result, address):
+     *    result = *address
+     *    *address = result + addend
+     *    return result
+     * </code>
+     */
+    @Opcode("ATOMIC_READ_AND_ADD")
+    public static final class AtomicReadAndAddOp extends AArch64LIRInstruction {
+        public static final LIRInstructionClass<AtomicReadAndAddOp> TYPE = LIRInstructionClass.create(AtomicReadAndAddOp.class);
+
+        private final AArch64Kind accessKind;
+
+        @Def protected AllocatableValue resultValue;
+        @Alive protected AllocatableValue addressValue;
+        @Alive protected Value deltaValue;
+        @Temp protected AllocatableValue scratchValue1;
+        @Temp protected AllocatableValue scratchValue2;
+
+        public AtomicReadAndAddOp(AArch64Kind kind, AllocatableValue result, AllocatableValue address, Value delta, AllocatableValue scratch1, AllocatableValue scratch2) {
+            super(TYPE);
+            this.accessKind = kind;
+            this.resultValue = result;
+            this.addressValue = address;
+            this.deltaValue = delta;
+            this.scratchValue1 = scratch1;
+            this.scratchValue2 = scratch2;
+        }
+
+        @Override
+        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+            assert accessKind.isInteger();
+            final int size = accessKind.getSizeInBytes() * Byte.SIZE;
+
+            Register address = asRegister(addressValue);
+            Register delta = asRegister(deltaValue);
+            Register result = asRegister(resultValue);
+
+            if (AArch64LIRFlagsVersioned.useLSE(masm)) {
+                masm.ldadd(size, delta, result, address, true, true);
+            } else {
+                Register scratch1 = asRegister(scratchValue1);
+                Register scratch2 = asRegister(scratchValue2);
+                Label retry = new Label();
+                masm.bind(retry);
+                masm.ldaxr(size, result, address);
+                masm.add(size, scratch1, result, delta, ShiftType.LSL, 0);
+                masm.stlxr(size, scratch2, scratch1, address);
+                // if scratch2 == 0 then write successful, else retry
+                masm.cbnz(32, scratch2, retry);
+            }
+        }
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
index 24015c63783..b1cec5af919 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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
@@ -22,6 +23,7 @@
  */
 package org.graalvm.compiler.lir.aarch64;
 
+import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
@@ -198,12 +200,16 @@ public class AArch64Call {
     public static void directCall(CompilationResultBuilder crb, AArch64MacroAssembler masm, InvokeTarget callTarget, Register scratch, LIRFrameState info, Label label) {
         int before = masm.position();
         if (scratch != null) {
-            /*
-             * Offset might not fit into a 28-bit immediate, generate an indirect call with a 64-bit
-             * immediate address which is fixed up by HotSpot.
-             */
-            masm.movNativeAddress(scratch, 0L);
-            masm.blr(scratch);
+            if (GeneratePIC.getValue(crb.getOptions())) {
+                masm.bl(0);
+            } else {
+                /*
+                 * Offset might not fit into a 28-bit immediate, generate an indirect call with a
+                 * 64-bit immediate address which is fixed up by HotSpot.
+                 */
+                masm.movNativeAddress(scratch, 0L);
+                masm.blr(scratch);
+            }
         } else {
             // Address is fixed up by HotSpot.
             masm.bl(0);
@@ -230,8 +236,12 @@ public class AArch64Call {
     public static void directJmp(CompilationResultBuilder crb, AArch64MacroAssembler masm, InvokeTarget callTarget) {
         try (AArch64MacroAssembler.ScratchRegister scratch = masm.getScratchRegister()) {
             int before = masm.position();
-            masm.movNativeAddress(scratch.getRegister(), 0L);
-            masm.jmp(scratch.getRegister());
+            if (GeneratePIC.getValue(crb.getOptions())) {
+                masm.jmp();
+            } else {
+                masm.movNativeAddress(scratch.getRegister(), 0L);
+                masm.jmp(scratch.getRegister());
+            }
             int after = masm.position();
             crb.recordDirectCall(before, after, callTarget, null);
             masm.ensureUniquePC();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRFlagsVersioned.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRFlagsVersioned.java
new file mode 100644
index 00000000000..f8f93dc2e32
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRFlagsVersioned.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018, 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.lir.aarch64;
+
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+
+import jdk.vm.ci.aarch64.AArch64.CPUFeature;
+import jdk.vm.ci.aarch64.AArch64.Flag;
+
+public class AArch64LIRFlagsVersioned {
+    public static boolean useLSE(AArch64MacroAssembler masm) {
+        return masm.supports(CPUFeature.LSE) || masm.isFlagSet(Flag.UseLSE);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
index a22347d7cb2..f08aaba8967 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
@@ -162,7 +162,12 @@ public class AArch64Move {
         @Override
         public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             Register dst = asRegister(result);
-            masm.loadAddress(dst, (AArch64Address) crb.recordDataReferenceInCode(data), data.getAlignment());
+            if (crb.compilationResult.isImmutablePIC()) {
+                crb.recordDataReferenceInCode(data);
+                masm.addressOf(dst);
+            } else {
+                masm.loadAddress(dst, (AArch64Address) crb.recordDataReferenceInCode(data), data.getAlignment());
+            }
         }
     }
 
@@ -192,6 +197,7 @@ public class AArch64Move {
     public static class MembarOp extends AArch64LIRInstruction {
         public static final LIRInstructionClass<MembarOp> TYPE = LIRInstructionClass.create(MembarOp.class);
 
+        // For future use.
         @SuppressWarnings("unused") private final int barriers;
 
         public MembarOp(int barriers) {
@@ -200,14 +206,15 @@ public class AArch64Move {
         }
 
         @Override
-        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+        // The odd-looking @SuppressWarnings("all") is here because of
+        // a compiler bug which warns that crb is unused, and also
+        // warns that @SuppressWarnings("unused") is unnecessary.
+        public void emitCode(@SuppressWarnings("all") CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             // As I understand it load acquire/store release have the same semantics as on IA64
             // and allow us to handle LoadStore, LoadLoad and StoreStore without an explicit
             // barrier.
             // But Graal support to figure out if a load/store is volatile is non-existant so for
-            // now
-            // just use
-            // memory barriers everywhere.
+            // now just use memory barriers everywhere.
             // if ((barrier & MemoryBarriers.STORE_LOAD) != 0) {
             masm.dmb(AArch64MacroAssembler.BarrierKind.ANY_ANY);
             // }
@@ -408,7 +415,7 @@ public class AArch64Move {
         }
     }
 
-    private static void reg2stack(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, AllocatableValue input) {
+    static void reg2stack(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, AllocatableValue input) {
         AArch64Address dest = loadStackSlotAddress(crb, masm, asStackSlot(result), Value.ILLEGAL);
         Register src = asRegister(input);
         // use the slot kind to define the operand size
@@ -421,7 +428,7 @@ public class AArch64Move {
         }
     }
 
-    private static void stack2reg(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, AllocatableValue input) {
+    static void stack2reg(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, AllocatableValue input) {
         AArch64Kind kind = (AArch64Kind) input.getPlatformKind();
         // use the slot kind to define the operand size
         final int size = kind.getSizeInBytes() * Byte.SIZE;
@@ -466,6 +473,12 @@ public class AArch64Move {
             case Float:
                 if (AArch64MacroAssembler.isFloatImmediate(input.asFloat())) {
                     masm.fmov(32, dst, input.asFloat());
+                } else if (crb.compilationResult.isImmutablePIC()) {
+                    try (ScratchRegister scr = masm.getScratchRegister()) {
+                        Register scratch = scr.getRegister();
+                        masm.mov(scratch, Float.floatToRawIntBits(input.asFloat()));
+                        masm.fmov(32, dst, scratch);
+                    }
                 } else {
                     masm.fldr(32, dst, (AArch64Address) crb.asFloatConstRef(input));
                 }
@@ -473,6 +486,12 @@ public class AArch64Move {
             case Double:
                 if (AArch64MacroAssembler.isDoubleImmediate(input.asDouble())) {
                     masm.fmov(64, dst, input.asDouble());
+                } else if (crb.compilationResult.isImmutablePIC()) {
+                    try (ScratchRegister scr = masm.getScratchRegister()) {
+                        Register scratch = scr.getRegister();
+                        masm.mov(scratch, Double.doubleToRawLongBits(input.asDouble()));
+                        masm.fmov(64, dst, scratch);
+                    }
                 } else {
                     masm.fldr(64, dst, (AArch64Address) crb.asDoubleConstRef(input));
                 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java
new file mode 100644
index 00000000000..7d6c12d6db2
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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.
+ *
+ * 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.lir.aarch64;
+
+import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
+import static jdk.vm.ci.code.ValueUtil.asStackSlot;
+import static jdk.vm.ci.code.ValueUtil.isStackSlot;
+
+import java.util.Arrays;
+
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.LIRValueUtil;
+import org.graalvm.compiler.lir.Opcode;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.StackSlot;
+import jdk.vm.ci.meta.AllocatableValue;
+
+/**
+ * Restores registers from stack slots.
+ */
+@Opcode("RESTORE_REGISTER")
+public class AArch64RestoreRegistersOp extends AArch64LIRInstruction {
+    public static final LIRInstructionClass<AArch64RestoreRegistersOp> TYPE = LIRInstructionClass.create(AArch64RestoreRegistersOp.class);
+
+    /**
+     * The slots from which the registers are restored.
+     */
+    @Use(STACK) protected final AllocatableValue[] slots;
+
+    /**
+     * The operation that saved the registers restored by this operation.
+     */
+    private final AArch64SaveRegistersOp save;
+
+    public AArch64RestoreRegistersOp(AllocatableValue[] values, AArch64SaveRegistersOp save) {
+        this(TYPE, values, save);
+    }
+
+    protected AArch64RestoreRegistersOp(LIRInstructionClass<? extends AArch64RestoreRegistersOp> c, AllocatableValue[] values, AArch64SaveRegistersOp save) {
+        super(c);
+        assert Arrays.asList(values).stream().allMatch(LIRValueUtil::isVirtualStackSlot);
+        this.slots = values;
+        this.save = save;
+    }
+
+    protected Register[] getSavedRegisters() {
+        return save.savedRegisters;
+    }
+
+    protected void restoreRegister(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, StackSlot input) {
+        AArch64Move.stack2reg(crb, masm, result.asValue(), input);
+    }
+
+    @Override
+    public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+        Register[] savedRegisters = getSavedRegisters();
+        for (int i = 0; i < savedRegisters.length; i++) {
+            if (savedRegisters[i] != null) {
+                assert isStackSlot(slots[i]) : "not a StackSlot: " + slots[i];
+                restoreRegister(crb, masm, savedRegisters[i], asStackSlot(slots[i]));
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java
new file mode 100644
index 00000000000..eaf090f8a7b
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2013, 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.lir.aarch64;
+
+import static jdk.vm.ci.code.ValueUtil.asStackSlot;
+import static jdk.vm.ci.code.ValueUtil.isStackSlot;
+import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
+
+import java.util.Arrays;
+
+import jdk.internal.vm.compiler.collections.EconomicSet;
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.LIRValueUtil;
+import org.graalvm.compiler.lir.Opcode;
+import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.lir.framemap.FrameMap;
+
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterSaveLayout;
+import jdk.vm.ci.code.StackSlot;
+import jdk.vm.ci.meta.AllocatableValue;
+
+/**
+ * Saves registers to stack slots.
+ */
+@Opcode("SAVE_REGISTER")
+public class AArch64SaveRegistersOp extends AArch64LIRInstruction implements SaveRegistersOp {
+    public static final LIRInstructionClass<AArch64SaveRegistersOp> TYPE = LIRInstructionClass.create(AArch64SaveRegistersOp.class);
+
+    /**
+     * The registers (potentially) saved by this operation.
+     */
+    protected final Register[] savedRegisters;
+
+    /**
+     * The slots to which the registers are saved.
+     */
+    @Def(STACK) protected final AllocatableValue[] slots;
+
+    /**
+     * Specifies if {@link #remove(EconomicSet)} should have an effect.
+     */
+    protected final boolean supportsRemove;
+
+    /**
+     *
+     * @param savedRegisters the registers saved by this operation which may be subject to
+     *            {@linkplain #remove(EconomicSet) pruning}
+     * @param savedRegisterLocations the slots to which the registers are saved
+     * @param supportsRemove determines if registers can be {@linkplain #remove(EconomicSet) pruned}
+     */
+    public AArch64SaveRegistersOp(Register[] savedRegisters, AllocatableValue[] savedRegisterLocations, boolean supportsRemove) {
+        this(TYPE, savedRegisters, savedRegisterLocations, supportsRemove);
+    }
+
+    public AArch64SaveRegistersOp(LIRInstructionClass<? extends AArch64SaveRegistersOp> c, Register[] savedRegisters, AllocatableValue[] savedRegisterLocations, boolean supportsRemove) {
+        super(c);
+        assert Arrays.asList(savedRegisterLocations).stream().allMatch(LIRValueUtil::isVirtualStackSlot);
+        this.savedRegisters = savedRegisters;
+        this.slots = savedRegisterLocations;
+        this.supportsRemove = supportsRemove;
+    }
+
+    protected void saveRegister(CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot result, Register input) {
+        AArch64Move.reg2stack(crb, masm, result, input.asValue());
+    }
+
+    @Override
+    public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+        for (int i = 0; i < savedRegisters.length; i++) {
+            if (savedRegisters[i] != null) {
+                assert isStackSlot(slots[i]) : "not a StackSlot: " + slots[i];
+                saveRegister(crb, masm, asStackSlot(slots[i]), savedRegisters[i]);
+            }
+        }
+    }
+
+    public AllocatableValue[] getSlots() {
+        return slots;
+    }
+
+    @Override
+    public boolean supportsRemove() {
+        return supportsRemove;
+    }
+
+    @Override
+    public int remove(EconomicSet<Register> doNotSave) {
+        if (!supportsRemove) {
+            throw new UnsupportedOperationException();
+        }
+        return prune(doNotSave, savedRegisters);
+    }
+
+    static int prune(EconomicSet<Register> toRemove, Register[] registers) {
+        int pruned = 0;
+        for (int i = 0; i < registers.length; i++) {
+            if (registers[i] != null) {
+                if (toRemove.contains(registers[i])) {
+                    registers[i] = null;
+                    pruned++;
+                }
+            }
+        }
+        return pruned;
+    }
+
+    @Override
+    public RegisterSaveLayout getMap(FrameMap frameMap) {
+        int total = 0;
+        for (int i = 0; i < savedRegisters.length; i++) {
+            if (savedRegisters[i] != null) {
+                total++;
+            }
+        }
+        Register[] keys = new Register[total];
+        int[] values = new int[total];
+        if (total != 0) {
+            int mapIndex = 0;
+            for (int i = 0; i < savedRegisters.length; i++) {
+                if (savedRegisters[i] != null) {
+                    keys[mapIndex] = savedRegisters[i];
+                    assert isStackSlot(slots[i]) : "not a StackSlot: " + slots[i];
+                    StackSlot slot = asStackSlot(slots[i]);
+                    values[mapIndex] = indexForStackSlot(frameMap, slot);
+                    mapIndex++;
+                }
+            }
+            assert mapIndex == total;
+        }
+        return new RegisterSaveLayout(keys, values);
+    }
+
+    /**
+     * Computes the index of a stack slot relative to slot 0. This is also the bit index of stack
+     * slots in the reference map.
+     *
+     * @param slot a stack slot
+     * @return the index of the stack slot
+     */
+    private static int indexForStackSlot(FrameMap frameMap, StackSlot slot) {
+        assert frameMap.offsetForStackSlot(slot) % frameMap.getTarget().wordSize == 0;
+        int value = frameMap.offsetForStackSlot(slot) / frameMap.getTarget().wordSize;
+        return value;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
index c30148e4747..eadee59d8a8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
@@ -431,6 +431,12 @@ public class AMD64Move {
                 masm.lock();
             }
             switch (accessKind) {
+                case BYTE:
+                    masm.cmpxchgb(asRegister(newValue), address.toAddress());
+                    break;
+                case WORD:
+                    masm.cmpxchgw(asRegister(newValue), address.toAddress());
+                    break;
                 case DWORD:
                     masm.cmpxchgl(asRegister(newValue), address.toAddress());
                     break;
@@ -468,6 +474,12 @@ public class AMD64Move {
                 masm.lock();
             }
             switch (accessKind) {
+                case BYTE:
+                    masm.xaddb(address.toAddress(), asRegister(result));
+                    break;
+                case WORD:
+                    masm.xaddw(address.toAddress(), asRegister(result));
+                    break;
                 case DWORD:
                     masm.xaddl(address.toAddress(), asRegister(result));
                     break;
@@ -502,6 +514,12 @@ public class AMD64Move {
         public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
             move(accessKind, crb, masm, result, newValue);
             switch (accessKind) {
+                case BYTE:
+                    masm.xchgb(asRegister(result), address.toAddress());
+                    break;
+                case WORD:
+                    masm.xchgw(asRegister(result), address.toAddress());
+                    break;
                 case DWORD:
                     masm.xchgl(asRegister(result), address.toAddress());
                     break;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java
index 51d4bf49434..abd7d13ba39 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java
@@ -142,17 +142,18 @@ public interface LIRGeneratorTool extends DiagnosticLIRGeneratorTool, ValueKindF
 
     void emitNullCheck(Value address, LIRFrameState state);
 
-    Variable emitLogicCompareAndSwap(Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue);
+    Variable emitLogicCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue, Value trueValue, Value falseValue);
 
-    Value emitValueCompareAndSwap(Value address, Value expectedValue, Value newValue);
+    Value emitValueCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue);
 
     /**
      * Emit an atomic read-and-add instruction.
      *
      * @param address address of the value to be read and written
+     * @param valueKind the access kind for the value to be written
      * @param delta the value to be added
      */
-    default Value emitAtomicReadAndAdd(Value address, Value delta) {
+    default Value emitAtomicReadAndAdd(Value address, ValueKind<?> valueKind, Value delta) {
         throw GraalError.unimplemented();
     }
 
@@ -160,9 +161,10 @@ public interface LIRGeneratorTool extends DiagnosticLIRGeneratorTool, ValueKindF
      * Emit an atomic read-and-write instruction.
      *
      * @param address address of the value to be read and written
+     * @param valueKind the access kind for the value to be written
      * @param newValue the new value to be written
      */
-    default Value emitAtomicReadAndWrite(Value address, Value newValue) {
+    default Value emitAtomicReadAndWrite(Value address, ValueKind<?> valueKind, Value newValue) {
         throw GraalError.unimplemented();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
index 9023042caa6..291f124fd21 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
@@ -116,12 +116,14 @@ public abstract class LoopTransformations {
         Position firstPosition = successors.next();
         AbstractBeginNode originalLoopBegin = BeginNode.begin(originalLoop.entryPoint());
         firstPosition.set(newControlSplit, originalLoopBegin);
+        originalLoopBegin.setNodeSourcePosition(firstPosition.get(firstNode).getNodeSourcePosition());
 
         while (successors.hasNext()) {
             Position position = successors.next();
             // create a new loop duplicate and connect it.
             LoopFragmentWhole duplicateLoop = originalLoop.duplicate();
             AbstractBeginNode newBegin = BeginNode.begin(duplicateLoop.entryPoint());
+            newBegin.setNodeSourcePosition(position.get(firstNode).getNodeSourcePosition());
             position.set(newControlSplit, newBegin);
 
             // For each cloned ControlSplitNode, simplify the proper path
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java
index 45f1ad9a971..aee523746ad 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java
@@ -118,7 +118,7 @@ public class CountedLoopInfo {
         }
         // round-away-from-zero divison: (range + stride -/+ 1) / stride
         ValueNode denominator = add(graph, range, sub(graph, absStride, one));
-        ValueNode div = unsignedDivBefore(graph, loop.entryPoint(), denominator, absStride);
+        ValueNode div = unsignedDivBefore(graph, loop.entryPoint(), denominator, absStride, null);
 
         if (assumePositive) {
             return div;
@@ -251,7 +251,7 @@ public class CountedLoopInfo {
             }
             assert graph.getGuardsStage().allowsFloatingGuards();
             overflowGuard = graph.unique(new GuardNode(cond, AbstractBeginNode.prevBegin(loop.entryPoint()), DeoptimizationReason.LoopLimitCheck, DeoptimizationAction.InvalidateRecompile, true,
-                            JavaConstant.NULL_POINTER)); // TODO gd: use speculation
+                            JavaConstant.NULL_POINTER, null)); // TODO gd: use speculation
             loop.loopBegin().setOverflowGuard(overflowGuard);
             return overflowGuard;
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java
index 5aff9698e1b..8c9918ffec8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java
@@ -543,6 +543,7 @@ public class LoopFragmentInside extends LoopFragment {
         }
     }
 
+    @SuppressWarnings("try")
     private AbstractBeginNode mergeEnds() {
         assert isDuplicate();
         List<EndNode> endsToMerge = new LinkedList<>();
@@ -562,9 +563,11 @@ public class LoopFragmentInside extends LoopFragment {
         if (endsToMerge.size() == 1) {
             AbstractEndNode end = endsToMerge.get(0);
             assert end.hasNoUsages();
-            newExit = graph.add(new BeginNode());
-            end.replaceAtPredecessor(newExit);
-            end.safeDelete();
+            try (DebugCloseable position = end.withNodeSourcePosition()) {
+                newExit = graph.add(new BeginNode());
+                end.replaceAtPredecessor(newExit);
+                end.safeDelete();
+            }
         } else {
             assert endsToMerge.size() > 1;
             AbstractMergeNode newExitMerge = graph.add(new MergeNode());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java
index 5d603eae10b..18254e48196 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java
@@ -31,6 +31,7 @@ import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
 import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
 import org.graalvm.compiler.nodes.calc.SignedDivNode;
 import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 
 import java.util.function.BiFunction;
 
@@ -73,12 +74,12 @@ public class MathUtil {
         return BinaryArithmeticNode.sub(graph, v1, v2, NodeView.DEFAULT);
     }
 
-    public static ValueNode divBefore(StructuredGraph graph, FixedNode before, ValueNode dividend, ValueNode divisor) {
-        return fixedDivBefore(graph, before, dividend, divisor, (dend, sor) -> SignedDivNode.create(dend, sor, NodeView.DEFAULT));
+    public static ValueNode divBefore(StructuredGraph graph, FixedNode before, ValueNode dividend, ValueNode divisor, GuardingNode zeroCheck) {
+        return fixedDivBefore(graph, before, dividend, divisor, (dend, sor) -> SignedDivNode.create(dend, sor, zeroCheck, NodeView.DEFAULT));
     }
 
-    public static ValueNode unsignedDivBefore(StructuredGraph graph, FixedNode before, ValueNode dividend, ValueNode divisor) {
-        return fixedDivBefore(graph, before, dividend, divisor, (dend, sor) -> UnsignedDivNode.create(dend, sor, NodeView.DEFAULT));
+    public static ValueNode unsignedDivBefore(StructuredGraph graph, FixedNode before, ValueNode dividend, ValueNode divisor, GuardingNode zeroCheck) {
+        return fixedDivBefore(graph, before, dividend, divisor, (dend, sor) -> UnsignedDivNode.create(dend, sor, zeroCheck, NodeView.DEFAULT));
     }
 
     private static ValueNode fixedDivBefore(StructuredGraph graph, FixedNode before, ValueNode dividend, ValueNode divisor, BiFunction<ValueNode, ValueNode, ValueNode> createDiv) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
index 2ce9601531f..04f0a0f8a59 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
@@ -319,7 +319,8 @@ public abstract class GraalCompilerState {
         assert !graph.isFrozen();
         ResolvedJavaMethod installedCodeOwner = graph.method();
         request = new Request<>(graph, installedCodeOwner, getProviders(), getBackend(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL,
-                        graph.getProfilingInfo(), createSuites(getOptions()), createLIRSuites(getOptions()), new CompilationResult(graph.compilationId()), CompilationResultBuilderFactory.Default);
+                        graph.getProfilingInfo(), createSuites(getOptions()), createLIRSuites(getOptions()), new CompilationResult(graph.compilationId()), CompilationResultBuilderFactory.Default,
+                        true);
     }
 
     /**
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java
index f1ee5d20db8..6ac9de53b43 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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,13 +31,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.FilerException;
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
@@ -45,11 +44,16 @@ import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic.Kind;
 
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
+/**
+ * Processor for {@value #NODE_INFO_CLASS_NAME} annotation.
+ */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({"org.graalvm.compiler.nodeinfo.NodeInfo"})
 public class GraphNodeProcessor extends AbstractProcessor {
+    private static final String NODE_INFO_CLASS_NAME = "org.graalvm.compiler.nodeinfo.NodeInfo";
+
     @Override
     public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.latest();
@@ -106,10 +110,6 @@ public class GraphNodeProcessor extends AbstractProcessor {
         message(kind, element, "Exception thrown during processing: %s", buf.toString());
     }
 
-    ProcessingEnvironment getProcessingEnv() {
-        return processingEnv;
-    }
-
     boolean isNodeType(Element element) {
         if (element.getKind() != ElementKind.CLASS) {
             return false;
@@ -134,17 +134,17 @@ public class GraphNodeProcessor extends AbstractProcessor {
 
         GraphNodeVerifier verifier = new GraphNodeVerifier(this);
 
-        for (Element element : roundEnv.getElementsAnnotatedWith(NodeInfo.class)) {
+        for (Element element : roundEnv.getElementsAnnotatedWith(getTypeElement(NODE_INFO_CLASS_NAME))) {
             scope = element;
             try {
                 if (!isNodeType(element)) {
-                    errorMessage(element, "%s can only be applied to Node subclasses", NodeInfo.class.getSimpleName());
+                    errorMessage(element, "%s can only be applied to Node subclasses", getSimpleName(NODE_INFO_CLASS_NAME));
                     continue;
                 }
 
-                NodeInfo nodeInfo = element.getAnnotation(NodeInfo.class);
+                AnnotationMirror nodeInfo = getAnnotation(element, getType(NODE_INFO_CLASS_NAME));
                 if (nodeInfo == null) {
-                    errorMessage(element, "Cannot get %s annotation from annotated element", NodeInfo.class.getSimpleName());
+                    errorMessage(element, "Cannot get %s annotation from annotated element", getSimpleName(NODE_INFO_CLASS_NAME));
                     continue;
                 }
 
@@ -154,7 +154,7 @@ public class GraphNodeProcessor extends AbstractProcessor {
                 if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.ABSTRACT)) {
                     // TODO(thomaswue): Reenable this check.
                     // errorMessage(element, "%s annotated class must be either final or abstract",
-                    // NodeInfo.class.getSimpleName());
+                    // getSimpleName(NODE_INFO_CLASS_NAME));
                     // continue;
                 }
                 boolean found = false;
@@ -167,7 +167,7 @@ public class GraphNodeProcessor extends AbstractProcessor {
                     }
                 }
                 if (!found) {
-                    errorMessage(element, "%s annotated class must have a field named TYPE", NodeInfo.class.getSimpleName());
+                    errorMessage(element, "%s annotated class must have a field named TYPE", getSimpleName(NODE_INFO_CLASS_NAME));
                 }
 
                 if (!typeElement.equals(verifier.Node) && !modifiers.contains(Modifier.ABSTRACT)) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java
index 108d6ed2251..1c9d3dce572 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, 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
@@ -32,7 +32,6 @@ import static javax.lang.model.element.Modifier.TRANSIENT;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -42,17 +41,16 @@ import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
+import org.graalvm.compiler.processor.AbstractProcessor;
+
 /**
  * Verifies static constraints on nodes.
  */
 public class GraphNodeVerifier {
 
-    private final GraphNodeProcessor env;
-    private final Types types;
-    private final Elements elements;
+    private final AbstractProcessor processor;
 
     // Checkstyle: stop
     private final TypeElement Input;
@@ -67,12 +65,8 @@ public class GraphNodeVerifier {
 
     // Checkstyle: resume
 
-    public GraphNodeVerifier(GraphNodeProcessor processor) {
-        this.env = processor;
-
-        this.types = processor.getProcessingEnv().getTypeUtils();
-        this.elements = processor.getProcessingEnv().getElementUtils();
-
+    public GraphNodeVerifier(AbstractProcessor processor) {
+        this.processor = processor;
         this.Input = getTypeElement("org.graalvm.compiler.graph.Node.Input");
         this.OptionalInput = getTypeElement("org.graalvm.compiler.graph.Node.OptionalInput");
         this.Successor = getTypeElement("org.graalvm.compiler.graph.Node.Successor");
@@ -88,11 +82,7 @@ public class GraphNodeVerifier {
      * @throw {@link NoClassDefFoundError} if a type element does not exist for {@code name}
      */
     public TypeElement getTypeElement(String name) {
-        TypeElement typeElement = elements.getTypeElement(name);
-        if (typeElement == null) {
-            throw new NoClassDefFoundError(name);
-        }
-        return typeElement;
+        return processor.getTypeElement(name);
     }
 
     public TypeElement getTypeElement(Class<?> cls) {
@@ -103,11 +93,8 @@ public class GraphNodeVerifier {
         return getTypeElement(name).asType();
     }
 
-    public ProcessingEnvironment getProcessingEnv() {
-        return env.getProcessingEnv();
-    }
-
     public boolean isAssignableWithErasure(Element from, Element to) {
+        Types types = processor.env().getTypeUtils();
         TypeMirror fromType = types.erasure(from.asType());
         TypeMirror toType = types.erasure(to.asType());
         return types.isAssignable(fromType, toType);
@@ -204,12 +191,12 @@ public class GraphNodeVerifier {
     }
 
     private boolean sameType(TypeMirror type1, TypeMirror type2) {
-        return env.getProcessingEnv().getTypeUtils().isSameType(type1, type2);
+        return processor.env().getTypeUtils().isSameType(type1, type2);
     }
 
     private TypeElement getSuperType(TypeElement element) {
         if (element.getSuperclass() != null) {
-            return (TypeElement) env.getProcessingEnv().getTypeUtils().asElement(element.getSuperclass());
+            return processor.asTypeElement(element.getSuperclass());
         }
         return null;
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java
index 4ebbdfc9065..01d23b1699c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java
@@ -27,7 +27,11 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
 
+import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
@@ -582,4 +586,58 @@ public class IntegerStampTest extends GraphTest {
         assertEquals(longStamp.join(longEmpty), longEmpty);
         assertEquals(longStamp.meet(longEmpty), longStamp);
     }
+
+    @Test
+    public void testUnaryOpFoldEmpty() {
+        // boolean?, byte, short, int, long
+        Stream.of(1, 8, 16, 32, 64).map(bits -> StampFactory.forInteger(bits).empty()).forEach(empty -> {
+            for (ArithmeticOpTable.UnaryOp<?> op : IntegerStamp.OPS.getUnaryOps()) {
+                if (op != null) {
+                    Assert.assertTrue(op.foldStamp(empty).isEmpty());
+                }
+            }
+        });
+    }
+
+    @Test
+    public void testIntegerConvertOpWithEmpty() {
+        int[] bits = new int[]{1, 8, 16, 32, 64};
+
+        List<IntegerConvertOp<?>> extendOps = Arrays.asList(
+                        IntegerStamp.OPS.getSignExtend(),
+                        IntegerStamp.OPS.getZeroExtend());
+
+        for (int inputBits : bits) {
+            IntegerStamp emptyIn = StampFactory.forInteger(inputBits).empty();
+            for (int outputBits : bits) {
+                IntegerStamp emptyOut = StampFactory.forInteger(outputBits).empty();
+                if (inputBits <= outputBits) {
+                    for (IntegerConvertOp<?> stamp : extendOps) {
+                        IntegerStamp folded = (IntegerStamp) stamp.foldStamp(inputBits, outputBits, emptyIn);
+                        Assert.assertTrue(folded.isEmpty());
+                        Assert.assertEquals(outputBits, folded.getBits());
+
+                        // Widening is lossless, inversion is well-defined.
+                        IntegerStamp inverted = (IntegerStamp) stamp.invertStamp(inputBits, outputBits, emptyOut);
+                        Assert.assertTrue(inverted.isEmpty());
+                        Assert.assertEquals(inputBits, inverted.getBits());
+                    }
+                }
+
+                if (inputBits >= outputBits) {
+                    IntegerConvertOp<?> narrow = IntegerStamp.OPS.getNarrow();
+                    IntegerStamp folded = (IntegerStamp) narrow.foldStamp(inputBits, outputBits, emptyIn);
+                    Assert.assertTrue(folded.isEmpty());
+                    Assert.assertEquals(outputBits, folded.getBits());
+
+                    // Narrowing is lossy, inversion can potentially yield empty or unknown (null).
+                    IntegerStamp inverted = (IntegerStamp) narrow.invertStamp(inputBits, outputBits, emptyOut);
+                    Assert.assertTrue(inverted == null || inverted.isEmpty());
+                    if (inverted != null) {
+                        Assert.assertEquals(inputBits, inverted.getBits());
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java
index d4f984d04ea..066e2bef8ec 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java
@@ -25,6 +25,7 @@ package org.graalvm.compiler.nodes;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.spi.Simplifiable;
 import org.graalvm.compiler.graph.spi.SimplifierTool;
 import org.graalvm.compiler.nodeinfo.InputType;
@@ -46,6 +47,7 @@ public abstract class AbstractFixedGuardNode extends DeoptimizingFixedWithNextNo
     protected DeoptimizationAction action;
     protected JavaConstant speculation;
     protected boolean negated;
+    protected NodeSourcePosition noDeoptSuccessorPosition;
 
     @Override
     public LogicNode getCondition() {
@@ -73,6 +75,12 @@ public abstract class AbstractFixedGuardNode extends DeoptimizingFixedWithNextNo
         this.reason = deoptReason;
     }
 
+    protected AbstractFixedGuardNode(NodeClass<? extends AbstractFixedGuardNode> c, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation,
+                    boolean negated, NodeSourcePosition noDeoptSuccessorPosition) {
+        this(c, condition, deoptReason, action, speculation, negated);
+        this.noDeoptSuccessorPosition = noDeoptSuccessorPosition;
+    }
+
     @Override
     public DeoptimizationReason getReason() {
         return reason;
@@ -126,6 +134,7 @@ public abstract class AbstractFixedGuardNode extends DeoptimizingFixedWithNextNo
                 ifNode = graph().add(new IfNode(condition, currentNext, deopt, 1));
                 noDeoptSuccessor = ifNode.trueSuccessor();
             }
+            noDeoptSuccessor.setNodeSourcePosition(getNoDeoptSuccessorPosition());
             ((FixedWithNextNode) predecessor()).setNext(ifNode);
             this.replaceAtUsages(noDeoptSuccessor);
             GraphUtil.killWithUnusedFloatingInputs(this);
@@ -148,4 +157,14 @@ public abstract class AbstractFixedGuardNode extends DeoptimizingFixedWithNextNo
     public void setReason(DeoptimizationReason reason) {
         this.reason = reason;
     }
+
+    @Override
+    public NodeSourcePosition getNoDeoptSuccessorPosition() {
+        return noDeoptSuccessorPosition;
+    }
+
+    @Override
+    public void setNoDeoptSuccessorPosition(NodeSourcePosition noDeoptSuccessorPosition) {
+        this.noDeoptSuccessorPosition = noDeoptSuccessorPosition;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java
index acdb8e770fc..cb02a14385d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java
@@ -28,6 +28,7 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.List;
 
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
@@ -158,6 +159,7 @@ public abstract class AbstractMergeNode extends BeginStateSplitNode implements I
      * canonicalization.
      */
     @Override
+    @SuppressWarnings("try")
     public void simplify(SimplifierTool tool) {
         FixedNode currentNext = next();
         if (currentNext instanceof AbstractEndNode) {
@@ -190,12 +192,14 @@ public abstract class AbstractMergeNode extends BeginStateSplitNode implements I
                     tool.addToWorkList(end);
                 }
                 AbstractEndNode newEnd;
-                if (merge instanceof LoopBeginNode) {
-                    newEnd = graph().add(new LoopEndNode((LoopBeginNode) merge));
-                } else {
-                    EndNode tmpEnd = graph().add(new EndNode());
-                    merge.addForwardEnd(tmpEnd);
-                    newEnd = tmpEnd;
+                try (DebugCloseable position = end.withNodeSourcePosition()) {
+                    if (merge instanceof LoopBeginNode) {
+                        newEnd = graph().add(new LoopEndNode((LoopBeginNode) merge));
+                    } else {
+                        EndNode tmpEnd = graph().add(new EndNode());
+                        merge.addForwardEnd(tmpEnd);
+                        newEnd = tmpEnd;
+                    }
                 }
                 for (PhiNode phi : merge.phis()) {
                     ValueNode v = phi.valueAt(origLoopEnd);
@@ -233,11 +237,13 @@ public abstract class AbstractMergeNode extends BeginStateSplitNode implements I
             ValuePhiNode returnValuePhi = returnNode.result() == null || !isPhiAtMerge(returnNode.result()) ? null : (ValuePhiNode) returnNode.result();
             List<EndNode> endNodes = forwardEnds().snapshot();
             for (EndNode end : endNodes) {
-                ReturnNode newReturn = graph().add(new ReturnNode(returnValuePhi == null ? returnNode.result() : returnValuePhi.valueAt(end)));
-                if (tool != null) {
-                    tool.addToWorkList(end.predecessor());
+                try (DebugCloseable position = returnNode.withNodeSourcePosition()) {
+                    ReturnNode newReturn = graph().add(new ReturnNode(returnValuePhi == null ? returnNode.result() : returnValuePhi.valueAt(end)));
+                    if (tool != null) {
+                        tool.addToWorkList(end.predecessor());
+                    }
+                    end.replaceAtPredecessor(newReturn);
                 }
-                end.replaceAtPredecessor(newReturn);
             }
             GraphUtil.killCFG(this);
             for (EndNode end : endNodes) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java
index b593d246e14..cf355f43c51 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java
@@ -22,6 +22,7 @@
  */
 package org.graalvm.compiler.nodes;
 
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
 
 /**
@@ -35,4 +36,16 @@ public interface DeoptimizingGuard extends GuardingNode, StaticDeoptimizingNode
     void setCondition(LogicNode x, boolean negated);
 
     boolean isNegated();
+
+    NodeSourcePosition getNoDeoptSuccessorPosition();
+
+    void setNoDeoptSuccessorPosition(NodeSourcePosition noDeoptSuccessorPosition);
+
+    default void addCallerToNoDeoptSuccessorPosition(NodeSourcePosition caller) {
+        NodeSourcePosition noDeoptSuccessorPosition = getNoDeoptSuccessorPosition();
+        if (noDeoptSuccessorPosition == null) {
+            return;
+        }
+        setNoDeoptSuccessorPosition(new NodeSourcePosition(caller, noDeoptSuccessorPosition.getMethod(), noDeoptSuccessorPosition.getBCI()));
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java
index 2745f67fb80..93c74db42ad 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java
@@ -23,12 +23,14 @@
 package org.graalvm.compiler.nodes;
 
 import org.graalvm.compiler.debug.DebugCloseable;
+
 import static org.graalvm.compiler.nodeinfo.InputType.Guard;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
 
 import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.spi.SimplifierTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.spi.Lowerable;
@@ -50,10 +52,18 @@ public final class FixedGuardNode extends AbstractFixedGuardNode implements Lowe
         this(condition, deoptReason, action, JavaConstant.NULL_POINTER, negated);
     }
 
+    public FixedGuardNode(LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, boolean negated, NodeSourcePosition noDeoptSuccessorPosition) {
+        this(condition, deoptReason, action, JavaConstant.NULL_POINTER, negated, noDeoptSuccessorPosition);
+    }
+
     public FixedGuardNode(LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation, boolean negated) {
         super(TYPE, condition, deoptReason, action, speculation, negated);
     }
 
+    public FixedGuardNode(LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation, boolean negated, NodeSourcePosition noDeoptSuccessorPosition) {
+        super(TYPE, condition, deoptReason, action, speculation, negated, noDeoptSuccessorPosition);
+    }
+
     @Override
     public void simplify(SimplifierTool tool) {
         super.simplify(tool);
@@ -75,8 +85,10 @@ public final class FixedGuardNode extends AbstractFixedGuardNode implements Lowe
         } else if (getCondition() instanceof ShortCircuitOrNode) {
             ShortCircuitOrNode shortCircuitOr = (ShortCircuitOrNode) getCondition();
             if (isNegated() && hasNoUsages()) {
-                graph().addAfterFixed(this, graph().add(new FixedGuardNode(shortCircuitOr.getY(), getReason(), getAction(), getSpeculation(), !shortCircuitOr.isYNegated())));
-                graph().replaceFixedWithFixed(this, graph().add(new FixedGuardNode(shortCircuitOr.getX(), getReason(), getAction(), getSpeculation(), !shortCircuitOr.isXNegated())));
+                graph().addAfterFixed(this,
+                                graph().add(new FixedGuardNode(shortCircuitOr.getY(), getReason(), getAction(), getSpeculation(), !shortCircuitOr.isYNegated(), getNoDeoptSuccessorPosition())));
+                graph().replaceFixedWithFixed(this,
+                                graph().add(new FixedGuardNode(shortCircuitOr.getX(), getReason(), getAction(), getSpeculation(), !shortCircuitOr.isXNegated(), getNoDeoptSuccessorPosition())));
             }
         }
     }
@@ -87,7 +99,7 @@ public final class FixedGuardNode extends AbstractFixedGuardNode implements Lowe
         try (DebugCloseable position = this.withNodeSourcePosition()) {
             if (graph().getGuardsStage().allowsFloatingGuards()) {
                 if (getAction() != DeoptimizationAction.None) {
-                    ValueNode guard = tool.createGuard(this, getCondition(), getReason(), getAction(), getSpeculation(), isNegated()).asNode();
+                    ValueNode guard = tool.createGuard(this, getCondition(), getReason(), getAction(), getSpeculation(), isNegated(), getNoDeoptSuccessorPosition()).asNode();
                     this.replaceAtUsages(guard);
                     graph().removeFixed(this);
                 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java
index 70c3d341709..d515e5abe67 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java
@@ -1022,7 +1022,11 @@ public class GraphDecoder {
             }
         }
         if (graph.trackNodeSourcePosition() && position != null) {
-            node.setNodeSourcePosition(methodScope.getCallerBytecodePosition(position));
+            NodeSourcePosition callerBytecodePosition = methodScope.getCallerBytecodePosition(position);
+            node.setNodeSourcePosition(callerBytecodePosition);
+            if (node instanceof DeoptimizingGuard) {
+                ((DeoptimizingGuard) node).addCallerToNoDeoptSuccessorPosition(callerBytecodePosition.getCaller());
+            }
         }
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java
index 24128da1d66..58a9a8ed010 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java
@@ -31,6 +31,7 @@ import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.spi.Canonicalizable;
 import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -63,19 +64,22 @@ public class GuardNode extends FloatingAnchoredNode implements Canonicalizable,
     protected DeoptimizationAction action;
     protected JavaConstant speculation;
     protected boolean negated;
+    protected NodeSourcePosition noDeoptSuccessorPosition;
 
-    public GuardNode(LogicNode condition, AnchoringNode anchor, DeoptimizationReason reason, DeoptimizationAction action, boolean negated, JavaConstant speculation) {
-        this(TYPE, condition, anchor, reason, action, negated, speculation);
+    public GuardNode(LogicNode condition, AnchoringNode anchor, DeoptimizationReason reason, DeoptimizationAction action, boolean negated, JavaConstant speculation,
+                    NodeSourcePosition noDeoptSuccessorPosition) {
+        this(TYPE, condition, anchor, reason, action, negated, speculation, noDeoptSuccessorPosition);
     }
 
     protected GuardNode(NodeClass<? extends GuardNode> c, LogicNode condition, AnchoringNode anchor, DeoptimizationReason reason, DeoptimizationAction action, boolean negated,
-                    JavaConstant speculation) {
+                    JavaConstant speculation, NodeSourcePosition noDeoptSuccessorPosition) {
         super(c, StampFactory.forVoid(), anchor);
         this.condition = condition;
         this.reason = reason;
         this.action = action;
         this.negated = negated;
         this.speculation = speculation;
+        this.noDeoptSuccessorPosition = noDeoptSuccessorPosition;
     }
 
     /**
@@ -130,7 +134,7 @@ public class GuardNode extends FloatingAnchoredNode implements Canonicalizable,
     public Node canonical(CanonicalizerTool tool) {
         if (getCondition() instanceof LogicNegationNode) {
             LogicNegationNode negation = (LogicNegationNode) getCondition();
-            return new GuardNode(negation.getValue(), getAnchor(), reason, action, !negated, speculation);
+            return new GuardNode(negation.getValue(), getAnchor(), reason, action, !negated, speculation, noDeoptSuccessorPosition);
         }
         if (getCondition() instanceof LogicConstantNode) {
             LogicConstantNode c = (LogicConstantNode) getCondition();
@@ -158,4 +162,14 @@ public class GuardNode extends FloatingAnchoredNode implements Canonicalizable,
     public void setReason(DeoptimizationReason reason) {
         this.reason = reason;
     }
+
+    @Override
+    public NodeSourcePosition getNoDeoptSuccessorPosition() {
+        return noDeoptSuccessorPosition;
+    }
+
+    @Override
+    public void setNoDeoptSuccessorPosition(NodeSourcePosition noDeoptSuccessorPosition) {
+        this.noDeoptSuccessorPosition = noDeoptSuccessorPosition;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java
index d3281072e94..7d8d5c9dbe4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java
@@ -29,18 +29,25 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 import jdk.internal.vm.compiler.collections.EconomicMap;
 import jdk.internal.vm.compiler.collections.Equivalence;
+import org.graalvm.compiler.bytecode.BytecodeDisassembler;
+import org.graalvm.compiler.bytecode.Bytecodes;
+import org.graalvm.compiler.bytecode.Bytes;
+import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.CounterKey;
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.graph.spi.Canonicalizable;
 import org.graalvm.compiler.graph.spi.Simplifiable;
@@ -67,6 +74,7 @@ import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.PrimitiveConstant;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
@@ -170,6 +178,60 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
         return super.verify();
     }
 
+    private boolean compareCallContext(NodeSourcePosition successorPosition) {
+        NodeSourcePosition position = getNodeSourcePosition();
+        NodeSourcePosition successor = successorPosition;
+        while (position != null) {
+            assertTrue(Objects.equals(position.getMethod(), successor.getMethod()), "method mismatch");
+            position = position.getCaller();
+            successor = successor.getCaller();
+        }
+        assertTrue(successor == null, "successor position has more methods");
+        return true;
+    }
+
+    @Override
+    public boolean verifySourcePosition() {
+        NodeSourcePosition sourcePosition = getNodeSourcePosition();
+        assertTrue(sourcePosition != null, "missing IfNode source position");
+
+        NodeSourcePosition trueSuccessorPosition = trueSuccessor.getNodeSourcePosition();
+        assertTrue(trueSuccessorPosition != null, "missing IfNode true successor source position");
+
+        NodeSourcePosition falseSuccessorPosition = falseSuccessor.getNodeSourcePosition();
+        assertTrue(falseSuccessorPosition != null, "missing IfNode false successor source position");
+
+        int bci = sourcePosition.getBCI();
+        ResolvedJavaMethod method = sourcePosition.getMethod();
+        int bytecode = BytecodeDisassembler.getBytecodeAt(method, bci);
+
+        if (!Bytecodes.isIfBytecode(bytecode)) {
+            return true;
+        }
+
+        byte[] code = (new ResolvedJavaMethodBytecode(method)).getCode();
+        int targetBCI = bci + Bytes.beS2(code, bci + 1);
+        int nextBCI = bci + Bytecodes.lengthOf(bytecode);
+
+        // At least one successor should have the correct BCI to indicate any possible negation that
+        // occurred after bytecode parsing
+        boolean matchingSuccessorFound = false;
+        if (trueSuccessorPosition.getBCI() == nextBCI || trueSuccessorPosition.getBCI() == targetBCI) {
+            assertTrue(compareCallContext(trueSuccessorPosition), "call context different from IfNode in trueSuccessor");
+            matchingSuccessorFound = true;
+        }
+
+        if (falseSuccessorPosition.getBCI() == nextBCI || falseSuccessorPosition.getBCI() == targetBCI) {
+            assertTrue(compareCallContext(falseSuccessorPosition), "call context different from IfNode in falseSuccessor");
+            matchingSuccessorFound = true;
+        }
+
+        assertTrue(matchingSuccessorFound, "no matching successor position found in IfNode");
+        assertTrue(trueSuccessorPosition.getBCI() != falseSuccessorPosition.getBCI(), "successor positions same in IfNode");
+
+        return true;
+    }
+
     public void eliminateNegation() {
         AbstractBeginNode oldTrueSuccessor = trueSuccessor;
         AbstractBeginNode oldFalseSuccessor = falseSuccessor;
@@ -249,6 +311,11 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
                     nextIf.setFalseSuccessor(intermediateBegin);
                     intermediateBegin.setNext(this);
                     this.setFalseSuccessor(bothFalseBegin);
+
+                    NodeSourcePosition intermediateBeginPosition = intermediateBegin.getNodeSourcePosition();
+                    intermediateBegin.setNodeSourcePosition(bothFalseBegin.getNodeSourcePosition());
+                    bothFalseBegin.setNodeSourcePosition(intermediateBeginPosition);
+
                     nextIf.setTrueSuccessorProbability(probabilityB);
                     if (probabilityB == 1.0) {
                         this.setTrueSuccessorProbability(0.0);
@@ -477,6 +544,7 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
      * @param tool
      * @return true if a replacement was done.
      */
+    @SuppressWarnings("try")
     private boolean checkForUnsignedCompare(SimplifierTool tool) {
         assert trueSuccessor().hasNoUsages() && falseSuccessor().hasNoUsages();
         if (condition() instanceof IntegerLessThanNode) {
@@ -516,18 +584,20 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
                         }
                     }
                     if (below != null) {
-                        ifNode2.setTrueSuccessor(null);
-                        ifNode2.setFalseSuccessor(null);
+                        try (DebugCloseable position = ifNode2.withNodeSourcePosition()) {
+                            ifNode2.setTrueSuccessor(null);
+                            ifNode2.setFalseSuccessor(null);
 
-                        IfNode newIfNode = graph().add(new IfNode(below, falseSucc, trueSucc, 1 - trueSuccessorProbability));
-                        // Remove the < 0 test.
-                        tool.deleteBranch(trueSuccessor);
-                        graph().removeSplit(this, falseSuccessor);
+                            IfNode newIfNode = graph().add(new IfNode(below, falseSucc, trueSucc, 1 - trueSuccessorProbability));
+                            // Remove the < 0 test.
+                            tool.deleteBranch(trueSuccessor);
+                            graph().removeSplit(this, falseSuccessor);
 
-                        // Replace the second test with the new one.
-                        ifNode2.predecessor().replaceFirstSuccessor(ifNode2, newIfNode);
-                        ifNode2.safeDelete();
-                        return true;
+                            // Replace the second test with the new one.
+                            ifNode2.predecessor().replaceFirstSuccessor(ifNode2, newIfNode);
+                            ifNode2.safeDelete();
+                            return true;
+                        }
                     }
                 }
             }
@@ -850,6 +920,7 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
      *
      * @param tool
      */
+    @SuppressWarnings("try")
     private boolean splitIfAtPhi(SimplifierTool tool) {
         if (graph().getGuardsStage().areFrameStatesAtSideEffects()) {
             // Disabled until we make sure we have no FrameState-less merges at this stage
@@ -918,12 +989,16 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
             } else if (result != condition) {
                 // Build a new IfNode using the new condition
                 BeginNode trueBegin = graph().add(new BeginNode());
+                trueBegin.setNodeSourcePosition(trueSuccessor().getNodeSourcePosition());
                 BeginNode falseBegin = graph().add(new BeginNode());
+                falseBegin.setNodeSourcePosition(falseSuccessor().getNodeSourcePosition());
 
                 if (result.graph() == null) {
                     result = graph().addOrUniqueWithInputs(result);
+                    result.setNodeSourcePosition(condition.getNodeSourcePosition());
                 }
                 IfNode newIfNode = graph().add(new IfNode(result, trueBegin, falseBegin, trueSuccessorProbability));
+                newIfNode.setNodeSourcePosition(getNodeSourcePosition());
                 merge.removeEnd(end);
                 ((FixedWithNextNode) end.predecessor()).setNext(newIfNode);
 
@@ -1053,6 +1128,7 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
         }
     }
 
+    @SuppressWarnings("try")
     private MergeNode insertMerge(AbstractBeginNode begin) {
         MergeNode merge = graph().add(new MergeNode());
         if (!begin.anchored().isEmpty()) {
@@ -1066,9 +1142,11 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
         AbstractBeginNode theBegin = begin;
         if (begin instanceof LoopExitNode) {
             // Insert an extra begin to make it easier.
-            theBegin = graph().add(new BeginNode());
-            begin.replaceAtPredecessor(theBegin);
-            theBegin.setNext(begin);
+            try (DebugCloseable position = begin.withNodeSourcePosition()) {
+                theBegin = graph().add(new BeginNode());
+                begin.replaceAtPredecessor(theBegin);
+                theBegin.setNext(begin);
+            }
         }
         FixedNode next = theBegin.next();
         next.replaceAtPredecessor(merge);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java
index b3a0301679a..7281d0c7a21 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java
@@ -225,9 +225,11 @@ public class InliningLog {
         while (replacementEntries.advance()) {
             Invokable replacementInvoke = replacementEntries.getKey();
             Callsite replacementSite = replacementEntries.getValue();
-            Invokable invoke = (Invokable) replacements.get((Node) replacementInvoke);
-            Callsite site = mapping.get(replacementSite);
-            leaves.put(invoke, site);
+            if (replacementInvoke.isAlive()) {
+                Invokable invoke = (Invokable) replacements.get((Node) replacementInvoke);
+                Callsite site = mapping.get(replacementSite);
+                leaves.put(invoke, site);
+            }
         }
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java
index d97b7ba2cc7..4b3ee6d965b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java
@@ -31,6 +31,8 @@ import org.graalvm.compiler.graph.spi.Canonicalizable;
 import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 
+import jdk.vm.ci.meta.TriState;
+
 /**
  * Logic node that negates its argument.
  */
@@ -77,4 +79,11 @@ public final class LogicNegationNode extends LogicNode implements Canonicalizabl
         return this;
     }
 
+    @Override
+    public TriState implies(boolean thisNegated, LogicNode other) {
+        if (other == getValue()) {
+            return TriState.get(thisNegated);
+        }
+        return getValue().implies(!thisNegated, other);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java
index ae66411467c..8c6c49ac7c7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java
@@ -25,6 +25,7 @@ package org.graalvm.compiler.nodes;
 import static org.graalvm.compiler.nodeinfo.InputType.Condition;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 
+import jdk.vm.ci.meta.TriState;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
 import org.graalvm.compiler.graph.NodeClass;
@@ -75,4 +76,19 @@ public abstract class LogicNode extends FloatingNode implements IndirectCanonica
 
         return false;
     }
+
+    /**
+     * Determines what this condition implies about the other.
+     *
+     * <ul>
+     * <li>If negate(this, thisNegated) => other, returns {@link TriState#TRUE}</li>
+     * <li>If negate(this, thisNegated) => !other, returns {@link TriState#FALSE}</li>
+     * </ul>
+     *
+     * @param thisNegated whether this condition should be considered as false.
+     * @param other the other condition.
+     */
+    public TriState implies(boolean thisNegated, LogicNode other) {
+        return TriState.UNKNOWN;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
index 0c7da53f3e4..cdbeb800524 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
@@ -25,6 +25,7 @@ package org.graalvm.compiler.nodes;
 import static org.graalvm.compiler.graph.iterators.NodePredicates.isNotA;
 
 import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
@@ -310,13 +311,16 @@ public final class LoopBeginNode extends AbstractMergeNode implements IterableNo
         return loopEnds().first();
     }
 
+    @SuppressWarnings("try")
     public void removeExits() {
         for (LoopExitNode loopexit : loopExits().snapshot()) {
-            loopexit.removeProxies();
-            FrameState loopStateAfter = loopexit.stateAfter();
-            graph().replaceFixedWithFixed(loopexit, graph().add(new BeginNode()));
-            if (loopStateAfter != null) {
-                GraphUtil.tryKillUnused(loopStateAfter);
+            try (DebugCloseable position = graph().withNodeSourcePosition(loopexit)) {
+                loopexit.removeProxies();
+                FrameState loopStateAfter = loopexit.stateAfter();
+                graph().replaceFixedWithFixed(loopexit, graph().add(new BeginNode()));
+                if (loopStateAfter != null) {
+                    GraphUtil.tryKillUnused(loopStateAfter);
+                }
             }
         }
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java
index caf8ab77a62..081d8acb4ea 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java
@@ -46,7 +46,7 @@ public final class PiArrayNode extends PiNode implements ArrayLengthProvider {
     @Input ValueNode length;
 
     @Override
-    public ValueNode length() {
+    public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
         return length;
     }
 
@@ -57,7 +57,7 @@ public final class PiArrayNode extends PiNode implements ArrayLengthProvider {
 
     @Override
     public Node canonical(CanonicalizerTool tool) {
-        if (GraphUtil.arrayLength(object()) != length()) {
+        if (GraphUtil.arrayLength(object(), ArrayLengthProvider.FindLengthMode.SEARCH_ONLY) != length) {
             return this;
         }
         return super.canonical(tool);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java
index 70aedd843f3..28e745649a9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java
@@ -26,15 +26,19 @@ import static org.graalvm.compiler.nodeinfo.InputType.Condition;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
 
+import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.spi.Canonicalizable;
 import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
+import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
+
+import jdk.vm.ci.meta.TriState;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class ShortCircuitOrNode extends LogicNode implements IterableNodeType, Canonicalizable.Binary<LogicNode> {
-
     public static final NodeClass<ShortCircuitOrNode> TYPE = NodeClass.create(ShortCircuitOrNode.class);
     @Input(Condition) LogicNode x;
     @Input(Condition) LogicNode y;
@@ -169,9 +173,90 @@ public final class ShortCircuitOrNode extends LogicNode implements IterableNodeT
                 return optimizeShortCircuit(inner, this.yNegated, this.xNegated, false);
             }
         }
+
+        // !X => Y constant
+        TriState impliedForY = forX.implies(!isXNegated(), forY);
+        if (impliedForY.isKnown()) {
+            boolean yResult = impliedForY.toBoolean() ^ isYNegated();
+            return yResult
+                            ? LogicConstantNode.tautology()
+                            : (isXNegated()
+                                            ? LogicNegationNode.create(forX)
+                                            : forX);
+        }
+
+        // if X >= 0:
+        // u < 0 || X < u ==>> X |<| u
+        if (!isXNegated() && !isYNegated()) {
+            LogicNode sym = simplifyComparison(forX, forY);
+            if (sym != null) {
+                return sym;
+            }
+        }
+
+        // if X >= 0:
+        // X |<| u || X < u ==>> X |<| u
+        if (forX instanceof IntegerBelowNode && forY instanceof IntegerLessThanNode && !isXNegated() && !isYNegated()) {
+            IntegerBelowNode xNode = (IntegerBelowNode) forX;
+            IntegerLessThanNode yNode = (IntegerLessThanNode) forY;
+            ValueNode xxNode = xNode.getX(); // X >= 0
+            ValueNode yxNode = yNode.getX(); // X >= 0
+            if (xxNode == yxNode && ((IntegerStamp) xxNode.stamp(NodeView.DEFAULT)).isPositive()) {
+                ValueNode xyNode = xNode.getY(); // u
+                ValueNode yyNode = yNode.getY(); // u
+                if (xyNode == yyNode) {
+                    return forX;
+                }
+            }
+        }
+
+        // if X >= 0:
+        // u < 0 || (X < u || tail) ==>> X |<| u || tail
+        if (forY instanceof ShortCircuitOrNode && !isXNegated() && !isYNegated()) {
+            ShortCircuitOrNode yNode = (ShortCircuitOrNode) forY;
+            if (!yNode.isXNegated()) {
+                LogicNode sym = simplifyComparison(forX, yNode.getX());
+                if (sym != null) {
+                    double p1 = getShortCircuitProbability();
+                    double p2 = yNode.getShortCircuitProbability();
+                    return new ShortCircuitOrNode(sym, isXNegated(), yNode.getY(), yNode.isYNegated(), p1 + (1 - p1) * p2);
+                }
+            }
+        }
+
         return this;
     }
 
+    private static LogicNode simplifyComparison(LogicNode forX, LogicNode forY) {
+        LogicNode sym = simplifyComparisonOrdered(forX, forY);
+        if (sym == null) {
+            return simplifyComparisonOrdered(forY, forX);
+        }
+        return sym;
+    }
+
+    private static LogicNode simplifyComparisonOrdered(LogicNode forX, LogicNode forY) {
+        // if X is >= 0:
+        // u < 0 || X < u ==>> X |<| u
+        if (forX instanceof IntegerLessThanNode && forY instanceof IntegerLessThanNode) {
+            IntegerLessThanNode xNode = (IntegerLessThanNode) forX;
+            IntegerLessThanNode yNode = (IntegerLessThanNode) forY;
+            ValueNode xyNode = xNode.getY(); // 0
+            if (xyNode.isConstant() && IntegerStamp.OPS.getAdd().isNeutral(xyNode.asConstant())) {
+                ValueNode yxNode = yNode.getX(); // X >= 0
+                IntegerStamp stamp = (IntegerStamp) yxNode.stamp(NodeView.DEFAULT);
+                if (stamp.isPositive()) {
+                    if (xNode.getX() == yNode.getY()) {
+                        ValueNode u = xNode.getX();
+                        return IntegerBelowNode.create(yxNode, u, NodeView.DEFAULT);
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
     private static LogicNode optimizeShortCircuit(ShortCircuitOrNode inner, boolean innerNegated, boolean matchNegated, boolean matchIsInnerX) {
         boolean innerMatchNegated;
         if (matchIsInnerX) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java
index a268b49e2da..af711d9e993 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java
@@ -30,6 +30,7 @@ import java.util.List;
 
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
 import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.spi.Canonicalizable;
@@ -273,55 +274,60 @@ public class SimplifyingGraphDecoder extends GraphDecoder {
         return new CanonicalizeToNullNode(node.stamp);
     }
 
+    @SuppressWarnings("try")
     private void handleCanonicalization(LoopScope loopScope, int nodeOrderId, FixedNode node, Node c) {
         assert c != node : "unnecessary call";
-        Node canonical = c == null ? canonicalizeFixedNodeToNull(node) : c;
-        if (!canonical.isAlive()) {
-            assert !canonical.isDeleted();
-            canonical = graph.addOrUniqueWithInputs(canonical);
-            if (canonical instanceof FixedWithNextNode) {
-                graph.addBeforeFixed(node, (FixedWithNextNode) canonical);
-            } else if (canonical instanceof ControlSinkNode) {
-                FixedWithNextNode predecessor = (FixedWithNextNode) node.predecessor();
-                predecessor.setNext((ControlSinkNode) canonical);
-                List<Node> successorSnapshot = node.successors().snapshot();
-                node.safeDelete();
-                for (Node successor : successorSnapshot) {
-                    successor.safeDelete();
+        try (DebugCloseable position = graph.withNodeSourcePosition(node)) {
+            Node canonical = c == null ? canonicalizeFixedNodeToNull(node) : c;
+            if (!canonical.isAlive()) {
+                assert !canonical.isDeleted();
+                canonical = graph.addOrUniqueWithInputs(canonical);
+                if (canonical instanceof FixedWithNextNode) {
+                    graph.addBeforeFixed(node, (FixedWithNextNode) canonical);
+                } else if (canonical instanceof ControlSinkNode) {
+                    FixedWithNextNode predecessor = (FixedWithNextNode) node.predecessor();
+                    predecessor.setNext((ControlSinkNode) canonical);
+                    List<Node> successorSnapshot = node.successors().snapshot();
+                    node.safeDelete();
+                    for (Node successor : successorSnapshot) {
+                        successor.safeDelete();
+                    }
+                } else {
+                    assert !(canonical instanceof FixedNode);
                 }
-
-            } else {
-                assert !(canonical instanceof FixedNode);
             }
+            if (!node.isDeleted()) {
+                GraphUtil.unlinkFixedNode((FixedWithNextNode) node);
+                node.replaceAtUsagesAndDelete(canonical);
+            }
+            assert lookupNode(loopScope, nodeOrderId) == node;
+            registerNode(loopScope, nodeOrderId, canonical, true, false);
         }
-        if (!node.isDeleted()) {
-            GraphUtil.unlinkFixedNode((FixedWithNextNode) node);
-            node.replaceAtUsagesAndDelete(canonical);
-        }
-        assert lookupNode(loopScope, nodeOrderId) == node;
-        registerNode(loopScope, nodeOrderId, canonical, true, false);
     }
 
     @Override
+    @SuppressWarnings("try")
     protected Node handleFloatingNodeBeforeAdd(MethodScope methodScope, LoopScope loopScope, Node node) {
         if (node instanceof ValueNode) {
             ((ValueNode) node).inferStamp();
         }
         if (node instanceof Canonicalizable) {
-            Node canonical = ((Canonicalizable) node).canonical(canonicalizerTool);
-            if (canonical == null) {
-                /*
-                 * This is a possible return value of canonicalization. However, we might need to
-                 * add additional usages later on for which we need a node. Therefore, we just do
-                 * nothing and leave the node in place.
-                 */
-            } else if (canonical != node) {
-                if (!canonical.isAlive()) {
-                    assert !canonical.isDeleted();
-                    canonical = graph.addOrUniqueWithInputs(canonical);
+            try (DebugCloseable context = graph.withNodeSourcePosition(node)) {
+                Node canonical = ((Canonicalizable) node).canonical(canonicalizerTool);
+                if (canonical == null) {
+                    /*
+                     * This is a possible return value of canonicalization. However, we might need
+                     * to add additional usages later on for which we need a node. Therefore, we
+                     * just do nothing and leave the node in place.
+                     */
+                } else if (canonical != node) {
+                    if (!canonical.isAlive()) {
+                        assert !canonical.isDeleted();
+                        canonical = graph.addOrUniqueWithInputs(canonical);
+                    }
+                    assert node.hasNoUsages();
+                    return canonical;
                 }
-                assert node.hasNoUsages();
-                return canonical;
             }
         }
         return node;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java
index ebf48d8672d..1b93b0f7b3f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java
@@ -28,6 +28,7 @@ import org.graalvm.compiler.graph.spi.Canonicalizable;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+import org.graalvm.compiler.nodes.spi.ValueProxy;
 
 import jdk.vm.ci.meta.TriState;
 
@@ -52,7 +53,58 @@ public abstract class UnaryOpLogicNode extends LogicNode implements LIRLowerable
     public void generate(NodeLIRBuilderTool gen) {
     }
 
+    /**
+     * In general the input stamp cannot be trusted, this method is reserved for the cases when it's
+     * "safe" to use the input stamp. To ensure safety use
+     * {@link #getSucceedingStampForValue(boolean)} instead.
+     */
+    public Stamp getSucceedingStampForValue(boolean negated, Stamp valueStamp) {
+        Stamp succStamp = getSucceedingStampForValue(negated);
+        if (succStamp != null) {
+            succStamp = succStamp.join(valueStamp);
+        }
+        return succStamp;
+    }
+
+    /**
+     * The input stamp cannot be trusted, the returned stamp cannot use the input stamp to narrow
+     * itself or derive any assumptions. This method does not use the input stamp and is considered
+     * safe.
+     *
+     * It's responsibility of the caller to determine when it's "safe" to "trust" the input stamp
+     * and use {@link #getSucceedingStampForValue(boolean, Stamp)} instead.
+     */
     public abstract Stamp getSucceedingStampForValue(boolean negated);
 
     public abstract TriState tryFold(Stamp valueStamp);
+
+    @Override
+    public TriState implies(boolean thisNegated, LogicNode other) {
+        if (other instanceof UnaryOpLogicNode) {
+            UnaryOpLogicNode unaryY = (UnaryOpLogicNode) other;
+            if (this.getValue() == unaryY.getValue() || // fast path
+                            skipThroughPisAndProxies(this.getValue()) == skipThroughPisAndProxies(unaryY.getValue())) {
+                Stamp succStamp = this.getSucceedingStampForValue(thisNegated);
+                TriState fold = unaryY.tryFold(succStamp);
+                if (fold.isKnown()) {
+                    return fold;
+                }
+            }
+        }
+        return super.implies(thisNegated, other);
+    }
+
+    private static ValueNode skipThroughPisAndProxies(ValueNode node) {
+        ValueNode n = node;
+        while (n != null) {
+            if (n instanceof PiNode) {
+                n = ((PiNode) n).getOriginalNode();
+            } else if (n instanceof ValueProxy) {
+                n = ((ValueProxy) n).getOriginalNode();
+            } else {
+                break;
+            }
+        }
+        return n;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java
index 978df0e4c9c..ba618c5d23b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java
@@ -29,16 +29,14 @@ import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeInputList;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
 import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.util.CollectionsUtil;
 
 /**
  * Value {@link PhiNode}s merge data flow values at control flow merges.
  */
 @NodeInfo(nameTemplate = "Phi({i#values}, {p#valueDescription})")
-public class ValuePhiNode extends PhiNode implements ArrayLengthProvider {
+public class ValuePhiNode extends PhiNode {
 
     public static final NodeClass<ValuePhiNode> TYPE = NodeClass.create(ValuePhiNode.class);
     @Input protected NodeInputList<ValueNode> values;
@@ -79,26 +77,6 @@ public class ValuePhiNode extends PhiNode implements ArrayLengthProvider {
         return updateStamp(valuesStamp);
     }
 
-    @Override
-    public ValueNode length() {
-        if (merge() instanceof LoopBeginNode) {
-            return null;
-        }
-        ValueNode length = null;
-        for (ValueNode input : values()) {
-            ValueNode l = GraphUtil.arrayLength(input);
-            if (l == null) {
-                return null;
-            }
-            if (length == null) {
-                length = l;
-            } else if (length != l) {
-                return null;
-            }
-        }
-        return length;
-    }
-
     @Override
     public boolean verify() {
         Stamp s = null;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java
index 1c59aed273c..318b715ae14 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java
@@ -30,6 +30,7 @@ import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.LogicNegationNode;
 import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -38,6 +39,7 @@ import org.graalvm.compiler.options.OptionValues;
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.TriState;
 
 @NodeInfo(shortName = "|<|")
 public final class IntegerBelowNode extends IntegerLowerThanNode {
@@ -135,4 +137,36 @@ public final class IntegerBelowNode extends IntegerLowerThanNode {
             return new IntegerBelowNode(x, y);
         }
     }
+
+    @Override
+    public TriState implies(boolean thisNegated, LogicNode other) {
+        if (other instanceof LogicNegationNode) {
+            // Unwrap negations.
+            TriState result = implies(thisNegated, ((LogicNegationNode) other).getValue());
+            if (result.isKnown()) {
+                return TriState.get(!result.toBoolean());
+            }
+        }
+        if (!thisNegated) {
+            if (other instanceof IntegerLessThanNode) {
+                IntegerLessThanNode integerLessThanNode = (IntegerLessThanNode) other;
+                IntegerStamp stampL = (IntegerStamp) this.getY().stamp(NodeView.DEFAULT);
+                // if L >= 0:
+                if (stampL.isPositive()) { // L >= 0
+                    if (this.getX() == integerLessThanNode.getX()) {
+                        // x |<| L implies x < L
+                        if (this.getY() == integerLessThanNode.getY()) {
+                            return TriState.TRUE;
+                        }
+                        // x |<| L implies !(x < 0)
+                        if (integerLessThanNode.getY().isConstant() &&
+                                        IntegerStamp.OPS.getAdd().isNeutral(integerLessThanNode.getY().asConstant())) {
+                            return TriState.FALSE;
+                        }
+                    }
+                }
+            }
+        }
+        return super.implies(thisNegated, other);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java
index d494c49dde9..534cdd5b6da 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java
@@ -28,9 +28,11 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 
@@ -49,19 +51,26 @@ public abstract class IntegerDivRemNode extends FixedBinaryNode implements Lower
         UNSIGNED
     }
 
+    @OptionalInput(InputType.Guard) private GuardingNode zeroCheck;
+
     private final Op op;
     private final Type type;
     private final boolean canDeopt;
 
-    protected IntegerDivRemNode(NodeClass<? extends IntegerDivRemNode> c, Stamp stamp, Op op, Type type, ValueNode x, ValueNode y) {
+    protected IntegerDivRemNode(NodeClass<? extends IntegerDivRemNode> c, Stamp stamp, Op op, Type type, ValueNode x, ValueNode y, GuardingNode zeroCheck) {
         super(c, stamp, x, y);
+        this.zeroCheck = zeroCheck;
         this.op = op;
         this.type = type;
 
         // Assigning canDeopt during constructor, because it must never change during lifetime of
         // the node.
         IntegerStamp yStamp = (IntegerStamp) getY().stamp(NodeView.DEFAULT);
-        this.canDeopt = yStamp.contains(0) || yStamp.contains(-1);
+        this.canDeopt = (yStamp.contains(0) && zeroCheck == null) || yStamp.contains(-1);
+    }
+
+    public final GuardingNode getZeroCheck() {
+        return zeroCheck;
     }
 
     public final Op getOp() {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
index dc206008f60..2c73f557667 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
@@ -31,6 +31,7 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
@@ -41,16 +42,16 @@ public class SignedDivNode extends IntegerDivRemNode implements LIRLowerable {
 
     public static final NodeClass<SignedDivNode> TYPE = NodeClass.create(SignedDivNode.class);
 
-    protected SignedDivNode(ValueNode x, ValueNode y) {
-        this(TYPE, x, y);
+    protected SignedDivNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        this(TYPE, x, y, zeroCheck);
     }
 
-    protected SignedDivNode(NodeClass<? extends SignedDivNode> c, ValueNode x, ValueNode y) {
-        super(c, IntegerStamp.OPS.getDiv().foldStamp(x.stamp(NodeView.DEFAULT), y.stamp(NodeView.DEFAULT)), Op.DIV, Type.SIGNED, x, y);
+    protected SignedDivNode(NodeClass<? extends SignedDivNode> c, ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        super(c, IntegerStamp.OPS.getDiv().foldStamp(x.stamp(NodeView.DEFAULT), y.stamp(NodeView.DEFAULT)), Op.DIV, Type.SIGNED, x, y, zeroCheck);
     }
 
-    public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
-        return canonical(null, x, y, view);
+    public static ValueNode create(ValueNode x, ValueNode y, GuardingNode zeroCheck, NodeView view) {
+        return canonical(null, x, y, zeroCheck, view);
     }
 
     @Override
@@ -61,17 +62,17 @@ public class SignedDivNode extends IntegerDivRemNode implements LIRLowerable {
     @Override
     public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
         NodeView view = NodeView.from(tool);
-        return canonical(this, forX, forY, view);
+        return canonical(this, forX, forY, getZeroCheck(), view);
     }
 
-    public static ValueNode canonical(SignedDivNode self, ValueNode forX, ValueNode forY, NodeView view) {
+    public static ValueNode canonical(SignedDivNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, NodeView view) {
         Stamp predictedStamp = IntegerStamp.OPS.getDiv().foldStamp(forX.stamp(NodeView.DEFAULT), forY.stamp(NodeView.DEFAULT));
         Stamp stamp = self != null ? self.stamp(view) : predictedStamp;
         if (forX.isConstant() && forY.isConstant()) {
             long y = forY.asJavaConstant().asLong();
             if (y == 0) {
-                return self != null ? self : new SignedDivNode(forX, forY); // this will trap, can
-                                                                            // not canonicalize
+                /* This will trap, cannot canonicalize. */
+                return self != null ? self : new SignedDivNode(forX, forY, zeroCheck);
             }
             return ConstantNode.forIntegerStamp(stamp, forX.asJavaConstant().asLong() / y);
         } else if (forY.isConstant()) {
@@ -89,7 +90,7 @@ public class SignedDivNode extends IntegerDivRemNode implements LIRLowerable {
                 SignedRemNode integerRemNode = (SignedRemNode) integerSubNode.getY();
                 if (integerSubNode.stamp(view).isCompatible(stamp) && integerRemNode.stamp(view).isCompatible(stamp) && integerSubNode.getX() == integerRemNode.getX() &&
                                 forY == integerRemNode.getY()) {
-                    SignedDivNode sd = new SignedDivNode(integerSubNode.getX(), forY);
+                    SignedDivNode sd = new SignedDivNode(integerSubNode.getX(), forY, zeroCheck);
                     sd.stateBefore = self != null ? self.stateBefore : null;
                     return sd;
                 }
@@ -103,7 +104,7 @@ public class SignedDivNode extends IntegerDivRemNode implements LIRLowerable {
             }
         }
 
-        return self != null ? self : new SignedDivNode(forX, forY);
+        return self != null ? self : new SignedDivNode(forX, forY, zeroCheck);
     }
 
     public static ValueNode canonical(ValueNode forX, long c, NodeView view) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
index 432cb047cd2..69bb0530ac8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
@@ -30,6 +30,7 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
@@ -40,17 +41,17 @@ public class SignedRemNode extends IntegerDivRemNode implements LIRLowerable {
 
     public static final NodeClass<SignedRemNode> TYPE = NodeClass.create(SignedRemNode.class);
 
-    protected SignedRemNode(ValueNode x, ValueNode y) {
-        this(TYPE, x, y);
+    protected SignedRemNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        this(TYPE, x, y, zeroCheck);
     }
 
-    protected SignedRemNode(NodeClass<? extends SignedRemNode> c, ValueNode x, ValueNode y) {
-        super(c, IntegerStamp.OPS.getRem().foldStamp(x.stamp(NodeView.DEFAULT), y.stamp(NodeView.DEFAULT)), Op.REM, Type.SIGNED, x, y);
+    protected SignedRemNode(NodeClass<? extends SignedRemNode> c, ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        super(c, IntegerStamp.OPS.getRem().foldStamp(x.stamp(NodeView.DEFAULT), y.stamp(NodeView.DEFAULT)), Op.REM, Type.SIGNED, x, y, zeroCheck);
     }
 
-    public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
+    public static ValueNode create(ValueNode x, ValueNode y, GuardingNode zeroCheck, NodeView view) {
         Stamp stamp = IntegerStamp.OPS.getRem().foldStamp(x.stamp(view), y.stamp(view));
-        return canonical(null, x, y, stamp, view);
+        return canonical(null, x, y, zeroCheck, stamp, view);
     }
 
     @Override
@@ -61,15 +62,15 @@ public class SignedRemNode extends IntegerDivRemNode implements LIRLowerable {
     @Override
     public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
         NodeView view = NodeView.from(tool);
-        return canonical(this, forX, forY, stamp(view), view);
+        return canonical(this, forX, forY, getZeroCheck(), stamp(view), view);
     }
 
-    private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode forY, Stamp stamp, NodeView view) {
+    private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, Stamp stamp, NodeView view) {
         if (forX.isConstant() && forY.isConstant()) {
             long y = forY.asJavaConstant().asLong();
             if (y == 0) {
-                return self != null ? self : new SignedRemNode(forX, forY); // this will trap, can
-                                                                            // not canonicalize
+                /* This will trap, cannot canonicalize. */
+                return self != null ? self : new SignedRemNode(forX, forY, zeroCheck);
             }
             return ConstantNode.forIntegerStamp(stamp, forX.asJavaConstant().asLong() % y);
         } else if (forY.isConstant() && forX.stamp(view) instanceof IntegerStamp && forY.stamp(view) instanceof IntegerStamp) {
@@ -78,7 +79,7 @@ public class SignedRemNode extends IntegerDivRemNode implements LIRLowerable {
             IntegerStamp yStamp = (IntegerStamp) forY.stamp(view);
             if (constY < 0 && constY != CodeUtil.minValue(yStamp.getBits())) {
                 Stamp newStamp = IntegerStamp.OPS.getRem().foldStamp(forX.stamp(view), forY.stamp(view));
-                return canonical(null, forX, ConstantNode.forIntegerStamp(yStamp, -constY), newStamp, view);
+                return canonical(null, forX, ConstantNode.forIntegerStamp(yStamp, -constY), zeroCheck, newStamp, view);
             }
 
             if (constY == 1) {
@@ -96,7 +97,7 @@ public class SignedRemNode extends IntegerDivRemNode implements LIRLowerable {
                 }
             }
         }
-        return self != null ? self : new SignedRemNode(forX, forY);
+        return self != null ? self : new SignedRemNode(forX, forY, zeroCheck);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java
index 792e4388a5d..e609a243eba 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java
@@ -30,6 +30,7 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
@@ -40,33 +41,33 @@ public class UnsignedDivNode extends IntegerDivRemNode implements LIRLowerable {
 
     public static final NodeClass<UnsignedDivNode> TYPE = NodeClass.create(UnsignedDivNode.class);
 
-    public UnsignedDivNode(ValueNode x, ValueNode y) {
-        this(TYPE, x, y);
+    public UnsignedDivNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        this(TYPE, x, y, zeroCheck);
     }
 
-    protected UnsignedDivNode(NodeClass<? extends UnsignedDivNode> c, ValueNode x, ValueNode y) {
-        super(c, x.stamp(NodeView.DEFAULT).unrestricted(), Op.DIV, Type.UNSIGNED, x, y);
+    protected UnsignedDivNode(NodeClass<? extends UnsignedDivNode> c, ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        super(c, x.stamp(NodeView.DEFAULT).unrestricted(), Op.DIV, Type.UNSIGNED, x, y, zeroCheck);
     }
 
-    public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
+    public static ValueNode create(ValueNode x, ValueNode y, GuardingNode zeroCheck, NodeView view) {
         Stamp stamp = x.stamp(view).unrestricted();
-        return canonical(null, x, y, stamp, view);
+        return canonical(null, x, y, zeroCheck, stamp, view);
     }
 
     @Override
     public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
         NodeView view = NodeView.from(tool);
-        return canonical(this, forX, forY, stamp(view), view);
+        return canonical(this, forX, forY, getZeroCheck(), stamp(view), view);
     }
 
     @SuppressWarnings("unused")
-    private static ValueNode canonical(UnsignedDivNode self, ValueNode forX, ValueNode forY, Stamp stamp, NodeView view) {
+    private static ValueNode canonical(UnsignedDivNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, Stamp stamp, NodeView view) {
         int bits = ((IntegerStamp) stamp).getBits();
         if (forX.isConstant() && forY.isConstant()) {
             long yConst = CodeUtil.zeroExtend(forY.asJavaConstant().asLong(), bits);
             if (yConst == 0) {
-                return self != null ? self : new UnsignedDivNode(forX, forY); // this will trap,
-                                                                              // cannot canonicalize
+                /* This will trap, cannot canonicalize. */
+                return self != null ? self : new UnsignedDivNode(forX, forY, zeroCheck);
             }
             return ConstantNode.forIntegerStamp(stamp, Long.divideUnsigned(CodeUtil.zeroExtend(forX.asJavaConstant().asLong(), bits), yConst));
         } else if (forY.isConstant()) {
@@ -78,7 +79,7 @@ public class UnsignedDivNode extends IntegerDivRemNode implements LIRLowerable {
                 return new UnsignedRightShiftNode(forX, ConstantNode.forInt(CodeUtil.log2(c)));
             }
         }
-        return self != null ? self : new UnsignedDivNode(forX, forY);
+        return self != null ? self : new UnsignedDivNode(forX, forY, zeroCheck);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java
index bfba2c43283..567b5cafa9f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java
@@ -30,6 +30,7 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
@@ -40,33 +41,33 @@ public class UnsignedRemNode extends IntegerDivRemNode implements LIRLowerable {
 
     public static final NodeClass<UnsignedRemNode> TYPE = NodeClass.create(UnsignedRemNode.class);
 
-    public UnsignedRemNode(ValueNode x, ValueNode y) {
-        this(TYPE, x, y);
+    public UnsignedRemNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        this(TYPE, x, y, zeroCheck);
     }
 
-    protected UnsignedRemNode(NodeClass<? extends UnsignedRemNode> c, ValueNode x, ValueNode y) {
-        super(c, x.stamp(NodeView.DEFAULT).unrestricted(), Op.REM, Type.UNSIGNED, x, y);
+    protected UnsignedRemNode(NodeClass<? extends UnsignedRemNode> c, ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+        super(c, x.stamp(NodeView.DEFAULT).unrestricted(), Op.REM, Type.UNSIGNED, x, y, zeroCheck);
     }
 
-    public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
+    public static ValueNode create(ValueNode x, ValueNode y, GuardingNode zeroCheck, NodeView view) {
         Stamp stamp = x.stamp(view).unrestricted();
-        return canonical(null, x, y, stamp, view);
+        return canonical(null, x, y, zeroCheck, stamp, view);
     }
 
     @Override
     public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
         NodeView view = NodeView.from(tool);
-        return canonical(this, forX, forY, stamp(view), view);
+        return canonical(this, forX, forY, getZeroCheck(), stamp(view), view);
     }
 
     @SuppressWarnings("unused")
-    public static ValueNode canonical(UnsignedRemNode self, ValueNode forX, ValueNode forY, Stamp stamp, NodeView view) {
+    public static ValueNode canonical(UnsignedRemNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, Stamp stamp, NodeView view) {
         int bits = ((IntegerStamp) stamp).getBits();
         if (forX.isConstant() && forY.isConstant()) {
             long yConst = CodeUtil.zeroExtend(forY.asJavaConstant().asLong(), bits);
             if (yConst == 0) {
-                return self != null ? self : new UnsignedRemNode(forX, forY); // this will trap,
-                                                                              // cannot canonicalize
+                /* This will trap, cannot canonicalize. */
+                return self != null ? self : new UnsignedRemNode(forX, forY, zeroCheck);
             }
             return ConstantNode.forIntegerStamp(stamp, Long.remainderUnsigned(CodeUtil.zeroExtend(forX.asJavaConstant().asLong(), bits), yConst));
         } else if (forY.isConstant()) {
@@ -77,7 +78,7 @@ public class UnsignedRemNode extends IntegerDivRemNode implements LIRLowerable {
                 return new AndNode(forX, ConstantNode.forIntegerStamp(stamp, c - 1));
             }
         }
-        return self != null ? self : new UnsignedRemNode(forX, forY);
+        return self != null ? self : new UnsignedRemNode(forX, forY, zeroCheck);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
index 02cb3b8f607..8811a7f63d3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
@@ -91,7 +91,9 @@ public class BoxNode extends FixedWithNextNode implements VirtualizableAllocatio
     }
 
     protected VirtualBoxingNode createVirtualBoxingNode() {
-        return new VirtualBoxingNode(StampTool.typeOrNull(stamp(NodeView.DEFAULT)), boxingKind);
+        VirtualBoxingNode node = new VirtualBoxingNode(StampTool.typeOrNull(stamp(NodeView.DEFAULT)), boxingKind);
+        node.setNodeSourcePosition(getNodeSourcePosition());
+        return node;
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
index 93a842ea1c1..e1d6cc5dfc8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
@@ -28,8 +28,12 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeInputList;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodeinfo.Verbosity;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -50,26 +54,43 @@ import jdk.vm.ci.meta.MetaAccessProvider;
           cyclesRationale = "Node will be lowered to a foreign call.",
           size = SIZE_8)
 // @formatter:on
-public final class BytecodeExceptionNode extends AbstractMemoryCheckpoint implements Lowerable, MemoryCheckpoint.Single {
+public final class BytecodeExceptionNode extends AbstractMemoryCheckpoint implements Lowerable, MemoryCheckpoint.Single, Canonicalizable {
 
-    public static final NodeClass<BytecodeExceptionNode> TYPE = NodeClass.create(BytecodeExceptionNode.class);
-    protected final Class<? extends Throwable> exceptionClass;
-    @Input NodeInputList<ValueNode> arguments;
+    public enum BytecodeExceptionKind {
+        NULL_POINTER(0, NullPointerException.class),
+        OUT_OF_BOUNDS(2, ArrayIndexOutOfBoundsException.class),
+        CLASS_CAST(2, ClassCastException.class),
+        ARRAY_STORE(1, ArrayStoreException.class),
+        DIVISION_BY_ZERO(0, ArithmeticException.class);
 
-    public BytecodeExceptionNode(MetaAccessProvider metaAccess, Class<? extends Throwable> exceptionClass, ValueNode... arguments) {
-        super(TYPE, StampFactory.objectNonNull(TypeReference.createExactTrusted(metaAccess.lookupJavaType(exceptionClass))));
-        this.exceptionClass = exceptionClass;
-        this.arguments = new NodeInputList<>(this, arguments);
+        final int numArguments;
+        final Class<? extends Throwable> exceptionClass;
+
+        BytecodeExceptionKind(int numArguments, Class<? extends Throwable> exceptionClass) {
+            this.numArguments = numArguments;
+            this.exceptionClass = exceptionClass;
+        }
     }
 
-    public Class<? extends Throwable> getExceptionClass() {
-        return exceptionClass;
+    public static final NodeClass<BytecodeExceptionNode> TYPE = NodeClass.create(BytecodeExceptionNode.class);
+    protected final BytecodeExceptionKind exceptionKind;
+    @Input NodeInputList<ValueNode> arguments;
+
+    public BytecodeExceptionNode(MetaAccessProvider metaAccess, BytecodeExceptionKind exceptionKind, ValueNode... arguments) {
+        super(TYPE, StampFactory.objectNonNull(TypeReference.createExactTrusted(metaAccess.lookupJavaType(exceptionKind.exceptionClass))));
+        this.exceptionKind = exceptionKind;
+        this.arguments = new NodeInputList<>(this, arguments);
+        GraalError.guarantee(arguments.length == exceptionKind.numArguments, "Mismatch in argument count for BytecodeExceptionNode");
+    }
+
+    public BytecodeExceptionKind getExceptionKind() {
+        return exceptionKind;
     }
 
     @Override
     public String toString(Verbosity verbosity) {
         if (verbosity == Verbosity.Name) {
-            return super.toString(verbosity) + "#" + exceptionClass.getSimpleName();
+            return super.toString(verbosity) + "#" + exceptionKind;
         }
         return super.toString(verbosity);
     }
@@ -79,6 +100,14 @@ public final class BytecodeExceptionNode extends AbstractMemoryCheckpoint implem
         return LocationIdentity.any();
     }
 
+    @Override
+    public Node canonical(CanonicalizerTool tool) {
+        if (tool.allUsagesAvailable() && getUsageCount() == 0) {
+            return null;
+        }
+        return this;
+    }
+
     @Override
     public void lower(LoweringTool tool) {
         tool.getLowerer().lower(this, tool);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java
new file mode 100644
index 00000000000..6f4830367c7
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2018, 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.nodes.extended;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.Lowerable;
+import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.nodes.spi.StampProvider;
+
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+/**
+ * Loads the component hub for of the provided array hub.
+ *
+ * This is a fixed node because on certain VMs, for example the HotSpot VM, the read is only valid
+ * when the provided hub is actually an array hub (and not, e.g., a primitive hub), so this node
+ * must not float above a possible type check. Properly guarding this node would be possible too,
+ * but it is unlikely that the guard would be more flexible than just fixing the node in the control
+ * flow.
+ */
+@NodeInfo(cycles = CYCLES_2, size = SIZE_1)
+public final class LoadArrayComponentHubNode extends FixedWithNextNode implements Lowerable, Canonicalizable.Unary<ValueNode> {
+
+    public static final NodeClass<LoadArrayComponentHubNode> TYPE = NodeClass.create(LoadArrayComponentHubNode.class);
+
+    private @Input ValueNode value;
+
+    public static ValueNode create(ValueNode value, StampProvider stampProvider, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
+        Stamp stamp = stampProvider.createHubStamp(null);
+        return findSynonym(null, value, stamp, metaAccess, constantReflection);
+    }
+
+    protected LoadArrayComponentHubNode(Stamp stamp, ValueNode value) {
+        super(TYPE, stamp);
+        this.value = value;
+    }
+
+    @Override
+    public ValueNode getValue() {
+        return value;
+    }
+
+    @Override
+    public void lower(LoweringTool tool) {
+        tool.getLowerer().lower(this, tool);
+    }
+
+    @Override
+    public Node canonical(CanonicalizerTool tool, ValueNode forValue) {
+        return findSynonym(this, forValue, stamp, tool.getMetaAccess(), tool.getConstantReflection());
+    }
+
+    private static ValueNode findSynonym(LoadArrayComponentHubNode self, ValueNode forValue, Stamp stamp, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
+        if (forValue.isConstant()) {
+            ResolvedJavaType type = constantReflection.asJavaType(forValue.asConstant());
+            if (type != null) {
+                return ConstantNode.forConstant(stamp, constantReflection.asObjectHub(type.getComponentType()), metaAccess);
+            }
+        }
+        return self != null ? self : new LoadArrayComponentHubNode(stamp, forValue);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
index 9fa8800927b..8f5a36a5f48 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
@@ -22,17 +22,29 @@
  */
 package org.graalvm.compiler.nodes.graphbuilderconf;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
+import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node.NodeIntrinsic;
 import org.graalvm.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
+/**
+ * Abstract class for a plugin generated for a method annotated by {@link NodeIntrinsic} or
+ * {@link Fold}.
+ */
 public abstract class GeneratedInvocationPlugin implements InvocationPlugin {
 
+    /**
+     * Gets the class of the annotation for which this plugin was generated.
+     */
+    public abstract Class<? extends Annotation> getSource();
+
     @Override
     public abstract boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] args);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
index 56ae30c77e4..1ad54861ade 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
@@ -76,4 +76,10 @@ public interface GraphBuilderTool {
      * by an intrinsic.
      */
     boolean parsingIntrinsic();
+
+    @SuppressWarnings("unused")
+    default boolean canDeferPlugin(GeneratedInvocationPlugin plugin) {
+        // By default generated plugins must be completely processed during parsing.
+        return false;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
index 7a9cdff9ebd..fe18091eca5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
@@ -83,6 +83,15 @@ public interface InvocationPlugin extends GraphBuilderPlugin {
         return isSignaturePolymorphic();
     }
 
+    /**
+     * Determines if this plugin only decorates the method is it associated with. That is, it
+     * inserts nodes prior to the invocation (e.g. some kind of marker nodes) but still expects the
+     * parser to process the invocation further.
+     */
+    default boolean isDecorator() {
+        return false;
+    }
+
     /**
      * Handles invocation of a signature polymorphic method.
      *
@@ -167,7 +176,8 @@ public interface InvocationPlugin extends GraphBuilderPlugin {
      * @return {@code true} if this plugin handled the invocation of {@code targetMethod}
      *         {@code false} if the graph builder should process the invoke further (e.g., by
      *         inlining it or creating an {@link Invoke} node). A plugin that does not handle an
-     *         invocation must not modify the graph being constructed.
+     *         invocation must not modify the graph being constructed unless it is a
+     *         {@linkplain InvocationPlugin#isDecorator() decorator}.
      */
     default boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] argsIncludingReceiver) {
         if (isSignaturePolymorphic()) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
index 087061d0440..fb687ad3583 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
@@ -679,7 +679,9 @@ public class InvocationPlugins {
                     }
                 }
                 if (res != null) {
-                    if (canBeIntrinsified(declaringClass)) {
+                    // A decorator plugin is trusted since it does not replace
+                    // the method it intrinsifies.
+                    if (res.isDecorator() || canBeIntrinsified(declaringClass)) {
                         return res;
                     }
                 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java
index 199a53b801d..299a2bd1366 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java
@@ -23,6 +23,7 @@
 package org.graalvm.compiler.nodes.graphbuilderconf;
 
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaTypeProfile;
@@ -106,10 +107,12 @@ public interface NodePlugin extends GraphBuilderPlugin {
      * @param b the context
      * @param array the accessed array
      * @param index the index for the array access
+     * @param boundsCheck the explicit bounds check already emitted, or null if no bounds check was
+     *            emitted yet
      * @param elementKind the element kind of the accessed array
      * @return true if the plugin handles the array access, false otherwise.
      */
-    default boolean handleLoadIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, JavaKind elementKind) {
+    default boolean handleLoadIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind) {
         return false;
     }
 
@@ -119,11 +122,15 @@ public interface NodePlugin extends GraphBuilderPlugin {
      * @param b the context
      * @param array the accessed array
      * @param index the index for the array access
+     * @param boundsCheck the explicit array bounds check already emitted, or null if no array
+     *            bounds check was emitted yet
+     * @param storeCheck the explicit array store check already emitted, or null if no array store
+     *            check was emitted yet
      * @param elementKind the element kind of the accessed array
      * @param value the value to be stored into the array
      * @return true if the plugin handles the array access, false otherwise.
      */
-    default boolean handleStoreIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, JavaKind elementKind, ValueNode value) {
+    default boolean handleStoreIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, GuardingNode boundsCheck, GuardingNode storeCheck, JavaKind elementKind, ValueNode value) {
         return false;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
index 4c6f9182765..eef79caac43 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
@@ -38,11 +38,15 @@ public abstract class AbstractNewArrayNode extends AbstractNewObjectNode impleme
     public static final NodeClass<AbstractNewArrayNode> TYPE = NodeClass.create(AbstractNewArrayNode.class);
     @Input protected ValueNode length;
 
-    @Override
     public ValueNode length() {
         return length;
     }
 
+    @Override
+    public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
+        return length;
+    }
+
     protected AbstractNewArrayNode(NodeClass<? extends AbstractNewArrayNode> c, Stamp stamp, ValueNode length, boolean fillContents, FrameState stateBefore) {
         super(c, stamp, fillContents, stateBefore);
         this.length = length;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java
index 97dfd0fc240..1a6d6ac4eb3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java
@@ -24,8 +24,10 @@ package org.graalvm.compiler.nodes.java;
 
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 
@@ -40,6 +42,7 @@ public abstract class AccessIndexedNode extends AccessArrayNode implements Lower
 
     public static final NodeClass<AccessIndexedNode> TYPE = NodeClass.create(AccessIndexedNode.class);
     @Input protected ValueNode index;
+    @OptionalInput(InputType.Guard) private GuardingNode boundsCheck;
     protected final JavaKind elementKind;
 
     public ValueNode index() {
@@ -52,14 +55,21 @@ public abstract class AccessIndexedNode extends AccessArrayNode implements Lower
      * @param stamp the result kind of the access
      * @param array the instruction producing the array
      * @param index the instruction producing the index
+     * @param boundsCheck the explicit array bounds check already performed before the access, or
+     *            null if no check was performed yet
      * @param elementKind the kind of the elements of the array
      */
-    protected AccessIndexedNode(NodeClass<? extends AccessIndexedNode> c, Stamp stamp, ValueNode array, ValueNode index, JavaKind elementKind) {
+    protected AccessIndexedNode(NodeClass<? extends AccessIndexedNode> c, Stamp stamp, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind) {
         super(c, stamp, array);
         this.index = index;
+        this.boundsCheck = boundsCheck;
         this.elementKind = elementKind;
     }
 
+    public GuardingNode getBoundsCheck() {
+        return boundsCheck;
+    }
+
     /**
      * Gets the element type of the array.
      *
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java
index 16346fee34f..39800be41f0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java
@@ -33,10 +33,9 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
+import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.compiler.nodes.util.GraphUtil;
@@ -90,39 +89,15 @@ public final class ArrayLengthNode extends FixedWithNextNode implements Canonica
         return this;
     }
 
-    /**
-     * Replicate the {@link ValueProxyNode}s from {@code originalValue} onto {@code value}.
-     *
-     * @param originalValue a possibly proxied value
-     * @param value a value needing proxies
-     * @return proxies wrapping {@code value}
-     */
-    private static ValueNode reproxyValue(ValueNode originalValue, ValueNode value) {
-        if (value.isConstant()) {
-            // No proxy needed
-            return value;
-        }
-        if (originalValue instanceof ValueProxyNode) {
-            ValueProxyNode proxy = (ValueProxyNode) originalValue;
-            return new ValueProxyNode(reproxyValue(proxy.getOriginalNode(), value), proxy.proxyPoint());
-        } else if (originalValue instanceof ValueProxy) {
-            ValueProxy proxy = (ValueProxy) originalValue;
-            return reproxyValue(proxy.getOriginalNode(), value);
-        } else {
-            return value;
-        }
-    }
-
     /**
      * Gets the length of an array if possible.
      *
      * @return a node representing the length of {@code array} or null if it is not available
      */
     public static ValueNode readArrayLength(ValueNode originalArray, ConstantReflectionProvider constantReflection) {
-        ValueNode length = GraphUtil.arrayLength(originalArray);
+        ValueNode length = GraphUtil.arrayLength(originalArray, ArrayLengthProvider.FindLengthMode.CANONICALIZE_READ);
         if (length != null) {
-            // Ensure that any proxies on the original value end up on the length value
-            return reproxyValue(originalArray, length);
+            return length;
         }
         return readArrayLengthConstant(originalArray, constantReflection);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
index 8bdb6b771ae..20b497b2f3e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
@@ -27,6 +27,7 @@ import static org.graalvm.compiler.nodeinfo.InputType.Memory;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
 
+import jdk.vm.ci.meta.JavaKind;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -50,13 +51,19 @@ public final class AtomicReadAndAddNode extends AbstractMemoryCheckpoint impleme
     public static final NodeClass<AtomicReadAndAddNode> TYPE = NodeClass.create(AtomicReadAndAddNode.class);
     @Input(Association) AddressNode address;
     @Input ValueNode delta;
+    /**
+     * We explicitly track the kind of this node instead of using {#delta.getStackKind()} to be able
+     * to emit the memory access instruction with the correct number of bits.
+     */
+    private JavaKind valueKind;
 
     protected final LocationIdentity locationIdentity;
 
-    public AtomicReadAndAddNode(AddressNode address, ValueNode delta, LocationIdentity locationIdentity) {
-        super(TYPE, StampFactory.forKind(delta.getStackKind()));
+    public AtomicReadAndAddNode(AddressNode address, ValueNode delta, JavaKind valueKind, LocationIdentity locationIdentity) {
+        super(TYPE, StampFactory.forKind(valueKind));
         this.address = address;
         this.delta = delta;
+        this.valueKind = valueKind;
         this.locationIdentity = locationIdentity;
     }
 
@@ -71,7 +78,7 @@ public final class AtomicReadAndAddNode extends AbstractMemoryCheckpoint impleme
 
     @Override
     public void generate(NodeLIRBuilderTool gen) {
-        Value result = gen.getLIRGeneratorTool().emitAtomicReadAndAdd(gen.operand(address), gen.operand(delta));
+        Value result = gen.getLIRGeneratorTool().emitAtomicReadAndAdd(gen.operand(address), gen.getLIRGeneratorTool().getValueKind(valueKind), gen.operand(delta));
         gen.setResult(this, result);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java
index 1aac395df8a..91e0812c57c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java
@@ -26,6 +26,8 @@ import static org.graalvm.compiler.nodeinfo.InputType.Anchor;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
 
+import java.util.Objects;
+
 import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
@@ -50,8 +52,6 @@ import org.graalvm.compiler.nodes.type.StampTool;
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.TriState;
 
-import java.util.Objects;
-
 /**
  * The {@code InstanceOfNode} represents an instanceof test.
  */
@@ -219,4 +219,25 @@ public class InstanceOfNode extends UnaryOpLogicNode implements Lowerable, Virtu
         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) {
+            InstanceOfNode instanceOfNode = (InstanceOfNode) other;
+            if (instanceOfNode.getValue() == getValue()) {
+                if (thisNegated) {
+                    // !X => Y
+                    if (this.getCheckedStamp().meet(instanceOfNode.getCheckedStamp()).equals(this.getCheckedStamp())) {
+                        return TriState.get(false);
+                    }
+                } else {
+                    // X => Y
+                    if (instanceOfNode.getCheckedStamp().meet(this.getCheckedStamp()).equals(instanceOfNode.getCheckedStamp())) {
+                        return TriState.get(true);
+                    }
+                }
+            }
+        }
+        return super.implies(thisNegated, other);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java
index cb731818fae..ff90bcbf35c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java
@@ -37,6 +37,7 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.compiler.nodes.type.StampTool;
@@ -65,20 +66,21 @@ public class LoadIndexedNode extends AccessIndexedNode implements Virtualizable,
      * @param index the instruction producing the index
      * @param elementKind the element type
      */
-    public LoadIndexedNode(Assumptions assumptions, ValueNode array, ValueNode index, JavaKind elementKind) {
-        this(TYPE, createStamp(assumptions, array, elementKind), array, index, elementKind);
+    public LoadIndexedNode(Assumptions assumptions, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind) {
+        this(TYPE, createStamp(assumptions, array, elementKind), array, index, boundsCheck, elementKind);
     }
 
-    public static ValueNode create(Assumptions assumptions, ValueNode array, ValueNode index, JavaKind elementKind, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
+    public static ValueNode create(Assumptions assumptions, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind, MetaAccessProvider metaAccess,
+                    ConstantReflectionProvider constantReflection) {
         ValueNode constant = tryConstantFold(array, index, metaAccess, constantReflection);
         if (constant != null) {
             return constant;
         }
-        return new LoadIndexedNode(assumptions, array, index, elementKind);
+        return new LoadIndexedNode(assumptions, array, index, boundsCheck, elementKind);
     }
 
-    protected LoadIndexedNode(NodeClass<? extends LoadIndexedNode> c, Stamp stamp, ValueNode array, ValueNode index, JavaKind elementKind) {
-        super(c, stamp, array, index, elementKind);
+    protected LoadIndexedNode(NodeClass<? extends LoadIndexedNode> c, Stamp stamp, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind) {
+        super(c, stamp, array, index, boundsCheck, elementKind);
     }
 
     private static Stamp createStamp(Assumptions assumptions, ValueNode array, JavaKind kind) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java
index d0509948969..c838812189a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java
@@ -66,7 +66,7 @@ public final class LogicCompareAndSwapNode extends AbstractCompareAndSwapNode {
         LIRKind resultKind = tool.getLIRKind(stamp(NodeView.DEFAULT));
         Value trueResult = tool.emitConstant(resultKind, JavaConstant.TRUE);
         Value falseResult = tool.emitConstant(resultKind, JavaConstant.FALSE);
-        Value result = tool.emitLogicCompareAndSwap(gen.operand(getAddress()), gen.operand(getExpectedValue()), gen.operand(getNewValue()), trueResult, falseResult);
+        Value result = tool.emitLogicCompareAndSwap(tool.getLIRKind(getAccessStamp()), gen.operand(getAddress()), gen.operand(getExpectedValue()), gen.operand(getNewValue()), trueResult, falseResult);
 
         gen.setResult(this, result);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
index e184526f244..5dd256ff546 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
@@ -27,6 +27,7 @@ import static org.graalvm.compiler.nodeinfo.InputType.State;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
 
+import jdk.vm.ci.meta.ValueKind;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -53,10 +54,12 @@ public final class LoweredAtomicReadAndWriteNode extends FixedAccessNode impleme
     public static final NodeClass<LoweredAtomicReadAndWriteNode> TYPE = NodeClass.create(LoweredAtomicReadAndWriteNode.class);
     @Input ValueNode newValue;
     @OptionalInput(State) FrameState stateAfter;
+    private final ValueKind<?> valueKind;
 
-    public LoweredAtomicReadAndWriteNode(AddressNode address, LocationIdentity location, ValueNode newValue, BarrierType barrierType) {
+    public LoweredAtomicReadAndWriteNode(AddressNode address, LocationIdentity location, ValueNode newValue, ValueKind<?> valueKind, BarrierType barrierType) {
         super(TYPE, address, location, newValue.stamp(NodeView.DEFAULT).unrestricted(), barrierType);
         this.newValue = newValue;
+        this.valueKind = valueKind;
     }
 
     @Override
@@ -78,7 +81,10 @@ public final class LoweredAtomicReadAndWriteNode extends FixedAccessNode impleme
 
     @Override
     public void generate(NodeLIRBuilderTool gen) {
-        Value result = gen.getLIRGeneratorTool().emitAtomicReadAndWrite(gen.operand(getAddress()), gen.operand(getNewValue()));
+        Value emitted = gen.operand(getNewValue());
+        // In case this node works with compressed objects, the newValue's kind must be used.
+        ValueKind<? extends ValueKind<?>> actualKind = newValue.stamp(NodeView.DEFAULT).getStackKind().isObject() ? emitted.getValueKind() : this.valueKind;
+        Value result = gen.getLIRGeneratorTool().emitAtomicReadAndWrite(gen.operand(getAddress()), actualKind, emitted);
         gen.setResult(this, result);
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java
index 04167c12227..79d0c2f3658 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java
@@ -29,6 +29,7 @@ import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.spi.Simplifiable;
 import org.graalvm.compiler.graph.spi.SimplifierTool;
@@ -118,6 +119,7 @@ public class NewArrayNode extends AbstractNewArrayNode implements VirtualizableA
     }
 
     @Override
+    @SuppressWarnings("try")
     public void simplify(SimplifierTool tool) {
         if (hasNoUsages()) {
             NodeView view = NodeView.from(tool);
@@ -132,10 +134,12 @@ public class NewArrayNode extends AbstractNewArrayNode implements VirtualizableA
             // Should be areFrameStatesAtSideEffects but currently SVM will complain about
             // RuntimeConstraint
             if (graph().getGuardsStage().allowsFloatingGuards()) {
-                LogicNode lengthNegativeCondition = CompareNode.createCompareNode(graph(), CanonicalCondition.LT, length(), ConstantNode.forInt(0, graph()), tool.getConstantReflection(), view);
-                // we do not have a non-deopting path for that at the moment so action=None.
-                FixedGuardNode guard = graph().add(new FixedGuardNode(lengthNegativeCondition, DeoptimizationReason.RuntimeConstraint, DeoptimizationAction.None, true));
-                graph().replaceFixedWithFixed(this, guard);
+                try (DebugCloseable context = this.withNodeSourcePosition()) {
+                    LogicNode lengthNegativeCondition = CompareNode.createCompareNode(graph(), CanonicalCondition.LT, length(), ConstantNode.forInt(0, graph()), tool.getConstantReflection(), view);
+                    // we do not have a non-deopting path for that at the moment so action=None.
+                    FixedGuardNode guard = graph().add(new FixedGuardNode(lengthNegativeCondition, DeoptimizationReason.RuntimeConstraint, DeoptimizationAction.None, true));
+                    graph().replaceFixedWithFixed(this, guard);
+                }
             }
         }
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java
index 131f3806a12..e3835cc2599 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java
@@ -87,7 +87,7 @@ public class NewMultiArrayNode extends DeoptimizingFixedWithNextNode implements
     }
 
     @Override
-    public ValueNode length() {
+    public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
         return dimension(0);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java
index b5e55e7bf47..72642ca674c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java
@@ -28,10 +28,12 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
 
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
@@ -49,9 +51,15 @@ import jdk.vm.ci.meta.ResolvedJavaType;
 public final class StoreIndexedNode extends AccessIndexedNode implements StateSplit, Lowerable, Virtualizable {
 
     public static final NodeClass<StoreIndexedNode> TYPE = NodeClass.create(StoreIndexedNode.class);
+
+    @OptionalInput(InputType.Guard) private GuardingNode storeCheck;
     @Input ValueNode value;
     @OptionalInput(State) FrameState stateAfter;
 
+    public GuardingNode getStoreCheck() {
+        return storeCheck;
+    }
+
     @Override
     public FrameState stateAfter() {
         return stateAfter;
@@ -73,8 +81,9 @@ public final class StoreIndexedNode extends AccessIndexedNode implements StateSp
         return value;
     }
 
-    public StoreIndexedNode(ValueNode array, ValueNode index, JavaKind elementKind, ValueNode value) {
-        super(TYPE, StampFactory.forVoid(), array, index, elementKind);
+    public StoreIndexedNode(ValueNode array, ValueNode index, GuardingNode boundsCheck, GuardingNode storeCheck, JavaKind elementKind, ValueNode value) {
+        super(TYPE, StampFactory.forVoid(), array, index, boundsCheck, elementKind);
+        this.storeCheck = storeCheck;
         this.value = value;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndExchangeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
new file mode 100644
index 00000000000..8c89df21beb
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2011, 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.nodes.java;
+
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import org.graalvm.compiler.nodes.memory.MemoryCheckpoint;
+import org.graalvm.compiler.nodes.spi.Lowerable;
+import org.graalvm.compiler.nodes.spi.LoweringTool;
+import jdk.internal.vm.compiler.word.LocationIdentity;
+
+import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+import static org.graalvm.compiler.nodeinfo.InputType.Value;
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+
+/**
+ * Represents an atomic compare-and-swap operation. The result is the current value of the memory
+ * location that was compared.
+ */
+@NodeInfo(allowedUsageTypes = {Value, Memory}, cycles = CYCLES_8, size = SIZE_8)
+public final class UnsafeCompareAndExchangeNode extends AbstractMemoryCheckpoint implements Lowerable, MemoryCheckpoint.Single {
+
+    public static final NodeClass<UnsafeCompareAndExchangeNode> TYPE = NodeClass.create(UnsafeCompareAndExchangeNode.class);
+    @Input ValueNode object;
+    @Input ValueNode offset;
+    @Input ValueNode expected;
+    @Input ValueNode newValue;
+
+    private final JavaKind valueKind;
+    private final LocationIdentity locationIdentity;
+
+    public UnsafeCompareAndExchangeNode(ValueNode object, ValueNode offset, ValueNode expected, ValueNode newValue, JavaKind valueKind, LocationIdentity locationIdentity) {
+        super(TYPE, meetInputs(expected.stamp(NodeView.DEFAULT), newValue.stamp(NodeView.DEFAULT)));
+        this.object = object;
+        this.offset = offset;
+        this.expected = expected;
+        this.newValue = newValue;
+        this.valueKind = valueKind;
+        this.locationIdentity = locationIdentity;
+    }
+
+    private static Stamp meetInputs(Stamp expected, Stamp newValue) {
+        assert expected.isCompatible(newValue);
+        return expected.unrestricted().meet(newValue.unrestricted());
+    }
+
+    public ValueNode object() {
+        return object;
+    }
+
+    public ValueNode offset() {
+        return offset;
+    }
+
+    public ValueNode expected() {
+        return expected;
+    }
+
+    public ValueNode newValue() {
+        return newValue;
+    }
+
+    public JavaKind getValueKind() {
+        return valueKind;
+    }
+
+    @Override
+    public LocationIdentity getLocationIdentity() {
+        return locationIdentity;
+    }
+
+    @Override
+    public void lower(LoweringTool tool) {
+        tool.getLowerer().lower(this, tool);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java
index 345c23897bf..4cc55d433f3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java
@@ -41,8 +41,8 @@ import jdk.internal.vm.compiler.word.LocationIdentity;
 import jdk.vm.ci.meta.JavaKind;
 
 /**
- * Represents an atomic compare-and-swap operation The result is a boolean that contains whether the
- * value matched the expected value.
+ * Represents an atomic compare-and-swap operation. The result is a boolean that contains whether
+ * the value matched the expected value.
  */
 @NodeInfo(allowedUsageTypes = {Value, Memory}, cycles = CYCLES_8, size = SIZE_8)
 public final class UnsafeCompareAndSwapNode extends AbstractMemoryCheckpoint implements Lowerable, MemoryCheckpoint.Single {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java
index d232b716c2d..20e46faad3d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java
@@ -55,6 +55,6 @@ public final class ValueCompareAndSwapNode extends AbstractCompareAndSwapNode {
         assert getNewValue().stamp(NodeView.DEFAULT).isCompatible(getExpectedValue().stamp(NodeView.DEFAULT));
         LIRGeneratorTool tool = gen.getLIRGeneratorTool();
         assert !this.canDeoptimize();
-        gen.setResult(this, tool.emitValueCompareAndSwap(gen.operand(getAddress()), gen.operand(getExpectedValue()), gen.operand(getNewValue())));
+        gen.setResult(this, tool.emitValueCompareAndSwap(tool.getLIRKind(getAccessStamp()), gen.operand(getAddress()), gen.operand(getExpectedValue()), gen.operand(getNewValue())));
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java
index 701e43c3935..497e171446b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java
@@ -44,6 +44,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
@@ -122,7 +123,7 @@ public class ReadNode extends FloatableAccessNode implements LIRLowerableAccess,
                 }
             }
             if (locationIdentity.equals(ARRAY_LENGTH_LOCATION)) {
-                ValueNode length = GraphUtil.arrayLength(object);
+                ValueNode length = GraphUtil.arrayLength(object, ArrayLengthProvider.FindLengthMode.CANONICALIZE_READ);
                 if (length != null) {
                     return length;
                 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java
index d472e207386..e2384563251 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java
@@ -23,11 +23,45 @@
 package org.graalvm.compiler.nodes.spi;
 
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.ValuePhiNode;
+import org.graalvm.compiler.nodes.ValueProxyNode;
+import org.graalvm.compiler.nodes.util.GraphUtil;
 
 public interface ArrayLengthProvider {
 
     /**
-     * @return the length of the array described by this node, or null if it is not available
+     * The different modes that determine what the results of {@link GraphUtil#arrayLength} and
+     * {@link ArrayLengthProvider#findLength} can be used for.
      */
-    ValueNode length();
+    enum FindLengthMode {
+        /**
+         * Use the result of {@link GraphUtil#arrayLength} and
+         * {@link ArrayLengthProvider#findLength} to replace the explicit load of the array length
+         * with a node that does not involve a memory access of the array length.
+         *
+         * Values that are defined inside a loop and flow out the loop need to be proxied by
+         * {@link ValueProxyNode}. When this mode is used, new necessary proxy nodes are created
+         * base on the proxies that were found while traversing the path to the length node. In
+         * addition, new {@link ValuePhiNode phi nodes} can be created. The caller is responsible
+         * for adding these nodes to the graph, i.e., the return value can be a node that is not yet
+         * added to the graph.
+         */
+        CANONICALIZE_READ,
+
+        /**
+         * Use the result of {@link GraphUtil#arrayLength} and
+         * {@link ArrayLengthProvider#findLength} only for decisions whether a certain optimization
+         * is possible. No new nodes are created during the search, i.e., the result is either a
+         * node that is already in the graph, or null.
+         */
+        SEARCH_ONLY
+    }
+
+    /**
+     * Returns the length of the array described by this node, or null if it is not available.
+     * Details of the different modes are documented in {@link FindLengthMode}.
+     *
+     * This method should not be called directly. Use {@link GraphUtil#arrayLength} instead.
+     */
+    ValueNode findLength(FindLengthMode mode);
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java
index 7305a38bd04..e302e7c2671 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java
@@ -23,6 +23,7 @@
 package org.graalvm.compiler.nodes.spi;
 
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.LogicNode;
@@ -51,7 +52,8 @@ public interface LoweringTool {
 
     GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action);
 
-    GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation, boolean negated);
+    GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation, boolean negated,
+                    NodeSourcePosition noDeoptSuccessorPosition);
 
     /**
      * Gets the closest fixed node preceding the node currently being lowered.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
index 65dace3dc80..336764eefbe 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.BiFunction;
 
 import jdk.internal.vm.compiler.collections.EconomicMap;
@@ -66,10 +67,13 @@ import org.graalvm.compiler.nodes.ProxyNode;
 import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.ValuePhiNode;
+import org.graalvm.compiler.nodes.ValueProxyNode;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.compiler.nodes.java.MonitorIdNode;
 import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
+import org.graalvm.compiler.nodes.spi.ArrayLengthProvider.FindLengthMode;
 import org.graalvm.compiler.nodes.spi.LimitedValueProxy;
 import org.graalvm.compiler.nodes.spi.LoweringProvider;
 import org.graalvm.compiler.nodes.spi.ValueProxy;
@@ -664,28 +668,71 @@ public class GraphUtil {
     }
 
     /**
-     * Looks for an {@link ArrayLengthProvider} while iterating through all {@link ValueProxy
-     * ValueProxies}.
+     * Returns the length of the array described by the value parameter, or null if it is not
+     * available. Details of the different modes are documented in {@link FindLengthMode}.
      *
      * @param value The start value.
+     * @param mode The mode as documented in {@link FindLengthMode}.
      * @return The array length if one was found, or null otherwise.
      */
-    public static ValueNode arrayLength(ValueNode value) {
+    public static ValueNode arrayLength(ValueNode value, ArrayLengthProvider.FindLengthMode mode) {
+        Objects.requireNonNull(mode);
+
         ValueNode current = value;
         do {
+            /*
+             * PiArrayNode implements ArrayLengthProvider and ValueProxy. We want to treat it as an
+             * ArrayLengthProvider, therefore we check this case first.
+             */
             if (current instanceof ArrayLengthProvider) {
-                ValueNode length = ((ArrayLengthProvider) current).length();
-                if (length != null) {
-                    return length;
+                return ((ArrayLengthProvider) current).findLength(mode);
+
+            } else if (current instanceof ValuePhiNode) {
+                return phiArrayLength((ValuePhiNode) current, mode);
+
+            } else if (current instanceof ValueProxyNode) {
+                ValueProxyNode proxy = (ValueProxyNode) current;
+                ValueNode length = arrayLength(proxy.getOriginalNode(), mode);
+                if (mode == ArrayLengthProvider.FindLengthMode.CANONICALIZE_READ && length != null && !length.isConstant()) {
+                    length = new ValueProxyNode(length, proxy.proxyPoint());
                 }
-            }
-            if (current instanceof ValueProxy) {
+                return length;
+
+            } else if (current instanceof ValueProxy) {
+                /* Written as a loop instead of a recursive call to reduce recursion depth. */
                 current = ((ValueProxy) current).getOriginalNode();
+
             } else {
-                break;
+                return null;
             }
         } while (true);
-        return null;
+    }
+
+    private static ValueNode phiArrayLength(ValuePhiNode phi, ArrayLengthProvider.FindLengthMode mode) {
+        if (phi.merge() instanceof LoopBeginNode) {
+            /* Avoid cycle detection by not processing phi functions that could introduce cycles. */
+            return null;
+        }
+
+        ValueNode singleLength = null;
+        for (int i = 0; i < phi.values().count(); i++) {
+            ValueNode input = phi.values().get(i);
+            ValueNode length = arrayLength(input, mode);
+            if (length == null) {
+                return null;
+            }
+            assert length.stamp(NodeView.DEFAULT).getStackKind() == JavaKind.Int;
+
+            if (i == 0) {
+                assert singleLength == null;
+                singleLength = length;
+            } else if (singleLength == length) {
+                /* Nothing to do, still having a single length. */
+            } else {
+                return null;
+            }
+        }
+        return singleLength;
     }
 
     /**
@@ -1006,7 +1053,7 @@ public class GraphUtil {
         } else {
             /* The source array is not virtualized, emit index loads. */
             for (int i = 0; i < readLength; i++) {
-                LoadIndexedNode load = new LoadIndexedNode(null, sourceAlias, ConstantNode.forInt(i + fromInt, graph), elementKind);
+                LoadIndexedNode load = new LoadIndexedNode(null, sourceAlias, ConstantNode.forInt(i + fromInt, graph), null, elementKind);
                 tool.addNode(load);
                 newEntryState[i] = load;
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
index fd2220f0005..cd5a55d3837 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
@@ -35,6 +35,7 @@ import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+import org.graalvm.compiler.nodes.util.GraphUtil;
 
 /**
  * Selects one object from a {@link CommitAllocationNode}. The object is identified by its
@@ -71,10 +72,7 @@ public final class AllocatedObjectNode extends FloatingNode implements Virtualiz
     }
 
     @Override
-    public ValueNode length() {
-        if (virtualObject instanceof ArrayLengthProvider) {
-            return ((ArrayLengthProvider) virtualObject).length();
-        }
-        return null;
+    public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
+        return GraphUtil.arrayLength(virtualObject, mode);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java
index d71bd537ff3..096fa5827aa 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java
@@ -123,16 +123,20 @@ public class VirtualArrayNode extends VirtualObjectNode implements ArrayLengthPr
 
     @Override
     public VirtualArrayNode duplicate() {
-        return new VirtualArrayNode(componentType, length);
+        VirtualArrayNode node = new VirtualArrayNode(componentType, length);
+        node.setNodeSourcePosition(this.getNodeSourcePosition());
+        return node;
     }
 
     @Override
     public ValueNode getMaterializedRepresentation(FixedNode fixed, ValueNode[] entries, LockState locks) {
-        return new AllocatedObjectNode(this);
+        AllocatedObjectNode node = new AllocatedObjectNode(this);
+        node.setNodeSourcePosition(this.getNodeSourcePosition());
+        return node;
     }
 
     @Override
-    public ValueNode length() {
+    public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
         return ConstantNode.forInt(length);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java
index a3090689bc1..10c2113d812 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java
@@ -53,14 +53,19 @@ public class VirtualBoxingNode extends VirtualInstanceNode {
 
     @Override
     public VirtualBoxingNode duplicate() {
-        return new VirtualBoxingNode(type(), boxingKind);
+        VirtualBoxingNode node = new VirtualBoxingNode(type(), boxingKind);
+        node.setNodeSourcePosition(this.getNodeSourcePosition());
+        return node;
     }
 
     @Override
     public ValueNode getMaterializedRepresentation(FixedNode fixed, ValueNode[] entries, LockState locks) {
         assert entries.length == 1;
         assert locks == null;
-        return new BoxNode(entries[0], type(), boxingKind);
+
+        BoxNode node = new BoxNode(entries[0], type(), boxingKind);
+        node.setNodeSourcePosition(this.getNodeSourcePosition());
+        return node;
     }
 
     public ValueNode getBoxedValue(VirtualizerTool tool) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java
index b7685463120..f034a0e6800 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java
@@ -113,11 +113,15 @@ public class VirtualInstanceNode extends VirtualObjectNode {
 
     @Override
     public VirtualInstanceNode duplicate() {
-        return new VirtualInstanceNode(type, fields, super.hasIdentity());
+        VirtualInstanceNode node = new VirtualInstanceNode(type, fields, super.hasIdentity());
+        node.setNodeSourcePosition(this.getNodeSourcePosition());
+        return node;
     }
 
     @Override
     public ValueNode getMaterializedRepresentation(FixedNode fixed, ValueNode[] entries, LockState locks) {
-        return new AllocatedObjectNode(this);
+        AllocatedObjectNode node = new AllocatedObjectNode(this);
+        node.setNodeSourcePosition(this.getNodeSourcePosition());
+        return node;
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java
index b3b5c274c87..6b40306d576 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 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
@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,11 +34,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
@@ -50,21 +49,16 @@ import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic.Kind;
 import javax.tools.FileObject;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
 /**
- * Processes static fields annotated with {@link Option}. An {@link OptionDescriptors}
+ * Processes static fields annotated with {@code Option}. An {@code OptionDescriptors}
  * implementation is generated for each top level class containing at least one such field. The name
  * of the generated class for top level class {@code com.foo.Bar} is
  * {@code com.foo.Bar_OptionDescriptors}.
@@ -72,6 +66,12 @@ import org.graalvm.compiler.options.OptionType;
 @SupportedAnnotationTypes({"org.graalvm.compiler.options.Option"})
 public class OptionProcessor extends AbstractProcessor {
 
+    private static final String OPTION_CLASS_NAME = "org.graalvm.compiler.options.Option";
+    private static final String OPTION_KEY_CLASS_NAME = "org.graalvm.compiler.options.OptionKey";
+    private static final String OPTION_TYPE_CLASS_NAME = "org.graalvm.compiler.options.OptionType";
+    private static final String OPTION_DESCRIPTOR_CLASS_NAME = "org.graalvm.compiler.options.OptionDescriptor";
+    private static final String OPTION_DESCRIPTORS_CLASS_NAME = "org.graalvm.compiler.options.OptionDescriptors";
+
     @Override
     public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.latest();
@@ -79,6 +79,9 @@ public class OptionProcessor extends AbstractProcessor {
 
     private final Set<Element> processed = new HashSet<>();
 
+    private TypeMirror optionTypeMirror;
+    private TypeMirror optionKeyTypeMirror;
+
     private void processElement(Element element, OptionsInfo info) {
 
         if (!element.getModifiers().contains(Modifier.STATIC)) {
@@ -90,26 +93,24 @@ public class OptionProcessor extends AbstractProcessor {
             return;
         }
 
-        Option annotation = element.getAnnotation(Option.class);
+        AnnotationMirror annotation = getAnnotation(element, optionTypeMirror);
         assert annotation != null;
         assert element instanceof VariableElement;
         assert element.getKind() == ElementKind.FIELD;
         VariableElement field = (VariableElement) element;
         String fieldName = field.getSimpleName().toString();
 
-        Elements elements = processingEnv.getElementUtils();
         Types types = processingEnv.getTypeUtils();
 
         TypeMirror fieldType = field.asType();
         if (fieldType.getKind() != TypeKind.DECLARED) {
-            processingEnv.getMessager().printMessage(Kind.ERROR, "Option field must be of type " + OptionKey.class.getName(), element);
+            processingEnv.getMessager().printMessage(Kind.ERROR, "Option field must be of type " + OPTION_KEY_CLASS_NAME, element);
             return;
         }
         DeclaredType declaredFieldType = (DeclaredType) fieldType;
 
-        TypeMirror optionKeyType = elements.getTypeElement(OptionKey.class.getName()).asType();
-        if (!types.isSubtype(fieldType, types.erasure(optionKeyType))) {
-            String msg = String.format("Option field type %s is not a subclass of %s", fieldType, optionKeyType);
+        if (!types.isSubtype(fieldType, types.erasure(optionKeyTypeMirror))) {
+            String msg = String.format("Option field type %s is not a subclass of %s", fieldType, optionKeyTypeMirror);
             processingEnv.getMessager().printMessage(Kind.ERROR, msg, element);
             return;
         }
@@ -123,7 +124,7 @@ public class OptionProcessor extends AbstractProcessor {
             return;
         }
 
-        String optionName = annotation.name();
+        String optionName = getAnnotationValue(annotation, "name", String.class);
         if (optionName.equals("")) {
             optionName = fieldName;
         }
@@ -134,7 +135,7 @@ public class OptionProcessor extends AbstractProcessor {
         }
 
         DeclaredType declaredOptionKeyType = declaredFieldType;
-        while (!types.isSameType(types.erasure(declaredOptionKeyType), types.erasure(optionKeyType))) {
+        while (!types.isSameType(types.erasure(declaredOptionKeyType), types.erasure(optionKeyTypeMirror))) {
             List<? extends TypeMirror> directSupertypes = types.directSupertypes(declaredFieldType);
             assert !directSupertypes.isEmpty();
             declaredOptionKeyType = (DeclaredType) directSupertypes.get(0);
@@ -171,12 +172,12 @@ public class OptionProcessor extends AbstractProcessor {
             processingEnv.getMessager().printMessage(Kind.ERROR, "Option field cannot be declared in the unnamed package", element);
             return;
         }
-        String[] helpValue = annotation.help();
+        List<String> helpValue = getAnnotationValueList(annotation, "help", String.class);
         String help = "";
-        String[] extraHelp = {};
+        List<String> extraHelp = new ArrayList<>();
 
-        if (helpValue.length == 1) {
-            help = helpValue[0];
+        if (helpValue.size() == 1) {
+            help = helpValue.get(0);
             if (help.startsWith("file:")) {
                 String path = help.substring("file:".length());
                 Filer filer = processingEnv.getFiler();
@@ -194,12 +195,10 @@ public class OptionProcessor extends AbstractProcessor {
                             help = "";
                         }
                         String line = br.readLine();
-                        List<String> lines = new ArrayList<>();
                         while (line != null) {
-                            lines.add(line);
+                            extraHelp.add(line);
                             line = br.readLine();
                         }
-                        extraHelp = lines.toArray(new String[lines.size()]);
                     }
                 } catch (IOException e) {
                     String msg = String.format("Error reading %s containing the help text for option field: %s", path, e);
@@ -207,9 +206,9 @@ public class OptionProcessor extends AbstractProcessor {
                     return;
                 }
             }
-        } else if (helpValue.length > 1) {
-            help = helpValue[0];
-            extraHelp = Arrays.copyOfRange(helpValue, 1, helpValue.length);
+        } else if (helpValue.size() > 1) {
+            help = helpValue.get(0);
+            extraHelp = helpValue.subList(1, helpValue.size());
         }
         if (help.length() != 0) {
             char firstChar = help.charAt(0);
@@ -219,7 +218,8 @@ public class OptionProcessor extends AbstractProcessor {
             }
         }
 
-        info.options.add(new OptionInfo(optionName, annotation.type(), help, extraHelp, optionType, declaringClass, field));
+        String optionTypeName = getAnnotationValue(annotation, "type", VariableElement.class).getSimpleName().toString();
+        info.options.add(new OptionInfo(optionName, optionTypeName, help, extraHelp, optionType, declaringClass, field));
     }
 
     private void createFiles(OptionsInfo info) {
@@ -231,7 +231,7 @@ public class OptionProcessor extends AbstractProcessor {
     }
 
     private void createOptionsDescriptorsFile(OptionsInfo info, String pkg, Name topDeclaringClass, Element[] originatingElements) {
-        String optionsClassName = topDeclaringClass + "_" + OptionDescriptors.class.getSimpleName();
+        String optionsClassName = topDeclaringClass + "_" + getSimpleName(OPTION_DESCRIPTORS_CLASS_NAME);
 
         Filer filer = processingEnv.getFiler();
         try (PrintWriter out = createSourceFile(pkg, optionsClassName, filer, originatingElements)) {
@@ -243,12 +243,12 @@ public class OptionProcessor extends AbstractProcessor {
             out.println("package " + pkg + ";");
             out.println("");
             out.println("import java.util.*;");
-            out.println("import " + OptionDescriptors.class.getPackage().getName() + ".*;");
-            out.println("import " + OptionType.class.getName() + ";");
+            out.println("import " + getPackageName(OPTION_DESCRIPTORS_CLASS_NAME) + ".*;");
+            out.println("import " + OPTION_TYPE_CLASS_NAME + ";");
             out.println("");
-            out.println("public class " + optionsClassName + " implements " + OptionDescriptors.class.getSimpleName() + " {");
+            out.println("public class " + optionsClassName + " implements " + getSimpleName(OPTION_DESCRIPTORS_CLASS_NAME) + " {");
 
-            String desc = OptionDescriptor.class.getSimpleName();
+            String desc = getSimpleName(OPTION_DESCRIPTOR_CLASS_NAME);
 
             Collections.sort(info.options);
 
@@ -265,18 +265,18 @@ public class OptionProcessor extends AbstractProcessor {
                     optionField = option.declaringClass + "." + option.field.getSimpleName();
                 }
                 out.println("        case \"" + name + "\": {");
-                OptionType optionType = option.optionType;
+                String optionType = option.optionType;
                 String type = option.type;
                 String help = option.help;
-                String[] extraHelp = option.extraHelp;
+                List<String> extraHelp = option.extraHelp;
                 String declaringClass = option.declaringClass;
                 Name fieldName = option.field.getSimpleName();
                 out.printf("            return " + desc + ".create(\n");
                 out.printf("                /*name*/ \"%s\",\n", name);
-                out.printf("                /*optionType*/ %s.%s,\n", optionType.getDeclaringClass().getSimpleName(), optionType.name());
+                out.printf("                /*optionType*/ %s.%s,\n", getSimpleName(OPTION_TYPE_CLASS_NAME), optionType);
                 out.printf("                /*optionValueType*/ %s.class,\n", type);
                 out.printf("                /*help*/ \"%s\",\n", help);
-                if (extraHelp.length != 0) {
+                if (extraHelp.size() != 0) {
                     out.printf("                /*extraHelp*/ new String[] {\n");
                     for (String line : extraHelp) {
                         out.printf("                         \"%s\",\n", line.replace("\\", "\\\\").replace("\"", "\\\""));
@@ -336,14 +336,14 @@ public class OptionProcessor extends AbstractProcessor {
     static class OptionInfo implements Comparable<OptionInfo> {
 
         final String name;
-        final OptionType optionType;
+        final String optionType;
         final String help;
-        final String[] extraHelp;
+        final List<String> extraHelp;
         final String type;
         final String declaringClass;
         final VariableElement field;
 
-        OptionInfo(String name, OptionType optionType, String help, String[] extraHelp, String type, String declaringClass, VariableElement field) {
+        OptionInfo(String name, String optionType, String help, List<String> extraHelp, String type, String declaringClass, VariableElement field) {
             this.name = name;
             this.optionType = optionType;
             this.help = help;
@@ -390,8 +390,13 @@ public class OptionProcessor extends AbstractProcessor {
             return true;
         }
 
+        TypeElement optionTypeElement = getTypeElement(OPTION_CLASS_NAME);
+
+        optionTypeMirror = optionTypeElement.asType();
+        optionKeyTypeMirror = getTypeElement(OPTION_KEY_CLASS_NAME).asType();
+
         Map<Element, OptionsInfo> map = new HashMap<>();
-        for (Element element : roundEnv.getElementsAnnotatedWith(Option.class)) {
+        for (Element element : roundEnv.getElementsAnnotatedWith(optionTypeElement)) {
             if (!processed.contains(element)) {
                 processed.add(element);
                 Element topDeclaringType = topDeclaringType(element);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
index 8e5920fd3a2..b0dd4ce8e79 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
@@ -314,7 +314,7 @@ public class CanonicalizerPhase extends BasePhase<PhaseContext> {
 
         @SuppressWarnings("try")
         public boolean tryCanonicalize(final Node node, NodeClass<?> nodeClass) {
-            try (DebugCloseable position = node.withNodeSourcePosition(); DebugContext.Scope scope = debug.scope("tryCanonicalize", node)) {
+            try (DebugCloseable position = node.withNodeSourcePosition(); DebugContext.Scope scope = debug.withContext(node)) {
                 if (customCanonicalizer != null) {
                     Node canonical = customCanonicalizer.canonicalize(node);
                     if (performReplacement(node, canonical)) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
index 20ade649751..b93756d21b5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
@@ -172,7 +172,8 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
                 AbstractMergeNode mergeNode = (AbstractMergeNode) beginNode;
                 for (GuardNode guard : mergeNode.guards().snapshot()) {
                     try (DebugCloseable closeable = guard.withNodeSourcePosition()) {
-                        GuardNode newlyCreatedGuard = new GuardNode(guard.getCondition(), anchorBlock.getBeginNode(), guard.getReason(), guard.getAction(), guard.isNegated(), guard.getSpeculation());
+                        GuardNode newlyCreatedGuard = new GuardNode(guard.getCondition(), anchorBlock.getBeginNode(), guard.getReason(), guard.getAction(), guard.isNegated(), guard.getSpeculation(),
+                                        guard.getNoDeoptSuccessorPosition());
                         GuardNode newGuard = mergeNode.graph().unique(newlyCreatedGuard);
                         guard.replaceAndDelete(newGuard);
                     }
@@ -205,7 +206,8 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
                                 continue;
                             }
                             try (DebugCloseable closeable = guard.withNodeSourcePosition()) {
-                                GuardNode newlyCreatedGuard = new GuardNode(guard.getCondition(), anchorBlock.getBeginNode(), guard.getReason(), guard.getAction(), guard.isNegated(), speculation);
+                                GuardNode newlyCreatedGuard = new GuardNode(guard.getCondition(), anchorBlock.getBeginNode(), guard.getReason(), guard.getAction(), guard.isNegated(), speculation,
+                                                guard.getNoDeoptSuccessorPosition());
                                 GuardNode newGuard = node.graph().unique(newlyCreatedGuard);
                                 if (otherGuard.isAlive()) {
                                     otherGuard.replaceAndDelete(newGuard);
@@ -245,7 +247,41 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
         }
     }
 
-    public static class Instance implements ControlFlowGraph.RecursiveVisitor<Integer> {
+    public static final class Marks {
+        final int infoElementOperations;
+        final int conditions;
+
+        public Marks(int infoElementOperations, int conditions) {
+            this.infoElementOperations = infoElementOperations;
+            this.conditions = conditions;
+        }
+    }
+
+    protected static final class GuardedCondition {
+        private final GuardingNode guard;
+        private final LogicNode condition;
+        private final boolean negated;
+
+        public GuardedCondition(GuardingNode guard, LogicNode condition, boolean negated) {
+            this.guard = guard;
+            this.condition = condition;
+            this.negated = negated;
+        }
+
+        public GuardingNode getGuard() {
+            return guard;
+        }
+
+        public LogicNode getCondition() {
+            return condition;
+        }
+
+        public boolean isNegated() {
+            return negated;
+        }
+    }
+
+    public static class Instance implements ControlFlowGraph.RecursiveVisitor<Marks> {
         protected final NodeMap<InfoElement> map;
         protected final BlockMap<List<Node>> blockToNodes;
         protected final NodeMap<Block> nodeToBlock;
@@ -255,6 +291,8 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
         protected final DebugContext debug;
         protected final EconomicMap<MergeNode, EconomicMap<ValuePhiNode, PhiInfoElement>> mergeMaps;
 
+        protected final ArrayDeque<GuardedCondition> conditions;
+
         /**
          * Tests which may be eliminated because post dominating tests to prove a broader condition.
          */
@@ -267,7 +305,8 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
             this.nodeToBlock = nodeToBlock;
             this.undoOperations = new NodeStack();
             this.map = graph.createNodeMap();
-            pendingTests = new ArrayDeque<>();
+            this.pendingTests = new ArrayDeque<>();
+            this.conditions = new ArrayDeque<>();
             tool = GraphUtil.getDefaultSimplifier(context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), false, graph.getAssumptions(), graph.getOptions(),
                             context.getLowerer());
             mergeMaps = EconomicMap.create();
@@ -337,13 +376,14 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
         }
 
         @Override
-        public Integer enter(Block block) {
-            int mark = undoOperations.size();
+        public Marks enter(Block block) {
+            int infoElementsMark = undoOperations.size();
+            int conditionsMark = conditions.size();
             debug.log("[Pre Processing block %s]", block);
             // For now conservatively collect guards only within the same block.
             pendingTests.clear();
             processNodes(block);
-            return mark;
+            return new Marks(infoElementsMark, conditionsMark);
         }
 
         protected void processNodes(Block block) {
@@ -531,8 +571,10 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
                 UnaryOpLogicNode unaryLogicNode = (UnaryOpLogicNode) condition;
                 ValueNode value = unaryLogicNode.getValue();
                 if (maybeMultipleUsages(value)) {
+                    // getSucceedingStampForValue doesn't take the (potentially a Pi Node) input
+                    // stamp into account, so it can be safely propagated.
                     Stamp newStamp = unaryLogicNode.getSucceedingStampForValue(negated);
-                    registerNewStamp(value, newStamp, guard);
+                    registerNewStamp(value, newStamp, guard, true);
                 }
             } else if (condition instanceof BinaryOpLogicNode) {
                 BinaryOpLogicNode binaryOpLogicNode = (BinaryOpLogicNode) condition;
@@ -753,17 +795,21 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
         }
 
         protected void registerCondition(LogicNode condition, boolean negated, GuardingNode guard) {
-            if (condition.getUsageCount() > 1) {
+            if (condition.hasMoreThanOneUsage()) {
                 registerNewStamp(condition, negated ? StampFactory.contradiction() : StampFactory.tautology(), guard);
             }
+            conditions.push(new GuardedCondition(guard, condition, negated));
         }
 
         protected InfoElement getInfoElements(ValueNode proxiedValue) {
-            ValueNode value = GraphUtil.skipPi(proxiedValue);
-            if (value == null) {
+            if (proxiedValue == null) {
                 return null;
             }
-            return map.getAndGrow(value);
+            InfoElement infoElement = map.getAndGrow(proxiedValue);
+            if (infoElement == null) {
+                infoElement = map.getAndGrow(GraphUtil.skipPi(proxiedValue));
+            }
+            return infoElement;
         }
 
         protected boolean rewireGuards(GuardingNode guard, boolean result, ValueNode proxifiedInput, Stamp guardedValueStamp, GuardRewirer rewireGuardFunction) {
@@ -801,6 +847,13 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
                 infoElement = nextElement(infoElement);
             }
 
+            for (GuardedCondition guardedCondition : this.conditions) {
+                TriState result = guardedCondition.getCondition().implies(guardedCondition.isNegated(), node);
+                if (result.isKnown()) {
+                    return rewireGuards(guardedCondition.guard, result.toBoolean(), null, null, rewireGuardFunction);
+                }
+            }
+
             if (node instanceof UnaryOpLogicNode) {
                 UnaryOpLogicNode unaryLogicNode = (UnaryOpLogicNode) node;
                 ValueNode value = unaryLogicNode.getValue();
@@ -943,30 +996,40 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
         }
 
         protected void registerNewStamp(ValueNode maybeProxiedValue, Stamp newStamp, GuardingNode guard) {
+            registerNewStamp(maybeProxiedValue, newStamp, guard, false);
+        }
+
+        protected void registerNewStamp(ValueNode maybeProxiedValue, Stamp newStamp, GuardingNode guard, boolean propagateThroughPis) {
             assert maybeProxiedValue != null;
             assert guard != null;
-            if (newStamp != null) {
-                ValueNode value = maybeProxiedValue;
-                Stamp stamp = newStamp;
+
+            if (newStamp == null || newStamp.isUnrestricted()) {
+                return;
+            }
+
+            ValueNode value = maybeProxiedValue;
+            Stamp stamp = newStamp;
+
+            while (stamp != null && value != null) {
                 ValueNode proxiedValue = null;
                 if (value instanceof PiNode) {
                     proxiedValue = value;
                 }
-                do {
-                    counterStampsRegistered.increment(debug);
-                    debug.log("\t Saving stamp for node %s stamp %s guarded by %s", value, stamp, guard);
-                    assert value instanceof LogicNode || stamp.isCompatible(value.stamp(NodeView.DEFAULT)) : stamp + " vs. " + value.stamp(NodeView.DEFAULT) + " (" + value + ")";
-                    map.setAndGrow(value, new InfoElement(stamp, guard, proxiedValue, map.getAndGrow(value)));
-                    undoOperations.push(value);
-                    if (value instanceof StampInverter) {
-                        StampInverter stampInverter = (StampInverter) value;
-                        value = stampInverter.getValue();
-                        stamp = stampInverter.invertStamp(stamp);
-                    } else {
-                        value = null;
-                        stamp = null;
-                    }
-                } while (value != null && stamp != null);
+                counterStampsRegistered.increment(debug);
+                debug.log("\t Saving stamp for node %s stamp %s guarded by %s", value, stamp, guard);
+                assert value instanceof LogicNode || stamp.isCompatible(value.stamp(NodeView.DEFAULT)) : stamp + " vs. " + value.stamp(NodeView.DEFAULT) + " (" + value + ")";
+                map.setAndGrow(value, new InfoElement(stamp, guard, proxiedValue, map.getAndGrow(value)));
+                undoOperations.push(value);
+                if (propagateThroughPis && value instanceof PiNode) {
+                    PiNode piNode = (PiNode) value;
+                    value = piNode.getOriginalNode();
+                } else if (value instanceof StampInverter) {
+                    StampInverter stampInverter = (StampInverter) value;
+                    value = stampInverter.getValue();
+                    stamp = stampInverter.invertStamp(stamp);
+                } else {
+                    break;
+                }
             }
         }
 
@@ -990,7 +1053,9 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
             if (value.hasMoreThanOneUsage()) {
                 return true;
             } else {
-                return value instanceof ProxyNode;
+                return value instanceof ProxyNode ||
+                                value instanceof PiNode ||
+                                value instanceof StampInverter;
             }
         }
 
@@ -1019,14 +1084,19 @@ public class ConditionalEliminationPhase extends BasePhase<PhaseContext> {
         }
 
         @Override
-        public void exit(Block b, Integer state) {
-            int mark = state;
-            while (undoOperations.size() > mark) {
+        public void exit(Block b, Marks marks) {
+            int infoElementsMark = marks.infoElementOperations;
+            while (undoOperations.size() > infoElementsMark) {
                 Node node = undoOperations.pop();
                 if (node.isAlive()) {
                     map.set(node, map.get(node).getParent());
                 }
             }
+
+            int conditionsMark = marks.conditions;
+            while (conditions.size() > conditionsMark) {
+                conditions.pop();
+            }
         }
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java
index 2760bbf3351..f22e109a408 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java
@@ -29,6 +29,7 @@ import java.util.List;
 import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.spi.SimplifierTool;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
@@ -178,8 +179,9 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase<PhaseContext> {
                         AbstractEndNode end = mergeNode.forwardEnds().first();
                         propagateFixed(end, deopt, loweringProvider);
                     }
-                    assert next.isAlive();
-                    propagateFixed(next, deopt, loweringProvider);
+                    if (next.isAlive()) {
+                        propagateFixed(next, deopt, loweringProvider);
+                    }
                     return;
                 } else if (current.predecessor() instanceof IfNode) {
                     IfNode ifNode = (IfNode) current.predecessor();
@@ -188,7 +190,9 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase<PhaseContext> {
                         StructuredGraph graph = ifNode.graph();
                         LogicNode conditionNode = ifNode.condition();
                         boolean negateGuardCondition = current == ifNode.trueSuccessor();
-                        FixedGuardNode guard = graph.add(new FixedGuardNode(conditionNode, deopt.getReason(), deopt.getAction(), deopt.getSpeculation(), negateGuardCondition));
+                        NodeSourcePosition survivingSuccessorPosition = negateGuardCondition ? ifNode.falseSuccessor().getNodeSourcePosition() : ifNode.trueSuccessor().getNodeSourcePosition();
+                        FixedGuardNode guard = graph.add(
+                                        new FixedGuardNode(conditionNode, deopt.getReason(), deopt.getAction(), deopt.getSpeculation(), negateGuardCondition, survivingSuccessorPosition));
 
                         FixedWithNextNode pred = (FixedWithNextNode) ifNode.predecessor();
                         AbstractBeginNode survivingSuccessor;
@@ -223,11 +227,14 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase<PhaseContext> {
         }
     }
 
+    @SuppressWarnings("try")
     private static void moveAsDeoptAfter(FixedWithNextNode node, StaticDeoptimizingNode deopt) {
-        FixedNode next = node.next();
-        if (next != deopt.asNode()) {
-            node.setNext(node.graph().add(new DeoptimizeNode(deopt.getAction(), deopt.getReason(), deopt.getSpeculation())));
-            GraphUtil.killCFG(next);
+        try (DebugCloseable position = deopt.asNode().withNodeSourcePosition()) {
+            FixedNode next = node.next();
+            if (next != deopt.asNode()) {
+                node.setNext(node.graph().add(new DeoptimizeNode(deopt.getAction(), deopt.getReason(), deopt.getSpeculation())));
+                GraphUtil.killCFG(next);
+            }
         }
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java
index 986af0c1636..2a90bbc7b98 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.graalvm.compiler.core.common.cfg.Loop;
 import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.nodes.AbstractDeoptimizeNode;
 import org.graalvm.compiler.nodes.AbstractMergeNode;
 import org.graalvm.compiler.nodes.DynamicDeoptimizeNode;
@@ -52,6 +53,7 @@ import org.graalvm.compiler.phases.tiers.MidTierContext;
 public class DeoptimizationGroupingPhase extends BasePhase<MidTierContext> {
 
     @Override
+    @SuppressWarnings("try")
     protected void run(StructuredGraph graph, MidTierContext context) {
         ControlFlowGraph cfg = null;
         for (FrameState fs : graph.getNodes(FrameState.TYPE)) {
@@ -80,8 +82,9 @@ public class DeoptimizationGroupingPhase extends BasePhase<MidTierContext> {
                         target.replaceAtPredecessor(firstEnd);
 
                         exitLoops((AbstractDeoptimizeNode) target, firstEnd, cfg);
-
-                        merge.setNext(graph.add(new DynamicDeoptimizeNode(reasonActionPhi, speculationPhi)));
+                        try (DebugCloseable position = target.withNodeSourcePosition()) {
+                            merge.setNext(graph.add(new DynamicDeoptimizeNode(reasonActionPhi, speculationPhi)));
+                        }
                         obsoletes = new LinkedList<>();
                         obsoletes.add((AbstractDeoptimizeNode) target);
                         target = merge;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java
index 39554260739..37b88b3be99 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java
@@ -107,64 +107,66 @@ public class ExpandLogicPhase extends Phase {
         binary.safeDelete();
     }
 
-    @SuppressWarnings("try")
     private static void processIf(LogicNode x, boolean xNegated, LogicNode y, boolean yNegated, IfNode ifNode, double shortCircuitProbability) {
-        try (DebugCloseable context = ifNode.withNodeSourcePosition()) {
+        /*
+         * this method splits an IfNode, which has a ShortCircuitOrNode as its condition, into two
+         * separate IfNodes: if(X) and if(Y)
+         *
+         * for computing the probabilities P(X) and P(Y), we use two different approaches. The first
+         * one assumes that the shortCircuitProbability and the probability on the IfNode were
+         * created with each other in mind. If this assumption does not hold, we fall back to
+         * another mechanism for computing the probabilities.
+         */
+        AbstractBeginNode trueTarget = ifNode.trueSuccessor();
+        AbstractBeginNode falseTarget = ifNode.falseSuccessor();
+
+        // 1st approach
+        // assumption: P(originalIf.trueSuccessor) == P(X) + ((1 - P(X)) * P(Y))
+        double firstIfTrueProbability = shortCircuitProbability;
+        double secondIfTrueProbability = sanitizeProbability((ifNode.getTrueSuccessorProbability() - shortCircuitProbability) / (1 - shortCircuitProbability));
+        double expectedOriginalIfTrueProbability = firstIfTrueProbability + (1 - firstIfTrueProbability) * secondIfTrueProbability;
+
+        if (!doubleEquals(ifNode.getTrueSuccessorProbability(), expectedOriginalIfTrueProbability)) {
             /*
-             * this method splits an IfNode, which has a ShortCircuitOrNode as its condition, into
-             * two separate IfNodes: if(X) and if(Y)
+             * 2nd approach
              *
-             * for computing the probabilities P(X) and P(Y), we use two different approaches. The
-             * first one assumes that the shortCircuitProbability and the probability on the IfNode
-             * were created with each other in mind. If this assumption does not hold, we fall back
-             * to another mechanism for computing the probabilities.
+             * the assumption above did not hold, so we either used an artificial probability as
+             * shortCircuitProbability or the ShortCircuitOrNode was moved to some other IfNode.
+             *
+             * so, we distribute the if's trueSuccessorProbability between the newly generated if
+             * nodes according to the shortCircuitProbability. the following invariant is always
+             * true in this case: P(originalIf.trueSuccessor) == P(X) + ((1 - P(X)) * P(Y))
              */
-            AbstractBeginNode trueTarget = ifNode.trueSuccessor();
-            AbstractBeginNode falseTarget = ifNode.falseSuccessor();
-
-            // 1st approach
-            // assumption: P(originalIf.trueSuccessor) == P(X) + ((1 - P(X)) * P(Y))
-            double firstIfTrueProbability = shortCircuitProbability;
-            double secondIfTrueProbability = sanitizeProbability((ifNode.getTrueSuccessorProbability() - shortCircuitProbability) / (1 - shortCircuitProbability));
-            double expectedOriginalIfTrueProbability = firstIfTrueProbability + (1 - firstIfTrueProbability) * secondIfTrueProbability;
-
-            if (!doubleEquals(ifNode.getTrueSuccessorProbability(), expectedOriginalIfTrueProbability)) {
-                /*
-                 * 2nd approach
-                 *
-                 * the assumption above did not hold, so we either used an artificial probability as
-                 * shortCircuitProbability or the ShortCircuitOrNode was moved to some other IfNode.
-                 *
-                 * so, we distribute the if's trueSuccessorProbability between the newly generated
-                 * if nodes according to the shortCircuitProbability. the following invariant is
-                 * always true in this case: P(originalIf.trueSuccessor) == P(X) + ((1 - P(X)) *
-                 * P(Y))
-                 */
-                firstIfTrueProbability = ifNode.getTrueSuccessorProbability() * shortCircuitProbability;
-                secondIfTrueProbability = sanitizeProbability(1 - (ifNode.probability(falseTarget) / (1 - firstIfTrueProbability)));
-            }
-
-            ifNode.clearSuccessors();
-            Graph graph = ifNode.graph();
-            AbstractMergeNode trueTargetMerge = graph.add(new MergeNode());
-            trueTargetMerge.setNext(trueTarget);
-            EndNode firstTrueEnd = graph.add(new EndNode());
-            EndNode secondTrueEnd = graph.add(new EndNode());
-            trueTargetMerge.addForwardEnd(firstTrueEnd);
-            trueTargetMerge.addForwardEnd(secondTrueEnd);
-            AbstractBeginNode firstTrueTarget = BeginNode.begin(firstTrueEnd);
-            AbstractBeginNode secondTrueTarget = BeginNode.begin(secondTrueEnd);
-            if (yNegated) {
-                secondIfTrueProbability = 1.0 - secondIfTrueProbability;
-            }
-            if (xNegated) {
-                firstIfTrueProbability = 1.0 - firstIfTrueProbability;
-            }
-            AbstractBeginNode secondIf = BeginNode.begin(graph.add(new IfNode(y, yNegated ? falseTarget : secondTrueTarget, yNegated ? secondTrueTarget : falseTarget, secondIfTrueProbability)));
-            IfNode firstIf = graph.add(new IfNode(x, xNegated ? secondIf : firstTrueTarget, xNegated ? firstTrueTarget : secondIf, firstIfTrueProbability));
-            ifNode.replaceAtPredecessor(firstIf);
-            ifNode.safeDelete();
+            firstIfTrueProbability = ifNode.getTrueSuccessorProbability() * shortCircuitProbability;
+            secondIfTrueProbability = sanitizeProbability(1 - (ifNode.probability(falseTarget) / (1 - firstIfTrueProbability)));
         }
+
+        ifNode.clearSuccessors();
+        Graph graph = ifNode.graph();
+        AbstractMergeNode trueTargetMerge = graph.add(new MergeNode());
+        trueTargetMerge.setNext(trueTarget);
+        EndNode firstTrueEnd = graph.add(new EndNode());
+        EndNode secondTrueEnd = graph.add(new EndNode());
+        trueTargetMerge.addForwardEnd(firstTrueEnd);
+        trueTargetMerge.addForwardEnd(secondTrueEnd);
+        AbstractBeginNode firstTrueTarget = BeginNode.begin(firstTrueEnd);
+        firstTrueTarget.setNodeSourcePosition(trueTarget.getNodeSourcePosition());
+        AbstractBeginNode secondTrueTarget = BeginNode.begin(secondTrueEnd);
+        secondTrueTarget.setNodeSourcePosition(trueTarget.getNodeSourcePosition());
+        if (yNegated) {
+            secondIfTrueProbability = 1.0 - secondIfTrueProbability;
+        }
+        if (xNegated) {
+            firstIfTrueProbability = 1.0 - firstIfTrueProbability;
+        }
+        IfNode secondIf = new IfNode(y, yNegated ? falseTarget : secondTrueTarget, yNegated ? secondTrueTarget : falseTarget, secondIfTrueProbability);
+        secondIf.setNodeSourcePosition(ifNode.getNodeSourcePosition());
+        AbstractBeginNode secondIfBegin = BeginNode.begin(graph.add(secondIf));
+        secondIfBegin.setNodeSourcePosition(falseTarget.getNodeSourcePosition());
+        IfNode firstIf = graph.add(new IfNode(x, xNegated ? secondIfBegin : firstTrueTarget, xNegated ? firstTrueTarget : secondIfBegin, firstIfTrueProbability));
+        firstIf.setNodeSourcePosition(ifNode.getNodeSourcePosition());
+        ifNode.replaceAtPredecessor(firstIf);
+        ifNode.safeDelete();
     }
 
     private static boolean doubleEquals(double a, double b) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
index d701789b3aa..779c40bdb14 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
@@ -86,6 +86,7 @@ public class GuardLoweringPhase extends BasePhase<MidTierContext> {
             try (DebugCloseable position = guard.withNodeSourcePosition()) {
                 StructuredGraph graph = guard.graph();
                 AbstractBeginNode fastPath = graph.add(new BeginNode());
+                fastPath.setNodeSourcePosition(guard.getNoDeoptSuccessorPosition());
                 @SuppressWarnings("deprecation")
                 int debugId = useGuardIdAsDebugId ? guard.getId() : DeoptimizeNode.DEFAULT_DEBUG_ID;
                 DeoptimizeNode deopt = graph.add(new DeoptimizeNode(guard.getAction(), guard.getReason(), debugId, guard.getSpeculation(), null));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java
index 3fa143a7fd7..7005b633f02 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java
@@ -24,6 +24,7 @@ package org.graalvm.compiler.phases.common;
 
 import static org.graalvm.compiler.core.common.GraalOptions.GenLoopSafepoints;
 
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.LoopEndNode;
 import org.graalvm.compiler.nodes.SafepointNode;
@@ -43,13 +44,16 @@ public class LoopSafepointInsertionPhase extends Phase {
     }
 
     @Override
+    @SuppressWarnings("try")
     protected void run(StructuredGraph graph) {
         if (GenLoopSafepoints.getValue(graph.getOptions())) {
             for (LoopBeginNode loopBeginNode : graph.getNodes(LoopBeginNode.TYPE)) {
                 for (LoopEndNode loopEndNode : loopBeginNode.loopEnds()) {
                     if (loopEndNode.canSafepoint()) {
-                        SafepointNode safepointNode = graph.add(new SafepointNode());
-                        graph.addBeforeFixed(loopEndNode, safepointNode);
+                        try (DebugCloseable s = loopEndNode.withNodeSourcePosition()) {
+                            SafepointNode safepointNode = graph.add(new SafepointNode());
+                            graph.addBeforeFixed(loopEndNode, safepointNode);
+                        }
                     }
                 }
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
index 36a0ce840e6..52a87fe39a0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
@@ -43,6 +43,7 @@ import org.graalvm.compiler.graph.Graph.Mark;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeBitMap;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -171,7 +172,7 @@ public class LoweringPhase extends BasePhase<PhaseContext> {
 
         @Override
         public GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action) {
-            return createGuard(before, condition, deoptReason, action, JavaConstant.NULL_POINTER, false);
+            return createGuard(before, condition, deoptReason, action, JavaConstant.NULL_POINTER, false, null);
         }
 
         @Override
@@ -180,7 +181,8 @@ public class LoweringPhase extends BasePhase<PhaseContext> {
         }
 
         @Override
-        public GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation, boolean negated) {
+        public GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, JavaConstant speculation, boolean negated,
+                        NodeSourcePosition noDeoptSucccessorPosition) {
             StructuredGraph graph = before.graph();
             if (OptEliminateGuards.getValue(graph.getOptions())) {
                 for (Node usage : condition.usages()) {
@@ -190,7 +192,7 @@ public class LoweringPhase extends BasePhase<PhaseContext> {
                 }
             }
             if (!condition.graph().getGuardsStage().allowsFloatingGuards()) {
-                FixedGuardNode fixedGuard = graph.add(new FixedGuardNode(condition, deoptReason, action, speculation, negated));
+                FixedGuardNode fixedGuard = graph.add(new FixedGuardNode(condition, deoptReason, action, speculation, negated, noDeoptSucccessorPosition));
                 graph.addBeforeFixed(before, fixedGuard);
                 DummyGuardHandle handle = graph.add(new DummyGuardHandle(fixedGuard));
                 fixedGuard.lower(this);
@@ -198,7 +200,7 @@ public class LoweringPhase extends BasePhase<PhaseContext> {
                 handle.safeDelete();
                 return result;
             } else {
-                GuardNode newGuard = graph.unique(new GuardNode(condition, guardAnchor, deoptReason, action, negated, speculation));
+                GuardNode newGuard = graph.unique(new GuardNode(condition, guardAnchor, deoptReason, action, negated, speculation, noDeoptSucccessorPosition));
                 if (OptEliminateGuards.getValue(graph.getOptions())) {
                     activeGuards.markAndGrow(newGuard);
                 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
index fd063d7858d..dc6476d3c6f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
@@ -65,6 +65,7 @@ import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.CallTargetNode;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
 import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.nodes.DeoptimizingGuard;
 import org.graalvm.compiler.nodes.EndNode;
 import org.graalvm.compiler.nodes.FixedGuardNode;
 import org.graalvm.compiler.nodes.FixedNode;
@@ -520,6 +521,7 @@ public class InliningUtil extends ValueMergeUtil {
         return listener.getNodes();
     }
 
+    @SuppressWarnings("try")
     private static ValueNode finishInlining(Invoke invoke, StructuredGraph graph, FixedNode firstNode, List<ReturnNode> returnNodes, UnwindNode unwindNode, Assumptions inlinedAssumptions,
                     StructuredGraph inlineGraph) {
         FixedNode invokeNode = invoke.asNode();
@@ -548,15 +550,19 @@ public class InliningUtil extends ValueMergeUtil {
             // get rid of memory kill
             AbstractBeginNode begin = invokeWithException.next();
             if (begin instanceof KillingBeginNode) {
-                AbstractBeginNode newBegin = new BeginNode();
-                graph.addAfterFixed(begin, graph.add(newBegin));
-                begin.replaceAtUsages(newBegin);
-                graph.removeFixed(begin);
+                try (DebugCloseable position = begin.withNodeSourcePosition()) {
+                    AbstractBeginNode newBegin = new BeginNode();
+                    graph.addAfterFixed(begin, graph.add(newBegin));
+                    begin.replaceAtUsages(newBegin);
+                    graph.removeFixed(begin);
+                }
             }
         } else {
             if (unwindNode != null && unwindNode.isAlive()) {
-                DeoptimizeNode deoptimizeNode = addDeoptimizeNode(graph, DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler);
-                unwindNode.replaceAndDelete(deoptimizeNode);
+                try (DebugCloseable position = unwindNode.withNodeSourcePosition()) {
+                    DeoptimizeNode deoptimizeNode = addDeoptimizeNode(graph, DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler);
+                    unwindNode.replaceAndDelete(deoptimizeNode);
+                }
             }
         }
 
@@ -710,6 +716,10 @@ public class InliningUtil extends ValueMergeUtil {
                         posMap.put(pos, callerPos);
                     }
                     value.setNodeSourcePosition(callerPos);
+
+                    if (value instanceof DeoptimizingGuard) {
+                        ((DeoptimizingGuard) value).addCallerToNoDeoptSuccessorPosition(callerPos.getCaller());
+                    }
                 } else {
                     if (isSubstitution) {
                         /*
@@ -721,7 +731,7 @@ public class InliningUtil extends ValueMergeUtil {
                 }
             }
         }
-        assert invokeGraph.verifySourcePositions();
+        assert invokeGraph.verifySourcePositions(false);
     }
 
     public static void processMonitorId(FrameState stateAfter, MonitorIdNode monitorIdNode) {
@@ -871,6 +881,7 @@ public class InliningUtil extends ValueMergeUtil {
         return frameState.bci == BytecodeFrame.AFTER_EXCEPTION_BCI || (frameState.bci == BytecodeFrame.UNWIND_BCI && !frameState.getMethod().isSynchronized());
     }
 
+    @SuppressWarnings("try")
     public static FrameState handleMissingAfterExceptionFrameState(FrameState nonReplaceableFrameState, Invoke invoke, EconomicMap<Node, Node> replacements, boolean alwaysDuplicateStateAfter) {
         StructuredGraph graph = nonReplaceableFrameState.graph();
         NodeWorkList workList = graph.createNodeWorkList();
@@ -890,9 +901,11 @@ public class InliningUtil extends ValueMergeUtil {
                         AbstractMergeNode merge = (AbstractMergeNode) fixedStateSplit;
                         while (merge.isAlive()) {
                             AbstractEndNode end = merge.forwardEnds().first();
-                            DeoptimizeNode deoptimizeNode = addDeoptimizeNode(graph, DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler);
-                            end.replaceAtPredecessor(deoptimizeNode);
-                            GraphUtil.killCFG(end);
+                            try (DebugCloseable position = end.withNodeSourcePosition()) {
+                                DeoptimizeNode deoptimizeNode = addDeoptimizeNode(graph, DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler);
+                                end.replaceAtPredecessor(deoptimizeNode);
+                                GraphUtil.killCFG(end);
+                            }
                         }
                     } else if (fixedStateSplit instanceof ExceptionObjectNode) {
                         // The target invoke does not have an exception edge. This means that the
@@ -909,12 +922,14 @@ public class InliningUtil extends ValueMergeUtil {
                         }
                         handleAfterBciFrameState(newInvoke.stateAfter(), invoke, alwaysDuplicateStateAfter);
                     } else {
-                        FixedNode deoptimizeNode = addDeoptimizeNode(graph, DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler);
-                        if (fixedStateSplit instanceof AbstractBeginNode) {
-                            deoptimizeNode = BeginNode.begin(deoptimizeNode);
+                        try (DebugCloseable position = fixedStateSplit.withNodeSourcePosition()) {
+                            FixedNode deoptimizeNode = addDeoptimizeNode(graph, DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler);
+                            if (fixedStateSplit instanceof AbstractBeginNode) {
+                                deoptimizeNode = BeginNode.begin(deoptimizeNode);
+                            }
+                            fixedStateSplit.replaceAtPredecessor(deoptimizeNode);
+                            GraphUtil.killCFG(fixedStateSplit);
                         }
-                        fixedStateSplit.replaceAtPredecessor(deoptimizeNode);
-                        GraphUtil.killCFG(fixedStateSplit);
                     }
                 }
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java
index 0b8f2cdec25..a002b116ad1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java
@@ -111,7 +111,14 @@ interface GraphPrinter extends Closeable, JavaConstantFormatter {
         SnippetReflectionProvider snippetReflection = getSnippetReflectionProvider();
         if (snippetReflection != null) {
             if (constant.getJavaKind() == JavaKind.Object) {
-                Object obj = snippetReflection.asObject(Object.class, constant);
+                Object obj = null;
+                /*
+                 * Ignore any exceptions on unknown JavaConstant implementations in debugging code.
+                 */
+                try {
+                    obj = snippetReflection.asObject(Object.class, constant);
+                } catch (Throwable ex) {
+                }
                 if (obj != null) {
                     return GraphPrinter.constantToString(obj);
                 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java
new file mode 100644
index 00000000000..bff1f766509
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2018, 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.processor;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.processing.FilerException;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
+
+/**
+ * {@link javax.annotation.processing.AbstractProcessor} subclass that provides extra functionality.
+ */
+@SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", //
+                reason = "We want this type to be found when someone is writing a new Graal annotation processor")
+public abstract class AbstractProcessor extends javax.annotation.processing.AbstractProcessor {
+
+    /**
+     * Gets the processing environment available to this processor.
+     */
+    public ProcessingEnvironment env() {
+        return processingEnv;
+    }
+
+    private final Map<String, TypeElement> types = new HashMap<>();
+
+    /**
+     * Gets the {@link TypeMirror} for a given class name.
+     *
+     * @throws NoClassDefFoundError if the class cannot be resolved
+     */
+    public TypeMirror getType(String className) {
+        return getTypeElement(className).asType();
+    }
+
+    /**
+     * Gets the {@link TypeMirror} for a given class name.
+     *
+     * @rturn {@code null} if the class cannot be resolved
+     */
+    public TypeMirror getTypeOrNull(String className) {
+        TypeElement element = getTypeElementOrNull(className);
+        if (element == null) {
+            return null;
+        }
+        return element.asType();
+    }
+
+    /**
+     * Gets the {@link TypeElement} for a given class name.
+     *
+     * @throws NoClassDefFoundError if the class cannot be resolved
+     */
+    public TypeElement getTypeElement(String className) {
+        TypeElement type = getTypeElementOrNull(className);
+        if (type == null) {
+            throw new NoClassDefFoundError(className);
+        }
+        return type;
+    }
+
+    /**
+     * Gets the {@link TypeElement} for a given class name.
+     *
+     * @returns {@code null} if the class cannot be resolved
+     */
+    public TypeElement getTypeElementOrNull(String className) {
+        TypeElement type = types.get(className);
+        if (type == null) {
+            type = processingEnv.getElementUtils().getTypeElement(className);
+            if (type == null) {
+                return null;
+            }
+            types.put(className, type);
+        }
+        return type;
+    }
+
+    /**
+     * Converts a given {@link TypeMirror} to a {@link TypeElement}.
+     *
+     * @throws ClassCastException if type cannot be converted to a {@link TypeElement}
+     */
+    public TypeElement asTypeElement(TypeMirror type) {
+        Element element = processingEnv.getTypeUtils().asElement(type);
+        if (element == null) {
+            throw new ClassCastException(type + " cannot be converted to a " + TypeElement.class.getName());
+        }
+        return (TypeElement) element;
+    }
+
+    /**
+     * Regular expression for a qualified class name that assumes package names start with lowercase
+     * and non-package components start with uppercase.
+     */
+    private static final Pattern QUALIFIED_CLASS_NAME_RE = Pattern.compile("(?:[a-z]\\w*\\.)+([A-Z].*)");
+
+    /**
+     * Gets the non-package component of a qualified class name.
+     *
+     * @throws IllegalArgumentException if {@code className} does not match
+     *             {@link #QUALIFIED_CLASS_NAME_RE}
+     */
+    public static String getSimpleName(String className) {
+        Matcher m = QUALIFIED_CLASS_NAME_RE.matcher(className);
+        if (m.matches()) {
+            return m.group(1);
+        }
+        throw new IllegalArgumentException("Class name \"" + className + "\" does not match pattern " + QUALIFIED_CLASS_NAME_RE);
+    }
+
+    /**
+     * Gets the package component of a qualified class name.
+     *
+     * @throws IllegalArgumentException if {@code className} does not match
+     *             {@link #QUALIFIED_CLASS_NAME_RE}
+     */
+    public static String getPackageName(String className) {
+        String simpleName = getSimpleName(className);
+        return className.substring(0, className.length() - simpleName.length() - 1);
+    }
+
+    /**
+     * Gets the annotation of type {@code annotationType} directly present on {@code element}.
+     *
+     * @return {@code null} if an annotation of type {@code annotationType} is not on
+     *         {@code element}
+     */
+    public AnnotationMirror getAnnotation(Element element, TypeMirror annotationType) {
+        List<AnnotationMirror> mirrors = getAnnotations(element, annotationType);
+        return mirrors.isEmpty() ? null : mirrors.get(0);
+    }
+
+    /**
+     * Gets all annotations directly present on {@code element}.
+     */
+    public List<AnnotationMirror> getAnnotations(Element element, TypeMirror typeMirror) {
+        List<AnnotationMirror> result = new ArrayList<>();
+        for (AnnotationMirror mirror : element.getAnnotationMirrors()) {
+            if (processingEnv.getTypeUtils().isSameType(mirror.getAnnotationType(), typeMirror)) {
+                result.add(mirror);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Gets the value of the {@code name} element of {@code annotation} and converts it to a value
+     * of type {@code type}.
+     *
+     * @param type the expected type of the element value. This must be a subclass of one of the
+     *            types described by {@link AnnotationValue}.
+     * @throws NoSuchElementException if {@code annotation} has no element named {@code name}
+     * @throws ClassCastException if the value of the specified element cannot be converted to
+     *             {@code type}
+     */
+    public static <T> T getAnnotationValue(AnnotationMirror annotation, String name, Class<T> type) {
+        ExecutableElement valueMethod = null;
+        for (ExecutableElement method : ElementFilter.methodsIn(annotation.getAnnotationType().asElement().getEnclosedElements())) {
+            if (method.getSimpleName().toString().equals(name)) {
+                valueMethod = method;
+                break;
+            }
+        }
+
+        if (valueMethod == null) {
+            return null;
+        }
+
+        AnnotationValue value = annotation.getElementValues().get(valueMethod);
+        if (value == null) {
+            value = valueMethod.getDefaultValue();
+        }
+
+        return type.cast(value.getValue());
+    }
+
+    /**
+     * Gets the value of the {@code name} array-typed element of {@code annotation} and converts it
+     * to list of values of type {@code type}.
+     *
+     * @param componentType the expected component type of the element value. This must be a
+     *            subclass of one of the types described by {@link AnnotationValue}.
+     * @throws NoSuchElementException if {@code annotation} has no element named {@code name}
+     * @throws ClassCastException if the value of the specified element is not an array whose
+     *             components cannot be converted to {@code componentType}
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> List<T> getAnnotationValueList(AnnotationMirror annotation, String name, Class<T> componentType) {
+        List<? extends AnnotationValue> values = getAnnotationValue(annotation, name, List.class);
+        List<T> result = new ArrayList<>();
+
+        if (values != null) {
+            for (AnnotationValue value : values) {
+                result.add(componentType.cast(value.getValue()));
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Creates a {@code META-INF/providers/<providerClassName>} file whose contents are a single
+     * line containing {@code serviceClassName}.
+     */
+    public void createProviderFile(String providerClassName, String serviceClassName, Element... originatingElements) {
+        assert originatingElements.length > 0;
+        String filename = "META-INF/providers/" + providerClassName;
+        try {
+            FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", filename, originatingElements);
+            PrintWriter writer = new PrintWriter(new OutputStreamWriter(file.openOutputStream(), "UTF-8"));
+            writer.println(serviceClassName);
+            writer.close();
+        } catch (IOException e) {
+            processingEnv.getMessager().printMessage(isBug367599(e) ? Kind.NOTE : Kind.ERROR, e.getMessage(), originatingElements[0]);
+        }
+    }
+
+    /**
+     * Determines if a given exception is (most likely) caused by
+     * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=367599">Bug 367599</a>.
+     */
+    private static boolean isBug367599(Throwable t) {
+        if (t instanceof FilerException) {
+            for (StackTraceElement ste : t.getStackTrace()) {
+                if (ste.toString().contains("org.eclipse.jdt.internal.apt.pluggable.core.filer.IdeFilerImpl.create")) {
+                    // See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=367599
+                    return true;
+                }
+            }
+        }
+        return t.getCause() != null && isBug367599(t.getCause());
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java
new file mode 100644
index 00000000000..c75dd250610
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018, 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.processor;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
+ */
+@Retention(RetentionPolicy.CLASS)
+@interface SuppressFBWarnings {
+    /**
+     * The set of FindBugs
+     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
+     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     */
+    java.lang.String[] value();
+
+    String reason();
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
index a187f4b6d01..590a3bd4bd5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -29,20 +29,29 @@ import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.Una
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
 import static org.graalvm.compiler.serviceprovider.GraalServices.JAVA_SPECIFICATION_VERSION;
+import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
 
 import org.graalvm.compiler.bytecode.BytecodeProvider;
+import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticLIRGeneratorTool.RoundingMode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+import jdk.internal.vm.compiler.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import sun.misc.Unsafe;
 
 public class AArch64GraphBuilderPlugins {
 
@@ -56,7 +65,11 @@ public class AArch64GraphBuilderPlugins {
                 registerMathPlugins(invocationPlugins);
                 registerStringLatin1Plugins(invocationPlugins, bytecodeProvider);
                 registerStringUTF16Plugins(invocationPlugins, bytecodeProvider);
-
+                registerUnsafeReadAndAddPlugins(invocationPlugins, bytecodeProvider);
+                // This is temporarily disabled until we implement correct emitting of the CAS
+                // instructions of the proper width.
+                StandardGraphBuilderPlugins.registerPlatformSpecificUnsafePlugins(invocationPlugins, bytecodeProvider,
+                                new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object});
             }
         });
     }
@@ -107,6 +120,9 @@ public class AArch64GraphBuilderPlugins {
                 return true;
             }
         });
+        registerRound(r, "rint", RoundingMode.NEAREST);
+        registerRound(r, "ceil", RoundingMode.UP);
+        registerRound(r, "floor", RoundingMode.DOWN);
     }
 
     private static void registerUnaryMath(Registration r, String name, UnaryOperation operation) {
@@ -119,6 +135,16 @@ public class AArch64GraphBuilderPlugins {
         });
     }
 
+    private static void registerRound(Registration r, String name, RoundingMode mode) {
+        r.register1(name, Double.TYPE, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
+                b.push(JavaKind.Double, b.append(new AArch64RoundNode(arg, mode)));
+                return true;
+            }
+        });
+    }
+
     private static void registerStringLatin1Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
         if (JAVA_SPECIFICATION_VERSION >= 9) {
             Registration r = new Registration(plugins, "java.lang.StringLatin1", replacementsBytecodeProvider);
@@ -137,4 +163,30 @@ public class AArch64GraphBuilderPlugins {
         }
     }
 
+    private static void registerUnsafeReadAndAddPlugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
+        Registration r;
+        if (Java8OrEarlier) {
+            r = new Registration(plugins, Unsafe.class);
+        } else {
+            r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacementsBytecodeProvider);
+        }
+
+        for (JavaKind kind : new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object}) {
+            Class<?> javaClass = kind == JavaKind.Object ? Object.class : kind.toJavaClass();
+
+            if (kind != JavaKind.Object) {
+                r.register4("getAndAdd" + kind.name(), Receiver.class, Object.class, long.class, javaClass, new InvocationPlugin() {
+                    @Override
+                    public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode object, ValueNode offset, ValueNode delta) {
+                        // Emits a null-check for the otherwise unused receiver
+                        unsafe.get();
+                        AddressNode address = b.add(new OffsetAddressNode(object, offset));
+                        b.addPush(kind, new AtomicReadAndAddNode(address, delta, kind, LocationIdentity.any()));
+                        b.getGraph().markUnsafeAccess();
+                        return true;
+                    }
+                });
+            }
+        }
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
index fab0c95b68c..90f3bb41009 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Red Hat 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
@@ -24,7 +25,9 @@
 package org.graalvm.compiler.replacements.aarch64;
 
 import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node.NodeIntrinsic;
@@ -34,7 +37,7 @@ import org.graalvm.compiler.nodes.DeoptimizeNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
+import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
 import org.graalvm.compiler.nodes.calc.SignedDivNode;
 import org.graalvm.compiler.nodes.calc.SignedRemNode;
 import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
@@ -84,7 +87,7 @@ public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implemen
         ulrem = snippet(AArch64IntegerArithmeticSnippets.class, "ulremSnippet");
     }
 
-    public void lower(FixedBinaryNode node, LoweringTool tool) {
+    public void lower(IntegerDivRemNode node, LoweringTool tool) {
         JavaKind kind = node.stamp(NodeView.DEFAULT).getStackKind();
         assert kind == JavaKind.Int || kind == JavaKind.Long;
         SnippetTemplate.SnippetInfo snippet;
@@ -106,68 +109,88 @@ public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implemen
         Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
         args.add("x", node.getX());
         args.add("y", node.getY());
+
+        IntegerStamp yStamp = (IntegerStamp) node.getY().stamp(NodeView.DEFAULT);
+        args.addConst("needsZeroCheck", node.getZeroCheck() == null && yStamp.contains(0));
+
         template(node, args).instantiate(providers.getMetaAccess(), node, SnippetTemplate.DEFAULT_REPLACER, args);
     }
 
     @Snippet
-    public static int idivSnippet(int x, int y) {
-        checkForZero(y);
+    public static int idivSnippet(int x, int y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeDiv(x, y);
     }
 
     @Snippet
-    public static long ldivSnippet(long x, long y) {
-        checkForZero(y);
+    public static long ldivSnippet(long x, long y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeDiv(x, y);
     }
 
     @Snippet
-    public static int iremSnippet(int x, int y) {
-        checkForZero(y);
+    public static int iremSnippet(int x, int y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeRem(x, y);
     }
 
     @Snippet
-    public static long lremSnippet(long x, long y) {
-        checkForZero(y);
+    public static long lremSnippet(long x, long y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeRem(x, y);
     }
 
     @Snippet
-    public static int uidivSnippet(int x, int y) {
-        checkForZero(y);
+    public static int uidivSnippet(int x, int y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeUDiv(x, y);
     }
 
     @Snippet
-    public static long uldivSnippet(long x, long y) {
-        checkForZero(y);
+    public static long uldivSnippet(long x, long y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeUDiv(x, y);
     }
 
     @Snippet
-    public static int uiremSnippet(int x, int y) {
-        checkForZero(y);
+    public static int uiremSnippet(int x, int y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeURem(x, y);
     }
 
     @Snippet
-    public static long ulremSnippet(long x, long y) {
-        checkForZero(y);
+    public static long ulremSnippet(long x, long y, @ConstantParameter boolean needsZeroCheck) {
+        if (needsZeroCheck) {
+            checkForZero(y);
+        }
         return safeURem(x, y);
     }
 
     private static void checkForZero(int y) {
         if (y == 0) {
             // "/ by zero"
-            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.ArithmeticException);
+            DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.ArithmeticException);
         }
     }
 
     private static void checkForZero(long y) {
         if (y == 0) {
             // "/ by zero"
-            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.ArithmeticException);
+            DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.ArithmeticException);
         }
     }
 
@@ -207,7 +230,7 @@ public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implemen
         public static final NodeClass<SafeSignedDivNode> TYPE = NodeClass.create(SafeSignedDivNode.class);
 
         protected SafeSignedDivNode(ValueNode x, ValueNode y) {
-            super(TYPE, x, y);
+            super(TYPE, x, y, null);
         }
 
         @Override
@@ -223,7 +246,7 @@ public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implemen
         public static final NodeClass<SafeSignedRemNode> TYPE = NodeClass.create(SafeSignedRemNode.class);
 
         protected SafeSignedRemNode(ValueNode x, ValueNode y) {
-            super(TYPE, x, y);
+            super(TYPE, x, y, null);
         }
 
         @Override
@@ -239,7 +262,7 @@ public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implemen
         public static final NodeClass<SafeUnsignedDivNode> TYPE = NodeClass.create(SafeUnsignedDivNode.class);
 
         protected SafeUnsignedDivNode(ValueNode x, ValueNode y) {
-            super(TYPE, x, y);
+            super(TYPE, x, y, null);
         }
 
         @Override
@@ -255,7 +278,7 @@ public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implemen
         public static final NodeClass<SafeUnsignedRemNode> TYPE = NodeClass.create(SafeUnsignedRemNode.class);
 
         protected SafeUnsignedRemNode(ValueNode x, ValueNode y) {
-            super(TYPE, x, y);
+            super(TYPE, x, y, null);
         }
 
         @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64RoundNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64RoundNode.java
new file mode 100644
index 00000000000..113bf185083
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64RoundNode.java
@@ -0,0 +1,113 @@
+/*
+ * 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.replacements.aarch64;
+
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.compiler.core.common.type.FloatStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticLIRGeneratorTool;
+import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticLIRGeneratorTool.RoundingMode;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.UnaryNode;
+import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
+
+/**
+ * Round floating-point value.
+ */
+@NodeInfo(cycles = CYCLES_8)
+public final class AArch64RoundNode extends UnaryNode implements ArithmeticLIRLowerable {
+    public static final NodeClass<AArch64RoundNode> TYPE = NodeClass.create(AArch64RoundNode.class);
+
+    private final RoundingMode mode;
+
+    public AArch64RoundNode(ValueNode value, RoundingMode mode) {
+        super(TYPE, roundStamp((FloatStamp) value.stamp(NodeView.DEFAULT), mode), value);
+        this.mode = mode;
+    }
+
+    private static double round(RoundingMode mode, double input) {
+        switch (mode) {
+            case DOWN:
+                return Math.floor(input);
+            case NEAREST:
+                return Math.rint(input);
+            case UP:
+                return Math.ceil(input);
+            case TRUNCATE:
+                return (long) input;
+            default:
+                throw GraalError.unimplemented("unimplemented RoundingMode " + mode);
+        }
+    }
+
+    private static FloatStamp roundStamp(FloatStamp stamp, RoundingMode mode) {
+        double min = stamp.lowerBound();
+        min = Math.min(min, round(mode, min));
+
+        double max = stamp.upperBound();
+        max = Math.max(max, round(mode, max));
+
+        return new FloatStamp(stamp.getBits(), min, max, stamp.isNonNaN());
+    }
+
+    @Override
+    public Stamp foldStamp(Stamp newStamp) {
+        assert newStamp.isCompatible(getValue().stamp(NodeView.DEFAULT));
+        return roundStamp((FloatStamp) newStamp, mode);
+    }
+
+    private ValueNode tryFold(ValueNode input) {
+        if (input.isConstant()) {
+            JavaConstant c = input.asJavaConstant();
+            if (c.getJavaKind() == JavaKind.Double) {
+                return ConstantNode.forDouble(round(mode, c.asDouble()));
+            } else if (c.getJavaKind() == JavaKind.Float) {
+                return ConstantNode.forFloat((float) round(mode, c.asFloat()));
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) {
+        ValueNode folded = tryFold(forValue);
+        return folded != null ? folded : this;
+    }
+
+    @Override
+    public void generate(NodeLIRBuilderTool builder, ArithmeticLIRGeneratorTool gen) {
+        builder.setResult(this, ((AArch64ArithmeticLIRGeneratorTool) gen).emitRound(builder.operand(getValue()), mode));
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
index 7467d4261d1..6a0e4476de1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
@@ -50,6 +50,7 @@ import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.replacements.ArraysSubstitutions;
 import org.graalvm.compiler.replacements.IntegerSubstitutions;
 import org.graalvm.compiler.replacements.LongSubstitutions;
+import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.UnsafeGetPlugin;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.UnsafePutPlugin;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
@@ -74,6 +75,8 @@ public class AMD64GraphBuilderPlugins {
             public void run() {
                 registerIntegerLongPlugins(invocationPlugins, IntegerSubstitutions.class, JavaKind.Int, arch, replacementsBytecodeProvider);
                 registerIntegerLongPlugins(invocationPlugins, LongSubstitutions.class, JavaKind.Long, arch, replacementsBytecodeProvider);
+                StandardGraphBuilderPlugins.registerPlatformSpecificUnsafePlugins(invocationPlugins, replacementsBytecodeProvider,
+                                new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object, JavaKind.Boolean, JavaKind.Byte, JavaKind.Short, JavaKind.Char, JavaKind.Float, JavaKind.Double});
                 registerUnsafePlugins(invocationPlugins, replacementsBytecodeProvider);
                 registerStringPlugins(invocationPlugins, arch, replacementsBytecodeProvider);
                 registerStringLatin1Plugins(invocationPlugins, replacementsBytecodeProvider);
@@ -218,12 +221,16 @@ public class AMD64GraphBuilderPlugins {
 
     private static void registerUnsafePlugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
         Registration r;
+        JavaKind[] unsafeJavaKinds;
         if (Java8OrEarlier) {
             r = new Registration(plugins, Unsafe.class);
+            unsafeJavaKinds = new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object};
         } else {
             r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacementsBytecodeProvider);
+            unsafeJavaKinds = new JavaKind[]{JavaKind.Boolean, JavaKind.Byte, JavaKind.Char, JavaKind.Short, JavaKind.Int, JavaKind.Long, JavaKind.Object};
         }
-        for (JavaKind kind : new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object}) {
+
+        for (JavaKind kind : unsafeJavaKinds) {
             Class<?> javaClass = kind == JavaKind.Object ? Object.class : kind.toJavaClass();
 
             r.register4("getAndSet" + kind.name(), Receiver.class, Object.class, long.class, javaClass, new InvocationPlugin() {
@@ -236,14 +243,14 @@ public class AMD64GraphBuilderPlugins {
                     return true;
                 }
             });
-            if (kind != JavaKind.Object) {
+            if (kind != JavaKind.Boolean && kind.isNumericInteger()) {
                 r.register4("getAndAdd" + kind.name(), Receiver.class, Object.class, long.class, javaClass, new InvocationPlugin() {
                     @Override
                     public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode object, ValueNode offset, ValueNode delta) {
                         // Emits a null-check for the otherwise unused receiver
                         unsafe.get();
                         AddressNode address = b.add(new OffsetAddressNode(object, offset));
-                        b.addPush(kind, new AtomicReadAndAddNode(address, delta, LocationIdentity.any()));
+                        b.addPush(kind, new AtomicReadAndAddNode(address, delta, kind, LocationIdentity.any()));
                         b.getGraph().markUnsafeAccess();
                         return true;
                     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/UnsafeReplacementsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/UnsafeReplacementsTest.java
new file mode 100644
index 00000000000..041ca10370a
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/UnsafeReplacementsTest.java
@@ -0,0 +1,513 @@
+/*
+ * 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.replacements.jdk9;
+
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import org.graalvm.compiler.api.test.Graal;
+import org.graalvm.compiler.core.phases.HighTier;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.replacements.test.MethodSubstitutionTest;
+import org.graalvm.compiler.runtime.RuntimeProvider;
+import org.graalvm.compiler.test.AddExports;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+
+@AddExports("java.base/jdk.internal.misc")
+public class UnsafeReplacementsTest extends MethodSubstitutionTest {
+
+    // See GR-9819.
+    @SuppressWarnings("unused") ResolvedJavaMethod method = null;
+
+    static class Container {
+        public volatile boolean booleanField;
+        public volatile byte byteField = 17;
+        public volatile char charField = 1025;
+        public volatile short shortField = 2232;
+        public volatile int intField = 0xcafebabe;
+        public volatile long longField = 0xdedababafafaL;
+        public volatile float floatField = 0.125f;
+        public volatile double doubleField = 0.125;
+        public volatile Object objectField = dummyValue;
+    }
+
+    static jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
+    static Container dummyValue = new Container();
+    static Container newDummyValue = new Container();
+    static long booleanOffset;
+    static long byteOffset;
+    static long charOffset;
+    static long shortOffset;
+    static long intOffset;
+    static long longOffset;
+    static long floatOffset;
+    static long doubleOffset;
+    static long objectOffset;
+
+    static {
+        try {
+            booleanOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("booleanField"));
+            byteOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("byteField"));
+            charOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("charField"));
+            shortOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("shortField"));
+            intOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("intField"));
+            longOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("longField"));
+            floatOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("floatField"));
+            doubleOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("doubleField"));
+            objectOffset = unsafe.objectFieldOffset(Container.class.getDeclaredField("objectField"));
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static boolean unsafeCompareAndSetBoolean() {
+        Container container = new Container();
+        return unsafe.compareAndSetBoolean(container, booleanOffset, false, true);
+    }
+
+    public static boolean unsafeCompareAndSetByte() {
+        Container container = new Container();
+        return unsafe.compareAndSetByte(container, byteOffset, (byte) 17, (byte) 121);
+    }
+
+    public static boolean unsafeCompareAndSetChar() {
+        Container container = new Container();
+        return unsafe.compareAndSetChar(container, charOffset, (char) 1025, (char) 1777);
+    }
+
+    public static boolean unsafeCompareAndSetShort() {
+        Container container = new Container();
+        return unsafe.compareAndSetShort(container, shortOffset, (short) 2232, (short) 12111);
+    }
+
+    public static boolean unsafeCompareAndSetInt() {
+        Container container = new Container();
+        return unsafe.compareAndSetInt(container, intOffset, 0xcafebabe, 0xbabefafa);
+    }
+
+    public static boolean unsafeCompareAndSetLong() {
+        Container container = new Container();
+        return unsafe.compareAndSetLong(container, longOffset, 0xdedababafafaL, 0xfafacecafafadedaL);
+    }
+
+    public static boolean unsafeCompareAndSetFloat() {
+        Container container = new Container();
+        return unsafe.compareAndSetFloat(container, floatOffset, 0.125f, 0.25f);
+    }
+
+    public static boolean unsafeCompareAndSetDouble() {
+        Container container = new Container();
+        return unsafe.compareAndSetDouble(container, doubleOffset, 0.125, 0.25);
+    }
+
+    public static boolean unsafeCompareAndSetObject() {
+        Container container = new Container();
+        return unsafe.compareAndSetObject(container, objectOffset, dummyValue, newDummyValue);
+    }
+
+    public static boolean unsafeCompareAndExchangeBoolean() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeBoolean(container, booleanOffset, false, true);
+    }
+
+    public static byte unsafeCompareAndExchangeByte() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeByte(container, byteOffset, (byte) 17, (byte) 31);
+    }
+
+    public static char unsafeCompareAndExchangeChar() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeChar(container, charOffset, (char) 1025, (char) 4502);
+    }
+
+    public static short unsafeCompareAndExchangeShort() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeShort(container, shortOffset, (short) 2232, (short) 8121);
+    }
+
+    public static int unsafeCompareAndExchangeInt() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeInt(container, intOffset, 0xcafebabe, 0xbabefafa);
+    }
+
+    public static long unsafeCompareAndExchangeLong() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeLong(container, longOffset, 0xdedababafafaL, 0xfafacecafafadedaL);
+    }
+
+    public static float unsafeCompareAndExchangeFloat() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeFloat(container, floatOffset, 0.125f, 0.25f);
+    }
+
+    public static double unsafeCompareAndExchangeDouble() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeDouble(container, doubleOffset, 0.125, 0.25);
+    }
+
+    public static Object unsafeCompareAndExchangeObject() {
+        Container container = new Container();
+        return unsafe.compareAndExchangeObject(container, objectOffset, dummyValue, newDummyValue);
+    }
+
+    @Test
+    public void testCompareAndSet() {
+        TargetDescription target = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getTarget();
+        if (target.arch instanceof AMD64) {
+            testGraph("unsafeCompareAndSetBoolean");
+            testGraph("unsafeCompareAndSetByte");
+            testGraph("unsafeCompareAndSetChar");
+            testGraph("unsafeCompareAndSetShort");
+            testGraph("unsafeCompareAndSetInt");
+            testGraph("unsafeCompareAndSetLong");
+            testGraph("unsafeCompareAndSetFloat");
+            testGraph("unsafeCompareAndSetDouble");
+            testGraph("unsafeCompareAndSetObject");
+            testGraph("unsafeCompareAndExchangeBoolean");
+            testGraph("unsafeCompareAndExchangeByte");
+            testGraph("unsafeCompareAndExchangeChar");
+            testGraph("unsafeCompareAndExchangeShort");
+            testGraph("unsafeCompareAndExchangeInt");
+            testGraph("unsafeCompareAndExchangeLong");
+            testGraph("unsafeCompareAndExchangeFloat");
+            testGraph("unsafeCompareAndExchangeDouble");
+            testGraph("unsafeCompareAndExchangeObject");
+        }
+        test("unsafeCompareAndSetBoolean");
+        test("unsafeCompareAndSetByte");
+        test("unsafeCompareAndSetChar");
+        test("unsafeCompareAndSetShort");
+        test("unsafeCompareAndSetInt");
+        test("unsafeCompareAndSetLong");
+        test("unsafeCompareAndSetFloat");
+        test("unsafeCompareAndSetDouble");
+        test("unsafeCompareAndSetObject");
+        test("unsafeCompareAndExchangeBoolean");
+        test("unsafeCompareAndExchangeByte");
+        test("unsafeCompareAndExchangeChar");
+        test("unsafeCompareAndExchangeShort");
+        test("unsafeCompareAndExchangeInt");
+        test("unsafeCompareAndExchangeLong");
+        test("unsafeCompareAndExchangeFloat");
+        test("unsafeCompareAndExchangeDouble");
+        test("unsafeCompareAndExchangeObject");
+    }
+
+    public static int unsafeGetAndAddByte() {
+        Container container = new Container();
+        return unsafe.getAndAddByte(container, byteOffset, (byte) 2);
+    }
+
+    public static int unsafeGetAndAddChar() {
+        Container container = new Container();
+        return unsafe.getAndAddChar(container, charOffset, (char) 250);
+    }
+
+    public static int unsafeGetAndAddShort() {
+        Container container = new Container();
+        return unsafe.getAndAddShort(container, shortOffset, (short) 1250);
+    }
+
+    public static int unsafeGetAndAddInt() {
+        Container container = new Container();
+        return unsafe.getAndAddInt(container, intOffset, 104501);
+    }
+
+    public static long unsafeGetAndAddLong() {
+        Container container = new Container();
+        return unsafe.getAndAddLong(container, longOffset, 0x123456abcdL);
+    }
+
+    @Test
+    public void testGetAndAdd() {
+        TargetDescription target = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getTarget();
+        if (target.arch instanceof AMD64) {
+            testGraph("unsafeGetAndAddByte");
+            testGraph("unsafeGetAndAddChar");
+            testGraph("unsafeGetAndAddShort");
+            testGraph("unsafeGetAndAddInt");
+            testGraph("unsafeGetAndAddLong");
+        }
+        test("unsafeGetAndAddByte");
+        test("unsafeGetAndAddChar");
+        test("unsafeGetAndAddShort");
+        test("unsafeGetAndAddInt");
+        test("unsafeGetAndAddLong");
+    }
+
+    public static boolean unsafeGetAndSetBoolean() {
+        Container container = new Container();
+        return unsafe.getAndSetBoolean(container, booleanOffset, true);
+    }
+
+    public static byte unsafeGetAndSetByte() {
+        Container container = new Container();
+        return unsafe.getAndSetByte(container, byteOffset, (byte) 129);
+    }
+
+    public static char unsafeGetAndSetChar() {
+        Container container = new Container();
+        return unsafe.getAndSetChar(container, charOffset, (char) 21111);
+    }
+
+    public static short unsafeGetAndSetShort() {
+        Container container = new Container();
+        return unsafe.getAndSetShort(container, shortOffset, (short) 21111);
+    }
+
+    public static int unsafeGetAndSetInt() {
+        Container container = new Container();
+        return unsafe.getAndSetInt(container, intOffset, 0x1234af);
+    }
+
+    public static long unsafeGetAndSetLong() {
+        Container container = new Container();
+        return unsafe.getAndSetLong(container, longOffset, 0x12345678abL);
+    }
+
+    public static Object unsafeGetAndSetObject() {
+        Container container = new Container();
+        container.objectField = null;
+        Container other = new Container();
+        return unsafe.getAndSetObject(container, objectOffset, other);
+    }
+
+    @Test
+    public void testGetAndSet() {
+        TargetDescription target = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getTarget();
+        if (target.arch instanceof AMD64) {
+            testGraph("unsafeGetAndSetBoolean");
+            testGraph("unsafeGetAndSetByte");
+            testGraph("unsafeGetAndSetChar");
+            testGraph("unsafeGetAndSetShort");
+            testGraph("unsafeGetAndSetInt");
+            testGraph("unsafeGetAndSetLong");
+            testGraph("unsafeGetAndSetObject");
+        }
+        test("unsafeGetAndSetBoolean");
+        test("unsafeGetAndSetByte");
+        test("unsafeGetAndSetChar");
+        test("unsafeGetAndSetShort");
+        test("unsafeGetAndSetInt");
+        test("unsafeGetAndSetLong");
+        test("unsafeGetAndSetObject");
+    }
+
+    public static void fieldInstance() {
+        JdkInternalMiscUnsafeAccessTestBoolean.testFieldInstance();
+    }
+
+    @Test
+    public void testFieldInstance() {
+        test(new OptionValues(getInitialOptions(), HighTier.Options.Inline, false), "fieldInstance");
+    }
+
+    public static void array() {
+        JdkInternalMiscUnsafeAccessTestBoolean.testArray();
+    }
+
+    @Test
+    public void testArray() {
+        test(new OptionValues(getInitialOptions(), HighTier.Options.Inline, false), "array");
+    }
+
+    public static void fieldStatic() {
+        JdkInternalMiscUnsafeAccessTestBoolean.testFieldStatic();
+    }
+
+    @Test
+    public void testFieldStatic() {
+        test(new OptionValues(getInitialOptions(), HighTier.Options.Inline, false), "fieldStatic");
+    }
+
+    public static class JdkInternalMiscUnsafeAccessTestBoolean {
+        static final int ITERATIONS = 100000;
+
+        static final int WEAK_ATTEMPTS = 10;
+
+        static final long V_OFFSET;
+
+        static final Object STATIC_V_BASE;
+
+        static final long STATIC_V_OFFSET;
+
+        static final int ARRAY_OFFSET;
+
+        static final int ARRAY_SHIFT;
+
+        static {
+            try {
+                Field staticVField = UnsafeReplacementsTest.JdkInternalMiscUnsafeAccessTestBoolean.class.getDeclaredField("staticV");
+                STATIC_V_BASE = unsafe.staticFieldBase(staticVField);
+                STATIC_V_OFFSET = unsafe.staticFieldOffset(staticVField);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
+            try {
+                Field vField = UnsafeReplacementsTest.JdkInternalMiscUnsafeAccessTestBoolean.class.getDeclaredField("v");
+                V_OFFSET = unsafe.objectFieldOffset(vField);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
+            ARRAY_OFFSET = unsafe.arrayBaseOffset(boolean[].class);
+            int ascale = unsafe.arrayIndexScale(boolean[].class);
+            ARRAY_SHIFT = 31 - Integer.numberOfLeadingZeros(ascale);
+        }
+
+        static boolean staticV;
+
+        boolean v;
+
+        @BytecodeParserForceInline
+        public static void testFieldInstance() {
+            JdkInternalMiscUnsafeAccessTestBoolean t = new JdkInternalMiscUnsafeAccessTestBoolean();
+            for (int c = 0; c < ITERATIONS; c++) {
+                testAccess(t, V_OFFSET);
+            }
+        }
+
+        public static void testFieldStatic() {
+            for (int c = 0; c < ITERATIONS; c++) {
+                testAccess(STATIC_V_BASE, STATIC_V_OFFSET);
+            }
+        }
+
+        public static void testArray() {
+            boolean[] array = new boolean[10];
+            for (int c = 0; c < ITERATIONS; c++) {
+                for (int i = 0; i < array.length; i++) {
+                    testAccess(array, (((long) i) << ARRAY_SHIFT) + ARRAY_OFFSET);
+                }
+            }
+        }
+
+        public static void assertEquals(Object seen, Object expected, String message) {
+            if (seen != expected) {
+                throw new AssertionError(message + " - seen: " + seen + ", expected: " + expected);
+            }
+        }
+
+        // Checkstyle: stop
+        @BytecodeParserForceInline
+        public static void testAccess(Object base, long offset) {
+            // Advanced compare
+            {
+                boolean r = unsafe.compareAndExchangeBoolean(base, offset, false, true);
+                assertEquals(r, false, "success compareAndExchange boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "success compareAndExchange boolean value");
+            }
+
+            {
+                boolean r = unsafe.compareAndExchangeBoolean(base, offset, false, false);
+                assertEquals(r, true, "failing compareAndExchange boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "failing compareAndExchange boolean value");
+            }
+
+            {
+                boolean r = unsafe.compareAndExchangeBooleanAcquire(base, offset, true, false);
+                assertEquals(r, true, "success compareAndExchangeAcquire boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+            }
+
+            {
+                boolean r = unsafe.compareAndExchangeBooleanAcquire(base, offset, true, false);
+                assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+            }
+
+            {
+                boolean r = unsafe.compareAndExchangeBooleanRelease(base, offset, false, true);
+                assertEquals(r, false, "success compareAndExchangeRelease boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+            }
+
+            {
+                boolean r = unsafe.compareAndExchangeBooleanRelease(base, offset, false, false);
+                assertEquals(r, true, "failing compareAndExchangeRelease boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+            }
+
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = unsafe.weakCompareAndSetBooleanPlain(base, offset, true, false);
+                }
+                assertEquals(success, true, "weakCompareAndSetPlain boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, false, "weakCompareAndSetPlain boolean value");
+            }
+
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = unsafe.weakCompareAndSetBooleanAcquire(base, offset, false, true);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "weakCompareAndSetAcquire boolean");
+            }
+
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = unsafe.weakCompareAndSetBooleanRelease(base, offset, true, false);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, false, "weakCompareAndSetRelease boolean");
+            }
+
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = unsafe.weakCompareAndSetBoolean(base, offset, false, true);
+                }
+                assertEquals(success, true, "weakCompareAndSet boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "weakCompareAndSet boolean");
+            }
+
+            unsafe.putBoolean(base, offset, false);
+
+            // Compare set and get
+            {
+                boolean o = unsafe.getAndSetBoolean(base, offset, true);
+                assertEquals(o, false, "getAndSet boolean");
+                boolean x = unsafe.getBoolean(base, offset);
+                assertEquals(x, true, "getAndSet boolean value");
+            }
+
+        }
+        // Checkstyle: resume
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 00000000000..47fbbfee750
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+org.graalvm.compiler.replacements.processor.ReplacementsAnnotationProcessor
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/APHotSpotSignature.java
similarity index 98%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/APHotSpotSignature.java
index 48cf4d7fe36..006d483a9a1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/APHotSpotSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, 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
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/AnnotationHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/AnnotationHandler.java
new file mode 100644
index 00000000000..acb5cea2d6b
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/AnnotationHandler.java
@@ -0,0 +1,47 @@
+/*
+ * 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 org.graalvm.compiler.replacements.processor;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+
+import org.graalvm.compiler.processor.AbstractProcessor;
+
+/**
+ * Handles processing of a single annotation type.
+ */
+public abstract class AnnotationHandler {
+
+    protected final AbstractProcessor processor;
+    protected final String annotationTypeName;
+
+    public AnnotationHandler(AbstractProcessor processor, String annotationTypeName) {
+        this.processor = processor;
+        this.annotationTypeName = annotationTypeName;
+    }
+
+    /**
+     * Processes the presence of {@code annotation} on {@code element}.
+     */
+    public abstract void process(Element element, AnnotationMirror annotation, PluginGenerator generator);
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ClassSubstitutionHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ClassSubstitutionHandler.java
new file mode 100644
index 00000000000..a5301366dd6
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ClassSubstitutionHandler.java
@@ -0,0 +1,109 @@
+/*
+ * 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 org.graalvm.compiler.replacements.processor;
+
+import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValue;
+import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValueList;
+
+import java.util.List;
+
+import javax.annotation.processing.Messager;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic.Kind;
+
+import org.graalvm.compiler.processor.AbstractProcessor;
+
+/**
+ * Handler for the {@value #CLASS_SUBSTITUTION_CLASS_NAME} annotation.
+ */
+public final class ClassSubstitutionHandler extends AnnotationHandler {
+
+    static final String CLASS_SUBSTITUTION_CLASS_NAME = "org.graalvm.compiler.api.replacements.ClassSubstitution";
+
+    public ClassSubstitutionHandler(AbstractProcessor env) {
+        super(env, CLASS_SUBSTITUTION_CLASS_NAME);
+    }
+
+    @Override
+    public void process(Element element, AnnotationMirror classSubstitution, PluginGenerator generator) {
+        if (!element.getKind().isClass()) {
+            assert false : "Element is guaranteed to be a class.";
+            return;
+        }
+        TypeElement type = (TypeElement) element;
+
+        TypeElement substitutionType = resolveOriginalType(processor, type, classSubstitution);
+        if (substitutionType == null) {
+            return;
+        }
+    }
+
+    static TypeElement resolveOriginalType(AbstractProcessor processor, Element sourceElement, AnnotationMirror classSubstition) {
+        TypeMirror type = getAnnotationValue(classSubstition, "value", TypeMirror.class);
+        List<String> classNames = getAnnotationValueList(classSubstition, "className", String.class);
+        boolean optional = getAnnotationValue(classSubstition, "optional", Boolean.class);
+
+        Messager messager = processor.env().getMessager();
+        if (type.getKind() != TypeKind.DECLARED) {
+            messager.printMessage(Kind.ERROR, "The provided class must be a declared type.", sourceElement, classSubstition);
+            return null;
+        }
+
+        if (!classSubstition.getAnnotationType().asElement().equals(((DeclaredType) type).asElement())) {
+            if (classNames.size() != 0) {
+                String msg = "The usage of value and className is exclusive.";
+                messager.printMessage(Kind.ERROR, msg, sourceElement, classSubstition);
+                messager.printMessage(Kind.ERROR, msg, sourceElement, classSubstition);
+            }
+
+            return (TypeElement) ((DeclaredType) type).asElement();
+        }
+
+        if (classNames.size() != 0) {
+            TypeElement typeElement = null;
+            for (String className : classNames) {
+                typeElement = processor.getTypeElementOrNull(className);
+                if (typeElement != null) {
+                    break;
+                }
+            }
+            if (typeElement == null && !optional) {
+                messager.printMessage(Kind.ERROR, String.format("None of the classes %s were found on the classpath.", classNames), sourceElement, classSubstition);
+            }
+
+            return typeElement;
+        }
+
+        if (!optional) {
+            messager.printMessage(Kind.ERROR, String.format("No value for 'value' or 'className' provided."), sourceElement, classSubstition);
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/FoldHandler.java
similarity index 64%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/FoldHandler.java
index 4531de72c33..5d5c921186e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/FoldHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -20,11 +20,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
 
-import java.lang.annotation.Annotation;
+import static org.graalvm.compiler.processor.AbstractProcessor.getSimpleName;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -33,21 +32,22 @@ import javax.lang.model.element.Modifier;
 import javax.lang.model.type.TypeKind;
 import javax.tools.Diagnostic.Kind;
 
-import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
-public final class FoldVerifier extends AbstractVerifier {
+/**
+ * Handler for the {@value #FOLD_CLASS_NAME} annotation.
+ */
+public final class FoldHandler extends AnnotationHandler {
 
-    public FoldVerifier(ProcessingEnvironment env) {
-        super(env);
+    static final String FOLD_CLASS_NAME = "org.graalvm.compiler.api.replacements.Fold";
+    static final String INJECTED_PARAMETER_CLASS_NAME = "org.graalvm.compiler.api.replacements.Fold.InjectedParameter";
+
+    public FoldHandler(AbstractProcessor processor) {
+        super(processor, FOLD_CLASS_NAME);
     }
 
     @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return Fold.class;
-    }
-
-    @Override
-    public void verify(Element element, AnnotationMirror annotation, PluginGenerator generator) {
+    public void process(Element element, AnnotationMirror annotation, PluginGenerator generator) {
         if (element.getKind() != ElementKind.METHOD) {
             assert false : "Element is guaranteed to be a method.";
             return;
@@ -55,11 +55,11 @@ public final class FoldVerifier extends AbstractVerifier {
 
         ExecutableElement foldMethod = (ExecutableElement) element;
         if (foldMethod.getReturnType().getKind() == TypeKind.VOID) {
-            env.getMessager().printMessage(Kind.ERROR,
-                            String.format("A @%s method must not be void as it won't yield a compile-time constant (the reason for supporting folding!).", Fold.class.getSimpleName()), element,
+            processor.env().getMessager().printMessage(Kind.ERROR,
+                            String.format("A @%s method must not be void as it won't yield a compile-time constant (the reason for supporting folding!).", getSimpleName(FOLD_CLASS_NAME)), element,
                             annotation);
         } else if (foldMethod.getModifiers().contains(Modifier.PRIVATE)) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("A @%s method must not be private.", Fold.class.getSimpleName()), element, annotation);
+            processor.env().getMessager().printMessage(Kind.ERROR, String.format("A @%s method must not be private.", getSimpleName(FOLD_CLASS_NAME)), element, annotation);
         } else {
             generator.addPlugin(new GeneratedFoldPlugin(foldMethod));
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java
similarity index 82%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java
index 32aed5cbd06..1e62d15baa5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -20,14 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
+
+import static org.graalvm.compiler.replacements.processor.FoldHandler.FOLD_CLASS_NAME;
+import static org.graalvm.compiler.replacements.processor.FoldHandler.INJECTED_PARAMETER_CLASS_NAME;
 
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -35,12 +37,11 @@ import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
-import org.graalvm.compiler.replacements.verifier.InjectedDependencies.WellKnownDependency;
+import org.graalvm.compiler.processor.AbstractProcessor;
+import org.graalvm.compiler.replacements.processor.InjectedDependencies.WellKnownDependency;
 
 /**
- * Create graph builder plugins for {@link Fold} methods.
+ * Create graph builder plugins for {@code Fold} methods.
  */
 public class GeneratedFoldPlugin extends GeneratedPlugin {
 
@@ -48,8 +49,9 @@ public class GeneratedFoldPlugin extends GeneratedPlugin {
         super(intrinsicMethod);
     }
 
-    private static TypeMirror stringType(ProcessingEnvironment env) {
-        return env.getElementUtils().getTypeElement("java.lang.String").asType();
+    @Override
+    protected TypeElement getAnnotationClass(AbstractProcessor processor) {
+        return processor.getTypeElement(FOLD_CLASS_NAME);
     }
 
     @Override
@@ -60,7 +62,7 @@ public class GeneratedFoldPlugin extends GeneratedPlugin {
     }
 
     @Override
-    protected InjectedDependencies createExecute(ProcessingEnvironment env, PrintWriter out) {
+    protected InjectedDependencies createExecute(AbstractProcessor processor, PrintWriter out) {
         InjectedDependencies deps = new InjectedDependencies();
         List<? extends VariableElement> params = intrinsicMethod.getParameters();
 
@@ -71,17 +73,17 @@ public class GeneratedFoldPlugin extends GeneratedPlugin {
         } else {
             receiver = "arg0";
             TypeElement type = (TypeElement) intrinsicMethod.getEnclosingElement();
-            constantArgument(env, out, deps, argCount, type.asType(), argCount);
+            constantArgument(processor, out, deps, argCount, type.asType(), argCount);
             argCount++;
         }
 
         int firstArg = argCount;
         for (VariableElement param : params) {
-            if (param.getAnnotation(InjectedParameter.class) == null) {
-                constantArgument(env, out, deps, argCount, param.asType(), argCount);
+            if (processor.getAnnotation(param, processor.getType(INJECTED_PARAMETER_CLASS_NAME)) == null) {
+                constantArgument(processor, out, deps, argCount, param.asType(), argCount);
             } else {
                 out.printf("            assert checkInjectedArgument(b, args[%d], targetMethod);\n", argCount);
-                out.printf("            %s arg%d = %s;\n", param.asType(), argCount, deps.use(env, (DeclaredType) param.asType()));
+                out.printf("            %s arg%d = %s;\n", param.asType(), argCount, deps.use(processor, (DeclaredType) param.asType()));
             }
             argCount++;
         }
@@ -140,7 +142,7 @@ public class GeneratedFoldPlugin extends GeneratedPlugin {
             case ARRAY:
             case TYPEVAR:
             case DECLARED:
-                if (returnType.equals(stringType(env))) {
+                if (returnType.equals(processor.getType("java.lang.String"))) {
                     out.printf("            JavaConstant constant = %s.forString(result);\n", deps.use(WellKnownDependency.CONSTANT_REFLECTION));
                 } else {
                     out.printf("            JavaConstant constant = %s.forObject(result);\n", deps.use(WellKnownDependency.SNIPPET_REFLECTION));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java
similarity index 73%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java
index 3b9b80bdf56..e9a13ab5540 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -20,25 +20,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
+
+import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.CONSTANT_NODE_PARAMETER_CLASS_NAME;
+import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.INJECTED_NODE_PARAMETER_CLASS_NAME;
+import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.VALUE_NODE_CLASS_NAME;
 
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.InjectedNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
 /**
- * Create graph builder plugins for {@link NodeIntrinsic} methods.
+ * Create graph builder plugins for {@code NodeIntrinsic} methods.
  */
 public abstract class GeneratedNodeIntrinsicPlugin extends GeneratedPlugin {
 
@@ -49,16 +51,17 @@ public abstract class GeneratedNodeIntrinsicPlugin extends GeneratedPlugin {
         this.signature = signature;
     }
 
-    private static TypeMirror valueNodeType(ProcessingEnvironment env) {
-        return env.getElementUtils().getTypeElement("org.graalvm.compiler.nodes.ValueNode").asType();
+    @Override
+    protected TypeElement getAnnotationClass(AbstractProcessor processor) {
+        return processor.getTypeElement(NodeIntrinsicHandler.NODE_INTRINSIC_CLASS_NAME);
     }
 
     protected abstract List<? extends VariableElement> getParameters();
 
-    protected abstract void factoryCall(ProcessingEnvironment env, PrintWriter out, InjectedDependencies deps, int argCount);
+    protected abstract void factoryCall(AbstractProcessor processor, PrintWriter out, InjectedDependencies deps, int argCount);
 
     @Override
-    protected InjectedDependencies createExecute(ProcessingEnvironment env, PrintWriter out) {
+    protected InjectedDependencies createExecute(AbstractProcessor processor, PrintWriter out) {
         InjectedDependencies deps = new InjectedDependencies();
 
         List<? extends VariableElement> params = getParameters();
@@ -66,18 +69,18 @@ public abstract class GeneratedNodeIntrinsicPlugin extends GeneratedPlugin {
         int idx = 0;
         for (; idx < params.size(); idx++) {
             VariableElement param = params.get(idx);
-            if (param.getAnnotation(InjectedNodeParameter.class) == null) {
+            if (processor.getAnnotation(param, processor.getType(INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) {
                 break;
             }
 
-            out.printf("            %s arg%d = %s;\n", param.asType(), idx, deps.use(env, (DeclaredType) param.asType()));
+            out.printf("            %s arg%d = %s;\n", param.asType(), idx, deps.use(processor, (DeclaredType) param.asType()));
         }
 
         for (int i = 0; i < signature.length; i++, idx++) {
-            if (intrinsicMethod.getParameters().get(i).getAnnotation(ConstantNodeParameter.class) != null) {
-                constantArgument(env, out, deps, idx, signature[i], i);
+            if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) {
+                constantArgument(processor, out, deps, idx, signature[i], i);
             } else {
-                if (signature[i].equals(valueNodeType(env))) {
+                if (signature[i].equals(processor.getType(VALUE_NODE_CLASS_NAME))) {
                     out.printf("            ValueNode arg%d = args[%d];\n", idx, i);
                 } else {
                     out.printf("            %s arg%d = (%s) args[%d];\n", signature[i], idx, signature[i], i);
@@ -85,7 +88,7 @@ public abstract class GeneratedNodeIntrinsicPlugin extends GeneratedPlugin {
             }
         }
 
-        factoryCall(env, out, deps, idx);
+        factoryCall(processor, out, deps, idx);
 
         return deps;
     }
@@ -112,7 +115,7 @@ public abstract class GeneratedNodeIntrinsicPlugin extends GeneratedPlugin {
         }
 
         @Override
-        protected void factoryCall(ProcessingEnvironment env, PrintWriter out, InjectedDependencies deps, int argCount) {
+        protected void factoryCall(AbstractProcessor processor, PrintWriter out, InjectedDependencies deps, int argCount) {
             out.printf("            %s node = new %s(", constructor.getEnclosingElement(), constructor.getEnclosingElement());
             if (argCount > 0) {
                 out.printf("arg0");
@@ -152,7 +155,7 @@ public abstract class GeneratedNodeIntrinsicPlugin extends GeneratedPlugin {
         }
 
         @Override
-        protected void factoryCall(ProcessingEnvironment env, PrintWriter out, InjectedDependencies deps, int argCount) {
+        protected void factoryCall(AbstractProcessor processor, PrintWriter out, InjectedDependencies deps, int argCount) {
             out.printf("            return %s.%s(b, targetMethod", customFactory.getEnclosingElement(), customFactory.getSimpleName());
             for (int i = 0; i < argCount; i++) {
                 out.printf(", arg%d", i);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java
similarity index 85%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java
index 1a8fb9e2070..4b078bb3d2c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -20,12 +20,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
 
 import java.io.PrintWriter;
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -36,8 +35,9 @@ import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.WildcardType;
 
-import org.graalvm.compiler.replacements.verifier.InjectedDependencies.Dependency;
-import org.graalvm.compiler.replacements.verifier.InjectedDependencies.WellKnownDependency;
+import org.graalvm.compiler.processor.AbstractProcessor;
+import org.graalvm.compiler.replacements.processor.InjectedDependencies.Dependency;
+import org.graalvm.compiler.replacements.processor.InjectedDependencies.WellKnownDependency;
 
 public abstract class GeneratedPlugin {
 
@@ -52,6 +52,8 @@ public abstract class GeneratedPlugin {
         this.pluginName = intrinsicMethod.getEnclosingElement().getSimpleName() + "_" + intrinsicMethod.getSimpleName();
     }
 
+    protected abstract TypeElement getAnnotationClass(AbstractProcessor processor);
+
     public String getPluginName() {
         return pluginName;
     }
@@ -60,7 +62,7 @@ public abstract class GeneratedPlugin {
         this.pluginName = pluginName;
     }
 
-    public void generate(ProcessingEnvironment env, PrintWriter out) {
+    public void generate(AbstractProcessor processor, PrintWriter out) {
         out.printf("    //        class: %s\n", intrinsicMethod.getEnclosingElement());
         out.printf("    //       method: %s\n", intrinsicMethod);
         out.printf("    // generated-by: %s\n", getClass().getName());
@@ -68,10 +70,14 @@ public abstract class GeneratedPlugin {
         out.printf("\n");
         out.printf("        @Override\n");
         out.printf("        public boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] args) {\n");
-        InjectedDependencies deps = createExecute(env, out);
+        InjectedDependencies deps = createExecute(processor, out);
+        out.printf("        }\n");
+        out.printf("        @Override\n");
+        out.printf("        public Class<? extends Annotation> getSource() {\n");
+        out.printf("            return %s.class;\n", getAnnotationClass(processor).getQualifiedName().toString().replace('$', '.'));
         out.printf("        }\n");
 
-        createPrivateMembers(out, deps);
+        createPrivateMembers(processor, out, deps);
 
         out.printf("    }\n");
     }
@@ -93,11 +99,7 @@ public abstract class GeneratedPlugin {
 
     public abstract void extraImports(Set<String> imports);
 
-    protected abstract InjectedDependencies createExecute(ProcessingEnvironment env, PrintWriter out);
-
-    private static TypeMirror resolvedJavaTypeType(ProcessingEnvironment env) {
-        return env.getElementUtils().getTypeElement("jdk.vm.ci.meta.ResolvedJavaType").asType();
-    }
+    protected abstract InjectedDependencies createExecute(AbstractProcessor processor, PrintWriter out);
 
     static String getErasedType(TypeMirror type) {
         switch (type.getKind()) {
@@ -153,7 +155,7 @@ public abstract class GeneratedPlugin {
         }
     }
 
-    private void createPrivateMembers(PrintWriter out, InjectedDependencies deps) {
+    private void createPrivateMembers(AbstractProcessor processor, PrintWriter out, InjectedDependencies deps) {
         if (!deps.isEmpty()) {
             out.printf("\n");
             for (Dependency dep : deps) {
@@ -163,7 +165,7 @@ public abstract class GeneratedPlugin {
             out.printf("\n");
             out.printf("        private %s(InjectionProvider injection) {\n", pluginName);
             for (Dependency dep : deps) {
-                out.printf("            this.%s = %s;\n", dep.name, dep.inject(intrinsicMethod));
+                out.printf("            this.%s = %s;\n", dep.name, dep.inject(processor, intrinsicMethod));
             }
             out.printf("        }\n");
 
@@ -196,13 +198,13 @@ public abstract class GeneratedPlugin {
         }
     }
 
-    protected static void constantArgument(ProcessingEnvironment env, PrintWriter out, InjectedDependencies deps, int argIdx, TypeMirror type, int nodeIdx) {
+    protected static void constantArgument(AbstractProcessor processor, PrintWriter out, InjectedDependencies deps, int argIdx, TypeMirror type, int nodeIdx) {
         if (hasRawtypeWarning(type)) {
             out.printf("            @SuppressWarnings({\"rawtypes\"})\n");
         }
         out.printf("            %s arg%d;\n", getErasedType(type), argIdx);
         out.printf("            if (args[%d].isConstant()) {\n", nodeIdx);
-        if (type.equals(resolvedJavaTypeType(env))) {
+        if (type.equals(processor.getType("jdk.vm.ci.meta.ResolvedJavaType"))) {
             out.printf("                arg%d = %s.asJavaType(args[%d].asConstant());\n", argIdx, deps.use(WellKnownDependency.CONSTANT_REFLECTION), nodeIdx);
         } else {
             switch (type.getKind()) {
@@ -239,6 +241,7 @@ public abstract class GeneratedPlugin {
             }
         }
         out.printf("            } else {\n");
+        out.printf("                assert b.canDeferPlugin(this) : b.getClass().toString();\n");
         out.printf("                return false;\n");
         out.printf("            }\n");
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/InjectedDependencies.java
similarity index 76%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/InjectedDependencies.java
index 630b73855d7..b9928bafc6e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/InjectedDependencies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -20,18 +20,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
+
+import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValue;
+import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.NODE_INTRINSIC_CLASS_NAME;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.replacements.verifier.InjectedDependencies.Dependency;
+import org.graalvm.compiler.processor.AbstractProcessor;
+import org.graalvm.compiler.replacements.processor.InjectedDependencies.Dependency;
 
 public class InjectedDependencies implements Iterable<Dependency> {
 
@@ -45,7 +48,7 @@ public class InjectedDependencies implements Iterable<Dependency> {
             this.type = type;
         }
 
-        public abstract String inject(ExecutableElement inject);
+        public abstract String inject(AbstractProcessor processor, ExecutableElement inject);
     }
 
     private static final class InjectedDependency extends Dependency {
@@ -55,7 +58,7 @@ public class InjectedDependencies implements Iterable<Dependency> {
         }
 
         @Override
-        public String inject(ExecutableElement inject) {
+        public String inject(AbstractProcessor processor, ExecutableElement inject) {
             return String.format("injection.getInjectedArgument(%s.class)", type);
         }
     }
@@ -67,9 +70,9 @@ public class InjectedDependencies implements Iterable<Dependency> {
         }
 
         @Override
-        public String inject(ExecutableElement inject) {
-            NodeIntrinsic nodeIntrinsic = inject.getAnnotation(NodeIntrinsic.class);
-            boolean nonNull = nodeIntrinsic != null && nodeIntrinsic.injectedStampIsNonNull();
+        public String inject(AbstractProcessor processor, ExecutableElement inject) {
+            AnnotationMirror nodeIntrinsic = processor.getAnnotation(inject, processor.getType(NODE_INTRINSIC_CLASS_NAME));
+            boolean nonNull = nodeIntrinsic != null && getAnnotationValue(nodeIntrinsic, "injectedStampIsNonNull", Boolean.class);
             return String.format("injection.getInjectedStamp(%s.class, %s)", GeneratedPlugin.getErasedType(inject.getReturnType()), nonNull);
         }
     }
@@ -98,8 +101,8 @@ public class InjectedDependencies implements Iterable<Dependency> {
             this.generateMember = generateMember;
         }
 
-        private TypeMirror getType(ProcessingEnvironment env) {
-            return env.getElementUtils().getTypeElement(type).asType();
+        private TypeMirror getType(AbstractProcessor processor) {
+            return processor.getType(type);
         }
     }
 
@@ -116,9 +119,9 @@ public class InjectedDependencies implements Iterable<Dependency> {
         return wellKnown.expr;
     }
 
-    public String use(ProcessingEnvironment env, DeclaredType type) {
+    public String use(AbstractProcessor processor, DeclaredType type) {
         for (WellKnownDependency wellKnown : WellKnownDependency.values()) {
-            if (env.getTypeUtils().isAssignable(wellKnown.getType(env), type)) {
+            if (processor.env().getTypeUtils().isAssignable(wellKnown.getType(processor), type)) {
                 return use(wellKnown);
             }
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/MethodSubstitutionHandler.java
similarity index 66%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/MethodSubstitutionHandler.java
index 141e3d896d1..0b5f20580cf 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/MethodSubstitutionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, 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
@@ -20,16 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
+
+import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValue;
+import static org.graalvm.compiler.processor.AbstractProcessor.getSimpleName;
+import static org.graalvm.compiler.replacements.processor.ClassSubstitutionHandler.CLASS_SUBSTITUTION_CLASS_NAME;
 
-import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.Messager;
 import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -42,10 +44,14 @@ import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import javax.tools.Diagnostic.Kind;
 
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
-public final class MethodSubstitutionVerifier extends AbstractVerifier {
+/**
+ * Handler for the {@value #METHOD_SUBSTITUTION_CLASS_NAME} annotation.
+ */
+public final class MethodSubstitutionHandler extends AnnotationHandler {
+
+    private static final String METHOD_SUBSTITUTION_CLASS_NAME = "org.graalvm.compiler.api.replacements.MethodSubstitution";
 
     private static final boolean DEBUG = false;
 
@@ -56,18 +62,13 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
     private static final String ORIGINAL_METHOD_NAME_DEFAULT = "";
     private static final String ORIGINAL_SIGNATURE_DEFAULT = "";
 
-    public MethodSubstitutionVerifier(ProcessingEnvironment env) {
-        super(env);
-    }
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return MethodSubstitution.class;
+    public MethodSubstitutionHandler(AbstractProcessor processor) {
+        super(processor, METHOD_SUBSTITUTION_CLASS_NAME);
     }
 
     @SuppressWarnings("unused")
     @Override
-    public void verify(Element element, AnnotationMirror annotation, PluginGenerator generator) {
+    public void process(Element element, AnnotationMirror annotation, PluginGenerator generator) {
         if (element.getKind() != ElementKind.METHOD) {
             assert false : "Element is guaranteed to be a method.";
             return;
@@ -76,59 +77,60 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
         TypeElement substitutionType = findEnclosingClass(substitutionMethod);
         assert substitutionType != null;
 
-        AnnotationMirror substitutionClassAnnotation = VerifierAnnotationProcessor.findAnnotationMirror(env, substitutionType.getAnnotationMirrors(), ClassSubstitution.class);
+        Messager messager = processor.env().getMessager();
+        AnnotationMirror substitutionClassAnnotation = processor.getAnnotation(substitutionType, processor.getType(CLASS_SUBSTITUTION_CLASS_NAME));
         if (substitutionClassAnnotation == null) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("A @%s annotation is required on the enclosing class.", ClassSubstitution.class.getSimpleName()), element, annotation);
+            messager.printMessage(Kind.ERROR, String.format("A @%s annotation is required on the enclosing class.", getSimpleName(CLASS_SUBSTITUTION_CLASS_NAME)), element, annotation);
             return;
         }
-        boolean optional = resolveAnnotationValue(Boolean.class, findAnnotationValue(substitutionClassAnnotation, "optional"));
+        boolean optional = getAnnotationValue(substitutionClassAnnotation, "optional", Boolean.class);
         if (optional) {
             return;
         }
 
-        TypeElement originalType = ClassSubstitutionVerifier.resolveOriginalType(env, substitutionType, substitutionClassAnnotation);
+        TypeElement originalType = ClassSubstitutionHandler.resolveOriginalType(processor, substitutionType, substitutionClassAnnotation);
         if (originalType == null) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("The @%s annotation is invalid on the enclosing class.", ClassSubstitution.class.getSimpleName()), element, annotation);
+            messager.printMessage(Kind.ERROR, String.format("The @%s annotation is invalid on the enclosing class.", getSimpleName(CLASS_SUBSTITUTION_CLASS_NAME)), element, annotation);
             return;
         }
 
         if (!substitutionMethod.getModifiers().contains(Modifier.STATIC)) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("A @%s method must be static.", MethodSubstitution.class.getSimpleName()), element, annotation);
+            messager.printMessage(Kind.ERROR, String.format("A @%s method must be static.", getSimpleName(METHOD_SUBSTITUTION_CLASS_NAME)), element, annotation);
         }
 
         if (substitutionMethod.getModifiers().contains(Modifier.ABSTRACT) || substitutionMethod.getModifiers().contains(Modifier.NATIVE)) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("A @%s method must not be native or abstract.", MethodSubstitution.class.getSimpleName()), element, annotation);
+            messager.printMessage(Kind.ERROR, String.format("A @%s method must not be native or abstract.", getSimpleName(METHOD_SUBSTITUTION_CLASS_NAME)), element, annotation);
         }
 
         String originalName = originalName(substitutionMethod, annotation);
-        boolean isStatic = resolveAnnotationValue(Boolean.class, findAnnotationValue(annotation, ORIGINAL_IS_STATIC));
+        boolean isStatic = getAnnotationValue(annotation, ORIGINAL_IS_STATIC, Boolean.class);
         TypeMirror[] originalSignature = originalSignature(originalType, substitutionMethod, annotation, isStatic);
         if (originalSignature == null) {
             return;
         }
         ExecutableElement originalMethod = originalMethod(substitutionMethod, annotation, originalType, originalName, originalSignature, isStatic);
         if (DEBUG && originalMethod != null) {
-            env.getMessager().printMessage(Kind.NOTE, String.format("Found original method %s in type %s.", originalMethod, findEnclosingClass(originalMethod)));
+            messager.printMessage(Kind.NOTE, String.format("Found original method %s in type %s.", originalMethod, findEnclosingClass(originalMethod)));
         }
     }
 
     private TypeMirror[] originalSignature(TypeElement originalType, ExecutableElement method, AnnotationMirror annotation, boolean isStatic) {
-        AnnotationValue signatureValue = findAnnotationValue(annotation, ORIGINAL_SIGNATURE);
-        String signatureString = resolveAnnotationValue(String.class, signatureValue);
+        String signatureString = getAnnotationValue(annotation, ORIGINAL_SIGNATURE, String.class);
         List<TypeMirror> parameters = new ArrayList<>();
+        Messager messager = processor.env().getMessager();
         if (signatureString.equals(ORIGINAL_SIGNATURE_DEFAULT)) {
             for (int i = 0; i < method.getParameters().size(); i++) {
                 parameters.add(method.getParameters().get(i).asType());
             }
             if (!isStatic) {
                 if (parameters.isEmpty()) {
-                    env.getMessager().printMessage(Kind.ERROR, "Method signature must be a static method with the 'this' object as its first parameter", method, annotation);
+                    messager.printMessage(Kind.ERROR, "Method signature must be a static method with the 'this' object as its first parameter", method, annotation);
                     return null;
                 } else {
                     TypeMirror thisParam = parameters.remove(0);
                     if (!isSubtype(originalType.asType(), thisParam)) {
                         Name thisName = method.getParameters().get(0).getSimpleName();
-                        env.getMessager().printMessage(Kind.ERROR, String.format("The type of %s must assignable from %s", thisName, originalType), method, annotation);
+                        messager.printMessage(Kind.ERROR, String.format("The type of %s must assignable from %s", thisName, originalType), method, annotation);
                     }
                 }
             }
@@ -136,17 +138,16 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
         } else {
             try {
                 APHotSpotSignature signature = new APHotSpotSignature(signatureString);
-                parameters.add(signature.getReturnType(env));
+                parameters.add(signature.getReturnType(processor.env()));
                 for (int i = 0; i < signature.getParameterCount(false); i++) {
-                    parameters.add(signature.getParameterType(env, i));
+                    parameters.add(signature.getParameterType(processor.env(), i));
                 }
             } catch (Exception e) {
                 /*
                  * That's not good practice and should be changed after APHotSpotSignature has
                  * received a cleanup.
                  */
-                env.getMessager().printMessage(Kind.ERROR, String.format("Parsing the signature failed: %s", e.getMessage() != null ? e.getMessage() : e.toString()), method, annotation,
-                                signatureValue);
+                messager.printMessage(Kind.ERROR, String.format("Parsing the signature failed: %s", e.getMessage() != null ? e.getMessage() : e.toString()), method, annotation);
                 return null;
             }
         }
@@ -154,7 +155,7 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
     }
 
     private static String originalName(ExecutableElement substituteMethod, AnnotationMirror substitution) {
-        String originalMethodName = resolveAnnotationValue(String.class, findAnnotationValue(substitution, ORIGINAL_METHOD_NAME));
+        String originalMethodName = getAnnotationValue(substitution, ORIGINAL_METHOD_NAME, String.class);
         if (originalMethodName.equals(ORIGINAL_METHOD_NAME_DEFAULT)) {
             originalMethodName = substituteMethod.getSimpleName().toString();
         }
@@ -172,6 +173,7 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
             searchElements = ElementFilter.methodsIn(originalType.getEnclosedElements());
         }
 
+        Messager messager = processor.env().getMessager();
         ExecutableElement originalMethod = null;
         outer: for (ExecutableElement searchElement : searchElements) {
             if (searchElement.getSimpleName().toString().equals(originalName) && searchElement.getParameters().size() == signatureParameters.length) {
@@ -186,24 +188,25 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
             }
         }
         if (originalMethod == null) {
-            boolean optional = resolveAnnotationValue(Boolean.class, findAnnotationValue(substitutionAnnotation, "optional"));
+            boolean optional = getAnnotationValue(substitutionAnnotation, "optional", Boolean.class);
             if (!optional) {
-                env.getMessager().printMessage(Kind.ERROR, String.format("Could not find the original method with name '%s' and parameters '%s'.", originalName, Arrays.toString(signatureParameters)),
+                messager.printMessage(Kind.ERROR,
+                                String.format("Could not find the original method with name '%s' and parameters '%s'.", originalName, Arrays.toString(signatureParameters)),
                                 substitutionMethod, substitutionAnnotation);
             }
             return null;
         }
 
         if (originalMethod.getModifiers().contains(Modifier.STATIC) != isStatic) {
-            boolean optional = resolveAnnotationValue(Boolean.class, findAnnotationValue(substitutionAnnotation, "optional"));
+            boolean optional = getAnnotationValue(substitutionAnnotation, "optional", Boolean.class);
             if (!optional) {
-                env.getMessager().printMessage(Kind.ERROR, String.format("The %s element must be set to %s.", ORIGINAL_IS_STATIC, !isStatic), substitutionMethod, substitutionAnnotation);
+                messager.printMessage(Kind.ERROR, String.format("The %s element must be set to %s.", ORIGINAL_IS_STATIC, !isStatic), substitutionMethod, substitutionAnnotation);
             }
             return null;
         }
 
         if (!isTypeCompatible(originalMethod.getReturnType(), signatureReturnType)) {
-            env.getMessager().printMessage(
+            messager.printMessage(
                             Kind.ERROR,
                             String.format("The return type of the substitution method '%s' must match with the return type of the original method '%s'.", signatureReturnType,
                                             originalMethod.getReturnType()),
@@ -218,12 +221,12 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
         TypeMirror original = originalType;
         TypeMirror substitution = substitutionType;
         if (needsErasure(original)) {
-            original = env.getTypeUtils().erasure(original);
+            original = processor.env().getTypeUtils().erasure(original);
         }
         if (needsErasure(substitution)) {
-            substitution = env.getTypeUtils().erasure(substitution);
+            substitution = processor.env().getTypeUtils().erasure(substitution);
         }
-        return env.getTypeUtils().isSameType(original, substitution);
+        return processor.env().getTypeUtils().isSameType(original, substitution);
     }
 
     /**
@@ -238,12 +241,12 @@ public final class MethodSubstitutionVerifier extends AbstractVerifier {
         TypeMirror t1Erased = t1;
         TypeMirror t2Erased = t2;
         if (needsErasure(t1Erased)) {
-            t1Erased = env.getTypeUtils().erasure(t1Erased);
+            t1Erased = processor.env().getTypeUtils().erasure(t1Erased);
         }
         if (needsErasure(t2Erased)) {
-            t2Erased = env.getTypeUtils().erasure(t2Erased);
+            t2Erased = processor.env().getTypeUtils().erasure(t2Erased);
         }
-        return env.getTypeUtils().isSubtype(t1Erased, t2Erased);
+        return processor.env().getTypeUtils().isSubtype(t1Erased, t2Erased);
     }
 
     private static boolean needsErasure(TypeMirror typeMirror) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/NodeIntrinsicHandler.java
similarity index 61%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/NodeIntrinsicHandler.java
index 16e091dae60..0545fef7a6d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/NodeIntrinsicHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, 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
@@ -20,18 +20,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
+
+import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValue;
+import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValueList;
+import static org.graalvm.compiler.processor.AbstractProcessor.getSimpleName;
 
-import java.lang.annotation.Annotation;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Formatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.Messager;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -46,76 +48,49 @@ import javax.lang.model.type.TypeVariable;
 import javax.lang.model.util.ElementFilter;
 import javax.tools.Diagnostic.Kind;
 
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.InjectedNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.StructuralInput.MarkerType;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
-public final class NodeIntrinsicVerifier extends AbstractVerifier {
+/**
+ * Handler for the {@value #NODE_INFO_CLASS_NAME} annotation.
+ */
+public final class NodeIntrinsicHandler extends AnnotationHandler {
 
-    private static final String NODE_CLASS_NAME = "value";
+    static final String CONSTANT_NODE_PARAMETER_CLASS_NAME = "org.graalvm.compiler.graph.Node.ConstantNodeParameter";
+    static final String MARKER_TYPE_CLASS_NAME = "org.graalvm.compiler.nodeinfo.StructuralInput.MarkerType";
+    static final String GRAPH_BUILDER_CONTEXT_CLASS_NAME = "org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext";
+    static final String STRUCTURAL_INPUT_CLASS_NAME = "org.graalvm.compiler.nodeinfo.StructuralInput";
+    static final String RESOLVED_JAVA_METHOD_CLASS_NAME = "jdk.vm.ci.meta.ResolvedJavaMethod";
+    static final String RESOLVED_JAVA_TYPE_CLASS_NAME = "jdk.vm.ci.meta.ResolvedJavaType";
+    static final String VALUE_NODE_CLASS_NAME = "org.graalvm.compiler.nodes.ValueNode";
+    static final String STAMP_CLASS_NAME = "org.graalvm.compiler.core.common.type.Stamp";
+    static final String NODE_CLASS_NAME = "org.graalvm.compiler.graph.Node";
+    static final String NODE_INFO_CLASS_NAME = "org.graalvm.compiler.nodeinfo.NodeInfo";
+    static final String NODE_INTRINSIC_CLASS_NAME = "org.graalvm.compiler.graph.Node.NodeIntrinsic";
+    static final String INJECTED_NODE_PARAMETER_CLASS_NAME = "org.graalvm.compiler.graph.Node.InjectedNodeParameter";
 
-    private TypeMirror nodeType() {
-        return env.getElementUtils().getTypeElement("org.graalvm.compiler.graph.Node").asType();
-    }
-
-    private TypeMirror stampType() {
-        return env.getElementUtils().getTypeElement("org.graalvm.compiler.core.common.type.Stamp").asType();
-    }
-
-    private TypeMirror valueNodeType() {
-        return env.getElementUtils().getTypeElement("org.graalvm.compiler.nodes.ValueNode").asType();
-    }
-
-    private TypeMirror classType() {
-        return env.getElementUtils().getTypeElement("java.lang.Class").asType();
-    }
-
-    private TypeMirror resolvedJavaTypeType() {
-        return env.getElementUtils().getTypeElement("jdk.vm.ci.meta.ResolvedJavaType").asType();
-    }
-
-    private TypeMirror resolvedJavaMethodType() {
-        return env.getElementUtils().getTypeElement("jdk.vm.ci.meta.ResolvedJavaMethod").asType();
-    }
-
-    private TypeMirror structuralInputType() {
-        return env.getElementUtils().getTypeElement("org.graalvm.compiler.nodeinfo.StructuralInput").asType();
-    }
-
-    private TypeMirror graphBuilderContextType() {
-        return env.getElementUtils().getTypeElement("org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext").asType();
-    }
-
-    public NodeIntrinsicVerifier(ProcessingEnvironment env) {
-        super(env);
+    public NodeIntrinsicHandler(AbstractProcessor processor) {
+        super(processor, NODE_INTRINSIC_CLASS_NAME);
     }
 
     @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return NodeIntrinsic.class;
-    }
-
-    @Override
-    public void verify(Element element, AnnotationMirror annotation, PluginGenerator generator) {
+    public void process(Element element, AnnotationMirror annotation, PluginGenerator generator) {
         if (element.getKind() != ElementKind.METHOD) {
             assert false : "Element is guaranteed to be a method.";
             return;
         }
 
         ExecutableElement intrinsicMethod = (ExecutableElement) element;
+        Messager messager = processor.env().getMessager();
         if (!intrinsicMethod.getModifiers().contains(Modifier.STATIC)) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("A @%s method must be static.", NodeIntrinsic.class.getSimpleName()), element, annotation);
+            messager.printMessage(Kind.ERROR, String.format("A @%s method must be static.", getSimpleName(NODE_INTRINSIC_CLASS_NAME)), element, annotation);
         }
         if (!intrinsicMethod.getModifiers().contains(Modifier.NATIVE)) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("A @%s method must be native.", NodeIntrinsic.class.getSimpleName()), element, annotation);
+            messager.printMessage(Kind.ERROR, String.format("A @%s method must be native.", getSimpleName(NODE_INTRINSIC_CLASS_NAME)), element, annotation);
         }
 
-        TypeMirror nodeClassMirror = resolveAnnotationValue(TypeMirror.class, findAnnotationValue(annotation, NODE_CLASS_NAME));
-        TypeElement nodeClass = (TypeElement) env.getTypeUtils().asElement(nodeClassMirror);
-        if (nodeClass.getSimpleName().contentEquals(NodeIntrinsic.class.getSimpleName())) {
+        TypeMirror nodeClassMirror = getAnnotationValue(annotation, "value", TypeMirror.class);
+        TypeElement nodeClass = processor.asTypeElement(nodeClassMirror);
+        if (processor.env().getTypeUtils().isSameType(nodeClassMirror, annotation.getAnnotationType())) {
             // default value
             Element enclosingElement = intrinsicMethod.getEnclosingElement();
             while (enclosingElement != null && enclosingElement.getKind() != ElementKind.CLASS) {
@@ -128,15 +103,15 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
 
         TypeMirror returnType = intrinsicMethod.getReturnType();
         if (returnType instanceof TypeVariable) {
-            env.getMessager().printMessage(Kind.ERROR, "@NodeIntrinsic cannot have a generic return type.", element, annotation);
+            messager.printMessage(Kind.ERROR, "@NodeIntrinsic cannot have a generic return type.", element, annotation);
         }
 
-        boolean injectedStampIsNonNull = intrinsicMethod.getAnnotation(NodeIntrinsic.class).injectedStampIsNonNull();
+        boolean injectedStampIsNonNull = getAnnotationValue(annotation, "injectedStampIsNonNull", Boolean.class);
 
         if (returnType.getKind() == TypeKind.VOID) {
             for (VariableElement parameter : intrinsicMethod.getParameters()) {
-                if (parameter.getAnnotation(InjectedNodeParameter.class) != null) {
-                    env.getMessager().printMessage(Kind.ERROR, "@NodeIntrinsic with an injected Stamp parameter cannot have a void return type.", element, annotation);
+                if (processor.getAnnotation(parameter, processor.getType(INJECTED_NODE_PARAMETER_CLASS_NAME)) != null) {
+                    messager.printMessage(Kind.ERROR, "@NodeIntrinsic with an injected Stamp parameter cannot have a void return type.", element, annotation);
                     break;
                 }
             }
@@ -148,15 +123,15 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
         List<ExecutableElement> constructors = Collections.emptyList();
         if (nodeClass.getModifiers().contains(Modifier.ABSTRACT)) {
             if (factories.isEmpty()) {
-                env.getMessager().printMessage(Kind.ERROR, String.format("Cannot make a node intrinsic for an abstract class %s.", nodeClass.getSimpleName()), element, annotation);
+                messager.printMessage(Kind.ERROR, String.format("Cannot make a node intrinsic for abstract class %s.", nodeClass.getSimpleName()), element, annotation);
             }
         } else if (!isNodeType(nodeClass)) {
             if (factories.isEmpty()) {
-                env.getMessager().printMessage(Kind.ERROR, String.format("%s is not a subclass of %s.", nodeClass.getSimpleName(), nodeType()), element, annotation);
+                messager.printMessage(Kind.ERROR, String.format("%s is not a subclass of %s.", nodeClass.getSimpleName(), processor.getType(NODE_CLASS_NAME)), element, annotation);
             }
         } else {
             TypeMirror ret = returnType;
-            if (env.getTypeUtils().isAssignable(ret, structuralInputType())) {
+            if (processor.env().getTypeUtils().isAssignable(ret, processor.getType(STRUCTURAL_INPUT_CLASS_NAME))) {
                 checkInputType(nodeClass, ret, element, annotation);
             }
 
@@ -168,13 +143,13 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
             for (ExecutableElement candidate : factories) {
                 msg.format("%n  %s", candidate);
             }
-            env.getMessager().printMessage(Kind.ERROR, msg.toString(), intrinsicMethod, annotation);
+            messager.printMessage(Kind.ERROR, msg.toString(), intrinsicMethod, annotation);
         } else if (constructors.size() > 1) {
             msg.format("Found more than one constructor in %s matching node intrinsic:", nodeClass);
             for (ExecutableElement candidate : constructors) {
                 msg.format("%n  %s", candidate);
             }
-            env.getMessager().printMessage(Kind.ERROR, msg.toString(), intrinsicMethod, annotation);
+            messager.printMessage(Kind.ERROR, msg.toString(), intrinsicMethod, annotation);
         } else if (factories.size() == 1) {
             generator.addPlugin(new GeneratedNodeIntrinsicPlugin.CustomFactoryPlugin(intrinsicMethod, factories.get(0), constructorSignature));
         } else if (constructors.size() == 1) {
@@ -187,57 +162,58 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
                     msg.format("%n  %s: %s", e.getKey(), e.getValue());
                 }
             }
-            env.getMessager().printMessage(Kind.ERROR, msg.toString(), intrinsicMethod, annotation);
+            messager.printMessage(Kind.ERROR, msg.toString(), intrinsicMethod, annotation);
         }
     }
 
     private void checkInputType(TypeElement nodeClass, TypeMirror returnType, Element element, AnnotationMirror annotation) {
-        InputType inputType = getInputType(returnType, element, annotation);
-        if (inputType != InputType.Value) {
+        String inputType = getInputType(returnType, element, annotation);
+        if (!inputType.equals("Value")) {
             boolean allowed = false;
-            InputType[] allowedTypes = nodeClass.getAnnotation(NodeInfo.class).allowedUsageTypes();
-            for (InputType allowedType : allowedTypes) {
-                if (inputType == allowedType) {
+            List<VariableElement> allowedTypes = getAnnotationValueList(processor.getAnnotation(nodeClass, processor.getType(NODE_INFO_CLASS_NAME)), "allowedUsageTypes", VariableElement.class);
+            for (VariableElement allowedType : allowedTypes) {
+                if (allowedType.getSimpleName().contentEquals(inputType)) {
                     allowed = true;
                     break;
                 }
             }
             if (!allowed) {
-                env.getMessager().printMessage(Kind.ERROR, String.format("@NodeIntrinsic returns input type %s, but only %s is allowed.", inputType, Arrays.toString(allowedTypes)), element,
-                                annotation);
+                processor.env().getMessager().printMessage(Kind.ERROR, String.format("@NodeIntrinsic returns input type %s, but only %s is allowed.", inputType, allowedTypes), element, annotation);
             }
         }
     }
 
-    private InputType getInputType(TypeMirror type, Element element, AnnotationMirror annotation) {
-        TypeElement current = (TypeElement) env.getTypeUtils().asElement(type);
+    private String getInputType(TypeMirror type, Element element, AnnotationMirror annotation) {
+        TypeElement current = processor.asTypeElement(type);
         while (current != null) {
-            MarkerType markerType = current.getAnnotation(MarkerType.class);
+            AnnotationMirror markerType = processor.getAnnotation(current, processor.getType(MARKER_TYPE_CLASS_NAME));
             if (markerType != null) {
-                return markerType.value();
+                return getAnnotationValue(markerType, "value", VariableElement.class).getSimpleName().toString();
             }
 
-            current = (TypeElement) env.getTypeUtils().asElement(current.getSuperclass());
+            current = processor.asTypeElement(current.getSuperclass());
         }
 
-        env.getMessager().printMessage(Kind.ERROR, String.format("The class %s is a subclass of StructuralInput, but isn't annotated with @MarkerType.", type), element, annotation);
-        return InputType.Value;
+        processor.env().getMessager().printMessage(Kind.ERROR,
+                        String.format("The class %s is a subclass of StructuralInput, but isn't annotated with @MarkerType. %s", type, element.getAnnotationMirrors()),
+                        element, annotation);
+        return "Value";
     }
 
     private boolean isNodeType(TypeElement nodeClass) {
-        return env.getTypeUtils().isSubtype(nodeClass.asType(), nodeType());
+        return processor.env().getTypeUtils().isSubtype(nodeClass.asType(), processor.getType(NODE_CLASS_NAME));
     }
 
     private TypeMirror[] constructorSignature(ExecutableElement method) {
         TypeMirror[] parameters = new TypeMirror[method.getParameters().size()];
         for (int i = 0; i < method.getParameters().size(); i++) {
             VariableElement parameter = method.getParameters().get(i);
-            if (parameter.getAnnotation(ConstantNodeParameter.class) == null) {
-                parameters[i] = valueNodeType();
+            if (processor.getAnnotation(parameter, processor.getType(CONSTANT_NODE_PARAMETER_CLASS_NAME)) == null) {
+                parameters[i] = processor.getType(VALUE_NODE_CLASS_NAME);
             } else {
                 TypeMirror type = parameter.asType();
-                if (isTypeCompatible(type, classType())) {
-                    type = resolvedJavaTypeType();
+                if (isTypeCompatible(type, processor.getType("java.lang.Class"))) {
+                    type = processor.getType(RESOLVED_JAVA_TYPE_CLASS_NAME);
                 }
                 parameters[i] = type;
             }
@@ -269,12 +245,12 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
             }
 
             VariableElement firstArg = method.getParameters().get(0);
-            if (!isTypeCompatible(firstArg.asType(), graphBuilderContextType())) {
+            if (!isTypeCompatible(firstArg.asType(), processor.getType(GRAPH_BUILDER_CONTEXT_CLASS_NAME))) {
                 continue;
             }
 
             VariableElement secondArg = method.getParameters().get(1);
-            if (!isTypeCompatible(secondArg.asType(), resolvedJavaMethodType())) {
+            if (!isTypeCompatible(secondArg.asType(), processor.getType(RESOLVED_JAVA_METHOD_CLASS_NAME))) {
                 continue;
             }
 
@@ -296,15 +272,15 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
         while (cIdx < method.getParameters().size()) {
             VariableElement parameter = method.getParameters().get(cIdx++);
             TypeMirror paramType = parameter.asType();
-            if (parameter.getAnnotation(InjectedNodeParameter.class) != null) {
-                if (missingStampArgument && env.getTypeUtils().isSameType(paramType, stampType())) {
+            if (processor.getAnnotation(parameter, processor.getType(INJECTED_NODE_PARAMETER_CLASS_NAME)) != null) {
+                if (missingStampArgument && processor.env().getTypeUtils().isSameType(paramType, processor.getType(STAMP_CLASS_NAME))) {
                     missingStampArgument = false;
                 }
                 // skip injected parameters
                 continue;
             }
             if (missingStampArgument) {
-                nonMatches.put(method, String.format("missing injected %s argument", stampType()));
+                nonMatches.put(method, String.format("missing injected %s argument", processor.getType(STAMP_CLASS_NAME)));
                 return false;
             }
 
@@ -327,7 +303,7 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
             }
         }
         if (missingStampArgument) {
-            nonMatches.put(method, String.format("missing injected %s argument", stampType()));
+            nonMatches.put(method, String.format("missing injected %s argument", processor.getType(STAMP_CLASS_NAME)));
             return false;
         }
 
@@ -342,12 +318,12 @@ public final class NodeIntrinsicVerifier extends AbstractVerifier {
         TypeMirror original = originalType;
         TypeMirror substitution = substitutionType;
         if (needsErasure(original)) {
-            original = env.getTypeUtils().erasure(original);
+            original = processor.env().getTypeUtils().erasure(original);
         }
         if (needsErasure(substitution)) {
-            substitution = env.getTypeUtils().erasure(substitution);
+            substitution = processor.env().getTypeUtils().erasure(substitution);
         }
-        return env.getTypeUtils().isSameType(original, substitution);
+        return processor.env().getTypeUtils().isSameType(original, substitution);
     }
 
     private static boolean needsErasure(TypeMirror typeMirror) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java
similarity index 87%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java
index 70228b2f459..8624d5d908b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.verifier;
+package org.graalvm.compiler.replacements.processor;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -33,7 +33,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Function;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.PackageElement;
@@ -47,6 +46,8 @@ import javax.lang.model.type.WildcardType;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 
+import org.graalvm.compiler.processor.AbstractProcessor;
+
 public class PluginGenerator {
 
     private final Map<Element, List<GeneratedPlugin>> plugins;
@@ -65,10 +66,10 @@ public class PluginGenerator {
         list.add(plugin);
     }
 
-    public void generateAll(ProcessingEnvironment env) {
+    public void generateAll(AbstractProcessor processor) {
         for (Entry<Element, List<GeneratedPlugin>> entry : plugins.entrySet()) {
             disambiguateNames(entry.getValue());
-            createPluginFactory(env, entry.getKey(), entry.getValue());
+            createPluginFactory(processor, entry.getKey(), entry.getValue());
         }
     }
 
@@ -148,41 +149,42 @@ public class PluginGenerator {
         });
     }
 
-    private static void createPluginFactory(ProcessingEnvironment env, Element topLevelClass, List<GeneratedPlugin> plugins) {
+    private static void createPluginFactory(AbstractProcessor processor, Element topLevelClass, List<GeneratedPlugin> plugins) {
         PackageElement pkg = (PackageElement) topLevelClass.getEnclosingElement();
 
         String genClassName = "PluginFactory_" + topLevelClass.getSimpleName();
 
+        String qualifiedGenClassName = pkg.getQualifiedName() + "." + genClassName;
         try {
-            JavaFileObject factory = env.getFiler().createSourceFile(pkg.getQualifiedName() + "." + genClassName, topLevelClass);
+            JavaFileObject factory = processor.env().getFiler().createSourceFile(qualifiedGenClassName, topLevelClass);
             try (PrintWriter out = new PrintWriter(factory.openWriter())) {
                 out.printf("// CheckStyle: stop header check\n");
                 out.printf("// CheckStyle: stop line length check\n");
                 out.printf("// GENERATED CONTENT - DO NOT EDIT\n");
-                out.printf("// GENERATORS: %s, %s\n", VerifierAnnotationProcessor.class.getName(), PluginGenerator.class.getName());
+                out.printf("// GENERATORS: %s, %s\n", ReplacementsAnnotationProcessor.class.getName(), PluginGenerator.class.getName());
                 out.printf("package %s;\n", pkg.getQualifiedName());
                 out.printf("\n");
                 createImports(out, plugins);
                 out.printf("\n");
-                out.printf("@ServiceProvider(NodeIntrinsicPluginFactory.class)\n");
                 out.printf("public class %s implements NodeIntrinsicPluginFactory {\n", genClassName);
                 for (GeneratedPlugin plugin : plugins) {
                     out.printf("\n");
-                    plugin.generate(env, out);
+                    plugin.generate(processor, out);
                 }
                 out.printf("\n");
                 createPluginFactoryMethod(out, plugins);
                 out.printf("}\n");
             }
         } catch (IOException e) {
-            env.getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage());
+            processor.env().getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage());
         }
+        processor.createProviderFile(qualifiedGenClassName, "org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory", topLevelClass);
     }
 
     protected static void createImports(PrintWriter out, List<GeneratedPlugin> plugins) {
         out.printf("import jdk.vm.ci.meta.ResolvedJavaMethod;\n");
-        out.printf("import org.graalvm.compiler.serviceprovider.ServiceProvider;\n");
         out.printf("\n");
+        out.printf("import java.lang.annotation.Annotation;\n");
         out.printf("import org.graalvm.compiler.nodes.ValueNode;\n");
         out.printf("import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;\n");
         out.printf("import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;\n");
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java
new file mode 100644
index 00000000000..2495f0c3cfb
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java
@@ -0,0 +1,96 @@
+/*
+ * 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 org.graalvm.compiler.replacements.processor;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic.Kind;
+
+import org.graalvm.compiler.processor.AbstractProcessor;
+
+/**
+ * Processor for annotation types in the {@code org.graalvm.compiler.replacements} name space.
+ */
+public class ReplacementsAnnotationProcessor extends AbstractProcessor {
+
+    private List<AnnotationHandler> handlers;
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latest();
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            PluginGenerator generator = new PluginGenerator();
+            for (AnnotationHandler handler : getHandlers()) {
+                TypeElement annotationClass = getTypeElementOrNull(handler.annotationTypeName);
+                if (annotationClass != null) {
+                    for (Element e : roundEnv.getElementsAnnotatedWith(annotationClass)) {
+                        AnnotationMirror annotationMirror = getAnnotation(e, annotationClass.asType());
+                        handler.process(e, annotationMirror, generator);
+                    }
+                } else {
+                    Set<? extends Element> roots = roundEnv.getRootElements();
+                    String message = String.format("Processor %s disabled as %s is not resolvable on the compilation class path", handler.getClass().getName(), handler.annotationTypeName);
+                    if (roots.isEmpty()) {
+                        env().getMessager().printMessage(Kind.WARNING, message);
+                    } else {
+                        env().getMessager().printMessage(Kind.WARNING, message, roots.iterator().next());
+                    }
+                }
+            }
+            generator.generateAll(this);
+        }
+        return false;
+    }
+
+    public List<AnnotationHandler> getHandlers() {
+        if (handlers == null) {
+            handlers = new ArrayList<>();
+            handlers.add(new ClassSubstitutionHandler(this));
+            handlers.add(new MethodSubstitutionHandler(this));
+            handlers.add(new NodeIntrinsicHandler(this));
+            handlers.add(new FoldHandler(this));
+        }
+        return handlers;
+    }
+
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        Set<String> annotationTypes = new HashSet<>();
+        for (AnnotationHandler handler : getHandlers()) {
+            annotationTypes.add(handler.annotationTypeName);
+        }
+        return annotationTypes;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java
index 20947e4f385..46510be54e7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java
@@ -38,6 +38,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
 import org.graalvm.compiler.replacements.IntegerSubstitutions;
 import org.graalvm.compiler.replacements.LongSubstitutions;
+import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.BitCountNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
@@ -56,6 +57,10 @@ public class SPARCGraphBuilderPlugins {
                 registerIntegerLongPlugins(invocationPlugins, IntegerSubstitutions.class, JavaKind.Int, bytecodeProvider);
                 registerIntegerLongPlugins(invocationPlugins, LongSubstitutions.class, JavaKind.Long, bytecodeProvider);
                 registerMathPlugins(invocationPlugins);
+                // This is temporarily disabled until we implement correct emitting of the CAS
+                // instructions of the proper width.
+                StandardGraphBuilderPlugins.registerPlatformSpecificUnsafePlugins(invocationPlugins, bytecodeProvider,
+                                new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object});
             }
         });
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java
index 7048cfadc55..145bdaa29bf 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java
@@ -32,6 +32,7 @@ import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
@@ -55,7 +56,7 @@ public class ArrayStoreBytecodeExceptionTest extends BytecodeExceptionTest {
         invocationPlugins.register(new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode obj) {
-                return throwBytecodeException(b, ArrayStoreException.class, obj);
+                return throwBytecodeException(b, BytecodeExceptionKind.ARRAY_STORE, obj);
             }
         }, Exceptions.class, "throwArrayStore", Object.class);
         super.registerInvocationPlugins(invocationPlugins);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java
index c1187cdee1c..3ebea683e30 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java
@@ -26,11 +26,12 @@ import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.nodes.UnwindNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 public abstract class BytecodeExceptionTest extends GraalCompilerTest {
 
-    protected boolean throwBytecodeException(GraphBuilderContext b, Class<? extends Throwable> exception, ValueNode... arguments) {
+    protected boolean throwBytecodeException(GraphBuilderContext b, BytecodeExceptionKind exception, ValueNode... arguments) {
         BytecodeExceptionNode exceptionNode = b.add(new BytecodeExceptionNode(b.getMetaAccess(), exception, arguments));
         b.add(new UnwindNode(exceptionNode));
         return true;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java
index 30a7a4b2433..27ca7f87a60 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java
@@ -38,6 +38,7 @@ import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
@@ -83,7 +84,7 @@ public class ClassCastBytecodeExceptionTest extends BytecodeExceptionTest {
                 Constant hub = b.getConstantReflection().asObjectHub(type);
                 Stamp hubStamp = b.getStampProvider().createHubStamp(StampFactory.object(TypeReference.createExactTrusted(type)));
                 ConstantNode hubConst = b.add(ConstantNode.forConstant(hubStamp, hub, b.getMetaAccess()));
-                return throwBytecodeException(b, ClassCastException.class, obj, hubConst);
+                return throwBytecodeException(b, BytecodeExceptionKind.CLASS_CAST, obj, hubConst);
             }
         }, Exceptions.class, "throwClassCast", Object.class, Class.class);
         super.registerInvocationPlugins(invocationPlugins);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java
index f635cad6ec7..5c8bcf44e24 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -33,6 +33,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
@@ -46,8 +47,9 @@ public class IndexOobBytecodeExceptionTest extends BytecodeExceptionTest {
 
         private static Object[] empty = new Object[0];
 
-        public static void throwOutOfBounds(int idx) {
+        public static void throwOutOfBounds(int idx, int length) {
             GraalDirectives.blackhole(empty[idx]);
+            GraalDirectives.blackhole(length);
         }
     }
 
@@ -55,15 +57,15 @@ public class IndexOobBytecodeExceptionTest extends BytecodeExceptionTest {
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
         invocationPlugins.register(new InvocationPlugin() {
             @Override
-            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode idx) {
-                return throwBytecodeException(b, ArrayIndexOutOfBoundsException.class, idx);
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode idx, ValueNode length) {
+                return throwBytecodeException(b, BytecodeExceptionKind.OUT_OF_BOUNDS, idx, length);
             }
-        }, Exceptions.class, "throwOutOfBounds", int.class);
+        }, Exceptions.class, "throwOutOfBounds", int.class, int.class);
         super.registerInvocationPlugins(invocationPlugins);
     }
 
-    public static void oobSnippet(int idx) {
-        Exceptions.throwOutOfBounds(idx);
+    public static void oobSnippet(int idx, int length) {
+        Exceptions.throwOutOfBounds(idx, length);
     }
 
     @Parameter public int index;
@@ -81,6 +83,6 @@ public class IndexOobBytecodeExceptionTest extends BytecodeExceptionTest {
 
     @Test
     public void testOutOfBoundsException() {
-        test("oobSnippet", index);
+        test("oobSnippet", index, Exceptions.empty.length);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java
index 3ddd84ec10e..a0f13e0a8c6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java
@@ -23,7 +23,7 @@
 package org.graalvm.compiler.replacements.test;
 
 import org.junit.Test;
-
+import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
@@ -46,7 +46,7 @@ public class NullBytecodeExceptionTest extends BytecodeExceptionTest {
         invocationPlugins.register(new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                return throwBytecodeException(b, NullPointerException.class);
+                return throwBytecodeException(b, BytecodeExceptionKind.NULL_POINTER);
             }
         }, Exceptions.class, "throwNull");
         super.registerInvocationPlugins(invocationPlugins);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 1d3cd49d5ad..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1 +0,0 @@
-org.graalvm.compiler.replacements.verifier.VerifierAnnotationProcessor
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java
deleted file mode 100644
index db1d2b32784..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2013, 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.replacements.verifier;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-
-public abstract class AbstractVerifier {
-
-    protected final ProcessingEnvironment env;
-
-    public AbstractVerifier(ProcessingEnvironment env) {
-        this.env = env;
-    }
-
-    public abstract void verify(Element element, AnnotationMirror annotation, PluginGenerator generator);
-
-    public abstract Class<? extends Annotation> getAnnotationClass();
-
-    @SuppressWarnings("unchecked")
-    protected static <T> T resolveAnnotationValue(Class<T> expectedType, AnnotationValue value) {
-        if (value == null) {
-            return null;
-        }
-        if (expectedType.isArray()) {
-            ArrayList<Object> result = new ArrayList<>();
-            List<AnnotationValue> l = (List<AnnotationValue>) value.getValue();
-            for (AnnotationValue el : l) {
-                result.add(resolveAnnotationValue(expectedType.getComponentType(), el));
-            }
-            return (T) result.toArray((Object[]) Array.newInstance(expectedType.getComponentType(), result.size()));
-        }
-        Object unboxedValue = value.getValue();
-        if (unboxedValue != null) {
-            if (expectedType == TypeMirror.class && unboxedValue instanceof String) {
-                /*
-                 * Happens if type is invalid when using the ECJ compiler. The ECJ does not match
-                 * AP-API specification here.
-                 */
-                return null;
-            }
-            if (!expectedType.isAssignableFrom(unboxedValue.getClass())) {
-                throw new ClassCastException(unboxedValue.getClass().getName() + " not assignable from " + expectedType.getName());
-            }
-        }
-        return (T) unboxedValue;
-    }
-
-    protected static AnnotationValue findAnnotationValue(AnnotationMirror mirror, String name) {
-        ExecutableElement valueMethod = null;
-        for (ExecutableElement method : ElementFilter.methodsIn(mirror.getAnnotationType().asElement().getEnclosedElements())) {
-            if (method.getSimpleName().toString().equals(name)) {
-                valueMethod = method;
-                break;
-            }
-        }
-
-        if (valueMethod == null) {
-            return null;
-        }
-
-        AnnotationValue value = mirror.getElementValues().get(valueMethod);
-        if (value == null) {
-            value = valueMethod.getDefaultValue();
-        }
-
-        return value;
-    }
-
-}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java
deleted file mode 100644
index 9a09c7a74ad..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2013, 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.replacements.verifier;
-
-import java.lang.annotation.Annotation;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic.Kind;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-
-public final class ClassSubstitutionVerifier extends AbstractVerifier {
-
-    private static final String TYPE_VALUE = "value";
-    private static final String STRING_VALUE = "className";
-    private static final String OPTIONAL = "optional";
-
-    public ClassSubstitutionVerifier(ProcessingEnvironment env) {
-        super(env);
-    }
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return ClassSubstitution.class;
-    }
-
-    @Override
-    public void verify(Element element, AnnotationMirror classSubstitution, PluginGenerator generator) {
-        if (!element.getKind().isClass()) {
-            assert false : "Element is guaranteed to be a class.";
-            return;
-        }
-        TypeElement type = (TypeElement) element;
-
-        TypeElement substitutionType = resolveOriginalType(env, type, classSubstitution);
-        if (substitutionType == null) {
-            return;
-        }
-    }
-
-    static TypeElement resolveOriginalType(ProcessingEnvironment env, Element sourceElement, AnnotationMirror classSubstition) {
-        AnnotationValue typeValue = findAnnotationValue(classSubstition, TYPE_VALUE);
-        AnnotationValue stringValue = findAnnotationValue(classSubstition, STRING_VALUE);
-        AnnotationValue optionalValue = findAnnotationValue(classSubstition, OPTIONAL);
-
-        assert typeValue != null && stringValue != null && optionalValue != null;
-
-        TypeMirror type = resolveAnnotationValue(TypeMirror.class, typeValue);
-        String[] classNames = resolveAnnotationValue(String[].class, stringValue);
-        boolean optional = resolveAnnotationValue(Boolean.class, optionalValue);
-
-        if (type.getKind() != TypeKind.DECLARED) {
-            env.getMessager().printMessage(Kind.ERROR, "The provided class must be a declared type.", sourceElement, classSubstition, typeValue);
-            return null;
-        }
-
-        if (!classSubstition.getAnnotationType().asElement().equals(((DeclaredType) type).asElement())) {
-            if (classNames.length != 0) {
-                String msg = "The usage of value and className is exclusive.";
-                env.getMessager().printMessage(Kind.ERROR, msg, sourceElement, classSubstition, stringValue);
-                env.getMessager().printMessage(Kind.ERROR, msg, sourceElement, classSubstition, typeValue);
-            }
-
-            return (TypeElement) ((DeclaredType) type).asElement();
-        }
-
-        if (classNames.length != 0) {
-            TypeElement typeElement = null;
-            for (String className : classNames) {
-                typeElement = env.getElementUtils().getTypeElement(className);
-                if (typeElement != null) {
-                    break;
-                }
-            }
-            if (typeElement == null && !optional) {
-                env.getMessager().printMessage(Kind.ERROR, String.format("The class '%s' was not found on the classpath.", stringValue), sourceElement, classSubstition, stringValue);
-            }
-
-            return typeElement;
-        }
-
-        if (!optional) {
-            env.getMessager().printMessage(Kind.ERROR, String.format("No value for '%s' or '%s' provided but required.", TYPE_VALUE, STRING_VALUE), sourceElement, classSubstition);
-        }
-
-        return null;
-    }
-
-}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java
deleted file mode 100644
index 9d96e935eda..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2013, 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.replacements.verifier;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.DeclaredType;
-
-public class VerifierAnnotationProcessor extends AbstractProcessor {
-
-    private List<AbstractVerifier> verifiers;
-
-    @Override
-    public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.latest();
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        if (!roundEnv.processingOver()) {
-            PluginGenerator generator = new PluginGenerator();
-            for (AbstractVerifier verifier : getVerifiers()) {
-                Class<? extends Annotation> annotationClass = verifier.getAnnotationClass();
-                for (Element e : roundEnv.getElementsAnnotatedWith(annotationClass)) {
-                    AnnotationMirror annotationMirror = findAnnotationMirror(processingEnv, e.getAnnotationMirrors(), annotationClass);
-                    if (annotationMirror == null) {
-                        assert false : "Annotation mirror always expected.";
-                        continue;
-                    }
-                    verifier.verify(e, annotationMirror, generator);
-                }
-            }
-
-            generator.generateAll(processingEnv);
-        }
-        return false;
-    }
-
-    public static AnnotationMirror findAnnotationMirror(ProcessingEnvironment processingEnv, List<? extends AnnotationMirror> mirrors, Class<?> annotationClass) {
-        TypeElement expectedAnnotationType = processingEnv.getElementUtils().getTypeElement(annotationClass.getCanonicalName());
-        for (AnnotationMirror mirror : mirrors) {
-            DeclaredType annotationType = mirror.getAnnotationType();
-            TypeElement actualAnnotationType = (TypeElement) annotationType.asElement();
-            if (actualAnnotationType.equals(expectedAnnotationType)) {
-                return mirror;
-            }
-        }
-        return null;
-    }
-
-    public List<AbstractVerifier> getVerifiers() {
-        /*
-         * Initialized lazily to fail(CNE) when the processor is invoked and not when it is created.
-         */
-        if (verifiers == null) {
-            assert this.processingEnv != null : "ProcessingEnv must be initialized before calling getVerifiers.";
-            verifiers = new ArrayList<>();
-            verifiers.add(new ClassSubstitutionVerifier(this.processingEnv));
-            verifiers.add(new MethodSubstitutionVerifier(this.processingEnv));
-            verifiers.add(new NodeIntrinsicVerifier(this.processingEnv));
-            verifiers.add(new FoldVerifier(this.processingEnv));
-        }
-        return verifiers;
-    }
-
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        Set<String> annotationTypes = new HashSet<>();
-        for (AbstractVerifier verifier : getVerifiers()) {
-            annotationTypes.add(verifier.getAnnotationClass().getCanonicalName());
-        }
-        return annotationTypes;
-    }
-
-}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
index 1e1d457237b..960c053ac48 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -41,6 +41,7 @@ import java.util.List;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
@@ -84,6 +85,7 @@ import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.extended.JavaReadNode;
 import org.graalvm.compiler.nodes.extended.JavaWriteNode;
+import org.graalvm.compiler.nodes.extended.LoadArrayComponentHubNode;
 import org.graalvm.compiler.nodes.extended.LoadHubNode;
 import org.graalvm.compiler.nodes.extended.MembarNode;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
@@ -109,7 +111,9 @@ import org.graalvm.compiler.nodes.java.NewInstanceNode;
 import org.graalvm.compiler.nodes.java.RawMonitorEnterNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
 import org.graalvm.compiler.nodes.java.StoreIndexedNode;
+import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
 import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
+import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode;
 import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.WriteNode;
@@ -156,6 +160,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
     protected final ForeignCallsProvider foreignCalls;
     protected final TargetDescription target;
     private final boolean useCompressedOops;
+    private final ResolvedJavaType objectArrayType;
 
     private BoxingSnippets.Templates boxingSnippets;
     private ConstantStringIndexOfSnippets.Templates indexOfSnippets;
@@ -165,6 +170,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         this.foreignCalls = foreignCalls;
         this.target = target;
         this.useCompressedOops = useCompressedOops;
+        this.objectArrayType = metaAccess.lookupJavaType(Object[].class);
     }
 
     public void initialize(OptionValues options, Iterable<DebugHandlersFactory> factories, SnippetCounter.Group.Factory factory, Providers providers, SnippetReflectionProvider snippetReflection) {
@@ -178,57 +184,64 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
     }
 
     @Override
+    @SuppressWarnings("try")
     public void lower(Node n, LoweringTool tool) {
         assert n instanceof Lowerable;
         StructuredGraph graph = (StructuredGraph) n.graph();
-        if (n instanceof LoadFieldNode) {
-            lowerLoadFieldNode((LoadFieldNode) n, tool);
-        } else if (n instanceof StoreFieldNode) {
-            lowerStoreFieldNode((StoreFieldNode) n, tool);
-        } else if (n instanceof LoadIndexedNode) {
-            lowerLoadIndexedNode((LoadIndexedNode) n, tool);
-        } else if (n instanceof StoreIndexedNode) {
-            lowerStoreIndexedNode((StoreIndexedNode) n, tool);
-        } else if (n instanceof ArrayLengthNode) {
-            lowerArrayLengthNode((ArrayLengthNode) n, tool);
-        } else if (n instanceof LoadHubNode) {
-            lowerLoadHubNode((LoadHubNode) n, tool);
-        } else if (n instanceof MonitorEnterNode) {
-            lowerMonitorEnterNode((MonitorEnterNode) n, tool, graph);
-        } else if (n instanceof UnsafeCompareAndSwapNode) {
-            lowerCompareAndSwapNode((UnsafeCompareAndSwapNode) n);
-        } else if (n instanceof AtomicReadAndWriteNode) {
-            lowerAtomicReadAndWriteNode((AtomicReadAndWriteNode) n);
-        } else if (n instanceof RawLoadNode) {
-            lowerUnsafeLoadNode((RawLoadNode) n, tool);
-        } else if (n instanceof UnsafeMemoryLoadNode) {
-            lowerUnsafeMemoryLoadNode((UnsafeMemoryLoadNode) n);
-        } else if (n instanceof RawStoreNode) {
-            lowerUnsafeStoreNode((RawStoreNode) n);
-        } else if (n instanceof UnsafeMemoryStoreNode) {
-            lowerUnsafeMemoryStoreNode((UnsafeMemoryStoreNode) n);
-        } else if (n instanceof JavaReadNode) {
-            lowerJavaReadNode((JavaReadNode) n);
-        } else if (n instanceof JavaWriteNode) {
-            lowerJavaWriteNode((JavaWriteNode) n);
-        } else if (n instanceof CommitAllocationNode) {
-            lowerCommitAllocationNode((CommitAllocationNode) n, tool);
-        } else if (n instanceof BoxNode) {
-            boxingSnippets.lower((BoxNode) n, tool);
-        } else if (n instanceof UnboxNode) {
-            boxingSnippets.lower((UnboxNode) n, tool);
-        } else if (n instanceof VerifyHeapNode) {
-            lowerVerifyHeap((VerifyHeapNode) n);
-        } else if (n instanceof UnaryMathIntrinsicNode) {
-            lowerUnaryMath((UnaryMathIntrinsicNode) n, tool);
-        } else if (n instanceof BinaryMathIntrinsicNode) {
-            lowerBinaryMath((BinaryMathIntrinsicNode) n, tool);
-        } else if (n instanceof StringIndexOfNode) {
-            lowerIndexOf((StringIndexOfNode) n);
-        } else if (n instanceof UnpackEndianHalfNode) {
-            lowerSecondHalf((UnpackEndianHalfNode) n);
-        } else {
-            throw GraalError.shouldNotReachHere("Node implementing Lowerable not handled: " + n);
+        try (DebugCloseable context = n.withNodeSourcePosition()) {
+            if (n instanceof LoadFieldNode) {
+                lowerLoadFieldNode((LoadFieldNode) n, tool);
+            } else if (n instanceof StoreFieldNode) {
+                lowerStoreFieldNode((StoreFieldNode) n, tool);
+            } else if (n instanceof LoadIndexedNode) {
+                lowerLoadIndexedNode((LoadIndexedNode) n, tool);
+            } else if (n instanceof StoreIndexedNode) {
+                lowerStoreIndexedNode((StoreIndexedNode) n, tool);
+            } else if (n instanceof ArrayLengthNode) {
+                lowerArrayLengthNode((ArrayLengthNode) n, tool);
+            } else if (n instanceof LoadHubNode) {
+                lowerLoadHubNode((LoadHubNode) n, tool);
+            } else if (n instanceof LoadArrayComponentHubNode) {
+                lowerLoadArrayComponentHubNode((LoadArrayComponentHubNode) n);
+            } else if (n instanceof MonitorEnterNode) {
+                lowerMonitorEnterNode((MonitorEnterNode) n, tool, graph);
+            } else if (n instanceof UnsafeCompareAndSwapNode) {
+                lowerCompareAndSwapNode((UnsafeCompareAndSwapNode) n);
+            } else if (n instanceof UnsafeCompareAndExchangeNode) {
+                lowerCompareAndExchangeNode((UnsafeCompareAndExchangeNode) n);
+            } else if (n instanceof AtomicReadAndWriteNode) {
+                lowerAtomicReadAndWriteNode((AtomicReadAndWriteNode) n);
+            } else if (n instanceof RawLoadNode) {
+                lowerUnsafeLoadNode((RawLoadNode) n, tool);
+            } else if (n instanceof UnsafeMemoryLoadNode) {
+                lowerUnsafeMemoryLoadNode((UnsafeMemoryLoadNode) n);
+            } else if (n instanceof RawStoreNode) {
+                lowerUnsafeStoreNode((RawStoreNode) n);
+            } else if (n instanceof UnsafeMemoryStoreNode) {
+                lowerUnsafeMemoryStoreNode((UnsafeMemoryStoreNode) n);
+            } else if (n instanceof JavaReadNode) {
+                lowerJavaReadNode((JavaReadNode) n);
+            } else if (n instanceof JavaWriteNode) {
+                lowerJavaWriteNode((JavaWriteNode) n);
+            } else if (n instanceof CommitAllocationNode) {
+                lowerCommitAllocationNode((CommitAllocationNode) n, tool);
+            } else if (n instanceof BoxNode) {
+                boxingSnippets.lower((BoxNode) n, tool);
+            } else if (n instanceof UnboxNode) {
+                boxingSnippets.lower((UnboxNode) n, tool);
+            } else if (n instanceof VerifyHeapNode) {
+                lowerVerifyHeap((VerifyHeapNode) n);
+            } else if (n instanceof UnaryMathIntrinsicNode) {
+                lowerUnaryMath((UnaryMathIntrinsicNode) n, tool);
+            } else if (n instanceof BinaryMathIntrinsicNode) {
+                lowerBinaryMath((BinaryMathIntrinsicNode) n, tool);
+            } else if (n instanceof StringIndexOfNode) {
+                lowerIndexOf((StringIndexOfNode) n);
+            } else if (n instanceof UnpackEndianHalfNode) {
+                lowerSecondHalf((UnpackEndianHalfNode) n);
+            } else {
+                throw GraalError.shouldNotReachHere("Node implementing Lowerable not handled: " + n);
+            }
         }
     }
 
@@ -445,7 +458,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         JavaKind elementKind = storeIndexed.elementKind();
 
         LogicNode condition = null;
-        if (elementKind == JavaKind.Object && !StampTool.isPointerAlwaysNull(value)) {
+        if (storeIndexed.getStoreCheck() == null && elementKind == JavaKind.Object && !StampTool.isPointerAlwaysNull(value)) {
             /* Array store check. */
             TypeReference arrayType = StampTool.typeReferenceOrNull(array);
             if (arrayType != null && arrayType.isExact()) {
@@ -510,6 +523,12 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         loadHub.replaceAtUsagesAndDelete(hub);
     }
 
+    protected void lowerLoadArrayComponentHubNode(LoadArrayComponentHubNode loadHub) {
+        StructuredGraph graph = loadHub.graph();
+        ValueNode hub = createReadArrayComponentHub(graph, loadHub.getValue(), loadHub);
+        graph.replaceFixed(loadHub, hub);
+    }
+
     protected void lowerMonitorEnterNode(MonitorEnterNode monitorEnter, LoweringTool tool, StructuredGraph graph) {
         ValueNode object = createNullCheckedValue(monitorEnter.object(), monitorEnter, tool);
         ValueNode hub = graph.addOrUnique(LoadHubNode.create(object, tool.getStampProvider(), tool.getMetaAccess(), tool.getConstantReflection()));
@@ -527,12 +546,28 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         ValueNode newValue = implicitStoreConvert(graph, valueKind, cas.newValue());
 
         AddressNode address = graph.unique(new OffsetAddressNode(cas.object(), cas.offset()));
-        BarrierType barrierType = storeBarrierType(cas.object(), expectedValue);
+        BarrierType barrierType = guessStoreBarrierType(cas.object(), expectedValue);
         LogicCompareAndSwapNode atomicNode = graph.add(new LogicCompareAndSwapNode(address, cas.getLocationIdentity(), expectedValue, newValue, barrierType));
         atomicNode.setStateAfter(cas.stateAfter());
         graph.replaceFixedWithFixed(cas, atomicNode);
     }
 
+    protected void lowerCompareAndExchangeNode(UnsafeCompareAndExchangeNode cas) {
+        StructuredGraph graph = cas.graph();
+        JavaKind valueKind = cas.getValueKind();
+
+        ValueNode expectedValue = implicitStoreConvert(graph, valueKind, cas.expected());
+        ValueNode newValue = implicitStoreConvert(graph, valueKind, cas.newValue());
+
+        AddressNode address = graph.unique(new OffsetAddressNode(cas.object(), cas.offset()));
+        BarrierType barrierType = guessStoreBarrierType(cas.object(), expectedValue);
+        ValueCompareAndSwapNode atomicNode = graph.add(new ValueCompareAndSwapNode(address, expectedValue, newValue, cas.getLocationIdentity(), barrierType));
+        ValueNode coercedNode = implicitLoadConvert(graph, valueKind, atomicNode, true);
+        atomicNode.setStateAfter(cas.stateAfter());
+        cas.replaceAtUsages(coercedNode);
+        graph.replaceFixedWithFixed(cas, atomicNode);
+    }
+
     protected void lowerAtomicReadAndWriteNode(AtomicReadAndWriteNode n) {
         StructuredGraph graph = n.graph();
         JavaKind valueKind = n.getValueKind();
@@ -540,8 +575,9 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         ValueNode newValue = implicitStoreConvert(graph, valueKind, n.newValue());
 
         AddressNode address = graph.unique(new OffsetAddressNode(n.object(), n.offset()));
-        BarrierType barrierType = storeBarrierType(n.object(), n.newValue());
-        LoweredAtomicReadAndWriteNode memoryRead = graph.add(new LoweredAtomicReadAndWriteNode(address, n.getLocationIdentity(), newValue, barrierType));
+        BarrierType barrierType = guessStoreBarrierType(n.object(), n.newValue());
+        LIRKind lirAccessKind = LIRKind.fromJavaKind(target.arch, valueKind);
+        LoweredAtomicReadAndWriteNode memoryRead = graph.add(new LoweredAtomicReadAndWriteNode(address, n.getLocationIdentity(), newValue, lirAccessKind, barrierType));
         memoryRead.setStateAfter(n.stateAfter());
 
         ValueNode readValue = implicitLoadConvert(graph, valueKind, memoryRead);
@@ -687,85 +723,87 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
             int valuePos = 0;
             for (int objIndex = 0; objIndex < commit.getVirtualObjects().size(); objIndex++) {
                 VirtualObjectNode virtual = commit.getVirtualObjects().get(objIndex);
-                int entryCount = virtual.entryCount();
-                AbstractNewObjectNode newObject;
-                try (DebugCloseable nsp = virtual.withNodeSourcePosition()) {
+                try (DebugCloseable nsp = graph.withNodeSourcePosition(virtual)) {
+                    int entryCount = virtual.entryCount();
+                    AbstractNewObjectNode newObject;
                     if (virtual instanceof VirtualInstanceNode) {
                         newObject = graph.add(createNewInstanceFromVirtual(virtual));
                     } else {
                         newObject = graph.add(createNewArrayFromVirtual(virtual, ConstantNode.forInt(entryCount, graph)));
                     }
-                }
-                recursiveLowerings.add(newObject);
-                graph.addBeforeFixed(commit, newObject);
-                allocations[objIndex] = newObject;
-                for (int i = 0; i < entryCount; i++) {
-                    ValueNode value = commit.getValues().get(valuePos);
-                    if (value instanceof VirtualObjectNode) {
-                        value = allocations[commit.getVirtualObjects().indexOf(value)];
-                    }
-                    if (value == null) {
-                        omittedValues.set(valuePos);
-                    } else if (!(value.isConstant() && value.asConstant().isDefaultForKind())) {
-                        // Constant.illegal is always the defaultForKind, so it is skipped
-                        JavaKind valueKind = value.getStackKind();
-                        JavaKind entryKind = virtual.entryKind(i);
 
-                        // Truffle requires some leniency in terms of what can be put where:
-                        assert valueKind.getStackKind() == entryKind.getStackKind() ||
-                                        (valueKind == JavaKind.Long || valueKind == JavaKind.Double || (valueKind == JavaKind.Int && virtual instanceof VirtualArrayNode));
-                        AddressNode address = null;
-                        BarrierType barrierType = null;
-                        if (virtual instanceof VirtualInstanceNode) {
-                            ResolvedJavaField field = ((VirtualInstanceNode) virtual).field(i);
-                            long offset = fieldOffset(field);
-                            if (offset >= 0) {
-                                address = createOffsetAddress(graph, newObject, offset);
-                                barrierType = fieldInitializationBarrier(entryKind);
+                    recursiveLowerings.add(newObject);
+                    graph.addBeforeFixed(commit, newObject);
+                    allocations[objIndex] = newObject;
+                    for (int i = 0; i < entryCount; i++) {
+                        ValueNode value = commit.getValues().get(valuePos);
+                        if (value instanceof VirtualObjectNode) {
+                            value = allocations[commit.getVirtualObjects().indexOf(value)];
+                        }
+                        if (value == null) {
+                            omittedValues.set(valuePos);
+                        } else if (!(value.isConstant() && value.asConstant().isDefaultForKind())) {
+                            // Constant.illegal is always the defaultForKind, so it is skipped
+                            JavaKind valueKind = value.getStackKind();
+                            JavaKind entryKind = virtual.entryKind(i);
+
+                            // Truffle requires some leniency in terms of what can be put where:
+                            assert valueKind.getStackKind() == entryKind.getStackKind() ||
+                                            (valueKind == JavaKind.Long || valueKind == JavaKind.Double || (valueKind == JavaKind.Int && virtual instanceof VirtualArrayNode));
+                            AddressNode address = null;
+                            BarrierType barrierType = null;
+                            if (virtual instanceof VirtualInstanceNode) {
+                                ResolvedJavaField field = ((VirtualInstanceNode) virtual).field(i);
+                                long offset = fieldOffset(field);
+                                if (offset >= 0) {
+                                    address = createOffsetAddress(graph, newObject, offset);
+                                    barrierType = fieldInitializationBarrier(entryKind);
+                                }
+                            } else {
+                                address = createOffsetAddress(graph, newObject, arrayBaseOffset(entryKind) + i * arrayScalingFactor(entryKind));
+                                barrierType = arrayInitializationBarrier(entryKind);
+                            }
+                            if (address != null) {
+                                WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, entryKind, value), barrierType);
+                                graph.addAfterFixed(newObject, graph.add(write));
                             }
-                        } else {
-                            address = createOffsetAddress(graph, newObject, arrayBaseOffset(entryKind) + i * arrayScalingFactor(entryKind));
-                            barrierType = arrayInitializationBarrier(entryKind);
-                        }
-                        if (address != null) {
-                            WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, entryKind, value), barrierType);
-                            graph.addAfterFixed(newObject, graph.add(write));
                         }
+                        valuePos++;
                     }
-                    valuePos++;
-
                 }
             }
             valuePos = 0;
 
             for (int objIndex = 0; objIndex < commit.getVirtualObjects().size(); objIndex++) {
                 VirtualObjectNode virtual = commit.getVirtualObjects().get(objIndex);
-                int entryCount = virtual.entryCount();
-                ValueNode newObject = allocations[objIndex];
-                for (int i = 0; i < entryCount; i++) {
-                    if (omittedValues.get(valuePos)) {
-                        ValueNode value = commit.getValues().get(valuePos);
-                        assert value instanceof VirtualObjectNode;
-                        ValueNode allocValue = allocations[commit.getVirtualObjects().indexOf(value)];
-                        if (!(allocValue.isConstant() && allocValue.asConstant().isDefaultForKind())) {
-                            assert virtual.entryKind(i) == JavaKind.Object && allocValue.getStackKind() == JavaKind.Object;
-                            AddressNode address;
-                            BarrierType barrierType;
-                            if (virtual instanceof VirtualInstanceNode) {
-                                VirtualInstanceNode virtualInstance = (VirtualInstanceNode) virtual;
-                                address = createFieldAddress(graph, newObject, virtualInstance.field(i));
-                                barrierType = BarrierType.IMPRECISE;
-                            } else {
-                                address = createArrayAddress(graph, newObject, virtual.entryKind(i), ConstantNode.forInt(i, graph));
-                                barrierType = BarrierType.PRECISE;
-                            }
-                            if (address != null) {
-                                WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, JavaKind.Object, allocValue), barrierType);
-                                graph.addBeforeFixed(commit, graph.add(write));
+                try (DebugCloseable nsp = graph.withNodeSourcePosition(virtual)) {
+                    int entryCount = virtual.entryCount();
+                    ValueNode newObject = allocations[objIndex];
+                    for (int i = 0; i < entryCount; i++) {
+                        if (omittedValues.get(valuePos)) {
+                            ValueNode value = commit.getValues().get(valuePos);
+                            assert value instanceof VirtualObjectNode;
+                            ValueNode allocValue = allocations[commit.getVirtualObjects().indexOf(value)];
+                            if (!(allocValue.isConstant() && allocValue.asConstant().isDefaultForKind())) {
+                                assert virtual.entryKind(i) == JavaKind.Object && allocValue.getStackKind() == JavaKind.Object;
+                                AddressNode address;
+                                BarrierType barrierType;
+                                if (virtual instanceof VirtualInstanceNode) {
+                                    VirtualInstanceNode virtualInstance = (VirtualInstanceNode) virtual;
+                                    address = createFieldAddress(graph, newObject, virtualInstance.field(i));
+                                    barrierType = BarrierType.IMPRECISE;
+                                } else {
+                                    address = createArrayAddress(graph, newObject, virtual.entryKind(i), ConstantNode.forInt(i, graph));
+                                    barrierType = BarrierType.PRECISE;
+                                }
+                                if (address != null) {
+                                    WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, JavaKind.Object, allocValue), barrierType);
+                                    graph.addBeforeFixed(commit, graph.add(write));
+                                }
                             }
                         }
+                        valuePos++;
                     }
-                    valuePos++;
                 }
             }
 
@@ -776,6 +814,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
                 recursiveLowering.lower(tool);
             }
         }
+
     }
 
     public NewInstanceNode createNewInstanceFromVirtual(VirtualObjectNode virtual) {
@@ -890,20 +929,22 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         return entryKind == JavaKind.Object ? BarrierType.PRECISE : BarrierType.NONE;
     }
 
-    private static BarrierType unsafeStoreBarrierType(RawStoreNode store) {
+    private BarrierType unsafeStoreBarrierType(RawStoreNode store) {
         if (!store.needsBarrier()) {
             return BarrierType.NONE;
         }
-        return storeBarrierType(store.object(), store.value());
+        return guessStoreBarrierType(store.object(), store.value());
     }
 
-    private static BarrierType storeBarrierType(ValueNode object, ValueNode value) {
+    private BarrierType guessStoreBarrierType(ValueNode object, ValueNode value) {
         if (value.getStackKind() == JavaKind.Object && object.getStackKind() == JavaKind.Object) {
             ResolvedJavaType type = StampTool.typeOrNull(object);
-            if (type != null && !type.isArray()) {
-                return BarrierType.IMPRECISE;
-            } else {
+            // Array types must use a precise barrier, so if the type is unknown or is a supertype
+            // of Object[] then treat it as an array.
+            if (type == null || type.isArray() || type.isAssignableFrom(objectArrayType)) {
                 return BarrierType.PRECISE;
+            } else {
+                return BarrierType.IMPRECISE;
             }
         }
         return BarrierType.NONE;
@@ -1030,6 +1071,10 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
     protected abstract ValueNode createReadArrayComponentHub(StructuredGraph graph, ValueNode arrayHub, FixedNode anchor);
 
     protected GuardingNode getBoundsCheck(AccessIndexedNode n, ValueNode array, LoweringTool tool) {
+        if (n.getBoundsCheck() != null) {
+            return n.getBoundsCheck();
+        }
+
         StructuredGraph graph = n.graph();
         ValueNode arrayLength = readArrayLength(array, tool.getConstantReflection());
         if (arrayLength == null) {
@@ -1049,7 +1094,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         if (StampTool.isPointerNonNull(object)) {
             return null;
         }
-        return tool.createGuard(before, before.graph().unique(IsNullNode.create(object)), NullCheckException, InvalidateReprofile, JavaConstant.NULL_POINTER, true);
+        return tool.createGuard(before, before.graph().unique(IsNullNode.create(object)), NullCheckException, InvalidateReprofile, JavaConstant.NULL_POINTER, true, null);
     }
 
     protected ValueNode createNullCheckedValue(ValueNode object, FixedNode before, LoweringTool tool) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java
index 9119d09d536..36a5b9498bc 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java
@@ -359,7 +359,7 @@ public class GraphKit implements GraphBuilderTool {
             calleeGraph.setTrackNodeSourcePosition();
         }
         IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
-        GraphBuilderPhase.Instance instance = new GraphBuilderPhase.Instance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
+        GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
                         OptimisticOptimizations.NONE,
                         initialReplacementContext);
         instance.apply(calleeGraph);
@@ -371,6 +371,11 @@ public class GraphKit implements GraphBuilderTool {
         InliningUtil.inline(invoke, calleeGraph, false, method, reason, phase);
     }
 
+    protected GraphBuilderPhase.Instance createGraphBuilderInstance(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection,
+                    ConstantFieldProvider constantFieldProvider, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
+        return new GraphBuilderPhase.Instance(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
+    }
+
     protected void pushStructure(Structure structure) {
         structures.add(structure);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index 6a7ef953384..b7bd4676095 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -22,6 +22,7 @@
  */
 package org.graalvm.compiler.replacements;
 
+import java.net.URI;
 import static org.graalvm.compiler.debug.GraalError.unimplemented;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
@@ -34,6 +35,7 @@ import java.util.Map;
 
 import jdk.internal.vm.compiler.collections.EconomicMap;
 import jdk.internal.vm.compiler.collections.Equivalence;
+import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.bytecode.Bytecode;
 import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.PermanentBailoutException;
@@ -46,6 +48,7 @@ import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.Node.NodeIntrinsic;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.SourceLanguagePosition;
@@ -78,6 +81,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
@@ -157,7 +161,7 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder {
         protected final int inliningDepth;
 
         protected final ValueNode[] arguments;
-        private final SourceLanguagePosition sourceLanguagePosition;
+        private SourceLanguagePosition sourceLanguagePosition = UnresolvedSourceLanguagePosition.INSTANCE;
 
         protected FrameState outerState;
         protected FrameState exceptionState;
@@ -173,13 +177,6 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder {
             this.invokeData = invokeData;
             this.inliningDepth = inliningDepth;
             this.arguments = arguments;
-            SourceLanguagePosition position = null;
-            if (arguments != null && method.hasReceiver() && arguments.length > 0 && arguments[0].isJavaConstant()) {
-                JavaConstant constantArgument = arguments[0].asJavaConstant();
-                position = sourceLanguagePositionProvider.getPosition(constantArgument);
-            }
-            this.sourceLanguagePosition = position;
-
         }
 
         @Override
@@ -201,13 +198,61 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder {
                 callerBytecodePosition = invokePosition;
             }
             if (position != null) {
-                return position.addCaller(caller.sourceLanguagePosition, callerBytecodePosition);
+                return position.addCaller(caller.resolveSourceLanguagePosition(), callerBytecodePosition);
             }
-            if (caller.sourceLanguagePosition != null && callerBytecodePosition != null) {
-                return new NodeSourcePosition(caller.sourceLanguagePosition, callerBytecodePosition.getCaller(), callerBytecodePosition.getMethod(), callerBytecodePosition.getBCI());
+            final SourceLanguagePosition pos = caller.resolveSourceLanguagePosition();
+            if (pos != null && callerBytecodePosition != null) {
+                return new NodeSourcePosition(pos, callerBytecodePosition.getCaller(), callerBytecodePosition.getMethod(), callerBytecodePosition.getBCI());
             }
             return callerBytecodePosition;
         }
+
+        private SourceLanguagePosition resolveSourceLanguagePosition() {
+            SourceLanguagePosition res = sourceLanguagePosition;
+            if (res == UnresolvedSourceLanguagePosition.INSTANCE) {
+                res = null;
+                if (arguments != null && method.hasReceiver() && arguments.length > 0 && arguments[0].isJavaConstant()) {
+                    JavaConstant constantArgument = arguments[0].asJavaConstant();
+                    res = sourceLanguagePositionProvider.getPosition(constantArgument);
+                }
+                sourceLanguagePosition = res;
+            }
+            return res;
+        }
+    }
+
+    private static final class UnresolvedSourceLanguagePosition implements SourceLanguagePosition {
+        static final SourceLanguagePosition INSTANCE = new UnresolvedSourceLanguagePosition();
+
+        @Override
+        public String toShortString() {
+            throw new IllegalStateException(getClass().getSimpleName() + " should not be reachable.");
+        }
+
+        @Override
+        public int getOffsetEnd() {
+            throw new IllegalStateException(getClass().getSimpleName() + " should not be reachable.");
+        }
+
+        @Override
+        public int getOffsetStart() {
+            throw new IllegalStateException(getClass().getSimpleName() + " should not be reachable.");
+        }
+
+        @Override
+        public int getLineNumber() {
+            throw new IllegalStateException(getClass().getSimpleName() + " should not be reachable.");
+        }
+
+        @Override
+        public URI getURI() {
+            throw new IllegalStateException(getClass().getSimpleName() + " should not be reachable.");
+        }
+
+        @Override
+        public String getLanguage() {
+            throw new IllegalStateException(getClass().getSimpleName() + " should not be reachable.");
+        }
     }
 
     protected class PENonAppendGraphBuilderContext implements GraphBuilderContext {
@@ -237,6 +282,21 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder {
             this.invoke = invoke;
         }
 
+        /**
+         * {@link Fold} and {@link NodeIntrinsic} can be deferred during parsing/decoding. Only by
+         * the end of {@linkplain SnippetTemplate#instantiate Snippet instantiation} do they need to
+         * have been processed.
+         *
+         * This is how SVM handles snippets. They are parsed with plugins disabled and then encoded
+         * and stored in the image. When the snippet is needed at runtime the graph is decoded and
+         * the plugins are run during the decoding process. If they aren't handled at this point
+         * then they will never be handled.
+         */
+        @Override
+        public boolean canDeferPlugin(GeneratedInvocationPlugin plugin) {
+            return plugin.getSource().equals(Fold.class) || plugin.getSource().equals(Node.NodeIntrinsic.class);
+        }
+
         @Override
         public BailoutException bailout(String string) {
             BailoutException bailout = new PermanentBailoutException(string);
@@ -1056,7 +1116,7 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder {
                 ValueNode array = loadIndexedNode.array();
                 ValueNode index = loadIndexedNode.index();
                 for (NodePlugin nodePlugin : nodePlugins) {
-                    if (nodePlugin.handleLoadIndexed(graphBuilderContext, array, index, loadIndexedNode.elementKind())) {
+                    if (nodePlugin.handleLoadIndexed(graphBuilderContext, array, index, loadIndexedNode.getBoundsCheck(), loadIndexedNode.elementKind())) {
                         replacedNode = graphBuilderContext.pushedNode;
                         break;
                     }
@@ -1068,7 +1128,7 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder {
                 ValueNode index = storeIndexedNode.index();
                 ValueNode value = storeIndexedNode.value();
                 for (NodePlugin nodePlugin : nodePlugins) {
-                    if (nodePlugin.handleStoreIndexed(graphBuilderContext, array, index, storeIndexedNode.elementKind(), value)) {
+                    if (nodePlugin.handleStoreIndexed(graphBuilderContext, array, index, storeIndexedNode.getBoundsCheck(), storeIndexedNode.getStoreCheck(), storeIndexedNode.elementKind(), value)) {
                         replacedNode = graphBuilderContext.pushedNode;
                         break;
                     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index e5b102f4dfe..4b5f04191cd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -51,6 +51,7 @@ 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.UnmodifiableEconomicMap;
+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.api.replacements.Snippet.NonNullParameter;
@@ -70,6 +71,7 @@ import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.debug.TimerKey;
 import org.graalvm.compiler.graph.Graph.Mark;
 import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.Node.NodeIntrinsic;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.Position;
@@ -103,6 +105,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.ValueNodeUtil;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
+import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.compiler.nodes.java.StoreIndexedNode;
 import org.graalvm.compiler.nodes.memory.MemoryAccess;
 import org.graalvm.compiler.nodes.memory.MemoryAnchorNode;
@@ -510,7 +513,7 @@ public class SnippetTemplate {
         }
 
         @Override
-        public ValueNode length() {
+        public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
             return ConstantNode.forInt(varargs.length);
         }
     }
@@ -955,6 +958,8 @@ public class SnippetTemplate {
                 merge.setNext(this.returnNode);
             }
 
+            assert verifyIntrinsicsProcessed(snippetCopy);
+
             this.sideEffectNodes = curSideEffectNodes;
             this.deoptNodes = curDeoptNodes;
             this.placeholderStampedNodes = curPlaceholderStampedNodes;
@@ -977,6 +982,16 @@ public class SnippetTemplate {
         }
     }
 
+    private static boolean verifyIntrinsicsProcessed(StructuredGraph snippetCopy) {
+        for (MethodCallTargetNode target : snippetCopy.getNodes(MethodCallTargetNode.TYPE)) {
+            ResolvedJavaMethod targetMethod = target.targetMethod();
+            if (targetMethod != null) {
+                assert targetMethod.getAnnotation(Fold.class) == null && targetMethod.getAnnotation(NodeIntrinsic.class) == null : "plugin should have been processed";
+            }
+        }
+        return true;
+    }
+
     public static void explodeLoops(final StructuredGraph snippetCopy, PhaseContext phaseContext) {
         // Do any required loop explosion
         boolean exploded = false;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
index d511f10bd13..81d8f7b9569 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -37,8 +37,6 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 
-import jdk.vm.ci.code.BytecodePosition;
-import jdk.vm.ci.meta.SpeculationLog;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.bytecode.BytecodeProvider;
@@ -63,6 +61,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.AbsNode;
 import org.graalvm.compiler.nodes.calc.CompareNode;
 import org.graalvm.compiler.nodes.calc.ConditionalNode;
+import org.graalvm.compiler.nodes.calc.FloatEqualsNode;
 import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
 import org.graalvm.compiler.nodes.calc.NarrowNode;
 import org.graalvm.compiler.nodes.calc.ReinterpretNode;
@@ -97,6 +96,7 @@ import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode;
 import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.compiler.nodes.java.RegisterFinalizerNode;
+import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
 import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode;
@@ -107,6 +107,7 @@ import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactNode;
 import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactNode;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 
+import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
@@ -115,6 +116,7 @@ import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.SpeculationLog;
 import sun.misc.Unsafe;
 
 /**
@@ -210,6 +212,76 @@ public class StandardGraphBuilderPlugins {
         r.registerMethodSubstitution(ArraySubstitutions.class, "getLength", Object.class);
     }
 
+    private abstract static class UnsafeCompareAndUpdatePluginsRegistrar {
+        public void register(Registration r, String casPrefix, JavaKind[] compareAndSwapTypes) {
+            for (JavaKind kind : compareAndSwapTypes) {
+                Class<?> javaClass = kind == JavaKind.Object ? Object.class : kind.toJavaClass();
+                r.register5(casPrefix + kind.name(), Receiver.class, Object.class, long.class, javaClass, javaClass, new InvocationPlugin() {
+                    @Override
+                    public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode object, ValueNode offset, ValueNode expected, ValueNode x) {
+                        // Emits a null-check for the otherwise unused receiver
+                        unsafe.get();
+                        b.addPush(returnKind(kind), createNode(object, offset, expected, x, kind, LocationIdentity.any()));
+                        b.getGraph().markUnsafeAccess();
+                        return true;
+                    }
+                });
+            }
+        }
+
+        public abstract ValueNode createNode(ValueNode object, ValueNode offset, ValueNode expected, ValueNode newValue, JavaKind kind, LocationIdentity identity);
+
+        public abstract JavaKind returnKind(JavaKind accessKind);
+    }
+
+    private static class UnsafeCompareAndSwapPluginsRegistrar extends UnsafeCompareAndUpdatePluginsRegistrar {
+        @Override
+        public ValueNode createNode(ValueNode object, ValueNode offset, ValueNode expected, ValueNode newValue, JavaKind kind, LocationIdentity identity) {
+            return new UnsafeCompareAndSwapNode(object, offset, expected, newValue, kind, LocationIdentity.any());
+        }
+
+        @Override
+        public JavaKind returnKind(JavaKind accessKind) {
+            return JavaKind.Boolean.getStackKind();
+        }
+    }
+
+    private static UnsafeCompareAndSwapPluginsRegistrar unsafeCompareAndSwapPluginsRegistrar = new UnsafeCompareAndSwapPluginsRegistrar();
+
+    private static class UnsafeCompareAndExchangePluginsRegistrar extends UnsafeCompareAndUpdatePluginsRegistrar {
+        @Override
+        public ValueNode createNode(ValueNode object, ValueNode offset, ValueNode expected, ValueNode newValue, JavaKind kind, LocationIdentity identity) {
+            return new UnsafeCompareAndExchangeNode(object, offset, expected, newValue, kind, LocationIdentity.any());
+        }
+
+        @Override
+        public JavaKind returnKind(JavaKind accessKind) {
+            if (accessKind.isNumericInteger()) {
+                return accessKind.getStackKind();
+            } else {
+                return accessKind;
+            }
+        }
+    }
+
+    private static UnsafeCompareAndExchangePluginsRegistrar unsafeCompareAndExchangePluginsRegistrar = new UnsafeCompareAndExchangePluginsRegistrar();
+
+    public static void registerPlatformSpecificUnsafePlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider, JavaKind[] supportedCasKinds) {
+        Registration r;
+        if (Java8OrEarlier) {
+            r = new Registration(plugins, Unsafe.class);
+        } else {
+            r = new Registration(plugins, "jdk.internal.misc.Unsafe", bytecodeProvider);
+        }
+
+        if (Java8OrEarlier) {
+            unsafeCompareAndSwapPluginsRegistrar.register(r, "compareAndSwap", new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object});
+        } else {
+            unsafeCompareAndSwapPluginsRegistrar.register(r, "compareAndSet", supportedCasKinds);
+            unsafeCompareAndExchangePluginsRegistrar.register(r, "compareAndExchange", supportedCasKinds);
+        }
+    }
+
     private static void registerUnsafePlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
         Registration r;
         if (Java8OrEarlier) {
@@ -250,26 +322,6 @@ public class StandardGraphBuilderPlugins {
         r.register2("getAddress", Receiver.class, long.class, new UnsafeGetPlugin(JavaKind.Long, false));
         r.register3("putAddress", Receiver.class, long.class, long.class, new UnsafePutPlugin(JavaKind.Long, false));
 
-        for (JavaKind kind : new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object}) {
-            Class<?> javaClass = kind == JavaKind.Object ? Object.class : kind.toJavaClass();
-            String casName;
-            if (Java8OrEarlier) {
-                casName = "compareAndSwap";
-            } else {
-                casName = "compareAndSet";
-            }
-            r.register5(casName + kind.name(), Receiver.class, Object.class, long.class, javaClass, javaClass, new InvocationPlugin() {
-                @Override
-                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode object, ValueNode offset, ValueNode expected, ValueNode x) {
-                    // Emits a null-check for the otherwise unused receiver
-                    unsafe.get();
-                    b.addPush(JavaKind.Int, new UnsafeCompareAndSwapNode(object, offset, expected, x, kind, LocationIdentity.any()));
-                    b.getGraph().markUnsafeAccess();
-                    return true;
-                }
-            });
-        }
-
         r.register2("allocateInstance", Receiver.class, Class.class, new InvocationPlugin() {
 
             @Override
@@ -301,14 +353,14 @@ public class StandardGraphBuilderPlugins {
         r.register2("divideUnsigned", type, type, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode dividend, ValueNode divisor) {
-                b.push(kind, b.append(UnsignedDivNode.create(dividend, divisor, NodeView.DEFAULT)));
+                b.push(kind, b.append(UnsignedDivNode.create(dividend, divisor, null, NodeView.DEFAULT)));
                 return true;
             }
         });
         r.register2("remainderUnsigned", type, type, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode dividend, ValueNode divisor) {
-                b.push(kind, b.append(UnsignedRemNode.create(dividend, divisor, NodeView.DEFAULT)));
+                b.push(kind, b.append(UnsignedRemNode.create(dividend, divisor, null, NodeView.DEFAULT)));
                 return true;
             }
         });
@@ -353,6 +405,16 @@ public class StandardGraphBuilderPlugins {
                 return true;
             }
         });
+        r.register1("floatToIntBits", float.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
+                LogicNode notNan = b.append(FloatEqualsNode.create(value, value, NodeView.DEFAULT));
+                ValueNode raw = b.append(ReinterpretNode.create(JavaKind.Int, value, NodeView.DEFAULT));
+                ValueNode result = b.append(ConditionalNode.create(notNan, raw, ConstantNode.forInt(0x7fc00000), NodeView.DEFAULT));
+                b.push(JavaKind.Int, result);
+                return true;
+            }
+        });
         r.register1("intBitsToFloat", int.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
@@ -371,6 +433,16 @@ public class StandardGraphBuilderPlugins {
                 return true;
             }
         });
+        r.register1("doubleToLongBits", double.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
+                LogicNode notNan = b.append(FloatEqualsNode.create(value, value, NodeView.DEFAULT));
+                ValueNode raw = b.append(ReinterpretNode.create(JavaKind.Long, value, NodeView.DEFAULT));
+                ValueNode result = b.append(ConditionalNode.create(notNan, raw, ConstantNode.forLong(0x7ff8000000000000L), NodeView.DEFAULT));
+                b.push(JavaKind.Long, result);
+                return true;
+            }
+        });
         r.register1("longBitsToDouble", long.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
@@ -906,6 +978,11 @@ public class StandardGraphBuilderPlugins {
                 b.add(new BlackholeNode(value));
                 return true;
             }
+
+            @Override
+            public boolean isDecorator() {
+                return true;
+            }
         };
         String[] names = {"org.openjdk.jmh.infra.Blackhole", "org.openjdk.jmh.logic.BlackHole"};
         for (String name : names) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/D b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/D
deleted file mode 100644
index 945a643ce98..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/D
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java
-index 88403c3..728297d 100644
---- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java
-+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java
-@@ -138,7 +138,11 @@ public final class ClassfileBytecodeProvider implements BytecodeProvider {
-         return classfile;
-     }
- 
--    synchronized Class<?> resolveToClass(String descriptor) {
-+    Class<?> resolveToClass(String descriptor) {
-+        return resolveToClass(descriptor, false);
-+    }
-+
-+    synchronized Class<?> resolveToClass(String descriptor, boolean initialize) {
-         Class<?> c = classes.get(descriptor);
-         if (c == null) {
-             if (descriptor.length() == 1) {
-@@ -155,7 +159,7 @@ public final class ClassfileBytecodeProvider implements BytecodeProvider {
-                     name = descriptor.replace('/', '.');
-                 }
-                 try {
--                    c = Class.forName(name, true, loader);
-+                    c = Class.forName(name, initialize, loader);
-                     classes.put(descriptor, c);
-                 } catch (ClassNotFoundException e) {
-                     throw new NoClassDefFoundError(descriptor);
-diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java
-index 087f78b..bde2dd4 100644
---- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java
-+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java
-@@ -70,8 +70,9 @@ abstract class ClassfileConstant {
-      * @param cp
-      * @param index
-      * @param opcode
-+     * @param initialize
-      */
--    public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode) {
-+    public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode, boolean initialize) {
-     }
- 
-     @Override
-@@ -90,15 +91,19 @@ abstract class ClassfileConstant {
-         }
- 
-         @Override
--        public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode) {
--            resolve(cp);
-+        public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode, boolean initialize) {
-+            resolve(cp, initialize);
-         }
- 
-         public ResolvedJavaType resolve(ClassfileConstantPool cp) throws GraalError {
-+            return resolve(cp, false /* initialize */);
-+        }
-+
-+        public ResolvedJavaType resolve(ClassfileConstantPool cp, boolean initialize) throws GraalError {
-             if (type == null) {
-                 String typeDescriptor = cp.get(Utf8.class, nameIndex).value;
-                 ClassfileBytecodeProvider context = cp.context;
--                type = context.metaAccess.lookupJavaType(context.resolveToClass(typeDescriptor));
-+                type = context.metaAccess.lookupJavaType(context.resolveToClass(typeDescriptor, initialize));
-             }
-             return type;
-         }
-@@ -116,8 +121,8 @@ abstract class ClassfileConstant {
-         }
- 
-         @Override
--        public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode) {
--            cp.get(ClassRef.class, classIndex).loadReferencedType(cp, classIndex, opcode);
-+        public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode, boolean initialize) {
-+            cp.get(ClassRef.class, classIndex).loadReferencedType(cp, classIndex, opcode, initialize);
-         }
-     }
- 
-@@ -269,7 +274,7 @@ abstract class ClassfileConstant {
-         }
- 
-         @Override
--        public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode) {
-+        public void loadReferencedType(ClassfileConstantPool cp, int index, int opcode, boolean initialize) {
-             throw new GraalError("Resolution of " + name + " constant pool entries not supported by " + ClassfileBytecodeProvider.class.getSimpleName());
-         }
-     }
-diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java
-index 218df10..a54779b 100644
---- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java
-+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java
-@@ -133,11 +133,11 @@ class ClassfileConstantPool implements ConstantPool {
-     }
- 
-     @Override
--    public void loadReferencedType(int index, int opcode) {
-+    public void loadReferencedType(int index, int opcode, boolean initialize) {
-         if (opcode == Bytecodes.INVOKEDYNAMIC) {
-             throw new GraalError("INVOKEDYNAMIC not supported by " + ClassfileBytecodeProvider.class.getSimpleName());
-         }
--        entries[index].loadReferencedType(this, index, opcode);
-+        entries[index].loadReferencedType(this, index, opcode, initialize);
-     }
- 
-     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 379bb109105..2d39c2298f9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -234,7 +234,8 @@ public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virt
                         return;
                     }
                     for (int i = 0; i < len; i++) {
-                        LoadIndexedNode load = new LoadIndexedNode(graph().getAssumptions(), srcAlias, ConstantNode.forInt(i + srcPosInt, graph()), destComponentType.getJavaKind());
+                        LoadIndexedNode load = new LoadIndexedNode(graph().getAssumptions(), srcAlias, ConstantNode.forInt(i + srcPosInt, graph()), null, destComponentType.getJavaKind());
+                        load.setNodeSourcePosition(getNodeSourcePosition());
                         tool.addNode(load);
                         tool.setVirtualEntry(destVirtual, destPosInt + i, load);
                     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
index ab46f0fbbd3..2de9d957480 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
@@ -139,7 +139,7 @@ public abstract class BasicObjectCloneNode extends MacroStateSplitNode implement
     }
 
     @Override
-    public ValueNode length() {
-        return GraphUtil.arrayLength(getObject());
+    public ValueNode findLength(ArrayLengthProvider.FindLengthMode mode) {
+        return GraphUtil.arrayLength(getObject(), mode);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
index bc78260f0c4..38f522e1062 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
@@ -333,7 +333,7 @@ public final class MethodHandleNode extends MacroStateSplitNode implements Simpl
                             FixedGuardNode fixedGuard = adder.add(new FixedGuardNode(inst, reason, action, speculation, false));
                             guard = fixedGuard;
                         } else {
-                            GuardNode newGuard = adder.add(new GuardNode(inst, guardAnchor, reason, action, false, speculation));
+                            GuardNode newGuard = adder.add(new GuardNode(inst, guardAnchor, reason, action, false, speculation, null));
                             adder.add(new ValueAnchorNode(newGuard));
                             guard = newGuard;
                         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java
index 8d17bfd3fff..5a4a7fbda4c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 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
@@ -22,34 +22,27 @@
  */
 package org.graalvm.compiler.serviceprovider.processor;
 
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.FilerException;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic.Kind;
-import javax.tools.FileObject;
-import javax.tools.StandardLocation;
 
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import org.graalvm.compiler.processor.AbstractProcessor;
 
 /**
- * Processes classes annotated with {@link ServiceProvider}. For a service defined by {@code S} and
+ * Processes classes annotated with {@code ServiceProvider}. For a service defined by {@code S} and
  * a class {@code P} implementing the service, this processor generates the file
  * {@code META-INF/providers/P} whose contents are a single line containing the fully qualified name
  * of {@code S}.
@@ -57,6 +50,7 @@ import org.graalvm.compiler.serviceprovider.ServiceProvider;
 @SupportedAnnotationTypes("org.graalvm.compiler.serviceprovider.ServiceProvider")
 public class ServiceProviderProcessor extends AbstractProcessor {
 
+    private static final String SERVICE_PROVIDER_CLASS_NAME = "org.graalvm.compiler.serviceprovider.ServiceProvider";
     private final Set<TypeElement> processed = new HashSet<>();
     private final Map<TypeElement, String> serviceProviders = new HashMap<>();
 
@@ -81,90 +75,59 @@ public class ServiceProviderProcessor extends AbstractProcessor {
         }
 
         processed.add(serviceProvider);
-        ServiceProvider annotation = serviceProvider.getAnnotation(ServiceProvider.class);
+        AnnotationMirror annotation = getAnnotation(serviceProvider, getType(SERVICE_PROVIDER_CLASS_NAME));
         if (annotation != null) {
-            try {
-                annotation.value();
-            } catch (MirroredTypeException ex) {
-                TypeMirror service = ex.getTypeMirror();
-                if (verifyAnnotation(service, serviceProvider)) {
-                    if (serviceProvider.getNestingKind().isNested()) {
-                        /*
-                         * This is a simplifying constraint that means we don't have to process the
-                         * qualified name to insert '$' characters at the relevant positions.
-                         */
-                        String msg = String.format("Service provider class %s must be a top level class", serviceProvider.getSimpleName());
-                        processingEnv.getMessager().printMessage(Kind.ERROR, msg, serviceProvider);
-                    } else {
-                        /*
-                         * Since the definition of the service class is not necessarily modifiable,
-                         * we need to support a non-top-level service class and ensure its name is
-                         * properly expressed with '$' separating nesting levels instead of '.'.
-                         */
-                        TypeElement serviceElement = (TypeElement) processingEnv.getTypeUtils().asElement(service);
-                        String serviceName = serviceElement.getSimpleName().toString();
-                        Element enclosing = serviceElement.getEnclosingElement();
-                        while (enclosing != null) {
-                            final ElementKind kind = enclosing.getKind();
-                            if (kind == ElementKind.PACKAGE) {
-                                serviceName = ((PackageElement) enclosing).getQualifiedName().toString() + "." + serviceName;
-                                break;
-                            } else if (kind == ElementKind.CLASS || kind == ElementKind.INTERFACE) {
-                                serviceName = ((TypeElement) enclosing).getSimpleName().toString() + "$" + serviceName;
-                                enclosing = enclosing.getEnclosingElement();
-                            } else {
-                                String msg = String.format("Cannot generate provider descriptor for service class %s as it is not nested in a package, class or interface",
-                                                serviceElement.getQualifiedName());
-                                processingEnv.getMessager().printMessage(Kind.ERROR, msg, serviceProvider);
-                                return;
-                            }
+            TypeMirror service = getAnnotationValue(annotation, "value", TypeMirror.class);
+            if (verifyAnnotation(service, serviceProvider)) {
+                if (serviceProvider.getNestingKind().isNested()) {
+                    /*
+                     * This is a simplifying constraint that means we don't have to process the
+                     * qualified name to insert '$' characters at the relevant positions.
+                     */
+                    String msg = String.format("Service provider class %s must be a top level class", serviceProvider.getSimpleName());
+                    processingEnv.getMessager().printMessage(Kind.ERROR, msg, serviceProvider);
+                } else {
+                    /*
+                     * Since the definition of the service class is not necessarily modifiable, we
+                     * need to support a non-top-level service class and ensure its name is properly
+                     * expressed with '$' separating nesting levels instead of '.'.
+                     */
+                    TypeElement serviceElement = (TypeElement) processingEnv.getTypeUtils().asElement(service);
+                    String serviceName = serviceElement.getSimpleName().toString();
+                    Element enclosing = serviceElement.getEnclosingElement();
+                    while (enclosing != null) {
+                        final ElementKind kind = enclosing.getKind();
+                        if (kind == ElementKind.PACKAGE) {
+                            serviceName = ((PackageElement) enclosing).getQualifiedName().toString() + "." + serviceName;
+                            break;
+                        } else if (kind == ElementKind.CLASS || kind == ElementKind.INTERFACE) {
+                            serviceName = ((TypeElement) enclosing).getSimpleName().toString() + "$" + serviceName;
+                            enclosing = enclosing.getEnclosingElement();
+                        } else {
+                            String msg = String.format("Cannot generate provider descriptor for service class %s as it is not nested in a package, class or interface",
+                                            serviceElement.getQualifiedName());
+                            processingEnv.getMessager().printMessage(Kind.ERROR, msg, serviceProvider);
+                            return;
                         }
-                        serviceProviders.put(serviceProvider, serviceName);
                     }
+                    serviceProviders.put(serviceProvider, serviceName);
                 }
             }
         }
     }
 
-    private void writeProviderFile(TypeElement serviceProvider, String interfaceName) {
-        String filename = "META-INF/providers/" + serviceProvider.getQualifiedName();
-        try {
-            FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", filename, serviceProvider);
-            PrintWriter writer = new PrintWriter(new OutputStreamWriter(file.openOutputStream(), "UTF-8"));
-            writer.println(interfaceName);
-            writer.close();
-        } catch (IOException e) {
-            processingEnv.getMessager().printMessage(isBug367599(e) ? Kind.NOTE : Kind.ERROR, e.getMessage(), serviceProvider);
-        }
-    }
-
-    /**
-     * Determines if a given exception is (most likely) caused by
-     * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=367599">Bug 367599</a>.
-     */
-    private static boolean isBug367599(Throwable t) {
-        if (t instanceof FilerException) {
-            for (StackTraceElement ste : t.getStackTrace()) {
-                if (ste.toString().contains("org.eclipse.jdt.internal.apt.pluggable.core.filer.IdeFilerImpl.create")) {
-                    // See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=367599
-                    return true;
-                }
-            }
-        }
-        return t.getCause() != null && isBug367599(t.getCause());
-    }
-
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (roundEnv.processingOver()) {
             for (Entry<TypeElement, String> e : serviceProviders.entrySet()) {
-                writeProviderFile(e.getKey(), e.getValue());
+                createProviderFile(e.getKey().getQualifiedName().toString(), e.getValue(), e.getKey());
             }
             serviceProviders.clear();
             return true;
         }
 
-        for (Element element : roundEnv.getElementsAnnotatedWith(ServiceProvider.class)) {
+        TypeElement serviceProviderTypeElement = getTypeElement(SERVICE_PROVIDER_CLASS_NAME);
+        for (Element element : roundEnv.getElementsAnnotatedWith(serviceProviderTypeElement)) {
             assert element.getKind().isClass();
             processElement((TypeElement) element);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java
index fc2a74ac8f6..29edabf765e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java
@@ -26,8 +26,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -183,6 +185,7 @@ public abstract class PartialEscapeBlockState<T extends PartialEscapeBlockState<
      * This transitively also materializes all other virtual objects that are reachable from the
      * entries.
      */
+    @SuppressWarnings("try")
     public void materializeBefore(FixedNode fixed, VirtualObjectNode virtual, GraphEffectList materializeEffects) {
         PartialEscapeClosure.COUNTER_MATERIALIZATIONS.increment(fixed.getDebug());
         List<AllocatedObjectNode> objects = new ArrayList<>(2);
@@ -209,8 +212,10 @@ public abstract class PartialEscapeBlockState<T extends PartialEscapeBlockState<
                     if (fixed.predecessor() instanceof CommitAllocationNode) {
                         commit = (CommitAllocationNode) fixed.predecessor();
                     } else {
-                        commit = graph.add(new CommitAllocationNode());
-                        graph.addBeforeFixed(fixed, commit);
+                        try (DebugCloseable context = graph.withNodeSourcePosition(NodeSourcePosition.placeholder(graph.method()))) {
+                            commit = graph.add(new CommitAllocationNode());
+                            graph.addBeforeFixed(fixed, commit);
+                        }
                     }
                     for (AllocatedObjectNode obj : objects) {
                         graph.addWithoutUnique(obj);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java
index 92c1e93c20c..d0dd1eb378b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java
@@ -650,7 +650,9 @@ public abstract class PartialEscapeClosure<BlockT extends PartialEscapeBlockStat
             if (needsCaching) {
                 return getValueObjectVirtualCached(phi, virtual);
             } else {
-                return virtual.duplicate();
+                VirtualObjectNode duplicate = virtual.duplicate();
+                duplicate.setNodeSourcePosition(virtual.getNodeSourcePosition());
+                return duplicate;
             }
         }
 
@@ -661,6 +663,7 @@ public abstract class PartialEscapeClosure<BlockT extends PartialEscapeBlockStat
             VirtualObjectNode result = valueObjectVirtuals.get(phi);
             if (result == null) {
                 result = virtual.duplicate();
+                result.setNodeSourcePosition(virtual.getNodeSourcePosition());
                 valueObjectVirtuals.put(phi, result);
             }
             return result;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java
index 8a790cb70e9..310a5d837e2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java
@@ -88,6 +88,7 @@ public abstract class Word implements SignedWord, UnsignedWord, Pointer {
      */
     public enum Opcode {
         NODE_CLASS,
+        NODE_CLASS_WITH_GUARD,
         COMPARISON,
         IS_NULL,
         IS_NON_NULL,
@@ -248,69 +249,69 @@ public abstract class Word implements SignedWord, UnsignedWord, Pointer {
     }
 
     @Override
-    @Operation(node = SignedDivNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = SignedDivNode.class)
     public Word signedDivide(SignedWord val) {
         return signedDivide((Word) val);
     }
 
     @Override
-    @Operation(node = SignedDivNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = SignedDivNode.class)
     public Word signedDivide(int val) {
         return signedDivide(intParam(val));
     }
 
-    @Operation(node = SignedDivNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = SignedDivNode.class)
     public Word signedDivide(Word val) {
         return box(unbox() / val.unbox());
     }
 
     @Override
-    @Operation(node = UnsignedDivNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = UnsignedDivNode.class)
     public Word unsignedDivide(UnsignedWord val) {
         return unsignedDivide((Word) val);
     }
 
     @Override
-    @Operation(node = UnsignedDivNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = UnsignedDivNode.class)
     public Word unsignedDivide(int val) {
         return signedDivide(intParam(val));
     }
 
-    @Operation(node = UnsignedDivNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = UnsignedDivNode.class)
     public Word unsignedDivide(Word val) {
         return box(Long.divideUnsigned(unbox(), val.unbox()));
     }
 
     @Override
-    @Operation(node = SignedRemNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = SignedRemNode.class)
     public Word signedRemainder(SignedWord val) {
         return signedRemainder((Word) val);
     }
 
     @Override
-    @Operation(node = SignedRemNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = SignedRemNode.class)
     public Word signedRemainder(int val) {
         return signedRemainder(intParam(val));
     }
 
-    @Operation(node = SignedRemNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = SignedRemNode.class)
     public Word signedRemainder(Word val) {
         return box(unbox() % val.unbox());
     }
 
     @Override
-    @Operation(node = UnsignedRemNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = UnsignedRemNode.class)
     public Word unsignedRemainder(UnsignedWord val) {
         return unsignedRemainder((Word) val);
     }
 
     @Override
-    @Operation(node = UnsignedRemNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = UnsignedRemNode.class)
     public Word unsignedRemainder(int val) {
         return signedRemainder(intParam(val));
     }
 
-    @Operation(node = UnsignedRemNode.class)
+    @Operation(opcode = Opcode.NODE_CLASS_WITH_GUARD, node = UnsignedRemNode.class)
     public Word unsignedRemainder(Word val) {
         return box(Long.remainderUnsigned(unbox(), val.unbox()));
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java
index 94971d79960..41fe42cefb5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java
@@ -51,6 +51,7 @@ import org.graalvm.compiler.nodes.calc.NarrowNode;
 import org.graalvm.compiler.nodes.calc.SignExtendNode;
 import org.graalvm.compiler.nodes.calc.XorNode;
 import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.extended.JavaReadNode;
 import org.graalvm.compiler.nodes.extended.JavaWriteNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
@@ -160,7 +161,7 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke
     }
 
     @Override
-    public boolean handleLoadIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, JavaKind elementKind) {
+    public boolean handleLoadIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind elementKind) {
         ResolvedJavaType arrayType = StampTool.typeOrNull(array);
         /*
          * There are cases where the array does not have a known type yet, i.e., the type is null.
@@ -168,14 +169,14 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke
          */
         if (arrayType != null && wordTypes.isWord(arrayType.getComponentType())) {
             assert elementKind == JavaKind.Object;
-            b.addPush(elementKind, createLoadIndexedNode(array, index));
+            b.addPush(elementKind, createLoadIndexedNode(array, index, boundsCheck));
             return true;
         }
         return false;
     }
 
-    protected LoadIndexedNode createLoadIndexedNode(ValueNode array, ValueNode index) {
-        return new LoadIndexedNode(null, array, index, wordKind);
+    protected LoadIndexedNode createLoadIndexedNode(ValueNode array, ValueNode index, GuardingNode boundsCheck) {
+        return new LoadIndexedNode(null, array, index, boundsCheck, wordKind);
     }
 
     @Override
@@ -201,14 +202,15 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke
     }
 
     @Override
-    public boolean handleStoreIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, JavaKind elementKind, ValueNode value) {
+    public boolean handleStoreIndexed(GraphBuilderContext b, ValueNode array, ValueNode index, GuardingNode boundsCheck, GuardingNode storeCheck, JavaKind elementKind, ValueNode value) {
         ResolvedJavaType arrayType = StampTool.typeOrNull(array);
         if (arrayType != null && wordTypes.isWord(arrayType.getComponentType())) {
             assert elementKind == JavaKind.Object;
             if (value.getStackKind() != wordKind) {
                 throw bailout(b, "Cannot store a non-word value into a word array: " + arrayType.toJavaName(true));
             }
-            b.add(createStoreIndexedNode(array, index, value));
+            GraalError.guarantee(storeCheck == null, "Word array stores are primitive stores and therefore do not require a store check");
+            b.add(createStoreIndexedNode(array, index, boundsCheck, value));
             return true;
         }
         if (elementKind == JavaKind.Object && value.getStackKind() == wordKind) {
@@ -217,8 +219,8 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke
         return false;
     }
 
-    protected StoreIndexedNode createStoreIndexedNode(ValueNode array, ValueNode index, ValueNode value) {
-        return new StoreIndexedNode(array, index, wordKind, value);
+    protected StoreIndexedNode createStoreIndexedNode(ValueNode array, ValueNode index, GuardingNode boundsCheck, ValueNode value) {
+        return new StoreIndexedNode(array, index, boundsCheck, null, wordKind, value);
     }
 
     @Override
@@ -275,11 +277,12 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke
         }
         switch (operation.opcode()) {
             case NODE_CLASS:
+            case NODE_CLASS_WITH_GUARD:
                 assert args.length == 2;
                 ValueNode left = args[0];
                 ValueNode right = operation.rightOperandIsInt() ? toUnsigned(b, args[1], JavaKind.Int) : fromSigned(b, args[1]);
 
-                b.addPush(returnKind, createBinaryNodeInstance(operation.node(), left, right));
+                b.addPush(returnKind, createBinaryNodeInstance(operation.node(), left, right, operation.opcode() == Opcode.NODE_CLASS_WITH_GUARD));
                 break;
 
             case COMPARISON:
@@ -399,10 +402,12 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke
      * method is called for all {@link Word} operations which are annotated with @Operation(node =
      * ...) and encapsulates the reflective allocation of the node.
      */
-    private static ValueNode createBinaryNodeInstance(Class<? extends ValueNode> nodeClass, ValueNode left, ValueNode right) {
+    private static ValueNode createBinaryNodeInstance(Class<? extends ValueNode> nodeClass, ValueNode left, ValueNode right, boolean withGuardingNode) {
         try {
-            Constructor<?> cons = nodeClass.getDeclaredConstructor(ValueNode.class, ValueNode.class);
-            return (ValueNode) cons.newInstance(left, right);
+            Class<?>[] parameterTypes = withGuardingNode ? new Class<?>[]{ValueNode.class, ValueNode.class, GuardingNode.class} : new Class<?>[]{ValueNode.class, ValueNode.class};
+            Constructor<?> cons = nodeClass.getDeclaredConstructor(parameterTypes);
+            Object[] initargs = withGuardingNode ? new Object[]{left, right, null} : new Object[]{left, right};
+            return (ValueNode) cons.newInstance(initargs);
         } catch (Throwable ex) {
             throw new GraalError(ex).addContext(nodeClass.getName());
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphJavadocSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphJavadocSnippets.java
index 96998075dd2..44672f512ae 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphJavadocSnippets.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphJavadocSnippets.java
@@ -149,8 +149,8 @@ final class GraphJavadocSnippets {
     static GraphOutput<AcmeGraph, ?> buildOutput(WritableByteChannel channel)
     throws IOException {
         return GraphOutput.newBuilder(acmeGraphStructure()).
-            // use the latest version; currently 5.0
-            protocolVersion(5, 0).
+            // use the latest version; currently 6.0
+            protocolVersion(6, 0).
             build(channel);
     }
     // END: org.graalvm.graphio.GraphJavadocSnippets#buildOutput
@@ -164,7 +164,7 @@ final class GraphJavadocSnippets {
         GraphTypes graphTypes = acmeTypes();
 
         return GraphOutput.newBuilder(acmeGraphStructure()).
-            protocolVersion(5, 0).
+            protocolVersion(6, 0).
             blocks(graphBlocks).
             elements(graphElements).
             types(graphTypes).
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java
index c437c7cc2d7..cc139a0032d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java
@@ -606,7 +606,7 @@ abstract class GraphProtocol<Graph, Node, NodeClass, Edges, Block, ResolvedJavaM
                             throw new IOException(ex);
                         }
                         if (uri == null) {
-                            throw new IOException("No URI for " + loc);
+                            continue;
                         }
                         String l = findLocationLanguage(loc);
                         if (l == null) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java
index 9e12b09318b..2e59feffe0e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java
@@ -78,7 +78,11 @@ final class ProtocolImpl<Graph, Node, NodeClass, Port, Block, ResolvedJavaMethod
 
     @Override
     protected NodeClass findClassForNode(Node obj) {
-        return structure.classForNode(obj);
+        NodeClass clazz = structure.classForNode(obj);
+        if (clazz != null && (findNodeClass(clazz) == null || findNode(clazz) != null)) {
+            throw new IllegalStateException("classForNode method shall return node class representation rather than node: " + clazz);
+        }
+        return clazz;
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java
index dfc4ff38092..ac2883abe23 100644
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java
+++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java
@@ -97,32 +97,32 @@ classes:
 <pre>
 import com.sun.javadoc.*;
 
-public class ListParams extends <span style="color:red" >Doclet</span> {
+public class ListParams extends <span style="color:#E00000" >Doclet</span> {
 
-    public static boolean start(<span style="color:red" >RootDoc</span> root) {
-        <span style="color:red" >ClassDoc</span>[] classes = root.<span style="color:red" >classes</span>();
+    public static boolean start(<span style="color:#E00000" >RootDoc</span> root) {
+        <span style="color:#E00000" >ClassDoc</span>[] classes = root.<span style="color:#E00000" >classes</span>();
         for (int i = 0; i &lt; classes.length; ++i) {
-            <span style="color:red" >ClassDoc</span> cd = classes[i];
-            printMembers(cd.<span style="color:red" >constructors</span>());
-            printMembers(cd.<span style="color:red" >methods</span>());
+            <span style="color:#E00000" >ClassDoc</span> cd = classes[i];
+            printMembers(cd.<span style="color:#E00000" >constructors</span>());
+            printMembers(cd.<span style="color:#E00000" >methods</span>());
         }
         return true;
     }
 
-    static void printMembers(<span style="color:red" >ExecutableMemberDoc</span>[] mems) {
+    static void printMembers(<span style="color:#E00000" >ExecutableMemberDoc</span>[] mems) {
         for (int i = 0; i &lt; mems.length; ++i) {
-            <span style="color:red" >ParamTag</span>[] params = mems[i].<span style="color:red" >paramTags</span>();
-            System.out.println(mems[i].<span style="color:red" >qualifiedName</span>());
+            <span style="color:#E00000" >ParamTag</span>[] params = mems[i].<span style="color:#E00000" >paramTags</span>();
+            System.out.println(mems[i].<span style="color:#E00000" >qualifiedName</span>());
             for (int j = 0; j &lt; params.length; ++j) {
-                System.out.println("   " + params[j].<span style="color:red" >parameterName</span>()
-                    + " - " + params[j].<span style="color:red" >parameterComment</span>());
+                System.out.println("   " + params[j].<span style="color:#E00000" >parameterName</span>()
+                    + " - " + params[j].<span style="color:#E00000" >parameterComment</span>());
             }
         }
     }
 }
 </pre>
 Interfaces and methods from the Javadoc API are marked in
-<span style="color:red" >red</span>.
+<span style="color:#E00000" >red</span>.
 {@link com.sun.javadoc.Doclet Doclet} is an abstract class that specifies
 the invocation interface for doclets,
 {@link com.sun.javadoc.Doclet Doclet} holds class or interface information,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index bae233fa7a5..27669aa1e6e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -198,9 +198,9 @@ public class HtmlConfiguration extends BaseConfiguration {
 
     /**
      * Specifies whether or not frames should be generated.
-     * Defaults to true; can be set by --frames; can be set to false by --no-frames; last one wins.
+     * Defaults to false; can be set to true by --frames; can be set to false by --no-frames; last one wins.
      */
-    public boolean frames = true;
+    public boolean frames = false;
 
     /**
      * This is the HTML version of the generated pages.
@@ -452,8 +452,12 @@ public class HtmlConfiguration extends BaseConfiguration {
      * packages is more than one. Sets {@link #createoverview} field to true.
      */
     protected void setCreateOverview() {
-        if ((overviewpath != null || packages.size() > 1) && !nooverview) {
-            createoverview = true;
+        if (!nooverview) {
+            if (overviewpath != null
+                    || modules.size() > 1
+                    || (modules.isEmpty() && packages.size() > 1)) {
+                createoverview = true;
+            }
         }
     }
 
@@ -740,6 +744,7 @@ public class HtmlConfiguration extends BaseConfiguration {
             new Option(resources, "--frames") {
                 @Override
                 public boolean process(String opt,  List<String> args) {
+                    reporter.print(WARNING, getText("doclet.Frames_specified", helpfile));
                     frames = true;
                     return true;
                 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index 034d51a85d5..600b0e0e257 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -172,8 +172,12 @@ public class HtmlDoclet extends AbstractDoclet {
             }
         }
 
-        if (!configuration.frames && !configuration.createoverview) {
-            IndexRedirectWriter.generate(configuration);
+        if (!configuration.frames) {
+            if (configuration.createoverview) {
+                IndexRedirectWriter.generate(configuration, DocPaths.OVERVIEW_SUMMARY, DocPaths.INDEX);
+            } else {
+                IndexRedirectWriter.generate(configuration);
+            }
         }
 
         if (configuration.helpfile.isEmpty() && !configuration.nohelp) {
@@ -201,9 +205,9 @@ public class HtmlDoclet extends AbstractDoclet {
         }
     }
 
-    protected void copyJqueryFiles() throws DocletException {
+    private void copyJqueryFiles() throws DocletException {
         List<String> files = Arrays.asList(
-                "jquery-1.10.2.js",
+                "jquery-1.12.4.js",
                 "jquery-ui.js",
                 "jquery-ui.css",
                 "jquery-ui.min.js",
@@ -245,7 +249,6 @@ public class HtmlDoclet extends AbstractDoclet {
     protected void generateClassFiles(SortedSet<TypeElement> arr, ClassTree classtree)
             throws DocletException {
         List<TypeElement> list = new ArrayList<>(arr);
-        ListIterator<TypeElement> iterator = list.listIterator();
         for (TypeElement klass : list) {
             if (utils.hasHiddenTag(klass) ||
                     !(configuration.isGeneratedDoc(klass) && utils.isIncluded(klass))) {
@@ -274,7 +277,6 @@ public class HtmlDoclet extends AbstractDoclet {
                 ModuleIndexFrameWriter.generate(configuration);
             }
             List<ModuleElement> mdles = new ArrayList<>(configuration.modulePackages.keySet());
-            int i = 0;
             for (ModuleElement mdle : mdles) {
                 if (configuration.frames && configuration.modules.size() > 1) {
                     ModulePackageIndexFrameWriter.generate(configuration, mdle);
@@ -283,21 +285,10 @@ public class HtmlDoclet extends AbstractDoclet {
                 AbstractBuilder moduleSummaryBuilder =
                         configuration.getBuilderFactory().getModuleSummaryBuilder(mdle);
                 moduleSummaryBuilder.build();
-                i++;
             }
         }
     }
 
-    PackageElement getNamedPackage(List<PackageElement> list, int idx) {
-        if (idx < list.size()) {
-            PackageElement pkg = list.get(idx);
-            if (pkg != null && !pkg.isUnnamed()) {
-                return pkg;
-            }
-        }
-        return null;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -308,11 +299,10 @@ public class HtmlDoclet extends AbstractDoclet {
             PackageIndexFrameWriter.generate(configuration);
         }
         List<PackageElement> pList = new ArrayList<>(packages);
-        for (int i = 0 ; i < pList.size() ; i++) {
+        for (PackageElement pkg : pList) {
             // if -nodeprecated option is set and the package is marked as
             // deprecated, do not generate the package-summary.html, package-frame.html
             // and package-tree.html pages for that package.
-            PackageElement pkg = pList.get(i);
             if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
                 if (configuration.frames) {
                     PackageFrameWriter.generate(configuration, pkg);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index 2daa6182f75..6295dce952b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -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
@@ -41,8 +41,8 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 
 /**
- * Writes an index.html file that tries to redirect to an alternate page.
- * The redirect uses JavaSCript, if enabled, falling back on
+ * Writes a file that tries to redirect to an alternate page.
+ * The redirect uses JavaScript, if enabled, falling back on
  * {@code <meta http-eqiv=refresh content="0,<uri>">}.
  * If neither are supported/enabled in a browser, the page displays the
  * standard "JavaScipt not enabled" message, and a link to the alternate page.
@@ -51,21 +51,27 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
 
     public static void generate(HtmlConfiguration configuration)
             throws DocFileIOException {
-        IndexRedirectWriter indexRedirect;
-        DocPath filename = DocPaths.INDEX;
-            indexRedirect = new IndexRedirectWriter(configuration, filename);
-            indexRedirect.generateIndexFile();
+        generate(configuration, DocPaths.INDEX, configuration.topFile);
     }
 
-    IndexRedirectWriter(HtmlConfiguration configuration, DocPath filename) {
+    public static void generate(HtmlConfiguration configuration, DocPath fileName, DocPath target)
+            throws DocFileIOException {
+        IndexRedirectWriter indexRedirect = new IndexRedirectWriter(configuration, fileName, target);
+        indexRedirect.generateIndexFile();
+    }
+
+    private DocPath target;
+
+    private IndexRedirectWriter(HtmlConfiguration configuration, DocPath filename, DocPath target) {
         super(configuration, filename);
+        this.target = target;
     }
 
     /**
      * Generate an index file that redirects to an alternate file.
      * @throws DocFileIOException if there is a problem generating the file
      */
-    void generateIndexFile() throws DocFileIOException {
+    private void generateIndexFile() throws DocFileIOException {
         DocType htmlDocType = DocType.forVersion(configuration.htmlVersion);
         Content htmlComment = contents.newPage;
         Head head = new Head(path, configuration.htmlVersion, configuration.docletVersion)
@@ -77,15 +83,16 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
                 : resources.getText("doclet.Generated_Docs_Untitled");
 
         head.setTitle(title)
-                .setCharset(configuration.charset);
+                .setCharset(configuration.charset)
+                .setCanonicalLink(target);
 
-        String topFilePath = configuration.topFile.getPath();
+        String targetPath = target.getPath();
         Script script = new Script("window.location.replace(")
-                .appendStringLiteral(topFilePath, '\'')
+                .appendStringLiteral(targetPath, '\'')
                 .append(")");
         HtmlTree metaRefresh = new HtmlTree(HtmlTag.META)
                 .addAttr(HtmlAttr.HTTP_EQUIV, "Refresh")
-                .addAttr(HtmlAttr.CONTENT, "0;" + topFilePath);
+                .addAttr(HtmlAttr.CONTENT, "0;" + targetPath);
         head.addContent(
                 script.asContent(),
                 configuration.isOutputHtml5() ? HtmlTree.NOSCRIPT(metaRefresh) : metaRefresh);
@@ -94,7 +101,7 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
         bodyContent.addContent(HtmlTree.NOSCRIPT(
                 HtmlTree.P(contents.getContent("doclet.No_Script_Message"))));
 
-        bodyContent.addContent(HtmlTree.P(HtmlTree.A(topFilePath, new StringContent(topFilePath))));
+        bodyContent.addContent(HtmlTree.P(HtmlTree.A(targetPath, new StringContent(targetPath))));
 
         Content body = new HtmlTree(HtmlTag.BODY);
         if (configuration.allowTag(HtmlTag.MAIN)) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index 592a84176ab..a9d76cda97d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -67,7 +67,8 @@ public class Head {
     private Script mainBodyScript;
     private final List<Script> scripts;
     private final List<Content> extraContent;
-    boolean addDefaultScript = true;
+    private boolean addDefaultScript = true;
+    private DocPath canonicalLink;
 
     private static final Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
 
@@ -227,6 +228,16 @@ public class Head {
         return this;
     }
 
+    /**
+     * Specifies a value for a
+     * <a href="https://en.wikipedia.org/wiki/Canonical_link_element">canonical link</a>
+     * in the {@code <head>} element.
+     * @param link
+     */
+    public void setCanonicalLink(DocPath link) {
+        this.canonicalLink = link;
+    }
+
     /**
      * Adds additional content to be included in the HEAD element.
      *
@@ -271,6 +282,13 @@ public class Head {
             tree.addContent(c);
         }
 
+        if (canonicalLink != null) {
+            HtmlTree link = new HtmlTree(HtmlTag.LINK);
+            link.addAttr(HtmlAttr.REL, "canonical");
+            link.addAttr(HtmlAttr.HREF, canonicalLink.getPath());
+            tree.addContent(link);
+        }
+
         addStylesheets(tree);
         addScripts(tree);
 
@@ -326,7 +344,7 @@ public class Head {
             tree.addContent(new RawHtml("<!--[if IE]>"));
             addJQueryFile(tree, DocPaths.JSZIPUTILS_IE_MIN);
             tree.addContent(new RawHtml("<![endif]-->"));
-            addJQueryFile(tree, DocPaths.JQUERY_JS_1_10);
+            addJQueryFile(tree, DocPaths.JQUERY_JS_1_12);
             addJQueryFile(tree, DocPaths.JQUERY_JS);
         }
         for (Script script : scripts) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js
index c5c648255c1..7fc60fca78b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js
@@ -1,91 +1,84 @@
 /*!
- * jQuery JavaScript Library v1.10.2
+ * jQuery JavaScript Library v1.12.4
  * http://jquery.com/
  *
  * Includes Sizzle.js
  * http://sizzlejs.com/
  *
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-07-03T13:48Z
+ * Date: 2016-05-20T17:17Z
  */
-(function( window, undefined ) {
 
-// Can't do this because several apps including ASP.NET trace
+(function( global, factory ) {
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+		// For CommonJS and CommonJS-like environments where a proper `window`
+		// is present, execute the factory and get jQuery.
+		// For environments that do not have a `window` with a `document`
+		// (such as Node.js), expose a factory as module.exports.
+		// This accentuates the need for the creation of a real `window`.
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info.
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Support: Firefox 18+
+// Can't be in strict mode, several libs including ASP.NET trace
 // the stack via arguments.caller.callee and Firefox dies if
 // you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
 //"use strict";
+var deletedIds = [];
+
+var document = window.document;
+
+var slice = deletedIds.slice;
+
+var concat = deletedIds.concat;
+
+var push = deletedIds.push;
+
+var indexOf = deletedIds.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
 var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<10
-	// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	location = window.location,
-	document = window.document,
-	docElem = document.documentElement,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.10.2",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
+	version = "1.12.4",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
+
 		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
 	},
 
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+	// Support: Android<4.1, IE<9
+	// Make sure we trim BOM and NBSP
 	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
 
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
 	// Matches dashed string for camelizing
 	rmsPrefix = /^-ms-/,
 	rdashAlpha = /-([\da-z])/gi,
@@ -93,134 +86,14 @@ var
 	// Used by jQuery.camelCase as callback to replace()
 	fcamelCase = function( all, letter ) {
 		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
 	};
 
 jQuery.fn = jQuery.prototype = {
+
 	// The current version of jQuery being used
-	jquery: core_version,
+	jquery: version,
 
 	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
 
 	// Start with an empty selector
 	selector: "",
@@ -229,19 +102,19 @@ jQuery.fn = jQuery.prototype = {
 	length: 0,
 
 	toArray: function() {
-		return core_slice.call( this );
+		return slice.call( this );
 	},
 
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
 	get: function( num ) {
-		return num == null ?
+		return num != null ?
 
-			// Return a 'clean' array
-			this.toArray() :
+			// Return just the one element from the set
+			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
 
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
+			// Return all the elements in a clean array
+			slice.call( this );
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -260,21 +133,18 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
+	each: function( callback ) {
+		return jQuery.each( this, callback );
 	},
 
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
+	map: function( callback ) {
+		return this.pushStack( jQuery.map( this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		} ) );
 	},
 
 	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
+		return this.pushStack( slice.apply( this, arguments ) );
 	},
 
 	first: function() {
@@ -288,32 +158,23 @@ jQuery.fn = jQuery.prototype = {
 	eq: function( i ) {
 		var len = this.length,
 			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
+		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
 	},
 
 	end: function() {
-		return this.prevObject || this.constructor(null);
+		return this.prevObject || this.constructor();
 	},
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
+	push: push,
+	sort: deletedIds.sort,
+	splice: deletedIds.splice
 };
 
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
 jQuery.extend = jQuery.fn.extend = function() {
 	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
+		target = arguments[ 0 ] || {},
 		i = 1,
 		length = arguments.length,
 		deep = false;
@@ -321,25 +182,28 @@ jQuery.extend = jQuery.fn.extend = function() {
 	// Handle a deep copy situation
 	if ( typeof target === "boolean" ) {
 		deep = target;
-		target = arguments[1] || {};
+
 		// skip the boolean and the target
-		i = 2;
+		target = arguments[ i ] || {};
+		i++;
 	}
 
 	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
 		target = {};
 	}
 
 	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
+	if ( i === length ) {
 		target = this;
-		--i;
+		i--;
 	}
 
 	for ( ; i < length; i++ ) {
+
 		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
+		if ( ( options = arguments[ i ] ) != null ) {
+
 			// Extend the base object
 			for ( name in options ) {
 				src = target[ name ];
@@ -351,13 +215,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 				}
 
 				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
+					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
+
 					if ( copyIsArray ) {
 						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
+						clone = src && jQuery.isArray( src ) ? src : [];
 
 					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
+						clone = src && jQuery.isPlainObject( src ) ? src : {};
 					}
 
 					// Never move original objects, clone them
@@ -375,78 +241,29 @@ jQuery.extend = jQuery.fn.extend = function() {
 	return target;
 };
 
-jQuery.extend({
+jQuery.extend( {
+
 	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
 
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
+	// Assume jQuery is ready without the ready module
+	isReady: true,
 
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
+	error: function( msg ) {
+		throw new Error( msg );
 	},
 
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
+	noop: function() {},
 
 	// See test/unit/core.js for details concerning isFunction.
 	// Since version 1.3, DOM methods and functions like alert
 	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
+		return jQuery.type( obj ) === "function";
 	},
 
 	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
+		return jQuery.type( obj ) === "array";
 	},
 
 	isWindow: function( obj ) {
@@ -455,53 +272,13 @@ jQuery.extend({
 	},
 
 	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
 
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( jQuery.support.ownLast ) {
-			for ( key in obj ) {
-				return core_hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
+		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		var realStringObj = obj && obj.toString();
+		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
 	},
 
 	isEmptyObject: function( obj ) {
@@ -512,104 +289,64 @@ jQuery.extend({
 		return true;
 	},
 
-	error: function( msg ) {
-		throw new Error( msg );
-	},
+	isPlainObject: function( obj ) {
+		var key;
 
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
 		}
 
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
 		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
+
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call( obj, "constructor" ) &&
+				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
+				return false;
 			}
-		} catch( e ) {
-			xml = undefined;
+		} catch ( e ) {
+
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
 		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
+
+		// Support: IE<9
+		// Handle iteration over inherited properties before own properties.
+		if ( !support.ownFirst ) {
+			for ( key in obj ) {
+				return hasOwn.call( obj, key );
+			}
 		}
-		return xml;
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
 	},
 
-	noop: function() {},
+	type: function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ toString.call( obj ) ] || "object" :
+			typeof obj;
+	},
 
-	// Evaluates a script in a global context
 	// Workarounds based on findings by Jim Driscoll
 	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
 	globalEval: function( data ) {
 		if ( data && jQuery.trim( data ) ) {
+
 			// We use execScript on Internet Explorer
 			// We use an anonymous function so that context is window
 			// rather than jQuery in Firefox
 			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
+				window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation
 			} )( data );
 		}
 	},
@@ -624,49 +361,20 @@ jQuery.extend({
 		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
 	},
 
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
+	each: function( obj, callback ) {
+		var length, i = 0;
 
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
+		if ( isArrayLike( obj ) ) {
+			length = obj.length;
+			for ( ; i < length; i++ ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
 				}
 			}
-
-		// A special, fast, case for the most common use of each
 		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
+			for ( i in obj ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
 				}
 			}
 		}
@@ -674,33 +382,25 @@ jQuery.extend({
 		return obj;
 	},
 
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
+	// Support: Android<4.1, IE<9
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
 
 	// results is for internal usage only
 	makeArray: function( arr, results ) {
 		var ret = results || [];
 
 		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
+			if ( isArrayLike( Object( arr ) ) ) {
 				jQuery.merge( ret,
 					typeof arr === "string" ?
 					[ arr ] : arr
 				);
 			} else {
-				core_push.call( ret, arr );
+				push.call( ret, arr );
 			}
 		}
 
@@ -711,14 +411,15 @@ jQuery.extend({
 		var len;
 
 		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
+			if ( indexOf ) {
+				return indexOf.call( arr, elem, i );
 			}
 
 			len = arr.length;
 			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
 
 			for ( ; i < len; i++ ) {
+
 				// Skip accessing in sparse arrays
 				if ( i in arr && arr[ i ] === elem ) {
 					return i;
@@ -730,16 +431,18 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
+		var len = +second.length,
+			j = 0,
+			i = first.length;
 
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
+		while ( j < len ) {
+			first[ i++ ] = second[ j++ ];
+		}
+
+		// Support: IE<9
+		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
+		if ( len !== len ) {
+			while ( second[ j ] !== undefined ) {
 				first[ i++ ] = second[ j++ ];
 			}
 		}
@@ -749,40 +452,39 @@ jQuery.extend({
 		return first;
 	},
 
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
 			i = 0,
-			length = elems.length;
-		inv = !!inv;
+			length = elems.length,
+			callbackExpect = !invert;
 
 		// Go through the array, only saving the items
 		// that pass the validator function
 		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
 			}
 		}
 
-		return ret;
+		return matches;
 	},
 
 	// arg is for internal usage only
 	map: function( elems, callback, arg ) {
-		var value,
+		var length, value,
 			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
 			ret = [];
 
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
+		// Go through the array, translating each of the items to their new values
+		if ( isArrayLike( elems ) ) {
+			length = elems.length;
 			for ( ; i < length; i++ ) {
 				value = callback( elems[ i ], i, arg );
 
 				if ( value != null ) {
-					ret[ ret.length ] = value;
+					ret.push( value );
 				}
 			}
 
@@ -792,13 +494,13 @@ jQuery.extend({
 				value = callback( elems[ i ], i, arg );
 
 				if ( value != null ) {
-					ret[ ret.length ] = value;
+					ret.push( value );
 				}
 			}
 		}
 
 		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
+		return concat.apply( [], ret );
 	},
 
 	// A global GUID counter for objects
@@ -822,9 +524,9 @@ jQuery.extend({
 		}
 
 		// Simulated bind
-		args = core_slice.call( arguments, 2 );
+		args = slice.call( arguments, 2 );
 		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
+			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
 		};
 
 		// Set the guid of unique handler to the same of original handler, so it can be removed
@@ -833,193 +535,71 @@ jQuery.extend({
 		return proxy;
 	},
 
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
 	now: function() {
-		return ( new Date() ).getTime();
+		return +( new Date() );
 	},
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations.
-	// Note: this method belongs to the css module but it's needed here for the support module.
-	// If support gets modularized, this method should be moved back to the css module.
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+} );
 
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
+// JSHint would error on this code due to the Symbol not being defined in ES5.
+// Defining this global in .jshintrc would create a danger of using the global
+// unguarded in another place, it seems safer to just disable JSHint for these
+// three lines.
+/* jshint ignore: start */
+if ( typeof Symbol === "function" ) {
+	jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ];
+}
+/* jshint ignore: end */
 
 // Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+function( i, name ) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
+} );
 
-function isArraylike( obj ) {
-	var length = obj.length,
+function isArrayLike( obj ) {
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = !!obj && "length" in obj && obj.length,
 		type = jQuery.type( obj );
 
-	if ( jQuery.isWindow( obj ) ) {
+	if ( type === "function" || jQuery.isWindow( obj ) ) {
 		return false;
 	}
 
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
 }
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
+var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v1.10.2
+ * Sizzle CSS Selector Engine v2.2.1
  * http://sizzlejs.com/
  *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-07-03
+ * Date: 2015-10-17
  */
-(function( window, undefined ) {
+(function( window ) {
 
 var i,
 	support,
-	cachedruns,
 	Expr,
 	getText,
 	isXML,
+	tokenize,
 	compile,
+	select,
 	outermostContext,
 	sortInput,
+	hasDuplicate,
 
 	// Local document vars
 	setDocument,
@@ -1032,24 +612,21 @@ var i,
 	contains,
 
 	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
+	expando = "sizzle" + 1 * new Date(),
 	preferredDoc = window.document,
 	dirruns = 0,
 	done = 0,
 	classCache = createCache(),
 	tokenCache = createCache(),
 	compilerCache = createCache(),
-	hasDuplicate = false,
 	sortOrder = function( a, b ) {
 		if ( a === b ) {
 			hasDuplicate = true;
-			return 0;
 		}
 		return 0;
 	},
 
 	// General-purpose constants
-	strundefined = typeof undefined,
 	MAX_NEGATIVE = 1 << 31,
 
 	// Instance methods
@@ -1059,12 +636,13 @@ var i,
 	push_native = arr.push,
 	push = arr.push,
 	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
+	// Use a stripped-down indexOf as it's faster than native
+	// http://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
 		var i = 0,
-			len = this.length;
+			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
+			if ( list[i] === elem ) {
 				return i;
 			}
 		}
@@ -1075,44 +653,46 @@ var i,
 
 	// Regular expressions
 
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	// http://www.w3.org/TR/css3-selectors/#whitespace
 	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
 
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
+	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
 
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
 
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
+	pseudos = ":(" + identifier + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
 	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
 	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
 
-	rsibling = new RegExp( whitespace + "*[+~]" ),
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
 
 	rpseudo = new RegExp( pseudos ),
 	ridentifier = new RegExp( "^" + identifier + "$" ),
 
 	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ID": new RegExp( "^#(" + identifier + ")" ),
+		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
+		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
 		"ATTR": new RegExp( "^" + attributes ),
 		"PSEUDO": new RegExp( "^" + pseudos ),
 		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
@@ -1125,14 +705,15 @@ var i,
 			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
 	},
 
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
 	rnative = /^[^{]+\{\s*\[native \w/,
 
 	// Easily-parseable/retrievable ID or TAG or CLASS selectors
 	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
 
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
+	rsibling = /[+~]/,
 	rescape = /'|\\/g,
 
 	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
@@ -1140,15 +721,23 @@ var i,
 	funescape = function( _, escaped, escapedWhitespace ) {
 		var high = "0x" + escaped - 0x10000;
 		// NaN means non-codepoint
-		// Support: Firefox
+		// Support: Firefox<24
 		// Workaround erroneous numeric interpretation of +"0x"
 		return high !== high || escapedWhitespace ?
 			escaped :
-			// BMP codepoint
 			high < 0 ?
+				// BMP codepoint
 				String.fromCharCode( high + 0x10000 ) :
 				// Supplemental Plane codepoint (surrogate pair)
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
 	};
 
 // Optimize for push.apply( _, NodeList )
@@ -1181,104 +770,129 @@ try {
 }
 
 function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
+	var m, i, elem, nid, nidselect, match, groups, newSelector,
+		newContext = context && context.ownerDocument,
 
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
+		// nodeType defaults to 9, since context defaults to document
+		nodeType = context ? context.nodeType : 9;
 
-	context = context || document;
 	results = results || [];
 
-	if ( !selector || typeof selector !== "string" ) {
+	// Return early from calls with invalid selector or context
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
 		return results;
 	}
 
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
+	// Try to shortcut find operations (as opposed to filters) in HTML documents
+	if ( !seed ) {
 
-	if ( documentIsHTML && !seed ) {
+		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+			setDocument( context );
+		}
+		context = context || document;
+
+		if ( documentIsHTML ) {
+
+			// If the selector is sufficiently simple, try using a "get*By*" DOM method
+			// (excepting DocumentFragment context, where the methods don't exist)
+			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+
+				// ID selector
+				if ( (m = match[1]) ) {
+
+					// Document context
+					if ( nodeType === 9 ) {
+						if ( (elem = context.getElementById( m )) ) {
+
+							// Support: IE, Opera, Webkit
+							// TODO: identify versions
+							// getElementById can match elements by name instead of ID
+							if ( elem.id === m ) {
+								results.push( elem );
+								return results;
+							}
+						} else {
+							return results;
+						}
+
+					// Element context
+					} else {
+
+						// Support: IE, Opera, Webkit
+						// TODO: identify versions
+						// getElementById can match elements by name instead of ID
+						if ( newContext && (elem = newContext.getElementById( m )) &&
+							contains( context, elem ) &&
+							elem.id === m ) {
 
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
 							results.push( elem );
 							return results;
 						}
-					} else {
-						return results;
 					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
 
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
+				// Type selector
+				} else if ( match[2] ) {
+					push.apply( results, context.getElementsByTagName( selector ) );
 					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
+
+				// Class selector
+				} else if ( (m = match[3]) && support.getElementsByClassName &&
+					context.getElementsByClassName ) {
+
+					push.apply( results, context.getElementsByClassName( m ) );
+					return results;
+				}
+			}
+
+			// Take advantage of querySelectorAll
+			if ( support.qsa &&
+				!compilerCache[ selector + " " ] &&
+				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+
+				if ( nodeType !== 1 ) {
+					newContext = context;
+					newSelector = selector;
+
+				// qSA looks outside Element context, which is not what we want
+				// Thanks to Andrew Dupont for this workaround technique
+				// Support: IE <=8
+				// Exclude object elements
+				} else if ( context.nodeName.toLowerCase() !== "object" ) {
+
+					// Capture the context ID, setting it first if necessary
+					if ( (nid = context.getAttribute( "id" )) ) {
+						nid = nid.replace( rescape, "\\$&" );
+					} else {
+						context.setAttribute( "id", (nid = expando) );
+					}
+
+					// Prefix every selector in the list
+					groups = tokenize( selector );
+					i = groups.length;
+					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
+					while ( i-- ) {
+						groups[i] = nidselect + " " + toSelector( groups[i] );
+					}
+					newSelector = groups.join( "," );
+
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+				}
+
+				if ( newSelector ) {
+					try {
+						push.apply( results,
+							newContext.querySelectorAll( newSelector )
+						);
+						return results;
+					} catch ( qsaError ) {
+					} finally {
+						if ( nid === expando ) {
+							context.removeAttribute( "id" );
+						}
 					}
 				}
 			}
@@ -1291,7 +905,7 @@ function Sizzle( selector, context, results, seed ) {
 
 /**
  * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ * @returns {function(string, object)} Returns the Object data after storing it on itself with
  *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
  *	deleting the oldest entry
  */
@@ -1300,11 +914,11 @@ function createCache() {
 
 	function cache( key, value ) {
 		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
 			// Only keep the most recent entries
 			delete cache[ keys.shift() ];
 		}
-		return (cache[ key ] = value);
+		return (cache[ key + " " ] = value);
 	}
 	return cache;
 }
@@ -1346,7 +960,7 @@ function assert( fn ) {
  */
 function addHandle( attrs, handler ) {
 	var arr = attrs.split("|"),
-		i = attrs.length;
+		i = arr.length;
 
 	while ( i-- ) {
 		Expr.attrHandle[ arr[i] ] = handler;
@@ -1427,8 +1041,21 @@ function createPositionalPseudo( fn ) {
 }
 
 /**
- * Detect xml
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
  * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
  */
 isXML = Sizzle.isXML = function( elem ) {
 	// documentElement is verified for cases where it doesn't yet exist
@@ -1437,45 +1064,44 @@ isXML = Sizzle.isXML = function( elem ) {
 	return documentElement ? documentElement.nodeName !== "HTML" : false;
 };
 
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
 /**
  * Sets document-related variables once based on the current document
  * @param {Element|Object} [doc] An element or document object to use to set the document
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
+	var hasCompare, parent,
+		doc = node ? node.ownerDocument || node : preferredDoc;
 
-	// If no document and documentElement is available, return
+	// Return early if doc is invalid or already selected
 	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
 		return document;
 	}
 
-	// Set our document
+	// Update global variables
 	document = doc;
-	docElem = doc.documentElement;
+	docElem = document.documentElement;
+	documentIsHTML = !isXML( document );
 
-	// Support tests
-	documentIsHTML = !isXML( doc );
+	// Support: IE 9-11, Edge
+	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
+	if ( (parent = document.defaultView) && parent.top !== parent ) {
+		// Support: IE 11
+		if ( parent.addEventListener ) {
+			parent.addEventListener( "unload", unloadHandler, false );
 
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent.attachEvent && parent !== parent.top ) {
-		parent.attachEvent( "onbeforeunload", function() {
-			setDocument();
-		});
+		// Support: IE 9 - 10 only
+		} else if ( parent.attachEvent ) {
+			parent.attachEvent( "onunload", unloadHandler );
+		}
 	}
 
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
 	support.attributes = assert(function( div ) {
 		div.className = "i";
 		return !div.getAttribute("className");
@@ -1486,21 +1112,12 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Check if getElementsByTagName("*") returns only elements
 	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
+		div.appendChild( document.createComment("") );
 		return !div.getElementsByTagName("*").length;
 	});
 
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
 
 	// Support: IE<10
 	// Check if getElementById returns elements by name
@@ -1508,17 +1125,15 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// so use a roundabout getElementsByName test
 	support.getById = assert(function( div ) {
 		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+		return !document.getElementsByName || !document.getElementsByName( expando ).length;
 	});
 
 	// ID find and filter
 	if ( support.getById ) {
 		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
+				return m ? [ m ] : [];
 			}
 		};
 		Expr.filter["ID"] = function( id ) {
@@ -1535,7 +1150,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 		Expr.filter["ID"] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				var node = typeof elem.getAttributeNode !== "undefined" &&
+					elem.getAttributeNode("id");
 				return node && node.value === attrId;
 			};
 		};
@@ -1544,14 +1160,20 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Tag
 	Expr.find["TAG"] = support.getElementsByTagName ?
 		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
 				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
 			}
 		} :
+
 		function( tag, context ) {
 			var elem,
 				tmp = [],
 				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
 				results = context.getElementsByTagName( tag );
 
 			// Filter out possible comments
@@ -1569,7 +1191,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Class
 	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
 	};
@@ -1589,7 +1211,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See http://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
+	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
 		assert(function( div ) {
@@ -1598,7 +1220,17 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// setting a boolean content attribute,
 			// since its presence should be enough
 			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
+			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
+				"<option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
@@ -1606,27 +1238,37 @@ setDocument = Sizzle.setDocument = function( node ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
+			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
+			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
 			if ( !div.querySelectorAll(":checked").length ) {
 				rbuggyQSA.push(":checked");
 			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibing-combinator selector` fails
+			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
 		});
 
 		assert(function( div ) {
-
-			// Support: Opera 10-12/IE8
-			// ^= $= *= and empty values
-			// Should not select anything
 			// Support: Windows 8 Native Apps
-			// The type attribute is restricted during .innerHTML assignment
-			var input = doc.createElement("input");
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = document.createElement("input");
 			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "t", "" );
+			div.appendChild( input ).setAttribute( "name", "D" );
 
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( div.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
@@ -1641,7 +1283,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 		});
 	}
 
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
 		docElem.msMatchesSelector) )) ) {
@@ -1663,11 +1306,12 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	/* Contains
 	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
 
 	// Element contains another
-	// Purposefully does not implement inclusive descendent
+	// Purposefully self-exclusive
 	// As in, an element does not contain itself
-	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
+	contains = hasCompare || rnative.test( docElem.contains ) ?
 		function( a, b ) {
 			var adown = a.nodeType === 9 ? a.documentElement : a,
 				bup = b && b.parentNode;
@@ -1692,7 +1336,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	---------------------------------------------------------------------- */
 
 	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
+	sortOrder = hasCompare ?
 	function( a, b ) {
 
 		// Flag for duplicate removal
@@ -1701,34 +1345,46 @@ setDocument = Sizzle.setDocument = function( node ) {
 			return 0;
 		}
 
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
-
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
 		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ||
-				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-				// Choose the first element that is related to our preferred document
-				if ( a === doc || contains(preferredDoc, a) ) {
-					return -1;
-				}
-				if ( b === doc || contains(preferredDoc, b) ) {
-					return 1;
-				}
-
-				// Maintain original order
-				return sortInput ?
-					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-					0;
-			}
-
-			return compare & 4 ? -1 : 1;
+			return compare;
 		}
 
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
 	} :
 	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
 		var cur,
 			i = 0,
 			aup = a.parentNode,
@@ -1736,19 +1392,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 			ap = [ a ],
 			bp = [ b ];
 
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
 		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
+		if ( !aup || !bup ) {
+			return a === document ? -1 :
+				b === document ? 1 :
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
 				0;
 
 		// If the nodes are siblings, we can do a quick check
@@ -1781,7 +1432,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 			0;
 	};
 
-	return doc;
+	return document;
 };
 
 Sizzle.matches = function( expr, elements ) {
@@ -1798,6 +1449,7 @@ Sizzle.matchesSelector = function( elem, expr ) {
 	expr = expr.replace( rattributeQuotes, "='$1']" );
 
 	if ( support.matchesSelector && documentIsHTML &&
+		!compilerCache[ expr + " " ] &&
 		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
 		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
 
@@ -1811,10 +1463,10 @@ Sizzle.matchesSelector = function( elem, expr ) {
 					elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch(e) {}
+		} catch (e) {}
 	}
 
-	return Sizzle( expr, document, null, [elem] ).length > 0;
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
 };
 
 Sizzle.contains = function( context, elem ) {
@@ -1837,13 +1489,13 @@ Sizzle.attr = function( elem, name ) {
 			fn( elem, name, !documentIsHTML ) :
 			undefined;
 
-	return val === undefined ?
+	return val !== undefined ?
+		val :
 		support.attributes || !documentIsHTML ?
 			elem.getAttribute( name ) :
 			(val = elem.getAttributeNode(name)) && val.specified ?
 				val.value :
-				null :
-		val;
+				null;
 };
 
 Sizzle.error = function( msg ) {
@@ -1876,6 +1528,10 @@ Sizzle.uniqueSort = function( results ) {
 		}
 	}
 
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
 	return results;
 };
 
@@ -1891,13 +1547,13 @@ getText = Sizzle.getText = function( elem ) {
 
 	if ( !nodeType ) {
 		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
+		while ( (node = elem[i++]) ) {
 			// Do not traverse comment nodes
 			ret += getText( node );
 		}
 	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
 		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
+		// innerText usage removed for consistency of new lines (jQuery #11153)
 		if ( typeof elem.textContent === "string" ) {
 			return elem.textContent;
 		} else {
@@ -1939,7 +1595,7 @@ Expr = Sizzle.selectors = {
 			match[1] = match[1].replace( runescape, funescape );
 
 			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
 
 			if ( match[2] === "~=" ) {
 				match[3] = " " + match[3] + " ";
@@ -1982,15 +1638,15 @@ Expr = Sizzle.selectors = {
 
 		"PSEUDO": function( match ) {
 			var excess,
-				unquoted = !match[5] && match[2];
+				unquoted = !match[6] && match[2];
 
 			if ( matchExpr["CHILD"].test( match[0] ) ) {
 				return null;
 			}
 
 			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
 
 			// Strip excess characters from unquoted arguments
 			} else if ( unquoted && rpseudo.test( unquoted ) &&
@@ -2026,7 +1682,7 @@ Expr = Sizzle.selectors = {
 			return pattern ||
 				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
 				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
 				});
 		},
 
@@ -2048,7 +1704,7 @@ Expr = Sizzle.selectors = {
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
 					operator === "*=" ? check && result.indexOf( check ) > -1 :
 					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
 			};
@@ -2067,11 +1723,12 @@ Expr = Sizzle.selectors = {
 				} :
 
 				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
+					var cache, uniqueCache, outerCache, node, nodeIndex, start,
 						dir = simple !== forward ? "nextSibling" : "previousSibling",
 						parent = elem.parentNode,
 						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
+						useCache = !xml && !ofType,
+						diff = false;
 
 					if ( parent ) {
 
@@ -2080,7 +1737,10 @@ Expr = Sizzle.selectors = {
 							while ( dir ) {
 								node = elem;
 								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+									if ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) {
+
 										return false;
 									}
 								}
@@ -2094,11 +1754,21 @@ Expr = Sizzle.selectors = {
 
 						// non-xml :nth-child(...) stores cache data on `parent`
 						if ( forward && useCache ) {
+
 							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
+
+							// ...in a gzip-friendly way
+							node = parent;
+							outerCache = node[ expando ] || (node[ expando ] = {});
+
+							// Support: IE <9 only
+							// Defend against cloned attroperties (jQuery gh-1709)
+							uniqueCache = outerCache[ node.uniqueID ] ||
+								(outerCache[ node.uniqueID ] = {});
+
+							cache = uniqueCache[ type ] || [];
+							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+							diff = nodeIndex && cache[ 2 ];
 							node = nodeIndex && parent.childNodes[ nodeIndex ];
 
 							while ( (node = ++nodeIndex && node && node[ dir ] ||
@@ -2108,29 +1778,55 @@ Expr = Sizzle.selectors = {
 
 								// When found, cache indexes on `parent` and break
 								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
 									break;
 								}
 							}
 
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
 						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
+							// Use previously-cached element index if available
+							if ( useCache ) {
+								// ...in a gzip-friendly way
+								node = elem;
+								outerCache = node[ expando ] || (node[ expando ] = {});
 
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
+								// Support: IE <9 only
+								// Defend against cloned attroperties (jQuery gh-1709)
+								uniqueCache = outerCache[ node.uniqueID ] ||
+									(outerCache[ node.uniqueID ] = {});
 
-									if ( node === elem ) {
-										break;
+								cache = uniqueCache[ type ] || [];
+								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+								diff = nodeIndex;
+							}
+
+							// xml :nth-child(...)
+							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
+							if ( diff === false ) {
+								// Use the same loop as above to seek `elem` from the start
+								while ( (node = ++nodeIndex && node && node[ dir ] ||
+									(diff = nodeIndex = 0) || start.pop()) ) {
+
+									if ( ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) &&
+										++diff ) {
+
+										// Cache the index of each encountered element
+										if ( useCache ) {
+											outerCache = node[ expando ] || (node[ expando ] = {});
+
+											// Support: IE <9 only
+											// Defend against cloned attroperties (jQuery gh-1709)
+											uniqueCache = outerCache[ node.uniqueID ] ||
+												(outerCache[ node.uniqueID ] = {});
+
+											uniqueCache[ type ] = [ dirruns, diff ];
+										}
+
+										if ( node === elem ) {
+											break;
+										}
 									}
 								}
 							}
@@ -2168,7 +1864,7 @@ Expr = Sizzle.selectors = {
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
+							idx = indexOf( seed, matched[i] );
 							seed[ idx ] = !( matches[ idx ] = matched[i] );
 						}
 					}) :
@@ -2207,6 +1903,8 @@ Expr = Sizzle.selectors = {
 				function( elem, context, xml ) {
 					input[0] = elem;
 					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
 					return !results.pop();
 				};
 		}),
@@ -2218,6 +1916,7 @@ Expr = Sizzle.selectors = {
 		}),
 
 		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
 			return function( elem ) {
 				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
 			};
@@ -2294,12 +1993,11 @@ Expr = Sizzle.selectors = {
 		// Contents
 		"empty": function( elem ) {
 			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
 			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
+				if ( elem.nodeType < 6 ) {
 					return false;
 				}
 			}
@@ -2326,11 +2024,12 @@ Expr = Sizzle.selectors = {
 
 		"text": function( elem ) {
 			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
 			return elem.nodeName.toLowerCase() === "input" &&
 				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
 		},
 
 		// Position-in-collection
@@ -2395,7 +2094,7 @@ function setFilters() {}
 setFilters.prototype = Expr.filters = Expr.pseudos;
 Expr.setFilters = new setFilters();
 
-function tokenize( selector, parseOnly ) {
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 	var matched, match, tokens, type,
 		soFar, groups, preFilters,
 		cached = tokenCache[ selector + " " ];
@@ -2416,7 +2115,7 @@ function tokenize( selector, parseOnly ) {
 				// Don't consume trailing commas as valid
 				soFar = soFar.slice( match[0].length ) || soFar;
 			}
-			groups.push( tokens = [] );
+			groups.push( (tokens = []) );
 		}
 
 		matched = false;
@@ -2460,7 +2159,7 @@ function tokenize( selector, parseOnly ) {
 			Sizzle.error( selector ) :
 			// Cache the tokens
 			tokenCache( selector, groups ).slice( 0 );
-}
+};
 
 function toSelector( tokens ) {
 	var i = 0,
@@ -2489,10 +2188,10 @@ function addCombinator( matcher, combinator, base ) {
 
 		// Check against all ancestor/preceding elements
 		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
+			var oldCache, uniqueCache, outerCache,
+				newCache = [ dirruns, doneName ];
 
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
 			if ( xml ) {
 				while ( (elem = elem[ dir ]) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
@@ -2505,14 +2204,22 @@ function addCombinator( matcher, combinator, base ) {
 				while ( (elem = elem[ dir ]) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
 						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
+
+						// Support: IE <9 only
+						// Defend against cloned attroperties (jQuery gh-1709)
+						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+
+						if ( (oldCache = uniqueCache[ dir ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
 						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
+							// Reuse newcache so results back-propagate to previous elements
+							uniqueCache[ dir ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
 								return true;
 							}
 						}
@@ -2536,6 +2243,15 @@ function elementMatcher( matchers ) {
 		matchers[0];
 }
 
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
 function condense( unmatched, map, filter, context, xml ) {
 	var elem,
 		newUnmatched = [],
@@ -2627,7 +2343,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				i = matcherOut.length;
 				while ( i-- ) {
 					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
 
 						seed[temp] = !(results[temp] = elem);
 					}
@@ -2662,13 +2378,16 @@ function matcherFromTokens( tokens ) {
 			return elem === checkContext;
 		}, implicitRelative, true ),
 		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
+			return indexOf( checkContext, elem ) > -1;
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
 				(checkContext = context).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
 		} ];
 
 	for ( ; i < len; i++ ) {
@@ -2706,42 +2425,43 @@ function matcherFromTokens( tokens ) {
 }
 
 function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
+	var bySet = setMatchers.length > 0,
 		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
+		superMatcher = function( seed, context, xml, results, outermost ) {
 			var elem, j, matcher,
-				setMatched = [],
 				matchedCount = 0,
 				i = "0",
 				unmatched = seed && [],
-				outermost = expandContext != null,
+				setMatched = [],
 				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
 				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
 
 			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
+				outermostContext = context === document || context || outermost;
 			}
 
 			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
 				if ( byElement && elem ) {
 					j = 0;
+					if ( !context && elem.ownerDocument !== document ) {
+						setDocument( elem );
+						xml = !documentIsHTML;
+					}
 					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
+						if ( matcher( elem, context || document, xml) ) {
 							results.push( elem );
 							break;
 						}
 					}
 					if ( outermost ) {
 						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
 					}
 				}
 
@@ -2759,8 +2479,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				}
 			}
 
-			// Apply set filters to unmatched elements
+			// `i` is now the count of elements visited above, and adding it to `matchedCount`
+			// makes the latter nonnegative.
 			matchedCount += i;
+
+			// Apply set filters to unmatched elements
+			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
+			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
+			// no element matchers and no seed.
+			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
+			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
+			// numerically zero.
 			if ( bySet && i !== matchedCount ) {
 				j = 0;
 				while ( (matcher = setMatchers[j++]) ) {
@@ -2806,7 +2535,7 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 		superMatcher;
 }
 
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 	var i,
 		setMatchers = [],
 		elementMatchers = [],
@@ -2814,12 +2543,12 @@ compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
 
 	if ( !cached ) {
 		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
+		if ( !match ) {
+			match = tokenize( selector );
 		}
-		i = group.length;
+		i = match.length;
 		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
+			cached = matcherFromTokens( match[i] );
 			if ( cached[ expando ] ) {
 				setMatchers.push( cached );
 			} else {
@@ -2829,91 +2558,101 @@ compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
 
 		// Cache the compiled function
 		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
 	}
 	return cached;
 };
 
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
 	var i, tokens, token, type, find,
-		match = tokenize( selector );
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
 
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
+	results = results || [];
 
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
+	// Try to minimize operations if there is only one selector in the list and no seed
+	// (the latter of which guarantees us context)
+	if ( match.length === 1 ) {
 
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
+		// Reduce context if the leading compound selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				support.getById && context.nodeType === 9 && documentIsHTML &&
+				Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
 			}
 
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
+			selector = selector.slice( tokens.shift().value.length );
+		}
 
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
 
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
-						}
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
 
-						break;
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
 					}
+
+					break;
 				}
 			}
 		}
 	}
 
-	// Compile and execute a filtering function
+	// Compile and execute a filtering function if one is not provided
 	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
+	( compiled || compile( selector, match ) )(
 		seed,
 		context,
 		!documentIsHTML,
 		results,
-		rsibling.test( selector )
+		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
 	);
 	return results;
-}
+};
 
 // One-time assignments
 
 // Sort stability
 support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
 
-// Support: Chrome<14
+// Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = hasDuplicate;
+support.detectDuplicates = !!hasDuplicate;
 
 // Initialize against the default document
 setDocument();
@@ -2961,32 +2700,467 @@ if ( !assert(function( div ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
 		if ( !isXML ) {
-			return (val = elem.getAttributeNode( name )) && val.specified ?
-				val.value :
-				elem[ name ] === true ? name.toLowerCase() : null;
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
 		}
 	});
 }
 
+return Sizzle;
+
+})( window );
+
+
+
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
+jQuery.expr[ ":" ] = jQuery.expr.pseudos;
+jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
 jQuery.text = Sizzle.getText;
 jQuery.isXMLDoc = Sizzle.isXML;
 jQuery.contains = Sizzle.contains;
 
 
-})( window );
-// String to Object options format cache
-var optionsCache = {};
 
-// Convert String-formatted options into Object-formatted ones and store in cache
+var dir = function( elem, dir, until ) {
+	var matched = [],
+		truncate = until !== undefined;
+
+	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
+		if ( elem.nodeType === 1 ) {
+			if ( truncate && jQuery( elem ).is( until ) ) {
+				break;
+			}
+			matched.push( elem );
+		}
+	}
+	return matched;
+};
+
+
+var siblings = function( n, elem ) {
+	var matched = [];
+
+	for ( ; n; n = n.nextSibling ) {
+		if ( n.nodeType === 1 && n !== elem ) {
+			matched.push( n );
+		}
+	}
+
+	return matched;
+};
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		} );
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		} );
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( risSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
+	} );
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return elems.length === 1 && elem.nodeType === 1 ?
+		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+			return elem.nodeType === 1;
+		} ) );
+};
+
+jQuery.fn.extend( {
+	find: function( selector ) {
+		var i,
+			ret = [],
+			self = this,
+			len = self.length;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter( function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			} ) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], false ) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], true ) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+} );
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	init = jQuery.fn.init = function( selector, context, root ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// init accepts an alternate rootjQuery
+		// so migrate can support jQuery.sub (gh-2101)
+		root = root || rootjQuery;
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt( 0 ) === "<" &&
+				selector.charAt( selector.length - 1 ) === ">" &&
+				selector.length >= 3 ) {
+
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && ( match[ 1 ] || !context ) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[ 1 ] ) {
+					context = context instanceof jQuery ? context[ 0 ] : context;
+
+					// scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[ 1 ],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[ 2 ] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[ 2 ] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[ 0 ] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || root ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[ 0 ] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return typeof root.ready !== "undefined" ?
+				root.ready( selector ) :
+
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend( {
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter( function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[ i ] ) ) {
+					return true;
+				}
+			}
+		} );
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && ( pos ?
+					pos.index( cur ) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector( cur, selectors ) ) ) {
+
+					matched.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[ 0 ], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[ 0 ] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.uniqueSort(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	}
+} );
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each( {
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return siblings( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return siblings( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		if ( this.length > 1 ) {
+
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				ret = jQuery.uniqueSort( ret );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				ret = ret.reverse();
+			}
+		}
+
+		return this.pushStack( ret );
+	};
+} );
+var rnotwhite = ( /\S+/g );
+
+
+
+// Convert String-formatted options into Object-formatted ones
 function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
+	var object = {};
+	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
 		object[ flag ] = true;
-	});
+	} );
 	return object;
 }
 
@@ -3017,156 +3191,186 @@ jQuery.Callbacks = function( options ) {
 	// Convert options from String-formatted to Object-formatted if needed
 	// (we check in cache first)
 	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
+		createOptions( options ) :
 		jQuery.extend( {}, options );
 
 	var // Flag to know if list is currently firing
 		firing,
-		// Last fire value (for non-forgettable lists)
+
+		// Last fire value for non-forgettable lists
 		memory,
+
 		// Flag to know if list was already fired
 		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
+
+		// Flag to prevent firing
+		locked,
+
 		// Actual callback list
 		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
+
+		// Queue of execution data for repeatable lists
+		queue = [],
+
+		// Index of currently firing callback (modified by add/remove as needed)
+		firingIndex = -1,
+
 		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
+		fire = function() {
+
+			// Enforce single-firing
+			locked = options.once;
+
+			// Execute callbacks for all pending executions,
+			// respecting firingIndex overrides and runtime changes
+			fired = firing = true;
+			for ( ; queue.length; firingIndex = -1 ) {
+				memory = queue.shift();
+				while ( ++firingIndex < list.length ) {
+
+					// Run callback and check for early termination
+					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
+						options.stopOnFalse ) {
+
+						// Jump to end and forget the data so .add doesn't re-fire
+						firingIndex = list.length;
+						memory = false;
+					}
 				}
 			}
+
+			// Forget the data if we're done with it
+			if ( !options.memory ) {
+				memory = false;
+			}
+
 			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
+
+			// Clean up if we're done firing for good
+			if ( locked ) {
+
+				// Keep an empty list if we have data for future add calls
+				if ( memory ) {
 					list = [];
+
+				// Otherwise, this object is spent
 				} else {
-					self.disable();
+					list = "";
 				}
 			}
 		},
+
 		// Actual Callbacks object
 		self = {
+
 			// Add a callback or a collection of callbacks to the list
 			add: function() {
 				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
+
+					// If we have memory from a past run, we should fire after adding
+					if ( memory && !firing ) {
+						firingIndex = list.length - 1;
+						queue.push( memory );
+					}
+
+					( function add( args ) {
 						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
+							if ( jQuery.isFunction( arg ) ) {
 								if ( !options.unique || !self.has( arg ) ) {
 									list.push( arg );
 								}
-							} else if ( arg && arg.length && type !== "string" ) {
+							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
+
 								// Inspect recursively
 								add( arg );
 							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
+						} );
+					} )( arguments );
+
+					if ( memory && !firing ) {
+						fire();
 					}
 				}
 				return this;
 			},
+
 			// Remove a callback from the list
 			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
+				jQuery.each( arguments, function( _, arg ) {
+					var index;
+					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+						list.splice( index, 1 );
+
+						// Handle firing indexes
+						if ( index <= firingIndex ) {
+							firingIndex--;
 						}
-					});
-				}
+					}
+				} );
 				return this;
 			},
+
 			// Check if a given callback is in the list.
 			// If no argument is given, return whether or not list has callbacks attached.
 			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+				return fn ?
+					jQuery.inArray( fn, list ) > -1 :
+					list.length > 0;
 			},
+
 			// Remove all callbacks from the list
 			empty: function() {
-				list = [];
-				firingLength = 0;
+				if ( list ) {
+					list = [];
+				}
 				return this;
 			},
-			// Have the list do nothing anymore
+
+			// Disable .fire and .add
+			// Abort any current/pending executions
+			// Clear all callbacks and values
 			disable: function() {
-				list = stack = memory = undefined;
+				locked = queue = [];
+				list = memory = "";
 				return this;
 			},
-			// Is it disabled?
 			disabled: function() {
 				return !list;
 			},
-			// Lock the list in its current state
+
+			// Disable .fire
+			// Also disable .add unless we have memory (since it would have no effect)
+			// Abort any pending executions
 			lock: function() {
-				stack = undefined;
+				locked = true;
 				if ( !memory ) {
 					self.disable();
 				}
 				return this;
 			},
-			// Is it locked?
 			locked: function() {
-				return !stack;
+				return !!locked;
 			},
+
 			// Call all callbacks with the given context and arguments
 			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
+				if ( !locked ) {
 					args = args || [];
 					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
+					queue.push( args );
+					if ( !firing ) {
+						fire();
 					}
 				}
 				return this;
 			},
+
 			// Call all the callbacks with the given arguments
 			fire: function() {
 				self.fireWith( this, arguments );
 				return this;
 			},
+
 			// To know if the callbacks have already been called at least once
 			fired: function() {
 				return !!fired;
@@ -3175,14 +3379,17 @@ jQuery.Callbacks = function( options ) {
 
 	return self;
 };
-jQuery.extend({
+
+
+jQuery.extend( {
 
 	Deferred: function( func ) {
 		var tuples = [
+
 				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
+				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
 			],
 			state = "pending",
 			promise = {
@@ -3195,26 +3402,30 @@ jQuery.extend({
 				},
 				then: function( /* fnDone, fnFail, fnProgress */ ) {
 					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
+					return jQuery.Deferred( function( newDefer ) {
 						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+
 							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
+							deferred[ tuple[ 1 ] ]( function() {
 								var returned = fn && fn.apply( this, arguments );
 								if ( returned && jQuery.isFunction( returned.promise ) ) {
 									returned.promise()
+										.progress( newDefer.notify )
 										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
+										.fail( newDefer.reject );
 								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+									newDefer[ tuple[ 0 ] + "With" ](
+										this === promise ? newDefer.promise() : this,
+										fn ? [ returned ] : arguments
+									);
 								}
-							});
-						});
+							} );
+						} );
 						fns = null;
-					}).promise();
+					} ).promise();
 				},
+
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
 				promise: function( obj ) {
@@ -3232,11 +3443,12 @@ jQuery.extend({
 				stateString = tuple[ 3 ];
 
 			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
+			promise[ tuple[ 1 ] ] = list.add;
 
 			// Handle state
 			if ( stateString ) {
-				list.add(function() {
+				list.add( function() {
+
 					// state = [ resolved | rejected ]
 					state = stateString;
 
@@ -3245,12 +3457,12 @@ jQuery.extend({
 			}
 
 			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+			deferred[ tuple[ 0 ] ] = function() {
+				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
 				return this;
 			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
+			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
+		} );
 
 		// Make the deferred a promise
 		promise.promise( deferred );
@@ -3267,22 +3479,25 @@ jQuery.extend({
 	// Deferred helper
 	when: function( subordinate /* , ..., subordinateN */ ) {
 		var i = 0,
-			resolveValues = core_slice.call( arguments ),
+			resolveValues = slice.call( arguments ),
 			length = resolveValues.length,
 
 			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+			remaining = length !== 1 ||
+				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
 
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			// the master Deferred.
+			// If resolveValues consist of only a single Deferred, just use that.
 			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
 
 			// Update function for both resolve and progress values
 			updateFunc = function( i, contexts, values ) {
 				return function( value ) {
 					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
+					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( values === progressValues ) {
 						deferred.notifyWith( contexts, values );
+
 					} else if ( !( --remaining ) ) {
 						deferred.resolveWith( contexts, values );
 					}
@@ -3299,9 +3514,9 @@ jQuery.extend({
 			for ( ; i < length; i++ ) {
 				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
 					resolveValues[ i ].promise()
+						.progress( updateFunc( i, progressContexts, progressValues ) )
 						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
+						.fail( deferred.reject );
 				} else {
 					--remaining;
 				}
@@ -3315,258 +3530,304 @@ jQuery.extend({
 
 		return deferred.promise();
 	}
-});
-jQuery.support = (function( support ) {
+} );
 
-	var all, a, input, select, fragment, opt, eventName, isSupported, i,
-		div = document.createElement("div");
 
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+// The deferred used on DOM ready
+var readyList;
 
-	// Finish early in limited (non-browser) environments
-	all = div.getElementsByTagName("*") || [];
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !a || !a.style || !all.length ) {
-		return support;
-	}
+jQuery.fn.ready = function( fn ) {
 
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
+	// Add the callback
+	jQuery.ready.promise().done( fn );
 
-	a.style.cssText = "top:1px;float:left;opacity:.5";
+	return this;
+};
 
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
+jQuery.extend( {
 
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
 
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName("tbody").length;
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
 
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName("link").length;
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
 
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
+	// Handle when the DOM is ready
+	ready: function( wait ) {
 
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Make sure that element opacity exists
-	// (IE uses filter instead)
-	// Use a regex to work around a WebKit issue. See #5145
-	support.opacity = /^0.5/.test( a.style.opacity );
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!a.style.cssFloat;
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Will be defined later
-	support.inlineBlockNeedsLayout = false;
-	support.shrinkWrapBlocks = false;
-	support.pixelPosition = false;
-	support.deleteExpando = true;
-	support.noCloneEvent = true;
-	support.reliableMarginRight = true;
-	support.boxSizingReliable = true;
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: IE<9
-	// Iteration over object's inherited properties before its own.
-	for ( i in jQuery( support ) ) {
-		break;
-	}
-	support.ownLast = i !== "0";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
 			return;
 		}
 
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
 
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior.
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-
-		// Workaround failing boxSizing test due to offsetWidth returning wrong value
-		// with some non-1 values of body zoom, ticket #13543
-		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
-			support.boxSizing = div.offsetWidth === 4;
-		});
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
 		}
 
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
 
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+		// Trigger any bound ready events
+		if ( jQuery.fn.triggerHandler ) {
+			jQuery( document ).triggerHandler( "ready" );
+			jQuery( document ).off( "ready" );
+		}
+	}
+} );
 
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
+/**
+ * Clean-up method for dom ready events
+ */
+function detach() {
+	if ( document.addEventListener ) {
+		document.removeEventListener( "DOMContentLoaded", completed );
+		window.removeEventListener( "load", completed );
+
+	} else {
+		document.detachEvent( "onreadystatechange", completed );
+		window.detachEvent( "onload", completed );
+	}
+}
+
+/**
+ * The ready event handler and self cleanup method
+ */
+function completed() {
+
+	// readyState === "complete" is good enough for us to call the dom ready in oldIE
+	if ( document.addEventListener ||
+		window.event.type === "load" ||
+		document.readyState === "complete" ) {
+
+		detach();
+		jQuery.ready();
+	}
+}
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called
+		// after the browser event has already occurred.
+		// Support: IE6-10
+		// Older IE sometimes signals "interactive" too soon
+		if ( document.readyState === "complete" ||
+			( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			window.setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed );
+
+		// If IE event model is used
+		} else {
+
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch ( e ) {}
+
+			if ( top && top.doScroll ) {
+				( function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll( "left" );
+						} catch ( e ) {
+							return window.setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				} )();
 			}
 		}
+	}
+	return readyList.promise( obj );
+};
 
-		body.removeChild( container );
+// Kick off the DOM ready check even if the user does not
+jQuery.ready.promise();
 
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
 
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
 
-	return support;
-})({});
 
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+// Support: IE<9
+// Iteration over object's inherited properties before its own
+var i;
+for ( i in jQuery( support ) ) {
+	break;
+}
+support.ownFirst = i === "0";
+
+// Note: most support tests are defined in their respective modules.
+// false until the test is run
+support.inlineBlockNeedsLayout = false;
+
+// Execute ASAP in case we need to set body.style.zoom
+jQuery( function() {
+
+	// Minified: var a,b,c,d
+	var val, div, body, container;
+
+	body = document.getElementsByTagName( "body" )[ 0 ];
+	if ( !body || !body.style ) {
+
+		// Return for frameset docs that don't have a body
+		return;
+	}
+
+	// Setup
+	div = document.createElement( "div" );
+	container = document.createElement( "div" );
+	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+	body.appendChild( container ).appendChild( div );
+
+	if ( typeof div.style.zoom !== "undefined" ) {
+
+		// Support: IE<8
+		// Check if natively block-level elements act like inline-block
+		// elements when setting their display to 'inline' and giving
+		// them layout
+		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
+
+		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
+		if ( val ) {
+
+			// Prevent IE 6 from affecting layout for positioned elements #11048
+			// Prevent IE from shrinking the body in IE 7 mode #12869
+			// Support: IE<8
+			body.style.zoom = 1;
+		}
+	}
+
+	body.removeChild( container );
+} );
+
+
+( function() {
+	var div = document.createElement( "div" );
+
+	// Support: IE<9
+	support.deleteExpando = true;
+	try {
+		delete div.test;
+	} catch ( e ) {
+		support.deleteExpando = false;
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+} )();
+var acceptData = function( elem ) {
+	var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ],
+		nodeType = +elem.nodeType || 1;
+
+	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
+	return nodeType !== 1 && nodeType !== 9 ?
+		false :
+
+		// Nodes accept data unless otherwise specified; rejection can be conditional
+		!noData || noData !== true && elem.getAttribute( "classid" ) === noData;
+};
+
+
+
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
 	rmultiDash = /([A-Z])/g;
 
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
+function dataAttr( elem, key, data ) {
+
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch ( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
+	if ( !acceptData( elem ) ) {
 		return;
 	}
 
@@ -3587,21 +3848,24 @@ function internalData( elem, name, data, pvt /* Internal Use Only */ ){
 
 	// Avoid doing any more work than we need to when trying to get data on an
 	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
+	if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
+		data === undefined && typeof name === "string" ) {
 		return;
 	}
 
 	if ( !id ) {
+
 		// Only DOM nodes need a new unique ID for each element since their data
 		// ends up in the global cache
 		if ( isNode ) {
-			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
+			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
 		} else {
 			id = internalKey;
 		}
 	}
 
 	if ( !cache[ id ] ) {
+
 		// Avoid exposing jQuery metadata on plain JS objects when the object
 		// is serialized using JSON.stringify
 		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
@@ -3655,7 +3919,7 @@ function internalData( elem, name, data, pvt /* Internal Use Only */ ){
 }
 
 function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
+	if ( !acceptData( elem ) ) {
 		return;
 	}
 
@@ -3691,10 +3955,11 @@ function internalRemoveData( elem, name, pvt ) {
 					if ( name in thisCache ) {
 						name = [ name ];
 					} else {
-						name = name.split(" ");
+						name = name.split( " " );
 					}
 				}
 			} else {
+
 				// If "name" is an array of keys...
 				// When data is initially created, via ("key", "val") signature,
 				// keys will be converted to camelCase.
@@ -3706,12 +3971,12 @@ function internalRemoveData( elem, name, pvt ) {
 
 			i = name.length;
 			while ( i-- ) {
-				delete thisCache[ name[i] ];
+				delete thisCache[ name[ i ] ];
 			}
 
 			// If there is no data left in the cache, we want to continue
 			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
+			if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) {
 				return;
 			}
 		}
@@ -3734,30 +3999,31 @@ function internalRemoveData( elem, name, pvt ) {
 
 	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
 	/* jshint eqeqeq: false */
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+	} else if ( support.deleteExpando || cache != cache.window ) {
 		/* jshint eqeqeq: true */
 		delete cache[ id ];
 
-	// When all else fails, null
+	// When all else fails, undefined
 	} else {
-		cache[ id ] = null;
+		cache[ id ] = undefined;
 	}
 }
 
-jQuery.extend({
+jQuery.extend( {
 	cache: {},
 
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
+	// The following elements (space-suffixed to avoid Object.prototype collisions)
+	// throw uncatchable exceptions if you attempt to set expando properties
 	noData: {
-		"applet": true,
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+		"applet ": true,
+		"embed ": true,
+
+		// ...but Flash objects (which have this classid) *can* handle expandos
+		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
 	},
 
 	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ];
 		return !!elem && !isEmptyDataObject( elem );
 	},
 
@@ -3776,28 +4042,14 @@ jQuery.extend({
 
 	_removeData: function( elem, name ) {
 		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
 	}
-});
+} );
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 	data: function( key, value ) {
-		var attrs, name,
-			data = null,
-			i = 0,
-			elem = this[0];
+		var i, name, data,
+			elem = this[ 0 ],
+			attrs = elem && elem.attributes;
 
 		// Special expections of .data basically thwart jQuery.access,
 		// so implement the relevant behavior ourselves
@@ -3808,14 +4060,17 @@ jQuery.fn.extend({
 				data = jQuery.data( elem );
 
 				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
+					i = attrs.length;
+					while ( i-- ) {
 
-						if ( name.indexOf("data-") === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
+						// Support: IE11+
+						// The attrs elements can be null (#14894)
+						if ( attrs[ i ] ) {
+							name = attrs[ i ].name;
+							if ( name.indexOf( "data-" ) === 0 ) {
+								name = jQuery.camelCase( name.slice( 5 ) );
+								dataAttr( elem, name, data[ name ] );
+							}
 						}
 					}
 					jQuery._data( elem, "parsedAttrs", true );
@@ -3827,78 +4082,32 @@ jQuery.fn.extend({
 
 		// Sets multiple values
 		if ( typeof key === "object" ) {
-			return this.each(function() {
+			return this.each( function() {
 				jQuery.data( this, key );
-			});
+			} );
 		}
 
 		return arguments.length > 1 ?
 
 			// Sets one value
-			this.each(function() {
+			this.each( function() {
 				jQuery.data( this, key, value );
-			}) :
+			} ) :
 
 			// Gets one value
 			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
+			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
 	},
 
 	removeData: function( key ) {
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.removeData( this, key );
-		});
+		} );
 	}
-});
+} );
 
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
 
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
+jQuery.extend( {
 	queue: function( elem, type, data ) {
 		var queue;
 
@@ -3908,8 +4117,8 @@ jQuery.extend({
 
 			// Speed up dequeue by getting out quickly if this is just a lookup
 			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				if ( !queue || jQuery.isArray( data ) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray( data ) );
 				} else {
 					queue.push( data );
 				}
@@ -3953,19 +4162,20 @@ jQuery.extend({
 		}
 	},
 
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	// not intended for public consumption - generates a queueHooks object,
+	// or returns the current one
 	_queueHooks: function( elem, type ) {
 		var key = type + "queueHooks";
 		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
+			empty: jQuery.Callbacks( "once memory" ).add( function() {
 				jQuery._removeData( elem, type + "queue" );
 				jQuery._removeData( elem, key );
-			})
-		});
+			} )
+		} );
 	}
-});
+} );
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 	queue: function( type, data ) {
 		var setter = 2;
 
@@ -3976,43 +4186,31 @@ jQuery.fn.extend({
 		}
 
 		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
+			return jQuery.queue( this[ 0 ], type );
 		}
 
 		return data === undefined ?
 			this :
-			this.each(function() {
+			this.each( function() {
 				var queue = jQuery.queue( this, type, data );
 
 				// ensure a hooks for this queue
 				jQuery._queueHooks( this, type );
 
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
+				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
 					jQuery.dequeue( this, type );
 				}
-			});
+			} );
 	},
 	dequeue: function( type ) {
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
+		} );
 	},
 	clearQueue: function( type ) {
 		return this.queue( type || "fx", [] );
 	},
+
 	// Get a promise resolved when queues of a certain type
 	// are emptied (fx is the type by default)
 	promise: function( type, obj ) {
@@ -4033,7 +4231,7 @@ jQuery.fn.extend({
 		}
 		type = type || "fx";
 
-		while( i-- ) {
+		while ( i-- ) {
 			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
 			if ( tmp && tmp.empty ) {
 				count++;
@@ -4043,671 +4241,520 @@ jQuery.fn.extend({
 		resolve();
 		return defer.promise( obj );
 	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n\f]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
+} );
 
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
 
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
+( function() {
+	var shrinkWrapBlocksVal;
 
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
+	support.shrinkWrapBlocks = function() {
+		if ( shrinkWrapBlocksVal != null ) {
+			return shrinkWrapBlocksVal;
 		}
 
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
+		// Will be changed later if needed.
+		shrinkWrapBlocksVal = false;
 
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
+		// Minified: var b,c,d
+		var div, body, container;
 
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
+		body = document.getElementsByTagName( "body" )[ 0 ];
+		if ( !body || !body.style ) {
 
+			// Test fired too early or in an unsupported environment, exit.
 			return;
 		}
 
-		isFunction = jQuery.isFunction( value );
+		// Setup
+		div = document.createElement( "div" );
+		container = document.createElement( "div" );
+		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+		body.appendChild( container ).appendChild( div );
 
-		return this.each(function( i ) {
-			var val;
+		// Support: IE6
+		// Check if elements with layout shrink-wrap their children
+		if ( typeof div.style.zoom !== "undefined" ) {
 
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
+			// Reset CSS: box-sizing; display; margin; border
+			div.style.cssText =
 
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
+				// Support: Firefox<29, Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;" +
+				"padding:1px;width:1px;zoom:1";
+			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
+			shrinkWrapBlocksVal = div.offsetWidth !== 3;
+		}
+
+		body.removeChild( container );
+
+		return shrinkWrapBlocksVal;
+	};
+
+} )();
+var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
+
+var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
+
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHidden = function( elem, el ) {
+
+		// isHidden might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+		return jQuery.css( elem, "display" ) === "none" ||
+			!jQuery.contains( elem.ownerDocument, elem );
+	};
+
+
+
+function adjustCSS( elem, prop, valueParts, tween ) {
+	var adjusted,
+		scale = 1,
+		maxIterations = 20,
+		currentValue = tween ?
+			function() { return tween.cur(); } :
+			function() { return jQuery.css( elem, prop, "" ); },
+		initial = currentValue(),
+		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+		// Starting value computation is required for potential unit mismatches
+		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+			rcssNum.exec( jQuery.css( elem, prop ) );
+
+	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
+
+		// Trust units reported by jQuery.css
+		unit = unit || initialInUnit[ 3 ];
+
+		// Make sure we update the tween properties later on
+		valueParts = valueParts || [];
+
+		// Iteratively approximate from a nonzero starting point
+		initialInUnit = +initial || 1;
+
+		do {
+
+			// If previous iteration zeroed out, double until we get *something*.
+			// Use string for doubling so we don't accidentally see scale as unchanged below
+			scale = scale || ".5";
+
+			// Adjust and apply
+			initialInUnit = initialInUnit / scale;
+			jQuery.style( elem, prop, initialInUnit + unit );
+
+		// Update scale, tolerating zero or NaN from tween.cur()
+		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
+		} while (
+			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
+		);
+	}
+
+	if ( valueParts ) {
+		initialInUnit = +initialInUnit || +initial || 0;
+
+		// Apply relative offset (+=/-=) if specified
+		adjusted = valueParts[ 1 ] ?
+			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
+			+valueParts[ 2 ];
+		if ( tween ) {
+			tween.unit = unit;
+			tween.start = initialInUnit;
+			tween.end = adjusted;
+		}
+	}
+	return adjusted;
+}
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		length = elems.length,
+		bulk = key == null;
+
+	// Sets many values
+	if ( jQuery.type( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+		}
+
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
+
+		if ( !jQuery.isFunction( value ) ) {
+			raw = true;
+		}
+
+		if ( bulk ) {
+
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
+
+			// ...except when executing function values
 			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// Use proper attribute retrieval(#6932, #12072)
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
 			}
 		}
-	},
 
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
+		if ( fn ) {
+			for ( ; i < length; i++ ) {
+				fn(
+					elems[ i ],
+					key,
+					raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) )
+				);
 			}
 		}
 	}
-});
 
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+	return chainable ?
+		elems :
 
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
+		// Gets
+		bulk ?
+			fn.call( elems ) :
+			length ? fn( elems[ 0 ], key ) : emptyGet;
 };
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
+var rcheckableType = ( /^(?:checkbox|radio)$/i );
 
-	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var fn = jQuery.expr.attrHandle[ name ],
-				ret = isXML ?
-					undefined :
-					/* jshint eqeqeq: false */
-					(jQuery.expr.attrHandle[ name ] = undefined) !=
-						getter( elem, name, isXML ) ?
+var rtagName = ( /<([\w:-]+)/ );
 
-						name.toLowerCase() :
-						null;
-			jQuery.expr.attrHandle[ name ] = fn;
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			return isXML ?
-				undefined :
-				elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-		};
-});
+var rscriptType = ( /^$|\/(?:java|ecma)script/i );
 
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
+var rleadingWhitespace = ( /^\s+/ );
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" +
+		"details|dialog|figcaption|figure|footer|header|hgroup|main|" +
+		"mark|meter|nav|output|picture|progress|section|summary|template|time|video";
+
+
+
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
 		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
-		// Some attributes are constructed with empty-string values when not defined
-		function( elem, name, isXML ) {
-			var ret;
-			return isXML ?
-				undefined :
-				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-		};
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ret.specified ?
-				ret.value :
-				undefined;
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !jQuery.support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
 	}
-});
+	return safeFrag;
+}
+
+
+( function() {
+	var div = document.createElement( "div" ),
+		fragment = document.createDocumentFragment(),
+		input = document.createElement( "input" );
+
+	// Setup
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// IE strips leading whitespace when .innerHTML is used
+	support.leadingWhitespace = div.firstChild.nodeType === 3;
+
+	// Make sure that tbody elements aren't automatically inserted
+	// IE will insert them into empty tables
+	support.tbody = !div.getElementsByTagName( "tbody" ).length;
+
+	// Make sure that link elements get serialized correctly by innerHTML
+	// This requires a wrapper element in IE
+	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
+
+	// Makes sure cloning an html5 element does not cause problems
+	// Where outerHTML is undefined, this still works
+	support.html5Clone =
+		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	input.type = "checkbox";
+	input.checked = true;
+	fragment.appendChild( input );
+	support.appendChecked = input.checked;
+
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	// Support: IE6-IE11+
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	fragment.appendChild( div );
+
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input = document.createElement( "input" );
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
+	// old WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<9
+	// Cloned elements keep attachEvent handlers, we use addEventListener on IE9+
+	support.noCloneEvent = !!div.addEventListener;
+
+	// Support: IE<9
+	// Since attributes and properties are the same in IE,
+	// cleanData must set properties to undefined rather than use removeAttribute
+	div[ jQuery.expando ] = 1;
+	support.attributes = !div.getAttribute( jQuery.expando );
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
+	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+	legend: [ 1, "<fieldset>", "</fieldset>" ],
+	area: [ 1, "<map>", "</map>" ],
+
+	// Support: IE8
+	param: [ 1, "<object>", "</object>" ],
+	thead: [ 1, "<table>", "</table>" ],
+	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+	col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+	// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+	// unless wrapped in a div with non-breaking characters in front of it.
+	_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>" ]
+};
+
+// Support: IE8-IE9
+wrapMap.optgroup = wrapMap.option;
+
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== "undefined" ?
+				context.querySelectorAll( tag || "*" ) :
+				undefined;
+
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context;
+			( elem = elems[ i ] ) != null;
+			i++
+		) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; ( elem = elems[ i ] ) != null; i++ ) {
+		jQuery._data(
+			elem,
+			"globalEval",
+			!refElements || jQuery._data( refElements[ i ], "globalEval" )
+		);
+	}
+}
+
+
+var rhtml = /<|&#?\w+;/,
+	rtbody = /<tbody/i;
+
+function fixDefaultChecked( elem ) {
+	if ( rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+function buildFragment( elems, context, scripts, selection, ignored ) {
+	var j, elem, contains,
+		tmp, tag, tbody, wrap,
+		l = elems.length,
+
+		// Ensure a safe fragment
+		safe = createSafeFragment( context ),
+
+		nodes = [],
+		i = 0;
+
+	for ( ; i < l; i++ ) {
+		elem = elems[ i ];
+
+		if ( elem || elem === 0 ) {
+
+			// Add nodes directly
+			if ( jQuery.type( elem ) === "object" ) {
+				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+			// Convert non-html into a text node
+			} else if ( !rhtml.test( elem ) ) {
+				nodes.push( context.createTextNode( elem ) );
+
+			// Convert html into DOM nodes
+			} else {
+				tmp = tmp || safe.appendChild( context.createElement( "div" ) );
+
+				// Deserialize a standard representation
+				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+				wrap = wrapMap[ tag ] || wrapMap._default;
+
+				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
+
+				// Descend through wrappers to the right content
+				j = wrap[ 0 ];
+				while ( j-- ) {
+					tmp = tmp.lastChild;
+				}
+
+				// Manually add leading whitespace removed by IE
+				if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[ 0 ] ) );
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					elem = tag === "table" && !rtbody.test( elem ) ?
+						tmp.firstChild :
+
+						// String was a bare <thead> or <tfoot>
+						wrap[ 1 ] === "<table>" && !rtbody.test( elem ) ?
+							tmp :
+							0;
+
+					j = elem && elem.childNodes.length;
+					while ( j-- ) {
+						if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) &&
+							!tbody.childNodes.length ) {
+
+							elem.removeChild( tbody );
+						}
+					}
+				}
+
+				jQuery.merge( nodes, tmp.childNodes );
+
+				// Fix #12392 for WebKit and IE > 9
+				tmp.textContent = "";
+
+				// Fix #12392 for oldIE
+				while ( tmp.firstChild ) {
+					tmp.removeChild( tmp.firstChild );
+				}
+
+				// Remember the top-level container for proper cleanup
+				tmp = safe.lastChild;
+			}
+		}
+	}
+
+	// Fix #11356: Clear elements from fragment
+	if ( tmp ) {
+		safe.removeChild( tmp );
+	}
+
+	// Reset defaultChecked for any radios and checkboxes
+	// about to be appended to the DOM in IE 6/7 (#8060)
+	if ( !support.appendChecked ) {
+		jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+	}
+
+	i = 0;
+	while ( ( elem = nodes[ i++ ] ) ) {
+
+		// Skip elements already in the context collection (trac-4087)
+		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
+			if ( ignored ) {
+				ignored.push( elem );
+			}
+
+			continue;
+		}
+
+		contains = jQuery.contains( elem.ownerDocument, elem );
+
+		// Append to fragment
+		tmp = getAll( safe.appendChild( elem ), "script" );
+
+		// Preserve script evaluation history
+		if ( contains ) {
+			setGlobalEval( tmp );
+		}
+
+		// Capture executables
+		if ( scripts ) {
+			j = 0;
+			while ( ( elem = tmp[ j++ ] ) ) {
+				if ( rscriptType.test( elem.type || "" ) ) {
+					scripts.push( elem );
+				}
+			}
+		}
+	}
+
+	tmp = null;
+
+	return safe;
+}
+
+
+( function() {
+	var i, eventName,
+		div = document.createElement( "div" );
+
+	// Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events)
+	for ( i in { submit: true, change: true, focusin: true } ) {
+		eventName = "on" + i;
+
+		if ( !( support[ i ] = eventName in window ) ) {
+
+			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+			div.setAttribute( eventName, "t" );
+			support[ i ] = div.attributes[ eventName ].expando === false;
+		}
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+} )();
+
+
 var rformElems = /^(?:input|select|textarea)$/i,
 	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
 	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
 
 function returnTrue() {
 	return true;
@@ -4717,12 +4764,75 @@ function returnFalse() {
 	return false;
 }
 
+// Support: IE9
+// See #13393 for more info
 function safeActiveElement() {
 	try {
 		return document.activeElement;
 	} catch ( err ) { }
 }
 
+function on( elem, types, selector, data, fn, one ) {
+	var origFn, type;
+
+	// Types can be a map of types/handlers
+	if ( typeof types === "object" ) {
+
+		// ( types-Object, selector, data )
+		if ( typeof selector !== "string" ) {
+
+			// ( types-Object, data )
+			data = data || selector;
+			selector = undefined;
+		}
+		for ( type in types ) {
+			on( elem, type, selector, data, types[ type ], one );
+		}
+		return elem;
+	}
+
+	if ( data == null && fn == null ) {
+
+		// ( types, fn )
+		fn = selector;
+		data = selector = undefined;
+	} else if ( fn == null ) {
+		if ( typeof selector === "string" ) {
+
+			// ( types, selector, fn )
+			fn = data;
+			data = undefined;
+		} else {
+
+			// ( types, data, fn )
+			fn = data;
+			data = selector;
+			selector = undefined;
+		}
+	}
+	if ( fn === false ) {
+		fn = returnFalse;
+	} else if ( !fn ) {
+		return elem;
+	}
+
+	if ( one === 1 ) {
+		origFn = fn;
+		fn = function( event ) {
+
+			// Can use an empty set, since event contains the info
+			jQuery().off( event );
+			return origFn.apply( this, arguments );
+		};
+
+		// Use same guid so caller can remove using origFn
+		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+	}
+	return elem.each( function() {
+		jQuery.event.add( this, types, fn, data, selector );
+	} );
+}
+
 /*
  * Helper functions for managing events -- not part of the public interface.
  * Props to Dean Edwards' addEvent library for many of the ideas.
@@ -4755,28 +4865,32 @@ jQuery.event = {
 		}
 
 		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
+		if ( !( events = elemData.events ) ) {
 			events = elemData.events = {};
 		}
-		if ( !(eventHandle = elemData.handle) ) {
+		if ( !( eventHandle = elemData.handle ) ) {
 			eventHandle = elemData.handle = function( e ) {
+
 				// Discard the second event of a jQuery.event.trigger() and
 				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
+				return typeof jQuery !== "undefined" &&
+					( !e || jQuery.event.triggered !== e.type ) ?
 					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
 					undefined;
 			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+
+			// Add elem as a property of the handle fn to prevent a memory leak
+			// with IE non-native events
 			eventHandle.elem = elem;
 		}
 
 		// Handle multiple events separated by a space
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
 
 			// There *must* be a type, no attaching namespace-only handlers
 			if ( !type ) {
@@ -4793,7 +4907,7 @@ jQuery.event = {
 			special = jQuery.event.special[ type ] || {};
 
 			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
+			handleObj = jQuery.extend( {
 				type: type,
 				origType: origType,
 				data: data,
@@ -4801,16 +4915,18 @@ jQuery.event = {
 				guid: handler.guid,
 				selector: selector,
 				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
+				namespace: namespaces.join( "." )
 			}, handleObjIn );
 
 			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
+			if ( !( handlers = events[ type ] ) ) {
 				handlers = events[ type ] = [];
 				handlers.delegateCount = 0;
 
 				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+				if ( !special.setup ||
+					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+
 					// Bind the global event handler to the element
 					if ( elem.addEventListener ) {
 						elem.addEventListener( type, eventHandle, false );
@@ -4852,17 +4968,17 @@ jQuery.event = {
 			namespaces, origType,
 			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
 
-		if ( !elemData || !(events = elemData.events) ) {
+		if ( !elemData || !( events = elemData.events ) ) {
 			return;
 		}
 
 		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
 
 			// Unbind all events (on this namespace, if provided) for the element
 			if ( !type ) {
@@ -4875,7 +4991,8 @@ jQuery.event = {
 			special = jQuery.event.special[ type ] || {};
 			type = ( selector ? special.delegateType : special.bindType ) || type;
 			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+			tmp = tmp[ 2 ] &&
+				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
 
 			// Remove matching events
 			origCount = j = handlers.length;
@@ -4885,7 +5002,8 @@ jQuery.event = {
 				if ( ( mappedTypes || origType === handleObj.origType ) &&
 					( !handler || handler.guid === handleObj.guid ) &&
 					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					( !selector || selector === handleObj.selector ||
+						selector === "**" && handleObj.selector ) ) {
 					handlers.splice( j, 1 );
 
 					if ( handleObj.selector ) {
@@ -4900,7 +5018,9 @@ jQuery.event = {
 			// Remove generic event handler if we removed something and no more handlers exist
 			// (avoids potential for endless recursion during removal of special event handlers)
 			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+				if ( !special.teardown ||
+					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+
 					jQuery.removeEvent( elem, type, elemData.handle );
 				}
 
@@ -4922,8 +5042,8 @@ jQuery.event = {
 		var handle, ontype, cur,
 			bubbleType, special, tmp, i,
 			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
 
 		cur = tmp = elem = elem || document;
 
@@ -4937,13 +5057,14 @@ jQuery.event = {
 			return;
 		}
 
-		if ( type.indexOf(".") >= 0 ) {
+		if ( type.indexOf( "." ) > -1 ) {
+
 			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
+			namespaces = type.split( "." );
 			type = namespaces.shift();
 			namespaces.sort();
 		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
+		ontype = type.indexOf( ":" ) < 0 && "on" + type;
 
 		// Caller can pass in a jQuery.Event object, Object, or just an event type string
 		event = event[ jQuery.expando ] ?
@@ -4952,9 +5073,9 @@ jQuery.event = {
 
 		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
 		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+		event.namespace = namespaces.join( "." );
+		event.rnamespace = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
 			null;
 
 		// Clean up the event in case it is being reused
@@ -4988,29 +5109,34 @@ jQuery.event = {
 			}
 
 			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
+			if ( tmp === ( elem.ownerDocument || document ) ) {
 				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
 			}
 		}
 
 		// Fire handlers on the event path
 		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
 
 			event.type = i > 1 ?
 				bubbleType :
 				special.bindType || type;
 
 			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] &&
+				jQuery._data( cur, "handle" );
+
 			if ( handle ) {
 				handle.apply( cur, data );
 			}
 
 			// Native handler
 			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
+			if ( handle && handle.apply && acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
 			}
 		}
 		event.type = type;
@@ -5018,8 +5144,11 @@ jQuery.event = {
 		// If nobody prevented the default action, do it now
 		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
 
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
+			if (
+				( !special._default ||
+				 special._default.apply( eventPath.pop(), data ) === false
+				) && acceptData( elem )
+			) {
 
 				// Call a native DOM method on the target with the same name name as the event.
 				// Can't use an .isFunction() check here because IE6/7 fails that test.
@@ -5038,6 +5167,7 @@ jQuery.event = {
 					try {
 						elem[ type ]();
 					} catch ( e ) {
+
 						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
 						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
 					}
@@ -5058,14 +5188,14 @@ jQuery.event = {
 		// Make a writable jQuery.Event from the native event object
 		event = jQuery.event.fix( event );
 
-		var i, ret, handleObj, matched, j,
+		var i, j, ret, matched, handleObj,
 			handlerQueue = [],
-			args = core_slice.call( arguments ),
+			args = slice.call( arguments ),
 			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
+		args[ 0 ] = event;
 		event.delegateTarget = this;
 
 		// Call the preDispatch hook for the mapped type, and let it bail if desired
@@ -5078,24 +5208,25 @@ jQuery.event = {
 
 		// Run delegates first; they may want to stop propagation beneath us
 		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
 			event.currentTarget = matched.elem;
 
 			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+				!event.isImmediatePropagationStopped() ) {
 
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
+				// a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
 
 					event.handleObj = handleObj;
 					event.data = handleObj.data;
 
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
+					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+						handleObj.handler ).apply( matched.elem, args );
 
 					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
+						if ( ( event.result = ret ) === false ) {
 							event.preventDefault();
 							event.stopPropagation();
 						}
@@ -5113,15 +5244,19 @@ jQuery.event = {
 	},
 
 	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
+		var i, matches, sel, handleObj,
 			handlerQueue = [],
 			delegateCount = handlers.delegateCount,
 			cur = event.target;
 
+		// Support (at least): Chrome, IE9
 		// Find delegate handlers
 		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+		//
+		// Support: Firefox<=42+
+		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
+		if ( delegateCount && cur.nodeType &&
+			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
 
 			/* jshint eqeqeq: false */
 			for ( ; cur != this; cur = cur.parentNode || this ) {
@@ -5129,7 +5264,7 @@ jQuery.event = {
 
 				// Don't check non-elements (#13208)
 				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
 					matches = [];
 					for ( i = 0; i < delegateCount; i++ ) {
 						handleObj = handlers[ i ];
@@ -5139,7 +5274,7 @@ jQuery.event = {
 
 						if ( matches[ sel ] === undefined ) {
 							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery( sel, this ).index( cur ) > -1 :
 								jQuery.find( sel, this, null, [ cur ] ).length;
 						}
 						if ( matches[ sel ] ) {
@@ -5147,7 +5282,7 @@ jQuery.event = {
 						}
 					}
 					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
+						handlerQueue.push( { elem: cur, handlers: matches } );
 					}
 				}
 			}
@@ -5155,7 +5290,7 @@ jQuery.event = {
 
 		// Add the remaining (directly-bound) handlers
 		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
 		}
 
 		return handlerQueue;
@@ -5194,7 +5329,7 @@ jQuery.event = {
 			event.target = originalEvent.srcElement || document;
 		}
 
-		// Support: Chrome 23+, Safari?
+		// Support: Safari 6-8+
 		// Target should not be a text node (#504, #13143)
 		if ( event.target.nodeType === 3 ) {
 			event.target = event.target.parentNode;
@@ -5208,12 +5343,13 @@ jQuery.event = {
 	},
 
 	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
+		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
 
 	fixHooks: {},
 
 	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
+		props: "char charCode key keyCode".split( " " ),
 		filter: function( event, original ) {
 
 			// Add which for key events
@@ -5226,7 +5362,8 @@ jQuery.event = {
 	},
 
 	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		props: ( "button buttons clientX clientY fromElement offsetX offsetY " +
+			"pageX pageY screenX screenY toElement" ).split( " " ),
 		filter: function( event, original ) {
 			var body, eventDoc, doc,
 				button = original.button,
@@ -5238,13 +5375,19 @@ jQuery.event = {
 				doc = eventDoc.documentElement;
 				body = eventDoc.body;
 
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+				event.pageX = original.clientX +
+					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
+					( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY +
+					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
+					( doc && doc.clientTop  || body && body.clientTop  || 0 );
 			}
 
 			// Add relatedTarget, if necessary
 			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+				event.relatedTarget = fromElement === event.target ?
+					original.toElement :
+					fromElement;
 			}
 
 			// Add which for click: 1 === left; 2 === middle; 3 === right
@@ -5259,10 +5402,12 @@ jQuery.event = {
 
 	special: {
 		load: {
+
 			// Prevent triggered image.load events from bubbling to window.load
 			noBubble: true
 		},
 		focus: {
+
 			// Fire native event if possible so blur/focus sequence is correct
 			trigger: function() {
 				if ( this !== safeActiveElement() && this.focus ) {
@@ -5270,6 +5415,7 @@ jQuery.event = {
 						this.focus();
 						return false;
 					} catch ( e ) {
+
 						// Support: IE<9
 						// If we error on focus to hidden element (#1486, #12518),
 						// let .trigger() run the handlers
@@ -5288,6 +5434,7 @@ jQuery.event = {
 			delegateType: "focusout"
 		},
 		click: {
+
 			// For checkbox, fire native event so checked state will be right
 			trigger: function() {
 				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
@@ -5305,32 +5452,37 @@ jQuery.event = {
 		beforeunload: {
 			postDispatch: function( event ) {
 
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
 					event.originalEvent.returnValue = event.result;
 				}
 			}
 		}
 	},
 
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
+	// Piggyback on a donor event to simulate a different one
+	simulate: function( type, elem, event ) {
 		var e = jQuery.extend(
 			new jQuery.Event(),
 			event,
 			{
 				type: type,
-				isSimulated: true,
-				originalEvent: {}
+				isSimulated: true
+
+				// Previously, `originalEvent: {}` was set here, so stopPropagation call
+				// would not be triggered on donor event, since in our own
+				// jQuery.event.stopPropagation function we had a check for existence of
+				// originalEvent.stopPropagation method, so, consequently it would be a noop.
+				//
+				// Guard for simulated events was moved to jQuery.event.stopPropagation function
+				// since `originalEvent` should point to the original event for the
+				// constancy with other events and for more focused logic
 			}
 		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
+
+		jQuery.event.trigger( e, null, elem );
+
 		if ( e.isDefaultPrevented() ) {
 			event.preventDefault();
 		}
@@ -5339,8 +5491,10 @@ jQuery.event = {
 
 jQuery.removeEvent = document.removeEventListener ?
 	function( elem, type, handle ) {
+
+		// This "if" is needed for plain objects
 		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
+			elem.removeEventListener( type, handle );
 		}
 	} :
 	function( elem, type, handle ) {
@@ -5349,8 +5503,9 @@ jQuery.removeEvent = document.removeEventListener ?
 		if ( elem.detachEvent ) {
 
 			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
+			// detachEvent needed property on element, by name of that event,
+			// to properly expose it to GC
+			if ( typeof elem[ name ] === "undefined" ) {
 				elem[ name ] = null;
 			}
 
@@ -5359,8 +5514,9 @@ jQuery.removeEvent = document.removeEventListener ?
 	};
 
 jQuery.Event = function( src, props ) {
+
 	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
+	if ( !( this instanceof jQuery.Event ) ) {
 		return new jQuery.Event( src, props );
 	}
 
@@ -5371,8 +5527,13 @@ jQuery.Event = function( src, props ) {
 
 		// Events bubbling up the document may have been marked as prevented
 		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+
+				// Support: IE < 9, Android < 4.0
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
 
 	// Event type
 	} else {
@@ -5394,6 +5555,7 @@ jQuery.Event = function( src, props ) {
 // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
 // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
 jQuery.Event.prototype = {
+	constructor: jQuery.Event,
 	isDefaultPrevented: returnFalse,
 	isPropagationStopped: returnFalse,
 	isImmediatePropagationStopped: returnFalse,
@@ -5420,9 +5582,11 @@ jQuery.Event.prototype = {
 		var e = this.originalEvent;
 
 		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
+
+		if ( !e || this.isSimulated ) {
 			return;
 		}
+
 		// If stopPropagation exists, run it on the original event
 		if ( e.stopPropagation ) {
 			e.stopPropagation();
@@ -5433,15 +5597,31 @@ jQuery.Event.prototype = {
 		e.cancelBubble = true;
 	},
 	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
 		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && e.stopImmediatePropagation ) {
+			e.stopImmediatePropagation();
+		}
+
 		this.stopPropagation();
 	}
 };
 
 // Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
+// so that event delegation works in jQuery.
+// Do the same for pointerenter/pointerleave and pointerover/pointerout
+//
+// Support: Safari 7 only
+// Safari sends mouseenter too often; see:
+// https://code.google.com/p/chromium/issues/detail?id=470258
+// for the description of the bug (it existed in older Chrome versions as well).
+jQuery.each( {
 	mouseenter: "mouseover",
-	mouseleave: "mouseout"
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
 }, function( orig, fix ) {
 	jQuery.event.special[ orig ] = {
 		delegateType: fix,
@@ -5453,9 +5633,9 @@ jQuery.each({
 				related = event.relatedTarget,
 				handleObj = event.handleObj;
 
-			// For mousenter/leave call the handler if related is outside the target.
+			// For mouseenter/leave call the handler if related is outside the target.
 			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
 				event.type = handleObj.origType;
 				ret = handleObj.handler.apply( this, arguments );
 				event.type = fix;
@@ -5463,13 +5643,14 @@ jQuery.each({
 			return ret;
 		}
 	};
-});
+} );
 
 // IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
+if ( !support.submit ) {
 
 	jQuery.event.special.submit = {
 		setup: function() {
+
 			// Only need this for delegated form submit events
 			if ( jQuery.nodeName( this, "form" ) ) {
 				return false;
@@ -5477,30 +5658,42 @@ if ( !jQuery.support.submitBubbles ) {
 
 			// Lazy-add a submit handler when a descendant form may potentially be submitted
 			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+
 				// Node name check avoids a VML-related crash in IE (#9807)
 				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ?
+
+						// Support: IE <=8
+						// We use jQuery.prop instead of elem.form
+						// to allow fixing the IE8 delegated submit issue (gh-2332)
+						// by 3rd party polyfills/workarounds.
+						jQuery.prop( elem, "form" ) :
+						undefined;
+
+				if ( form && !jQuery._data( form, "submit" ) ) {
 					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
+						event._submitBubble = true;
+					} );
+					jQuery._data( form, "submit", true );
 				}
-			});
+			} );
+
 			// return undefined since we don't need an event listener
 		},
 
 		postDispatch: function( event ) {
+
 			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
+			if ( event._submitBubble ) {
+				delete event._submitBubble;
 				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
+					jQuery.event.simulate( "submit", this.parentNode, event );
 				}
 			}
 		},
 
 		teardown: function() {
+
 			// Only need this for delegated form submit events
 			if ( jQuery.nodeName( this, "form" ) ) {
 				return false;
@@ -5513,52 +5706,57 @@ if ( !jQuery.support.submitBubbles ) {
 }
 
 // IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
+if ( !support.change ) {
 
 	jQuery.event.special.change = {
 
 		setup: function() {
 
 			if ( rformElems.test( this.nodeName ) ) {
+
 				// IE doesn't fire change on a check/radio until blur; trigger it on click
 				// after a propertychange. Eat the blur-change in special.change.handle.
 				// This still fires onchange a second time for check/radio after blur.
 				if ( this.type === "checkbox" || this.type === "radio" ) {
 					jQuery.event.add( this, "propertychange._change", function( event ) {
 						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
+							this._justChanged = true;
 						}
-					});
+					} );
 					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
+						if ( this._justChanged && !event.isTrigger ) {
+							this._justChanged = false;
 						}
+
 						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
+						jQuery.event.simulate( "change", this, event );
+					} );
 				}
 				return false;
 			}
+
 			// Delegated event; lazy-add a change handler on descendant inputs
 			jQuery.event.add( this, "beforeactivate._change", function( e ) {
 				var elem = e.target;
 
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) {
 					jQuery.event.add( elem, "change._change", function( event ) {
 						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
+							jQuery.event.simulate( "change", this.parentNode, event );
 						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
+					} );
+					jQuery._data( elem, "change", true );
 				}
-			});
+			} );
 		},
 
 		handle: function( event ) {
 			var elem = event.target;
 
 			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+			if ( this !== elem || event.isSimulated || event.isTrigger ||
+				( elem.type !== "radio" && elem.type !== "checkbox" ) ) {
+
 				return event.handleObj.handler.apply( this, arguments );
 			}
 		},
@@ -5571,102 +5769,72 @@ if ( !jQuery.support.changeBubbles ) {
 	};
 }
 
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+// Support: Firefox
+// Firefox doesn't have focus(in | out) events
+// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+//
+// Support: Chrome, Safari
+// focus(in | out) events fire after focus & blur events,
+// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
+if ( !support.focusin ) {
+	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+		};
 
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
 				}
+				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
 			},
 			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					jQuery._removeData( doc, fix );
+				} else {
+					jQuery._data( doc, fix, attaches );
 				}
 			}
 		};
-	});
+	} );
 }
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
+	on: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn );
 	},
 	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
+		return on( this, types, selector, data, fn, 1 );
 	},
 	off: function( types, selector, fn ) {
 		var handleObj, type;
 		if ( types && types.preventDefault && types.handleObj ) {
+
 			// ( event )  dispatched jQuery.Event
 			handleObj = types.handleObj;
 			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.namespace ?
+					handleObj.origType + "." + handleObj.namespace :
+					handleObj.origType,
 				handleObj.selector,
 				handleObj.handler
 			);
 			return this;
 		}
 		if ( typeof types === "object" ) {
+
 			// ( types-object [, selector] )
 			for ( type in types ) {
 				this.off( type, selector, types[ type ] );
@@ -5674,6 +5842,7 @@ jQuery.fn.extend({
 			return this;
 		}
 		if ( selector === false || typeof selector === "function" ) {
+
 			// ( types [, fn] )
 			fn = selector;
 			selector = undefined;
@@ -5681,655 +5850,68 @@ jQuery.fn.extend({
 		if ( fn === false ) {
 			fn = returnFalse;
 		}
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.event.remove( this, types, fn, selector );
-		});
+		} );
 	},
 
 	trigger: function( type, data ) {
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.event.trigger( type, data, this );
-		});
+		} );
 	},
 	triggerHandler: function( type, data ) {
-		var elem = this[0];
+		var elem = this[ 0 ];
 		if ( elem ) {
 			return jQuery.event.trigger( type, data, elem, true );
 		}
 	}
-});
-var isSimple = /^.[^:#\[\.,]*$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
+} );
 
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
 
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
+var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
 
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
+	// Support: IE 10-11, Edge 10240+
+	// In IE/Edge using regex groups here causes severe slowdowns.
+	// See https://connect.microsoft.com/IE/feedback/details/1736512/
+	rnoInnerhtml = /<script|<style|<link/i,
 
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					cur = ret.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		var elem = elems[ 0 ];
-
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 && elem.nodeType === 1 ?
-			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-				return elem.nodeType === 1;
-			}));
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
 	// checked="checked" or checked
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
 	rscriptTypeMasked = /^true\/(.*)/,
 	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
 	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var
-			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
-			args = jQuery.map( this, function( elem ) {
-				return [ elem.nextSibling, elem.parentNode ];
-			}),
-			i = 0;
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			var next = args[ i++ ],
-				parent = args[ i++ ];
-
-			if ( parent ) {
-				// Don't use the snapshot next if it has moved (#13810)
-				if ( next && next.parentNode !== parent ) {
-					next = this.nextSibling;
-				}
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		// Allow new content to include elements from the context set
-		}, true );
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return i ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback, allowIntersection ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback, allowIntersection );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery._evalUrl( node.src );
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
+	fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) );
 
 // Support: IE<8
 // Manipulating tables requires a tbody
 function manipulationTarget( elem, content ) {
 	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
+		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
 
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
+		elem.getElementsByTagName( "tbody" )[ 0 ] ||
+			elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
 		elem;
 }
 
 // Replace/restore the type attribute of script elements for safe DOM manipulation
 function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
+	elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type;
 	return elem;
 }
 function restoreScript( elem ) {
 	var match = rscriptTypeMasked.exec( elem.type );
 	if ( match ) {
-		elem.type = match[1];
+		elem.type = match[ 1 ];
 	} else {
-		elem.removeAttribute("type");
+		elem.removeAttribute( "type" );
 	}
 	return elem;
 }
 
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
 function cloneCopyEvent( src, dest ) {
-
 	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
 		return;
 	}
@@ -6367,7 +5949,7 @@ function fixCloneNodeIssues( src, dest ) {
 	nodeName = dest.nodeName.toLowerCase();
 
 	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
+	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
 		data = jQuery._data( dest );
 
 		for ( e in data.events ) {
@@ -6394,11 +5976,12 @@ function fixCloneNodeIssues( src, dest ) {
 		// element in IE9, the outerHTML strategy above is not sufficient.
 		// If the src has innerHTML and the destination does not,
 		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) {
 			dest.innerHTML = src.innerHTML;
 		}
 
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
+	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+
 		// IE6-8 fails to persist the checked state of a cloned checkbox
 		// or radio button. Worse, IE6-7 fail to give the cloned element
 		// a checked appearance if the defaultChecked value isn't also set
@@ -6423,67 +6006,137 @@ function fixCloneNodeIssues( src, dest ) {
 	}
 }
 
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
+function domManip( collection, args, callback, ignored ) {
 
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
+	// Flatten any nested arrays
+	args = concat.apply( [], args );
 
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
+	var first, node, hasScripts,
+		scripts, doc, fragment,
 		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
+		l = collection.length,
+		iNoClone = l - 1,
+		value = args[ 0 ],
+		isFunction = jQuery.isFunction( value );
 
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
+	// We can't cloneNode fragments that contain checked, in WebKit
+	if ( isFunction ||
+			( l > 1 && typeof value === "string" &&
+				!support.checkClone && rchecked.test( value ) ) ) {
+		return collection.each( function( index ) {
+			var self = collection.eq( index );
+			if ( isFunction ) {
+				args[ 0 ] = value.call( this, index, self.html() );
 			}
+			domManip( self, args, callback, ignored );
+		} );
+	}
+
+	if ( l ) {
+		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+		first = fragment.firstChild;
+
+		if ( fragment.childNodes.length === 1 ) {
+			fragment = first;
+		}
+
+		// Require either new content or an interest in ignored elements to invoke the callback
+		if ( first || ignored ) {
+			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+			hasScripts = scripts.length;
+
+			// Use the original fragment for the last item
+			// instead of the first because it can end up
+			// being emptied incorrectly in certain situations (#8070).
+			for ( ; i < l; i++ ) {
+				node = fragment;
+
+				if ( i !== iNoClone ) {
+					node = jQuery.clone( node, true, true );
+
+					// Keep references to cloned scripts for later restoration
+					if ( hasScripts ) {
+
+						// Support: Android<4.1, PhantomJS<2
+						// push.apply(_, arraylike) throws on ancient WebKit
+						jQuery.merge( scripts, getAll( node, "script" ) );
+					}
+				}
+
+				callback.call( collection[ i ], node, i );
+			}
+
+			if ( hasScripts ) {
+				doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+				// Reenable scripts
+				jQuery.map( scripts, restoreScript );
+
+				// Evaluate executable scripts on first document insertion
+				for ( i = 0; i < hasScripts; i++ ) {
+					node = scripts[ i ];
+					if ( rscriptType.test( node.type || "" ) &&
+						!jQuery._data( node, "globalEval" ) &&
+						jQuery.contains( doc, node ) ) {
+
+						if ( node.src ) {
+
+							// Optional AJAX dependency, but won't run scripts if not present
+							if ( jQuery._evalUrl ) {
+								jQuery._evalUrl( node.src );
+							}
+						} else {
+							jQuery.globalEval(
+								( node.text || node.textContent || node.innerHTML || "" )
+									.replace( rcleanScript, "" )
+							);
+						}
+					}
+				}
+			}
+
+			// Fix #11809: Avoid leaking memory
+			fragment = first = null;
 		}
 	}
 
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
+	return collection;
 }
 
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
+function remove( elem, selector, keepData ) {
+	var node,
+		elems = selector ? jQuery.filter( selector, elem ) : elem,
+		i = 0;
+
+	for ( ; ( node = elems[ i ] ) != null; i++ ) {
+
+		if ( !keepData && node.nodeType === 1 ) {
+			jQuery.cleanData( getAll( node ) );
+		}
+
+		if ( node.parentNode ) {
+			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+				setGlobalEval( getAll( node, "script" ) );
+			}
+			node.parentNode.removeChild( node );
+		}
 	}
+
+	return elem;
 }
 
-jQuery.extend({
+jQuery.extend( {
+	htmlPrefilter: function( html ) {
+		return html.replace( rxhtmlTag, "<$1></$2>" );
+	},
+
 	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
 		var destElements, node, clone, i, srcElements,
 			inPage = jQuery.contains( elem.ownerDocument, elem );
 
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+		if ( support.html5Clone || jQuery.isXMLDoc( elem ) ||
+			!rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+
 			clone = elem.cloneNode( true );
 
 		// IE<=8 does not properly clone detached, unknown element nodes
@@ -6492,18 +6145,19 @@ jQuery.extend({
 			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
 		}
 
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+		if ( ( !support.noCloneEvent || !support.noCloneChecked ) &&
+				( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) {
 
 			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
 			destElements = getAll( clone );
 			srcElements = getAll( elem );
 
 			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+			for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) {
+
 				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
+				if ( destElements[ i ] ) {
+					fixCloneNodeIssues( node, destElements[ i ] );
 				}
 			}
 		}
@@ -6514,8 +6168,8 @@ jQuery.extend({
 				srcElements = srcElements || getAll( elem );
 				destElements = destElements || getAll( clone );
 
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
+				for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) {
+					cloneCopyEvent( node, destElements[ i ] );
 				}
 			} else {
 				cloneCopyEvent( elem, clone );
@@ -6534,144 +6188,16 @@ jQuery.extend({
 		return clone;
 	},
 
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
+	cleanData: function( elems, /* internal */ forceAcceptData ) {
 		var elem, type, id, data,
 			i = 0,
 			internalKey = jQuery.expando,
 			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
+			attributes = support.attributes,
 			special = jQuery.event.special;
 
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
+		for ( ; ( elem = elems[ i ] ) != null; i++ ) {
+			if ( forceAcceptData || acceptData( elem ) ) {
 
 				id = elem[ internalKey ];
 				data = id && cache[ id ];
@@ -6694,153 +6220,662 @@ jQuery.extend({
 
 						delete cache[ id ];
 
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
+						// Support: IE<9
+						// IE does not allow us to delete expando properties from nodes
+						// IE creates expando attributes along with the property
+						// IE does not have a removeAttribute function on Document nodes
+						if ( !attributes && typeof elem.removeAttribute !== "undefined" ) {
 							elem.removeAttribute( internalKey );
 
+						// Webkit & Blink performance suffers when deleting properties
+						// from DOM nodes, so set to undefined instead
+						// https://code.google.com/p/chromium/issues/detail?id=378607
 						} else {
-							elem[ internalKey ] = null;
+							elem[ internalKey ] = undefined;
 						}
 
-						core_deletedIds.push( id );
+						deletedIds.push( id );
 					}
 				}
 			}
 		}
+	}
+} );
+
+jQuery.fn.extend( {
+
+	// Keep domManip exposed until 3.0 (gh-2225)
+	domManip: domManip,
+
+	detach: function( selector ) {
+		return remove( this, selector, true );
 	},
 
-	_evalUrl: function( url ) {
-		return jQuery.ajax({
-			url: url,
-			type: "GET",
-			dataType: "script",
-			async: false,
-			global: false,
-			"throws": true
-		});
-	}
-});
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
+	remove: function( selector ) {
+		return remove( this, selector );
+	},
 
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append(
+					( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value )
+				);
+		}, null, value, arguments.length );
+	},
 
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
+	append: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		} );
+	},
+
+	prepend: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		} );
+	},
+
+	before: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		} );
+	},
+
+	after: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		} );
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; ( elem = this[ i ] ) != null; i++ ) {
+
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem, false ) );
 			}
 
-			wrap.map(function() {
-				var elem = this;
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
 
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
 		}
 
 		return this;
 	},
 
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		} );
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+				value = jQuery.htmlPrefilter( value );
+
+				try {
+					for ( ; i < l; i++ ) {
+
+						// Remove element nodes and prevent memory leaks
+						elem = this[ i ] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch ( e ) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var ignored = [];
+
+		// Make the changes, replacing each non-ignored context element with the new content
+		return domManip( this, arguments, function( elem ) {
+			var parent = this.parentNode;
+
+			if ( jQuery.inArray( this, ignored ) < 0 ) {
+				jQuery.cleanData( getAll( this ) );
+				if ( parent ) {
+					parent.replaceChild( elem, this );
+				}
+			}
+
+		// Force callback invocation
+		}, ignored );
+	}
+} );
+
+jQuery.each( {
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone( true );
+			jQuery( insert[ i ] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			push.apply( ret, elems.get() );
 		}
 
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
+		return this.pushStack( ret );
+	};
+} );
 
-			if ( contents.length ) {
-				contents.wrapAll( html );
 
-			} else {
-				self.append( html );
-			}
-		});
-	},
+var iframe,
+	elemdisplay = {
 
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
+		// Support: Firefox
+		// We have to pre-define these values for FF (#10227)
+		HTML: "block",
+		BODY: "block"
+	};
 
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
 
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+		display = jQuery.css( elem[ 0 ], "display" );
+
+	// We don't have any data stored on the element,
+	// so use "detach" method as fast way to get rid of the element
+	elem.detach();
+
+	return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+
+			// Use the already-created iframe if possible
+			iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
+				.appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
+
+			// Support: IE
+			doc.write();
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
 	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+
+	return display;
+}
+var rmargin = ( /^margin/ );
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+var swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+var documentElement = document.documentElement;
+
+
+
+( function() {
+	var pixelPositionVal, pixelMarginRightVal, boxSizingReliableVal,
+		reliableHiddenOffsetsVal, reliableMarginRightVal, reliableMarginLeftVal,
+		container = document.createElement( "div" ),
+		div = document.createElement( "div" );
+
+	// Finish early in limited (non-browser) environments
+	if ( !div.style ) {
+		return;
+	}
+
+	div.style.cssText = "float:left;opacity:.5";
+
+	// Support: IE<9
+	// Make sure that element opacity exists (as opposed to filter)
+	support.opacity = div.style.opacity === "0.5";
+
+	// Verify style float existence
+	// (IE uses styleFloat instead of cssFloat)
+	support.cssFloat = !!div.style.cssFloat;
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	container = document.createElement( "div" );
+	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
+		"padding:0;margin-top:1px;position:absolute";
+	div.innerHTML = "";
+	container.appendChild( div );
+
+	// Support: Firefox<29, Android 2.3
+	// Vendor-prefix box-sizing
+	support.boxSizing = div.style.boxSizing === "" || div.style.MozBoxSizing === "" ||
+		div.style.WebkitBoxSizing === "";
+
+	jQuery.extend( support, {
+		reliableHiddenOffsets: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableHiddenOffsetsVal;
+		},
+
+		boxSizingReliable: function() {
+
+			// We're checking for pixelPositionVal here instead of boxSizingReliableVal
+			// since that compresses better and they're computed together anyway.
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return boxSizingReliableVal;
+		},
+
+		pixelMarginRight: function() {
+
+			// Support: Android 4.0-4.3
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelMarginRightVal;
+		},
+
+		pixelPosition: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelPositionVal;
+		},
+
+		reliableMarginRight: function() {
+
+			// Support: Android 2.3
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginRightVal;
+		},
+
+		reliableMarginLeft: function() {
+
+			// Support: IE <=8 only, Android 4.0 - 4.3 only, Firefox <=3 - 37
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginLeftVal;
+		}
+	} );
+
+	function computeStyleTests() {
+		var contents, divStyle,
+			documentElement = document.documentElement;
+
+		// Setup
+		documentElement.appendChild( container );
+
+		div.style.cssText =
+
+			// Support: Android 2.3
+			// Vendor-prefix box-sizing
+			"-webkit-box-sizing:border-box;box-sizing:border-box;" +
+			"position:relative;display:block;" +
+			"margin:auto;border:1px;padding:1px;" +
+			"top:1%;width:50%";
+
+		// Support: IE<9
+		// Assume reasonable values in the absence of getComputedStyle
+		pixelPositionVal = boxSizingReliableVal = reliableMarginLeftVal = false;
+		pixelMarginRightVal = reliableMarginRightVal = true;
+
+		// Check for getComputedStyle so that this code is not run in IE<9.
+		if ( window.getComputedStyle ) {
+			divStyle = window.getComputedStyle( div );
+			pixelPositionVal = ( divStyle || {} ).top !== "1%";
+			reliableMarginLeftVal = ( divStyle || {} ).marginLeft === "2px";
+			boxSizingReliableVal = ( divStyle || { width: "4px" } ).width === "4px";
+
+			// Support: Android 4.0 - 4.3 only
+			// Some styles come back with percentage values, even though they shouldn't
+			div.style.marginRight = "50%";
+			pixelMarginRightVal = ( divStyle || { marginRight: "4px" } ).marginRight === "4px";
+
+			// Support: Android 2.3 only
+			// Div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container (#3333)
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			contents = div.appendChild( document.createElement( "div" ) );
+
+			// Reset CSS: box-sizing; display; margin; border; padding
+			contents.style.cssText = div.style.cssText =
+
+				// Support: Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
+			contents.style.marginRight = contents.style.width = "0";
+			div.style.width = "1px";
+
+			reliableMarginRightVal =
+				!parseFloat( ( window.getComputedStyle( contents ) || {} ).marginRight );
+
+			div.removeChild( contents );
+		}
+
+		// Support: IE6-8
+		// First check that getClientRects works as expected
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.style.display = "none";
+		reliableHiddenOffsetsVal = div.getClientRects().length === 0;
+		if ( reliableHiddenOffsetsVal ) {
+			div.style.display = "";
+			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+			div.childNodes[ 0 ].style.borderCollapse = "separate";
+			contents = div.getElementsByTagName( "td" );
+			contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
+			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+			if ( reliableHiddenOffsetsVal ) {
+				contents[ 0 ].style.display = "";
+				contents[ 1 ].style.display = "none";
+				reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+			}
+		}
+
+		// Teardown
+		documentElement.removeChild( container );
+	}
+
+} )();
+
+
+var getStyles, curCSS,
+	rposition = /^(top|right|bottom|left)$/;
+
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+
+		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		var view = elem.ownerDocument.defaultView;
+
+		if ( !view || !view.opener ) {
+			view = window;
+		}
+
+		return view.getComputedStyle( elem );
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var width, minWidth, maxWidth, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+
+		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
+
+		// Support: Opera 12.1x only
+		// Fall back to style even without computed
+		// computed is undefined for elems on document fragments
+		if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) {
+			ret = jQuery.style( elem, name );
+		}
+
+		if ( computed ) {
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value"
+			// instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values,
+			// but width seems to be reliably pixels
+			// this is against the CSSOM draft spec:
+			// http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "";
+	};
+} else if ( documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var left, rs, rsLeft, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+		ret = computed ? computed[ name ] : undefined;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are
+		// proportional to the parent element instead
+		// and we can't measure the parent instead because it
+		// might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "" || "auto";
+	};
+}
+
+
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			if ( conditionFn() ) {
+
+				// Hook not needed (or it's not possible to use it due
+				// to missing dependency), remove it.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+			return ( this.get = hookFn ).apply( this, arguments );
+		}
+	};
+}
+
+
+var
+
+		ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/i,
+
+	// swappable if display is none or starts with table except
+	// "table", "table-cell", or "table-caption"
+	// see here for display values:
+	// https://developer.mozilla.org/en-US/docs/CSS/display
 	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
+	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
 
 	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
+		letterSpacing: "0",
+		fontWeight: "400"
 	},
 
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
+	emptyStyle = document.createElement( "div" ).style;
+
 
 // return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
+function vendorPropName( name ) {
 
 	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
+	if ( name in emptyStyle ) {
 		return name;
 	}
 
 	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
+	var capName = name.charAt( 0 ).toUpperCase() + name.slice( 1 ),
 		i = cssPrefixes.length;
 
 	while ( i-- ) {
 		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
+		if ( name in emptyStyle ) {
 			return name;
 		}
 	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
 }
 
 function showHide( elements, show ) {
@@ -6858,6 +6893,7 @@ function showHide( elements, show ) {
 		values[ index ] = jQuery._data( elem, "olddisplay" );
 		display = elem.style.display;
 		if ( show ) {
+
 			// Reset the inline display of this element to learn if it is
 			// being hidden by cascaded rules or not
 			if ( !values[ index ] && display === "none" ) {
@@ -6868,16 +6904,18 @@ function showHide( elements, show ) {
 			// in a stylesheet to whatever the default browser style is
 			// for such an element
 			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+				values[ index ] =
+					jQuery._data( elem, "olddisplay", defaultDisplay( elem.nodeName ) );
 			}
 		} else {
+			hidden = isHidden( elem );
 
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
+			if ( display && display !== "none" || !hidden ) {
+				jQuery._data(
+					elem,
+					"olddisplay",
+					hidden ? display : jQuery.css( elem, "display" )
+				);
 			}
 		}
 	}
@@ -6897,10 +6935,401 @@ function showHide( elements, show ) {
 	return elements;
 }
 
-jQuery.fn.extend({
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+
+		// If we already have the right measurement, avoid augmentation
+		4 :
+
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = support.boxSizing &&
+			jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test( val ) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox &&
+			( support.boxSizingReliable() || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+jQuery.extend( {
+
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"animationIterationCount": true,
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+
+		// normalize float css property
+		"float": support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Convert "+=" or "-=" to relative numbers (#7345)
+			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+				value = adjustCSS( elem, name, ret );
+
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set. See: #7116
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number was passed in, add the unit (except for certain CSS properties)
+			if ( type === "number" ) {
+				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight
+			// (for every problematic property) identical functions
+			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !( "set" in hooks ) ||
+				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+
+				// Support: IE
+				// Swallow errors from 'invalid' CSS values (#5509)
+				try {
+					style[ name ] = value;
+				} catch ( e ) {}
+			}
+
+		} else {
+
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks &&
+				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || isFinite( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+} );
+
+jQuery.each( [ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+					elem.offsetWidth === 0 ?
+						swap( elem, cssShow, function() {
+							return getWidthOrHeight( elem, name, extra );
+						} ) :
+						getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					support.boxSizing &&
+						jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+} );
+
+if ( !support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+
+			// IE uses filters for opacity
+			return ropacity.test( ( computed && elem.currentStyle ?
+				elem.currentStyle.filter :
+				elem.style.filter ) || "" ) ?
+					( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+					computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist -
+			// attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule
+				// or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
+	function( elem, computed ) {
+		if ( computed ) {
+			return swap( elem, { "display": "inline-block" },
+				curCSS, [ elem, "marginRight" ] );
+		}
+	}
+);
+
+jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+	function( elem, computed ) {
+		if ( computed ) {
+			return (
+				parseFloat( curCSS( elem, "marginLeft" ) ) ||
+
+				// Support: IE<=11+
+				// Running getBoundingClientRect on a disconnected node in IE throws an error
+				// Support: IE8 only
+				// getClientRects() errors on disconnected elems
+				( jQuery.contains( elem.ownerDocument, elem ) ?
+					elem.getBoundingClientRect().left -
+						swap( elem, { marginLeft: 0 }, function() {
+							return elem.getBoundingClientRect().left;
+						} ) :
+					0
+				)
+			) + "px";
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each( {
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split( " " ) : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+} );
+
+jQuery.fn.extend( {
 	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
+		return access( this, function( elem, name, value ) {
+			var styles, len,
 				map = {},
 				i = 0;
 
@@ -6931,629 +7360,1621 @@ jQuery.fn.extend({
 			return state ? this.show() : this.hide();
 		}
 
-		return this.each(function() {
+		return this.each( function() {
 			if ( isHidden( this ) ) {
 				jQuery( this ).show();
 			} else {
 				jQuery( this ).hide();
 			}
-		});
+		} );
 	}
-});
+} );
 
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || jQuery.easing._default;
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			// Use a property on the element directly when it is not a DOM element,
+			// or when there is no matching style property that exists.
+			if ( tween.elem.nodeType !== 1 ||
+				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.nodeType === 1 &&
+				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
+					jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9
+// Panic based approach to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	},
+	_default: "swing"
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rrun = /queueHooks$/;
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	window.setTimeout( function() {
+		fxNow = undefined;
+	} );
+	return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+
+			// we're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	/* jshint validthis: true */
+	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHidden( elem ),
+		dataShow = jQuery._data( elem, "fxshow" );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always( function() {
+
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always( function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			} );
+		} );
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		display = jQuery.css( elem, "display" );
+
+		// Test default display if display is currently "none"
+		checkDisplay = display === "none" ?
+			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !support.shrinkWrapBlocks() ) {
+			anim.always( function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			} );
+		}
+	}
+
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// If there is dataShow left over from a stopped hide or show
+				// and we are going to proceed with show, we should pretend to be hidden
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+
+		// Any non-fx value stops us from restoring the original display value
+		} else {
+			display = undefined;
+		}
+	}
+
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
+			}
+		} else {
+			dataShow = jQuery._data( elem, "fxshow", {} );
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done( function() {
+				jQuery( elem ).hide();
+			} );
+		}
+		anim.done( function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		} );
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
 				}
 			}
 		}
+
+	// If this is a noop like .hide().hide(), restore an overwritten display value
+	} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
+		style.display = display;
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = Animation.prefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		} ),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+
+				// Support: Android 2.3
+				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ] );
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise( {
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, {
+				specialEasing: {},
+				easing: jQuery.easing._default
+			}, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.notifyWith( elem, [ animation, 1, 0 ] );
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		} ),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			if ( jQuery.isFunction( result.stop ) ) {
+				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+					jQuery.proxy( result.stop, result );
+			}
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		} )
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweeners: {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value );
+			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+			return tween;
+		} ]
 	},
 
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.match( rnotwhite );
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+			Animation.tweeners[ prop ].unshift( callback );
+		}
 	},
 
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
+	prefilters: [ defaultPrefilter ],
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			Animation.prefilters.unshift( callback );
+		} else {
+			Animation.prefilters.push( callback );
+		}
+	}
+} );
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ?
+			jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend( {
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate( { opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each( function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this &&
+					( type == null || timers[ index ].queue === type ) ) {
+
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		} );
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each( function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		} );
+	}
+} );
+
+jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+} );
+
+// Generate shortcuts for custom animations
+jQuery.each( {
+	slideDown: genFx( "show" ),
+	slideUp: genFx( "hide" ),
+	slideToggle: genFx( "toggle" ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+} );
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	if ( timer() ) {
+		jQuery.fx.start();
+	} else {
+		jQuery.timers.pop();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	window.clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = window.setTimeout( next, time );
+		hooks.stop = function() {
+			window.clearTimeout( timeout );
+		};
+	} );
+};
+
+
+( function() {
+	var a,
+		input = document.createElement( "input" ),
+		div = document.createElement( "div" ),
+		select = document.createElement( "select" ),
+		opt = select.appendChild( document.createElement( "option" ) );
+
+	// Setup
+	div = document.createElement( "div" );
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// Support: Windows Web Apps (WWA)
+	// `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "checkbox" );
+	div.appendChild( input );
+
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// First batch of tests.
+	a.style.cssText = "top:1px";
+
+	// Test setAttribute on camelCase class.
+	// If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+	support.getSetAttribute = div.className !== "t";
+
+	// Get the style information from getAttribute
+	// (IE uses .cssText instead)
+	support.style = /top/.test( a.getAttribute( "style" ) );
+
+	// Make sure that URLs aren't manipulated
+	// (IE normalizes it by default)
+	support.hrefNormalized = a.getAttribute( "href" ) === "/a";
+
+	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+	support.checkOn = !!input.value;
+
+	// Make sure that a selected-by-default option has a working selected property.
+	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+	support.optSelected = opt.selected;
+
+	// Tests for enctype support on a form (#6743)
+	support.enctype = !!document.createElement( "form" ).enctype;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE8 only
+	// Check if we can trust getAttribute("value")
+	input = document.createElement( "input" );
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
+
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+} )();
+
+
+var rreturn = /\r/g,
+	rspaces = /[\x20\t\r\n\f]+/g;
+
+jQuery.fn.extend( {
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[ 0 ];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] ||
+					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if (
+					hooks &&
+					"get" in hooks &&
+					( ret = hooks.get( elem, "value" ) ) !== undefined
+				) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+
+					// handle most common string cases
+					ret.replace( rreturn, "" ) :
+
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
 
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
 			return;
 		}
 
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
+		isFunction = jQuery.isFunction( value );
 
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+		return this.each( function( i ) {
+			var val;
 
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
+			if ( this.nodeType !== 1 ) {
 				return;
 			}
 
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
 			}
 
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				} );
 			}
 
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
 
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+
+					// Support: IE10-11+
+					// option.text throws exceptions (#14686, #14858)
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+
+							// Don't return options that are disabled or in a disabled optgroup
+							( support.optDisabled ?
+								!option.disabled :
+								option.getAttribute( "disabled" ) === null ) &&
+							( !option.parentNode.disabled ||
+								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+
+					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {
+
+						// Support: IE6
+						// When new option element is added to select box we need to
+						// force reflow of newly added node in order to workaround delay
+						// of initialization properties
+						try {
+							option.selected = optionSet = true;
+
+						} catch ( _ ) {
+
+							// Will be executed only in IE6
+							option.scrollHeight;
+						}
+
+					} else {
+						option.selected = false;
+					}
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+
+				return options;
+			}
+		}
+	}
+} );
+
+// Radios and checkboxes getter/setter
+jQuery.each( [ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+		};
+	}
+} );
+
+
+
+
+var nodeHook, boolHook,
+	attrHandle = jQuery.expr.attrHandle,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = support.getSetAttribute,
+	getSetInput = support.input;
+
+jQuery.fn.extend( {
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each( function() {
+			jQuery.removeAttr( this, name );
+		} );
+	}
+} );
+
+jQuery.extend( {
+	attr: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set attributes on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
 			}
 
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
 				return ret;
 			}
 
-			// Otherwise just get the value from the style object
-			return style[ name ];
+			elem.setAttribute( name, value + "" );
+			return value;
 		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		ret = jQuery.find.attr( elem, name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return ret == null ? undefined : ret;
 	},
 
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" &&
+					jQuery.nodeName( elem, "input" ) ) {
 
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-// Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
-				}
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
+					// Setting the type on a radio button after the value resets the value in IE8-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
 					}
+					return value;
 				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
 			}
-
-			return expanded;
 		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
 	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
 
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( rnotwhite );
 
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( ( name = attrNames[ i++ ] ) ) {
+				propName = jQuery.propFix[ name ] || name;
 
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
+				// Boolean attributes get special treatment (#10870)
+				if ( jQuery.expr.match.bool.test( name ) ) {
 
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
+					// Set corresponding property to false
+					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+						elem[ propName ] = false;
 
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
+					// Support: IE<9
+					// Also clear defaultChecked/defaultSelected (if appropriate)
+					} else {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
 		}
 	}
+} );
 
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		} else {
+
+			// Support: IE<9
+			// Use defaultChecked and defaultSelected for oldIE
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+		return name;
+	}
 };
 
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = attrHandle[ name ] || jQuery.find.attr;
 
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
+	if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+		attrHandle[ name ] = function( elem, name, isXML ) {
+			var ret, handle;
+			if ( !isXML ) {
 
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+				// Avoid an infinite loop by temporarily removing this function from the getter
+				handle = attrHandle[ name ];
+				attrHandle[ name ] = ret;
+				ret = getter( elem, name, isXML ) != null ?
+					name.toLowerCase() :
+					null;
+				attrHandle[ name ] = handle;
 			}
-		});
+			return ret;
+		};
+	} else {
+		attrHandle[ name ] = function( elem, name, isXML ) {
+			if ( !isXML ) {
+				return elem[ jQuery.camelCase( "default-" + name ) ] ?
+					name.toLowerCase() :
+					null;
+			}
+		};
+	}
+} );
 
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+// fix oldIE attroperties
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = {
+		set: function( elem, value, name ) {
+
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					( ret = elem.ownerDocument.createAttribute( name ) )
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			if ( name === "value" || value === elem.getAttribute( name ) ) {
+				return value;
+			}
+		}
+	};
+
+	// Some attributes are constructed with empty-string values when not defined
+	attrHandle.id = attrHandle.name = attrHandle.coords =
+		function( elem, name, isXML ) {
+			var ret;
+			if ( !isXML ) {
+				return ( ret = elem.getAttributeNode( name ) ) && ret.value !== "" ?
+					ret.value :
+					null;
+			}
+		};
+
+	// Fixing value retrieval on a button requires this module
+	jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			if ( ret && ret.specified ) {
+				return ret.value;
+			}
+		},
+		set: nodeHook.set
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each( [ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		};
+	} );
+}
+
+if ( !support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case sensitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend( {
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each( function() {
+
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch ( e ) {}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	prop: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set properties on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
 		}
 
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			return ( elem[ name ] = value );
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		return elem[ name ];
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+
+				// elem.tabIndex doesn't always return the
+				// correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				return tabindex ?
+					parseInt( tabindex, 10 ) :
+					rfocusable.test( elem.nodeName ) ||
+						rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							-1;
+			}
+		}
+	},
+
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
 	}
+} );
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !support.hrefNormalized ) {
+
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each( [ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	} );
 }
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+
+// Support: Safari, IE9+
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		},
+		set: function( elem ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	};
+}
+
+jQuery.each( [
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+} );
+
+// IE6/7 call enctype encoding
+if ( !support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+
+
+
+var rclass = /[\t\r\n\f]/g;
+
+function getClass( elem ) {
+	return jQuery.attr( elem, "class" ) || "";
+}
+
+jQuery.fn.extend( {
+	addClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnotwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+				cur = elem.nodeType === 1 &&
+					( " " + curValue + " " ).replace( rclass, " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( curValue !== finalValue ) {
+						jQuery.attr( elem, "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( !arguments.length ) {
+			return this.attr( "class", "" );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnotwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 &&
+					( " " + curValue + " " ).replace( rclass, " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( curValue !== finalValue ) {
+						jQuery.attr( elem, "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).toggleClass(
+					value.call( this, i, getClass( this ), stateVal ),
+					stateVal
+				);
+			} );
+		}
+
+		return this.each( function() {
+			var className, i, self, classNames;
+
+			if ( type === "string" ) {
+
+				// Toggle individual class names
+				i = 0;
+				self = jQuery( this );
+				classNames = value.match( rnotwhite ) || [];
+
+				while ( ( className = classNames[ i++ ] ) ) {
+
+					// Check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( value === undefined || type === "boolean" ) {
+				className = getClass( this );
+				if ( className ) {
+
+					// store className if set
+					jQuery._data( this, "__className__", className );
+				}
+
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				jQuery.attr( this, "class",
+					className || value === false ?
+					"" :
+					jQuery._data( this, "__className__" ) || ""
+				);
+			}
+		} );
+	},
+
+	hasClass: function( selector ) {
+		var className, elem,
+			i = 0;
+
+		className = " " + selector + " ";
+		while ( ( elem = this[ i++ ] ) ) {
+			if ( elem.nodeType === 1 &&
+				( " " + getClass( elem ) + " " ).replace( rclass, " " )
+					.indexOf( className ) > -1
+			) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+} );
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+	"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
+	function( i, name ) {
 
 	// Handle event binding
 	jQuery.fn[ name ] = function( data, fn ) {
@@ -7561,46 +8982,107 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
 			this.on( name, null, data, fn ) :
 			this.trigger( name );
 	};
-});
+} );
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 	hover: function( fnOver, fnOut ) {
 		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
 	}
-});
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
+} );
 
-	ajax_rquery = /\?/,
+
+var location = window.location;
+
+var nonce = jQuery.now();
+
+var rquery = ( /\?/ );
+
+
+
+var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
+
+jQuery.parseJSON = function( data ) {
+
+	// Attempt to parse using the native JSON parser first
+	if ( window.JSON && window.JSON.parse ) {
+
+		// Support: Android 2.3
+		// Workaround failure to string-cast null input
+		return window.JSON.parse( data + "" );
+	}
+
+	var requireNonComma,
+		depth = null,
+		str = jQuery.trim( data + "" );
+
+	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
+	// after removing valid tokens
+	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
+
+		// Force termination if we see a misplaced comma
+		if ( requireNonComma && comma ) {
+			depth = 0;
+		}
+
+		// Perform no more replacements after returning to outermost depth
+		if ( depth === 0 ) {
+			return token;
+		}
+
+		// Commas must not follow "[", "{", or ","
+		requireNonComma = open || comma;
+
+		// Determine new depth
+		// array/object open ("[" or "{"): depth += true - false (increment)
+		// array/object close ("]" or "}"): depth += false - true (decrement)
+		// other cases ("," or primitive): depth += true - true (numeric cast)
+		depth += !close - !open;
+
+		// Remove this token
+		return "";
+	} ) ) ?
+		( Function( "return " + str ) )() :
+		jQuery.error( "Invalid JSON: " + data );
+};
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml, tmp;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	try {
+		if ( window.DOMParser ) { // Standard
+			tmp = new window.DOMParser();
+			xml = tmp.parseFromString( data, "text/xml" );
+		} else { // IE
+			xml = new window.ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+	} catch ( e ) {
+		xml = undefined;
+	}
+	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+		jQuery.error( "Invalid XML: " + data );
+	}
+	return xml;
+};
+
+
+var
 	rhash = /#.*$/,
 	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+
+	// IE leaves an \r character at EOL
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg,
+
 	// #7653, #8125, #8152: local protocol detection
 	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
 	rnoContent = /^(?:GET|HEAD)$/,
 	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
+	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
 
 	/* Prefilters
 	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
@@ -7621,22 +9103,13 @@ var
 	transports = {},
 
 	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
+	allTypes = "*/".concat( "*" ),
 
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
+	// Document location
+	ajaxLocation = location.href,
 
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+	// Segment location into parts
+	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
 function addToPrefiltersOrTransports( structure ) {
@@ -7651,19 +9124,21 @@ function addToPrefiltersOrTransports( structure ) {
 
 		var dataType,
 			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
 
 		if ( jQuery.isFunction( func ) ) {
+
 			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
+			while ( ( dataType = dataTypes[ i++ ] ) ) {
+
 				// Prepend if requested
-				if ( dataType[0] === "+" ) {
+				if ( dataType.charAt( 0 ) === "+" ) {
 					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
 
 				// Otherwise append
 				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
 				}
 			}
 		}
@@ -7681,14 +9156,16 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX
 		inspected[ dataType ] = true;
 		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
 			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+			if ( typeof dataTypeOrTransport === "string" &&
+				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+
 				options.dataTypes.unshift( dataTypeOrTransport );
 				inspect( dataTypeOrTransport );
 				return false;
 			} else if ( seekingTransport ) {
 				return !( selected = dataTypeOrTransport );
 			}
-		});
+		} );
 		return selected;
 	}
 
@@ -7704,7 +9181,7 @@ function ajaxExtend( target, src ) {
 
 	for ( key in src ) {
 		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
 		}
 	}
 	if ( deep ) {
@@ -7714,71 +9191,164 @@ function ajaxExtend( target, src ) {
 	return target;
 }
 
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while ( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
+		}
 	}
 
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
 	}
 
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
 
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
 
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
 	}
 
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
 
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
 
-			// Save response for use in complete callback
-			response = arguments;
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
 
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
 	}
 
-	return this;
-};
+	current = dataTypes.shift();
 
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
+	// Convert to each sequential dataType
+	while ( current ) {
 
-jQuery.extend({
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+			// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s[ "throws" ] ) { // jscs:ignore requireDotNotation
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return {
+								state: "parsererror",
+								error: conv ? e : "No conversion from " + prev + " to " + current
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+
+jQuery.extend( {
 
 	// Counter for holding the number of active queries
 	active: 0,
@@ -7816,9 +9386,9 @@ jQuery.extend({
 		},
 
 		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
+			xml: /\bxml\b/,
+			html: /\bhtml/,
+			json: /\bjson\b/
 		},
 
 		responseFields: {
@@ -7882,14 +9452,20 @@ jQuery.extend({
 		// Force options to be an object
 		options = options || {};
 
-		var // Cross-domain detection vars
+		var
+
+			// Cross-domain detection vars
 			parts,
+
 			// Loop variable
 			i,
+
 			// URL without anti-cache param
 			cacheURL,
+
 			// Response headers as string
 			responseHeadersString,
+
 			// timeout handle
 			timeoutTimer,
 
@@ -7897,28 +9473,39 @@ jQuery.extend({
 			fireGlobals,
 
 			transport,
+
 			// Response headers
 			responseHeaders,
+
 			// Create the final options object
 			s = jQuery.ajaxSetup( {}, options ),
+
 			// Callbacks context
 			callbackContext = s.context || s,
+
 			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
+			globalEventContext = s.context &&
+				( callbackContext.nodeType || callbackContext.jquery ) ?
+					jQuery( callbackContext ) :
+					jQuery.event,
+
 			// Deferreds
 			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+
 			// Status-dependent callbacks
 			statusCode = s.statusCode || {},
+
 			// Headers (they are sent all at once)
 			requestHeaders = {},
 			requestHeadersNames = {},
+
 			// The jqXHR state
 			state = 0,
+
 			// Default abort message
 			strAbort = "canceled",
+
 			// Fake xhr
 			jqXHR = {
 				readyState: 0,
@@ -7929,8 +9516,8 @@ jQuery.extend({
 					if ( state === 2 ) {
 						if ( !responseHeaders ) {
 							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
 							}
 						}
 						match = responseHeaders[ key.toLowerCase() ];
@@ -7967,10 +9554,12 @@ jQuery.extend({
 					if ( map ) {
 						if ( state < 2 ) {
 							for ( code in map ) {
+
 								// Lazy-add the new callback in a way that preserves old ones
 								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
 							}
 						} else {
+
 							// Execute the appropriate callbacks
 							jqXHR.always( map[ jqXHR.status ] );
 						}
@@ -7998,13 +9587,15 @@ jQuery.extend({
 		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
 		// Handle falsy url in the settings object (#10093: consistency with old signature)
 		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+		s.url = ( ( url || s.url || ajaxLocation ) + "" )
+			.replace( rhash, "" )
+			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
 
 		// Alias method option to type as per ticket #12004
 		s.type = options.method || options.type || s.method || s.type;
 
 		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
 
 		// A cross-domain request is in order when we have a protocol:host:port mismatch
 		if ( s.crossDomain == null ) {
@@ -8030,11 +9621,12 @@ jQuery.extend({
 		}
 
 		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
 
 		// Watch for a new set of requests
 		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
+			jQuery.event.trigger( "ajaxStart" );
 		}
 
 		// Uppercase the type
@@ -8052,7 +9644,8 @@ jQuery.extend({
 
 			// If data is available, append data to url
 			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+
 				// #9682: remove data so that it's not used in an eventual retry
 				delete s.data;
 			}
@@ -8062,10 +9655,10 @@ jQuery.extend({
 				s.url = rts.test( cacheURL ) ?
 
 					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+					cacheURL.replace( rts, "$1_=" + nonce++ ) :
 
 					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
 			}
 		}
 
@@ -8087,8 +9680,9 @@ jQuery.extend({
 		// Set the Accepts header for the server, depending on the dataType
 		jqXHR.setRequestHeader(
 			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+				s.accepts[ s.dataTypes[ 0 ] ] +
+					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
 				s.accepts[ "*" ]
 		);
 
@@ -8098,7 +9692,9 @@ jQuery.extend({
 		}
 
 		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+		if ( s.beforeSend &&
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+
 			// Abort if not done already and return
 			return jqXHR.abort();
 		}
@@ -8124,10 +9720,16 @@ jQuery.extend({
 			if ( fireGlobals ) {
 				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
 			}
+
+			// If request was aborted inside ajaxSend, stop there
+			if ( state === 2 ) {
+				return jqXHR;
+			}
+
 			// Timeout
 			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
+				timeoutTimer = window.setTimeout( function() {
+					jqXHR.abort( "timeout" );
 				}, s.timeout );
 			}
 
@@ -8135,9 +9737,11 @@ jQuery.extend({
 				state = 1;
 				transport.send( requestHeaders, done );
 			} catch ( e ) {
+
 				// Propagate exception as error if not done
 				if ( state < 2 ) {
 					done( -1, e );
+
 				// Simply rethrow otherwise
 				} else {
 					throw e;
@@ -8160,7 +9764,7 @@ jQuery.extend({
 
 			// Clear timeout if it exists
 			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
+				window.clearTimeout( timeoutTimer );
 			}
 
 			// Dereference transport for early garbage collection
@@ -8189,11 +9793,11 @@ jQuery.extend({
 
 				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
+					modified = jqXHR.getResponseHeader( "Last-Modified" );
 					if ( modified ) {
 						jQuery.lastModified[ cacheURL ] = modified;
 					}
-					modified = jqXHR.getResponseHeader("etag");
+					modified = jqXHR.getResponseHeader( "etag" );
 					if ( modified ) {
 						jQuery.etag[ cacheURL ] = modified;
 					}
@@ -8215,6 +9819,7 @@ jQuery.extend({
 					isSuccess = !error;
 				}
 			} else {
+
 				// We extract error from statusText
 				// then normalize statusText and status for non-aborts
 				error = statusText;
@@ -8251,9 +9856,10 @@ jQuery.extend({
 
 			if ( fireGlobals ) {
 				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+
 				// Handle the global AJAX counter
 				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
+					jQuery.event.trigger( "ajaxStop" );
 				}
 			}
 		}
@@ -8268,10 +9874,11 @@ jQuery.extend({
 	getScript: function( url, callback ) {
 		return jQuery.get( url, undefined, callback, "script" );
 	}
-});
+} );
 
 jQuery.each( [ "get", "post" ], function( i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
+
 		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
@@ -8279,172 +9886,486 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 			data = undefined;
 		}
 
-		return jQuery.ajax({
+		// The url can be an options object (which then must have .url)
+		return jQuery.ajax( jQuery.extend( {
 			url: url,
 			type: method,
 			dataType: type,
 			data: data,
 			success: callback
-		});
+		}, jQuery.isPlainObject( url ) && url ) );
 	};
-});
+} );
 
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
 
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+jQuery._evalUrl = function( url ) {
+	return jQuery.ajax( {
+		url: url,
+
+		// Make this explicit, since user can override this through ajaxSetup (#11264)
+		type: "GET",
+		dataType: "script",
+		cache: true,
+		async: false,
+		global: false,
+		"throws": true
+	} );
+};
+
+
+jQuery.fn.extend( {
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapAll( html.call( this, i ) );
+			} );
 		}
-	}
 
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
+		if ( this[ 0 ] ) {
+
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+
+			if ( this[ 0 ].parentNode ) {
+				wrap.insertBefore( this[ 0 ] );
 			}
-		}
-	}
 
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
+			wrap.map( function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			} ).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapInner( html.call( this, i ) );
+			} );
+		}
+
+		return this.each( function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		} );
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each( function( i ) {
+			jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
+		} );
+	},
+
+	unwrap: function() {
+		return this.parent().each( function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		} ).end();
+	}
+} );
+
+
+function getDisplay( elem ) {
+	return elem.style && elem.style.display || jQuery.css( elem, "display" );
+}
+
+function filterHidden( elem ) {
+
+	// Disconnected elements are considered hidden
+	if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
+		return true;
+	}
+	while ( elem && elem.nodeType === 1 ) {
+		if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
+			return true;
+		}
+		elem = elem.parentNode;
+	}
+	return false;
+}
+
+jQuery.expr.filters.hidden = function( elem ) {
+
+	// Support: Opera <= 12.12
+	// Opera reports offsetWidths and offsetHeights less than zero on some elements
+	return support.reliableHiddenOffsets() ?
+		( elem.offsetWidth <= 0 && elem.offsetHeight <= 0 &&
+			!elem.getClientRects().length ) :
+			filterHidden( elem );
+};
+
+jQuery.expr.filters.visible = function( elem ) {
+	return !jQuery.expr.filters.hidden( elem );
+};
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams(
+					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+					v,
+					traditional,
+					add
+				);
+			}
+		} );
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
 	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
 
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
+		// Serialize scalar item.
+		add( prefix, obj );
 	}
 }
 
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
 
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		} );
+
+	} else {
+
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
 		}
 	}
 
-	current = dataTypes.shift();
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
 
-	// Convert to each sequential dataType
-	while ( current ) {
+jQuery.fn.extend( {
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map( function() {
 
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		} )
+		.filter( function() {
+			var type = this.type;
+
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		} )
+		.map( function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ) {
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					} ) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		} ).get();
+	}
+} );
+
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
+
+	// Support: IE6-IE8
+	function() {
+
+		// XHR cannot access local files, always use ActiveX for that case
+		if ( this.isLocal ) {
+			return createActiveXHR();
 		}
 
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
+		// Support: IE 9-11
+		// IE seems to error on cross-domain PATCH requests when ActiveX XHR
+		// is used. In IE 9+ always use the native XHR.
+		// Note: this condition won't catch Edge as it doesn't define
+		// document.documentMode but it also doesn't support ActiveX so it won't
+		// reach this code.
+		if ( document.documentMode > 8 ) {
+			return createStandardXHR();
 		}
 
-		prev = current;
-		current = dataTypes.shift();
+		// Support: IE<9
+		// oldIE XHR does not support non-RFC2616 methods (#13240)
+		// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
+		// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
+		// Although this check for six methods instead of eight
+		// since IE also does not support "trace" and "connect"
+		return /^(get|post|head|put|delete|options)$/i.test( this.type ) &&
+			createStandardXHR() || createActiveXHR();
+	} :
 
-		if ( current ) {
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
 
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
+var xhrId = 0,
+	xhrCallbacks = {},
+	xhrSupported = jQuery.ajaxSettings.xhr();
 
-				current = prev;
+// Support: IE<10
+// Open requests must be manually aborted on unload (#5280)
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
+	} );
+}
 
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
+// Determine support properties
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = support.ajax = !!xhrSupported;
 
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
 
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
+	jQuery.ajaxTransport( function( options ) {
 
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !options.crossDomain || support.cors ) {
 
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
+			var callback;
 
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
+			return {
+				send: function( headers, complete ) {
+					var i,
+						xhr = options.xhr(),
+						id = ++xhrId;
+
+					// Open the socket
+					xhr.open(
+						options.type,
+						options.url,
+						options.async,
+						options.username,
+						options.password
+					);
+
+					// Apply custom fields if provided
+					if ( options.xhrFields ) {
+						for ( i in options.xhrFields ) {
+							xhr[ i ] = options.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( options.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( options.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Set headers
+					for ( i in headers ) {
+
+						// Support: IE<9
+						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
+						// request header to a null-value.
+						//
+						// To keep consistent with other XHR implementations, cast the value
+						// to string and ignore `undefined`.
+						if ( headers[ i ] !== undefined ) {
+							xhr.setRequestHeader( i, headers[ i ] + "" );
+						}
+					}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( options.hasContent && options.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, statusText, responses;
+
+						// Was never called and is aborted or complete
+						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+							// Clean up
+							delete xhrCallbacks[ id ];
+							callback = undefined;
+							xhr.onreadystatechange = jQuery.noop;
+
+							// Abort manually if needed
+							if ( isAbort ) {
+								if ( xhr.readyState !== 4 ) {
+									xhr.abort();
+								}
+							} else {
+								responses = {};
+								status = xhr.status;
+
+								// Support: IE<10
+								// Accessing binary-data responseText throws an exception
+								// (#11426)
+								if ( typeof xhr.responseText === "string" ) {
+									responses.text = xhr.responseText;
+								}
+
+								// Firefox throws an exception when accessing
+								// statusText for faulty cross-domain requests
+								try {
+									statusText = xhr.statusText;
+								} catch ( e ) {
+
+									// We normalize with Webkit giving an empty statusText
+									statusText = "";
+								}
+
+								// Filter status for non standard behaviors
+
+								// If the request is local and we have data: assume a success
+								// (success with no data won't get notified, that's the best we
+								// can do given current implementations)
+								if ( !status && options.isLocal && !options.crossDomain ) {
+									status = responses.text ? 200 : 404;
+
+								// IE - #1450: sometimes returns 1223 when it should be 204
+								} else if ( status === 1223 ) {
+									status = 204;
 								}
-								break;
 							}
 						}
-					}
-				}
 
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
 						}
+					};
+
+					// Do send the request
+					// `xhr.send` may raise an exception, but it will be
+					// handled in jQuery.ajax (so no try/catch here)
+					if ( !options.async ) {
+
+						// If we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						window.setTimeout( callback );
+					} else {
+
+						// Register the callback, but delay it in case `xhr.send` throws
+						// Add to the list of active xhr callbacks
+						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
 					}
 				}
-			}
+			};
 		}
-	}
-
-	return { state: "success", data: response };
+	} );
 }
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch ( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch ( e ) {}
+}
+
+
+
+
 // Install script dataType
-jQuery.ajaxSetup({
+jQuery.ajaxSetup( {
 	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+		script: "text/javascript, application/javascript, " +
+			"application/ecmascript, application/x-ecmascript"
 	},
 	contents: {
-		script: /(?:java|ecma)script/
+		script: /\b(?:java|ecma)script\b/
 	},
 	converters: {
 		"text script": function( text ) {
@@ -8452,7 +10373,7 @@ jQuery.ajaxSetup({
 			return text;
 		}
 	}
-});
+} );
 
 // Handle cache's special case and global
 jQuery.ajaxPrefilter( "script", function( s ) {
@@ -8463,22 +10384,22 @@ jQuery.ajaxPrefilter( "script", function( s ) {
 		s.type = "GET";
 		s.global = false;
 	}
-});
+} );
 
 // Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
+jQuery.ajaxTransport( "script", function( s ) {
 
 	// This transport only deals with cross domain requests
 	if ( s.crossDomain ) {
 
 		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
+			head = document.head || jQuery( "head" )[ 0 ] || document.documentElement;
 
 		return {
 
 			send: function( _, callback ) {
 
-				script = document.createElement("script");
+				script = document.createElement( "script" );
 
 				script.async = true;
 
@@ -8523,19 +10444,23 @@ jQuery.ajaxTransport( "script", function(s) {
 			}
 		};
 	}
-});
+} );
+
+
+
+
 var oldCallbacks = [],
 	rjsonp = /(=)\?(?=&|$)|\?\?/;
 
 // Default jsonp settings
-jQuery.ajaxSetup({
+jQuery.ajaxSetup( {
 	jsonp: "callback",
 	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
 		this[ callback ] = true;
 		return callback;
 	}
-});
+} );
 
 // Detect, normalize options and install callbacks for jsonp requests
 jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
@@ -8543,7 +10468,10 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 	var callbackName, overwritten, responseContainer,
 		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
 			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+			typeof s.data === "string" &&
+				( s.contentType || "" )
+					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+				rjsonp.test( s.data ) && "data"
 		);
 
 	// Handle iff the expected data type is "jsonp" or we have a parameter to set
@@ -8558,11 +10486,11 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 		if ( jsonProp ) {
 			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
 		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
 		}
 
 		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
+		s.converters[ "script json" ] = function() {
 			if ( !responseContainer ) {
 				jQuery.error( callbackName + " was not called" );
 			}
@@ -8579,12 +10507,20 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 		};
 
 		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
+		jqXHR.always( function() {
+
+			// If previous value didn't exist - remove it
+			if ( overwritten === undefined ) {
+				jQuery( window ).removeProp( callbackName );
+
+			// Otherwise restore preexisting value
+			} else {
+				window[ callbackName ] = overwritten;
+			}
 
 			// Save back as free
 			if ( s[ callbackName ] ) {
+
 				// make sure that re-using the options doesn't screw things around
 				s.jsonpCallback = originalSettings.jsonpCallback;
 
@@ -8598,1006 +10534,179 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 			}
 
 			responseContainer = overwritten = undefined;
-		});
+		} );
 
 		// Delegate to script
 		return "script";
 	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
+} );
+
+
+
+
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context,
+// defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	if ( typeof context === "boolean" ) {
+		keepScripts = context;
+		context = false;
+	}
+	context = context || document;
+
+	var parsed = rsingleTag.exec( data ),
+		scripts = !keepScripts && [];
+
+	// Single tag
+	if ( parsed ) {
+		return [ context.createElement( parsed[ 1 ] ) ];
+	}
+
+	parsed = buildFragment( [ data ], context, scripts );
+
+	if ( scripts && scripts.length ) {
+		jQuery( scripts ).remove();
+	}
+
+	return jQuery.merge( [], parsed.childNodes );
+};
+
+
+// Keep a copy of the old load method
+var _load = jQuery.fn.load;
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, type, response,
+		self = this,
+		off = url.indexOf( " " );
+
+	if ( off > -1 ) {
+		selector = jQuery.trim( url.slice( off, url.length ) );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax( {
+			url: url,
+
+			// If "type" variable is undefined, then "GET" method will be used.
+			// Make value of this field explicit since
+			// user can override it through ajaxSetup method
+			type: type || "GET",
+			dataType: "html",
+			data: params
+		} ).done( function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		// If the request succeeds, this function gets "data", "status", "jqXHR"
+		// but they are ignored because response was set above.
+		// If it fails, this function gets "jqXHR", "status", "error"
+		} ).always( callback && function( jqXHR, status ) {
+			self.each( function() {
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
+			} );
+		} );
+	}
+
+	return this;
+};
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
 	};
+} );
 
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
 
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
 
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
 
-// Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( err ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
+jQuery.expr.filters.animated = function( elem ) {
+	return jQuery.grep( jQuery.timers, function( fn ) {
+		return elem === fn.elem;
+	} ).length;
 };
 
-Tween.prototype.init.prototype = Tween.prototype;
 
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
 
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
 
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
 
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
 }
 
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-	};
-};
-
 jQuery.offset = {
-
 	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
+		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+			position = jQuery.css( elem, "position" ),
+			curElem = jQuery( elem ),
+			props = {};
 
 		// set position first, in-case top/left are set even on static elem
 		if ( position === "static" ) {
 			elem.style.position = "relative";
 		}
 
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
+		curOffset = curElem.offset();
+		curCSSTop = jQuery.css( elem, "top" );
+		curCSSLeft = jQuery.css( elem, "left" );
+		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+			jQuery.inArray( "auto", [ curCSSTop, curCSSLeft ] ) > -1;
 
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		// need to be able to calculate position if either top or left
+		// is auto and position is either absolute or fixed
 		if ( calculatePosition ) {
 			curPosition = curElem.position();
 			curTop = curPosition.top;
@@ -9608,7 +10717,9 @@ jQuery.offset = {
 		}
 
 		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
+
+			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
+			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
 		}
 
 		if ( options.top != null ) {
@@ -9626,8 +10737,43 @@ jQuery.offset = {
 	}
 };
 
+jQuery.fn.extend( {
+	offset: function( options ) {
+		if ( arguments.length ) {
+			return options === undefined ?
+				this :
+				this.each( function( i ) {
+					jQuery.offset.setOffset( this, options, i );
+				} );
+		}
 
-jQuery.fn.extend({
+		var docElem, win,
+			box = { top: 0, left: 0 },
+			elem = this[ 0 ],
+			doc = elem && elem.ownerDocument;
+
+		if ( !doc ) {
+			return;
+		}
+
+		docElem = doc.documentElement;
+
+		// Make sure it's not a disconnected DOM node
+		if ( !jQuery.contains( docElem, elem ) ) {
+			return box;
+		}
+
+		// If we don't have gBCR, just use 0,0 rather than error
+		// BlackBerry 5, iOS 3 (original iPhone)
+		if ( typeof elem.getBoundingClientRect !== "undefined" ) {
+			box = elem.getBoundingClientRect();
+		}
+		win = getWindow( doc );
+		return {
+			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+		};
+	},
 
 	position: function() {
 		if ( !this[ 0 ] ) {
@@ -9638,11 +10784,14 @@ jQuery.fn.extend({
 			parentOffset = { top: 0, left: 0 },
 			elem = this[ 0 ];
 
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
+		// because it is its only offset parent
 		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+
 			// we assume that getBoundingClientRect is available when computed position is fixed
 			offset = elem.getBoundingClientRect();
 		} else {
+
 			// Get *real* offsetParent
 			offsetParent = this.offsetParent();
 
@@ -9662,32 +10811,33 @@ jQuery.fn.extend({
 		// are the same in Safari causing offset.left to incorrectly be 0
 		return {
 			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
 		};
 	},
 
 	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
+		return this.map( function() {
+			var offsetParent = this.offsetParent;
+
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) &&
+				jQuery.css( offsetParent, "position" ) === "static" ) ) {
 				offsetParent = offsetParent.offsetParent;
 			}
-			return offsetParent || docElem;
-		});
+			return offsetParent || documentElement;
+		} );
 	}
-});
-
+} );
 
 // Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
 	var top = /Y/.test( prop );
 
 	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
+		return access( this, function( elem, method, val ) {
 			var win = getWindow( elem );
 
 			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
+				return win ? ( prop in win ) ? win[ prop ] :
 					win.document.documentElement[ method ] :
 					elem[ method ];
 			}
@@ -9703,27 +10853,44 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me
 			}
 		}, method, val, arguments.length, null );
 	};
-});
+} );
+
+// Support: Safari<7-8+, Chrome<37-44+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// getComputedStyle returns percent when specified for top/left/bottom/right
+// rather than make the css module depend on the offset module, we just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+		function( elem, computed ) {
+			if ( computed ) {
+				computed = curCSS( elem, prop );
+
+				// if curCSS returns percentage, fallback to offset
+				return rnumnonpx.test( computed ) ?
+					jQuery( elem ).position()[ prop ] + "px" :
+					computed;
+			}
+		}
+	);
+} );
+
 
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
 jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
+	function( defaultExtra, funcName ) {
+
 		// margin is only for outerHeight, outerWidth
 		jQuery.fn[ funcName ] = function( margin, value ) {
 			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
 				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
 
-			return jQuery.access( this, function( elem, type, value ) {
+			return access( this, function( elem, type, value ) {
 				var doc;
 
 				if ( jQuery.isWindow( elem ) ) {
+
 					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
 					// isn't a whole lot we can do. See pull request at this URL for discussion:
 					// https://github.com/jquery/jquery/pull/764
@@ -9734,8 +10901,10 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 				if ( elem.nodeType === 9 ) {
 					doc = elem.documentElement;
 
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+					// whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only,
+					// but there is currently no good, small way to fix it.
 					return Math.max(
 						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
 						elem.body[ "offset" + name ], doc[ "offset" + name ],
@@ -9744,6 +10913,7 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 				}
 
 				return value === undefined ?
+
 					// Get width or height on the element, requesting but not forcing parseFloat
 					jQuery.css( elem, type, extra ) :
 
@@ -9751,10 +10921,30 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 					jQuery.style( elem, type, value, extra );
 			}, type, chainable ? margin : undefined, chainable, null );
 		};
-	});
-});
-// Limit scope pollution from any deprecated API
-// (function() {
+	} );
+} );
+
+
+jQuery.fn.extend( {
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ?
+			this.off( selector, "**" ) :
+			this.off( types, selector || "**", fn );
+	}
+} );
 
 // The number of elements contained in the matched element set
 jQuery.fn.size = function() {
@@ -9763,27 +10953,56 @@ jQuery.fn.size = function() {
 
 jQuery.fn.andSelf = jQuery.fn.addBack;
 
-// })();
-if ( typeof module === "object" && module && typeof module.exports === "object" ) {
-	// Expose jQuery as module.exports in loaders that implement the Node
-	// module pattern (including browserify). Do not create the global, since
-	// the user will be storing it themselves locally, and globals are frowned
-	// upon in the Node module world.
-	module.exports = jQuery;
-} else {
-	// Otherwise expose jQuery to the global object as usual
-	window.jQuery = window.$ = jQuery;
 
-	// Register as a named AMD module, since jQuery can be concatenated with other
-	// files that may use define, but not via a proper concatenation script that
-	// understands anonymous AMD modules. A named AMD is safest and most robust
-	// way to register. Lowercase jquery is used because AMD module names are
-	// derived from file names, and jQuery is normally delivered in a lowercase
-	// file name. Do this after creating the global so that if an AMD module wants
-	// to call noConflict to hide this version of jQuery, it will work.
-	if ( typeof define === "function" && define.amd ) {
-		define( "jquery", [], function () { return jQuery; } );
-	}
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "jquery", [], function() {
+		return jQuery;
+	} );
 }
 
-})( window );
+
+
+var
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in
+// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( !noGlobal ) {
+	window.jQuery = window.$ = jQuery;
+}
+
+return jQuery;
+}));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.12.4.js
similarity index 62%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.12.4.js
index c5c648255c1..7fc60fca78b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.12.4.js
@@ -1,91 +1,84 @@
 /*!
- * jQuery JavaScript Library v1.10.2
+ * jQuery JavaScript Library v1.12.4
  * http://jquery.com/
  *
  * Includes Sizzle.js
  * http://sizzlejs.com/
  *
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-07-03T13:48Z
+ * Date: 2016-05-20T17:17Z
  */
-(function( window, undefined ) {
 
-// Can't do this because several apps including ASP.NET trace
+(function( global, factory ) {
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+		// For CommonJS and CommonJS-like environments where a proper `window`
+		// is present, execute the factory and get jQuery.
+		// For environments that do not have a `window` with a `document`
+		// (such as Node.js), expose a factory as module.exports.
+		// This accentuates the need for the creation of a real `window`.
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info.
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Support: Firefox 18+
+// Can't be in strict mode, several libs including ASP.NET trace
 // the stack via arguments.caller.callee and Firefox dies if
 // you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
 //"use strict";
+var deletedIds = [];
+
+var document = window.document;
+
+var slice = deletedIds.slice;
+
+var concat = deletedIds.concat;
+
+var push = deletedIds.push;
+
+var indexOf = deletedIds.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
 var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<10
-	// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	location = window.location,
-	document = window.document,
-	docElem = document.documentElement,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.10.2",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
+	version = "1.12.4",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
+
 		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
 	},
 
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+	// Support: Android<4.1, IE<9
+	// Make sure we trim BOM and NBSP
 	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
 
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
 	// Matches dashed string for camelizing
 	rmsPrefix = /^-ms-/,
 	rdashAlpha = /-([\da-z])/gi,
@@ -93,134 +86,14 @@ var
 	// Used by jQuery.camelCase as callback to replace()
 	fcamelCase = function( all, letter ) {
 		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
 	};
 
 jQuery.fn = jQuery.prototype = {
+
 	// The current version of jQuery being used
-	jquery: core_version,
+	jquery: version,
 
 	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
 
 	// Start with an empty selector
 	selector: "",
@@ -229,19 +102,19 @@ jQuery.fn = jQuery.prototype = {
 	length: 0,
 
 	toArray: function() {
-		return core_slice.call( this );
+		return slice.call( this );
 	},
 
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
 	get: function( num ) {
-		return num == null ?
+		return num != null ?
 
-			// Return a 'clean' array
-			this.toArray() :
+			// Return just the one element from the set
+			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
 
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
+			// Return all the elements in a clean array
+			slice.call( this );
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -260,21 +133,18 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
+	each: function( callback ) {
+		return jQuery.each( this, callback );
 	},
 
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
+	map: function( callback ) {
+		return this.pushStack( jQuery.map( this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		} ) );
 	},
 
 	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
+		return this.pushStack( slice.apply( this, arguments ) );
 	},
 
 	first: function() {
@@ -288,32 +158,23 @@ jQuery.fn = jQuery.prototype = {
 	eq: function( i ) {
 		var len = this.length,
 			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
+		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
 	},
 
 	end: function() {
-		return this.prevObject || this.constructor(null);
+		return this.prevObject || this.constructor();
 	},
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
+	push: push,
+	sort: deletedIds.sort,
+	splice: deletedIds.splice
 };
 
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
 jQuery.extend = jQuery.fn.extend = function() {
 	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
+		target = arguments[ 0 ] || {},
 		i = 1,
 		length = arguments.length,
 		deep = false;
@@ -321,25 +182,28 @@ jQuery.extend = jQuery.fn.extend = function() {
 	// Handle a deep copy situation
 	if ( typeof target === "boolean" ) {
 		deep = target;
-		target = arguments[1] || {};
+
 		// skip the boolean and the target
-		i = 2;
+		target = arguments[ i ] || {};
+		i++;
 	}
 
 	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
 		target = {};
 	}
 
 	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
+	if ( i === length ) {
 		target = this;
-		--i;
+		i--;
 	}
 
 	for ( ; i < length; i++ ) {
+
 		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
+		if ( ( options = arguments[ i ] ) != null ) {
+
 			// Extend the base object
 			for ( name in options ) {
 				src = target[ name ];
@@ -351,13 +215,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 				}
 
 				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
+					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
+
 					if ( copyIsArray ) {
 						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
+						clone = src && jQuery.isArray( src ) ? src : [];
 
 					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
+						clone = src && jQuery.isPlainObject( src ) ? src : {};
 					}
 
 					// Never move original objects, clone them
@@ -375,78 +241,29 @@ jQuery.extend = jQuery.fn.extend = function() {
 	return target;
 };
 
-jQuery.extend({
+jQuery.extend( {
+
 	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
 
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
+	// Assume jQuery is ready without the ready module
+	isReady: true,
 
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
+	error: function( msg ) {
+		throw new Error( msg );
 	},
 
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
+	noop: function() {},
 
 	// See test/unit/core.js for details concerning isFunction.
 	// Since version 1.3, DOM methods and functions like alert
 	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
+		return jQuery.type( obj ) === "function";
 	},
 
 	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
+		return jQuery.type( obj ) === "array";
 	},
 
 	isWindow: function( obj ) {
@@ -455,53 +272,13 @@ jQuery.extend({
 	},
 
 	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
 
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( jQuery.support.ownLast ) {
-			for ( key in obj ) {
-				return core_hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
+		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		var realStringObj = obj && obj.toString();
+		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
 	},
 
 	isEmptyObject: function( obj ) {
@@ -512,104 +289,64 @@ jQuery.extend({
 		return true;
 	},
 
-	error: function( msg ) {
-		throw new Error( msg );
-	},
+	isPlainObject: function( obj ) {
+		var key;
 
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
 		}
 
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
 		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
+
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call( obj, "constructor" ) &&
+				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
+				return false;
 			}
-		} catch( e ) {
-			xml = undefined;
+		} catch ( e ) {
+
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
 		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
+
+		// Support: IE<9
+		// Handle iteration over inherited properties before own properties.
+		if ( !support.ownFirst ) {
+			for ( key in obj ) {
+				return hasOwn.call( obj, key );
+			}
 		}
-		return xml;
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
 	},
 
-	noop: function() {},
+	type: function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ toString.call( obj ) ] || "object" :
+			typeof obj;
+	},
 
-	// Evaluates a script in a global context
 	// Workarounds based on findings by Jim Driscoll
 	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
 	globalEval: function( data ) {
 		if ( data && jQuery.trim( data ) ) {
+
 			// We use execScript on Internet Explorer
 			// We use an anonymous function so that context is window
 			// rather than jQuery in Firefox
 			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
+				window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation
 			} )( data );
 		}
 	},
@@ -624,49 +361,20 @@ jQuery.extend({
 		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
 	},
 
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
+	each: function( obj, callback ) {
+		var length, i = 0;
 
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
+		if ( isArrayLike( obj ) ) {
+			length = obj.length;
+			for ( ; i < length; i++ ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
 				}
 			}
-
-		// A special, fast, case for the most common use of each
 		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
+			for ( i in obj ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
 				}
 			}
 		}
@@ -674,33 +382,25 @@ jQuery.extend({
 		return obj;
 	},
 
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
+	// Support: Android<4.1, IE<9
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
 
 	// results is for internal usage only
 	makeArray: function( arr, results ) {
 		var ret = results || [];
 
 		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
+			if ( isArrayLike( Object( arr ) ) ) {
 				jQuery.merge( ret,
 					typeof arr === "string" ?
 					[ arr ] : arr
 				);
 			} else {
-				core_push.call( ret, arr );
+				push.call( ret, arr );
 			}
 		}
 
@@ -711,14 +411,15 @@ jQuery.extend({
 		var len;
 
 		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
+			if ( indexOf ) {
+				return indexOf.call( arr, elem, i );
 			}
 
 			len = arr.length;
 			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
 
 			for ( ; i < len; i++ ) {
+
 				// Skip accessing in sparse arrays
 				if ( i in arr && arr[ i ] === elem ) {
 					return i;
@@ -730,16 +431,18 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
+		var len = +second.length,
+			j = 0,
+			i = first.length;
 
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
+		while ( j < len ) {
+			first[ i++ ] = second[ j++ ];
+		}
+
+		// Support: IE<9
+		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
+		if ( len !== len ) {
+			while ( second[ j ] !== undefined ) {
 				first[ i++ ] = second[ j++ ];
 			}
 		}
@@ -749,40 +452,39 @@ jQuery.extend({
 		return first;
 	},
 
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
 			i = 0,
-			length = elems.length;
-		inv = !!inv;
+			length = elems.length,
+			callbackExpect = !invert;
 
 		// Go through the array, only saving the items
 		// that pass the validator function
 		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
 			}
 		}
 
-		return ret;
+		return matches;
 	},
 
 	// arg is for internal usage only
 	map: function( elems, callback, arg ) {
-		var value,
+		var length, value,
 			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
 			ret = [];
 
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
+		// Go through the array, translating each of the items to their new values
+		if ( isArrayLike( elems ) ) {
+			length = elems.length;
 			for ( ; i < length; i++ ) {
 				value = callback( elems[ i ], i, arg );
 
 				if ( value != null ) {
-					ret[ ret.length ] = value;
+					ret.push( value );
 				}
 			}
 
@@ -792,13 +494,13 @@ jQuery.extend({
 				value = callback( elems[ i ], i, arg );
 
 				if ( value != null ) {
-					ret[ ret.length ] = value;
+					ret.push( value );
 				}
 			}
 		}
 
 		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
+		return concat.apply( [], ret );
 	},
 
 	// A global GUID counter for objects
@@ -822,9 +524,9 @@ jQuery.extend({
 		}
 
 		// Simulated bind
-		args = core_slice.call( arguments, 2 );
+		args = slice.call( arguments, 2 );
 		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
+			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
 		};
 
 		// Set the guid of unique handler to the same of original handler, so it can be removed
@@ -833,193 +535,71 @@ jQuery.extend({
 		return proxy;
 	},
 
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
 	now: function() {
-		return ( new Date() ).getTime();
+		return +( new Date() );
 	},
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations.
-	// Note: this method belongs to the css module but it's needed here for the support module.
-	// If support gets modularized, this method should be moved back to the css module.
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+} );
 
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
+// JSHint would error on this code due to the Symbol not being defined in ES5.
+// Defining this global in .jshintrc would create a danger of using the global
+// unguarded in another place, it seems safer to just disable JSHint for these
+// three lines.
+/* jshint ignore: start */
+if ( typeof Symbol === "function" ) {
+	jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ];
+}
+/* jshint ignore: end */
 
 // Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+function( i, name ) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
+} );
 
-function isArraylike( obj ) {
-	var length = obj.length,
+function isArrayLike( obj ) {
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = !!obj && "length" in obj && obj.length,
 		type = jQuery.type( obj );
 
-	if ( jQuery.isWindow( obj ) ) {
+	if ( type === "function" || jQuery.isWindow( obj ) ) {
 		return false;
 	}
 
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
 }
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
+var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v1.10.2
+ * Sizzle CSS Selector Engine v2.2.1
  * http://sizzlejs.com/
  *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-07-03
+ * Date: 2015-10-17
  */
-(function( window, undefined ) {
+(function( window ) {
 
 var i,
 	support,
-	cachedruns,
 	Expr,
 	getText,
 	isXML,
+	tokenize,
 	compile,
+	select,
 	outermostContext,
 	sortInput,
+	hasDuplicate,
 
 	// Local document vars
 	setDocument,
@@ -1032,24 +612,21 @@ var i,
 	contains,
 
 	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
+	expando = "sizzle" + 1 * new Date(),
 	preferredDoc = window.document,
 	dirruns = 0,
 	done = 0,
 	classCache = createCache(),
 	tokenCache = createCache(),
 	compilerCache = createCache(),
-	hasDuplicate = false,
 	sortOrder = function( a, b ) {
 		if ( a === b ) {
 			hasDuplicate = true;
-			return 0;
 		}
 		return 0;
 	},
 
 	// General-purpose constants
-	strundefined = typeof undefined,
 	MAX_NEGATIVE = 1 << 31,
 
 	// Instance methods
@@ -1059,12 +636,13 @@ var i,
 	push_native = arr.push,
 	push = arr.push,
 	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
+	// Use a stripped-down indexOf as it's faster than native
+	// http://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
 		var i = 0,
-			len = this.length;
+			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
+			if ( list[i] === elem ) {
 				return i;
 			}
 		}
@@ -1075,44 +653,46 @@ var i,
 
 	// Regular expressions
 
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	// http://www.w3.org/TR/css3-selectors/#whitespace
 	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
 
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
+	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
 
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
 
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
+	pseudos = ":(" + identifier + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
 	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
 	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
 
-	rsibling = new RegExp( whitespace + "*[+~]" ),
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
 
 	rpseudo = new RegExp( pseudos ),
 	ridentifier = new RegExp( "^" + identifier + "$" ),
 
 	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ID": new RegExp( "^#(" + identifier + ")" ),
+		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
+		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
 		"ATTR": new RegExp( "^" + attributes ),
 		"PSEUDO": new RegExp( "^" + pseudos ),
 		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
@@ -1125,14 +705,15 @@ var i,
 			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
 	},
 
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
 	rnative = /^[^{]+\{\s*\[native \w/,
 
 	// Easily-parseable/retrievable ID or TAG or CLASS selectors
 	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
 
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
+	rsibling = /[+~]/,
 	rescape = /'|\\/g,
 
 	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
@@ -1140,15 +721,23 @@ var i,
 	funescape = function( _, escaped, escapedWhitespace ) {
 		var high = "0x" + escaped - 0x10000;
 		// NaN means non-codepoint
-		// Support: Firefox
+		// Support: Firefox<24
 		// Workaround erroneous numeric interpretation of +"0x"
 		return high !== high || escapedWhitespace ?
 			escaped :
-			// BMP codepoint
 			high < 0 ?
+				// BMP codepoint
 				String.fromCharCode( high + 0x10000 ) :
 				// Supplemental Plane codepoint (surrogate pair)
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
 	};
 
 // Optimize for push.apply( _, NodeList )
@@ -1181,104 +770,129 @@ try {
 }
 
 function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
+	var m, i, elem, nid, nidselect, match, groups, newSelector,
+		newContext = context && context.ownerDocument,
 
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
+		// nodeType defaults to 9, since context defaults to document
+		nodeType = context ? context.nodeType : 9;
 
-	context = context || document;
 	results = results || [];
 
-	if ( !selector || typeof selector !== "string" ) {
+	// Return early from calls with invalid selector or context
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
 		return results;
 	}
 
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
+	// Try to shortcut find operations (as opposed to filters) in HTML documents
+	if ( !seed ) {
 
-	if ( documentIsHTML && !seed ) {
+		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+			setDocument( context );
+		}
+		context = context || document;
+
+		if ( documentIsHTML ) {
+
+			// If the selector is sufficiently simple, try using a "get*By*" DOM method
+			// (excepting DocumentFragment context, where the methods don't exist)
+			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+
+				// ID selector
+				if ( (m = match[1]) ) {
+
+					// Document context
+					if ( nodeType === 9 ) {
+						if ( (elem = context.getElementById( m )) ) {
+
+							// Support: IE, Opera, Webkit
+							// TODO: identify versions
+							// getElementById can match elements by name instead of ID
+							if ( elem.id === m ) {
+								results.push( elem );
+								return results;
+							}
+						} else {
+							return results;
+						}
+
+					// Element context
+					} else {
+
+						// Support: IE, Opera, Webkit
+						// TODO: identify versions
+						// getElementById can match elements by name instead of ID
+						if ( newContext && (elem = newContext.getElementById( m )) &&
+							contains( context, elem ) &&
+							elem.id === m ) {
 
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
 							results.push( elem );
 							return results;
 						}
-					} else {
-						return results;
 					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
 
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
+				// Type selector
+				} else if ( match[2] ) {
+					push.apply( results, context.getElementsByTagName( selector ) );
 					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
+
+				// Class selector
+				} else if ( (m = match[3]) && support.getElementsByClassName &&
+					context.getElementsByClassName ) {
+
+					push.apply( results, context.getElementsByClassName( m ) );
+					return results;
+				}
+			}
+
+			// Take advantage of querySelectorAll
+			if ( support.qsa &&
+				!compilerCache[ selector + " " ] &&
+				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+
+				if ( nodeType !== 1 ) {
+					newContext = context;
+					newSelector = selector;
+
+				// qSA looks outside Element context, which is not what we want
+				// Thanks to Andrew Dupont for this workaround technique
+				// Support: IE <=8
+				// Exclude object elements
+				} else if ( context.nodeName.toLowerCase() !== "object" ) {
+
+					// Capture the context ID, setting it first if necessary
+					if ( (nid = context.getAttribute( "id" )) ) {
+						nid = nid.replace( rescape, "\\$&" );
+					} else {
+						context.setAttribute( "id", (nid = expando) );
+					}
+
+					// Prefix every selector in the list
+					groups = tokenize( selector );
+					i = groups.length;
+					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
+					while ( i-- ) {
+						groups[i] = nidselect + " " + toSelector( groups[i] );
+					}
+					newSelector = groups.join( "," );
+
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+				}
+
+				if ( newSelector ) {
+					try {
+						push.apply( results,
+							newContext.querySelectorAll( newSelector )
+						);
+						return results;
+					} catch ( qsaError ) {
+					} finally {
+						if ( nid === expando ) {
+							context.removeAttribute( "id" );
+						}
 					}
 				}
 			}
@@ -1291,7 +905,7 @@ function Sizzle( selector, context, results, seed ) {
 
 /**
  * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ * @returns {function(string, object)} Returns the Object data after storing it on itself with
  *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
  *	deleting the oldest entry
  */
@@ -1300,11 +914,11 @@ function createCache() {
 
 	function cache( key, value ) {
 		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
 			// Only keep the most recent entries
 			delete cache[ keys.shift() ];
 		}
-		return (cache[ key ] = value);
+		return (cache[ key + " " ] = value);
 	}
 	return cache;
 }
@@ -1346,7 +960,7 @@ function assert( fn ) {
  */
 function addHandle( attrs, handler ) {
 	var arr = attrs.split("|"),
-		i = attrs.length;
+		i = arr.length;
 
 	while ( i-- ) {
 		Expr.attrHandle[ arr[i] ] = handler;
@@ -1427,8 +1041,21 @@ function createPositionalPseudo( fn ) {
 }
 
 /**
- * Detect xml
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
  * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
  */
 isXML = Sizzle.isXML = function( elem ) {
 	// documentElement is verified for cases where it doesn't yet exist
@@ -1437,45 +1064,44 @@ isXML = Sizzle.isXML = function( elem ) {
 	return documentElement ? documentElement.nodeName !== "HTML" : false;
 };
 
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
 /**
  * Sets document-related variables once based on the current document
  * @param {Element|Object} [doc] An element or document object to use to set the document
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
+	var hasCompare, parent,
+		doc = node ? node.ownerDocument || node : preferredDoc;
 
-	// If no document and documentElement is available, return
+	// Return early if doc is invalid or already selected
 	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
 		return document;
 	}
 
-	// Set our document
+	// Update global variables
 	document = doc;
-	docElem = doc.documentElement;
+	docElem = document.documentElement;
+	documentIsHTML = !isXML( document );
 
-	// Support tests
-	documentIsHTML = !isXML( doc );
+	// Support: IE 9-11, Edge
+	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
+	if ( (parent = document.defaultView) && parent.top !== parent ) {
+		// Support: IE 11
+		if ( parent.addEventListener ) {
+			parent.addEventListener( "unload", unloadHandler, false );
 
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent.attachEvent && parent !== parent.top ) {
-		parent.attachEvent( "onbeforeunload", function() {
-			setDocument();
-		});
+		// Support: IE 9 - 10 only
+		} else if ( parent.attachEvent ) {
+			parent.attachEvent( "onunload", unloadHandler );
+		}
 	}
 
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
 	support.attributes = assert(function( div ) {
 		div.className = "i";
 		return !div.getAttribute("className");
@@ -1486,21 +1112,12 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Check if getElementsByTagName("*") returns only elements
 	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
+		div.appendChild( document.createComment("") );
 		return !div.getElementsByTagName("*").length;
 	});
 
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
 
 	// Support: IE<10
 	// Check if getElementById returns elements by name
@@ -1508,17 +1125,15 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// so use a roundabout getElementsByName test
 	support.getById = assert(function( div ) {
 		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+		return !document.getElementsByName || !document.getElementsByName( expando ).length;
 	});
 
 	// ID find and filter
 	if ( support.getById ) {
 		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
+				return m ? [ m ] : [];
 			}
 		};
 		Expr.filter["ID"] = function( id ) {
@@ -1535,7 +1150,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 		Expr.filter["ID"] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				var node = typeof elem.getAttributeNode !== "undefined" &&
+					elem.getAttributeNode("id");
 				return node && node.value === attrId;
 			};
 		};
@@ -1544,14 +1160,20 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Tag
 	Expr.find["TAG"] = support.getElementsByTagName ?
 		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
 				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
 			}
 		} :
+
 		function( tag, context ) {
 			var elem,
 				tmp = [],
 				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
 				results = context.getElementsByTagName( tag );
 
 			// Filter out possible comments
@@ -1569,7 +1191,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Class
 	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
 	};
@@ -1589,7 +1211,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See http://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
+	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
 		assert(function( div ) {
@@ -1598,7 +1220,17 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// setting a boolean content attribute,
 			// since its presence should be enough
 			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
+			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
+				"<option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
@@ -1606,27 +1238,37 @@ setDocument = Sizzle.setDocument = function( node ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
+			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
+			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
 			if ( !div.querySelectorAll(":checked").length ) {
 				rbuggyQSA.push(":checked");
 			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibing-combinator selector` fails
+			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
 		});
 
 		assert(function( div ) {
-
-			// Support: Opera 10-12/IE8
-			// ^= $= *= and empty values
-			// Should not select anything
 			// Support: Windows 8 Native Apps
-			// The type attribute is restricted during .innerHTML assignment
-			var input = doc.createElement("input");
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = document.createElement("input");
 			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "t", "" );
+			div.appendChild( input ).setAttribute( "name", "D" );
 
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( div.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
@@ -1641,7 +1283,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 		});
 	}
 
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
 		docElem.msMatchesSelector) )) ) {
@@ -1663,11 +1306,12 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	/* Contains
 	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
 
 	// Element contains another
-	// Purposefully does not implement inclusive descendent
+	// Purposefully self-exclusive
 	// As in, an element does not contain itself
-	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
+	contains = hasCompare || rnative.test( docElem.contains ) ?
 		function( a, b ) {
 			var adown = a.nodeType === 9 ? a.documentElement : a,
 				bup = b && b.parentNode;
@@ -1692,7 +1336,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	---------------------------------------------------------------------- */
 
 	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
+	sortOrder = hasCompare ?
 	function( a, b ) {
 
 		// Flag for duplicate removal
@@ -1701,34 +1345,46 @@ setDocument = Sizzle.setDocument = function( node ) {
 			return 0;
 		}
 
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
-
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
 		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ||
-				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-				// Choose the first element that is related to our preferred document
-				if ( a === doc || contains(preferredDoc, a) ) {
-					return -1;
-				}
-				if ( b === doc || contains(preferredDoc, b) ) {
-					return 1;
-				}
-
-				// Maintain original order
-				return sortInput ?
-					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-					0;
-			}
-
-			return compare & 4 ? -1 : 1;
+			return compare;
 		}
 
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
 	} :
 	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
 		var cur,
 			i = 0,
 			aup = a.parentNode,
@@ -1736,19 +1392,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 			ap = [ a ],
 			bp = [ b ];
 
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
 		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
+		if ( !aup || !bup ) {
+			return a === document ? -1 :
+				b === document ? 1 :
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
 				0;
 
 		// If the nodes are siblings, we can do a quick check
@@ -1781,7 +1432,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 			0;
 	};
 
-	return doc;
+	return document;
 };
 
 Sizzle.matches = function( expr, elements ) {
@@ -1798,6 +1449,7 @@ Sizzle.matchesSelector = function( elem, expr ) {
 	expr = expr.replace( rattributeQuotes, "='$1']" );
 
 	if ( support.matchesSelector && documentIsHTML &&
+		!compilerCache[ expr + " " ] &&
 		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
 		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
 
@@ -1811,10 +1463,10 @@ Sizzle.matchesSelector = function( elem, expr ) {
 					elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch(e) {}
+		} catch (e) {}
 	}
 
-	return Sizzle( expr, document, null, [elem] ).length > 0;
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
 };
 
 Sizzle.contains = function( context, elem ) {
@@ -1837,13 +1489,13 @@ Sizzle.attr = function( elem, name ) {
 			fn( elem, name, !documentIsHTML ) :
 			undefined;
 
-	return val === undefined ?
+	return val !== undefined ?
+		val :
 		support.attributes || !documentIsHTML ?
 			elem.getAttribute( name ) :
 			(val = elem.getAttributeNode(name)) && val.specified ?
 				val.value :
-				null :
-		val;
+				null;
 };
 
 Sizzle.error = function( msg ) {
@@ -1876,6 +1528,10 @@ Sizzle.uniqueSort = function( results ) {
 		}
 	}
 
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
 	return results;
 };
 
@@ -1891,13 +1547,13 @@ getText = Sizzle.getText = function( elem ) {
 
 	if ( !nodeType ) {
 		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
+		while ( (node = elem[i++]) ) {
 			// Do not traverse comment nodes
 			ret += getText( node );
 		}
 	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
 		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
+		// innerText usage removed for consistency of new lines (jQuery #11153)
 		if ( typeof elem.textContent === "string" ) {
 			return elem.textContent;
 		} else {
@@ -1939,7 +1595,7 @@ Expr = Sizzle.selectors = {
 			match[1] = match[1].replace( runescape, funescape );
 
 			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
 
 			if ( match[2] === "~=" ) {
 				match[3] = " " + match[3] + " ";
@@ -1982,15 +1638,15 @@ Expr = Sizzle.selectors = {
 
 		"PSEUDO": function( match ) {
 			var excess,
-				unquoted = !match[5] && match[2];
+				unquoted = !match[6] && match[2];
 
 			if ( matchExpr["CHILD"].test( match[0] ) ) {
 				return null;
 			}
 
 			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
 
 			// Strip excess characters from unquoted arguments
 			} else if ( unquoted && rpseudo.test( unquoted ) &&
@@ -2026,7 +1682,7 @@ Expr = Sizzle.selectors = {
 			return pattern ||
 				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
 				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
 				});
 		},
 
@@ -2048,7 +1704,7 @@ Expr = Sizzle.selectors = {
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
 					operator === "*=" ? check && result.indexOf( check ) > -1 :
 					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
 			};
@@ -2067,11 +1723,12 @@ Expr = Sizzle.selectors = {
 				} :
 
 				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
+					var cache, uniqueCache, outerCache, node, nodeIndex, start,
 						dir = simple !== forward ? "nextSibling" : "previousSibling",
 						parent = elem.parentNode,
 						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
+						useCache = !xml && !ofType,
+						diff = false;
 
 					if ( parent ) {
 
@@ -2080,7 +1737,10 @@ Expr = Sizzle.selectors = {
 							while ( dir ) {
 								node = elem;
 								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+									if ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) {
+
 										return false;
 									}
 								}
@@ -2094,11 +1754,21 @@ Expr = Sizzle.selectors = {
 
 						// non-xml :nth-child(...) stores cache data on `parent`
 						if ( forward && useCache ) {
+
 							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
+
+							// ...in a gzip-friendly way
+							node = parent;
+							outerCache = node[ expando ] || (node[ expando ] = {});
+
+							// Support: IE <9 only
+							// Defend against cloned attroperties (jQuery gh-1709)
+							uniqueCache = outerCache[ node.uniqueID ] ||
+								(outerCache[ node.uniqueID ] = {});
+
+							cache = uniqueCache[ type ] || [];
+							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+							diff = nodeIndex && cache[ 2 ];
 							node = nodeIndex && parent.childNodes[ nodeIndex ];
 
 							while ( (node = ++nodeIndex && node && node[ dir ] ||
@@ -2108,29 +1778,55 @@ Expr = Sizzle.selectors = {
 
 								// When found, cache indexes on `parent` and break
 								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
 									break;
 								}
 							}
 
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
 						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
+							// Use previously-cached element index if available
+							if ( useCache ) {
+								// ...in a gzip-friendly way
+								node = elem;
+								outerCache = node[ expando ] || (node[ expando ] = {});
 
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
+								// Support: IE <9 only
+								// Defend against cloned attroperties (jQuery gh-1709)
+								uniqueCache = outerCache[ node.uniqueID ] ||
+									(outerCache[ node.uniqueID ] = {});
 
-									if ( node === elem ) {
-										break;
+								cache = uniqueCache[ type ] || [];
+								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+								diff = nodeIndex;
+							}
+
+							// xml :nth-child(...)
+							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
+							if ( diff === false ) {
+								// Use the same loop as above to seek `elem` from the start
+								while ( (node = ++nodeIndex && node && node[ dir ] ||
+									(diff = nodeIndex = 0) || start.pop()) ) {
+
+									if ( ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) &&
+										++diff ) {
+
+										// Cache the index of each encountered element
+										if ( useCache ) {
+											outerCache = node[ expando ] || (node[ expando ] = {});
+
+											// Support: IE <9 only
+											// Defend against cloned attroperties (jQuery gh-1709)
+											uniqueCache = outerCache[ node.uniqueID ] ||
+												(outerCache[ node.uniqueID ] = {});
+
+											uniqueCache[ type ] = [ dirruns, diff ];
+										}
+
+										if ( node === elem ) {
+											break;
+										}
 									}
 								}
 							}
@@ -2168,7 +1864,7 @@ Expr = Sizzle.selectors = {
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
+							idx = indexOf( seed, matched[i] );
 							seed[ idx ] = !( matches[ idx ] = matched[i] );
 						}
 					}) :
@@ -2207,6 +1903,8 @@ Expr = Sizzle.selectors = {
 				function( elem, context, xml ) {
 					input[0] = elem;
 					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
 					return !results.pop();
 				};
 		}),
@@ -2218,6 +1916,7 @@ Expr = Sizzle.selectors = {
 		}),
 
 		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
 			return function( elem ) {
 				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
 			};
@@ -2294,12 +1993,11 @@ Expr = Sizzle.selectors = {
 		// Contents
 		"empty": function( elem ) {
 			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
 			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
+				if ( elem.nodeType < 6 ) {
 					return false;
 				}
 			}
@@ -2326,11 +2024,12 @@ Expr = Sizzle.selectors = {
 
 		"text": function( elem ) {
 			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
 			return elem.nodeName.toLowerCase() === "input" &&
 				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
 		},
 
 		// Position-in-collection
@@ -2395,7 +2094,7 @@ function setFilters() {}
 setFilters.prototype = Expr.filters = Expr.pseudos;
 Expr.setFilters = new setFilters();
 
-function tokenize( selector, parseOnly ) {
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 	var matched, match, tokens, type,
 		soFar, groups, preFilters,
 		cached = tokenCache[ selector + " " ];
@@ -2416,7 +2115,7 @@ function tokenize( selector, parseOnly ) {
 				// Don't consume trailing commas as valid
 				soFar = soFar.slice( match[0].length ) || soFar;
 			}
-			groups.push( tokens = [] );
+			groups.push( (tokens = []) );
 		}
 
 		matched = false;
@@ -2460,7 +2159,7 @@ function tokenize( selector, parseOnly ) {
 			Sizzle.error( selector ) :
 			// Cache the tokens
 			tokenCache( selector, groups ).slice( 0 );
-}
+};
 
 function toSelector( tokens ) {
 	var i = 0,
@@ -2489,10 +2188,10 @@ function addCombinator( matcher, combinator, base ) {
 
 		// Check against all ancestor/preceding elements
 		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
+			var oldCache, uniqueCache, outerCache,
+				newCache = [ dirruns, doneName ];
 
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
 			if ( xml ) {
 				while ( (elem = elem[ dir ]) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
@@ -2505,14 +2204,22 @@ function addCombinator( matcher, combinator, base ) {
 				while ( (elem = elem[ dir ]) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
 						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
+
+						// Support: IE <9 only
+						// Defend against cloned attroperties (jQuery gh-1709)
+						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+
+						if ( (oldCache = uniqueCache[ dir ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
 						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
+							// Reuse newcache so results back-propagate to previous elements
+							uniqueCache[ dir ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
 								return true;
 							}
 						}
@@ -2536,6 +2243,15 @@ function elementMatcher( matchers ) {
 		matchers[0];
 }
 
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
 function condense( unmatched, map, filter, context, xml ) {
 	var elem,
 		newUnmatched = [],
@@ -2627,7 +2343,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				i = matcherOut.length;
 				while ( i-- ) {
 					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
 
 						seed[temp] = !(results[temp] = elem);
 					}
@@ -2662,13 +2378,16 @@ function matcherFromTokens( tokens ) {
 			return elem === checkContext;
 		}, implicitRelative, true ),
 		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
+			return indexOf( checkContext, elem ) > -1;
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
 				(checkContext = context).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
 		} ];
 
 	for ( ; i < len; i++ ) {
@@ -2706,42 +2425,43 @@ function matcherFromTokens( tokens ) {
 }
 
 function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
+	var bySet = setMatchers.length > 0,
 		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
+		superMatcher = function( seed, context, xml, results, outermost ) {
 			var elem, j, matcher,
-				setMatched = [],
 				matchedCount = 0,
 				i = "0",
 				unmatched = seed && [],
-				outermost = expandContext != null,
+				setMatched = [],
 				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
 				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
 
 			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
+				outermostContext = context === document || context || outermost;
 			}
 
 			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
 				if ( byElement && elem ) {
 					j = 0;
+					if ( !context && elem.ownerDocument !== document ) {
+						setDocument( elem );
+						xml = !documentIsHTML;
+					}
 					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
+						if ( matcher( elem, context || document, xml) ) {
 							results.push( elem );
 							break;
 						}
 					}
 					if ( outermost ) {
 						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
 					}
 				}
 
@@ -2759,8 +2479,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				}
 			}
 
-			// Apply set filters to unmatched elements
+			// `i` is now the count of elements visited above, and adding it to `matchedCount`
+			// makes the latter nonnegative.
 			matchedCount += i;
+
+			// Apply set filters to unmatched elements
+			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
+			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
+			// no element matchers and no seed.
+			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
+			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
+			// numerically zero.
 			if ( bySet && i !== matchedCount ) {
 				j = 0;
 				while ( (matcher = setMatchers[j++]) ) {
@@ -2806,7 +2535,7 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 		superMatcher;
 }
 
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 	var i,
 		setMatchers = [],
 		elementMatchers = [],
@@ -2814,12 +2543,12 @@ compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
 
 	if ( !cached ) {
 		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
+		if ( !match ) {
+			match = tokenize( selector );
 		}
-		i = group.length;
+		i = match.length;
 		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
+			cached = matcherFromTokens( match[i] );
 			if ( cached[ expando ] ) {
 				setMatchers.push( cached );
 			} else {
@@ -2829,91 +2558,101 @@ compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
 
 		// Cache the compiled function
 		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
 	}
 	return cached;
 };
 
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
 	var i, tokens, token, type, find,
-		match = tokenize( selector );
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
 
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
+	results = results || [];
 
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
+	// Try to minimize operations if there is only one selector in the list and no seed
+	// (the latter of which guarantees us context)
+	if ( match.length === 1 ) {
 
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
+		// Reduce context if the leading compound selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				support.getById && context.nodeType === 9 && documentIsHTML &&
+				Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
 			}
 
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
+			selector = selector.slice( tokens.shift().value.length );
+		}
 
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
 
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
-						}
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
 
-						break;
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
 					}
+
+					break;
 				}
 			}
 		}
 	}
 
-	// Compile and execute a filtering function
+	// Compile and execute a filtering function if one is not provided
 	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
+	( compiled || compile( selector, match ) )(
 		seed,
 		context,
 		!documentIsHTML,
 		results,
-		rsibling.test( selector )
+		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
 	);
 	return results;
-}
+};
 
 // One-time assignments
 
 // Sort stability
 support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
 
-// Support: Chrome<14
+// Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = hasDuplicate;
+support.detectDuplicates = !!hasDuplicate;
 
 // Initialize against the default document
 setDocument();
@@ -2961,32 +2700,467 @@ if ( !assert(function( div ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
 		if ( !isXML ) {
-			return (val = elem.getAttributeNode( name )) && val.specified ?
-				val.value :
-				elem[ name ] === true ? name.toLowerCase() : null;
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
 		}
 	});
 }
 
+return Sizzle;
+
+})( window );
+
+
+
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
+jQuery.expr[ ":" ] = jQuery.expr.pseudos;
+jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
 jQuery.text = Sizzle.getText;
 jQuery.isXMLDoc = Sizzle.isXML;
 jQuery.contains = Sizzle.contains;
 
 
-})( window );
-// String to Object options format cache
-var optionsCache = {};
 
-// Convert String-formatted options into Object-formatted ones and store in cache
+var dir = function( elem, dir, until ) {
+	var matched = [],
+		truncate = until !== undefined;
+
+	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
+		if ( elem.nodeType === 1 ) {
+			if ( truncate && jQuery( elem ).is( until ) ) {
+				break;
+			}
+			matched.push( elem );
+		}
+	}
+	return matched;
+};
+
+
+var siblings = function( n, elem ) {
+	var matched = [];
+
+	for ( ; n; n = n.nextSibling ) {
+		if ( n.nodeType === 1 && n !== elem ) {
+			matched.push( n );
+		}
+	}
+
+	return matched;
+};
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		} );
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		} );
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( risSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
+	} );
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return elems.length === 1 && elem.nodeType === 1 ?
+		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+			return elem.nodeType === 1;
+		} ) );
+};
+
+jQuery.fn.extend( {
+	find: function( selector ) {
+		var i,
+			ret = [],
+			self = this,
+			len = self.length;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter( function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			} ) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], false ) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], true ) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+} );
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	init = jQuery.fn.init = function( selector, context, root ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// init accepts an alternate rootjQuery
+		// so migrate can support jQuery.sub (gh-2101)
+		root = root || rootjQuery;
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt( 0 ) === "<" &&
+				selector.charAt( selector.length - 1 ) === ">" &&
+				selector.length >= 3 ) {
+
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && ( match[ 1 ] || !context ) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[ 1 ] ) {
+					context = context instanceof jQuery ? context[ 0 ] : context;
+
+					// scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[ 1 ],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[ 2 ] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[ 2 ] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[ 0 ] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || root ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[ 0 ] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return typeof root.ready !== "undefined" ?
+				root.ready( selector ) :
+
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend( {
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter( function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[ i ] ) ) {
+					return true;
+				}
+			}
+		} );
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && ( pos ?
+					pos.index( cur ) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector( cur, selectors ) ) ) {
+
+					matched.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[ 0 ], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[ 0 ] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.uniqueSort(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	}
+} );
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each( {
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return siblings( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return siblings( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		if ( this.length > 1 ) {
+
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				ret = jQuery.uniqueSort( ret );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				ret = ret.reverse();
+			}
+		}
+
+		return this.pushStack( ret );
+	};
+} );
+var rnotwhite = ( /\S+/g );
+
+
+
+// Convert String-formatted options into Object-formatted ones
 function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
+	var object = {};
+	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
 		object[ flag ] = true;
-	});
+	} );
 	return object;
 }
 
@@ -3017,156 +3191,186 @@ jQuery.Callbacks = function( options ) {
 	// Convert options from String-formatted to Object-formatted if needed
 	// (we check in cache first)
 	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
+		createOptions( options ) :
 		jQuery.extend( {}, options );
 
 	var // Flag to know if list is currently firing
 		firing,
-		// Last fire value (for non-forgettable lists)
+
+		// Last fire value for non-forgettable lists
 		memory,
+
 		// Flag to know if list was already fired
 		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
+
+		// Flag to prevent firing
+		locked,
+
 		// Actual callback list
 		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
+
+		// Queue of execution data for repeatable lists
+		queue = [],
+
+		// Index of currently firing callback (modified by add/remove as needed)
+		firingIndex = -1,
+
 		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
+		fire = function() {
+
+			// Enforce single-firing
+			locked = options.once;
+
+			// Execute callbacks for all pending executions,
+			// respecting firingIndex overrides and runtime changes
+			fired = firing = true;
+			for ( ; queue.length; firingIndex = -1 ) {
+				memory = queue.shift();
+				while ( ++firingIndex < list.length ) {
+
+					// Run callback and check for early termination
+					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
+						options.stopOnFalse ) {
+
+						// Jump to end and forget the data so .add doesn't re-fire
+						firingIndex = list.length;
+						memory = false;
+					}
 				}
 			}
+
+			// Forget the data if we're done with it
+			if ( !options.memory ) {
+				memory = false;
+			}
+
 			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
+
+			// Clean up if we're done firing for good
+			if ( locked ) {
+
+				// Keep an empty list if we have data for future add calls
+				if ( memory ) {
 					list = [];
+
+				// Otherwise, this object is spent
 				} else {
-					self.disable();
+					list = "";
 				}
 			}
 		},
+
 		// Actual Callbacks object
 		self = {
+
 			// Add a callback or a collection of callbacks to the list
 			add: function() {
 				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
+
+					// If we have memory from a past run, we should fire after adding
+					if ( memory && !firing ) {
+						firingIndex = list.length - 1;
+						queue.push( memory );
+					}
+
+					( function add( args ) {
 						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
+							if ( jQuery.isFunction( arg ) ) {
 								if ( !options.unique || !self.has( arg ) ) {
 									list.push( arg );
 								}
-							} else if ( arg && arg.length && type !== "string" ) {
+							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
+
 								// Inspect recursively
 								add( arg );
 							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
+						} );
+					} )( arguments );
+
+					if ( memory && !firing ) {
+						fire();
 					}
 				}
 				return this;
 			},
+
 			// Remove a callback from the list
 			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
+				jQuery.each( arguments, function( _, arg ) {
+					var index;
+					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+						list.splice( index, 1 );
+
+						// Handle firing indexes
+						if ( index <= firingIndex ) {
+							firingIndex--;
 						}
-					});
-				}
+					}
+				} );
 				return this;
 			},
+
 			// Check if a given callback is in the list.
 			// If no argument is given, return whether or not list has callbacks attached.
 			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+				return fn ?
+					jQuery.inArray( fn, list ) > -1 :
+					list.length > 0;
 			},
+
 			// Remove all callbacks from the list
 			empty: function() {
-				list = [];
-				firingLength = 0;
+				if ( list ) {
+					list = [];
+				}
 				return this;
 			},
-			// Have the list do nothing anymore
+
+			// Disable .fire and .add
+			// Abort any current/pending executions
+			// Clear all callbacks and values
 			disable: function() {
-				list = stack = memory = undefined;
+				locked = queue = [];
+				list = memory = "";
 				return this;
 			},
-			// Is it disabled?
 			disabled: function() {
 				return !list;
 			},
-			// Lock the list in its current state
+
+			// Disable .fire
+			// Also disable .add unless we have memory (since it would have no effect)
+			// Abort any pending executions
 			lock: function() {
-				stack = undefined;
+				locked = true;
 				if ( !memory ) {
 					self.disable();
 				}
 				return this;
 			},
-			// Is it locked?
 			locked: function() {
-				return !stack;
+				return !!locked;
 			},
+
 			// Call all callbacks with the given context and arguments
 			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
+				if ( !locked ) {
 					args = args || [];
 					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
+					queue.push( args );
+					if ( !firing ) {
+						fire();
 					}
 				}
 				return this;
 			},
+
 			// Call all the callbacks with the given arguments
 			fire: function() {
 				self.fireWith( this, arguments );
 				return this;
 			},
+
 			// To know if the callbacks have already been called at least once
 			fired: function() {
 				return !!fired;
@@ -3175,14 +3379,17 @@ jQuery.Callbacks = function( options ) {
 
 	return self;
 };
-jQuery.extend({
+
+
+jQuery.extend( {
 
 	Deferred: function( func ) {
 		var tuples = [
+
 				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
+				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
 			],
 			state = "pending",
 			promise = {
@@ -3195,26 +3402,30 @@ jQuery.extend({
 				},
 				then: function( /* fnDone, fnFail, fnProgress */ ) {
 					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
+					return jQuery.Deferred( function( newDefer ) {
 						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+
 							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
+							deferred[ tuple[ 1 ] ]( function() {
 								var returned = fn && fn.apply( this, arguments );
 								if ( returned && jQuery.isFunction( returned.promise ) ) {
 									returned.promise()
+										.progress( newDefer.notify )
 										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
+										.fail( newDefer.reject );
 								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+									newDefer[ tuple[ 0 ] + "With" ](
+										this === promise ? newDefer.promise() : this,
+										fn ? [ returned ] : arguments
+									);
 								}
-							});
-						});
+							} );
+						} );
 						fns = null;
-					}).promise();
+					} ).promise();
 				},
+
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
 				promise: function( obj ) {
@@ -3232,11 +3443,12 @@ jQuery.extend({
 				stateString = tuple[ 3 ];
 
 			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
+			promise[ tuple[ 1 ] ] = list.add;
 
 			// Handle state
 			if ( stateString ) {
-				list.add(function() {
+				list.add( function() {
+
 					// state = [ resolved | rejected ]
 					state = stateString;
 
@@ -3245,12 +3457,12 @@ jQuery.extend({
 			}
 
 			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+			deferred[ tuple[ 0 ] ] = function() {
+				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
 				return this;
 			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
+			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
+		} );
 
 		// Make the deferred a promise
 		promise.promise( deferred );
@@ -3267,22 +3479,25 @@ jQuery.extend({
 	// Deferred helper
 	when: function( subordinate /* , ..., subordinateN */ ) {
 		var i = 0,
-			resolveValues = core_slice.call( arguments ),
+			resolveValues = slice.call( arguments ),
 			length = resolveValues.length,
 
 			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+			remaining = length !== 1 ||
+				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
 
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			// the master Deferred.
+			// If resolveValues consist of only a single Deferred, just use that.
 			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
 
 			// Update function for both resolve and progress values
 			updateFunc = function( i, contexts, values ) {
 				return function( value ) {
 					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
+					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( values === progressValues ) {
 						deferred.notifyWith( contexts, values );
+
 					} else if ( !( --remaining ) ) {
 						deferred.resolveWith( contexts, values );
 					}
@@ -3299,9 +3514,9 @@ jQuery.extend({
 			for ( ; i < length; i++ ) {
 				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
 					resolveValues[ i ].promise()
+						.progress( updateFunc( i, progressContexts, progressValues ) )
 						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
+						.fail( deferred.reject );
 				} else {
 					--remaining;
 				}
@@ -3315,258 +3530,304 @@ jQuery.extend({
 
 		return deferred.promise();
 	}
-});
-jQuery.support = (function( support ) {
+} );
 
-	var all, a, input, select, fragment, opt, eventName, isSupported, i,
-		div = document.createElement("div");
 
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+// The deferred used on DOM ready
+var readyList;
 
-	// Finish early in limited (non-browser) environments
-	all = div.getElementsByTagName("*") || [];
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !a || !a.style || !all.length ) {
-		return support;
-	}
+jQuery.fn.ready = function( fn ) {
 
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
+	// Add the callback
+	jQuery.ready.promise().done( fn );
 
-	a.style.cssText = "top:1px;float:left;opacity:.5";
+	return this;
+};
 
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
+jQuery.extend( {
 
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
 
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName("tbody").length;
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
 
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName("link").length;
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
 
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
+	// Handle when the DOM is ready
+	ready: function( wait ) {
 
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Make sure that element opacity exists
-	// (IE uses filter instead)
-	// Use a regex to work around a WebKit issue. See #5145
-	support.opacity = /^0.5/.test( a.style.opacity );
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!a.style.cssFloat;
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Will be defined later
-	support.inlineBlockNeedsLayout = false;
-	support.shrinkWrapBlocks = false;
-	support.pixelPosition = false;
-	support.deleteExpando = true;
-	support.noCloneEvent = true;
-	support.reliableMarginRight = true;
-	support.boxSizingReliable = true;
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: IE<9
-	// Iteration over object's inherited properties before its own.
-	for ( i in jQuery( support ) ) {
-		break;
-	}
-	support.ownLast = i !== "0";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
 			return;
 		}
 
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
 
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior.
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-
-		// Workaround failing boxSizing test due to offsetWidth returning wrong value
-		// with some non-1 values of body zoom, ticket #13543
-		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
-			support.boxSizing = div.offsetWidth === 4;
-		});
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
 		}
 
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
 
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+		// Trigger any bound ready events
+		if ( jQuery.fn.triggerHandler ) {
+			jQuery( document ).triggerHandler( "ready" );
+			jQuery( document ).off( "ready" );
+		}
+	}
+} );
 
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
+/**
+ * Clean-up method for dom ready events
+ */
+function detach() {
+	if ( document.addEventListener ) {
+		document.removeEventListener( "DOMContentLoaded", completed );
+		window.removeEventListener( "load", completed );
+
+	} else {
+		document.detachEvent( "onreadystatechange", completed );
+		window.detachEvent( "onload", completed );
+	}
+}
+
+/**
+ * The ready event handler and self cleanup method
+ */
+function completed() {
+
+	// readyState === "complete" is good enough for us to call the dom ready in oldIE
+	if ( document.addEventListener ||
+		window.event.type === "load" ||
+		document.readyState === "complete" ) {
+
+		detach();
+		jQuery.ready();
+	}
+}
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called
+		// after the browser event has already occurred.
+		// Support: IE6-10
+		// Older IE sometimes signals "interactive" too soon
+		if ( document.readyState === "complete" ||
+			( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			window.setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed );
+
+		// If IE event model is used
+		} else {
+
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch ( e ) {}
+
+			if ( top && top.doScroll ) {
+				( function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll( "left" );
+						} catch ( e ) {
+							return window.setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				} )();
 			}
 		}
+	}
+	return readyList.promise( obj );
+};
 
-		body.removeChild( container );
+// Kick off the DOM ready check even if the user does not
+jQuery.ready.promise();
 
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
 
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
 
-	return support;
-})({});
 
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+// Support: IE<9
+// Iteration over object's inherited properties before its own
+var i;
+for ( i in jQuery( support ) ) {
+	break;
+}
+support.ownFirst = i === "0";
+
+// Note: most support tests are defined in their respective modules.
+// false until the test is run
+support.inlineBlockNeedsLayout = false;
+
+// Execute ASAP in case we need to set body.style.zoom
+jQuery( function() {
+
+	// Minified: var a,b,c,d
+	var val, div, body, container;
+
+	body = document.getElementsByTagName( "body" )[ 0 ];
+	if ( !body || !body.style ) {
+
+		// Return for frameset docs that don't have a body
+		return;
+	}
+
+	// Setup
+	div = document.createElement( "div" );
+	container = document.createElement( "div" );
+	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+	body.appendChild( container ).appendChild( div );
+
+	if ( typeof div.style.zoom !== "undefined" ) {
+
+		// Support: IE<8
+		// Check if natively block-level elements act like inline-block
+		// elements when setting their display to 'inline' and giving
+		// them layout
+		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
+
+		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
+		if ( val ) {
+
+			// Prevent IE 6 from affecting layout for positioned elements #11048
+			// Prevent IE from shrinking the body in IE 7 mode #12869
+			// Support: IE<8
+			body.style.zoom = 1;
+		}
+	}
+
+	body.removeChild( container );
+} );
+
+
+( function() {
+	var div = document.createElement( "div" );
+
+	// Support: IE<9
+	support.deleteExpando = true;
+	try {
+		delete div.test;
+	} catch ( e ) {
+		support.deleteExpando = false;
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+} )();
+var acceptData = function( elem ) {
+	var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ],
+		nodeType = +elem.nodeType || 1;
+
+	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
+	return nodeType !== 1 && nodeType !== 9 ?
+		false :
+
+		// Nodes accept data unless otherwise specified; rejection can be conditional
+		!noData || noData !== true && elem.getAttribute( "classid" ) === noData;
+};
+
+
+
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
 	rmultiDash = /([A-Z])/g;
 
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
+function dataAttr( elem, key, data ) {
+
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch ( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
+	if ( !acceptData( elem ) ) {
 		return;
 	}
 
@@ -3587,21 +3848,24 @@ function internalData( elem, name, data, pvt /* Internal Use Only */ ){
 
 	// Avoid doing any more work than we need to when trying to get data on an
 	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
+	if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
+		data === undefined && typeof name === "string" ) {
 		return;
 	}
 
 	if ( !id ) {
+
 		// Only DOM nodes need a new unique ID for each element since their data
 		// ends up in the global cache
 		if ( isNode ) {
-			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
+			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
 		} else {
 			id = internalKey;
 		}
 	}
 
 	if ( !cache[ id ] ) {
+
 		// Avoid exposing jQuery metadata on plain JS objects when the object
 		// is serialized using JSON.stringify
 		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
@@ -3655,7 +3919,7 @@ function internalData( elem, name, data, pvt /* Internal Use Only */ ){
 }
 
 function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
+	if ( !acceptData( elem ) ) {
 		return;
 	}
 
@@ -3691,10 +3955,11 @@ function internalRemoveData( elem, name, pvt ) {
 					if ( name in thisCache ) {
 						name = [ name ];
 					} else {
-						name = name.split(" ");
+						name = name.split( " " );
 					}
 				}
 			} else {
+
 				// If "name" is an array of keys...
 				// When data is initially created, via ("key", "val") signature,
 				// keys will be converted to camelCase.
@@ -3706,12 +3971,12 @@ function internalRemoveData( elem, name, pvt ) {
 
 			i = name.length;
 			while ( i-- ) {
-				delete thisCache[ name[i] ];
+				delete thisCache[ name[ i ] ];
 			}
 
 			// If there is no data left in the cache, we want to continue
 			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
+			if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) {
 				return;
 			}
 		}
@@ -3734,30 +3999,31 @@ function internalRemoveData( elem, name, pvt ) {
 
 	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
 	/* jshint eqeqeq: false */
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+	} else if ( support.deleteExpando || cache != cache.window ) {
 		/* jshint eqeqeq: true */
 		delete cache[ id ];
 
-	// When all else fails, null
+	// When all else fails, undefined
 	} else {
-		cache[ id ] = null;
+		cache[ id ] = undefined;
 	}
 }
 
-jQuery.extend({
+jQuery.extend( {
 	cache: {},
 
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
+	// The following elements (space-suffixed to avoid Object.prototype collisions)
+	// throw uncatchable exceptions if you attempt to set expando properties
 	noData: {
-		"applet": true,
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+		"applet ": true,
+		"embed ": true,
+
+		// ...but Flash objects (which have this classid) *can* handle expandos
+		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
 	},
 
 	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ];
 		return !!elem && !isEmptyDataObject( elem );
 	},
 
@@ -3776,28 +4042,14 @@ jQuery.extend({
 
 	_removeData: function( elem, name ) {
 		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
 	}
-});
+} );
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 	data: function( key, value ) {
-		var attrs, name,
-			data = null,
-			i = 0,
-			elem = this[0];
+		var i, name, data,
+			elem = this[ 0 ],
+			attrs = elem && elem.attributes;
 
 		// Special expections of .data basically thwart jQuery.access,
 		// so implement the relevant behavior ourselves
@@ -3808,14 +4060,17 @@ jQuery.fn.extend({
 				data = jQuery.data( elem );
 
 				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
+					i = attrs.length;
+					while ( i-- ) {
 
-						if ( name.indexOf("data-") === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
+						// Support: IE11+
+						// The attrs elements can be null (#14894)
+						if ( attrs[ i ] ) {
+							name = attrs[ i ].name;
+							if ( name.indexOf( "data-" ) === 0 ) {
+								name = jQuery.camelCase( name.slice( 5 ) );
+								dataAttr( elem, name, data[ name ] );
+							}
 						}
 					}
 					jQuery._data( elem, "parsedAttrs", true );
@@ -3827,78 +4082,32 @@ jQuery.fn.extend({
 
 		// Sets multiple values
 		if ( typeof key === "object" ) {
-			return this.each(function() {
+			return this.each( function() {
 				jQuery.data( this, key );
-			});
+			} );
 		}
 
 		return arguments.length > 1 ?
 
 			// Sets one value
-			this.each(function() {
+			this.each( function() {
 				jQuery.data( this, key, value );
-			}) :
+			} ) :
 
 			// Gets one value
 			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
+			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
 	},
 
 	removeData: function( key ) {
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.removeData( this, key );
-		});
+		} );
 	}
-});
+} );
 
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
 
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
+jQuery.extend( {
 	queue: function( elem, type, data ) {
 		var queue;
 
@@ -3908,8 +4117,8 @@ jQuery.extend({
 
 			// Speed up dequeue by getting out quickly if this is just a lookup
 			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				if ( !queue || jQuery.isArray( data ) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray( data ) );
 				} else {
 					queue.push( data );
 				}
@@ -3953,19 +4162,20 @@ jQuery.extend({
 		}
 	},
 
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	// not intended for public consumption - generates a queueHooks object,
+	// or returns the current one
 	_queueHooks: function( elem, type ) {
 		var key = type + "queueHooks";
 		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
+			empty: jQuery.Callbacks( "once memory" ).add( function() {
 				jQuery._removeData( elem, type + "queue" );
 				jQuery._removeData( elem, key );
-			})
-		});
+			} )
+		} );
 	}
-});
+} );
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 	queue: function( type, data ) {
 		var setter = 2;
 
@@ -3976,43 +4186,31 @@ jQuery.fn.extend({
 		}
 
 		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
+			return jQuery.queue( this[ 0 ], type );
 		}
 
 		return data === undefined ?
 			this :
-			this.each(function() {
+			this.each( function() {
 				var queue = jQuery.queue( this, type, data );
 
 				// ensure a hooks for this queue
 				jQuery._queueHooks( this, type );
 
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
+				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
 					jQuery.dequeue( this, type );
 				}
-			});
+			} );
 	},
 	dequeue: function( type ) {
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
+		} );
 	},
 	clearQueue: function( type ) {
 		return this.queue( type || "fx", [] );
 	},
+
 	// Get a promise resolved when queues of a certain type
 	// are emptied (fx is the type by default)
 	promise: function( type, obj ) {
@@ -4033,7 +4231,7 @@ jQuery.fn.extend({
 		}
 		type = type || "fx";
 
-		while( i-- ) {
+		while ( i-- ) {
 			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
 			if ( tmp && tmp.empty ) {
 				count++;
@@ -4043,671 +4241,520 @@ jQuery.fn.extend({
 		resolve();
 		return defer.promise( obj );
 	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n\f]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
+} );
 
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
 
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
+( function() {
+	var shrinkWrapBlocksVal;
 
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
+	support.shrinkWrapBlocks = function() {
+		if ( shrinkWrapBlocksVal != null ) {
+			return shrinkWrapBlocksVal;
 		}
 
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
+		// Will be changed later if needed.
+		shrinkWrapBlocksVal = false;
 
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
+		// Minified: var b,c,d
+		var div, body, container;
 
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
+		body = document.getElementsByTagName( "body" )[ 0 ];
+		if ( !body || !body.style ) {
 
+			// Test fired too early or in an unsupported environment, exit.
 			return;
 		}
 
-		isFunction = jQuery.isFunction( value );
+		// Setup
+		div = document.createElement( "div" );
+		container = document.createElement( "div" );
+		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+		body.appendChild( container ).appendChild( div );
 
-		return this.each(function( i ) {
-			var val;
+		// Support: IE6
+		// Check if elements with layout shrink-wrap their children
+		if ( typeof div.style.zoom !== "undefined" ) {
 
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
+			// Reset CSS: box-sizing; display; margin; border
+			div.style.cssText =
 
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
+				// Support: Firefox<29, Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;" +
+				"padding:1px;width:1px;zoom:1";
+			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
+			shrinkWrapBlocksVal = div.offsetWidth !== 3;
+		}
+
+		body.removeChild( container );
+
+		return shrinkWrapBlocksVal;
+	};
+
+} )();
+var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
+
+var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
+
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHidden = function( elem, el ) {
+
+		// isHidden might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+		return jQuery.css( elem, "display" ) === "none" ||
+			!jQuery.contains( elem.ownerDocument, elem );
+	};
+
+
+
+function adjustCSS( elem, prop, valueParts, tween ) {
+	var adjusted,
+		scale = 1,
+		maxIterations = 20,
+		currentValue = tween ?
+			function() { return tween.cur(); } :
+			function() { return jQuery.css( elem, prop, "" ); },
+		initial = currentValue(),
+		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+		// Starting value computation is required for potential unit mismatches
+		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+			rcssNum.exec( jQuery.css( elem, prop ) );
+
+	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
+
+		// Trust units reported by jQuery.css
+		unit = unit || initialInUnit[ 3 ];
+
+		// Make sure we update the tween properties later on
+		valueParts = valueParts || [];
+
+		// Iteratively approximate from a nonzero starting point
+		initialInUnit = +initial || 1;
+
+		do {
+
+			// If previous iteration zeroed out, double until we get *something*.
+			// Use string for doubling so we don't accidentally see scale as unchanged below
+			scale = scale || ".5";
+
+			// Adjust and apply
+			initialInUnit = initialInUnit / scale;
+			jQuery.style( elem, prop, initialInUnit + unit );
+
+		// Update scale, tolerating zero or NaN from tween.cur()
+		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
+		} while (
+			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
+		);
+	}
+
+	if ( valueParts ) {
+		initialInUnit = +initialInUnit || +initial || 0;
+
+		// Apply relative offset (+=/-=) if specified
+		adjusted = valueParts[ 1 ] ?
+			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
+			+valueParts[ 2 ];
+		if ( tween ) {
+			tween.unit = unit;
+			tween.start = initialInUnit;
+			tween.end = adjusted;
+		}
+	}
+	return adjusted;
+}
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		length = elems.length,
+		bulk = key == null;
+
+	// Sets many values
+	if ( jQuery.type( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+		}
+
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
+
+		if ( !jQuery.isFunction( value ) ) {
+			raw = true;
+		}
+
+		if ( bulk ) {
+
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
+
+			// ...except when executing function values
 			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// Use proper attribute retrieval(#6932, #12072)
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
 			}
 		}
-	},
 
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
+		if ( fn ) {
+			for ( ; i < length; i++ ) {
+				fn(
+					elems[ i ],
+					key,
+					raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) )
+				);
 			}
 		}
 	}
-});
 
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+	return chainable ?
+		elems :
 
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
+		// Gets
+		bulk ?
+			fn.call( elems ) :
+			length ? fn( elems[ 0 ], key ) : emptyGet;
 };
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
+var rcheckableType = ( /^(?:checkbox|radio)$/i );
 
-	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var fn = jQuery.expr.attrHandle[ name ],
-				ret = isXML ?
-					undefined :
-					/* jshint eqeqeq: false */
-					(jQuery.expr.attrHandle[ name ] = undefined) !=
-						getter( elem, name, isXML ) ?
+var rtagName = ( /<([\w:-]+)/ );
 
-						name.toLowerCase() :
-						null;
-			jQuery.expr.attrHandle[ name ] = fn;
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			return isXML ?
-				undefined :
-				elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-		};
-});
+var rscriptType = ( /^$|\/(?:java|ecma)script/i );
 
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
+var rleadingWhitespace = ( /^\s+/ );
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" +
+		"details|dialog|figcaption|figure|footer|header|hgroup|main|" +
+		"mark|meter|nav|output|picture|progress|section|summary|template|time|video";
+
+
+
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
 		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
-		// Some attributes are constructed with empty-string values when not defined
-		function( elem, name, isXML ) {
-			var ret;
-			return isXML ?
-				undefined :
-				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-		};
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ret.specified ?
-				ret.value :
-				undefined;
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !jQuery.support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
 	}
-});
+	return safeFrag;
+}
+
+
+( function() {
+	var div = document.createElement( "div" ),
+		fragment = document.createDocumentFragment(),
+		input = document.createElement( "input" );
+
+	// Setup
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// IE strips leading whitespace when .innerHTML is used
+	support.leadingWhitespace = div.firstChild.nodeType === 3;
+
+	// Make sure that tbody elements aren't automatically inserted
+	// IE will insert them into empty tables
+	support.tbody = !div.getElementsByTagName( "tbody" ).length;
+
+	// Make sure that link elements get serialized correctly by innerHTML
+	// This requires a wrapper element in IE
+	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
+
+	// Makes sure cloning an html5 element does not cause problems
+	// Where outerHTML is undefined, this still works
+	support.html5Clone =
+		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	input.type = "checkbox";
+	input.checked = true;
+	fragment.appendChild( input );
+	support.appendChecked = input.checked;
+
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	// Support: IE6-IE11+
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	fragment.appendChild( div );
+
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input = document.createElement( "input" );
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
+	// old WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<9
+	// Cloned elements keep attachEvent handlers, we use addEventListener on IE9+
+	support.noCloneEvent = !!div.addEventListener;
+
+	// Support: IE<9
+	// Since attributes and properties are the same in IE,
+	// cleanData must set properties to undefined rather than use removeAttribute
+	div[ jQuery.expando ] = 1;
+	support.attributes = !div.getAttribute( jQuery.expando );
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
+	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+	legend: [ 1, "<fieldset>", "</fieldset>" ],
+	area: [ 1, "<map>", "</map>" ],
+
+	// Support: IE8
+	param: [ 1, "<object>", "</object>" ],
+	thead: [ 1, "<table>", "</table>" ],
+	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+	col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+	// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+	// unless wrapped in a div with non-breaking characters in front of it.
+	_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>" ]
+};
+
+// Support: IE8-IE9
+wrapMap.optgroup = wrapMap.option;
+
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== "undefined" ?
+				context.querySelectorAll( tag || "*" ) :
+				undefined;
+
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context;
+			( elem = elems[ i ] ) != null;
+			i++
+		) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; ( elem = elems[ i ] ) != null; i++ ) {
+		jQuery._data(
+			elem,
+			"globalEval",
+			!refElements || jQuery._data( refElements[ i ], "globalEval" )
+		);
+	}
+}
+
+
+var rhtml = /<|&#?\w+;/,
+	rtbody = /<tbody/i;
+
+function fixDefaultChecked( elem ) {
+	if ( rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+function buildFragment( elems, context, scripts, selection, ignored ) {
+	var j, elem, contains,
+		tmp, tag, tbody, wrap,
+		l = elems.length,
+
+		// Ensure a safe fragment
+		safe = createSafeFragment( context ),
+
+		nodes = [],
+		i = 0;
+
+	for ( ; i < l; i++ ) {
+		elem = elems[ i ];
+
+		if ( elem || elem === 0 ) {
+
+			// Add nodes directly
+			if ( jQuery.type( elem ) === "object" ) {
+				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+			// Convert non-html into a text node
+			} else if ( !rhtml.test( elem ) ) {
+				nodes.push( context.createTextNode( elem ) );
+
+			// Convert html into DOM nodes
+			} else {
+				tmp = tmp || safe.appendChild( context.createElement( "div" ) );
+
+				// Deserialize a standard representation
+				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+				wrap = wrapMap[ tag ] || wrapMap._default;
+
+				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
+
+				// Descend through wrappers to the right content
+				j = wrap[ 0 ];
+				while ( j-- ) {
+					tmp = tmp.lastChild;
+				}
+
+				// Manually add leading whitespace removed by IE
+				if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[ 0 ] ) );
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					elem = tag === "table" && !rtbody.test( elem ) ?
+						tmp.firstChild :
+
+						// String was a bare <thead> or <tfoot>
+						wrap[ 1 ] === "<table>" && !rtbody.test( elem ) ?
+							tmp :
+							0;
+
+					j = elem && elem.childNodes.length;
+					while ( j-- ) {
+						if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) &&
+							!tbody.childNodes.length ) {
+
+							elem.removeChild( tbody );
+						}
+					}
+				}
+
+				jQuery.merge( nodes, tmp.childNodes );
+
+				// Fix #12392 for WebKit and IE > 9
+				tmp.textContent = "";
+
+				// Fix #12392 for oldIE
+				while ( tmp.firstChild ) {
+					tmp.removeChild( tmp.firstChild );
+				}
+
+				// Remember the top-level container for proper cleanup
+				tmp = safe.lastChild;
+			}
+		}
+	}
+
+	// Fix #11356: Clear elements from fragment
+	if ( tmp ) {
+		safe.removeChild( tmp );
+	}
+
+	// Reset defaultChecked for any radios and checkboxes
+	// about to be appended to the DOM in IE 6/7 (#8060)
+	if ( !support.appendChecked ) {
+		jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+	}
+
+	i = 0;
+	while ( ( elem = nodes[ i++ ] ) ) {
+
+		// Skip elements already in the context collection (trac-4087)
+		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
+			if ( ignored ) {
+				ignored.push( elem );
+			}
+
+			continue;
+		}
+
+		contains = jQuery.contains( elem.ownerDocument, elem );
+
+		// Append to fragment
+		tmp = getAll( safe.appendChild( elem ), "script" );
+
+		// Preserve script evaluation history
+		if ( contains ) {
+			setGlobalEval( tmp );
+		}
+
+		// Capture executables
+		if ( scripts ) {
+			j = 0;
+			while ( ( elem = tmp[ j++ ] ) ) {
+				if ( rscriptType.test( elem.type || "" ) ) {
+					scripts.push( elem );
+				}
+			}
+		}
+	}
+
+	tmp = null;
+
+	return safe;
+}
+
+
+( function() {
+	var i, eventName,
+		div = document.createElement( "div" );
+
+	// Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events)
+	for ( i in { submit: true, change: true, focusin: true } ) {
+		eventName = "on" + i;
+
+		if ( !( support[ i ] = eventName in window ) ) {
+
+			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+			div.setAttribute( eventName, "t" );
+			support[ i ] = div.attributes[ eventName ].expando === false;
+		}
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+} )();
+
+
 var rformElems = /^(?:input|select|textarea)$/i,
 	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
 	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
 
 function returnTrue() {
 	return true;
@@ -4717,12 +4764,75 @@ function returnFalse() {
 	return false;
 }
 
+// Support: IE9
+// See #13393 for more info
 function safeActiveElement() {
 	try {
 		return document.activeElement;
 	} catch ( err ) { }
 }
 
+function on( elem, types, selector, data, fn, one ) {
+	var origFn, type;
+
+	// Types can be a map of types/handlers
+	if ( typeof types === "object" ) {
+
+		// ( types-Object, selector, data )
+		if ( typeof selector !== "string" ) {
+
+			// ( types-Object, data )
+			data = data || selector;
+			selector = undefined;
+		}
+		for ( type in types ) {
+			on( elem, type, selector, data, types[ type ], one );
+		}
+		return elem;
+	}
+
+	if ( data == null && fn == null ) {
+
+		// ( types, fn )
+		fn = selector;
+		data = selector = undefined;
+	} else if ( fn == null ) {
+		if ( typeof selector === "string" ) {
+
+			// ( types, selector, fn )
+			fn = data;
+			data = undefined;
+		} else {
+
+			// ( types, data, fn )
+			fn = data;
+			data = selector;
+			selector = undefined;
+		}
+	}
+	if ( fn === false ) {
+		fn = returnFalse;
+	} else if ( !fn ) {
+		return elem;
+	}
+
+	if ( one === 1 ) {
+		origFn = fn;
+		fn = function( event ) {
+
+			// Can use an empty set, since event contains the info
+			jQuery().off( event );
+			return origFn.apply( this, arguments );
+		};
+
+		// Use same guid so caller can remove using origFn
+		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+	}
+	return elem.each( function() {
+		jQuery.event.add( this, types, fn, data, selector );
+	} );
+}
+
 /*
  * Helper functions for managing events -- not part of the public interface.
  * Props to Dean Edwards' addEvent library for many of the ideas.
@@ -4755,28 +4865,32 @@ jQuery.event = {
 		}
 
 		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
+		if ( !( events = elemData.events ) ) {
 			events = elemData.events = {};
 		}
-		if ( !(eventHandle = elemData.handle) ) {
+		if ( !( eventHandle = elemData.handle ) ) {
 			eventHandle = elemData.handle = function( e ) {
+
 				// Discard the second event of a jQuery.event.trigger() and
 				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
+				return typeof jQuery !== "undefined" &&
+					( !e || jQuery.event.triggered !== e.type ) ?
 					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
 					undefined;
 			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+
+			// Add elem as a property of the handle fn to prevent a memory leak
+			// with IE non-native events
 			eventHandle.elem = elem;
 		}
 
 		// Handle multiple events separated by a space
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
 
 			// There *must* be a type, no attaching namespace-only handlers
 			if ( !type ) {
@@ -4793,7 +4907,7 @@ jQuery.event = {
 			special = jQuery.event.special[ type ] || {};
 
 			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
+			handleObj = jQuery.extend( {
 				type: type,
 				origType: origType,
 				data: data,
@@ -4801,16 +4915,18 @@ jQuery.event = {
 				guid: handler.guid,
 				selector: selector,
 				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
+				namespace: namespaces.join( "." )
 			}, handleObjIn );
 
 			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
+			if ( !( handlers = events[ type ] ) ) {
 				handlers = events[ type ] = [];
 				handlers.delegateCount = 0;
 
 				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+				if ( !special.setup ||
+					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+
 					// Bind the global event handler to the element
 					if ( elem.addEventListener ) {
 						elem.addEventListener( type, eventHandle, false );
@@ -4852,17 +4968,17 @@ jQuery.event = {
 			namespaces, origType,
 			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
 
-		if ( !elemData || !(events = elemData.events) ) {
+		if ( !elemData || !( events = elemData.events ) ) {
 			return;
 		}
 
 		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
 
 			// Unbind all events (on this namespace, if provided) for the element
 			if ( !type ) {
@@ -4875,7 +4991,8 @@ jQuery.event = {
 			special = jQuery.event.special[ type ] || {};
 			type = ( selector ? special.delegateType : special.bindType ) || type;
 			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+			tmp = tmp[ 2 ] &&
+				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
 
 			// Remove matching events
 			origCount = j = handlers.length;
@@ -4885,7 +5002,8 @@ jQuery.event = {
 				if ( ( mappedTypes || origType === handleObj.origType ) &&
 					( !handler || handler.guid === handleObj.guid ) &&
 					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					( !selector || selector === handleObj.selector ||
+						selector === "**" && handleObj.selector ) ) {
 					handlers.splice( j, 1 );
 
 					if ( handleObj.selector ) {
@@ -4900,7 +5018,9 @@ jQuery.event = {
 			// Remove generic event handler if we removed something and no more handlers exist
 			// (avoids potential for endless recursion during removal of special event handlers)
 			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+				if ( !special.teardown ||
+					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+
 					jQuery.removeEvent( elem, type, elemData.handle );
 				}
 
@@ -4922,8 +5042,8 @@ jQuery.event = {
 		var handle, ontype, cur,
 			bubbleType, special, tmp, i,
 			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
 
 		cur = tmp = elem = elem || document;
 
@@ -4937,13 +5057,14 @@ jQuery.event = {
 			return;
 		}
 
-		if ( type.indexOf(".") >= 0 ) {
+		if ( type.indexOf( "." ) > -1 ) {
+
 			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
+			namespaces = type.split( "." );
 			type = namespaces.shift();
 			namespaces.sort();
 		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
+		ontype = type.indexOf( ":" ) < 0 && "on" + type;
 
 		// Caller can pass in a jQuery.Event object, Object, or just an event type string
 		event = event[ jQuery.expando ] ?
@@ -4952,9 +5073,9 @@ jQuery.event = {
 
 		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
 		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+		event.namespace = namespaces.join( "." );
+		event.rnamespace = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
 			null;
 
 		// Clean up the event in case it is being reused
@@ -4988,29 +5109,34 @@ jQuery.event = {
 			}
 
 			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
+			if ( tmp === ( elem.ownerDocument || document ) ) {
 				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
 			}
 		}
 
 		// Fire handlers on the event path
 		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
 
 			event.type = i > 1 ?
 				bubbleType :
 				special.bindType || type;
 
 			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] &&
+				jQuery._data( cur, "handle" );
+
 			if ( handle ) {
 				handle.apply( cur, data );
 			}
 
 			// Native handler
 			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
+			if ( handle && handle.apply && acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
 			}
 		}
 		event.type = type;
@@ -5018,8 +5144,11 @@ jQuery.event = {
 		// If nobody prevented the default action, do it now
 		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
 
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
+			if (
+				( !special._default ||
+				 special._default.apply( eventPath.pop(), data ) === false
+				) && acceptData( elem )
+			) {
 
 				// Call a native DOM method on the target with the same name name as the event.
 				// Can't use an .isFunction() check here because IE6/7 fails that test.
@@ -5038,6 +5167,7 @@ jQuery.event = {
 					try {
 						elem[ type ]();
 					} catch ( e ) {
+
 						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
 						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
 					}
@@ -5058,14 +5188,14 @@ jQuery.event = {
 		// Make a writable jQuery.Event from the native event object
 		event = jQuery.event.fix( event );
 
-		var i, ret, handleObj, matched, j,
+		var i, j, ret, matched, handleObj,
 			handlerQueue = [],
-			args = core_slice.call( arguments ),
+			args = slice.call( arguments ),
 			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
+		args[ 0 ] = event;
 		event.delegateTarget = this;
 
 		// Call the preDispatch hook for the mapped type, and let it bail if desired
@@ -5078,24 +5208,25 @@ jQuery.event = {
 
 		// Run delegates first; they may want to stop propagation beneath us
 		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
 			event.currentTarget = matched.elem;
 
 			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+				!event.isImmediatePropagationStopped() ) {
 
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
+				// a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
 
 					event.handleObj = handleObj;
 					event.data = handleObj.data;
 
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
+					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+						handleObj.handler ).apply( matched.elem, args );
 
 					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
+						if ( ( event.result = ret ) === false ) {
 							event.preventDefault();
 							event.stopPropagation();
 						}
@@ -5113,15 +5244,19 @@ jQuery.event = {
 	},
 
 	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
+		var i, matches, sel, handleObj,
 			handlerQueue = [],
 			delegateCount = handlers.delegateCount,
 			cur = event.target;
 
+		// Support (at least): Chrome, IE9
 		// Find delegate handlers
 		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+		//
+		// Support: Firefox<=42+
+		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
+		if ( delegateCount && cur.nodeType &&
+			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
 
 			/* jshint eqeqeq: false */
 			for ( ; cur != this; cur = cur.parentNode || this ) {
@@ -5129,7 +5264,7 @@ jQuery.event = {
 
 				// Don't check non-elements (#13208)
 				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
 					matches = [];
 					for ( i = 0; i < delegateCount; i++ ) {
 						handleObj = handlers[ i ];
@@ -5139,7 +5274,7 @@ jQuery.event = {
 
 						if ( matches[ sel ] === undefined ) {
 							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery( sel, this ).index( cur ) > -1 :
 								jQuery.find( sel, this, null, [ cur ] ).length;
 						}
 						if ( matches[ sel ] ) {
@@ -5147,7 +5282,7 @@ jQuery.event = {
 						}
 					}
 					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
+						handlerQueue.push( { elem: cur, handlers: matches } );
 					}
 				}
 			}
@@ -5155,7 +5290,7 @@ jQuery.event = {
 
 		// Add the remaining (directly-bound) handlers
 		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
 		}
 
 		return handlerQueue;
@@ -5194,7 +5329,7 @@ jQuery.event = {
 			event.target = originalEvent.srcElement || document;
 		}
 
-		// Support: Chrome 23+, Safari?
+		// Support: Safari 6-8+
 		// Target should not be a text node (#504, #13143)
 		if ( event.target.nodeType === 3 ) {
 			event.target = event.target.parentNode;
@@ -5208,12 +5343,13 @@ jQuery.event = {
 	},
 
 	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
+		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
 
 	fixHooks: {},
 
 	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
+		props: "char charCode key keyCode".split( " " ),
 		filter: function( event, original ) {
 
 			// Add which for key events
@@ -5226,7 +5362,8 @@ jQuery.event = {
 	},
 
 	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		props: ( "button buttons clientX clientY fromElement offsetX offsetY " +
+			"pageX pageY screenX screenY toElement" ).split( " " ),
 		filter: function( event, original ) {
 			var body, eventDoc, doc,
 				button = original.button,
@@ -5238,13 +5375,19 @@ jQuery.event = {
 				doc = eventDoc.documentElement;
 				body = eventDoc.body;
 
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+				event.pageX = original.clientX +
+					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
+					( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY +
+					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
+					( doc && doc.clientTop  || body && body.clientTop  || 0 );
 			}
 
 			// Add relatedTarget, if necessary
 			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+				event.relatedTarget = fromElement === event.target ?
+					original.toElement :
+					fromElement;
 			}
 
 			// Add which for click: 1 === left; 2 === middle; 3 === right
@@ -5259,10 +5402,12 @@ jQuery.event = {
 
 	special: {
 		load: {
+
 			// Prevent triggered image.load events from bubbling to window.load
 			noBubble: true
 		},
 		focus: {
+
 			// Fire native event if possible so blur/focus sequence is correct
 			trigger: function() {
 				if ( this !== safeActiveElement() && this.focus ) {
@@ -5270,6 +5415,7 @@ jQuery.event = {
 						this.focus();
 						return false;
 					} catch ( e ) {
+
 						// Support: IE<9
 						// If we error on focus to hidden element (#1486, #12518),
 						// let .trigger() run the handlers
@@ -5288,6 +5434,7 @@ jQuery.event = {
 			delegateType: "focusout"
 		},
 		click: {
+
 			// For checkbox, fire native event so checked state will be right
 			trigger: function() {
 				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
@@ -5305,32 +5452,37 @@ jQuery.event = {
 		beforeunload: {
 			postDispatch: function( event ) {
 
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
 					event.originalEvent.returnValue = event.result;
 				}
 			}
 		}
 	},
 
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
+	// Piggyback on a donor event to simulate a different one
+	simulate: function( type, elem, event ) {
 		var e = jQuery.extend(
 			new jQuery.Event(),
 			event,
 			{
 				type: type,
-				isSimulated: true,
-				originalEvent: {}
+				isSimulated: true
+
+				// Previously, `originalEvent: {}` was set here, so stopPropagation call
+				// would not be triggered on donor event, since in our own
+				// jQuery.event.stopPropagation function we had a check for existence of
+				// originalEvent.stopPropagation method, so, consequently it would be a noop.
+				//
+				// Guard for simulated events was moved to jQuery.event.stopPropagation function
+				// since `originalEvent` should point to the original event for the
+				// constancy with other events and for more focused logic
 			}
 		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
+
+		jQuery.event.trigger( e, null, elem );
+
 		if ( e.isDefaultPrevented() ) {
 			event.preventDefault();
 		}
@@ -5339,8 +5491,10 @@ jQuery.event = {
 
 jQuery.removeEvent = document.removeEventListener ?
 	function( elem, type, handle ) {
+
+		// This "if" is needed for plain objects
 		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
+			elem.removeEventListener( type, handle );
 		}
 	} :
 	function( elem, type, handle ) {
@@ -5349,8 +5503,9 @@ jQuery.removeEvent = document.removeEventListener ?
 		if ( elem.detachEvent ) {
 
 			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
+			// detachEvent needed property on element, by name of that event,
+			// to properly expose it to GC
+			if ( typeof elem[ name ] === "undefined" ) {
 				elem[ name ] = null;
 			}
 
@@ -5359,8 +5514,9 @@ jQuery.removeEvent = document.removeEventListener ?
 	};
 
 jQuery.Event = function( src, props ) {
+
 	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
+	if ( !( this instanceof jQuery.Event ) ) {
 		return new jQuery.Event( src, props );
 	}
 
@@ -5371,8 +5527,13 @@ jQuery.Event = function( src, props ) {
 
 		// Events bubbling up the document may have been marked as prevented
 		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+
+				// Support: IE < 9, Android < 4.0
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
 
 	// Event type
 	} else {
@@ -5394,6 +5555,7 @@ jQuery.Event = function( src, props ) {
 // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
 // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
 jQuery.Event.prototype = {
+	constructor: jQuery.Event,
 	isDefaultPrevented: returnFalse,
 	isPropagationStopped: returnFalse,
 	isImmediatePropagationStopped: returnFalse,
@@ -5420,9 +5582,11 @@ jQuery.Event.prototype = {
 		var e = this.originalEvent;
 
 		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
+
+		if ( !e || this.isSimulated ) {
 			return;
 		}
+
 		// If stopPropagation exists, run it on the original event
 		if ( e.stopPropagation ) {
 			e.stopPropagation();
@@ -5433,15 +5597,31 @@ jQuery.Event.prototype = {
 		e.cancelBubble = true;
 	},
 	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
 		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && e.stopImmediatePropagation ) {
+			e.stopImmediatePropagation();
+		}
+
 		this.stopPropagation();
 	}
 };
 
 // Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
+// so that event delegation works in jQuery.
+// Do the same for pointerenter/pointerleave and pointerover/pointerout
+//
+// Support: Safari 7 only
+// Safari sends mouseenter too often; see:
+// https://code.google.com/p/chromium/issues/detail?id=470258
+// for the description of the bug (it existed in older Chrome versions as well).
+jQuery.each( {
 	mouseenter: "mouseover",
-	mouseleave: "mouseout"
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
 }, function( orig, fix ) {
 	jQuery.event.special[ orig ] = {
 		delegateType: fix,
@@ -5453,9 +5633,9 @@ jQuery.each({
 				related = event.relatedTarget,
 				handleObj = event.handleObj;
 
-			// For mousenter/leave call the handler if related is outside the target.
+			// For mouseenter/leave call the handler if related is outside the target.
 			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
 				event.type = handleObj.origType;
 				ret = handleObj.handler.apply( this, arguments );
 				event.type = fix;
@@ -5463,13 +5643,14 @@ jQuery.each({
 			return ret;
 		}
 	};
-});
+} );
 
 // IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
+if ( !support.submit ) {
 
 	jQuery.event.special.submit = {
 		setup: function() {
+
 			// Only need this for delegated form submit events
 			if ( jQuery.nodeName( this, "form" ) ) {
 				return false;
@@ -5477,30 +5658,42 @@ if ( !jQuery.support.submitBubbles ) {
 
 			// Lazy-add a submit handler when a descendant form may potentially be submitted
 			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+
 				// Node name check avoids a VML-related crash in IE (#9807)
 				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ?
+
+						// Support: IE <=8
+						// We use jQuery.prop instead of elem.form
+						// to allow fixing the IE8 delegated submit issue (gh-2332)
+						// by 3rd party polyfills/workarounds.
+						jQuery.prop( elem, "form" ) :
+						undefined;
+
+				if ( form && !jQuery._data( form, "submit" ) ) {
 					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
+						event._submitBubble = true;
+					} );
+					jQuery._data( form, "submit", true );
 				}
-			});
+			} );
+
 			// return undefined since we don't need an event listener
 		},
 
 		postDispatch: function( event ) {
+
 			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
+			if ( event._submitBubble ) {
+				delete event._submitBubble;
 				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
+					jQuery.event.simulate( "submit", this.parentNode, event );
 				}
 			}
 		},
 
 		teardown: function() {
+
 			// Only need this for delegated form submit events
 			if ( jQuery.nodeName( this, "form" ) ) {
 				return false;
@@ -5513,52 +5706,57 @@ if ( !jQuery.support.submitBubbles ) {
 }
 
 // IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
+if ( !support.change ) {
 
 	jQuery.event.special.change = {
 
 		setup: function() {
 
 			if ( rformElems.test( this.nodeName ) ) {
+
 				// IE doesn't fire change on a check/radio until blur; trigger it on click
 				// after a propertychange. Eat the blur-change in special.change.handle.
 				// This still fires onchange a second time for check/radio after blur.
 				if ( this.type === "checkbox" || this.type === "radio" ) {
 					jQuery.event.add( this, "propertychange._change", function( event ) {
 						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
+							this._justChanged = true;
 						}
-					});
+					} );
 					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
+						if ( this._justChanged && !event.isTrigger ) {
+							this._justChanged = false;
 						}
+
 						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
+						jQuery.event.simulate( "change", this, event );
+					} );
 				}
 				return false;
 			}
+
 			// Delegated event; lazy-add a change handler on descendant inputs
 			jQuery.event.add( this, "beforeactivate._change", function( e ) {
 				var elem = e.target;
 
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) {
 					jQuery.event.add( elem, "change._change", function( event ) {
 						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
+							jQuery.event.simulate( "change", this.parentNode, event );
 						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
+					} );
+					jQuery._data( elem, "change", true );
 				}
-			});
+			} );
 		},
 
 		handle: function( event ) {
 			var elem = event.target;
 
 			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+			if ( this !== elem || event.isSimulated || event.isTrigger ||
+				( elem.type !== "radio" && elem.type !== "checkbox" ) ) {
+
 				return event.handleObj.handler.apply( this, arguments );
 			}
 		},
@@ -5571,102 +5769,72 @@ if ( !jQuery.support.changeBubbles ) {
 	};
 }
 
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+// Support: Firefox
+// Firefox doesn't have focus(in | out) events
+// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+//
+// Support: Chrome, Safari
+// focus(in | out) events fire after focus & blur events,
+// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
+if ( !support.focusin ) {
+	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+		};
 
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
 				}
+				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
 			},
 			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					jQuery._removeData( doc, fix );
+				} else {
+					jQuery._data( doc, fix, attaches );
 				}
 			}
 		};
-	});
+	} );
 }
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
+	on: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn );
 	},
 	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
+		return on( this, types, selector, data, fn, 1 );
 	},
 	off: function( types, selector, fn ) {
 		var handleObj, type;
 		if ( types && types.preventDefault && types.handleObj ) {
+
 			// ( event )  dispatched jQuery.Event
 			handleObj = types.handleObj;
 			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.namespace ?
+					handleObj.origType + "." + handleObj.namespace :
+					handleObj.origType,
 				handleObj.selector,
 				handleObj.handler
 			);
 			return this;
 		}
 		if ( typeof types === "object" ) {
+
 			// ( types-object [, selector] )
 			for ( type in types ) {
 				this.off( type, selector, types[ type ] );
@@ -5674,6 +5842,7 @@ jQuery.fn.extend({
 			return this;
 		}
 		if ( selector === false || typeof selector === "function" ) {
+
 			// ( types [, fn] )
 			fn = selector;
 			selector = undefined;
@@ -5681,655 +5850,68 @@ jQuery.fn.extend({
 		if ( fn === false ) {
 			fn = returnFalse;
 		}
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.event.remove( this, types, fn, selector );
-		});
+		} );
 	},
 
 	trigger: function( type, data ) {
-		return this.each(function() {
+		return this.each( function() {
 			jQuery.event.trigger( type, data, this );
-		});
+		} );
 	},
 	triggerHandler: function( type, data ) {
-		var elem = this[0];
+		var elem = this[ 0 ];
 		if ( elem ) {
 			return jQuery.event.trigger( type, data, elem, true );
 		}
 	}
-});
-var isSimple = /^.[^:#\[\.,]*$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
+} );
 
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
 
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
+var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
 
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
+	// Support: IE 10-11, Edge 10240+
+	// In IE/Edge using regex groups here causes severe slowdowns.
+	// See https://connect.microsoft.com/IE/feedback/details/1736512/
+	rnoInnerhtml = /<script|<style|<link/i,
 
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					cur = ret.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		var elem = elems[ 0 ];
-
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 && elem.nodeType === 1 ?
-			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-				return elem.nodeType === 1;
-			}));
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
 	// checked="checked" or checked
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
 	rscriptTypeMasked = /^true\/(.*)/,
 	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
 	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var
-			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
-			args = jQuery.map( this, function( elem ) {
-				return [ elem.nextSibling, elem.parentNode ];
-			}),
-			i = 0;
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			var next = args[ i++ ],
-				parent = args[ i++ ];
-
-			if ( parent ) {
-				// Don't use the snapshot next if it has moved (#13810)
-				if ( next && next.parentNode !== parent ) {
-					next = this.nextSibling;
-				}
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		// Allow new content to include elements from the context set
-		}, true );
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return i ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback, allowIntersection ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback, allowIntersection );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery._evalUrl( node.src );
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
+	fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) );
 
 // Support: IE<8
 // Manipulating tables requires a tbody
 function manipulationTarget( elem, content ) {
 	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
+		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
 
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
+		elem.getElementsByTagName( "tbody" )[ 0 ] ||
+			elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
 		elem;
 }
 
 // Replace/restore the type attribute of script elements for safe DOM manipulation
 function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
+	elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type;
 	return elem;
 }
 function restoreScript( elem ) {
 	var match = rscriptTypeMasked.exec( elem.type );
 	if ( match ) {
-		elem.type = match[1];
+		elem.type = match[ 1 ];
 	} else {
-		elem.removeAttribute("type");
+		elem.removeAttribute( "type" );
 	}
 	return elem;
 }
 
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
 function cloneCopyEvent( src, dest ) {
-
 	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
 		return;
 	}
@@ -6367,7 +5949,7 @@ function fixCloneNodeIssues( src, dest ) {
 	nodeName = dest.nodeName.toLowerCase();
 
 	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
+	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
 		data = jQuery._data( dest );
 
 		for ( e in data.events ) {
@@ -6394,11 +5976,12 @@ function fixCloneNodeIssues( src, dest ) {
 		// element in IE9, the outerHTML strategy above is not sufficient.
 		// If the src has innerHTML and the destination does not,
 		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) {
 			dest.innerHTML = src.innerHTML;
 		}
 
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
+	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+
 		// IE6-8 fails to persist the checked state of a cloned checkbox
 		// or radio button. Worse, IE6-7 fail to give the cloned element
 		// a checked appearance if the defaultChecked value isn't also set
@@ -6423,67 +6006,137 @@ function fixCloneNodeIssues( src, dest ) {
 	}
 }
 
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
+function domManip( collection, args, callback, ignored ) {
 
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
+	// Flatten any nested arrays
+	args = concat.apply( [], args );
 
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
+	var first, node, hasScripts,
+		scripts, doc, fragment,
 		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
+		l = collection.length,
+		iNoClone = l - 1,
+		value = args[ 0 ],
+		isFunction = jQuery.isFunction( value );
 
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
+	// We can't cloneNode fragments that contain checked, in WebKit
+	if ( isFunction ||
+			( l > 1 && typeof value === "string" &&
+				!support.checkClone && rchecked.test( value ) ) ) {
+		return collection.each( function( index ) {
+			var self = collection.eq( index );
+			if ( isFunction ) {
+				args[ 0 ] = value.call( this, index, self.html() );
 			}
+			domManip( self, args, callback, ignored );
+		} );
+	}
+
+	if ( l ) {
+		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+		first = fragment.firstChild;
+
+		if ( fragment.childNodes.length === 1 ) {
+			fragment = first;
+		}
+
+		// Require either new content or an interest in ignored elements to invoke the callback
+		if ( first || ignored ) {
+			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+			hasScripts = scripts.length;
+
+			// Use the original fragment for the last item
+			// instead of the first because it can end up
+			// being emptied incorrectly in certain situations (#8070).
+			for ( ; i < l; i++ ) {
+				node = fragment;
+
+				if ( i !== iNoClone ) {
+					node = jQuery.clone( node, true, true );
+
+					// Keep references to cloned scripts for later restoration
+					if ( hasScripts ) {
+
+						// Support: Android<4.1, PhantomJS<2
+						// push.apply(_, arraylike) throws on ancient WebKit
+						jQuery.merge( scripts, getAll( node, "script" ) );
+					}
+				}
+
+				callback.call( collection[ i ], node, i );
+			}
+
+			if ( hasScripts ) {
+				doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+				// Reenable scripts
+				jQuery.map( scripts, restoreScript );
+
+				// Evaluate executable scripts on first document insertion
+				for ( i = 0; i < hasScripts; i++ ) {
+					node = scripts[ i ];
+					if ( rscriptType.test( node.type || "" ) &&
+						!jQuery._data( node, "globalEval" ) &&
+						jQuery.contains( doc, node ) ) {
+
+						if ( node.src ) {
+
+							// Optional AJAX dependency, but won't run scripts if not present
+							if ( jQuery._evalUrl ) {
+								jQuery._evalUrl( node.src );
+							}
+						} else {
+							jQuery.globalEval(
+								( node.text || node.textContent || node.innerHTML || "" )
+									.replace( rcleanScript, "" )
+							);
+						}
+					}
+				}
+			}
+
+			// Fix #11809: Avoid leaking memory
+			fragment = first = null;
 		}
 	}
 
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
+	return collection;
 }
 
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
+function remove( elem, selector, keepData ) {
+	var node,
+		elems = selector ? jQuery.filter( selector, elem ) : elem,
+		i = 0;
+
+	for ( ; ( node = elems[ i ] ) != null; i++ ) {
+
+		if ( !keepData && node.nodeType === 1 ) {
+			jQuery.cleanData( getAll( node ) );
+		}
+
+		if ( node.parentNode ) {
+			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+				setGlobalEval( getAll( node, "script" ) );
+			}
+			node.parentNode.removeChild( node );
+		}
 	}
+
+	return elem;
 }
 
-jQuery.extend({
+jQuery.extend( {
+	htmlPrefilter: function( html ) {
+		return html.replace( rxhtmlTag, "<$1></$2>" );
+	},
+
 	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
 		var destElements, node, clone, i, srcElements,
 			inPage = jQuery.contains( elem.ownerDocument, elem );
 
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+		if ( support.html5Clone || jQuery.isXMLDoc( elem ) ||
+			!rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+
 			clone = elem.cloneNode( true );
 
 		// IE<=8 does not properly clone detached, unknown element nodes
@@ -6492,18 +6145,19 @@ jQuery.extend({
 			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
 		}
 
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+		if ( ( !support.noCloneEvent || !support.noCloneChecked ) &&
+				( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) {
 
 			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
 			destElements = getAll( clone );
 			srcElements = getAll( elem );
 
 			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+			for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) {
+
 				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
+				if ( destElements[ i ] ) {
+					fixCloneNodeIssues( node, destElements[ i ] );
 				}
 			}
 		}
@@ -6514,8 +6168,8 @@ jQuery.extend({
 				srcElements = srcElements || getAll( elem );
 				destElements = destElements || getAll( clone );
 
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
+				for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) {
+					cloneCopyEvent( node, destElements[ i ] );
 				}
 			} else {
 				cloneCopyEvent( elem, clone );
@@ -6534,144 +6188,16 @@ jQuery.extend({
 		return clone;
 	},
 
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
+	cleanData: function( elems, /* internal */ forceAcceptData ) {
 		var elem, type, id, data,
 			i = 0,
 			internalKey = jQuery.expando,
 			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
+			attributes = support.attributes,
 			special = jQuery.event.special;
 
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
+		for ( ; ( elem = elems[ i ] ) != null; i++ ) {
+			if ( forceAcceptData || acceptData( elem ) ) {
 
 				id = elem[ internalKey ];
 				data = id && cache[ id ];
@@ -6694,153 +6220,662 @@ jQuery.extend({
 
 						delete cache[ id ];
 
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
+						// Support: IE<9
+						// IE does not allow us to delete expando properties from nodes
+						// IE creates expando attributes along with the property
+						// IE does not have a removeAttribute function on Document nodes
+						if ( !attributes && typeof elem.removeAttribute !== "undefined" ) {
 							elem.removeAttribute( internalKey );
 
+						// Webkit & Blink performance suffers when deleting properties
+						// from DOM nodes, so set to undefined instead
+						// https://code.google.com/p/chromium/issues/detail?id=378607
 						} else {
-							elem[ internalKey ] = null;
+							elem[ internalKey ] = undefined;
 						}
 
-						core_deletedIds.push( id );
+						deletedIds.push( id );
 					}
 				}
 			}
 		}
+	}
+} );
+
+jQuery.fn.extend( {
+
+	// Keep domManip exposed until 3.0 (gh-2225)
+	domManip: domManip,
+
+	detach: function( selector ) {
+		return remove( this, selector, true );
 	},
 
-	_evalUrl: function( url ) {
-		return jQuery.ajax({
-			url: url,
-			type: "GET",
-			dataType: "script",
-			async: false,
-			global: false,
-			"throws": true
-		});
-	}
-});
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
+	remove: function( selector ) {
+		return remove( this, selector );
+	},
 
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append(
+					( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value )
+				);
+		}, null, value, arguments.length );
+	},
 
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
+	append: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		} );
+	},
+
+	prepend: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		} );
+	},
+
+	before: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		} );
+	},
+
+	after: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		} );
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; ( elem = this[ i ] ) != null; i++ ) {
+
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem, false ) );
 			}
 
-			wrap.map(function() {
-				var elem = this;
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
 
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
 		}
 
 		return this;
 	},
 
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		} );
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+				value = jQuery.htmlPrefilter( value );
+
+				try {
+					for ( ; i < l; i++ ) {
+
+						// Remove element nodes and prevent memory leaks
+						elem = this[ i ] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch ( e ) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var ignored = [];
+
+		// Make the changes, replacing each non-ignored context element with the new content
+		return domManip( this, arguments, function( elem ) {
+			var parent = this.parentNode;
+
+			if ( jQuery.inArray( this, ignored ) < 0 ) {
+				jQuery.cleanData( getAll( this ) );
+				if ( parent ) {
+					parent.replaceChild( elem, this );
+				}
+			}
+
+		// Force callback invocation
+		}, ignored );
+	}
+} );
+
+jQuery.each( {
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone( true );
+			jQuery( insert[ i ] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			push.apply( ret, elems.get() );
 		}
 
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
+		return this.pushStack( ret );
+	};
+} );
 
-			if ( contents.length ) {
-				contents.wrapAll( html );
 
-			} else {
-				self.append( html );
-			}
-		});
-	},
+var iframe,
+	elemdisplay = {
 
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
+		// Support: Firefox
+		// We have to pre-define these values for FF (#10227)
+		HTML: "block",
+		BODY: "block"
+	};
 
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
 
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+		display = jQuery.css( elem[ 0 ], "display" );
+
+	// We don't have any data stored on the element,
+	// so use "detach" method as fast way to get rid of the element
+	elem.detach();
+
+	return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+
+			// Use the already-created iframe if possible
+			iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
+				.appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
+
+			// Support: IE
+			doc.write();
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
 	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+
+	return display;
+}
+var rmargin = ( /^margin/ );
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+var swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+var documentElement = document.documentElement;
+
+
+
+( function() {
+	var pixelPositionVal, pixelMarginRightVal, boxSizingReliableVal,
+		reliableHiddenOffsetsVal, reliableMarginRightVal, reliableMarginLeftVal,
+		container = document.createElement( "div" ),
+		div = document.createElement( "div" );
+
+	// Finish early in limited (non-browser) environments
+	if ( !div.style ) {
+		return;
+	}
+
+	div.style.cssText = "float:left;opacity:.5";
+
+	// Support: IE<9
+	// Make sure that element opacity exists (as opposed to filter)
+	support.opacity = div.style.opacity === "0.5";
+
+	// Verify style float existence
+	// (IE uses styleFloat instead of cssFloat)
+	support.cssFloat = !!div.style.cssFloat;
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	container = document.createElement( "div" );
+	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
+		"padding:0;margin-top:1px;position:absolute";
+	div.innerHTML = "";
+	container.appendChild( div );
+
+	// Support: Firefox<29, Android 2.3
+	// Vendor-prefix box-sizing
+	support.boxSizing = div.style.boxSizing === "" || div.style.MozBoxSizing === "" ||
+		div.style.WebkitBoxSizing === "";
+
+	jQuery.extend( support, {
+		reliableHiddenOffsets: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableHiddenOffsetsVal;
+		},
+
+		boxSizingReliable: function() {
+
+			// We're checking for pixelPositionVal here instead of boxSizingReliableVal
+			// since that compresses better and they're computed together anyway.
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return boxSizingReliableVal;
+		},
+
+		pixelMarginRight: function() {
+
+			// Support: Android 4.0-4.3
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelMarginRightVal;
+		},
+
+		pixelPosition: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelPositionVal;
+		},
+
+		reliableMarginRight: function() {
+
+			// Support: Android 2.3
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginRightVal;
+		},
+
+		reliableMarginLeft: function() {
+
+			// Support: IE <=8 only, Android 4.0 - 4.3 only, Firefox <=3 - 37
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginLeftVal;
+		}
+	} );
+
+	function computeStyleTests() {
+		var contents, divStyle,
+			documentElement = document.documentElement;
+
+		// Setup
+		documentElement.appendChild( container );
+
+		div.style.cssText =
+
+			// Support: Android 2.3
+			// Vendor-prefix box-sizing
+			"-webkit-box-sizing:border-box;box-sizing:border-box;" +
+			"position:relative;display:block;" +
+			"margin:auto;border:1px;padding:1px;" +
+			"top:1%;width:50%";
+
+		// Support: IE<9
+		// Assume reasonable values in the absence of getComputedStyle
+		pixelPositionVal = boxSizingReliableVal = reliableMarginLeftVal = false;
+		pixelMarginRightVal = reliableMarginRightVal = true;
+
+		// Check for getComputedStyle so that this code is not run in IE<9.
+		if ( window.getComputedStyle ) {
+			divStyle = window.getComputedStyle( div );
+			pixelPositionVal = ( divStyle || {} ).top !== "1%";
+			reliableMarginLeftVal = ( divStyle || {} ).marginLeft === "2px";
+			boxSizingReliableVal = ( divStyle || { width: "4px" } ).width === "4px";
+
+			// Support: Android 4.0 - 4.3 only
+			// Some styles come back with percentage values, even though they shouldn't
+			div.style.marginRight = "50%";
+			pixelMarginRightVal = ( divStyle || { marginRight: "4px" } ).marginRight === "4px";
+
+			// Support: Android 2.3 only
+			// Div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container (#3333)
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			contents = div.appendChild( document.createElement( "div" ) );
+
+			// Reset CSS: box-sizing; display; margin; border; padding
+			contents.style.cssText = div.style.cssText =
+
+				// Support: Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
+			contents.style.marginRight = contents.style.width = "0";
+			div.style.width = "1px";
+
+			reliableMarginRightVal =
+				!parseFloat( ( window.getComputedStyle( contents ) || {} ).marginRight );
+
+			div.removeChild( contents );
+		}
+
+		// Support: IE6-8
+		// First check that getClientRects works as expected
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.style.display = "none";
+		reliableHiddenOffsetsVal = div.getClientRects().length === 0;
+		if ( reliableHiddenOffsetsVal ) {
+			div.style.display = "";
+			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+			div.childNodes[ 0 ].style.borderCollapse = "separate";
+			contents = div.getElementsByTagName( "td" );
+			contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
+			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+			if ( reliableHiddenOffsetsVal ) {
+				contents[ 0 ].style.display = "";
+				contents[ 1 ].style.display = "none";
+				reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+			}
+		}
+
+		// Teardown
+		documentElement.removeChild( container );
+	}
+
+} )();
+
+
+var getStyles, curCSS,
+	rposition = /^(top|right|bottom|left)$/;
+
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+
+		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		var view = elem.ownerDocument.defaultView;
+
+		if ( !view || !view.opener ) {
+			view = window;
+		}
+
+		return view.getComputedStyle( elem );
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var width, minWidth, maxWidth, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+
+		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
+
+		// Support: Opera 12.1x only
+		// Fall back to style even without computed
+		// computed is undefined for elems on document fragments
+		if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) {
+			ret = jQuery.style( elem, name );
+		}
+
+		if ( computed ) {
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value"
+			// instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values,
+			// but width seems to be reliably pixels
+			// this is against the CSSOM draft spec:
+			// http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "";
+	};
+} else if ( documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var left, rs, rsLeft, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+		ret = computed ? computed[ name ] : undefined;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are
+		// proportional to the parent element instead
+		// and we can't measure the parent instead because it
+		// might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "" || "auto";
+	};
+}
+
+
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			if ( conditionFn() ) {
+
+				// Hook not needed (or it's not possible to use it due
+				// to missing dependency), remove it.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+			return ( this.get = hookFn ).apply( this, arguments );
+		}
+	};
+}
+
+
+var
+
+		ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/i,
+
+	// swappable if display is none or starts with table except
+	// "table", "table-cell", or "table-caption"
+	// see here for display values:
+	// https://developer.mozilla.org/en-US/docs/CSS/display
 	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
+	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
 
 	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
+		letterSpacing: "0",
+		fontWeight: "400"
 	},
 
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
+	emptyStyle = document.createElement( "div" ).style;
+
 
 // return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
+function vendorPropName( name ) {
 
 	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
+	if ( name in emptyStyle ) {
 		return name;
 	}
 
 	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
+	var capName = name.charAt( 0 ).toUpperCase() + name.slice( 1 ),
 		i = cssPrefixes.length;
 
 	while ( i-- ) {
 		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
+		if ( name in emptyStyle ) {
 			return name;
 		}
 	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
 }
 
 function showHide( elements, show ) {
@@ -6858,6 +6893,7 @@ function showHide( elements, show ) {
 		values[ index ] = jQuery._data( elem, "olddisplay" );
 		display = elem.style.display;
 		if ( show ) {
+
 			// Reset the inline display of this element to learn if it is
 			// being hidden by cascaded rules or not
 			if ( !values[ index ] && display === "none" ) {
@@ -6868,16 +6904,18 @@ function showHide( elements, show ) {
 			// in a stylesheet to whatever the default browser style is
 			// for such an element
 			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+				values[ index ] =
+					jQuery._data( elem, "olddisplay", defaultDisplay( elem.nodeName ) );
 			}
 		} else {
+			hidden = isHidden( elem );
 
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
+			if ( display && display !== "none" || !hidden ) {
+				jQuery._data(
+					elem,
+					"olddisplay",
+					hidden ? display : jQuery.css( elem, "display" )
+				);
 			}
 		}
 	}
@@ -6897,10 +6935,401 @@ function showHide( elements, show ) {
 	return elements;
 }
 
-jQuery.fn.extend({
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+
+		// If we already have the right measurement, avoid augmentation
+		4 :
+
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = support.boxSizing &&
+			jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test( val ) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox &&
+			( support.boxSizingReliable() || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+jQuery.extend( {
+
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"animationIterationCount": true,
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+
+		// normalize float css property
+		"float": support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Convert "+=" or "-=" to relative numbers (#7345)
+			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+				value = adjustCSS( elem, name, ret );
+
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set. See: #7116
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number was passed in, add the unit (except for certain CSS properties)
+			if ( type === "number" ) {
+				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight
+			// (for every problematic property) identical functions
+			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !( "set" in hooks ) ||
+				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+
+				// Support: IE
+				// Swallow errors from 'invalid' CSS values (#5509)
+				try {
+					style[ name ] = value;
+				} catch ( e ) {}
+			}
+
+		} else {
+
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks &&
+				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || isFinite( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+} );
+
+jQuery.each( [ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+					elem.offsetWidth === 0 ?
+						swap( elem, cssShow, function() {
+							return getWidthOrHeight( elem, name, extra );
+						} ) :
+						getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					support.boxSizing &&
+						jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+} );
+
+if ( !support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+
+			// IE uses filters for opacity
+			return ropacity.test( ( computed && elem.currentStyle ?
+				elem.currentStyle.filter :
+				elem.style.filter ) || "" ) ?
+					( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+					computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist -
+			// attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule
+				// or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
+	function( elem, computed ) {
+		if ( computed ) {
+			return swap( elem, { "display": "inline-block" },
+				curCSS, [ elem, "marginRight" ] );
+		}
+	}
+);
+
+jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+	function( elem, computed ) {
+		if ( computed ) {
+			return (
+				parseFloat( curCSS( elem, "marginLeft" ) ) ||
+
+				// Support: IE<=11+
+				// Running getBoundingClientRect on a disconnected node in IE throws an error
+				// Support: IE8 only
+				// getClientRects() errors on disconnected elems
+				( jQuery.contains( elem.ownerDocument, elem ) ?
+					elem.getBoundingClientRect().left -
+						swap( elem, { marginLeft: 0 }, function() {
+							return elem.getBoundingClientRect().left;
+						} ) :
+					0
+				)
+			) + "px";
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each( {
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split( " " ) : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+} );
+
+jQuery.fn.extend( {
 	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
+		return access( this, function( elem, name, value ) {
+			var styles, len,
 				map = {},
 				i = 0;
 
@@ -6931,629 +7360,1621 @@ jQuery.fn.extend({
 			return state ? this.show() : this.hide();
 		}
 
-		return this.each(function() {
+		return this.each( function() {
 			if ( isHidden( this ) ) {
 				jQuery( this ).show();
 			} else {
 				jQuery( this ).hide();
 			}
-		});
+		} );
 	}
-});
+} );
 
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || jQuery.easing._default;
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			// Use a property on the element directly when it is not a DOM element,
+			// or when there is no matching style property that exists.
+			if ( tween.elem.nodeType !== 1 ||
+				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.nodeType === 1 &&
+				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
+					jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9
+// Panic based approach to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	},
+	_default: "swing"
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rrun = /queueHooks$/;
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	window.setTimeout( function() {
+		fxNow = undefined;
+	} );
+	return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+
+			// we're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	/* jshint validthis: true */
+	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHidden( elem ),
+		dataShow = jQuery._data( elem, "fxshow" );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always( function() {
+
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always( function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			} );
+		} );
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		display = jQuery.css( elem, "display" );
+
+		// Test default display if display is currently "none"
+		checkDisplay = display === "none" ?
+			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !support.shrinkWrapBlocks() ) {
+			anim.always( function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			} );
+		}
+	}
+
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// If there is dataShow left over from a stopped hide or show
+				// and we are going to proceed with show, we should pretend to be hidden
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+
+		// Any non-fx value stops us from restoring the original display value
+		} else {
+			display = undefined;
+		}
+	}
+
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
+			}
+		} else {
+			dataShow = jQuery._data( elem, "fxshow", {} );
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done( function() {
+				jQuery( elem ).hide();
+			} );
+		}
+		anim.done( function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		} );
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
 				}
 			}
 		}
+
+	// If this is a noop like .hide().hide(), restore an overwritten display value
+	} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
+		style.display = display;
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = Animation.prefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		} ),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+
+				// Support: Android 2.3
+				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ] );
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise( {
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, {
+				specialEasing: {},
+				easing: jQuery.easing._default
+			}, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.notifyWith( elem, [ animation, 1, 0 ] );
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		} ),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			if ( jQuery.isFunction( result.stop ) ) {
+				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+					jQuery.proxy( result.stop, result );
+			}
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		} )
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweeners: {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value );
+			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+			return tween;
+		} ]
 	},
 
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.match( rnotwhite );
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+			Animation.tweeners[ prop ].unshift( callback );
+		}
 	},
 
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
+	prefilters: [ defaultPrefilter ],
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			Animation.prefilters.unshift( callback );
+		} else {
+			Animation.prefilters.push( callback );
+		}
+	}
+} );
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ?
+			jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend( {
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate( { opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each( function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this &&
+					( type == null || timers[ index ].queue === type ) ) {
+
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		} );
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each( function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		} );
+	}
+} );
+
+jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+} );
+
+// Generate shortcuts for custom animations
+jQuery.each( {
+	slideDown: genFx( "show" ),
+	slideUp: genFx( "hide" ),
+	slideToggle: genFx( "toggle" ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+} );
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	if ( timer() ) {
+		jQuery.fx.start();
+	} else {
+		jQuery.timers.pop();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	window.clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = window.setTimeout( next, time );
+		hooks.stop = function() {
+			window.clearTimeout( timeout );
+		};
+	} );
+};
+
+
+( function() {
+	var a,
+		input = document.createElement( "input" ),
+		div = document.createElement( "div" ),
+		select = document.createElement( "select" ),
+		opt = select.appendChild( document.createElement( "option" ) );
+
+	// Setup
+	div = document.createElement( "div" );
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// Support: Windows Web Apps (WWA)
+	// `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "checkbox" );
+	div.appendChild( input );
+
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// First batch of tests.
+	a.style.cssText = "top:1px";
+
+	// Test setAttribute on camelCase class.
+	// If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+	support.getSetAttribute = div.className !== "t";
+
+	// Get the style information from getAttribute
+	// (IE uses .cssText instead)
+	support.style = /top/.test( a.getAttribute( "style" ) );
+
+	// Make sure that URLs aren't manipulated
+	// (IE normalizes it by default)
+	support.hrefNormalized = a.getAttribute( "href" ) === "/a";
+
+	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+	support.checkOn = !!input.value;
+
+	// Make sure that a selected-by-default option has a working selected property.
+	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+	support.optSelected = opt.selected;
+
+	// Tests for enctype support on a form (#6743)
+	support.enctype = !!document.createElement( "form" ).enctype;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE8 only
+	// Check if we can trust getAttribute("value")
+	input = document.createElement( "input" );
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
+
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+} )();
+
+
+var rreturn = /\r/g,
+	rspaces = /[\x20\t\r\n\f]+/g;
+
+jQuery.fn.extend( {
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[ 0 ];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] ||
+					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if (
+					hooks &&
+					"get" in hooks &&
+					( ret = hooks.get( elem, "value" ) ) !== undefined
+				) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+
+					// handle most common string cases
+					ret.replace( rreturn, "" ) :
+
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
 
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
 			return;
 		}
 
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
+		isFunction = jQuery.isFunction( value );
 
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+		return this.each( function( i ) {
+			var val;
 
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
+			if ( this.nodeType !== 1 ) {
 				return;
 			}
 
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
 			}
 
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				} );
 			}
 
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
 
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+
+					// Support: IE10-11+
+					// option.text throws exceptions (#14686, #14858)
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+
+							// Don't return options that are disabled or in a disabled optgroup
+							( support.optDisabled ?
+								!option.disabled :
+								option.getAttribute( "disabled" ) === null ) &&
+							( !option.parentNode.disabled ||
+								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+
+					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {
+
+						// Support: IE6
+						// When new option element is added to select box we need to
+						// force reflow of newly added node in order to workaround delay
+						// of initialization properties
+						try {
+							option.selected = optionSet = true;
+
+						} catch ( _ ) {
+
+							// Will be executed only in IE6
+							option.scrollHeight;
+						}
+
+					} else {
+						option.selected = false;
+					}
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+
+				return options;
+			}
+		}
+	}
+} );
+
+// Radios and checkboxes getter/setter
+jQuery.each( [ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+		};
+	}
+} );
+
+
+
+
+var nodeHook, boolHook,
+	attrHandle = jQuery.expr.attrHandle,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = support.getSetAttribute,
+	getSetInput = support.input;
+
+jQuery.fn.extend( {
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each( function() {
+			jQuery.removeAttr( this, name );
+		} );
+	}
+} );
+
+jQuery.extend( {
+	attr: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set attributes on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
 			}
 
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
 				return ret;
 			}
 
-			// Otherwise just get the value from the style object
-			return style[ name ];
+			elem.setAttribute( name, value + "" );
+			return value;
 		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		ret = jQuery.find.attr( elem, name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return ret == null ? undefined : ret;
 	},
 
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" &&
+					jQuery.nodeName( elem, "input" ) ) {
 
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-// Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
-				}
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
+					// Setting the type on a radio button after the value resets the value in IE8-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
 					}
+					return value;
 				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
 			}
-
-			return expanded;
 		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
 	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
 
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( rnotwhite );
 
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( ( name = attrNames[ i++ ] ) ) {
+				propName = jQuery.propFix[ name ] || name;
 
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
+				// Boolean attributes get special treatment (#10870)
+				if ( jQuery.expr.match.bool.test( name ) ) {
 
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
+					// Set corresponding property to false
+					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+						elem[ propName ] = false;
 
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
+					// Support: IE<9
+					// Also clear defaultChecked/defaultSelected (if appropriate)
+					} else {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
 		}
 	}
+} );
 
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		} else {
+
+			// Support: IE<9
+			// Use defaultChecked and defaultSelected for oldIE
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+		return name;
+	}
 };
 
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = attrHandle[ name ] || jQuery.find.attr;
 
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
+	if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+		attrHandle[ name ] = function( elem, name, isXML ) {
+			var ret, handle;
+			if ( !isXML ) {
 
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+				// Avoid an infinite loop by temporarily removing this function from the getter
+				handle = attrHandle[ name ];
+				attrHandle[ name ] = ret;
+				ret = getter( elem, name, isXML ) != null ?
+					name.toLowerCase() :
+					null;
+				attrHandle[ name ] = handle;
 			}
-		});
+			return ret;
+		};
+	} else {
+		attrHandle[ name ] = function( elem, name, isXML ) {
+			if ( !isXML ) {
+				return elem[ jQuery.camelCase( "default-" + name ) ] ?
+					name.toLowerCase() :
+					null;
+			}
+		};
+	}
+} );
 
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+// fix oldIE attroperties
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = {
+		set: function( elem, value, name ) {
+
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					( ret = elem.ownerDocument.createAttribute( name ) )
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			if ( name === "value" || value === elem.getAttribute( name ) ) {
+				return value;
+			}
+		}
+	};
+
+	// Some attributes are constructed with empty-string values when not defined
+	attrHandle.id = attrHandle.name = attrHandle.coords =
+		function( elem, name, isXML ) {
+			var ret;
+			if ( !isXML ) {
+				return ( ret = elem.getAttributeNode( name ) ) && ret.value !== "" ?
+					ret.value :
+					null;
+			}
+		};
+
+	// Fixing value retrieval on a button requires this module
+	jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			if ( ret && ret.specified ) {
+				return ret.value;
+			}
+		},
+		set: nodeHook.set
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each( [ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		};
+	} );
+}
+
+if ( !support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case sensitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend( {
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each( function() {
+
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch ( e ) {}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	prop: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set properties on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
 		}
 
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			return ( elem[ name ] = value );
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		return elem[ name ];
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+
+				// elem.tabIndex doesn't always return the
+				// correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				return tabindex ?
+					parseInt( tabindex, 10 ) :
+					rfocusable.test( elem.nodeName ) ||
+						rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							-1;
+			}
+		}
+	},
+
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
 	}
+} );
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !support.hrefNormalized ) {
+
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each( [ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	} );
 }
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+
+// Support: Safari, IE9+
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		},
+		set: function( elem ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	};
+}
+
+jQuery.each( [
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+} );
+
+// IE6/7 call enctype encoding
+if ( !support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+
+
+
+var rclass = /[\t\r\n\f]/g;
+
+function getClass( elem ) {
+	return jQuery.attr( elem, "class" ) || "";
+}
+
+jQuery.fn.extend( {
+	addClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnotwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+				cur = elem.nodeType === 1 &&
+					( " " + curValue + " " ).replace( rclass, " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( curValue !== finalValue ) {
+						jQuery.attr( elem, "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( !arguments.length ) {
+			return this.attr( "class", "" );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnotwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 &&
+					( " " + curValue + " " ).replace( rclass, " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( curValue !== finalValue ) {
+						jQuery.attr( elem, "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).toggleClass(
+					value.call( this, i, getClass( this ), stateVal ),
+					stateVal
+				);
+			} );
+		}
+
+		return this.each( function() {
+			var className, i, self, classNames;
+
+			if ( type === "string" ) {
+
+				// Toggle individual class names
+				i = 0;
+				self = jQuery( this );
+				classNames = value.match( rnotwhite ) || [];
+
+				while ( ( className = classNames[ i++ ] ) ) {
+
+					// Check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( value === undefined || type === "boolean" ) {
+				className = getClass( this );
+				if ( className ) {
+
+					// store className if set
+					jQuery._data( this, "__className__", className );
+				}
+
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				jQuery.attr( this, "class",
+					className || value === false ?
+					"" :
+					jQuery._data( this, "__className__" ) || ""
+				);
+			}
+		} );
+	},
+
+	hasClass: function( selector ) {
+		var className, elem,
+			i = 0;
+
+		className = " " + selector + " ";
+		while ( ( elem = this[ i++ ] ) ) {
+			if ( elem.nodeType === 1 &&
+				( " " + getClass( elem ) + " " ).replace( rclass, " " )
+					.indexOf( className ) > -1
+			) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+} );
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+	"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
+	function( i, name ) {
 
 	// Handle event binding
 	jQuery.fn[ name ] = function( data, fn ) {
@@ -7561,46 +8982,107 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
 			this.on( name, null, data, fn ) :
 			this.trigger( name );
 	};
-});
+} );
 
-jQuery.fn.extend({
+jQuery.fn.extend( {
 	hover: function( fnOver, fnOut ) {
 		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
 	}
-});
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
+} );
 
-	ajax_rquery = /\?/,
+
+var location = window.location;
+
+var nonce = jQuery.now();
+
+var rquery = ( /\?/ );
+
+
+
+var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
+
+jQuery.parseJSON = function( data ) {
+
+	// Attempt to parse using the native JSON parser first
+	if ( window.JSON && window.JSON.parse ) {
+
+		// Support: Android 2.3
+		// Workaround failure to string-cast null input
+		return window.JSON.parse( data + "" );
+	}
+
+	var requireNonComma,
+		depth = null,
+		str = jQuery.trim( data + "" );
+
+	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
+	// after removing valid tokens
+	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
+
+		// Force termination if we see a misplaced comma
+		if ( requireNonComma && comma ) {
+			depth = 0;
+		}
+
+		// Perform no more replacements after returning to outermost depth
+		if ( depth === 0 ) {
+			return token;
+		}
+
+		// Commas must not follow "[", "{", or ","
+		requireNonComma = open || comma;
+
+		// Determine new depth
+		// array/object open ("[" or "{"): depth += true - false (increment)
+		// array/object close ("]" or "}"): depth += false - true (decrement)
+		// other cases ("," or primitive): depth += true - true (numeric cast)
+		depth += !close - !open;
+
+		// Remove this token
+		return "";
+	} ) ) ?
+		( Function( "return " + str ) )() :
+		jQuery.error( "Invalid JSON: " + data );
+};
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml, tmp;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	try {
+		if ( window.DOMParser ) { // Standard
+			tmp = new window.DOMParser();
+			xml = tmp.parseFromString( data, "text/xml" );
+		} else { // IE
+			xml = new window.ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+	} catch ( e ) {
+		xml = undefined;
+	}
+	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+		jQuery.error( "Invalid XML: " + data );
+	}
+	return xml;
+};
+
+
+var
 	rhash = /#.*$/,
 	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+
+	// IE leaves an \r character at EOL
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg,
+
 	// #7653, #8125, #8152: local protocol detection
 	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
 	rnoContent = /^(?:GET|HEAD)$/,
 	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
+	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
 
 	/* Prefilters
 	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
@@ -7621,22 +9103,13 @@ var
 	transports = {},
 
 	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
+	allTypes = "*/".concat( "*" ),
 
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
+	// Document location
+	ajaxLocation = location.href,
 
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+	// Segment location into parts
+	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
 function addToPrefiltersOrTransports( structure ) {
@@ -7651,19 +9124,21 @@ function addToPrefiltersOrTransports( structure ) {
 
 		var dataType,
 			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
 
 		if ( jQuery.isFunction( func ) ) {
+
 			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
+			while ( ( dataType = dataTypes[ i++ ] ) ) {
+
 				// Prepend if requested
-				if ( dataType[0] === "+" ) {
+				if ( dataType.charAt( 0 ) === "+" ) {
 					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
 
 				// Otherwise append
 				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
 				}
 			}
 		}
@@ -7681,14 +9156,16 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX
 		inspected[ dataType ] = true;
 		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
 			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+			if ( typeof dataTypeOrTransport === "string" &&
+				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+
 				options.dataTypes.unshift( dataTypeOrTransport );
 				inspect( dataTypeOrTransport );
 				return false;
 			} else if ( seekingTransport ) {
 				return !( selected = dataTypeOrTransport );
 			}
-		});
+		} );
 		return selected;
 	}
 
@@ -7704,7 +9181,7 @@ function ajaxExtend( target, src ) {
 
 	for ( key in src ) {
 		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
 		}
 	}
 	if ( deep ) {
@@ -7714,71 +9191,164 @@ function ajaxExtend( target, src ) {
 	return target;
 }
 
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while ( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
+		}
 	}
 
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
 	}
 
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
 
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
 
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
 	}
 
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
 
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
 
-			// Save response for use in complete callback
-			response = arguments;
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
 
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
 	}
 
-	return this;
-};
+	current = dataTypes.shift();
 
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
+	// Convert to each sequential dataType
+	while ( current ) {
 
-jQuery.extend({
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+			// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s[ "throws" ] ) { // jscs:ignore requireDotNotation
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return {
+								state: "parsererror",
+								error: conv ? e : "No conversion from " + prev + " to " + current
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+
+jQuery.extend( {
 
 	// Counter for holding the number of active queries
 	active: 0,
@@ -7816,9 +9386,9 @@ jQuery.extend({
 		},
 
 		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
+			xml: /\bxml\b/,
+			html: /\bhtml/,
+			json: /\bjson\b/
 		},
 
 		responseFields: {
@@ -7882,14 +9452,20 @@ jQuery.extend({
 		// Force options to be an object
 		options = options || {};
 
-		var // Cross-domain detection vars
+		var
+
+			// Cross-domain detection vars
 			parts,
+
 			// Loop variable
 			i,
+
 			// URL without anti-cache param
 			cacheURL,
+
 			// Response headers as string
 			responseHeadersString,
+
 			// timeout handle
 			timeoutTimer,
 
@@ -7897,28 +9473,39 @@ jQuery.extend({
 			fireGlobals,
 
 			transport,
+
 			// Response headers
 			responseHeaders,
+
 			// Create the final options object
 			s = jQuery.ajaxSetup( {}, options ),
+
 			// Callbacks context
 			callbackContext = s.context || s,
+
 			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
+			globalEventContext = s.context &&
+				( callbackContext.nodeType || callbackContext.jquery ) ?
+					jQuery( callbackContext ) :
+					jQuery.event,
+
 			// Deferreds
 			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+
 			// Status-dependent callbacks
 			statusCode = s.statusCode || {},
+
 			// Headers (they are sent all at once)
 			requestHeaders = {},
 			requestHeadersNames = {},
+
 			// The jqXHR state
 			state = 0,
+
 			// Default abort message
 			strAbort = "canceled",
+
 			// Fake xhr
 			jqXHR = {
 				readyState: 0,
@@ -7929,8 +9516,8 @@ jQuery.extend({
 					if ( state === 2 ) {
 						if ( !responseHeaders ) {
 							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
 							}
 						}
 						match = responseHeaders[ key.toLowerCase() ];
@@ -7967,10 +9554,12 @@ jQuery.extend({
 					if ( map ) {
 						if ( state < 2 ) {
 							for ( code in map ) {
+
 								// Lazy-add the new callback in a way that preserves old ones
 								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
 							}
 						} else {
+
 							// Execute the appropriate callbacks
 							jqXHR.always( map[ jqXHR.status ] );
 						}
@@ -7998,13 +9587,15 @@ jQuery.extend({
 		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
 		// Handle falsy url in the settings object (#10093: consistency with old signature)
 		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+		s.url = ( ( url || s.url || ajaxLocation ) + "" )
+			.replace( rhash, "" )
+			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
 
 		// Alias method option to type as per ticket #12004
 		s.type = options.method || options.type || s.method || s.type;
 
 		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
 
 		// A cross-domain request is in order when we have a protocol:host:port mismatch
 		if ( s.crossDomain == null ) {
@@ -8030,11 +9621,12 @@ jQuery.extend({
 		}
 
 		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
 
 		// Watch for a new set of requests
 		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
+			jQuery.event.trigger( "ajaxStart" );
 		}
 
 		// Uppercase the type
@@ -8052,7 +9644,8 @@ jQuery.extend({
 
 			// If data is available, append data to url
 			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+
 				// #9682: remove data so that it's not used in an eventual retry
 				delete s.data;
 			}
@@ -8062,10 +9655,10 @@ jQuery.extend({
 				s.url = rts.test( cacheURL ) ?
 
 					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+					cacheURL.replace( rts, "$1_=" + nonce++ ) :
 
 					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
 			}
 		}
 
@@ -8087,8 +9680,9 @@ jQuery.extend({
 		// Set the Accepts header for the server, depending on the dataType
 		jqXHR.setRequestHeader(
 			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+				s.accepts[ s.dataTypes[ 0 ] ] +
+					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
 				s.accepts[ "*" ]
 		);
 
@@ -8098,7 +9692,9 @@ jQuery.extend({
 		}
 
 		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+		if ( s.beforeSend &&
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+
 			// Abort if not done already and return
 			return jqXHR.abort();
 		}
@@ -8124,10 +9720,16 @@ jQuery.extend({
 			if ( fireGlobals ) {
 				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
 			}
+
+			// If request was aborted inside ajaxSend, stop there
+			if ( state === 2 ) {
+				return jqXHR;
+			}
+
 			// Timeout
 			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
+				timeoutTimer = window.setTimeout( function() {
+					jqXHR.abort( "timeout" );
 				}, s.timeout );
 			}
 
@@ -8135,9 +9737,11 @@ jQuery.extend({
 				state = 1;
 				transport.send( requestHeaders, done );
 			} catch ( e ) {
+
 				// Propagate exception as error if not done
 				if ( state < 2 ) {
 					done( -1, e );
+
 				// Simply rethrow otherwise
 				} else {
 					throw e;
@@ -8160,7 +9764,7 @@ jQuery.extend({
 
 			// Clear timeout if it exists
 			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
+				window.clearTimeout( timeoutTimer );
 			}
 
 			// Dereference transport for early garbage collection
@@ -8189,11 +9793,11 @@ jQuery.extend({
 
 				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
+					modified = jqXHR.getResponseHeader( "Last-Modified" );
 					if ( modified ) {
 						jQuery.lastModified[ cacheURL ] = modified;
 					}
-					modified = jqXHR.getResponseHeader("etag");
+					modified = jqXHR.getResponseHeader( "etag" );
 					if ( modified ) {
 						jQuery.etag[ cacheURL ] = modified;
 					}
@@ -8215,6 +9819,7 @@ jQuery.extend({
 					isSuccess = !error;
 				}
 			} else {
+
 				// We extract error from statusText
 				// then normalize statusText and status for non-aborts
 				error = statusText;
@@ -8251,9 +9856,10 @@ jQuery.extend({
 
 			if ( fireGlobals ) {
 				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+
 				// Handle the global AJAX counter
 				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
+					jQuery.event.trigger( "ajaxStop" );
 				}
 			}
 		}
@@ -8268,10 +9874,11 @@ jQuery.extend({
 	getScript: function( url, callback ) {
 		return jQuery.get( url, undefined, callback, "script" );
 	}
-});
+} );
 
 jQuery.each( [ "get", "post" ], function( i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
+
 		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
@@ -8279,172 +9886,486 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 			data = undefined;
 		}
 
-		return jQuery.ajax({
+		// The url can be an options object (which then must have .url)
+		return jQuery.ajax( jQuery.extend( {
 			url: url,
 			type: method,
 			dataType: type,
 			data: data,
 			success: callback
-		});
+		}, jQuery.isPlainObject( url ) && url ) );
 	};
-});
+} );
 
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
 
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+jQuery._evalUrl = function( url ) {
+	return jQuery.ajax( {
+		url: url,
+
+		// Make this explicit, since user can override this through ajaxSetup (#11264)
+		type: "GET",
+		dataType: "script",
+		cache: true,
+		async: false,
+		global: false,
+		"throws": true
+	} );
+};
+
+
+jQuery.fn.extend( {
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapAll( html.call( this, i ) );
+			} );
 		}
-	}
 
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
+		if ( this[ 0 ] ) {
+
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+
+			if ( this[ 0 ].parentNode ) {
+				wrap.insertBefore( this[ 0 ] );
 			}
-		}
-	}
 
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
+			wrap.map( function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			} ).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapInner( html.call( this, i ) );
+			} );
+		}
+
+		return this.each( function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		} );
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each( function( i ) {
+			jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
+		} );
+	},
+
+	unwrap: function() {
+		return this.parent().each( function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		} ).end();
+	}
+} );
+
+
+function getDisplay( elem ) {
+	return elem.style && elem.style.display || jQuery.css( elem, "display" );
+}
+
+function filterHidden( elem ) {
+
+	// Disconnected elements are considered hidden
+	if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
+		return true;
+	}
+	while ( elem && elem.nodeType === 1 ) {
+		if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
+			return true;
+		}
+		elem = elem.parentNode;
+	}
+	return false;
+}
+
+jQuery.expr.filters.hidden = function( elem ) {
+
+	// Support: Opera <= 12.12
+	// Opera reports offsetWidths and offsetHeights less than zero on some elements
+	return support.reliableHiddenOffsets() ?
+		( elem.offsetWidth <= 0 && elem.offsetHeight <= 0 &&
+			!elem.getClientRects().length ) :
+			filterHidden( elem );
+};
+
+jQuery.expr.filters.visible = function( elem ) {
+	return !jQuery.expr.filters.hidden( elem );
+};
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams(
+					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+					v,
+					traditional,
+					add
+				);
+			}
+		} );
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
 	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
 
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
+		// Serialize scalar item.
+		add( prefix, obj );
 	}
 }
 
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
 
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		} );
+
+	} else {
+
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
 		}
 	}
 
-	current = dataTypes.shift();
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
 
-	// Convert to each sequential dataType
-	while ( current ) {
+jQuery.fn.extend( {
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map( function() {
 
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		} )
+		.filter( function() {
+			var type = this.type;
+
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		} )
+		.map( function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ) {
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					} ) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		} ).get();
+	}
+} );
+
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
+
+	// Support: IE6-IE8
+	function() {
+
+		// XHR cannot access local files, always use ActiveX for that case
+		if ( this.isLocal ) {
+			return createActiveXHR();
 		}
 
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
+		// Support: IE 9-11
+		// IE seems to error on cross-domain PATCH requests when ActiveX XHR
+		// is used. In IE 9+ always use the native XHR.
+		// Note: this condition won't catch Edge as it doesn't define
+		// document.documentMode but it also doesn't support ActiveX so it won't
+		// reach this code.
+		if ( document.documentMode > 8 ) {
+			return createStandardXHR();
 		}
 
-		prev = current;
-		current = dataTypes.shift();
+		// Support: IE<9
+		// oldIE XHR does not support non-RFC2616 methods (#13240)
+		// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
+		// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
+		// Although this check for six methods instead of eight
+		// since IE also does not support "trace" and "connect"
+		return /^(get|post|head|put|delete|options)$/i.test( this.type ) &&
+			createStandardXHR() || createActiveXHR();
+	} :
 
-		if ( current ) {
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
 
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
+var xhrId = 0,
+	xhrCallbacks = {},
+	xhrSupported = jQuery.ajaxSettings.xhr();
 
-				current = prev;
+// Support: IE<10
+// Open requests must be manually aborted on unload (#5280)
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
+	} );
+}
 
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
+// Determine support properties
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = support.ajax = !!xhrSupported;
 
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
 
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
+	jQuery.ajaxTransport( function( options ) {
 
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !options.crossDomain || support.cors ) {
 
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
+			var callback;
 
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
+			return {
+				send: function( headers, complete ) {
+					var i,
+						xhr = options.xhr(),
+						id = ++xhrId;
+
+					// Open the socket
+					xhr.open(
+						options.type,
+						options.url,
+						options.async,
+						options.username,
+						options.password
+					);
+
+					// Apply custom fields if provided
+					if ( options.xhrFields ) {
+						for ( i in options.xhrFields ) {
+							xhr[ i ] = options.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( options.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( options.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Set headers
+					for ( i in headers ) {
+
+						// Support: IE<9
+						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
+						// request header to a null-value.
+						//
+						// To keep consistent with other XHR implementations, cast the value
+						// to string and ignore `undefined`.
+						if ( headers[ i ] !== undefined ) {
+							xhr.setRequestHeader( i, headers[ i ] + "" );
+						}
+					}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( options.hasContent && options.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, statusText, responses;
+
+						// Was never called and is aborted or complete
+						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+							// Clean up
+							delete xhrCallbacks[ id ];
+							callback = undefined;
+							xhr.onreadystatechange = jQuery.noop;
+
+							// Abort manually if needed
+							if ( isAbort ) {
+								if ( xhr.readyState !== 4 ) {
+									xhr.abort();
+								}
+							} else {
+								responses = {};
+								status = xhr.status;
+
+								// Support: IE<10
+								// Accessing binary-data responseText throws an exception
+								// (#11426)
+								if ( typeof xhr.responseText === "string" ) {
+									responses.text = xhr.responseText;
+								}
+
+								// Firefox throws an exception when accessing
+								// statusText for faulty cross-domain requests
+								try {
+									statusText = xhr.statusText;
+								} catch ( e ) {
+
+									// We normalize with Webkit giving an empty statusText
+									statusText = "";
+								}
+
+								// Filter status for non standard behaviors
+
+								// If the request is local and we have data: assume a success
+								// (success with no data won't get notified, that's the best we
+								// can do given current implementations)
+								if ( !status && options.isLocal && !options.crossDomain ) {
+									status = responses.text ? 200 : 404;
+
+								// IE - #1450: sometimes returns 1223 when it should be 204
+								} else if ( status === 1223 ) {
+									status = 204;
 								}
-								break;
 							}
 						}
-					}
-				}
 
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
 						}
+					};
+
+					// Do send the request
+					// `xhr.send` may raise an exception, but it will be
+					// handled in jQuery.ajax (so no try/catch here)
+					if ( !options.async ) {
+
+						// If we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						window.setTimeout( callback );
+					} else {
+
+						// Register the callback, but delay it in case `xhr.send` throws
+						// Add to the list of active xhr callbacks
+						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
 					}
 				}
-			}
+			};
 		}
-	}
-
-	return { state: "success", data: response };
+	} );
 }
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch ( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch ( e ) {}
+}
+
+
+
+
 // Install script dataType
-jQuery.ajaxSetup({
+jQuery.ajaxSetup( {
 	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+		script: "text/javascript, application/javascript, " +
+			"application/ecmascript, application/x-ecmascript"
 	},
 	contents: {
-		script: /(?:java|ecma)script/
+		script: /\b(?:java|ecma)script\b/
 	},
 	converters: {
 		"text script": function( text ) {
@@ -8452,7 +10373,7 @@ jQuery.ajaxSetup({
 			return text;
 		}
 	}
-});
+} );
 
 // Handle cache's special case and global
 jQuery.ajaxPrefilter( "script", function( s ) {
@@ -8463,22 +10384,22 @@ jQuery.ajaxPrefilter( "script", function( s ) {
 		s.type = "GET";
 		s.global = false;
 	}
-});
+} );
 
 // Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
+jQuery.ajaxTransport( "script", function( s ) {
 
 	// This transport only deals with cross domain requests
 	if ( s.crossDomain ) {
 
 		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
+			head = document.head || jQuery( "head" )[ 0 ] || document.documentElement;
 
 		return {
 
 			send: function( _, callback ) {
 
-				script = document.createElement("script");
+				script = document.createElement( "script" );
 
 				script.async = true;
 
@@ -8523,19 +10444,23 @@ jQuery.ajaxTransport( "script", function(s) {
 			}
 		};
 	}
-});
+} );
+
+
+
+
 var oldCallbacks = [],
 	rjsonp = /(=)\?(?=&|$)|\?\?/;
 
 // Default jsonp settings
-jQuery.ajaxSetup({
+jQuery.ajaxSetup( {
 	jsonp: "callback",
 	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
 		this[ callback ] = true;
 		return callback;
 	}
-});
+} );
 
 // Detect, normalize options and install callbacks for jsonp requests
 jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
@@ -8543,7 +10468,10 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 	var callbackName, overwritten, responseContainer,
 		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
 			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+			typeof s.data === "string" &&
+				( s.contentType || "" )
+					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+				rjsonp.test( s.data ) && "data"
 		);
 
 	// Handle iff the expected data type is "jsonp" or we have a parameter to set
@@ -8558,11 +10486,11 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 		if ( jsonProp ) {
 			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
 		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
 		}
 
 		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
+		s.converters[ "script json" ] = function() {
 			if ( !responseContainer ) {
 				jQuery.error( callbackName + " was not called" );
 			}
@@ -8579,12 +10507,20 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 		};
 
 		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
+		jqXHR.always( function() {
+
+			// If previous value didn't exist - remove it
+			if ( overwritten === undefined ) {
+				jQuery( window ).removeProp( callbackName );
+
+			// Otherwise restore preexisting value
+			} else {
+				window[ callbackName ] = overwritten;
+			}
 
 			// Save back as free
 			if ( s[ callbackName ] ) {
+
 				// make sure that re-using the options doesn't screw things around
 				s.jsonpCallback = originalSettings.jsonpCallback;
 
@@ -8598,1006 +10534,179 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 			}
 
 			responseContainer = overwritten = undefined;
-		});
+		} );
 
 		// Delegate to script
 		return "script";
 	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
+} );
+
+
+
+
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context,
+// defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	if ( typeof context === "boolean" ) {
+		keepScripts = context;
+		context = false;
+	}
+	context = context || document;
+
+	var parsed = rsingleTag.exec( data ),
+		scripts = !keepScripts && [];
+
+	// Single tag
+	if ( parsed ) {
+		return [ context.createElement( parsed[ 1 ] ) ];
+	}
+
+	parsed = buildFragment( [ data ], context, scripts );
+
+	if ( scripts && scripts.length ) {
+		jQuery( scripts ).remove();
+	}
+
+	return jQuery.merge( [], parsed.childNodes );
+};
+
+
+// Keep a copy of the old load method
+var _load = jQuery.fn.load;
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, type, response,
+		self = this,
+		off = url.indexOf( " " );
+
+	if ( off > -1 ) {
+		selector = jQuery.trim( url.slice( off, url.length ) );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax( {
+			url: url,
+
+			// If "type" variable is undefined, then "GET" method will be used.
+			// Make value of this field explicit since
+			// user can override it through ajaxSetup method
+			type: type || "GET",
+			dataType: "html",
+			data: params
+		} ).done( function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		// If the request succeeds, this function gets "data", "status", "jqXHR"
+		// but they are ignored because response was set above.
+		// If it fails, this function gets "jqXHR", "status", "error"
+		} ).always( callback && function( jqXHR, status ) {
+			self.each( function() {
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
+			} );
+		} );
+	}
+
+	return this;
+};
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
 	};
+} );
 
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
 
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
 
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
 
-// Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( err ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
+jQuery.expr.filters.animated = function( elem ) {
+	return jQuery.grep( jQuery.timers, function( fn ) {
+		return elem === fn.elem;
+	} ).length;
 };
 
-Tween.prototype.init.prototype = Tween.prototype;
 
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
 
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
 
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
 
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
 }
 
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-	};
-};
-
 jQuery.offset = {
-
 	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
+		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+			position = jQuery.css( elem, "position" ),
+			curElem = jQuery( elem ),
+			props = {};
 
 		// set position first, in-case top/left are set even on static elem
 		if ( position === "static" ) {
 			elem.style.position = "relative";
 		}
 
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
+		curOffset = curElem.offset();
+		curCSSTop = jQuery.css( elem, "top" );
+		curCSSLeft = jQuery.css( elem, "left" );
+		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+			jQuery.inArray( "auto", [ curCSSTop, curCSSLeft ] ) > -1;
 
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		// need to be able to calculate position if either top or left
+		// is auto and position is either absolute or fixed
 		if ( calculatePosition ) {
 			curPosition = curElem.position();
 			curTop = curPosition.top;
@@ -9608,7 +10717,9 @@ jQuery.offset = {
 		}
 
 		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
+
+			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
+			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
 		}
 
 		if ( options.top != null ) {
@@ -9626,8 +10737,43 @@ jQuery.offset = {
 	}
 };
 
+jQuery.fn.extend( {
+	offset: function( options ) {
+		if ( arguments.length ) {
+			return options === undefined ?
+				this :
+				this.each( function( i ) {
+					jQuery.offset.setOffset( this, options, i );
+				} );
+		}
 
-jQuery.fn.extend({
+		var docElem, win,
+			box = { top: 0, left: 0 },
+			elem = this[ 0 ],
+			doc = elem && elem.ownerDocument;
+
+		if ( !doc ) {
+			return;
+		}
+
+		docElem = doc.documentElement;
+
+		// Make sure it's not a disconnected DOM node
+		if ( !jQuery.contains( docElem, elem ) ) {
+			return box;
+		}
+
+		// If we don't have gBCR, just use 0,0 rather than error
+		// BlackBerry 5, iOS 3 (original iPhone)
+		if ( typeof elem.getBoundingClientRect !== "undefined" ) {
+			box = elem.getBoundingClientRect();
+		}
+		win = getWindow( doc );
+		return {
+			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+		};
+	},
 
 	position: function() {
 		if ( !this[ 0 ] ) {
@@ -9638,11 +10784,14 @@ jQuery.fn.extend({
 			parentOffset = { top: 0, left: 0 },
 			elem = this[ 0 ];
 
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
+		// because it is its only offset parent
 		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+
 			// we assume that getBoundingClientRect is available when computed position is fixed
 			offset = elem.getBoundingClientRect();
 		} else {
+
 			// Get *real* offsetParent
 			offsetParent = this.offsetParent();
 
@@ -9662,32 +10811,33 @@ jQuery.fn.extend({
 		// are the same in Safari causing offset.left to incorrectly be 0
 		return {
 			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
 		};
 	},
 
 	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
+		return this.map( function() {
+			var offsetParent = this.offsetParent;
+
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) &&
+				jQuery.css( offsetParent, "position" ) === "static" ) ) {
 				offsetParent = offsetParent.offsetParent;
 			}
-			return offsetParent || docElem;
-		});
+			return offsetParent || documentElement;
+		} );
 	}
-});
-
+} );
 
 // Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
 	var top = /Y/.test( prop );
 
 	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
+		return access( this, function( elem, method, val ) {
 			var win = getWindow( elem );
 
 			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
+				return win ? ( prop in win ) ? win[ prop ] :
 					win.document.documentElement[ method ] :
 					elem[ method ];
 			}
@@ -9703,27 +10853,44 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me
 			}
 		}, method, val, arguments.length, null );
 	};
-});
+} );
+
+// Support: Safari<7-8+, Chrome<37-44+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// getComputedStyle returns percent when specified for top/left/bottom/right
+// rather than make the css module depend on the offset module, we just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+		function( elem, computed ) {
+			if ( computed ) {
+				computed = curCSS( elem, prop );
+
+				// if curCSS returns percentage, fallback to offset
+				return rnumnonpx.test( computed ) ?
+					jQuery( elem ).position()[ prop ] + "px" :
+					computed;
+			}
+		}
+	);
+} );
+
 
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
 jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
+	function( defaultExtra, funcName ) {
+
 		// margin is only for outerHeight, outerWidth
 		jQuery.fn[ funcName ] = function( margin, value ) {
 			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
 				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
 
-			return jQuery.access( this, function( elem, type, value ) {
+			return access( this, function( elem, type, value ) {
 				var doc;
 
 				if ( jQuery.isWindow( elem ) ) {
+
 					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
 					// isn't a whole lot we can do. See pull request at this URL for discussion:
 					// https://github.com/jquery/jquery/pull/764
@@ -9734,8 +10901,10 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 				if ( elem.nodeType === 9 ) {
 					doc = elem.documentElement;
 
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+					// whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only,
+					// but there is currently no good, small way to fix it.
 					return Math.max(
 						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
 						elem.body[ "offset" + name ], doc[ "offset" + name ],
@@ -9744,6 +10913,7 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 				}
 
 				return value === undefined ?
+
 					// Get width or height on the element, requesting but not forcing parseFloat
 					jQuery.css( elem, type, extra ) :
 
@@ -9751,10 +10921,30 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 					jQuery.style( elem, type, value, extra );
 			}, type, chainable ? margin : undefined, chainable, null );
 		};
-	});
-});
-// Limit scope pollution from any deprecated API
-// (function() {
+	} );
+} );
+
+
+jQuery.fn.extend( {
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ?
+			this.off( selector, "**" ) :
+			this.off( types, selector || "**", fn );
+	}
+} );
 
 // The number of elements contained in the matched element set
 jQuery.fn.size = function() {
@@ -9763,27 +10953,56 @@ jQuery.fn.size = function() {
 
 jQuery.fn.andSelf = jQuery.fn.addBack;
 
-// })();
-if ( typeof module === "object" && module && typeof module.exports === "object" ) {
-	// Expose jQuery as module.exports in loaders that implement the Node
-	// module pattern (including browserify). Do not create the global, since
-	// the user will be storing it themselves locally, and globals are frowned
-	// upon in the Node module world.
-	module.exports = jQuery;
-} else {
-	// Otherwise expose jQuery to the global object as usual
-	window.jQuery = window.$ = jQuery;
 
-	// Register as a named AMD module, since jQuery can be concatenated with other
-	// files that may use define, but not via a proper concatenation script that
-	// understands anonymous AMD modules. A named AMD is safest and most robust
-	// way to register. Lowercase jquery is used because AMD module names are
-	// derived from file names, and jQuery is normally delivered in a lowercase
-	// file name. Do this after creating the global so that if an AMD module wants
-	// to call noConflict to hide this version of jQuery, it will work.
-	if ( typeof define === "function" && define.amd ) {
-		define( "jquery", [], function () { return jQuery; } );
-	}
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "jquery", [], function() {
+		return jQuery;
+	} );
 }
 
-})( window );
+
+
+var
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in
+// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( !noGlobal ) {
+	window.jQuery = window.$ = jQuery;
+}
+
+return jQuery;
+}));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js
index 7d5c4da8bf8..02804cdfd06 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js
@@ -1,60 +1,98 @@
 /*!
 
-JSZip - A Javascript class for generating and reading zip files
+JSZip v3.1.5 - A JavaScript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
-(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
+(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
 Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
 
 JSZip uses the library pako released under the MIT license :
 https://github.com/nodeca/pako/blob/master/LICENSE
 */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.JSZip=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
+
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.JSZip = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
+var utils = require('./utils');
+var support = require('./support');
 // private property
 var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
 
 // public method for encoding
-exports.encode = function(input, utf8) {
-    var output = "";
+exports.encode = function(input) {
+    var output = [];
     var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-    var i = 0;
+    var i = 0, len = input.length, remainingBytes = len;
 
+    var isArray = utils.getTypeOf(input) !== "string";
     while (i < input.length) {
+        remainingBytes = len - i;
 
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
+        if (!isArray) {
+            chr1 = input.charCodeAt(i++);
+            chr2 = i < len ? input.charCodeAt(i++) : 0;
+            chr3 = i < len ? input.charCodeAt(i++) : 0;
+        } else {
+            chr1 = input[i++];
+            chr2 = i < len ? input[i++] : 0;
+            chr3 = i < len ? input[i++] : 0;
+        }
 
         enc1 = chr1 >> 2;
         enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-        enc4 = chr3 & 63;
+        enc3 = remainingBytes > 1 ? (((chr2 & 15) << 2) | (chr3 >> 6)) : 64;
+        enc4 = remainingBytes > 2 ? (chr3 & 63) : 64;
 
-        if (isNaN(chr2)) {
-            enc3 = enc4 = 64;
-        }
-        else if (isNaN(chr3)) {
-            enc4 = 64;
-        }
-
-        output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
+        output.push(_keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4));
 
     }
 
-    return output;
+    return output.join("");
 };
 
 // public method for decoding
-exports.decode = function(input, utf8) {
-    var output = "";
+exports.decode = function(input) {
     var chr1, chr2, chr3;
     var enc1, enc2, enc3, enc4;
-    var i = 0;
+    var i = 0, resultIndex = 0;
+
+    var dataUrlPrefix = "data:";
+
+    if (input.substr(0, dataUrlPrefix.length) === dataUrlPrefix) {
+        // This is a common error: people give a data url
+        // (data:image/png;base64,iVBOR...) with a {base64: true} and
+        // wonders why things don't work.
+        // We can detect that the string input looks like a data url but we
+        // *can't* be sure it is one: removing everything up to the comma would
+        // be too dangerous.
+        throw new Error("Invalid base64 input, it looks like a data url.");
+    }
 
     input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
 
+    var totalLength = input.length * 3 / 4;
+    if(input.charAt(input.length - 1) === _keyStr.charAt(64)) {
+        totalLength--;
+    }
+    if(input.charAt(input.length - 2) === _keyStr.charAt(64)) {
+        totalLength--;
+    }
+    if (totalLength % 1 !== 0) {
+        // totalLength is not an integer, the length does not match a valid
+        // base64 content. That can happen if:
+        // - the input is not a base64 content
+        // - the input is *almost* a base64 content, with a extra chars at the
+        //   beginning or at the end
+        // - the input uses a base64 variant (base64url for example)
+        throw new Error("Invalid base64 input, bad content length.");
+    }
+    var output;
+    if (support.uint8array) {
+        output = new Uint8Array(totalLength|0);
+    } else {
+        output = new Array(totalLength|0);
+    }
+
     while (i < input.length) {
 
         enc1 = _keyStr.indexOf(input.charAt(i++));
@@ -66,178 +104,1696 @@ exports.decode = function(input, utf8) {
         chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
         chr3 = ((enc3 & 3) << 6) | enc4;
 
-        output = output + String.fromCharCode(chr1);
+        output[resultIndex++] = chr1;
 
-        if (enc3 != 64) {
-            output = output + String.fromCharCode(chr2);
+        if (enc3 !== 64) {
+            output[resultIndex++] = chr2;
         }
-        if (enc4 != 64) {
-            output = output + String.fromCharCode(chr3);
+        if (enc4 !== 64) {
+            output[resultIndex++] = chr3;
         }
 
     }
 
     return output;
-
 };
 
-},{}],2:[function(_dereq_,module,exports){
+},{"./support":30,"./utils":32}],2:[function(require,module,exports){
 'use strict';
-function CompressedObject() {
-    this.compressedSize = 0;
-    this.uncompressedSize = 0;
-    this.crc32 = 0;
-    this.compressionMethod = null;
-    this.compressedContent = null;
+
+var external = require("./external");
+var DataWorker = require('./stream/DataWorker');
+var DataLengthProbe = require('./stream/DataLengthProbe');
+var Crc32Probe = require('./stream/Crc32Probe');
+var DataLengthProbe = require('./stream/DataLengthProbe');
+
+/**
+ * Represent a compressed object, with everything needed to decompress it.
+ * @constructor
+ * @param {number} compressedSize the size of the data compressed.
+ * @param {number} uncompressedSize the size of the data after decompression.
+ * @param {number} crc32 the crc32 of the decompressed file.
+ * @param {object} compression the type of compression, see lib/compressions.js.
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the compressed data.
+ */
+function CompressedObject(compressedSize, uncompressedSize, crc32, compression, data) {
+    this.compressedSize = compressedSize;
+    this.uncompressedSize = uncompressedSize;
+    this.crc32 = crc32;
+    this.compression = compression;
+    this.compressedContent = data;
 }
 
 CompressedObject.prototype = {
     /**
-     * Return the decompressed content in an unspecified format.
-     * The format will depend on the decompressor.
-     * @return {Object} the decompressed content.
+     * Create a worker to get the uncompressed content.
+     * @return {GenericWorker} the worker.
      */
-    getContent: function() {
-        return null; // see implementation
+    getContentWorker : function () {
+        var worker = new DataWorker(external.Promise.resolve(this.compressedContent))
+        .pipe(this.compression.uncompressWorker())
+        .pipe(new DataLengthProbe("data_length"));
+
+        var that = this;
+        worker.on("end", function () {
+            if(this.streamInfo['data_length'] !== that.uncompressedSize) {
+                throw new Error("Bug : uncompressed data size mismatch");
+            }
+        });
+        return worker;
     },
     /**
-     * Return the compressed content in an unspecified format.
-     * The format will depend on the compressed conten source.
-     * @return {Object} the compressed content.
+     * Create a worker to get the compressed content.
+     * @return {GenericWorker} the worker.
      */
-    getCompressedContent: function() {
-        return null; // see implementation
+    getCompressedWorker : function () {
+        return new DataWorker(external.Promise.resolve(this.compressedContent))
+        .withStreamInfo("compressedSize", this.compressedSize)
+        .withStreamInfo("uncompressedSize", this.uncompressedSize)
+        .withStreamInfo("crc32", this.crc32)
+        .withStreamInfo("compression", this.compression)
+        ;
     }
 };
-module.exports = CompressedObject;
-
-},{}],3:[function(_dereq_,module,exports){
-'use strict';
-exports.STORE = {
-    magic: "\x00\x00",
-    compress: function(content, compressionOptions) {
-        return content; // no compression
-    },
-    uncompress: function(content) {
-        return content; // no compression
-    },
-    compressInputType: null,
-    uncompressInputType: null
-};
-exports.DEFLATE = _dereq_('./flate');
-
-},{"./flate":8}],4:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-var table = [
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-];
 
 /**
- *
- *  Javascript crc32
- *  http://www.webtoolkit.info/
- *
+ * Chain the given worker with other workers to compress the content with the
+ * given compresion.
+ * @param {GenericWorker} uncompressedWorker the worker to pipe.
+ * @param {Object} compression the compression object.
+ * @param {Object} compressionOptions the options to use when compressing.
+ * @return {GenericWorker} the new worker compressing the content.
  */
-module.exports = function crc32(input, crc) {
+CompressedObject.createWorkerFrom = function (uncompressedWorker, compression, compressionOptions) {
+    return uncompressedWorker
+    .pipe(new Crc32Probe())
+    .pipe(new DataLengthProbe("uncompressedSize"))
+    .pipe(compression.compressWorker(compressionOptions))
+    .pipe(new DataLengthProbe("compressedSize"))
+    .withStreamInfo("compression", compression);
+};
+
+module.exports = CompressedObject;
+
+},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(require,module,exports){
+'use strict';
+
+var GenericWorker = require("./stream/GenericWorker");
+
+exports.STORE = {
+    magic: "\x00\x00",
+    compressWorker : function (compressionOptions) {
+        return new GenericWorker("STORE compression");
+    },
+    uncompressWorker : function () {
+        return new GenericWorker("STORE decompression");
+    }
+};
+exports.DEFLATE = require('./flate');
+
+},{"./flate":7,"./stream/GenericWorker":28}],4:[function(require,module,exports){
+'use strict';
+
+var utils = require('./utils');
+
+/**
+ * The following functions come from pako, from pako/lib/zlib/crc32.js
+ * released under the MIT license, see pako https://github.com/nodeca/pako/
+ */
+
+// Use ordinary array, since untyped makes no boost here
+function makeTable() {
+    var c, table = [];
+
+    for(var n =0; n < 256; n++){
+        c = n;
+        for(var k =0; k < 8; k++){
+            c = ((c&1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
+        }
+        table[n] = c;
+    }
+
+    return table;
+}
+
+// Create table on load. Just 255 signed longs. Not a problem.
+var crcTable = makeTable();
+
+
+function crc32(crc, buf, len, pos) {
+    var t = crcTable, end = pos + len;
+
+    crc = crc ^ (-1);
+
+    for (var i = pos; i < end; i++ ) {
+        crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
+    }
+
+    return (crc ^ (-1)); // >>> 0;
+}
+
+// That's all for the pako functions.
+
+/**
+ * Compute the crc32 of a string.
+ * This is almost the same as the function crc32, but for strings. Using the
+ * same function for the two use cases leads to horrible performances.
+ * @param {Number} crc the starting value of the crc.
+ * @param {String} str the string to use.
+ * @param {Number} len the length of the string.
+ * @param {Number} pos the starting position for the crc32 computation.
+ * @return {Number} the computed crc32.
+ */
+function crc32str(crc, str, len, pos) {
+    var t = crcTable, end = pos + len;
+
+    crc = crc ^ (-1);
+
+    for (var i = pos; i < end; i++ ) {
+        crc = (crc >>> 8) ^ t[(crc ^ str.charCodeAt(i)) & 0xFF];
+    }
+
+    return (crc ^ (-1)); // >>> 0;
+}
+
+module.exports = function crc32wrapper(input, crc) {
     if (typeof input === "undefined" || !input.length) {
         return 0;
     }
 
     var isArray = utils.getTypeOf(input) !== "string";
 
-    if (typeof(crc) == "undefined") {
-        crc = 0;
+    if(isArray) {
+        return crc32(crc|0, input, input.length, 0);
+    } else {
+        return crc32str(crc|0, input, input.length, 0);
     }
-    var x = 0;
-    var y = 0;
-    var b = 0;
-
-    crc = crc ^ (-1);
-    for (var i = 0, iTop = input.length; i < iTop; i++) {
-        b = isArray ? input[i] : input.charCodeAt(i);
-        y = (crc ^ b) & 0xFF;
-        x = table[y];
-        crc = (crc >>> 8) ^ x;
-    }
-
-    return crc ^ (-1);
 };
-// vim: set shiftwidth=4 softtabstop=4:
 
-},{"./utils":21}],5:[function(_dereq_,module,exports){
+},{"./utils":32}],5:[function(require,module,exports){
 'use strict';
-var utils = _dereq_('./utils');
+exports.base64 = false;
+exports.binary = false;
+exports.dir = false;
+exports.createFolders = true;
+exports.date = null;
+exports.compression = null;
+exports.compressionOptions = null;
+exports.comment = null;
+exports.unixPermissions = null;
+exports.dosPermissions = null;
+
+},{}],6:[function(require,module,exports){
+/* global Promise */
+'use strict';
+
+// load the global object first:
+// - it should be better integrated in the system (unhandledRejection in node)
+// - the environment may have a custom Promise implementation (see zone.js)
+var ES6Promise = null;
+if (typeof Promise !== "undefined") {
+    ES6Promise = Promise;
+} else {
+    ES6Promise = require("lie");
+}
+
+/**
+ * Let the user use/change some implementations.
+ */
+module.exports = {
+    Promise: ES6Promise
+};
+
+},{"lie":58}],7:[function(require,module,exports){
+'use strict';
+var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
+
+var pako = require("pako");
+var utils = require("./utils");
+var GenericWorker = require("./stream/GenericWorker");
+
+var ARRAY_TYPE = USE_TYPEDARRAY ? "uint8array" : "array";
+
+exports.magic = "\x08\x00";
+
+/**
+ * Create a worker that uses pako to inflate/deflate.
+ * @constructor
+ * @param {String} action the name of the pako function to call : either "Deflate" or "Inflate".
+ * @param {Object} options the options to use when (de)compressing.
+ */
+function FlateWorker(action, options) {
+    GenericWorker.call(this, "FlateWorker/" + action);
+
+    this._pako = null;
+    this._pakoAction = action;
+    this._pakoOptions = options;
+    // the `meta` object from the last chunk received
+    // this allow this worker to pass around metadata
+    this.meta = {};
+}
+
+utils.inherits(FlateWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+FlateWorker.prototype.processChunk = function (chunk) {
+    this.meta = chunk.meta;
+    if (this._pako === null) {
+        this._createPako();
+    }
+    this._pako.push(utils.transformTo(ARRAY_TYPE, chunk.data), false);
+};
+
+/**
+ * @see GenericWorker.flush
+ */
+FlateWorker.prototype.flush = function () {
+    GenericWorker.prototype.flush.call(this);
+    if (this._pako === null) {
+        this._createPako();
+    }
+    this._pako.push([], true);
+};
+/**
+ * @see GenericWorker.cleanUp
+ */
+FlateWorker.prototype.cleanUp = function () {
+    GenericWorker.prototype.cleanUp.call(this);
+    this._pako = null;
+};
+
+/**
+ * Create the _pako object.
+ * TODO: lazy-loading this object isn't the best solution but it's the
+ * quickest. The best solution is to lazy-load the worker list. See also the
+ * issue #446.
+ */
+FlateWorker.prototype._createPako = function () {
+    this._pako = new pako[this._pakoAction]({
+        raw: true,
+        level: this._pakoOptions.level || -1 // default compression
+    });
+    var self = this;
+    this._pako.onData = function(data) {
+        self.push({
+            data : data,
+            meta : self.meta
+        });
+    };
+};
+
+exports.compressWorker = function (compressionOptions) {
+    return new FlateWorker("Deflate", compressionOptions);
+};
+exports.uncompressWorker = function () {
+    return new FlateWorker("Inflate", {});
+};
+
+},{"./stream/GenericWorker":28,"./utils":32,"pako":59}],8:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var GenericWorker = require('../stream/GenericWorker');
+var utf8 = require('../utf8');
+var crc32 = require('../crc32');
+var signature = require('../signature');
+
+/**
+ * Transform an integer into a string in hexadecimal.
+ * @private
+ * @param {number} dec the number to convert.
+ * @param {number} bytes the number of bytes to generate.
+ * @returns {string} the result.
+ */
+var decToHex = function(dec, bytes) {
+    var hex = "", i;
+    for (i = 0; i < bytes; i++) {
+        hex += String.fromCharCode(dec & 0xff);
+        dec = dec >>> 8;
+    }
+    return hex;
+};
+
+/**
+ * Generate the UNIX part of the external file attributes.
+ * @param {Object} unixPermissions the unix permissions or null.
+ * @param {Boolean} isDir true if the entry is a directory, false otherwise.
+ * @return {Number} a 32 bit integer.
+ *
+ * adapted from http://unix.stackexchange.com/questions/14705/the-zip-formats-external-file-attribute :
+ *
+ * TTTTsstrwxrwxrwx0000000000ADVSHR
+ * ^^^^____________________________ file type, see zipinfo.c (UNX_*)
+ *     ^^^_________________________ setuid, setgid, sticky
+ *        ^^^^^^^^^________________ permissions
+ *                 ^^^^^^^^^^______ not used ?
+ *                           ^^^^^^ DOS attribute bits : Archive, Directory, Volume label, System file, Hidden, Read only
+ */
+var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
+
+    var result = unixPermissions;
+    if (!unixPermissions) {
+        // I can't use octal values in strict mode, hence the hexa.
+        //  040775 => 0x41fd
+        // 0100664 => 0x81b4
+        result = isDir ? 0x41fd : 0x81b4;
+    }
+    return (result & 0xFFFF) << 16;
+};
+
+/**
+ * Generate the DOS part of the external file attributes.
+ * @param {Object} dosPermissions the dos permissions or null.
+ * @param {Boolean} isDir true if the entry is a directory, false otherwise.
+ * @return {Number} a 32 bit integer.
+ *
+ * Bit 0     Read-Only
+ * Bit 1     Hidden
+ * Bit 2     System
+ * Bit 3     Volume Label
+ * Bit 4     Directory
+ * Bit 5     Archive
+ */
+var generateDosExternalFileAttr = function (dosPermissions, isDir) {
+
+    // the dir flag is already set for compatibility
+    return (dosPermissions || 0)  & 0x3F;
+};
+
+/**
+ * Generate the various parts used in the construction of the final zip file.
+ * @param {Object} streamInfo the hash with informations about the compressed file.
+ * @param {Boolean} streamedContent is the content streamed ?
+ * @param {Boolean} streamingEnded is the stream finished ?
+ * @param {number} offset the current offset from the start of the zip file.
+ * @param {String} platform let's pretend we are this platform (change platform dependents fields)
+ * @param {Function} encodeFileName the function to encode the file name / comment.
+ * @return {Object} the zip parts.
+ */
+var generateZipParts = function(streamInfo, streamedContent, streamingEnded, offset, platform, encodeFileName) {
+    var file = streamInfo['file'],
+    compression = streamInfo['compression'],
+    useCustomEncoding = encodeFileName !== utf8.utf8encode,
+    encodedFileName = utils.transformTo("string", encodeFileName(file.name)),
+    utfEncodedFileName = utils.transformTo("string", utf8.utf8encode(file.name)),
+    comment = file.comment,
+    encodedComment = utils.transformTo("string", encodeFileName(comment)),
+    utfEncodedComment = utils.transformTo("string", utf8.utf8encode(comment)),
+    useUTF8ForFileName = utfEncodedFileName.length !== file.name.length,
+    useUTF8ForComment = utfEncodedComment.length !== comment.length,
+    dosTime,
+    dosDate,
+    extraFields = "",
+    unicodePathExtraField = "",
+    unicodeCommentExtraField = "",
+    dir = file.dir,
+    date = file.date;
+
+
+    var dataInfo = {
+        crc32 : 0,
+        compressedSize : 0,
+        uncompressedSize : 0
+    };
+
+    // if the content is streamed, the sizes/crc32 are only available AFTER
+    // the end of the stream.
+    if (!streamedContent || streamingEnded) {
+        dataInfo.crc32 = streamInfo['crc32'];
+        dataInfo.compressedSize = streamInfo['compressedSize'];
+        dataInfo.uncompressedSize = streamInfo['uncompressedSize'];
+    }
+
+    var bitflag = 0;
+    if (streamedContent) {
+        // Bit 3: the sizes/crc32 are set to zero in the local header.
+        // The correct values are put in the data descriptor immediately
+        // following the compressed data.
+        bitflag |= 0x0008;
+    }
+    if (!useCustomEncoding && (useUTF8ForFileName || useUTF8ForComment)) {
+        // Bit 11: Language encoding flag (EFS).
+        bitflag |= 0x0800;
+    }
+
+
+    var extFileAttr = 0;
+    var versionMadeBy = 0;
+    if (dir) {
+        // dos or unix, we set the dos dir flag
+        extFileAttr |= 0x00010;
+    }
+    if(platform === "UNIX") {
+        versionMadeBy = 0x031E; // UNIX, version 3.0
+        extFileAttr |= generateUnixExternalFileAttr(file.unixPermissions, dir);
+    } else { // DOS or other, fallback to DOS
+        versionMadeBy = 0x0014; // DOS, version 2.0
+        extFileAttr |= generateDosExternalFileAttr(file.dosPermissions, dir);
+    }
+
+    // date
+    // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
+    // @see http://www.delorie.com/djgpp/doc/rbinter/it/65/16.html
+    // @see http://www.delorie.com/djgpp/doc/rbinter/it/66/16.html
+
+    dosTime = date.getUTCHours();
+    dosTime = dosTime << 6;
+    dosTime = dosTime | date.getUTCMinutes();
+    dosTime = dosTime << 5;
+    dosTime = dosTime | date.getUTCSeconds() / 2;
+
+    dosDate = date.getUTCFullYear() - 1980;
+    dosDate = dosDate << 4;
+    dosDate = dosDate | (date.getUTCMonth() + 1);
+    dosDate = dosDate << 5;
+    dosDate = dosDate | date.getUTCDate();
+
+    if (useUTF8ForFileName) {
+        // set the unicode path extra field. unzip needs at least one extra
+        // field to correctly handle unicode path, so using the path is as good
+        // as any other information. This could improve the situation with
+        // other archive managers too.
+        // This field is usually used without the utf8 flag, with a non
+        // unicode path in the header (winrar, winzip). This helps (a bit)
+        // with the messy Windows' default compressed folders feature but
+        // breaks on p7zip which doesn't seek the unicode path extra field.
+        // So for now, UTF-8 everywhere !
+        unicodePathExtraField =
+            // Version
+            decToHex(1, 1) +
+            // NameCRC32
+            decToHex(crc32(encodedFileName), 4) +
+            // UnicodeName
+            utfEncodedFileName;
+
+        extraFields +=
+            // Info-ZIP Unicode Path Extra Field
+            "\x75\x70" +
+            // size
+            decToHex(unicodePathExtraField.length, 2) +
+            // content
+            unicodePathExtraField;
+    }
+
+    if(useUTF8ForComment) {
+
+        unicodeCommentExtraField =
+            // Version
+            decToHex(1, 1) +
+            // CommentCRC32
+            decToHex(crc32(encodedComment), 4) +
+            // UnicodeName
+            utfEncodedComment;
+
+        extraFields +=
+            // Info-ZIP Unicode Path Extra Field
+            "\x75\x63" +
+            // size
+            decToHex(unicodeCommentExtraField.length, 2) +
+            // content
+            unicodeCommentExtraField;
+    }
+
+    var header = "";
+
+    // version needed to extract
+    header += "\x0A\x00";
+    // general purpose bit flag
+    header += decToHex(bitflag, 2);
+    // compression method
+    header += compression.magic;
+    // last mod file time
+    header += decToHex(dosTime, 2);
+    // last mod file date
+    header += decToHex(dosDate, 2);
+    // crc-32
+    header += decToHex(dataInfo.crc32, 4);
+    // compressed size
+    header += decToHex(dataInfo.compressedSize, 4);
+    // uncompressed size
+    header += decToHex(dataInfo.uncompressedSize, 4);
+    // file name length
+    header += decToHex(encodedFileName.length, 2);
+    // extra field length
+    header += decToHex(extraFields.length, 2);
+
+
+    var fileRecord = signature.LOCAL_FILE_HEADER + header + encodedFileName + extraFields;
+
+    var dirRecord = signature.CENTRAL_FILE_HEADER +
+        // version made by (00: DOS)
+        decToHex(versionMadeBy, 2) +
+        // file header (common to file and central directory)
+        header +
+        // file comment length
+        decToHex(encodedComment.length, 2) +
+        // disk number start
+        "\x00\x00" +
+        // internal file attributes TODO
+        "\x00\x00" +
+        // external file attributes
+        decToHex(extFileAttr, 4) +
+        // relative offset of local header
+        decToHex(offset, 4) +
+        // file name
+        encodedFileName +
+        // extra field
+        extraFields +
+        // file comment
+        encodedComment;
+
+    return {
+        fileRecord: fileRecord,
+        dirRecord: dirRecord
+    };
+};
+
+/**
+ * Generate the EOCD record.
+ * @param {Number} entriesCount the number of entries in the zip file.
+ * @param {Number} centralDirLength the length (in bytes) of the central dir.
+ * @param {Number} localDirLength the length (in bytes) of the local dir.
+ * @param {String} comment the zip file comment as a binary string.
+ * @param {Function} encodeFileName the function to encode the comment.
+ * @return {String} the EOCD record.
+ */
+var generateCentralDirectoryEnd = function (entriesCount, centralDirLength, localDirLength, comment, encodeFileName) {
+    var dirEnd = "";
+    var encodedComment = utils.transformTo("string", encodeFileName(comment));
+
+    // end of central dir signature
+    dirEnd = signature.CENTRAL_DIRECTORY_END +
+        // number of this disk
+        "\x00\x00" +
+        // number of the disk with the start of the central directory
+        "\x00\x00" +
+        // total number of entries in the central directory on this disk
+        decToHex(entriesCount, 2) +
+        // total number of entries in the central directory
+        decToHex(entriesCount, 2) +
+        // size of the central directory   4 bytes
+        decToHex(centralDirLength, 4) +
+        // offset of start of central directory with respect to the starting disk number
+        decToHex(localDirLength, 4) +
+        // .ZIP file comment length
+        decToHex(encodedComment.length, 2) +
+        // .ZIP file comment
+        encodedComment;
+
+    return dirEnd;
+};
+
+/**
+ * Generate data descriptors for a file entry.
+ * @param {Object} streamInfo the hash generated by a worker, containing informations
+ * on the file entry.
+ * @return {String} the data descriptors.
+ */
+var generateDataDescriptors = function (streamInfo) {
+    var descriptor = "";
+    descriptor = signature.DATA_DESCRIPTOR +
+        // crc-32                          4 bytes
+        decToHex(streamInfo['crc32'], 4) +
+        // compressed size                 4 bytes
+        decToHex(streamInfo['compressedSize'], 4) +
+        // uncompressed size               4 bytes
+        decToHex(streamInfo['uncompressedSize'], 4);
+
+    return descriptor;
+};
+
+
+/**
+ * A worker to concatenate other workers to create a zip file.
+ * @param {Boolean} streamFiles `true` to stream the content of the files,
+ * `false` to accumulate it.
+ * @param {String} comment the comment to use.
+ * @param {String} platform the platform to use, "UNIX" or "DOS".
+ * @param {Function} encodeFileName the function to encode file names and comments.
+ */
+function ZipFileWorker(streamFiles, comment, platform, encodeFileName) {
+    GenericWorker.call(this, "ZipFileWorker");
+    // The number of bytes written so far. This doesn't count accumulated chunks.
+    this.bytesWritten = 0;
+    // The comment of the zip file
+    this.zipComment = comment;
+    // The platform "generating" the zip file.
+    this.zipPlatform = platform;
+    // the function to encode file names and comments.
+    this.encodeFileName = encodeFileName;
+    // Should we stream the content of the files ?
+    this.streamFiles = streamFiles;
+    // If `streamFiles` is false, we will need to accumulate the content of the
+    // files to calculate sizes / crc32 (and write them *before* the content).
+    // This boolean indicates if we are accumulating chunks (it will change a lot
+    // during the lifetime of this worker).
+    this.accumulate = false;
+    // The buffer receiving chunks when accumulating content.
+    this.contentBuffer = [];
+    // The list of generated directory records.
+    this.dirRecords = [];
+    // The offset (in bytes) from the beginning of the zip file for the current source.
+    this.currentSourceOffset = 0;
+    // The total number of entries in this zip file.
+    this.entriesCount = 0;
+    // the name of the file currently being added, null when handling the end of the zip file.
+    // Used for the emited metadata.
+    this.currentFile = null;
+
+
+
+    this._sources = [];
+}
+utils.inherits(ZipFileWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.push
+ */
+ZipFileWorker.prototype.push = function (chunk) {
+
+    var currentFilePercent = chunk.meta.percent || 0;
+    var entriesCount = this.entriesCount;
+    var remainingFiles = this._sources.length;
+
+    if(this.accumulate) {
+        this.contentBuffer.push(chunk);
+    } else {
+        this.bytesWritten += chunk.data.length;
+
+        GenericWorker.prototype.push.call(this, {
+            data : chunk.data,
+            meta : {
+                currentFile : this.currentFile,
+                percent : entriesCount ? (currentFilePercent + 100 * (entriesCount - remainingFiles - 1)) / entriesCount : 100
+            }
+        });
+    }
+};
+
+/**
+ * The worker started a new source (an other worker).
+ * @param {Object} streamInfo the streamInfo object from the new source.
+ */
+ZipFileWorker.prototype.openedSource = function (streamInfo) {
+    this.currentSourceOffset = this.bytesWritten;
+    this.currentFile = streamInfo['file'].name;
+
+    var streamedContent = this.streamFiles && !streamInfo['file'].dir;
+
+    // don't stream folders (because they don't have any content)
+    if(streamedContent) {
+        var record = generateZipParts(streamInfo, streamedContent, false, this.currentSourceOffset, this.zipPlatform, this.encodeFileName);
+        this.push({
+            data : record.fileRecord,
+            meta : {percent:0}
+        });
+    } else {
+        // we need to wait for the whole file before pushing anything
+        this.accumulate = true;
+    }
+};
+
+/**
+ * The worker finished a source (an other worker).
+ * @param {Object} streamInfo the streamInfo object from the finished source.
+ */
+ZipFileWorker.prototype.closedSource = function (streamInfo) {
+    this.accumulate = false;
+    var streamedContent = this.streamFiles && !streamInfo['file'].dir;
+    var record = generateZipParts(streamInfo, streamedContent, true, this.currentSourceOffset, this.zipPlatform, this.encodeFileName);
+
+    this.dirRecords.push(record.dirRecord);
+    if(streamedContent) {
+        // after the streamed file, we put data descriptors
+        this.push({
+            data : generateDataDescriptors(streamInfo),
+            meta : {percent:100}
+        });
+    } else {
+        // the content wasn't streamed, we need to push everything now
+        // first the file record, then the content
+        this.push({
+            data : record.fileRecord,
+            meta : {percent:0}
+        });
+        while(this.contentBuffer.length) {
+            this.push(this.contentBuffer.shift());
+        }
+    }
+    this.currentFile = null;
+};
+
+/**
+ * @see GenericWorker.flush
+ */
+ZipFileWorker.prototype.flush = function () {
+
+    var localDirLength = this.bytesWritten;
+    for(var i = 0; i < this.dirRecords.length; i++) {
+        this.push({
+            data : this.dirRecords[i],
+            meta : {percent:100}
+        });
+    }
+    var centralDirLength = this.bytesWritten - localDirLength;
+
+    var dirEnd = generateCentralDirectoryEnd(this.dirRecords.length, centralDirLength, localDirLength, this.zipComment, this.encodeFileName);
+
+    this.push({
+        data : dirEnd,
+        meta : {percent:100}
+    });
+};
+
+/**
+ * Prepare the next source to be read.
+ */
+ZipFileWorker.prototype.prepareNextSource = function () {
+    this.previous = this._sources.shift();
+    this.openedSource(this.previous.streamInfo);
+    if (this.isPaused) {
+        this.previous.pause();
+    } else {
+        this.previous.resume();
+    }
+};
+
+/**
+ * @see GenericWorker.registerPrevious
+ */
+ZipFileWorker.prototype.registerPrevious = function (previous) {
+    this._sources.push(previous);
+    var self = this;
+
+    previous.on('data', function (chunk) {
+        self.processChunk(chunk);
+    });
+    previous.on('end', function () {
+        self.closedSource(self.previous.streamInfo);
+        if(self._sources.length) {
+            self.prepareNextSource();
+        } else {
+            self.end();
+        }
+    });
+    previous.on('error', function (e) {
+        self.error(e);
+    });
+    return this;
+};
+
+/**
+ * @see GenericWorker.resume
+ */
+ZipFileWorker.prototype.resume = function () {
+    if(!GenericWorker.prototype.resume.call(this)) {
+        return false;
+    }
+
+    if (!this.previous && this._sources.length) {
+        this.prepareNextSource();
+        return true;
+    }
+    if (!this.previous && !this._sources.length && !this.generatedError) {
+        this.end();
+        return true;
+    }
+};
+
+/**
+ * @see GenericWorker.error
+ */
+ZipFileWorker.prototype.error = function (e) {
+    var sources = this._sources;
+    if(!GenericWorker.prototype.error.call(this, e)) {
+        return false;
+    }
+    for(var i = 0; i < sources.length; i++) {
+        try {
+            sources[i].error(e);
+        } catch(e) {
+            // the `error` exploded, nothing to do
+        }
+    }
+    return true;
+};
+
+/**
+ * @see GenericWorker.lock
+ */
+ZipFileWorker.prototype.lock = function () {
+    GenericWorker.prototype.lock.call(this);
+    var sources = this._sources;
+    for(var i = 0; i < sources.length; i++) {
+        sources[i].lock();
+    }
+};
+
+module.exports = ZipFileWorker;
+
+},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(require,module,exports){
+'use strict';
+
+var compressions = require('../compressions');
+var ZipFileWorker = require('./ZipFileWorker');
+
+/**
+ * Find the compression to use.
+ * @param {String} fileCompression the compression defined at the file level, if any.
+ * @param {String} zipCompression the compression defined at the load() level.
+ * @return {Object} the compression object to use.
+ */
+var getCompression = function (fileCompression, zipCompression) {
+
+    var compressionName = fileCompression || zipCompression;
+    var compression = compressions[compressionName];
+    if (!compression) {
+        throw new Error(compressionName + " is not a valid compression method !");
+    }
+    return compression;
+};
+
+/**
+ * Create a worker to generate a zip file.
+ * @param {JSZip} zip the JSZip instance at the right root level.
+ * @param {Object} options to generate the zip file.
+ * @param {String} comment the comment to use.
+ */
+exports.generateWorker = function (zip, options, comment) {
+
+    var zipFileWorker = new ZipFileWorker(options.streamFiles, comment, options.platform, options.encodeFileName);
+    var entriesCount = 0;
+    try {
+
+        zip.forEach(function (relativePath, file) {
+            entriesCount++;
+            var compression = getCompression(file.options.compression, options.compression);
+            var compressionOptions = file.options.compressionOptions || options.compressionOptions || {};
+            var dir = file.dir, date = file.date;
+
+            file._compressWorker(compression, compressionOptions)
+            .withStreamInfo("file", {
+                name : relativePath,
+                dir : dir,
+                date : date,
+                comment : file.comment || "",
+                unixPermissions : file.unixPermissions,
+                dosPermissions : file.dosPermissions
+            })
+            .pipe(zipFileWorker);
+        });
+        zipFileWorker.entriesCount = entriesCount;
+    } catch (e) {
+        zipFileWorker.error(e);
+    }
+
+    return zipFileWorker;
+};
+
+},{"../compressions":3,"./ZipFileWorker":8}],10:[function(require,module,exports){
+'use strict';
+
+/**
+ * Representation a of zip file in js
+ * @constructor
+ */
+function JSZip() {
+    // if this constructor is used without `new`, it adds `new` before itself:
+    if(!(this instanceof JSZip)) {
+        return new JSZip();
+    }
+
+    if(arguments.length) {
+        throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");
+    }
+
+    // object containing the files :
+    // {
+    //   "folder/" : {...},
+    //   "folder/data.txt" : {...}
+    // }
+    this.files = {};
+
+    this.comment = null;
+
+    // Where we are in the hierarchy
+    this.root = "";
+    this.clone = function() {
+        var newObj = new JSZip();
+        for (var i in this) {
+            if (typeof this[i] !== "function") {
+                newObj[i] = this[i];
+            }
+        }
+        return newObj;
+    };
+}
+JSZip.prototype = require('./object');
+JSZip.prototype.loadAsync = require('./load');
+JSZip.support = require('./support');
+JSZip.defaults = require('./defaults');
+
+// TODO find a better way to handle this version,
+// a require('package.json').version doesn't work with webpack, see #327
+JSZip.version = "3.1.5";
+
+JSZip.loadAsync = function (content, options) {
+    return new JSZip().loadAsync(content, options);
+};
+
+JSZip.external = require("./external");
+module.exports = JSZip;
+
+},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(require,module,exports){
+'use strict';
+var utils = require('./utils');
+var external = require("./external");
+var utf8 = require('./utf8');
+var utils = require('./utils');
+var ZipEntries = require('./zipEntries');
+var Crc32Probe = require('./stream/Crc32Probe');
+var nodejsUtils = require("./nodejsUtils");
+
+/**
+ * Check the CRC32 of an entry.
+ * @param {ZipEntry} zipEntry the zip entry to check.
+ * @return {Promise} the result.
+ */
+function checkEntryCRC32(zipEntry) {
+    return new external.Promise(function (resolve, reject) {
+        var worker = zipEntry.decompressed.getContentWorker().pipe(new Crc32Probe());
+        worker.on("error", function (e) {
+            reject(e);
+        })
+        .on("end", function () {
+            if (worker.streamInfo.crc32 !== zipEntry.decompressed.crc32) {
+                reject(new Error("Corrupted zip : CRC32 mismatch"));
+            } else {
+                resolve();
+            }
+        })
+        .resume();
+    });
+}
+
+module.exports = function(data, options) {
+    var zip = this;
+    options = utils.extend(options || {}, {
+        base64: false,
+        checkCRC32: false,
+        optimizedBinaryString: false,
+        createFolders: false,
+        decodeFileName: utf8.utf8decode
+    });
+
+    if (nodejsUtils.isNode && nodejsUtils.isStream(data)) {
+        return external.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file."));
+    }
+
+    return utils.prepareContent("the loaded zip file", data, true, options.optimizedBinaryString, options.base64)
+    .then(function(data) {
+        var zipEntries = new ZipEntries(options);
+        zipEntries.load(data);
+        return zipEntries;
+    }).then(function checkCRC32(zipEntries) {
+        var promises = [external.Promise.resolve(zipEntries)];
+        var files = zipEntries.files;
+        if (options.checkCRC32) {
+            for (var i = 0; i < files.length; i++) {
+                promises.push(checkEntryCRC32(files[i]));
+            }
+        }
+        return external.Promise.all(promises);
+    }).then(function addFiles(results) {
+        var zipEntries = results.shift();
+        var files = zipEntries.files;
+        for (var i = 0; i < files.length; i++) {
+            var input = files[i];
+            zip.file(input.fileNameStr, input.decompressed, {
+                binary: true,
+                optimizedBinaryString: true,
+                date: input.date,
+                dir: input.dir,
+                comment : input.fileCommentStr.length ? input.fileCommentStr : null,
+                unixPermissions : input.unixPermissions,
+                dosPermissions : input.dosPermissions,
+                createFolders: options.createFolders
+            });
+        }
+        if (zipEntries.zipComment.length) {
+            zip.comment = zipEntries.zipComment;
+        }
+
+        return zip;
+    });
+};
+
+},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(require,module,exports){
+"use strict";
+
+var utils = require('../utils');
+var GenericWorker = require('../stream/GenericWorker');
+
+/**
+ * A worker that use a nodejs stream as source.
+ * @constructor
+ * @param {String} filename the name of the file entry for this stream.
+ * @param {Readable} stream the nodejs stream.
+ */
+function NodejsStreamInputAdapter(filename, stream) {
+    GenericWorker.call(this, "Nodejs stream input adapter for " + filename);
+    this._upstreamEnded = false;
+    this._bindStream(stream);
+}
+
+utils.inherits(NodejsStreamInputAdapter, GenericWorker);
+
+/**
+ * Prepare the stream and bind the callbacks on it.
+ * Do this ASAP on node 0.10 ! A lazy binding doesn't always work.
+ * @param {Stream} stream the nodejs stream to use.
+ */
+NodejsStreamInputAdapter.prototype._bindStream = function (stream) {
+    var self = this;
+    this._stream = stream;
+    stream.pause();
+    stream
+    .on("data", function (chunk) {
+        self.push({
+            data: chunk,
+            meta : {
+                percent : 0
+            }
+        });
+    })
+    .on("error", function (e) {
+        if(self.isPaused) {
+            this.generatedError = e;
+        } else {
+            self.error(e);
+        }
+    })
+    .on("end", function () {
+        if(self.isPaused) {
+            self._upstreamEnded = true;
+        } else {
+            self.end();
+        }
+    });
+};
+NodejsStreamInputAdapter.prototype.pause = function () {
+    if(!GenericWorker.prototype.pause.call(this)) {
+        return false;
+    }
+    this._stream.pause();
+    return true;
+};
+NodejsStreamInputAdapter.prototype.resume = function () {
+    if(!GenericWorker.prototype.resume.call(this)) {
+        return false;
+    }
+
+    if(this._upstreamEnded) {
+        this.end();
+    } else {
+        this._stream.resume();
+    }
+
+    return true;
+};
+
+module.exports = NodejsStreamInputAdapter;
+
+},{"../stream/GenericWorker":28,"../utils":32}],13:[function(require,module,exports){
+'use strict';
+
+var Readable = require('readable-stream').Readable;
+
+var utils = require('../utils');
+utils.inherits(NodejsStreamOutputAdapter, Readable);
+
+/**
+* A nodejs stream using a worker as source.
+* @see the SourceWrapper in http://nodejs.org/api/stream.html
+* @constructor
+* @param {StreamHelper} helper the helper wrapping the worker
+* @param {Object} options the nodejs stream options
+* @param {Function} updateCb the update callback.
+*/
+function NodejsStreamOutputAdapter(helper, options, updateCb) {
+    Readable.call(this, options);
+    this._helper = helper;
+
+    var self = this;
+    helper.on("data", function (data, meta) {
+        if (!self.push(data)) {
+            self._helper.pause();
+        }
+        if(updateCb) {
+            updateCb(meta);
+        }
+    })
+    .on("error", function(e) {
+        self.emit('error', e);
+    })
+    .on("end", function () {
+        self.push(null);
+    });
+}
+
+
+NodejsStreamOutputAdapter.prototype._read = function() {
+    this._helper.resume();
+};
+
+module.exports = NodejsStreamOutputAdapter;
+
+},{"../utils":32,"readable-stream":16}],14:[function(require,module,exports){
+'use strict';
+
+module.exports = {
+    /**
+     * True if this is running in Nodejs, will be undefined in a browser.
+     * In a browser, browserify won't include this file and the whole module
+     * will be resolved an empty object.
+     */
+    isNode : typeof Buffer !== "undefined",
+    /**
+     * Create a new nodejs Buffer from an existing content.
+     * @param {Object} data the data to pass to the constructor.
+     * @param {String} encoding the encoding to use.
+     * @return {Buffer} a new Buffer.
+     */
+    newBufferFrom: function(data, encoding) {
+        // XXX We can't use `Buffer.from` which comes from `Uint8Array.from`
+        // in nodejs v4 (< v.4.5). It's not the expected implementation (and
+        // has a different signature).
+        // see https://github.com/nodejs/node/issues/8053
+        // A condition on nodejs' version won't solve the issue as we don't
+        // control the Buffer polyfills that may or may not be used.
+        return new Buffer(data, encoding);
+    },
+    /**
+     * Create a new nodejs Buffer with the specified size.
+     * @param {Integer} size the size of the buffer.
+     * @return {Buffer} a new Buffer.
+     */
+    allocBuffer: function (size) {
+        if (Buffer.alloc) {
+            return Buffer.alloc(size);
+        } else {
+            return new Buffer(size);
+        }
+    },
+    /**
+     * Find out if an object is a Buffer.
+     * @param {Object} b the object to test.
+     * @return {Boolean} true if the object is a Buffer, false otherwise.
+     */
+    isBuffer : function(b){
+        return Buffer.isBuffer(b);
+    },
+
+    isStream : function (obj) {
+        return obj &&
+            typeof obj.on === "function" &&
+            typeof obj.pause === "function" &&
+            typeof obj.resume === "function";
+    }
+};
+
+},{}],15:[function(require,module,exports){
+'use strict';
+var utf8 = require('./utf8');
+var utils = require('./utils');
+var GenericWorker = require('./stream/GenericWorker');
+var StreamHelper = require('./stream/StreamHelper');
+var defaults = require('./defaults');
+var CompressedObject = require('./compressedObject');
+var ZipObject = require('./zipObject');
+var generate = require("./generate");
+var nodejsUtils = require("./nodejsUtils");
+var NodejsStreamInputAdapter = require("./nodejs/NodejsStreamInputAdapter");
+
+
+/**
+ * Add a file in the current folder.
+ * @private
+ * @param {string} name the name of the file
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data of the file
+ * @param {Object} originalOptions the options of the file
+ * @return {Object} the new file.
+ */
+var fileAdd = function(name, data, originalOptions) {
+    // be sure sub folders exist
+    var dataType = utils.getTypeOf(data),
+        parent;
+
+
+    /*
+     * Correct options.
+     */
+
+    var o = utils.extend(originalOptions || {}, defaults);
+    o.date = o.date || new Date();
+    if (o.compression !== null) {
+        o.compression = o.compression.toUpperCase();
+    }
+
+    if (typeof o.unixPermissions === "string") {
+        o.unixPermissions = parseInt(o.unixPermissions, 8);
+    }
+
+    // UNX_IFDIR  0040000 see zipinfo.c
+    if (o.unixPermissions && (o.unixPermissions & 0x4000)) {
+        o.dir = true;
+    }
+    // Bit 4    Directory
+    if (o.dosPermissions && (o.dosPermissions & 0x0010)) {
+        o.dir = true;
+    }
+
+    if (o.dir) {
+        name = forceTrailingSlash(name);
+    }
+    if (o.createFolders && (parent = parentFolder(name))) {
+        folderAdd.call(this, parent, true);
+    }
+
+    var isUnicodeString = dataType === "string" && o.binary === false && o.base64 === false;
+    if (!originalOptions || typeof originalOptions.binary === "undefined") {
+        o.binary = !isUnicodeString;
+    }
+
+
+    var isCompressedEmpty = (data instanceof CompressedObject) && data.uncompressedSize === 0;
+
+    if (isCompressedEmpty || o.dir || !data || data.length === 0) {
+        o.base64 = false;
+        o.binary = true;
+        data = "";
+        o.compression = "STORE";
+        dataType = "string";
+    }
+
+    /*
+     * Convert content to fit.
+     */
+
+    var zipObjectContent = null;
+    if (data instanceof CompressedObject || data instanceof GenericWorker) {
+        zipObjectContent = data;
+    } else if (nodejsUtils.isNode && nodejsUtils.isStream(data)) {
+        zipObjectContent = new NodejsStreamInputAdapter(name, data);
+    } else {
+        zipObjectContent = utils.prepareContent(name, data, o.binary, o.optimizedBinaryString, o.base64);
+    }
+
+    var object = new ZipObject(name, zipObjectContent, o);
+    this.files[name] = object;
+    /*
+    TODO: we can't throw an exception because we have async promises
+    (we can have a promise of a Date() for example) but returning a
+    promise is useless because file(name, data) returns the JSZip
+    object for chaining. Should we break that to allow the user
+    to catch the error ?
+
+    return external.Promise.resolve(zipObjectContent)
+    .then(function () {
+        return object;
+    });
+    */
+};
+
+/**
+ * Find the parent folder of the path.
+ * @private
+ * @param {string} path the path to use
+ * @return {string} the parent folder, or ""
+ */
+var parentFolder = function (path) {
+    if (path.slice(-1) === '/') {
+        path = path.substring(0, path.length - 1);
+    }
+    var lastSlash = path.lastIndexOf('/');
+    return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
+};
+
+/**
+ * Returns the path with a slash at the end.
+ * @private
+ * @param {String} path the path to check.
+ * @return {String} the path with a trailing slash.
+ */
+var forceTrailingSlash = function(path) {
+    // Check the name ends with a /
+    if (path.slice(-1) !== "/") {
+        path += "/"; // IE doesn't like substr(-1)
+    }
+    return path;
+};
+
+/**
+ * Add a (sub) folder in the current folder.
+ * @private
+ * @param {string} name the folder's name
+ * @param {boolean=} [createFolders] If true, automatically create sub
+ *  folders. Defaults to false.
+ * @return {Object} the new folder.
+ */
+var folderAdd = function(name, createFolders) {
+    createFolders = (typeof createFolders !== 'undefined') ? createFolders : defaults.createFolders;
+
+    name = forceTrailingSlash(name);
+
+    // Does this folder already exist?
+    if (!this.files[name]) {
+        fileAdd.call(this, name, null, {
+            dir: true,
+            createFolders: createFolders
+        });
+    }
+    return this.files[name];
+};
+
+/**
+* Cross-window, cross-Node-context regular expression detection
+* @param  {Object}  object Anything
+* @return {Boolean}        true if the object is a regular expression,
+* false otherwise
+*/
+function isRegExp(object) {
+    return Object.prototype.toString.call(object) === "[object RegExp]";
+}
+
+// return the actual prototype of JSZip
+var out = {
+    /**
+     * @see loadAsync
+     */
+    load: function() {
+        throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.");
+    },
+
+
+    /**
+     * Call a callback function for each entry at this folder level.
+     * @param {Function} cb the callback function:
+     * function (relativePath, file) {...}
+     * It takes 2 arguments : the relative path and the file.
+     */
+    forEach: function(cb) {
+        var filename, relativePath, file;
+        for (filename in this.files) {
+            if (!this.files.hasOwnProperty(filename)) {
+                continue;
+            }
+            file = this.files[filename];
+            relativePath = filename.slice(this.root.length, filename.length);
+            if (relativePath && filename.slice(0, this.root.length) === this.root) { // the file is in the current root
+                cb(relativePath, file); // TODO reverse the parameters ? need to be clean AND consistent with the filter search fn...
+            }
+        }
+    },
+
+    /**
+     * Filter nested files/folders with the specified function.
+     * @param {Function} search the predicate to use :
+     * function (relativePath, file) {...}
+     * It takes 2 arguments : the relative path and the file.
+     * @return {Array} An array of matching elements.
+     */
+    filter: function(search) {
+        var result = [];
+        this.forEach(function (relativePath, entry) {
+            if (search(relativePath, entry)) { // the file matches the function
+                result.push(entry);
+            }
+
+        });
+        return result;
+    },
+
+    /**
+     * Add a file to the zip file, or search a file.
+     * @param   {string|RegExp} name The name of the file to add (if data is defined),
+     * the name of the file to find (if no data) or a regex to match files.
+     * @param   {String|ArrayBuffer|Uint8Array|Buffer} data  The file data, either raw or base64 encoded
+     * @param   {Object} o     File options
+     * @return  {JSZip|Object|Array} this JSZip object (when adding a file),
+     * a file (when searching by string) or an array of files (when searching by regex).
+     */
+    file: function(name, data, o) {
+        if (arguments.length === 1) {
+            if (isRegExp(name)) {
+                var regexp = name;
+                return this.filter(function(relativePath, file) {
+                    return !file.dir && regexp.test(relativePath);
+                });
+            }
+            else { // text
+                var obj = this.files[this.root + name];
+                if (obj && !obj.dir) {
+                    return obj;
+                } else {
+                    return null;
+                }
+            }
+        }
+        else { // more than one argument : we have data !
+            name = this.root + name;
+            fileAdd.call(this, name, data, o);
+        }
+        return this;
+    },
+
+    /**
+     * Add a directory to the zip file, or search.
+     * @param   {String|RegExp} arg The name of the directory to add, or a regex to search folders.
+     * @return  {JSZip} an object with the new directory as the root, or an array containing matching folders.
+     */
+    folder: function(arg) {
+        if (!arg) {
+            return this;
+        }
+
+        if (isRegExp(arg)) {
+            return this.filter(function(relativePath, file) {
+                return file.dir && arg.test(relativePath);
+            });
+        }
+
+        // else, name is a new folder
+        var name = this.root + arg;
+        var newFolder = folderAdd.call(this, name);
+
+        // Allow chaining by returning a new object with this folder as the root
+        var ret = this.clone();
+        ret.root = newFolder.name;
+        return ret;
+    },
+
+    /**
+     * Delete a file, or a directory and all sub-files, from the zip
+     * @param {string} name the name of the file to delete
+     * @return {JSZip} this JSZip object
+     */
+    remove: function(name) {
+        name = this.root + name;
+        var file = this.files[name];
+        if (!file) {
+            // Look for any folders
+            if (name.slice(-1) !== "/") {
+                name += "/";
+            }
+            file = this.files[name];
+        }
+
+        if (file && !file.dir) {
+            // file
+            delete this.files[name];
+        } else {
+            // maybe a folder, delete recursively
+            var kids = this.filter(function(relativePath, file) {
+                return file.name.slice(0, name.length) === name;
+            });
+            for (var i = 0; i < kids.length; i++) {
+                delete this.files[kids[i].name];
+            }
+        }
+
+        return this;
+    },
+
+    /**
+     * Generate the complete zip file
+     * @param {Object} options the options to generate the zip file :
+     * - compression, "STORE" by default.
+     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
+     * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the zip file
+     */
+    generate: function(options) {
+        throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.");
+    },
+
+    /**
+     * Generate the complete zip file as an internal stream.
+     * @param {Object} options the options to generate the zip file :
+     * - compression, "STORE" by default.
+     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
+     * @return {StreamHelper} the streamed zip file.
+     */
+    generateInternalStream: function(options) {
+      var worker, opts = {};
+      try {
+          opts = utils.extend(options || {}, {
+              streamFiles: false,
+              compression: "STORE",
+              compressionOptions : null,
+              type: "",
+              platform: "DOS",
+              comment: null,
+              mimeType: 'application/zip',
+              encodeFileName: utf8.utf8encode
+          });
+
+          opts.type = opts.type.toLowerCase();
+          opts.compression = opts.compression.toUpperCase();
+
+          // "binarystring" is prefered but the internals use "string".
+          if(opts.type === "binarystring") {
+            opts.type = "string";
+          }
+
+          if (!opts.type) {
+            throw new Error("No output type specified.");
+          }
+
+          utils.checkSupport(opts.type);
+
+          // accept nodejs `process.platform`
+          if(
+              opts.platform === 'darwin' ||
+              opts.platform === 'freebsd' ||
+              opts.platform === 'linux' ||
+              opts.platform === 'sunos'
+          ) {
+              opts.platform = "UNIX";
+          }
+          if (opts.platform === 'win32') {
+              opts.platform = "DOS";
+          }
+
+          var comment = opts.comment || this.comment || "";
+          worker = generate.generateWorker(this, opts, comment);
+      } catch (e) {
+        worker = new GenericWorker("error");
+        worker.error(e);
+      }
+      return new StreamHelper(worker, opts.type || "string", opts.mimeType);
+    },
+    /**
+     * Generate the complete zip file asynchronously.
+     * @see generateInternalStream
+     */
+    generateAsync: function(options, onUpdate) {
+        return this.generateInternalStream(options).accumulate(onUpdate);
+    },
+    /**
+     * Generate the complete zip file asynchronously.
+     * @see generateInternalStream
+     */
+    generateNodeStream: function(options, onUpdate) {
+        options = options || {};
+        if (!options.type) {
+            options.type = "nodebuffer";
+        }
+        return this.generateInternalStream(options).toNodejsStream(onUpdate);
+    }
+};
+module.exports = out;
+
+},{"./compressedObject":2,"./defaults":5,"./generate":9,"./nodejs/NodejsStreamInputAdapter":12,"./nodejsUtils":14,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31,"./utils":32,"./zipObject":35}],16:[function(require,module,exports){
+/*
+ * This file is used by module bundlers (browserify/webpack/etc) when
+ * including a stream implementation. We use "readable-stream" to get a
+ * consistent behavior between nodejs versions but bundlers often have a shim
+ * for "stream". Using this shim greatly improve the compatibility and greatly
+ * reduce the final size of the bundle (only one stream implementation, not
+ * two).
+ */
+module.exports = require("stream");
+
+},{"stream":undefined}],17:[function(require,module,exports){
+'use strict';
+var DataReader = require('./DataReader');
+var utils = require('../utils');
+
+function ArrayReader(data) {
+    DataReader.call(this, data);
+	for(var i = 0; i < this.data.length; i++) {
+		data[i] = data[i] & 0xFF;
+	}
+}
+utils.inherits(ArrayReader, DataReader);
+/**
+ * @see DataReader.byteAt
+ */
+ArrayReader.prototype.byteAt = function(i) {
+    return this.data[this.zero + i];
+};
+/**
+ * @see DataReader.lastIndexOfSignature
+ */
+ArrayReader.prototype.lastIndexOfSignature = function(sig) {
+    var sig0 = sig.charCodeAt(0),
+        sig1 = sig.charCodeAt(1),
+        sig2 = sig.charCodeAt(2),
+        sig3 = sig.charCodeAt(3);
+    for (var i = this.length - 4; i >= 0; --i) {
+        if (this.data[i] === sig0 && this.data[i + 1] === sig1 && this.data[i + 2] === sig2 && this.data[i + 3] === sig3) {
+            return i - this.zero;
+        }
+    }
+
+    return -1;
+};
+/**
+ * @see DataReader.readAndCheckSignature
+ */
+ArrayReader.prototype.readAndCheckSignature = function (sig) {
+    var sig0 = sig.charCodeAt(0),
+        sig1 = sig.charCodeAt(1),
+        sig2 = sig.charCodeAt(2),
+        sig3 = sig.charCodeAt(3),
+        data = this.readData(4);
+    return sig0 === data[0] && sig1 === data[1] && sig2 === data[2] && sig3 === data[3];
+};
+/**
+ * @see DataReader.readData
+ */
+ArrayReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    if(size === 0) {
+        return [];
+    }
+    var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
+    return result;
+};
+module.exports = ArrayReader;
+
+},{"../utils":32,"./DataReader":18}],18:[function(require,module,exports){
+'use strict';
+var utils = require('../utils');
 
 function DataReader(data) {
-    this.data = null; // type : see implementation
-    this.length = 0;
+    this.data = data; // type : see implementation
+    this.length = data.length;
     this.index = 0;
+    this.zero = 0;
 }
 DataReader.prototype = {
     /**
@@ -249,12 +1805,12 @@ DataReader.prototype = {
         this.checkIndex(this.index + offset);
     },
     /**
-     * Check that the specifed index will not be too far.
+     * Check that the specified index will not be too far.
      * @param {string} newIndex the index to check.
      * @throws {Error} an Error if the index is out of bounds.
      */
     checkIndex: function(newIndex) {
-        if (this.length < newIndex || newIndex < 0) {
+        if (this.length < this.zero + newIndex || newIndex < 0) {
             throw new Error("End of data reached (data length = " + this.length + ", asked index = " + (newIndex) + "). Corrupted zip ?");
         }
     },
@@ -322,1194 +1878,147 @@ DataReader.prototype = {
     lastIndexOfSignature: function(sig) {
         // see implementations
     },
+    /**
+     * Read the signature (4 bytes) at the current position and compare it with sig.
+     * @param {string} sig the expected signature
+     * @return {boolean} true if the signature matches, false otherwise.
+     */
+    readAndCheckSignature: function(sig) {
+        // see implementations
+    },
     /**
      * Get the next date.
      * @return {Date} the date.
      */
     readDate: function() {
         var dostime = this.readInt(4);
-        return new Date(
+        return new Date(Date.UTC(
         ((dostime >> 25) & 0x7f) + 1980, // year
         ((dostime >> 21) & 0x0f) - 1, // month
         (dostime >> 16) & 0x1f, // day
         (dostime >> 11) & 0x1f, // hour
         (dostime >> 5) & 0x3f, // minute
-        (dostime & 0x1f) << 1); // second
+        (dostime & 0x1f) << 1)); // second
     }
 };
 module.exports = DataReader;
 
-},{"./utils":21}],6:[function(_dereq_,module,exports){
+},{"../utils":32}],19:[function(require,module,exports){
 'use strict';
-exports.base64 = false;
-exports.binary = false;
-exports.dir = false;
-exports.createFolders = false;
-exports.date = null;
-exports.compression = null;
-exports.compressionOptions = null;
-exports.comment = null;
-exports.unixPermissions = null;
-exports.dosPermissions = null;
-
-},{}],7:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2binary = function(str) {
-    return utils.string2binary(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Uint8Array = function(str) {
-    return utils.transformTo("uint8array", str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.uint8Array2String = function(array) {
-    return utils.transformTo("string", array);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Blob = function(str) {
-    var buffer = utils.transformTo("arraybuffer", str);
-    return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.arrayBuffer2Blob = function(buffer) {
-    return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.transformTo = function(outputType, input) {
-    return utils.transformTo(outputType, input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.getTypeOf = function(input) {
-    return utils.getTypeOf(input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.checkSupport = function(type) {
-    return utils.checkSupport(type);
-};
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_16BITS = utils.MAX_VALUE_16BITS;
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_32BITS = utils.MAX_VALUE_32BITS;
-
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.pretty = function(str) {
-    return utils.pretty(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.findCompression = function(compressionMethod) {
-    return utils.findCompression(compressionMethod);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.isRegExp = function (object) {
-    return utils.isRegExp(object);
-};
-
-
-},{"./utils":21}],8:[function(_dereq_,module,exports){
-'use strict';
-var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
-
-var pako = _dereq_("pako");
-exports.uncompressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-exports.compressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-
-exports.magic = "\x08\x00";
-exports.compress = function(input, compressionOptions) {
-    return pako.deflateRaw(input, {
-        level : compressionOptions.level || -1 // default compression
-    });
-};
-exports.uncompress =  function(input) {
-    return pako.inflateRaw(input);
-};
-
-},{"pako":24}],9:[function(_dereq_,module,exports){
-'use strict';
-
-var base64 = _dereq_('./base64');
-
-/**
-Usage:
-   zip = new JSZip();
-   zip.file("hello.txt", "Hello, World!").file("tempfile", "nothing");
-   zip.folder("images").file("smile.gif", base64Data, {base64: true});
-   zip.file("Xmas.txt", "Ho ho ho !", {date : new Date("December 25, 2007 00:00:01")});
-   zip.remove("tempfile");
-
-   base64zip = zip.generate();
-
-**/
-
-/**
- * Representation a of zip file in js
- * @constructor
- * @param {String=|ArrayBuffer=|Uint8Array=} data the data to load, if any (optional).
- * @param {Object=} options the options for creating this objects (optional).
- */
-function JSZip(data, options) {
-    // if this constructor is used without `new`, it adds `new` before itself:
-    if(!(this instanceof JSZip)) return new JSZip(data, options);
-
-    // object containing the files :
-    // {
-    //   "folder/" : {...},
-    //   "folder/data.txt" : {...}
-    // }
-    this.files = {};
-
-    this.comment = null;
-
-    // Where we are in the hierarchy
-    this.root = "";
-    if (data) {
-        this.load(data, options);
-    }
-    this.clone = function() {
-        var newObj = new JSZip();
-        for (var i in this) {
-            if (typeof this[i] !== "function") {
-                newObj[i] = this[i];
-            }
-        }
-        return newObj;
-    };
-}
-JSZip.prototype = _dereq_('./object');
-JSZip.prototype.load = _dereq_('./load');
-JSZip.support = _dereq_('./support');
-JSZip.defaults = _dereq_('./defaults');
-
-/**
- * @deprecated
- * This namespace will be removed in a future version without replacement.
- */
-JSZip.utils = _dereq_('./deprecatedPublicUtils');
-
-JSZip.base64 = {
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    encode : function(input) {
-        return base64.encode(input);
-    },
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    decode : function(input) {
-        return base64.decode(input);
-    }
-};
-JSZip.compressions = _dereq_('./compressions');
-module.exports = JSZip;
-
-},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(_dereq_,module,exports){
-'use strict';
-var base64 = _dereq_('./base64');
-var ZipEntries = _dereq_('./zipEntries');
-module.exports = function(data, options) {
-    var files, zipEntries, i, input;
-    options = options || {};
-    if (options.base64) {
-        data = base64.decode(data);
-    }
-
-    zipEntries = new ZipEntries(data, options);
-    files = zipEntries.files;
-    for (i = 0; i < files.length; i++) {
-        input = files[i];
-        this.file(input.fileName, input.decompressed, {
-            binary: true,
-            optimizedBinaryString: true,
-            date: input.date,
-            dir: input.dir,
-            comment : input.fileComment.length ? input.fileComment : null,
-            unixPermissions : input.unixPermissions,
-            dosPermissions : input.dosPermissions,
-            createFolders: options.createFolders
-        });
-    }
-    if (zipEntries.zipComment.length) {
-        this.comment = zipEntries.zipComment;
-    }
-
-    return this;
-};
-
-},{"./base64":1,"./zipEntries":22}],11:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-module.exports = function(data, encoding){
-    return new Buffer(data, encoding);
-};
-module.exports.test = function(b){
-    return Buffer.isBuffer(b);
-};
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],12:[function(_dereq_,module,exports){
-'use strict';
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
+var Uint8ArrayReader = require('./Uint8ArrayReader');
+var utils = require('../utils');
 
 function NodeBufferReader(data) {
-    this.data = data;
-    this.length = this.data.length;
-    this.index = 0;
+    Uint8ArrayReader.call(this, data);
 }
-NodeBufferReader.prototype = new Uint8ArrayReader();
+utils.inherits(NodeBufferReader, Uint8ArrayReader);
 
 /**
  * @see DataReader.readData
  */
 NodeBufferReader.prototype.readData = function(size) {
     this.checkOffset(size);
-    var result = this.data.slice(this.index, this.index + size);
+    var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
     this.index += size;
     return result;
 };
 module.exports = NodeBufferReader;
 
-},{"./uint8ArrayReader":18}],13:[function(_dereq_,module,exports){
+},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(require,module,exports){
 'use strict';
-var support = _dereq_('./support');
-var utils = _dereq_('./utils');
-var crc32 = _dereq_('./crc32');
-var signature = _dereq_('./signature');
-var defaults = _dereq_('./defaults');
-var base64 = _dereq_('./base64');
-var compressions = _dereq_('./compressions');
-var CompressedObject = _dereq_('./compressedObject');
-var nodeBuffer = _dereq_('./nodeBuffer');
-var utf8 = _dereq_('./utf8');
-var StringWriter = _dereq_('./stringWriter');
-var Uint8ArrayWriter = _dereq_('./uint8ArrayWriter');
+var DataReader = require('./DataReader');
+var utils = require('../utils');
 
+function StringReader(data) {
+    DataReader.call(this, data);
+}
+utils.inherits(StringReader, DataReader);
 /**
- * Returns the raw data of a ZipObject, decompress the content if necessary.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
+ * @see DataReader.byteAt
  */
-var getRawData = function(file) {
-    if (file._data instanceof CompressedObject) {
-        file._data = file._data.getContent();
-        file.options.binary = true;
-        file.options.base64 = false;
-
-        if (utils.getTypeOf(file._data) === "uint8array") {
-            var copy = file._data;
-            // when reading an arraybuffer, the CompressedObject mechanism will keep it and subarray() a Uint8Array.
-            // if we request a file in the same format, we might get the same Uint8Array or its ArrayBuffer (the original zip file).
-            file._data = new Uint8Array(copy.length);
-            // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
-            if (copy.length !== 0) {
-                file._data.set(copy, 0);
-            }
-        }
-    }
-    return file._data;
+StringReader.prototype.byteAt = function(i) {
+    return this.data.charCodeAt(this.zero + i);
 };
-
 /**
- * Returns the data of a ZipObject in a binary form. If the content is an unicode string, encode it.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
+ * @see DataReader.lastIndexOfSignature
  */
-var getBinaryData = function(file) {
-    var result = getRawData(file),
-        type = utils.getTypeOf(result);
-    if (type === "string") {
-        if (!file.options.binary) {
-            // unicode text !
-            // unicode string => binary string is a painful process, check if we can avoid it.
-            if (support.nodebuffer) {
-                return nodeBuffer(result, "utf-8");
-            }
-        }
-        return file.asBinary();
-    }
+StringReader.prototype.lastIndexOfSignature = function(sig) {
+    return this.data.lastIndexOf(sig) - this.zero;
+};
+/**
+ * @see DataReader.readAndCheckSignature
+ */
+StringReader.prototype.readAndCheckSignature = function (sig) {
+    var data = this.readData(4);
+    return sig === data;
+};
+/**
+ * @see DataReader.readData
+ */
+StringReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    // this will work because the constructor applied the "& 0xff" mask.
+    var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
     return result;
 };
+module.exports = StringReader;
 
+},{"../utils":32,"./DataReader":18}],21:[function(require,module,exports){
+'use strict';
+var ArrayReader = require('./ArrayReader');
+var utils = require('../utils');
+
+function Uint8ArrayReader(data) {
+    ArrayReader.call(this, data);
+}
+utils.inherits(Uint8ArrayReader, ArrayReader);
 /**
- * Transform this._data into a string.
- * @param {function} filter a function String -> String, applied if not null on the result.
- * @return {String} the string representing this._data.
+ * @see DataReader.readData
  */
-var dataToString = function(asUTF8) {
-    var result = getRawData(this);
-    if (result === null || typeof result === "undefined") {
-        return "";
-    }
-    // if the data is a base64 string, we decode it before checking the encoding !
-    if (this.options.base64) {
-        result = base64.decode(result);
-    }
-    if (asUTF8 && this.options.binary) {
-        // JSZip.prototype.utf8decode supports arrays as input
-        // skip to array => string step, utf8decode will do it.
-        result = out.utf8decode(result);
-    }
-    else {
-        // no utf8 transformation, do the array => string step.
-        result = utils.transformTo("string", result);
-    }
-
-    if (!asUTF8 && !this.options.binary) {
-        result = utils.transformTo("string", out.utf8encode(result));
+Uint8ArrayReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    if(size === 0) {
+        // in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
+        return new Uint8Array(0);
     }
+    var result = this.data.subarray(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
     return result;
 };
-/**
- * A simple object representing a file in the zip file.
- * @constructor
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data
- * @param {Object} options the options of the file
- */
-var ZipObject = function(name, data, options) {
-    this.name = name;
-    this.dir = options.dir;
-    this.date = options.date;
-    this.comment = options.comment;
-    this.unixPermissions = options.unixPermissions;
-    this.dosPermissions = options.dosPermissions;
+module.exports = Uint8ArrayReader;
 
-    this._data = data;
-    this.options = options;
+},{"../utils":32,"./ArrayReader":17}],22:[function(require,module,exports){
+'use strict';
 
-    /*
-     * This object contains initial values for dir and date.
-     * With them, we can check if the user changed the deprecated metadata in
-     * `ZipObject#options` or not.
-     */
-    this._initialMetadata = {
-      dir : options.dir,
-      date : options.date
-    };
-};
-
-ZipObject.prototype = {
-    /**
-     * Return the content as UTF8 string.
-     * @return {string} the UTF8 string.
-     */
-    asText: function() {
-        return dataToString.call(this, true);
-    },
-    /**
-     * Returns the binary content.
-     * @return {string} the content as binary.
-     */
-    asBinary: function() {
-        return dataToString.call(this, false);
-    },
-    /**
-     * Returns the content as a nodejs Buffer.
-     * @return {Buffer} the content as a Buffer.
-     */
-    asNodeBuffer: function() {
-        var result = getBinaryData(this);
-        return utils.transformTo("nodebuffer", result);
-    },
-    /**
-     * Returns the content as an Uint8Array.
-     * @return {Uint8Array} the content as an Uint8Array.
-     */
-    asUint8Array: function() {
-        var result = getBinaryData(this);
-        return utils.transformTo("uint8array", result);
-    },
-    /**
-     * Returns the content as an ArrayBuffer.
-     * @return {ArrayBuffer} the content as an ArrayBufer.
-     */
-    asArrayBuffer: function() {
-        return this.asUint8Array().buffer;
-    }
-};
+var utils = require('../utils');
+var support = require('../support');
+var ArrayReader = require('./ArrayReader');
+var StringReader = require('./StringReader');
+var NodeBufferReader = require('./NodeBufferReader');
+var Uint8ArrayReader = require('./Uint8ArrayReader');
 
 /**
- * Transform an integer into a string in hexadecimal.
- * @private
- * @param {number} dec the number to convert.
- * @param {number} bytes the number of bytes to generate.
- * @returns {string} the result.
+ * Create a reader adapted to the data.
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data to read.
+ * @return {DataReader} the data reader.
  */
-var decToHex = function(dec, bytes) {
-    var hex = "",
-        i;
-    for (i = 0; i < bytes; i++) {
-        hex += String.fromCharCode(dec & 0xff);
-        dec = dec >>> 8;
+module.exports = function (data) {
+    var type = utils.getTypeOf(data);
+    utils.checkSupport(type);
+    if (type === "string" && !support.uint8array) {
+        return new StringReader(data);
     }
-    return hex;
+    if (type === "nodebuffer") {
+        return new NodeBufferReader(data);
+    }
+    if (support.uint8array) {
+        return new Uint8ArrayReader(utils.transformTo("uint8array", data));
+    }
+    return new ArrayReader(utils.transformTo("array", data));
 };
 
-/**
- * Merge the objects passed as parameters into a new one.
- * @private
- * @param {...Object} var_args All objects to merge.
- * @return {Object} a new object with the data of the others.
- */
-var extend = function() {
-    var result = {}, i, attr;
-    for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
-        for (attr in arguments[i]) {
-            if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
-                result[attr] = arguments[i][attr];
-            }
-        }
-    }
-    return result;
-};
-
-/**
- * Transforms the (incomplete) options from the user into the complete
- * set of options to create a file.
- * @private
- * @param {Object} o the options from the user.
- * @return {Object} the complete set of options.
- */
-var prepareFileAttrs = function(o) {
-    o = o || {};
-    if (o.base64 === true && (o.binary === null || o.binary === undefined)) {
-        o.binary = true;
-    }
-    o = extend(o, defaults);
-    o.date = o.date || new Date();
-    if (o.compression !== null) o.compression = o.compression.toUpperCase();
-
-    return o;
-};
-
-/**
- * Add a file in the current folder.
- * @private
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data of the file
- * @param {Object} o the options of the file
- * @return {Object} the new file.
- */
-var fileAdd = function(name, data, o) {
-    // be sure sub folders exist
-    var dataType = utils.getTypeOf(data),
-        parent;
-
-    o = prepareFileAttrs(o);
-
-    if (typeof o.unixPermissions === "string") {
-        o.unixPermissions = parseInt(o.unixPermissions, 8);
-    }
-
-    // UNX_IFDIR  0040000 see zipinfo.c
-    if (o.unixPermissions && (o.unixPermissions & 0x4000)) {
-        o.dir = true;
-    }
-    // Bit 4    Directory
-    if (o.dosPermissions && (o.dosPermissions & 0x0010)) {
-        o.dir = true;
-    }
-
-    if (o.dir) {
-        name = forceTrailingSlash(name);
-    }
-
-    if (o.createFolders && (parent = parentFolder(name))) {
-        folderAdd.call(this, parent, true);
-    }
-
-    if (o.dir || data === null || typeof data === "undefined") {
-        o.base64 = false;
-        o.binary = false;
-        data = null;
-        dataType = null;
-    }
-    else if (dataType === "string") {
-        if (o.binary && !o.base64) {
-            // optimizedBinaryString == true means that the file has already been filtered with a 0xFF mask
-            if (o.optimizedBinaryString !== true) {
-                // this is a string, not in a base64 format.
-                // Be sure that this is a correct "binary string"
-                data = utils.string2binary(data);
-            }
-        }
-    }
-    else { // arraybuffer, uint8array, ...
-        o.base64 = false;
-        o.binary = true;
-
-        if (!dataType && !(data instanceof CompressedObject)) {
-            throw new Error("The data of '" + name + "' is in an unsupported format !");
-        }
-
-        // special case : it's way easier to work with Uint8Array than with ArrayBuffer
-        if (dataType === "arraybuffer") {
-            data = utils.transformTo("uint8array", data);
-        }
-    }
-
-    var object = new ZipObject(name, data, o);
-    this.files[name] = object;
-    return object;
-};
-
-/**
- * Find the parent folder of the path.
- * @private
- * @param {string} path the path to use
- * @return {string} the parent folder, or ""
- */
-var parentFolder = function (path) {
-    if (path.slice(-1) == '/') {
-        path = path.substring(0, path.length - 1);
-    }
-    var lastSlash = path.lastIndexOf('/');
-    return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
-};
-
-
-/**
- * Returns the path with a slash at the end.
- * @private
- * @param {String} path the path to check.
- * @return {String} the path with a trailing slash.
- */
-var forceTrailingSlash = function(path) {
-    // Check the name ends with a /
-    if (path.slice(-1) != "/") {
-        path += "/"; // IE doesn't like substr(-1)
-    }
-    return path;
-};
-/**
- * Add a (sub) folder in the current folder.
- * @private
- * @param {string} name the folder's name
- * @param {boolean=} [createFolders] If true, automatically create sub
- *  folders. Defaults to false.
- * @return {Object} the new folder.
- */
-var folderAdd = function(name, createFolders) {
-    createFolders = (typeof createFolders !== 'undefined') ? createFolders : false;
-
-    name = forceTrailingSlash(name);
-
-    // Does this folder already exist?
-    if (!this.files[name]) {
-        fileAdd.call(this, name, null, {
-            dir: true,
-            createFolders: createFolders
-        });
-    }
-    return this.files[name];
-};
-
-/**
- * Generate a JSZip.CompressedObject for a given zipOject.
- * @param {ZipObject} file the object to read.
- * @param {JSZip.compression} compression the compression to use.
- * @param {Object} compressionOptions the options to use when compressing.
- * @return {JSZip.CompressedObject} the compressed result.
- */
-var generateCompressedObjectFrom = function(file, compression, compressionOptions) {
-    var result = new CompressedObject(),
-        content;
-
-    // the data has not been decompressed, we might reuse things !
-    if (file._data instanceof CompressedObject) {
-        result.uncompressedSize = file._data.uncompressedSize;
-        result.crc32 = file._data.crc32;
-
-        if (result.uncompressedSize === 0 || file.dir) {
-            compression = compressions['STORE'];
-            result.compressedContent = "";
-            result.crc32 = 0;
-        }
-        else if (file._data.compressionMethod === compression.magic) {
-            result.compressedContent = file._data.getCompressedContent();
-        }
-        else {
-            content = file._data.getContent();
-            // need to decompress / recompress
-            result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
-        }
-    }
-    else {
-        // have uncompressed data
-        content = getBinaryData(file);
-        if (!content || content.length === 0 || file.dir) {
-            compression = compressions['STORE'];
-            content = "";
-        }
-        result.uncompressedSize = content.length;
-        result.crc32 = crc32(content);
-        result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
-    }
-
-    result.compressedSize = result.compressedContent.length;
-    result.compressionMethod = compression.magic;
-
-    return result;
-};
-
-
-
-
-/**
- * Generate the UNIX part of the external file attributes.
- * @param {Object} unixPermissions the unix permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * adapted from http://unix.stackexchange.com/questions/14705/the-zip-formats-external-file-attribute :
- *
- * TTTTsstrwxrwxrwx0000000000ADVSHR
- * ^^^^____________________________ file type, see zipinfo.c (UNX_*)
- *     ^^^_________________________ setuid, setgid, sticky
- *        ^^^^^^^^^________________ permissions
- *                 ^^^^^^^^^^______ not used ?
- *                           ^^^^^^ DOS attribute bits : Archive, Directory, Volume label, System file, Hidden, Read only
- */
-var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
-
-    var result = unixPermissions;
-    if (!unixPermissions) {
-        // I can't use octal values in strict mode, hence the hexa.
-        //  040775 => 0x41fd
-        // 0100664 => 0x81b4
-        result = isDir ? 0x41fd : 0x81b4;
-    }
-
-    return (result & 0xFFFF) << 16;
-};
-
-/**
- * Generate the DOS part of the external file attributes.
- * @param {Object} dosPermissions the dos permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * Bit 0     Read-Only
- * Bit 1     Hidden
- * Bit 2     System
- * Bit 3     Volume Label
- * Bit 4     Directory
- * Bit 5     Archive
- */
-var generateDosExternalFileAttr = function (dosPermissions, isDir) {
-
-    // the dir flag is already set for compatibility
-
-    return (dosPermissions || 0)  & 0x3F;
-};
-
-/**
- * Generate the various parts used in the construction of the final zip file.
- * @param {string} name the file name.
- * @param {ZipObject} file the file content.
- * @param {JSZip.CompressedObject} compressedObject the compressed object.
- * @param {number} offset the current offset from the start of the zip file.
- * @param {String} platform let's pretend we are this platform (change platform dependents fields)
- * @return {object} the zip parts.
- */
-var generateZipParts = function(name, file, compressedObject, offset, platform) {
-    var data = compressedObject.compressedContent,
-        utfEncodedFileName = utils.transformTo("string", utf8.utf8encode(file.name)),
-        comment = file.comment || "",
-        utfEncodedComment = utils.transformTo("string", utf8.utf8encode(comment)),
-        useUTF8ForFileName = utfEncodedFileName.length !== file.name.length,
-        useUTF8ForComment = utfEncodedComment.length !== comment.length,
-        o = file.options,
-        dosTime,
-        dosDate,
-        extraFields = "",
-        unicodePathExtraField = "",
-        unicodeCommentExtraField = "",
-        dir, date;
-
-
-    // handle the deprecated options.dir
-    if (file._initialMetadata.dir !== file.dir) {
-        dir = file.dir;
-    } else {
-        dir = o.dir;
-    }
-
-    // handle the deprecated options.date
-    if(file._initialMetadata.date !== file.date) {
-        date = file.date;
-    } else {
-        date = o.date;
-    }
-
-    var extFileAttr = 0;
-    var versionMadeBy = 0;
-    if (dir) {
-        // dos or unix, we set the dos dir flag
-        extFileAttr |= 0x00010;
-    }
-    if(platform === "UNIX") {
-        versionMadeBy = 0x031E; // UNIX, version 3.0
-        extFileAttr |= generateUnixExternalFileAttr(file.unixPermissions, dir);
-    } else { // DOS or other, fallback to DOS
-        versionMadeBy = 0x0014; // DOS, version 2.0
-        extFileAttr |= generateDosExternalFileAttr(file.dosPermissions, dir);
-    }
-
-    // date
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/65/16.html
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/66/16.html
-
-    dosTime = date.getHours();
-    dosTime = dosTime << 6;
-    dosTime = dosTime | date.getMinutes();
-    dosTime = dosTime << 5;
-    dosTime = dosTime | date.getSeconds() / 2;
-
-    dosDate = date.getFullYear() - 1980;
-    dosDate = dosDate << 4;
-    dosDate = dosDate | (date.getMonth() + 1);
-    dosDate = dosDate << 5;
-    dosDate = dosDate | date.getDate();
-
-    if (useUTF8ForFileName) {
-        // set the unicode path extra field. unzip needs at least one extra
-        // field to correctly handle unicode path, so using the path is as good
-        // as any other information. This could improve the situation with
-        // other archive managers too.
-        // This field is usually used without the utf8 flag, with a non
-        // unicode path in the header (winrar, winzip). This helps (a bit)
-        // with the messy Windows' default compressed folders feature but
-        // breaks on p7zip which doesn't seek the unicode path extra field.
-        // So for now, UTF-8 everywhere !
-        unicodePathExtraField =
-            // Version
-            decToHex(1, 1) +
-            // NameCRC32
-            decToHex(crc32(utfEncodedFileName), 4) +
-            // UnicodeName
-            utfEncodedFileName;
-
-        extraFields +=
-            // Info-ZIP Unicode Path Extra Field
-            "\x75\x70" +
-            // size
-            decToHex(unicodePathExtraField.length, 2) +
-            // content
-            unicodePathExtraField;
-    }
-
-    if(useUTF8ForComment) {
-
-        unicodeCommentExtraField =
-            // Version
-            decToHex(1, 1) +
-            // CommentCRC32
-            decToHex(this.crc32(utfEncodedComment), 4) +
-            // UnicodeName
-            utfEncodedComment;
-
-        extraFields +=
-            // Info-ZIP Unicode Path Extra Field
-            "\x75\x63" +
-            // size
-            decToHex(unicodeCommentExtraField.length, 2) +
-            // content
-            unicodeCommentExtraField;
-    }
-
-    var header = "";
-
-    // version needed to extract
-    header += "\x0A\x00";
-    // general purpose bit flag
-    // set bit 11 if utf8
-    header += (useUTF8ForFileName || useUTF8ForComment) ? "\x00\x08" : "\x00\x00";
-    // compression method
-    header += compressedObject.compressionMethod;
-    // last mod file time
-    header += decToHex(dosTime, 2);
-    // last mod file date
-    header += decToHex(dosDate, 2);
-    // crc-32
-    header += decToHex(compressedObject.crc32, 4);
-    // compressed size
-    header += decToHex(compressedObject.compressedSize, 4);
-    // uncompressed size
-    header += decToHex(compressedObject.uncompressedSize, 4);
-    // file name length
-    header += decToHex(utfEncodedFileName.length, 2);
-    // extra field length
-    header += decToHex(extraFields.length, 2);
-
-
-    var fileRecord = signature.LOCAL_FILE_HEADER + header + utfEncodedFileName + extraFields;
-
-    var dirRecord = signature.CENTRAL_FILE_HEADER +
-    // version made by (00: DOS)
-    decToHex(versionMadeBy, 2) +
-    // file header (common to file and central directory)
-    header +
-    // file comment length
-    decToHex(utfEncodedComment.length, 2) +
-    // disk number start
-    "\x00\x00" +
-    // internal file attributes TODO
-    "\x00\x00" +
-    // external file attributes
-    decToHex(extFileAttr, 4) +
-    // relative offset of local header
-    decToHex(offset, 4) +
-    // file name
-    utfEncodedFileName +
-    // extra field
-    extraFields +
-    // file comment
-    utfEncodedComment;
-
-    return {
-        fileRecord: fileRecord,
-        dirRecord: dirRecord,
-        compressedObject: compressedObject
-    };
-};
-
-
-// return the actual prototype of JSZip
-var out = {
-    /**
-     * Read an existing zip and merge the data in the current JSZip object.
-     * The implementation is in jszip-load.js, don't forget to include it.
-     * @param {String|ArrayBuffer|Uint8Array|Buffer} stream  The stream to load
-     * @param {Object} options Options for loading the stream.
-     *  options.base64 : is the stream in base64 ? default : false
-     * @return {JSZip} the current JSZip object
-     */
-    load: function(stream, options) {
-        throw new Error("Load method is not defined. Is the file jszip-load.js included ?");
-    },
-
-    /**
-     * Filter nested files/folders with the specified function.
-     * @param {Function} search the predicate to use :
-     * function (relativePath, file) {...}
-     * It takes 2 arguments : the relative path and the file.
-     * @return {Array} An array of matching elements.
-     */
-    filter: function(search) {
-        var result = [],
-            filename, relativePath, file, fileClone;
-        for (filename in this.files) {
-            if (!this.files.hasOwnProperty(filename)) {
-                continue;
-            }
-            file = this.files[filename];
-            // return a new object, don't let the user mess with our internal objects :)
-            fileClone = new ZipObject(file.name, file._data, extend(file.options));
-            relativePath = filename.slice(this.root.length, filename.length);
-            if (filename.slice(0, this.root.length) === this.root && // the file is in the current root
-            search(relativePath, fileClone)) { // and the file matches the function
-                result.push(fileClone);
-            }
-        }
-        return result;
-    },
-
-    /**
-     * Add a file to the zip file, or search a file.
-     * @param   {string|RegExp} name The name of the file to add (if data is defined),
-     * the name of the file to find (if no data) or a regex to match files.
-     * @param   {String|ArrayBuffer|Uint8Array|Buffer} data  The file data, either raw or base64 encoded
-     * @param   {Object} o     File options
-     * @return  {JSZip|Object|Array} this JSZip object (when adding a file),
-     * a file (when searching by string) or an array of files (when searching by regex).
-     */
-    file: function(name, data, o) {
-        if (arguments.length === 1) {
-            if (utils.isRegExp(name)) {
-                var regexp = name;
-                return this.filter(function(relativePath, file) {
-                    return !file.dir && regexp.test(relativePath);
-                });
-            }
-            else { // text
-                return this.filter(function(relativePath, file) {
-                    return !file.dir && relativePath === name;
-                })[0] || null;
-            }
-        }
-        else { // more than one argument : we have data !
-            name = this.root + name;
-            fileAdd.call(this, name, data, o);
-        }
-        return this;
-    },
-
-    /**
-     * Add a directory to the zip file, or search.
-     * @param   {String|RegExp} arg The name of the directory to add, or a regex to search folders.
-     * @return  {JSZip} an object with the new directory as the root, or an array containing matching folders.
-     */
-    folder: function(arg) {
-        if (!arg) {
-            return this;
-        }
-
-        if (utils.isRegExp(arg)) {
-            return this.filter(function(relativePath, file) {
-                return file.dir && arg.test(relativePath);
-            });
-        }
-
-        // else, name is a new folder
-        var name = this.root + arg;
-        var newFolder = folderAdd.call(this, name);
-
-        // Allow chaining by returning a new object with this folder as the root
-        var ret = this.clone();
-        ret.root = newFolder.name;
-        return ret;
-    },
-
-    /**
-     * Delete a file, or a directory and all sub-files, from the zip
-     * @param {string} name the name of the file to delete
-     * @return {JSZip} this JSZip object
-     */
-    remove: function(name) {
-        name = this.root + name;
-        var file = this.files[name];
-        if (!file) {
-            // Look for any folders
-            if (name.slice(-1) != "/") {
-                name += "/";
-            }
-            file = this.files[name];
-        }
-
-        if (file && !file.dir) {
-            // file
-            delete this.files[name];
-        } else {
-            // maybe a folder, delete recursively
-            var kids = this.filter(function(relativePath, file) {
-                return file.name.slice(0, name.length) === name;
-            });
-            for (var i = 0; i < kids.length; i++) {
-                delete this.files[kids[i].name];
-            }
-        }
-
-        return this;
-    },
-
-    /**
-     * Generate the complete zip file
-     * @param {Object} options the options to generate the zip file :
-     * - base64, (deprecated, use type instead) true to generate base64.
-     * - compression, "STORE" by default.
-     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
-     * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the zip file
-     */
-    generate: function(options) {
-        options = extend(options || {}, {
-            base64: true,
-            compression: "STORE",
-            compressionOptions : null,
-            type: "base64",
-            platform: "DOS",
-            comment: null,
-            mimeType: 'application/zip'
-        });
-
-        utils.checkSupport(options.type);
-
-        // accept nodejs `process.platform`
-        if(
-          options.platform === 'darwin' ||
-          options.platform === 'freebsd' ||
-          options.platform === 'linux' ||
-          options.platform === 'sunos'
-        ) {
-          options.platform = "UNIX";
-        }
-        if (options.platform === 'win32') {
-          options.platform = "DOS";
-        }
-
-        var zipData = [],
-            localDirLength = 0,
-            centralDirLength = 0,
-            writer, i,
-            utfEncodedComment = utils.transformTo("string", this.utf8encode(options.comment || this.comment || ""));
-
-        // first, generate all the zip parts.
-        for (var name in this.files) {
-            if (!this.files.hasOwnProperty(name)) {
-                continue;
-            }
-            var file = this.files[name];
-
-            var compressionName = file.options.compression || options.compression.toUpperCase();
-            var compression = compressions[compressionName];
-            if (!compression) {
-                throw new Error(compressionName + " is not a valid compression method !");
-            }
-            var compressionOptions = file.options.compressionOptions || options.compressionOptions || {};
-
-            var compressedObject = generateCompressedObjectFrom.call(this, file, compression, compressionOptions);
-
-            var zipPart = generateZipParts.call(this, name, file, compressedObject, localDirLength, options.platform);
-            localDirLength += zipPart.fileRecord.length + compressedObject.compressedSize;
-            centralDirLength += zipPart.dirRecord.length;
-            zipData.push(zipPart);
-        }
-
-        var dirEnd = "";
-
-        // end of central dir signature
-        dirEnd = signature.CENTRAL_DIRECTORY_END +
-        // number of this disk
-        "\x00\x00" +
-        // number of the disk with the start of the central directory
-        "\x00\x00" +
-        // total number of entries in the central directory on this disk
-        decToHex(zipData.length, 2) +
-        // total number of entries in the central directory
-        decToHex(zipData.length, 2) +
-        // size of the central directory   4 bytes
-        decToHex(centralDirLength, 4) +
-        // offset of start of central directory with respect to the starting disk number
-        decToHex(localDirLength, 4) +
-        // .ZIP file comment length
-        decToHex(utfEncodedComment.length, 2) +
-        // .ZIP file comment
-        utfEncodedComment;
-
-
-        // we have all the parts (and the total length)
-        // time to create a writer !
-        var typeName = options.type.toLowerCase();
-        if(typeName==="uint8array"||typeName==="arraybuffer"||typeName==="blob"||typeName==="nodebuffer") {
-            writer = new Uint8ArrayWriter(localDirLength + centralDirLength + dirEnd.length);
-        }else{
-            writer = new StringWriter(localDirLength + centralDirLength + dirEnd.length);
-        }
-
-        for (i = 0; i < zipData.length; i++) {
-            writer.append(zipData[i].fileRecord);
-            writer.append(zipData[i].compressedObject.compressedContent);
-        }
-        for (i = 0; i < zipData.length; i++) {
-            writer.append(zipData[i].dirRecord);
-        }
-
-        writer.append(dirEnd);
-
-        var zip = writer.finalize();
-
-
-
-        switch(options.type.toLowerCase()) {
-            // case "zip is an Uint8Array"
-            case "uint8array" :
-            case "arraybuffer" :
-            case "nodebuffer" :
-               return utils.transformTo(options.type.toLowerCase(), zip);
-            case "blob" :
-               return utils.arrayBuffer2Blob(utils.transformTo("arraybuffer", zip), options.mimeType);
-            // case "zip is a string"
-            case "base64" :
-               return (options.base64) ? base64.encode(zip) : zip;
-            default : // case "string" :
-               return zip;
-         }
-
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    crc32: function (input, crc) {
-        return crc32(input, crc);
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    utf8encode: function (string) {
-        return utils.transformTo("string", utf8.utf8encode(string));
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    utf8decode: function (input) {
-        return utf8.utf8decode(input);
-    }
-};
-module.exports = out;
-
-},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(_dereq_,module,exports){
+},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(require,module,exports){
 'use strict';
 exports.LOCAL_FILE_HEADER = "PK\x03\x04";
 exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
@@ -1518,86 +2027,695 @@ exports.ZIP64_CENTRAL_DIRECTORY_LOCATOR = "PK\x06\x07";
 exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
 exports.DATA_DESCRIPTOR = "PK\x07\x08";
 
-},{}],15:[function(_dereq_,module,exports){
+},{}],24:[function(require,module,exports){
 'use strict';
-var DataReader = _dereq_('./dataReader');
-var utils = _dereq_('./utils');
 
-function StringReader(data, optimizedBinaryString) {
-    this.data = data;
-    if (!optimizedBinaryString) {
-        this.data = utils.string2binary(this.data);
-    }
-    this.length = this.data.length;
-    this.index = 0;
+var GenericWorker = require('./GenericWorker');
+var utils = require('../utils');
+
+/**
+ * A worker which convert chunks to a specified type.
+ * @constructor
+ * @param {String} destType the destination type.
+ */
+function ConvertWorker(destType) {
+    GenericWorker.call(this, "ConvertWorker to " + destType);
+    this.destType = destType;
 }
-StringReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-StringReader.prototype.byteAt = function(i) {
-    return this.data.charCodeAt(i);
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-StringReader.prototype.lastIndexOfSignature = function(sig) {
-    return this.data.lastIndexOf(sig);
-};
-/**
- * @see DataReader.readData
- */
-StringReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    // this will work because the constructor applied the "& 0xff" mask.
-    var result = this.data.slice(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = StringReader;
+utils.inherits(ConvertWorker, GenericWorker);
 
-},{"./dataReader":5,"./utils":21}],16:[function(_dereq_,module,exports){
+/**
+ * @see GenericWorker.processChunk
+ */
+ConvertWorker.prototype.processChunk = function (chunk) {
+    this.push({
+        data : utils.transformTo(this.destType, chunk.data),
+        meta : chunk.meta
+    });
+};
+module.exports = ConvertWorker;
+
+},{"../utils":32,"./GenericWorker":28}],25:[function(require,module,exports){
 'use strict';
 
-var utils = _dereq_('./utils');
+var GenericWorker = require('./GenericWorker');
+var crc32 = require('../crc32');
+var utils = require('../utils');
 
 /**
- * An object to write any content to a string.
+ * A worker which calculate the crc32 of the data flowing through.
  * @constructor
  */
-var StringWriter = function() {
-    this.data = [];
+function Crc32Probe() {
+    GenericWorker.call(this, "Crc32Probe");
+    this.withStreamInfo("crc32", 0);
+}
+utils.inherits(Crc32Probe, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+Crc32Probe.prototype.processChunk = function (chunk) {
+    this.streamInfo.crc32 = crc32(chunk.data, this.streamInfo.crc32 || 0);
+    this.push(chunk);
 };
-StringWriter.prototype = {
-    /**
-     * Append any content to the current string.
-     * @param {Object} input the content to add.
-     */
-    append: function(input) {
-        input = utils.transformTo("string", input);
-        this.data.push(input);
-    },
-    /**
-     * Finalize the construction an return the result.
-     * @return {string} the generated string.
-     */
-    finalize: function() {
-        return this.data.join("");
+module.exports = Crc32Probe;
+
+},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var GenericWorker = require('./GenericWorker');
+
+/**
+ * A worker which calculate the total length of the data flowing through.
+ * @constructor
+ * @param {String} propName the name used to expose the length
+ */
+function DataLengthProbe(propName) {
+    GenericWorker.call(this, "DataLengthProbe for " + propName);
+    this.propName = propName;
+    this.withStreamInfo(propName, 0);
+}
+utils.inherits(DataLengthProbe, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+DataLengthProbe.prototype.processChunk = function (chunk) {
+    if(chunk) {
+        var length = this.streamInfo[this.propName] || 0;
+        this.streamInfo[this.propName] = length + chunk.data.length;
+    }
+    GenericWorker.prototype.processChunk.call(this, chunk);
+};
+module.exports = DataLengthProbe;
+
+
+},{"../utils":32,"./GenericWorker":28}],27:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var GenericWorker = require('./GenericWorker');
+
+// the size of the generated chunks
+// TODO expose this as a public variable
+var DEFAULT_BLOCK_SIZE = 16 * 1024;
+
+/**
+ * A worker that reads a content and emits chunks.
+ * @constructor
+ * @param {Promise} dataP the promise of the data to split
+ */
+function DataWorker(dataP) {
+    GenericWorker.call(this, "DataWorker");
+    var self = this;
+    this.dataIsReady = false;
+    this.index = 0;
+    this.max = 0;
+    this.data = null;
+    this.type = "";
+
+    this._tickScheduled = false;
+
+    dataP.then(function (data) {
+        self.dataIsReady = true;
+        self.data = data;
+        self.max = data && data.length || 0;
+        self.type = utils.getTypeOf(data);
+        if(!self.isPaused) {
+            self._tickAndRepeat();
+        }
+    }, function (e) {
+        self.error(e);
+    });
+}
+
+utils.inherits(DataWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.cleanUp
+ */
+DataWorker.prototype.cleanUp = function () {
+    GenericWorker.prototype.cleanUp.call(this);
+    this.data = null;
+};
+
+/**
+ * @see GenericWorker.resume
+ */
+DataWorker.prototype.resume = function () {
+    if(!GenericWorker.prototype.resume.call(this)) {
+        return false;
+    }
+
+    if (!this._tickScheduled && this.dataIsReady) {
+        this._tickScheduled = true;
+        utils.delay(this._tickAndRepeat, [], this);
+    }
+    return true;
+};
+
+/**
+ * Trigger a tick a schedule an other call to this function.
+ */
+DataWorker.prototype._tickAndRepeat = function() {
+    this._tickScheduled = false;
+    if(this.isPaused || this.isFinished) {
+        return;
+    }
+    this._tick();
+    if(!this.isFinished) {
+        utils.delay(this._tickAndRepeat, [], this);
+        this._tickScheduled = true;
     }
 };
 
-module.exports = StringWriter;
+/**
+ * Read and push a chunk.
+ */
+DataWorker.prototype._tick = function() {
 
-},{"./utils":21}],17:[function(_dereq_,module,exports){
-(function (Buffer){
+    if(this.isPaused || this.isFinished) {
+        return false;
+    }
+
+    var size = DEFAULT_BLOCK_SIZE;
+    var data = null, nextIndex = Math.min(this.max, this.index + size);
+    if (this.index >= this.max) {
+        // EOF
+        return this.end();
+    } else {
+        switch(this.type) {
+            case "string":
+                data = this.data.substring(this.index, nextIndex);
+            break;
+            case "uint8array":
+                data = this.data.subarray(this.index, nextIndex);
+            break;
+            case "array":
+            case "nodebuffer":
+                data = this.data.slice(this.index, nextIndex);
+            break;
+        }
+        this.index = nextIndex;
+        return this.push({
+            data : data,
+            meta : {
+                percent : this.max ? this.index / this.max * 100 : 0
+            }
+        });
+    }
+};
+
+module.exports = DataWorker;
+
+},{"../utils":32,"./GenericWorker":28}],28:[function(require,module,exports){
 'use strict';
+
+/**
+ * A worker that does nothing but passing chunks to the next one. This is like
+ * a nodejs stream but with some differences. On the good side :
+ * - it works on IE 6-9 without any issue / polyfill
+ * - it weights less than the full dependencies bundled with browserify
+ * - it forwards errors (no need to declare an error handler EVERYWHERE)
+ *
+ * A chunk is an object with 2 attributes : `meta` and `data`. The former is an
+ * object containing anything (`percent` for example), see each worker for more
+ * details. The latter is the real data (String, Uint8Array, etc).
+ *
+ * @constructor
+ * @param {String} name the name of the stream (mainly used for debugging purposes)
+ */
+function GenericWorker(name) {
+    // the name of the worker
+    this.name = name || "default";
+    // an object containing metadata about the workers chain
+    this.streamInfo = {};
+    // an error which happened when the worker was paused
+    this.generatedError = null;
+    // an object containing metadata to be merged by this worker into the general metadata
+    this.extraStreamInfo = {};
+    // true if the stream is paused (and should not do anything), false otherwise
+    this.isPaused = true;
+    // true if the stream is finished (and should not do anything), false otherwise
+    this.isFinished = false;
+    // true if the stream is locked to prevent further structure updates (pipe), false otherwise
+    this.isLocked = false;
+    // the event listeners
+    this._listeners = {
+        'data':[],
+        'end':[],
+        'error':[]
+    };
+    // the previous worker, if any
+    this.previous = null;
+}
+
+GenericWorker.prototype = {
+    /**
+     * Push a chunk to the next workers.
+     * @param {Object} chunk the chunk to push
+     */
+    push : function (chunk) {
+        this.emit("data", chunk);
+    },
+    /**
+     * End the stream.
+     * @return {Boolean} true if this call ended the worker, false otherwise.
+     */
+    end : function () {
+        if (this.isFinished) {
+            return false;
+        }
+
+        this.flush();
+        try {
+            this.emit("end");
+            this.cleanUp();
+            this.isFinished = true;
+        } catch (e) {
+            this.emit("error", e);
+        }
+        return true;
+    },
+    /**
+     * End the stream with an error.
+     * @param {Error} e the error which caused the premature end.
+     * @return {Boolean} true if this call ended the worker with an error, false otherwise.
+     */
+    error : function (e) {
+        if (this.isFinished) {
+            return false;
+        }
+
+        if(this.isPaused) {
+            this.generatedError = e;
+        } else {
+            this.isFinished = true;
+
+            this.emit("error", e);
+
+            // in the workers chain exploded in the middle of the chain,
+            // the error event will go downward but we also need to notify
+            // workers upward that there has been an error.
+            if(this.previous) {
+                this.previous.error(e);
+            }
+
+            this.cleanUp();
+        }
+        return true;
+    },
+    /**
+     * Add a callback on an event.
+     * @param {String} name the name of the event (data, end, error)
+     * @param {Function} listener the function to call when the event is triggered
+     * @return {GenericWorker} the current object for chainability
+     */
+    on : function (name, listener) {
+        this._listeners[name].push(listener);
+        return this;
+    },
+    /**
+     * Clean any references when a worker is ending.
+     */
+    cleanUp : function () {
+        this.streamInfo = this.generatedError = this.extraStreamInfo = null;
+        this._listeners = [];
+    },
+    /**
+     * Trigger an event. This will call registered callback with the provided arg.
+     * @param {String} name the name of the event (data, end, error)
+     * @param {Object} arg the argument to call the callback with.
+     */
+    emit : function (name, arg) {
+        if (this._listeners[name]) {
+            for(var i = 0; i < this._listeners[name].length; i++) {
+                this._listeners[name][i].call(this, arg);
+            }
+        }
+    },
+    /**
+     * Chain a worker with an other.
+     * @param {Worker} next the worker receiving events from the current one.
+     * @return {worker} the next worker for chainability
+     */
+    pipe : function (next) {
+        return next.registerPrevious(this);
+    },
+    /**
+     * Same as `pipe` in the other direction.
+     * Using an API with `pipe(next)` is very easy.
+     * Implementing the API with the point of view of the next one registering
+     * a source is easier, see the ZipFileWorker.
+     * @param {Worker} previous the previous worker, sending events to this one
+     * @return {Worker} the current worker for chainability
+     */
+    registerPrevious : function (previous) {
+        if (this.isLocked) {
+            throw new Error("The stream '" + this + "' has already been used.");
+        }
+
+        // sharing the streamInfo...
+        this.streamInfo = previous.streamInfo;
+        // ... and adding our own bits
+        this.mergeStreamInfo();
+        this.previous =  previous;
+        var self = this;
+        previous.on('data', function (chunk) {
+            self.processChunk(chunk);
+        });
+        previous.on('end', function () {
+            self.end();
+        });
+        previous.on('error', function (e) {
+            self.error(e);
+        });
+        return this;
+    },
+    /**
+     * Pause the stream so it doesn't send events anymore.
+     * @return {Boolean} true if this call paused the worker, false otherwise.
+     */
+    pause : function () {
+        if(this.isPaused || this.isFinished) {
+            return false;
+        }
+        this.isPaused = true;
+
+        if(this.previous) {
+            this.previous.pause();
+        }
+        return true;
+    },
+    /**
+     * Resume a paused stream.
+     * @return {Boolean} true if this call resumed the worker, false otherwise.
+     */
+    resume : function () {
+        if(!this.isPaused || this.isFinished) {
+            return false;
+        }
+        this.isPaused = false;
+
+        // if true, the worker tried to resume but failed
+        var withError = false;
+        if(this.generatedError) {
+            this.error(this.generatedError);
+            withError = true;
+        }
+        if(this.previous) {
+            this.previous.resume();
+        }
+
+        return !withError;
+    },
+    /**
+     * Flush any remaining bytes as the stream is ending.
+     */
+    flush : function () {},
+    /**
+     * Process a chunk. This is usually the method overridden.
+     * @param {Object} chunk the chunk to process.
+     */
+    processChunk : function(chunk) {
+        this.push(chunk);
+    },
+    /**
+     * Add a key/value to be added in the workers chain streamInfo once activated.
+     * @param {String} key the key to use
+     * @param {Object} value the associated value
+     * @return {Worker} the current worker for chainability
+     */
+    withStreamInfo : function (key, value) {
+        this.extraStreamInfo[key] = value;
+        this.mergeStreamInfo();
+        return this;
+    },
+    /**
+     * Merge this worker's streamInfo into the chain's streamInfo.
+     */
+    mergeStreamInfo : function () {
+        for(var key in this.extraStreamInfo) {
+            if (!this.extraStreamInfo.hasOwnProperty(key)) {
+                continue;
+            }
+            this.streamInfo[key] = this.extraStreamInfo[key];
+        }
+    },
+
+    /**
+     * Lock the stream to prevent further updates on the workers chain.
+     * After calling this method, all calls to pipe will fail.
+     */
+    lock: function () {
+        if (this.isLocked) {
+            throw new Error("The stream '" + this + "' has already been used.");
+        }
+        this.isLocked = true;
+        if (this.previous) {
+            this.previous.lock();
+        }
+    },
+
+    /**
+     *
+     * Pretty print the workers chain.
+     */
+    toString : function () {
+        var me = "Worker " + this.name;
+        if (this.previous) {
+            return this.previous + " -> " + me;
+        } else {
+            return me;
+        }
+    }
+};
+
+module.exports = GenericWorker;
+
+},{}],29:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var ConvertWorker = require('./ConvertWorker');
+var GenericWorker = require('./GenericWorker');
+var base64 = require('../base64');
+var support = require("../support");
+var external = require("../external");
+
+var NodejsStreamOutputAdapter = null;
+if (support.nodestream) {
+    try {
+        NodejsStreamOutputAdapter = require('../nodejs/NodejsStreamOutputAdapter');
+    } catch(e) {}
+}
+
+/**
+ * Apply the final transformation of the data. If the user wants a Blob for
+ * example, it's easier to work with an U8intArray and finally do the
+ * ArrayBuffer/Blob conversion.
+ * @param {String} type the name of the final type
+ * @param {String|Uint8Array|Buffer} content the content to transform
+ * @param {String} mimeType the mime type of the content, if applicable.
+ * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the content in the right format.
+ */
+function transformZipOutput(type, content, mimeType) {
+    switch(type) {
+        case "blob" :
+            return utils.newBlob(utils.transformTo("arraybuffer", content), mimeType);
+        case "base64" :
+            return base64.encode(content);
+        default :
+            return utils.transformTo(type, content);
+    }
+}
+
+/**
+ * Concatenate an array of data of the given type.
+ * @param {String} type the type of the data in the given array.
+ * @param {Array} dataArray the array containing the data chunks to concatenate
+ * @return {String|Uint8Array|Buffer} the concatenated data
+ * @throws Error if the asked type is unsupported
+ */
+function concat (type, dataArray) {
+    var i, index = 0, res = null, totalLength = 0;
+    for(i = 0; i < dataArray.length; i++) {
+        totalLength += dataArray[i].length;
+    }
+    switch(type) {
+        case "string":
+            return dataArray.join("");
+          case "array":
+            return Array.prototype.concat.apply([], dataArray);
+        case "uint8array":
+            res = new Uint8Array(totalLength);
+            for(i = 0; i < dataArray.length; i++) {
+                res.set(dataArray[i], index);
+                index += dataArray[i].length;
+            }
+            return res;
+        case "nodebuffer":
+            return Buffer.concat(dataArray);
+        default:
+            throw new Error("concat : unsupported type '"  + type + "'");
+    }
+}
+
+/**
+ * Listen a StreamHelper, accumulate its content and concatenate it into a
+ * complete block.
+ * @param {StreamHelper} helper the helper to use.
+ * @param {Function} updateCallback a callback called on each update. Called
+ * with one arg :
+ * - the metadata linked to the update received.
+ * @return Promise the promise for the accumulation.
+ */
+function accumulate(helper, updateCallback) {
+    return new external.Promise(function (resolve, reject){
+        var dataArray = [];
+        var chunkType = helper._internalType,
+            resultType = helper._outputType,
+            mimeType = helper._mimeType;
+        helper
+        .on('data', function (data, meta) {
+            dataArray.push(data);
+            if(updateCallback) {
+                updateCallback(meta);
+            }
+        })
+        .on('error', function(err) {
+            dataArray = [];
+            reject(err);
+        })
+        .on('end', function (){
+            try {
+                var result = transformZipOutput(resultType, concat(chunkType, dataArray), mimeType);
+                resolve(result);
+            } catch (e) {
+                reject(e);
+            }
+            dataArray = [];
+        })
+        .resume();
+    });
+}
+
+/**
+ * An helper to easily use workers outside of JSZip.
+ * @constructor
+ * @param {Worker} worker the worker to wrap
+ * @param {String} outputType the type of data expected by the use
+ * @param {String} mimeType the mime type of the content, if applicable.
+ */
+function StreamHelper(worker, outputType, mimeType) {
+    var internalType = outputType;
+    switch(outputType) {
+        case "blob":
+        case "arraybuffer":
+            internalType = "uint8array";
+        break;
+        case "base64":
+            internalType = "string";
+        break;
+    }
+
+    try {
+        // the type used internally
+        this._internalType = internalType;
+        // the type used to output results
+        this._outputType = outputType;
+        // the mime type
+        this._mimeType = mimeType;
+        utils.checkSupport(internalType);
+        this._worker = worker.pipe(new ConvertWorker(internalType));
+        // the last workers can be rewired without issues but we need to
+        // prevent any updates on previous workers.
+        worker.lock();
+    } catch(e) {
+        this._worker = new GenericWorker("error");
+        this._worker.error(e);
+    }
+}
+
+StreamHelper.prototype = {
+    /**
+     * Listen a StreamHelper, accumulate its content and concatenate it into a
+     * complete block.
+     * @param {Function} updateCb the update callback.
+     * @return Promise the promise for the accumulation.
+     */
+    accumulate : function (updateCb) {
+        return accumulate(this, updateCb);
+    },
+    /**
+     * Add a listener on an event triggered on a stream.
+     * @param {String} evt the name of the event
+     * @param {Function} fn the listener
+     * @return {StreamHelper} the current helper.
+     */
+    on : function (evt, fn) {
+        var self = this;
+
+        if(evt === "data") {
+            this._worker.on(evt, function (chunk) {
+                fn.call(self, chunk.data, chunk.meta);
+            });
+        } else {
+            this._worker.on(evt, function () {
+                utils.delay(fn, arguments, self);
+            });
+        }
+        return this;
+    },
+    /**
+     * Resume the flow of chunks.
+     * @return {StreamHelper} the current helper.
+     */
+    resume : function () {
+        utils.delay(this._worker.resume, [], this._worker);
+        return this;
+    },
+    /**
+     * Pause the flow of chunks.
+     * @return {StreamHelper} the current helper.
+     */
+    pause : function () {
+        this._worker.pause();
+        return this;
+    },
+    /**
+     * Return a nodejs stream for this helper.
+     * @param {Function} updateCb the update callback.
+     * @return {NodejsStreamOutputAdapter} the nodejs stream.
+     */
+    toNodejsStream : function (updateCb) {
+        utils.checkSupport("nodestream");
+        if (this._outputType !== "nodebuffer") {
+            // an object stream containing blob/arraybuffer/uint8array/string
+            // is strange and I don't know if it would be useful.
+            // I you find this comment and have a good usecase, please open a
+            // bug report !
+            throw new Error(this._outputType + " is not supported by this method");
+        }
+
+        return new NodejsStreamOutputAdapter(this, {
+            objectMode : this._outputType !== "nodebuffer"
+        }, updateCb);
+    }
+};
+
+
+module.exports = StreamHelper;
+
+},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(require,module,exports){
+'use strict';
+
 exports.base64 = true;
 exports.array = true;
 exports.string = true;
 exports.arraybuffer = typeof ArrayBuffer !== "undefined" && typeof Uint8Array !== "undefined";
-// contains true if JSZip can read/generate nodejs Buffer, false otherwise.
-// Browserify will provide a Buffer implementation for browsers, which is
-// an augmented Uint8Array (i.e., can be used as either Buffer or U8).
 exports.nodebuffer = typeof Buffer !== "undefined";
 // contains true if JSZip can read/generate Uint8Array, false otherwise.
 exports.uint8array = typeof Uint8Array !== "undefined";
@@ -1614,7 +2732,7 @@ else {
     }
     catch (e) {
         try {
-            var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
+            var Builder = self.BlobBuilder || self.WebKitBlobBuilder || self.MozBlobBuilder || self.MSBlobBuilder;
             var builder = new Builder();
             builder.append(buffer);
             exports.blob = builder.getBlob('application/zip').size === 0;
@@ -1625,100 +2743,19 @@ else {
     }
 }
 
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],18:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-
-function Uint8ArrayReader(data) {
-    if (data) {
-        this.data = data;
-        this.length = this.data.length;
-        this.index = 0;
-    }
+try {
+    exports.nodestream = !!require('readable-stream').Readable;
+} catch(e) {
+    exports.nodestream = false;
 }
-Uint8ArrayReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-Uint8ArrayReader.prototype.byteAt = function(i) {
-    return this.data[i];
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-Uint8ArrayReader.prototype.lastIndexOfSignature = function(sig) {
-    var sig0 = sig.charCodeAt(0),
-        sig1 = sig.charCodeAt(1),
-        sig2 = sig.charCodeAt(2),
-        sig3 = sig.charCodeAt(3);
-    for (var i = this.length - 4; i >= 0; --i) {
-        if (this.data[i] === sig0 && this.data[i + 1] === sig1 && this.data[i + 2] === sig2 && this.data[i + 3] === sig3) {
-            return i;
-        }
-    }
 
-    return -1;
-};
-/**
- * @see DataReader.readData
- */
-Uint8ArrayReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    if(size === 0) {
-        // in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
-        return new Uint8Array(0);
-    }
-    var result = this.data.subarray(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = Uint8ArrayReader;
-
-},{"./dataReader":5}],19:[function(_dereq_,module,exports){
+},{"readable-stream":16}],31:[function(require,module,exports){
 'use strict';
 
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to an Uint8Array.
- * @constructor
- * @param {number} length The length of the array.
- */
-var Uint8ArrayWriter = function(length) {
-    this.data = new Uint8Array(length);
-    this.index = 0;
-};
-Uint8ArrayWriter.prototype = {
-    /**
-     * Append any content to the current array.
-     * @param {Object} input the content to add.
-     */
-    append: function(input) {
-        if (input.length !== 0) {
-            // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
-            input = utils.transformTo("uint8array", input);
-            this.data.set(input, this.index);
-            this.index += input.length;
-        }
-    },
-    /**
-     * Finalize the construction an return the result.
-     * @return {Uint8Array} the generated array.
-     */
-    finalize: function() {
-        return this.data;
-    }
-};
-
-module.exports = Uint8ArrayWriter;
-
-},{"./utils":21}],20:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-var support = _dereq_('./support');
-var nodeBuffer = _dereq_('./nodeBuffer');
+var utils = require('./utils');
+var support = require('./support');
+var nodejsUtils = require('./nodejsUtils');
+var GenericWorker = require('./stream/GenericWorker');
 
 /**
  * The following functions come from pako, from pako/lib/utils/strings
@@ -1883,7 +2920,7 @@ var buf2string = function (buf) {
  */
 exports.utf8encode = function utf8encode(str) {
     if (support.nodebuffer) {
-        return nodeBuffer(str, "utf-8");
+        return nodejsUtils.newBufferFrom(str, "utf-8");
     }
 
     return string2buf(str);
@@ -1903,60 +2940,149 @@ exports.utf8decode = function utf8decode(buf) {
 
     buf = utils.transformTo(support.uint8array ? "uint8array" : "array", buf);
 
-    // return buf2string(buf);
-    // Chrome prefers to work with "small" chunks of data
-    // for the method buf2string.
-    // Firefox and Chrome has their own shortcut, IE doesn't seem to really care.
-    var result = [], k = 0, len = buf.length, chunk = 65536;
-    while (k < len) {
-        var nextBoundary = utf8border(buf, Math.min(k + chunk, len));
-        if (support.uint8array) {
-            result.push(buf2string(buf.subarray(k, nextBoundary)));
-        } else {
-            result.push(buf2string(buf.slice(k, nextBoundary)));
-        }
-        k = nextBoundary;
-    }
-    return result.join("");
-
+    return buf2string(buf);
 };
-// vim: set shiftwidth=4 softtabstop=4:
 
-},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var compressions = _dereq_('./compressions');
-var nodeBuffer = _dereq_('./nodeBuffer');
 /**
- * Convert a string to a "binary string" : a string containing only char codes between 0 and 255.
- * @param {string} str the string to transform.
- * @return {String} the binary string.
+ * A worker to decode utf8 encoded binary chunks into string chunks.
+ * @constructor
  */
-exports.string2binary = function(str) {
-    var result = "";
-    for (var i = 0; i < str.length; i++) {
-        result += String.fromCharCode(str.charCodeAt(i) & 0xff);
+function Utf8DecodeWorker() {
+    GenericWorker.call(this, "utf-8 decode");
+    // the last bytes if a chunk didn't end with a complete codepoint.
+    this.leftOver = null;
+}
+utils.inherits(Utf8DecodeWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+Utf8DecodeWorker.prototype.processChunk = function (chunk) {
+
+    var data = utils.transformTo(support.uint8array ? "uint8array" : "array", chunk.data);
+
+    // 1st step, re-use what's left of the previous chunk
+    if (this.leftOver && this.leftOver.length) {
+        if(support.uint8array) {
+            var previousData = data;
+            data = new Uint8Array(previousData.length + this.leftOver.length);
+            data.set(this.leftOver, 0);
+            data.set(previousData, this.leftOver.length);
+        } else {
+            data = this.leftOver.concat(data);
+        }
+        this.leftOver = null;
     }
-    return result;
+
+    var nextBoundary = utf8border(data);
+    var usableData = data;
+    if (nextBoundary !== data.length) {
+        if (support.uint8array) {
+            usableData = data.subarray(0, nextBoundary);
+            this.leftOver = data.subarray(nextBoundary, data.length);
+        } else {
+            usableData = data.slice(0, nextBoundary);
+            this.leftOver = data.slice(nextBoundary, data.length);
+        }
+    }
+
+    this.push({
+        data : exports.utf8decode(usableData),
+        meta : chunk.meta
+    });
 };
-exports.arrayBuffer2Blob = function(buffer, mimeType) {
+
+/**
+ * @see GenericWorker.flush
+ */
+Utf8DecodeWorker.prototype.flush = function () {
+    if(this.leftOver && this.leftOver.length) {
+        this.push({
+            data : exports.utf8decode(this.leftOver),
+            meta : {}
+        });
+        this.leftOver = null;
+    }
+};
+exports.Utf8DecodeWorker = Utf8DecodeWorker;
+
+/**
+ * A worker to endcode string chunks into utf8 encoded binary chunks.
+ * @constructor
+ */
+function Utf8EncodeWorker() {
+    GenericWorker.call(this, "utf-8 encode");
+}
+utils.inherits(Utf8EncodeWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+Utf8EncodeWorker.prototype.processChunk = function (chunk) {
+    this.push({
+        data : exports.utf8encode(chunk.data),
+        meta : chunk.meta
+    });
+};
+exports.Utf8EncodeWorker = Utf8EncodeWorker;
+
+},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(require,module,exports){
+'use strict';
+
+var support = require('./support');
+var base64 = require('./base64');
+var nodejsUtils = require('./nodejsUtils');
+var setImmediate = require('core-js/library/fn/set-immediate');
+var external = require("./external");
+
+
+/**
+ * Convert a string that pass as a "binary string": it should represent a byte
+ * array but may have > 255 char codes. Be sure to take only the first byte
+ * and returns the byte array.
+ * @param {String} str the string to transform.
+ * @return {Array|Uint8Array} the string in a binary format.
+ */
+function string2binary(str) {
+    var result = null;
+    if (support.uint8array) {
+      result = new Uint8Array(str.length);
+    } else {
+      result = new Array(str.length);
+    }
+    return stringToArrayLike(str, result);
+}
+
+/**
+ * Create a new blob with the given content and the given type.
+ * @param {String|ArrayBuffer} part the content to put in the blob. DO NOT use
+ * an Uint8Array because the stock browser of android 4 won't accept it (it
+ * will be silently converted to a string, "[object Uint8Array]").
+ *
+ * Use only ONE part to build the blob to avoid a memory leak in IE11 / Edge:
+ * when a large amount of Array is used to create the Blob, the amount of
+ * memory consumed is nearly 100 times the original data amount.
+ *
+ * @param {String} type the mime type of the blob.
+ * @return {Blob} the created blob.
+ */
+exports.newBlob = function(part, type) {
     exports.checkSupport("blob");
-	mimeType = mimeType || 'application/zip';
 
     try {
         // Blob constructor
-        return new Blob([buffer], {
-            type: mimeType
+        return new Blob([part], {
+            type: type
         });
     }
     catch (e) {
 
         try {
             // deprecated, browser only, old way
-            var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
+            var Builder = self.BlobBuilder || self.WebKitBlobBuilder || self.MozBlobBuilder || self.MSBlobBuilder;
             var builder = new Builder();
-            builder.append(buffer);
-            return builder.getBlob(mimeType);
+            builder.append(part);
+            return builder.getBlob(type);
         }
         catch (e) {
 
@@ -1989,6 +3115,76 @@ function stringToArrayLike(str, array) {
     return array;
 }
 
+/**
+ * An helper for the function arrayLikeToString.
+ * This contains static informations and functions that
+ * can be optimized by the browser JIT compiler.
+ */
+var arrayToStringHelper = {
+    /**
+     * Transform an array of int into a string, chunk by chunk.
+     * See the performances notes on arrayLikeToString.
+     * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
+     * @param {String} type the type of the array.
+     * @param {Integer} chunk the chunk size.
+     * @return {String} the resulting string.
+     * @throws Error if the chunk is too big for the stack.
+     */
+    stringifyByChunk: function(array, type, chunk) {
+        var result = [], k = 0, len = array.length;
+        // shortcut
+        if (len <= chunk) {
+            return String.fromCharCode.apply(null, array);
+        }
+        while (k < len) {
+            if (type === "array" || type === "nodebuffer") {
+                result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
+            }
+            else {
+                result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
+            }
+            k += chunk;
+        }
+        return result.join("");
+    },
+    /**
+     * Call String.fromCharCode on every item in the array.
+     * This is the naive implementation, which generate A LOT of intermediate string.
+     * This should be used when everything else fail.
+     * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
+     * @return {String} the result.
+     */
+    stringifyByChar: function(array){
+        var resultStr = "";
+        for(var i = 0; i < array.length; i++) {
+            resultStr += String.fromCharCode(array[i]);
+        }
+        return resultStr;
+    },
+    applyCanBeUsed : {
+        /**
+         * true if the browser accepts to use String.fromCharCode on Uint8Array
+         */
+        uint8array : (function () {
+            try {
+                return support.uint8array && String.fromCharCode.apply(null, new Uint8Array(1)).length === 1;
+            } catch (e) {
+                return false;
+            }
+        })(),
+        /**
+         * true if the browser accepts to use String.fromCharCode on nodejs Buffer.
+         */
+        nodebuffer : (function () {
+            try {
+                return support.nodebuffer && String.fromCharCode.apply(null, nodejsUtils.allocBuffer(1)).length === 1;
+            } catch (e) {
+                return false;
+            }
+        })()
+    }
+};
+
 /**
  * Transform an array-like object to a string.
  * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
@@ -2004,49 +3200,29 @@ function arrayLikeToString(array) {
     // result += String.fromCharCode(array[i]); generate too many strings !
     //
     // This code is inspired by http://jsperf.com/arraybuffer-to-string-apply-performance/2
-    var chunk = 65536;
-    var result = [],
-        len = array.length,
+    // TODO : we now have workers that split the work. Do we still need that ?
+    var chunk = 65536,
         type = exports.getTypeOf(array),
-        k = 0,
         canUseApply = true;
-      try {
-         switch(type) {
-            case "uint8array":
-               String.fromCharCode.apply(null, new Uint8Array(0));
-               break;
-            case "nodebuffer":
-               String.fromCharCode.apply(null, nodeBuffer(0));
-               break;
-         }
-      } catch(e) {
-         canUseApply = false;
-      }
+    if (type === "uint8array") {
+        canUseApply = arrayToStringHelper.applyCanBeUsed.uint8array;
+    } else if (type === "nodebuffer") {
+        canUseApply = arrayToStringHelper.applyCanBeUsed.nodebuffer;
+    }
 
-      // no apply : slow and painful algorithm
-      // default browser on android 4.*
-      if (!canUseApply) {
-         var resultStr = "";
-         for(var i = 0; i < array.length;i++) {
-            resultStr += String.fromCharCode(array[i]);
-         }
-    return resultStr;
-    }
-    while (k < len && chunk > 1) {
-        try {
-            if (type === "array" || type === "nodebuffer") {
-                result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
+    if (canUseApply) {
+        while (chunk > 1) {
+            try {
+                return arrayToStringHelper.stringifyByChunk(array, type, chunk);
+            } catch (e) {
+                chunk = Math.floor(chunk / 2);
             }
-            else {
-                result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
-            }
-            k += chunk;
-        }
-        catch (e) {
-            chunk = Math.floor(chunk / 2);
         }
     }
-    return result.join("");
+
+    // no apply or chunk error : slow and painful algorithm
+    // default browser on android 4.*
+    return arrayToStringHelper.stringifyByChar(array);
 }
 
 exports.applyFromCharCode = arrayLikeToString;
@@ -2081,7 +3257,7 @@ transform["string"] = {
         return stringToArrayLike(input, new Uint8Array(input.length));
     },
     "nodebuffer": function(input) {
-        return stringToArrayLike(input, nodeBuffer(input.length));
+        return stringToArrayLike(input, nodejsUtils.allocBuffer(input.length));
     }
 };
 
@@ -2096,7 +3272,7 @@ transform["array"] = {
         return new Uint8Array(input);
     },
     "nodebuffer": function(input) {
-        return nodeBuffer(input);
+        return nodejsUtils.newBufferFrom(input);
     }
 };
 
@@ -2113,7 +3289,7 @@ transform["arraybuffer"] = {
         return new Uint8Array(input);
     },
     "nodebuffer": function(input) {
-        return nodeBuffer(new Uint8Array(input));
+        return nodejsUtils.newBufferFrom(new Uint8Array(input));
     }
 };
 
@@ -2128,7 +3304,7 @@ transform["uint8array"] = {
     },
     "uint8array": identity,
     "nodebuffer": function(input) {
-        return nodeBuffer(input);
+        return nodejsUtils.newBufferFrom(input);
     }
 };
 
@@ -2183,7 +3359,7 @@ exports.getTypeOf = function(input) {
     if (Object.prototype.toString.call(input) === "[object Array]") {
         return "array";
     }
-    if (support.nodebuffer && nodeBuffer.test(input)) {
+    if (support.nodebuffer && nodejsUtils.isBuffer(input)) {
         return "nodebuffer";
     }
     if (support.uint8array && input instanceof Uint8Array) {
@@ -2202,9 +3378,10 @@ exports.getTypeOf = function(input) {
 exports.checkSupport = function(type) {
     var supported = support[type.toLowerCase()];
     if (!supported) {
-        throw new Error(type + " is not supported by this browser");
+        throw new Error(type + " is not supported by this platform");
     }
 };
+
 exports.MAX_VALUE_16BITS = 65535;
 exports.MAX_VALUE_32BITS = -1; // well, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" is parsed as -1
 
@@ -2224,68 +3401,154 @@ exports.pretty = function(str) {
 };
 
 /**
- * Find a compression registered in JSZip.
- * @param {string} compressionMethod the method magic to find.
- * @return {Object|null} the JSZip compression object, null if none found.
+ * Defer the call of a function.
+ * @param {Function} callback the function to call asynchronously.
+ * @param {Array} args the arguments to give to the callback.
  */
-exports.findCompression = function(compressionMethod) {
-    for (var method in compressions) {
-        if (!compressions.hasOwnProperty(method)) {
-            continue;
-        }
-        if (compressions[method].magic === compressionMethod) {
-            return compressions[method];
+exports.delay = function(callback, args, self) {
+    setImmediate(function () {
+        callback.apply(self || null, args || []);
+    });
+};
+
+/**
+ * Extends a prototype with an other, without calling a constructor with
+ * side effects. Inspired by nodejs' `utils.inherits`
+ * @param {Function} ctor the constructor to augment
+ * @param {Function} superCtor the parent constructor to use
+ */
+exports.inherits = function (ctor, superCtor) {
+    var Obj = function() {};
+    Obj.prototype = superCtor.prototype;
+    ctor.prototype = new Obj();
+};
+
+/**
+ * Merge the objects passed as parameters into a new one.
+ * @private
+ * @param {...Object} var_args All objects to merge.
+ * @return {Object} a new object with the data of the others.
+ */
+exports.extend = function() {
+    var result = {}, i, attr;
+    for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
+        for (attr in arguments[i]) {
+            if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
+                result[attr] = arguments[i][attr];
+            }
         }
     }
-    return null;
+    return result;
 };
+
 /**
-* Cross-window, cross-Node-context regular expression detection
-* @param  {Object}  object Anything
-* @return {Boolean}        true if the object is a regular expression,
-* false otherwise
-*/
-exports.isRegExp = function (object) {
-    return Object.prototype.toString.call(object) === "[object RegExp]";
+ * Transform arbitrary content into a Promise.
+ * @param {String} name a name for the content being processed.
+ * @param {Object} inputData the content to process.
+ * @param {Boolean} isBinary true if the content is not an unicode string
+ * @param {Boolean} isOptimizedBinaryString true if the string content only has one byte per character.
+ * @param {Boolean} isBase64 true if the string content is encoded with base64.
+ * @return {Promise} a promise in a format usable by JSZip.
+ */
+exports.prepareContent = function(name, inputData, isBinary, isOptimizedBinaryString, isBase64) {
+
+    // if inputData is already a promise, this flatten it.
+    var promise = external.Promise.resolve(inputData).then(function(data) {
+        
+        
+        var isBlob = support.blob && (data instanceof Blob || ['[object File]', '[object Blob]'].indexOf(Object.prototype.toString.call(data)) !== -1);
+
+        if (isBlob && typeof FileReader !== "undefined") {
+            return new external.Promise(function (resolve, reject) {
+                var reader = new FileReader();
+
+                reader.onload = function(e) {
+                    resolve(e.target.result);
+                };
+                reader.onerror = function(e) {
+                    reject(e.target.error);
+                };
+                reader.readAsArrayBuffer(data);
+            });
+        } else {
+            return data;
+        }
+    });
+
+    return promise.then(function(data) {
+        var dataType = exports.getTypeOf(data);
+
+        if (!dataType) {
+            return external.Promise.reject(
+                new Error("Can't read the data of '" + name + "'. Is it " +
+                          "in a supported JavaScript type (String, Blob, ArrayBuffer, etc) ?")
+            );
+        }
+        // special case : it's way easier to work with Uint8Array than with ArrayBuffer
+        if (dataType === "arraybuffer") {
+            data = exports.transformTo("uint8array", data);
+        } else if (dataType === "string") {
+            if (isBase64) {
+                data = base64.decode(data);
+            }
+            else if (isBinary) {
+                // optimizedBinaryString === true means that the file has already been filtered with a 0xFF mask
+                if (isOptimizedBinaryString !== true) {
+                    // this is a string, not in a base64 format.
+                    // Be sure that this is a correct "binary string"
+                    data = string2binary(data);
+                }
+            }
+        }
+        return data;
+    });
 };
 
-
-},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(_dereq_,module,exports){
+},{"./base64":1,"./external":6,"./nodejsUtils":14,"./support":30,"core-js/library/fn/set-immediate":36}],33:[function(require,module,exports){
 'use strict';
-var StringReader = _dereq_('./stringReader');
-var NodeBufferReader = _dereq_('./nodeBufferReader');
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-var utils = _dereq_('./utils');
-var sig = _dereq_('./signature');
-var ZipEntry = _dereq_('./zipEntry');
-var support = _dereq_('./support');
-var jszipProto = _dereq_('./object');
+var readerFor = require('./reader/readerFor');
+var utils = require('./utils');
+var sig = require('./signature');
+var ZipEntry = require('./zipEntry');
+var utf8 = require('./utf8');
+var support = require('./support');
 //  class ZipEntries {{{
 /**
  * All the entries in the zip file.
  * @constructor
- * @param {String|ArrayBuffer|Uint8Array} data the binary stream to load.
  * @param {Object} loadOptions Options for loading the stream.
  */
-function ZipEntries(data, loadOptions) {
+function ZipEntries(loadOptions) {
     this.files = [];
     this.loadOptions = loadOptions;
-    if (data) {
-        this.load(data);
-    }
 }
 ZipEntries.prototype = {
     /**
-     * Check that the reader is on the speficied signature.
+     * Check that the reader is on the specified signature.
      * @param {string} expectedSignature the expected signature.
      * @throws {Error} if it is an other signature.
      */
     checkSignature: function(expectedSignature) {
-        var signature = this.reader.readString(4);
-        if (signature !== expectedSignature) {
-            throw new Error("Corrupted zip or bug : unexpected signature " + "(" + utils.pretty(signature) + ", expected " + utils.pretty(expectedSignature) + ")");
+        if (!this.reader.readAndCheckSignature(expectedSignature)) {
+            this.reader.index -= 4;
+            var signature = this.reader.readString(4);
+            throw new Error("Corrupted zip or bug: unexpected signature " + "(" + utils.pretty(signature) + ", expected " + utils.pretty(expectedSignature) + ")");
         }
     },
+    /**
+     * Check if the given signature is at the given index.
+     * @param {number} askedIndex the index to check.
+     * @param {string} expectedSignature the signature to expect.
+     * @return {boolean} true if the signature is here, false otherwise.
+     */
+    isSignature: function(askedIndex, expectedSignature) {
+        var currentIndex = this.reader.index;
+        this.reader.setIndex(askedIndex);
+        var signature = this.reader.readString(4);
+        var result = signature === expectedSignature;
+        this.reader.setIndex(currentIndex);
+        return result;
+    },
     /**
      * Read the end of the central directory.
      */
@@ -2301,10 +3564,12 @@ ZipEntries.prototype = {
         // warning : the encoding depends of the system locale
         // On a linux machine with LANG=en_US.utf8, this field is utf8 encoded.
         // On a windows machine, this field is encoded with the localized windows code page.
-        this.zipComment = this.reader.readString(this.zipCommentLength);
+        var zipComment = this.reader.readData(this.zipCommentLength);
+        var decodeParamType = support.uint8array ? "uint8array" : "array";
         // To get consistent behavior with the generation part, we will assume that
-        // this is utf8 encoded.
-        this.zipComment = jszipProto.utf8decode(this.zipComment);
+        // this is utf8 encoded unless specified otherwise.
+        var decodeContent = utils.transformTo(decodeParamType, zipComment);
+        this.zipComment = this.loadOptions.decodeFileName(decodeContent);
     },
     /**
      * Read the end of the Zip 64 central directory.
@@ -2314,8 +3579,9 @@ ZipEntries.prototype = {
      */
     readBlockZip64EndOfCentral: function() {
         this.zip64EndOfCentralSize = this.reader.readInt(8);
-        this.versionMadeBy = this.reader.readString(2);
-        this.versionNeeded = this.reader.readInt(2);
+        this.reader.skip(4);
+        // this.versionMadeBy = this.reader.readString(2);
+        // this.versionNeeded = this.reader.readInt(2);
         this.diskNumber = this.reader.readInt(4);
         this.diskWithCentralDirStart = this.reader.readInt(4);
         this.centralDirRecordsOnThisDisk = this.reader.readInt(8);
@@ -2332,7 +3598,7 @@ ZipEntries.prototype = {
         while (index < extraDataSize) {
             extraFieldId = this.reader.readInt(2);
             extraFieldLength = this.reader.readInt(4);
-            extraFieldValue = this.reader.readString(extraFieldLength);
+            extraFieldValue = this.reader.readData(extraFieldLength);
             this.zip64ExtensibleData[extraFieldId] = {
                 id: extraFieldId,
                 length: extraFieldLength,
@@ -2372,40 +3638,49 @@ ZipEntries.prototype = {
         var file;
 
         this.reader.setIndex(this.centralDirOffset);
-        while (this.reader.readString(4) === sig.CENTRAL_FILE_HEADER) {
+        while (this.reader.readAndCheckSignature(sig.CENTRAL_FILE_HEADER)) {
             file = new ZipEntry({
                 zip64: this.zip64
             }, this.loadOptions);
             file.readCentralPart(this.reader);
             this.files.push(file);
         }
+
+        if (this.centralDirRecords !== this.files.length) {
+            if (this.centralDirRecords !== 0 && this.files.length === 0) {
+                // We expected some records but couldn't find ANY.
+                // This is really suspicious, as if something went wrong.
+                throw new Error("Corrupted zip or bug: expected " + this.centralDirRecords + " records in central dir, got " + this.files.length);
+            } else {
+                // We found some records but not all.
+                // Something is wrong but we got something for the user: no error here.
+                // console.warn("expected", this.centralDirRecords, "records in central dir, got", this.files.length);
+            }
+        }
     },
     /**
      * Read the end of central directory.
      */
     readEndOfCentral: function() {
         var offset = this.reader.lastIndexOfSignature(sig.CENTRAL_DIRECTORY_END);
-        if (offset === -1) {
+        if (offset < 0) {
             // Check if the content is a truncated zip or complete garbage.
             // A "LOCAL_FILE_HEADER" is not required at the beginning (auto
             // extractible zip for example) but it can give a good hint.
             // If an ajax request was used without responseType, we will also
             // get unreadable data.
-            var isGarbage = true;
-            try {
-                this.reader.setIndex(0);
-                this.checkSignature(sig.LOCAL_FILE_HEADER);
-                isGarbage = false;
-            } catch (e) {}
+            var isGarbage = !this.isSignature(0, sig.LOCAL_FILE_HEADER);
 
             if (isGarbage) {
                 throw new Error("Can't find end of central directory : is this a zip file ? " +
-                                "If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html");
+                                "If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html");
             } else {
-                throw new Error("Corrupted zip : can't find end of central directory");
+                throw new Error("Corrupted zip: can't find end of central directory");
             }
+
         }
         this.reader.setIndex(offset);
+        var endOfCentralDirOffset = offset;
         this.checkSignature(sig.CENTRAL_DIRECTORY_END);
         this.readBlockEndOfCentral();
 
@@ -2425,7 +3700,7 @@ ZipEntries.prototype = {
 
             /*
             Warning : the zip64 extension is supported, but ONLY if the 64bits integer read from
-            the zip file can fit into a 32bits integer. This cannot be solved : Javascript represents
+            the zip file can fit into a 32bits integer. This cannot be solved : JavaScript represents
             all numbers as 64-bit double precision IEEE 754 floating point numbers.
             So, we have 53bits for integers and bitwise operations treat everything as 32bits.
             see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Operators/Bitwise_Operators
@@ -2434,30 +3709,50 @@ ZipEntries.prototype = {
 
             // should look for a zip64 EOCD locator
             offset = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
-            if (offset === -1) {
-                throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");
+            if (offset < 0) {
+                throw new Error("Corrupted zip: can't find the ZIP64 end of central directory locator");
             }
             this.reader.setIndex(offset);
             this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
             this.readBlockZip64EndOfCentralLocator();
 
             // now the zip64 EOCD record
+            if (!this.isSignature(this.relativeOffsetEndOfZip64CentralDir, sig.ZIP64_CENTRAL_DIRECTORY_END)) {
+                // console.warn("ZIP64 end of central directory not where expected.");
+                this.relativeOffsetEndOfZip64CentralDir = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
+                if (this.relativeOffsetEndOfZip64CentralDir < 0) {
+                    throw new Error("Corrupted zip: can't find the ZIP64 end of central directory");
+                }
+            }
             this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir);
             this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
             this.readBlockZip64EndOfCentral();
         }
+
+        var expectedEndOfCentralDirOffset = this.centralDirOffset + this.centralDirSize;
+        if (this.zip64) {
+            expectedEndOfCentralDirOffset += 20; // end of central dir 64 locator
+            expectedEndOfCentralDirOffset += 12 /* should not include the leading 12 bytes */ + this.zip64EndOfCentralSize;
+        }
+
+        var extraBytes = endOfCentralDirOffset - expectedEndOfCentralDirOffset;
+
+        if (extraBytes > 0) {
+            // console.warn(extraBytes, "extra bytes at beginning or within zipfile");
+            if (this.isSignature(endOfCentralDirOffset, sig.CENTRAL_FILE_HEADER)) {
+                // The offsets seem wrong, but we have something at the specified offset.
+                // So… we keep it.
+            } else {
+                // the offset is wrong, update the "zero" of the reader
+                // this happens if data has been prepended (crx files for example)
+                this.reader.zero = extraBytes;
+            }
+        } else if (extraBytes < 0) {
+            throw new Error("Corrupted zip: missing " + Math.abs(extraBytes) + " bytes.");
+        }
     },
     prepareReader: function(data) {
-        var type = utils.getTypeOf(data);
-        if (type === "string" && !support.uint8array) {
-            this.reader = new StringReader(data, this.loadOptions.optimizedBinaryString);
-        }
-        else if (type === "nodebuffer") {
-            this.reader = new NodeBufferReader(data);
-        }
-        else {
-            this.reader = new Uint8ArrayReader(utils.transformTo("uint8array", data));
-        }
+        this.reader = readerFor(data);
     },
     /**
      * Read a zip file and create ZipEntries.
@@ -2473,16 +3768,36 @@ ZipEntries.prototype = {
 // }}} end of ZipEntries
 module.exports = ZipEntries;
 
-},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(_dereq_,module,exports){
+},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(require,module,exports){
 'use strict';
-var StringReader = _dereq_('./stringReader');
-var utils = _dereq_('./utils');
-var CompressedObject = _dereq_('./compressedObject');
-var jszipProto = _dereq_('./object');
+var readerFor = require('./reader/readerFor');
+var utils = require('./utils');
+var CompressedObject = require('./compressedObject');
+var crc32fn = require('./crc32');
+var utf8 = require('./utf8');
+var compressions = require('./compressions');
+var support = require('./support');
 
 var MADE_BY_DOS = 0x00;
 var MADE_BY_UNIX = 0x03;
 
+/**
+ * Find a compression registered in JSZip.
+ * @param {string} compressionMethod the method magic to find.
+ * @return {Object|null} the JSZip compression object, null if none found.
+ */
+var findCompression = function(compressionMethod) {
+    for (var method in compressions) {
+        if (!compressions.hasOwnProperty(method)) {
+            continue;
+        }
+        if (compressions[method].magic === compressionMethod) {
+            return compressions[method];
+        }
+    }
+    return null;
+};
+
 // class ZipEntry {{{
 /**
  * An entry in the zip file.
@@ -2511,45 +3826,6 @@ ZipEntry.prototype = {
         // bit 11 is set
         return (this.bitFlag & 0x0800) === 0x0800;
     },
-    /**
-     * Prepare the function used to generate the compressed content from this ZipFile.
-     * @param {DataReader} reader the reader to use.
-     * @param {number} from the offset from where we should read the data.
-     * @param {number} length the length of the data to read.
-     * @return {Function} the callback to get the compressed content (the type depends of the DataReader class).
-     */
-    prepareCompressedContent: function(reader, from, length) {
-        return function() {
-            var previousIndex = reader.index;
-            reader.setIndex(from);
-            var compressedFileData = reader.readData(length);
-            reader.setIndex(previousIndex);
-
-            return compressedFileData;
-        };
-    },
-    /**
-     * Prepare the function used to generate the uncompressed content from this ZipFile.
-     * @param {DataReader} reader the reader to use.
-     * @param {number} from the offset from where we should read the data.
-     * @param {number} length the length of the data to read.
-     * @param {JSZip.compression} compression the compression used on this file.
-     * @param {number} uncompressedSize the uncompressed size to expect.
-     * @return {Function} the callback to get the uncompressed content (the type depends of the DataReader class).
-     */
-    prepareContent: function(reader, from, length, compression, uncompressedSize) {
-        return function() {
-
-            var compressedFileData = utils.transformTo(compression.uncompressInputType, this.getCompressedContent());
-            var uncompressedFileData = compression.uncompress(compressedFileData);
-
-            if (uncompressedFileData.length !== uncompressedSize) {
-                throw new Error("Bug : uncompressed data size mismatch");
-            }
-
-            return uncompressedFileData;
-        };
-    },
     /**
      * Read the local part of a zip file and add the info in this object.
      * @param {DataReader} reader the reader to use.
@@ -2576,32 +3852,19 @@ ZipEntry.prototype = {
         // Unfortunately, this lead also to some issues : http://seclists.org/fulldisclosure/2009/Sep/394
         this.fileNameLength = reader.readInt(2);
         localExtraFieldsLength = reader.readInt(2); // can't be sure this will be the same as the central dir
-        this.fileName = reader.readString(this.fileNameLength);
+        // the fileName is stored as binary data, the handleUTF8 method will take care of the encoding.
+        this.fileName = reader.readData(this.fileNameLength);
         reader.skip(localExtraFieldsLength);
 
-        if (this.compressedSize == -1 || this.uncompressedSize == -1) {
-            throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory " + "(compressedSize == -1 || uncompressedSize == -1)");
+        if (this.compressedSize === -1 || this.uncompressedSize === -1) {
+            throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory " + "(compressedSize === -1 || uncompressedSize === -1)");
         }
 
-        compression = utils.findCompression(this.compressionMethod);
+        compression = findCompression(this.compressionMethod);
         if (compression === null) { // no compression found
-            throw new Error("Corrupted zip : compression " + utils.pretty(this.compressionMethod) + " unknown (inner file : " + this.fileName + ")");
-        }
-        this.decompressed = new CompressedObject();
-        this.decompressed.compressedSize = this.compressedSize;
-        this.decompressed.uncompressedSize = this.uncompressedSize;
-        this.decompressed.crc32 = this.crc32;
-        this.decompressed.compressionMethod = this.compressionMethod;
-        this.decompressed.getCompressedContent = this.prepareCompressedContent(reader, reader.index, this.compressedSize, compression);
-        this.decompressed.getContent = this.prepareContent(reader, reader.index, this.compressedSize, compression, this.uncompressedSize);
-
-        // we need to compute the crc32...
-        if (this.loadOptions.checkCRC32) {
-            this.decompressed = utils.transformTo("string", this.decompressed.getContent());
-            if (jszipProto.crc32(this.decompressed) !== this.crc32) {
-                throw new Error("Corrupted zip : CRC32 mismatch");
-            }
+            throw new Error("Corrupted zip : compression " + utils.pretty(this.compressionMethod) + " unknown (inner file : " + utils.transformTo("string", this.fileName) + ")");
         }
+        this.decompressed = new CompressedObject(this.compressedSize, this.uncompressedSize, this.crc32, compression, reader.readData(this.compressedSize));
     },
 
     /**
@@ -2610,14 +3873,15 @@ ZipEntry.prototype = {
      */
     readCentralPart: function(reader) {
         this.versionMadeBy = reader.readInt(2);
-        this.versionNeeded = reader.readInt(2);
+        reader.skip(2);
+        // this.versionNeeded = reader.readInt(2);
         this.bitFlag = reader.readInt(2);
         this.compressionMethod = reader.readString(2);
         this.date = reader.readDate();
         this.crc32 = reader.readInt(4);
         this.compressedSize = reader.readInt(4);
         this.uncompressedSize = reader.readInt(4);
-        this.fileNameLength = reader.readInt(2);
+        var fileNameLength = reader.readInt(2);
         this.extraFieldsLength = reader.readInt(2);
         this.fileCommentLength = reader.readInt(2);
         this.diskNumberStart = reader.readInt(2);
@@ -2629,10 +3893,11 @@ ZipEntry.prototype = {
             throw new Error("Encrypted zip are not supported");
         }
 
-        this.fileName = reader.readString(this.fileNameLength);
+        // will be read in the local part, see the comments there
+        reader.skip(fileNameLength);
         this.readExtraFields(reader);
         this.parseZIP64ExtraField(reader);
-        this.fileComment = reader.readString(this.fileCommentLength);
+        this.fileComment = reader.readData(this.fileCommentLength);
     },
 
     /**
@@ -2659,7 +3924,7 @@ ZipEntry.prototype = {
         }
 
         // fail safe : if the name ends with a / it probably means a folder
-        if (!this.dir && this.fileName.slice(-1) === '/') {
+        if (!this.dir && this.fileNameStr.slice(-1) === '/') {
             this.dir = true;
         }
     },
@@ -2675,7 +3940,7 @@ ZipEntry.prototype = {
         }
 
         // should be something, preparing the extra reader
-        var extraReader = new StringReader(this.extraFields[0x0001].value);
+        var extraReader = readerFor(this.extraFields[0x0001].value);
 
         // I really hope that these 64bits integer can fit in 32 bits integer, because js
         // won't let us have more.
@@ -2697,17 +3962,19 @@ ZipEntry.prototype = {
      * @param {DataReader} reader the reader to use.
      */
     readExtraFields: function(reader) {
-        var start = reader.index,
+        var end = reader.index + this.extraFieldsLength,
             extraFieldId,
             extraFieldLength,
             extraFieldValue;
 
-        this.extraFields = this.extraFields || {};
+        if (!this.extraFields) {
+            this.extraFields = {};
+        }
 
-        while (reader.index < start + this.extraFieldsLength) {
+        while (reader.index < end) {
             extraFieldId = reader.readInt(2);
             extraFieldLength = reader.readInt(2);
-            extraFieldValue = reader.readString(extraFieldLength);
+            extraFieldValue = reader.readData(extraFieldLength);
 
             this.extraFields[extraFieldId] = {
                 id: extraFieldId,
@@ -2720,17 +3987,27 @@ ZipEntry.prototype = {
      * Apply an UTF8 transformation if needed.
      */
     handleUTF8: function() {
+        var decodeParamType = support.uint8array ? "uint8array" : "array";
         if (this.useUTF8()) {
-            this.fileName = jszipProto.utf8decode(this.fileName);
-            this.fileComment = jszipProto.utf8decode(this.fileComment);
+            this.fileNameStr = utf8.utf8decode(this.fileName);
+            this.fileCommentStr = utf8.utf8decode(this.fileComment);
         } else {
             var upath = this.findExtraFieldUnicodePath();
             if (upath !== null) {
-                this.fileName = upath;
+                this.fileNameStr = upath;
+            } else {
+                // ASCII text or unsupported code page
+                var fileNameByteArray =  utils.transformTo(decodeParamType, this.fileName);
+                this.fileNameStr = this.loadOptions.decodeFileName(fileNameByteArray);
             }
+
             var ucomment = this.findExtraFieldUnicodeComment();
             if (ucomment !== null) {
-                this.fileComment = ucomment;
+                this.fileCommentStr = ucomment;
+            } else {
+                // ASCII text or unsupported code page
+                var commentByteArray =  utils.transformTo(decodeParamType, this.fileComment);
+                this.fileCommentStr = this.loadOptions.decodeFileName(commentByteArray);
             }
         }
     },
@@ -2742,7 +4019,7 @@ ZipEntry.prototype = {
     findExtraFieldUnicodePath: function() {
         var upathField = this.extraFields[0x7075];
         if (upathField) {
-            var extraReader = new StringReader(upathField.value);
+            var extraReader = readerFor(upathField.value);
 
             // wrong version
             if (extraReader.readInt(1) !== 1) {
@@ -2750,11 +4027,11 @@ ZipEntry.prototype = {
             }
 
             // the crc of the filename changed, this field is out of date.
-            if (jszipProto.crc32(this.fileName) !== extraReader.readInt(4)) {
+            if (crc32fn(this.fileName) !== extraReader.readInt(4)) {
                 return null;
             }
 
-            return jszipProto.utf8decode(extraReader.readString(upathField.length - 5));
+            return utf8.utf8decode(extraReader.readData(upathField.length - 5));
         }
         return null;
     },
@@ -2766,7 +4043,7 @@ ZipEntry.prototype = {
     findExtraFieldUnicodeComment: function() {
         var ucommentField = this.extraFields[0x6375];
         if (ucommentField) {
-            var extraReader = new StringReader(ucommentField.value);
+            var extraReader = readerFor(ucommentField.value);
 
             // wrong version
             if (extraReader.readInt(1) !== 1) {
@@ -2774,42 +4051,797 @@ ZipEntry.prototype = {
             }
 
             // the crc of the comment changed, this field is out of date.
-            if (jszipProto.crc32(this.fileComment) !== extraReader.readInt(4)) {
+            if (crc32fn(this.fileComment) !== extraReader.readInt(4)) {
                 return null;
             }
 
-            return jszipProto.utf8decode(extraReader.readString(ucommentField.length - 5));
+            return utf8.utf8decode(extraReader.readData(ucommentField.length - 5));
         }
         return null;
     }
 };
 module.exports = ZipEntry;
 
-},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(_dereq_,module,exports){
+},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(require,module,exports){
+'use strict';
+
+var StreamHelper = require('./stream/StreamHelper');
+var DataWorker = require('./stream/DataWorker');
+var utf8 = require('./utf8');
+var CompressedObject = require('./compressedObject');
+var GenericWorker = require('./stream/GenericWorker');
+
+/**
+ * A simple object representing a file in the zip file.
+ * @constructor
+ * @param {string} name the name of the file
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data
+ * @param {Object} options the options of the file
+ */
+var ZipObject = function(name, data, options) {
+    this.name = name;
+    this.dir = options.dir;
+    this.date = options.date;
+    this.comment = options.comment;
+    this.unixPermissions = options.unixPermissions;
+    this.dosPermissions = options.dosPermissions;
+
+    this._data = data;
+    this._dataBinary = options.binary;
+    // keep only the compression
+    this.options = {
+        compression : options.compression,
+        compressionOptions : options.compressionOptions
+    };
+};
+
+ZipObject.prototype = {
+    /**
+     * Create an internal stream for the content of this object.
+     * @param {String} type the type of each chunk.
+     * @return StreamHelper the stream.
+     */
+    internalStream: function (type) {
+        var result = null, outputType = "string";
+        try {
+            if (!type) {
+                throw new Error("No output type specified.");
+            }
+            outputType = type.toLowerCase();
+            var askUnicodeString = outputType === "string" || outputType === "text";
+            if (outputType === "binarystring" || outputType === "text") {
+                outputType = "string";
+            }
+            result = this._decompressWorker();
+
+            var isUnicodeString = !this._dataBinary;
+
+            if (isUnicodeString && !askUnicodeString) {
+                result = result.pipe(new utf8.Utf8EncodeWorker());
+            }
+            if (!isUnicodeString && askUnicodeString) {
+                result = result.pipe(new utf8.Utf8DecodeWorker());
+            }
+        } catch (e) {
+            result = new GenericWorker("error");
+            result.error(e);
+        }
+
+        return new StreamHelper(result, outputType, "");
+    },
+
+    /**
+     * Prepare the content in the asked type.
+     * @param {String} type the type of the result.
+     * @param {Function} onUpdate a function to call on each internal update.
+     * @return Promise the promise of the result.
+     */
+    async: function (type, onUpdate) {
+        return this.internalStream(type).accumulate(onUpdate);
+    },
+
+    /**
+     * Prepare the content as a nodejs stream.
+     * @param {String} type the type of each chunk.
+     * @param {Function} onUpdate a function to call on each internal update.
+     * @return Stream the stream.
+     */
+    nodeStream: function (type, onUpdate) {
+        return this.internalStream(type || "nodebuffer").toNodejsStream(onUpdate);
+    },
+
+    /**
+     * Return a worker for the compressed content.
+     * @private
+     * @param {Object} compression the compression object to use.
+     * @param {Object} compressionOptions the options to use when compressing.
+     * @return Worker the worker.
+     */
+    _compressWorker: function (compression, compressionOptions) {
+        if (
+            this._data instanceof CompressedObject &&
+            this._data.compression.magic === compression.magic
+        ) {
+            return this._data.getCompressedWorker();
+        } else {
+            var result = this._decompressWorker();
+            if(!this._dataBinary) {
+                result = result.pipe(new utf8.Utf8EncodeWorker());
+            }
+            return CompressedObject.createWorkerFrom(result, compression, compressionOptions);
+        }
+    },
+    /**
+     * Return a worker for the decompressed content.
+     * @private
+     * @return Worker the worker.
+     */
+    _decompressWorker : function () {
+        if (this._data instanceof CompressedObject) {
+            return this._data.getContentWorker();
+        } else if (this._data instanceof GenericWorker) {
+            return this._data;
+        } else {
+            return new DataWorker(this._data);
+        }
+    }
+};
+
+var removedMethods = ["asText", "asBinary", "asNodeBuffer", "asUint8Array", "asArrayBuffer"];
+var removedFn = function () {
+    throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.");
+};
+
+for(var i = 0; i < removedMethods.length; i++) {
+    ZipObject.prototype[removedMethods[i]] = removedFn;
+}
+module.exports = ZipObject;
+
+},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(require,module,exports){
+require('../modules/web.immediate');
+module.exports = require('../modules/_core').setImmediate;
+},{"../modules/_core":40,"../modules/web.immediate":56}],37:[function(require,module,exports){
+module.exports = function(it){
+  if(typeof it != 'function')throw TypeError(it + ' is not a function!');
+  return it;
+};
+},{}],38:[function(require,module,exports){
+var isObject = require('./_is-object');
+module.exports = function(it){
+  if(!isObject(it))throw TypeError(it + ' is not an object!');
+  return it;
+};
+},{"./_is-object":51}],39:[function(require,module,exports){
+var toString = {}.toString;
+
+module.exports = function(it){
+  return toString.call(it).slice(8, -1);
+};
+},{}],40:[function(require,module,exports){
+var core = module.exports = {version: '2.3.0'};
+if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
+},{}],41:[function(require,module,exports){
+// optional / simple context binding
+var aFunction = require('./_a-function');
+module.exports = function(fn, that, length){
+  aFunction(fn);
+  if(that === undefined)return fn;
+  switch(length){
+    case 1: return function(a){
+      return fn.call(that, a);
+    };
+    case 2: return function(a, b){
+      return fn.call(that, a, b);
+    };
+    case 3: return function(a, b, c){
+      return fn.call(that, a, b, c);
+    };
+  }
+  return function(/* ...args */){
+    return fn.apply(that, arguments);
+  };
+};
+},{"./_a-function":37}],42:[function(require,module,exports){
+// Thank's IE8 for his funny defineProperty
+module.exports = !require('./_fails')(function(){
+  return Object.defineProperty({}, 'a', {get: function(){ return 7; }}).a != 7;
+});
+},{"./_fails":45}],43:[function(require,module,exports){
+var isObject = require('./_is-object')
+  , document = require('./_global').document
+  // in old IE typeof document.createElement is 'object'
+  , is = isObject(document) && isObject(document.createElement);
+module.exports = function(it){
+  return is ? document.createElement(it) : {};
+};
+},{"./_global":46,"./_is-object":51}],44:[function(require,module,exports){
+var global    = require('./_global')
+  , core      = require('./_core')
+  , ctx       = require('./_ctx')
+  , hide      = require('./_hide')
+  , PROTOTYPE = 'prototype';
+
+var $export = function(type, name, source){
+  var IS_FORCED = type & $export.F
+    , IS_GLOBAL = type & $export.G
+    , IS_STATIC = type & $export.S
+    , IS_PROTO  = type & $export.P
+    , IS_BIND   = type & $export.B
+    , IS_WRAP   = type & $export.W
+    , exports   = IS_GLOBAL ? core : core[name] || (core[name] = {})
+    , expProto  = exports[PROTOTYPE]
+    , target    = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE]
+    , key, own, out;
+  if(IS_GLOBAL)source = name;
+  for(key in source){
+    // contains in native
+    own = !IS_FORCED && target && target[key] !== undefined;
+    if(own && key in exports)continue;
+    // export native or passed
+    out = own ? target[key] : source[key];
+    // prevent global pollution for namespaces
+    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+    // bind timers to global for call from export context
+    : IS_BIND && own ? ctx(out, global)
+    // wrap global constructors for prevent change them in library
+    : IS_WRAP && target[key] == out ? (function(C){
+      var F = function(a, b, c){
+        if(this instanceof C){
+          switch(arguments.length){
+            case 0: return new C;
+            case 1: return new C(a);
+            case 2: return new C(a, b);
+          } return new C(a, b, c);
+        } return C.apply(this, arguments);
+      };
+      F[PROTOTYPE] = C[PROTOTYPE];
+      return F;
+    // make static versions for prototype methods
+    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
+    if(IS_PROTO){
+      (exports.virtual || (exports.virtual = {}))[key] = out;
+      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
+      if(type & $export.R && expProto && !expProto[key])hide(expProto, key, out);
+    }
+  }
+};
+// type bitmap
+$export.F = 1;   // forced
+$export.G = 2;   // global
+$export.S = 4;   // static
+$export.P = 8;   // proto
+$export.B = 16;  // bind
+$export.W = 32;  // wrap
+$export.U = 64;  // safe
+$export.R = 128; // real proto method for `library` 
+module.exports = $export;
+},{"./_core":40,"./_ctx":41,"./_global":46,"./_hide":47}],45:[function(require,module,exports){
+module.exports = function(exec){
+  try {
+    return !!exec();
+  } catch(e){
+    return true;
+  }
+};
+},{}],46:[function(require,module,exports){
+// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+var global = module.exports = typeof window != 'undefined' && window.Math == Math
+  ? window : typeof self != 'undefined' && self.Math == Math ? self : Function('return this')();
+if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef
+},{}],47:[function(require,module,exports){
+var dP         = require('./_object-dp')
+  , createDesc = require('./_property-desc');
+module.exports = require('./_descriptors') ? function(object, key, value){
+  return dP.f(object, key, createDesc(1, value));
+} : function(object, key, value){
+  object[key] = value;
+  return object;
+};
+},{"./_descriptors":42,"./_object-dp":52,"./_property-desc":53}],48:[function(require,module,exports){
+module.exports = require('./_global').document && document.documentElement;
+},{"./_global":46}],49:[function(require,module,exports){
+module.exports = !require('./_descriptors') && !require('./_fails')(function(){
+  return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
+});
+},{"./_descriptors":42,"./_dom-create":43,"./_fails":45}],50:[function(require,module,exports){
+// fast apply, http://jsperf.lnkit.com/fast-apply/5
+module.exports = function(fn, args, that){
+  var un = that === undefined;
+  switch(args.length){
+    case 0: return un ? fn()
+                      : fn.call(that);
+    case 1: return un ? fn(args[0])
+                      : fn.call(that, args[0]);
+    case 2: return un ? fn(args[0], args[1])
+                      : fn.call(that, args[0], args[1]);
+    case 3: return un ? fn(args[0], args[1], args[2])
+                      : fn.call(that, args[0], args[1], args[2]);
+    case 4: return un ? fn(args[0], args[1], args[2], args[3])
+                      : fn.call(that, args[0], args[1], args[2], args[3]);
+  } return              fn.apply(that, args);
+};
+},{}],51:[function(require,module,exports){
+module.exports = function(it){
+  return typeof it === 'object' ? it !== null : typeof it === 'function';
+};
+},{}],52:[function(require,module,exports){
+var anObject       = require('./_an-object')
+  , IE8_DOM_DEFINE = require('./_ie8-dom-define')
+  , toPrimitive    = require('./_to-primitive')
+  , dP             = Object.defineProperty;
+
+exports.f = require('./_descriptors') ? Object.defineProperty : function defineProperty(O, P, Attributes){
+  anObject(O);
+  P = toPrimitive(P, true);
+  anObject(Attributes);
+  if(IE8_DOM_DEFINE)try {
+    return dP(O, P, Attributes);
+  } catch(e){ /* empty */ }
+  if('get' in Attributes || 'set' in Attributes)throw TypeError('Accessors not supported!');
+  if('value' in Attributes)O[P] = Attributes.value;
+  return O;
+};
+},{"./_an-object":38,"./_descriptors":42,"./_ie8-dom-define":49,"./_to-primitive":55}],53:[function(require,module,exports){
+module.exports = function(bitmap, value){
+  return {
+    enumerable  : !(bitmap & 1),
+    configurable: !(bitmap & 2),
+    writable    : !(bitmap & 4),
+    value       : value
+  };
+};
+},{}],54:[function(require,module,exports){
+var ctx                = require('./_ctx')
+  , invoke             = require('./_invoke')
+  , html               = require('./_html')
+  , cel                = require('./_dom-create')
+  , global             = require('./_global')
+  , process            = global.process
+  , setTask            = global.setImmediate
+  , clearTask          = global.clearImmediate
+  , MessageChannel     = global.MessageChannel
+  , counter            = 0
+  , queue              = {}
+  , ONREADYSTATECHANGE = 'onreadystatechange'
+  , defer, channel, port;
+var run = function(){
+  var id = +this;
+  if(queue.hasOwnProperty(id)){
+    var fn = queue[id];
+    delete queue[id];
+    fn();
+  }
+};
+var listener = function(event){
+  run.call(event.data);
+};
+// Node.js 0.9+ & IE10+ has setImmediate, otherwise:
+if(!setTask || !clearTask){
+  setTask = function setImmediate(fn){
+    var args = [], i = 1;
+    while(arguments.length > i)args.push(arguments[i++]);
+    queue[++counter] = function(){
+      invoke(typeof fn == 'function' ? fn : Function(fn), args);
+    };
+    defer(counter);
+    return counter;
+  };
+  clearTask = function clearImmediate(id){
+    delete queue[id];
+  };
+  // Node.js 0.8-
+  if(require('./_cof')(process) == 'process'){
+    defer = function(id){
+      process.nextTick(ctx(run, id, 1));
+    };
+  // Browsers with MessageChannel, includes WebWorkers
+  } else if(MessageChannel){
+    channel = new MessageChannel;
+    port    = channel.port2;
+    channel.port1.onmessage = listener;
+    defer = ctx(port.postMessage, port, 1);
+  // Browsers with postMessage, skip WebWorkers
+  // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
+  } else if(global.addEventListener && typeof postMessage == 'function' && !global.importScripts){
+    defer = function(id){
+      global.postMessage(id + '', '*');
+    };
+    global.addEventListener('message', listener, false);
+  // IE8-
+  } else if(ONREADYSTATECHANGE in cel('script')){
+    defer = function(id){
+      html.appendChild(cel('script'))[ONREADYSTATECHANGE] = function(){
+        html.removeChild(this);
+        run.call(id);
+      };
+    };
+  // Rest old browsers
+  } else {
+    defer = function(id){
+      setTimeout(ctx(run, id, 1), 0);
+    };
+  }
+}
+module.exports = {
+  set:   setTask,
+  clear: clearTask
+};
+},{"./_cof":39,"./_ctx":41,"./_dom-create":43,"./_global":46,"./_html":48,"./_invoke":50}],55:[function(require,module,exports){
+// 7.1.1 ToPrimitive(input [, PreferredType])
+var isObject = require('./_is-object');
+// instead of the ES6 spec version, we didn't implement @@toPrimitive case
+// and the second argument - flag - preferred type is a string
+module.exports = function(it, S){
+  if(!isObject(it))return it;
+  var fn, val;
+  if(S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it)))return val;
+  if(typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it)))return val;
+  if(!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it)))return val;
+  throw TypeError("Can't convert object to primitive value");
+};
+},{"./_is-object":51}],56:[function(require,module,exports){
+var $export = require('./_export')
+  , $task   = require('./_task');
+$export($export.G + $export.B, {
+  setImmediate:   $task.set,
+  clearImmediate: $task.clear
+});
+},{"./_export":44,"./_task":54}],57:[function(require,module,exports){
+(function (global){
+'use strict';
+var Mutation = global.MutationObserver || global.WebKitMutationObserver;
+
+var scheduleDrain;
+
+{
+  if (Mutation) {
+    var called = 0;
+    var observer = new Mutation(nextTick);
+    var element = global.document.createTextNode('');
+    observer.observe(element, {
+      characterData: true
+    });
+    scheduleDrain = function () {
+      element.data = (called = ++called % 2);
+    };
+  } else if (!global.setImmediate && typeof global.MessageChannel !== 'undefined') {
+    var channel = new global.MessageChannel();
+    channel.port1.onmessage = nextTick;
+    scheduleDrain = function () {
+      channel.port2.postMessage(0);
+    };
+  } else if ('document' in global && 'onreadystatechange' in global.document.createElement('script')) {
+    scheduleDrain = function () {
+
+      // Create a <script> element; its readystatechange event will be fired asynchronously once it is inserted
+      // into the document. Do so, thus queuing up the task. Remember to clean up once it's been called.
+      var scriptEl = global.document.createElement('script');
+      scriptEl.onreadystatechange = function () {
+        nextTick();
+
+        scriptEl.onreadystatechange = null;
+        scriptEl.parentNode.removeChild(scriptEl);
+        scriptEl = null;
+      };
+      global.document.documentElement.appendChild(scriptEl);
+    };
+  } else {
+    scheduleDrain = function () {
+      setTimeout(nextTick, 0);
+    };
+  }
+}
+
+var draining;
+var queue = [];
+//named nextTick for less confusing stack traces
+function nextTick() {
+  draining = true;
+  var i, oldQueue;
+  var len = queue.length;
+  while (len) {
+    oldQueue = queue;
+    queue = [];
+    i = -1;
+    while (++i < len) {
+      oldQueue[i]();
+    }
+    len = queue.length;
+  }
+  draining = false;
+}
+
+module.exports = immediate;
+function immediate(task) {
+  if (queue.push(task) === 1 && !draining) {
+    scheduleDrain();
+  }
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],58:[function(require,module,exports){
+'use strict';
+var immediate = require('immediate');
+
+/* istanbul ignore next */
+function INTERNAL() {}
+
+var handlers = {};
+
+var REJECTED = ['REJECTED'];
+var FULFILLED = ['FULFILLED'];
+var PENDING = ['PENDING'];
+
+module.exports = Promise;
+
+function Promise(resolver) {
+  if (typeof resolver !== 'function') {
+    throw new TypeError('resolver must be a function');
+  }
+  this.state = PENDING;
+  this.queue = [];
+  this.outcome = void 0;
+  if (resolver !== INTERNAL) {
+    safelyResolveThenable(this, resolver);
+  }
+}
+
+Promise.prototype["catch"] = function (onRejected) {
+  return this.then(null, onRejected);
+};
+Promise.prototype.then = function (onFulfilled, onRejected) {
+  if (typeof onFulfilled !== 'function' && this.state === FULFILLED ||
+    typeof onRejected !== 'function' && this.state === REJECTED) {
+    return this;
+  }
+  var promise = new this.constructor(INTERNAL);
+  if (this.state !== PENDING) {
+    var resolver = this.state === FULFILLED ? onFulfilled : onRejected;
+    unwrap(promise, resolver, this.outcome);
+  } else {
+    this.queue.push(new QueueItem(promise, onFulfilled, onRejected));
+  }
+
+  return promise;
+};
+function QueueItem(promise, onFulfilled, onRejected) {
+  this.promise = promise;
+  if (typeof onFulfilled === 'function') {
+    this.onFulfilled = onFulfilled;
+    this.callFulfilled = this.otherCallFulfilled;
+  }
+  if (typeof onRejected === 'function') {
+    this.onRejected = onRejected;
+    this.callRejected = this.otherCallRejected;
+  }
+}
+QueueItem.prototype.callFulfilled = function (value) {
+  handlers.resolve(this.promise, value);
+};
+QueueItem.prototype.otherCallFulfilled = function (value) {
+  unwrap(this.promise, this.onFulfilled, value);
+};
+QueueItem.prototype.callRejected = function (value) {
+  handlers.reject(this.promise, value);
+};
+QueueItem.prototype.otherCallRejected = function (value) {
+  unwrap(this.promise, this.onRejected, value);
+};
+
+function unwrap(promise, func, value) {
+  immediate(function () {
+    var returnValue;
+    try {
+      returnValue = func(value);
+    } catch (e) {
+      return handlers.reject(promise, e);
+    }
+    if (returnValue === promise) {
+      handlers.reject(promise, new TypeError('Cannot resolve promise with itself'));
+    } else {
+      handlers.resolve(promise, returnValue);
+    }
+  });
+}
+
+handlers.resolve = function (self, value) {
+  var result = tryCatch(getThen, value);
+  if (result.status === 'error') {
+    return handlers.reject(self, result.value);
+  }
+  var thenable = result.value;
+
+  if (thenable) {
+    safelyResolveThenable(self, thenable);
+  } else {
+    self.state = FULFILLED;
+    self.outcome = value;
+    var i = -1;
+    var len = self.queue.length;
+    while (++i < len) {
+      self.queue[i].callFulfilled(value);
+    }
+  }
+  return self;
+};
+handlers.reject = function (self, error) {
+  self.state = REJECTED;
+  self.outcome = error;
+  var i = -1;
+  var len = self.queue.length;
+  while (++i < len) {
+    self.queue[i].callRejected(error);
+  }
+  return self;
+};
+
+function getThen(obj) {
+  // Make sure we only access the accessor once as required by the spec
+  var then = obj && obj.then;
+  if (obj && (typeof obj === 'object' || typeof obj === 'function') && typeof then === 'function') {
+    return function appyThen() {
+      then.apply(obj, arguments);
+    };
+  }
+}
+
+function safelyResolveThenable(self, thenable) {
+  // Either fulfill, reject or reject with error
+  var called = false;
+  function onError(value) {
+    if (called) {
+      return;
+    }
+    called = true;
+    handlers.reject(self, value);
+  }
+
+  function onSuccess(value) {
+    if (called) {
+      return;
+    }
+    called = true;
+    handlers.resolve(self, value);
+  }
+
+  function tryToUnwrap() {
+    thenable(onSuccess, onError);
+  }
+
+  var result = tryCatch(tryToUnwrap);
+  if (result.status === 'error') {
+    onError(result.value);
+  }
+}
+
+function tryCatch(func, value) {
+  var out = {};
+  try {
+    out.value = func(value);
+    out.status = 'success';
+  } catch (e) {
+    out.status = 'error';
+    out.value = e;
+  }
+  return out;
+}
+
+Promise.resolve = resolve;
+function resolve(value) {
+  if (value instanceof this) {
+    return value;
+  }
+  return handlers.resolve(new this(INTERNAL), value);
+}
+
+Promise.reject = reject;
+function reject(reason) {
+  var promise = new this(INTERNAL);
+  return handlers.reject(promise, reason);
+}
+
+Promise.all = all;
+function all(iterable) {
+  var self = this;
+  if (Object.prototype.toString.call(iterable) !== '[object Array]') {
+    return this.reject(new TypeError('must be an array'));
+  }
+
+  var len = iterable.length;
+  var called = false;
+  if (!len) {
+    return this.resolve([]);
+  }
+
+  var values = new Array(len);
+  var resolved = 0;
+  var i = -1;
+  var promise = new this(INTERNAL);
+
+  while (++i < len) {
+    allResolver(iterable[i], i);
+  }
+  return promise;
+  function allResolver(value, i) {
+    self.resolve(value).then(resolveFromAll, function (error) {
+      if (!called) {
+        called = true;
+        handlers.reject(promise, error);
+      }
+    });
+    function resolveFromAll(outValue) {
+      values[i] = outValue;
+      if (++resolved === len && !called) {
+        called = true;
+        handlers.resolve(promise, values);
+      }
+    }
+  }
+}
+
+Promise.race = race;
+function race(iterable) {
+  var self = this;
+  if (Object.prototype.toString.call(iterable) !== '[object Array]') {
+    return this.reject(new TypeError('must be an array'));
+  }
+
+  var len = iterable.length;
+  var called = false;
+  if (!len) {
+    return this.resolve([]);
+  }
+
+  var i = -1;
+  var promise = new this(INTERNAL);
+
+  while (++i < len) {
+    resolver(iterable[i]);
+  }
+  return promise;
+  function resolver(value) {
+    self.resolve(value).then(function (response) {
+      if (!called) {
+        called = true;
+        handlers.resolve(promise, response);
+      }
+    }, function (error) {
+      if (!called) {
+        called = true;
+        handlers.reject(promise, error);
+      }
+    });
+  }
+}
+
+},{"immediate":57}],59:[function(require,module,exports){
 // Top level file is just a mixin of submodules & constants
 'use strict';
 
-var assign    = _dereq_('./lib/utils/common').assign;
+var assign    = require('./lib/utils/common').assign;
 
-var deflate   = _dereq_('./lib/deflate');
-var inflate   = _dereq_('./lib/inflate');
-var constants = _dereq_('./lib/zlib/constants');
+var deflate   = require('./lib/deflate');
+var inflate   = require('./lib/inflate');
+var constants = require('./lib/zlib/constants');
 
 var pako = {};
 
 assign(pako, deflate, inflate, constants);
 
 module.exports = pako;
-},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(_dereq_,module,exports){
+
+},{"./lib/deflate":60,"./lib/inflate":61,"./lib/utils/common":62,"./lib/zlib/constants":65}],60:[function(require,module,exports){
 'use strict';
 
 
-var zlib_deflate = _dereq_('./zlib/deflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
+var zlib_deflate = require('./zlib/deflate');
+var utils        = require('./utils/common');
+var strings      = require('./utils/strings');
+var msg          = require('./zlib/messages');
+var ZStream      = require('./zlib/zstream');
 
+var toString = Object.prototype.toString;
 
 /* Public constants ==========================================================*/
 /* ===========================================================================*/
@@ -2819,6 +4851,7 @@ var Z_FINISH        = 4;
 
 var Z_OK            = 0;
 var Z_STREAM_END    = 1;
+var Z_SYNC_FLUSH    = 2;
 
 var Z_DEFAULT_COMPRESSION = -1;
 
@@ -2848,7 +4881,9 @@ var Z_DEFLATED  = 8;
  *
  * Compressed result, generated by default [[Deflate#onData]]
  * and [[Deflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Deflate#push]] with `Z_FINISH` / `true` param).
+ * (call [[Deflate#push]] with `Z_FINISH` / `true` param)  or if you
+ * push a chunk with explicit flush (call [[Deflate#push]] with
+ * `Z_SYNC_FLUSH` param).
  **/
 
 /**
@@ -2878,6 +4913,7 @@ var Z_DEFLATED  = 8;
  * - `windowBits`
  * - `memLevel`
  * - `strategy`
+ * - `dictionary`
  *
  * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
  * for more information on these.
@@ -2915,7 +4951,8 @@ var Z_DEFLATED  = 8;
  * console.log(deflate.result);
  * ```
  **/
-var Deflate = function(options) {
+function Deflate(options) {
+  if (!(this instanceof Deflate)) return new Deflate(options);
 
   this.options = utils.assign({
     level: Z_DEFAULT_COMPRESSION,
@@ -2942,7 +4979,7 @@ var Deflate = function(options) {
   this.ended  = false;  // used to avoid multiple onEnd() calls
   this.chunks = [];     // chunks of compressed data
 
-  this.strm = new zstream();
+  this.strm = new ZStream();
   this.strm.avail_out = 0;
 
   var status = zlib_deflate.deflateInit2(
@@ -2961,19 +4998,41 @@ var Deflate = function(options) {
   if (opt.header) {
     zlib_deflate.deflateSetHeader(this.strm, opt.header);
   }
-};
+
+  if (opt.dictionary) {
+    var dict;
+    // Convert data if needed
+    if (typeof opt.dictionary === 'string') {
+      // If we need to compress text, change encoding to utf8.
+      dict = strings.string2buf(opt.dictionary);
+    } else if (toString.call(opt.dictionary) === '[object ArrayBuffer]') {
+      dict = new Uint8Array(opt.dictionary);
+    } else {
+      dict = opt.dictionary;
+    }
+
+    status = zlib_deflate.deflateSetDictionary(this.strm, dict);
+
+    if (status !== Z_OK) {
+      throw new Error(msg[status]);
+    }
+
+    this._dict_set = true;
+  }
+}
 
 /**
  * Deflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data. Strings will be converted to
- *   utf8 byte sequence.
+ * - data (Uint8Array|Array|ArrayBuffer|String): input data. Strings will be
+ *   converted to utf8 byte sequence.
  * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
  *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
  *
  * Sends input data to deflate pipe, generating [[Deflate#onData]] calls with
  * new compressed chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Deflate#onEnd]].
+ * mode Z_FINISH (or `true`). That will flush internal pending buffers and call
+ * [[Deflate#onEnd]]. For interim explicit flushes (without ending the stream) you
+ * can use mode Z_SYNC_FLUSH, keeping the compression context.
  *
  * On fail call [[Deflate#onEnd]] with error code and return false.
  *
@@ -2991,7 +5050,7 @@ var Deflate = function(options) {
  * push(chunk, true);  // push last chunk
  * ```
  **/
-Deflate.prototype.push = function(data, mode) {
+Deflate.prototype.push = function (data, mode) {
   var strm = this.strm;
   var chunkSize = this.options.chunkSize;
   var status, _mode;
@@ -3004,6 +5063,8 @@ Deflate.prototype.push = function(data, mode) {
   if (typeof data === 'string') {
     // If we need to compress text, change encoding to utf8.
     strm.input = strings.string2buf(data);
+  } else if (toString.call(data) === '[object ArrayBuffer]') {
+    strm.input = new Uint8Array(data);
   } else {
     strm.input = data;
   }
@@ -3024,7 +5085,7 @@ Deflate.prototype.push = function(data, mode) {
       this.ended = true;
       return false;
     }
-    if (strm.avail_out === 0 || (strm.avail_in === 0 && _mode === Z_FINISH)) {
+    if (strm.avail_out === 0 || (strm.avail_in === 0 && (_mode === Z_FINISH || _mode === Z_SYNC_FLUSH))) {
       if (this.options.to === 'string') {
         this.onData(strings.buf2binstring(utils.shrinkBuf(strm.output, strm.next_out)));
       } else {
@@ -3041,6 +5102,13 @@ Deflate.prototype.push = function(data, mode) {
     return status === Z_OK;
   }
 
+  // callback interim results if Z_SYNC_FLUSH.
+  if (_mode === Z_SYNC_FLUSH) {
+    this.onEnd(Z_OK);
+    strm.avail_out = 0;
+    return true;
+  }
+
   return true;
 };
 
@@ -3054,7 +5122,7 @@ Deflate.prototype.push = function(data, mode) {
  * By default, stores data blocks in `chunks[]` property and glue
  * those in `onEnd`. Override this handler, if you need another behaviour.
  **/
-Deflate.prototype.onData = function(chunk) {
+Deflate.prototype.onData = function (chunk) {
   this.chunks.push(chunk);
 };
 
@@ -3064,11 +5132,12 @@ Deflate.prototype.onData = function(chunk) {
  * - status (Number): deflate status. 0 (Z_OK) on success,
  *   other if not.
  *
- * Called once after you tell deflate that input stream complete
- * or error happenned. By default - join collected chunks,
+ * Called once after you tell deflate that the input stream is
+ * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
+ * or if an error happened. By default - join collected chunks,
  * free memory and fill `results` / `err` properties.
  **/
-Deflate.prototype.onEnd = function(status) {
+Deflate.prototype.onEnd = function (status) {
   // On success - join
   if (status === Z_OK) {
     if (this.options.to === 'string') {
@@ -3088,7 +5157,7 @@ Deflate.prototype.onEnd = function(status) {
  * - data (Uint8Array|Array|String): input data to compress.
  * - options (Object): zlib deflate options.
  *
- * Compress `data` with deflate alrorythm and `options`.
+ * Compress `data` with deflate algorithm and `options`.
  *
  * Supported options are:
  *
@@ -3096,6 +5165,7 @@ Deflate.prototype.onEnd = function(status) {
  * - windowBits
  * - memLevel
  * - strategy
+ * - dictionary
  *
  * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
  * for more information on these.
@@ -3122,7 +5192,7 @@ function deflate(input, options) {
   deflator.push(input, true);
 
   // That will never happens, if you don't cheat with options :)
-  if (deflator.err) { throw deflator.msg; }
+  if (deflator.err) { throw deflator.msg || msg[deflator.err]; }
 
   return deflator.result;
 }
@@ -3162,18 +5232,20 @@ exports.Deflate = Deflate;
 exports.deflate = deflate;
 exports.deflateRaw = deflateRaw;
 exports.gzip = gzip;
-},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(_dereq_,module,exports){
+
+},{"./utils/common":62,"./utils/strings":63,"./zlib/deflate":67,"./zlib/messages":72,"./zlib/zstream":74}],61:[function(require,module,exports){
 'use strict';
 
 
-var zlib_inflate = _dereq_('./zlib/inflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var c = _dereq_('./zlib/constants');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-var gzheader = _dereq_('./zlib/gzheader');
+var zlib_inflate = require('./zlib/inflate');
+var utils        = require('./utils/common');
+var strings      = require('./utils/strings');
+var c            = require('./zlib/constants');
+var msg          = require('./zlib/messages');
+var ZStream      = require('./zlib/zstream');
+var GZheader     = require('./zlib/gzheader');
 
+var toString = Object.prototype.toString;
 
 /**
  * class Inflate
@@ -3194,7 +5266,9 @@ var gzheader = _dereq_('./zlib/gzheader');
  *
  * Uncompressed result, generated by default [[Inflate#onData]]
  * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Inflate#push]] with `Z_FINISH` / `true` param).
+ * (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you
+ * push a chunk with explicit flush (call [[Inflate#push]] with
+ * `Z_SYNC_FLUSH` param).
  **/
 
 /**
@@ -3219,6 +5293,7 @@ var gzheader = _dereq_('./zlib/gzheader');
  * on bad params. Supported options:
  *
  * - `windowBits`
+ * - `dictionary`
  *
  * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
  * for more information on these.
@@ -3251,7 +5326,8 @@ var gzheader = _dereq_('./zlib/gzheader');
  * console.log(inflate.result);
  * ```
  **/
-var Inflate = function(options) {
+function Inflate(options) {
+  if (!(this instanceof Inflate)) return new Inflate(options);
 
   this.options = utils.assign({
     chunkSize: 16384,
@@ -3289,7 +5365,7 @@ var Inflate = function(options) {
   this.ended  = false;  // used to avoid multiple onEnd() calls
   this.chunks = [];     // chunks of compressed data
 
-  this.strm   = new zstream();
+  this.strm   = new ZStream();
   this.strm.avail_out = 0;
 
   var status  = zlib_inflate.inflateInit2(
@@ -3301,21 +5377,22 @@ var Inflate = function(options) {
     throw new Error(msg[status]);
   }
 
-  this.header = new gzheader();
+  this.header = new GZheader();
 
   zlib_inflate.inflateGetHeader(this.strm, this.header);
-};
+}
 
 /**
  * Inflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data
+ * - data (Uint8Array|Array|ArrayBuffer|String): input data
  * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
  *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
  *
  * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
  * new output chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Inflate#onEnd]].
+ * mode Z_FINISH (or `true`). That will flush internal pending buffers and call
+ * [[Inflate#onEnd]]. For interim explicit flushes (without ending the stream) you
+ * can use mode Z_SYNC_FLUSH, keeping the decompression context.
  *
  * On fail call [[Inflate#onEnd]] with error code and return false.
  *
@@ -3333,11 +5410,17 @@ var Inflate = function(options) {
  * push(chunk, true);  // push last chunk
  * ```
  **/
-Inflate.prototype.push = function(data, mode) {
+Inflate.prototype.push = function (data, mode) {
   var strm = this.strm;
   var chunkSize = this.options.chunkSize;
+  var dictionary = this.options.dictionary;
   var status, _mode;
   var next_out_utf8, tail, utf8str;
+  var dict;
+
+  // Flag to properly process Z_BUF_ERROR on testing inflate call
+  // when we check that all output data was flushed.
+  var allowBufError = false;
 
   if (this.ended) { return false; }
   _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH);
@@ -3346,6 +5429,8 @@ Inflate.prototype.push = function(data, mode) {
   if (typeof data === 'string') {
     // Only binary strings can be decompressed on practice
     strm.input = strings.binstring2buf(data);
+  } else if (toString.call(data) === '[object ArrayBuffer]') {
+    strm.input = new Uint8Array(data);
   } else {
     strm.input = data;
   }
@@ -3362,6 +5447,25 @@ Inflate.prototype.push = function(data, mode) {
 
     status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH);    /* no bad return value */
 
+    if (status === c.Z_NEED_DICT && dictionary) {
+      // Convert data if needed
+      if (typeof dictionary === 'string') {
+        dict = strings.string2buf(dictionary);
+      } else if (toString.call(dictionary) === '[object ArrayBuffer]') {
+        dict = new Uint8Array(dictionary);
+      } else {
+        dict = dictionary;
+      }
+
+      status = zlib_inflate.inflateSetDictionary(this.strm, dict);
+
+    }
+
+    if (status === c.Z_BUF_ERROR && allowBufError === true) {
+      status = c.Z_OK;
+      allowBufError = false;
+    }
+
     if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
       this.onEnd(status);
       this.ended = true;
@@ -3369,7 +5473,7 @@ Inflate.prototype.push = function(data, mode) {
     }
 
     if (strm.next_out) {
-      if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) {
+      if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && (_mode === c.Z_FINISH || _mode === c.Z_SYNC_FLUSH))) {
 
         if (this.options.to === 'string') {
 
@@ -3390,11 +5494,24 @@ Inflate.prototype.push = function(data, mode) {
         }
       }
     }
-  } while ((strm.avail_in > 0) && status !== c.Z_STREAM_END);
+
+    // When no more input data, we should check that internal inflate buffers
+    // are flushed. The only way to do it when avail_out = 0 - run one more
+    // inflate pass. But if output data not exists, inflate return Z_BUF_ERROR.
+    // Here we set flag to process this error properly.
+    //
+    // NOTE. Deflate does not return error in this case and does not needs such
+    // logic.
+    if (strm.avail_in === 0 && strm.avail_out === 0) {
+      allowBufError = true;
+    }
+
+  } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END);
 
   if (status === c.Z_STREAM_END) {
     _mode = c.Z_FINISH;
   }
+
   // Finalize on the last chunk.
   if (_mode === c.Z_FINISH) {
     status = zlib_inflate.inflateEnd(this.strm);
@@ -3403,6 +5520,13 @@ Inflate.prototype.push = function(data, mode) {
     return status === c.Z_OK;
   }
 
+  // callback interim results if Z_SYNC_FLUSH.
+  if (_mode === c.Z_SYNC_FLUSH) {
+    this.onEnd(c.Z_OK);
+    strm.avail_out = 0;
+    return true;
+  }
+
   return true;
 };
 
@@ -3416,7 +5540,7 @@ Inflate.prototype.push = function(data, mode) {
  * By default, stores data blocks in `chunks[]` property and glue
  * those in `onEnd`. Override this handler, if you need another behaviour.
  **/
-Inflate.prototype.onData = function(chunk) {
+Inflate.prototype.onData = function (chunk) {
   this.chunks.push(chunk);
 };
 
@@ -3426,11 +5550,12 @@ Inflate.prototype.onData = function(chunk) {
  * - status (Number): inflate status. 0 (Z_OK) on success,
  *   other if not.
  *
- * Called once after you tell inflate that input stream complete
- * or error happenned. By default - join collected chunks,
+ * Called either after you tell inflate that the input stream is
+ * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
+ * or if an error happened. By default - join collected chunks,
  * free memory and fill `results` / `err` properties.
  **/
-Inflate.prototype.onEnd = function(status) {
+Inflate.prototype.onEnd = function (status) {
   // On success - join
   if (status === c.Z_OK) {
     if (this.options.to === 'string') {
@@ -3492,7 +5617,7 @@ function inflate(input, options) {
   inflator.push(input, true);
 
   // That will never happens, if you don't cheat with options :)
-  if (inflator.err) { throw inflator.msg; }
+  if (inflator.err) { throw inflator.msg || msg[inflator.err]; }
 
   return inflator.result;
 }
@@ -3528,7 +5653,7 @@ exports.inflate = inflate;
 exports.inflateRaw = inflateRaw;
 exports.ungzip  = inflate;
 
-},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(_dereq_,module,exports){
+},{"./utils/common":62,"./utils/strings":63,"./zlib/constants":65,"./zlib/gzheader":68,"./zlib/inflate":70,"./zlib/messages":72,"./zlib/zstream":74}],62:[function(require,module,exports){
 'use strict';
 
 
@@ -3543,7 +5668,7 @@ exports.assign = function (obj /*from1, from2, from3, ...*/) {
     var source = sources.shift();
     if (!source) { continue; }
 
-    if (typeof(source) !== 'object') {
+    if (typeof source !== 'object') {
       throw new TypeError(source + 'must be non-object');
     }
 
@@ -3570,28 +5695,28 @@ exports.shrinkBuf = function (buf, size) {
 var fnTyped = {
   arraySet: function (dest, src, src_offs, len, dest_offs) {
     if (src.subarray && dest.subarray) {
-      dest.set(src.subarray(src_offs, src_offs+len), dest_offs);
+      dest.set(src.subarray(src_offs, src_offs + len), dest_offs);
       return;
     }
     // Fallback to ordinary array
-    for(var i=0; i<len; i++) {
+    for (var i = 0; i < len; i++) {
       dest[dest_offs + i] = src[src_offs + i];
     }
   },
   // Join array of chunks to single array.
-  flattenChunks: function(chunks) {
+  flattenChunks: function (chunks) {
     var i, l, len, pos, chunk, result;
 
     // calculate data length
     len = 0;
-    for (i=0, l=chunks.length; i<l; i++) {
+    for (i = 0, l = chunks.length; i < l; i++) {
       len += chunks[i].length;
     }
 
     // join chunks
     result = new Uint8Array(len);
     pos = 0;
-    for (i=0, l=chunks.length; i<l; i++) {
+    for (i = 0, l = chunks.length; i < l; i++) {
       chunk = chunks[i];
       result.set(chunk, pos);
       pos += chunk.length;
@@ -3603,12 +5728,12 @@ var fnTyped = {
 
 var fnUntyped = {
   arraySet: function (dest, src, src_offs, len, dest_offs) {
-    for(var i=0; i<len; i++) {
+    for (var i = 0; i < len; i++) {
       dest[dest_offs + i] = src[src_offs + i];
     }
   },
   // Join array of chunks to single array.
-  flattenChunks: function(chunks) {
+  flattenChunks: function (chunks) {
     return [].concat.apply([], chunks);
   }
 };
@@ -3631,12 +5756,13 @@ exports.setTyped = function (on) {
 };
 
 exports.setTyped(TYPED_OK);
-},{}],28:[function(_dereq_,module,exports){
+
+},{}],63:[function(require,module,exports){
 // String encode/decode helpers
 'use strict';
 
 
-var utils = _dereq_('./common');
+var utils = require('./common');
 
 
 // Quick check if we can use fast array to bin string conversion
@@ -3647,18 +5773,18 @@ var utils = _dereq_('./common');
 var STR_APPLY_OK = true;
 var STR_APPLY_UIA_OK = true;
 
-try { String.fromCharCode.apply(null, [0]); } catch(__) { STR_APPLY_OK = false; }
-try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch(__) { STR_APPLY_UIA_OK = false; }
+try { String.fromCharCode.apply(null, [ 0 ]); } catch (__) { STR_APPLY_OK = false; }
+try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch (__) { STR_APPLY_UIA_OK = false; }
 
 
 // Table with utf8 lengths (calculated by first byte of sequence)
 // Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
 // because max possible codepoint is 0x10ffff
 var _utf8len = new utils.Buf8(256);
-for (var i=0; i<256; i++) {
-  _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
+for (var q = 0; q < 256; q++) {
+  _utf8len[q] = (q >= 252 ? 6 : q >= 248 ? 5 : q >= 240 ? 4 : q >= 224 ? 3 : q >= 192 ? 2 : 1);
 }
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
+_utf8len[254] = _utf8len[254] = 1; // Invalid sequence start
 
 
 // convert string to array (typed, when possible)
@@ -3668,8 +5794,8 @@ exports.string2buf = function (str) {
   // count binary size
   for (m_pos = 0; m_pos < str_len; m_pos++) {
     c = str.charCodeAt(m_pos);
-    if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-      c2 = str.charCodeAt(m_pos+1);
+    if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) {
+      c2 = str.charCodeAt(m_pos + 1);
       if ((c2 & 0xfc00) === 0xdc00) {
         c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
         m_pos++;
@@ -3682,10 +5808,10 @@ exports.string2buf = function (str) {
   buf = new utils.Buf8(buf_len);
 
   // convert
-  for (i=0, m_pos = 0; i < buf_len; m_pos++) {
+  for (i = 0, m_pos = 0; i < buf_len; m_pos++) {
     c = str.charCodeAt(m_pos);
-    if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-      c2 = str.charCodeAt(m_pos+1);
+    if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) {
+      c2 = str.charCodeAt(m_pos + 1);
       if ((c2 & 0xfc00) === 0xdc00) {
         c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
         m_pos++;
@@ -3725,7 +5851,7 @@ function buf2binstring(buf, len) {
   }
 
   var result = '';
-  for(var i=0; i < len; i++) {
+  for (var i = 0; i < len; i++) {
     result += String.fromCharCode(buf[i]);
   }
   return result;
@@ -3733,15 +5859,15 @@ function buf2binstring(buf, len) {
 
 
 // Convert byte array to binary string
-exports.buf2binstring = function(buf) {
+exports.buf2binstring = function (buf) {
   return buf2binstring(buf, buf.length);
 };
 
 
 // Convert binary string (typed, when possible)
-exports.binstring2buf = function(str) {
+exports.binstring2buf = function (str) {
   var buf = new utils.Buf8(str.length);
-  for(var i=0, len=buf.length; i < len; i++) {
+  for (var i = 0, len = buf.length; i < len; i++) {
     buf[i] = str.charCodeAt(i);
   }
   return buf;
@@ -3756,16 +5882,16 @@ exports.buf2string = function (buf, max) {
   // Reserve max possible length (2 words per char)
   // NB: by unknown reasons, Array is significantly faster for
   //     String.fromCharCode.apply than Uint16Array.
-  var utf16buf = new Array(len*2);
+  var utf16buf = new Array(len * 2);
 
-  for (out=0, i=0; i<len;) {
+  for (out = 0, i = 0; i < len;) {
     c = buf[i++];
     // quick process ascii
     if (c < 0x80) { utf16buf[out++] = c; continue; }
 
     c_len = _utf8len[c];
     // skip 5 & 6 byte codes
-    if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
+    if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len - 1; continue; }
 
     // apply mask on first byte
     c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
@@ -3797,14 +5923,14 @@ exports.buf2string = function (buf, max) {
 //
 // buf[] - utf8 bytes array
 // max   - length limit (mandatory);
-exports.utf8border = function(buf, max) {
+exports.utf8border = function (buf, max) {
   var pos;
 
   max = max || buf.length;
   if (max > buf.length) { max = buf.length; }
 
   // go back from last position, until start of sequence found
-  pos = max-1;
+  pos = max - 1;
   while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
 
   // Fuckup - very small and broken sequence,
@@ -3818,17 +5944,36 @@ exports.utf8border = function(buf, max) {
   return (pos + _utf8len[buf[pos]] > max) ? pos : max;
 };
 
-},{"./common":27}],29:[function(_dereq_,module,exports){
+},{"./common":62}],64:[function(require,module,exports){
 'use strict';
 
 // Note: adler32 takes 12% for level 0 and 2% for level 6.
 // It doesn't worth to make additional optimizationa as in original.
 // Small size is preferable.
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
 function adler32(adler, buf, len, pos) {
-  var s1 = (adler & 0xffff) |0
-    , s2 = ((adler >>> 16) & 0xffff) |0
-    , n = 0;
+  var s1 = (adler & 0xffff) |0,
+      s2 = ((adler >>> 16) & 0xffff) |0,
+      n = 0;
 
   while (len !== 0) {
     // Set limit ~ twice less than 5552, to keep
@@ -3851,7 +5996,29 @@ function adler32(adler, buf, len, pos) {
 
 
 module.exports = adler32;
-},{}],30:[function(_dereq_,module,exports){
+
+},{}],65:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
 module.exports = {
 
   /* Allowed flush values; see deflate() and inflate() below for details */
@@ -3899,22 +6066,41 @@ module.exports = {
   Z_DEFLATED:               8
   //Z_NULL:                 null // Use -1 or null inline, depending on var type
 };
-},{}],31:[function(_dereq_,module,exports){
+
+},{}],66:[function(require,module,exports){
 'use strict';
 
 // Note: we can't get significant speed boost here.
 // So write code to minimize size - no pregenerated tables
 // and array tools dependencies.
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 
 // Use ordinary array, since untyped makes no boost here
 function makeTable() {
   var c, table = [];
 
-  for(var n =0; n < 256; n++){
+  for (var n = 0; n < 256; n++) {
     c = n;
-    for(var k =0; k < 8; k++){
-      c = ((c&1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
+    for (var k = 0; k < 8; k++) {
+      c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
     }
     table[n] = c;
   }
@@ -3927,12 +6113,12 @@ var crcTable = makeTable();
 
 
 function crc32(crc, buf, len, pos) {
-  var t = crcTable
-    , end = pos + len;
+  var t = crcTable,
+      end = pos + len;
 
-  crc = crc ^ (-1);
+  crc ^= -1;
 
-  for (var i = pos; i < end; i++ ) {
+  for (var i = pos; i < end; i++) {
     crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
   }
 
@@ -3941,14 +6127,34 @@ function crc32(crc, buf, len, pos) {
 
 
 module.exports = crc32;
-},{}],32:[function(_dereq_,module,exports){
+
+},{}],67:[function(require,module,exports){
 'use strict';
 
-var utils   = _dereq_('../utils/common');
-var trees   = _dereq_('./trees');
-var adler32 = _dereq_('./adler32');
-var crc32   = _dereq_('./crc32');
-var msg   = _dereq_('./messages');
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+var utils   = require('../utils/common');
+var trees   = require('./trees');
+var adler32 = require('./adler32');
+var crc32   = require('./crc32');
+var msg     = require('./messages');
 
 /* Public constants ==========================================================*/
 /* ===========================================================================*/
@@ -4021,7 +6227,7 @@ var D_CODES       = 30;
 /* number of distance codes */
 var BL_CODES      = 19;
 /* number of codes used to transfer the bit lengths */
-var HEAP_SIZE     = 2*L_CODES + 1;
+var HEAP_SIZE     = 2 * L_CODES + 1;
 /* maximum heap size */
 var MAX_BITS  = 15;
 /* All codes must not exceed MAX_BITS bits */
@@ -4087,7 +6293,7 @@ function flush_pending(strm) {
 }
 
 
-function flush_block_only (s, last) {
+function flush_block_only(s, last) {
   trees._tr_flush_block(s, (s.block_start >= 0 ? s.block_start : -1), s.strstart - s.block_start, last);
   s.block_start = s.strstart;
   flush_pending(s.strm);
@@ -4127,6 +6333,7 @@ function read_buf(strm, buf, start, size) {
 
   strm.avail_in -= len;
 
+  // zmemcpy(buf, strm->next_in, len);
   utils.arraySet(buf, strm.input, strm.next_in, len, start);
   if (strm.state.wrap === 1) {
     strm.adler = adler32(strm.adler, buf, len, start);
@@ -4357,7 +6564,7 @@ function fill_window(s) {
 //#endif
       while (s.insert) {
         /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
-        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH-1]) & s.hash_mask;
+        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH - 1]) & s.hash_mask;
 
         s.prev[str & s.w_mask] = s.head[s.ins_h];
         s.head[s.ins_h] = str;
@@ -4621,7 +6828,7 @@ function deflate_fast(s, flush) {
       /***/
     }
   }
-  s.insert = ((s.strstart < (MIN_MATCH-1)) ? s.strstart : MIN_MATCH-1);
+  s.insert = ((s.strstart < (MIN_MATCH - 1)) ? s.strstart : MIN_MATCH - 1);
   if (flush === Z_FINISH) {
     /*** FLUSH_BLOCK(s, 1); ***/
     flush_block_only(s, true);
@@ -4684,10 +6891,10 @@ function deflate_slow(s, flush) {
      */
     s.prev_length = s.match_length;
     s.prev_match = s.match_start;
-    s.match_length = MIN_MATCH-1;
+    s.match_length = MIN_MATCH - 1;
 
     if (hash_head !== 0/*NIL*/ && s.prev_length < s.max_lazy_match &&
-        s.strstart - hash_head <= (s.w_size-MIN_LOOKAHEAD)/*MAX_DIST(s)*/) {
+        s.strstart - hash_head <= (s.w_size - MIN_LOOKAHEAD)/*MAX_DIST(s)*/) {
       /* To simplify the code, we prevent matches with the string
        * of window index 0 (in particular we have to avoid a match
        * of the string with itself at the start of the input file).
@@ -4701,7 +6908,7 @@ function deflate_slow(s, flush) {
         /* If prev_match is also MIN_MATCH, match_start is garbage
          * but we will ignore the current match anyway.
          */
-        s.match_length = MIN_MATCH-1;
+        s.match_length = MIN_MATCH - 1;
       }
     }
     /* If there was a match at the previous step and the current
@@ -4715,13 +6922,13 @@ function deflate_slow(s, flush) {
 
       /***_tr_tally_dist(s, s.strstart - 1 - s.prev_match,
                      s.prev_length - MIN_MATCH, bflush);***/
-      bflush = trees._tr_tally(s, s.strstart - 1- s.prev_match, s.prev_length - MIN_MATCH);
+      bflush = trees._tr_tally(s, s.strstart - 1 - s.prev_match, s.prev_length - MIN_MATCH);
       /* Insert in hash table all strings up to the end of the match.
        * strstart-1 and strstart are already inserted. If there is not
        * enough lookahead, the last two strings are not inserted in
        * the hash table.
        */
-      s.lookahead -= s.prev_length-1;
+      s.lookahead -= s.prev_length - 1;
       s.prev_length -= 2;
       do {
         if (++s.strstart <= max_insert) {
@@ -4733,7 +6940,7 @@ function deflate_slow(s, flush) {
         }
       } while (--s.prev_length !== 0);
       s.match_available = 0;
-      s.match_length = MIN_MATCH-1;
+      s.match_length = MIN_MATCH - 1;
       s.strstart++;
 
       if (bflush) {
@@ -4752,7 +6959,7 @@ function deflate_slow(s, flush) {
        */
       //Tracevv((stderr,"%c", s->window[s->strstart-1]));
       /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
+      bflush = trees._tr_tally(s, 0, s.window[s.strstart - 1]);
 
       if (bflush) {
         /*** FLUSH_BLOCK_ONLY(s, 0) ***/
@@ -4777,11 +6984,11 @@ function deflate_slow(s, flush) {
   if (s.match_available) {
     //Tracevv((stderr,"%c", s->window[s->strstart-1]));
     /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
-    bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
+    bflush = trees._tr_tally(s, 0, s.window[s.strstart - 1]);
 
     s.match_available = 0;
   }
-  s.insert = s.strstart < MIN_MATCH-1 ? s.strstart : MIN_MATCH-1;
+  s.insert = s.strstart < MIN_MATCH - 1 ? s.strstart : MIN_MATCH - 1;
   if (flush === Z_FINISH) {
     /*** FLUSH_BLOCK(s, 1); ***/
     flush_block_only(s, true);
@@ -4961,13 +7168,13 @@ function deflate_huff(s, flush) {
  * exclude worst case performance for pathological files. Better values may be
  * found for specific files.
  */
-var Config = function (good_length, max_lazy, nice_length, max_chain, func) {
+function Config(good_length, max_lazy, nice_length, max_chain, func) {
   this.good_length = good_length;
   this.max_lazy = max_lazy;
   this.nice_length = nice_length;
   this.max_chain = max_chain;
   this.func = func;
-};
+}
 
 var configuration_table;
 
@@ -5117,8 +7324,8 @@ function DeflateState() {
   // Use flat array of DOUBLE size, with interleaved fata,
   // because JS does not support effective
   this.dyn_ltree  = new utils.Buf16(HEAP_SIZE * 2);
-  this.dyn_dtree  = new utils.Buf16((2*D_CODES+1) * 2);
-  this.bl_tree    = new utils.Buf16((2*BL_CODES+1) * 2);
+  this.dyn_dtree  = new utils.Buf16((2 * D_CODES + 1) * 2);
+  this.bl_tree    = new utils.Buf16((2 * BL_CODES + 1) * 2);
   zero(this.dyn_ltree);
   zero(this.dyn_dtree);
   zero(this.bl_tree);
@@ -5128,11 +7335,11 @@ function DeflateState() {
   this.bl_desc  = null;         /* desc. for bit length tree */
 
   //ush bl_count[MAX_BITS+1];
-  this.bl_count = new utils.Buf16(MAX_BITS+1);
+  this.bl_count = new utils.Buf16(MAX_BITS + 1);
   /* number of codes at each bit length for an optimal tree */
 
   //int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-  this.heap = new utils.Buf16(2*L_CODES+1);  /* heap used to build the Huffman trees */
+  this.heap = new utils.Buf16(2 * L_CODES + 1);  /* heap used to build the Huffman trees */
   zero(this.heap);
 
   this.heap_len = 0;               /* number of elements in the heap */
@@ -5141,7 +7348,7 @@ function DeflateState() {
    * The same heap array is used to build all trees.
    */
 
-  this.depth = new utils.Buf16(2*L_CODES+1); //uch depth[2*L_CODES+1];
+  this.depth = new utils.Buf16(2 * L_CODES + 1); //uch depth[2*L_CODES+1];
   zero(this.depth);
   /* Depth of each subtree used as tie breaker for trees of equal frequency
    */
@@ -5307,9 +7514,16 @@ function deflateInit2(strm, level, method, windowBits, memLevel, strategy) {
   s.lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
   s.pending_buf_size = s.lit_bufsize * 4;
+
+  //overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+  //s->pending_buf = (uchf *) overlay;
   s.pending_buf = new utils.Buf8(s.pending_buf_size);
 
-  s.d_buf = s.lit_bufsize >> 1;
+  // It is offset from `s.pending_buf` (size is `s.lit_bufsize * 2`)
+  //s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+  s.d_buf = 1 * s.lit_bufsize;
+
+  //s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
   s.l_buf = (1 + 2) * s.lit_bufsize;
 
   s.level = level;
@@ -5478,7 +7692,7 @@ function deflate(strm, flush) {
         put_byte(s, val);
       } while (val !== 0);
 
-      if (s.gzhead.hcrc && s.pending > beg){
+      if (s.gzhead.hcrc && s.pending > beg) {
         strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
       }
       if (val === 0) {
@@ -5682,12 +7896,94 @@ function deflateEnd(strm) {
   return status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK;
 }
 
+
 /* =========================================================================
- * Copy the source state to the destination state
+ * Initializes the compression dictionary from the given byte
+ * sequence without producing any compressed output.
  */
-//function deflateCopy(dest, source) {
-//
-//}
+function deflateSetDictionary(strm, dictionary) {
+  var dictLength = dictionary.length;
+
+  var s;
+  var str, n;
+  var wrap;
+  var avail;
+  var next;
+  var input;
+  var tmpDict;
+
+  if (!strm/*== Z_NULL*/ || !strm.state/*== Z_NULL*/) {
+    return Z_STREAM_ERROR;
+  }
+
+  s = strm.state;
+  wrap = s.wrap;
+
+  if (wrap === 2 || (wrap === 1 && s.status !== INIT_STATE) || s.lookahead) {
+    return Z_STREAM_ERROR;
+  }
+
+  /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+  if (wrap === 1) {
+    /* adler32(strm->adler, dictionary, dictLength); */
+    strm.adler = adler32(strm.adler, dictionary, dictLength, 0);
+  }
+
+  s.wrap = 0;   /* avoid computing Adler-32 in read_buf */
+
+  /* if dictionary would fill window, just replace the history */
+  if (dictLength >= s.w_size) {
+    if (wrap === 0) {            /* already empty otherwise */
+      /*** CLEAR_HASH(s); ***/
+      zero(s.head); // Fill with NIL (= 0);
+      s.strstart = 0;
+      s.block_start = 0;
+      s.insert = 0;
+    }
+    /* use the tail */
+    // dictionary = dictionary.slice(dictLength - s.w_size);
+    tmpDict = new utils.Buf8(s.w_size);
+    utils.arraySet(tmpDict, dictionary, dictLength - s.w_size, s.w_size, 0);
+    dictionary = tmpDict;
+    dictLength = s.w_size;
+  }
+  /* insert dictionary into window and hash */
+  avail = strm.avail_in;
+  next = strm.next_in;
+  input = strm.input;
+  strm.avail_in = dictLength;
+  strm.next_in = 0;
+  strm.input = dictionary;
+  fill_window(s);
+  while (s.lookahead >= MIN_MATCH) {
+    str = s.strstart;
+    n = s.lookahead - (MIN_MATCH - 1);
+    do {
+      /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
+      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH - 1]) & s.hash_mask;
+
+      s.prev[str & s.w_mask] = s.head[s.ins_h];
+
+      s.head[s.ins_h] = str;
+      str++;
+    } while (--n);
+    s.strstart = str;
+    s.lookahead = MIN_MATCH - 1;
+    fill_window(s);
+  }
+  s.strstart += s.lookahead;
+  s.block_start = s.strstart;
+  s.insert = s.lookahead;
+  s.lookahead = 0;
+  s.match_length = s.prev_length = MIN_MATCH - 1;
+  s.match_available = 0;
+  strm.next_in = next;
+  strm.input = input;
+  strm.avail_in = avail;
+  s.wrap = wrap;
+  return Z_OK;
+}
+
 
 exports.deflateInit = deflateInit;
 exports.deflateInit2 = deflateInit2;
@@ -5696,20 +7992,39 @@ exports.deflateResetKeep = deflateResetKeep;
 exports.deflateSetHeader = deflateSetHeader;
 exports.deflate = deflate;
 exports.deflateEnd = deflateEnd;
+exports.deflateSetDictionary = deflateSetDictionary;
 exports.deflateInfo = 'pako deflate (from Nodeca project)';
 
 /* Not implemented
 exports.deflateBound = deflateBound;
 exports.deflateCopy = deflateCopy;
-exports.deflateSetDictionary = deflateSetDictionary;
 exports.deflateParams = deflateParams;
 exports.deflatePending = deflatePending;
 exports.deflatePrime = deflatePrime;
 exports.deflateTune = deflateTune;
 */
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(_dereq_,module,exports){
+
+},{"../utils/common":62,"./adler32":64,"./crc32":66,"./messages":72,"./trees":73}],68:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 
 function GZheader() {
   /* true if compressed data believed to be text */
@@ -5727,7 +8042,7 @@ function GZheader() {
                        // but leave for few code modifications
 
   //
-  // Setup limits is not necessary because in js we should not preallocate memory 
+  // Setup limits is not necessary because in js we should not preallocate memory
   // for inflate use constant limit in 65536 bytes
   //
 
@@ -5748,9 +8063,29 @@ function GZheader() {
 }
 
 module.exports = GZheader;
-},{}],34:[function(_dereq_,module,exports){
+
+},{}],69:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
 // See state defs from inflate.js
 var BAD = 30;       /* got a data error -- remain here until reset */
 var TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
@@ -5803,7 +8138,8 @@ module.exports = function inflate_fast(strm, start) {
   var wsize;                  /* window size or zero if not using window */
   var whave;                  /* valid bytes in the window */
   var wnext;                  /* window write index */
-  var window;                 /* allocated sliding window, if wsize != 0 */
+  // Use `s_window` instead `window`, avoid conflict with instrumentation tools
+  var s_window;               /* allocated sliding window, if wsize != 0 */
   var hold;                   /* local strm.hold */
   var bits;                   /* local strm.bits */
   var lcode;                  /* local strm.lencode */
@@ -5837,7 +8173,7 @@ module.exports = function inflate_fast(strm, start) {
   wsize = state.wsize;
   whave = state.whave;
   wnext = state.wnext;
-  window = state.window;
+  s_window = state.window;
   hold = state.hold;
   bits = state.bits;
   lcode = state.lencode;
@@ -5955,13 +8291,13 @@ module.exports = function inflate_fast(strm, start) {
 //#endif
               }
               from = 0; // window index
-              from_source = window;
+              from_source = s_window;
               if (wnext === 0) {           /* very common case */
                 from += wsize - op;
                 if (op < len) {         /* some from window */
                   len -= op;
                   do {
-                    output[_out++] = window[from++];
+                    output[_out++] = s_window[from++];
                   } while (--op);
                   from = _out - dist;  /* rest from output */
                   from_source = output;
@@ -5973,14 +8309,14 @@ module.exports = function inflate_fast(strm, start) {
                 if (op < len) {         /* some from end of window */
                   len -= op;
                   do {
-                    output[_out++] = window[from++];
+                    output[_out++] = s_window[from++];
                   } while (--op);
                   from = 0;
                   if (wnext < len) {  /* some from start of window */
                     op = wnext;
                     len -= op;
                     do {
-                      output[_out++] = window[from++];
+                      output[_out++] = s_window[from++];
                     } while (--op);
                     from = _out - dist;      /* rest from output */
                     from_source = output;
@@ -5992,7 +8328,7 @@ module.exports = function inflate_fast(strm, start) {
                 if (op < len) {         /* some from window */
                   len -= op;
                   do {
-                    output[_out++] = window[from++];
+                    output[_out++] = s_window[from++];
                   } while (--op);
                   from = _out - dist;  /* rest from output */
                   from_source = output;
@@ -6075,15 +8411,33 @@ module.exports = function inflate_fast(strm, start) {
   return;
 };
 
-},{}],35:[function(_dereq_,module,exports){
+},{}],70:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 
-var utils = _dereq_('../utils/common');
-var adler32 = _dereq_('./adler32');
-var crc32   = _dereq_('./crc32');
-var inflate_fast = _dereq_('./inffast');
-var inflate_table = _dereq_('./inftrees');
+var utils         = require('../utils/common');
+var adler32       = require('./adler32');
+var crc32         = require('./crc32');
+var inflate_fast  = require('./inffast');
+var inflate_table = require('./inftrees');
 
 var CODES = 0;
 var LENS = 1;
@@ -6170,7 +8524,7 @@ var MAX_WBITS = 15;
 var DEF_WBITS = MAX_WBITS;
 
 
-function ZSWAP32(q) {
+function zswap32(q) {
   return  (((q >>> 24) & 0xff) +
           ((q >>> 8) & 0xff00) +
           ((q & 0xff00) << 8) +
@@ -6363,13 +8717,13 @@ function fixedtables(state) {
     while (sym < 280) { state.lens[sym++] = 7; }
     while (sym < 288) { state.lens[sym++] = 8; }
 
-    inflate_table(LENS,  state.lens, 0, 288, lenfix,   0, state.work, {bits: 9});
+    inflate_table(LENS,  state.lens, 0, 288, lenfix,   0, state.work, { bits: 9 });
 
     /* distance table */
     sym = 0;
     while (sym < 32) { state.lens[sym++] = 5; }
 
-    inflate_table(DISTS, state.lens, 0, 32,   distfix, 0, state.work, {bits: 5});
+    inflate_table(DISTS, state.lens, 0, 32,   distfix, 0, state.work, { bits: 5 });
 
     /* do this just once */
     virgin = false;
@@ -6411,7 +8765,7 @@ function updatewindow(strm, src, end, copy) {
 
   /* copy state->wsize or less output bytes into the circular window */
   if (copy >= state.wsize) {
-    utils.arraySet(state.window,src, end - state.wsize, state.wsize, 0);
+    utils.arraySet(state.window, src, end - state.wsize, state.wsize, 0);
     state.wnext = 0;
     state.whave = state.wsize;
   }
@@ -6421,11 +8775,11 @@ function updatewindow(strm, src, end, copy) {
       dist = copy;
     }
     //zmemcpy(state->window + state->wnext, end - copy, dist);
-    utils.arraySet(state.window,src, end - copy, dist, state.wnext);
+    utils.arraySet(state.window, src, end - copy, dist, state.wnext);
     copy -= dist;
     if (copy) {
       //zmemcpy(state->window, end - copy, copy);
-      utils.arraySet(state.window,src, end - copy, copy, 0);
+      utils.arraySet(state.window, src, end - copy, copy, 0);
       state.wnext = copy;
       state.whave = state.wsize;
     }
@@ -6462,7 +8816,7 @@ function inflate(strm, flush) {
   var n; // temporary var for NEED_BITS
 
   var order = /* permutation of code lengths */
-    [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
+    [ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 ];
 
 
   if (!strm || !strm.state || !strm.output ||
@@ -6789,7 +9143,7 @@ function inflate(strm, flush) {
         state.head.hcrc = ((state.flags >> 9) & 1);
         state.head.done = true;
       }
-      strm.adler = state.check = 0 /*crc32(0L, Z_NULL, 0)*/;
+      strm.adler = state.check = 0;
       state.mode = TYPE;
       break;
     case DICTID:
@@ -6801,7 +9155,7 @@ function inflate(strm, flush) {
         bits += 8;
       }
       //===//
-      strm.adler = state.check = ZSWAP32(hold);
+      strm.adler = state.check = zswap32(hold);
       //=== INITBITS();
       hold = 0;
       bits = 0;
@@ -6993,7 +9347,7 @@ function inflate(strm, flush) {
       state.lencode = state.lendyn;
       state.lenbits = 7;
 
-      opts = {bits: state.lenbits};
+      opts = { bits: state.lenbits };
       ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts);
       state.lenbits = opts.bits;
 
@@ -7124,7 +9478,7 @@ function inflate(strm, flush) {
          concerning the ENOUGH constants, which depend on those values */
       state.lenbits = 9;
 
-      opts = {bits: state.lenbits};
+      opts = { bits: state.lenbits };
       ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts);
       // We have separate tables & no pointers. 2 commented lines below not needed.
       // state.next_index = opts.table_index;
@@ -7141,7 +9495,7 @@ function inflate(strm, flush) {
       //state.distcode.copy(state.codes);
       // Switch to use dynamic table
       state.distcode = state.distdyn;
-      opts = {bits: state.distbits};
+      opts = { bits: state.distbits };
       ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts);
       // We have separate tables & no pointers. 2 commented lines below not needed.
       // state.next_index = opts.table_index;
@@ -7189,7 +9543,7 @@ function inflate(strm, flush) {
       }
       state.back = 0;
       for (;;) {
-        here = state.lencode[hold & ((1 << state.lenbits) -1)];  /*BITS(state.lenbits)*/
+        here = state.lencode[hold & ((1 << state.lenbits) - 1)];  /*BITS(state.lenbits)*/
         here_bits = here >>> 24;
         here_op = (here >>> 16) & 0xff;
         here_val = here & 0xffff;
@@ -7208,7 +9562,7 @@ function inflate(strm, flush) {
         last_val = here_val;
         for (;;) {
           here = state.lencode[last_val +
-                  ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
+                  ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)];
           here_bits = here >>> 24;
           here_op = (here >>> 16) & 0xff;
           here_val = here & 0xffff;
@@ -7265,7 +9619,7 @@ function inflate(strm, flush) {
           bits += 8;
         }
         //===//
-        state.length += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
+        state.length += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/;
         //--- DROPBITS(state.extra) ---//
         hold >>>= state.extra;
         bits -= state.extra;
@@ -7278,7 +9632,7 @@ function inflate(strm, flush) {
       /* falls through */
     case DIST:
       for (;;) {
-        here = state.distcode[hold & ((1 << state.distbits) -1)];/*BITS(state.distbits)*/
+        here = state.distcode[hold & ((1 << state.distbits) - 1)];/*BITS(state.distbits)*/
         here_bits = here >>> 24;
         here_op = (here >>> 16) & 0xff;
         here_val = here & 0xffff;
@@ -7297,7 +9651,7 @@ function inflate(strm, flush) {
         last_val = here_val;
         for (;;) {
           here = state.distcode[last_val +
-                  ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
+                  ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)];
           here_bits = here >>> 24;
           here_op = (here >>> 16) & 0xff;
           here_val = here & 0xffff;
@@ -7341,7 +9695,7 @@ function inflate(strm, flush) {
           bits += 8;
         }
         //===//
-        state.offset += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
+        state.offset += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/;
         //--- DROPBITS(state.extra) ---//
         hold >>>= state.extra;
         bits -= state.extra;
@@ -7435,8 +9789,8 @@ function inflate(strm, flush) {
 
         }
         _out = left;
-        // NB: crc32 stored as signed 32-bit int, ZSWAP32 returns signed too
-        if ((state.flags ? hold : ZSWAP32(hold)) !== state.check) {
+        // NB: crc32 stored as signed 32-bit int, zswap32 returns signed too
+        if ((state.flags ? hold : zswap32(hold)) !== state.check) {
           strm.msg = 'incorrect data check';
           state.mode = BAD;
           break;
@@ -7558,6 +9912,41 @@ function inflateGetHeader(strm, head) {
   return Z_OK;
 }
 
+function inflateSetDictionary(strm, dictionary) {
+  var dictLength = dictionary.length;
+
+  var state;
+  var dictid;
+  var ret;
+
+  /* check state */
+  if (!strm /* == Z_NULL */ || !strm.state /* == Z_NULL */) { return Z_STREAM_ERROR; }
+  state = strm.state;
+
+  if (state.wrap !== 0 && state.mode !== DICT) {
+    return Z_STREAM_ERROR;
+  }
+
+  /* check for correct dictionary identifier */
+  if (state.mode === DICT) {
+    dictid = 1; /* adler32(0, null, 0)*/
+    /* dictid = adler32(dictid, dictionary, dictLength); */
+    dictid = adler32(dictid, dictionary, dictLength, 0);
+    if (dictid !== state.check) {
+      return Z_DATA_ERROR;
+    }
+  }
+  /* copy dictionary to window using updatewindow(), which will amend the
+   existing dictionary if appropriate */
+  ret = updatewindow(strm, dictionary, dictLength, dictLength);
+  if (ret) {
+    state.mode = MEM;
+    return Z_MEM_ERROR;
+  }
+  state.havedict = 1;
+  // Tracev((stderr, "inflate:   dictionary set\n"));
+  return Z_OK;
+}
 
 exports.inflateReset = inflateReset;
 exports.inflateReset2 = inflateReset2;
@@ -7567,6 +9956,7 @@ exports.inflateInit2 = inflateInit2;
 exports.inflate = inflate;
 exports.inflateEnd = inflateEnd;
 exports.inflateGetHeader = inflateGetHeader;
+exports.inflateSetDictionary = inflateSetDictionary;
 exports.inflateInfo = 'pako inflate (from Nodeca project)';
 
 /* Not implemented
@@ -7574,16 +9964,34 @@ exports.inflateCopy = inflateCopy;
 exports.inflateGetDictionary = inflateGetDictionary;
 exports.inflateMark = inflateMark;
 exports.inflatePrime = inflatePrime;
-exports.inflateSetDictionary = inflateSetDictionary;
 exports.inflateSync = inflateSync;
 exports.inflateSyncPoint = inflateSyncPoint;
 exports.inflateUndermine = inflateUndermine;
 */
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(_dereq_,module,exports){
+
+},{"../utils/common":62,"./adler32":64,"./crc32":66,"./inffast":69,"./inftrees":71}],71:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 
-var utils = _dereq_('../utils/common');
+var utils = require('../utils/common');
 
 var MAXBITS = 15;
 var ENOUGH_LENS = 852;
@@ -7639,8 +10047,8 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
   var base_index = 0;
 //  var shoextra;    /* extra bits table to use */
   var end;                    /* use base and extra for symbol > end */
-  var count = new utils.Buf16(MAXBITS+1); //[MAXBITS+1];    /* number of codes of each length */
-  var offs = new utils.Buf16(MAXBITS+1); //[MAXBITS+1];     /* offsets in table for each length */
+  var count = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1];    /* number of codes of each length */
+  var offs = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1];     /* offsets in table for each length */
   var extra = null;
   var extra_index = 0;
 
@@ -7776,18 +10184,20 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
   // poor man optimization - use if-else instead of switch,
   // to avoid deopts in old v8
   if (type === CODES) {
-      base = extra = work;    /* dummy value--not used */
-      end = 19;
+    base = extra = work;    /* dummy value--not used */
+    end = 19;
+
   } else if (type === LENS) {
-      base = lbase;
-      base_index -= 257;
-      extra = lext;
-      extra_index -= 257;
-      end = 256;
+    base = lbase;
+    base_index -= 257;
+    extra = lext;
+    extra_index -= 257;
+    end = 256;
+
   } else {                    /* DISTS */
-      base = dbase;
-      extra = dext;
-      end = -1;
+    base = dbase;
+    extra = dext;
+    end = -1;
   }
 
   /* initialize opts for loop */
@@ -7807,10 +10217,8 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
     return 1;
   }
 
-  var i=0;
   /* process all codes and make table entries */
   for (;;) {
-    i++;
     /* create table entry */
     here_bits = len - drop;
     if (work[sym] < end) {
@@ -7906,13 +10314,32 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
   return 0;
 };
 
-},{"../utils/common":27}],37:[function(_dereq_,module,exports){
+},{"../utils/common":62}],72:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
 module.exports = {
-  '2':    'need dictionary',     /* Z_NEED_DICT       2  */
-  '1':    'stream end',          /* Z_STREAM_END      1  */
-  '0':    '',                    /* Z_OK              0  */
+  2:      'need dictionary',     /* Z_NEED_DICT       2  */
+  1:      'stream end',          /* Z_STREAM_END      1  */
+  0:      '',                    /* Z_OK              0  */
   '-1':   'file error',          /* Z_ERRNO         (-1) */
   '-2':   'stream error',        /* Z_STREAM_ERROR  (-2) */
   '-3':   'data error',          /* Z_DATA_ERROR    (-3) */
@@ -7920,11 +10347,30 @@ module.exports = {
   '-5':   'buffer error',        /* Z_BUF_ERROR     (-5) */
   '-6':   'incompatible version' /* Z_VERSION_ERROR (-6) */
 };
-},{}],38:[function(_dereq_,module,exports){
+
+},{}],73:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 
-var utils = _dereq_('../utils/common');
+var utils = require('../utils/common');
 
 /* Public constants ==========================================================*/
 /* ===========================================================================*/
@@ -7978,7 +10424,7 @@ var D_CODES       = 30;
 var BL_CODES      = 19;
 /* number of codes used to transfer the bit lengths */
 
-var HEAP_SIZE     = 2*L_CODES + 1;
+var HEAP_SIZE     = 2 * L_CODES + 1;
 /* maximum heap size */
 
 var MAX_BITS      = 15;
@@ -8007,6 +10453,7 @@ var REPZ_3_10   = 17;
 var REPZ_11_138 = 18;
 /* repeat a zero length 11-138 times  (7 bits of repeat count) */
 
+/* eslint-disable comma-spacing,array-bracket-spacing */
 var extra_lbits =   /* extra bits for each length code */
   [0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0];
 
@@ -8018,6 +10465,8 @@ var extra_blbits =  /* extra bits for each bit length code */
 
 var bl_order =
   [16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];
+/* eslint-enable comma-spacing,array-bracket-spacing */
+
 /* The lengths of the bit length codes are sent in order of decreasing
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
@@ -8031,7 +10480,7 @@ var bl_order =
 var DIST_CODE_LEN = 512; /* see definition of array dist_code below */
 
 // !!!! Use flat array insdead of structure, Freq = i*2, Len = i*2+1
-var static_ltree  = new Array((L_CODES+2) * 2);
+var static_ltree  = new Array((L_CODES + 2) * 2);
 zero(static_ltree);
 /* The static literal tree. Since the bit lengths are imposed, there is no
  * need for the L_CODES extra codes used during heap construction. However
@@ -8052,7 +10501,7 @@ zero(_dist_code);
  * the 15 bit distances.
  */
 
-var _length_code  = new Array(MAX_MATCH-MIN_MATCH+1);
+var _length_code  = new Array(MAX_MATCH - MIN_MATCH + 1);
 zero(_length_code);
 /* length code for each normalized match length (0 == MIN_MATCH) */
 
@@ -8065,7 +10514,7 @@ zero(base_dist);
 /* First normalized distance for each code (0 = distance of 1) */
 
 
-var StaticTreeDesc = function (static_tree, extra_bits, extra_base, elems, max_length) {
+function StaticTreeDesc(static_tree, extra_bits, extra_base, elems, max_length) {
 
   this.static_tree  = static_tree;  /* static tree or NULL */
   this.extra_bits   = extra_bits;   /* extra bits for each code or NULL */
@@ -8075,7 +10524,7 @@ var StaticTreeDesc = function (static_tree, extra_bits, extra_base, elems, max_l
 
   // show if `static_tree` has data or dummy - needed for monomorphic objects
   this.has_stree    = static_tree && static_tree.length;
-};
+}
 
 
 var static_l_desc;
@@ -8083,11 +10532,11 @@ var static_d_desc;
 var static_bl_desc;
 
 
-var TreeDesc = function(dyn_tree, stat_desc) {
+function TreeDesc(dyn_tree, stat_desc) {
   this.dyn_tree = dyn_tree;     /* the dynamic tree */
   this.max_code = 0;            /* largest code with non zero frequency */
   this.stat_desc = stat_desc;   /* the corresponding static tree */
-};
+}
 
 
 
@@ -8100,7 +10549,7 @@ function d_code(dist) {
  * Output a short LSB first on the stream.
  * IN assertion: there is enough room in pendingBuf.
  */
-function put_short (s, w) {
+function put_short(s, w) {
 //    put_byte(s, (uch)((w) & 0xff));
 //    put_byte(s, (uch)((ush)(w) >> 8));
   s.pending_buf[s.pending++] = (w) & 0xff;
@@ -8126,7 +10575,7 @@ function send_bits(s, value, length) {
 
 
 function send_code(s, c, tree) {
-  send_bits(s, tree[c*2]/*.Code*/, tree[c*2 + 1]/*.Len*/);
+  send_bits(s, tree[c * 2]/*.Code*/, tree[c * 2 + 1]/*.Len*/);
 }
 
 
@@ -8198,16 +10647,16 @@ function gen_bitlen(s, desc)
   /* In a first pass, compute the optimal bit lengths (which may
    * overflow in the case of the bit length tree).
    */
-  tree[s.heap[s.heap_max]*2 + 1]/*.Len*/ = 0; /* root of the heap */
+  tree[s.heap[s.heap_max] * 2 + 1]/*.Len*/ = 0; /* root of the heap */
 
-  for (h = s.heap_max+1; h < HEAP_SIZE; h++) {
+  for (h = s.heap_max + 1; h < HEAP_SIZE; h++) {
     n = s.heap[h];
-    bits = tree[tree[n*2 +1]/*.Dad*/ * 2 + 1]/*.Len*/ + 1;
+    bits = tree[tree[n * 2 + 1]/*.Dad*/ * 2 + 1]/*.Len*/ + 1;
     if (bits > max_length) {
       bits = max_length;
       overflow++;
     }
-    tree[n*2 + 1]/*.Len*/ = bits;
+    tree[n * 2 + 1]/*.Len*/ = bits;
     /* We overwrite tree[n].Dad which is no longer needed */
 
     if (n > max_code) { continue; } /* not a leaf node */
@@ -8215,12 +10664,12 @@ function gen_bitlen(s, desc)
     s.bl_count[bits]++;
     xbits = 0;
     if (n >= base) {
-      xbits = extra[n-base];
+      xbits = extra[n - base];
     }
     f = tree[n * 2]/*.Freq*/;
     s.opt_len += f * (bits + xbits);
     if (has_stree) {
-      s.static_len += f * (stree[n*2 + 1]/*.Len*/ + xbits);
+      s.static_len += f * (stree[n * 2 + 1]/*.Len*/ + xbits);
     }
   }
   if (overflow === 0) { return; }
@@ -8230,10 +10679,10 @@ function gen_bitlen(s, desc)
 
   /* Find the first bit length which could increase: */
   do {
-    bits = max_length-1;
+    bits = max_length - 1;
     while (s.bl_count[bits] === 0) { bits--; }
     s.bl_count[bits]--;      /* move one leaf down the tree */
-    s.bl_count[bits+1] += 2; /* move one overflow item as its brother */
+    s.bl_count[bits + 1] += 2; /* move one overflow item as its brother */
     s.bl_count[max_length]--;
     /* The brother of the overflow item also moves one step up,
      * but this does not affect bl_count[max_length]
@@ -8251,10 +10700,10 @@ function gen_bitlen(s, desc)
     while (n !== 0) {
       m = s.heap[--h];
       if (m > max_code) { continue; }
-      if (tree[m*2 + 1]/*.Len*/ !== bits) {
+      if (tree[m * 2 + 1]/*.Len*/ !== bits) {
         // Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-        s.opt_len += (bits - tree[m*2 + 1]/*.Len*/)*tree[m*2]/*.Freq*/;
-        tree[m*2 + 1]/*.Len*/ = bits;
+        s.opt_len += (bits - tree[m * 2 + 1]/*.Len*/) * tree[m * 2]/*.Freq*/;
+        tree[m * 2 + 1]/*.Len*/ = bits;
       }
       n--;
     }
@@ -8275,7 +10724,7 @@ function gen_codes(tree, max_code, bl_count)
 //    int max_code;              /* largest code with non zero frequency */
 //    ushf *bl_count;            /* number of codes at each bit length */
 {
-  var next_code = new Array(MAX_BITS+1); /* next code value for each bit length */
+  var next_code = new Array(MAX_BITS + 1); /* next code value for each bit length */
   var code = 0;              /* running code value */
   var bits;                  /* bit index */
   var n;                     /* code index */
@@ -8284,7 +10733,7 @@ function gen_codes(tree, max_code, bl_count)
    * without bit reversal.
    */
   for (bits = 1; bits <= MAX_BITS; bits++) {
-    next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+    next_code[bits] = code = (code + bl_count[bits - 1]) << 1;
   }
   /* Check that the bit counts in bl_count are consistent. The last code
    * must be all ones.
@@ -8294,10 +10743,10 @@ function gen_codes(tree, max_code, bl_count)
   //Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
 
   for (n = 0;  n <= max_code; n++) {
-    var len = tree[n*2 + 1]/*.Len*/;
+    var len = tree[n * 2 + 1]/*.Len*/;
     if (len === 0) { continue; }
     /* Now reverse the bits */
-    tree[n*2]/*.Code*/ = bi_reverse(next_code[len]++, len);
+    tree[n * 2]/*.Code*/ = bi_reverse(next_code[len]++, len);
 
     //Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
     //     n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
@@ -8314,7 +10763,7 @@ function tr_static_init() {
   var length;   /* length value */
   var code;     /* code value */
   var dist;     /* distance index */
-  var bl_count = new Array(MAX_BITS+1);
+  var bl_count = new Array(MAX_BITS + 1);
   /* number of codes at each bit length for an optimal tree */
 
   // do check in _tr_init()
@@ -8331,9 +10780,9 @@ function tr_static_init() {
 
   /* Initialize the mapping length (0..255) -> length code (0..28) */
   length = 0;
-  for (code = 0; code < LENGTH_CODES-1; code++) {
+  for (code = 0; code < LENGTH_CODES - 1; code++) {
     base_length[code] = length;
-    for (n = 0; n < (1<<extra_lbits[code]); n++) {
+    for (n = 0; n < (1 << extra_lbits[code]); n++) {
       _length_code[length++] = code;
     }
   }
@@ -8342,21 +10791,21 @@ function tr_static_init() {
    * in two different ways: code 284 + 5 bits or code 285, so we
    * overwrite length_code[255] to use the best encoding:
    */
-  _length_code[length-1] = code;
+  _length_code[length - 1] = code;
 
   /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
   dist = 0;
-  for (code = 0 ; code < 16; code++) {
+  for (code = 0; code < 16; code++) {
     base_dist[code] = dist;
-    for (n = 0; n < (1<<extra_dbits[code]); n++) {
+    for (n = 0; n < (1 << extra_dbits[code]); n++) {
       _dist_code[dist++] = code;
     }
   }
   //Assert (dist == 256, "tr_static_init: dist != 256");
   dist >>= 7; /* from now on, all distances are divided by 128 */
-  for ( ; code < D_CODES; code++) {
+  for (; code < D_CODES; code++) {
     base_dist[code] = dist << 7;
-    for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+    for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
       _dist_code[256 + dist++] = code;
     }
   }
@@ -8369,22 +10818,22 @@ function tr_static_init() {
 
   n = 0;
   while (n <= 143) {
-    static_ltree[n*2 + 1]/*.Len*/ = 8;
+    static_ltree[n * 2 + 1]/*.Len*/ = 8;
     n++;
     bl_count[8]++;
   }
   while (n <= 255) {
-    static_ltree[n*2 + 1]/*.Len*/ = 9;
+    static_ltree[n * 2 + 1]/*.Len*/ = 9;
     n++;
     bl_count[9]++;
   }
   while (n <= 279) {
-    static_ltree[n*2 + 1]/*.Len*/ = 7;
+    static_ltree[n * 2 + 1]/*.Len*/ = 7;
     n++;
     bl_count[7]++;
   }
   while (n <= 287) {
-    static_ltree[n*2 + 1]/*.Len*/ = 8;
+    static_ltree[n * 2 + 1]/*.Len*/ = 8;
     n++;
     bl_count[8]++;
   }
@@ -8392,18 +10841,18 @@ function tr_static_init() {
    * tree construction to get a canonical Huffman tree (longest code
    * all ones)
    */
-  gen_codes(static_ltree, L_CODES+1, bl_count);
+  gen_codes(static_ltree, L_CODES + 1, bl_count);
 
   /* The static distance tree is trivial: */
   for (n = 0; n < D_CODES; n++) {
-    static_dtree[n*2 + 1]/*.Len*/ = 5;
-    static_dtree[n*2]/*.Code*/ = bi_reverse(n, 5);
+    static_dtree[n * 2 + 1]/*.Len*/ = 5;
+    static_dtree[n * 2]/*.Code*/ = bi_reverse(n, 5);
   }
 
   // Now data ready and we can init static trees
-  static_l_desc = new StaticTreeDesc(static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS);
+  static_l_desc = new StaticTreeDesc(static_ltree, extra_lbits, LITERALS + 1, L_CODES, MAX_BITS);
   static_d_desc = new StaticTreeDesc(static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS);
-  static_bl_desc =new StaticTreeDesc(new Array(0), extra_blbits, 0,         BL_CODES, MAX_BL_BITS);
+  static_bl_desc = new StaticTreeDesc(new Array(0), extra_blbits, 0,         BL_CODES, MAX_BL_BITS);
 
   //static_init_done = true;
 }
@@ -8416,11 +10865,11 @@ function init_block(s) {
   var n; /* iterates over tree elements */
 
   /* Initialize the trees. */
-  for (n = 0; n < L_CODES;  n++) { s.dyn_ltree[n*2]/*.Freq*/ = 0; }
-  for (n = 0; n < D_CODES;  n++) { s.dyn_dtree[n*2]/*.Freq*/ = 0; }
-  for (n = 0; n < BL_CODES; n++) { s.bl_tree[n*2]/*.Freq*/ = 0; }
+  for (n = 0; n < L_CODES;  n++) { s.dyn_ltree[n * 2]/*.Freq*/ = 0; }
+  for (n = 0; n < D_CODES;  n++) { s.dyn_dtree[n * 2]/*.Freq*/ = 0; }
+  for (n = 0; n < BL_CODES; n++) { s.bl_tree[n * 2]/*.Freq*/ = 0; }
 
-  s.dyn_ltree[END_BLOCK*2]/*.Freq*/ = 1;
+  s.dyn_ltree[END_BLOCK * 2]/*.Freq*/ = 1;
   s.opt_len = s.static_len = 0;
   s.last_lit = s.matches = 0;
 }
@@ -8469,8 +10918,8 @@ function copy_block(s, buf, len, header)
  * the subtrees have equal frequency. This minimizes the worst case length.
  */
 function smaller(tree, n, m, depth) {
-  var _n2 = n*2;
-  var _m2 = m*2;
+  var _n2 = n * 2;
+  var _m2 = m * 2;
   return (tree[_n2]/*.Freq*/ < tree[_m2]/*.Freq*/ ||
          (tree[_n2]/*.Freq*/ === tree[_m2]/*.Freq*/ && depth[n] <= depth[m]));
 }
@@ -8491,7 +10940,7 @@ function pqdownheap(s, tree, k)
   while (j <= s.heap_len) {
     /* Set j to the smallest of the two sons: */
     if (j < s.heap_len &&
-      smaller(tree, s.heap[j+1], s.heap[j], s.depth)) {
+      smaller(tree, s.heap[j + 1], s.heap[j], s.depth)) {
       j++;
     }
     /* Exit if v is smaller than both sons */
@@ -8527,7 +10976,7 @@ function compress_block(s, ltree, dtree)
 
   if (s.last_lit !== 0) {
     do {
-      dist = (s.pending_buf[s.d_buf + lx*2] << 8) | (s.pending_buf[s.d_buf + lx*2 + 1]);
+      dist = (s.pending_buf[s.d_buf + lx * 2] << 8) | (s.pending_buf[s.d_buf + lx * 2 + 1]);
       lc = s.pending_buf[s.l_buf + lx];
       lx++;
 
@@ -8537,7 +10986,7 @@ function compress_block(s, ltree, dtree)
       } else {
         /* Here, lc is the match length - MIN_MATCH */
         code = _length_code[lc];
-        send_code(s, code+LITERALS+1, ltree); /* send the length code */
+        send_code(s, code + LITERALS + 1, ltree); /* send the length code */
         extra = extra_lbits[code];
         if (extra !== 0) {
           lc -= base_length[code];
@@ -8599,7 +11048,7 @@ function build_tree(s, desc)
       s.depth[n] = 0;
 
     } else {
-      tree[n*2 + 1]/*.Len*/ = 0;
+      tree[n * 2 + 1]/*.Len*/ = 0;
     }
   }
 
@@ -8615,7 +11064,7 @@ function build_tree(s, desc)
     s.opt_len--;
 
     if (has_stree) {
-      s.static_len -= stree[node*2 + 1]/*.Len*/;
+      s.static_len -= stree[node * 2 + 1]/*.Len*/;
     }
     /* node is 0 or 1 so it does not have extra bits */
   }
@@ -8646,7 +11095,7 @@ function build_tree(s, desc)
     /* Create a new node father of n and m */
     tree[node * 2]/*.Freq*/ = tree[n * 2]/*.Freq*/ + tree[m * 2]/*.Freq*/;
     s.depth[node] = (s.depth[n] >= s.depth[m] ? s.depth[n] : s.depth[m]) + 1;
-    tree[n*2 + 1]/*.Dad*/ = tree[m*2 + 1]/*.Dad*/ = node;
+    tree[n * 2 + 1]/*.Dad*/ = tree[m * 2 + 1]/*.Dad*/ = node;
 
     /* and insert the new node in the heap */
     s.heap[1/*SMALLEST*/] = node++;
@@ -8679,7 +11128,7 @@ function scan_tree(s, tree, max_code)
   var prevlen = -1;          /* last emitted length */
   var curlen;                /* length of current code */
 
-  var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
+  var nextlen = tree[0 * 2 + 1]/*.Len*/; /* length of next code */
 
   var count = 0;             /* repeat count of the current code */
   var max_count = 7;         /* max repeat count */
@@ -8689,11 +11138,11 @@ function scan_tree(s, tree, max_code)
     max_count = 138;
     min_count = 3;
   }
-  tree[(max_code+1)*2 + 1]/*.Len*/ = 0xffff; /* guard */
+  tree[(max_code + 1) * 2 + 1]/*.Len*/ = 0xffff; /* guard */
 
   for (n = 0; n <= max_code; n++) {
     curlen = nextlen;
-    nextlen = tree[(n+1)*2 + 1]/*.Len*/;
+    nextlen = tree[(n + 1) * 2 + 1]/*.Len*/;
 
     if (++count < max_count && curlen === nextlen) {
       continue;
@@ -8704,13 +11153,13 @@ function scan_tree(s, tree, max_code)
     } else if (curlen !== 0) {
 
       if (curlen !== prevlen) { s.bl_tree[curlen * 2]/*.Freq*/++; }
-      s.bl_tree[REP_3_6*2]/*.Freq*/++;
+      s.bl_tree[REP_3_6 * 2]/*.Freq*/++;
 
     } else if (count <= 10) {
-      s.bl_tree[REPZ_3_10*2]/*.Freq*/++;
+      s.bl_tree[REPZ_3_10 * 2]/*.Freq*/++;
 
     } else {
-      s.bl_tree[REPZ_11_138*2]/*.Freq*/++;
+      s.bl_tree[REPZ_11_138 * 2]/*.Freq*/++;
     }
 
     count = 0;
@@ -8745,7 +11194,7 @@ function send_tree(s, tree, max_code)
   var prevlen = -1;          /* last emitted length */
   var curlen;                /* length of current code */
 
-  var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
+  var nextlen = tree[0 * 2 + 1]/*.Len*/; /* length of next code */
 
   var count = 0;             /* repeat count of the current code */
   var max_count = 7;         /* max repeat count */
@@ -8759,7 +11208,7 @@ function send_tree(s, tree, max_code)
 
   for (n = 0; n <= max_code; n++) {
     curlen = nextlen;
-    nextlen = tree[(n+1)*2 + 1]/*.Len*/;
+    nextlen = tree[(n + 1) * 2 + 1]/*.Len*/;
 
     if (++count < max_count && curlen === nextlen) {
       continue;
@@ -8774,15 +11223,15 @@ function send_tree(s, tree, max_code)
       }
       //Assert(count >= 3 && count <= 6, " 3_6?");
       send_code(s, REP_3_6, s.bl_tree);
-      send_bits(s, count-3, 2);
+      send_bits(s, count - 3, 2);
 
     } else if (count <= 10) {
       send_code(s, REPZ_3_10, s.bl_tree);
-      send_bits(s, count-3, 3);
+      send_bits(s, count - 3, 3);
 
     } else {
       send_code(s, REPZ_11_138, s.bl_tree);
-      send_bits(s, count-11, 7);
+      send_bits(s, count - 11, 7);
     }
 
     count = 0;
@@ -8824,13 +11273,13 @@ function build_bl_tree(s) {
    * requires that at least 4 bit length codes be sent. (appnote.txt says
    * 3 but the actual value used is 4.)
    */
-  for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-    if (s.bl_tree[bl_order[max_blindex]*2 + 1]/*.Len*/ !== 0) {
+  for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) {
+    if (s.bl_tree[bl_order[max_blindex] * 2 + 1]/*.Len*/ !== 0) {
       break;
     }
   }
   /* Update opt_len to include the bit length tree and counts */
-  s.opt_len += 3*(max_blindex+1) + 5+5+4;
+  s.opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
   //Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
   //        s->opt_len, s->static_len));
 
@@ -8853,19 +11302,19 @@ function send_all_trees(s, lcodes, dcodes, blcodes)
   //Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
   //        "too many codes");
   //Tracev((stderr, "\nbl counts: "));
-  send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-  send_bits(s, dcodes-1,   5);
-  send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+  send_bits(s, lcodes - 257, 5); /* not +255 as stated in appnote.txt */
+  send_bits(s, dcodes - 1,   5);
+  send_bits(s, blcodes - 4,  4); /* not -3 as stated in appnote.txt */
   for (rank = 0; rank < blcodes; rank++) {
     //Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-    send_bits(s, s.bl_tree[bl_order[rank]*2 + 1]/*.Len*/, 3);
+    send_bits(s, s.bl_tree[bl_order[rank] * 2 + 1]/*.Len*/, 3);
   }
   //Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-  send_tree(s, s.dyn_ltree, lcodes-1); /* literal tree */
+  send_tree(s, s.dyn_ltree, lcodes - 1); /* literal tree */
   //Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-  send_tree(s, s.dyn_dtree, dcodes-1); /* distance tree */
+  send_tree(s, s.dyn_dtree, dcodes - 1); /* distance tree */
   //Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
@@ -8893,7 +11342,7 @@ function detect_data_type(s) {
 
   /* Check for non-textual ("black-listed") bytes. */
   for (n = 0; n <= 31; n++, black_mask >>>= 1) {
-    if ((black_mask & 1) && (s.dyn_ltree[n*2]/*.Freq*/ !== 0)) {
+    if ((black_mask & 1) && (s.dyn_ltree[n * 2]/*.Freq*/ !== 0)) {
       return Z_BINARY;
     }
   }
@@ -8950,7 +11399,7 @@ function _tr_stored_block(s, buf, stored_len, last)
 //ulg stored_len;   /* length of input block */
 //int last;         /* one if this is the last block for a file */
 {
-  send_bits(s, (STORED_BLOCK<<1)+(last ? 1 : 0), 3);    /* send block type */
+  send_bits(s, (STORED_BLOCK << 1) + (last ? 1 : 0), 3);    /* send block type */
   copy_block(s, buf, stored_len, true); /* with header */
 }
 
@@ -8960,7 +11409,7 @@ function _tr_stored_block(s, buf, stored_len, last)
  * This takes 10 bits, of which 7 may remain in the bit buffer.
  */
 function _tr_align(s) {
-  send_bits(s, STATIC_TREES<<1, 3);
+  send_bits(s, STATIC_TREES << 1, 3);
   send_code(s, END_BLOCK, static_ltree);
   bi_flush(s);
 }
@@ -9005,8 +11454,8 @@ function _tr_flush_block(s, buf, stored_len, last)
     max_blindex = build_bl_tree(s);
 
     /* Determine the best encoding. Compute the block lengths in bytes. */
-    opt_lenb = (s.opt_len+3+7) >>> 3;
-    static_lenb = (s.static_len+3+7) >>> 3;
+    opt_lenb = (s.opt_len + 3 + 7) >>> 3;
+    static_lenb = (s.static_len + 3 + 7) >>> 3;
 
     // Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
     //        opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
@@ -9019,7 +11468,7 @@ function _tr_flush_block(s, buf, stored_len, last)
     opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
   }
 
-  if ((stored_len+4 <= opt_lenb) && (buf !== -1)) {
+  if ((stored_len + 4 <= opt_lenb) && (buf !== -1)) {
     /* 4: two words for the lengths */
 
     /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -9032,12 +11481,12 @@ function _tr_flush_block(s, buf, stored_len, last)
 
   } else if (s.strategy === Z_FIXED || static_lenb === opt_lenb) {
 
-    send_bits(s, (STATIC_TREES<<1) + (last ? 1 : 0), 3);
+    send_bits(s, (STATIC_TREES << 1) + (last ? 1 : 0), 3);
     compress_block(s, static_ltree, static_dtree);
 
   } else {
-    send_bits(s, (DYN_TREES<<1) + (last ? 1 : 0), 3);
-    send_all_trees(s, s.l_desc.max_code+1, s.d_desc.max_code+1, max_blindex+1);
+    send_bits(s, (DYN_TREES << 1) + (last ? 1 : 0), 3);
+    send_all_trees(s, s.l_desc.max_code + 1, s.d_desc.max_code + 1, max_blindex + 1);
     compress_block(s, s.dyn_ltree, s.dyn_dtree);
   }
   // Assert (s->compressed_len == s->bits_sent, "bad compressed size");
@@ -9072,7 +11521,7 @@ function _tr_tally(s, dist, lc)
 
   if (dist === 0) {
     /* lc is the unmatched char */
-    s.dyn_ltree[lc*2]/*.Freq*/++;
+    s.dyn_ltree[lc * 2]/*.Freq*/++;
   } else {
     s.matches++;
     /* Here, lc is the match length - MIN_MATCH */
@@ -9081,7 +11530,7 @@ function _tr_tally(s, dist, lc)
     //       (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
     //       (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-    s.dyn_ltree[(_length_code[lc]+LITERALS+1) * 2]/*.Freq*/++;
+    s.dyn_ltree[(_length_code[lc] + LITERALS + 1) * 2]/*.Freq*/++;
     s.dyn_dtree[d_code(dist) * 2]/*.Freq*/++;
   }
 
@@ -9108,7 +11557,7 @@ function _tr_tally(s, dist, lc)
 //  }
 //#endif
 
-  return (s.last_lit === s.lit_bufsize-1);
+  return (s.last_lit === s.lit_bufsize - 1);
   /* We avoid equality with lit_bufsize because of wraparound at 64K
    * on 16 bit machines and because stored blocks are restricted to
    * 64K-1 bytes.
@@ -9120,9 +11569,28 @@ exports._tr_stored_block = _tr_stored_block;
 exports._tr_flush_block  = _tr_flush_block;
 exports._tr_tally = _tr_tally;
 exports._tr_align = _tr_align;
-},{"../utils/common":27}],39:[function(_dereq_,module,exports){
+
+},{"../utils/common":62}],74:[function(require,module,exports){
 'use strict';
 
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 
 function ZStream() {
   /* next input byte */
@@ -9150,6 +11618,6 @@ function ZStream() {
 }
 
 module.exports = ZStream;
-},{}]},{},[9])
-(9)
-});
+
+},{}]},{},[10])(10)
+});
\ No newline at end of file
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js
index 8b8c550763c..b9188736b73 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js
@@ -1,14 +1,15 @@
 /*!
 
-JSZip - A Javascript class for generating and reading zip files
+JSZip v3.1.5 - A JavaScript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
-(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
+(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
 Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
 
 JSZip uses the library pako released under the MIT license :
 https://github.com/nodeca/pako/blob/master/LICENSE
 */
-!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a,b){return e.deflateRaw(a,{level:b.level||-1})},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.decompressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,unixPermissions:h.unixPermissions,dosPermissions:h.dosPermissions,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?D.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",D.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this.unixPermissions=c.unixPermissions,this.dosPermissions=c.dosPermissions,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),"string"==typeof c.unixPermissions&&(c.unixPermissions=parseInt(c.unixPermissions,8)),c.unixPermissions&&16384&c.unixPermissions&&(c.dir=!0),c.dosPermissions&&16&c.dosPermissions&&(c.dir=!0),c.dir&&(a=x(a)),c.createFolders&&(e=w(a))&&y.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null,f=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a){return"/"!=a.slice(-1)&&(a+="/"),a},y=function(a,b){return b="undefined"!=typeof b?b:!1,a=x(a),this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},z=function(a,b,c){var f,g=new j;return a._data instanceof j?(g.uncompressedSize=a._data.uncompressedSize,g.crc32=a._data.crc32,0===g.uncompressedSize||a.dir?(b=i.STORE,g.compressedContent="",g.crc32=0):a._data.compressionMethod===b.magic?g.compressedContent=a._data.getCompressedContent():(f=a._data.getContent(),g.compressedContent=b.compress(d.transformTo(b.compressInputType,f),c))):(f=p(a),(!f||0===f.length||a.dir)&&(b=i.STORE,f=""),g.uncompressedSize=f.length,g.crc32=e(f),g.compressedContent=b.compress(d.transformTo(b.compressInputType,f),c)),g.compressedSize=g.compressedContent.length,g.compressionMethod=b.magic,g},A=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},B=function(a){return 63&(a||0)},C=function(a,b,c,g,h){var i,j,k,m,n=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),o=b.comment||"",p=d.transformTo("string",l.utf8encode(o)),q=n.length!==b.name.length,r=p.length!==o.length,t=b.options,u="",v="",w="";k=b._initialMetadata.dir!==b.dir?b.dir:t.dir,m=b._initialMetadata.date!==b.date?b.date:t.date;var x=0,y=0;k&&(x|=16),"UNIX"===h?(y=798,x|=A(b.unixPermissions,k)):(y=20,x|=B(b.dosPermissions,k)),i=m.getHours(),i<<=6,i|=m.getMinutes(),i<<=5,i|=m.getSeconds()/2,j=m.getFullYear()-1980,j<<=4,j|=m.getMonth()+1,j<<=5,j|=m.getDate(),q&&(v=s(1,1)+s(e(n),4)+n,u+="up"+s(v.length,2)+v),r&&(w=s(1,1)+s(this.crc32(p),4)+p,u+="uc"+s(w.length,2)+w);var z="";z+="\n\x00",z+=q||r?"\x00\b":"\x00\x00",z+=c.compressionMethod,z+=s(i,2),z+=s(j,2),z+=s(c.crc32,4),z+=s(c.compressedSize,4),z+=s(c.uncompressedSize,4),z+=s(n.length,2),z+=s(u.length,2);var C=f.LOCAL_FILE_HEADER+z+n+u,D=f.CENTRAL_FILE_HEADER+s(y,2)+z+s(p.length,2)+"\x00\x00\x00\x00"+s(x,4)+s(g,4)+n+u+p;return{fileRecord:C,dirRecord:D,compressedObject:c}},D={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=y.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",compressionOptions:null,type:"base64",platform:"DOS",comment:null,mimeType:"application/zip"}),d.checkSupport(a.type),("darwin"===a.platform||"freebsd"===a.platform||"linux"===a.platform||"sunos"===a.platform)&&(a.platform="UNIX"),"win32"===a.platform&&(a.platform="DOS");var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=o.options.compressionOptions||a.compressionOptions||{},u=z.call(this,o,q,r),v=C.call(this,l,o,u,g,a.platform);g+=v.fileRecord.length+u.compressedSize,j+=v.dirRecord.length,e.push(v)}var w="";w=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var x=a.type.toLowerCase();for(b="uint8array"===x||"arraybuffer"===x||"blob"===x||"nodebuffer"===x?new n(g+j+w.length):new m(g+j+w.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(w);var y=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),y);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",y),a.mimeType);case"base64":return a.base64?h.encode(y):y;default:return y}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=D},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(e.uint8array?k(a.subarray(c,h)):k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a,b){c.checkSupport("blob"),b=b||"application/zip";try{return new Blob([a],{type:b})}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;return f.append(a),f.getBlob(b)}catch(d){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8(),b.processAttributes()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a){var b=!0;try{this.reader.setIndex(0),this.checkSignature(h.LOCAL_FILE_HEADER),b=!1}catch(c){}throw new Error(b?"Can't find end of central directory : is this a zip file ? If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html":"Corrupted zip : can't find end of central directory")}if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object"),h=0,i=3;c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.decompressed=new f,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=e.transformTo("string",this.decompressed.getContent()),g.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readInt(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var a=this.versionMadeBy>>8;this.dir=16&this.externalFileAttributes?!0:!1,a===h&&(this.dosPermissions=63&this.externalFileAttributes),a===i&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileName.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))
-}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header)};s.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?m:l,e.input="string"==typeof a?i.string2buf(a):a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new h.Buf8(f),e.next_out=0,e.avail_out=f),c=g.deflate(e,d),c!==o&&c!==n)return this.onEnd(c),this.ended=!0,!1;(0===e.avail_out||0===e.avail_in&&d===m)&&this.onData("string"===this.options.to?i.buf2binstring(h.shrinkBuf(e.output,e.next_out)):h.shrinkBuf(e.output,e.next_out))}while((e.avail_in>0||0===e.avail_out)&&c!==o);return d===m?(c=g.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===n):!0},s.prototype.onData=function(a){this.chunks.push(a)},s.prototype.onEnd=function(a){a===n&&(this.result="string"===this.options.to?this.chunks.join(""):h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=s,c.deflate=d,c.deflateRaw=e,c.gzip=f},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(a,b,c){"use strict";function d(a,b){var c=new m(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}var f=a("./zlib/inflate.js"),g=a("./utils/common"),h=a("./utils/strings"),i=a("./zlib/constants"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=a("./zlib/gzheader"),m=function(a){this.options=g.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=f.inflateInit2(this.strm,b.windowBits);if(c!==i.Z_OK)throw new Error(j[c]);this.header=new l,f.inflateGetHeader(this.strm,this.header)};m.prototype.push=function(a,b){var c,d,e,j,k,l=this.strm,m=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?i.Z_FINISH:i.Z_NO_FLUSH,l.input="string"==typeof a?h.binstring2buf(a):a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new g.Buf8(m),l.next_out=0,l.avail_out=m),c=f.inflate(l,i.Z_NO_FLUSH),c!==i.Z_STREAM_END&&c!==i.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0===l.avail_out||c===i.Z_STREAM_END||0===l.avail_in&&d===i.Z_FINISH)&&("string"===this.options.to?(e=h.utf8border(l.output,l.next_out),j=l.next_out-e,k=h.buf2string(l.output,e),l.next_out=j,l.avail_out=m-j,j&&g.arraySet(l.output,l.output,e,j,0),this.onData(k)):this.onData(g.shrinkBuf(l.output,l.next_out)))}while(l.avail_in>0&&c!==i.Z_STREAM_END);return c===i.Z_STREAM_END&&(d=i.Z_FINISH),d===i.Z_FINISH?(c=f.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===i.Z_OK):!0},m.prototype.onData=function(a){this.chunks.push(a)},m.prototype.onEnd=function(a){a===i.Z_OK&&(this.result="string"===this.options.to?this.chunks.join(""):g.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=m,c.inflate=d,c.inflateRaw=e,c.ungzip=d},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],28:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":27}],29:[function(a,b){"use strict";function c(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=c},{}],30:[function(a,b){b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],31:[function(a,b){"use strict";function c(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function d(a,b,c,d){var f=e,g=d+c;a=-1^a;for(var h=d;g>h;h++)a=a>>>8^f[255&(a^b[h])];return-1^a}var e=c();b.exports=d},{}],32:[function(a,b,c){"use strict";function d(a,b){return a.msg=G[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(C.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){D._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,C.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=E(a.adler,b,e,c):2===a.state.wrap&&(a.adler=F(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-jb?a.strstart-(a.w_size-jb):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ib,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ib-(m-f),f=m-ib,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-jb)){C.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=hb)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+hb-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<hb)););}while(a.lookahead<jb&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===H)return sb;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return sb;if(a.strstart-a.block_start>=a.w_size-jb&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?sb:sb}function o(a,b){for(var c,d;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c)),a.match_length>=hb)if(d=D._tr_tally(a,a.strstart-a.match_start,a.match_length-hb),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=hb){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function p(a,b){for(var c,d,e;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=hb-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===S||a.match_length===hb&&a.strstart-a.match_start>4096)&&(a.match_length=hb-1)),a.prev_length>=hb&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-hb,d=D._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-hb),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=hb-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return sb}else if(a.match_available){if(d=D._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return sb}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=D._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ib){if(m(a),a.lookahead<=ib&&b===H)return sb;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=hb&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ib;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ib-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=hb?(c=D._tr_tally(a,1,a.match_length-hb),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===H)return sb;break}if(a.match_length=0,c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function s(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=B[a.level].max_lazy,a.good_match=B[a.level].good_length,a.nice_match=B[a.level].nice_length,a.max_chain_length=B[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=hb-1,a.match_available=0,a.ins_h=0}function t(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Y,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new C.Buf16(2*fb),this.dyn_dtree=new C.Buf16(2*(2*db+1)),this.bl_tree=new C.Buf16(2*(2*eb+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new C.Buf16(gb+1),this.heap=new C.Buf16(2*cb+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new C.Buf16(2*cb+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function u(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=X,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?lb:qb,a.adler=2===b.wrap?0:1,b.last_flush=H,D._tr_init(b),M):d(a,O)}function v(a){var b=u(a);return b===M&&s(a.state),b}function w(a,b){return a&&a.state?2!==a.state.wrap?O:(a.state.gzhead=b,M):O}function x(a,b,c,e,f,g){if(!a)return O;var h=1;if(b===R&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>Z||c!==Y||8>e||e>15||0>b||b>9||0>g||g>V)return d(a,O);8===e&&(e=9);var i=new t;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+hb-1)/hb),i.window=new C.Buf8(2*i.w_size),i.head=new C.Buf16(i.hash_size),i.prev=new C.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new C.Buf8(i.pending_buf_size),i.d_buf=i.lit_bufsize>>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,v(a)}function y(a,b){return x(a,b,Y,$,_,W)}function z(a,b){var c,h,k,l;if(!a||!a.state||b>L||0>b)return a?d(a,O):O;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===rb&&b!==K)return d(a,0===a.avail_out?Q:O);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===lb)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=F(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=mb):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,wb),h.status=qb);else{var m=Y+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=T||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=kb),m+=31-m%31,h.status=qb,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===mb)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=nb)}else h.status=nb;if(h.status===nb)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=ob)}else h.status=ob;if(h.status===ob)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=pb)}else h.status=pb;if(h.status===pb&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=qb)):h.status=qb),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,M}else if(0===a.avail_in&&e(b)<=e(c)&&b!==K)return d(a,Q);if(h.status===rb&&0!==a.avail_in)return d(a,Q);if(0!==a.avail_in||0!==h.lookahead||b!==H&&h.status!==rb){var o=h.strategy===T?r(h,b):h.strategy===U?q(h,b):B[h.level].func(h,b);if((o===ub||o===vb)&&(h.status=rb),o===sb||o===ub)return 0===a.avail_out&&(h.last_flush=-1),M;if(o===tb&&(b===I?D._tr_align(h):b!==L&&(D._tr_stored_block(h,0,0,!1),b===J&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,M}return b!==K?M:h.wrap<=0?N:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?M:N)}function A(a){var b;return a&&a.state?(b=a.state.status,b!==lb&&b!==mb&&b!==nb&&b!==ob&&b!==pb&&b!==qb&&b!==rb?d(a,O):(a.state=null,b===qb?d(a,P):M)):O}var B,C=a("../utils/common"),D=a("./trees"),E=a("./adler32"),F=a("./crc32"),G=a("./messages"),H=0,I=1,J=3,K=4,L=5,M=0,N=1,O=-2,P=-3,Q=-5,R=-1,S=1,T=2,U=3,V=4,W=0,X=2,Y=8,Z=9,$=15,_=8,ab=29,bb=256,cb=bb+1+ab,db=30,eb=19,fb=2*cb+1,gb=15,hb=3,ib=258,jb=ib+hb+1,kb=32,lb=42,mb=69,nb=73,ob=91,pb=103,qb=113,rb=666,sb=1,tb=2,ub=3,vb=4,wb=3,xb=function(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e};B=[new xb(0,0,0,0,n),new xb(4,4,8,4,o),new xb(4,5,16,8,o),new xb(4,6,32,32,o),new xb(4,4,16,16,p),new xb(8,16,32,32,p),new xb(8,16,128,128,p),new xb(8,32,128,256,p),new xb(32,128,258,1024,p),new xb(32,258,258,4096,p)],c.deflateInit=y,c.deflateInit2=x,c.deflateReset=v,c.deflateResetKeep=u,c.deflateSetHeader=w,c.deflate=z,c.deflateEnd=A,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(a,b){"use strict";function c(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=c},{}],34:[function(a,b){"use strict";var c=30,d=12;b.exports=function(a,b){var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;e=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=e.dmax,l=e.wsize,m=e.whave,n=e.wnext,o=e.window,p=e.hold,q=e.bits,r=e.lencode,s=e.distcode,t=(1<<e.lenbits)-1,u=(1<<e.distbits)-1;a:do{15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){e.mode=d;break a}a.msg="invalid literal/length code",e.mode=c;break a}x=65535&v,w&=15,w&&(w>q&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",e.mode=c;break a}if(y=65535&v,w&=15,w>q&&(p+=B[f++]<<q,q+=8,w>q&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",e.mode=c;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&e.sane){a.msg="invalid distance too far back",e.mode=c;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=g>f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),e.hold=p,e.bits=q}},{}],35:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(ob),b.distcode=b.distdyn=new r.Buf32(pb),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,rb)}function k(a){if(sb){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sb=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new r.Buf8(f.wsize)),d>=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,ob,pb,qb,rb,sb,tb,ub,vb,wb,xb,yb,zb,Ab=0,Bb=new r.Buf8(4),Cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return F;c=a.state,c.mode===V&&(c.mode=W),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xb=C;a:for(;;)switch(c.mode){case K:if(0===c.wrap){c.mode=W;break}for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=lb;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=lb;break}if(m>>>=4,n-=4,wb=(15&m)+8,0===c.wbits)c.wbits=wb;else if(wb>c.wbits){a.msg="invalid window size",c.mode=lb;break}c.dmax=1<<wb,a.adler=c.check=1,c.mode=512&m?T:V,m=0,n=0;break;case L:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==J){a.msg="unknown compression method",c.mode=lb;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=lb;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,Bb[2]=m>>>16&255,Bb[3]=m>>>24&255,c.check=t(c.check,Bb,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wb=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wb)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.name+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.comment+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=lb;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=U;case U:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,E;a.adler=c.check=1,c.mode=V;case V:if(b===A||b===B)break a;case W:if(c.last){m>>>=7&n,n-=7&n,c.mode=ib;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=bb,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=lb}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=lb;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=lb;break}c.have=0,c.mode=_;case _:for(;c.have<c.ncode;){for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Cb[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Cb[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,yb={bits:c.lenbits},xb=v(w,c.lens,0,19,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid code lengths set",c.mode=lb;break}c.have=0,c.mode=ab;case ab:for(;c.have<c.nlen+c.ndist;){for(;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(16>sb)m>>>=qb,n-=qb,c.lens[c.have++]=sb;else{if(16===sb){for(zb=qb+2;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qb,n-=qb,0===c.have){a.msg="invalid bit length repeat",c.mode=lb;break}wb=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sb){for(zb=qb+3;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=3+(7&m),m>>>=3,n-=3}else{for(zb=qb+7;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=lb;break}for(;q--;)c.lens[c.have++]=wb}}if(c.mode===lb)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=lb;break}if(c.lenbits=9,yb={bits:c.lenbits},xb=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid literal/lengths set",c.mode=lb;break}if(c.distbits=6,c.distcode=c.distdyn,yb={bits:c.distbits},xb=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,yb),c.distbits=yb.bits,xb){a.msg="invalid distances set",c.mode=lb;break}if(c.mode=bb,b===B)break a;case bb:c.mode=cb;case cb:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1);
-break}for(c.back=0;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(rb&&0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.lencode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,c.length=sb,0===rb){c.mode=hb;break}if(32&rb){c.back=-1,c.mode=V;break}if(64&rb){a.msg="invalid literal/length code",c.mode=lb;break}c.extra=15&rb,c.mode=db;case db:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=eb;case eb:for(;Ab=c.distcode[m&(1<<c.distbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.distcode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,64&rb){a.msg="invalid distance code",c.mode=lb;break}c.offset=sb,c.extra=15&rb,c.mode=fb;case fb:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=lb;break}c.mode=gb;case gb:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=lb;break}q>c.wnext?(q-=c.wnext,ob=c.wsize-q):ob=c.wnext-q,q>c.length&&(q=c.length),pb=c.window}else pb=f,ob=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pb[ob++];while(--q);0===c.length&&(c.mode=cb);break;case hb:if(0===j)break a;f[h++]=c.length,j--,c.mode=cb;break;case ib:if(c.wrap){for(;32>n;){if(0===i)break a;i--,m|=e[g++]<<n,n+=8}if(p-=j,a.total_out+=p,c.total+=p,p&&(a.adler=c.check=c.flags?t(c.check,f,p,h-p):s(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=lb;break}m=0,n=0}c.mode=jb;case jb:if(c.wrap&&c.flags){for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=lb;break}m=0,n=0}c.mode=kb;case kb:xb=D;break a;case lb:xb=G;break a;case mb:return H;case nb:default:return F}return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,(c.wsize||p!==a.avail_out&&c.mode<lb&&(c.mode<ib||b!==z))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=mb,H):(o-=a.avail_in,p-=a.avail_out,a.total_in+=o,a.total_out+=p,c.total+=p,c.wrap&&p&&(a.adler=c.check=c.flags?t(c.check,f,p,a.next_out-p):s(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===V?128:0)+(c.mode===bb||c.mode===Y?256:0),(0===o&&0===p||b===z)&&xb===C&&(xb=I),xb)}function n(a){if(!a||!a.state)return F;var b=a.state;return b.window&&(b.window=null),a.state=null,C}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?F:(c.head=b,b.done=!1,C)):F}var p,q,r=a("../utils/common"),s=a("./adler32"),t=a("./crc32"),u=a("./inffast"),v=a("./inftrees"),w=0,x=1,y=2,z=4,A=5,B=6,C=0,D=1,E=2,F=-2,G=-3,H=-4,I=-5,J=8,K=1,L=2,M=3,N=4,O=5,P=6,Q=7,R=8,S=9,T=10,U=11,V=12,W=13,X=14,Y=15,Z=16,$=17,_=18,ab=19,bb=20,cb=21,db=22,eb=23,fb=24,gb=25,hb=26,ib=27,jb=28,kb=29,lb=30,mb=31,nb=32,ob=852,pb=592,qb=15,rb=qb,sb=!0;c.inflateReset=g,c.inflateReset2=h,c.inflateResetKeep=f,c.inflateInit=j,c.inflateInit2=i,c.inflate=m,c.inflateEnd=n,c.inflateGetHeader=o,c.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(a,b){"use strict";var c=a("../utils/common"),d=15,e=852,f=592,g=0,h=1,i=2,j=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],k=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],l=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],m=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];b.exports=function(a,b,n,o,p,q,r,s){var t,u,v,w,x,y,z,A,B,C=s.bits,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=null,O=0,P=new c.Buf16(d+1),Q=new c.Buf16(d+1),R=null,S=0;for(D=0;d>=D;D++)P[D]=0;for(E=0;o>E;E++)P[b[n+E]]++;for(H=C,G=d;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;d>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===g||1!==G))return-1;for(Q[1]=0,D=1;d>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;E++)0!==b[n+E]&&(r[Q[b[n+E]]++]=E);if(a===g?(N=R=r,y=19):a===h?(N=j,O-=257,R=k,S-=257,y=256):(N=l,R=m,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<<H,w=L-1,a===h&&L>e||a===i&&L>f)return 1;for(var T=0;;){T++,z=D-J,r[E]<y?(A=0,B=r[E]):r[E]>y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<<D-J,u=1<<I,F=u;do u-=t,p[x+(M>>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<<D-1;M&t;)t>>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[n+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<<I;G>I+J&&(K-=P[I+J],!(0>=K));)I++,K<<=1;if(L+=1<<I,a===h&&L>e||a===i&&L>f)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":27}],37:[function(a,b){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],38:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a){return 256>a?gb[a]:gb[256+(a>>>7)]}function f(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function g(a,b,c){a.bi_valid>V-c?(a.bi_buf|=b<<a.bi_valid&65535,f(a,a.bi_buf),a.bi_buf=b>>V-a.bi_valid,a.bi_valid+=c-V):(a.bi_buf|=b<<a.bi_valid&65535,a.bi_valid+=c)}function h(a,b,c){g(a,c[2*b],c[2*b+1])}function i(a,b){var c=0;do c|=1&a,a>>>=1,c<<=1;while(--b>0);return c>>>1}function j(a){16===a.bi_valid?(f(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function k(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;U>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;T>c;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function l(a,b,c){var d,e,f=new Array(U+1),g=0;for(d=1;U>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;e++){var h=a[2*e+1];0!==h&&(a[2*e]=i(f[h]++,h))}}function m(){var a,b,c,d,e,f=new Array(U+1);for(c=0,d=0;O-1>d;d++)for(ib[d]=c,a=0;a<1<<_[d];a++)hb[c++]=d;for(hb[c-1]=d,e=0,d=0;16>d;d++)for(jb[d]=e,a=0;a<1<<ab[d];a++)gb[e++]=d;for(e>>=7;R>d;d++)for(jb[d]=e<<7,a=0;a<1<<ab[d]-7;a++)gb[256+e++]=d;for(b=0;U>=b;b++)f[b]=0;for(a=0;143>=a;)eb[2*a+1]=8,a++,f[8]++;for(;255>=a;)eb[2*a+1]=9,a++,f[9]++;for(;279>=a;)eb[2*a+1]=7,a++,f[7]++;for(;287>=a;)eb[2*a+1]=8,a++,f[8]++;for(l(eb,Q+1,f),a=0;R>a;a++)fb[2*a+1]=5,fb[2*a]=i(a,5);kb=new nb(eb,_,P+1,Q,U),lb=new nb(fb,ab,0,R,U),mb=new nb(new Array(0),bb,0,S,W)}function n(a){var b;for(b=0;Q>b;b++)a.dyn_ltree[2*b]=0;for(b=0;R>b;b++)a.dyn_dtree[2*b]=0;for(b=0;S>b;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*X]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function o(a){a.bi_valid>8?f(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function p(a,b,c,d){o(a),d&&(f(a,c),f(a,~c)),E.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function q(a,b,c,d){var e=2*b,f=2*c;return a[e]<a[f]||a[e]===a[f]&&d[b]<=d[c]}function r(a,b,c){for(var d=a.heap[c],e=c<<1;e<=a.heap_len&&(e<a.heap_len&&q(b,a.heap[e+1],a.heap[e],a.depth)&&e++,!q(b,d,a.heap[e],a.depth));)a.heap[c]=a.heap[e],c=e,e<<=1;a.heap[c]=d}function s(a,b,c){var d,f,i,j,k=0;if(0!==a.last_lit)do d=a.pending_buf[a.d_buf+2*k]<<8|a.pending_buf[a.d_buf+2*k+1],f=a.pending_buf[a.l_buf+k],k++,0===d?h(a,f,b):(i=hb[f],h(a,i+P+1,b),j=_[i],0!==j&&(f-=ib[i],g(a,f,j)),d--,i=e(d),h(a,i,c),j=ab[i],0!==j&&(d-=jb[i],g(a,d,j)));while(k<a.last_lit);h(a,X,b)}function t(a,b){var c,d,e,f=b.dyn_tree,g=b.stat_desc.static_tree,h=b.stat_desc.has_stree,i=b.stat_desc.elems,j=-1;for(a.heap_len=0,a.heap_max=T,c=0;i>c;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=2>j?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)r(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],r(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,r(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],k(a,b),l(f,j,a.bl_count)}function u(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;c>=d;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(j>h?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*Y]++):10>=h?a.bl_tree[2*Z]++:a.bl_tree[2*$]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function v(a,b,c){var d,e,f=-1,i=b[1],j=0,k=7,l=4;for(0===i&&(k=138,l=3),d=0;c>=d;d++)if(e=i,i=b[2*(d+1)+1],!(++j<k&&e===i)){if(l>j){do h(a,e,a.bl_tree);while(0!==--j)}else 0!==e?(e!==f&&(h(a,e,a.bl_tree),j--),h(a,Y,a.bl_tree),g(a,j-3,2)):10>=j?(h(a,Z,a.bl_tree),g(a,j-3,3)):(h(a,$,a.bl_tree),g(a,j-11,7));j=0,f=e,0===i?(k=138,l=3):e===i?(k=6,l=3):(k=7,l=4)}}function w(a){var b;for(u(a,a.dyn_ltree,a.l_desc.max_code),u(a,a.dyn_dtree,a.d_desc.max_code),t(a,a.bl_desc),b=S-1;b>=3&&0===a.bl_tree[2*cb[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function x(a,b,c,d){var e;for(g(a,b-257,5),g(a,c-1,5),g(a,d-4,4),e=0;d>e;e++)g(a,a.bl_tree[2*cb[e]+1],3);v(a,a.dyn_ltree,b-1),v(a,a.dyn_dtree,c-1)}function y(a){var b,c=4093624447;for(b=0;31>=b;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return G;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return H;for(b=32;P>b;b++)if(0!==a.dyn_ltree[2*b])return H;return G}function z(a){pb||(m(),pb=!0),a.l_desc=new ob(a.dyn_ltree,kb),a.d_desc=new ob(a.dyn_dtree,lb),a.bl_desc=new ob(a.bl_tree,mb),a.bi_buf=0,a.bi_valid=0,n(a)}function A(a,b,c,d){g(a,(J<<1)+(d?1:0),3),p(a,b,c,!0)}function B(a){g(a,K<<1,3),h(a,X,eb),j(a)}function C(a,b,c,d){var e,f,h=0;a.level>0?(a.strm.data_type===I&&(a.strm.data_type=y(a)),t(a,a.l_desc),t(a,a.d_desc),h=w(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?A(a,b,c,d):a.strategy===F||f===e?(g(a,(K<<1)+(d?1:0),3),s(a,eb,fb)):(g(a,(L<<1)+(d?1:0),3),x(a,a.l_desc.max_code+1,a.d_desc.max_code+1,h+1),s(a,a.dyn_ltree,a.dyn_dtree)),n(a),d&&o(a)}function D(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(hb[c]+P+1)]++,a.dyn_dtree[2*e(b)]++),a.last_lit===a.lit_bufsize-1}var E=a("../utils/common"),F=4,G=0,H=1,I=2,J=0,K=1,L=2,M=3,N=258,O=29,P=256,Q=P+1+O,R=30,S=19,T=2*Q+1,U=15,V=16,W=7,X=256,Y=16,Z=17,$=18,_=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ab=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],bb=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],db=512,eb=new Array(2*(Q+2));d(eb);var fb=new Array(2*R);d(fb);var gb=new Array(db);d(gb);var hb=new Array(N-M+1);d(hb);var ib=new Array(O);d(ib);var jb=new Array(R);d(jb);var kb,lb,mb,nb=function(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length},ob=function(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b},pb=!1;c._tr_init=z,c._tr_stored_block=A,c._tr_flush_block=C,c._tr_tally=D,c._tr_align=B},{"../utils/common":27}],39:[function(a,b){"use strict";function c(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=c},{}]},{},[9])(9)});
+!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d=a("./utils"),e=a("./support"),f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,g,h,i,j,k=[],l=0,m=a.length,n=m,o="string"!==d.getTypeOf(a);l<a.length;)n=m-l,o?(b=a[l++],c=l<m?a[l++]:0,e=l<m?a[l++]:0):(b=a.charCodeAt(l++),c=l<m?a.charCodeAt(l++):0,e=l<m?a.charCodeAt(l++):0),g=b>>2,h=(3&b)<<4|c>>4,i=n>1?(15&c)<<2|e>>6:64,j=n>2?63&e:64,k.push(f.charAt(g)+f.charAt(h)+f.charAt(i)+f.charAt(j));return k.join("")},c.decode=function(a){var b,c,d,g,h,i,j,k=0,l=0,m="data:";if(a.substr(0,m.length)===m)throw new Error("Invalid base64 input, it looks like a data url.");a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");var n=3*a.length/4;if(a.charAt(a.length-1)===f.charAt(64)&&n--,a.charAt(a.length-2)===f.charAt(64)&&n--,n%1!==0)throw new Error("Invalid base64 input, bad content length.");var o;for(o=e.uint8array?new Uint8Array(0|n):new Array(0|n);k<a.length;)g=f.indexOf(a.charAt(k++)),h=f.indexOf(a.charAt(k++)),i=f.indexOf(a.charAt(k++)),j=f.indexOf(a.charAt(k++)),b=g<<2|h>>4,c=(15&h)<<4|i>>2,d=(3&i)<<6|j,o[l++]=b,64!==i&&(o[l++]=c),64!==j&&(o[l++]=d);return o}},{"./support":30,"./utils":32}],2:[function(a,b,c){"use strict";function d(a,b,c,d,e){this.compressedSize=a,this.uncompressedSize=b,this.crc32=c,this.compression=d,this.compressedContent=e}var e=a("./external"),f=a("./stream/DataWorker"),g=a("./stream/DataLengthProbe"),h=a("./stream/Crc32Probe"),g=a("./stream/DataLengthProbe");d.prototype={getContentWorker:function(){var a=new f(e.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new g("data_length")),b=this;return a.on("end",function(){if(this.streamInfo.data_length!==b.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),a},getCompressedWorker:function(){return new f(e.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},d.createWorkerFrom=function(a,b,c){return a.pipe(new h).pipe(new g("uncompressedSize")).pipe(b.compressWorker(c)).pipe(new g("compressedSize")).withStreamInfo("compression",b)},b.exports=d},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(a,b,c){"use strict";var d=a("./stream/GenericWorker");c.STORE={magic:"\0\0",compressWorker:function(a){return new d("STORE compression")},uncompressWorker:function(){return new d("STORE decompression")}},c.DEFLATE=a("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;c<256;c++){a=c;for(var d=0;d<8;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function e(a,b,c,d){var e=h,f=d+c;a^=-1;for(var g=d;g<f;g++)a=a>>>8^e[255&(a^b[g])];return a^-1}function f(a,b,c,d){var e=h,f=d+c;a^=-1;for(var g=d;g<f;g++)a=a>>>8^e[255&(a^b.charCodeAt(g))];return a^-1}var g=a("./utils"),h=d();b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var c="string"!==g.getTypeOf(a);return c?e(0|b,a,a.length,0):f(0|b,a,a.length,0)}},{"./utils":32}],5:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!0,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],6:[function(a,b,c){"use strict";var d=null;d="undefined"!=typeof Promise?Promise:a("lie"),b.exports={Promise:d}},{lie:58}],7:[function(a,b,c){"use strict";function d(a,b){h.call(this,"FlateWorker/"+a),this._pako=null,this._pakoAction=a,this._pakoOptions=b,this.meta={}}var e="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,f=a("pako"),g=a("./utils"),h=a("./stream/GenericWorker"),i=e?"uint8array":"array";c.magic="\b\0",g.inherits(d,h),d.prototype.processChunk=function(a){this.meta=a.meta,null===this._pako&&this._createPako(),this._pako.push(g.transformTo(i,a.data),!1)},d.prototype.flush=function(){h.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},d.prototype.cleanUp=function(){h.prototype.cleanUp.call(this),this._pako=null},d.prototype._createPako=function(){this._pako=new f[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var a=this;this._pako.onData=function(b){a.push({data:b,meta:a.meta})}},c.compressWorker=function(a){return new d("Deflate",a)},c.uncompressWorker=function(){return new d("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:59}],8:[function(a,b,c){"use strict";function d(a,b,c,d){f.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=b,this.zipPlatform=c,this.encodeFileName=d,this.streamFiles=a,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}var e=a("../utils"),f=a("../stream/GenericWorker"),g=a("../utf8"),h=a("../crc32"),i=a("../signature"),j=function(a,b){var c,d="";for(c=0;c<b;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},k=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},l=function(a,b){return 63&(a||0)},m=function(a,b,c,d,f,m){var n,o,p=a.file,q=a.compression,r=m!==g.utf8encode,s=e.transformTo("string",m(p.name)),t=e.transformTo("string",g.utf8encode(p.name)),u=p.comment,v=e.transformTo("string",m(u)),w=e.transformTo("string",g.utf8encode(u)),x=t.length!==p.name.length,y=w.length!==u.length,z="",A="",B="",C=p.dir,D=p.date,E={crc32:0,compressedSize:0,uncompressedSize:0};b&&!c||(E.crc32=a.crc32,E.compressedSize=a.compressedSize,E.uncompressedSize=a.uncompressedSize);var F=0;b&&(F|=8),r||!x&&!y||(F|=2048);var G=0,H=0;C&&(G|=16),"UNIX"===f?(H=798,G|=k(p.unixPermissions,C)):(H=20,G|=l(p.dosPermissions,C)),n=D.getUTCHours(),n<<=6,n|=D.getUTCMinutes(),n<<=5,n|=D.getUTCSeconds()/2,o=D.getUTCFullYear()-1980,o<<=4,o|=D.getUTCMonth()+1,o<<=5,o|=D.getUTCDate(),x&&(A=j(1,1)+j(h(s),4)+t,z+="up"+j(A.length,2)+A),y&&(B=j(1,1)+j(h(v),4)+w,z+="uc"+j(B.length,2)+B);var I="";I+="\n\0",I+=j(F,2),I+=q.magic,I+=j(n,2),I+=j(o,2),I+=j(E.crc32,4),I+=j(E.compressedSize,4),I+=j(E.uncompressedSize,4),I+=j(s.length,2),I+=j(z.length,2);var J=i.LOCAL_FILE_HEADER+I+s+z,K=i.CENTRAL_FILE_HEADER+j(H,2)+I+j(v.length,2)+"\0\0\0\0"+j(G,4)+j(d,4)+s+z+v;return{fileRecord:J,dirRecord:K}},n=function(a,b,c,d,f){var g="",h=e.transformTo("string",f(d));return g=i.CENTRAL_DIRECTORY_END+"\0\0\0\0"+j(a,2)+j(a,2)+j(b,4)+j(c,4)+j(h.length,2)+h},o=function(a){var b="";return b=i.DATA_DESCRIPTOR+j(a.crc32,4)+j(a.compressedSize,4)+j(a.uncompressedSize,4)};e.inherits(d,f),d.prototype.push=function(a){var b=a.meta.percent||0,c=this.entriesCount,d=this._sources.length;this.accumulate?this.contentBuffer.push(a):(this.bytesWritten+=a.data.length,f.prototype.push.call(this,{data:a.data,meta:{currentFile:this.currentFile,percent:c?(b+100*(c-d-1))/c:100}}))},d.prototype.openedSource=function(a){this.currentSourceOffset=this.bytesWritten,this.currentFile=a.file.name;var b=this.streamFiles&&!a.file.dir;if(b){var c=m(a,b,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:c.fileRecord,meta:{percent:0}})}else this.accumulate=!0},d.prototype.closedSource=function(a){this.accumulate=!1;var b=this.streamFiles&&!a.file.dir,c=m(a,b,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(c.dirRecord),b)this.push({data:o(a),meta:{percent:100}});else for(this.push({data:c.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},d.prototype.flush=function(){for(var a=this.bytesWritten,b=0;b<this.dirRecords.length;b++)this.push({data:this.dirRecords[b],meta:{percent:100}});var c=this.bytesWritten-a,d=n(this.dirRecords.length,c,a,this.zipComment,this.encodeFileName);this.push({data:d,meta:{percent:100}})},d.prototype.prepareNextSource=function(){this.previous=this._sources.shift(),this.openedSource(this.previous.streamInfo),this.isPaused?this.previous.pause():this.previous.resume()},d.prototype.registerPrevious=function(a){this._sources.push(a);var b=this;return a.on("data",function(a){b.processChunk(a)}),a.on("end",function(){b.closedSource(b.previous.streamInfo),b._sources.length?b.prepareNextSource():b.end()}),a.on("error",function(a){b.error(a)}),this},d.prototype.resume=function(){return!!f.prototype.resume.call(this)&&(!this.previous&&this._sources.length?(this.prepareNextSource(),!0):this.previous||this._sources.length||this.generatedError?void 0:(this.end(),!0))},d.prototype.error=function(a){var b=this._sources;if(!f.prototype.error.call(this,a))return!1;for(var c=0;c<b.length;c++)try{b[c].error(a)}catch(a){}return!0},d.prototype.lock=function(){f.prototype.lock.call(this);for(var a=this._sources,b=0;b<a.length;b++)a[b].lock()},b.exports=d},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(a,b,c){"use strict";var d=a("../compressions"),e=a("./ZipFileWorker"),f=function(a,b){var c=a||b,e=d[c];if(!e)throw new Error(c+" is not a valid compression method !");return e};c.generateWorker=function(a,b,c){var d=new e(b.streamFiles,c,b.platform,b.encodeFileName),g=0;try{a.forEach(function(a,c){g++;var e=f(c.options.compression,b.compression),h=c.options.compressionOptions||b.compressionOptions||{},i=c.dir,j=c.date;c._compressWorker(e,h).withStreamInfo("file",{name:a,dir:i,date:j,comment:c.comment||"",unixPermissions:c.unixPermissions,dosPermissions:c.dosPermissions}).pipe(d)}),d.entriesCount=g}catch(h){d.error(h)}return d}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(a,b,c){"use strict";function d(){if(!(this instanceof d))return new d;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files={},this.comment=null,this.root="",this.clone=function(){var a=new d;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a}}d.prototype=a("./object"),d.prototype.loadAsync=a("./load"),d.support=a("./support"),d.defaults=a("./defaults"),d.version="3.1.5",d.loadAsync=function(a,b){return(new d).loadAsync(a,b)},d.external=a("./external"),b.exports=d},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(a,b,c){"use strict";function d(a){return new f.Promise(function(b,c){var d=a.decompressed.getContentWorker().pipe(new i);d.on("error",function(a){c(a)}).on("end",function(){d.streamInfo.crc32!==a.decompressed.crc32?c(new Error("Corrupted zip : CRC32 mismatch")):b()}).resume()})}var e=a("./utils"),f=a("./external"),g=a("./utf8"),e=a("./utils"),h=a("./zipEntries"),i=a("./stream/Crc32Probe"),j=a("./nodejsUtils");b.exports=function(a,b){var c=this;return b=e.extend(b||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:g.utf8decode}),j.isNode&&j.isStream(a)?f.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):e.prepareContent("the loaded zip file",a,!0,b.optimizedBinaryString,b.base64).then(function(a){var c=new h(b);return c.load(a),c}).then(function(a){var c=[f.Promise.resolve(a)],e=a.files;if(b.checkCRC32)for(var g=0;g<e.length;g++)c.push(d(e[g]));return f.Promise.all(c)}).then(function(a){for(var d=a.shift(),e=d.files,f=0;f<e.length;f++){var g=e[f];c.file(g.fileNameStr,g.decompressed,{binary:!0,optimizedBinaryString:!0,date:g.date,dir:g.dir,comment:g.fileCommentStr.length?g.fileCommentStr:null,unixPermissions:g.unixPermissions,dosPermissions:g.dosPermissions,createFolders:b.createFolders})}return d.zipComment.length&&(c.comment=d.zipComment),c})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(a,b,c){"use strict";function d(a,b){f.call(this,"Nodejs stream input adapter for "+a),this._upstreamEnded=!1,this._bindStream(b)}var e=a("../utils"),f=a("../stream/GenericWorker");e.inherits(d,f),d.prototype._bindStream=function(a){var b=this;this._stream=a,a.pause(),a.on("data",function(a){b.push({data:a,meta:{percent:0}})}).on("error",function(a){b.isPaused?this.generatedError=a:b.error(a)}).on("end",function(){b.isPaused?b._upstreamEnded=!0:b.end()})},d.prototype.pause=function(){return!!f.prototype.pause.call(this)&&(this._stream.pause(),!0)},d.prototype.resume=function(){return!!f.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},b.exports=d},{"../stream/GenericWorker":28,"../utils":32}],13:[function(a,b,c){"use strict";function d(a,b,c){e.call(this,b),this._helper=a;var d=this;a.on("data",function(a,b){d.push(a)||d._helper.pause(),c&&c(b)}).on("error",function(a){d.emit("error",a)}).on("end",function(){d.push(null)})}var e=a("readable-stream").Readable,f=a("../utils");f.inherits(d,e),d.prototype._read=function(){this._helper.resume()},b.exports=d},{"../utils":32,"readable-stream":16}],14:[function(a,b,c){"use strict";b.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(a,b){return new Buffer(a,b)},allocBuffer:function(a){return Buffer.alloc?Buffer.alloc(a):new Buffer(a)},isBuffer:function(a){return Buffer.isBuffer(a)},isStream:function(a){return a&&"function"==typeof a.on&&"function"==typeof a.pause&&"function"==typeof a.resume}}},{}],15:[function(a,b,c){"use strict";function d(a){return"[object RegExp]"===Object.prototype.toString.call(a)}var e=a("./utf8"),f=a("./utils"),g=a("./stream/GenericWorker"),h=a("./stream/StreamHelper"),i=a("./defaults"),j=a("./compressedObject"),k=a("./zipObject"),l=a("./generate"),m=a("./nodejsUtils"),n=a("./nodejs/NodejsStreamInputAdapter"),o=function(a,b,c){var d,e=f.getTypeOf(b),h=f.extend(c||{},i);h.date=h.date||new Date,null!==h.compression&&(h.compression=h.compression.toUpperCase()),"string"==typeof h.unixPermissions&&(h.unixPermissions=parseInt(h.unixPermissions,8)),h.unixPermissions&&16384&h.unixPermissions&&(h.dir=!0),h.dosPermissions&&16&h.dosPermissions&&(h.dir=!0),h.dir&&(a=q(a)),h.createFolders&&(d=p(a))&&r.call(this,d,!0);var l="string"===e&&h.binary===!1&&h.base64===!1;c&&"undefined"!=typeof c.binary||(h.binary=!l);var o=b instanceof j&&0===b.uncompressedSize;(o||h.dir||!b||0===b.length)&&(h.base64=!1,h.binary=!0,b="",h.compression="STORE",e="string");var s=null;s=b instanceof j||b instanceof g?b:m.isNode&&m.isStream(b)?new n(a,b):f.prepareContent(a,b,h.binary,h.optimizedBinaryString,h.base64);var t=new k(a,s,h);this.files[a]=t},p=function(a){"/"===a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},q=function(a){return"/"!==a.slice(-1)&&(a+="/"),a},r=function(a,b){return b="undefined"!=typeof b?b:i.createFolders,a=q(a),this.files[a]||o.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},s={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(a){var b,c,d;for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],c=b.slice(this.root.length,b.length),c&&b.slice(0,this.root.length)===this.root&&a(c,d))},filter:function(a){var b=[];return this.forEach(function(c,d){a(c,d)&&b.push(d)}),b},file:function(a,b,c){if(1===arguments.length){if(d(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}var f=this.files[this.root+a];return f&&!f.dir?f:null}return a=this.root+a,o.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=r.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!==a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(a){var b,c={};try{if(c=f.extend(a||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:e.utf8encode}),c.type=c.type.toLowerCase(),c.compression=c.compression.toUpperCase(),"binarystring"===c.type&&(c.type="string"),!c.type)throw new Error("No output type specified.");f.checkSupport(c.type),"darwin"!==c.platform&&"freebsd"!==c.platform&&"linux"!==c.platform&&"sunos"!==c.platform||(c.platform="UNIX"),"win32"===c.platform&&(c.platform="DOS");var d=c.comment||this.comment||"";b=l.generateWorker(this,c,d)}catch(i){b=new g("error"),b.error(i)}return new h(b,c.type||"string",c.mimeType)},generateAsync:function(a,b){return this.generateInternalStream(a).accumulate(b)},generateNodeStream:function(a,b){return a=a||{},a.type||(a.type="nodebuffer"),this.generateInternalStream(a).toNodejsStream(b)}};b.exports=s},{"./compressedObject":2,"./defaults":5,"./generate":9,"./nodejs/NodejsStreamInputAdapter":12,"./nodejsUtils":14,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31,"./utils":32,"./zipObject":35}],16:[function(a,b,c){b.exports=a("stream")},{stream:void 0}],17:[function(a,b,c){"use strict";function d(a){e.call(this,a);for(var b=0;b<this.data.length;b++)a[b]=255&a[b]}var e=a("./DataReader"),f=a("../utils");f.inherits(d,e),d.prototype.byteAt=function(a){return this.data[this.zero+a]},d.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f-this.zero;return-1},d.prototype.readAndCheckSignature=function(a){var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.readData(4);return b===f[0]&&c===f[1]&&d===f[2]&&e===f[3]},d.prototype.readData=function(a){if(this.checkOffset(a),0===a)return[];var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./DataReader":18}],18:[function(a,b,c){"use strict";function d(a){this.data=a,this.length=a.length,this.index=0,this.zero=0}var e=a("../utils");d.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<this.zero+a||a<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(a){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return e.transformTo("string",this.readData(a))},readData:function(a){},lastIndexOfSignature:function(a){},readAndCheckSignature:function(a){},readDate:function(){var a=this.readInt(4);return new Date(Date.UTC((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1))}},b.exports=d},{"../utils":32}],19:[function(a,b,c){"use strict";function d(a){e.call(this,a)}var e=a("./Uint8ArrayReader"),f=a("../utils");f.inherits(d,e),d.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(a,b,c){"use strict";function d(a){e.call(this,a)}var e=a("./DataReader"),f=a("../utils");f.inherits(d,e),d.prototype.byteAt=function(a){return this.data.charCodeAt(this.zero+a)},d.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)-this.zero},d.prototype.readAndCheckSignature=function(a){var b=this.readData(4);return a===b},d.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./DataReader":18}],21:[function(a,b,c){"use strict";function d(a){e.call(this,a)}var e=a("./ArrayReader"),f=a("../utils");f.inherits(d,e),d.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./ArrayReader":17}],22:[function(a,b,c){"use strict";var d=a("../utils"),e=a("../support"),f=a("./ArrayReader"),g=a("./StringReader"),h=a("./NodeBufferReader"),i=a("./Uint8ArrayReader");b.exports=function(a){var b=d.getTypeOf(a);return d.checkSupport(b),"string"!==b||e.uint8array?"nodebuffer"===b?new h(a):e.uint8array?new i(d.transformTo("uint8array",a)):new f(d.transformTo("array",a)):new g(a)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],24:[function(a,b,c){"use strict";function d(a){e.call(this,"ConvertWorker to "+a),this.destType=a}var e=a("./GenericWorker"),f=a("../utils");f.inherits(d,e),d.prototype.processChunk=function(a){this.push({data:f.transformTo(this.destType,a.data),meta:a.meta})},b.exports=d},{"../utils":32,"./GenericWorker":28}],25:[function(a,b,c){"use strict";function d(){e.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}var e=a("./GenericWorker"),f=a("../crc32"),g=a("../utils");g.inherits(d,e),d.prototype.processChunk=function(a){this.streamInfo.crc32=f(a.data,this.streamInfo.crc32||0),this.push(a)},b.exports=d},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(a,b,c){"use strict";function d(a){f.call(this,"DataLengthProbe for "+a),this.propName=a,this.withStreamInfo(a,0)}var e=a("../utils"),f=a("./GenericWorker");e.inherits(d,f),d.prototype.processChunk=function(a){if(a){var b=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=b+a.data.length}f.prototype.processChunk.call(this,a)},b.exports=d},{"../utils":32,"./GenericWorker":28}],27:[function(a,b,c){"use strict";function d(a){f.call(this,"DataWorker");var b=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,a.then(function(a){b.dataIsReady=!0,b.data=a,b.max=a&&a.length||0,b.type=e.getTypeOf(a),b.isPaused||b._tickAndRepeat()},function(a){b.error(a)})}var e=a("../utils"),f=a("./GenericWorker"),g=16384;e.inherits(d,f),d.prototype.cleanUp=function(){f.prototype.cleanUp.call(this),this.data=null},d.prototype.resume=function(){return!!f.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,e.delay(this._tickAndRepeat,[],this)),!0)},d.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(e.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},d.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var a=g,b=null,c=Math.min(this.max,this.index+a);if(this.index>=this.max)return this.end();switch(this.type){case"string":b=this.data.substring(this.index,c);break;case"uint8array":b=this.data.subarray(this.index,c);break;case"array":case"nodebuffer":b=this.data.slice(this.index,c)}return this.index=c,this.push({data:b,meta:{percent:this.max?this.index/this.max*100:0}})},b.exports=d},{"../utils":32,"./GenericWorker":28}],28:[function(a,b,c){"use strict";function d(a){this.name=a||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}d.prototype={push:function(a){this.emit("data",a)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(a){this.emit("error",a)}return!0},error:function(a){return!this.isFinished&&(this.isPaused?this.generatedError=a:(this.isFinished=!0,this.emit("error",a),this.previous&&this.previous.error(a),this.cleanUp()),!0)},on:function(a,b){return this._listeners[a].push(b),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(a,b){if(this._listeners[a])for(var c=0;c<this._listeners[a].length;c++)this._listeners[a][c].call(this,b)},pipe:function(a){return a.registerPrevious(this)},registerPrevious:function(a){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=a.streamInfo,this.mergeStreamInfo(),this.previous=a;var b=this;return a.on("data",function(a){b.processChunk(a)}),a.on("end",function(){b.end()}),a.on("error",function(a){b.error(a)}),this},pause:function(){return!this.isPaused&&!this.isFinished&&(this.isPaused=!0,this.previous&&this.previous.pause(),!0)},resume:function(){if(!this.isPaused||this.isFinished)return!1;this.isPaused=!1;var a=!1;return this.generatedError&&(this.error(this.generatedError),a=!0),this.previous&&this.previous.resume(),!a},flush:function(){},processChunk:function(a){this.push(a)},withStreamInfo:function(a,b){return this.extraStreamInfo[a]=b,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var a in this.extraStreamInfo)this.extraStreamInfo.hasOwnProperty(a)&&(this.streamInfo[a]=this.extraStreamInfo[a])},lock:function(){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.isLocked=!0,this.previous&&this.previous.lock()},toString:function(){var a="Worker "+this.name;return this.previous?this.previous+" -> "+a:a}},b.exports=d},{}],29:[function(a,b,c){"use strict";function d(a,b,c){switch(a){case"blob":return h.newBlob(h.transformTo("arraybuffer",b),c);case"base64":return k.encode(b);default:return h.transformTo(a,b)}}function e(a,b){var c,d=0,e=null,f=0;for(c=0;c<b.length;c++)f+=b[c].length;switch(a){case"string":return b.join("");case"array":return Array.prototype.concat.apply([],b);case"uint8array":for(e=new Uint8Array(f),c=0;c<b.length;c++)e.set(b[c],d),d+=b[c].length;return e;case"nodebuffer":return Buffer.concat(b);default:throw new Error("concat : unsupported type '"+a+"'")}}function f(a,b){return new m.Promise(function(c,f){var g=[],h=a._internalType,i=a._outputType,j=a._mimeType;a.on("data",function(a,c){g.push(a),b&&b(c)}).on("error",function(a){g=[],f(a)}).on("end",function(){try{var a=d(i,e(h,g),j);c(a)}catch(b){f(b)}g=[]}).resume()})}function g(a,b,c){var d=b;switch(b){case"blob":case"arraybuffer":d="uint8array";break;case"base64":d="string"}try{this._internalType=d,this._outputType=b,this._mimeType=c,h.checkSupport(d),this._worker=a.pipe(new i(d)),a.lock()}catch(e){this._worker=new j("error"),this._worker.error(e)}}var h=a("../utils"),i=a("./ConvertWorker"),j=a("./GenericWorker"),k=a("../base64"),l=a("../support"),m=a("../external"),n=null;if(l.nodestream)try{n=a("../nodejs/NodejsStreamOutputAdapter")}catch(o){}g.prototype={accumulate:function(a){return f(this,a)},on:function(a,b){var c=this;return"data"===a?this._worker.on(a,function(a){b.call(c,a.data,a.meta)}):this._worker.on(a,function(){h.delay(b,arguments,c)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(a){if(h.checkSupport("nodestream"),"nodebuffer"!==this._outputType)throw new Error(this._outputType+" is not supported by this method");return new n(this,{objectMode:"nodebuffer"!==this._outputType},a)}},b.exports=g},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(a,b,c){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof Buffer,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var d=new ArrayBuffer(0);try{c.blob=0===new Blob([d],{type:"application/zip"}).size}catch(e){try{var f=self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder,g=new f;g.append(d),c.blob=0===g.getBlob("application/zip").size}catch(e){c.blob=!1}}}try{c.nodestream=!!a("readable-stream").Readable}catch(e){c.nodestream=!1}},{"readable-stream":16}],31:[function(a,b,c){"use strict";function d(){i.call(this,"utf-8 decode"),this.leftOver=null}function e(){i.call(this,"utf-8 encode")}for(var f=a("./utils"),g=a("./support"),h=a("./nodejsUtils"),i=a("./stream/GenericWorker"),j=new Array(256),k=0;k<256;k++)j[k]=k>=252?6:k>=248?5:k>=240?4:k>=224?3:k>=192?2:1;j[254]=j[254]=1;var l=function(a){var b,c,d,e,f,h=a.length,i=0;for(e=0;e<h;e++)c=a.charCodeAt(e),55296===(64512&c)&&e+1<h&&(d=a.charCodeAt(e+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),e++)),i+=c<128?1:c<2048?2:c<65536?3:4;for(b=g.uint8array?new Uint8Array(i):new Array(i),f=0,e=0;f<i;e++)c=a.charCodeAt(e),55296===(64512&c)&&e+1<h&&(d=a.charCodeAt(e+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),e++)),c<128?b[f++]=c:c<2048?(b[f++]=192|c>>>6,b[f++]=128|63&c):c<65536?(b[f++]=224|c>>>12,b[f++]=128|c>>>6&63,b[f++]=128|63&c):(b[f++]=240|c>>>18,b[f++]=128|c>>>12&63,b[f++]=128|c>>>6&63,b[f++]=128|63&c);return b},m=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return c<0?b:0===c?b:c+j[a[c]]>b?c:b},n=function(a){var b,c,d,e,g=a.length,h=new Array(2*g);for(c=0,b=0;b<g;)if(d=a[b++],d<128)h[c++]=d;else if(e=j[d],e>4)h[c++]=65533,b+=e-1;else{for(d&=2===e?31:3===e?15:7;e>1&&b<g;)d=d<<6|63&a[b++],e--;e>1?h[c++]=65533:d<65536?h[c++]=d:(d-=65536,h[c++]=55296|d>>10&1023,h[c++]=56320|1023&d)}return h.length!==c&&(h.subarray?h=h.subarray(0,c):h.length=c),f.applyFromCharCode(h)};c.utf8encode=function(a){return g.nodebuffer?h.newBufferFrom(a,"utf-8"):l(a)},c.utf8decode=function(a){return g.nodebuffer?f.transformTo("nodebuffer",a).toString("utf-8"):(a=f.transformTo(g.uint8array?"uint8array":"array",a),n(a))},f.inherits(d,i),d.prototype.processChunk=function(a){var b=f.transformTo(g.uint8array?"uint8array":"array",a.data);if(this.leftOver&&this.leftOver.length){if(g.uint8array){var d=b;b=new Uint8Array(d.length+this.leftOver.length),b.set(this.leftOver,0),b.set(d,this.leftOver.length)}else b=this.leftOver.concat(b);this.leftOver=null}var e=m(b),h=b;e!==b.length&&(g.uint8array?(h=b.subarray(0,e),this.leftOver=b.subarray(e,b.length)):(h=b.slice(0,e),this.leftOver=b.slice(e,b.length))),this.push({data:c.utf8decode(h),meta:a.meta})},d.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:c.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},c.Utf8DecodeWorker=d,f.inherits(e,i),e.prototype.processChunk=function(a){this.push({data:c.utf8encode(a.data),meta:a.meta})},c.Utf8EncodeWorker=e},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(a,b,c){"use strict";function d(a){var b=null;return b=i.uint8array?new Uint8Array(a.length):new Array(a.length),f(a,b)}function e(a){return a}function f(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function g(a){var b=65536,d=c.getTypeOf(a),e=!0;if("uint8array"===d?e=n.applyCanBeUsed.uint8array:"nodebuffer"===d&&(e=n.applyCanBeUsed.nodebuffer),e)for(;b>1;)try{return n.stringifyByChunk(a,d,b)}catch(f){b=Math.floor(b/2)}return n.stringifyByChar(a)}function h(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];
+return b}var i=a("./support"),j=a("./base64"),k=a("./nodejsUtils"),l=a("core-js/library/fn/set-immediate"),m=a("./external");c.newBlob=function(a,b){c.checkSupport("blob");try{return new Blob([a],{type:b})}catch(d){try{var e=self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder,f=new e;return f.append(a),f.getBlob(b)}catch(d){throw new Error("Bug : can't construct the Blob.")}}};var n={stringifyByChunk:function(a,b,c){var d=[],e=0,f=a.length;if(f<=c)return String.fromCharCode.apply(null,a);for(;e<f;)"array"===b||"nodebuffer"===b?d.push(String.fromCharCode.apply(null,a.slice(e,Math.min(e+c,f)))):d.push(String.fromCharCode.apply(null,a.subarray(e,Math.min(e+c,f)))),e+=c;return d.join("")},stringifyByChar:function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(a[c]);return b},applyCanBeUsed:{uint8array:function(){try{return i.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(a){return!1}}(),nodebuffer:function(){try{return i.nodebuffer&&1===String.fromCharCode.apply(null,k.allocBuffer(1)).length}catch(a){return!1}}()}};c.applyFromCharCode=g;var o={};o.string={string:e,array:function(a){return f(a,new Array(a.length))},arraybuffer:function(a){return o.string.uint8array(a).buffer},uint8array:function(a){return f(a,new Uint8Array(a.length))},nodebuffer:function(a){return f(a,k.allocBuffer(a.length))}},o.array={string:g,array:e,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return k.newBufferFrom(a)}},o.arraybuffer={string:function(a){return g(new Uint8Array(a))},array:function(a){return h(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:e,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return k.newBufferFrom(new Uint8Array(a))}},o.uint8array={string:g,array:function(a){return h(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:e,nodebuffer:function(a){return k.newBufferFrom(a)}},o.nodebuffer={string:g,array:function(a){return h(a,new Array(a.length))},arraybuffer:function(a){return o.nodebuffer.uint8array(a).buffer},uint8array:function(a){return h(a,new Uint8Array(a.length))},nodebuffer:e},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=o[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":i.nodebuffer&&k.isBuffer(a)?"nodebuffer":i.uint8array&&a instanceof Uint8Array?"uint8array":i.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=i[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this platform")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(b<16?"0":"")+b.toString(16).toUpperCase();return d},c.delay=function(a,b,c){l(function(){a.apply(c||null,b||[])})},c.inherits=function(a,b){var c=function(){};c.prototype=b.prototype,a.prototype=new c},c.extend=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},c.prepareContent=function(a,b,e,f,g){var h=m.Promise.resolve(b).then(function(a){var b=i.blob&&(a instanceof Blob||["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(a))!==-1);return b&&"undefined"!=typeof FileReader?new m.Promise(function(b,c){var d=new FileReader;d.onload=function(a){b(a.target.result)},d.onerror=function(a){c(a.target.error)},d.readAsArrayBuffer(a)}):a});return h.then(function(b){var h=c.getTypeOf(b);return h?("arraybuffer"===h?b=c.transformTo("uint8array",b):"string"===h&&(g?b=j.decode(b):e&&f!==!0&&(b=d(b))),b):m.Promise.reject(new Error("Can't read the data of '"+a+"'. Is it in a supported JavaScript type (String, Blob, ArrayBuffer, etc) ?"))})}},{"./base64":1,"./external":6,"./nodejsUtils":14,"./support":30,"core-js/library/fn/set-immediate":36}],33:[function(a,b,c){"use strict";function d(a){this.files=[],this.loadOptions=a}var e=a("./reader/readerFor"),f=a("./utils"),g=a("./signature"),h=a("./zipEntry"),i=(a("./utf8"),a("./support"));d.prototype={checkSignature:function(a){if(!this.reader.readAndCheckSignature(a)){this.reader.index-=4;var b=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+f.pretty(b)+", expected "+f.pretty(a)+")")}},isSignature:function(a,b){var c=this.reader.index;this.reader.setIndex(a);var d=this.reader.readString(4),e=d===b;return this.reader.setIndex(c),e},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2);var a=this.reader.readData(this.zipCommentLength),b=i.uint8array?"uint8array":"array",c=f.transformTo(b,a);this.zipComment=this.loadOptions.decodeFileName(c)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.reader.skip(4),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;e<d;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readData(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(g.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8(),b.processAttributes()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(g.CENTRAL_FILE_HEADER);)a=new h({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a);if(this.centralDirRecords!==this.files.length&&0!==this.centralDirRecords&&0===this.files.length)throw new Error("Corrupted zip or bug: expected "+this.centralDirRecords+" records in central dir, got "+this.files.length)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(g.CENTRAL_DIRECTORY_END);if(a<0){var b=!this.isSignature(0,g.LOCAL_FILE_HEADER);throw b?new Error("Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html"):new Error("Corrupted zip: can't find end of central directory")}this.reader.setIndex(a);var c=a;if(this.checkSignature(g.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===f.MAX_VALUE_16BITS||this.diskWithCentralDirStart===f.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===f.MAX_VALUE_16BITS||this.centralDirRecords===f.MAX_VALUE_16BITS||this.centralDirSize===f.MAX_VALUE_32BITS||this.centralDirOffset===f.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(g.ZIP64_CENTRAL_DIRECTORY_LOCATOR),a<0)throw new Error("Corrupted zip: can't find the ZIP64 end of central directory locator");if(this.reader.setIndex(a),this.checkSignature(g.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),!this.isSignature(this.relativeOffsetEndOfZip64CentralDir,g.ZIP64_CENTRAL_DIRECTORY_END)&&(this.relativeOffsetEndOfZip64CentralDir=this.reader.lastIndexOfSignature(g.ZIP64_CENTRAL_DIRECTORY_END),this.relativeOffsetEndOfZip64CentralDir<0))throw new Error("Corrupted zip: can't find the ZIP64 end of central directory");this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(g.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}var d=this.centralDirOffset+this.centralDirSize;this.zip64&&(d+=20,d+=12+this.zip64EndOfCentralSize);var e=c-d;if(e>0)this.isSignature(c,g.CENTRAL_FILE_HEADER)||(this.reader.zero=e);else if(e<0)throw new Error("Corrupted zip: missing "+Math.abs(e)+" bytes.")},prepareReader:function(a){this.reader=e(a)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=d},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(a,b,c){"use strict";function d(a,b){this.options=a,this.loadOptions=b}var e=a("./reader/readerFor"),f=a("./utils"),g=a("./compressedObject"),h=a("./crc32"),i=a("./utf8"),j=a("./compressions"),k=a("./support"),l=0,m=3,n=function(a){for(var b in j)if(j.hasOwnProperty(b)&&j[b].magic===a)return j[b];return null};d.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readData(this.fileNameLength),a.skip(c),this.compressedSize===-1||this.uncompressedSize===-1)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize === -1 || uncompressedSize === -1)");if(b=n(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+f.pretty(this.compressionMethod)+" unknown (inner file : "+f.transformTo("string",this.fileName)+")");this.decompressed=new g(this.compressedSize,this.uncompressedSize,this.crc32,b,a.readData(this.compressedSize))},readCentralPart:function(a){this.versionMadeBy=a.readInt(2),a.skip(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4);var b=a.readInt(2);if(this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");a.skip(b),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var a=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),a===l&&(this.dosPermissions=63&this.externalFileAttributes),a===m&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(a){if(this.extraFields[1]){var b=e(this.extraFields[1].value);this.uncompressedSize===f.MAX_VALUE_32BITS&&(this.uncompressedSize=b.readInt(8)),this.compressedSize===f.MAX_VALUE_32BITS&&(this.compressedSize=b.readInt(8)),this.localHeaderOffset===f.MAX_VALUE_32BITS&&(this.localHeaderOffset=b.readInt(8)),this.diskNumberStart===f.MAX_VALUE_32BITS&&(this.diskNumberStart=b.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});a.index<e;)b=a.readInt(2),c=a.readInt(2),d=a.readData(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){var a=k.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=i.utf8decode(this.fileName),this.fileCommentStr=i.utf8decode(this.fileComment);else{var b=this.findExtraFieldUnicodePath();if(null!==b)this.fileNameStr=b;else{var c=f.transformTo(a,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(c)}var d=this.findExtraFieldUnicodeComment();if(null!==d)this.fileCommentStr=d;else{var e=f.transformTo(a,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(e)}}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=e(a.value);return 1!==b.readInt(1)?null:h(this.fileName)!==b.readInt(4)?null:i.utf8decode(b.readData(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=e(a.value);return 1!==b.readInt(1)?null:h(this.fileComment)!==b.readInt(4)?null:i.utf8decode(b.readData(a.length-5))}return null}},b.exports=d},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(a,b,c){"use strict";var d=a("./stream/StreamHelper"),e=a("./stream/DataWorker"),f=a("./utf8"),g=a("./compressedObject"),h=a("./stream/GenericWorker"),i=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this.unixPermissions=c.unixPermissions,this.dosPermissions=c.dosPermissions,this._data=b,this._dataBinary=c.binary,this.options={compression:c.compression,compressionOptions:c.compressionOptions}};i.prototype={internalStream:function(a){var b=null,c="string";try{if(!a)throw new Error("No output type specified.");c=a.toLowerCase();var e="string"===c||"text"===c;"binarystring"!==c&&"text"!==c||(c="string"),b=this._decompressWorker();var g=!this._dataBinary;g&&!e&&(b=b.pipe(new f.Utf8EncodeWorker)),!g&&e&&(b=b.pipe(new f.Utf8DecodeWorker))}catch(i){b=new h("error"),b.error(i)}return new d(b,c,"")},async:function(a,b){return this.internalStream(a).accumulate(b)},nodeStream:function(a,b){return this.internalStream(a||"nodebuffer").toNodejsStream(b)},_compressWorker:function(a,b){if(this._data instanceof g&&this._data.compression.magic===a.magic)return this._data.getCompressedWorker();var c=this._decompressWorker();return this._dataBinary||(c=c.pipe(new f.Utf8EncodeWorker)),g.createWorkerFrom(c,a,b)},_decompressWorker:function(){return this._data instanceof g?this._data.getContentWorker():this._data instanceof h?this._data:new e(this._data)}};for(var j=["asText","asBinary","asNodeBuffer","asUint8Array","asArrayBuffer"],k=function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},l=0;l<j.length;l++)i.prototype[j[l]]=k;b.exports=i},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(a,b,c){a("../modules/web.immediate"),b.exports=a("../modules/_core").setImmediate},{"../modules/_core":40,"../modules/web.immediate":56}],37:[function(a,b,c){b.exports=function(a){if("function"!=typeof a)throw TypeError(a+" is not a function!");return a}},{}],38:[function(a,b,c){var d=a("./_is-object");b.exports=function(a){if(!d(a))throw TypeError(a+" is not an object!");return a}},{"./_is-object":51}],39:[function(a,b,c){var d={}.toString;b.exports=function(a){return d.call(a).slice(8,-1)}},{}],40:[function(a,b,c){var d=b.exports={version:"2.3.0"};"number"==typeof __e&&(__e=d)},{}],41:[function(a,b,c){var d=a("./_a-function");b.exports=function(a,b,c){if(d(a),void 0===b)return a;switch(c){case 1:return function(c){return a.call(b,c)};case 2:return function(c,d){return a.call(b,c,d)};case 3:return function(c,d,e){return a.call(b,c,d,e)}}return function(){return a.apply(b,arguments)}}},{"./_a-function":37}],42:[function(a,b,c){b.exports=!a("./_fails")(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{"./_fails":45}],43:[function(a,b,c){var d=a("./_is-object"),e=a("./_global").document,f=d(e)&&d(e.createElement);b.exports=function(a){return f?e.createElement(a):{}}},{"./_global":46,"./_is-object":51}],44:[function(a,b,c){var d=a("./_global"),e=a("./_core"),f=a("./_ctx"),g=a("./_hide"),h="prototype",i=function(a,b,c){var j,k,l,m=a&i.F,n=a&i.G,o=a&i.S,p=a&i.P,q=a&i.B,r=a&i.W,s=n?e:e[b]||(e[b]={}),t=s[h],u=n?d:o?d[b]:(d[b]||{})[h];n&&(c=b);for(j in c)k=!m&&u&&void 0!==u[j],k&&j in s||(l=k?u[j]:c[j],s[j]=n&&"function"!=typeof u[j]?c[j]:q&&k?f(l,d):r&&u[j]==l?function(a){var b=function(b,c,d){if(this instanceof a){switch(arguments.length){case 0:return new a;case 1:return new a(b);case 2:return new a(b,c)}return new a(b,c,d)}return a.apply(this,arguments)};return b[h]=a[h],b}(l):p&&"function"==typeof l?f(Function.call,l):l,p&&((s.virtual||(s.virtual={}))[j]=l,a&i.R&&t&&!t[j]&&g(t,j,l)))};i.F=1,i.G=2,i.S=4,i.P=8,i.B=16,i.W=32,i.U=64,i.R=128,b.exports=i},{"./_core":40,"./_ctx":41,"./_global":46,"./_hide":47}],45:[function(a,b,c){b.exports=function(a){try{return!!a()}catch(b){return!0}}},{}],46:[function(a,b,c){var d=b.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=d)},{}],47:[function(a,b,c){var d=a("./_object-dp"),e=a("./_property-desc");b.exports=a("./_descriptors")?function(a,b,c){return d.f(a,b,e(1,c))}:function(a,b,c){return a[b]=c,a}},{"./_descriptors":42,"./_object-dp":52,"./_property-desc":53}],48:[function(a,b,c){b.exports=a("./_global").document&&document.documentElement},{"./_global":46}],49:[function(a,b,c){b.exports=!a("./_descriptors")&&!a("./_fails")(function(){return 7!=Object.defineProperty(a("./_dom-create")("div"),"a",{get:function(){return 7}}).a})},{"./_descriptors":42,"./_dom-create":43,"./_fails":45}],50:[function(a,b,c){b.exports=function(a,b,c){var d=void 0===c;switch(b.length){case 0:return d?a():a.call(c);case 1:return d?a(b[0]):a.call(c,b[0]);case 2:return d?a(b[0],b[1]):a.call(c,b[0],b[1]);case 3:return d?a(b[0],b[1],b[2]):a.call(c,b[0],b[1],b[2]);case 4:return d?a(b[0],b[1],b[2],b[3]):a.call(c,b[0],b[1],b[2],b[3])}return a.apply(c,b)}},{}],51:[function(a,b,c){b.exports=function(a){return"object"==typeof a?null!==a:"function"==typeof a}},{}],52:[function(a,b,c){var d=a("./_an-object"),e=a("./_ie8-dom-define"),f=a("./_to-primitive"),g=Object.defineProperty;c.f=a("./_descriptors")?Object.defineProperty:function(a,b,c){if(d(a),b=f(b,!0),d(c),e)try{return g(a,b,c)}catch(h){}if("get"in c||"set"in c)throw TypeError("Accessors not supported!");return"value"in c&&(a[b]=c.value),a}},{"./_an-object":38,"./_descriptors":42,"./_ie8-dom-define":49,"./_to-primitive":55}],53:[function(a,b,c){b.exports=function(a,b){return{enumerable:!(1&a),configurable:!(2&a),writable:!(4&a),value:b}}},{}],54:[function(a,b,c){var d,e,f,g=a("./_ctx"),h=a("./_invoke"),i=a("./_html"),j=a("./_dom-create"),k=a("./_global"),l=k.process,m=k.setImmediate,n=k.clearImmediate,o=k.MessageChannel,p=0,q={},r="onreadystatechange",s=function(){var a=+this;if(q.hasOwnProperty(a)){var b=q[a];delete q[a],b()}},t=function(a){s.call(a.data)};m&&n||(m=function(a){for(var b=[],c=1;arguments.length>c;)b.push(arguments[c++]);return q[++p]=function(){h("function"==typeof a?a:Function(a),b)},d(p),p},n=function(a){delete q[a]},"process"==a("./_cof")(l)?d=function(a){l.nextTick(g(s,a,1))}:o?(e=new o,f=e.port2,e.port1.onmessage=t,d=g(f.postMessage,f,1)):k.addEventListener&&"function"==typeof postMessage&&!k.importScripts?(d=function(a){k.postMessage(a+"","*")},k.addEventListener("message",t,!1)):d=r in j("script")?function(a){i.appendChild(j("script"))[r]=function(){i.removeChild(this),s.call(a)}}:function(a){setTimeout(g(s,a,1),0)}),b.exports={set:m,clear:n}},{"./_cof":39,"./_ctx":41,"./_dom-create":43,"./_global":46,"./_html":48,"./_invoke":50}],55:[function(a,b,c){var d=a("./_is-object");b.exports=function(a,b){if(!d(a))return a;var c,e;if(b&&"function"==typeof(c=a.toString)&&!d(e=c.call(a)))return e;if("function"==typeof(c=a.valueOf)&&!d(e=c.call(a)))return e;if(!b&&"function"==typeof(c=a.toString)&&!d(e=c.call(a)))return e;throw TypeError("Can't convert object to primitive value")}},{"./_is-object":51}],56:[function(a,b,c){var d=a("./_export"),e=a("./_task");d(d.G+d.B,{setImmediate:e.set,clearImmediate:e.clear})},{"./_export":44,"./_task":54}],57:[function(a,b,c){(function(a){"use strict";function c(){k=!0;for(var a,b,c=l.length;c;){for(b=l,l=[],a=-1;++a<c;)b[a]();c=l.length}k=!1}function d(a){1!==l.push(a)||k||e()}var e,f=a.MutationObserver||a.WebKitMutationObserver;if(f){var g=0,h=new f(c),i=a.document.createTextNode("");h.observe(i,{characterData:!0}),e=function(){i.data=g=++g%2}}else if(a.setImmediate||"undefined"==typeof a.MessageChannel)e="document"in a&&"onreadystatechange"in a.document.createElement("script")?function(){var b=a.document.createElement("script");b.onreadystatechange=function(){c(),b.onreadystatechange=null,b.parentNode.removeChild(b),b=null},a.document.documentElement.appendChild(b)}:function(){setTimeout(c,0)};else{var j=new a.MessageChannel;j.port1.onmessage=c,e=function(){j.port2.postMessage(0)}}var k,l=[];b.exports=d}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],58:[function(a,b,c){"use strict";function d(){}function e(a){if("function"!=typeof a)throw new TypeError("resolver must be a function");this.state=s,this.queue=[],this.outcome=void 0,a!==d&&i(this,a)}function f(a,b,c){this.promise=a,"function"==typeof b&&(this.onFulfilled=b,this.callFulfilled=this.otherCallFulfilled),"function"==typeof c&&(this.onRejected=c,this.callRejected=this.otherCallRejected)}function g(a,b,c){o(function(){var d;try{d=b(c)}catch(e){return p.reject(a,e)}d===a?p.reject(a,new TypeError("Cannot resolve promise with itself")):p.resolve(a,d)})}function h(a){var b=a&&a.then;if(a&&("object"==typeof a||"function"==typeof a)&&"function"==typeof b)return function(){b.apply(a,arguments)}}function i(a,b){function c(b){f||(f=!0,p.reject(a,b))}function d(b){f||(f=!0,p.resolve(a,b))}function e(){b(d,c)}var f=!1,g=j(e);"error"===g.status&&c(g.value)}function j(a,b){var c={};try{c.value=a(b),c.status="success"}catch(d){c.status="error",c.value=d}return c}function k(a){return a instanceof this?a:p.resolve(new this(d),a)}function l(a){var b=new this(d);return p.reject(b,a)}function m(a){function b(a,b){function d(a){g[b]=a,++h!==e||f||(f=!0,p.resolve(j,g))}c.resolve(a).then(d,function(a){f||(f=!0,p.reject(j,a))})}var c=this;if("[object Array]"!==Object.prototype.toString.call(a))return this.reject(new TypeError("must be an array"));var e=a.length,f=!1;if(!e)return this.resolve([]);for(var g=new Array(e),h=0,i=-1,j=new this(d);++i<e;)b(a[i],i);return j}function n(a){function b(a){c.resolve(a).then(function(a){f||(f=!0,p.resolve(h,a))},function(a){f||(f=!0,p.reject(h,a))})}var c=this;if("[object Array]"!==Object.prototype.toString.call(a))return this.reject(new TypeError("must be an array"));var e=a.length,f=!1;if(!e)return this.resolve([]);for(var g=-1,h=new this(d);++g<e;)b(a[g]);return h}var o=a("immediate"),p={},q=["REJECTED"],r=["FULFILLED"],s=["PENDING"];b.exports=e,e.prototype["catch"]=function(a){return this.then(null,a)},e.prototype.then=function(a,b){if("function"!=typeof a&&this.state===r||"function"!=typeof b&&this.state===q)return this;var c=new this.constructor(d);if(this.state!==s){var e=this.state===r?a:b;g(c,e,this.outcome)}else this.queue.push(new f(c,a,b));return c},f.prototype.callFulfilled=function(a){p.resolve(this.promise,a)},f.prototype.otherCallFulfilled=function(a){g(this.promise,this.onFulfilled,a)},f.prototype.callRejected=function(a){p.reject(this.promise,a)},f.prototype.otherCallRejected=function(a){g(this.promise,this.onRejected,a)},p.resolve=function(a,b){var c=j(h,b);if("error"===c.status)return p.reject(a,c.value);var d=c.value;if(d)i(a,d);else{a.state=r,a.outcome=b;for(var e=-1,f=a.queue.length;++e<f;)a.queue[e].callFulfilled(b)}return a},p.reject=function(a,b){a.state=q,a.outcome=b;for(var c=-1,d=a.queue.length;++c<d;)a.queue[c].callRejected(b);return a},e.resolve=k,e.reject=l,e.all=m,e.race=n},{immediate:57}],59:[function(a,b,c){"use strict";var d=a("./lib/utils/common").assign,e=a("./lib/deflate"),f=a("./lib/inflate"),g=a("./lib/zlib/constants"),h={};d(h,e,f,g),b.exports=h},{"./lib/deflate":60,"./lib/inflate":61,"./lib/utils/common":62,"./lib/zlib/constants":65}],60:[function(a,b,c){"use strict";function d(a){if(!(this instanceof d))return new d(a);this.options=i.assign({level:s,method:u,chunkSize:16384,windowBits:15,memLevel:8,strategy:t,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=h.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==p)throw new Error(k[c]);if(b.header&&h.deflateSetHeader(this.strm,b.header),b.dictionary){var e;if(e="string"==typeof b.dictionary?j.string2buf(b.dictionary):"[object ArrayBuffer]"===m.call(b.dictionary)?new Uint8Array(b.dictionary):b.dictionary,c=h.deflateSetDictionary(this.strm,e),c!==p)throw new Error(k[c]);this._dict_set=!0}}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg||k[c.err];return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}function g(a,b){return b=b||{},b.gzip=!0,e(a,b)}var h=a("./zlib/deflate"),i=a("./utils/common"),j=a("./utils/strings"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=Object.prototype.toString,n=0,o=4,p=0,q=1,r=2,s=-1,t=0,u=8;d.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?o:n,"string"==typeof a?e.input=j.string2buf(a):"[object ArrayBuffer]"===m.call(a)?e.input=new Uint8Array(a):e.input=a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new i.Buf8(f),e.next_out=0,e.avail_out=f),c=h.deflate(e,d),c!==q&&c!==p)return this.onEnd(c),this.ended=!0,!1;0!==e.avail_out&&(0!==e.avail_in||d!==o&&d!==r)||("string"===this.options.to?this.onData(j.buf2binstring(i.shrinkBuf(e.output,e.next_out))):this.onData(i.shrinkBuf(e.output,e.next_out)))}while((e.avail_in>0||0===e.avail_out)&&c!==q);return d===o?(c=h.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===p):d!==r||(this.onEnd(p),e.avail_out=0,!0)},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===p&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=i.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=d,c.deflate=e,c.deflateRaw=f,c.gzip=g},{"./utils/common":62,"./utils/strings":63,"./zlib/deflate":67,"./zlib/messages":72,"./zlib/zstream":74}],61:[function(a,b,c){"use strict";function d(a){if(!(this instanceof d))return new d(a);this.options=h.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=g.inflateInit2(this.strm,b.windowBits);if(c!==j.Z_OK)throw new Error(k[c]);this.header=new m,g.inflateGetHeader(this.strm,this.header)}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg||k[c.err];return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}var g=a("./zlib/inflate"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/constants"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=a("./zlib/gzheader"),n=Object.prototype.toString;d.prototype.push=function(a,b){var c,d,e,f,k,l,m=this.strm,o=this.options.chunkSize,p=this.options.dictionary,q=!1;if(this.ended)return!1;d=b===~~b?b:b===!0?j.Z_FINISH:j.Z_NO_FLUSH,"string"==typeof a?m.input=i.binstring2buf(a):"[object ArrayBuffer]"===n.call(a)?m.input=new Uint8Array(a):m.input=a,m.next_in=0,m.avail_in=m.input.length;do{if(0===m.avail_out&&(m.output=new h.Buf8(o),m.next_out=0,m.avail_out=o),c=g.inflate(m,j.Z_NO_FLUSH),c===j.Z_NEED_DICT&&p&&(l="string"==typeof p?i.string2buf(p):"[object ArrayBuffer]"===n.call(p)?new Uint8Array(p):p,c=g.inflateSetDictionary(this.strm,l)),c===j.Z_BUF_ERROR&&q===!0&&(c=j.Z_OK,q=!1),c!==j.Z_STREAM_END&&c!==j.Z_OK)return this.onEnd(c),this.ended=!0,!1;m.next_out&&(0!==m.avail_out&&c!==j.Z_STREAM_END&&(0!==m.avail_in||d!==j.Z_FINISH&&d!==j.Z_SYNC_FLUSH)||("string"===this.options.to?(e=i.utf8border(m.output,m.next_out),f=m.next_out-e,k=i.buf2string(m.output,e),m.next_out=f,m.avail_out=o-f,f&&h.arraySet(m.output,m.output,e,f,0),this.onData(k)):this.onData(h.shrinkBuf(m.output,m.next_out)))),0===m.avail_in&&0===m.avail_out&&(q=!0)}while((m.avail_in>0||0===m.avail_out)&&c!==j.Z_STREAM_END);return c===j.Z_STREAM_END&&(d=j.Z_FINISH),d===j.Z_FINISH?(c=g.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===j.Z_OK):d!==j.Z_SYNC_FLUSH||(this.onEnd(j.Z_OK),m.avail_out=0,!0)},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===j.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=d,c.inflate=e,c.inflateRaw=f,c.ungzip=e},{"./utils/common":62,"./utils/strings":63,"./zlib/constants":65,"./zlib/gzheader":68,"./zlib/inflate":70,"./zlib/messages":72,"./zlib/zstream":74}],62:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;f<d;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;b<c;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;b<c;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;f<d;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],63:[function(a,b,c){"use strict";function d(a,b){if(b<65537&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;d<b;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;j<256;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;f<h;f++)c=a.charCodeAt(f),55296===(64512&c)&&f+1<h&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=c<128?1:c<2048?2:c<65536?3:4;for(b=new e.Buf8(i),g=0,f=0;g<i;f++)c=a.charCodeAt(f),55296===(64512&c)&&f+1<h&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),c<128?b[g++]=c:c<2048?(b[g++]=192|c>>>6,b[g++]=128|63&c):c<65536?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;c<d;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;c<h;)if(f=a[c++],f<128)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&c<h;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:f<65536?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return c<0?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":62}],64:[function(a,b,c){"use strict";function d(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0;
+}b.exports=d},{}],65:[function(a,b,c){"use strict";b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],66:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;c<256;c++){a=c;for(var d=0;d<8;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function e(a,b,c,d){var e=f,g=d+c;a^=-1;for(var h=d;h<g;h++)a=a>>>8^e[255&(a^b[h])];return a^-1}var f=d();b.exports=e},{}],67:[function(a,b,c){"use strict";function d(a,b){return a.msg=I[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(E.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){F._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,E.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=G(a.adler,b,e,c):2===a.state.wrap&&(a.adler=H(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-la?a.strstart-(a.w_size-la):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ka,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&f<m);if(d=ka-(m-f),f=m-ka,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-la)){E.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=ja)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+ja-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<ja)););}while(a.lookahead<la&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===J)return ua;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return ua;if(a.strstart-a.block_start>=a.w_size-la&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?ua:ua}function o(a,b){for(var c,d;;){if(a.lookahead<la){if(m(a),a.lookahead<la&&b===J)return ua;if(0===a.lookahead)break}if(c=0,a.lookahead>=ja&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-la&&(a.match_length=l(a,c)),a.match_length>=ja)if(d=F._tr_tally(a,a.strstart-a.match_start,a.match_length-ja),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=ja){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=a.strstart<ja-1?a.strstart:ja-1,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function p(a,b){for(var c,d,e;;){if(a.lookahead<la){if(m(a),a.lookahead<la&&b===J)return ua;if(0===a.lookahead)break}if(c=0,a.lookahead>=ja&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=ja-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-la&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===U||a.match_length===ja&&a.strstart-a.match_start>4096)&&(a.match_length=ja-1)),a.prev_length>=ja&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-ja,d=F._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-ja),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=ja-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return ua}else if(a.match_available){if(d=F._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return ua}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=F._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<ja-1?a.strstart:ja-1,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ka){if(m(a),a.lookahead<=ka&&b===J)return ua;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=ja&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ka;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&e<f);a.match_length=ka-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=ja?(c=F._tr_tally(a,1,a.match_length-ja),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===J)return ua;break}if(a.match_length=0,c=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function s(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e}function t(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=D[a.level].max_lazy,a.good_match=D[a.level].good_length,a.nice_match=D[a.level].nice_length,a.max_chain_length=D[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=ja-1,a.match_available=0,a.ins_h=0}function u(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=$,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new E.Buf16(2*ha),this.dyn_dtree=new E.Buf16(2*(2*fa+1)),this.bl_tree=new E.Buf16(2*(2*ga+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new E.Buf16(ia+1),this.heap=new E.Buf16(2*ea+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new E.Buf16(2*ea+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function v(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=Z,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?na:sa,a.adler=2===b.wrap?0:1,b.last_flush=J,F._tr_init(b),O):d(a,Q)}function w(a){var b=v(a);return b===O&&t(a.state),b}function x(a,b){return a&&a.state?2!==a.state.wrap?Q:(a.state.gzhead=b,O):Q}function y(a,b,c,e,f,g){if(!a)return Q;var h=1;if(b===T&&(b=6),e<0?(h=0,e=-e):e>15&&(h=2,e-=16),f<1||f>_||c!==$||e<8||e>15||b<0||b>9||g<0||g>X)return d(a,Q);8===e&&(e=9);var i=new u;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+ja-1)/ja),i.window=new E.Buf8(2*i.w_size),i.head=new E.Buf16(i.hash_size),i.prev=new E.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new E.Buf8(i.pending_buf_size),i.d_buf=1*i.lit_bufsize,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,w(a)}function z(a,b){return y(a,b,$,aa,ba,Y)}function A(a,b){var c,h,k,l;if(!a||!a.state||b>N||b<0)return a?d(a,Q):Q;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===ta&&b!==M)return d(a,0===a.avail_out?S:Q);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===na)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=V||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=H(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=oa):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=V||h.level<2?4:0),i(h,ya),h.status=sa);else{var m=$+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=V||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=ma),m+=31-m%31,h.status=sa,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===oa)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=pa)}else h.status=pa;if(h.status===pa)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=qa)}else h.status=qa;if(h.status===qa)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=ra)}else h.status=ra;if(h.status===ra&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=sa)):h.status=sa),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,O}else if(0===a.avail_in&&e(b)<=e(c)&&b!==M)return d(a,S);if(h.status===ta&&0!==a.avail_in)return d(a,S);if(0!==a.avail_in||0!==h.lookahead||b!==J&&h.status!==ta){var o=h.strategy===V?r(h,b):h.strategy===W?q(h,b):D[h.level].func(h,b);if(o!==wa&&o!==xa||(h.status=ta),o===ua||o===wa)return 0===a.avail_out&&(h.last_flush=-1),O;if(o===va&&(b===K?F._tr_align(h):b!==N&&(F._tr_stored_block(h,0,0,!1),b===L&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,O}return b!==M?O:h.wrap<=0?P:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?O:P)}function B(a){var b;return a&&a.state?(b=a.state.status,b!==na&&b!==oa&&b!==pa&&b!==qa&&b!==ra&&b!==sa&&b!==ta?d(a,Q):(a.state=null,b===sa?d(a,R):O)):Q}function C(a,b){var c,d,e,g,h,i,j,k,l=b.length;if(!a||!a.state)return Q;if(c=a.state,g=c.wrap,2===g||1===g&&c.status!==na||c.lookahead)return Q;for(1===g&&(a.adler=G(a.adler,b,l,0)),c.wrap=0,l>=c.w_size&&(0===g&&(f(c.head),c.strstart=0,c.block_start=0,c.insert=0),k=new E.Buf8(c.w_size),E.arraySet(k,b,l-c.w_size,c.w_size,0),b=k,l=c.w_size),h=a.avail_in,i=a.next_in,j=a.input,a.avail_in=l,a.next_in=0,a.input=b,m(c);c.lookahead>=ja;){d=c.strstart,e=c.lookahead-(ja-1);do c.ins_h=(c.ins_h<<c.hash_shift^c.window[d+ja-1])&c.hash_mask,c.prev[d&c.w_mask]=c.head[c.ins_h],c.head[c.ins_h]=d,d++;while(--e);c.strstart=d,c.lookahead=ja-1,m(c)}return c.strstart+=c.lookahead,c.block_start=c.strstart,c.insert=c.lookahead,c.lookahead=0,c.match_length=c.prev_length=ja-1,c.match_available=0,a.next_in=i,a.input=j,a.avail_in=h,c.wrap=g,O}var D,E=a("../utils/common"),F=a("./trees"),G=a("./adler32"),H=a("./crc32"),I=a("./messages"),J=0,K=1,L=3,M=4,N=5,O=0,P=1,Q=-2,R=-3,S=-5,T=-1,U=1,V=2,W=3,X=4,Y=0,Z=2,$=8,_=9,aa=15,ba=8,ca=29,da=256,ea=da+1+ca,fa=30,ga=19,ha=2*ea+1,ia=15,ja=3,ka=258,la=ka+ja+1,ma=32,na=42,oa=69,pa=73,qa=91,ra=103,sa=113,ta=666,ua=1,va=2,wa=3,xa=4,ya=3;D=[new s(0,0,0,0,n),new s(4,4,8,4,o),new s(4,5,16,8,o),new s(4,6,32,32,o),new s(4,4,16,16,p),new s(8,16,32,32,p),new s(8,16,128,128,p),new s(8,32,128,256,p),new s(32,128,258,1024,p),new s(32,258,258,4096,p)],c.deflateInit=z,c.deflateInit2=y,c.deflateReset=w,c.deflateResetKeep=v,c.deflateSetHeader=x,c.deflate=A,c.deflateEnd=B,c.deflateSetDictionary=C,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":62,"./adler32":64,"./crc32":66,"./messages":72,"./trees":73}],68:[function(a,b,c){"use strict";function d(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=d},{}],69:[function(a,b,c){"use strict";var d=30,e=12;b.exports=function(a,b){var c,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;c=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=c.dmax,l=c.wsize,m=c.whave,n=c.wnext,o=c.window,p=c.hold,q=c.bits,r=c.lencode,s=c.distcode,t=(1<<c.lenbits)-1,u=(1<<c.distbits)-1;a:do{q<15&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){c.mode=e;break a}a.msg="invalid literal/length code",c.mode=d;break a}x=65535&v,w&=15,w&&(q<w&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),q<15&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",c.mode=d;break a}if(y=65535&v,w&=15,q<w&&(p+=B[f++]<<q,q+=8,q<w&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",c.mode=d;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&c.sane){a.msg="invalid distance too far back",c.mode=d;break a}if(z=0,A=o,0===n){if(z+=l-w,w<x){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(n<w){if(z+=l+n-w,w-=n,w<x){x-=w;do C[h++]=o[z++];while(--w);if(z=0,n<x){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,w<x){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(f<g&&h<j);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=f<g?5+(g-f):5-(f-g),a.avail_out=h<j?257+(j-h):257-(h-j),c.hold=p,c.bits=q}},{}],70:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new s.Buf16(320),this.work=new s.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=L,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new s.Buf32(pa),b.distcode=b.distdyn=new s.Buf32(qa),b.sane=1,b.back=-1,D):G}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):G}function h(a,b){var c,d;return a&&a.state?(d=a.state,b<0?(c=0,b=-b):(c=(b>>4)+1,b<48&&(b&=15)),b&&(b<8||b>15)?G:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):G}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==D&&(a.state=null),c):G}function j(a){return i(a,sa)}function k(a){if(ta){var b;for(q=new s.Buf32(512),r=new s.Buf32(32),b=0;b<144;)a.lens[b++]=8;for(;b<256;)a.lens[b++]=9;for(;b<280;)a.lens[b++]=7;for(;b<288;)a.lens[b++]=8;for(w(y,a.lens,0,288,q,0,a.work,{bits:9}),b=0;b<32;)a.lens[b++]=5;w(z,a.lens,0,32,r,0,a.work,{bits:5}),ta=!1}a.lencode=q,a.lenbits=9,a.distcode=r,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new s.Buf8(f.wsize)),d>=f.wsize?(s.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),s.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(s.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,r,pa,qa,ra,sa,ta,ua,va,wa,xa,ya,za,Aa=0,Ba=new s.Buf8(4),Ca=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return G;c=a.state,c.mode===W&&(c.mode=X),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xa=D;a:for(;;)switch(c.mode){case L:if(0===c.wrap){c.mode=X;break}for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0),m=0,n=0,c.mode=M;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=ma;break}if((15&m)!==K){a.msg="unknown compression method",c.mode=ma;break}if(m>>>=4,n-=4,wa=(15&m)+8,0===c.wbits)c.wbits=wa;else if(wa>c.wbits){a.msg="invalid window size",c.mode=ma;break}c.dmax=1<<wa,a.adler=c.check=1,c.mode=512&m?U:W,m=0,n=0;break;case M:for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==K){a.msg="unknown compression method",c.mode=ma;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=ma;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0,c.mode=N;case N:for(;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,Ba[2]=m>>>16&255,Ba[3]=m>>>24&255,c.check=u(c.check,Ba,4,0)),m=0,n=0,c.mode=O;case O:for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0,c.mode=P;case P:if(1024&c.flags){for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=Q;case Q:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wa=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),s.arraySet(c.head.extra,e,g,q,wa)),512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=R;case R:if(2048&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.name+=String.fromCharCode(wa));while(wa&&q<i);if(512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=S;case S:if(4096&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.comment+=String.fromCharCode(wa));while(wa&&q<i);if(512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.comment=null);c.mode=T;case T:if(512&c.flags){for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=ma;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=W;break;case U:for(;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=V;case V:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,F;a.adler=c.check=1,c.mode=W;case W:if(b===B||b===C)break a;case X:if(c.last){m>>>=7&n,n-=7&n,c.mode=ja;break}for(;n<3;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=Y;break;case 1:if(k(c),c.mode=ca,b===C){m>>>=2,n-=2;break a}break;case 2:c.mode=_;break;case 3:a.msg="invalid block type",c.mode=ma}m>>>=2,n-=2;break;case Y:for(m>>>=7&n,n-=7&n;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=ma;break}if(c.length=65535&m,m=0,n=0,c.mode=Z,b===C)break a;case Z:c.mode=$;case $:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;s.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=W;break;case _:for(;n<14;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=ma;break}c.have=0,c.mode=aa;case aa:for(;c.have<c.ncode;){for(;n<3;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Ca[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Ca[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,ya={bits:c.lenbits},xa=w(x,c.lens,0,19,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid code lengths set",c.mode=ma;break}c.have=0,c.mode=ba;case ba:for(;c.have<c.nlen+c.ndist;){for(;Aa=c.lencode[m&(1<<c.lenbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(sa<16)m>>>=qa,n-=qa,c.lens[c.have++]=sa;else{if(16===sa){for(za=qa+2;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qa,n-=qa,0===c.have){a.msg="invalid bit length repeat",c.mode=ma;break}wa=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sa){for(za=qa+3;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qa,n-=qa,wa=0,q=3+(7&m),m>>>=3,n-=3}else{for(za=qa+7;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qa,n-=qa,wa=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=ma;break}for(;q--;)c.lens[c.have++]=wa}}if(c.mode===ma)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=ma;break}if(c.lenbits=9,ya={bits:c.lenbits},xa=w(y,c.lens,0,c.nlen,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid literal/lengths set",c.mode=ma;break}if(c.distbits=6,c.distcode=c.distdyn,ya={bits:c.distbits},xa=w(z,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,ya),c.distbits=ya.bits,xa){a.msg="invalid distances set",c.mode=ma;break}if(c.mode=ca,b===C)break a;case ca:c.mode=da;case da:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,v(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===W&&(c.back=-1);break}for(c.back=0;Aa=c.lencode[m&(1<<c.lenbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(ra&&0===(240&ra)){for(ta=qa,ua=ra,va=sa;Aa=c.lencode[va+((m&(1<<ta+ua)-1)>>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(ta+qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,c.length=sa,0===ra){c.mode=ia;break}if(32&ra){c.back=-1,c.mode=W;break}if(64&ra){a.msg="invalid literal/length code",c.mode=ma;break}c.extra=15&ra,c.mode=ea;case ea:if(c.extra){for(za=c.extra;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=fa;case fa:for(;Aa=c.distcode[m&(1<<c.distbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&ra)){for(ta=qa,ua=ra,va=sa;Aa=c.distcode[va+((m&(1<<ta+ua)-1)>>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(ta+qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,64&ra){a.msg="invalid distance code",c.mode=ma;break}c.offset=sa,c.extra=15&ra,c.mode=ga;case ga:if(c.extra){for(za=c.extra;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=ma;break}c.mode=ha;case ha:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=ma;break}q>c.wnext?(q-=c.wnext,r=c.wsize-q):r=c.wnext-q,q>c.length&&(q=c.length),pa=c.window}else pa=f,r=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pa[r++];while(--q);0===c.length&&(c.mode=da);break;case ia:if(0===j)break a;f[h++]=c.length,j--,c.mode=da;break;case ja:if(c.wrap){for(;n<32;){if(0===i)break a;i--,m|=e[g++]<<n,n+=8}if(p-=j,a.total_out+=p,c.total+=p,p&&(a.adler=c.check=c.flags?u(c.check,f,p,h-p):t(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=ma;break}m=0,n=0}c.mode=ka;case ka:if(c.wrap&&c.flags){for(;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=ma;break}m=0,n=0}c.mode=la;case la:xa=E;break a;case ma:xa=H;break a;case na:return I;case oa:default:return G}return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,(c.wsize||p!==a.avail_out&&c.mode<ma&&(c.mode<ja||b!==A))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=na,I):(o-=a.avail_in,p-=a.avail_out,a.total_in+=o,a.total_out+=p,c.total+=p,c.wrap&&p&&(a.adler=c.check=c.flags?u(c.check,f,p,a.next_out-p):t(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===W?128:0)+(c.mode===ca||c.mode===Z?256:0),(0===o&&0===p||b===A)&&xa===D&&(xa=J),xa)}function n(a){if(!a||!a.state)return G;var b=a.state;return b.window&&(b.window=null),a.state=null,D}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?G:(c.head=b,b.done=!1,D)):G}function p(a,b){var c,d,e,f=b.length;return a&&a.state?(c=a.state,0!==c.wrap&&c.mode!==V?G:c.mode===V&&(d=1,d=t(d,b,f,0),d!==c.check)?H:(e=l(a,b,f,f))?(c.mode=na,I):(c.havedict=1,D)):G}var q,r,s=a("../utils/common"),t=a("./adler32"),u=a("./crc32"),v=a("./inffast"),w=a("./inftrees"),x=0,y=1,z=2,A=4,B=5,C=6,D=0,E=1,F=2,G=-2,H=-3,I=-4,J=-5,K=8,L=1,M=2,N=3,O=4,P=5,Q=6,R=7,S=8,T=9,U=10,V=11,W=12,X=13,Y=14,Z=15,$=16,_=17,aa=18,ba=19,ca=20,da=21,ea=22,fa=23,ga=24,ha=25,ia=26,ja=27,ka=28,la=29,ma=30,na=31,oa=32,pa=852,qa=592,ra=15,sa=ra,ta=!0;c.inflateReset=g,c.inflateReset2=h,c.inflateResetKeep=f,c.inflateInit=j,c.inflateInit2=i,c.inflate=m,c.inflateEnd=n,c.inflateGetHeader=o,c.inflateSetDictionary=p,c.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":62,"./adler32":64,"./crc32":66,"./inffast":69,"./inftrees":71}],71:[function(a,b,c){"use strict";var d=a("../utils/common"),e=15,f=852,g=592,h=0,i=1,j=2,k=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],l=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],m=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],n=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];b.exports=function(a,b,c,o,p,q,r,s){var t,u,v,w,x,y,z,A,B,C=s.bits,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=null,O=0,P=new d.Buf16(e+1),Q=new d.Buf16(e+1),R=null,S=0;for(D=0;D<=e;D++)P[D]=0;for(E=0;E<o;E++)P[b[c+E]]++;for(H=C,G=e;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;F<G&&0===P[F];F++);for(H<F&&(H=F),K=1,D=1;D<=e;D++)if(K<<=1,K-=P[D],K<0)return-1;if(K>0&&(a===h||1!==G))return-1;for(Q[1]=0,D=1;D<e;D++)Q[D+1]=Q[D]+P[D];for(E=0;E<o;E++)0!==b[c+E]&&(r[Q[b[c+E]]++]=E);if(a===h?(N=R=r,y=19):a===i?(N=k,O-=257,R=l,S-=257,y=256):(N=m,R=n,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<<H,w=L-1,a===i&&L>f||a===j&&L>g)return 1;for(;;){z=D-J,r[E]<y?(A=0,B=r[E]):r[E]>y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<<D-J,u=1<<I,F=u;do u-=t,p[x+(M>>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<<D-1;M&t;)t>>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[c+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<<I;I+J<G&&(K-=P[I+J],!(K<=0));)I++,K<<=1;if(L+=1<<I,a===i&&L>f||a===j&&L>g)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":62}],72:[function(a,b,c){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],73:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length}function f(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b}function g(a){return a<256?ia[a]:ia[256+(a>>>7)]}function h(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function i(a,b,c){a.bi_valid>X-c?(a.bi_buf|=b<<a.bi_valid&65535,h(a,a.bi_buf),a.bi_buf=b>>X-a.bi_valid,a.bi_valid+=c-X):(a.bi_buf|=b<<a.bi_valid&65535,a.bi_valid+=c)}function j(a,b,c){i(a,c[2*b],c[2*b+1])}function k(a,b){var c=0;do c|=1&a,a>>>=1,c<<=1;while(--b>0);return c>>>1}function l(a){16===a.bi_valid?(h(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function m(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;f<=W;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,
+c=a.heap_max+1;c<V;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function n(a,b,c){var d,e,f=new Array(W+1),g=0;for(d=1;d<=W;d++)f[d]=g=g+c[d-1]<<1;for(e=0;e<=b;e++){var h=a[2*e+1];0!==h&&(a[2*e]=k(f[h]++,h))}}function o(){var a,b,c,d,f,g=new Array(W+1);for(c=0,d=0;d<Q-1;d++)for(ka[d]=c,a=0;a<1<<ba[d];a++)ja[c++]=d;for(ja[c-1]=d,f=0,d=0;d<16;d++)for(la[d]=f,a=0;a<1<<ca[d];a++)ia[f++]=d;for(f>>=7;d<T;d++)for(la[d]=f<<7,a=0;a<1<<ca[d]-7;a++)ia[256+f++]=d;for(b=0;b<=W;b++)g[b]=0;for(a=0;a<=143;)ga[2*a+1]=8,a++,g[8]++;for(;a<=255;)ga[2*a+1]=9,a++,g[9]++;for(;a<=279;)ga[2*a+1]=7,a++,g[7]++;for(;a<=287;)ga[2*a+1]=8,a++,g[8]++;for(n(ga,S+1,g),a=0;a<T;a++)ha[2*a+1]=5,ha[2*a]=k(a,5);ma=new e(ga,ba,R+1,S,W),na=new e(ha,ca,0,T,W),oa=new e(new Array(0),da,0,U,Y)}function p(a){var b;for(b=0;b<S;b++)a.dyn_ltree[2*b]=0;for(b=0;b<T;b++)a.dyn_dtree[2*b]=0;for(b=0;b<U;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*Z]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function q(a){a.bi_valid>8?h(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function r(a,b,c,d){q(a),d&&(h(a,c),h(a,~c)),G.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function s(a,b,c,d){var e=2*b,f=2*c;return a[e]<a[f]||a[e]===a[f]&&d[b]<=d[c]}function t(a,b,c){for(var d=a.heap[c],e=c<<1;e<=a.heap_len&&(e<a.heap_len&&s(b,a.heap[e+1],a.heap[e],a.depth)&&e++,!s(b,d,a.heap[e],a.depth));)a.heap[c]=a.heap[e],c=e,e<<=1;a.heap[c]=d}function u(a,b,c){var d,e,f,h,k=0;if(0!==a.last_lit)do d=a.pending_buf[a.d_buf+2*k]<<8|a.pending_buf[a.d_buf+2*k+1],e=a.pending_buf[a.l_buf+k],k++,0===d?j(a,e,b):(f=ja[e],j(a,f+R+1,b),h=ba[f],0!==h&&(e-=ka[f],i(a,e,h)),d--,f=g(d),j(a,f,c),h=ca[f],0!==h&&(d-=la[f],i(a,d,h)));while(k<a.last_lit);j(a,Z,b)}function v(a,b){var c,d,e,f=b.dyn_tree,g=b.stat_desc.static_tree,h=b.stat_desc.has_stree,i=b.stat_desc.elems,j=-1;for(a.heap_len=0,a.heap_max=V,c=0;c<i;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=j<2?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)t(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],t(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,t(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],m(a,b),n(f,j,a.bl_count)}function w(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;d<=c;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(h<j?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*$]++):h<=10?a.bl_tree[2*_]++:a.bl_tree[2*aa]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function x(a,b,c){var d,e,f=-1,g=b[1],h=0,k=7,l=4;for(0===g&&(k=138,l=3),d=0;d<=c;d++)if(e=g,g=b[2*(d+1)+1],!(++h<k&&e===g)){if(h<l){do j(a,e,a.bl_tree);while(0!==--h)}else 0!==e?(e!==f&&(j(a,e,a.bl_tree),h--),j(a,$,a.bl_tree),i(a,h-3,2)):h<=10?(j(a,_,a.bl_tree),i(a,h-3,3)):(j(a,aa,a.bl_tree),i(a,h-11,7));h=0,f=e,0===g?(k=138,l=3):e===g?(k=6,l=3):(k=7,l=4)}}function y(a){var b;for(w(a,a.dyn_ltree,a.l_desc.max_code),w(a,a.dyn_dtree,a.d_desc.max_code),v(a,a.bl_desc),b=U-1;b>=3&&0===a.bl_tree[2*ea[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function z(a,b,c,d){var e;for(i(a,b-257,5),i(a,c-1,5),i(a,d-4,4),e=0;e<d;e++)i(a,a.bl_tree[2*ea[e]+1],3);x(a,a.dyn_ltree,b-1),x(a,a.dyn_dtree,c-1)}function A(a){var b,c=4093624447;for(b=0;b<=31;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return I;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return J;for(b=32;b<R;b++)if(0!==a.dyn_ltree[2*b])return J;return I}function B(a){pa||(o(),pa=!0),a.l_desc=new f(a.dyn_ltree,ma),a.d_desc=new f(a.dyn_dtree,na),a.bl_desc=new f(a.bl_tree,oa),a.bi_buf=0,a.bi_valid=0,p(a)}function C(a,b,c,d){i(a,(L<<1)+(d?1:0),3),r(a,b,c,!0)}function D(a){i(a,M<<1,3),j(a,Z,ga),l(a)}function E(a,b,c,d){var e,f,g=0;a.level>0?(a.strm.data_type===K&&(a.strm.data_type=A(a)),v(a,a.l_desc),v(a,a.d_desc),g=y(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,f<=e&&(e=f)):e=f=c+5,c+4<=e&&b!==-1?C(a,b,c,d):a.strategy===H||f===e?(i(a,(M<<1)+(d?1:0),3),u(a,ga,ha)):(i(a,(N<<1)+(d?1:0),3),z(a,a.l_desc.max_code+1,a.d_desc.max_code+1,g+1),u(a,a.dyn_ltree,a.dyn_dtree)),p(a),d&&q(a)}function F(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(ja[c]+R+1)]++,a.dyn_dtree[2*g(b)]++),a.last_lit===a.lit_bufsize-1}var G=a("../utils/common"),H=4,I=0,J=1,K=2,L=0,M=1,N=2,O=3,P=258,Q=29,R=256,S=R+1+Q,T=30,U=19,V=2*S+1,W=15,X=16,Y=7,Z=256,$=16,_=17,aa=18,ba=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ca=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],da=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],ea=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],fa=512,ga=new Array(2*(S+2));d(ga);var ha=new Array(2*T);d(ha);var ia=new Array(fa);d(ia);var ja=new Array(P-O+1);d(ja);var ka=new Array(Q);d(ka);var la=new Array(T);d(la);var ma,na,oa,pa=!1;c._tr_init=B,c._tr_stored_block=C,c._tr_flush_block=E,c._tr_tally=F,c._tr_align=D},{"../utils/common":62}],74:[function(a,b,c){"use strict";function d(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=d},{}]},{},[10])(10)});
\ No newline at end of file
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index 458ed964ab7..be29eaecdfe 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -403,10 +403,10 @@ doclet.usage.docencoding.description=\
     Specify the character encoding for the output
 
 doclet.usage.frames.description=\
-    Enable the use of frames in the generated output (default)
+    Enable the use of frames in the generated output
 
 doclet.usage.no-frames.description=\
-    Disable the use of frames in the generated output
+    Disable the use of frames in the generated output (default)
 
 doclet.usage.override-methods.parameters=\
     (detail|summary)
@@ -450,3 +450,10 @@ doclet.HTML_4_specified=\
     The default is currently HTML5 and the support for HTML 4.01 will be removed\n\
     in a future release. To suppress this warning, please ensure that any HTML constructs\n\
     in your comments are valid in HTML5, and remove the -html4 option.
+
+# L10N: do not localize the option names --frames
+doclet.Frames_specified=\
+    You have specified to generate frames, by using the --frames option.\n\
+    The default is currently to not generate frames and the support for \n\
+    frames will be removed in a future release.\n\
+    To suppress this warning, remove the --frames option and avoid the use of frames.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
index 31c4daed83f..7f1e486cf46 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
@@ -884,7 +884,7 @@ table.striped {
     border: 1px solid black;
 }
 table.striped > thead {
-    background-color: #DDD;
+    background-color: #E3E3E3;
 }
 table.striped > thead > tr > th, table.striped > thead > tr > td {
     border: 1px solid black;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java
index 7f17ff52bfd..04e4e098790 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java
@@ -215,7 +215,9 @@ public class ClassUseMapper {
             mapAnnotations(classToPackageAnnotations, pkg, pkg);
             mapTypeParameters(classToClassTypeParam, aClass, aClass);
             mapAnnotations(classToClassAnnotations, aClass, aClass);
-            List<VariableElement> fields = utils.getFields(aClass);
+            VisibleMemberTable vmt = configuration.getVisibleMemberTable(aClass);
+
+            List<VariableElement> fields = ElementFilter.fieldsIn(vmt.getVisibleMembers(FIELDS));
             for (VariableElement fd : fields) {
                 mapTypeParameters(classToFieldTypeParam, fd, fd);
                 mapAnnotations(annotationToField, fd, fd);
@@ -238,13 +240,12 @@ public class ClassUseMapper {
                 stv.visit(fd.asType(), fd);
             }
 
-            List<ExecutableElement> ctors = utils.getConstructors(aClass);
+            List<ExecutableElement> ctors = ElementFilter.constructorsIn(vmt.getMembers(CONSTRUCTORS));
             for (ExecutableElement ctor : ctors) {
                 mapAnnotations(classToConstructorAnnotations, ctor, ctor);
                 mapExecutable(ctor);
             }
 
-            VisibleMemberTable vmt = configuration.getVisibleMemberTable(aClass);
             List<ExecutableElement> methods = ElementFilter.methodsIn(vmt.getMembers(METHODS));
 
             for (ExecutableElement method : methods) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
index 9242d81bfa2..187a10dec64 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
@@ -119,7 +119,7 @@ public class DocPaths {
     public static final DocPath JQUERY_STYLESHEET_FILE = DocPath.create("jquery-ui.css");
 
     /** The name of the default jQuery javascript file. */
-    public static final DocPath JQUERY_JS_1_10 = DocPath.create("jquery-1.10.2.js");
+    public static final DocPath JQUERY_JS_1_12 = DocPath.create("jquery-1.12.4.js");
 
     /** The name of the default jQuery javascript file. */
     public static final DocPath JQUERY_JS = DocPath.create("jquery-ui.js");
diff --git a/src/jdk.javadoc/share/legal/jquery.md b/src/jdk.javadoc/share/legal/jquery.md
index 197afc01a58..8e7d50dfa14 100644
--- a/src/jdk.javadoc/share/legal/jquery.md
+++ b/src/jdk.javadoc/share/legal/jquery.md
@@ -1,9 +1,9 @@
-## jQuery v1.20.2
+## jQuery v1.12.4
 
 ### jQuery License
 <pre>
-jQuery v 1.10.2
-Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
+jQuery v 1.12.4
+Copyright 2005, 2016 jQuery Foundation, Inc. and other contributors
 http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************
 
-The jQuery JavaScript Library v1.10.2 also includes Sizzle.js
+The jQuery JavaScript Library v1.12.4 also includes Sizzle.js
 
 Sizzle.js includes the following license:
 
diff --git a/src/jdk.javadoc/share/legal/jszip.md b/src/jdk.javadoc/share/legal/jszip.md
index 46359d7ba0a..29c42666b07 100644
--- a/src/jdk.javadoc/share/legal/jszip.md
+++ b/src/jdk.javadoc/share/legal/jszip.md
@@ -1,9 +1,9 @@
-## JSZip v2.5.0
+## JSZip v3.1.5
 
 ### MIT License
 <pre>
 
-Copyright (c) 2009-2014 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
+Copyright (c) 2009-2016 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java b/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
index 86f0d1a77f9..09bde36d0fe 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
@@ -88,7 +88,9 @@ class Arguments {
         }
 
         if (listCounters != true && sb.length() == 0) {
-            throw new IllegalArgumentException("No command specified");
+            // Omitting the command shall cause the target VM to print out a list
+            // of available commands.
+            sb.append("help");
         }
 
         command = sb.toString().trim();
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java
index bf2152a4ec5..a46d3c8b189 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java
@@ -44,6 +44,7 @@ import java.util.Collections;
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -329,7 +330,7 @@ public class ModuleDotGraph {
 
                 out.format("digraph \"%s\" {%n", name);
                 out.format("  nodesep=.5;%n");
-                out.format("  ranksep=%f;%n", attributes.rankSep());
+                out.format((Locale)null, "  ranksep=%f;%n", attributes.rankSep());
                 out.format("  pencolor=transparent;%n");
                 out.format("  node [shape=plaintext, fontcolor=\"%s\", fontname=\"%s\","
                                 + " fontsize=%d, margin=\".2,.2\"];%n",
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
index ee5a1ef2a4c..af09a3e3c4f 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -118,7 +118,6 @@ public interface ThreadReference extends ObjectReference {
      * @throws InvalidTypeException if <code>throwable</code> is not
      * an instance of java.lang.Throwable in the target VM.
      * @throws VMCannotBeModifiedException if the VirtualMachine is read-only - see {@link VirtualMachine#canBeModified()}.
-     * @see java.lang.Thread#stop(Throwable)
      */
     @SuppressWarnings("javadoc")
     void stop(ObjectReference throwable) throws InvalidTypeException;
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java
index d73103328ac..8a33c23a70c 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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 @@ public class TargetVM implements Runnable {
      * TO DO: The limit numbers below are somewhat arbitrary and should
      * be configurable in the future.
      */
-    static private final int OVERLOADED_QUEUE = 2000;
+    static private final int OVERLOADED_QUEUE = 10000;
     static private final int UNDERLOADED_QUEUE = 100;
 
     TargetVM(VirtualMachineImpl vm, Connection connection) {
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index f4af1765f0f..30ddb127e6d 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -614,6 +614,25 @@
       <setting name="enabled">true</setting>
     </event>
 
+    <event name="jdk.ZPageAllocation">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.ZThreadPhase">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ZStatisticsCounter">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.ZStatisticsSampler">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
 
 
 
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 52deb124867..a85a431390e 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -614,6 +614,25 @@
       <setting name="enabled">true</setting>
     </event>
 
+    <event name="jdk.ZPageAllocation">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.ZThreadPhase">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ZStatisticsCounter">
+      <setting name="threshold">10 ms</setting>
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ZStatisticsSampler">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
 
 
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
index eca78e675a2..0f6b488bf5e 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
@@ -1224,7 +1224,7 @@ public class JmodTask {
 
             all.put(CMD_FILENAME, new OptionDescriptor() {
                 @Override
-                public Collection<String> options() {
+                public List<String> options() {
                     List<String> ret = new ArrayList<>();
                     ret.add(CMD_FILENAME);
                     return ret;
@@ -1314,7 +1314,7 @@ public class JmodTask {
                         .withValuesConvertedBy(new PatternConverter());
 
         OptionSpec<Void> help
-                = parser.acceptsAll(Set.of("h", "help", "?"), getMessage("main.opt.help"))
+                = parser.acceptsAll(List.of("h", "help", "?"), getMessage("main.opt.help"))
                         .forHelp();
 
         OptionSpec<Void> helpExtra
@@ -1347,7 +1347,7 @@ public class JmodTask {
                         .withValuesConvertedBy(DirPathConverter.INSTANCE);
 
         OptionSpec<List<Path>> modulePath
-                = parser.acceptsAll(Set.of("p", "module-path"),
+                = parser.acceptsAll(List.of("p", "module-path"),
                                     getMessage("main.opt.module-path"))
                         .withRequiredArg()
                         .withValuesConvertedBy(DirPathConverter.INSTANCE);
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index 2d4e2095450..94cd62761fd 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -173,7 +173,7 @@ class ConsoleIOContext extends IOContext {
             }
         }
         repl.prefs.flush();
-        in.shutdown();
+        in.close();
         try {
             in.getTerminal().restore();
         } catch (Exception ex) {
@@ -1179,7 +1179,7 @@ class ConsoleIOContext extends IOContext {
 
         public TestTerminal(StopDetectingInputStream input) throws Exception {
             super(true);
-            setAnsiSupported(Boolean.getBoolean("test.terminal.ansi.supported"));
+            setAnsiSupported(true);
             setEchoEnabled(false);
             this.input = input;
             int h = DEFAULT_HEIGHT;
@@ -1218,7 +1218,7 @@ class ConsoleIOContext extends IOContext {
         private final CompletionState completionState;
 
         public CheckCompletionKeyMap(KeyMap del, CompletionState completionState) {
-            super(del.getName(), del.isViKeyMap());
+            super(del.getName());
             this.del = del;
             this.completionState = completionState;
         }
diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java
index b88cf85502a..e169b3b7a6a 100644
--- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java
+++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, 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
@@ -91,6 +91,7 @@ public class FormatData_ja extends ParallelListResourceBundle {
             "\u5927\u6b63", // Taisho
             "\u662d\u548c", // Showa
             "\u5e73\u6210", // Heisei
+            "\u65b0\u5143\u53f7", // NewEra
         };
         final String[] rocEras = {
             "\u6c11\u56fd\u524d",
diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
index 5c4b510140c..84e0e1f3143 100644
--- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
+++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
@@ -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
@@ -154,6 +154,7 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle {
             "\u5927\u6b63",
             "\u662d\u548c",
             "\u5e73\u6210",
+            "\u65b0\u5143\u53f7", // NewEra
         };
 
         final String[] sharedJavaTimeShortEras = {
diff --git a/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java b/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java
index 353dd5e6b8c..e86fb7fa619 100644
--- a/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java
+++ b/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -49,16 +49,55 @@ class LinuxSocketOptions extends PlatformSocketOptions {
         return quickAckSupported0();
     }
 
-    native static private void setQuickAck0(int fd, boolean on) throws SocketException;
+    @Override
+    boolean keepAliveOptionsSupported() {
+        return keepAliveOptionsSupported0();
+    }
 
-    native static private boolean getQuickAck0(int fd) throws SocketException;
+    @Override
+    void setTcpkeepAliveProbes(int fd, final int value) throws SocketException {
+        setTcpkeepAliveProbes0(fd, value);
+    }
 
-    native static private boolean quickAckSupported0();
+    @Override
+    void setTcpKeepAliveTime(int fd, final int value) throws SocketException {
+        setTcpKeepAliveTime0(fd, value);
+    }
 
+    @Override
+    void setTcpKeepAliveIntvl(int fd, final int value) throws SocketException {
+        setTcpKeepAliveIntvl0(fd, value);
+    }
+
+    @Override
+    int getTcpkeepAliveProbes(int fd) throws SocketException {
+        return getTcpkeepAliveProbes0(fd);
+    }
+
+    @Override
+    int getTcpKeepAliveTime(int fd) throws SocketException {
+        return getTcpKeepAliveTime0(fd);
+    }
+
+    @Override
+    int getTcpKeepAliveIntvl(int fd) throws SocketException {
+        return getTcpKeepAliveIntvl0(fd);
+    }
+
+    private static native void setTcpkeepAliveProbes0(int fd, int value) throws SocketException;
+    private static native void setTcpKeepAliveTime0(int fd, int value) throws SocketException;
+    private static native void setTcpKeepAliveIntvl0(int fd, int value) throws SocketException;
+    private static native int getTcpkeepAliveProbes0(int fd) throws SocketException;
+    private static native int getTcpKeepAliveTime0(int fd) throws SocketException;
+    private static native int getTcpKeepAliveIntvl0(int fd) throws SocketException;
+    private static native void setQuickAck0(int fd, boolean on) throws SocketException;
+    private static native boolean getQuickAck0(int fd) throws SocketException;
+    private static native boolean keepAliveOptionsSupported0();
+    private static native boolean quickAckSupported0();
     static {
         AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
             System.loadLibrary("extnet");
             return null;
         });
     }
-}
+}
\ No newline at end of file
diff --git a/src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c b/src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c
index 2beee6a5290..241133c813f 100644
--- a/src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c
+++ b/src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -29,7 +29,9 @@
 
 #include <jni.h>
 #include <netinet/tcp.h>
+#include <netinet/in.h>
 #include "jni_util.h"
+#include "jdk_net_LinuxSocketOptions.h"
 
 /*
  * Class:     jdk_net_LinuxSocketOptions
@@ -97,3 +99,117 @@ JNIEXPORT jboolean JNICALL Java_jdk_net_LinuxSocketOptions_quickAckSupported0
     close(s);
     return rv;
 }
+
+static jint socketOptionSupported(jint sockopt) {
+    jint one = 1;
+    jint rv, s;
+    s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (s < 0) {
+        return 0;
+    }
+    rv = setsockopt(s, SOL_TCP, sockopt, (void *) &one, sizeof (one));
+    if (rv != 0 && errno == ENOPROTOOPT) {
+        rv = 0;
+    } else {
+        rv = 1;
+    }
+    close(s);
+    return rv;
+}
+
+static void handleError(JNIEnv *env, jint rv, const char *errmsg) {
+    if (rv < 0) {
+        if (errno == ENOPROTOOPT) {
+            JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
+                    "unsupported socket option");
+        } else {
+            JNU_ThrowByNameWithLastError(env, "java/net/SocketException", errmsg);
+        }
+    }
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    keepAliveOptionsSupported0
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_jdk_net_LinuxSocketOptions_keepAliveOptionsSupported0
+(JNIEnv *env, jobject unused) {
+    return socketOptionSupported(TCP_KEEPIDLE) && socketOptionSupported(TCP_KEEPCNT)
+            && socketOptionSupported(TCP_KEEPINTVL);
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    setTcpkeepAliveProbes0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_LinuxSocketOptions_setTcpkeepAliveProbes0
+(JNIEnv *env, jobject unused, jint fd, jint optval) {
+    jint rv = setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &optval, sizeof (optval));
+    handleError(env, rv, "set option TCP_KEEPCNT failed");
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    setTcpKeepAliveTime0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_LinuxSocketOptions_setTcpKeepAliveTime0
+(JNIEnv *env, jobject unused, jint fd, jint optval) {
+    jint rv = setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, sizeof (optval));
+    handleError(env, rv, "set option TCP_KEEPIDLE failed");
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    setTcpKeepAliveIntvl0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_LinuxSocketOptions_setTcpKeepAliveIntvl0
+(JNIEnv *env, jobject unused, jint fd, jint optval) {
+    jint rv = setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &optval, sizeof (optval));
+    handleError(env, rv, "set option TCP_KEEPINTVL failed");
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    getTcpkeepAliveProbes0
+ * Signature: (I)I;
+ */
+JNIEXPORT jint JNICALL Java_jdk_net_LinuxSocketOptions_getTcpkeepAliveProbes0
+(JNIEnv *env, jobject unused, jint fd) {
+    jint optval, rv;
+    socklen_t sz = sizeof (optval);
+    rv = getsockopt(fd, SOL_TCP, TCP_KEEPCNT, &optval, &sz);
+    handleError(env, rv, "get option TCP_KEEPCNT failed");
+    return optval;
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    getTcpKeepAliveTime0
+ * Signature: (I)I;
+ */
+JNIEXPORT jint JNICALL Java_jdk_net_LinuxSocketOptions_getTcpKeepAliveTime0
+(JNIEnv *env, jobject unused, jint fd) {
+    jint optval, rv;
+    socklen_t sz = sizeof (optval);
+    rv = getsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, &sz);
+    handleError(env, rv, "get option TCP_KEEPIDLE failed");
+    return optval;
+}
+
+/*
+ * Class:     jdk_net_LinuxSocketOptions
+ * Method:    getTcpKeepAliveIntvl0
+ * Signature: (I)I;
+ */
+JNIEXPORT jint JNICALL Java_jdk_net_LinuxSocketOptions_getTcpKeepAliveIntvl0
+(JNIEnv *env, jobject unused, jint fd) {
+    jint optval, rv;
+    socklen_t sz = sizeof (optval);
+    rv = getsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &optval, &sz);
+    handleError(env, rv, "get option TCP_KEEPINTVL failed");
+    return optval;
+}
diff --git a/src/jdk.net/macosx/classes/jdk/net/MacOSXSocketOptions.java b/src/jdk.net/macosx/classes/jdk/net/MacOSXSocketOptions.java
new file mode 100644
index 00000000000..cd5a7021540
--- /dev/null
+++ b/src/jdk.net/macosx/classes/jdk/net/MacOSXSocketOptions.java
@@ -0,0 +1,85 @@
+/*
+ * 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 jdk.net;
+
+import java.net.SocketException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import jdk.net.ExtendedSocketOptions.PlatformSocketOptions;
+
+class MacOSXSocketOptions extends PlatformSocketOptions {
+
+    public MacOSXSocketOptions() {
+    }
+
+    @Override
+    boolean keepAliveOptionsSupported() {
+        return keepAliveOptionsSupported0();
+    }
+
+    @Override
+    void setTcpkeepAliveProbes(int fd, final int value) throws SocketException {
+        setTcpkeepAliveProbes0(fd, value);
+    }
+
+    @Override
+    void setTcpKeepAliveTime(int fd, final int value) throws SocketException {
+        setTcpKeepAliveTime0(fd, value);
+    }
+
+    @Override
+    void setTcpKeepAliveIntvl(int fd, final int value) throws SocketException {
+        setTcpKeepAliveIntvl0(fd, value);
+    }
+
+    @Override
+    int getTcpkeepAliveProbes(int fd) throws SocketException {
+        return getTcpkeepAliveProbes0(fd);
+    }
+
+    @Override
+    int getTcpKeepAliveTime(int fd) throws SocketException {
+        return getTcpKeepAliveTime0(fd);
+    }
+
+    @Override
+    int getTcpKeepAliveIntvl(int fd) throws SocketException {
+        return getTcpKeepAliveIntvl0(fd);
+    }
+
+    private static native void setTcpkeepAliveProbes0(int fd, int value) throws SocketException;
+    private static native void setTcpKeepAliveTime0(int fd, int value) throws SocketException;
+    private static native void setTcpKeepAliveIntvl0(int fd, int value) throws SocketException;
+    private static native int getTcpkeepAliveProbes0(int fd) throws SocketException;
+    private static native int getTcpKeepAliveTime0(int fd) throws SocketException;
+    private static native int getTcpKeepAliveIntvl0(int fd) throws SocketException;
+    private static native boolean keepAliveOptionsSupported0();
+    static {
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            System.loadLibrary("extnet");
+            return null;
+        });
+    }
+}
diff --git a/src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c b/src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c
new file mode 100644
index 00000000000..db676d3c5b1
--- /dev/null
+++ b/src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+#include <sys/socket.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <jni.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+#include "jni_util.h"
+
+static jint socketOptionSupported(jint sockopt) {
+    jint one = 1;
+    jint rv, s;
+    s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (s < 0) {
+        return 0;
+    }
+    rv = setsockopt(s, IPPROTO_TCP, sockopt, (void *) &one, sizeof (one));
+    if (rv != 0 && errno == ENOPROTOOPT) {
+        rv = 0;
+    } else {
+        rv = 1;
+    }
+    close(s);
+    return rv;
+}
+
+static void handleError(JNIEnv *env, jint rv, const char *errmsg) {
+    if (rv < 0) {
+        if (errno == ENOPROTOOPT) {
+            JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
+                    "unsupported socket option");
+        } else {
+            JNU_ThrowByNameWithLastError(env, "java/net/SocketException", errmsg);
+        }
+    }
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    keepAliveOptionsSupported0
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_jdk_net_MacOSXSocketOptions_keepAliveOptionsSupported0
+(JNIEnv *env, jobject unused) {
+    return socketOptionSupported(TCP_KEEPALIVE) && socketOptionSupported(TCP_KEEPCNT)
+            && socketOptionSupported(TCP_KEEPINTVL);
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    setTcpkeepAliveProbes0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_MacOSXSocketOptions_setTcpkeepAliveProbes0
+(JNIEnv *env, jobject unused, jint fd, jint optval) {
+    jint rv = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &optval, sizeof (optval));
+    handleError(env, rv, "set option TCP_KEEPCNT failed");
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    setTcpKeepAliveTime0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_MacOSXSocketOptions_setTcpKeepAliveTime0
+(JNIEnv *env, jobject unused, jint fd, jint optval) {
+    jint rv = setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &optval, sizeof (optval));
+    handleError(env, rv, "set option TCP_KEEPALIVE failed");// mac TCP_KEEPIDLE ->TCP_KEEPALIVE
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    setTcpKeepAliveIntvl0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_MacOSXSocketOptions_setTcpKeepAliveIntvl0
+(JNIEnv *env, jobject unused, jint fd, jint optval) {
+    jint rv = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, sizeof (optval));
+    handleError(env, rv, "set option TCP_KEEPINTVL failed");
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    getTcpkeepAliveProbes0
+ * Signature: (I)I;
+ */
+JNIEXPORT jint JNICALL Java_jdk_net_MacOSXSocketOptions_getTcpkeepAliveProbes0
+(JNIEnv *env, jobject unused, jint fd) {
+    jint optval, rv;
+    socklen_t sz = sizeof (optval);
+    rv = getsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &optval, &sz);
+    handleError(env, rv, "get option TCP_KEEPCNT failed");
+    return optval;
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    getTcpKeepAliveTime0
+ * Signature: (I)I;
+ */
+JNIEXPORT jint JNICALL Java_jdk_net_MacOSXSocketOptions_getTcpKeepAliveTime0
+(JNIEnv *env, jobject unused, jint fd) {
+    jint optval, rv;
+    socklen_t sz = sizeof (optval);
+    rv = getsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &optval, &sz);
+    handleError(env, rv, "get option TCP_KEEPALIVE failed");// mac TCP_KEEPIDLE ->TCP_KEEPALIVE
+    return optval;
+}
+
+/*
+ * Class:     jdk_net_MacOSXSocketOptions
+ * Method:    getTcpKeepAliveIntvl0
+ * Signature: (I)I;
+ */
+JNIEXPORT jint JNICALL Java_jdk_net_MacOSXSocketOptions_getTcpKeepAliveIntvl0
+(JNIEnv *env, jobject unused, jint fd) {
+    jint optval, rv;
+    socklen_t sz = sizeof (optval);
+    rv = getsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, &sz);
+    handleError(env, rv, "get option TCP_KEEPINTVL failed");
+    return optval;
+}
diff --git a/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java b/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java
index 784d018e3a3..32323b66423 100644
--- a/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java
+++ b/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java
@@ -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,6 +31,7 @@ import java.net.SocketOption;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 import jdk.internal.misc.JavaIOFileDescriptorAccess;
 import jdk.internal.misc.SharedSecrets;
@@ -92,6 +93,74 @@ public final class ExtendedSocketOptions {
     public static final SocketOption<Boolean> TCP_QUICKACK =
             new ExtSocketOption<Boolean>("TCP_QUICKACK", Boolean.class);
 
+    /**
+     * Keep-Alive idle time.
+     *
+     * <p>
+     * The value of this socket option is an {@code Integer} that is the number
+     * of seconds of idle time before keep-alive initiates a probe. The socket
+     * option is specific to stream-oriented sockets using the TCP/IP protocol.
+     * The exact semantics of this socket option are system dependent.
+     *
+     * <p>
+     * When the {@link java.net.StandardSocketOptions#SO_KEEPALIVE
+     * SO_KEEPALIVE} option is enabled, TCP probes a connection that has been
+     * idle for some amount of time. The default value for this idle period is
+     * system dependent, but is typically 2 hours. The {@code TCP_KEEPIDLE}
+     * option can be used to affect this value for a given socket.
+     *
+     * @since 11
+     */
+    public static final SocketOption<Integer> TCP_KEEPIDLE
+            = new ExtSocketOption<Integer>("TCP_KEEPIDLE", Integer.class);
+
+    /**
+     * Keep-Alive retransmission interval time.
+     *
+     * <p>
+     * The value of this socket option is an {@code Integer} that is the number
+     * of seconds to wait before retransmitting a keep-alive probe. The socket
+     * option is specific to stream-oriented sockets using the TCP/IP protocol.
+     * The exact semantics of this socket option are system dependent.
+     *
+     * <p>
+     * When the {@link java.net.StandardSocketOptions#SO_KEEPALIVE
+     * SO_KEEPALIVE} option is enabled, TCP probes a connection that has been
+     * idle for some amount of time. If the remote system does not respond to a
+     * keep-alive probe, TCP retransmits the probe after some amount of time.
+     * The default value for this retransmission interval is system dependent,
+     * but is typically 75 seconds. The {@code TCP_KEEPINTERVAL} option can be
+     * used to affect this value for a given socket.
+     *
+     * @since 11
+     */
+    public static final SocketOption<Integer> TCP_KEEPINTERVAL
+            = new ExtSocketOption<Integer>("TCP_KEEPINTERVAL", Integer.class);
+
+    /**
+     * Keep-Alive retransmission maximum limit.
+     *
+     * <p>
+     * The value of this socket option is an {@code Integer} that is the maximum
+     * number of keep-alive probes to be sent. The socket option is specific to
+     * stream-oriented sockets using the TCP/IP protocol. The exact semantics of
+     * this socket option are system dependent.
+     *
+     * <p>
+     * When the {@link java.net.StandardSocketOptions#SO_KEEPALIVE
+     * SO_KEEPALIVE} option is enabled, TCP probes a connection that has been
+     * idle for some amount of time. If the remote system does not respond to a
+     * keep-alive probe, TCP retransmits the probe a certain number of times
+     * before a connection is considered to be broken. The default value for
+     * this keep-alive probe retransmit limit is system dependent, but is
+     * typically 8. The {@code TCP_KEEPCOUNT} option can be used to affect this
+     * value for a given socket.
+     *
+     * @since 11
+     */
+    public static final SocketOption<Integer> TCP_KEEPCOUNT
+            = new ExtSocketOption<Integer>("TCP_KEEPCOUNT", Integer.class);
+
     private static final PlatformSocketOptions platformSocketOptions =
             PlatformSocketOptions.get();
 
@@ -99,21 +168,22 @@ public final class ExtendedSocketOptions {
             platformSocketOptions.flowSupported();
     private static final boolean quickAckSupported =
             platformSocketOptions.quickAckSupported();
-
+    private static final boolean keepAliveOptSupported =
+            platformSocketOptions.keepAliveOptionsSupported();
     private static final Set<SocketOption<?>> extendedOptions = options();
 
     static Set<SocketOption<?>> options() {
+        Set<SocketOption<?>> options = new HashSet<>();
         if (flowSupported) {
-            if (quickAckSupported) {
-                return Set.of(SO_FLOW_SLA, TCP_QUICKACK);
-            } else {
-                return Set.of(SO_FLOW_SLA);
-            }
-        } else if (quickAckSupported) {
-            return Set.of(TCP_QUICKACK);
-        } else {
-            return Collections.<SocketOption<?>>emptySet();
+            options.add(SO_FLOW_SLA);
         }
+        if (quickAckSupported) {
+            options.add(TCP_QUICKACK);
+        }
+        if (keepAliveOptSupported) {
+            options.addAll(Set.of(TCP_KEEPCOUNT, TCP_KEEPIDLE, TCP_KEEPINTERVAL));
+        }
+        return Collections.unmodifiableSet(options);
     }
 
     static {
@@ -140,6 +210,12 @@ public final class ExtendedSocketOptions {
                     setFlowOption(fd, flow);
                 } else if (option == TCP_QUICKACK) {
                     setQuickAckOption(fd, (boolean) value);
+                } else if (option == TCP_KEEPCOUNT) {
+                    setTcpkeepAliveProbes(fd, (Integer) value);
+                } else if (option == TCP_KEEPIDLE) {
+                    setTcpKeepAliveTime(fd, (Integer) value);
+                } else if (option == TCP_KEEPINTERVAL) {
+                    setTcpKeepAliveIntvl(fd, (Integer) value);
                 } else {
                     throw new InternalError("Unexpected option " + option);
                 }
@@ -164,6 +240,12 @@ public final class ExtendedSocketOptions {
                     return flow;
                 } else if (option == TCP_QUICKACK) {
                     return getQuickAckOption(fd);
+                } else if (option == TCP_KEEPCOUNT) {
+                    return getTcpkeepAliveProbes(fd);
+                } else if (option == TCP_KEEPIDLE) {
+                    return getTcpKeepAliveTime(fd);
+                } else if (option == TCP_KEEPINTERVAL) {
+                    return getTcpKeepAliveIntvl(fd);
                 } else {
                     throw new InternalError("Unexpected option " + option);
                 }
@@ -208,6 +290,33 @@ public final class ExtendedSocketOptions {
         return platformSocketOptions.getQuickAck(fdAccess.get(fd));
     }
 
+    private static void setTcpkeepAliveProbes(FileDescriptor fd, int value)
+            throws SocketException {
+        platformSocketOptions.setTcpkeepAliveProbes(fdAccess.get(fd), value);
+    }
+
+    private static void setTcpKeepAliveTime(FileDescriptor fd, int value)
+            throws SocketException {
+        platformSocketOptions.setTcpKeepAliveTime(fdAccess.get(fd), value);
+    }
+
+    private static void setTcpKeepAliveIntvl(FileDescriptor fd, int value)
+            throws SocketException {
+        platformSocketOptions.setTcpKeepAliveIntvl(fdAccess.get(fd), value);
+    }
+
+    private static int getTcpkeepAliveProbes(FileDescriptor fd) throws SocketException {
+        return platformSocketOptions.getTcpkeepAliveProbes(fdAccess.get(fd));
+    }
+
+    private static int getTcpKeepAliveTime(FileDescriptor fd) throws SocketException {
+        return platformSocketOptions.getTcpKeepAliveTime(fdAccess.get(fd));
+    }
+
+    private static int getTcpKeepAliveIntvl(FileDescriptor fd) throws SocketException {
+        return platformSocketOptions.getTcpKeepAliveIntvl(fdAccess.get(fd));
+    }
+
     static class PlatformSocketOptions {
 
         protected PlatformSocketOptions() {}
@@ -234,6 +343,8 @@ public final class ExtendedSocketOptions {
                 return newInstance("jdk.net.SolarisSocketOptions");
             } else if ("Linux".equals(osname)) {
                 return newInstance("jdk.net.LinuxSocketOptions");
+            } else if (osname.startsWith("Mac")) {
+                return newInstance("jdk.net.MacOSXSocketOptions");
             } else {
                 return new PlatformSocketOptions();
             }
@@ -270,5 +381,33 @@ public final class ExtendedSocketOptions {
         boolean quickAckSupported() {
             return false;
         }
+
+        boolean keepAliveOptionsSupported() {
+            return false;
+        }
+
+        void setTcpkeepAliveProbes(int fd, final int value) throws SocketException {
+            throw new UnsupportedOperationException("unsupported TCP_KEEPCNT option");
+        }
+
+        void setTcpKeepAliveTime(int fd, final int value) throws SocketException {
+            throw new UnsupportedOperationException("unsupported TCP_KEEPIDLE option");
+        }
+
+        void setTcpKeepAliveIntvl(int fd, final int value) throws SocketException {
+            throw new UnsupportedOperationException("unsupported TCP_KEEPINTVL option");
+        }
+
+        int getTcpkeepAliveProbes(int fd) throws SocketException {
+            throw new UnsupportedOperationException("unsupported TCP_KEEPCNT option");
+        }
+
+        int getTcpKeepAliveTime(int fd) throws SocketException {
+            throw new UnsupportedOperationException("unsupported TCP_KEEPIDLE option");
+        }
+
+        int getTcpKeepAliveIntvl(int fd) throws SocketException {
+            throw new UnsupportedOperationException("unsupported TCP_KEEPINTVL option");
+        }
     }
 }
diff --git a/src/jdk.net/share/classes/jdk/net/Sockets.java b/src/jdk.net/share/classes/jdk/net/Sockets.java
index b1d003da4ac..51f3b7a734b 100644
--- a/src/jdk.net/share/classes/jdk/net/Sockets.java
+++ b/src/jdk.net/share/classes/jdk/net/Sockets.java
@@ -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
@@ -282,6 +282,11 @@ public class Sockets {
         if (QuickAck.available) {
             set.add(ExtendedSocketOptions.TCP_QUICKACK);
         }
+        if (KeepAliveOptions.AVAILABLE) {
+            set.addAll(Set.of(ExtendedSocketOptions.TCP_KEEPCOUNT,
+                    ExtendedSocketOptions.TCP_KEEPIDLE,
+                    ExtendedSocketOptions.TCP_KEEPINTERVAL));
+        }
         set = Collections.unmodifiableSet(set);
         options.put(Socket.class, set);
 
@@ -296,6 +301,11 @@ public class Sockets {
         if (QuickAck.available) {
             set.add(ExtendedSocketOptions.TCP_QUICKACK);
         }
+        if (KeepAliveOptions.AVAILABLE) {
+            set.addAll(Set.of(ExtendedSocketOptions.TCP_KEEPCOUNT,
+                    ExtendedSocketOptions.TCP_KEEPIDLE,
+                    ExtendedSocketOptions.TCP_KEEPINTERVAL));
+        }
         set.add(StandardSocketOptions.IP_TOS);
         set = Collections.unmodifiableSet(set);
         options.put(ServerSocket.class, set);
@@ -350,4 +360,19 @@ public class Sockets {
             available = s.contains(ExtendedSocketOptions.TCP_QUICKACK);
         }
     }
+
+    /**
+     * Tells whether TCP_KEEPALIVE options are supported.
+     */
+    static class KeepAliveOptions {
+
+        static final boolean AVAILABLE;
+
+        static {
+            Set<SocketOption<?>> s = new Socket().supportedOptions();
+            AVAILABLE = s.containsAll(Set.of(ExtendedSocketOptions.TCP_KEEPCOUNT,
+                                            ExtendedSocketOptions.TCP_KEEPIDLE,
+                                            ExtendedSocketOptions.TCP_KEEPINTERVAL));
+        }
+    }
 }
diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
index 7bc4e476167..f7240a26ca2 100644
--- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
+++ b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
@@ -40,6 +40,7 @@ import jdk.internal.jline.TerminalFactory.Flavor;
 import jdk.internal.jline.WindowsTerminal;
 import jdk.internal.jline.console.ConsoleReader;
 import jdk.internal.jline.console.KeyMap;
+import jdk.internal.jline.console.completer.CandidateListCompletionHandler;
 import jdk.internal.jline.extra.EditingHistory;
 import jdk.internal.misc.Signal;
 import jdk.internal.misc.Signal.Handler;
@@ -53,13 +54,14 @@ class Console implements AutoCloseable {
             final NashornCompleter completer, final Function<String, String> docHelper) throws IOException {
         this.historyFile = historyFile;
 
-        TerminalFactory.registerFlavor(Flavor.WINDOWS, isCygwin()? JJSUnixTerminal::new : JJSWindowsTerminal::new);
-        TerminalFactory.registerFlavor(Flavor.UNIX, JJSUnixTerminal::new);
+        TerminalFactory.registerFlavor(Flavor.WINDOWS, ttyDevice -> isCygwin() ? new JJSUnixTerminal() : new JJSWindowsTerminal());
+        TerminalFactory.registerFlavor(Flavor.UNIX, ttyDevice -> new JJSUnixTerminal());
         in = new ConsoleReader(cmdin, cmdout);
         in.setExpandEvents(false);
         in.setHandleUserInterrupt(true);
         in.setBellEnabled(true);
         in.setCopyPasteDetection(true);
+        ((CandidateListCompletionHandler) in.getCompletionHandler()).setPrintSpaceAfterFullCompletion(false);
         final Iterable<String> existingHistory = historyFile.exists() ? Files.readAllLines(historyFile.toPath()) : null;
         in.setHistory(new EditingHistory(in, existingHistory) {
             @Override protected boolean isComplete(CharSequence input) {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
index dbed5d18285..f5fce08bce0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
@@ -541,7 +541,6 @@ class ByteCodeMachine extends StackMachine {
             sprev = s;
             s++;
         }
-        sprev = sbegin; // break;
     }
 
     private void opAnyCharMLStar() {
@@ -550,7 +549,6 @@ class ByteCodeMachine extends StackMachine {
             sprev = s;
             s++;
         }
-        sprev = sbegin; // break;
     }
 
     private void opAnyCharStarPeekNext() {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
index 65900538414..f9a8c602848 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
@@ -45,6 +45,7 @@ public interface Config {
 
     final int NREGION                   = 10;
     final int MAX_BACKREF_NUM           = 1000;
+    final int MAX_CAPTURE_GROUP_NUM     = 0x8000;
     final int MAX_REPEAT_NUM            = 100000;
     final int MAX_MULTI_BYTE_RANGES_NUM = 10000;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
index 48f5ce0b547..2e118435d61 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
@@ -62,6 +62,9 @@ public final class ScanEnvironment {
     }
 
     public int addMemEntry() {
+        if (numMem >= Config.MAX_CAPTURE_GROUP_NUM) {
+            throw new InternalException(ErrorMessages.ERR_TOO_MANY_CAPTURE_GROUPS);
+        }
         if (numMem++ == 0) {
             memNodes = new Node[SCANENV_MEMNODES_SIZE];
         } else if (numMem >= memNodes.length) {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
index 3c835d7b992..da986489c82 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
@@ -31,6 +31,7 @@ public interface ErrorMessages {
     final String ERR_PARSER_BUG = "internal parser error (bug)";
     final String ERR_UNDEFINED_BYTECODE = "undefined bytecode (bug)";
     final String ERR_UNEXPECTED_BYTECODE = "unexpected bytecode (bug)";
+    final String ERR_TOO_MANY_CAPTURE_GROUPS = "too many capture groups";
 
     /* syntax error */
     final String ERR_END_PATTERN_AT_LEFT_BRACE = "end pattern at left brace";
diff --git a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
index 6d08f53bd5c..94d9aed477b 100644
--- a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
+++ b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
@@ -1203,7 +1203,7 @@ const void* const OopStorageBlockCollectionTest::_pseudo_owner[] = {};
 class OopStorageAllocateListTest : public OopStorageBlockCollectionTest {};
 
 TEST_F(OopStorageAllocateListTest, empty_list) {
-  AllocateList list(&OopBlock::get_allocate_entry);
+  AllocateList list;
 
   EXPECT_TRUE(is_list_empty(list));
   EXPECT_EQ(NULL_BLOCK, list.head());
@@ -1212,7 +1212,7 @@ TEST_F(OopStorageAllocateListTest, empty_list) {
 }
 
 TEST_F(OopStorageAllocateListTest, push_back) {
-  AllocateList list(&OopBlock::get_allocate_entry);
+  AllocateList list;
 
   for (size_t i = 0; i < nvalues; ++i) {
     list.push_back(*values[i]);
@@ -1242,7 +1242,7 @@ TEST_F(OopStorageAllocateListTest, push_back) {
 }
 
 TEST_F(OopStorageAllocateListTest, push_front) {
-  AllocateList list(&OopBlock::get_allocate_entry);
+  AllocateList list;
 
   for (size_t i = 0; i < nvalues; ++i) {
     list.push_front(*values[i]);
@@ -1273,7 +1273,7 @@ TEST_F(OopStorageAllocateListTest, push_front) {
 
 class OopStorageAllocateListTestWithList : public OopStorageAllocateListTest {
 public:
-  OopStorageAllocateListTestWithList() : list(&OopBlock::get_allocate_entry) {
+  OopStorageAllocateListTestWithList() : list() {
     for (size_t i = 0; i < nvalues; ++i) {
       list.push_back(*values[i]);
     }
@@ -1345,7 +1345,7 @@ TEST_F(OopStorageAllocateListTestWithList, unlink_middle) {
 }
 
 TEST_F(OopStorageAllocateListTest, single) {
-  AllocateList list(&OopBlock::get_allocate_entry);
+  AllocateList list;
 
   list.push_back(*values[0]);
   EXPECT_EQ(NULL_BLOCK, list.next(*values[0]));
diff --git a/test/hotspot/gtest/gc/z/test_zAddress.cpp b/test/hotspot/gtest/gc/z/test_zAddress.cpp
new file mode 100644
index 00000000000..e5966d4981d
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zAddress.cpp
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "unittest.hpp"
+
+class ZAddressTest : public ::testing::Test {
+protected:
+  static void is_good_bit(uintptr_t bit_mask) {
+    // Setup
+    uintptr_t mask_before = ZAddressGoodMask;
+
+    ZAddressMasks::set_good_mask(bit_mask);
+
+    // Test that a pointer with only the given bit is considered good.
+    EXPECT_EQ(ZAddress::is_good(ZAddressMetadataMarked0),  (bit_mask == ZAddressMetadataMarked0));
+    EXPECT_EQ(ZAddress::is_good(ZAddressMetadataMarked1),  (bit_mask == ZAddressMetadataMarked1));
+    EXPECT_EQ(ZAddress::is_good(ZAddressMetadataRemapped), (bit_mask == ZAddressMetadataRemapped));
+
+    // Test that a pointer with the given bit and some extra bits is considered good.
+    EXPECT_EQ(ZAddress::is_good(ZAddressMetadataMarked0  | 0x8),(bit_mask == ZAddressMetadataMarked0));
+    EXPECT_EQ(ZAddress::is_good(ZAddressMetadataMarked1  | 0x8), (bit_mask == ZAddressMetadataMarked1));
+    EXPECT_EQ(ZAddress::is_good(ZAddressMetadataRemapped | 0x8), (bit_mask == ZAddressMetadataRemapped));
+
+    // Test that null is not considered good.
+    EXPECT_FALSE(ZAddress::is_good(0));
+
+    // Teardown
+    ZAddressMasks::set_good_mask(mask_before);
+  }
+
+  static void is_good_or_null_bit(uintptr_t bit_mask) {
+    // Setup
+    uintptr_t mask_before = ZAddressGoodMask;
+
+    ZAddressMasks::set_good_mask(bit_mask);
+
+    // Test that a pointer with only the given bit is considered good.
+    EXPECT_EQ(ZAddress::is_good_or_null(ZAddressMetadataMarked0),  (bit_mask == ZAddressMetadataMarked0));
+    EXPECT_EQ(ZAddress::is_good_or_null(ZAddressMetadataMarked1),  (bit_mask == ZAddressMetadataMarked1));
+    EXPECT_EQ(ZAddress::is_good_or_null(ZAddressMetadataRemapped), (bit_mask == ZAddressMetadataRemapped));
+
+    // Test that a pointer with the given bit and some extra bits is considered good.
+    EXPECT_EQ(ZAddress::is_good_or_null(ZAddressMetadataMarked0  | 0x8), (bit_mask == ZAddressMetadataMarked0));
+    EXPECT_EQ(ZAddress::is_good_or_null(ZAddressMetadataMarked1  | 0x8), (bit_mask == ZAddressMetadataMarked1));
+    EXPECT_EQ(ZAddress::is_good_or_null(ZAddressMetadataRemapped | 0x8), (bit_mask == ZAddressMetadataRemapped));
+
+    // Test that null is considered good_or_null.
+    EXPECT_TRUE(ZAddress::is_good_or_null(0));
+
+    // Teardown
+    ZAddressMasks::set_good_mask(mask_before);
+  }
+
+  static void finalizable() {
+    // Setup
+    ZAddressMasks::initialize();
+    ZAddressMasks::flip_to_marked();
+
+    // Test that a normal good pointer is good and weak good, but not finalizable
+    const uintptr_t addr1 = ZAddress::good(1);
+    EXPECT_FALSE(ZAddress::is_finalizable(addr1));
+    EXPECT_TRUE(ZAddress::is_marked(addr1));
+    EXPECT_FALSE(ZAddress::is_remapped(addr1));
+    EXPECT_TRUE(ZAddress::is_weak_good(addr1));
+    EXPECT_TRUE(ZAddress::is_weak_good_or_null(addr1));
+    EXPECT_TRUE(ZAddress::is_good(addr1));
+    EXPECT_TRUE(ZAddress::is_good_or_null(addr1));
+
+    // Test that a finalizable good pointer is finalizable and weak good, but not good
+    const uintptr_t addr2 = ZAddress::finalizable_good(1);
+    EXPECT_TRUE(ZAddress::is_finalizable(addr2));
+    EXPECT_TRUE(ZAddress::is_marked(addr2));
+    EXPECT_FALSE(ZAddress::is_remapped(addr2));
+    EXPECT_TRUE(ZAddress::is_weak_good(addr2));
+    EXPECT_TRUE(ZAddress::is_weak_good_or_null(addr2));
+    EXPECT_FALSE(ZAddress::is_good(addr2));
+    EXPECT_FALSE(ZAddress::is_good_or_null(addr2));
+
+    // Flip to remapped and test that it's no longer weak good
+    ZAddressMasks::flip_to_remapped();
+    EXPECT_TRUE(ZAddress::is_finalizable(addr2));
+    EXPECT_TRUE(ZAddress::is_marked(addr2));
+    EXPECT_FALSE(ZAddress::is_remapped(addr2));
+    EXPECT_FALSE(ZAddress::is_weak_good(addr2));
+    EXPECT_FALSE(ZAddress::is_weak_good_or_null(addr2));
+    EXPECT_FALSE(ZAddress::is_good(addr2));
+    EXPECT_FALSE(ZAddress::is_good_or_null(addr2));
+  }
+};
+
+TEST_F(ZAddressTest, is_good) {
+  is_good_bit(ZAddressMetadataMarked0);
+  is_good_bit(ZAddressMetadataMarked1);
+  is_good_bit(ZAddressMetadataRemapped);
+}
+
+TEST_F(ZAddressTest, is_good_or_null) {
+  is_good_or_null_bit(ZAddressMetadataMarked0);
+  is_good_or_null_bit(ZAddressMetadataMarked1);
+  is_good_or_null_bit(ZAddressMetadataRemapped);
+}
+
+TEST_F(ZAddressTest, is_weak_good_or_null) {
+#define check_is_weak_good_or_null(value)                                        \
+  EXPECT_EQ(ZAddress::is_weak_good_or_null(value),                               \
+            (ZAddress::is_good_or_null(value) || ZAddress::is_remapped(value)))  \
+    << "is_good_or_null: " << ZAddress::is_good_or_null(value)                   \
+    << " is_remaped: " << ZAddress::is_remapped(value)                           \
+    << " is_good_or_null_or_remapped: " << ZAddress::is_weak_good_or_null(value)
+
+  check_is_weak_good_or_null((uintptr_t)NULL);
+  check_is_weak_good_or_null(ZAddressMetadataMarked0);
+  check_is_weak_good_or_null(ZAddressMetadataMarked1);
+  check_is_weak_good_or_null(ZAddressMetadataRemapped);
+  check_is_weak_good_or_null((uintptr_t)0x123);
+}
+
+TEST_F(ZAddressTest, finalizable) {
+  finalizable();
+}
diff --git a/test/hotspot/gtest/gc/z/test_zArray.cpp b/test/hotspot/gtest/gc/z/test_zArray.cpp
new file mode 100644
index 00000000000..48e27ff1b65
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zArray.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zArray.inline.hpp"
+#include "unittest.hpp"
+
+TEST(ZArrayTest, test_add) {
+  ZArray<int> a;
+
+  // Add elements
+  for (int i = 0; i < 10; i++) {
+    a.add(i);
+  }
+
+  // Check size
+  ASSERT_EQ(a.size(), 10u);
+
+  // Check elements
+  for (int i = 0; i < 10; i++) {
+    EXPECT_EQ(a.at(i), i);
+  }
+}
+
+TEST(ZArrayTest, test_clear) {
+  ZArray<int> a;
+
+  // Add elements
+  for (int i = 0; i < 10; i++) {
+    a.add(i);
+  }
+
+  // Check size
+  ASSERT_EQ(a.size(), 10u);
+  ASSERT_EQ(a.is_empty(), false);
+
+  // Clear elements
+  a.clear();
+
+  // Check size
+  ASSERT_EQ(a.size(), 0u);
+  ASSERT_EQ(a.is_empty(), true);
+
+  // Add element
+  a.add(11);
+
+  // Check size
+  ASSERT_EQ(a.size(), 1u);
+  ASSERT_EQ(a.is_empty(), false);
+
+  // Clear elements
+  a.clear();
+
+  // Check size
+  ASSERT_EQ(a.size(), 0u);
+  ASSERT_EQ(a.is_empty(), true);
+}
+
+TEST(ZArrayTest, test_iterator) {
+  ZArray<int> a;
+
+  // Add elements
+  for (int i = 0; i < 10; i++) {
+    a.add(i);
+  }
+
+  // Iterate
+  int count = 0;
+  ZArrayIterator<int> iter(&a);
+  for (int value; iter.next(&value);) {
+    ASSERT_EQ(a.at(count), count);
+    count++;
+  }
+
+  // Check count
+  ASSERT_EQ(count, 10);
+}
diff --git a/test/hotspot/gtest/gc/z/test_zBitField.cpp b/test/hotspot/gtest/gc/z/test_zBitField.cpp
new file mode 100644
index 00000000000..6252862f6f7
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zBitField.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zBitField.hpp"
+#include "unittest.hpp"
+
+TEST(ZBitFieldTest, test) {
+  typedef ZBitField<uint64_t, bool,      0,  1>    field_bool;
+  typedef ZBitField<uint64_t, uint8_t,   1,  8>    field_uint8;
+  typedef ZBitField<uint64_t, uint16_t,  2, 16>    field_uint16;
+  typedef ZBitField<uint64_t, uint32_t, 32, 32>    field_uint32;
+  typedef ZBitField<uint64_t, uint64_t,  0, 63>    field_uint64;
+  typedef ZBitField<uint64_t, void*,     1, 61, 3> field_pointer;
+
+  uint64_t entry;
+
+  {
+    const bool value = false;
+    entry = field_bool::encode(value);
+    EXPECT_EQ(field_bool::decode(entry), value) << "Should be equal";
+  }
+
+  {
+    const bool value = true;
+    entry = field_bool::encode(value);
+      EXPECT_EQ(field_bool::decode(entry), value) << "Should be equal";
+  }
+
+  {
+    const uint8_t value = ~(uint8_t)0;
+    entry = field_uint8::encode(value);
+    EXPECT_EQ(field_uint8::decode(entry), value) << "Should be equal";
+  }
+
+  {
+    const uint16_t value = ~(uint16_t)0;
+    entry = field_uint16::encode(value);
+    EXPECT_EQ(field_uint16::decode(entry), value) << "Should be equal";
+  }
+
+  {
+    const uint32_t value = ~(uint32_t)0;
+    entry = field_uint32::encode(value);
+    EXPECT_EQ(field_uint32::decode(entry), value) << "Should be equal";
+  }
+
+  {
+    const uint64_t value = ~(uint64_t)0 >> 1;
+    entry = field_uint64::encode(value);
+    EXPECT_EQ(field_uint64::decode(entry), value) << "Should be equal";
+  }
+
+  {
+    void* const value = (void*)(~(uintptr_t)0 << 3);
+    entry = field_pointer::encode(value);
+    EXPECT_EQ(field_pointer::decode(entry), value) << "Should be equal";
+  }
+}
diff --git a/test/hotspot/gtest/gc/z/test_zBitMap.cpp b/test/hotspot/gtest/gc/z/test_zBitMap.cpp
new file mode 100644
index 00000000000..58809f05291
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zBitMap.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zBitMap.inline.hpp"
+#include "unittest.hpp"
+
+class ZBitMapTest : public ::testing::Test {
+protected:
+  static void test_set_pair_unset(size_t size, bool finalizable) {
+    ZBitMap bitmap(size);
+
+    for (BitMap::idx_t i = 0; i < size - 1; i++) {
+      if ((i + 1) % BitsPerWord == 0) {
+        // Can't set pairs of bits in different words.
+        continue;
+      }
+
+      // ZBitMaps are not cleared when constructed.
+      bitmap.clear();
+
+      bool inc_live = false;
+
+      bool ret = bitmap.par_set_bit_pair(i, finalizable, inc_live);
+      EXPECT_TRUE(ret) << "Failed to set bit";
+      EXPECT_TRUE(inc_live) << "Should have set inc_live";
+
+      // First bit should always be set
+      EXPECT_TRUE(bitmap.at(i)) << "Should be set";
+
+      // Second bit should only be set when marking strong
+      EXPECT_NE(bitmap.at(i + 1), finalizable);
+    }
+  }
+
+  static void test_set_pair_set(size_t size, bool finalizable) {
+    ZBitMap bitmap(size);
+
+    for (BitMap::idx_t i = 0; i < size - 1; i++) {
+      if ((i + 1) % BitsPerWord == 0) {
+        // Can't set pairs of bits in different words.
+        continue;
+      }
+
+      // Fill the bitmap with ones.
+      bitmap.set_range(0, size);
+
+      bool inc_live = false;
+
+      bool ret = bitmap.par_set_bit_pair(i, finalizable, inc_live);
+      EXPECT_FALSE(ret) << "Should not succeed setting bit";
+      EXPECT_FALSE(inc_live) << "Should not have set inc_live";
+
+      // Both bits were pre-set.
+      EXPECT_TRUE(bitmap.at(i)) << "Should be set";
+      EXPECT_TRUE(bitmap.at(i + 1)) << "Should be set";
+    }
+  }
+
+  static void test_set_pair_set(bool finalizable) {
+    test_set_pair_set(2,   finalizable);
+    test_set_pair_set(62,  finalizable);
+    test_set_pair_set(64,  finalizable);
+    test_set_pair_set(66,  finalizable);
+    test_set_pair_set(126, finalizable);
+    test_set_pair_set(128, finalizable);
+  }
+
+  static void test_set_pair_unset(bool finalizable) {
+    test_set_pair_unset(2,   finalizable);
+    test_set_pair_unset(62,  finalizable);
+    test_set_pair_unset(64,  finalizable);
+    test_set_pair_unset(66,  finalizable);
+    test_set_pair_unset(126, finalizable);
+    test_set_pair_unset(128, finalizable);
+  }
+
+};
+
+TEST_F(ZBitMapTest, test_set_pair_set) {
+  test_set_pair_set(false);
+  test_set_pair_set(true);
+}
+
+TEST_F(ZBitMapTest, test_set_pair_unset) {
+  test_set_pair_unset(false);
+  test_set_pair_unset(true);
+}
diff --git a/test/hotspot/gtest/gc/z/test_zForwardingTable.cpp b/test/hotspot/gtest/gc/z/test_zForwardingTable.cpp
new file mode 100644
index 00000000000..4b0ac3c714a
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zForwardingTable.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zForwardingTable.inline.hpp"
+#include "unittest.hpp"
+
+using namespace testing;
+
+#define CAPTURE_DELIM "\n"
+#define CAPTURE1(expression) #expression << " evaluates to " << expression
+#define CAPTURE2(e0, e1)                 CAPTURE1(e0) << CAPTURE_DELIM << CAPTURE1(e1)
+
+#define CAPTURE(expression) CAPTURE1(expression)
+
+class ZForwardingTableTest : public Test {
+public:
+  // Helper functions
+
+  static bool is_power_of_2(size_t value) {
+    return ::is_power_of_2((intptr_t)value);
+  }
+
+  class SequenceToFromIndex : AllStatic {
+  public:
+    static uintptr_t even(uint32_t sequence_number) {
+      return sequence_number * 2;
+    }
+    static uintptr_t odd(uint32_t sequence_number) {
+      return even(sequence_number) + 1;
+    }
+    static uintptr_t one_to_one(uint32_t sequence_number) {
+      return sequence_number;
+    }
+  };
+
+  // Test functions
+
+  static void setup(ZForwardingTable& table) {
+    EXPECT_PRED1(is_power_of_2, table._size) << CAPTURE(table._size);
+  }
+
+  static void find_empty(ZForwardingTable& table) {
+    size_t size = table._size;
+    size_t entries_to_check = size * 2;
+
+    for (uint32_t i = 0; i < entries_to_check; i++) {
+      uintptr_t from_index = SequenceToFromIndex::one_to_one(i);
+
+      EXPECT_TRUE(table.find(from_index).is_empty()) << CAPTURE2(from_index, size);
+    }
+
+    EXPECT_TRUE(table.find(uintptr_t(-1)).is_empty()) << CAPTURE(size);
+  }
+
+  static void find_full(ZForwardingTable& table) {
+    size_t size = table._size;
+    size_t entries_to_populate = size;
+
+    // Populate
+    for (uint32_t i = 0; i < entries_to_populate; i++) {
+      uintptr_t from_index = SequenceToFromIndex::one_to_one(i);
+
+      ZForwardingTableCursor cursor;
+      ZForwardingTableEntry entry = table.find(from_index, &cursor);
+      ASSERT_TRUE(entry.is_empty()) << CAPTURE2(from_index, size);
+
+      table.insert(from_index, from_index, &cursor);
+    }
+
+    // Verify
+    for (uint32_t i = 0; i < entries_to_populate; i++) {
+      uintptr_t from_index = SequenceToFromIndex::one_to_one(i);
+
+      ZForwardingTableEntry entry = table.find(from_index);
+      ASSERT_FALSE(entry.is_empty()) << CAPTURE2(from_index, size);
+
+      ASSERT_EQ(entry.from_index(), from_index) << CAPTURE(size);
+      ASSERT_EQ(entry.to_offset(), from_index) << CAPTURE(size);
+    }
+  }
+
+  static void find_every_other(ZForwardingTable& table) {
+    size_t size = table._size;
+    size_t entries_to_populate = size / 2;
+
+    // Populate even from indices
+    for (uint32_t i = 0; i < entries_to_populate; i++) {
+      uintptr_t from_index = SequenceToFromIndex::even(i);
+
+      ZForwardingTableCursor cursor;
+      ZForwardingTableEntry entry = table.find(from_index, &cursor);
+      ASSERT_TRUE(entry.is_empty()) << CAPTURE2(from_index, size);
+
+      table.insert(from_index, from_index, &cursor);
+    }
+
+    // Verify populated even indices
+    for (uint32_t i = 0; i < entries_to_populate; i++) {
+      uintptr_t from_index = SequenceToFromIndex::even(i);
+
+      ZForwardingTableCursor cursor;
+      ZForwardingTableEntry entry = table.find(from_index, &cursor);
+      ASSERT_FALSE(entry.is_empty()) << CAPTURE2(from_index, size);
+
+      ASSERT_EQ(entry.from_index(), from_index) << CAPTURE(size);
+      ASSERT_EQ(entry.to_offset(), from_index) << CAPTURE(size);
+    }
+
+    // Verify empty odd indices
+    //
+    // This check could be done on a larger range of sequence numbers,
+    // but currently entries_to_populate is used.
+    for (uint32_t i = 0; i < entries_to_populate; i++) {
+      uintptr_t from_index = SequenceToFromIndex::odd(i);
+
+      ZForwardingTableEntry entry = table.find(from_index);
+
+      ASSERT_TRUE(entry.is_empty()) << CAPTURE2(from_index, size);
+    }
+  }
+
+  static void test(void (*function)(ZForwardingTable&), uint32_t size) {
+    // Setup
+    ZForwardingTable table;
+    table.setup(size);
+    ASSERT_FALSE(table.is_null());
+
+    // Actual test function
+    (*function)(table);
+
+    // Teardown
+    table.reset();
+    ASSERT_TRUE(table.is_null());
+  }
+
+  // Run the given function with a few different input values.
+  static void test(void (*function)(ZForwardingTable&)) {
+    test(function, 1);
+    test(function, 2);
+    test(function, 3);
+    test(function, 4);
+    test(function, 7);
+    test(function, 8);
+    test(function, 1023);
+    test(function, 1024);
+    test(function, 1025);
+  }
+};
+
+TEST_F(ZForwardingTableTest, setup) {
+  test(&ZForwardingTableTest::setup);
+}
+
+TEST_F(ZForwardingTableTest, find_empty) {
+  test(&ZForwardingTableTest::find_empty);
+}
+
+TEST_F(ZForwardingTableTest, find_full) {
+  test(&ZForwardingTableTest::find_full);
+}
+
+TEST_F(ZForwardingTableTest, find_every_other) {
+  test(&ZForwardingTableTest::find_every_other);
+}
diff --git a/test/hotspot/gtest/gc/z/test_zList.cpp b/test/hotspot/gtest/gc/z/test_zList.cpp
new file mode 100644
index 00000000000..4ddef3330dc
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zList.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zList.inline.hpp"
+#include "unittest.hpp"
+
+#ifndef PRODUCT
+
+class ZTestEntry {
+  friend class ZList<ZTestEntry>;
+
+private:
+  const int             _id;
+  ZListNode<ZTestEntry> _node;
+
+public:
+  ZTestEntry(int id) :
+      _id(id),
+      _node() {}
+
+  int id() const {
+    return _id;
+  }
+};
+
+class ZListTest : public ::testing::Test {
+protected:
+  static void assert_sorted(ZList<ZTestEntry>* list) {
+    // Iterate forward
+    {
+      int count = list->first()->id();
+      ZListIterator<ZTestEntry> iter(list);
+      for (ZTestEntry* entry; iter.next(&entry);) {
+        ASSERT_EQ(entry->id(), count);
+        count++;
+      }
+    }
+
+    // Iterate backward
+    {
+      int count = list->last()->id();
+      ZListReverseIterator<ZTestEntry> iter(list);
+      for (ZTestEntry* entry; iter.next(&entry);) {
+        EXPECT_EQ(entry->id(), count);
+        count--;
+      }
+    }
+  }
+};
+
+TEST_F(ZListTest, test_insert) {
+  ZList<ZTestEntry> list;
+  ZTestEntry e0(0);
+  ZTestEntry e1(1);
+  ZTestEntry e2(2);
+  ZTestEntry e3(3);
+  ZTestEntry e4(4);
+  ZTestEntry e5(5);
+
+  list.insert_first(&e2);
+  list.insert_before(&e2, &e1);
+  list.insert_after(&e2, &e3);
+  list.insert_last(&e4);
+  list.insert_first(&e0);
+  list.insert_last(&e5);
+
+  EXPECT_EQ(list.size(), 6u);
+  assert_sorted(&list);
+}
+
+TEST_F(ZListTest, test_remove) {
+  // Remove first
+  {
+    ZList<ZTestEntry> list;
+    ZTestEntry e0(0);
+    ZTestEntry e1(1);
+    ZTestEntry e2(2);
+    ZTestEntry e3(3);
+    ZTestEntry e4(4);
+    ZTestEntry e5(5);
+
+    list.insert_last(&e0);
+    list.insert_last(&e1);
+    list.insert_last(&e2);
+    list.insert_last(&e3);
+    list.insert_last(&e4);
+    list.insert_last(&e5);
+
+    EXPECT_EQ(list.size(), 6u);
+
+    for (int i = 0; i < 6; i++) {
+      ZTestEntry* e = list.remove_first();
+      EXPECT_EQ(e->id(), i);
+    }
+
+    EXPECT_EQ(list.size(), 0u);
+  }
+
+  // Remove last
+  {
+    ZList<ZTestEntry> list;
+    ZTestEntry e0(0);
+    ZTestEntry e1(1);
+    ZTestEntry e2(2);
+    ZTestEntry e3(3);
+    ZTestEntry e4(4);
+    ZTestEntry e5(5);
+
+    list.insert_last(&e0);
+    list.insert_last(&e1);
+    list.insert_last(&e2);
+    list.insert_last(&e3);
+    list.insert_last(&e4);
+    list.insert_last(&e5);
+
+    EXPECT_EQ(list.size(), 6u);
+
+    for (int i = 5; i >= 0; i--) {
+      ZTestEntry* e = list.remove_last();
+      EXPECT_EQ(e->id(), i);
+    }
+
+    EXPECT_EQ(list.size(), 0u);
+  }
+}
+
+TEST_F(ZListTest, test_transfer) {
+  // Transfer empty to empty
+  {
+    ZList<ZTestEntry> list0;
+    ZList<ZTestEntry> list1;
+
+    EXPECT_TRUE(list0.is_empty());
+    EXPECT_TRUE(list1.is_empty());
+
+    list0.transfer(&list1);
+
+    EXPECT_TRUE(list0.is_empty());
+    EXPECT_TRUE(list1.is_empty());
+  }
+
+  // Transfer non-empty to empty
+  {
+    ZList<ZTestEntry> list0;
+    ZList<ZTestEntry> list1;
+    ZTestEntry e0(0);
+    ZTestEntry e1(1);
+    ZTestEntry e2(2);
+    ZTestEntry e3(3);
+    ZTestEntry e4(4);
+    ZTestEntry e5(5);
+
+    list1.insert_last(&e0);
+    list1.insert_last(&e1);
+    list1.insert_last(&e2);
+    list1.insert_last(&e3);
+    list1.insert_last(&e4);
+    list1.insert_last(&e5);
+
+    EXPECT_EQ(list0.size(), 0u);
+    EXPECT_EQ(list1.size(), 6u);
+
+    list0.transfer(&list1);
+
+    EXPECT_EQ(list0.size(), 6u);
+    EXPECT_EQ(list1.size(), 0u);
+
+    assert_sorted(&list0);
+  }
+
+  // Transfer non-empty to non-empty
+  {
+    ZList<ZTestEntry> list0;
+    ZList<ZTestEntry> list1;
+    ZTestEntry e0(0);
+    ZTestEntry e1(1);
+    ZTestEntry e2(2);
+    ZTestEntry e3(3);
+    ZTestEntry e4(4);
+    ZTestEntry e5(5);
+
+    list0.insert_last(&e0);
+    list0.insert_last(&e1);
+    list0.insert_last(&e2);
+
+    list1.insert_last(&e3);
+    list1.insert_last(&e4);
+    list1.insert_last(&e5);
+
+    EXPECT_EQ(list0.size(), 3u);
+    EXPECT_EQ(list1.size(), 3u);
+
+    list0.transfer(&list1);
+
+    EXPECT_EQ(list0.size(), 6u);
+    EXPECT_EQ(list1.size(), 0u);
+
+    assert_sorted(&list0);
+  }
+}
+
+#endif // PRODUCT
diff --git a/test/hotspot/gtest/gc/z/test_zLiveMap.cpp b/test/hotspot/gtest/gc/z/test_zLiveMap.cpp
new file mode 100644
index 00000000000..74432b6f05d
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zLiveMap.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zLiveMap.inline.hpp"
+#include "unittest.hpp"
+
+class ZLiveMapTest : public ::testing::Test {
+protected:
+  static void strongly_live_for_large_zpage() {
+    // Large ZPages only have room for one object.
+    ZLiveMap livemap(1);
+
+    bool inc_live;
+    uintptr_t object = 0u;
+
+    // Mark the object strong.
+    livemap.set_atomic(object, false /* finalizable */, inc_live);
+
+    // Check that both bits are in the same segment.
+    ASSERT_EQ(livemap.index_to_segment(0), livemap.index_to_segment(1));
+
+    // Check that the object was marked.
+    ASSERT_TRUE(livemap.get(0));
+
+    // Check that the object was strongly marked.
+    ASSERT_TRUE(livemap.get(1));
+
+    ASSERT_TRUE(inc_live);
+  }
+};
+
+TEST_F(ZLiveMapTest, strongly_live_for_large_zpage) {
+  strongly_live_for_large_zpage();
+}
diff --git a/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp b/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp
new file mode 100644
index 00000000000..357e4019aec
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zPhysicalMemory.inline.hpp"
+#include "utilities/debug.hpp"
+#include "unittest.hpp"
+
+#if defined(AMD64)
+
+TEST(ZPhysicalMemorySegmentTest, split) {
+  const size_t SegmentSize = 2 * M;
+
+  ZPhysicalMemorySegment seg(0, 10 * SegmentSize);
+
+  ZPhysicalMemorySegment seg_split0 = seg.split(0 * SegmentSize);
+  EXPECT_EQ(seg_split0.size(),  0 * SegmentSize);
+  EXPECT_EQ(       seg.size(), 10 * SegmentSize);
+
+  ZPhysicalMemorySegment seg_split1 = seg.split(5 * SegmentSize);
+  EXPECT_EQ(seg_split1.size(),  5 * SegmentSize);
+  EXPECT_EQ(       seg.size(),  5 * SegmentSize);
+
+  ZPhysicalMemorySegment seg_split2 = seg.split(5 * SegmentSize);
+  EXPECT_EQ(seg_split2.size(),  5 * SegmentSize);
+  EXPECT_EQ(       seg.size(),  0 * SegmentSize);
+
+  ZPhysicalMemorySegment seg_split3 = seg.split(0 * SegmentSize);
+  EXPECT_EQ(seg_split3.size(),  0 * SegmentSize);
+  EXPECT_EQ(       seg.size(),  0 * SegmentSize);
+}
+
+TEST(ZPhysicalMemoryTest, split) {
+  const size_t SegmentSize = 2 * M;
+
+  ZPhysicalMemoryManager pmem_manager(10 * SegmentSize, SegmentSize);
+
+  ZPhysicalMemory pmem = pmem_manager.alloc(8 * SegmentSize);
+  EXPECT_EQ(pmem.nsegments(), 1u) << "wrong number of segments";
+
+  ZPhysicalMemory split0_pmem = pmem.split(SegmentSize);
+  EXPECT_EQ(split0_pmem.nsegments(), 1u);
+  EXPECT_EQ(       pmem.nsegments(), 1u);
+  EXPECT_EQ(split0_pmem.size(), 1 * SegmentSize);
+  EXPECT_EQ(       pmem.size(), 7 * SegmentSize);
+
+  ZPhysicalMemory split1_pmem = pmem.split(2 * SegmentSize);
+  EXPECT_EQ(split1_pmem.nsegments(), 1u);
+  EXPECT_EQ(       pmem.nsegments(), 1u);
+  EXPECT_EQ(split1_pmem.size(), 2 * SegmentSize);
+  EXPECT_EQ(       pmem.size(), 5 * SegmentSize);
+
+  ZPhysicalMemory split2_pmem = pmem.split(5 * SegmentSize);
+  EXPECT_EQ(split2_pmem.nsegments(), 1u);
+  EXPECT_EQ(       pmem.nsegments(), 1u);
+  EXPECT_EQ(split2_pmem.size(), 5 * SegmentSize);
+  EXPECT_EQ(       pmem.size(), 0 * SegmentSize);
+}
+
+#endif
diff --git a/test/hotspot/gtest/gc/z/test_zUtils.cpp b/test/hotspot/gtest/gc/z/test_zUtils.cpp
new file mode 100644
index 00000000000..8b511594fa8
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zUtils.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zUtils.inline.hpp"
+#include "unittest.hpp"
+
+#include <limits>
+
+template <typename T>
+static T max_alignment() {
+  T max = std::numeric_limits<T>::max();
+  return max ^ (max >> 1);
+}
+
+TEST(ZUtilsTest, round_up_power_of_2) {
+  EXPECT_EQ(ZUtils::round_up_power_of_2(1u), 1u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(2u), 2u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(3u), 4u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(4u), 4u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(5u), 8u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(6u), 8u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(7u), 8u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(8u), 8u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(9u), 16u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(10u), 16u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(1023u), 1024u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(1024u), 1024u);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(1025u), 2048u);
+
+  const size_t max = max_alignment<size_t>();
+  EXPECT_EQ(ZUtils::round_up_power_of_2(max - 1), max);
+  EXPECT_EQ(ZUtils::round_up_power_of_2(max), max);
+}
+
+TEST(ZUtilsTest, round_down_power_of_2) {
+  EXPECT_EQ(ZUtils::round_down_power_of_2(1u), 1u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(2u), 2u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(3u), 2u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(4u), 4u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(5u), 4u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(6u), 4u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(7u), 4u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(8u), 8u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(9u), 8u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(10u), 8u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(1023u), 512u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(1024u), 1024u);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(1025u), 1024u);
+
+  const size_t max = max_alignment<size_t>();
+  EXPECT_EQ(ZUtils::round_down_power_of_2(max), max);
+  EXPECT_EQ(ZUtils::round_down_power_of_2(max - 1), max / 2);
+}
diff --git a/test/hotspot/gtest/gc/z/test_zVirtualMemory.cpp b/test/hotspot/gtest/gc/z/test_zVirtualMemory.cpp
new file mode 100644
index 00000000000..b9029f3cd0f
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zVirtualMemory.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zVirtualMemory.inline.hpp"
+#include "utilities/debug.hpp"
+#include "unittest.hpp"
+
+TEST(ZVirtualMemory, split) {
+  const size_t PageSize = 2 * M;
+
+  ZVirtualMemory mem(0, 10 * PageSize);
+
+  ZVirtualMemory mem_split0 = mem.split(0 * PageSize);
+  EXPECT_EQ(mem_split0.size(),  0 * PageSize);
+  EXPECT_EQ(       mem.size(), 10 * PageSize);
+
+  ZVirtualMemory mem_split1 = mem.split(5u * PageSize);
+  EXPECT_EQ(mem_split1.size(),  5 * PageSize);
+  EXPECT_EQ(       mem.size(),  5 * PageSize);
+
+  ZVirtualMemory mem_split2 = mem.split(5u * PageSize);
+  EXPECT_EQ(mem_split2.size(),  5 * PageSize);
+  EXPECT_EQ(       mem.size(),  0 * PageSize);
+
+  ZVirtualMemory mem_split3 = mem.split(0 * PageSize);
+  EXPECT_EQ(mem_split3.size(),  0 * PageSize);
+}
diff --git a/test/hotspot/gtest/logging/test_logConfiguration.cpp b/test/hotspot/gtest/logging/test_logConfiguration.cpp
index dee60551a51..4a9b311199a 100644
--- a/test/hotspot/gtest/logging/test_logConfiguration.cpp
+++ b/test/hotspot/gtest/logging/test_logConfiguration.cpp
@@ -239,6 +239,7 @@ TEST_VM_F(LogConfigurationTest, invalid_configure_options) {
   EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("all=invalid_level"));
   EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("what=invalid"));
   EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("all::invalid_decorator"));
+  EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("*"));
 }
 
 // Test empty configuration options
diff --git a/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp b/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
index b877edb96cf..1cffbd300d9 100644
--- a/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
+++ b/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
@@ -265,6 +265,40 @@ static void cht_scan(Thread* thr) {
   delete cht;
 }
 
+struct ChtCountScan {
+  size_t _count;
+  ChtCountScan() : _count(0) {}
+  bool operator()(uintptr_t* val) {
+    _count++;
+    return true; /* continue scan */
+  }
+};
+
+static void cht_move_to(Thread* thr) {
+  uintptr_t val1 = 0x2;
+  uintptr_t val2 = 0xe0000002;
+  uintptr_t val3 = 0x3;
+  SimpleTestLookup stl1(val1), stl2(val2), stl3(val3);
+  SimpleTestTable* from_cht = new SimpleTestTable();
+  EXPECT_TRUE(from_cht->insert(thr, stl1, val1)) << "Insert unique value failed.";
+  EXPECT_TRUE(from_cht->insert(thr, stl2, val2)) << "Insert unique value failed.";
+  EXPECT_TRUE(from_cht->insert(thr, stl3, val3)) << "Insert unique value failed.";
+
+  SimpleTestTable* to_cht = new SimpleTestTable();
+  EXPECT_TRUE(from_cht->try_move_nodes_to(thr, to_cht)) << "Moving nodes to new table failed";
+
+  ChtCountScan scan_old;
+  EXPECT_TRUE(from_cht->try_scan(thr, scan_old)) << "Scanning table should work.";
+  EXPECT_EQ(scan_old._count, (size_t)0) << "All items should be moved";
+
+  ChtCountScan scan_new;
+  EXPECT_TRUE(to_cht->try_scan(thr, scan_new)) << "Scanning table should work.";
+  EXPECT_EQ(scan_new._count, (size_t)3) << "All items should be moved";
+  EXPECT_TRUE(to_cht->get_copy(thr, stl1) == val1) << "Getting an inserted value should work.";
+  EXPECT_TRUE(to_cht->get_copy(thr, stl2) == val2) << "Getting an inserted value should work.";
+  EXPECT_TRUE(to_cht->get_copy(thr, stl3) == val3) << "Getting an inserted value should work.";
+}
+
 static void cht_grow(Thread* thr) {
   uintptr_t val = 0x2;
   uintptr_t val2 = 0x22;
@@ -371,6 +405,10 @@ TEST_VM(ConcurrentHashTable, basic_scan) {
   nomt_test_doer(cht_scan);
 }
 
+TEST_VM(ConcurrentHashTable, basic_move_to) {
+  nomt_test_doer(cht_move_to);
+}
+
 TEST_VM(ConcurrentHashTable, basic_grow) {
   nomt_test_doer(cht_grow);
 }
diff --git a/test/hotspot/gtest/utilities/test_globalCounter.cpp b/test/hotspot/gtest/utilities/test_globalCounter.cpp
index 52ad41b654b..d6edb3d2246 100644
--- a/test/hotspot/gtest/utilities/test_globalCounter.cpp
+++ b/test/hotspot/gtest/utilities/test_globalCounter.cpp
@@ -23,7 +23,7 @@
 
 #include "precompiled.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalCounter.hpp"
 #include "utilities/globalCounter.inline.hpp"
diff --git a/test/hotspot/jtreg/ProblemList-graal.txt b/test/hotspot/jtreg/ProblemList-graal.txt
index cb91916c324..b4b03b643fa 100644
--- a/test/hotspot/jtreg/ProblemList-graal.txt
+++ b/test/hotspot/jtreg/ProblemList-graal.txt
@@ -95,49 +95,8 @@ vmTestbase/nsk/stress/strace/strace006.java                     8191047   generi
 vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/TestDescription.java                         8191047   generic-all
 vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java   8191047   generic-all
 
-vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java                     8195600   generic-all
-vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java                             8195600   generic-all
-vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java      8195600   generic-all
-vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java                      8195600   generic-all
-vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java                      8195600   generic-all
-vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java   8195600   generic-all
-vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java   8195600   generic-all
-vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java               8195600   generic-all
-vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java               8195600   generic-all
-vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java   8195600   generic-all
-vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java   8195600   generic-all
-vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java   8195600   generic-all
-vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java                       8195600   generic-all
 vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java                          8195600   generic-all
-vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java                          8195600   generic-all
-vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java                          8195600   generic-all
 vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java       8195600   generic-all
-vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java 8195600   generic-all
-vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java 8195600   generic-all
-vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java          8195600   generic-all
-vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java                    8195600   generic-all
-vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java   8195600   generic-all
-vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java   8195600   generic-all
-
-vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java                            8200387  generic-all
-vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java         8200387  generic-all
-vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java         8200387  generic-all
-vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java         8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java  8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java  8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java              8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java                 8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java  8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java  8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java                          8200387  generic-all
-vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java                          8200387  generic-all
-vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java           8200387  generic-all
-vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java           8200387  generic-all
-vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java                                     8200387  generic-all
-vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java  8200387  generic-all
-vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java                8200387  generic-all
-vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java                  8200387  generic-all
-vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java       8200387  generic-all
 
 vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java                              8203174   generic-all
 vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java                              8203174   generic-all
@@ -184,3 +143,9 @@ vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn002/TestDescription.java
 vmTestbase/nsk/jvmti/AttachOnDemand/attach024/TestDescription.java                 8195630   generic-all
 
 vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/TestDescription.java       8202342   generic-all
+
+vmTestbase/nsk/jvmti/scenarios/hotswap/HS102/hs102t002/TestDescription.java        8204506   macosx-all
+
+compiler/stable/TestStableShort.java                             8204346   generic-all
+compiler/stable/TestStableUShort.java                            8204346   generic-all
+compiler/stable/TestStableUByte.java                             8204346   generic-all
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 01b94fd3fbf..23d4a5154f1 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -148,6 +148,9 @@ vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java 820
 
 vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8191869,8192647 generic-all
 
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java 8148743 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java 8079666 generic-all
+
 vmTestbase/vm/mlvm/indy/func/jdi/breakpointOtherStratum/Test.java 8199578 generic-all
 vmTestbase/vm/mlvm/indy/func/jdi/breakpoint/Test.java 8199578 generic-all
 vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
@@ -172,4 +175,6 @@ vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java 8197938 windows-all
 vmTestbase/heapdump/JMapHeapCore/TestDescription.java 8023376,8001227,8051445 generic-all
 vmTestbase/heapdump/JMapMetaspaceCore/TestDescription.java 8023376,8001227,8051445 generic-all
 
+vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
+
 #############################################################################
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index 1ffd678d119..1f5e15cf95d 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -27,7 +27,7 @@
 # It also contains test-suite configuration information.
 
 # The list of keywords supported in this test suite
-keys=cte_test jcmd nmt regression gc stress metaspace
+keys=cte_test jcmd nmt regression gc stress metaspace headful intermittent
 
 groups=TEST.groups
 
@@ -45,6 +45,8 @@ requires.properties= \
     vm.gc.Serial \
     vm.gc.Parallel \
     vm.gc.ConcMarkSweep \
+    vm.gc.Epsilon \
+    vm.gc.Z \
     vm.jvmci \
     vm.emulatedClient \
     vm.cpu.features \
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index c2edb45e3ec..bf98e703f7b 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -174,12 +174,14 @@ hotspot_not_fast_gc = \
   -:tier1_gc
 
 tier1_gc_1 = \
+  gc/epsilon/ \
   gc/g1/ \
   -gc/g1/ihop/TestIHOPErgo.java
 
 tier1_gc_2 = \
   sanity/ExecuteInternalVMTests.java \
   gc/ \
+  -gc/epsilon/ \
   -gc/g1/ \
   -gc/logging/TestUnifiedLoggingSwitchStress.java \
   -gc/stress \
@@ -267,6 +269,7 @@ tier1_runtime_appcds_exclude = \
 
 tier1_serviceability = \
   serviceability/dcmd/compiler \
+  -serviceability/dcmd/compiler/CompilerQueueTest.java \
   serviceability/logging \
   serviceability/sa \
   -serviceability/sa/ClhsdbScanOops.java \
@@ -1750,6 +1753,122 @@ vmTestbase_nsk_jvmti_quick = \
   vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/TestDescription.java \
   vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/TestDescription.java
 
+# JDWP tests
+vmTestbase_nsk_jdwp = \
+  vmTestbase/nsk/jdwp
+
+vmTestbase_nsk_jdwp_quick = \
+  vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java \
+  vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/VM_START/vmstart001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/Composite/composite001/TestDescription.java \
+  vmTestbase/nsk/jdwp/EventRequest/Clear/clear001/TestDescription.java \
+  vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001/TestDescription.java \
+  vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002/TestDescription.java \
+  vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003/TestDescription.java \
+  vmTestbase/nsk/jdwp/EventRequest/Set/set001/TestDescription.java \
+  vmTestbase/nsk/jdwp/EventRequest/Set/set002/TestDescription.java \
+  vmTestbase/nsk/jdwp/Method/LineTable/linetable001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Method/VariableTable/vartable001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Status/status001/TestDescription.java \
+  vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001/TestDescription.java \
+  vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001/TestDescription.java \
+  vmTestbase/nsk/jdwp/StringReference/Value/value001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Name/name001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Status/status001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/Version/version001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/Version/version002/TestDescription.java \
+  vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002/TestDescription.java \
+  vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java \
+  vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/TestDescription.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001/TestDescription.java \
+  vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001/TestDescription.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001.java \
+  vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002.java \
+  vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001.java \
+  vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002.java \
+  vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001.java \
+  vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java \
+  vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001.java \
+  vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo002/ownedMonitorsStackDepthInfo002.java
+
 vmTestbase_nsk_stress = \
   vmTestbase/nsk/stress
 
@@ -1855,6 +1974,293 @@ vmTestbase_largepages = \
   vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java \
   vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java
 
+# Just-In-Time compiler tests
+vmTestbase_vm_compiler = \
+  vmTestbase/vm/compiler \
+  vmTestbase/jit \
+  vmTestbase/vm/jit
+
+vmTestbase_vm_compiler_quick = \
+  vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java \
+  vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java \
+  vmTestbase/vm/compiler/jbe/dead/dead01/dead01.java \
+  vmTestbase/vm/compiler/jbe/dead/dead02/dead02.java \
+  vmTestbase/vm/compiler/jbe/dead/dead03/dead03.java \
+  vmTestbase/vm/compiler/jbe/dead/dead04/dead04.java \
+  vmTestbase/vm/compiler/jbe/dead/dead05/dead05.java \
+  vmTestbase/vm/compiler/jbe/dead/dead06/dead06.java \
+  vmTestbase/vm/compiler/jbe/dead/dead07/dead07.java \
+  vmTestbase/vm/compiler/jbe/dead/dead08/dead08.java \
+  vmTestbase/vm/compiler/jbe/dead/dead09/dead09.java \
+  vmTestbase/vm/compiler/jbe/dead/dead10/dead10.java \
+  vmTestbase/vm/compiler/jbe/dead/dead11/dead11.java \
+  vmTestbase/vm/compiler/jbe/dead/dead12/dead12.java \
+  vmTestbase/vm/compiler/jbe/dead/dead13/dead13.java \
+  vmTestbase/vm/compiler/jbe/dead/dead14/dead14.java \
+  vmTestbase/vm/compiler/jbe/dead/dead15/dead15.java \
+  vmTestbase/vm/compiler/jbe/dead/dead16/dead16.java \
+  vmTestbase/vm/compiler/jbe/hoist/hoist01/hoist01.java \
+  vmTestbase/vm/compiler/jbe/hoist/hoist02/hoist02.java \
+  vmTestbase/vm/compiler/jbe/hoist/hoist03/hoist03.java \
+  vmTestbase/vm/compiler/jbe/hoist/hoist04/hoist04.java \
+  vmTestbase/vm/compiler/jbe/subcommon/subcommon01/subcommon01.java \
+  vmTestbase/vm/compiler/jbe/subcommon/subcommon03/subcommon03.java \
+  vmTestbase/vm/compiler/jbe/subcommon/subcommon04/subcommon04.java \
+  vmTestbase/vm/compiler/jbe/subcommon/subcommon05/subcommon05.java \
+  vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/partialpeel/While/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/TestDescription.java \
+  vmTestbase/vm/compiler/optimizations/partialpeel/Do/TestDescription.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit001/uninit001.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit002/uninit002.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit003/uninit003.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit004/uninit004.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit005/uninit005.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit006/uninit006.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit007/uninit007.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit008/uninit008.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit009/uninit009.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit010/uninit010.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit011/uninit011.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit012/uninit012.java \
+  vmTestbase/vm/compiler/complog/uninit/uninit013/uninit013.java \
+  vmTestbase/jit/Arrays/ArrayBounds/ArrayBounds.java \
+  vmTestbase/jit/Arrays/ArrayStoreCheck/ArrayStoreCheck.java \
+  vmTestbase/jit/Arrays/ArrayTests/ArrayTests.java \
+  vmTestbase/jit/CEETest/CEETest.java \
+  vmTestbase/jit/CondExpr/CondExpr.java \
+  vmTestbase/jit/DivTest/DivTest.java \
+  vmTestbase/jit/ExcOpt/ExcOpt.java \
+  vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java \
+  vmTestbase/jit/FloatingPoint/gen_math/ShortCircuitTest/ShortCircuitTest.java \
+  vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java \
+  vmTestbase/jit/PrintProperties/PrintProperties.java \
+  vmTestbase/jit/PrintThis/PrintThis.java \
+  vmTestbase/jit/Robert/Robert.java \
+  vmTestbase/jit/Sleeper/Sleeper.java \
+  vmTestbase/jit/bounds/bounds.java \
+  vmTestbase/jit/collapse/collapse.java \
+  vmTestbase/jit/deoptimization/test01/test01.java \
+  vmTestbase/jit/deoptimization/test02/test02.java \
+  vmTestbase/jit/deoptimization/test03/test03.java \
+  vmTestbase/jit/deoptimization/test04/test04.java \
+  vmTestbase/jit/deoptimization/test05/test05.java \
+  vmTestbase/jit/deoptimization/test06/test06.java \
+  vmTestbase/jit/deoptimization/test07/test07.java \
+  vmTestbase/jit/deoptimization/test08/test08.java \
+  vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java \
+  vmTestbase/jit/escape/LockElision/MatMul/MatMul.java \
+  vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java \
+  vmTestbase/jit/exception/exception.java \
+  vmTestbase/jit/graph/cgt0/cgt0.java \
+  vmTestbase/jit/graph/cgt1/cgt1.java \
+  vmTestbase/jit/graph/cgt2/cgt2.java \
+  vmTestbase/jit/graph/cgt3/cgt3.java \
+  vmTestbase/jit/graph/cgt4/cgt4.java \
+  vmTestbase/jit/graph/cgt5/cgt5.java \
+  vmTestbase/jit/graph/cgt6/cgt6.java \
+  vmTestbase/jit/graph/cgt7/cgt7.java \
+  vmTestbase/jit/graph/cgt8/cgt8.java \
+  vmTestbase/jit/graph/cgt9/cgt9.java \
+  vmTestbase/jit/graph/cgt10/cgt10.java \
+  vmTestbase/jit/graph/cgt11/cgt11.java \
+  vmTestbase/jit/init/init01/init01.java \
+  vmTestbase/jit/init/init02/init02.java \
+  vmTestbase/jit/inline/inline003/inline003.java \
+  vmTestbase/jit/inline/inline004/inline004.java \
+  vmTestbase/jit/inline/inline005/inline005.java \
+  vmTestbase/jit/inline/inline007/inline007.java \
+  vmTestbase/jit/misctests/JitBug1/JitBug1.java \
+  vmTestbase/jit/misctests/Pi/Pi.java \
+  vmTestbase/jit/misctests/clss14702/clss14702.java \
+  vmTestbase/jit/misctests/fpustack/GraphApplet.java \
+  vmTestbase/jit/misctests/putfield00802/putfield00802.java \
+  vmTestbase/jit/misctests/t5/t5.java \
+  vmTestbase/jit/overflow/overflow.java \
+  vmTestbase/jit/regression/b4427606/b4427606.java \
+  vmTestbase/jit/regression/b4446672/b4446672.java \
+  vmTestbase/jit/regression/CrashC1/CrashC1.java \
+  vmTestbase/jit/series/series.java \
+  vmTestbase/jit/t/t001/t001.java \
+  vmTestbase/jit/t/t002/t002.java \
+  vmTestbase/jit/t/t003/t003.java \
+  vmTestbase/jit/t/t004/t004.java \
+  vmTestbase/jit/t/t005/t005.java \
+  vmTestbase/jit/t/t006/t006.java \
+  vmTestbase/jit/t/t007/t007.java \
+  vmTestbase/jit/t/t008/t008.java \
+  vmTestbase/jit/t/t009/t009.java \
+  vmTestbase/jit/t/t011/t011.java \
+  vmTestbase/jit/t/t012/t012.java \
+  vmTestbase/jit/t/t013/t013.java \
+  vmTestbase/jit/t/t014/t014.java \
+  vmTestbase/jit/t/t015/t015.java \
+  vmTestbase/jit/t/t016/t016.java \
+  vmTestbase/jit/t/t017/t017.java \
+  vmTestbase/jit/t/t018/t018.java \
+  vmTestbase/jit/t/t019/t019.java \
+  vmTestbase/jit/t/t020/t020.java \
+  vmTestbase/jit/t/t021/t021.java \
+  vmTestbase/jit/t/t022/t022.java \
+  vmTestbase/jit/t/t023/t023.java \
+  vmTestbase/jit/t/t024/t024.java \
+  vmTestbase/jit/t/t025/t025.java \
+  vmTestbase/jit/t/t026/t026.java \
+  vmTestbase/jit/t/t027/t027.java \
+  vmTestbase/jit/t/t028/t028.java \
+  vmTestbase/jit/t/t029/t029.java \
+  vmTestbase/jit/t/t030/t030.java \
+  vmTestbase/jit/t/t031/t031.java \
+  vmTestbase/jit/t/t032/t032.java \
+  vmTestbase/jit/t/t033/t033.java \
+  vmTestbase/jit/t/t034/t034.java \
+  vmTestbase/jit/t/t035/t035.java \
+  vmTestbase/jit/t/t036/t036.java \
+  vmTestbase/jit/t/t037/t037.java \
+  vmTestbase/jit/t/t038/t038.java \
+  vmTestbase/jit/t/t039/t039.java \
+  vmTestbase/jit/t/t040/t040.java \
+  vmTestbase/jit/t/t041/t041.java \
+  vmTestbase/jit/t/t042/t042.java \
+  vmTestbase/jit/t/t043/t043.java \
+  vmTestbase/jit/t/t044/t044.java \
+  vmTestbase/jit/t/t045/t045.java \
+  vmTestbase/jit/t/t046/t046.java \
+  vmTestbase/jit/t/t047/t047.java \
+  vmTestbase/jit/t/t048/t048.java \
+  vmTestbase/jit/t/t049/t049.java \
+  vmTestbase/jit/t/t050/t050.java \
+  vmTestbase/jit/t/t051/t051.java \
+  vmTestbase/jit/t/t052/t052.java \
+  vmTestbase/jit/t/t053/t053.java \
+  vmTestbase/jit/t/t054/t054.java \
+  vmTestbase/jit/t/t055/t055.java \
+  vmTestbase/jit/t/t056/t056.java \
+  vmTestbase/jit/t/t057/t057.java \
+  vmTestbase/jit/t/t058/t058.java \
+  vmTestbase/jit/t/t059/t059.java \
+  vmTestbase/jit/t/t060/t060.java \
+  vmTestbase/jit/t/t061/t061.java \
+  vmTestbase/jit/t/t062/t062.java \
+  vmTestbase/jit/t/t063/t063.java \
+  vmTestbase/jit/t/t064/t064.java \
+  vmTestbase/jit/t/t065/t065.java \
+  vmTestbase/jit/t/t066/t066.java \
+  vmTestbase/jit/t/t067/t067.java \
+  vmTestbase/jit/t/t068/t068.java \
+  vmTestbase/jit/t/t069/t069.java \
+  vmTestbase/jit/t/t070/t070.java \
+  vmTestbase/jit/t/t071/t071.java \
+  vmTestbase/jit/t/t072/t072.java \
+  vmTestbase/jit/t/t073/t073.java \
+  vmTestbase/jit/t/t074/t074.java \
+  vmTestbase/jit/t/t075/t075.java \
+  vmTestbase/jit/t/t076/t076.java \
+  vmTestbase/jit/t/t077/t077.java \
+  vmTestbase/jit/t/t078/t078.java \
+  vmTestbase/jit/t/t079/t079.java \
+  vmTestbase/jit/t/t080/t080.java \
+  vmTestbase/jit/t/t081/t081.java \
+  vmTestbase/jit/t/t086/t086.java \
+  vmTestbase/jit/t/t087/t087.java \
+  vmTestbase/jit/t/t088/t088.java \
+  vmTestbase/jit/t/t091/t091.java \
+  vmTestbase/jit/t/t093/t093.java \
+  vmTestbase/jit/t/t094/t094.java \
+  vmTestbase/jit/t/t095/t095.java \
+  vmTestbase/jit/t/t096/t096.java \
+  vmTestbase/jit/t/t098/t098.java \
+  vmTestbase/jit/t/t099/t099.java \
+  vmTestbase/jit/t/t100/t100.java \
+  vmTestbase/jit/t/t101/t101.java \
+  vmTestbase/jit/t/t102/t102.java \
+  vmTestbase/jit/t/t103/t103.java \
+  vmTestbase/jit/t/t104/t104.java \
+  vmTestbase/jit/t/t105/t105.java \
+  vmTestbase/jit/t/t106/t106.java \
+  vmTestbase/jit/t/t107/t107.java \
+  vmTestbase/jit/t/t108/TestDescription.java \
+  vmTestbase/jit/t/t109/TestDescription.java \
+  vmTestbase/jit/t/t110/TestDescription.java \
+  vmTestbase/jit/t/t111/TestDescription.java \
+  vmTestbase/jit/t/t112/TestDescription.java \
+  vmTestbase/jit/t/t113/TestDescription.java \
+  vmTestbase/jit/tiered/TestDescription.java \
+  vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java \
+  vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java \
+  vmTestbase/jit/wide/wide01/wide01.java \
+  vmTestbase/jit/wide/wide02/wide02.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java \
+  vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java
+
 # JSR292 tests (invokedynamic AKA Multi-Language VM AKA Da Vinci Machine)
 vmTestbase_vm_mlvm = \
   vmTestbase/vm/mlvm
@@ -1870,6 +2276,10 @@ vmTestbase_vm_heapdump_quick = \
   vmTestbase/heapdump/JMapHeapCore/TestDescription.java \
   vmTestbase/heapdump/JMapMetaspace/TestDescription.java
 
+# Tests for attach-on-demand implementation
+vmTestbase_nsk_aod = \
+  vmTestbase/nsk/aod
+
 # JDB tests
 vmTestbase_nsk_jdb = \
   vmTestbase/nsk/jdb
diff --git a/test/hotspot/jtreg/compiler/aot/AotCompiler.java b/test/hotspot/jtreg/compiler/aot/AotCompiler.java
index dbd0ba6c700..b710f0c8c05 100644
--- a/test/hotspot/jtreg/compiler/aot/AotCompiler.java
+++ b/test/hotspot/jtreg/compiler/aot/AotCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -185,17 +185,17 @@ public class AotCompiler {
                 if (Platform.isX64()) {
                     @Artifact(organization = "jpg.infra.builddeps",
                             name = "devkit-windows_x64",
-                            revision = "VS2013SP4+1.0",
+                            revision = "VS2017-15.5.5+1.0",
                             extension = "tar.gz")
                     class DevkitWindowsX64 { }
                     String artifactName = "jpg.infra.builddeps."
                             + "devkit-windows_x64-"
-                            + "VS2013SP4+1.0";
+                            + "VS2017-15.5.5+1.0";
                     Path devkit = ArtifactResolver.resolve(DevkitWindowsX64.class)
                                                   .get(artifactName);
                     linker = devkit.resolve("VC")
                                    .resolve("bin")
-                                   .resolve("amd64")
+                                   .resolve("x64")
                                    .resolve("link.exe");
                 }
             } else if (Platform.isOSX()) {
@@ -221,13 +221,13 @@ public class AotCompiler {
                 if (Platform.isSparc()) {
                     @Artifact(organization =  "jpg.infra.builddeps",
                             name = "devkit-solaris_sparcv9",
-                            revision = "SS12u4-Solaris11u1+1.0",
+                            revision = "SS12u4-Solaris11u1+1.1",
                             extension = "tar.gz")
                     class DevkitSolarisSparc { }
 
                     String artifactName = "jpg.infra.builddeps."
                             + "devkit-solaris_sparcv9-"
-                            + "SS12u4-Solaris11u1+1.0";
+                            + "SS12u4-Solaris11u1+1.1";
                     Path devkit = ArtifactResolver.resolve(DevkitSolarisSparc.class)
                                                   .get(artifactName);
                     linker = devkit.resolve("SS12u4-Solaris11u1")
@@ -285,13 +285,13 @@ public class AotCompiler {
                 } else if (Platform.isX64()) {
                     @Artifact(organization = "jpg.infra.builddeps",
                             name = "devkit-linux_x64",
-                            revision = "gcc4.9.2-OEL6.4+1.1",
+                            revision = "gcc7.3.0-OEL6.4+1.0",
                             extension = "tar.gz")
                     class DevkitLinuxX64 { }
 
                     String artifactName = "jpg.infra.builddeps."
                             + "devkit-linux_x64-"
-                            + "gcc4.9.2-OEL6.4+1.1";
+                            + "gcc7.3.0-OEL6.4+1.0";
                     Path devkit = ArtifactResolver.resolve(DevkitLinuxX64.class)
                                                   .get(artifactName);
                     linker = devkit.resolve("bin")
diff --git a/test/hotspot/jtreg/compiler/c2/Test6910605_2.java b/test/hotspot/jtreg/compiler/c2/Test6910605_2.java
index 3a1b417a3e8..6131d6cef0f 100644
--- a/test/hotspot/jtreg/compiler/c2/Test6910605_2.java
+++ b/test/hotspot/jtreg/compiler/c2/Test6910605_2.java
@@ -26,7 +26,7 @@
  * @bug 6910605
  * @summary C2: NullPointerException/ClassCaseException is thrown when C2 with DeoptimizeALot is used
  *
- * @run main/othervm -Xmx64m -XX:+IgnoreUnrecognizedVMOptions -XX:+DeoptimizeALot
+ * @run main/othervm -Xmx128m -XX:+IgnoreUnrecognizedVMOptions -XX:+DeoptimizeALot
  *      -XX:+DoEscapeAnalysis -Xbatch -XX:InlineSmallCode=2000
  *      compiler.c2.Test6910605_2
  */
diff --git a/test/hotspot/jtreg/compiler/c2/Test7199742.java b/test/hotspot/jtreg/compiler/c2/Test7199742.java
index 15ead54c09c..6b2c5f9b7cc 100644
--- a/test/hotspot/jtreg/compiler/c2/Test7199742.java
+++ b/test/hotspot/jtreg/compiler/c2/Test7199742.java
@@ -26,7 +26,7 @@
  * @bug 7199742
  * @summary A lot of C2 OSR compilations of the same method's bci
  *
- * @run main/othervm -Xmx32m -Xbatch compiler.c2.Test7199742
+ * @run main/othervm -Xmx128m -Xbatch compiler.c2.Test7199742
  */
 
 package compiler.c2;
@@ -54,4 +54,3 @@ public class Test7199742 {
         return v;
     }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/Test8002069.java b/test/hotspot/jtreg/compiler/c2/Test8002069.java
index 8debe1575f0..38953f8a419 100644
--- a/test/hotspot/jtreg/compiler/c2/Test8002069.java
+++ b/test/hotspot/jtreg/compiler/c2/Test8002069.java
@@ -26,7 +26,7 @@
  * @bug 8002069
  * @summary Assert failed in C2: assert(field->edge_count() > 0) failed: sanity
  *
- * @run main/othervm -Xmx32m -XX:+IgnoreUnrecognizedVMOptions -Xbatch
+ * @run main/othervm -Xmx128m -XX:+IgnoreUnrecognizedVMOptions -Xbatch
  *      -XX:CompileCommand=exclude,compiler.c2.Test8002069::dummy
  *      compiler.c2.Test8002069
  */
@@ -109,4 +109,3 @@ public class Test8002069 {
         return i * 2;
     }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/Test8004741.java b/test/hotspot/jtreg/compiler/c2/Test8004741.java
index 69d2ad9f0bd..cf54e50dba1 100644
--- a/test/hotspot/jtreg/compiler/c2/Test8004741.java
+++ b/test/hotspot/jtreg/compiler/c2/Test8004741.java
@@ -27,11 +27,11 @@
  * @summary Missing compiled exception handle table entry for multidimensional array allocation
  *
  * @requires !vm.graal.enabled
- * @run main/othervm -Xmx64m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm -Xmx128m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
  *    -XX:-TieredCompilation -XX:+StressCompiledExceptionHandlers
  *    -XX:+SafepointALot -XX:GuaranteedSafepointInterval=100
  *    compiler.c2.Test8004741
- * @run main/othervm -Xmx64m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm -Xmx128m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
  *    -XX:-TieredCompilation -XX:+StressCompiledExceptionHandlers
  *    compiler.c2.Test8004741
  */
diff --git a/test/hotspot/jtreg/compiler/c2/TestUnsignedByteCompare.java b/test/hotspot/jtreg/compiler/c2/TestUnsignedByteCompare.java
new file mode 100644
index 00000000000..5616d5b2f6f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestUnsignedByteCompare.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018, Red Hat 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.
+ *
+ * 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 8204479
+ * @summary Bitwise AND on byte value sometimes produces wrong result
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation
+ *      -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xcomp -XX:-Inline
+ *      compiler.c2.TestUnsignedByteCompare
+ */
+
+package compiler.c2;
+
+public class TestUnsignedByteCompare {
+
+    static int p, n;
+
+    static void report(byte[] ba, int i, boolean failed) {
+        // Enable for debugging:
+        // System.out.println((failed ? "Failed" : "Passed") + " with: " + ba[i] + " at " + i);
+    }
+
+    static void m1(byte[] ba) {
+        for (int i = 0; i < ba.length; i++) {
+            if ((ba[i] & 0xFF) < 0x10) {
+               p++;
+               report(ba, i, true);
+            } else {
+               n++;
+               report(ba, i, false);
+            }
+        }
+    }
+
+    static void m2(byte[] ba) {
+        for (int i = 0; i < ba.length; i++) {
+            if (((ba[i] & 0xFF) & 0x80) < 0) {
+               p++;
+               report(ba, i, true);
+            } else {
+               n++;
+               report(ba, i, false);
+            }
+        }
+    }
+
+    static public void main(String[] args) {
+        final int tries = 1_000;
+        final int count = 1_000;
+
+        byte[] ba = new byte[count];
+
+        for (int i = 0; i < count; i++) {
+            int v = -(i % 126 + 1);
+            ba[i] = (byte)v;
+        }
+
+        for (int t = 0; t < tries; t++) {
+            m1(ba);
+            if (p != 0) {
+                throw new IllegalStateException("m1 error: p = " + p + ", n = " + n);
+            }
+        }
+
+        for (int t = 0; t < tries; t++) {
+            m2(ba);
+            if (p != 0) {
+                throw new IllegalStateException("m2 error: p = " + p + ", n = " + n);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestByteVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestByteVect.java
index 404210ff709..42b3ebf9a38 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestByteVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestByteVect.java
@@ -26,7 +26,7 @@
  * @bug 6340864
  * @summary Implement vectorization optimizations in hotspot-server
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr6340864.TestByteVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr6340864.TestByteVect
  */
 
 package compiler.c2.cr6340864;
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java
index e6a5282c4b3..56fce03cc83 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java
@@ -26,7 +26,7 @@
  * @bug 6340864
  * @summary Implement vectorization optimizations in hotspot-server
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr6340864.TestDoubleVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr6340864.TestDoubleVect
  */
 
 package compiler.c2.cr6340864;
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java
index f5f35a524eb..c64c28ba0ec 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java
@@ -26,7 +26,7 @@
  * @bug 6340864
  * @summary Implement vectorization optimizations in hotspot-server
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr6340864.TestFloatVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr6340864.TestFloatVect
  */
 
 package compiler.c2.cr6340864;
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java
index f221d94b10a..87c8557adb9 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java
@@ -26,7 +26,7 @@
  * @bug 6340864
  * @summary Implement vectorization optimizations in hotspot-server
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr6340864.TestIntVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr6340864.TestIntVect
  */
 
 package compiler.c2.cr6340864;
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestLongVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestLongVect.java
index 7c27969ce71..1bd0bf5c91b 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestLongVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestLongVect.java
@@ -26,7 +26,7 @@
  * @bug 6340864
  * @summary Implement vectorization optimizations in hotspot-server
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr6340864.TestLongVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr6340864.TestLongVect
  */
 
 package compiler.c2.cr6340864;
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestShortVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestShortVect.java
index 9002343dbb7..e2bf2a90308 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestShortVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestShortVect.java
@@ -26,7 +26,7 @@
  * @bug 6340864
  * @summary Implement vectorization optimizations in hotspot-server
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr6340864.TestShortVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr6340864.TestShortVect
  */
 
 package compiler.c2.cr6340864;
diff --git a/test/hotspot/jtreg/compiler/c2/cr7192963/TestByteVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestByteVect.java
index 1e0d5921d09..ce926eb7062 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7192963/TestByteVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7192963/TestByteVect.java
@@ -26,7 +26,7 @@
  * @bug 7192963
  * @summary assert(_in[req-1] == this) failed: Must pass arg count to 'new'
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr7192963.TestByteVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr7192963.TestByteVect
  */
 
 package compiler.c2.cr7192963;
@@ -201,4 +201,3 @@ public class TestByteVect {
     return 0;
   }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/cr7192963/TestDoubleVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestDoubleVect.java
index 4de6112a6ef..d1b347e3f4c 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7192963/TestDoubleVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7192963/TestDoubleVect.java
@@ -26,7 +26,7 @@
  * @bug 7192963
  * @summary assert(_in[req-1] == this) failed: Must pass arg count to 'new'
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr7192963.TestDoubleVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr7192963.TestDoubleVect
  */
 
 package compiler.c2.cr7192963;
@@ -201,4 +201,3 @@ public class TestDoubleVect {
     return 0;
   }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/cr7192963/TestFloatVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestFloatVect.java
index 526344a82b9..bc842d52edb 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7192963/TestFloatVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7192963/TestFloatVect.java
@@ -26,7 +26,7 @@
  * @bug 7192963
  * @summary assert(_in[req-1] == this) failed: Must pass arg count to 'new'
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr7192963.TestFloatVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr7192963.TestFloatVect
  */
 
 package compiler.c2.cr7192963;
@@ -201,4 +201,3 @@ public class TestFloatVect {
     return 0;
   }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/cr7192963/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestIntVect.java
index fc3922ed870..55ebaf45365 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7192963/TestIntVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7192963/TestIntVect.java
@@ -26,7 +26,7 @@
  * @bug 7192963
  * @summary assert(_in[req-1] == this) failed: Must pass arg count to 'new'
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr7192963.TestIntVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr7192963.TestIntVect
  */
 
 package compiler.c2.cr7192963;
@@ -201,4 +201,3 @@ public class TestIntVect {
     return 0;
   }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/cr7192963/TestLongVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestLongVect.java
index 47a86e6257a..ba3e71af139 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7192963/TestLongVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7192963/TestLongVect.java
@@ -26,7 +26,7 @@
  * @bug 7192963
  * @summary assert(_in[req-1] == this) failed: Must pass arg count to 'new'
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr7192963.TestLongVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr7192963.TestLongVect
  */
 
 package compiler.c2.cr7192963;
@@ -201,4 +201,3 @@ public class TestLongVect {
     return 0;
   }
 }
-
diff --git a/test/hotspot/jtreg/compiler/c2/cr7192963/TestShortVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestShortVect.java
index 4c9cefc8375..cf287a23787 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7192963/TestShortVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7192963/TestShortVect.java
@@ -26,7 +26,7 @@
  * @bug 7192963
  * @summary assert(_in[req-1] == this) failed: Must pass arg count to 'new'
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.c2.cr7192963.TestShortVect
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.c2.cr7192963.TestShortVect
  */
 
 package compiler.c2.cr7192963;
@@ -201,4 +201,3 @@ public class TestShortVect {
     return 0;
   }
 }
-
diff --git a/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java b/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java
index 6b39a974d0a..a5c47fa5ea8 100644
--- a/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java
+++ b/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java
@@ -61,7 +61,7 @@ public abstract class CiReplayBase {
     private static final String HS_ERR_NAME = "hs_err_pid";
     private static final String RUN_SHELL_ZERO_LIMIT = "ulimit -S -c 0 && ";
     private static final String VERSION_OPTION = "-version";
-    private static final String[] REPLAY_GENERATION_OPTIONS = new String[]{"-Xms8m", "-Xmx32m",
+    private static final String[] REPLAY_GENERATION_OPTIONS = new String[]{"-Xms128m", "-Xmx128m",
         "-XX:MetaspaceSize=4m", "-XX:MaxMetaspaceSize=16m", "-XX:InitialCodeCacheSize=512k",
         "-XX:ReservedCodeCacheSize=4m", "-XX:ThreadStackSize=512", "-XX:VMThreadStackSize=512",
         "-XX:CompilerThreadStackSize=512", "-XX:ParallelGCThreads=1", "-XX:CICompilerCount=2",
diff --git a/test/hotspot/jtreg/compiler/codegen/Test6942326.java b/test/hotspot/jtreg/compiler/codegen/Test6942326.java
index 1575b05edde..00314c1f8c3 100644
--- a/test/hotspot/jtreg/compiler/codegen/Test6942326.java
+++ b/test/hotspot/jtreg/compiler/codegen/Test6942326.java
@@ -26,7 +26,7 @@
  * @bug 6942326
  * @summary x86 code in string_indexof() could read beyond reserved heap space
  *
- * @run main/othervm/timeout=300 -Xmx32m -Xbatch -XX:+IgnoreUnrecognizedVMOptions
+ * @run main/othervm/timeout=300 -Xmx128m -Xbatch -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:CompileCommand=exclude,compiler.codegen.Test6942326::main
  *      -XX:CompileCommand=exclude,compiler.codegen.Test6942326::test_varsub_indexof
  *      -XX:CompileCommand=exclude,compiler.codegen.Test6942326::test_varstr_indexof
@@ -414,4 +414,3 @@ public class Test6942326 {
         public int indexOf(String str) { return str.indexOf(constr); }
     }
 }
-
diff --git a/test/hotspot/jtreg/compiler/codegen/TestCharVect2.java b/test/hotspot/jtreg/compiler/codegen/TestCharVect2.java
index 327dcab3fb8..6c349239ad7 100644
--- a/test/hotspot/jtreg/compiler/codegen/TestCharVect2.java
+++ b/test/hotspot/jtreg/compiler/codegen/TestCharVect2.java
@@ -26,7 +26,7 @@
  * @bug 8001183
  * @summary incorrect results of char vectors right shift operaiton
  *
- * @run main/othervm/timeout=400 -Xbatch -Xmx64m compiler.codegen.TestCharVect2
+ * @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.codegen.TestCharVect2
  */
 
 package compiler.codegen;
diff --git a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
new file mode 100644
index 00000000000..95324d307cf
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 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
+ * 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 8059022
+ * @modules java.base/jdk.internal.misc:+open
+ * @summary Validate barriers after Unsafe getObject, CAS and swap (GetAndSet)
+ * @requires vm.gc.Z & !vm.graal.enabled
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -XX:+UnlockDiagnosticVMOptions -XX:+ZUnmapBadViews -XX:ZCollectionInterval=1 -XX:-CreateCoredumpOnCrash -XX:CompileCommand=dontinline,*::mergeImpl* compiler.gcbarriers.UnsafeIntrinsicsTest
+ */
+
+package compiler.gcbarriers;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Random;
+import sun.misc.Unsafe;
+
+public class UnsafeIntrinsicsTest {
+
+    /*
+     * This test triggers the loadbarriers by allocating a lot, keeping the objects alive and then
+     * letting them die in a way that maximizes fragmentation.
+     *
+     * All subtests (OperationType's) could run in parallel.
+     */
+
+    static int node_count = 133700;
+    static int thread_count = 4;
+    static int time = Integer.getInteger("time", 4); // seconds per subtest
+
+    static Runner r = new Runner(null, 1, 1, Runner.OperationType.CAS);
+
+    static Node first_node;
+    int epoch = 0;
+
+    public static void main(String[] args) {
+        UnsafeIntrinsicsTest t = new UnsafeIntrinsicsTest();
+
+        t.testWithLocalData(Runner.OperationType.CAS);
+        t.testWithLocalData(Runner.OperationType.Weak_CAS);
+        t.testWithLocalData(Runner.OperationType.CMPX);
+
+        t.testWithSharedData(Runner.OperationType.Swap);
+        t.testWithSharedData(Runner.OperationType.Load);
+    }
+
+    public UnsafeIntrinsicsTest() {
+
+    }
+
+    public void testWithLocalData(Runner.OperationType optype) {
+        System.out.println("Testing " + optype.name() + " with " + thread_count +" thread and " + node_count + " nodes");
+
+        // start mutator threads
+        ArrayList<Thread> thread_list = new ArrayList<Thread>();
+        Random r = new Random(System.nanoTime());
+        for (int i = 0; i < thread_count; i++) {
+
+            setup(); // each thread has its own circle of nodes
+            Thread t = new Thread(new Runner(first_node, time, r.nextLong(), optype));
+            t.start();
+            thread_list.add(t);
+        }
+
+        waitForCompletion(thread_list);
+        countNodes();
+    }
+
+    public void testWithSharedData(Runner.OperationType optype) {
+        System.out.println("Testing " + optype.name() + " with " + thread_count +" thread and " + node_count + " nodes");
+
+        setup(); // All nodes are shared between threads
+        ArrayList<Thread> thread_list = new ArrayList<Thread>();
+        Random r = new Random(System.nanoTime());
+        for (int i = 0; i < thread_count; i++) {
+            Thread t = new Thread(new Runner(first_node, time, r.nextLong(), optype));
+            t.start();
+            thread_list.add(t);
+        }
+
+        waitForCompletion(thread_list);
+        countNodes();
+    }
+
+    public void waitForCompletion(ArrayList<Thread> thread_list) {
+        // do some waiting
+        try {
+            Thread.sleep(time*1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        // wait for all thread to terminate
+        for (int i = 0; i < thread_count; i++) {
+            try {
+                thread_list.get(i).join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    void countNodes() {
+        epoch++;
+        int count = 0;
+        Node node = first_node;
+        while (node.number() < epoch) {
+            node.setNumber(epoch);
+            count++;
+            node = node.next();
+        }
+        System.out.println("Program end, found " + count + " nodes");
+    }
+
+    // Create a circular linked list
+    public void setup() {
+        first_node = new Node();
+        Node last_node = first_node;
+        for (int i = 0; i < node_count; i++) {
+            last_node = new Node(last_node);
+        }
+        first_node.setNext(last_node);
+    }
+}
+
+class Runner implements Runnable {
+
+    OperationType type;
+    Node current;
+    Random r;
+    long time;
+    long seed;
+
+    long milage = 0;
+    long created = 0;
+    long skipped = 0;
+    int iterations = 0;
+
+    static final jdk.internal.misc.Unsafe UNSAFE;
+    static final long offset;
+
+    public enum OperationType {
+        Load("Load"),
+        Swap("Swap"),
+        CAS("CAS"),
+        Weak_CAS("Weak-CAS"),
+        CMPX("CMPX");
+
+        private String name;
+        private OperationType(String name) { this.name = name; }
+    }
+
+    static {
+        try {
+            Field f = jdk.internal.misc.Unsafe.class.getDeclaredField("theUnsafe");
+            f.setAccessible(true);
+            UNSAFE = (jdk.internal.misc.Unsafe) f.get(null);
+            offset = UNSAFE.objectFieldOffset(Node.class.getDeclaredField("next"));
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to get Unsafe instance.", e);
+        }
+    }
+
+    public Runner(Node start, int testtime, long seed, OperationType type) {
+        current = start;
+        time = testtime*1000000000L;
+        r = new Random(seed);
+        this.type = type;
+    }
+
+    @Override
+    public void run() {
+        long starttime = System.nanoTime();
+        while((System.nanoTime() - starttime) < time) {
+            iterations++;
+            // Run a bit
+            int run_length = r.nextInt() & 0xfff;
+            for (int i = 0; i < run_length; i++) {
+                current = current.next();
+                milage++;
+            }
+            // find a start node
+            Node startNode = current;
+            Node expectedNext = startNode.next;
+
+            // Run a bit more
+            int skip_length = (r.nextInt() & 0xff) + 1;
+            for (int i = 0; i < skip_length; i++) {
+                current = current.next();
+                skipped++;
+            }
+
+            // create a branch
+            int branch_length = (r.nextInt() & 0xff) + 1;
+            created += branch_length;
+            Node head = makeBranch(current, branch_length);
+
+            // complete circle, but continue to run on old path
+            boolean test_fail = ((iterations & 0x1) == 0);
+            Node current = merge(startNode, expectedNext, head, test_fail);
+        }
+        System.out.println("Milage: " + milage + " Skipped: " + skipped + " Created: " + created + " iterations: " + iterations);
+    }
+
+    /*
+     *  The reason for the duplicated code that is wrapping the unsafe operations is that we want
+     *  to test the operations individually. They must not interfere with each other - checking a field
+     *  will heal that reference and no operation after can trigger the barrier.
+     *
+     *  All mergeImpl*-method are prevented from being inlined.
+     */
+
+    private Node merge(Node startNode, Node expectedNext, Node head, boolean test_fail) {
+        switch (type) {
+            case Load:
+                return mergeImplLoad(startNode, expectedNext, head);
+            case Swap:
+                return mergeImplSwap(startNode, expectedNext, head);
+            case CAS:
+                if (test_fail) {
+                    return mergeImplCASFail(startNode, expectedNext, head);
+                } else {
+                    return mergeImplCAS(startNode, expectedNext, head);
+                }
+            case Weak_CAS:
+                if (test_fail) {
+                    return mergeImplWeakCASFail(startNode, expectedNext, head);
+                } else {
+                    return mergeImplWeakCAS(startNode, expectedNext, head);
+                }
+            case CMPX:
+                if (test_fail) {
+                    return mergeImplCMPXFail(startNode, expectedNext, head);
+                } else {
+                    return mergeImplCMPX(startNode, expectedNext, head);
+                }
+            default:
+            throw new Error("Unimplemented");
+        }
+    }
+
+    private Node mergeImplLoad(Node startNode, Node expectedNext, Node head) {
+        // Atomic load version
+        Node temp = (Node) UNSAFE.getObject(startNode, offset);
+        startNode.setNext(head);
+        return temp;
+    }
+
+    private Node mergeImplSwap(Node startNode, Node expectedNext, Node head) {
+        // Swap version
+        return (Node) UNSAFE.getAndSetObject(startNode, offset, head);
+    }
+
+    private Node mergeImplCAS(Node startNode, Node expectedNext, Node head) {
+        // CAS - should always be true within a single thread - no other thread can have overwritten
+        if (!UNSAFE.compareAndSetObject(startNode, offset, expectedNext, head)) {
+            throw new Error("CAS should always succeed on thread local objects, check you barrier implementation");
+        }
+        return expectedNext; // continue on old circle
+    }
+
+    private Node mergeImplCASFail(Node startNode, Node expectedNext, Node head) {
+        // Force a fail
+        if (UNSAFE.compareAndSetObject(startNode, offset, "fail", head)) {
+            throw new Error("This CAS should always fail, check you barrier implementation");
+        }
+        if (startNode.next() != expectedNext) {
+            throw new Error("Shouldn't have changed");
+        }
+        return current;
+    }
+
+    private Node mergeImplWeakCAS(Node startNode, Node expectedNext, Node head) {
+        // Weak CAS - should always be true within a single thread - no other thread can have overwritten
+        if (!UNSAFE.weakCompareAndSetObject(startNode, offset, expectedNext, head)) {
+            throw new Error("Weak CAS should always succeed on thread local objects, check you barrier implementation");
+        }
+        return expectedNext; // continue on old circle
+    }
+
+    private Node mergeImplWeakCASFail(Node startNode, Node expectedNext, Node head) {
+        // Force a fail
+        if (UNSAFE.weakCompareAndSetObject(startNode, offset, "fail", head)) {
+            throw new Error("This weak CAS should always fail, check you barrier implementation");
+        }
+        if (startNode.next() != expectedNext) {
+            throw new Error("Shouldn't have changed");
+        }
+        return current;
+    }
+
+    private Node mergeImplCMPX(Node startNode, Node expectedNext, Node head) {
+        // CmpX - should always be true within a single thread - no other thread can have overwritten
+        Object res = UNSAFE.compareAndExchangeObject(startNode, offset, expectedNext, head);
+        if (!res.equals(expectedNext)) {
+            throw new Error("Fail CmpX should always succeed on thread local objects, check you barrier implementation");
+        }
+        return expectedNext; // continue on old circle
+    }
+
+    private Node mergeImplCMPXFail(Node startNode, Node expectedNext, Node head) {
+        Object res = UNSAFE.compareAndExchangeObject(startNode, offset, head, head);
+        if (startNode.next() != expectedNext) {
+            throw new Error("Shouldn't have changed");
+        }
+        if (head == expectedNext) {
+            throw new Error("Test malfunction");
+        }
+        if (!res.equals(expectedNext)) {
+            throw new Error("This CmpX should have returned 'expectedNext' when it failed");
+        }
+        if (res.equals(head)) {
+            throw new Error("This CmpX shouldn't have returned head when it failed. count: "+ iterations);
+        }
+
+        return current;
+    }
+
+    // Create a new branch that will replace a part of the circle
+    public Node makeBranch(Node end_node, int count) {
+        Node head = end_node;
+        for (int i = 0; i < count; i++) {
+            head = new Node(head);
+        }
+        return head;
+    }
+}
+
+class Node {
+    Node next;
+    int number = 0;
+
+    public int number() {
+        return number;
+    }
+
+    public void setNumber(int v) {
+        number = v;
+    }
+
+    public Node() {
+    }
+
+    public Node(Node link) {
+        next = link;
+    }
+
+    public void setNext(Node next) {
+        this.next = next;
+    }
+    public Node next() {
+        return next;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/intrinsics/Test8005419.java b/test/hotspot/jtreg/compiler/intrinsics/Test8005419.java
index 4fc5dc9ef4d..47dc48b3423 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/Test8005419.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/Test8005419.java
@@ -26,7 +26,7 @@
  * @bug 8005419
  * @summary Improve intrinsics code performance on x86 by using AVX2
  *
- * @run main/othervm -Xbatch -Xmx64m compiler.intrinsics.Test8005419
+ * @run main/othervm -Xbatch -Xmx128m compiler.intrinsics.Test8005419
  */
 
 package compiler.intrinsics;
diff --git a/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java b/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java
index cc672bc124d..2cadb85d7b4 100644
--- a/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java
+++ b/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8057967
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.org.objectweb.asm
  * @library patches /
@@ -220,4 +221,3 @@ public class CallSiteDepContextTest {
         System.out.println("TEST PASSED");
     }
 }
-
diff --git a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java
index 8ae54321848..a6be752c582 100644
--- a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java
+++ b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8072008
+ * @requires vm.opt.final.ClassUnloading
  * @library /test/lib ../patches
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.vm.annotation
diff --git a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/InvokeTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/InvokeTest.java
index c9569d09f54..e1f3a3a9828 100644
--- a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/InvokeTest.java
+++ b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/InvokeTest.java
@@ -52,10 +52,12 @@ import static jdk.test.lib.Asserts.assertEquals;
 public class InvokeTest {
     static MethodHandles.Lookup LOOKUP = MethodHandleHelper.IMPL_LOOKUP;
 
-    static final MethodHandle virtualMH;  // invokevirtual   T.f1
-    static final MethodHandle staticMH;   // invokestatic    T.f2
-    static final MethodHandle intfMH;     // invokeinterface I.f1
-    static final MethodHandle specialMH;  // invokespecial   T.f4 T
+    static final MethodHandle virtualMH; // invokevirtual   T.f1
+    static final MethodHandle staticMH;  // invokestatic    T.f2
+    static final MethodHandle intfMH;    // invokeinterface I.f3
+    static final MethodHandle defaultMH; // invokevirtual   T.f3
+    static final MethodHandle specialMH; // invokespecial   T.f4 T
+    static final MethodHandle privateMH; // invokespecial   I.f4 T
     static final MethodHandle basicMH;
 
     static final WhiteBox WB = WhiteBox.getWhiteBox();
@@ -69,7 +71,9 @@ public class InvokeTest {
             virtualMH  = LOOKUP.findVirtual(T.class, "f1", mtype);
             staticMH   = LOOKUP.findStatic (T.class, "f2", mtype);
             intfMH     = LOOKUP.findVirtual(I.class, "f3", mtype);
+            defaultMH  = LOOKUP.findVirtual(T.class, "f3", mtype);
             specialMH  = LOOKUP.findSpecial(T.class, "f4", mtype, T.class);
+            privateMH  = LOOKUP.findSpecial(I.class, "f4", mtype, I.class);
             basicMH    = NonInlinedReinvoker.make(staticMH);
         } catch (Exception e) {
             throw new Error(e);
@@ -92,24 +96,51 @@ public class InvokeTest {
         @DontInline public Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return P2.class; }
     }
 
-    static interface I {
+    interface I {
         @DontInline default Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return I.class; }
+        @DontInline private Class<?> f4() { if (doDeopt) WB.deoptimizeAll(); return I.class; }
     }
 
+    interface J1 extends I {
+        @DontInline default Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return J1.class; }
+    }
+
+    interface J2 extends I {
+        @DontInline default Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return J2.class; }
+    }
+
+    interface J3 extends I {
+        @DontInline default Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return J3.class; }
+    }
+
+    static class Q1 extends T implements J1 {}
+    static class Q2 extends T implements J2 {}
+    static class Q3 extends T implements J3 {}
+
     @DontInline
-    static void linkToVirtual(Object obj, Class<?> extecpted) {
+    static void linkToVirtual(T recv, Class<?> expected) {
         try {
-            Class<?> cls = (Class<?>)virtualMH.invokeExact((T)obj);
-            assertEquals(cls, obj.getClass());
+            Class<?> cls = (Class<?>)virtualMH.invokeExact(recv);
+            assertEquals(cls, expected);
         } catch (Throwable e) {
             throw new Error(e);
         }
     }
 
     @DontInline
-    static void linkToInterface(Object obj, Class<?> expected) {
+    static void linkToVirtualDefault(T recv, Class<?> expected) {
         try {
-            Class<?> cls = (Class<?>)intfMH.invokeExact((I)obj);
+            Class<?> cls = (Class<?>)defaultMH.invokeExact(recv);
+            assertEquals(cls, expected);
+        } catch (Throwable e) {
+            throw new Error(e);
+        }
+    }
+
+    @DontInline
+    static void linkToInterface(I recv, Class<?> expected) {
+        try {
+            Class<?> cls = (Class<?>)intfMH.invokeExact(recv);
             assertEquals(cls, expected);
         } catch (Throwable e) {
             throw new Error(e);
@@ -127,15 +158,26 @@ public class InvokeTest {
     }
 
     @DontInline
-    static void linkToSpecial(Object obj, Class<?> expected) {
+    static void linkToSpecial(T recv, Class<?> expected) {
         try {
-            Class<?> cls = (Class<?>)specialMH.invokeExact((T)obj);
+            Class<?> cls = (Class<?>)specialMH.invokeExact(recv);
             assertEquals(cls, expected);
         } catch (Throwable e) {
             throw new Error(e);
         }
     }
 
+    @DontInline
+    static void linkToSpecialIntf(I recv, Class<?> expected) {
+        try {
+            Class<?> cls = (Class<?>)privateMH.invokeExact(recv);
+            assertEquals(cls, expected);
+        } catch (Throwable e) {
+            throw new Error(e);
+        }
+    }
+
+
     @DontInline
     static void invokeBasic() {
         try {
@@ -171,13 +213,33 @@ public class InvokeTest {
 
         // Monomorphic case (optimized virtual call)
         run(() -> linkToVirtual(new T(), T.class));
+        run(() -> linkToVirtualDefault(new T(), I.class));
 
-        // Megamorphic case (virtual call)
-        Object[] recv = new Object[] { new T(), new P1(), new P2() };
+        // Megamorphic case (optimized virtual call)
         run(() -> {
-            for (Object r : recv) {
-                linkToVirtual(r, r.getClass());
-            }});
+            linkToVirtual(new T() {}, T.class);
+            linkToVirtual(new T() {}, T.class);
+            linkToVirtual(new T() {}, T.class);
+        });
+
+        run(() -> {
+            linkToVirtualDefault(new T(){}, I.class);
+            linkToVirtualDefault(new T(){}, I.class);
+            linkToVirtualDefault(new T(){}, I.class);
+        });
+
+        // Megamorphic case (virtual call), multiple implementations
+        run(() -> {
+            linkToVirtual(new T(),  T.class);
+            linkToVirtual(new P1(), P1.class);
+            linkToVirtual(new P2(), P2.class);
+        });
+
+        run(() -> {
+            linkToVirtualDefault(new Q1(), J1.class);
+            linkToVirtualDefault(new Q2(), J2.class);
+            linkToVirtualDefault(new Q3(), J3.class);
+        });
     }
 
     static void testInterface() {
@@ -190,17 +252,18 @@ public class InvokeTest {
         run(() -> linkToInterface(new T(), I.class));
 
         // Megamorphic case (virtual call)
-        Object[][] recv = new Object[][] {{new T(), I.class}, {new P1(), P1.class}, {new P2(), P2.class}};
         run(() -> {
-            for (Object[] r : recv) {
-                linkToInterface(r[0], (Class<?>)r[1]);
-            }});
+            linkToInterface(new T(),  I.class);
+            linkToInterface(new P1(), P1.class);
+            linkToInterface(new P2(), P2.class);
+        });
     }
 
     static void testSpecial() {
         System.out.println("linkToSpecial");
         // Monomorphic case (optimized virtual call)
         run(() -> linkToSpecial(new T(), T.class));
+        run(() -> linkToSpecialIntf(new T(), I.class));
     }
 
     static void testStatic() {
diff --git a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
index 2779db7b213..0751d05cbbf 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,6 +23,7 @@
 
 /*
  * @test TestBasicLogOutput
+ * @bug 8203370
  * @summary Ensure -XX:-JVMCIPrintProperties can be enabled and successfully prints expected output to stdout.
  * @requires vm.jvmci
  * @library /test/lib
@@ -34,9 +35,14 @@ import jdk.test.lib.process.OutputAnalyzer;
 public class TestJVMCIPrintProperties {
 
     public static void main(String[] args) throws Exception {
+        test("-XX:+EnableJVMCI");
+        test("-XX:+UseJVMCICompiler");
+    }
+
+    static void test(String enableFlag) throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
-            "-XX:+EnableJVMCI", "-Djvmci.Compiler=null",
+            enableFlag, "-Djvmci.Compiler=null",
             "-XX:+JVMCIPrintProperties");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("[JVMCI properties]"); // expected message
diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
index dc33a461282..4aa21cfa2ff 100644
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -89,13 +89,17 @@ public class DisassembleCodeBlobTest {
             throw new Error(testCase + " : method is not compiled");
         }
         InstalledCode installedCode = testCase.toInstalledCode();
-        String str = CompilerToVMHelper.disassembleCodeBlob(installedCode);
-        if (str != null) {
-            Asserts.assertGT(str.length(), 0,
+        String str1 = CompilerToVMHelper.disassembleCodeBlob(installedCode);
+        if (str1 != null) {
+            Asserts.assertGT(str1.length(), 0,
                    testCase +  " : returned string has to be non-zero length");
         }
+        // The very first call to the disassembler contains a string specifying the
+        // architecture: [Disassembling for mach='i386:x86-64']
+        // Therefore compare strings 2 and 3.
         String str2 = CompilerToVMHelper.disassembleCodeBlob(installedCode);
-        Asserts.assertEQ(str, str2,
-                testCase + " : 2nd invocation returned different value");
+        String str3 = CompilerToVMHelper.disassembleCodeBlob(installedCode);
+        Asserts.assertEQ(str2, str3,
+                testCase + " : 3nd invocation returned different value from 2nd");
     }
 }
diff --git a/test/hotspot/jtreg/compiler/loopstripmining/UnexpectedNodeInOuterLoopWhenCloning.java b/test/hotspot/jtreg/compiler/loopstripmining/UnexpectedNodeInOuterLoopWhenCloning.java
new file mode 100644
index 00000000000..231cf353589
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopstripmining/UnexpectedNodeInOuterLoopWhenCloning.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2018, Red Hat, 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.
+ *
+ * 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 8202747
+ * @summary C2: assert(mode == ControlAroundStripMined && use == sfpt) failed: missed a node
+ *
+ * @run main/othervm -Xcomp -Xbatch -XX:CompileOnly=UnexpectedNodeInOuterLoopWhenCloning -XX:-TieredCompilation UnexpectedNodeInOuterLoopWhenCloning
+ *
+ */
+
+public class UnexpectedNodeInOuterLoopWhenCloning {
+
+    public static final int N = 400;
+
+    public static double dFld=0.37026;
+    public static int iArrFld[]=new int[N];
+
+    public static void vMeth() {
+
+        int i5=6, i6=-42538, i7=-209, i8=163, i10=-4, i11=191;
+        boolean b=true;
+        double dArr[]=new double[N];
+
+        for (i5 = 3; i5 < 245; i5++) {
+            i7 = 7;
+            while (--i7 > 0) {
+                iArrFld[i7] = -11995;
+                if (b) continue;
+            }
+            for (i8 = 1; i8 < 7; ++i8) {
+                for (i10 = 1; i10 < 2; i10++) {
+                    dFld -= i6;
+                    i11 += i7;
+                }
+            }
+        }
+    }
+
+    public static void main(String[] strArr) {
+        UnexpectedNodeInOuterLoopWhenCloning _instance = new UnexpectedNodeInOuterLoopWhenCloning();
+        _instance.vMeth();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java b/test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java
index 76eac8a81c6..1875af8e0d1 100644
--- a/test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java
+++ b/test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java
@@ -36,6 +36,8 @@ public abstract class RTMGenericCommandLineOptionTest {
 
     protected static final String RTM_INSTR_ERROR
             = "RTM instructions are not available on this CPU";
+    protected static final String RTM_OS_ERROR
+            = "RTM is not supported on this OS version";
     protected static final String RTM_UNSUPPORTED_VM_ERROR
             = "RTM locking optimization is not supported in this VM";
     protected static final String RTM_FOR_STACK_LOCKS_WARNING
diff --git a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
index bfa8d354e28..f45c8cda89e 100644
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
@@ -48,28 +48,49 @@ public class TestUseRTMLockingOptionOnUnsupportedCPU {
     private static final String DEFAULT_VALUE = "false";
 
     public void runTestCases() throws Throwable {
-        String unrecongnizedOption
+        String unrecognizedOption
                 = CommandLineOptionTest.getUnrecognizedOptionErrorMessage(
                 "UseRTMLocking");
         String errorMessage = RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR;
 
         if (Platform.isX86() || Platform.isX64() || Platform.isPPC()) {
-            String shouldFailMessage = "JVM startup should fail with option "
-                    + "-XX:+UseRTMLocking on unsupported CPU";
-            // verify that we get an error when use +UseRTMLocking
-            // on unsupported CPU
-            CommandLineOptionTest.verifySameJVMStartup(
-                    new String[] { errorMessage },
-                    new String[] { unrecongnizedOption }, shouldFailMessage,
-                    shouldFailMessage + ". Error message should be shown",
-                    ExitCode.FAIL, "-XX:+UseRTMLocking");
+            String shouldFailMessage = "JVM startup should fail with option " +
+                                       "-XX:+UseRTMLocking on unsupported CPU";
+
+            try {
+                // verify that we get an error when use +UseRTMLocking
+                // on unsupported CPU
+                CommandLineOptionTest.verifySameJVMStartup(
+                        new String[] { errorMessage },
+                        new String[] { unrecognizedOption }, shouldFailMessage,
+                        shouldFailMessage + ". Error message should be shown.",
+                        ExitCode.FAIL, "-XX:+UseRTMLocking");
+            } catch (Throwable e) {
+                // verify that we get an error when use +UseRTMLocking
+                // on unsupported OS. It might be the case that although CPU
+                // supports RTM the OS version does not support RTM
+                if (Platform.isPPC()) {
+                    String errorMessage2 = RTMGenericCommandLineOptionTest.RTM_OS_ERROR;
+                    String shouldFailMessage2 = "JVM startup should fail with option " +
+                                                "-XX:+UseRTMLocking on unsupported CPU or " +
+                                                "OS version";
+
+                    CommandLineOptionTest.verifySameJVMStartup(
+                            new String[] { errorMessage2 },
+                            new String[] { unrecognizedOption}, shouldFailMessage2,
+                            shouldFailMessage2 + ". Error message should be shown.",
+                            ExitCode.FAIL, "-XX:+UseRTMLocking");
+                } else {
+                    throw e; // checking unsupported OS error is not necessary
+                }
+            }
 
             String shouldPassMessage = "JVM startup should pass with option "
                     + "-XX:-UseRTMLocking even on unsupported CPU";
             // verify that we can pass -UseRTMLocking without
             // getting any error messages
             CommandLineOptionTest.verifySameJVMStartup(null, new String[] {
-                    errorMessage, unrecongnizedOption }, shouldPassMessage,
+                    errorMessage, unrecognizedOption }, shouldPassMessage,
                     shouldPassMessage + " without any warnings", ExitCode.OK,
                     "-XX:-UseRTMLocking");
 
@@ -84,12 +105,12 @@ public class TestUseRTMLockingOptionOnUnsupportedCPU {
                     + "Error message should be shown";
             // verify that on non-x86 CPUs RTMLocking could not be used
             CommandLineOptionTest.verifySameJVMStartup(
-                    new String[] { unrecongnizedOption },
+                    new String[] { unrecognizedOption },
                     null, shouldFailMessage, shouldFailMessage,
                     ExitCode.FAIL, "-XX:+UseRTMLocking");
 
             CommandLineOptionTest.verifySameJVMStartup(
-                    new String[] { unrecongnizedOption },
+                    new String[] { unrecognizedOption },
                     null, shouldFailMessage, shouldFailMessage,
                     ExitCode.FAIL, "-XX:-UseRTMLocking");
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java
index 18cdcd6dca0..672e0f9ab70 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java
@@ -136,7 +136,7 @@ public class TestRTMAbortRatio {
         public void lock(boolean abort) {
             synchronized(monitor) {
                 if (abort) {
-                    Test.UNSAFE.addressSize();
+                    Test.UNSAFE.pageSize();
                 }
             }
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
index 3abc7fdb2a6..f8a0c7b994c 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
@@ -167,7 +167,7 @@ public class TestRTMAfterNonRTMDeopt {
                 synchronized(monitor) {
                     a[0]++;
                     if (abort) {
-                        Test.field = Test.UNSAFE.addressSize();
+                        Test.field = Test.UNSAFE.pageSize();
                     }
                 }
             } catch (Throwable t) {
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
index 6955f125b03..944e7a98890 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
@@ -140,7 +140,7 @@ public class TestRTMDeoptOnLowAbortRatio {
         public void forceAbort(boolean abort) {
             synchronized(monitor) {
                 if (abort) {
-                    Test.UNSAFE.addressSize();
+                    Test.UNSAFE.pageSize();
                 }
             }
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java
index 959805a52d8..626c840545e 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java
@@ -151,7 +151,7 @@ public class TestRTMLockingThreshold {
         public void lock(boolean abort) {
             synchronized(monitor) {
                 if (abort) {
-                    Test.field += Test.UNSAFE.addressSize();
+                    Test.field += Test.UNSAFE.pageSize();
                 }
             }
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java
index c5b9ef2f378..97593772b92 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java
@@ -60,7 +60,7 @@ public class TestRTMSpinLoopCount {
     private static final boolean INFLATE_MONITOR = true;
     private static final long MAX_ABORTS = RTM_RETRY_COUNT + 1L;
     private static final int[] SPIN_LOOP_COUNTS
-            = new int[] { 0, 100, 1_000, 1_000_000, 10_000_000 };
+            = new int[] { 0, 100, 1_000, 10_000, 100_000 };
 
     protected void runTestCases() throws Throwable {
         long[] aborts = new long[TestRTMSpinLoopCount.SPIN_LOOP_COUNTS.length];
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
index 703d46caed1..f25517a759c 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
@@ -129,7 +129,7 @@ public class TestRTMTotalCountIncrRate {
                     // If an actual JNI call will be replaced by
                     // intrinsic - we'll be in trouble, since xabort
                     // will be no longer called and test may fail.
-                    UNSAFE.addressSize();
+                    UNSAFE.pageSize();
                 }
                 Test.field++;
             }
diff --git a/test/hotspot/jtreg/compiler/runtime/Test7196199.java b/test/hotspot/jtreg/compiler/runtime/Test7196199.java
index d0611bcd433..fb23c91f3a2 100644
--- a/test/hotspot/jtreg/compiler/runtime/Test7196199.java
+++ b/test/hotspot/jtreg/compiler/runtime/Test7196199.java
@@ -26,7 +26,7 @@
  * @bug 7196199
  * @summary java/text/Bidi/Bug6665028.java failed: Bidi run count incorrect
  *
- * @run main/othervm/timeout=400 -Xmx32m -Xbatch -XX:+IgnoreUnrecognizedVMOptions
+ * @run main/othervm/timeout=400 -Xmx128m -Xbatch -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation
  *      -XX:+SafepointALot -XX:GuaranteedSafepointInterval=100
  *      -XX:CompileCommand=exclude,compiler.runtime.Test7196199::test
@@ -194,4 +194,3 @@ public class Test7196199 {
         return 0;
     }
 }
-
diff --git a/test/hotspot/jtreg/compiler/runtime/Test8010927.java b/test/hotspot/jtreg/compiler/runtime/Test8010927.java
index 32b62035176..0888738cb8f 100644
--- a/test/hotspot/jtreg/compiler/runtime/Test8010927.java
+++ b/test/hotspot/jtreg/compiler/runtime/Test8010927.java
@@ -31,7 +31,7 @@
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
- *                   -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xmx64m -XX:NewSize=20971520
+ *                   -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xmx128m -XX:NewSize=20971520
  *                   -XX:MaxNewSize=32m -XX:-UseTLAB -XX:-UseAdaptiveSizePolicy
  *                   compiler.runtime.Test8010927
  */
diff --git a/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java
index 961ff33eeca..06bd7884548 100644
--- a/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java
+++ b/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java
@@ -46,7 +46,7 @@ class XAbortProvoker extends AbortProvoker {
     @Override
     public void forceAbort() {
         synchronized(monitor) {
-            XAbortProvoker.field = UNSAFE.addressSize();
+            XAbortProvoker.field = UNSAFE.pageSize();
         }
     }
 
@@ -54,7 +54,7 @@ class XAbortProvoker extends AbortProvoker {
     public String[] getMethodsToCompileNames() {
         return new String[] {
                 getMethodWithLockName(),
-                Unsafe.class.getName() + "::addressSize"
+                Unsafe.class.getName() + "::pageSize"
         };
     }
 }
diff --git a/test/hotspot/jtreg/gc/TestAgeOutput.java b/test/hotspot/jtreg/gc/TestAgeOutput.java
index b3289c2f7c4..fcd17e0f597 100644
--- a/test/hotspot/jtreg/gc/TestAgeOutput.java
+++ b/test/hotspot/jtreg/gc/TestAgeOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -32,10 +32,22 @@
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -XX:+UseSerialGC TestAgeOutput UseSerialGC
- * @run main/othervm -XX:+UseConcMarkSweepGC TestAgeOutput UseConcMarkSweepGC
  * @run main/othervm -XX:+UseG1GC TestAgeOutput UseG1GC
  */
 
+/*
+ * @test TestAgeOutputCMS
+ * @bug 8164936
+ * @key gc
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -XX:+UseConcMarkSweepGC TestAgeOutput UseConcMarkSweepGC
+ */
+
 import sun.hotspot.WhiteBox;
 
 import java.util.regex.Matcher;
diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java b/test/hotspot/jtreg/gc/TestAllocateHeapAt.java
index aae999ce1ea..763a881ec0c 100644
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAt.java
@@ -24,6 +24,7 @@
 /* @test TestAllocateHeapAt.java
  * @key gc
  * @summary Test to check allocation of Java Heap with AllocateHeapAt option
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  */
diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java b/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
index b7f667c1a17..fcd3dd67513 100644
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
@@ -24,6 +24,7 @@
 /* @test TestAllocateHeapAtError.java
  * @key gc
  * @summary Test to check correct handling of non-existent directory passed to AllocateHeapAt option
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  */
@@ -75,4 +76,3 @@ public class TestAllocateHeapAtError {
     output.shouldNotHaveExitValue(0);
   }
 }
-
diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java b/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
index 492a976c1e9..b165fced35d 100644
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
@@ -26,7 +26,7 @@
  * @summary Test to check allocation of Java Heap with AllocateHeapAt option. Has multiple sub-tests to cover different code paths.
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64"
+ * @requires vm.bits == "64" & vm.gc != "Z"
  */
 
 import jdk.test.lib.JDKToolFinder;
diff --git a/test/hotspot/jtreg/gc/TestBigObj.java b/test/hotspot/jtreg/gc/TestBigObj.java
index 299e46b3068..a592e465a1b 100644
--- a/test/hotspot/jtreg/gc/TestBigObj.java
+++ b/test/hotspot/jtreg/gc/TestBigObj.java
@@ -25,7 +25,7 @@
  * @test TestBigObj
  * @bug 6845368
  * @summary ensure gc updates references > 64K bytes from the start of the obj
- * @run main/othervm/timeout=720 -Xmx64m -verbose:gc TestBigObj
+ * @run main/othervm/timeout=720 -Xmx256m -verbose:gc TestBigObj
  */
 
 // Allocate an object with a block of reference fields that starts more
diff --git a/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java b/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java
index d9b4c94c7fb..49bc8ff4971 100644
--- a/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java
+++ b/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -38,8 +38,21 @@ import gc.testlibrary.PerfCounters;
  * @run main/othervm -XX:+UsePerfData -XX:+UseSerialGC TestGenerationPerfCounter
  * @run main/othervm -XX:+UsePerfData -XX:+UseParallelGC TestGenerationPerfCounter
  * @run main/othervm -XX:+UsePerfData -XX:+UseG1GC TestGenerationPerfCounter
+ */
+
+/* @test TestGenerationPerfCounterCMS
+ * @bug 8080345
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @library /test/lib /
+ * @summary Tests that the sun.gc.policy.generations returns 2 for all GCs.
+ * @modules java.base/jdk.internal.misc
+ *          java.compiler
+ *          java.management/sun.management
+ *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @run main/othervm -XX:+UsePerfData -XX:+UseConcMarkSweepGC TestGenerationPerfCounter
  */
+
 public class TestGenerationPerfCounter {
     public static void main(String[] args) throws Exception {
         long numGenerations =
diff --git a/test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java b/test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java
index 4afc81f64e5..cb502bc0a33 100644
--- a/test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java
+++ b/test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2002, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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,7 +25,7 @@
  * @test TestMemoryInitializationWithCMS
  * @key gc
  * @bug 4668531
- * @requires vm.debug & vm.gc.ConcMarkSweep
+ * @requires vm.debug & vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Simple test for -XX:+CheckMemoryInitialization doesn't crash VM
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+CheckMemoryInitialization TestMemoryInitializationWithCMS
  */
diff --git a/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java b/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java
index e923dd4ec1c..12a737a0b71 100644
--- a/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java
+++ b/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -35,11 +35,20 @@ import java.util.stream.*;
  *          java.management
  * @requires vm.gc == null
  * @run main/othervm -XX:+UseG1GC TestMemoryMXBeansAndPoolsPresence G1
- * @run main/othervm -XX:+UseConcMarkSweepGC TestMemoryMXBeansAndPoolsPresence CMS
  * @run main/othervm -XX:+UseParallelGC TestMemoryMXBeansAndPoolsPresence Parallel
  * @run main/othervm -XX:+UseSerialGC TestMemoryMXBeansAndPoolsPresence Serial
  */
 
+/* @test TestMemoryMXBeansAndPoolsPresenceCMS
+ * @bug 8191564
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @comment Graal does not support CMS
+ * @requires vm.gc == null & !vm.graal.enabled
+ * @run main/othervm -XX:+UseConcMarkSweepGC TestMemoryMXBeansAndPoolsPresence CMS
+ */
+
 class GCBeanDescription {
     public String name;
     public String[] poolNames;
diff --git a/test/hotspot/jtreg/gc/TestNUMAPageSize.java b/test/hotspot/jtreg/gc/TestNUMAPageSize.java
index 938e86bd64a..4e1cd22af1f 100644
--- a/test/hotspot/jtreg/gc/TestNUMAPageSize.java
+++ b/test/hotspot/jtreg/gc/TestNUMAPageSize.java
@@ -27,7 +27,7 @@
  * @summary Make sure that start up with NUMA support does not cause problems.
  * @bug 8061467
  * @requires (vm.opt.AggressiveOpts == null) | (vm.opt.AggressiveOpts == false)
- * @run main/othervm -Xmx8M -XX:+UseNUMA TestNUMAPageSize
+ * @run main/othervm -Xmx128m -XX:+UseNUMA TestNUMAPageSize
  */
 
 public class TestNUMAPageSize {
diff --git a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
index 7379e1a2829..4ad407d2e18 100644
--- a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
+++ b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -31,10 +31,22 @@
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:+UseConcMarkSweepGC TestNumWorkerOutput UseConcMarkSweepGC
  * @run main/othervm -XX:+UseG1GC TestNumWorkerOutput UseG1GC
  */
 
+/*
+ * @test TestNumWorkerOutputCMS
+ * @bug 8165292
+ * @key gc
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -XX:+UseConcMarkSweepGC TestNumWorkerOutput UseConcMarkSweepGC
+ */
+
 import sun.hotspot.WhiteBox;
 
 import java.util.regex.Matcher;
diff --git a/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java b/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java
index 79afdfb6bff..17eac6a3787 100644
--- a/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java
+++ b/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java
@@ -25,6 +25,7 @@
  * @test TestSoftReferencesBehaviorOnOOME
  * @key gc
  * @summary Tests that all SoftReferences has been cleared at time of OOM.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 512 2k
diff --git a/test/hotspot/jtreg/gc/TestSystemGC.java b/test/hotspot/jtreg/gc/TestSystemGC.java
index a3830130ac2..93a81a5dc22 100644
--- a/test/hotspot/jtreg/gc/TestSystemGC.java
+++ b/test/hotspot/jtreg/gc/TestSystemGC.java
@@ -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
@@ -30,14 +30,21 @@
  * @run main/othervm -XX:+UseSerialGC TestSystemGC
  * @run main/othervm -XX:+UseParallelGC TestSystemGC
  * @run main/othervm -XX:+UseParallelGC -XX:-UseParallelOldGC TestSystemGC
- * @run main/othervm -XX:+UseConcMarkSweepGC TestSystemGC
- * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent TestSystemGC
  * @run main/othervm -XX:+UseG1GC TestSystemGC
  * @run main/othervm -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent TestSystemGC
  * @run main/othervm -XX:+UseLargePages TestSystemGC
  * @run main/othervm -XX:+UseLargePages -XX:+UseLargePagesInMetaspace TestSystemGC
  */
 
+/*
+ * @test TestSystemGCCMS
+ * @key gc
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @run main/othervm -XX:+UseConcMarkSweepGC TestSystemGC
+ * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent TestSystemGC
+ */
+
 public class TestSystemGC {
   public static void main(String args[]) throws Exception {
     System.gc();
diff --git a/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java b/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java
index 744b52be360..ca63c70178f 100644
--- a/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java
+++ b/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java
@@ -25,6 +25,7 @@
  * @key gc
  * @bug 8010463 8011343 8011898
  * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  */
diff --git a/test/hotspot/jtreg/gc/TestVerifySilently.java b/test/hotspot/jtreg/gc/TestVerifySilently.java
index 5b811cfdc6d..9a69d1ab050 100644
--- a/test/hotspot/jtreg/gc/TestVerifySilently.java
+++ b/test/hotspot/jtreg/gc/TestVerifySilently.java
@@ -25,6 +25,7 @@
  * @key gc
  * @bug 8032771
  * @summary Test silent verification.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  */
diff --git a/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java b/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java
index 0e9a88e57fd..742619bb8d3 100644
--- a/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java
+++ b/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java
@@ -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
@@ -34,12 +34,20 @@
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:-UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseSerialGC -XX:+UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseSerialGC -XX:-UseLargePages TestAlignmentToUseLargePages
- * @run main/othervm -Xms71M -Xmx91M -XX:+UseConcMarkSweepGC -XX:+UseLargePages TestAlignmentToUseLargePages
- * @run main/othervm -Xms71M -Xmx91M -XX:+UseConcMarkSweepGC -XX:-UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseG1GC -XX:+UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseG1GC -XX:-UseLargePages TestAlignmentToUseLargePages
  */
 
+/**
+ * @test TestAlignmentToUseLargePagesCMS
+ * @key gc regression
+ * @bug 8024396
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @run main/othervm -Xms71M -Xmx91M -XX:+UseConcMarkSweepGC -XX:+UseLargePages TestAlignmentToUseLargePages
+ * @run main/othervm -Xms71M -Xmx91M -XX:+UseConcMarkSweepGC -XX:-UseLargePages TestAlignmentToUseLargePages
+ */
+
 public class TestAlignmentToUseLargePages {
   public static void main(String args[]) throws Exception {
     // nothing to do
diff --git a/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java
index 2e73a24ddc9..a92306419f4 100644
--- a/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java
@@ -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
@@ -25,7 +25,7 @@
  * @test TestCMSHeapSizeFlags
  * @key gc
  * @bug 8006088
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
index 4bbc4695531..6eef55b825f 100644
--- a/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
+++ b/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
@@ -43,6 +43,8 @@ public class TestDisableDefaultGC {
                                                                   "-XX:-UseParallelGC",
                                                                   "-XX:-UseG1GC",
                                                                   "-XX:-UseConcMarkSweepGC",
+                                                                  "-XX:+UnlockExperimentalVMOptions",
+                                                                  "-XX:-UseZGC",
                                                                   "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldMatch("Garbage collector not selected");
diff --git a/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
index e97a0edd66f..ffab16ca723 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
@@ -25,6 +25,7 @@
  * @test TestMaxMinHeapFreeRatioFlags
  * @key gc
  * @summary Verify that heap size changes according to max and min heap free ratios.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java b/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java
index c78867f30a7..91eaa677917 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java
@@ -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
@@ -27,16 +27,28 @@
  * @bug 7057939
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.
+ * @requires vm.gc=="null"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestMaxNewSize -XX:+UseSerialGC
  * @run main TestMaxNewSize -XX:+UseParallelGC
- * @run main TestMaxNewSize -XX:+UseConcMarkSweepGC
  * @run main TestMaxNewSize -XX:+UseG1GC
  * @author thomas.schatzl@oracle.com, jesper.wilhelmsson@oracle.com
  */
 
+/*
+ * @test TestMaxNewSizeCMS
+ * @key gc
+ * @bug 7057939
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run main TestMaxNewSize -XX:+UseConcMarkSweepGC
+ */
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
index 3304ee43c3a..aa128408346 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
@@ -26,6 +26,7 @@
  * @key gc
  * @bug 8025166
  * @summary Verify that heap devided among generations according to NewRatio
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
index 8027dc1456f..1c7af6a2aae 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
@@ -26,6 +26,7 @@
  * @key gc
  * @bug 8025166
  * @summary Verify that young gen size conforms values specified by NewSize, MaxNewSize and Xmn options
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java b/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java
index 001a1621b31..494fab9f4e4 100644
--- a/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java
+++ b/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java
@@ -25,6 +25,7 @@
  * @test TestShrinkHeapInSteps
  * @key gc
  * @summary Verify that -XX:-ShrinkHeapInSteps works properly.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
index 82bcde6e3b4..e98f8fe740e 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
@@ -25,6 +25,7 @@
  * @test TestSurvivorRatioFlag
  * @key gc
  * @summary Verify that actual survivor ratio is equal to specified SurvivorRatio value
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
index a0f790cf589..6b4a989e0ce 100644
--- a/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
@@ -27,6 +27,7 @@
  * @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC.
  * @requires (vm.opt.ExplicitGCInvokesConcurrent == null) | (vm.opt.ExplicitGCInvokesConcurrent == false)
  * @requires (vm.opt.UseJVMCICompiler == null) | (vm.opt.UseJVMCICompiler == false)
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java
index 401345d04bc..2c4fd806b1a 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java
@@ -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
@@ -26,6 +26,7 @@
  * @key gc
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
+ * @requires vm.gc=="null"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
@@ -35,10 +36,24 @@
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC -XX:-UseParallelOldGC
- * @run main/othervm TestUseCompressedOopsErgo -XX:+UseConcMarkSweepGC
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseSerialGC
  */
 
+/*
+ * @test TestUseCompressedOopsErgoCMS
+ * @key gc
+ * @bug 8010722
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management/sun.management
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm TestUseCompressedOopsErgo -XX:+UseConcMarkSweepGC
+ */
+
 public class TestUseCompressedOopsErgo {
 
   public static void main(String args[]) throws Exception {
diff --git a/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java b/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
index 1258fae516d..21c32afbb0a 100644
--- a/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
@@ -28,6 +28,7 @@
  * @summary Runs an simple application (GarbageProducer) with various
          combinations of -XX:{+|-}Verify{After|Before}GC flags and checks that
          output contain or doesn't contain expected patterns
+ * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @library /test/lib
diff --git a/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java b/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
index bda9796a0dd..3e799e2d58f 100644
--- a/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
+++ b/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @key gc
  * @bug 8049831
+ * @requires !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java b/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java
index bb2c8db999f..4c1c0a302bd 100644
--- a/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java
+++ b/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -44,6 +44,22 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-ClassUnloading -XX:+UseParallelGC TestClassUnloadingDisabled
  *
+ */
+
+/*
+ * @test
+ * @key gc
+ * @bug 8114823
+ * @comment Graal does not support CMS
+ * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.opt.ExplicitGCInvokesConcurrent != true
+ * @requires vm.opt.ClassUnloading != true
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-ClassUnloading -XX:+UseConcMarkSweepGC TestClassUnloadingDisabled
  */
diff --git a/test/hotspot/jtreg/gc/cms/DisableResizePLAB.java b/test/hotspot/jtreg/gc/cms/DisableResizePLAB.java
index a8d9861464e..c987ddacd62 100644
--- a/test/hotspot/jtreg/gc/cms/DisableResizePLAB.java
+++ b/test/hotspot/jtreg/gc/cms/DisableResizePLAB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, 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
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8060467
  * @author filipp.zhinkin@oracle.com, john.coomes@oracle.com
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Run CMS with PLAB resizing disabled and a small OldPLABSize
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:-ResizePLAB -XX:OldPLABSize=1k -Xmx256m -Xlog:gc=debug DisableResizePLAB
  */
diff --git a/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java b/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java
index 29ae8969691..8488207ed00 100644
--- a/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java
+++ b/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java
@@ -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
@@ -26,6 +26,7 @@
  * @key gc regression
  * @summary Remove warning about CMS generation shrinking.
  * @bug 8012111
+ * @requires !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java b/test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java
index 90a9aa5510b..96d0fbfe0ee 100644
--- a/test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java
+++ b/test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2016, 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
@@ -28,7 +28,7 @@ import java.util.ListIterator;
 
 /*
  * @test
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @key cte_test
  * @bug 4950157
  * @summary Stress the behavior of ergonomics when the heap is nearly full and
diff --git a/test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java b/test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java
index f97eeb5a863..97e70ef6088 100644
--- a/test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java
+++ b/test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -25,7 +25,7 @@
  * @test TestCMSScavengeBeforeRemark
  * @key gc
  * @bug 8139868
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Run CMS with CMSScavengeBeforeRemark
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+CMSScavengeBeforeRemark -XX:+ExplicitGCInvokesConcurrent -Xmx256m -Xlog:gc=debug TestCMSScavengeBeforeRemark
  */
diff --git a/test/hotspot/jtreg/gc/cms/TestMBeanCMS.java b/test/hotspot/jtreg/gc/cms/TestMBeanCMS.java
index 633c78a06ba..646eb1f78da 100644
--- a/test/hotspot/jtreg/gc/cms/TestMBeanCMS.java
+++ b/test/hotspot/jtreg/gc/cms/TestMBeanCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -24,7 +24,7 @@
 /*
  * @test TestMBeanCMS.java
  * @bug 6581734
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary CMS Old Gen's collection usage is zero after GC which is incorrect
  * @modules java.management
  * @run main/othervm -Xmx512m -verbose:gc -XX:+UseConcMarkSweepGC TestMBeanCMS
diff --git a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java
index 3c3bab76048..e136c99175c 100644
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -24,7 +24,7 @@
 /*
  * @test TestConcurrentPhaseControlCMS
  * @bug 8169517
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Verify CMS GC doesn't support WhiteBox concurrent phase control.
  * @key gc
  * @modules java.base
diff --git a/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java b/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java
new file mode 100644
index 00000000000..e3628925bc2
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestAlwaysPretouch
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Basic sanity test for Epsilon
+ * @run main/othervm -Xmx1g -XX:+AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestAlwaysPretouch
+ */
+
+public class TestAlwaysPretouch {
+  public static void main(String[] args) throws Exception {
+    // everything should happen before entry point
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java b/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java
new file mode 100644
index 00000000000..693d3e85bd0
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestByteArrays
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon is able to allocate arrays, and does not corrupt their state
+ *
+ * @run main/othervm -Xmx1g                                        -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xint                                  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp                         -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:-TieredCompilation  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ *
+ * @run main/othervm -Xmx1g                                        -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xint                                  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp                         -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:-TieredCompilation  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestByteArrays
+ */
+
+import java.util.Random;
+
+public class TestByteArrays {
+
+  static long SEED = Long.getLong("seed", System.nanoTime());
+  static int COUNT = Integer.getInteger("count", 3000); // ~500 MB allocation
+
+  static byte[][] arr;
+
+  public static void main(String[] args) throws Exception {
+    Random r = new Random(SEED);
+
+    arr = new byte[COUNT * 100][];
+    for (int c = 0; c < COUNT; c++) {
+      arr[c] = new byte[c * 100];
+      for (int v = 0; v < c; v++) {
+        arr[c][v] = (byte)(r.nextInt(255) & 0xFF);
+      }
+    }
+
+    r = new Random(SEED);
+    for (int c = 0; c < COUNT; c++) {
+      byte[] b = arr[c];
+      if (b.length != (c * 100)) {
+        throw new IllegalStateException("Failure: length = " + b.length + ", need = " + (c*100));
+      }
+      for (int v = 0; v < c; v++) {
+        byte actual = b[v];
+        byte expected = (byte)(r.nextInt(255) & 0xFF);
+        if (actual != expected) {
+          throw new IllegalStateException("Failure: expected = " + expected + ", actual = " + actual);
+        }
+      }
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java
new file mode 100644
index 00000000000..f415abf7738
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestDieDefault
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon GC should die on heap exhaustion
+ * @library /test/lib
+ * @run main TestDieDefault
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class TestDieDefault {
+
+  public static void passWith(String... args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+    OutputAnalyzer out = new OutputAnalyzer(pb.start());
+    out.shouldNotContain("OutOfMemoryError");
+    out.shouldHaveExitValue(0);
+  }
+
+  public static void failWith(String... args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+    OutputAnalyzer out = new OutputAnalyzer(pb.start());
+    out.shouldContain("OutOfMemoryError");
+    if (out.getExitValue() == 0) {
+      throw new IllegalStateException("Should have failed with non-zero exit code");
+    }
+  }
+
+  public static void main(String[] args) throws Exception {
+    passWith("-Xmx128m",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-Dcount=1",
+             TestDieDefault.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             TestDieDefault.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xint",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             TestDieDefault.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             TestDieDefault.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:TieredStopAtLevel=1",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             TestDieDefault.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:-TieredCompilation",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             TestDieDefault.Workload.class.getName());
+  }
+
+  public static class Workload {
+    static int COUNT = Integer.getInteger("count", 1_000_000_000); // ~24 GB allocation
+
+    static volatile Object sink;
+
+    public static void main(String... args) {
+      for (int c = 0; c < COUNT; c++) {
+        sink = new Object();
+      }
+    }
+  }
+
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java
new file mode 100644
index 00000000000..2d105ab34fc
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestDieWithHeapDump
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon GC should die on heap exhaustion with error handler attached
+ * @library /test/lib
+ * @run main TestDieWithHeapDump
+ */
+
+import java.io.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class TestDieWithHeapDump {
+
+  public static void passWith(String... args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+    OutputAnalyzer out = new OutputAnalyzer(pb.start());
+    out.shouldNotContain("OutOfMemoryError");
+    out.shouldHaveExitValue(0);
+  }
+
+  public static void failWith(String... args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+    Process p = pb.start();
+    OutputAnalyzer out = new OutputAnalyzer(p);
+    out.shouldContain("OutOfMemoryError");
+    if (out.getExitValue() == 0) {
+      throw new IllegalStateException("Should have failed with non-zero exit code");
+    }
+    String heapDump = "java_pid" + p.pid() + ".hprof";
+    if (!new File(heapDump).exists()) {
+      throw new IllegalStateException("Should have produced the heap dump at: " + heapDump);
+    }
+  }
+
+  public static void main(String[] args) throws Exception {
+    passWith("-Xmx128m",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-Dcount=1",
+             "-XX:+HeapDumpOnOutOfMemoryError",
+             TestDieWithHeapDump.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:+HeapDumpOnOutOfMemoryError",
+             TestDieWithHeapDump.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xint",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:+HeapDumpOnOutOfMemoryError",
+             TestDieWithHeapDump.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:+HeapDumpOnOutOfMemoryError",
+             TestDieWithHeapDump.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:TieredStopAtLevel=1",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:+HeapDumpOnOutOfMemoryError",
+             TestDieWithHeapDump.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:-TieredCompilation",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:+HeapDumpOnOutOfMemoryError",
+             TestDieWithHeapDump.Workload.class.getName());
+  }
+
+  public static class Workload {
+    static int COUNT = Integer.getInteger("count", 1_000_000_000); // ~24 GB allocation
+
+    static volatile Object sink;
+
+    public static void main(String... args) {
+      for (int c = 0; c < COUNT; c++) {
+        sink = new Object();
+      }
+    }
+  }
+
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java
new file mode 100644
index 00000000000..a8d61e8d93a
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestDieWithOnError
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon GC should die on heap exhaustion with error handler attached
+ * @library /test/lib
+ * @run main TestDieWithOnError
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class TestDieWithOnError {
+
+  static String ON_ERR_MSG = "Epsilon error handler message";
+
+  public static void passWith(String... args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+    OutputAnalyzer out = new OutputAnalyzer(pb.start());
+    out.shouldNotContain("OutOfMemoryError");
+    out.stdoutShouldNotMatch("^" + ON_ERR_MSG);
+    out.shouldHaveExitValue(0);
+  }
+
+  public static void failWith(String... args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+    OutputAnalyzer out = new OutputAnalyzer(pb.start());
+    out.shouldContain("OutOfMemoryError");
+    if (out.getExitValue() == 0) {
+      throw new IllegalStateException("Should have failed with non-zero exit code");
+    }
+    out.stdoutShouldMatch("^" + ON_ERR_MSG);
+  }
+
+  public static void main(String[] args) throws Exception {
+    passWith("-Xmx128m",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-Dcount=1",
+             "-XX:OnOutOfMemoryError=echo " + ON_ERR_MSG,
+             TestDieWithOnError.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:OnOutOfMemoryError=echo " + ON_ERR_MSG,
+             TestDieWithOnError.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xint",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:OnOutOfMemoryError=echo " + ON_ERR_MSG,
+             TestDieWithOnError.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:OnOutOfMemoryError=echo " + ON_ERR_MSG,
+             TestDieWithOnError.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:TieredStopAtLevel=1",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:OnOutOfMemoryError=echo " + ON_ERR_MSG,
+             TestDieWithOnError.Workload.class.getName());
+
+    failWith("-Xmx128m",
+             "-Xbatch",
+             "-Xcomp",
+             "-XX:-TieredCompilation",
+             "-XX:+UnlockExperimentalVMOptions",
+             "-XX:+UseEpsilonGC",
+             "-XX:OnOutOfMemoryError=echo " + ON_ERR_MSG,
+             TestDieWithOnError.Workload.class.getName());
+  }
+
+  public static class Workload {
+    static int COUNT = Integer.getInteger("count", 1_000_000_000); // ~24 GB allocation
+
+    static volatile Object sink;
+
+    public static void main(String... args) {
+      for (int c = 0; c < COUNT; c++) {
+        sink = new Object();
+      }
+    }
+  }
+
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java b/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java
new file mode 100644
index 00000000000..15a81471ca9
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestElasticTLAB
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon is able to work with/without elastic TLABs
+ *
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:-EpsilonElasticTLAB                               TestElasticTLAB
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:EpsilonTLABElasticity=1   TestElasticTLAB
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:EpsilonTLABElasticity=1.1 TestElasticTLAB
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:EpsilonTLABElasticity=2.0 TestElasticTLAB
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:EpsilonTLABElasticity=42  TestElasticTLAB
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:EpsilonTLABElasticity=100 TestElasticTLAB
+ */
+
+import java.util.Random;
+
+public class TestElasticTLAB {
+
+  static long SEED = Long.getLong("seed", System.nanoTime());
+  static int COUNT = Integer.getInteger("count", 3000); // ~500 MB allocation
+
+  static byte[][] arr;
+
+  public static void main(String[] args) throws Exception {
+    Random r = new Random(SEED);
+
+    arr = new byte[COUNT * 100][];
+    for (int c = 0; c < COUNT; c++) {
+      arr[c] = new byte[c * 100];
+      for (int v = 0; v < c; v++) {
+        arr[c][v] = (byte)(r.nextInt(255) & 0xFF);
+      }
+    }
+
+    r = new Random(SEED);
+    for (int c = 0; c < COUNT; c++) {
+      byte[] b = arr[c];
+      if (b.length != (c * 100)) {
+        throw new IllegalStateException("Failure: length = " + b.length + ", need = " + (c*100));
+      }
+      for (int v = 0; v < c; v++) {
+        byte actual = b[v];
+        byte expected = (byte)(r.nextInt(255) & 0xFF);
+        if (actual != expected) {
+          throw new IllegalStateException("Failure: expected = " + expected + ", actual = " + actual);
+        }
+      }
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java b/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java
new file mode 100644
index 00000000000..9ba1d3d2fe8
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestElasticTLABDecay
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon is able to work with/without elastic TLABs
+ *
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:-EpsilonElasticTLABDecay                               TestElasticTLABDecay
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:+EpsilonElasticTLABDecay -XX:EpsilonTLABDecayTime=1    TestElasticTLABDecay
+ * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -XX:+EpsilonElasticTLAB -XX:+EpsilonElasticTLABDecay -XX:EpsilonTLABDecayTime=100  TestElasticTLABDecay
+ */
+
+import java.util.Random;
+
+public class TestElasticTLABDecay {
+
+  static long SEED = Long.getLong("seed", System.nanoTime());
+  static int COUNT = Integer.getInteger("count", 3000); // ~500 MB allocation
+
+  static byte[][] arr;
+
+  public static void main(String[] args) throws Exception {
+    Random r = new Random(SEED);
+
+    arr = new byte[COUNT * 100][];
+    for (int c = 0; c < COUNT; c++) {
+      arr[c] = new byte[c * 100];
+      for (int v = 0; v < c; v++) {
+        arr[c][v] = (byte)(r.nextInt(255) & 0xFF);
+      }
+      Thread.sleep(5);
+    }
+
+    r = new Random(SEED);
+    for (int c = 0; c < COUNT; c++) {
+      byte[] b = arr[c];
+      if (b.length != (c * 100)) {
+        throw new IllegalStateException("Failure: length = " + b.length + ", need = " + (c*100));
+      }
+      for (int v = 0; v < c; v++) {
+        byte actual = b[v];
+        byte expected = (byte)(r.nextInt(255) & 0xFF);
+        if (actual != expected) {
+          throw new IllegalStateException("Failure: expected = " + expected + ", actual = " + actual);
+        }
+      }
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java b/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java
new file mode 100644
index 00000000000..1541844969e
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestAlwaysPretouch
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Basic sanity test for Epsilon
+ * @library /test/lib
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestEpsilonEnabled
+ */
+
+import jdk.test.lib.Platform;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+
+public class TestEpsilonEnabled {
+  public static void main(String[] args) throws Exception {
+    if (!isEpsilonEnabled()) {
+      throw new IllegalStateException("Debug builds should have Epsilon enabled");
+    }
+  }
+
+  public static boolean isEpsilonEnabled() {
+    for (GarbageCollectorMXBean bean : ManagementFactory.getGarbageCollectorMXBeans()) {
+      if (bean.getName().contains("Epsilon")) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java b/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java
new file mode 100644
index 00000000000..440bc09092d
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestHelloWorld
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Basic sanity test for Epsilon
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestHelloWorld
+ */
+
+public class TestHelloWorld {
+  public static void main(String[] args) throws Exception {
+    System.out.println("Hello World");
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java b/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java
new file mode 100644
index 00000000000..20fbe5dc414
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestLogTrace
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Test that tracing does not crash Epsilon
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc*=trace TestLogTrace
+ */
+
+public class TestLogTrace {
+  public static void main(String[] args) throws Exception {
+    System.out.println("Hello World");
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java b/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java
new file mode 100644
index 00000000000..9052af34c59
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestManyThreads
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Test allocations from many threads
+ *
+ * @run main/othervm -Xmx128m -Xss512k                                        -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xint                                  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xbatch -Xcomp                         -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xbatch -Xcomp -XX:-TieredCompilation  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ *
+ * @run main/othervm -Xmx128m -Xss512k                                        -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xint                                  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xbatch -Xcomp                         -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ * @run main/othervm -Xmx128m -Xss512k -Xbatch -Xcomp -XX:-TieredCompilation  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestManyThreads
+ */
+
+import java.util.concurrent.atomic.*;
+
+public class TestManyThreads {
+
+  static int COUNT = Integer.getInteger("count", 128);  // 128 * 4M max tlabs = 512M, would overflow without TLAB sizing
+
+  static volatile Object sink;
+  static volatile Throwable failed;
+  static final AtomicInteger allocated = new AtomicInteger();
+
+  public static void workload() {
+    try {
+      sink = new Object();
+      allocated.incrementAndGet();
+      Thread.sleep(3600 * 1000);
+    } catch (Throwable e) {
+      failed = e;
+    }
+  }
+
+  public static void main(String[] args) throws Throwable {
+    for (int c = 0; c < COUNT; c++) {
+      Thread t = new Thread(TestManyThreads::workload);
+      t.setDaemon(true);
+      t.start();
+    }
+
+    while ((failed == null) && (allocated.get() != COUNT)) {
+        Thread.sleep(100);
+    }
+
+    if (failed != null) {
+      throw failed;
+    }
+  }
+
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java b/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java
new file mode 100644
index 00000000000..a62b458338f
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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 TestMemoryMXBeans
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Test JMX memory beans
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC          -Xmx1g TestMemoryMXBeans   -1 1024
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xms1g   -Xmx1g TestMemoryMXBeans 1024 1024
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xms128m -Xmx1g TestMemoryMXBeans  128 1024
+ */
+
+import java.lang.management.*;
+import java.util.*;
+
+public class TestMemoryMXBeans {
+
+    static volatile Object sink;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length < 2) {
+            throw new IllegalStateException("Should provide expected heap sizes");
+        }
+
+        long initSize = 1L * Integer.parseInt(args[0]) * 1024 * 1024;
+        long maxSize =  1L * Integer.parseInt(args[1]) * 1024 * 1024;
+
+        testMemoryBean(initSize, maxSize);
+        testAllocs();
+    }
+
+    public static void testMemoryBean(long initSize, long maxSize) {
+        MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
+        long heapInit = memoryMXBean.getHeapMemoryUsage().getInit();
+        long heapMax = memoryMXBean.getHeapMemoryUsage().getMax();
+        long nonHeapInit = memoryMXBean.getNonHeapMemoryUsage().getInit();
+        long nonHeapMax = memoryMXBean.getNonHeapMemoryUsage().getMax();
+
+        if (initSize > 0 && heapInit != initSize) {
+            throw new IllegalStateException("Init heap size is wrong: " + heapInit + " vs " + initSize);
+        }
+        if (maxSize > 0 && heapMax != maxSize) {
+            throw new IllegalStateException("Max heap size is wrong: " + heapMax + " vs " + maxSize);
+        }
+    }
+
+    public static void testAllocs() {
+        MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
+
+        // Do lazy inits first:
+        long heapUsed1 = memoryMXBean.getHeapMemoryUsage().getUsed();
+        sink = new int[1024*1024];
+        long heapUsed2 = memoryMXBean.getHeapMemoryUsage().getUsed();
+
+        // Compute how much we waste during the calls themselves:
+        heapUsed1 = memoryMXBean.getHeapMemoryUsage().getUsed();
+        heapUsed2 = memoryMXBean.getHeapMemoryUsage().getUsed();
+        long adj = heapUsed2 - heapUsed1;
+
+        heapUsed1 = memoryMXBean.getHeapMemoryUsage().getUsed();
+        sink = new int[1024*1024];
+        heapUsed2 = memoryMXBean.getHeapMemoryUsage().getUsed();
+
+        long diff = heapUsed2 - heapUsed1 - adj;
+        long min = 8 + 4*1024*1024;
+        long max = 16 + 4*1024*1024;
+        if (!(min <= diff && diff <= max)) {
+           throw new IllegalStateException("Allocation did not change used space right: " + diff + " should be in [" + min + ", " + max + "]");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java b/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java
new file mode 100644
index 00000000000..d9154fdcaf0
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestMemoryPools
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Test JMX memory pools
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xmx1g -Xms1g TestMemoryPools
+ */
+
+import java.lang.management.*;
+import java.util.*;
+
+public class TestMemoryPools {
+
+    public static void main(String[] args) throws Exception {
+        List<MemoryManagerMXBean> mms = ManagementFactory.getMemoryManagerMXBeans();
+        if (mms == null) {
+            throw new RuntimeException("getMemoryManagerMXBeans is null");
+        }
+        if (mms.isEmpty()) {
+            throw new RuntimeException("getMemoryManagerMXBeans is empty");
+        }
+        for (MemoryManagerMXBean mmBean : mms) {
+            String[] names = mmBean.getMemoryPoolNames();
+            if (names == null) {
+                throw new RuntimeException("getMemoryPoolNames() is null");
+            }
+            if (names.length == 0) {
+                throw new RuntimeException("getMemoryPoolNames() is empty");
+            }
+            for (String name : names) {
+                if (name == null) {
+                    throw new RuntimeException("pool name is null");
+                }
+                if (name.length() == 0) {
+                    throw new RuntimeException("pool name is empty");
+                }
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestObjects.java b/test/hotspot/jtreg/gc/epsilon/TestObjects.java
new file mode 100644
index 00000000000..2d5b638d86a
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestObjects.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestObjects
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon is able to allocate objects, and does not corrupt their state
+ *
+ * @run main/othervm -Xmx128m                                        -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xint                                  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xbatch -Xcomp                         -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xbatch -Xcomp -XX:-TieredCompilation  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ *
+ * @run main/othervm -Xmx128m                                        -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xint                                  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xbatch -Xcomp                         -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ * @run main/othervm -Xmx128m -Xbatch -Xcomp -XX:-TieredCompilation  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestObjects
+ */
+
+import java.util.Random;
+
+public class TestObjects {
+
+  static long SEED = Long.getLong("seed", System.nanoTime());
+  static int COUNT = Integer.getInteger("count", 1_000_000); // ~24 MB allocation
+
+  static MyObject[] arr;
+
+  public static void main(String[] args) throws Exception {
+    Random r = new Random(SEED);
+
+    arr = new MyObject[COUNT];
+    for (int c = 0; c < COUNT; c++) {
+      arr[c] = new MyObject(r.nextInt());
+    }
+
+    r = new Random(SEED);
+    for (int c = 0; c < COUNT; c++) {
+      int expected = r.nextInt();
+      int actual = arr[c].id();
+      if (expected != actual) {
+        throw new IllegalStateException("Failure: expected = " + expected + ", actual = " + actual);
+      }
+    }
+  }
+
+  public static class MyObject {
+    int id;
+    public MyObject(int id) {
+      this.id = id;
+    }
+    public int id() {
+      return id;
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java b/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java
new file mode 100644
index 00000000000..3d8a7208e8a
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestPrintSteps
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Tests -XX:EpsilonPrintHeapSteps works
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=0    TestPrintHeapSteps
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=1    TestPrintHeapSteps
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=1000 TestPrintHeapSteps
+ */
+
+public class TestPrintHeapSteps {
+  public static void main(String[] args) throws Exception {
+    System.out.println("Hello World");
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java b/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java
new file mode 100644
index 00000000000..e87623b4aaf
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestRefArrays
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Epsilon is able to allocate arrays, and does not corrupt their state
+ * @library /test/lib
+ *
+ * @run main/othervm -Xmx1g                                        -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xint                                  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp                         -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:-TieredCompilation  -XX:+UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ *
+ * @run main/othervm -Xmx1g                                        -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xint                                  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp                         -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:TieredStopAtLevel=1 -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:-TieredCompilation  -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestRefArrays
+ */
+
+import java.util.Random;
+
+public class TestRefArrays {
+
+  static long SEED = Long.getLong("seed", System.nanoTime());
+  static int COUNT = Integer.getInteger("count", 1000); // ~500 MB allocation
+
+  static MyObject[][] arr;
+
+  public static void main(String[] args) throws Exception {
+    Random r = new Random(SEED);
+
+    arr = new MyObject[COUNT * 100][];
+    for (int c = 0; c < COUNT; c++) {
+      arr[c] = new MyObject[c * 100];
+      for (int v = 0; v < c; v++) {
+        arr[c][v] = new MyObject(r.nextInt());
+      }
+    }
+
+    r = new Random(SEED);
+    for (int c = 0; c < COUNT; c++) {
+      MyObject[] b = arr[c];
+      if (b.length != (c * 100)) {
+        throw new IllegalStateException("Failure: length = " + b.length + ", need = " + (c*100));
+      }
+      for (int v = 0; v < c; v++) {
+        int actual = b[v].id();
+        int expected = r.nextInt();
+        if (actual != expected) {
+          throw new IllegalStateException("Failure: expected = " + expected + ", actual = " + actual);
+        }
+      }
+    }
+  }
+
+  public static class MyObject {
+    int id;
+    public MyObject(int id) {
+      this.id = id;
+    }
+    public int id() {
+      return id;
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java b/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java
new file mode 100644
index 00000000000..a94e4fa5bdb
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, 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.
+ *
+ * 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 TestUpdateCountersSteps
+ * @key gc
+ * @requires vm.gc.Epsilon
+ * @summary Test EpsilonUpdateCountersStep works
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=1    TestUpdateCountersSteps
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=10   TestUpdateCountersSteps
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=100  TestUpdateCountersSteps
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=1000 TestUpdateCountersSteps
+ */
+
+public class TestUpdateCountersSteps {
+  public static void main(String[] args) throws Exception {
+    System.out.println("Hello World");
+  }
+}
diff --git a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
index 35c780669fb..c25dec659d6 100644
--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -177,6 +177,24 @@ public class TestPrintReferences {
   public static void checkLogValue(OutputAnalyzer out) {
     output = out.getStdout();
 
+    String patternString = gcLogTimeRegex + indent(0) +
+                           referenceProcessing + ": " + "[0-9]+[.,][0-9]+";
+    Matcher m = Pattern.compile(patternString).matcher(output);
+    if (m.find()) {
+        int start = m.start();
+        int end = output.length();
+        // If there's another concurrent Reference Processing log, ignore it.
+        if (m.find()) {
+            end = m.start();
+        }
+        if (start != -1) {
+            output = output.substring(start, end);
+            checkTrimmedLogValue();
+        }
+     }
+  }
+
+  public static void checkTrimmedLogValue() {
     BigDecimal refProcTime = getTimeValue(referenceProcessing, 0);
 
     BigDecimal sumOfSubPhasesTime = checkPhaseTime(softReference);
diff --git a/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java b/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java
index c09f5e5b573..17ebdf87c55 100644
--- a/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java
+++ b/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java
@@ -42,6 +42,7 @@ import java.util.Random;
  * @key gc stress
  * @summary Switches gc log level on fly while stressing memory/gc
  * @requires !vm.flightRecorder
+ * @requires vm.gc != "Z"
  * @library /test/lib /
  * @modules java.management java.base/jdk.internal.misc
  *
diff --git a/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
index ea9ae05eb12..4fc29441f4d 100644
--- a/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
+++ b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
@@ -25,6 +25,7 @@
  * @test CompressedClassSpaceSizeInJmapHeap
  * @bug 8004924
  * @summary Checks that jmap -heap contains the flag CompressedClassSpaceSize
+ * @requires vm.opt.final.UseCompressedOops
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java
index dfc949ef586..055186d020b 100644
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -28,6 +28,7 @@ import sun.hotspot.WhiteBox;
 /* @test TestMetaspaceCMSCancel
  * @bug 8026752
  * @summary Tests cancel of CMS concurrent cycle for Metaspace after a full GC
+ * @requires !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
diff --git a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java
index 370537992f6..8025a19e9d9 100644
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java
@@ -32,6 +32,7 @@ import static jdk.test.lib.Asserts.*;
  * @bug 8000754
  * @summary Tests that a MemoryPoolMXBeans is created for metaspace and that a
  *          MemoryManagerMXBean is created.
+ * @requires vm.opt.final.UseCompressedOops
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java b/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java
index a5b7cc9fc89..1f5deca3cc2 100644
--- a/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, 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
@@ -22,14 +22,15 @@
  */
 
 /*
-* @test TestCMS
-* @key gc
-* @bug 8006398 8155948 8179013
-* @summary Test that CMS prints a warning message
-* @library /test/lib
-* @modules java.base/jdk.internal.misc
-*          java.management
-*/
+ * @test TestCMS
+ * @key gc
+ * @bug 8006398 8155948 8179013
+ * @summary Test that CMS prints a warning message
+ * @requires !vm.graal.enabled
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ */
 
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
diff --git a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
index d22447921c4..63e5ad71b00 100644
--- a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
+++ b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
@@ -25,8 +25,7 @@
  * @test TestReclaimStringsLeaksMemory
  * @bug 8180048
  * @summary Ensure that during a Full GC interned string memory is reclaimed completely.
- * @requires vm.gc=="null"
- * @requires !vm.debug
+ * @requires vm.gc=="null" & !vm.graal.enabled & !vm.debug
  * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java
index a8bcfe5e9be..660f7491869 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java
@@ -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
@@ -28,7 +28,7 @@ import java.io.IOException;
  * @test TestGCBasherWithCMS
  * @key gc stress
  * @requires vm.gc.ConcMarkSweep
- * @requires vm.flavor == "server" & !vm.emulatedClient
+ * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
  * @summary Stress the CMS GC by trying to make old objects more likely to be garbage than young objects.
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseConcMarkSweepGC TestGCBasherWithCMS 120000
  */
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
new file mode 100644
index 00000000000..c0068f74088
--- /dev/null
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
@@ -0,0 +1,39 @@
+/*
+ * 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
+ * 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 java.io.IOException;
+
+/*
+ * @test TestGCBasherWithZ
+ * @key gc stress
+ * @requires vm.gc.Z
+ * @requires vm.flavor == "server" & !vm.emulatedClient
+ * @summary Stress ZGC
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx384m -server -XX:+UnlockExperimentalVMOptions -XX:+UseZGC TestGCBasherWithZ 120000
+ */
+public class TestGCBasherWithZ {
+    public static void main(String[] args) throws IOException {
+        TestGCBasher.main(args);
+    }
+}
diff --git a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java
index 825a8d4bd00..7228846e626 100644
--- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -25,7 +25,7 @@
 /*
  * @test TestGCLockerWithCMS
  * @key gc
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Stress CMS' GC locker by calling GetPrimitiveArrayCritical while concurrently filling up old gen.
  * @run main/native/othervm/timeout=200 -Xlog:gc*=info -Xms1500m -Xmx1500m -XX:+UseConcMarkSweepGC TestGCLockerWithCMS
  */
diff --git a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java
index e0cd960d0c8..101fbd8e3e7 100644
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -25,7 +25,7 @@
 /*
  * @test TestGCOldWithCMS
  * @key gc
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Stress the CMS GC by trying to make old objects more likely to be garbage than young objects.
  * @run main/othervm -Xmx384M -XX:+UseConcMarkSweepGC TestGCOldWithCMS 50 1 20 10 10000
  */
diff --git a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java
new file mode 100644
index 00000000000..ed24fff1765
--- /dev/null
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, 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 TestGCOldWithZ
+ * @key gc
+ * @requires vm.gc.Z
+ * @summary Stress the Z
+ * @run main/othervm -Xmx384M -XX:+UnlockExperimentalVMOptions -XX:+UseZGC TestGCOldWithZ 50 1 20 10 10000
+ * @run main/othervm -Xmx256m -XX:+UnlockExperimentalVMOptions -XX:+UseZGC TestGCOldWithZ 50 5 20 1 5000
+ */
+public class TestGCOldWithZ {
+    public static void main(String[] args) {
+        TestGCOld.main(args);
+    }
+}
diff --git a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java
index 33dec96e5a6..22d2bd80f2b 100644
--- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java
+++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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,7 +26,7 @@
  * @test TestSystemGCWithCMS
  * @key gc stress
  * @bug 8190703
- * @requires vm.gc.ConcMarkSweep
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @summary Stress the CMS GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UseConcMarkSweepGC TestSystemGCWithCMS 270
  */
diff --git a/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java b/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java
index 740db3b3cd8..583eaef0d86 100644
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java
@@ -26,6 +26,7 @@
  * @bug 8031323
  * @summary Verify that object's alignment in eden space is not affected by
  *          SurvivorAlignmentInBytes option.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java
index bd6d74bba83..cba0a805561 100644
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java
@@ -26,6 +26,7 @@
  * @bug 8031323
  * @summary Verify that objects promoted from eden space to tenured space during
  *          full GC are not aligned to SurvivorAlignmentInBytes value.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java
index 2542e3a7381..e35e9a9cf83 100644
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java
@@ -26,6 +26,7 @@
  * @bug 8031323
  * @summary Verify that objects promoted from survivor space to tenured space
  *          during full GC are not aligned to SurvivorAlignmentInBytes value.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java
index ba2a1bdffab..2fad59d3c88 100644
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java
@@ -27,6 +27,7 @@
  * @summary Verify that objects promoted from survivor space to tenured space
  *          when their age exceeded tenuring threshold are not aligned to
  *          SurvivorAlignmentInBytes value.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java
index 57fbbd34518..fb5841704e4 100644
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java
@@ -26,6 +26,7 @@
  * @bug 8031323
  * @summary Verify that objects promoted from eden space to survivor space after
  *          minor GC are aligned to SurvivorAlignmentInBytes.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/whitebox/TestWBGC.java b/test/hotspot/jtreg/gc/whitebox/TestWBGC.java
index 8ce7ee11ad6..6b9eec22f8c 100644
--- a/test/hotspot/jtreg/gc/whitebox/TestWBGC.java
+++ b/test/hotspot/jtreg/gc/whitebox/TestWBGC.java
@@ -25,6 +25,7 @@
  * @test TestWBGC
  * @bug 8055098
  * @summary Test verify that WB methods isObjectInOldGen and youngGC works correctly.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/6981737/Test6981737.java b/test/hotspot/jtreg/runtime/6981737/Test6981737.java
index 3c131bbefc4..c8a12ded519 100644
--- a/test/hotspot/jtreg/runtime/6981737/Test6981737.java
+++ b/test/hotspot/jtreg/runtime/6981737/Test6981737.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test Test6981737.java
- * @bug 6981737
+ * @bug 6981737 8204565
  * @summary check for correct vm properties
  * @run main Test6981737
  * @author kamg
@@ -33,13 +33,12 @@ public class Test6981737 {
 
     /**
      * Check the 'vendor' properties and java.vm.specification.version property.
-     * In jdk9 onwards they should be "Oracle..." and "<major_version>"
      */
     public static void main(String[] args) throws Exception {
 
         String vendor_re = "Oracle Corporation";
-        int major_version = Runtime.version().major();
-        String vm_spec_version_re = Integer.toString(major_version);
+        int feature_version = Runtime.version().feature();
+        String vm_spec_version_re = Integer.toString(feature_version);
 
         verifyProperty("java.vm.specification.vendor", vendor_re);
         verifyProperty("java.specification.vendor", vendor_re);
diff --git a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java
index 037be05f6a0..d2a5074d655 100644
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java
@@ -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
@@ -24,6 +24,7 @@
 /*
  * @test KeepAliveClass
  * @summary This test case uses a java.lang.Class instance to keep a class alive.
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /runtime/testlibrary
  * @library classes
diff --git a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java
index e8f7b008197..7604d989fab 100644
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java
@@ -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
@@ -24,6 +24,7 @@
 /*
  * @test KeepAliveClassLoader
  * @summary This test case uses a java.lang.ClassLoader instance to keep a class alive.
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /runtime/testlibrary
  * @library classes
diff --git a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java
index 71de9e2714c..49a2437f140 100644
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java
@@ -24,6 +24,7 @@
 /*
  * @test KeepAliveObject
  * @summary This test case uses a class instance to keep the class alive.
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /runtime/testlibrary
  * @library classes
diff --git a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java
index 77c6b8d8362..7ba2e0e092f 100644
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java
@@ -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
@@ -24,6 +24,7 @@
 /*
  * @test KeepAliveSoftReference
  * @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive.
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /runtime/testlibrary
  * @library classes
diff --git a/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java b/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java
index 4a2e0a4958d..972d2ea014e 100644
--- a/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java
+++ b/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java
@@ -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
@@ -23,6 +23,7 @@
 
 /*
  * @test UnloadTest
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /runtime/testlibrary /test/lib
  * @library classes
@@ -64,4 +65,3 @@ public class UnloadTest {
         ClassUnloadCommon.failIf(wb.isClassAlive(className), "should have been unloaded");
     }
 }
-
diff --git a/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java
index 5f30d752f1f..1b8aa54edf5 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java
@@ -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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8006298
+ * @bug 8006298 8204055
  * @summary Using an unrecognized VM option should print the name of the option
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -35,11 +35,19 @@ import jdk.test.lib.process.OutputAnalyzer;
 
 public class UnrecognizedVMOption {
   public static void main(String[] args) throws Exception {
-    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-        "-XX:bogus_option", "-version");
+    // Note: -XX by itself is an unrecognized launcher option, the :
+    // must be present for it to be passed through as a VM option.
+    String[] badOptions = {
+      "",  // empty option
+      "bogus_option",
+    };
+    for (String option : badOptions) {
+      ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+          "-XX:" + option, "-version");
 
-    OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldContain("Unrecognized VM option 'bogus_option'");
-    output.shouldHaveExitValue(1);
+      OutputAnalyzer output = new OutputAnalyzer(pb.start());
+      output.shouldContain("Unrecognized VM option '" + option + "'");
+      output.shouldHaveExitValue(1);
+    }
   }
 }
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
index c6f592af01a..f4c9bcd7d74 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8024927
  * @summary Testing address of compressed class pointer space as best as possible.
+ * @requires vm.opt.final.UseCompressedOops
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java
index b1d9f8b3d72..84a4979cf6d 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8022865
  * @summary Tests for the -XX:CompressedClassSpaceSize command line option
+ * @requires vm.opt.final.UseCompressedOops
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java b/test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java
index 65874233c8d..659e2ca63fd 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, 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
@@ -28,7 +28,9 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main UseCompressedOops
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. UseCompressedOops
  */
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,6 +38,8 @@ import jdk.test.lib.Platform;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 
+import sun.hotspot.code.Compiler;
+
 public class UseCompressedOops {
 
     public static void main(String[] args) throws Exception {
@@ -51,7 +55,9 @@ public class UseCompressedOops {
         testCompressedOopsModes(args);
         // Test GCs.
         testCompressedOopsModes(args, "-XX:+UseG1GC");
-        testCompressedOopsModes(args, "-XX:+UseConcMarkSweepGC");
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            testCompressedOopsModes(args, "-XX:+UseConcMarkSweepGC");
+        }
         testCompressedOopsModes(args, "-XX:+UseSerialGC");
         testCompressedOopsModes(args, "-XX:+UseParallelGC");
         testCompressedOopsModes(args, "-XX:+UseParallelOldGC");
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java b/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java
index 3f4bd6614f8..4ca81a2fd78 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java
@@ -57,7 +57,7 @@ public class CreateCoredumpOnCrash {
     public static OutputAnalyzer runTest(String option) throws Exception {
         return new OutputAnalyzer(
             ProcessTools.createJavaProcessBuilder(
-            "-Xmx64m", "-XX:-TransmitErrorReport", "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED", option, Crasher.class.getName())
+            "-Xmx128m", "-XX:-TransmitErrorReport", "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED", option, Crasher.class.getName())
             .start());
     }
 }
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
index 38d50e488f4..3ef7c868462 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
@@ -53,7 +53,7 @@ public class TestCrashOnOutOfMemoryError {
         }
         // else this is the main test
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+CrashOnOutOfMemoryError",
-                 "-XX:-CreateCoredumpOnCrash", "-Xmx64m", TestCrashOnOutOfMemoryError.class.getName(),"throwOOME");
+                 "-XX:-CreateCoredumpOnCrash", "-Xmx128m", TestCrashOnOutOfMemoryError.class.getName(),"throwOOME");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         int exitValue = output.getExitValue();
         if (0 == exitValue) {
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java
index 34faa87a9d1..2159442c08c 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java
@@ -49,7 +49,7 @@ public class TestExitOnOutOfMemoryError {
 
         // else this is the main test
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+ExitOnOutOfMemoryError",
-                "-Xmx64m", TestExitOnOutOfMemoryError.class.getName(), "throwOOME");
+                "-Xmx128m", TestExitOnOutOfMemoryError.class.getName(), "throwOOME");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
         /*
diff --git a/test/hotspot/jtreg/runtime/InternalApi/ThreadCpuTimesDeadlock.java b/test/hotspot/jtreg/runtime/InternalApi/ThreadCpuTimesDeadlock.java
index b367b1be825..2aaa64de2fa 100644
--- a/test/hotspot/jtreg/runtime/InternalApi/ThreadCpuTimesDeadlock.java
+++ b/test/hotspot/jtreg/runtime/InternalApi/ThreadCpuTimesDeadlock.java
@@ -27,7 +27,7 @@
  * @bug 8014294
  * @summary Possible JVM deadlock in ThreadTimesClosure when using HotspotInternal non-public API.
  * @modules java.management/sun.management
- * @run main/othervm -XX:+UsePerfData -Xmx32m ThreadCpuTimesDeadlock
+ * @run main/othervm -XX:+UsePerfData -Xmx128m ThreadCpuTimesDeadlock
  */
 
 import java.lang.management.ManagementFactory;
diff --git a/test/hotspot/jtreg/runtime/LoadClass/TestResize.java b/test/hotspot/jtreg/runtime/LoadClass/TestResize.java
index 48327bbc86e..ecc6a07da37 100644
--- a/test/hotspot/jtreg/runtime/LoadClass/TestResize.java
+++ b/test/hotspot/jtreg/runtime/LoadClass/TestResize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -34,6 +34,7 @@
  */
 
 import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -66,42 +67,61 @@ public class TestResize {
   }
 
   static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
-    pb.redirectErrorStream(true);
-    Process process = pb.start();
-    BufferedReader rd = new BufferedReader(new InputStreamReader(process.getInputStream()));
-    String line = rd.readLine();
-    while (line != null) {
-      if (line.startsWith("Java dictionary (")) {
-        // ex. "Java dictionary (table_size=107, classes=6)"
-        // ex. "Java dictionary (table_size=20201, classes=50002)"
+    OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+    String output = analyzer.getStdout();
+    analyzer.shouldHaveExitValue(0);
+
+    boolean resized = false;
+
+    // Split string into lines using platform independent end of line marker.
+    String[] lines = output.split("\\R");
+    for (String line : lines) {
+      if (!resized) {
+        // ex. [0.563s][info][safepoint,cleanup] resizing system dictionaries, 0.0000002 secs
+        if (line.contains("resizing system dictionaries")) {
+          resized = true;
+        }
+      } else if (resized && line.startsWith("Java dictionary (")) {
+        // ex. Java dictionary (table_size=10103, classes=5002)
         Scanner scanner = new Scanner(line);
-        scanner.next();
-        scanner.next();
-        int table_size = getInt(scanner.next());
-        int classes = getInt(scanner.next());
+        scanner.next(); // skip "Java"
+        scanner.next(); // skip "dictionary"
+        int table_size = getInt(scanner.next()); // process "(table_size=40423"
+        int classes = getInt(scanner.next()); // process ", classes=50002"
         scanner.close();
 
         double loadFactor = (double)classes / (double)table_size;
         if (loadFactor > MAX_LOAD_FACTOR) {
-          throw new RuntimeException("Load factor too high, expected MAX "+MAX_LOAD_FACTOR+", got "+loadFactor);
+
+          // We've hit an error, so print all of the output.
+          System.out.println(output);
+
+          throw new RuntimeException("Load factor too high, expected MAX " + MAX_LOAD_FACTOR +
+            ", got " + loadFactor + " [table size " + table_size + ", number of clases " + classes + "]");
         } else {
-          System.out.println("PASS table_size:"+table_size+", classes:"+classes+" OK");
+          System.out.println("PASS table_size: " + table_size + ", classes: " + classes +
+          ", load factor: " + loadFactor + " <= " + MAX_LOAD_FACTOR);
+          // There are more than one system dictionary to check, so keep looking...
         }
       }
-      line = rd.readLine();
     }
-    int retval = process.waitFor();
-    if (retval != 0) {
-      throw new RuntimeException("Error: test returned non-zero value");
+
+    if (!resized) {
+      System.out.println("PASS trivially. No resizing occurred, so did not check the load.");
     }
   }
 
   public static void main(String[] args) throws Exception {
     if (Platform.isDebugBuild()) {
+      // -XX:+PrintSystemDictionaryAtExit will print the details of system dictionary,
+      // that will allow us to calculate the table's load factor.
+      // -Xlog:safepoint+cleanup will print out cleanup details at safepoint
+      // that will allow us to detect if the system dictionary resized.
       ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintSystemDictionaryAtExit",
+                                                                "-Xlog:safepoint+cleanup",
                                                                 "TriggerResize",
                                                                 "50000");
       analyzeOutputOn(pb);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/LdrCnstrFldMsgTest.java b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/LdrCnstrFldMsgTest.java
new file mode 100644
index 00000000000..0ed595481d1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/LdrCnstrFldMsgTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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
+ * @compile pkg/Grand.java pkg/Parent.java pkg/ClassLoaderForParentFoo.java
+ * @compile pkg/ClassLoaderForChildGrandFoo.java pkg/Child.jasm
+ * @run main/othervm LdrCnstrFldMsgTest
+ */
+
+import java.lang.reflect.Method;
+
+// Check that LinkageError loader constraint message for fields contains the
+// correct information.
+//
+// The test creates two class loaders.  The first class loader loads classes
+// Child, Foo, and Grand.  The second class loader loads Parent and Foo.  Class
+// Parent is a sub-class of Grand and class Child is a sub-class of Parent.
+// Class Child tries to load Parent._field1.  This should fail because type Foo
+// for Parent._field1 is a different type than Child's Foo.
+//
+public class LdrCnstrFldMsgTest {
+    public static void main(String... args) throws Exception {
+        ClassLoader l = new pkg.ClassLoaderForChildGrandFoo("pkg.Foo", "pkg.Child", "pkg.Grand");
+        l.loadClass("pkg.Foo");
+
+        // Try to call a public method in Grand.
+        Runnable r = (Runnable) l.loadClass("pkg.Child").newInstance();
+        try {
+            r.run();
+            throw new RuntimeException("Expected LinkageError exception not thrown");
+        } catch (java.lang.LinkageError e) {
+            if (!e.getMessage().contains("for the field's defining type, pkg.Parent,") ||
+                !e.getMessage().contains("have different Class objects for type pkg.Foo")) {
+                throw new RuntimeException("Wrong LinkageError exception thrown: " + e.toString());
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Child.jasm b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Child.jasm
new file mode 100644
index 00000000000..2bb5c3184a6
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Child.jasm
@@ -0,0 +1,50 @@
+/*
+ * 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 pkg;
+
+// The getfield of Parent._field1 gets a LinkageError because class Parent
+// has a different Foo class than Child, causing a loader constraint violation.
+super public class Child extends pkg/Parent implements java/lang/Runnable version 50:0 {
+
+    public Method "<init>":"()V" stack 1 locals 1 {
+        aload_0;
+        invokespecial    Method pkg/Parent."<init>":"()V";
+        return;
+    }
+
+    public Method run:"()V" stack 4 locals 4 {
+        ldc    class pkg/Foo;
+        astore_1;
+        new    class pkg/Child;
+        dup;
+        invokespecial Method pkg/Child."<init>":"()V";
+        astore_2;
+        aload_2;
+        getstatic Field pkg/Parent._field1:"Lpkg/Foo;";
+        pop;
+        return;
+    }
+
+} // end Class Child
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/ClassLoaderForChildGrandFoo.java b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/ClassLoaderForChildGrandFoo.java
new file mode 100644
index 00000000000..94222aa2623
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/ClassLoaderForChildGrandFoo.java
@@ -0,0 +1,73 @@
+/*
+ * 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 pkg;
+
+import java.util.*;
+import java.io.*;
+
+// This class loader loads Foo, Child, and Grand.
+public class ClassLoaderForChildGrandFoo extends ClassLoader {
+
+    ClassLoader l2 = null;
+
+    private final Set<String> names = new HashSet<>();
+
+    public ClassLoaderForChildGrandFoo(String... names) {
+        for (String n : names) this.names.add(n);
+    }
+
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        // Create class loader l2 to load Parent and Foo.  And, pass this class
+        // loader to l2 so l2 can use it to load Grand.
+        if (name.contains("Parent") && l2 == null) {
+            l2 = new ClassLoaderForParentFoo(this, "pkg.Foo", "pkg.Grand", "pkg.Parent");
+            Class<?> b = l2.loadClass("pkg.Parent");
+            return b;
+        }
+        if (!names.contains(name)) return super.loadClass(name, resolve);
+        Class<?> result = findLoadedClass(name);
+
+        if (result == null) {
+            String filename = name.replace('.', '/') + ".class";
+            try (InputStream data = getResourceAsStream(filename)) {
+                if (data == null) throw new ClassNotFoundException();
+                try (ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
+                    int b;
+                    do {
+                        b = data.read();
+                        if (b >= 0) buffer.write(b);
+                    } while (b >= 0);
+                    byte[] bytes = buffer.toByteArray();
+                    result = defineClass(name, bytes, 0, bytes.length);
+                }
+            } catch (IOException e) {
+                throw new ClassNotFoundException("Error reading class file", e);
+            }
+        }
+        if (resolve) resolveClass(result);
+        return result;
+    }
+
+}
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/ClassLoaderForParentFoo.java b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/ClassLoaderForParentFoo.java
new file mode 100644
index 00000000000..286ddc81b7d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/ClassLoaderForParentFoo.java
@@ -0,0 +1,69 @@
+/*
+ * 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 pkg;
+
+import java.util.*;
+import java.io.*;
+
+// This class loader loads Foo and Parent and calls back to l1 to load Grand.
+public class ClassLoaderForParentFoo extends ClassLoader {
+
+    private final Set<String> names = new HashSet<>();
+
+    ClassLoader l1;
+
+    public ClassLoaderForParentFoo(ClassLoader l, String... names) {
+        l1 = l;
+        for (String n : names) this.names.add(n);
+    }
+
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        if (name.contains("Grand")) return l1.loadClass("pkg.Grand");
+        if (!names.contains(name)) return super.loadClass(name, resolve);
+        Class<?> result = findLoadedClass(name);
+        if (result == null) {
+            // Load our own version of Foo that will be referenced by Parent.
+            if (name.contains("Parent")) loadClass("pkg.Foo", resolve);
+            String filename = name.replace('.', '/') + ".class";
+            try (InputStream data = getResourceAsStream(filename)) {
+                if (data == null) throw new ClassNotFoundException();
+                try (ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
+                    int b;
+                    do {
+                        b = data.read();
+                        if (b >= 0) buffer.write(b);
+                    } while (b >= 0);
+                    byte[] bytes = buffer.toByteArray();
+                    result = defineClass(name, bytes, 0, bytes.length);
+                }
+            } catch (IOException e) {
+                throw new ClassNotFoundException("Error reading class file", e);
+            }
+        }
+        if (resolve) resolveClass(result);
+        return result;
+    }
+
+}
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Foo.java b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Foo.java
new file mode 100644
index 00000000000..98519e09d63
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Foo.java
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg;
+
+public class Foo {}
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Grand.java b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Grand.java
new file mode 100644
index 00000000000..1a67a4d832b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Grand.java
@@ -0,0 +1,29 @@
+/*
+ * 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 pkg;
+
+public class Grand {
+    public static Foo _field1;
+}
diff --git a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Parent.java b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Parent.java
new file mode 100644
index 00000000000..ab856a7c080
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/pkg/Parent.java
@@ -0,0 +1,29 @@
+/*
+ * 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 pkg;
+
+public class Parent extends Grand {
+    public static Foo _field1;
+}
diff --git a/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java
index 9a3395a625d..357f27ff1ae 100644
--- a/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java
+++ b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java
@@ -26,13 +26,17 @@
  * @bug 8174749
  * @summary MemberNameTable should reuse entries
  * @library /test/lib
- * @run main MemberNameLeak
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MemberNameLeak
  */
 
 import java.lang.invoke.*;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
+import sun.hotspot.code.Compiler;
+
 public class MemberNameLeak {
     static class Leak {
       public void callMe() {
@@ -69,6 +73,8 @@ public class MemberNameLeak {
         test("-XX:+UseG1GC");
         test("-XX:+UseParallelGC");
         test("-XX:+UseSerialGC");
-        test("-XX:+UseConcMarkSweepGC");
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            test("-XX:+UseConcMarkSweepGC");
+        }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/Metaspace/DefineClass.java b/test/hotspot/jtreg/runtime/Metaspace/DefineClass.java
index 4f5bb02af29..4dcc601f385 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/DefineClass.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/DefineClass.java
@@ -27,6 +27,7 @@
  * @bug 8173743
  * @requires vm.compMode != "Xcomp"
  * @summary Failures during class definition can lead to memory leaks in metaspace
+ * @requires vm.opt.final.ClassUnloading
  * @library /test/lib
  * @run main/othervm test.DefineClass defineClass
  * @run main/othervm test.DefineClass defineSystemClass
diff --git a/test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java b/test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java
index f50477caa2a..053cfd4bea4 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java
@@ -27,6 +27,7 @@ import jdk.test.lib.process.OutputAnalyzer;
 /*
  * @test MaxMetaspaceSizeTest
  * @requires vm.bits == "64"
+ * @requires vm.opt.final.UseCompressedOops
  * @bug 8087291
  * @library /test/lib
  * @run main/othervm MaxMetaspaceSizeTest
diff --git a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java
index 27c1d5b8766..a6241586647 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java
@@ -30,6 +30,7 @@ import jdk.test.lib.JDKToolFinder;
  * @test
  * @key metaspace jcmd
  * @summary Test the VM.metaspace command
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -73,7 +74,7 @@ public class PrintMetaspaceDcmd {
         pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "show-loaders"});
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
-        output.shouldMatch("ClassLoaderData.*for <bootloader>");
+        output.shouldMatch("CLD.*<bootstrap>");
 
         pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "by-chunktype"});
         output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java
index dda3e872c72..681f06a5be9 100644
--- a/test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java
+++ b/test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java
@@ -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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8165246
  * @summary Test has_previous_versions flag and processing during class unloading.
+ * @requires vm.opt.final.ClassUnloading
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @modules java.compiler
diff --git a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java
index 96ae06eeeb8..ab8bba21726 100644
--- a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java
+++ b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java
@@ -52,7 +52,7 @@ public class AssertSafepointCheckConsistency1 {
                   "-XX:+WhiteBoxAPI",
                   "-XX:-TransmitErrorReport",
                   "-XX:-CreateCoredumpOnCrash",
-                  "-Xmx32m",
+                  "-Xmx128m",
                   "AssertSafepointCheckConsistency1",
                   "test");
             OutputAnalyzer output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java
index 5c0d6d99da2..ee82e0acd39 100644
--- a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java
+++ b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java
@@ -52,7 +52,7 @@ public class AssertSafepointCheckConsistency2 {
                   "-XX:+WhiteBoxAPI",
                   "-XX:-TransmitErrorReport",
                   "-XX:-CreateCoredumpOnCrash",
-                  "-Xmx32m",
+                  "-Xmx128m",
                   "AssertSafepointCheckConsistency2",
                   "test");
 
diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java
index 93aadf9a7c7..a88deada884 100644
--- a/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java
+++ b/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @summary Test of method selection and resolution cases that
  * generate AbstractMethodErrorTest
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @library /runtime/SelectionResolution/classes
  * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies AbstractMethodErrorTest
diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java
index a775e857027..b39138e27e1 100644
--- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java
+++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @summary Test of method selection and resolution cases that
  * generate IncompatibleClassChangeError
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @library /runtime/SelectionResolution/classes
  * @run main/othervm/timeout=500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceICCE
diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java
index cf75021fa71..d8f9a7aaeb9 100644
--- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java
+++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @summary Test of method selection and resolution cases that
  * generate InvokeInterfaceSuccessTest
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @library /runtime/SelectionResolution/classes
  * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceSuccessTest
diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java
index 59fe0272e5b..5e02b049e34 100644
--- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java
+++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @summary Test of method selection and resolution cases that
  * generate IncompatibleClassChangeError
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @library /runtime/SelectionResolution/classes
  * @run main/othervm/timeout=1200 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualICCE
diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java
index 359537e5485..80fb1f6537c 100644
--- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java
+++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @summary Test of method selection and resolution cases that
  * generate InvokeVirtualSuccessTest
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @library /runtime/SelectionResolution/classes
  * @run main/othervm/timeout=400 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualSuccessTest
diff --git a/test/hotspot/jtreg/runtime/Unsafe/RangeCheck.java b/test/hotspot/jtreg/runtime/Unsafe/RangeCheck.java
index 8b885bfb3ba..dc899e45c05 100644
--- a/test/hotspot/jtreg/runtime/Unsafe/RangeCheck.java
+++ b/test/hotspot/jtreg/runtime/Unsafe/RangeCheck.java
@@ -46,7 +46,7 @@ public class RangeCheck {
 
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
                 true,
-                "-Xmx32m",
+                "-Xmx128m",
                 "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED",
                 "-XX:-TransmitErrorReport",
                 "-XX:-CreateCoredumpOnCrash",
diff --git a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java b/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java
index ba3f803b95b..c40a196e35d 100644
--- a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java
+++ b/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java
@@ -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
@@ -32,14 +32,18 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @compile test-classes/Hello.java
- * @run main/timeout=240 CommandLineFlagCombo
+ * @run main/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. CommandLineFlagCombo
  */
 
 import jdk.test.lib.BuildHelper;
 import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 
+import sun.hotspot.code.Compiler;
+
 public class CommandLineFlagCombo {
 
     // shared base address test table
@@ -122,6 +126,11 @@ public class CommandLineFlagCombo {
             System.out.println("Test case not applicable on non-commercial builds");
             return true;
         }
+        if (Compiler.isGraalEnabled() && testEntry.equals("-XX:+UseConcMarkSweepGC"))
+        {
+            System.out.println("Graal does not support CMS");
+            return true;
+        }
 
         return false;
     }
diff --git a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java b/test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java
index a4fb110ba32..1bacd5fc6ed 100644
--- a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java
+++ b/test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java
@@ -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
@@ -71,6 +71,8 @@ public class CommandLineFlagComboNegative {
                 "Class data sharing is inconsistent with other specified options", 1) );
             testTable.add( new TestVector("-XX:+UseCompressedClassPointers", "-XX:-UseCompressedClassPointers",
                 "Class data sharing is inconsistent with other specified options", 1) );
+            testTable.add( new TestVector("-XX:-UseAppCDS", "-XX:+UseAppCDS",
+                "Ignoring obsolete option UseAppCDS; AppCDS is automatically enabled", 0) );
         }
     }
 
diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java b/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java
index 254f133ddb2..60a035cebd1 100644
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -28,6 +28,7 @@
  *          unloaded.
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
+ * @requires vm.opt.final.ClassUnloading
  * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/testlibrary
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
deleted file mode 100644
index 41ba077077b..00000000000
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- *
- */
-
-/**
- * Used with -p or --upgrade-module-path to exercise the replacement
- * of classes in modules that are linked into the runtime image.
- */
-
-import java.lang.*;
-import java.lang.reflect.*;
-import sun.hotspot.WhiteBox;
-
-
-public class LimitModsHelper {
-    static final ClassLoader PLATFORM_LOADER = ClassLoader.getPlatformClassLoader();
-    static final ClassLoader SYS_LOADER      = ClassLoader.getSystemClassLoader();
-
-    public static void main(String[] args) throws Exception {
-        assertTrue(args.length == 4);
-        String[] classNames = new String[3];
-        for (int i = 0; i < 3; i++) {
-            classNames[i] = args[i].replace('/', '.');
-        }
-        int excludeModIdx = Integer.parseInt(args[3]);
-
-        ClassLoader expectedLoaders[] = {null, PLATFORM_LOADER, SYS_LOADER};
-
-        WhiteBox wb = WhiteBox.getWhiteBox();
-
-        Class<?> clazz = null;
-        for (int i = 0; i < 3; i++) {
-            try {
-                // Load the class with the default ClassLoader.
-                clazz = Class.forName(classNames[i]);
-            } catch (Exception e) {
-                if (i == excludeModIdx) {
-                    System.out.println(classNames[i] + " not found as expected because the module isn't in the --limit-modules - PASSED");
-                } else {
-                    throw(e);
-                }
-            }
-
-            if (clazz != null && i != excludeModIdx) {
-                // Make sure we got the expected defining ClassLoader
-                testLoader(clazz, expectedLoaders[i]);
-
-                // Make sure the class is not in the shared space
-                // because CDS is disabled with --limit-modules during run time.
-                if (excludeModIdx != -1) {
-                    if (wb.isSharedClass(clazz)) {
-                        throw new RuntimeException(clazz.getName() +
-                            ".class should not be in the shared space. " +
-                             "loader=" + clazz.getClassLoader() + " module=" + clazz.getModule().getName());
-                    }
-                } else {
-                    // class should be in the shared space if --limit-modules
-                    // isn't specified during run time
-                    if (!wb.isSharedClass(clazz)) {
-                        throw new RuntimeException(clazz.getName() +
-                            ".class should be in the shared space. " +
-                             "loader=" + clazz.getClassLoader() + " module=" + clazz.getModule().getName());
-                    }
-                }
-            }
-            clazz = null;
-        }
-    }
-
-    /**
-     * Asserts that given class has the expected defining loader.
-     */
-    static void testLoader(Class<?> clazz, ClassLoader expected) {
-        ClassLoader loader = clazz.getClassLoader();
-        if (loader != expected) {
-            throw new RuntimeException(clazz + " loaded by " + loader + ", expected " + expected);
-        }
-    }
-
-    static void assertTrue(boolean expr) {
-        if (!expr)
-            throw new RuntimeException("assertion failed");
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
deleted file mode 100644
index d8aacdfaf9a..00000000000
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2015, 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
- * @requires vm.cds & !vm.graal.enabled
- * @library ../..
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- * @modules jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @compile LimitModsHelper.java
- * @compile ../../test-classes/java/net/HttpCookie.jasm
- * @compile ../../test-classes/jdk/dynalink/DynamicLinker.jasm
- * @compile ../../test-classes/com/sun/tools/javac/Main.jasm
- * @build sun.hotspot.WhiteBox
- * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main LimitModsTests
- * @summary AppCDS tests for excluding class in module by using --limit-modules.
- */
-
-/**
- * This is for testing the --limit-modules option with AppCDS.
- * This test assumes the following defining class loader, module, class relations:
- * class loader    module            class
- * -----------------------------------------------------
- * boot            java.base         java/net/HttpCookie
- * platform        jdk.dynalink      jdk/dynalink/DynamicLinker
- * app             jdk.compiler      com/sun/tools/javac/Main
- *
- * This test dumps the above 3 classes into a shared archive.
- * Then it will run the following 4 -limit-modules scenarios:
- * 1. without --limit-modules
- *    All 3 classes should be loaded successfully.
- *    All 3 classes should be loaded by the appropriate class loader.
- *    All 3 classes should be found in the shared archive.
- * 2. --limit-modules java.base,jdk.dynalink
- *    The loading of the com/sun/tools/javac/Main class should fail.
- *    The other 2 classes should be loaded successfully and by the appropriate class loader.
- *    The other 2 classes should be found in the shared archive.
- * 3. --limit-modules java.base,jdk.compiler
- *    The loading of the jdk/nio/dynalink/DynamicLinker class should fail.
- *    The other 2 classes should be loaded successfully and by the appropriate class loader.
- *    The other 2 classes should be found in the shared archive.
- * 4. --limit-modules jdk.dynalink,jdk.compiler
- *    The java.base module can't be excluded.
- *    The results for this case is the same as for case #1.
- */
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-
-public class LimitModsTests {
-
-    // the module that is limited
-    private static final String[] LIMIT_MODULES = {"java.base", "jdk.dynalink", "jdk.compiler"};
-
-    // test classes to archive.
-    private static final String BOOT_ARCHIVE_CLASS = "java/net/HttpCookie";
-    private static final String PLATFORM_ARCHIVE_CLASS = "jdk/dynalink/DynamicLinker";
-    private static final String APP_ARCHIVE_CLASS = "com/sun/tools/javac/Main";
-    private static final String[] ARCHIVE_CLASSES = {
-        BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS};
-    private String bootClassPath = null;
-    private String whiteBoxJar = null;
-    private String helperJar = null;
-    private String appJar = null;
-    private OutputAnalyzer output = null;
-
-    public static void main(String[] args) throws Exception {
-        LimitModsTests tests = new LimitModsTests();
-        tests.dumpArchive();
-        tests.runTestNoLimitMods();
-        tests.runTestLimitMods();
-    }
-
-    void dumpArchive() throws Exception {
-        JarBuilder.build("limitModsTest", BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS);
-        JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox");
-        JarBuilder.build("limitModsHelper", "LimitModsHelper");
-
-        appJar = TestCommon.getTestJar("limitModsTest.jar");
-        whiteBoxJar = TestCommon.getTestJar("WhiteBox.jar");
-        helperJar = TestCommon.getTestJar("limitModsHelper.jar");
-        bootClassPath = "-Xbootclasspath/a:" + whiteBoxJar;
-        // Dump the test classes into the archive
-        OutputAnalyzer output1  = TestCommon.dump(appJar, TestCommon.list(ARCHIVE_CLASSES), bootClassPath);
-        TestCommon.checkDump(output1);
-        // Make sure all the classes where successfully archived.
-        for (String archiveClass : ARCHIVE_CLASSES) {
-            output1.shouldNotContain("Preload Warning: Cannot find " + archiveClass);
-        }
-    }
-
-    // run the test without --limit-modules
-    public void runTestNoLimitMods() throws Exception {
-        output = TestCommon.exec(
-            appJar + File.pathSeparator + helperJar,
-            "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", bootClassPath,
-            "LimitModsHelper",
-            BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS, "-1"); // last 4 args passed to test
-        TestCommon.checkExec(output);
-    }
-
-    // run the test with --limit-modules
-    //
-    // --limit-modules jdk.dynalink,jdk.compiler
-    // It seems we can't exclude the java.base module. For this case,
-    // although the java.base module isn't in --limit-modules, the class
-    // in the java.base module (java.net.HttpCookie) can also be found.
-    //
-    // --limit-modules java.base,jdk.dynalink
-    // --limit-modules java.base,jdk.compiler
-    public void runTestLimitMods() throws Exception {
-        String limitMods = null;
-        for (int excludeModIdx = 0; excludeModIdx < 3; excludeModIdx++) {
-            for (int includeModIdx = 0; includeModIdx < 3; includeModIdx++) {
-                if (includeModIdx != excludeModIdx) {
-                    if (limitMods != null) {
-                        limitMods += ",";
-                        limitMods += LIMIT_MODULES[includeModIdx];
-                    } else {
-                        limitMods = LIMIT_MODULES[includeModIdx];
-                    }
-                }
-            }
-            TestCommon.run(
-                "-cp", appJar + File.pathSeparator + helperJar,
-                "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", bootClassPath,
-                "--limit-modules", limitMods,
-                "LimitModsHelper",
-                BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS,
-                Integer.toString(excludeModIdx)) // last 4 args passed to test
-                .assertSilentlyDisabledCDS(0);
-            limitMods = null;
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java
index 311937479bd..46840e0e1d3 100644
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java
@@ -32,13 +32,17 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  *          jdk.jartool/sun.tools.jar
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @build HelloString
- * @run main IncompatibleOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions
  */
 
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 
+import sun.hotspot.code.Compiler;
+
 public class IncompatibleOptions {
     static final String COOPS_DUMP_WARNING =
         "Cannot dump shared archive when UseCompressedOops or UseCompressedClassPointers is off";
@@ -62,7 +66,9 @@ public class IncompatibleOptions {
         // incompatible GCs
         testDump(2, "-XX:+UseParallelGC", "", GC_WARNING, false);
         testDump(3, "-XX:+UseSerialGC", "", GC_WARNING, false);
-        testDump(4, "-XX:+UseConcMarkSweepGC", "", GC_WARNING, false);
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            testDump(4, "-XX:+UseConcMarkSweepGC", "", GC_WARNING, false);
+        }
 
         // ======= archive with compressed oops, run w/o
         testDump(5, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, false);
@@ -73,7 +79,9 @@ public class IncompatibleOptions {
         // Still run, to ensure no crash or exception
         testExec(6, "-XX:+UseParallelGC", "", "", false);
         testExec(7, "-XX:+UseSerialGC", "", "", false);
-        testExec(8, "-XX:+UseConcMarkSweepGC", "", "", false);
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            testExec(8, "-XX:+UseConcMarkSweepGC", "", "", false);
+        }
 
         // Test various oops encodings, by varying ObjectAlignmentInBytes and heap sizes
         testDump(9, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=8", null, false);
diff --git a/test/hotspot/jtreg/runtime/exceptionMsgs/NegativeArraySizeException/NegativeArraySizeExceptionTest.java b/test/hotspot/jtreg/runtime/exceptionMsgs/NegativeArraySizeException/NegativeArraySizeExceptionTest.java
new file mode 100644
index 00000000000..51d95fb4417
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NegativeArraySizeException/NegativeArraySizeExceptionTest.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018 SAP SE. 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
+ * @summary Test that NegativeArraySizeException reports the wrong size.
+ * @library /test/lib
+ * @compile NegativeArraySizeExceptionTest.java
+ * @run main NegativeArraySizeExceptionTest
+ */
+
+import java.lang.reflect.Array;
+
+import jdk.test.lib.Asserts;
+
+public class NegativeArraySizeExceptionTest {
+
+    private static void fail () throws Exception {
+        throw new RuntimeException("Array allocation with negative size expected to fail!");
+    }
+
+    public static void main(String[] args) throws Exception {
+        int minusOne = -1;
+        Object r = null;
+
+        // Tests for exception thrown in arrayKlass.cp, ArrayKlass::allocate_arrayArray().
+
+        try {
+            r = new byte[minusOne][];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new Object[Integer.MIN_VALUE][];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in typeArrayKlass.cpp, TypeArrayKlass::allocate_common().
+
+        try {
+            r = new byte[minusOne];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new byte[Integer.MIN_VALUE];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in instanceKlass.cpp, InstanceKlass::allocate_objArray().
+
+        try {
+            r = new Object[minusOne];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new Object[Integer.MIN_VALUE];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in typeArrayKlass.cpp, TypeArrayKlass::allocate_common().
+        // Innermost primitive array of multidimensional array has wrong size.
+
+        try {
+            r = new byte[3][minusOne];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new byte[3][Integer.MIN_VALUE];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in objArrayKlass.cpp, ObjArrayKlass::allocate().
+        // Innermost object array of multidimensional array has wrong size.
+
+        try {
+            r = new Object[3][minusOne];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new Object[3][Integer.MIN_VALUE];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in
+        // Innermost primitive array of multidimensional array has wrong size.
+        // Outer array has size 0.
+
+        try {
+            r = new byte[0][minusOne];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new byte[0][Integer.MIN_VALUE];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in
+        // Innermost object array of multidimensional array has wrong size.
+        // Outer array has size 0.
+
+        try {
+            r = new Object[0][minusOne];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new Object[0][Integer.MIN_VALUE];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in objArrayKlass.cpp, ObjArrayKlass::allocate().
+        // Outer array of multidimensional array has wrong size, inner array
+        // has primitive type.
+
+        try {
+            r = new byte[minusOne][3];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new byte[Integer.MIN_VALUE][3];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in objArrayKlass.cpp, ObjArrayKlass::allocate().
+        // Outer array of multidimensional array has wrong size, inner array
+        // has object type.
+
+        try {
+            r = new Object[minusOne][3];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            r = new Object[Integer.MIN_VALUE][3];
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        // Tests for exception thrown in reflection.cpp, Reflection::reflect_new_array().
+
+        try {
+            Array.newInstance(byte.class, minusOne);
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(byte.class, Integer.MIN_VALUE);
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(NegativeArraySizeException.class, minusOne);
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(NegativeArraySizeException.class, Integer.MIN_VALUE);
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+
+        // Tests for exception thrown in reflection.cpp, Reflection::reflect_new_multi_array().
+
+        try {
+            Array.newInstance(byte.class, new int[] {3, minusOne});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(byte.class, new int[] {3, Integer.MIN_VALUE});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(byte.class, new int[] {0, minusOne});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(byte.class, new int[] {0, Integer.MIN_VALUE});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(NegativeArraySizeException.class, new int[] {3, minusOne});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(NegativeArraySizeException.class, new int[] {3, Integer.MIN_VALUE});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(byte.class, new int[] {minusOne, 3});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(byte.class, new int[] {Integer.MIN_VALUE, 3});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(NegativeArraySizeException.class, new int[] {minusOne, 3});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-1", e.getMessage());
+        }
+
+        try {
+            Array.newInstance(NegativeArraySizeException.class, new int[] {Integer.MIN_VALUE, 3});
+            fail();
+        } catch (NegativeArraySizeException e) {
+            Asserts.assertEQ("-2147483648", e.getMessage());
+        }
+
+        Asserts.assertEQ(r, null, "Expected all tries to allocate negative array to fail.");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java b/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
index 5afbd49ce25..a0605d0ff4f 100644
--- a/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
+++ b/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
@@ -48,22 +48,26 @@ public class BiasedLockingTest {
     }
 
     public static void main(String[] args) throws Exception {
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:biasedlocking",
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseBiasedLocking",
+                                                                  "-Xlog:biasedlocking",
                                                                   "-XX:BiasedLockingStartupDelay=0",
                                                                   InnerClass.class.getName());
         analyzeOutputOn(pb);
 
-        pb = ProcessTools.createJavaProcessBuilder("-XX:+TraceBiasedLocking",
+        pb = ProcessTools.createJavaProcessBuilder("-XX:+UseBiasedLocking",
+                                                   "-XX:+TraceBiasedLocking",
                                                    "-XX:BiasedLockingStartupDelay=0",
                                                    InnerClass.class.getName());
         analyzeOutputOn(pb);
 
-        pb = ProcessTools.createJavaProcessBuilder("-Xlog:biasedlocking=off",
+        pb = ProcessTools.createJavaProcessBuilder("-XX:+UseBiasedLocking",
+                                                   "-Xlog:biasedlocking=off",
                                                    "-XX:BiasedLockingStartupDelay=0",
                                                    InnerClass.class.getName());
         analyzeOutputOff(pb);
 
-        pb = ProcessTools.createJavaProcessBuilder("-XX:-TraceBiasedLocking",
+        pb = ProcessTools.createJavaProcessBuilder("-XX:+UseBiasedLocking",
+                                                   "-XX:-TraceBiasedLocking",
                                                    "-XX:BiasedLockingStartupDelay=0",
                                                    InnerClass.class.getName());
         analyzeOutputOff(pb);
diff --git a/test/hotspot/jtreg/runtime/logging/ClassInitializationTest.java b/test/hotspot/jtreg/runtime/logging/ClassInitializationTest.java
index 90a5bdb4353..cb9b03f77bb 100644
--- a/test/hotspot/jtreg/runtime/logging/ClassInitializationTest.java
+++ b/test/hotspot/jtreg/runtime/logging/ClassInitializationTest.java
@@ -42,7 +42,7 @@ public class ClassInitializationTest {
         // (1)
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:class+init=info",
                                                                   "-Xverify:all",
-                                                                  "-Xmx64m",
+                                                                  "-Xmx128m",
                                                                   "BadMap50");
         OutputAnalyzer out = new OutputAnalyzer(pb.start());
         out.shouldContain("Start class verification for:");
@@ -56,7 +56,7 @@ public class ClassInitializationTest {
             pb = ProcessTools.createJavaProcessBuilder("-Xlog:class+init=info",
                                                        "-Xverify:all",
                                                        "-XX:+EagerInitialization",
-                                                       "-Xmx64m",
+                                                       "-Xmx128m",
                                                        InnerClass.class.getName());
             out = new OutputAnalyzer(pb.start());
             out.shouldContain("[Initialized").shouldContain("without side effects]");
@@ -66,7 +66,7 @@ public class ClassInitializationTest {
         // (3) class+init should turn off.
         pb = ProcessTools.createJavaProcessBuilder("-Xlog:class+init=off",
                                                    "-Xverify:all",
-                                                   "-Xmx64m",
+                                                   "-Xmx128m",
                                                    "BadMap50");
         out = new OutputAnalyzer(pb.start());
         out.shouldNotContain("[class,init]");
diff --git a/test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java b/test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java
index 66909560cbc..4a3c2083386 100644
--- a/test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java
+++ b/test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java
@@ -25,6 +25,7 @@
 /*
  * @test ClassLoadUnloadTest
  * @bug 8142506
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /runtime/testlibrary
  * @library classes
diff --git a/test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java b/test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java
index f3eb5d225c1..545d1cf3b8f 100644
--- a/test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java
+++ b/test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8149991
  * @requires (sun.arch.data.model == "64")
+ * @requires vm.opt.final.UseCompressedOops
  * @summary -Xlog:gc+heap+coops=info should have output from the code
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/logging/DefaultMethodsTest.java b/test/hotspot/jtreg/runtime/logging/DefaultMethodsTest.java
index 757d3478b35..1f5ed9b5f6e 100644
--- a/test/hotspot/jtreg/runtime/logging/DefaultMethodsTest.java
+++ b/test/hotspot/jtreg/runtime/logging/DefaultMethodsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8139564
+ * @bug 8139564 8203960
  * @summary defaultmethods=debug should have logging from each of the statements in the code
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -50,7 +50,15 @@ public class DefaultMethodsTest {
         output.shouldHaveExitValue(0);
     }
 
-    public static class InnerClass {
+    interface TestInterface {
+        default void doSomething() {
+            System.out.println("Default TestInterface");
+        }
+    }
+
+    public static class InnerClass implements TestInterface {
+        // InnerClass implements TestInterface with a default method.
+        // Loading of InnerClass will trigger default method processing.
         public static void main(String[] args) throws Exception {
             System.out.println("Inner Class");
         }
diff --git a/test/hotspot/jtreg/runtime/logging/ProtectionDomainVerificationTest.java b/test/hotspot/jtreg/runtime/logging/ProtectionDomainVerificationTest.java
index 1d145047e86..9c15817e1ac 100644
--- a/test/hotspot/jtreg/runtime/logging/ProtectionDomainVerificationTest.java
+++ b/test/hotspot/jtreg/runtime/logging/ProtectionDomainVerificationTest.java
@@ -39,7 +39,7 @@ public class ProtectionDomainVerificationTest {
 
         // -Xlog:protectiondomain=trace
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:protectiondomain=trace",
-                                                                  "-Xmx64m",
+                                                                  "-Xmx128m",
                                                                   Hello.class.getName());
         OutputAnalyzer out = new OutputAnalyzer(pb.start());
         out.shouldContain("[protectiondomain] Checking package access");
@@ -47,7 +47,7 @@ public class ProtectionDomainVerificationTest {
 
         // -Xlog:protectiondomain=debug
         pb = ProcessTools.createJavaProcessBuilder("-Xlog:protectiondomain=debug",
-                                                                  "-Xmx64m",
+                                                                  "-Xmx128m",
                                                                   Hello.class.getName());
         out = new OutputAnalyzer(pb.start());
         out.shouldContain("[protectiondomain] Checking package access");
diff --git a/test/hotspot/jtreg/runtime/logging/VMOperationTest.java b/test/hotspot/jtreg/runtime/logging/VMOperationTest.java
index 6daa91f00ca..a971e16df0d 100644
--- a/test/hotspot/jtreg/runtime/logging/VMOperationTest.java
+++ b/test/hotspot/jtreg/runtime/logging/VMOperationTest.java
@@ -38,8 +38,8 @@ import jdk.test.lib.process.ProcessTools;
 public class VMOperationTest {
     public static void main(String[] args) throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:vmoperation=debug",
-                                                                  "-Xmx64m",
-                                                                  "-Xms64m",
+                                                                  "-Xmx128m",
+                                                                  "-Xms128m",
                                                                   InternalClass.class.getName());
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("VM_Operation (");
@@ -65,4 +65,3 @@ public class VMOperationTest {
         }
     }
 }
-
diff --git a/test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java b/test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java
index 90075297489..71511695359 100644
--- a/test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java
+++ b/test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java
@@ -23,6 +23,7 @@
 
 /* @test TestLargePagesFlags
  * @summary Tests how large pages are choosen depending on the given large pages flag combinations.
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/memory/MultiAllocateNullCheck.java b/test/hotspot/jtreg/runtime/memory/MultiAllocateNullCheck.java
index cc9dac3cdb6..3fdc3c4a165 100644
--- a/test/hotspot/jtreg/runtime/memory/MultiAllocateNullCheck.java
+++ b/test/hotspot/jtreg/runtime/memory/MultiAllocateNullCheck.java
@@ -25,7 +25,7 @@
  * @test MultiAllocateNullCheck
  * @bug 6726963
  * @summary multi_allocate() call does not CHECK_NULL and causes crash in fastdebug bits
- * @run main/othervm -Xmx32m MultiAllocateNullCheck
+ * @run main/othervm -Xmx128m MultiAllocateNullCheck
  */
 
 import java.lang.reflect.Array;
diff --git a/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java b/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java
index 28c2c5e7f95..c27c24cc39e 100644
--- a/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java
+++ b/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java
@@ -53,7 +53,7 @@ public class ReadFromNoaccessArea {
           "-XX:+UseCompressedOops",
           "-XX:HeapBaseMinAddress=33G",
           "-XX:-CreateCoredumpOnCrash",
-          "-Xmx32m",
+          "-Xmx128m",
           DummyClassWithMainTryingToReadFromNoaccessArea.class.getName());
 
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/memory/ReserveMemory.java b/test/hotspot/jtreg/runtime/memory/ReserveMemory.java
index f3e536504e5..63cdc2919da 100644
--- a/test/hotspot/jtreg/runtime/memory/ReserveMemory.java
+++ b/test/hotspot/jtreg/runtime/memory/ReserveMemory.java
@@ -57,7 +57,7 @@ public class ReserveMemory {
           "-XX:+WhiteBoxAPI",
           "-XX:-TransmitErrorReport",
           "-XX:-CreateCoredumpOnCrash",
-          "-Xmx32m",
+          "-Xmx128m",
           "ReserveMemory",
           "test");
 
diff --git a/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModule.java b/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModule.java
new file mode 100644
index 00000000000..137d08852e6
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModule.java
@@ -0,0 +1,55 @@
+/*
+ * 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 jdk.internal.misc.Unsafe;
+
+public class ClassLoaderNoUnnamedModule {
+    static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    class TestClass extends ClassLoader {
+        public boolean calledConstructor = false;
+
+        public TestClass() {
+            calledConstructor = true;
+        }
+    }
+
+    static void testConstructorCall() throws Exception {
+        // Use Unsafe allocateInstance to construct an instance of TestClass
+        // which does not invoke its super's, java.lang.ClassLoader, constructor.
+        // An unnamed module for this ClassLoader is not created.
+        TestClass tc = (TestClass)UNSAFE.allocateInstance(TestClass.class);
+        System.out.println("tc = " + tc + "tc's ctor called = " + tc.calledConstructor);
+        Module unnamed_module = tc.getUnnamedModule();
+        if (unnamed_module == null) {
+            System.out.println("The unnamed module for this class loader is null");
+        }
+
+        tc.loadClass(String.class.getName());
+        Class.forName(String.class.getName(), false, tc);
+    }
+
+    public static void main(String args[]) throws Exception {
+        testConstructorCall();
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModuleTest.java b/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModuleTest.java
new file mode 100644
index 00000000000..5c488741ac1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModuleTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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 8202758
+ * @summary Ensure that if the JVM encounters a ClassLoader whose unnamedModule field is not set an InternalError results.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @compile ClassLoaderNoUnnamedModule.java
+ * @run main/othervm ClassLoaderNoUnnamedModuleTest
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ClassLoaderNoUnnamedModuleTest {
+    public static void main(String args[]) throws Throwable {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                               "--add-modules=java.base",
+                               "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED",
+                               "-XX:-CreateCoredumpOnCrash",
+                               "ClassLoaderNoUnnamedModule");
+        OutputAnalyzer oa = new OutputAnalyzer(pb.start());
+        oa.shouldContain("Internal Error");
+        oa.shouldContain("unnamed module");
+        oa.shouldContain("null or not an instance of java.lang.Module");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java b/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java
index 6686666df8c..cba2e635835 100644
--- a/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java
+++ b/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java
@@ -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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary Ensure module information is cleaned when owning class loader unloads
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  * @library /test/lib ..
  * @build sun.hotspot.WhiteBox
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigalrm.java b/test/hotspot/jtreg/runtime/signal/TestSigalrm.java
index 337a97e0706..e90dac0c0f6 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigalrm.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigalrm.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigalrm01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigbus.java b/test/hotspot/jtreg/runtime/signal/TestSigbus.java
index ce1c04e50ea..8b81be8caa4 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigbus.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigbus.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigbus01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigcld.java b/test/hotspot/jtreg/runtime/signal/TestSigcld.java
index 8b84ed97951..ec847f24d85 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigcld.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigcld.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigcld01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigcont.java b/test/hotspot/jtreg/runtime/signal/TestSigcont.java
index d0e3106f251..4e0b9137d42 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigcont.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigcont.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigcont01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigemt.java b/test/hotspot/jtreg/runtime/signal/TestSigemt.java
index 0614f87fbcc..295294c92a7 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigemt.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigemt.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigemt01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigfpe.java b/test/hotspot/jtreg/runtime/signal/TestSigfpe.java
index bd9977f3855..c790ef6abc9 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigfpe.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigfpe.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigfpe01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java b/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java
index d335fd7b129..34ae0a85f01 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigfreeze01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSighup.java b/test/hotspot/jtreg/runtime/signal/TestSighup.java
index 6ac820d4a1f..3176545d864 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSighup.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSighup.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sighup01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigill.java b/test/hotspot/jtreg/runtime/signal/TestSigill.java
index f24d9a024d5..6771dda2e3e 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigill.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigill.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigill01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigint.java b/test/hotspot/jtreg/runtime/signal/TestSigint.java
index 4c6f8eafb52..d028f2da83e 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigint.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigint.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigint01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigiot.java b/test/hotspot/jtreg/runtime/signal/TestSigiot.java
index 107c04422bf..2f20448fc69 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigiot.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigiot.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigiot01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSiglost.java b/test/hotspot/jtreg/runtime/signal/TestSiglost.java
index 0b2582a61ea..792806eab8f 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSiglost.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSiglost.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/siglost01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSiglwp.java b/test/hotspot/jtreg/runtime/signal/TestSiglwp.java
index 3641c827785..66ccb9fda27 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSiglwp.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSiglwp.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/siglwp01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigpipe.java b/test/hotspot/jtreg/runtime/signal/TestSigpipe.java
index 98476b71912..b82ac815359 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigpipe.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigpipe.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigpipe01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigpoll.java b/test/hotspot/jtreg/runtime/signal/TestSigpoll.java
index 777ea2d97ad..016ebcf4ea1 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigpoll.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigpoll.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigpoll01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigprof.java b/test/hotspot/jtreg/runtime/signal/TestSigprof.java
index e9185146c4d..8a7e908592b 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigprof.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigprof.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigprof01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigpwr.java b/test/hotspot/jtreg/runtime/signal/TestSigpwr.java
index 50c670d468e..415cf8aff42 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigpwr.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigpwr.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigpwr01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigquit.java b/test/hotspot/jtreg/runtime/signal/TestSigquit.java
index f83b9f64a20..c896084de5c 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigquit.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigquit.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigquit01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigsegv.java b/test/hotspot/jtreg/runtime/signal/TestSigsegv.java
index 2524e6d6dff..ac4c0ef39ab 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigsegv.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigsegv.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigsegv01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigstop.java b/test/hotspot/jtreg/runtime/signal/TestSigstop.java
index a6ce690da0f..01e49df22c4 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigstop.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigstop.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigstop01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigsys.java b/test/hotspot/jtreg/runtime/signal/TestSigsys.java
index 32fc4dcc07f..db435d417b9 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigsys.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigsys.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigsys01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigterm.java b/test/hotspot/jtreg/runtime/signal/TestSigterm.java
index b61897dc210..d7c21a026ca 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigterm.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigterm.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigterm01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigthaw.java b/test/hotspot/jtreg/runtime/signal/TestSigthaw.java
index 01e163c4083..62b15cd9517 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigthaw.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigthaw.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigthaw01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigtrap.java b/test/hotspot/jtreg/runtime/signal/TestSigtrap.java
index 46ead06c6b0..d91f1310096 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigtrap.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigtrap.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigtrap01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigtstp.java b/test/hotspot/jtreg/runtime/signal/TestSigtstp.java
index fcb5e6a0ce9..d2c3fc869c9 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigtstp.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigtstp.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigtstp01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigttin.java b/test/hotspot/jtreg/runtime/signal/TestSigttin.java
index 48e35345546..53ad313b2fa 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigttin.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigttin.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigttin01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigttou.java b/test/hotspot/jtreg/runtime/signal/TestSigttou.java
index 1a3ffd60d52..68bb92a591e 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigttou.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigttou.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigttou01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigurg.java b/test/hotspot/jtreg/runtime/signal/TestSigurg.java
index 05fb609a06a..e12dbe19fda 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigurg.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigurg.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigurg01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigusr1.java b/test/hotspot/jtreg/runtime/signal/TestSigusr1.java
index 9f1fadc1968..1177f613624 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigusr1.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigusr1.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigusr101.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigusr2.java b/test/hotspot/jtreg/runtime/signal/TestSigusr2.java
index 915c2e97aa8..180c6d730f0 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigusr2.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigusr2.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigusr201.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java b/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java
index 031e3c679ca..bbeee112c6a 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigvtalrm01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigwinch.java b/test/hotspot/jtreg/runtime/signal/TestSigwinch.java
index de169ffea24..e61d3690413 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigwinch.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigwinch.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigwinch01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java b/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java
index c63c68922b6..bfc72259d5a 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigxcpu01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java b/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java
index 1aecbfdd040..0d3be31888b 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigxfsz01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigxres.java b/test/hotspot/jtreg/runtime/signal/TestSigxres.java
index 7d099e4e8b6..a4c17867b6c 100644
--- a/test/hotspot/jtreg/runtime/signal/TestSigxres.java
+++ b/test/hotspot/jtreg/runtime/signal/TestSigxres.java
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @requires os.family != "windows"
+ * @requires os.family != "windows" & os.family != "aix"
  *
  * @summary converted from VM testbase runtime/signal/sigxres01.
  * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java
index a1b79533a3a..d947eaa83b7 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java
@@ -24,6 +24,7 @@
 /*
  * @test CompilerQueueTest
  * @bug 8054889
+ * @key intermittent
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.compiler
diff --git a/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java
index 267e91381a5..6156f46905c 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java
@@ -36,6 +36,7 @@ import jdk.test.lib.dcmd.JMXExecutor;
 /*
  * @test
  * @summary Test of diagnostic command GC.run
+ * @requires vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java
new file mode 100644
index 00000000000..8fdfef53207
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, SAP SE. 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
+ * @summary Test of diagnostic command VM.classloaders
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.compiler
+ *          java.management
+ *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @run testng ClassLoaderHierarchyTest
+ */
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.JMXExecutor;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+public class ClassLoaderHierarchyTest {
+
+//+-- <bootstrap>
+//      |
+//      +-- "platform", jdk.internal.loader.ClassLoaders$PlatformClassLoader
+//      |     |
+//      |     +-- "app", jdk.internal.loader.ClassLoaders$AppClassLoader
+//      |
+//      +-- jdk.internal.reflect.DelegatingClassLoader
+//      |
+//      +-- "Kevin", ClassLoaderHierarchyTest$TestClassLoader
+//      |
+//      +-- ClassLoaderHierarchyTest$TestClassLoader
+//            |
+//            +-- "Bill", ClassLoaderHierarchyTest$TestClassLoader
+
+    public void run(CommandExecutor executor) throws ClassNotFoundException {
+
+        ClassLoader unnamed_cl = new TestClassLoader(null, null);
+        Class<?> c1 = Class.forName("TestClass2", true, unnamed_cl);
+        if (c1.getClassLoader() != unnamed_cl) {
+            Assert.fail("TestClass defined by wrong classloader: " + c1.getClassLoader());
+        }
+
+        ClassLoader named_cl = new TestClassLoader("Kevin", null);
+        Class<?> c2 = Class.forName("TestClass2", true, named_cl);
+        if (c2.getClassLoader() != named_cl) {
+            Assert.fail("TestClass defined by wrong classloader: " + c2.getClassLoader());
+        }
+
+        ClassLoader named_child_cl = new TestClassLoader("Bill", unnamed_cl);
+        Class<?> c3 = Class.forName("TestClass2", true, named_child_cl);
+        if (c3.getClassLoader() != named_child_cl) {
+            Assert.fail("TestClass defined by wrong classloader: " + c3.getClassLoader());
+        }
+
+        // First test: simple output, no classes displayed
+        OutputAnalyzer output = executor.execute("VM.classloaders");
+        output.shouldContain("<bootstrap>");
+        output.shouldMatch(".*TestClassLoader");
+        output.shouldMatch("Kevin.*TestClassLoader");
+        output.shouldMatch("Bill.*TestClassLoader");
+
+        // Second test: print with classes.
+        output = executor.execute("VM.classloaders show-classes");
+        output.shouldContain("<bootstrap>");
+        output.shouldContain("java.lang.Object");
+        output.shouldMatch(".*TestClassLoader");
+        output.shouldMatch("Kevin.*TestClassLoader");
+        output.shouldMatch("Bill.*TestClassLoader");
+        output.shouldContain("TestClass2");
+    }
+
+    static class TestClassLoader extends ClassLoader {
+
+        public TestClassLoader() {
+            super();
+        }
+
+        public TestClassLoader(String name, ClassLoader parent) {
+            super(name, parent);
+        }
+
+        public static final String CLASS_NAME = "TestClass2";
+
+        static ByteBuffer readClassFile(String name)
+        {
+            File f = new File(System.getProperty("test.classes", "."),
+                              name);
+            try (FileInputStream fin = new FileInputStream(f);
+                 FileChannel fc = fin.getChannel())
+            {
+                return fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
+            } catch (IOException e) {
+                Assert.fail("Can't open file: " + name, e);
+            }
+
+            /* Will not reach here as Assert.fail() throws exception */
+            return null;
+        }
+
+        protected Class<?> loadClass(String name, boolean resolve)
+            throws ClassNotFoundException
+        {
+            Class<?> c;
+            if (!CLASS_NAME.equals(name)) {
+                c = super.loadClass(name, resolve);
+            } else {
+                // should not delegate to the system class loader
+                c = findClass(name);
+                if (resolve) {
+                    resolveClass(c);
+                }
+            }
+            return c;
+        }
+
+        protected Class<?> findClass(String name)
+            throws ClassNotFoundException
+        {
+            if (!CLASS_NAME.equals(name)) {
+                throw new ClassNotFoundException("Unexpected class: " + name);
+            }
+            return defineClass(name, readClassFile(name + ".class"), null);
+        }
+
+    }
+
+    @Test
+    public void jmx() throws ClassNotFoundException {
+        run(new JMXExecutor());
+    }
+
+}
+
+class TestClass2 {
+    static {
+        Runnable r = () -> System.out.println("Hello");
+        r.run();
+    }
+}
+
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/JvmtiGetSystemPropertyTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/JvmtiGetSystemPropertyTest.java
new file mode 100644
index 00000000000..7c86182a9fd
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/JvmtiGetSystemPropertyTest.java
@@ -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 8203329
+ * @summary Verifies the JVMTI GetSystemProperty API returns the updated java.vm.info value
+ * @library /test/lib
+ * @run main/othervm/native -agentlib:JvmtiGetSystemPropertyTest JvmtiGetSystemPropertyTest
+ *
+ */
+
+public class JvmtiGetSystemPropertyTest {
+    private static native String getSystemProperty();
+
+    public static void main(String[] args) throws Exception {
+        String vm_info = System.getProperty("java.vm.info");
+        String vm_info_jvmti = getSystemProperty();
+        System.out.println("java.vm.info from java:  " + vm_info);
+        System.out.println("java.vm.info from jvmti: " + vm_info_jvmti);
+        if (!vm_info.equals(vm_info_jvmti)) {
+            throw new RuntimeException("java.vm.info poperties not equal: \"" +
+                                       vm_info + "\" != \"" + vm_info_jvmti + "\"");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/libJvmtiGetSystemPropertyTest.c b/test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/libJvmtiGetSystemPropertyTest.c
new file mode 100644
index 00000000000..ad5f835e4b0
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/libJvmtiGetSystemPropertyTest.c
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <jvmti.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static jvmtiEnv *jvmti = NULL;
+
+JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+  int err = (*jvm)->GetEnv(jvm, (void**) &jvmti, JVMTI_VERSION_9);
+  if (err != JNI_OK) {
+    return JNI_ERR;
+  }
+  return JNI_OK;
+}
+
+JNIEXPORT jstring JNICALL
+Java_JvmtiGetSystemPropertyTest_getSystemProperty(JNIEnv *env, jclass cls) {
+  jvmtiError err;
+  char* prop_value;
+
+  err = (*jvmti)->GetSystemProperty(jvmti, "java.vm.info", &prop_value);
+  if (err != JVMTI_ERROR_NONE) {
+    return NULL;
+  }
+
+  return (*env)->NewStringUTF(env, prop_value);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/serviceability/jvmti/NotifyFramePop/NotifyFramePopTest.java b/test/hotspot/jtreg/serviceability/jvmti/NotifyFramePop/NotifyFramePopTest.java
new file mode 100644
index 00000000000..0e4a770f3bc
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/NotifyFramePop/NotifyFramePopTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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
+ * @summary Verifies NotifyFramePop request is cleared if JVMTI_EVENT_FRAME_POP is disabled
+ * @compile NotifyFramePopTest.java
+ * @run main/othervm/native -agentlib:NotifyFramePopTest NotifyFramePopTest
+ */
+
+public class NotifyFramePopTest {
+    static {
+        try {
+            System.loadLibrary("NotifyFramePopTest");
+        } catch (UnsatisfiedLinkError ex) {
+            System.err.println("Could not load NotifyFramePopTest library");
+            System.err.println("java.library.path:"
+                + System.getProperty("java.library.path"));
+            throw ex;
+        }
+    }
+
+    public static void main(String args[]) {
+        if (!canGenerateFramePopEvents()) {
+            log("FramePop event is not supported - skipping the test");
+            return;
+        }
+
+        // Sanity testing that FRAME_POP works.
+        test("sanity", true, () -> {
+            setFramePopNotificationMode(true);
+            notifyFramePop(null);
+        });
+
+        // Request notification and then disable FRAME_POP event notification.
+        // This should not prevent the notification for the frame being cleared
+        // when we return from the method.
+        test("requestAndDisable", false, () -> {
+            setFramePopNotificationMode(true);
+            notifyFramePop(null);
+            setFramePopNotificationMode(false);
+        });
+
+        // Ensure there is no pending event
+        test("ensureCleared", false, () -> {
+            setFramePopNotificationMode(true);
+        });
+
+        log("Test PASSED");
+    }
+
+    private native static boolean canGenerateFramePopEvents();
+    private native static void setFramePopNotificationMode(boolean enabled);
+    private native static void notifyFramePop(Thread thread);
+    private native static boolean framePopReceived();
+
+    private static void log(String msg) {
+        System.out.println(msg);
+    }
+
+    private interface Test {
+        void test();
+    }
+
+    private static void test(String name, boolean framePopExpected, Test theTest) {
+        log("test: " + name);
+        theTest.test();
+        boolean actual = framePopReceived();
+        if (framePopExpected != actual) {
+            throw new RuntimeException("unexpected notification:"
+                    + " FramePop expected: " + (framePopExpected ? "yes" : "no")
+                    + ", actually received: " + (actual ? "yes" : "no"));
+        }
+        log("  - OK (" + (actual ? "received" : "NOT received") + ")");
+    }
+
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/NotifyFramePop/libNotifyFramePopTest.c b/test/hotspot/jtreg/serviceability/jvmti/NotifyFramePop/libNotifyFramePopTest.c
new file mode 100644
index 00000000000..8553f6632c3
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/NotifyFramePop/libNotifyFramePopTest.c
@@ -0,0 +1,173 @@
+/*
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "jvmti.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
+
+static jvmtiEnv *jvmti = NULL;
+static jvmtiCapabilities caps;
+static jvmtiEventCallbacks callbacks;
+static jboolean framePopReceived = JNI_FALSE;
+
+static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
+
+JNIEXPORT
+jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+    return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT
+jint JNICALL Agent_OnAttach(JavaVM *jvm, char *options, void *reserved) {
+    return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT
+jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
+    return JNI_VERSION_9;
+}
+
+
+static void reportError(const char *msg, int err) {
+    fprintf(stdout, "%s, error: %d\n", msg, err);
+    fflush(stdout);
+}
+
+
+static void JNICALL
+FramePop(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
+         jmethodID method, jboolean wasPoppedByException)
+{
+    jvmtiError err;
+    jclass cls = NULL;
+    char* csig = NULL;
+    char* name = NULL;
+    char* sign = NULL;
+
+    framePopReceived = JNI_TRUE;
+
+    err = (*jvmti_env)->GetMethodDeclaringClass(jvmti_env, method, &cls);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("FramePop: GetMethodDeclaringClass failed", err);
+    }
+    err = (*jvmti_env)->GetClassSignature(jvmti_env, cls, &csig, NULL);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("FramePop: GetClassSignature failed", err);
+    }
+    err = (*jvmti_env)->GetMethodName(jvmti_env, method, &name, &sign, NULL);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("FramePop: GetMethodName failed", err);
+    }
+    fprintf(stdout, "FramePop event from method: %s %s%s\n", csig, name, sign);
+    fflush(stdout);
+
+    (*jvmti_env)->Deallocate(jvmti_env, (unsigned char*)csig);
+    (*jvmti_env)->Deallocate(jvmti_env, (unsigned char*)name);
+    (*jvmti_env)->Deallocate(jvmti_env, (unsigned char*)sign);
+}
+
+static
+jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+    jint res;
+    jvmtiError err;
+
+    res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_9);
+    if (res != JNI_OK || jvmti == NULL) {
+        reportError("GetEnv(JVMTI_VERSION_9) failed", res);
+        return JNI_ERR;
+    }
+    err = (*jvmti)->GetPotentialCapabilities(jvmti, &caps);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("GetPotentialCapabilities failed", err);
+        return JNI_ERR;
+    }
+    err = (*jvmti)->AddCapabilities(jvmti, &caps);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("AddCapabilities failed",err);
+        return JNI_ERR;
+    }
+    err = (*jvmti)->GetCapabilities(jvmti, &caps);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("GetCapabilities failed", err);
+        return JNI_ERR;
+    }
+    if (caps.can_generate_frame_pop_events) {
+        callbacks.FramePop = &FramePop;
+        err = (*jvmti)->SetEventCallbacks(jvmti, &callbacks, sizeof(callbacks));
+        if (err != JVMTI_ERROR_NONE) {
+            reportError("SetEventCallbacks failed", err);
+            return JNI_ERR;
+        }
+    }
+    return JNI_OK;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_NotifyFramePopTest_canGenerateFramePopEvents(JNIEnv *env, jclass cls) {
+    return caps.can_generate_frame_pop_events ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_NotifyFramePopTest_setFramePopNotificationMode(JNIEnv *env, jclass cl, jboolean enable) {
+    jvmtiEventMode mode = enable ? JVMTI_ENABLE : JVMTI_DISABLE;
+    jvmtiError err = (*jvmti)->SetEventNotificationMode(jvmti, mode, JVMTI_EVENT_FRAME_POP, NULL);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("Failed to set notification mode for FRAME_POP events", err);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_NotifyFramePopTest_notifyFramePop(JNIEnv *env, jclass cls, jthread thread)
+{
+    jvmtiError err= (*jvmti)->NotifyFramePop(jvmti, thread, 1);
+    if (err != JVMTI_ERROR_NONE) {
+        reportError("NotifyFramePop failed", err);
+    }
+}
+
+JNIEXPORT jboolean JNICALL
+Java_NotifyFramePopTest_framePopReceived(JNIEnv *env, jclass cls) {
+    jboolean result = framePopReceived;
+    framePopReceived = JNI_FALSE;
+    return result;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
index 22186683536..0941c538ce1 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
@@ -40,6 +40,7 @@ import jdk.test.lib.Utils;
  * @test
  * @library /test/lib
  * @requires os.family != "mac"
+ * @requires vm.gc.G1
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.gc.g1
  *          jdk.hotspot.agent/sun.jvm.hotspot.memory
diff --git a/test/hotspot/jtreg/serviceability/sa/TestUniverse.java b/test/hotspot/jtreg/serviceability/sa/TestUniverse.java
index e820861a2b1..4b719390f5d 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestUniverse.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestUniverse.java
@@ -21,6 +21,8 @@
  * questions.
  */
 
+import sun.hotspot.code.Compiler;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.io.IOException;
@@ -34,10 +36,25 @@ import jdk.test.lib.process.OutputAnalyzer;
 /*
  * @test
  * @summary Test the 'universe' command of jhsdb clhsdb.
+ * @requires vm.gc != "Z"
  * @bug 8190307
  * @library /test/lib
  * @build jdk.test.lib.apps.*
- * @run main/othervm TestUniverse
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. TestUniverse withoutZ
+ */
+
+/*
+ * @test
+ * @summary Test the 'universe' command of jhsdb clhsdb.
+ * @requires vm.gc == "Z"
+ * @bug 8190307
+ * @library /test/lib
+ * @build jdk.test.lib.apps.*
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. TestUniverse withZ
  */
 
 public class TestUniverse {
@@ -80,6 +97,9 @@ public class TestUniverse {
             p.destroyForcibly();
             throw new Error("Problem awaiting the child process: " + ie, ie);
         }
+        if (gc.contains("UseZGC")) {
+            output.shouldContain("ZHeap");
+        }
 
         output.shouldHaveExitValue(0);
         System.out.println(output.getOutput());
@@ -102,13 +122,19 @@ public class TestUniverse {
             output.shouldContain("PSYoungGen");
             output.shouldContain("eden");
         }
-
+        if (gc.contains("UseEpsilonGC")) {
+            output.shouldContain("Epsilon heap");
+            output.shouldContain("reserved");
+            output.shouldContain("committed");
+            output.shouldContain("used");
+        }
     }
 
     public static void test(String gc) throws Exception {
         LingeredApp app = null;
         try {
             List<String> vmArgs = new ArrayList<String>();
+            vmArgs.add("-XX:+UnlockExperimentalVMOptions"); // unlock experimental GCs
             vmArgs.add(gc);
             app = LingeredApp.startApp(vmArgs);
             System.out.println ("Started LingeredApp with the GC option " + gc +
@@ -132,7 +158,13 @@ public class TestUniverse {
             test("-XX:+UseG1GC");
             test("-XX:+UseParallelGC");
             test("-XX:+UseSerialGC");
-            test("-XX:+UseConcMarkSweepGC");
+            if (!Compiler.isGraalEnabled()) { // Graal does not support all GCs
+                test("-XX:+UseConcMarkSweepGC");
+                if (args[0].equals("withZ")) {
+                    test("-XX:+UseZGC");
+                }
+            }
+            test("-XX:+UseEpsilonGC");
         } catch (Exception e) {
             throw new Error("Test failed with " + e);
         }
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCapacityTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCapacityTest.java
index 820c8dab35d..4347b4e4565 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCapacityTest.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCapacityTest.java
@@ -27,6 +27,7 @@ import utils.*;
  * @test
  * @summary Test checks the consistency of the output
  * displayed with jstat -gccapacity.
+ * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @library ../share
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest01.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest01.java
index 96f0728a349..6900b74eec4 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest01.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest01.java
@@ -32,6 +32,7 @@
  * @library /test/lib
  * @library ../share
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
+ * @requires vm.gc != "Z"
  * @run main/othervm -XX:+UsePerfData -Xmx128M GcCauseTest01
  */
 import utils.*;
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest02.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest02.java
index b92ea57d0a8..4ff045ce46d 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest02.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest02.java
@@ -28,6 +28,7 @@
  *          test forces debuggee application eat ~70% of heap and runs jstat.
  *          jstat should show actual usage of old gen (OC/OU ~= old gen usage).
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
+ * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @library ../share
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest03.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest03.java
index 13bd73b5303..018f7b61b95 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest03.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest03.java
@@ -27,6 +27,7 @@
  *          Test scenario:
  *          test forces debuggee application call System.gc(), runs jstat and checks that
  *          cause of last garbage collection displayed by jstat (LGCC) is 'System.gc()'.
+ * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @library ../share
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcNewTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcNewTest.java
index 4719baa6239..c676689f895 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcNewTest.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcNewTest.java
@@ -29,6 +29,7 @@ import utils.*;
  *          test several times provokes garbage collection in the debuggee application and after each garbage
  *          collection runs jstat. jstat should show that after garbage collection number of GC events and garbage
  *          collection time increase.
+ * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @library ../share
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest01.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest01.java
index 6ee18f3f3bb..c2ead3a11d9 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest01.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest01.java
@@ -35,6 +35,7 @@
  * @library /test/lib
  * @library ../share
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
+ * @requires vm.gc != "Z"
  * @run main/othervm -XX:+UsePerfData -Xmx128M GcTest01
  */
 import utils.*;
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest02.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest02.java
index a0e0cb4fcac..93a109cb60c 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest02.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest02.java
@@ -28,6 +28,7 @@
  *          test forces debuggee application eat ~70% of heap and runs jstat.
  *          jstat should show actual usage of old gen (OC/OU ~= old gen usage).
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
+ * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @library ../share
diff --git a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java
index 952e34182a3..ca6cf25b1c1 100644
--- a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java
+++ b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -37,6 +37,7 @@ import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
 public abstract class TestsGenerator implements BiConsumer<IRNode, IRNode> {
+    private static final int DEFAULT_JTREG_TIMEOUT = 120;
     protected static final String JAVA_BIN = getJavaPath();
     protected static final String JAVAC = Paths.get(JAVA_BIN, "javac").toString();
     protected static final String JAVA = Paths.get(JAVA_BIN, "java").toString();
@@ -73,15 +74,17 @@ public abstract class TestsGenerator implements BiConsumer<IRNode, IRNode> {
         pb.redirectError(new File(name + ".err"));
         pb.redirectOutput(new File(name + ".out"));
         Process process = pb.start();
-        if (process.waitFor(Automatic.MINUTES_TO_WAIT, TimeUnit.MINUTES)) {
-            try (FileWriter file = new FileWriter(name + ".exit")) {
-                file.write(Integer.toString(process.exitValue()));
+        try {
+            if (process.waitFor(DEFAULT_JTREG_TIMEOUT, TimeUnit.SECONDS)) {
+                try (FileWriter file = new FileWriter(name + ".exit")) {
+                    file.write(Integer.toString(process.exitValue()));
+                }
+                return process.exitValue();
             }
-            return process.exitValue();
-        } else {
+        } finally {
             process.destroyForcibly();
-            return -1;
         }
+        return -1;
     }
 
     protected static void compilePrinter() {
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC/LoadUnloadGC.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC/LoadUnloadGC.java
index 11dcf233536..8ccf2ad3e05 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC/LoadUnloadGC.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC/LoadUnloadGC.java
@@ -34,6 +34,7 @@
  * garbage collection takes place because their classloader is made unreachable
  * at the end of the each loop iteration. The loop is repeated 1000 times.
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
diff --git a/test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java b/test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java
index 7b59640fa8f..193ea5bc3f2 100644
--- a/test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java
@@ -33,6 +33,7 @@
  *     parsed by HprofParser. It fills metaspace with classes till OutOfMemoryError,
  *     then uses JMap to create heap dump and then verifies created heap dump with HprofParser.
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
@@ -40,4 +41,3 @@
  *        heapdump.share.EatMemory
  * @run shell/timeout=300 run.sh
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayBounds/ArrayBounds.java b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayBounds/ArrayBounds.java
new file mode 100644
index 00000000000..68a9b5bda48
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayBounds/ArrayBounds.java
@@ -0,0 +1,240 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/Arrays/ArrayBounds.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.Arrays.ArrayBounds.ArrayBounds
+ */
+
+package jit.Arrays.ArrayBounds;
+
+/*
+SCCS ID : @(#)ArrayBounds.java  1.2 02/07/16
+*/
+/* The intent of this Java program is to expose Virtual Machines that
+   make illegal array bounds check removal optimizations. */
+
+/* There are a variety of potential semantic problems with array bounds
+   checking.
+
+   One source of potential bounds-check problems is a compiler that
+   "hoist"s bounds checks outside of loops.  This may either either
+   because an array access is loop invariant, or because the compiler
+   is clever enough to determine a loop-invariant "sufficient
+   condition" that guarantees the safety of the safety of one or more
+   accesses within the loop.
+
+   While this is a good approach, it has a variety of possible
+   pitfalls:
+
+     1) If a hoisted test fails, you can't just raise a bounds-check
+        exception when the test fails; the loop may have had global
+        side effects before the exception was supposed to have been
+        raised.  [prematureExceptionTest]
+
+     2) A hoisted test may itself generate an exception (such as a
+        null pointer exception).  Again, this must not be reflected
+        prematurely if the loop has global side effects that should be
+        observed.
+
+     3) An implementation might fail to be conservative enough about
+        the possible side effects of a method call within the loop.
+        For example, when an array being accessed within a loop is
+        accessed as a static or instance variable, then any call must
+        be assumed to possibly modify the array variable itself (in
+        the absence of pretty clever proof techniques!)  So no hoisted
+        predicate mentioning the array length (as most will) can be
+        loop-invariant.
+
+     4) In some implementations, the code generated for a bounds-check
+        implicitly does a null check as well.  For example, it may
+        access an array length field in the object header.  On systems
+        where the 0-th page is protected, this might ensure an OS
+        signal for a null array pointer.  But if a bounds check is
+        elided, the generated code might only access the null pointer
+        at a large offset, beyond the protected page, and fail to
+        produce a null pointer exception.
+
+     5) Multi-dimensional arrays are annoying for bounds-check removal.
+        If a loop over "i" accesses "a[i][j]" (where "j" is invariant in
+        the loop, then "a[i]" is not loop-invariant; it changes every
+        iteration.  Even if a two-dimensional array were "rectangular"
+        when a loop begins, nothing guarantees that another thread
+        won't update some "a[k]" during the loop.  If the compiler
+        hoisted some bounds check comparing "j" to the presumed length
+        of all the "a[k]", and a shorter array were written to some
+        "a[k]" during the loop, then we might miss a necessary array
+        bounds exception.
+*/
+
+import nsk.share.TestFailure;
+
+
+public class ArrayBounds {
+  private static int global;
+
+  private static int[] aplIota(int n) {
+    int[] a = new int[n];
+    for (int j = 0; j < n; j++) a[j] = j;
+    return a;
+  }
+
+  private static int prematureExceptionWork(int[] a, int n) {
+    global = 0;
+    int sum = 0;
+    try {
+      for (int i = 0; i < n; i++) {
+        global++; sum += a[i];
+      }
+    } catch (ArrayIndexOutOfBoundsException t) {}
+    return sum;
+  }
+  private static void prematureException() {
+    int[] a = aplIota(10);
+    int sum = prematureExceptionWork(a, 11);
+    if (global != 11 || sum != 45) {
+      throw new TestFailure("Premature exception test failed.");
+    }
+  }
+
+  private static class Foo {
+    int[] a;
+  }
+
+  private static int exceptionInHoistedPredWork(Foo f, int n) {
+    global = 0;
+    int sum = 0;
+    try {
+      for (int i = 0; i < n; i++) {
+        global++; sum += f.a[i];
+      }
+    } catch (NullPointerException t) {}
+    return sum;
+  }
+  private static void exceptionInHoistedPred() {
+    int sum = exceptionInHoistedPredWork(null, 10);
+    if (global != 1 || sum != 0) {
+      throw new TestFailure("Premature exception test failed.");
+    }
+  }
+
+  private static void changeLength(Foo f, int n) {
+    int[] a = aplIota(n);
+    f.a = a;
+  }
+  private static int arraySideEffectWork(Foo f, int n) {
+    int sum = 0;
+    try {
+      for (int i = 0; i < n; i++) {
+        sum += f.a[i];
+        if (i == 0) changeLength(f, 5);
+      }
+    } catch (ArrayIndexOutOfBoundsException t) {}
+    return sum;
+  }
+  private static void arraySideEffect() {
+    int[] a = aplIota(10);
+    Foo f = new Foo(); f.a = a;
+    int sum = arraySideEffectWork(f, 10);
+    if (sum != 10) {
+      throw new TestFailure("Array side effect test failed (" + sum + ")");
+    }
+  }
+
+  private static boolean nullArrayWork(int[] a, int n) {
+    int sum = 0;
+    global = 0;
+    boolean x = false;
+    try {
+      for (int i = 0; i < n; i++) {
+        global++; sum += a[i];
+      }
+    } catch (NullPointerException t) {
+      x = true;
+    }
+    return x;
+  }
+  private static void nullArray() {
+     /* 30000 should be larger than most pages sizes! */
+    if (!nullArrayWork(null, 30000) || global != 1) {
+      throw new TestFailure("nullArray test failed.");
+    }
+  }
+
+  private static int[][] aa = new int[10][20];
+  static {
+    for (int i = 0; i < 10; i++) aa[i] = aplIota(20);
+  }
+  private static class ArrayMutator extends Thread {
+    int[][] aa; int newN;
+    ArrayMutator(int[][] aa, int newN) {
+      super();
+      this.aa = aa; this.newN = newN;
+    }
+    public void run() {
+      aa[1] = aplIota(newN);
+    }
+  }
+
+  private static int array2DWork(int[][] aa, int m, int n) {
+    int sum = 0;
+    global = 0;
+    try {
+      for (int i = 0; i < m; i++) {
+        for (int j = 0; j < n; j++) {
+          global++; sum += aa[i][j];
+          if (i == 0 && j == 0) {
+            Thread t = new ArrayMutator(aa, n/2);
+            try {
+              t.start();
+              t.join();
+            } catch (InterruptedException x) {}
+          }
+        }
+      }
+    } catch (ArrayIndexOutOfBoundsException t) {}
+    return sum;
+  }
+  private static void array2D() {
+    int sum = array2DWork(aa, aa.length, aa[0].length);
+    if (sum != 19*20/2 + 9*10/2 || global != 20 + 10 + 1) {
+      throw new TestFailure("array2D test failed (sum = " + sum +
+                         "; global = " + global + ")");
+    }
+  }
+
+  public static void main(String[] args) {
+    exceptionInHoistedPred();
+    prematureException();
+    arraySideEffect();
+    nullArray();
+    array2D();
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayStoreCheck/ArrayStoreCheck.java b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayStoreCheck/ArrayStoreCheck.java
new file mode 100644
index 00000000000..941cd9c1705
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayStoreCheck/ArrayStoreCheck.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * 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.
+ */
+// A simple program checking whether ArrayStoreExceptions are thrown
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/Arrays/ArrayStoreCheck.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.Arrays.ArrayStoreCheck.ArrayStoreCheck
+ */
+
+package jit.Arrays.ArrayStoreCheck;
+
+import nsk.share.TestFailure;
+
+class A {}
+
+class B extends A {}
+
+public class ArrayStoreCheck {
+
+  static void doit(A list[], A element) {
+    boolean caught = false;
+    try {
+      list[0] = element;
+    } catch (Exception ex) {
+      caught = true;
+    }
+    if (caught) {
+        System.out.println("Array store check test passed");
+    } else {
+        throw new TestFailure("Array store check test failed");
+    }
+  }
+
+  public static void main(String args[]) {
+    doit(new B[1], new A());
+  }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayTests/ArrayTests.java b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayTests/ArrayTests.java
new file mode 100644
index 00000000000..2f78c0c68de
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayTests/ArrayTests.java
@@ -0,0 +1,184 @@
+/*
+ * 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
+ * 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.
+ */
+// srm 961012
+// Test if array stores and reads are correct for
+// integral types and floating points
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/Arrays/ArrayTests.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.Arrays.ArrayTests.ArrayTests
+ */
+
+package jit.Arrays.ArrayTests;
+
+import nsk.share.TestFailure;
+
+public class ArrayTests  {
+  int base_array[];
+  static int the_int_res = 200;
+  static int the_char_res = 13041864;
+  static int the_byte_res = -312;
+  static int n = 400;
+
+  ArrayTests() {
+    base_array = new int [n];
+    int start_value = n/2;
+    for (int i=0; i<n; i++) {
+      base_array[i]= start_value;
+      start_value--;
+    }
+  };
+
+  void print() {
+    for (int i=0; i<base_array.length; i++)
+      System.out.print(" "+base_array[i]);
+    // System.out.println("Result is " + the_res);
+  }
+
+  boolean with_chars () {
+    char char_array[] = new char[n];
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      char_array[i] = (char)base_array[i];
+      // System.out.print (" " + (int) char_array[i]);
+    }
+    for (int i=0; i<n; i++) {
+      res += (int) char_array[i];
+    }
+    System.out.println("chars " + res + " == " + the_char_res);
+    return (res==the_char_res);
+  }
+
+  boolean with_bytes () {
+    byte byte_array[] = new byte[n];
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      byte_array[i] = (byte)base_array[i];
+    }
+    for (int i=0; i<n; i++) {
+      res += (int) byte_array[i];
+    }
+    System.out.println("bytes " + res + " == " + the_byte_res);
+    return res==the_byte_res;
+  }
+
+  boolean with_shorts () {
+    short short_array[] = new short[n];
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      short_array[i] = (short)base_array[i];
+    }
+    for (int i=0; i<n; i++) {
+      res += (int) short_array[i];
+    }
+    System.out.println("shorts " + res + " == " + the_int_res);
+    return res==the_int_res;
+  }
+
+  boolean with_ints () {
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      res +=   base_array[i];
+    }
+    // base_array is integer
+    return (res==the_int_res);
+  }
+
+  boolean with_longs() {
+    long long_array[] = new long[n];
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      long_array[i] = (long)base_array[i];
+    }
+    for (int i=0; i<n; i++) {
+      res += (int) long_array[i];
+    }
+    System.out.println("longs " + res + " == " + the_int_res);
+    return res==the_int_res;
+  }
+
+  boolean with_floats () {
+    float float_array[] = new float[n];
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      float_array[i] = (float)base_array[i];
+    }
+    for (int i=0; i<n; i++) {
+      res += (int) float_array[i];
+    }
+    System.out.println("floats " + res + " == " + the_int_res);
+    return res==the_int_res;
+  }
+
+  boolean with_doubles () {
+    double double_array[] = new double[n];
+    int res = 0;
+    for (int i=0; i<n; i++) {
+      double_array[i] = (double)base_array[i];
+    }
+    for (int i=0; i<n; i++) {
+      res += (int) double_array[i];
+    }
+    System.out.println("doubles " + res + " == " + the_int_res);
+    return res==the_int_res;
+  }
+
+  void check(String msg, boolean flag) {
+    if (!flag) {
+      System.out.println("ERROR in " + msg);
+    }
+  }
+
+  boolean execute() {
+    // print();
+    boolean res = true;
+    res = res & with_chars();   check("chars",res);
+    res = res & with_shorts();  check("shorts",res);
+    res = res & with_bytes();   check("bytes",res);
+    res = res & with_ints();    check("ints",res);
+    res = res & with_longs();   check("longs",res);
+    res = res & with_floats();  check("floats",res);
+    res = res & with_doubles(); check("doubles",res);
+
+    return res;
+  }
+
+
+  public static void main (String s[]) {
+    boolean res = true;
+    ArrayTests at = new ArrayTests();
+    res  = res  & at.execute();
+
+    if (res) System.out.println("Array read/write testsOK (srm 10/22/96)");
+    else throw new TestFailure("Error in read/write array tests!");
+  }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/CEETest/CEETest.java b/test/hotspot/jtreg/vmTestbase/jit/CEETest/CEETest.java
new file mode 100644
index 00000000000..cc090ad6a61
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/CEETest/CEETest.java
@@ -0,0 +1,326 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/CEETest.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.CEETest.CEETest
+ */
+
+package jit.CEETest;
+
+import java.io.PrintStream;
+import nsk.share.TestFailure;
+
+public class CEETest {
+
+  public static final long WarmUp = 1500;
+  public static final long Iterations = 100000;
+
+  public static void main(String args[]) {
+    boolean pass = true;
+    for (int i=0; ( i < WarmUp ) & pass; i++) {
+      pass = pass & doInt();
+      pass = pass & doBoolean();
+      pass = pass & doByte();
+      pass = pass & doChar();
+      pass = pass & doShort();
+      pass = pass & doLong();
+      pass = pass & doFloat();
+      pass = pass & doDouble();
+      pass = pass & doObject();
+      pass = pass & doBitOps();
+    }
+
+    long start = System.currentTimeMillis() ;
+    for (int i=0; i<Iterations & pass; i++) {
+      pass = pass & doInt();
+      pass = pass & doBoolean();
+      pass = pass & doByte();
+      pass = pass & doChar();
+      pass = pass & doShort();
+      pass = pass & doLong();
+      pass = pass & doFloat();
+      pass = pass & doDouble();
+      pass = pass & doObject();
+      pass = pass & doBitOps();
+    }
+
+    long duration = System.currentTimeMillis() - start;
+
+    if (true == pass) {
+      System.out.println ("CEETest PASSed in " + duration + " ms.");
+    }
+    else {
+      throw new TestFailure("CEETest FAILed in " + duration + " ms.");
+    }
+  }
+
+  public static boolean doInt () {
+
+    int x = 0;
+    int y = 1;
+
+    int a = (x == y) ? x : y;
+    int b = (x != y) ? y : x;
+    int c = (x <  y) ? y : x;
+    int d = (x >  y) ? x : y;
+    int e = (x <= y) ? y : x;
+    int f = (x >= y) ? x : y;
+
+    if ( (a != y) ||
+         (b != y) ||
+         (c != y) ||
+         (d != y) ||
+         (e != y) ||
+         (f != y) ) {
+      System.err.println ("doInt() failed");
+      return false;
+    }
+    else {
+      return true;
+    }
+  }
+
+  public static boolean doBoolean () {
+
+    boolean x = false;
+    boolean y = !x;
+    boolean a = (x == y) ? x : y;
+    boolean b = (x != y) ? y : x;
+
+    if ( (a == y) &&
+         (b == y) ) {
+      return true;
+    }
+    else {
+      System.err.println ("doBoolean() failed");
+      return false;
+    }
+  }
+
+  public static boolean doByte () {
+
+    byte x = 0;
+    byte y = 1;
+
+    byte a = (x == y) ? x : y;
+    byte b = (x != y) ? y : x;
+    byte c = (x <  y) ? y : x;
+    byte d = (x >  y) ? x : y;
+    byte e = (x <= y) ? y : x;
+    byte f = (x >= y) ? x : y;
+
+    if ( (a != y) ||
+         (b != y) ||
+         (c != y) ||
+         (d != y) ||
+         (e != y) ||
+         (f != y) ) {
+      System.err.println ("doByte() failed");
+      return false;
+    }
+    else {
+      return true;
+    }
+  }
+
+  public static boolean doChar () {
+
+    char x = 0;
+    char y = 1;
+
+    char a = (x == y) ? x : y;
+    char b = (x != y) ? y : x;
+    char c = (x <  y) ? y : x;
+    char d = (x >  y) ? x : y;
+    char e = (x <= y) ? y : x;
+    char f = (x >= y) ? x : y;
+
+    if ( (a == y) &&
+         (b == y) &&
+         (c == y) &&
+         (d == y) &&
+         (e == y) &&
+         (f == y) ) {
+      return true;
+    }
+    else {
+      System.err.println ("doChar() failed");
+      return false;
+    }
+  }
+
+  public static boolean doShort () {
+
+    short x = 0;
+    short y = 1;
+
+    short a = (x == y) ? x : y;
+    short b = (x != y) ? y : x;
+    short c = (x <  y) ? y : x;
+    short d = (x >  y) ? x : y;
+    short e = (x <= y) ? y : x;
+    short f = (x >= y) ? x : y;
+
+    if ( (a != y) ||
+         (b != y) ||
+         (c != y) ||
+         (d != y) ||
+         (e != y) ||
+         (f != y) ) {
+      System.err.println ("doShort() failed");
+      return false;
+    }
+    else {
+      return true;
+    }
+  }
+
+  public static boolean doLong () {
+
+    long x = 0;
+    long y = 1;
+    long a = (x == y) ? x : y;
+    long b = (x != y) ? y : x;
+    long c = (x <  y) ? y : x;
+    long d = (x >  y) ? x : y;
+    long e = (x <= y) ? y : x;
+    long f = (x >= y) ? x : y;
+
+    if ( (a == y) &&
+         (b == y) &&
+         (c == y) &&
+         (d == y) &&
+         (e == y) &&
+         (f == y) ) {
+      return true;
+    }
+    else {
+      System.err.println ("doLong() failed");
+      return false;
+    }
+  }
+
+  public static boolean doFloat () {
+
+    float x = 0.0f;
+    float y = 1.0f;
+    float a = (x == y) ? x : y;
+    float b = (x != y) ? y : x;
+    float c = (x <  y) ? y : x;
+    float d = (x >  y) ? x : y;
+    float e = (x <= y) ? y : x;
+    float f = (x >= y) ? x : y;
+
+    if ( (a != y) ||
+         (b != y) ||
+         (c != y) ||
+         (d != y) ||
+         (e != y) ||
+         (f != y) ) {
+      System.err.println ("doFloat() failed");
+      return false;
+    }
+    else {
+      return true;
+    }
+  }
+
+  public static boolean doDouble () {
+
+    double x = 0.0;
+    double y = 1.0;
+    double a = (x == y) ? x : y;
+    double b = (x != y) ? y : x;
+    double c = (x <  y) ? y : x;
+    double d = (x <= y) ? y : x;
+    double e = (x >  y) ? x : y;
+    double f = (x >= y) ? x : y;
+
+    if ( (a == y) &&
+         (b == y) &&
+         (c == y) &&
+         (d == y) &&
+         (e == y) &&
+         (f == y) ) {
+      return true;
+    }
+    else {
+      System.err.println ("doDouble() failed");
+      return false;
+    }
+  }
+
+  public static boolean doObject () {
+
+    String x = new String("x");
+    String y = new String("y");
+    String a = (x == y) ? x : y;
+    String b = (x != y) ? y : x;
+    String c = (x instanceof String) ? y : x;
+
+    if ( (a != y) ||
+         (b != y) ||
+         (c != y) ) {
+      System.err.println ("doBoolean() failed");
+      return false;
+    }
+    else {
+      return true;
+    }
+  }
+
+  public static boolean doBitOps () {
+    int x = 0;
+    int y = 1;
+
+    int a = x; a += y;
+    int b = (x == y) ? x : (x | y);
+    int c = (x == y) ? x : (x ^ y);
+    int d = (x == y) ? x : (y & y);
+    int e = (x == y) ? x : (y % 2);
+    int f = (x == y) ? x : (2 >> y);
+    int g = (x == y) ? x : (~-2);
+
+    if ( (a == y) &&
+         (b == y) &&
+         (c == y) &&
+         (d == y) &&
+         (e == y) &&
+         (f == y) &&
+         (g == y) ) {
+      return true;
+    } else {
+      System.err.println ("doBoolean() failed");
+      return false;
+    }
+  }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/CondExpr/CondExpr.java b/test/hotspot/jtreg/vmTestbase/jit/CondExpr/CondExpr.java
new file mode 100644
index 00000000000..bb64e404c9f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/CondExpr/CondExpr.java
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * 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 the conditional expressions
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/CondExpr.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.CondExpr.CondExpr
+ */
+
+package jit.CondExpr;
+
+import nsk.share.TestFailure;
+
+public class CondExpr {
+
+  public static void trace (String s, int res) {
+    System.out.println("test result for " + s + " is " + res);
+  }
+
+  public static int test_int1(int arg) { return (arg==10) ? 1 : 2;  }
+
+  public static int test_int(int arg) { return test_int1(arg) + test_int1(arg+1); }
+
+  public static long test_long1(long arg) { return (arg==10) ? 1l : 2l;  }
+
+  public static int test_long(long arg) { return (int)(test_long1(arg) + test_long1(arg+1)); }
+
+  public static float test_float1(float arg) { return (arg==10.0f) ? 1.0f : 2.0f;  }
+
+  public static int test_float(float arg) { return (int)(test_float1(arg) + test_float1(arg+1)); }
+
+  public static double test_double1(double arg) { return (arg==10.0) ? 1.0 : 2.0;  }
+
+  public static int test_double(double arg) { return (int)(test_double1(arg) + test_double1(arg+1)); }
+
+
+  public static int nested_test_int1(int arg) {
+    return (arg>1) ? ((arg==10) ? 1 : 2) : ((arg==-10) ? 3: 4);
+  }
+
+
+
+  public static int nested_test_int (int arg) {
+    return (nested_test_int1 (arg) + nested_test_int1 (arg+1) + nested_test_int1 (-arg) + nested_test_int1 (-arg-1)); }
+
+  public static void main(String s[]) {
+    System.out.println ("Testing conditional expressions (srm 10/22)");
+    boolean correct = true;
+    int res = 0;
+    res = test_int(10);        trace("test_int", res);
+    correct = correct & ( res == 3);
+    res = test_long(10l);      trace("test_long", res);
+    correct = correct & ( res == 3);
+    res = test_float(10.0f);   trace("test_float", res);
+    correct = correct & ( res == 3);
+    res = test_double(10.0);   trace("test_double", res);
+    correct = correct & ( res == 3);
+
+    res = nested_test_int(10); trace("nested_test_int", res);
+     correct = correct & ( res == 10);
+
+    if (correct) System.out.println("Correct!");
+    else throw new TestFailure("ERRROR in conditional expressions");
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java b/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java
new file mode 100644
index 00000000000..bc82a41ea44
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 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.
+ */
+// DivTest.java
+// bug-12
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/DivTest.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.DivTest.DivTest
+ * @run driver ExecDriver --java jit.DivTest.DivTest
+ */
+
+package jit.DivTest;
+
+import nsk.share.TestFailure;
+
+class DivTest{
+  static int n;
+  static boolean test1 (int n1, int n2) {
+    try {
+      n = n1 / n2;
+      System.out.println(n);
+      return true;
+    } catch (Exception e) {
+      System.out.println(e);
+      return false;
+    }
+  }
+  public static void main(String s[]) {
+    boolean failed;
+    failed = test1 (-1, 0);
+    failed |= !test1 (-1, 0x80000000);
+    failed |= !test1 (0, -1);
+    failed |= !test1 (0x80000000, -1);
+    if (failed)
+        throw new TestFailure("Test failed");
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/ExcOpt/ExcOpt.java b/test/hotspot/jtreg/vmTestbase/jit/ExcOpt/ExcOpt.java
new file mode 100644
index 00000000000..ea23f437764
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/ExcOpt/ExcOpt.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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.
+ */
+// tests exception handler inside optimizable loops and around them
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/ExcOpt.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.ExcOpt.ExcOpt
+ */
+
+package jit.ExcOpt;
+
+import nsk.share.TestFailure;
+
+public class ExcOpt {
+  static int x;
+
+  public static void main (String s[]) {
+
+    x = 0;
+
+    try {
+      for (int i = 1; i < 100; i++) {
+        x += 1;
+      }
+    } catch (Exception e) {
+      x = 0;
+    }
+
+    for (int i=1; i < 100; i++) {
+      try {
+        x += 1;
+      } catch (Exception e) {
+        x = 0;
+      }
+    }
+
+    System.out.println("Done " + x);
+
+    if (x != 198)
+        throw new TestFailure("Test failed (x != 198)");
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.gold b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.gold
new file mode 100644
index 00000000000..4185d47101d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.gold
@@ -0,0 +1,8712 @@
+1.4E-45 + 1.4E-45 = 2.8E-45, with float param operands
+1.4E-45 - 1.4E-45 = 0.0, with float param operands
+1.4E-45 * 1.4E-45 = 0.0, with float param operands
+1.4E-45 / 1.4E-45 = 1.0, with float param operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float local operands
+1.4E-45 - 1.4E-45 = 0.0, with float local operands
+1.4E-45 * 1.4E-45 = 0.0, with float local operands
+1.4E-45 / 1.4E-45 = 1.0, with float local operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float static operands
+1.4E-45 - 1.4E-45 = 0.0, with float static operands
+1.4E-45 * 1.4E-45 = 0.0, with float static operands
+1.4E-45 / 1.4E-45 = 1.0, with float static operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float field operands
+1.4E-45 - 1.4E-45 = 0.0, with float field operands
+1.4E-45 * 1.4E-45 = 0.0, with float field operands
+1.4E-45 / 1.4E-45 = 1.0, with float field operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float a[i] operands
+1.4E-45 - 1.4E-45 = 0.0, with float a[i] operands
+1.4E-45 * 1.4E-45 = 0.0, with float a[i] operands
+1.4E-45 / 1.4E-45 = 1.0, with float a[i] operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float f(x) operands
+1.4E-45 - 1.4E-45 = 0.0, with float f(x) operands
+1.4E-45 * 1.4E-45 = 0.0, with float f(x) operands
+1.4E-45 / 1.4E-45 = 1.0, with float f(x) operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float lExpr operands
+1.4E-45 - 1.4E-45 = 0.0, with float lExpr operands
+1.4E-45 * 1.4E-45 = 0.0, with float lExpr operands
+1.4E-45 / 1.4E-45 = 1.0, with float lExpr operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float rExpr operands
+1.4E-45 - 1.4E-45 = 0.0, with float rExpr operands
+1.4E-45 * 1.4E-45 = 0.0, with float rExpr operands
+1.4E-45 / 1.4E-45 = 1.0, with float rExpr operands
+1.4E-45 + 1.4E-45 = 2.8E-45, with float exprs operands
+1.4E-45 - 1.4E-45 = 0.0, with float exprs operands
+1.4E-45 * 1.4E-45 = 0.0, with float exprs operands
+1.4E-45 / 1.4E-45 = 1.0, with float exprs operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float param operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float param operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float param operands
+1.4E-45 / 3.4028235E38 = 0.0, with float param operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float local operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float local operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float local operands
+1.4E-45 / 3.4028235E38 = 0.0, with float local operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float static operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float static operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float static operands
+1.4E-45 / 3.4028235E38 = 0.0, with float static operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float field operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float field operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float field operands
+1.4E-45 / 3.4028235E38 = 0.0, with float field operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float a[i] operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float a[i] operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float a[i] operands
+1.4E-45 / 3.4028235E38 = 0.0, with float a[i] operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float f(x) operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float f(x) operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float f(x) operands
+1.4E-45 / 3.4028235E38 = 0.0, with float f(x) operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float lExpr operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float lExpr operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float lExpr operands
+1.4E-45 / 3.4028235E38 = 0.0, with float lExpr operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float rExpr operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float rExpr operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float rExpr operands
+1.4E-45 / 3.4028235E38 = 0.0, with float rExpr operands
+1.4E-45 + 3.4028235E38 = 3.4028235E38, with float exprs operands
+1.4E-45 - 3.4028235E38 = -3.4028235E38, with float exprs operands
+1.4E-45 * 3.4028235E38 = 4.7683713E-7, with float exprs operands
+1.4E-45 / 3.4028235E38 = 0.0, with float exprs operands
+1.4E-45 + -1.4E-45 = 0.0, with float param operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float param operands
+1.4E-45 * -1.4E-45 = -0.0, with float param operands
+1.4E-45 / -1.4E-45 = -1.0, with float param operands
+1.4E-45 + -1.4E-45 = 0.0, with float local operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float local operands
+1.4E-45 * -1.4E-45 = -0.0, with float local operands
+1.4E-45 / -1.4E-45 = -1.0, with float local operands
+1.4E-45 + -1.4E-45 = 0.0, with float static operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float static operands
+1.4E-45 * -1.4E-45 = -0.0, with float static operands
+1.4E-45 / -1.4E-45 = -1.0, with float static operands
+1.4E-45 + -1.4E-45 = 0.0, with float field operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float field operands
+1.4E-45 * -1.4E-45 = -0.0, with float field operands
+1.4E-45 / -1.4E-45 = -1.0, with float field operands
+1.4E-45 + -1.4E-45 = 0.0, with float a[i] operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float a[i] operands
+1.4E-45 * -1.4E-45 = -0.0, with float a[i] operands
+1.4E-45 / -1.4E-45 = -1.0, with float a[i] operands
+1.4E-45 + -1.4E-45 = 0.0, with float f(x) operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float f(x) operands
+1.4E-45 * -1.4E-45 = -0.0, with float f(x) operands
+1.4E-45 / -1.4E-45 = -1.0, with float f(x) operands
+1.4E-45 + -1.4E-45 = 0.0, with float lExpr operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float lExpr operands
+1.4E-45 * -1.4E-45 = -0.0, with float lExpr operands
+1.4E-45 / -1.4E-45 = -1.0, with float lExpr operands
+1.4E-45 + -1.4E-45 = 0.0, with float rExpr operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float rExpr operands
+1.4E-45 * -1.4E-45 = -0.0, with float rExpr operands
+1.4E-45 / -1.4E-45 = -1.0, with float rExpr operands
+1.4E-45 + -1.4E-45 = 0.0, with float exprs operands
+1.4E-45 - -1.4E-45 = 2.8E-45, with float exprs operands
+1.4E-45 * -1.4E-45 = -0.0, with float exprs operands
+1.4E-45 / -1.4E-45 = -1.0, with float exprs operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float param operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float param operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float param operands
+1.4E-45 / -3.4028235E38 = -0.0, with float param operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float local operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float local operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float local operands
+1.4E-45 / -3.4028235E38 = -0.0, with float local operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float static operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float static operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float static operands
+1.4E-45 / -3.4028235E38 = -0.0, with float static operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float field operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float field operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float field operands
+1.4E-45 / -3.4028235E38 = -0.0, with float field operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float a[i] operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float a[i] operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float a[i] operands
+1.4E-45 / -3.4028235E38 = -0.0, with float a[i] operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float f(x) operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float f(x) operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float f(x) operands
+1.4E-45 / -3.4028235E38 = -0.0, with float f(x) operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float lExpr operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float lExpr operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float lExpr operands
+1.4E-45 / -3.4028235E38 = -0.0, with float lExpr operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float rExpr operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float rExpr operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float rExpr operands
+1.4E-45 / -3.4028235E38 = -0.0, with float rExpr operands
+1.4E-45 + -3.4028235E38 = -3.4028235E38, with float exprs operands
+1.4E-45 - -3.4028235E38 = 3.4028235E38, with float exprs operands
+1.4E-45 * -3.4028235E38 = -4.7683713E-7, with float exprs operands
+1.4E-45 / -3.4028235E38 = -0.0, with float exprs operands
+1.4E-45 + -1.0 = -1.0, with float param operands
+1.4E-45 - -1.0 = 1.0, with float param operands
+1.4E-45 * -1.0 = -1.4E-45, with float param operands
+1.4E-45 / -1.0 = -1.4E-45, with float param operands
+1.4E-45 + -1.0 = -1.0, with float local operands
+1.4E-45 - -1.0 = 1.0, with float local operands
+1.4E-45 * -1.0 = -1.4E-45, with float local operands
+1.4E-45 / -1.0 = -1.4E-45, with float local operands
+1.4E-45 + -1.0 = -1.0, with float static operands
+1.4E-45 - -1.0 = 1.0, with float static operands
+1.4E-45 * -1.0 = -1.4E-45, with float static operands
+1.4E-45 / -1.0 = -1.4E-45, with float static operands
+1.4E-45 + -1.0 = -1.0, with float field operands
+1.4E-45 - -1.0 = 1.0, with float field operands
+1.4E-45 * -1.0 = -1.4E-45, with float field operands
+1.4E-45 / -1.0 = -1.4E-45, with float field operands
+1.4E-45 + -1.0 = -1.0, with float a[i] operands
+1.4E-45 - -1.0 = 1.0, with float a[i] operands
+1.4E-45 * -1.0 = -1.4E-45, with float a[i] operands
+1.4E-45 / -1.0 = -1.4E-45, with float a[i] operands
+1.4E-45 + -1.0 = -1.0, with float f(x) operands
+1.4E-45 - -1.0 = 1.0, with float f(x) operands
+1.4E-45 * -1.0 = -1.4E-45, with float f(x) operands
+1.4E-45 / -1.0 = -1.4E-45, with float f(x) operands
+1.4E-45 + -1.0 = -1.0, with float lExpr operands
+1.4E-45 - -1.0 = 1.0, with float lExpr operands
+1.4E-45 * -1.0 = -1.4E-45, with float lExpr operands
+1.4E-45 / -1.0 = -1.4E-45, with float lExpr operands
+1.4E-45 + -1.0 = -1.0, with float rExpr operands
+1.4E-45 - -1.0 = 1.0, with float rExpr operands
+1.4E-45 * -1.0 = -1.4E-45, with float rExpr operands
+1.4E-45 / -1.0 = -1.4E-45, with float rExpr operands
+1.4E-45 + -1.0 = -1.0, with float exprs operands
+1.4E-45 - -1.0 = 1.0, with float exprs operands
+1.4E-45 * -1.0 = -1.4E-45, with float exprs operands
+1.4E-45 / -1.0 = -1.4E-45, with float exprs operands
+1.4E-45 + 1.0 = 1.0, with float param operands
+1.4E-45 - 1.0 = -1.0, with float param operands
+1.4E-45 * 1.0 = 1.4E-45, with float param operands
+1.4E-45 / 1.0 = 1.4E-45, with float param operands
+1.4E-45 + 1.0 = 1.0, with float local operands
+1.4E-45 - 1.0 = -1.0, with float local operands
+1.4E-45 * 1.0 = 1.4E-45, with float local operands
+1.4E-45 / 1.0 = 1.4E-45, with float local operands
+1.4E-45 + 1.0 = 1.0, with float static operands
+1.4E-45 - 1.0 = -1.0, with float static operands
+1.4E-45 * 1.0 = 1.4E-45, with float static operands
+1.4E-45 / 1.0 = 1.4E-45, with float static operands
+1.4E-45 + 1.0 = 1.0, with float field operands
+1.4E-45 - 1.0 = -1.0, with float field operands
+1.4E-45 * 1.0 = 1.4E-45, with float field operands
+1.4E-45 / 1.0 = 1.4E-45, with float field operands
+1.4E-45 + 1.0 = 1.0, with float a[i] operands
+1.4E-45 - 1.0 = -1.0, with float a[i] operands
+1.4E-45 * 1.0 = 1.4E-45, with float a[i] operands
+1.4E-45 / 1.0 = 1.4E-45, with float a[i] operands
+1.4E-45 + 1.0 = 1.0, with float f(x) operands
+1.4E-45 - 1.0 = -1.0, with float f(x) operands
+1.4E-45 * 1.0 = 1.4E-45, with float f(x) operands
+1.4E-45 / 1.0 = 1.4E-45, with float f(x) operands
+1.4E-45 + 1.0 = 1.0, with float lExpr operands
+1.4E-45 - 1.0 = -1.0, with float lExpr operands
+1.4E-45 * 1.0 = 1.4E-45, with float lExpr operands
+1.4E-45 / 1.0 = 1.4E-45, with float lExpr operands
+1.4E-45 + 1.0 = 1.0, with float rExpr operands
+1.4E-45 - 1.0 = -1.0, with float rExpr operands
+1.4E-45 * 1.0 = 1.4E-45, with float rExpr operands
+1.4E-45 / 1.0 = 1.4E-45, with float rExpr operands
+1.4E-45 + 1.0 = 1.0, with float exprs operands
+1.4E-45 - 1.0 = -1.0, with float exprs operands
+1.4E-45 * 1.0 = 1.4E-45, with float exprs operands
+1.4E-45 / 1.0 = 1.4E-45, with float exprs operands
+1.4E-45 + -0.0 = 1.4E-45, with float param operands
+1.4E-45 - -0.0 = 1.4E-45, with float param operands
+1.4E-45 * -0.0 = -0.0, with float param operands
+1.4E-45 / -0.0 = -Infinity, with float param operands
+1.4E-45 + -0.0 = 1.4E-45, with float local operands
+1.4E-45 - -0.0 = 1.4E-45, with float local operands
+1.4E-45 * -0.0 = -0.0, with float local operands
+1.4E-45 / -0.0 = -Infinity, with float local operands
+1.4E-45 + -0.0 = 1.4E-45, with float static operands
+1.4E-45 - -0.0 = 1.4E-45, with float static operands
+1.4E-45 * -0.0 = -0.0, with float static operands
+1.4E-45 / -0.0 = -Infinity, with float static operands
+1.4E-45 + -0.0 = 1.4E-45, with float field operands
+1.4E-45 - -0.0 = 1.4E-45, with float field operands
+1.4E-45 * -0.0 = -0.0, with float field operands
+1.4E-45 / -0.0 = -Infinity, with float field operands
+1.4E-45 + -0.0 = 1.4E-45, with float a[i] operands
+1.4E-45 - -0.0 = 1.4E-45, with float a[i] operands
+1.4E-45 * -0.0 = -0.0, with float a[i] operands
+1.4E-45 / -0.0 = -Infinity, with float a[i] operands
+1.4E-45 + -0.0 = 1.4E-45, with float f(x) operands
+1.4E-45 - -0.0 = 1.4E-45, with float f(x) operands
+1.4E-45 * -0.0 = -0.0, with float f(x) operands
+1.4E-45 / -0.0 = -Infinity, with float f(x) operands
+1.4E-45 + -0.0 = 1.4E-45, with float lExpr operands
+1.4E-45 - -0.0 = 1.4E-45, with float lExpr operands
+1.4E-45 * -0.0 = -0.0, with float lExpr operands
+1.4E-45 / -0.0 = -Infinity, with float lExpr operands
+1.4E-45 + 0.0 = 1.4E-45, with float rExpr operands
+1.4E-45 - 0.0 = 1.4E-45, with float rExpr operands
+1.4E-45 * 0.0 = 0.0, with float rExpr operands
+1.4E-45 / 0.0 = Infinity, with float rExpr operands
+1.4E-45 + 0.0 = 1.4E-45, with float exprs operands
+1.4E-45 - 0.0 = 1.4E-45, with float exprs operands
+1.4E-45 * 0.0 = 0.0, with float exprs operands
+1.4E-45 / 0.0 = Infinity, with float exprs operands
+1.4E-45 + 0.0 = 1.4E-45, with float param operands
+1.4E-45 - 0.0 = 1.4E-45, with float param operands
+1.4E-45 * 0.0 = 0.0, with float param operands
+1.4E-45 / 0.0 = Infinity, with float param operands
+1.4E-45 + 0.0 = 1.4E-45, with float local operands
+1.4E-45 - 0.0 = 1.4E-45, with float local operands
+1.4E-45 * 0.0 = 0.0, with float local operands
+1.4E-45 / 0.0 = Infinity, with float local operands
+1.4E-45 + 0.0 = 1.4E-45, with float static operands
+1.4E-45 - 0.0 = 1.4E-45, with float static operands
+1.4E-45 * 0.0 = 0.0, with float static operands
+1.4E-45 / 0.0 = Infinity, with float static operands
+1.4E-45 + 0.0 = 1.4E-45, with float field operands
+1.4E-45 - 0.0 = 1.4E-45, with float field operands
+1.4E-45 * 0.0 = 0.0, with float field operands
+1.4E-45 / 0.0 = Infinity, with float field operands
+1.4E-45 + 0.0 = 1.4E-45, with float a[i] operands
+1.4E-45 - 0.0 = 1.4E-45, with float a[i] operands
+1.4E-45 * 0.0 = 0.0, with float a[i] operands
+1.4E-45 / 0.0 = Infinity, with float a[i] operands
+1.4E-45 + 0.0 = 1.4E-45, with float f(x) operands
+1.4E-45 - 0.0 = 1.4E-45, with float f(x) operands
+1.4E-45 * 0.0 = 0.0, with float f(x) operands
+1.4E-45 / 0.0 = Infinity, with float f(x) operands
+1.4E-45 + 0.0 = 1.4E-45, with float lExpr operands
+1.4E-45 - 0.0 = 1.4E-45, with float lExpr operands
+1.4E-45 * 0.0 = 0.0, with float lExpr operands
+1.4E-45 / 0.0 = Infinity, with float lExpr operands
+1.4E-45 + 0.0 = 1.4E-45, with float rExpr operands
+1.4E-45 - 0.0 = 1.4E-45, with float rExpr operands
+1.4E-45 * 0.0 = 0.0, with float rExpr operands
+1.4E-45 / 0.0 = Infinity, with float rExpr operands
+1.4E-45 + 0.0 = 1.4E-45, with float exprs operands
+1.4E-45 - 0.0 = 1.4E-45, with float exprs operands
+1.4E-45 * 0.0 = 0.0, with float exprs operands
+1.4E-45 / 0.0 = Infinity, with float exprs operands
+1.4E-45 + -Infinity = -Infinity, with float param operands
+1.4E-45 - -Infinity = Infinity, with float param operands
+1.4E-45 * -Infinity = -Infinity, with float param operands
+1.4E-45 / -Infinity = -0.0, with float param operands
+1.4E-45 + -Infinity = -Infinity, with float local operands
+1.4E-45 - -Infinity = Infinity, with float local operands
+1.4E-45 * -Infinity = -Infinity, with float local operands
+1.4E-45 / -Infinity = -0.0, with float local operands
+1.4E-45 + -Infinity = -Infinity, with float static operands
+1.4E-45 - -Infinity = Infinity, with float static operands
+1.4E-45 * -Infinity = -Infinity, with float static operands
+1.4E-45 / -Infinity = -0.0, with float static operands
+1.4E-45 + -Infinity = -Infinity, with float field operands
+1.4E-45 - -Infinity = Infinity, with float field operands
+1.4E-45 * -Infinity = -Infinity, with float field operands
+1.4E-45 / -Infinity = -0.0, with float field operands
+1.4E-45 + -Infinity = -Infinity, with float a[i] operands
+1.4E-45 - -Infinity = Infinity, with float a[i] operands
+1.4E-45 * -Infinity = -Infinity, with float a[i] operands
+1.4E-45 / -Infinity = -0.0, with float a[i] operands
+1.4E-45 + -Infinity = -Infinity, with float f(x) operands
+1.4E-45 - -Infinity = Infinity, with float f(x) operands
+1.4E-45 * -Infinity = -Infinity, with float f(x) operands
+1.4E-45 / -Infinity = -0.0, with float f(x) operands
+1.4E-45 + -Infinity = -Infinity, with float lExpr operands
+1.4E-45 - -Infinity = Infinity, with float lExpr operands
+1.4E-45 * -Infinity = -Infinity, with float lExpr operands
+1.4E-45 / -Infinity = -0.0, with float lExpr operands
+1.4E-45 + -Infinity = -Infinity, with float rExpr operands
+1.4E-45 - -Infinity = Infinity, with float rExpr operands
+1.4E-45 * -Infinity = -Infinity, with float rExpr operands
+1.4E-45 / -Infinity = -0.0, with float rExpr operands
+1.4E-45 + -Infinity = -Infinity, with float exprs operands
+1.4E-45 - -Infinity = Infinity, with float exprs operands
+1.4E-45 * -Infinity = -Infinity, with float exprs operands
+1.4E-45 / -Infinity = -0.0, with float exprs operands
+1.4E-45 + Infinity = Infinity, with float param operands
+1.4E-45 - Infinity = -Infinity, with float param operands
+1.4E-45 * Infinity = Infinity, with float param operands
+1.4E-45 / Infinity = 0.0, with float param operands
+1.4E-45 + Infinity = Infinity, with float local operands
+1.4E-45 - Infinity = -Infinity, with float local operands
+1.4E-45 * Infinity = Infinity, with float local operands
+1.4E-45 / Infinity = 0.0, with float local operands
+1.4E-45 + Infinity = Infinity, with float static operands
+1.4E-45 - Infinity = -Infinity, with float static operands
+1.4E-45 * Infinity = Infinity, with float static operands
+1.4E-45 / Infinity = 0.0, with float static operands
+1.4E-45 + Infinity = Infinity, with float field operands
+1.4E-45 - Infinity = -Infinity, with float field operands
+1.4E-45 * Infinity = Infinity, with float field operands
+1.4E-45 / Infinity = 0.0, with float field operands
+1.4E-45 + Infinity = Infinity, with float a[i] operands
+1.4E-45 - Infinity = -Infinity, with float a[i] operands
+1.4E-45 * Infinity = Infinity, with float a[i] operands
+1.4E-45 / Infinity = 0.0, with float a[i] operands
+1.4E-45 + Infinity = Infinity, with float f(x) operands
+1.4E-45 - Infinity = -Infinity, with float f(x) operands
+1.4E-45 * Infinity = Infinity, with float f(x) operands
+1.4E-45 / Infinity = 0.0, with float f(x) operands
+1.4E-45 + Infinity = Infinity, with float lExpr operands
+1.4E-45 - Infinity = -Infinity, with float lExpr operands
+1.4E-45 * Infinity = Infinity, with float lExpr operands
+1.4E-45 / Infinity = 0.0, with float lExpr operands
+1.4E-45 + Infinity = Infinity, with float rExpr operands
+1.4E-45 - Infinity = -Infinity, with float rExpr operands
+1.4E-45 * Infinity = Infinity, with float rExpr operands
+1.4E-45 / Infinity = 0.0, with float rExpr operands
+1.4E-45 + Infinity = Infinity, with float exprs operands
+1.4E-45 - Infinity = -Infinity, with float exprs operands
+1.4E-45 * Infinity = Infinity, with float exprs operands
+1.4E-45 / Infinity = 0.0, with float exprs operands
+1.4E-45 + NaN = NaN, with float param operands
+1.4E-45 - NaN = NaN, with float param operands
+1.4E-45 * NaN = NaN, with float param operands
+1.4E-45 / NaN = NaN, with float param operands
+1.4E-45 + NaN = NaN, with float local operands
+1.4E-45 - NaN = NaN, with float local operands
+1.4E-45 * NaN = NaN, with float local operands
+1.4E-45 / NaN = NaN, with float local operands
+1.4E-45 + NaN = NaN, with float static operands
+1.4E-45 - NaN = NaN, with float static operands
+1.4E-45 * NaN = NaN, with float static operands
+1.4E-45 / NaN = NaN, with float static operands
+1.4E-45 + NaN = NaN, with float field operands
+1.4E-45 - NaN = NaN, with float field operands
+1.4E-45 * NaN = NaN, with float field operands
+1.4E-45 / NaN = NaN, with float field operands
+1.4E-45 + NaN = NaN, with float a[i] operands
+1.4E-45 - NaN = NaN, with float a[i] operands
+1.4E-45 * NaN = NaN, with float a[i] operands
+1.4E-45 / NaN = NaN, with float a[i] operands
+1.4E-45 + NaN = NaN, with float f(x) operands
+1.4E-45 - NaN = NaN, with float f(x) operands
+1.4E-45 * NaN = NaN, with float f(x) operands
+1.4E-45 / NaN = NaN, with float f(x) operands
+1.4E-45 + NaN = NaN, with float lExpr operands
+1.4E-45 - NaN = NaN, with float lExpr operands
+1.4E-45 * NaN = NaN, with float lExpr operands
+1.4E-45 / NaN = NaN, with float lExpr operands
+1.4E-45 + NaN = NaN, with float rExpr operands
+1.4E-45 - NaN = NaN, with float rExpr operands
+1.4E-45 * NaN = NaN, with float rExpr operands
+1.4E-45 / NaN = NaN, with float rExpr operands
+1.4E-45 + NaN = NaN, with float exprs operands
+1.4E-45 - NaN = NaN, with float exprs operands
+1.4E-45 * NaN = NaN, with float exprs operands
+1.4E-45 / NaN = NaN, with float exprs operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float param operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float param operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float param operands
+3.4028235E38 / 1.4E-45 = Infinity, with float param operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float local operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float local operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float local operands
+3.4028235E38 / 1.4E-45 = Infinity, with float local operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float static operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float static operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float static operands
+3.4028235E38 / 1.4E-45 = Infinity, with float static operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float field operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float field operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float field operands
+3.4028235E38 / 1.4E-45 = Infinity, with float field operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float a[i] operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float a[i] operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float a[i] operands
+3.4028235E38 / 1.4E-45 = Infinity, with float a[i] operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float f(x) operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float f(x) operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float f(x) operands
+3.4028235E38 / 1.4E-45 = Infinity, with float f(x) operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float lExpr operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float lExpr operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float lExpr operands
+3.4028235E38 / 1.4E-45 = Infinity, with float lExpr operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float rExpr operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float rExpr operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float rExpr operands
+3.4028235E38 / 1.4E-45 = Infinity, with float rExpr operands
+3.4028235E38 + 1.4E-45 = 3.4028235E38, with float exprs operands
+3.4028235E38 - 1.4E-45 = 3.4028235E38, with float exprs operands
+3.4028235E38 * 1.4E-45 = 4.7683713E-7, with float exprs operands
+3.4028235E38 / 1.4E-45 = Infinity, with float exprs operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float param operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float param operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float param operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float param operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float local operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float local operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float local operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float local operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float static operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float static operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float static operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float static operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float field operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float field operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float field operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float field operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float a[i] operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float a[i] operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float a[i] operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float a[i] operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float f(x) operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float f(x) operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float f(x) operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float f(x) operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float lExpr operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float lExpr operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float lExpr operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float lExpr operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float rExpr operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float rExpr operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float rExpr operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float rExpr operands
+3.4028235E38 + 3.4028235E38 = Infinity, with float exprs operands
+3.4028235E38 - 3.4028235E38 = 0.0, with float exprs operands
+3.4028235E38 * 3.4028235E38 = Infinity, with float exprs operands
+3.4028235E38 / 3.4028235E38 = 1.0, with float exprs operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float param operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float param operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float param operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float param operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float local operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float local operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float local operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float local operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float static operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float static operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float static operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float static operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float field operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float field operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float field operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float field operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float a[i] operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float a[i] operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float a[i] operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float a[i] operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float f(x) operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float f(x) operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float f(x) operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float f(x) operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float lExpr operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float lExpr operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float lExpr operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float lExpr operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float rExpr operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float rExpr operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float rExpr operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float rExpr operands
+3.4028235E38 + -1.4E-45 = 3.4028235E38, with float exprs operands
+3.4028235E38 - -1.4E-45 = 3.4028235E38, with float exprs operands
+3.4028235E38 * -1.4E-45 = -4.7683713E-7, with float exprs operands
+3.4028235E38 / -1.4E-45 = -Infinity, with float exprs operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float param operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float param operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float param operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float param operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float local operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float local operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float local operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float local operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float static operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float static operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float static operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float static operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float field operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float field operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float field operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float field operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float a[i] operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float a[i] operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float a[i] operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float a[i] operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float f(x) operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float f(x) operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float f(x) operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float f(x) operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float lExpr operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float lExpr operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float lExpr operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float lExpr operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float rExpr operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float rExpr operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float rExpr operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float rExpr operands
+3.4028235E38 + -3.4028235E38 = 0.0, with float exprs operands
+3.4028235E38 - -3.4028235E38 = Infinity, with float exprs operands
+3.4028235E38 * -3.4028235E38 = -Infinity, with float exprs operands
+3.4028235E38 / -3.4028235E38 = -1.0, with float exprs operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float param operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float param operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float param operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float param operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float local operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float local operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float local operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float local operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float static operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float static operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float static operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float static operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float field operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float field operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float field operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float field operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float a[i] operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float a[i] operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float f(x) operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float f(x) operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float lExpr operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float lExpr operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float rExpr operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float rExpr operands
+3.4028235E38 + -1.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 - -1.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 * -1.0 = -3.4028235E38, with float exprs operands
+3.4028235E38 / -1.0 = -3.4028235E38, with float exprs operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float param operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float param operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float param operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float param operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float local operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float local operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float local operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float local operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float static operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float static operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float static operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float static operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float field operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float field operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float field operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float field operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 + 1.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 - 1.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 * 1.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 / 1.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float param operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float param operands
+3.4028235E38 * -0.0 = -0.0, with float param operands
+3.4028235E38 / -0.0 = -Infinity, with float param operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float local operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float local operands
+3.4028235E38 * -0.0 = -0.0, with float local operands
+3.4028235E38 / -0.0 = -Infinity, with float local operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float static operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float static operands
+3.4028235E38 * -0.0 = -0.0, with float static operands
+3.4028235E38 / -0.0 = -Infinity, with float static operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float field operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float field operands
+3.4028235E38 * -0.0 = -0.0, with float field operands
+3.4028235E38 / -0.0 = -Infinity, with float field operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 * -0.0 = -0.0, with float a[i] operands
+3.4028235E38 / -0.0 = -Infinity, with float a[i] operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 * -0.0 = -0.0, with float f(x) operands
+3.4028235E38 / -0.0 = -Infinity, with float f(x) operands
+3.4028235E38 + -0.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 - -0.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 * -0.0 = -0.0, with float lExpr operands
+3.4028235E38 / -0.0 = -Infinity, with float lExpr operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 * 0.0 = 0.0, with float rExpr operands
+3.4028235E38 / 0.0 = Infinity, with float rExpr operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 * 0.0 = 0.0, with float exprs operands
+3.4028235E38 / 0.0 = Infinity, with float exprs operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float param operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float param operands
+3.4028235E38 * 0.0 = 0.0, with float param operands
+3.4028235E38 / 0.0 = Infinity, with float param operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float local operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float local operands
+3.4028235E38 * 0.0 = 0.0, with float local operands
+3.4028235E38 / 0.0 = Infinity, with float local operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float static operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float static operands
+3.4028235E38 * 0.0 = 0.0, with float static operands
+3.4028235E38 / 0.0 = Infinity, with float static operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float field operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float field operands
+3.4028235E38 * 0.0 = 0.0, with float field operands
+3.4028235E38 / 0.0 = Infinity, with float field operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float a[i] operands
+3.4028235E38 * 0.0 = 0.0, with float a[i] operands
+3.4028235E38 / 0.0 = Infinity, with float a[i] operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float f(x) operands
+3.4028235E38 * 0.0 = 0.0, with float f(x) operands
+3.4028235E38 / 0.0 = Infinity, with float f(x) operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float lExpr operands
+3.4028235E38 * 0.0 = 0.0, with float lExpr operands
+3.4028235E38 / 0.0 = Infinity, with float lExpr operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float rExpr operands
+3.4028235E38 * 0.0 = 0.0, with float rExpr operands
+3.4028235E38 / 0.0 = Infinity, with float rExpr operands
+3.4028235E38 + 0.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 - 0.0 = 3.4028235E38, with float exprs operands
+3.4028235E38 * 0.0 = 0.0, with float exprs operands
+3.4028235E38 / 0.0 = Infinity, with float exprs operands
+3.4028235E38 + -Infinity = -Infinity, with float param operands
+3.4028235E38 - -Infinity = Infinity, with float param operands
+3.4028235E38 * -Infinity = -Infinity, with float param operands
+3.4028235E38 / -Infinity = -0.0, with float param operands
+3.4028235E38 + -Infinity = -Infinity, with float local operands
+3.4028235E38 - -Infinity = Infinity, with float local operands
+3.4028235E38 * -Infinity = -Infinity, with float local operands
+3.4028235E38 / -Infinity = -0.0, with float local operands
+3.4028235E38 + -Infinity = -Infinity, with float static operands
+3.4028235E38 - -Infinity = Infinity, with float static operands
+3.4028235E38 * -Infinity = -Infinity, with float static operands
+3.4028235E38 / -Infinity = -0.0, with float static operands
+3.4028235E38 + -Infinity = -Infinity, with float field operands
+3.4028235E38 - -Infinity = Infinity, with float field operands
+3.4028235E38 * -Infinity = -Infinity, with float field operands
+3.4028235E38 / -Infinity = -0.0, with float field operands
+3.4028235E38 + -Infinity = -Infinity, with float a[i] operands
+3.4028235E38 - -Infinity = Infinity, with float a[i] operands
+3.4028235E38 * -Infinity = -Infinity, with float a[i] operands
+3.4028235E38 / -Infinity = -0.0, with float a[i] operands
+3.4028235E38 + -Infinity = -Infinity, with float f(x) operands
+3.4028235E38 - -Infinity = Infinity, with float f(x) operands
+3.4028235E38 * -Infinity = -Infinity, with float f(x) operands
+3.4028235E38 / -Infinity = -0.0, with float f(x) operands
+3.4028235E38 + -Infinity = -Infinity, with float lExpr operands
+3.4028235E38 - -Infinity = Infinity, with float lExpr operands
+3.4028235E38 * -Infinity = -Infinity, with float lExpr operands
+3.4028235E38 / -Infinity = -0.0, with float lExpr operands
+3.4028235E38 + -Infinity = -Infinity, with float rExpr operands
+3.4028235E38 - -Infinity = Infinity, with float rExpr operands
+3.4028235E38 * -Infinity = -Infinity, with float rExpr operands
+3.4028235E38 / -Infinity = -0.0, with float rExpr operands
+3.4028235E38 + -Infinity = -Infinity, with float exprs operands
+3.4028235E38 - -Infinity = Infinity, with float exprs operands
+3.4028235E38 * -Infinity = -Infinity, with float exprs operands
+3.4028235E38 / -Infinity = -0.0, with float exprs operands
+3.4028235E38 + Infinity = Infinity, with float param operands
+3.4028235E38 - Infinity = -Infinity, with float param operands
+3.4028235E38 * Infinity = Infinity, with float param operands
+3.4028235E38 / Infinity = 0.0, with float param operands
+3.4028235E38 + Infinity = Infinity, with float local operands
+3.4028235E38 - Infinity = -Infinity, with float local operands
+3.4028235E38 * Infinity = Infinity, with float local operands
+3.4028235E38 / Infinity = 0.0, with float local operands
+3.4028235E38 + Infinity = Infinity, with float static operands
+3.4028235E38 - Infinity = -Infinity, with float static operands
+3.4028235E38 * Infinity = Infinity, with float static operands
+3.4028235E38 / Infinity = 0.0, with float static operands
+3.4028235E38 + Infinity = Infinity, with float field operands
+3.4028235E38 - Infinity = -Infinity, with float field operands
+3.4028235E38 * Infinity = Infinity, with float field operands
+3.4028235E38 / Infinity = 0.0, with float field operands
+3.4028235E38 + Infinity = Infinity, with float a[i] operands
+3.4028235E38 - Infinity = -Infinity, with float a[i] operands
+3.4028235E38 * Infinity = Infinity, with float a[i] operands
+3.4028235E38 / Infinity = 0.0, with float a[i] operands
+3.4028235E38 + Infinity = Infinity, with float f(x) operands
+3.4028235E38 - Infinity = -Infinity, with float f(x) operands
+3.4028235E38 * Infinity = Infinity, with float f(x) operands
+3.4028235E38 / Infinity = 0.0, with float f(x) operands
+3.4028235E38 + Infinity = Infinity, with float lExpr operands
+3.4028235E38 - Infinity = -Infinity, with float lExpr operands
+3.4028235E38 * Infinity = Infinity, with float lExpr operands
+3.4028235E38 / Infinity = 0.0, with float lExpr operands
+3.4028235E38 + Infinity = Infinity, with float rExpr operands
+3.4028235E38 - Infinity = -Infinity, with float rExpr operands
+3.4028235E38 * Infinity = Infinity, with float rExpr operands
+3.4028235E38 / Infinity = 0.0, with float rExpr operands
+3.4028235E38 + Infinity = Infinity, with float exprs operands
+3.4028235E38 - Infinity = -Infinity, with float exprs operands
+3.4028235E38 * Infinity = Infinity, with float exprs operands
+3.4028235E38 / Infinity = 0.0, with float exprs operands
+3.4028235E38 + NaN = NaN, with float param operands
+3.4028235E38 - NaN = NaN, with float param operands
+3.4028235E38 * NaN = NaN, with float param operands
+3.4028235E38 / NaN = NaN, with float param operands
+3.4028235E38 + NaN = NaN, with float local operands
+3.4028235E38 - NaN = NaN, with float local operands
+3.4028235E38 * NaN = NaN, with float local operands
+3.4028235E38 / NaN = NaN, with float local operands
+3.4028235E38 + NaN = NaN, with float static operands
+3.4028235E38 - NaN = NaN, with float static operands
+3.4028235E38 * NaN = NaN, with float static operands
+3.4028235E38 / NaN = NaN, with float static operands
+3.4028235E38 + NaN = NaN, with float field operands
+3.4028235E38 - NaN = NaN, with float field operands
+3.4028235E38 * NaN = NaN, with float field operands
+3.4028235E38 / NaN = NaN, with float field operands
+3.4028235E38 + NaN = NaN, with float a[i] operands
+3.4028235E38 - NaN = NaN, with float a[i] operands
+3.4028235E38 * NaN = NaN, with float a[i] operands
+3.4028235E38 / NaN = NaN, with float a[i] operands
+3.4028235E38 + NaN = NaN, with float f(x) operands
+3.4028235E38 - NaN = NaN, with float f(x) operands
+3.4028235E38 * NaN = NaN, with float f(x) operands
+3.4028235E38 / NaN = NaN, with float f(x) operands
+3.4028235E38 + NaN = NaN, with float lExpr operands
+3.4028235E38 - NaN = NaN, with float lExpr operands
+3.4028235E38 * NaN = NaN, with float lExpr operands
+3.4028235E38 / NaN = NaN, with float lExpr operands
+3.4028235E38 + NaN = NaN, with float rExpr operands
+3.4028235E38 - NaN = NaN, with float rExpr operands
+3.4028235E38 * NaN = NaN, with float rExpr operands
+3.4028235E38 / NaN = NaN, with float rExpr operands
+3.4028235E38 + NaN = NaN, with float exprs operands
+3.4028235E38 - NaN = NaN, with float exprs operands
+3.4028235E38 * NaN = NaN, with float exprs operands
+3.4028235E38 / NaN = NaN, with float exprs operands
+-1.4E-45 + 1.4E-45 = 0.0, with float param operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float param operands
+-1.4E-45 * 1.4E-45 = -0.0, with float param operands
+-1.4E-45 / 1.4E-45 = -1.0, with float param operands
+-1.4E-45 + 1.4E-45 = 0.0, with float local operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float local operands
+-1.4E-45 * 1.4E-45 = -0.0, with float local operands
+-1.4E-45 / 1.4E-45 = -1.0, with float local operands
+-1.4E-45 + 1.4E-45 = 0.0, with float static operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float static operands
+-1.4E-45 * 1.4E-45 = -0.0, with float static operands
+-1.4E-45 / 1.4E-45 = -1.0, with float static operands
+-1.4E-45 + 1.4E-45 = 0.0, with float field operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float field operands
+-1.4E-45 * 1.4E-45 = -0.0, with float field operands
+-1.4E-45 / 1.4E-45 = -1.0, with float field operands
+-1.4E-45 + 1.4E-45 = 0.0, with float a[i] operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float a[i] operands
+-1.4E-45 * 1.4E-45 = -0.0, with float a[i] operands
+-1.4E-45 / 1.4E-45 = -1.0, with float a[i] operands
+-1.4E-45 + 1.4E-45 = 0.0, with float f(x) operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float f(x) operands
+-1.4E-45 * 1.4E-45 = -0.0, with float f(x) operands
+-1.4E-45 / 1.4E-45 = -1.0, with float f(x) operands
+-1.4E-45 + 1.4E-45 = 0.0, with float lExpr operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float lExpr operands
+-1.4E-45 * 1.4E-45 = -0.0, with float lExpr operands
+-1.4E-45 / 1.4E-45 = -1.0, with float lExpr operands
+-1.4E-45 + 1.4E-45 = 0.0, with float rExpr operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float rExpr operands
+-1.4E-45 * 1.4E-45 = -0.0, with float rExpr operands
+-1.4E-45 / 1.4E-45 = -1.0, with float rExpr operands
+-1.4E-45 + 1.4E-45 = 0.0, with float exprs operands
+-1.4E-45 - 1.4E-45 = -2.8E-45, with float exprs operands
+-1.4E-45 * 1.4E-45 = -0.0, with float exprs operands
+-1.4E-45 / 1.4E-45 = -1.0, with float exprs operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float param operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float param operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float param operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float param operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float local operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float local operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float local operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float local operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float static operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float static operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float static operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float static operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float field operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float field operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float field operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float field operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float a[i] operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float a[i] operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float a[i] operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float a[i] operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float f(x) operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float f(x) operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float f(x) operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float f(x) operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float lExpr operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float lExpr operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float lExpr operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float lExpr operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float rExpr operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float rExpr operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float rExpr operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float rExpr operands
+-1.4E-45 + 3.4028235E38 = 3.4028235E38, with float exprs operands
+-1.4E-45 - 3.4028235E38 = -3.4028235E38, with float exprs operands
+-1.4E-45 * 3.4028235E38 = -4.7683713E-7, with float exprs operands
+-1.4E-45 / 3.4028235E38 = -0.0, with float exprs operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float param operands
+-1.4E-45 - -1.4E-45 = 0.0, with float param operands
+-1.4E-45 * -1.4E-45 = 0.0, with float param operands
+-1.4E-45 / -1.4E-45 = 1.0, with float param operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float local operands
+-1.4E-45 - -1.4E-45 = 0.0, with float local operands
+-1.4E-45 * -1.4E-45 = 0.0, with float local operands
+-1.4E-45 / -1.4E-45 = 1.0, with float local operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float static operands
+-1.4E-45 - -1.4E-45 = 0.0, with float static operands
+-1.4E-45 * -1.4E-45 = 0.0, with float static operands
+-1.4E-45 / -1.4E-45 = 1.0, with float static operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float field operands
+-1.4E-45 - -1.4E-45 = 0.0, with float field operands
+-1.4E-45 * -1.4E-45 = 0.0, with float field operands
+-1.4E-45 / -1.4E-45 = 1.0, with float field operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float a[i] operands
+-1.4E-45 - -1.4E-45 = 0.0, with float a[i] operands
+-1.4E-45 * -1.4E-45 = 0.0, with float a[i] operands
+-1.4E-45 / -1.4E-45 = 1.0, with float a[i] operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float f(x) operands
+-1.4E-45 - -1.4E-45 = 0.0, with float f(x) operands
+-1.4E-45 * -1.4E-45 = 0.0, with float f(x) operands
+-1.4E-45 / -1.4E-45 = 1.0, with float f(x) operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float lExpr operands
+-1.4E-45 - -1.4E-45 = 0.0, with float lExpr operands
+-1.4E-45 * -1.4E-45 = 0.0, with float lExpr operands
+-1.4E-45 / -1.4E-45 = 1.0, with float lExpr operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float rExpr operands
+-1.4E-45 - -1.4E-45 = 0.0, with float rExpr operands
+-1.4E-45 * -1.4E-45 = 0.0, with float rExpr operands
+-1.4E-45 / -1.4E-45 = 1.0, with float rExpr operands
+-1.4E-45 + -1.4E-45 = -2.8E-45, with float exprs operands
+-1.4E-45 - -1.4E-45 = 0.0, with float exprs operands
+-1.4E-45 * -1.4E-45 = 0.0, with float exprs operands
+-1.4E-45 / -1.4E-45 = 1.0, with float exprs operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float param operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float param operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float param operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float param operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float local operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float local operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float local operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float local operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float static operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float static operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float static operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float static operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float field operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float field operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float field operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float field operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float a[i] operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float a[i] operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float a[i] operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float a[i] operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float f(x) operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float f(x) operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float f(x) operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float f(x) operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float lExpr operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float lExpr operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float lExpr operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float lExpr operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float rExpr operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float rExpr operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float rExpr operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float rExpr operands
+-1.4E-45 + -3.4028235E38 = -3.4028235E38, with float exprs operands
+-1.4E-45 - -3.4028235E38 = 3.4028235E38, with float exprs operands
+-1.4E-45 * -3.4028235E38 = 4.7683713E-7, with float exprs operands
+-1.4E-45 / -3.4028235E38 = 0.0, with float exprs operands
+-1.4E-45 + -1.0 = -1.0, with float param operands
+-1.4E-45 - -1.0 = 1.0, with float param operands
+-1.4E-45 * -1.0 = 1.4E-45, with float param operands
+-1.4E-45 / -1.0 = 1.4E-45, with float param operands
+-1.4E-45 + -1.0 = -1.0, with float local operands
+-1.4E-45 - -1.0 = 1.0, with float local operands
+-1.4E-45 * -1.0 = 1.4E-45, with float local operands
+-1.4E-45 / -1.0 = 1.4E-45, with float local operands
+-1.4E-45 + -1.0 = -1.0, with float static operands
+-1.4E-45 - -1.0 = 1.0, with float static operands
+-1.4E-45 * -1.0 = 1.4E-45, with float static operands
+-1.4E-45 / -1.0 = 1.4E-45, with float static operands
+-1.4E-45 + -1.0 = -1.0, with float field operands
+-1.4E-45 - -1.0 = 1.0, with float field operands
+-1.4E-45 * -1.0 = 1.4E-45, with float field operands
+-1.4E-45 / -1.0 = 1.4E-45, with float field operands
+-1.4E-45 + -1.0 = -1.0, with float a[i] operands
+-1.4E-45 - -1.0 = 1.0, with float a[i] operands
+-1.4E-45 * -1.0 = 1.4E-45, with float a[i] operands
+-1.4E-45 / -1.0 = 1.4E-45, with float a[i] operands
+-1.4E-45 + -1.0 = -1.0, with float f(x) operands
+-1.4E-45 - -1.0 = 1.0, with float f(x) operands
+-1.4E-45 * -1.0 = 1.4E-45, with float f(x) operands
+-1.4E-45 / -1.0 = 1.4E-45, with float f(x) operands
+-1.4E-45 + -1.0 = -1.0, with float lExpr operands
+-1.4E-45 - -1.0 = 1.0, with float lExpr operands
+-1.4E-45 * -1.0 = 1.4E-45, with float lExpr operands
+-1.4E-45 / -1.0 = 1.4E-45, with float lExpr operands
+-1.4E-45 + -1.0 = -1.0, with float rExpr operands
+-1.4E-45 - -1.0 = 1.0, with float rExpr operands
+-1.4E-45 * -1.0 = 1.4E-45, with float rExpr operands
+-1.4E-45 / -1.0 = 1.4E-45, with float rExpr operands
+-1.4E-45 + -1.0 = -1.0, with float exprs operands
+-1.4E-45 - -1.0 = 1.0, with float exprs operands
+-1.4E-45 * -1.0 = 1.4E-45, with float exprs operands
+-1.4E-45 / -1.0 = 1.4E-45, with float exprs operands
+-1.4E-45 + 1.0 = 1.0, with float param operands
+-1.4E-45 - 1.0 = -1.0, with float param operands
+-1.4E-45 * 1.0 = -1.4E-45, with float param operands
+-1.4E-45 / 1.0 = -1.4E-45, with float param operands
+-1.4E-45 + 1.0 = 1.0, with float local operands
+-1.4E-45 - 1.0 = -1.0, with float local operands
+-1.4E-45 * 1.0 = -1.4E-45, with float local operands
+-1.4E-45 / 1.0 = -1.4E-45, with float local operands
+-1.4E-45 + 1.0 = 1.0, with float static operands
+-1.4E-45 - 1.0 = -1.0, with float static operands
+-1.4E-45 * 1.0 = -1.4E-45, with float static operands
+-1.4E-45 / 1.0 = -1.4E-45, with float static operands
+-1.4E-45 + 1.0 = 1.0, with float field operands
+-1.4E-45 - 1.0 = -1.0, with float field operands
+-1.4E-45 * 1.0 = -1.4E-45, with float field operands
+-1.4E-45 / 1.0 = -1.4E-45, with float field operands
+-1.4E-45 + 1.0 = 1.0, with float a[i] operands
+-1.4E-45 - 1.0 = -1.0, with float a[i] operands
+-1.4E-45 * 1.0 = -1.4E-45, with float a[i] operands
+-1.4E-45 / 1.0 = -1.4E-45, with float a[i] operands
+-1.4E-45 + 1.0 = 1.0, with float f(x) operands
+-1.4E-45 - 1.0 = -1.0, with float f(x) operands
+-1.4E-45 * 1.0 = -1.4E-45, with float f(x) operands
+-1.4E-45 / 1.0 = -1.4E-45, with float f(x) operands
+-1.4E-45 + 1.0 = 1.0, with float lExpr operands
+-1.4E-45 - 1.0 = -1.0, with float lExpr operands
+-1.4E-45 * 1.0 = -1.4E-45, with float lExpr operands
+-1.4E-45 / 1.0 = -1.4E-45, with float lExpr operands
+-1.4E-45 + 1.0 = 1.0, with float rExpr operands
+-1.4E-45 - 1.0 = -1.0, with float rExpr operands
+-1.4E-45 * 1.0 = -1.4E-45, with float rExpr operands
+-1.4E-45 / 1.0 = -1.4E-45, with float rExpr operands
+-1.4E-45 + 1.0 = 1.0, with float exprs operands
+-1.4E-45 - 1.0 = -1.0, with float exprs operands
+-1.4E-45 * 1.0 = -1.4E-45, with float exprs operands
+-1.4E-45 / 1.0 = -1.4E-45, with float exprs operands
+-1.4E-45 + -0.0 = -1.4E-45, with float param operands
+-1.4E-45 - -0.0 = -1.4E-45, with float param operands
+-1.4E-45 * -0.0 = 0.0, with float param operands
+-1.4E-45 / -0.0 = Infinity, with float param operands
+-1.4E-45 + -0.0 = -1.4E-45, with float local operands
+-1.4E-45 - -0.0 = -1.4E-45, with float local operands
+-1.4E-45 * -0.0 = 0.0, with float local operands
+-1.4E-45 / -0.0 = Infinity, with float local operands
+-1.4E-45 + -0.0 = -1.4E-45, with float static operands
+-1.4E-45 - -0.0 = -1.4E-45, with float static operands
+-1.4E-45 * -0.0 = 0.0, with float static operands
+-1.4E-45 / -0.0 = Infinity, with float static operands
+-1.4E-45 + -0.0 = -1.4E-45, with float field operands
+-1.4E-45 - -0.0 = -1.4E-45, with float field operands
+-1.4E-45 * -0.0 = 0.0, with float field operands
+-1.4E-45 / -0.0 = Infinity, with float field operands
+-1.4E-45 + -0.0 = -1.4E-45, with float a[i] operands
+-1.4E-45 - -0.0 = -1.4E-45, with float a[i] operands
+-1.4E-45 * -0.0 = 0.0, with float a[i] operands
+-1.4E-45 / -0.0 = Infinity, with float a[i] operands
+-1.4E-45 + -0.0 = -1.4E-45, with float f(x) operands
+-1.4E-45 - -0.0 = -1.4E-45, with float f(x) operands
+-1.4E-45 * -0.0 = 0.0, with float f(x) operands
+-1.4E-45 / -0.0 = Infinity, with float f(x) operands
+-1.4E-45 + -0.0 = -1.4E-45, with float lExpr operands
+-1.4E-45 - -0.0 = -1.4E-45, with float lExpr operands
+-1.4E-45 * -0.0 = 0.0, with float lExpr operands
+-1.4E-45 / -0.0 = Infinity, with float lExpr operands
+-1.4E-45 + 0.0 = -1.4E-45, with float rExpr operands
+-1.4E-45 - 0.0 = -1.4E-45, with float rExpr operands
+-1.4E-45 * 0.0 = -0.0, with float rExpr operands
+-1.4E-45 / 0.0 = -Infinity, with float rExpr operands
+-1.4E-45 + 0.0 = -1.4E-45, with float exprs operands
+-1.4E-45 - 0.0 = -1.4E-45, with float exprs operands
+-1.4E-45 * 0.0 = -0.0, with float exprs operands
+-1.4E-45 / 0.0 = -Infinity, with float exprs operands
+-1.4E-45 + 0.0 = -1.4E-45, with float param operands
+-1.4E-45 - 0.0 = -1.4E-45, with float param operands
+-1.4E-45 * 0.0 = -0.0, with float param operands
+-1.4E-45 / 0.0 = -Infinity, with float param operands
+-1.4E-45 + 0.0 = -1.4E-45, with float local operands
+-1.4E-45 - 0.0 = -1.4E-45, with float local operands
+-1.4E-45 * 0.0 = -0.0, with float local operands
+-1.4E-45 / 0.0 = -Infinity, with float local operands
+-1.4E-45 + 0.0 = -1.4E-45, with float static operands
+-1.4E-45 - 0.0 = -1.4E-45, with float static operands
+-1.4E-45 * 0.0 = -0.0, with float static operands
+-1.4E-45 / 0.0 = -Infinity, with float static operands
+-1.4E-45 + 0.0 = -1.4E-45, with float field operands
+-1.4E-45 - 0.0 = -1.4E-45, with float field operands
+-1.4E-45 * 0.0 = -0.0, with float field operands
+-1.4E-45 / 0.0 = -Infinity, with float field operands
+-1.4E-45 + 0.0 = -1.4E-45, with float a[i] operands
+-1.4E-45 - 0.0 = -1.4E-45, with float a[i] operands
+-1.4E-45 * 0.0 = -0.0, with float a[i] operands
+-1.4E-45 / 0.0 = -Infinity, with float a[i] operands
+-1.4E-45 + 0.0 = -1.4E-45, with float f(x) operands
+-1.4E-45 - 0.0 = -1.4E-45, with float f(x) operands
+-1.4E-45 * 0.0 = -0.0, with float f(x) operands
+-1.4E-45 / 0.0 = -Infinity, with float f(x) operands
+-1.4E-45 + 0.0 = -1.4E-45, with float lExpr operands
+-1.4E-45 - 0.0 = -1.4E-45, with float lExpr operands
+-1.4E-45 * 0.0 = -0.0, with float lExpr operands
+-1.4E-45 / 0.0 = -Infinity, with float lExpr operands
+-1.4E-45 + 0.0 = -1.4E-45, with float rExpr operands
+-1.4E-45 - 0.0 = -1.4E-45, with float rExpr operands
+-1.4E-45 * 0.0 = -0.0, with float rExpr operands
+-1.4E-45 / 0.0 = -Infinity, with float rExpr operands
+-1.4E-45 + 0.0 = -1.4E-45, with float exprs operands
+-1.4E-45 - 0.0 = -1.4E-45, with float exprs operands
+-1.4E-45 * 0.0 = -0.0, with float exprs operands
+-1.4E-45 / 0.0 = -Infinity, with float exprs operands
+-1.4E-45 + -Infinity = -Infinity, with float param operands
+-1.4E-45 - -Infinity = Infinity, with float param operands
+-1.4E-45 * -Infinity = Infinity, with float param operands
+-1.4E-45 / -Infinity = 0.0, with float param operands
+-1.4E-45 + -Infinity = -Infinity, with float local operands
+-1.4E-45 - -Infinity = Infinity, with float local operands
+-1.4E-45 * -Infinity = Infinity, with float local operands
+-1.4E-45 / -Infinity = 0.0, with float local operands
+-1.4E-45 + -Infinity = -Infinity, with float static operands
+-1.4E-45 - -Infinity = Infinity, with float static operands
+-1.4E-45 * -Infinity = Infinity, with float static operands
+-1.4E-45 / -Infinity = 0.0, with float static operands
+-1.4E-45 + -Infinity = -Infinity, with float field operands
+-1.4E-45 - -Infinity = Infinity, with float field operands
+-1.4E-45 * -Infinity = Infinity, with float field operands
+-1.4E-45 / -Infinity = 0.0, with float field operands
+-1.4E-45 + -Infinity = -Infinity, with float a[i] operands
+-1.4E-45 - -Infinity = Infinity, with float a[i] operands
+-1.4E-45 * -Infinity = Infinity, with float a[i] operands
+-1.4E-45 / -Infinity = 0.0, with float a[i] operands
+-1.4E-45 + -Infinity = -Infinity, with float f(x) operands
+-1.4E-45 - -Infinity = Infinity, with float f(x) operands
+-1.4E-45 * -Infinity = Infinity, with float f(x) operands
+-1.4E-45 / -Infinity = 0.0, with float f(x) operands
+-1.4E-45 + -Infinity = -Infinity, with float lExpr operands
+-1.4E-45 - -Infinity = Infinity, with float lExpr operands
+-1.4E-45 * -Infinity = Infinity, with float lExpr operands
+-1.4E-45 / -Infinity = 0.0, with float lExpr operands
+-1.4E-45 + -Infinity = -Infinity, with float rExpr operands
+-1.4E-45 - -Infinity = Infinity, with float rExpr operands
+-1.4E-45 * -Infinity = Infinity, with float rExpr operands
+-1.4E-45 / -Infinity = 0.0, with float rExpr operands
+-1.4E-45 + -Infinity = -Infinity, with float exprs operands
+-1.4E-45 - -Infinity = Infinity, with float exprs operands
+-1.4E-45 * -Infinity = Infinity, with float exprs operands
+-1.4E-45 / -Infinity = 0.0, with float exprs operands
+-1.4E-45 + Infinity = Infinity, with float param operands
+-1.4E-45 - Infinity = -Infinity, with float param operands
+-1.4E-45 * Infinity = -Infinity, with float param operands
+-1.4E-45 / Infinity = -0.0, with float param operands
+-1.4E-45 + Infinity = Infinity, with float local operands
+-1.4E-45 - Infinity = -Infinity, with float local operands
+-1.4E-45 * Infinity = -Infinity, with float local operands
+-1.4E-45 / Infinity = -0.0, with float local operands
+-1.4E-45 + Infinity = Infinity, with float static operands
+-1.4E-45 - Infinity = -Infinity, with float static operands
+-1.4E-45 * Infinity = -Infinity, with float static operands
+-1.4E-45 / Infinity = -0.0, with float static operands
+-1.4E-45 + Infinity = Infinity, with float field operands
+-1.4E-45 - Infinity = -Infinity, with float field operands
+-1.4E-45 * Infinity = -Infinity, with float field operands
+-1.4E-45 / Infinity = -0.0, with float field operands
+-1.4E-45 + Infinity = Infinity, with float a[i] operands
+-1.4E-45 - Infinity = -Infinity, with float a[i] operands
+-1.4E-45 * Infinity = -Infinity, with float a[i] operands
+-1.4E-45 / Infinity = -0.0, with float a[i] operands
+-1.4E-45 + Infinity = Infinity, with float f(x) operands
+-1.4E-45 - Infinity = -Infinity, with float f(x) operands
+-1.4E-45 * Infinity = -Infinity, with float f(x) operands
+-1.4E-45 / Infinity = -0.0, with float f(x) operands
+-1.4E-45 + Infinity = Infinity, with float lExpr operands
+-1.4E-45 - Infinity = -Infinity, with float lExpr operands
+-1.4E-45 * Infinity = -Infinity, with float lExpr operands
+-1.4E-45 / Infinity = -0.0, with float lExpr operands
+-1.4E-45 + Infinity = Infinity, with float rExpr operands
+-1.4E-45 - Infinity = -Infinity, with float rExpr operands
+-1.4E-45 * Infinity = -Infinity, with float rExpr operands
+-1.4E-45 / Infinity = -0.0, with float rExpr operands
+-1.4E-45 + Infinity = Infinity, with float exprs operands
+-1.4E-45 - Infinity = -Infinity, with float exprs operands
+-1.4E-45 * Infinity = -Infinity, with float exprs operands
+-1.4E-45 / Infinity = -0.0, with float exprs operands
+-1.4E-45 + NaN = NaN, with float param operands
+-1.4E-45 - NaN = NaN, with float param operands
+-1.4E-45 * NaN = NaN, with float param operands
+-1.4E-45 / NaN = NaN, with float param operands
+-1.4E-45 + NaN = NaN, with float local operands
+-1.4E-45 - NaN = NaN, with float local operands
+-1.4E-45 * NaN = NaN, with float local operands
+-1.4E-45 / NaN = NaN, with float local operands
+-1.4E-45 + NaN = NaN, with float static operands
+-1.4E-45 - NaN = NaN, with float static operands
+-1.4E-45 * NaN = NaN, with float static operands
+-1.4E-45 / NaN = NaN, with float static operands
+-1.4E-45 + NaN = NaN, with float field operands
+-1.4E-45 - NaN = NaN, with float field operands
+-1.4E-45 * NaN = NaN, with float field operands
+-1.4E-45 / NaN = NaN, with float field operands
+-1.4E-45 + NaN = NaN, with float a[i] operands
+-1.4E-45 - NaN = NaN, with float a[i] operands
+-1.4E-45 * NaN = NaN, with float a[i] operands
+-1.4E-45 / NaN = NaN, with float a[i] operands
+-1.4E-45 + NaN = NaN, with float f(x) operands
+-1.4E-45 - NaN = NaN, with float f(x) operands
+-1.4E-45 * NaN = NaN, with float f(x) operands
+-1.4E-45 / NaN = NaN, with float f(x) operands
+-1.4E-45 + NaN = NaN, with float lExpr operands
+-1.4E-45 - NaN = NaN, with float lExpr operands
+-1.4E-45 * NaN = NaN, with float lExpr operands
+-1.4E-45 / NaN = NaN, with float lExpr operands
+-1.4E-45 + NaN = NaN, with float rExpr operands
+-1.4E-45 - NaN = NaN, with float rExpr operands
+-1.4E-45 * NaN = NaN, with float rExpr operands
+-1.4E-45 / NaN = NaN, with float rExpr operands
+-1.4E-45 + NaN = NaN, with float exprs operands
+-1.4E-45 - NaN = NaN, with float exprs operands
+-1.4E-45 * NaN = NaN, with float exprs operands
+-1.4E-45 / NaN = NaN, with float exprs operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float param operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float param operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float param operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float param operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float local operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float local operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float local operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float local operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float static operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float static operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float static operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float static operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float field operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float field operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float field operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float field operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float a[i] operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float a[i] operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float f(x) operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float f(x) operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float lExpr operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float lExpr operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float rExpr operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float rExpr operands
+-3.4028235E38 + 1.4E-45 = -3.4028235E38, with float exprs operands
+-3.4028235E38 - 1.4E-45 = -3.4028235E38, with float exprs operands
+-3.4028235E38 * 1.4E-45 = -4.7683713E-7, with float exprs operands
+-3.4028235E38 / 1.4E-45 = -Infinity, with float exprs operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float param operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float param operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float param operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float param operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float local operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float local operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float local operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float local operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float static operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float static operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float static operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float static operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float field operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float field operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float field operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float field operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float a[i] operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float a[i] operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float a[i] operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float a[i] operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float f(x) operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float f(x) operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float f(x) operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float f(x) operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float lExpr operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float lExpr operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float lExpr operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float lExpr operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float rExpr operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float rExpr operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float rExpr operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float rExpr operands
+-3.4028235E38 + 3.4028235E38 = 0.0, with float exprs operands
+-3.4028235E38 - 3.4028235E38 = -Infinity, with float exprs operands
+-3.4028235E38 * 3.4028235E38 = -Infinity, with float exprs operands
+-3.4028235E38 / 3.4028235E38 = -1.0, with float exprs operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float param operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float param operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float param operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float param operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float local operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float local operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float local operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float local operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float static operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float static operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float static operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float static operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float field operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float field operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float field operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float field operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float a[i] operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float a[i] operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float f(x) operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float f(x) operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float lExpr operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float lExpr operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float rExpr operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float rExpr operands
+-3.4028235E38 + -1.4E-45 = -3.4028235E38, with float exprs operands
+-3.4028235E38 - -1.4E-45 = -3.4028235E38, with float exprs operands
+-3.4028235E38 * -1.4E-45 = 4.7683713E-7, with float exprs operands
+-3.4028235E38 / -1.4E-45 = Infinity, with float exprs operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float param operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float param operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float param operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float param operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float local operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float local operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float local operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float local operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float static operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float static operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float static operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float static operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float field operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float field operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float field operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float field operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float a[i] operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float a[i] operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float a[i] operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float a[i] operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float f(x) operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float f(x) operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float f(x) operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float f(x) operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float lExpr operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float lExpr operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float lExpr operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float lExpr operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float rExpr operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float rExpr operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float rExpr operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float rExpr operands
+-3.4028235E38 + -3.4028235E38 = -Infinity, with float exprs operands
+-3.4028235E38 - -3.4028235E38 = 0.0, with float exprs operands
+-3.4028235E38 * -3.4028235E38 = Infinity, with float exprs operands
+-3.4028235E38 / -3.4028235E38 = 1.0, with float exprs operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float param operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float param operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float param operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float param operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float local operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float local operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float local operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float local operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float static operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float static operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float static operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float static operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float field operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float field operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float field operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float field operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float a[i] operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float a[i] operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float f(x) operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float f(x) operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float lExpr operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float lExpr operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float rExpr operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float rExpr operands
+-3.4028235E38 + -1.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 - -1.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 * -1.0 = 3.4028235E38, with float exprs operands
+-3.4028235E38 / -1.0 = 3.4028235E38, with float exprs operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float param operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float param operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float param operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float param operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float local operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float local operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float local operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float local operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float static operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float static operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float static operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float static operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float field operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float field operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float field operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float field operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 + 1.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 - 1.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 * 1.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 / 1.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float param operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float param operands
+-3.4028235E38 * -0.0 = 0.0, with float param operands
+-3.4028235E38 / -0.0 = Infinity, with float param operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float local operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float local operands
+-3.4028235E38 * -0.0 = 0.0, with float local operands
+-3.4028235E38 / -0.0 = Infinity, with float local operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float static operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float static operands
+-3.4028235E38 * -0.0 = 0.0, with float static operands
+-3.4028235E38 / -0.0 = Infinity, with float static operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float field operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float field operands
+-3.4028235E38 * -0.0 = 0.0, with float field operands
+-3.4028235E38 / -0.0 = Infinity, with float field operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 * -0.0 = 0.0, with float a[i] operands
+-3.4028235E38 / -0.0 = Infinity, with float a[i] operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 * -0.0 = 0.0, with float f(x) operands
+-3.4028235E38 / -0.0 = Infinity, with float f(x) operands
+-3.4028235E38 + -0.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 - -0.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 * -0.0 = 0.0, with float lExpr operands
+-3.4028235E38 / -0.0 = Infinity, with float lExpr operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 * 0.0 = -0.0, with float rExpr operands
+-3.4028235E38 / 0.0 = -Infinity, with float rExpr operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 * 0.0 = -0.0, with float exprs operands
+-3.4028235E38 / 0.0 = -Infinity, with float exprs operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float param operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float param operands
+-3.4028235E38 * 0.0 = -0.0, with float param operands
+-3.4028235E38 / 0.0 = -Infinity, with float param operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float local operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float local operands
+-3.4028235E38 * 0.0 = -0.0, with float local operands
+-3.4028235E38 / 0.0 = -Infinity, with float local operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float static operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float static operands
+-3.4028235E38 * 0.0 = -0.0, with float static operands
+-3.4028235E38 / 0.0 = -Infinity, with float static operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float field operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float field operands
+-3.4028235E38 * 0.0 = -0.0, with float field operands
+-3.4028235E38 / 0.0 = -Infinity, with float field operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float a[i] operands
+-3.4028235E38 * 0.0 = -0.0, with float a[i] operands
+-3.4028235E38 / 0.0 = -Infinity, with float a[i] operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float f(x) operands
+-3.4028235E38 * 0.0 = -0.0, with float f(x) operands
+-3.4028235E38 / 0.0 = -Infinity, with float f(x) operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float lExpr operands
+-3.4028235E38 * 0.0 = -0.0, with float lExpr operands
+-3.4028235E38 / 0.0 = -Infinity, with float lExpr operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float rExpr operands
+-3.4028235E38 * 0.0 = -0.0, with float rExpr operands
+-3.4028235E38 / 0.0 = -Infinity, with float rExpr operands
+-3.4028235E38 + 0.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 - 0.0 = -3.4028235E38, with float exprs operands
+-3.4028235E38 * 0.0 = -0.0, with float exprs operands
+-3.4028235E38 / 0.0 = -Infinity, with float exprs operands
+-3.4028235E38 + -Infinity = -Infinity, with float param operands
+-3.4028235E38 - -Infinity = Infinity, with float param operands
+-3.4028235E38 * -Infinity = Infinity, with float param operands
+-3.4028235E38 / -Infinity = 0.0, with float param operands
+-3.4028235E38 + -Infinity = -Infinity, with float local operands
+-3.4028235E38 - -Infinity = Infinity, with float local operands
+-3.4028235E38 * -Infinity = Infinity, with float local operands
+-3.4028235E38 / -Infinity = 0.0, with float local operands
+-3.4028235E38 + -Infinity = -Infinity, with float static operands
+-3.4028235E38 - -Infinity = Infinity, with float static operands
+-3.4028235E38 * -Infinity = Infinity, with float static operands
+-3.4028235E38 / -Infinity = 0.0, with float static operands
+-3.4028235E38 + -Infinity = -Infinity, with float field operands
+-3.4028235E38 - -Infinity = Infinity, with float field operands
+-3.4028235E38 * -Infinity = Infinity, with float field operands
+-3.4028235E38 / -Infinity = 0.0, with float field operands
+-3.4028235E38 + -Infinity = -Infinity, with float a[i] operands
+-3.4028235E38 - -Infinity = Infinity, with float a[i] operands
+-3.4028235E38 * -Infinity = Infinity, with float a[i] operands
+-3.4028235E38 / -Infinity = 0.0, with float a[i] operands
+-3.4028235E38 + -Infinity = -Infinity, with float f(x) operands
+-3.4028235E38 - -Infinity = Infinity, with float f(x) operands
+-3.4028235E38 * -Infinity = Infinity, with float f(x) operands
+-3.4028235E38 / -Infinity = 0.0, with float f(x) operands
+-3.4028235E38 + -Infinity = -Infinity, with float lExpr operands
+-3.4028235E38 - -Infinity = Infinity, with float lExpr operands
+-3.4028235E38 * -Infinity = Infinity, with float lExpr operands
+-3.4028235E38 / -Infinity = 0.0, with float lExpr operands
+-3.4028235E38 + -Infinity = -Infinity, with float rExpr operands
+-3.4028235E38 - -Infinity = Infinity, with float rExpr operands
+-3.4028235E38 * -Infinity = Infinity, with float rExpr operands
+-3.4028235E38 / -Infinity = 0.0, with float rExpr operands
+-3.4028235E38 + -Infinity = -Infinity, with float exprs operands
+-3.4028235E38 - -Infinity = Infinity, with float exprs operands
+-3.4028235E38 * -Infinity = Infinity, with float exprs operands
+-3.4028235E38 / -Infinity = 0.0, with float exprs operands
+-3.4028235E38 + Infinity = Infinity, with float param operands
+-3.4028235E38 - Infinity = -Infinity, with float param operands
+-3.4028235E38 * Infinity = -Infinity, with float param operands
+-3.4028235E38 / Infinity = -0.0, with float param operands
+-3.4028235E38 + Infinity = Infinity, with float local operands
+-3.4028235E38 - Infinity = -Infinity, with float local operands
+-3.4028235E38 * Infinity = -Infinity, with float local operands
+-3.4028235E38 / Infinity = -0.0, with float local operands
+-3.4028235E38 + Infinity = Infinity, with float static operands
+-3.4028235E38 - Infinity = -Infinity, with float static operands
+-3.4028235E38 * Infinity = -Infinity, with float static operands
+-3.4028235E38 / Infinity = -0.0, with float static operands
+-3.4028235E38 + Infinity = Infinity, with float field operands
+-3.4028235E38 - Infinity = -Infinity, with float field operands
+-3.4028235E38 * Infinity = -Infinity, with float field operands
+-3.4028235E38 / Infinity = -0.0, with float field operands
+-3.4028235E38 + Infinity = Infinity, with float a[i] operands
+-3.4028235E38 - Infinity = -Infinity, with float a[i] operands
+-3.4028235E38 * Infinity = -Infinity, with float a[i] operands
+-3.4028235E38 / Infinity = -0.0, with float a[i] operands
+-3.4028235E38 + Infinity = Infinity, with float f(x) operands
+-3.4028235E38 - Infinity = -Infinity, with float f(x) operands
+-3.4028235E38 * Infinity = -Infinity, with float f(x) operands
+-3.4028235E38 / Infinity = -0.0, with float f(x) operands
+-3.4028235E38 + Infinity = Infinity, with float lExpr operands
+-3.4028235E38 - Infinity = -Infinity, with float lExpr operands
+-3.4028235E38 * Infinity = -Infinity, with float lExpr operands
+-3.4028235E38 / Infinity = -0.0, with float lExpr operands
+-3.4028235E38 + Infinity = Infinity, with float rExpr operands
+-3.4028235E38 - Infinity = -Infinity, with float rExpr operands
+-3.4028235E38 * Infinity = -Infinity, with float rExpr operands
+-3.4028235E38 / Infinity = -0.0, with float rExpr operands
+-3.4028235E38 + Infinity = Infinity, with float exprs operands
+-3.4028235E38 - Infinity = -Infinity, with float exprs operands
+-3.4028235E38 * Infinity = -Infinity, with float exprs operands
+-3.4028235E38 / Infinity = -0.0, with float exprs operands
+-3.4028235E38 + NaN = NaN, with float param operands
+-3.4028235E38 - NaN = NaN, with float param operands
+-3.4028235E38 * NaN = NaN, with float param operands
+-3.4028235E38 / NaN = NaN, with float param operands
+-3.4028235E38 + NaN = NaN, with float local operands
+-3.4028235E38 - NaN = NaN, with float local operands
+-3.4028235E38 * NaN = NaN, with float local operands
+-3.4028235E38 / NaN = NaN, with float local operands
+-3.4028235E38 + NaN = NaN, with float static operands
+-3.4028235E38 - NaN = NaN, with float static operands
+-3.4028235E38 * NaN = NaN, with float static operands
+-3.4028235E38 / NaN = NaN, with float static operands
+-3.4028235E38 + NaN = NaN, with float field operands
+-3.4028235E38 - NaN = NaN, with float field operands
+-3.4028235E38 * NaN = NaN, with float field operands
+-3.4028235E38 / NaN = NaN, with float field operands
+-3.4028235E38 + NaN = NaN, with float a[i] operands
+-3.4028235E38 - NaN = NaN, with float a[i] operands
+-3.4028235E38 * NaN = NaN, with float a[i] operands
+-3.4028235E38 / NaN = NaN, with float a[i] operands
+-3.4028235E38 + NaN = NaN, with float f(x) operands
+-3.4028235E38 - NaN = NaN, with float f(x) operands
+-3.4028235E38 * NaN = NaN, with float f(x) operands
+-3.4028235E38 / NaN = NaN, with float f(x) operands
+-3.4028235E38 + NaN = NaN, with float lExpr operands
+-3.4028235E38 - NaN = NaN, with float lExpr operands
+-3.4028235E38 * NaN = NaN, with float lExpr operands
+-3.4028235E38 / NaN = NaN, with float lExpr operands
+-3.4028235E38 + NaN = NaN, with float rExpr operands
+-3.4028235E38 - NaN = NaN, with float rExpr operands
+-3.4028235E38 * NaN = NaN, with float rExpr operands
+-3.4028235E38 / NaN = NaN, with float rExpr operands
+-3.4028235E38 + NaN = NaN, with float exprs operands
+-3.4028235E38 - NaN = NaN, with float exprs operands
+-3.4028235E38 * NaN = NaN, with float exprs operands
+-3.4028235E38 / NaN = NaN, with float exprs operands
+-1.0 + 1.4E-45 = -1.0, with float param operands
+-1.0 - 1.4E-45 = -1.0, with float param operands
+-1.0 * 1.4E-45 = -1.4E-45, with float param operands
+-1.0 / 1.4E-45 = -Infinity, with float param operands
+-1.0 + 1.4E-45 = -1.0, with float local operands
+-1.0 - 1.4E-45 = -1.0, with float local operands
+-1.0 * 1.4E-45 = -1.4E-45, with float local operands
+-1.0 / 1.4E-45 = -Infinity, with float local operands
+-1.0 + 1.4E-45 = -1.0, with float static operands
+-1.0 - 1.4E-45 = -1.0, with float static operands
+-1.0 * 1.4E-45 = -1.4E-45, with float static operands
+-1.0 / 1.4E-45 = -Infinity, with float static operands
+-1.0 + 1.4E-45 = -1.0, with float field operands
+-1.0 - 1.4E-45 = -1.0, with float field operands
+-1.0 * 1.4E-45 = -1.4E-45, with float field operands
+-1.0 / 1.4E-45 = -Infinity, with float field operands
+-1.0 + 1.4E-45 = -1.0, with float a[i] operands
+-1.0 - 1.4E-45 = -1.0, with float a[i] operands
+-1.0 * 1.4E-45 = -1.4E-45, with float a[i] operands
+-1.0 / 1.4E-45 = -Infinity, with float a[i] operands
+-1.0 + 1.4E-45 = -1.0, with float f(x) operands
+-1.0 - 1.4E-45 = -1.0, with float f(x) operands
+-1.0 * 1.4E-45 = -1.4E-45, with float f(x) operands
+-1.0 / 1.4E-45 = -Infinity, with float f(x) operands
+-1.0 + 1.4E-45 = -1.0, with float lExpr operands
+-1.0 - 1.4E-45 = -1.0, with float lExpr operands
+-1.0 * 1.4E-45 = -1.4E-45, with float lExpr operands
+-1.0 / 1.4E-45 = -Infinity, with float lExpr operands
+-1.0 + 1.4E-45 = -1.0, with float rExpr operands
+-1.0 - 1.4E-45 = -1.0, with float rExpr operands
+-1.0 * 1.4E-45 = -1.4E-45, with float rExpr operands
+-1.0 / 1.4E-45 = -Infinity, with float rExpr operands
+-1.0 + 1.4E-45 = -1.0, with float exprs operands
+-1.0 - 1.4E-45 = -1.0, with float exprs operands
+-1.0 * 1.4E-45 = -1.4E-45, with float exprs operands
+-1.0 / 1.4E-45 = -Infinity, with float exprs operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float param operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float param operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float param operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float param operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float local operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float local operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float local operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float local operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float static operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float static operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float static operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float static operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float field operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float field operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float field operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float field operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float a[i] operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float a[i] operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float a[i] operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float a[i] operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float f(x) operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float f(x) operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float f(x) operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float f(x) operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float lExpr operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float lExpr operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float lExpr operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float lExpr operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float rExpr operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float rExpr operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float rExpr operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float rExpr operands
+-1.0 + 3.4028235E38 = 3.4028235E38, with float exprs operands
+-1.0 - 3.4028235E38 = -3.4028235E38, with float exprs operands
+-1.0 * 3.4028235E38 = -3.4028235E38, with float exprs operands
+-1.0 / 3.4028235E38 = -2.938736E-39, with float exprs operands
+-1.0 + -1.4E-45 = -1.0, with float param operands
+-1.0 - -1.4E-45 = -1.0, with float param operands
+-1.0 * -1.4E-45 = 1.4E-45, with float param operands
+-1.0 / -1.4E-45 = Infinity, with float param operands
+-1.0 + -1.4E-45 = -1.0, with float local operands
+-1.0 - -1.4E-45 = -1.0, with float local operands
+-1.0 * -1.4E-45 = 1.4E-45, with float local operands
+-1.0 / -1.4E-45 = Infinity, with float local operands
+-1.0 + -1.4E-45 = -1.0, with float static operands
+-1.0 - -1.4E-45 = -1.0, with float static operands
+-1.0 * -1.4E-45 = 1.4E-45, with float static operands
+-1.0 / -1.4E-45 = Infinity, with float static operands
+-1.0 + -1.4E-45 = -1.0, with float field operands
+-1.0 - -1.4E-45 = -1.0, with float field operands
+-1.0 * -1.4E-45 = 1.4E-45, with float field operands
+-1.0 / -1.4E-45 = Infinity, with float field operands
+-1.0 + -1.4E-45 = -1.0, with float a[i] operands
+-1.0 - -1.4E-45 = -1.0, with float a[i] operands
+-1.0 * -1.4E-45 = 1.4E-45, with float a[i] operands
+-1.0 / -1.4E-45 = Infinity, with float a[i] operands
+-1.0 + -1.4E-45 = -1.0, with float f(x) operands
+-1.0 - -1.4E-45 = -1.0, with float f(x) operands
+-1.0 * -1.4E-45 = 1.4E-45, with float f(x) operands
+-1.0 / -1.4E-45 = Infinity, with float f(x) operands
+-1.0 + -1.4E-45 = -1.0, with float lExpr operands
+-1.0 - -1.4E-45 = -1.0, with float lExpr operands
+-1.0 * -1.4E-45 = 1.4E-45, with float lExpr operands
+-1.0 / -1.4E-45 = Infinity, with float lExpr operands
+-1.0 + -1.4E-45 = -1.0, with float rExpr operands
+-1.0 - -1.4E-45 = -1.0, with float rExpr operands
+-1.0 * -1.4E-45 = 1.4E-45, with float rExpr operands
+-1.0 / -1.4E-45 = Infinity, with float rExpr operands
+-1.0 + -1.4E-45 = -1.0, with float exprs operands
+-1.0 - -1.4E-45 = -1.0, with float exprs operands
+-1.0 * -1.4E-45 = 1.4E-45, with float exprs operands
+-1.0 / -1.4E-45 = Infinity, with float exprs operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float param operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float param operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float param operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float param operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float local operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float local operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float local operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float local operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float static operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float static operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float static operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float static operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float field operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float field operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float field operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float field operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float a[i] operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float a[i] operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float a[i] operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float a[i] operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float f(x) operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float f(x) operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float f(x) operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float f(x) operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float lExpr operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float lExpr operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float lExpr operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float lExpr operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float rExpr operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float rExpr operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float rExpr operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float rExpr operands
+-1.0 + -3.4028235E38 = -3.4028235E38, with float exprs operands
+-1.0 - -3.4028235E38 = 3.4028235E38, with float exprs operands
+-1.0 * -3.4028235E38 = 3.4028235E38, with float exprs operands
+-1.0 / -3.4028235E38 = 2.938736E-39, with float exprs operands
+-1.0 + -1.0 = -2.0, with float param operands
+-1.0 - -1.0 = 0.0, with float param operands
+-1.0 * -1.0 = 1.0, with float param operands
+-1.0 / -1.0 = 1.0, with float param operands
+-1.0 + -1.0 = -2.0, with float local operands
+-1.0 - -1.0 = 0.0, with float local operands
+-1.0 * -1.0 = 1.0, with float local operands
+-1.0 / -1.0 = 1.0, with float local operands
+-1.0 + -1.0 = -2.0, with float static operands
+-1.0 - -1.0 = 0.0, with float static operands
+-1.0 * -1.0 = 1.0, with float static operands
+-1.0 / -1.0 = 1.0, with float static operands
+-1.0 + -1.0 = -2.0, with float field operands
+-1.0 - -1.0 = 0.0, with float field operands
+-1.0 * -1.0 = 1.0, with float field operands
+-1.0 / -1.0 = 1.0, with float field operands
+-1.0 + -1.0 = -2.0, with float a[i] operands
+-1.0 - -1.0 = 0.0, with float a[i] operands
+-1.0 * -1.0 = 1.0, with float a[i] operands
+-1.0 / -1.0 = 1.0, with float a[i] operands
+-1.0 + -1.0 = -2.0, with float f(x) operands
+-1.0 - -1.0 = 0.0, with float f(x) operands
+-1.0 * -1.0 = 1.0, with float f(x) operands
+-1.0 / -1.0 = 1.0, with float f(x) operands
+-1.0 + -1.0 = -2.0, with float lExpr operands
+-1.0 - -1.0 = 0.0, with float lExpr operands
+-1.0 * -1.0 = 1.0, with float lExpr operands
+-1.0 / -1.0 = 1.0, with float lExpr operands
+-1.0 + -1.0 = -2.0, with float rExpr operands
+-1.0 - -1.0 = 0.0, with float rExpr operands
+-1.0 * -1.0 = 1.0, with float rExpr operands
+-1.0 / -1.0 = 1.0, with float rExpr operands
+-1.0 + -1.0 = -2.0, with float exprs operands
+-1.0 - -1.0 = 0.0, with float exprs operands
+-1.0 * -1.0 = 1.0, with float exprs operands
+-1.0 / -1.0 = 1.0, with float exprs operands
+-1.0 + 1.0 = 0.0, with float param operands
+-1.0 - 1.0 = -2.0, with float param operands
+-1.0 * 1.0 = -1.0, with float param operands
+-1.0 / 1.0 = -1.0, with float param operands
+-1.0 + 1.0 = 0.0, with float local operands
+-1.0 - 1.0 = -2.0, with float local operands
+-1.0 * 1.0 = -1.0, with float local operands
+-1.0 / 1.0 = -1.0, with float local operands
+-1.0 + 1.0 = 0.0, with float static operands
+-1.0 - 1.0 = -2.0, with float static operands
+-1.0 * 1.0 = -1.0, with float static operands
+-1.0 / 1.0 = -1.0, with float static operands
+-1.0 + 1.0 = 0.0, with float field operands
+-1.0 - 1.0 = -2.0, with float field operands
+-1.0 * 1.0 = -1.0, with float field operands
+-1.0 / 1.0 = -1.0, with float field operands
+-1.0 + 1.0 = 0.0, with float a[i] operands
+-1.0 - 1.0 = -2.0, with float a[i] operands
+-1.0 * 1.0 = -1.0, with float a[i] operands
+-1.0 / 1.0 = -1.0, with float a[i] operands
+-1.0 + 1.0 = 0.0, with float f(x) operands
+-1.0 - 1.0 = -2.0, with float f(x) operands
+-1.0 * 1.0 = -1.0, with float f(x) operands
+-1.0 / 1.0 = -1.0, with float f(x) operands
+-1.0 + 1.0 = 0.0, with float lExpr operands
+-1.0 - 1.0 = -2.0, with float lExpr operands
+-1.0 * 1.0 = -1.0, with float lExpr operands
+-1.0 / 1.0 = -1.0, with float lExpr operands
+-1.0 + 1.0 = 0.0, with float rExpr operands
+-1.0 - 1.0 = -2.0, with float rExpr operands
+-1.0 * 1.0 = -1.0, with float rExpr operands
+-1.0 / 1.0 = -1.0, with float rExpr operands
+-1.0 + 1.0 = 0.0, with float exprs operands
+-1.0 - 1.0 = -2.0, with float exprs operands
+-1.0 * 1.0 = -1.0, with float exprs operands
+-1.0 / 1.0 = -1.0, with float exprs operands
+-1.0 + -0.0 = -1.0, with float param operands
+-1.0 - -0.0 = -1.0, with float param operands
+-1.0 * -0.0 = 0.0, with float param operands
+-1.0 / -0.0 = Infinity, with float param operands
+-1.0 + -0.0 = -1.0, with float local operands
+-1.0 - -0.0 = -1.0, with float local operands
+-1.0 * -0.0 = 0.0, with float local operands
+-1.0 / -0.0 = Infinity, with float local operands
+-1.0 + -0.0 = -1.0, with float static operands
+-1.0 - -0.0 = -1.0, with float static operands
+-1.0 * -0.0 = 0.0, with float static operands
+-1.0 / -0.0 = Infinity, with float static operands
+-1.0 + -0.0 = -1.0, with float field operands
+-1.0 - -0.0 = -1.0, with float field operands
+-1.0 * -0.0 = 0.0, with float field operands
+-1.0 / -0.0 = Infinity, with float field operands
+-1.0 + -0.0 = -1.0, with float a[i] operands
+-1.0 - -0.0 = -1.0, with float a[i] operands
+-1.0 * -0.0 = 0.0, with float a[i] operands
+-1.0 / -0.0 = Infinity, with float a[i] operands
+-1.0 + -0.0 = -1.0, with float f(x) operands
+-1.0 - -0.0 = -1.0, with float f(x) operands
+-1.0 * -0.0 = 0.0, with float f(x) operands
+-1.0 / -0.0 = Infinity, with float f(x) operands
+-1.0 + -0.0 = -1.0, with float lExpr operands
+-1.0 - -0.0 = -1.0, with float lExpr operands
+-1.0 * -0.0 = 0.0, with float lExpr operands
+-1.0 / -0.0 = Infinity, with float lExpr operands
+-1.0 + 0.0 = -1.0, with float rExpr operands
+-1.0 - 0.0 = -1.0, with float rExpr operands
+-1.0 * 0.0 = -0.0, with float rExpr operands
+-1.0 / 0.0 = -Infinity, with float rExpr operands
+-1.0 + 0.0 = -1.0, with float exprs operands
+-1.0 - 0.0 = -1.0, with float exprs operands
+-1.0 * 0.0 = -0.0, with float exprs operands
+-1.0 / 0.0 = -Infinity, with float exprs operands
+-1.0 + 0.0 = -1.0, with float param operands
+-1.0 - 0.0 = -1.0, with float param operands
+-1.0 * 0.0 = -0.0, with float param operands
+-1.0 / 0.0 = -Infinity, with float param operands
+-1.0 + 0.0 = -1.0, with float local operands
+-1.0 - 0.0 = -1.0, with float local operands
+-1.0 * 0.0 = -0.0, with float local operands
+-1.0 / 0.0 = -Infinity, with float local operands
+-1.0 + 0.0 = -1.0, with float static operands
+-1.0 - 0.0 = -1.0, with float static operands
+-1.0 * 0.0 = -0.0, with float static operands
+-1.0 / 0.0 = -Infinity, with float static operands
+-1.0 + 0.0 = -1.0, with float field operands
+-1.0 - 0.0 = -1.0, with float field operands
+-1.0 * 0.0 = -0.0, with float field operands
+-1.0 / 0.0 = -Infinity, with float field operands
+-1.0 + 0.0 = -1.0, with float a[i] operands
+-1.0 - 0.0 = -1.0, with float a[i] operands
+-1.0 * 0.0 = -0.0, with float a[i] operands
+-1.0 / 0.0 = -Infinity, with float a[i] operands
+-1.0 + 0.0 = -1.0, with float f(x) operands
+-1.0 - 0.0 = -1.0, with float f(x) operands
+-1.0 * 0.0 = -0.0, with float f(x) operands
+-1.0 / 0.0 = -Infinity, with float f(x) operands
+-1.0 + 0.0 = -1.0, with float lExpr operands
+-1.0 - 0.0 = -1.0, with float lExpr operands
+-1.0 * 0.0 = -0.0, with float lExpr operands
+-1.0 / 0.0 = -Infinity, with float lExpr operands
+-1.0 + 0.0 = -1.0, with float rExpr operands
+-1.0 - 0.0 = -1.0, with float rExpr operands
+-1.0 * 0.0 = -0.0, with float rExpr operands
+-1.0 / 0.0 = -Infinity, with float rExpr operands
+-1.0 + 0.0 = -1.0, with float exprs operands
+-1.0 - 0.0 = -1.0, with float exprs operands
+-1.0 * 0.0 = -0.0, with float exprs operands
+-1.0 / 0.0 = -Infinity, with float exprs operands
+-1.0 + -Infinity = -Infinity, with float param operands
+-1.0 - -Infinity = Infinity, with float param operands
+-1.0 * -Infinity = Infinity, with float param operands
+-1.0 / -Infinity = 0.0, with float param operands
+-1.0 + -Infinity = -Infinity, with float local operands
+-1.0 - -Infinity = Infinity, with float local operands
+-1.0 * -Infinity = Infinity, with float local operands
+-1.0 / -Infinity = 0.0, with float local operands
+-1.0 + -Infinity = -Infinity, with float static operands
+-1.0 - -Infinity = Infinity, with float static operands
+-1.0 * -Infinity = Infinity, with float static operands
+-1.0 / -Infinity = 0.0, with float static operands
+-1.0 + -Infinity = -Infinity, with float field operands
+-1.0 - -Infinity = Infinity, with float field operands
+-1.0 * -Infinity = Infinity, with float field operands
+-1.0 / -Infinity = 0.0, with float field operands
+-1.0 + -Infinity = -Infinity, with float a[i] operands
+-1.0 - -Infinity = Infinity, with float a[i] operands
+-1.0 * -Infinity = Infinity, with float a[i] operands
+-1.0 / -Infinity = 0.0, with float a[i] operands
+-1.0 + -Infinity = -Infinity, with float f(x) operands
+-1.0 - -Infinity = Infinity, with float f(x) operands
+-1.0 * -Infinity = Infinity, with float f(x) operands
+-1.0 / -Infinity = 0.0, with float f(x) operands
+-1.0 + -Infinity = -Infinity, with float lExpr operands
+-1.0 - -Infinity = Infinity, with float lExpr operands
+-1.0 * -Infinity = Infinity, with float lExpr operands
+-1.0 / -Infinity = 0.0, with float lExpr operands
+-1.0 + -Infinity = -Infinity, with float rExpr operands
+-1.0 - -Infinity = Infinity, with float rExpr operands
+-1.0 * -Infinity = Infinity, with float rExpr operands
+-1.0 / -Infinity = 0.0, with float rExpr operands
+-1.0 + -Infinity = -Infinity, with float exprs operands
+-1.0 - -Infinity = Infinity, with float exprs operands
+-1.0 * -Infinity = Infinity, with float exprs operands
+-1.0 / -Infinity = 0.0, with float exprs operands
+-1.0 + Infinity = Infinity, with float param operands
+-1.0 - Infinity = -Infinity, with float param operands
+-1.0 * Infinity = -Infinity, with float param operands
+-1.0 / Infinity = -0.0, with float param operands
+-1.0 + Infinity = Infinity, with float local operands
+-1.0 - Infinity = -Infinity, with float local operands
+-1.0 * Infinity = -Infinity, with float local operands
+-1.0 / Infinity = -0.0, with float local operands
+-1.0 + Infinity = Infinity, with float static operands
+-1.0 - Infinity = -Infinity, with float static operands
+-1.0 * Infinity = -Infinity, with float static operands
+-1.0 / Infinity = -0.0, with float static operands
+-1.0 + Infinity = Infinity, with float field operands
+-1.0 - Infinity = -Infinity, with float field operands
+-1.0 * Infinity = -Infinity, with float field operands
+-1.0 / Infinity = -0.0, with float field operands
+-1.0 + Infinity = Infinity, with float a[i] operands
+-1.0 - Infinity = -Infinity, with float a[i] operands
+-1.0 * Infinity = -Infinity, with float a[i] operands
+-1.0 / Infinity = -0.0, with float a[i] operands
+-1.0 + Infinity = Infinity, with float f(x) operands
+-1.0 - Infinity = -Infinity, with float f(x) operands
+-1.0 * Infinity = -Infinity, with float f(x) operands
+-1.0 / Infinity = -0.0, with float f(x) operands
+-1.0 + Infinity = Infinity, with float lExpr operands
+-1.0 - Infinity = -Infinity, with float lExpr operands
+-1.0 * Infinity = -Infinity, with float lExpr operands
+-1.0 / Infinity = -0.0, with float lExpr operands
+-1.0 + Infinity = Infinity, with float rExpr operands
+-1.0 - Infinity = -Infinity, with float rExpr operands
+-1.0 * Infinity = -Infinity, with float rExpr operands
+-1.0 / Infinity = -0.0, with float rExpr operands
+-1.0 + Infinity = Infinity, with float exprs operands
+-1.0 - Infinity = -Infinity, with float exprs operands
+-1.0 * Infinity = -Infinity, with float exprs operands
+-1.0 / Infinity = -0.0, with float exprs operands
+-1.0 + NaN = NaN, with float param operands
+-1.0 - NaN = NaN, with float param operands
+-1.0 * NaN = NaN, with float param operands
+-1.0 / NaN = NaN, with float param operands
+-1.0 + NaN = NaN, with float local operands
+-1.0 - NaN = NaN, with float local operands
+-1.0 * NaN = NaN, with float local operands
+-1.0 / NaN = NaN, with float local operands
+-1.0 + NaN = NaN, with float static operands
+-1.0 - NaN = NaN, with float static operands
+-1.0 * NaN = NaN, with float static operands
+-1.0 / NaN = NaN, with float static operands
+-1.0 + NaN = NaN, with float field operands
+-1.0 - NaN = NaN, with float field operands
+-1.0 * NaN = NaN, with float field operands
+-1.0 / NaN = NaN, with float field operands
+-1.0 + NaN = NaN, with float a[i] operands
+-1.0 - NaN = NaN, with float a[i] operands
+-1.0 * NaN = NaN, with float a[i] operands
+-1.0 / NaN = NaN, with float a[i] operands
+-1.0 + NaN = NaN, with float f(x) operands
+-1.0 - NaN = NaN, with float f(x) operands
+-1.0 * NaN = NaN, with float f(x) operands
+-1.0 / NaN = NaN, with float f(x) operands
+-1.0 + NaN = NaN, with float lExpr operands
+-1.0 - NaN = NaN, with float lExpr operands
+-1.0 * NaN = NaN, with float lExpr operands
+-1.0 / NaN = NaN, with float lExpr operands
+-1.0 + NaN = NaN, with float rExpr operands
+-1.0 - NaN = NaN, with float rExpr operands
+-1.0 * NaN = NaN, with float rExpr operands
+-1.0 / NaN = NaN, with float rExpr operands
+-1.0 + NaN = NaN, with float exprs operands
+-1.0 - NaN = NaN, with float exprs operands
+-1.0 * NaN = NaN, with float exprs operands
+-1.0 / NaN = NaN, with float exprs operands
+1.0 + 1.4E-45 = 1.0, with float param operands
+1.0 - 1.4E-45 = 1.0, with float param operands
+1.0 * 1.4E-45 = 1.4E-45, with float param operands
+1.0 / 1.4E-45 = Infinity, with float param operands
+1.0 + 1.4E-45 = 1.0, with float local operands
+1.0 - 1.4E-45 = 1.0, with float local operands
+1.0 * 1.4E-45 = 1.4E-45, with float local operands
+1.0 / 1.4E-45 = Infinity, with float local operands
+1.0 + 1.4E-45 = 1.0, with float static operands
+1.0 - 1.4E-45 = 1.0, with float static operands
+1.0 * 1.4E-45 = 1.4E-45, with float static operands
+1.0 / 1.4E-45 = Infinity, with float static operands
+1.0 + 1.4E-45 = 1.0, with float field operands
+1.0 - 1.4E-45 = 1.0, with float field operands
+1.0 * 1.4E-45 = 1.4E-45, with float field operands
+1.0 / 1.4E-45 = Infinity, with float field operands
+1.0 + 1.4E-45 = 1.0, with float a[i] operands
+1.0 - 1.4E-45 = 1.0, with float a[i] operands
+1.0 * 1.4E-45 = 1.4E-45, with float a[i] operands
+1.0 / 1.4E-45 = Infinity, with float a[i] operands
+1.0 + 1.4E-45 = 1.0, with float f(x) operands
+1.0 - 1.4E-45 = 1.0, with float f(x) operands
+1.0 * 1.4E-45 = 1.4E-45, with float f(x) operands
+1.0 / 1.4E-45 = Infinity, with float f(x) operands
+1.0 + 1.4E-45 = 1.0, with float lExpr operands
+1.0 - 1.4E-45 = 1.0, with float lExpr operands
+1.0 * 1.4E-45 = 1.4E-45, with float lExpr operands
+1.0 / 1.4E-45 = Infinity, with float lExpr operands
+1.0 + 1.4E-45 = 1.0, with float rExpr operands
+1.0 - 1.4E-45 = 1.0, with float rExpr operands
+1.0 * 1.4E-45 = 1.4E-45, with float rExpr operands
+1.0 / 1.4E-45 = Infinity, with float rExpr operands
+1.0 + 1.4E-45 = 1.0, with float exprs operands
+1.0 - 1.4E-45 = 1.0, with float exprs operands
+1.0 * 1.4E-45 = 1.4E-45, with float exprs operands
+1.0 / 1.4E-45 = Infinity, with float exprs operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float param operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float param operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float param operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float param operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float local operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float local operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float local operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float local operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float static operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float static operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float static operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float static operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float field operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float field operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float field operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float field operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float a[i] operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float a[i] operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float a[i] operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float a[i] operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float f(x) operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float f(x) operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float f(x) operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float f(x) operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float lExpr operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float lExpr operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float lExpr operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float lExpr operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float rExpr operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float rExpr operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float rExpr operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float rExpr operands
+1.0 + 3.4028235E38 = 3.4028235E38, with float exprs operands
+1.0 - 3.4028235E38 = -3.4028235E38, with float exprs operands
+1.0 * 3.4028235E38 = 3.4028235E38, with float exprs operands
+1.0 / 3.4028235E38 = 2.938736E-39, with float exprs operands
+1.0 + -1.4E-45 = 1.0, with float param operands
+1.0 - -1.4E-45 = 1.0, with float param operands
+1.0 * -1.4E-45 = -1.4E-45, with float param operands
+1.0 / -1.4E-45 = -Infinity, with float param operands
+1.0 + -1.4E-45 = 1.0, with float local operands
+1.0 - -1.4E-45 = 1.0, with float local operands
+1.0 * -1.4E-45 = -1.4E-45, with float local operands
+1.0 / -1.4E-45 = -Infinity, with float local operands
+1.0 + -1.4E-45 = 1.0, with float static operands
+1.0 - -1.4E-45 = 1.0, with float static operands
+1.0 * -1.4E-45 = -1.4E-45, with float static operands
+1.0 / -1.4E-45 = -Infinity, with float static operands
+1.0 + -1.4E-45 = 1.0, with float field operands
+1.0 - -1.4E-45 = 1.0, with float field operands
+1.0 * -1.4E-45 = -1.4E-45, with float field operands
+1.0 / -1.4E-45 = -Infinity, with float field operands
+1.0 + -1.4E-45 = 1.0, with float a[i] operands
+1.0 - -1.4E-45 = 1.0, with float a[i] operands
+1.0 * -1.4E-45 = -1.4E-45, with float a[i] operands
+1.0 / -1.4E-45 = -Infinity, with float a[i] operands
+1.0 + -1.4E-45 = 1.0, with float f(x) operands
+1.0 - -1.4E-45 = 1.0, with float f(x) operands
+1.0 * -1.4E-45 = -1.4E-45, with float f(x) operands
+1.0 / -1.4E-45 = -Infinity, with float f(x) operands
+1.0 + -1.4E-45 = 1.0, with float lExpr operands
+1.0 - -1.4E-45 = 1.0, with float lExpr operands
+1.0 * -1.4E-45 = -1.4E-45, with float lExpr operands
+1.0 / -1.4E-45 = -Infinity, with float lExpr operands
+1.0 + -1.4E-45 = 1.0, with float rExpr operands
+1.0 - -1.4E-45 = 1.0, with float rExpr operands
+1.0 * -1.4E-45 = -1.4E-45, with float rExpr operands
+1.0 / -1.4E-45 = -Infinity, with float rExpr operands
+1.0 + -1.4E-45 = 1.0, with float exprs operands
+1.0 - -1.4E-45 = 1.0, with float exprs operands
+1.0 * -1.4E-45 = -1.4E-45, with float exprs operands
+1.0 / -1.4E-45 = -Infinity, with float exprs operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float param operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float param operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float param operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float param operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float local operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float local operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float local operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float local operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float static operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float static operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float static operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float static operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float field operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float field operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float field operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float field operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float a[i] operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float a[i] operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float a[i] operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float a[i] operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float f(x) operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float f(x) operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float f(x) operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float f(x) operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float lExpr operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float lExpr operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float lExpr operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float lExpr operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float rExpr operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float rExpr operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float rExpr operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float rExpr operands
+1.0 + -3.4028235E38 = -3.4028235E38, with float exprs operands
+1.0 - -3.4028235E38 = 3.4028235E38, with float exprs operands
+1.0 * -3.4028235E38 = -3.4028235E38, with float exprs operands
+1.0 / -3.4028235E38 = -2.938736E-39, with float exprs operands
+1.0 + -1.0 = 0.0, with float param operands
+1.0 - -1.0 = 2.0, with float param operands
+1.0 * -1.0 = -1.0, with float param operands
+1.0 / -1.0 = -1.0, with float param operands
+1.0 + -1.0 = 0.0, with float local operands
+1.0 - -1.0 = 2.0, with float local operands
+1.0 * -1.0 = -1.0, with float local operands
+1.0 / -1.0 = -1.0, with float local operands
+1.0 + -1.0 = 0.0, with float static operands
+1.0 - -1.0 = 2.0, with float static operands
+1.0 * -1.0 = -1.0, with float static operands
+1.0 / -1.0 = -1.0, with float static operands
+1.0 + -1.0 = 0.0, with float field operands
+1.0 - -1.0 = 2.0, with float field operands
+1.0 * -1.0 = -1.0, with float field operands
+1.0 / -1.0 = -1.0, with float field operands
+1.0 + -1.0 = 0.0, with float a[i] operands
+1.0 - -1.0 = 2.0, with float a[i] operands
+1.0 * -1.0 = -1.0, with float a[i] operands
+1.0 / -1.0 = -1.0, with float a[i] operands
+1.0 + -1.0 = 0.0, with float f(x) operands
+1.0 - -1.0 = 2.0, with float f(x) operands
+1.0 * -1.0 = -1.0, with float f(x) operands
+1.0 / -1.0 = -1.0, with float f(x) operands
+1.0 + -1.0 = 0.0, with float lExpr operands
+1.0 - -1.0 = 2.0, with float lExpr operands
+1.0 * -1.0 = -1.0, with float lExpr operands
+1.0 / -1.0 = -1.0, with float lExpr operands
+1.0 + -1.0 = 0.0, with float rExpr operands
+1.0 - -1.0 = 2.0, with float rExpr operands
+1.0 * -1.0 = -1.0, with float rExpr operands
+1.0 / -1.0 = -1.0, with float rExpr operands
+1.0 + -1.0 = 0.0, with float exprs operands
+1.0 - -1.0 = 2.0, with float exprs operands
+1.0 * -1.0 = -1.0, with float exprs operands
+1.0 / -1.0 = -1.0, with float exprs operands
+1.0 + 1.0 = 2.0, with float param operands
+1.0 - 1.0 = 0.0, with float param operands
+1.0 * 1.0 = 1.0, with float param operands
+1.0 / 1.0 = 1.0, with float param operands
+1.0 + 1.0 = 2.0, with float local operands
+1.0 - 1.0 = 0.0, with float local operands
+1.0 * 1.0 = 1.0, with float local operands
+1.0 / 1.0 = 1.0, with float local operands
+1.0 + 1.0 = 2.0, with float static operands
+1.0 - 1.0 = 0.0, with float static operands
+1.0 * 1.0 = 1.0, with float static operands
+1.0 / 1.0 = 1.0, with float static operands
+1.0 + 1.0 = 2.0, with float field operands
+1.0 - 1.0 = 0.0, with float field operands
+1.0 * 1.0 = 1.0, with float field operands
+1.0 / 1.0 = 1.0, with float field operands
+1.0 + 1.0 = 2.0, with float a[i] operands
+1.0 - 1.0 = 0.0, with float a[i] operands
+1.0 * 1.0 = 1.0, with float a[i] operands
+1.0 / 1.0 = 1.0, with float a[i] operands
+1.0 + 1.0 = 2.0, with float f(x) operands
+1.0 - 1.0 = 0.0, with float f(x) operands
+1.0 * 1.0 = 1.0, with float f(x) operands
+1.0 / 1.0 = 1.0, with float f(x) operands
+1.0 + 1.0 = 2.0, with float lExpr operands
+1.0 - 1.0 = 0.0, with float lExpr operands
+1.0 * 1.0 = 1.0, with float lExpr operands
+1.0 / 1.0 = 1.0, with float lExpr operands
+1.0 + 1.0 = 2.0, with float rExpr operands
+1.0 - 1.0 = 0.0, with float rExpr operands
+1.0 * 1.0 = 1.0, with float rExpr operands
+1.0 / 1.0 = 1.0, with float rExpr operands
+1.0 + 1.0 = 2.0, with float exprs operands
+1.0 - 1.0 = 0.0, with float exprs operands
+1.0 * 1.0 = 1.0, with float exprs operands
+1.0 / 1.0 = 1.0, with float exprs operands
+1.0 + -0.0 = 1.0, with float param operands
+1.0 - -0.0 = 1.0, with float param operands
+1.0 * -0.0 = -0.0, with float param operands
+1.0 / -0.0 = -Infinity, with float param operands
+1.0 + -0.0 = 1.0, with float local operands
+1.0 - -0.0 = 1.0, with float local operands
+1.0 * -0.0 = -0.0, with float local operands
+1.0 / -0.0 = -Infinity, with float local operands
+1.0 + -0.0 = 1.0, with float static operands
+1.0 - -0.0 = 1.0, with float static operands
+1.0 * -0.0 = -0.0, with float static operands
+1.0 / -0.0 = -Infinity, with float static operands
+1.0 + -0.0 = 1.0, with float field operands
+1.0 - -0.0 = 1.0, with float field operands
+1.0 * -0.0 = -0.0, with float field operands
+1.0 / -0.0 = -Infinity, with float field operands
+1.0 + -0.0 = 1.0, with float a[i] operands
+1.0 - -0.0 = 1.0, with float a[i] operands
+1.0 * -0.0 = -0.0, with float a[i] operands
+1.0 / -0.0 = -Infinity, with float a[i] operands
+1.0 + -0.0 = 1.0, with float f(x) operands
+1.0 - -0.0 = 1.0, with float f(x) operands
+1.0 * -0.0 = -0.0, with float f(x) operands
+1.0 / -0.0 = -Infinity, with float f(x) operands
+1.0 + -0.0 = 1.0, with float lExpr operands
+1.0 - -0.0 = 1.0, with float lExpr operands
+1.0 * -0.0 = -0.0, with float lExpr operands
+1.0 / -0.0 = -Infinity, with float lExpr operands
+1.0 + 0.0 = 1.0, with float rExpr operands
+1.0 - 0.0 = 1.0, with float rExpr operands
+1.0 * 0.0 = 0.0, with float rExpr operands
+1.0 / 0.0 = Infinity, with float rExpr operands
+1.0 + 0.0 = 1.0, with float exprs operands
+1.0 - 0.0 = 1.0, with float exprs operands
+1.0 * 0.0 = 0.0, with float exprs operands
+1.0 / 0.0 = Infinity, with float exprs operands
+1.0 + 0.0 = 1.0, with float param operands
+1.0 - 0.0 = 1.0, with float param operands
+1.0 * 0.0 = 0.0, with float param operands
+1.0 / 0.0 = Infinity, with float param operands
+1.0 + 0.0 = 1.0, with float local operands
+1.0 - 0.0 = 1.0, with float local operands
+1.0 * 0.0 = 0.0, with float local operands
+1.0 / 0.0 = Infinity, with float local operands
+1.0 + 0.0 = 1.0, with float static operands
+1.0 - 0.0 = 1.0, with float static operands
+1.0 * 0.0 = 0.0, with float static operands
+1.0 / 0.0 = Infinity, with float static operands
+1.0 + 0.0 = 1.0, with float field operands
+1.0 - 0.0 = 1.0, with float field operands
+1.0 * 0.0 = 0.0, with float field operands
+1.0 / 0.0 = Infinity, with float field operands
+1.0 + 0.0 = 1.0, with float a[i] operands
+1.0 - 0.0 = 1.0, with float a[i] operands
+1.0 * 0.0 = 0.0, with float a[i] operands
+1.0 / 0.0 = Infinity, with float a[i] operands
+1.0 + 0.0 = 1.0, with float f(x) operands
+1.0 - 0.0 = 1.0, with float f(x) operands
+1.0 * 0.0 = 0.0, with float f(x) operands
+1.0 / 0.0 = Infinity, with float f(x) operands
+1.0 + 0.0 = 1.0, with float lExpr operands
+1.0 - 0.0 = 1.0, with float lExpr operands
+1.0 * 0.0 = 0.0, with float lExpr operands
+1.0 / 0.0 = Infinity, with float lExpr operands
+1.0 + 0.0 = 1.0, with float rExpr operands
+1.0 - 0.0 = 1.0, with float rExpr operands
+1.0 * 0.0 = 0.0, with float rExpr operands
+1.0 / 0.0 = Infinity, with float rExpr operands
+1.0 + 0.0 = 1.0, with float exprs operands
+1.0 - 0.0 = 1.0, with float exprs operands
+1.0 * 0.0 = 0.0, with float exprs operands
+1.0 / 0.0 = Infinity, with float exprs operands
+1.0 + -Infinity = -Infinity, with float param operands
+1.0 - -Infinity = Infinity, with float param operands
+1.0 * -Infinity = -Infinity, with float param operands
+1.0 / -Infinity = -0.0, with float param operands
+1.0 + -Infinity = -Infinity, with float local operands
+1.0 - -Infinity = Infinity, with float local operands
+1.0 * -Infinity = -Infinity, with float local operands
+1.0 / -Infinity = -0.0, with float local operands
+1.0 + -Infinity = -Infinity, with float static operands
+1.0 - -Infinity = Infinity, with float static operands
+1.0 * -Infinity = -Infinity, with float static operands
+1.0 / -Infinity = -0.0, with float static operands
+1.0 + -Infinity = -Infinity, with float field operands
+1.0 - -Infinity = Infinity, with float field operands
+1.0 * -Infinity = -Infinity, with float field operands
+1.0 / -Infinity = -0.0, with float field operands
+1.0 + -Infinity = -Infinity, with float a[i] operands
+1.0 - -Infinity = Infinity, with float a[i] operands
+1.0 * -Infinity = -Infinity, with float a[i] operands
+1.0 / -Infinity = -0.0, with float a[i] operands
+1.0 + -Infinity = -Infinity, with float f(x) operands
+1.0 - -Infinity = Infinity, with float f(x) operands
+1.0 * -Infinity = -Infinity, with float f(x) operands
+1.0 / -Infinity = -0.0, with float f(x) operands
+1.0 + -Infinity = -Infinity, with float lExpr operands
+1.0 - -Infinity = Infinity, with float lExpr operands
+1.0 * -Infinity = -Infinity, with float lExpr operands
+1.0 / -Infinity = -0.0, with float lExpr operands
+1.0 + -Infinity = -Infinity, with float rExpr operands
+1.0 - -Infinity = Infinity, with float rExpr operands
+1.0 * -Infinity = -Infinity, with float rExpr operands
+1.0 / -Infinity = -0.0, with float rExpr operands
+1.0 + -Infinity = -Infinity, with float exprs operands
+1.0 - -Infinity = Infinity, with float exprs operands
+1.0 * -Infinity = -Infinity, with float exprs operands
+1.0 / -Infinity = -0.0, with float exprs operands
+1.0 + Infinity = Infinity, with float param operands
+1.0 - Infinity = -Infinity, with float param operands
+1.0 * Infinity = Infinity, with float param operands
+1.0 / Infinity = 0.0, with float param operands
+1.0 + Infinity = Infinity, with float local operands
+1.0 - Infinity = -Infinity, with float local operands
+1.0 * Infinity = Infinity, with float local operands
+1.0 / Infinity = 0.0, with float local operands
+1.0 + Infinity = Infinity, with float static operands
+1.0 - Infinity = -Infinity, with float static operands
+1.0 * Infinity = Infinity, with float static operands
+1.0 / Infinity = 0.0, with float static operands
+1.0 + Infinity = Infinity, with float field operands
+1.0 - Infinity = -Infinity, with float field operands
+1.0 * Infinity = Infinity, with float field operands
+1.0 / Infinity = 0.0, with float field operands
+1.0 + Infinity = Infinity, with float a[i] operands
+1.0 - Infinity = -Infinity, with float a[i] operands
+1.0 * Infinity = Infinity, with float a[i] operands
+1.0 / Infinity = 0.0, with float a[i] operands
+1.0 + Infinity = Infinity, with float f(x) operands
+1.0 - Infinity = -Infinity, with float f(x) operands
+1.0 * Infinity = Infinity, with float f(x) operands
+1.0 / Infinity = 0.0, with float f(x) operands
+1.0 + Infinity = Infinity, with float lExpr operands
+1.0 - Infinity = -Infinity, with float lExpr operands
+1.0 * Infinity = Infinity, with float lExpr operands
+1.0 / Infinity = 0.0, with float lExpr operands
+1.0 + Infinity = Infinity, with float rExpr operands
+1.0 - Infinity = -Infinity, with float rExpr operands
+1.0 * Infinity = Infinity, with float rExpr operands
+1.0 / Infinity = 0.0, with float rExpr operands
+1.0 + Infinity = Infinity, with float exprs operands
+1.0 - Infinity = -Infinity, with float exprs operands
+1.0 * Infinity = Infinity, with float exprs operands
+1.0 / Infinity = 0.0, with float exprs operands
+1.0 + NaN = NaN, with float param operands
+1.0 - NaN = NaN, with float param operands
+1.0 * NaN = NaN, with float param operands
+1.0 / NaN = NaN, with float param operands
+1.0 + NaN = NaN, with float local operands
+1.0 - NaN = NaN, with float local operands
+1.0 * NaN = NaN, with float local operands
+1.0 / NaN = NaN, with float local operands
+1.0 + NaN = NaN, with float static operands
+1.0 - NaN = NaN, with float static operands
+1.0 * NaN = NaN, with float static operands
+1.0 / NaN = NaN, with float static operands
+1.0 + NaN = NaN, with float field operands
+1.0 - NaN = NaN, with float field operands
+1.0 * NaN = NaN, with float field operands
+1.0 / NaN = NaN, with float field operands
+1.0 + NaN = NaN, with float a[i] operands
+1.0 - NaN = NaN, with float a[i] operands
+1.0 * NaN = NaN, with float a[i] operands
+1.0 / NaN = NaN, with float a[i] operands
+1.0 + NaN = NaN, with float f(x) operands
+1.0 - NaN = NaN, with float f(x) operands
+1.0 * NaN = NaN, with float f(x) operands
+1.0 / NaN = NaN, with float f(x) operands
+1.0 + NaN = NaN, with float lExpr operands
+1.0 - NaN = NaN, with float lExpr operands
+1.0 * NaN = NaN, with float lExpr operands
+1.0 / NaN = NaN, with float lExpr operands
+1.0 + NaN = NaN, with float rExpr operands
+1.0 - NaN = NaN, with float rExpr operands
+1.0 * NaN = NaN, with float rExpr operands
+1.0 / NaN = NaN, with float rExpr operands
+1.0 + NaN = NaN, with float exprs operands
+1.0 - NaN = NaN, with float exprs operands
+1.0 * NaN = NaN, with float exprs operands
+1.0 / NaN = NaN, with float exprs operands
+-0.0 + 1.4E-45 = 1.4E-45, with float param operands
+-0.0 - 1.4E-45 = -1.4E-45, with float param operands
+-0.0 * 1.4E-45 = -0.0, with float param operands
+-0.0 / 1.4E-45 = -0.0, with float param operands
+-0.0 + 1.4E-45 = 1.4E-45, with float local operands
+-0.0 - 1.4E-45 = -1.4E-45, with float local operands
+-0.0 * 1.4E-45 = -0.0, with float local operands
+-0.0 / 1.4E-45 = -0.0, with float local operands
+-0.0 + 1.4E-45 = 1.4E-45, with float static operands
+-0.0 - 1.4E-45 = -1.4E-45, with float static operands
+-0.0 * 1.4E-45 = -0.0, with float static operands
+-0.0 / 1.4E-45 = -0.0, with float static operands
+-0.0 + 1.4E-45 = 1.4E-45, with float field operands
+-0.0 - 1.4E-45 = -1.4E-45, with float field operands
+-0.0 * 1.4E-45 = -0.0, with float field operands
+-0.0 / 1.4E-45 = -0.0, with float field operands
+-0.0 + 1.4E-45 = 1.4E-45, with float a[i] operands
+-0.0 - 1.4E-45 = -1.4E-45, with float a[i] operands
+-0.0 * 1.4E-45 = -0.0, with float a[i] operands
+-0.0 / 1.4E-45 = -0.0, with float a[i] operands
+-0.0 + 1.4E-45 = 1.4E-45, with float f(x) operands
+-0.0 - 1.4E-45 = -1.4E-45, with float f(x) operands
+-0.0 * 1.4E-45 = -0.0, with float f(x) operands
+-0.0 / 1.4E-45 = -0.0, with float f(x) operands
+0.0 + 1.4E-45 = 1.4E-45, with float lExpr operands
+0.0 - 1.4E-45 = -1.4E-45, with float lExpr operands
+0.0 * 1.4E-45 = 0.0, with float lExpr operands
+0.0 / 1.4E-45 = 0.0, with float lExpr operands
+-0.0 + 1.4E-45 = 1.4E-45, with float rExpr operands
+-0.0 - 1.4E-45 = -1.4E-45, with float rExpr operands
+-0.0 * 1.4E-45 = -0.0, with float rExpr operands
+-0.0 / 1.4E-45 = -0.0, with float rExpr operands
+0.0 + 1.4E-45 = 1.4E-45, with float exprs operands
+0.0 - 1.4E-45 = -1.4E-45, with float exprs operands
+0.0 * 1.4E-45 = 0.0, with float exprs operands
+0.0 / 1.4E-45 = 0.0, with float exprs operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float param operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float param operands
+-0.0 * 3.4028235E38 = -0.0, with float param operands
+-0.0 / 3.4028235E38 = -0.0, with float param operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float local operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float local operands
+-0.0 * 3.4028235E38 = -0.0, with float local operands
+-0.0 / 3.4028235E38 = -0.0, with float local operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float static operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float static operands
+-0.0 * 3.4028235E38 = -0.0, with float static operands
+-0.0 / 3.4028235E38 = -0.0, with float static operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float field operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float field operands
+-0.0 * 3.4028235E38 = -0.0, with float field operands
+-0.0 / 3.4028235E38 = -0.0, with float field operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float a[i] operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float a[i] operands
+-0.0 * 3.4028235E38 = -0.0, with float a[i] operands
+-0.0 / 3.4028235E38 = -0.0, with float a[i] operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float f(x) operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float f(x) operands
+-0.0 * 3.4028235E38 = -0.0, with float f(x) operands
+-0.0 / 3.4028235E38 = -0.0, with float f(x) operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float lExpr operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float lExpr operands
+0.0 * 3.4028235E38 = 0.0, with float lExpr operands
+0.0 / 3.4028235E38 = 0.0, with float lExpr operands
+-0.0 + 3.4028235E38 = 3.4028235E38, with float rExpr operands
+-0.0 - 3.4028235E38 = -3.4028235E38, with float rExpr operands
+-0.0 * 3.4028235E38 = -0.0, with float rExpr operands
+-0.0 / 3.4028235E38 = -0.0, with float rExpr operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float exprs operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float exprs operands
+0.0 * 3.4028235E38 = 0.0, with float exprs operands
+0.0 / 3.4028235E38 = 0.0, with float exprs operands
+-0.0 + -1.4E-45 = -1.4E-45, with float param operands
+-0.0 - -1.4E-45 = 1.4E-45, with float param operands
+-0.0 * -1.4E-45 = 0.0, with float param operands
+-0.0 / -1.4E-45 = 0.0, with float param operands
+-0.0 + -1.4E-45 = -1.4E-45, with float local operands
+-0.0 - -1.4E-45 = 1.4E-45, with float local operands
+-0.0 * -1.4E-45 = 0.0, with float local operands
+-0.0 / -1.4E-45 = 0.0, with float local operands
+-0.0 + -1.4E-45 = -1.4E-45, with float static operands
+-0.0 - -1.4E-45 = 1.4E-45, with float static operands
+-0.0 * -1.4E-45 = 0.0, with float static operands
+-0.0 / -1.4E-45 = 0.0, with float static operands
+-0.0 + -1.4E-45 = -1.4E-45, with float field operands
+-0.0 - -1.4E-45 = 1.4E-45, with float field operands
+-0.0 * -1.4E-45 = 0.0, with float field operands
+-0.0 / -1.4E-45 = 0.0, with float field operands
+-0.0 + -1.4E-45 = -1.4E-45, with float a[i] operands
+-0.0 - -1.4E-45 = 1.4E-45, with float a[i] operands
+-0.0 * -1.4E-45 = 0.0, with float a[i] operands
+-0.0 / -1.4E-45 = 0.0, with float a[i] operands
+-0.0 + -1.4E-45 = -1.4E-45, with float f(x) operands
+-0.0 - -1.4E-45 = 1.4E-45, with float f(x) operands
+-0.0 * -1.4E-45 = 0.0, with float f(x) operands
+-0.0 / -1.4E-45 = 0.0, with float f(x) operands
+0.0 + -1.4E-45 = -1.4E-45, with float lExpr operands
+0.0 - -1.4E-45 = 1.4E-45, with float lExpr operands
+0.0 * -1.4E-45 = -0.0, with float lExpr operands
+0.0 / -1.4E-45 = -0.0, with float lExpr operands
+-0.0 + -1.4E-45 = -1.4E-45, with float rExpr operands
+-0.0 - -1.4E-45 = 1.4E-45, with float rExpr operands
+-0.0 * -1.4E-45 = 0.0, with float rExpr operands
+-0.0 / -1.4E-45 = 0.0, with float rExpr operands
+0.0 + -1.4E-45 = -1.4E-45, with float exprs operands
+0.0 - -1.4E-45 = 1.4E-45, with float exprs operands
+0.0 * -1.4E-45 = -0.0, with float exprs operands
+0.0 / -1.4E-45 = -0.0, with float exprs operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float param operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float param operands
+-0.0 * -3.4028235E38 = 0.0, with float param operands
+-0.0 / -3.4028235E38 = 0.0, with float param operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float local operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float local operands
+-0.0 * -3.4028235E38 = 0.0, with float local operands
+-0.0 / -3.4028235E38 = 0.0, with float local operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float static operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float static operands
+-0.0 * -3.4028235E38 = 0.0, with float static operands
+-0.0 / -3.4028235E38 = 0.0, with float static operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float field operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float field operands
+-0.0 * -3.4028235E38 = 0.0, with float field operands
+-0.0 / -3.4028235E38 = 0.0, with float field operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float a[i] operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float a[i] operands
+-0.0 * -3.4028235E38 = 0.0, with float a[i] operands
+-0.0 / -3.4028235E38 = 0.0, with float a[i] operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float f(x) operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float f(x) operands
+-0.0 * -3.4028235E38 = 0.0, with float f(x) operands
+-0.0 / -3.4028235E38 = 0.0, with float f(x) operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float lExpr operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float lExpr operands
+0.0 * -3.4028235E38 = -0.0, with float lExpr operands
+0.0 / -3.4028235E38 = -0.0, with float lExpr operands
+-0.0 + -3.4028235E38 = -3.4028235E38, with float rExpr operands
+-0.0 - -3.4028235E38 = 3.4028235E38, with float rExpr operands
+-0.0 * -3.4028235E38 = 0.0, with float rExpr operands
+-0.0 / -3.4028235E38 = 0.0, with float rExpr operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float exprs operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float exprs operands
+0.0 * -3.4028235E38 = -0.0, with float exprs operands
+0.0 / -3.4028235E38 = -0.0, with float exprs operands
+-0.0 + -1.0 = -1.0, with float param operands
+-0.0 - -1.0 = 1.0, with float param operands
+-0.0 * -1.0 = 0.0, with float param operands
+-0.0 / -1.0 = 0.0, with float param operands
+-0.0 + -1.0 = -1.0, with float local operands
+-0.0 - -1.0 = 1.0, with float local operands
+-0.0 * -1.0 = 0.0, with float local operands
+-0.0 / -1.0 = 0.0, with float local operands
+-0.0 + -1.0 = -1.0, with float static operands
+-0.0 - -1.0 = 1.0, with float static operands
+-0.0 * -1.0 = 0.0, with float static operands
+-0.0 / -1.0 = 0.0, with float static operands
+-0.0 + -1.0 = -1.0, with float field operands
+-0.0 - -1.0 = 1.0, with float field operands
+-0.0 * -1.0 = 0.0, with float field operands
+-0.0 / -1.0 = 0.0, with float field operands
+-0.0 + -1.0 = -1.0, with float a[i] operands
+-0.0 - -1.0 = 1.0, with float a[i] operands
+-0.0 * -1.0 = 0.0, with float a[i] operands
+-0.0 / -1.0 = 0.0, with float a[i] operands
+-0.0 + -1.0 = -1.0, with float f(x) operands
+-0.0 - -1.0 = 1.0, with float f(x) operands
+-0.0 * -1.0 = 0.0, with float f(x) operands
+-0.0 / -1.0 = 0.0, with float f(x) operands
+0.0 + -1.0 = -1.0, with float lExpr operands
+0.0 - -1.0 = 1.0, with float lExpr operands
+0.0 * -1.0 = -0.0, with float lExpr operands
+0.0 / -1.0 = -0.0, with float lExpr operands
+-0.0 + -1.0 = -1.0, with float rExpr operands
+-0.0 - -1.0 = 1.0, with float rExpr operands
+-0.0 * -1.0 = 0.0, with float rExpr operands
+-0.0 / -1.0 = 0.0, with float rExpr operands
+0.0 + -1.0 = -1.0, with float exprs operands
+0.0 - -1.0 = 1.0, with float exprs operands
+0.0 * -1.0 = -0.0, with float exprs operands
+0.0 / -1.0 = -0.0, with float exprs operands
+-0.0 + 1.0 = 1.0, with float param operands
+-0.0 - 1.0 = -1.0, with float param operands
+-0.0 * 1.0 = -0.0, with float param operands
+-0.0 / 1.0 = -0.0, with float param operands
+-0.0 + 1.0 = 1.0, with float local operands
+-0.0 - 1.0 = -1.0, with float local operands
+-0.0 * 1.0 = -0.0, with float local operands
+-0.0 / 1.0 = -0.0, with float local operands
+-0.0 + 1.0 = 1.0, with float static operands
+-0.0 - 1.0 = -1.0, with float static operands
+-0.0 * 1.0 = -0.0, with float static operands
+-0.0 / 1.0 = -0.0, with float static operands
+-0.0 + 1.0 = 1.0, with float field operands
+-0.0 - 1.0 = -1.0, with float field operands
+-0.0 * 1.0 = -0.0, with float field operands
+-0.0 / 1.0 = -0.0, with float field operands
+-0.0 + 1.0 = 1.0, with float a[i] operands
+-0.0 - 1.0 = -1.0, with float a[i] operands
+-0.0 * 1.0 = -0.0, with float a[i] operands
+-0.0 / 1.0 = -0.0, with float a[i] operands
+-0.0 + 1.0 = 1.0, with float f(x) operands
+-0.0 - 1.0 = -1.0, with float f(x) operands
+-0.0 * 1.0 = -0.0, with float f(x) operands
+-0.0 / 1.0 = -0.0, with float f(x) operands
+0.0 + 1.0 = 1.0, with float lExpr operands
+0.0 - 1.0 = -1.0, with float lExpr operands
+0.0 * 1.0 = 0.0, with float lExpr operands
+0.0 / 1.0 = 0.0, with float lExpr operands
+-0.0 + 1.0 = 1.0, with float rExpr operands
+-0.0 - 1.0 = -1.0, with float rExpr operands
+-0.0 * 1.0 = -0.0, with float rExpr operands
+-0.0 / 1.0 = -0.0, with float rExpr operands
+0.0 + 1.0 = 1.0, with float exprs operands
+0.0 - 1.0 = -1.0, with float exprs operands
+0.0 * 1.0 = 0.0, with float exprs operands
+0.0 / 1.0 = 0.0, with float exprs operands
+-0.0 + -0.0 = -0.0, with float param operands
+-0.0 - -0.0 = 0.0, with float param operands
+-0.0 * -0.0 = 0.0, with float param operands
+-0.0 / -0.0 = NaN, with float param operands
+-0.0 + -0.0 = -0.0, with float local operands
+-0.0 - -0.0 = 0.0, with float local operands
+-0.0 * -0.0 = 0.0, with float local operands
+-0.0 / -0.0 = NaN, with float local operands
+-0.0 + -0.0 = -0.0, with float static operands
+-0.0 - -0.0 = 0.0, with float static operands
+-0.0 * -0.0 = 0.0, with float static operands
+-0.0 / -0.0 = NaN, with float static operands
+-0.0 + -0.0 = -0.0, with float field operands
+-0.0 - -0.0 = 0.0, with float field operands
+-0.0 * -0.0 = 0.0, with float field operands
+-0.0 / -0.0 = NaN, with float field operands
+-0.0 + -0.0 = -0.0, with float a[i] operands
+-0.0 - -0.0 = 0.0, with float a[i] operands
+-0.0 * -0.0 = 0.0, with float a[i] operands
+-0.0 / -0.0 = NaN, with float a[i] operands
+-0.0 + -0.0 = -0.0, with float f(x) operands
+-0.0 - -0.0 = 0.0, with float f(x) operands
+-0.0 * -0.0 = 0.0, with float f(x) operands
+-0.0 / -0.0 = NaN, with float f(x) operands
+0.0 + -0.0 = 0.0, with float lExpr operands
+0.0 - -0.0 = 0.0, with float lExpr operands
+0.0 * -0.0 = -0.0, with float lExpr operands
+0.0 / -0.0 = NaN, with float lExpr operands
+-0.0 + 0.0 = 0.0, with float rExpr operands
+-0.0 - 0.0 = -0.0, with float rExpr operands
+-0.0 * 0.0 = -0.0, with float rExpr operands
+-0.0 / 0.0 = NaN, with float rExpr operands
+0.0 + 0.0 = 0.0, with float exprs operands
+0.0 - 0.0 = 0.0, with float exprs operands
+0.0 * 0.0 = 0.0, with float exprs operands
+0.0 / 0.0 = NaN, with float exprs operands
+-0.0 + 0.0 = 0.0, with float param operands
+-0.0 - 0.0 = -0.0, with float param operands
+-0.0 * 0.0 = -0.0, with float param operands
+-0.0 / 0.0 = NaN, with float param operands
+-0.0 + 0.0 = 0.0, with float local operands
+-0.0 - 0.0 = -0.0, with float local operands
+-0.0 * 0.0 = -0.0, with float local operands
+-0.0 / 0.0 = NaN, with float local operands
+-0.0 + 0.0 = 0.0, with float static operands
+-0.0 - 0.0 = -0.0, with float static operands
+-0.0 * 0.0 = -0.0, with float static operands
+-0.0 / 0.0 = NaN, with float static operands
+-0.0 + 0.0 = 0.0, with float field operands
+-0.0 - 0.0 = -0.0, with float field operands
+-0.0 * 0.0 = -0.0, with float field operands
+-0.0 / 0.0 = NaN, with float field operands
+-0.0 + 0.0 = 0.0, with float a[i] operands
+-0.0 - 0.0 = -0.0, with float a[i] operands
+-0.0 * 0.0 = -0.0, with float a[i] operands
+-0.0 / 0.0 = NaN, with float a[i] operands
+-0.0 + 0.0 = 0.0, with float f(x) operands
+-0.0 - 0.0 = -0.0, with float f(x) operands
+-0.0 * 0.0 = -0.0, with float f(x) operands
+-0.0 / 0.0 = NaN, with float f(x) operands
+0.0 + 0.0 = 0.0, with float lExpr operands
+0.0 - 0.0 = 0.0, with float lExpr operands
+0.0 * 0.0 = 0.0, with float lExpr operands
+0.0 / 0.0 = NaN, with float lExpr operands
+-0.0 + 0.0 = 0.0, with float rExpr operands
+-0.0 - 0.0 = -0.0, with float rExpr operands
+-0.0 * 0.0 = -0.0, with float rExpr operands
+-0.0 / 0.0 = NaN, with float rExpr operands
+0.0 + 0.0 = 0.0, with float exprs operands
+0.0 - 0.0 = 0.0, with float exprs operands
+0.0 * 0.0 = 0.0, with float exprs operands
+0.0 / 0.0 = NaN, with float exprs operands
+-0.0 + -Infinity = -Infinity, with float param operands
+-0.0 - -Infinity = Infinity, with float param operands
+-0.0 * -Infinity = NaN, with float param operands
+-0.0 / -Infinity = 0.0, with float param operands
+-0.0 + -Infinity = -Infinity, with float local operands
+-0.0 - -Infinity = Infinity, with float local operands
+-0.0 * -Infinity = NaN, with float local operands
+-0.0 / -Infinity = 0.0, with float local operands
+-0.0 + -Infinity = -Infinity, with float static operands
+-0.0 - -Infinity = Infinity, with float static operands
+-0.0 * -Infinity = NaN, with float static operands
+-0.0 / -Infinity = 0.0, with float static operands
+-0.0 + -Infinity = -Infinity, with float field operands
+-0.0 - -Infinity = Infinity, with float field operands
+-0.0 * -Infinity = NaN, with float field operands
+-0.0 / -Infinity = 0.0, with float field operands
+-0.0 + -Infinity = -Infinity, with float a[i] operands
+-0.0 - -Infinity = Infinity, with float a[i] operands
+-0.0 * -Infinity = NaN, with float a[i] operands
+-0.0 / -Infinity = 0.0, with float a[i] operands
+-0.0 + -Infinity = -Infinity, with float f(x) operands
+-0.0 - -Infinity = Infinity, with float f(x) operands
+-0.0 * -Infinity = NaN, with float f(x) operands
+-0.0 / -Infinity = 0.0, with float f(x) operands
+0.0 + -Infinity = -Infinity, with float lExpr operands
+0.0 - -Infinity = Infinity, with float lExpr operands
+0.0 * -Infinity = NaN, with float lExpr operands
+0.0 / -Infinity = -0.0, with float lExpr operands
+-0.0 + -Infinity = -Infinity, with float rExpr operands
+-0.0 - -Infinity = Infinity, with float rExpr operands
+-0.0 * -Infinity = NaN, with float rExpr operands
+-0.0 / -Infinity = 0.0, with float rExpr operands
+0.0 + -Infinity = -Infinity, with float exprs operands
+0.0 - -Infinity = Infinity, with float exprs operands
+0.0 * -Infinity = NaN, with float exprs operands
+0.0 / -Infinity = -0.0, with float exprs operands
+-0.0 + Infinity = Infinity, with float param operands
+-0.0 - Infinity = -Infinity, with float param operands
+-0.0 * Infinity = NaN, with float param operands
+-0.0 / Infinity = -0.0, with float param operands
+-0.0 + Infinity = Infinity, with float local operands
+-0.0 - Infinity = -Infinity, with float local operands
+-0.0 * Infinity = NaN, with float local operands
+-0.0 / Infinity = -0.0, with float local operands
+-0.0 + Infinity = Infinity, with float static operands
+-0.0 - Infinity = -Infinity, with float static operands
+-0.0 * Infinity = NaN, with float static operands
+-0.0 / Infinity = -0.0, with float static operands
+-0.0 + Infinity = Infinity, with float field operands
+-0.0 - Infinity = -Infinity, with float field operands
+-0.0 * Infinity = NaN, with float field operands
+-0.0 / Infinity = -0.0, with float field operands
+-0.0 + Infinity = Infinity, with float a[i] operands
+-0.0 - Infinity = -Infinity, with float a[i] operands
+-0.0 * Infinity = NaN, with float a[i] operands
+-0.0 / Infinity = -0.0, with float a[i] operands
+-0.0 + Infinity = Infinity, with float f(x) operands
+-0.0 - Infinity = -Infinity, with float f(x) operands
+-0.0 * Infinity = NaN, with float f(x) operands
+-0.0 / Infinity = -0.0, with float f(x) operands
+0.0 + Infinity = Infinity, with float lExpr operands
+0.0 - Infinity = -Infinity, with float lExpr operands
+0.0 * Infinity = NaN, with float lExpr operands
+0.0 / Infinity = 0.0, with float lExpr operands
+-0.0 + Infinity = Infinity, with float rExpr operands
+-0.0 - Infinity = -Infinity, with float rExpr operands
+-0.0 * Infinity = NaN, with float rExpr operands
+-0.0 / Infinity = -0.0, with float rExpr operands
+0.0 + Infinity = Infinity, with float exprs operands
+0.0 - Infinity = -Infinity, with float exprs operands
+0.0 * Infinity = NaN, with float exprs operands
+0.0 / Infinity = 0.0, with float exprs operands
+-0.0 + NaN = NaN, with float param operands
+-0.0 - NaN = NaN, with float param operands
+-0.0 * NaN = NaN, with float param operands
+-0.0 / NaN = NaN, with float param operands
+-0.0 + NaN = NaN, with float local operands
+-0.0 - NaN = NaN, with float local operands
+-0.0 * NaN = NaN, with float local operands
+-0.0 / NaN = NaN, with float local operands
+-0.0 + NaN = NaN, with float static operands
+-0.0 - NaN = NaN, with float static operands
+-0.0 * NaN = NaN, with float static operands
+-0.0 / NaN = NaN, with float static operands
+-0.0 + NaN = NaN, with float field operands
+-0.0 - NaN = NaN, with float field operands
+-0.0 * NaN = NaN, with float field operands
+-0.0 / NaN = NaN, with float field operands
+-0.0 + NaN = NaN, with float a[i] operands
+-0.0 - NaN = NaN, with float a[i] operands
+-0.0 * NaN = NaN, with float a[i] operands
+-0.0 / NaN = NaN, with float a[i] operands
+-0.0 + NaN = NaN, with float f(x) operands
+-0.0 - NaN = NaN, with float f(x) operands
+-0.0 * NaN = NaN, with float f(x) operands
+-0.0 / NaN = NaN, with float f(x) operands
+0.0 + NaN = NaN, with float lExpr operands
+0.0 - NaN = NaN, with float lExpr operands
+0.0 * NaN = NaN, with float lExpr operands
+0.0 / NaN = NaN, with float lExpr operands
+-0.0 + NaN = NaN, with float rExpr operands
+-0.0 - NaN = NaN, with float rExpr operands
+-0.0 * NaN = NaN, with float rExpr operands
+-0.0 / NaN = NaN, with float rExpr operands
+0.0 + NaN = NaN, with float exprs operands
+0.0 - NaN = NaN, with float exprs operands
+0.0 * NaN = NaN, with float exprs operands
+0.0 / NaN = NaN, with float exprs operands
+0.0 + 1.4E-45 = 1.4E-45, with float param operands
+0.0 - 1.4E-45 = -1.4E-45, with float param operands
+0.0 * 1.4E-45 = 0.0, with float param operands
+0.0 / 1.4E-45 = 0.0, with float param operands
+0.0 + 1.4E-45 = 1.4E-45, with float local operands
+0.0 - 1.4E-45 = -1.4E-45, with float local operands
+0.0 * 1.4E-45 = 0.0, with float local operands
+0.0 / 1.4E-45 = 0.0, with float local operands
+0.0 + 1.4E-45 = 1.4E-45, with float static operands
+0.0 - 1.4E-45 = -1.4E-45, with float static operands
+0.0 * 1.4E-45 = 0.0, with float static operands
+0.0 / 1.4E-45 = 0.0, with float static operands
+0.0 + 1.4E-45 = 1.4E-45, with float field operands
+0.0 - 1.4E-45 = -1.4E-45, with float field operands
+0.0 * 1.4E-45 = 0.0, with float field operands
+0.0 / 1.4E-45 = 0.0, with float field operands
+0.0 + 1.4E-45 = 1.4E-45, with float a[i] operands
+0.0 - 1.4E-45 = -1.4E-45, with float a[i] operands
+0.0 * 1.4E-45 = 0.0, with float a[i] operands
+0.0 / 1.4E-45 = 0.0, with float a[i] operands
+0.0 + 1.4E-45 = 1.4E-45, with float f(x) operands
+0.0 - 1.4E-45 = -1.4E-45, with float f(x) operands
+0.0 * 1.4E-45 = 0.0, with float f(x) operands
+0.0 / 1.4E-45 = 0.0, with float f(x) operands
+0.0 + 1.4E-45 = 1.4E-45, with float lExpr operands
+0.0 - 1.4E-45 = -1.4E-45, with float lExpr operands
+0.0 * 1.4E-45 = 0.0, with float lExpr operands
+0.0 / 1.4E-45 = 0.0, with float lExpr operands
+0.0 + 1.4E-45 = 1.4E-45, with float rExpr operands
+0.0 - 1.4E-45 = -1.4E-45, with float rExpr operands
+0.0 * 1.4E-45 = 0.0, with float rExpr operands
+0.0 / 1.4E-45 = 0.0, with float rExpr operands
+0.0 + 1.4E-45 = 1.4E-45, with float exprs operands
+0.0 - 1.4E-45 = -1.4E-45, with float exprs operands
+0.0 * 1.4E-45 = 0.0, with float exprs operands
+0.0 / 1.4E-45 = 0.0, with float exprs operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float param operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float param operands
+0.0 * 3.4028235E38 = 0.0, with float param operands
+0.0 / 3.4028235E38 = 0.0, with float param operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float local operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float local operands
+0.0 * 3.4028235E38 = 0.0, with float local operands
+0.0 / 3.4028235E38 = 0.0, with float local operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float static operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float static operands
+0.0 * 3.4028235E38 = 0.0, with float static operands
+0.0 / 3.4028235E38 = 0.0, with float static operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float field operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float field operands
+0.0 * 3.4028235E38 = 0.0, with float field operands
+0.0 / 3.4028235E38 = 0.0, with float field operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float a[i] operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float a[i] operands
+0.0 * 3.4028235E38 = 0.0, with float a[i] operands
+0.0 / 3.4028235E38 = 0.0, with float a[i] operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float f(x) operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float f(x) operands
+0.0 * 3.4028235E38 = 0.0, with float f(x) operands
+0.0 / 3.4028235E38 = 0.0, with float f(x) operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float lExpr operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float lExpr operands
+0.0 * 3.4028235E38 = 0.0, with float lExpr operands
+0.0 / 3.4028235E38 = 0.0, with float lExpr operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float rExpr operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float rExpr operands
+0.0 * 3.4028235E38 = 0.0, with float rExpr operands
+0.0 / 3.4028235E38 = 0.0, with float rExpr operands
+0.0 + 3.4028235E38 = 3.4028235E38, with float exprs operands
+0.0 - 3.4028235E38 = -3.4028235E38, with float exprs operands
+0.0 * 3.4028235E38 = 0.0, with float exprs operands
+0.0 / 3.4028235E38 = 0.0, with float exprs operands
+0.0 + -1.4E-45 = -1.4E-45, with float param operands
+0.0 - -1.4E-45 = 1.4E-45, with float param operands
+0.0 * -1.4E-45 = -0.0, with float param operands
+0.0 / -1.4E-45 = -0.0, with float param operands
+0.0 + -1.4E-45 = -1.4E-45, with float local operands
+0.0 - -1.4E-45 = 1.4E-45, with float local operands
+0.0 * -1.4E-45 = -0.0, with float local operands
+0.0 / -1.4E-45 = -0.0, with float local operands
+0.0 + -1.4E-45 = -1.4E-45, with float static operands
+0.0 - -1.4E-45 = 1.4E-45, with float static operands
+0.0 * -1.4E-45 = -0.0, with float static operands
+0.0 / -1.4E-45 = -0.0, with float static operands
+0.0 + -1.4E-45 = -1.4E-45, with float field operands
+0.0 - -1.4E-45 = 1.4E-45, with float field operands
+0.0 * -1.4E-45 = -0.0, with float field operands
+0.0 / -1.4E-45 = -0.0, with float field operands
+0.0 + -1.4E-45 = -1.4E-45, with float a[i] operands
+0.0 - -1.4E-45 = 1.4E-45, with float a[i] operands
+0.0 * -1.4E-45 = -0.0, with float a[i] operands
+0.0 / -1.4E-45 = -0.0, with float a[i] operands
+0.0 + -1.4E-45 = -1.4E-45, with float f(x) operands
+0.0 - -1.4E-45 = 1.4E-45, with float f(x) operands
+0.0 * -1.4E-45 = -0.0, with float f(x) operands
+0.0 / -1.4E-45 = -0.0, with float f(x) operands
+0.0 + -1.4E-45 = -1.4E-45, with float lExpr operands
+0.0 - -1.4E-45 = 1.4E-45, with float lExpr operands
+0.0 * -1.4E-45 = -0.0, with float lExpr operands
+0.0 / -1.4E-45 = -0.0, with float lExpr operands
+0.0 + -1.4E-45 = -1.4E-45, with float rExpr operands
+0.0 - -1.4E-45 = 1.4E-45, with float rExpr operands
+0.0 * -1.4E-45 = -0.0, with float rExpr operands
+0.0 / -1.4E-45 = -0.0, with float rExpr operands
+0.0 + -1.4E-45 = -1.4E-45, with float exprs operands
+0.0 - -1.4E-45 = 1.4E-45, with float exprs operands
+0.0 * -1.4E-45 = -0.0, with float exprs operands
+0.0 / -1.4E-45 = -0.0, with float exprs operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float param operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float param operands
+0.0 * -3.4028235E38 = -0.0, with float param operands
+0.0 / -3.4028235E38 = -0.0, with float param operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float local operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float local operands
+0.0 * -3.4028235E38 = -0.0, with float local operands
+0.0 / -3.4028235E38 = -0.0, with float local operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float static operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float static operands
+0.0 * -3.4028235E38 = -0.0, with float static operands
+0.0 / -3.4028235E38 = -0.0, with float static operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float field operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float field operands
+0.0 * -3.4028235E38 = -0.0, with float field operands
+0.0 / -3.4028235E38 = -0.0, with float field operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float a[i] operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float a[i] operands
+0.0 * -3.4028235E38 = -0.0, with float a[i] operands
+0.0 / -3.4028235E38 = -0.0, with float a[i] operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float f(x) operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float f(x) operands
+0.0 * -3.4028235E38 = -0.0, with float f(x) operands
+0.0 / -3.4028235E38 = -0.0, with float f(x) operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float lExpr operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float lExpr operands
+0.0 * -3.4028235E38 = -0.0, with float lExpr operands
+0.0 / -3.4028235E38 = -0.0, with float lExpr operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float rExpr operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float rExpr operands
+0.0 * -3.4028235E38 = -0.0, with float rExpr operands
+0.0 / -3.4028235E38 = -0.0, with float rExpr operands
+0.0 + -3.4028235E38 = -3.4028235E38, with float exprs operands
+0.0 - -3.4028235E38 = 3.4028235E38, with float exprs operands
+0.0 * -3.4028235E38 = -0.0, with float exprs operands
+0.0 / -3.4028235E38 = -0.0, with float exprs operands
+0.0 + -1.0 = -1.0, with float param operands
+0.0 - -1.0 = 1.0, with float param operands
+0.0 * -1.0 = -0.0, with float param operands
+0.0 / -1.0 = -0.0, with float param operands
+0.0 + -1.0 = -1.0, with float local operands
+0.0 - -1.0 = 1.0, with float local operands
+0.0 * -1.0 = -0.0, with float local operands
+0.0 / -1.0 = -0.0, with float local operands
+0.0 + -1.0 = -1.0, with float static operands
+0.0 - -1.0 = 1.0, with float static operands
+0.0 * -1.0 = -0.0, with float static operands
+0.0 / -1.0 = -0.0, with float static operands
+0.0 + -1.0 = -1.0, with float field operands
+0.0 - -1.0 = 1.0, with float field operands
+0.0 * -1.0 = -0.0, with float field operands
+0.0 / -1.0 = -0.0, with float field operands
+0.0 + -1.0 = -1.0, with float a[i] operands
+0.0 - -1.0 = 1.0, with float a[i] operands
+0.0 * -1.0 = -0.0, with float a[i] operands
+0.0 / -1.0 = -0.0, with float a[i] operands
+0.0 + -1.0 = -1.0, with float f(x) operands
+0.0 - -1.0 = 1.0, with float f(x) operands
+0.0 * -1.0 = -0.0, with float f(x) operands
+0.0 / -1.0 = -0.0, with float f(x) operands
+0.0 + -1.0 = -1.0, with float lExpr operands
+0.0 - -1.0 = 1.0, with float lExpr operands
+0.0 * -1.0 = -0.0, with float lExpr operands
+0.0 / -1.0 = -0.0, with float lExpr operands
+0.0 + -1.0 = -1.0, with float rExpr operands
+0.0 - -1.0 = 1.0, with float rExpr operands
+0.0 * -1.0 = -0.0, with float rExpr operands
+0.0 / -1.0 = -0.0, with float rExpr operands
+0.0 + -1.0 = -1.0, with float exprs operands
+0.0 - -1.0 = 1.0, with float exprs operands
+0.0 * -1.0 = -0.0, with float exprs operands
+0.0 / -1.0 = -0.0, with float exprs operands
+0.0 + 1.0 = 1.0, with float param operands
+0.0 - 1.0 = -1.0, with float param operands
+0.0 * 1.0 = 0.0, with float param operands
+0.0 / 1.0 = 0.0, with float param operands
+0.0 + 1.0 = 1.0, with float local operands
+0.0 - 1.0 = -1.0, with float local operands
+0.0 * 1.0 = 0.0, with float local operands
+0.0 / 1.0 = 0.0, with float local operands
+0.0 + 1.0 = 1.0, with float static operands
+0.0 - 1.0 = -1.0, with float static operands
+0.0 * 1.0 = 0.0, with float static operands
+0.0 / 1.0 = 0.0, with float static operands
+0.0 + 1.0 = 1.0, with float field operands
+0.0 - 1.0 = -1.0, with float field operands
+0.0 * 1.0 = 0.0, with float field operands
+0.0 / 1.0 = 0.0, with float field operands
+0.0 + 1.0 = 1.0, with float a[i] operands
+0.0 - 1.0 = -1.0, with float a[i] operands
+0.0 * 1.0 = 0.0, with float a[i] operands
+0.0 / 1.0 = 0.0, with float a[i] operands
+0.0 + 1.0 = 1.0, with float f(x) operands
+0.0 - 1.0 = -1.0, with float f(x) operands
+0.0 * 1.0 = 0.0, with float f(x) operands
+0.0 / 1.0 = 0.0, with float f(x) operands
+0.0 + 1.0 = 1.0, with float lExpr operands
+0.0 - 1.0 = -1.0, with float lExpr operands
+0.0 * 1.0 = 0.0, with float lExpr operands
+0.0 / 1.0 = 0.0, with float lExpr operands
+0.0 + 1.0 = 1.0, with float rExpr operands
+0.0 - 1.0 = -1.0, with float rExpr operands
+0.0 * 1.0 = 0.0, with float rExpr operands
+0.0 / 1.0 = 0.0, with float rExpr operands
+0.0 + 1.0 = 1.0, with float exprs operands
+0.0 - 1.0 = -1.0, with float exprs operands
+0.0 * 1.0 = 0.0, with float exprs operands
+0.0 / 1.0 = 0.0, with float exprs operands
+0.0 + -0.0 = 0.0, with float param operands
+0.0 - -0.0 = 0.0, with float param operands
+0.0 * -0.0 = -0.0, with float param operands
+0.0 / -0.0 = NaN, with float param operands
+0.0 + -0.0 = 0.0, with float local operands
+0.0 - -0.0 = 0.0, with float local operands
+0.0 * -0.0 = -0.0, with float local operands
+0.0 / -0.0 = NaN, with float local operands
+0.0 + -0.0 = 0.0, with float static operands
+0.0 - -0.0 = 0.0, with float static operands
+0.0 * -0.0 = -0.0, with float static operands
+0.0 / -0.0 = NaN, with float static operands
+0.0 + -0.0 = 0.0, with float field operands
+0.0 - -0.0 = 0.0, with float field operands
+0.0 * -0.0 = -0.0, with float field operands
+0.0 / -0.0 = NaN, with float field operands
+0.0 + -0.0 = 0.0, with float a[i] operands
+0.0 - -0.0 = 0.0, with float a[i] operands
+0.0 * -0.0 = -0.0, with float a[i] operands
+0.0 / -0.0 = NaN, with float a[i] operands
+0.0 + -0.0 = 0.0, with float f(x) operands
+0.0 - -0.0 = 0.0, with float f(x) operands
+0.0 * -0.0 = -0.0, with float f(x) operands
+0.0 / -0.0 = NaN, with float f(x) operands
+0.0 + -0.0 = 0.0, with float lExpr operands
+0.0 - -0.0 = 0.0, with float lExpr operands
+0.0 * -0.0 = -0.0, with float lExpr operands
+0.0 / -0.0 = NaN, with float lExpr operands
+0.0 + 0.0 = 0.0, with float rExpr operands
+0.0 - 0.0 = 0.0, with float rExpr operands
+0.0 * 0.0 = 0.0, with float rExpr operands
+0.0 / 0.0 = NaN, with float rExpr operands
+0.0 + 0.0 = 0.0, with float exprs operands
+0.0 - 0.0 = 0.0, with float exprs operands
+0.0 * 0.0 = 0.0, with float exprs operands
+0.0 / 0.0 = NaN, with float exprs operands
+0.0 + 0.0 = 0.0, with float param operands
+0.0 - 0.0 = 0.0, with float param operands
+0.0 * 0.0 = 0.0, with float param operands
+0.0 / 0.0 = NaN, with float param operands
+0.0 + 0.0 = 0.0, with float local operands
+0.0 - 0.0 = 0.0, with float local operands
+0.0 * 0.0 = 0.0, with float local operands
+0.0 / 0.0 = NaN, with float local operands
+0.0 + 0.0 = 0.0, with float static operands
+0.0 - 0.0 = 0.0, with float static operands
+0.0 * 0.0 = 0.0, with float static operands
+0.0 / 0.0 = NaN, with float static operands
+0.0 + 0.0 = 0.0, with float field operands
+0.0 - 0.0 = 0.0, with float field operands
+0.0 * 0.0 = 0.0, with float field operands
+0.0 / 0.0 = NaN, with float field operands
+0.0 + 0.0 = 0.0, with float a[i] operands
+0.0 - 0.0 = 0.0, with float a[i] operands
+0.0 * 0.0 = 0.0, with float a[i] operands
+0.0 / 0.0 = NaN, with float a[i] operands
+0.0 + 0.0 = 0.0, with float f(x) operands
+0.0 - 0.0 = 0.0, with float f(x) operands
+0.0 * 0.0 = 0.0, with float f(x) operands
+0.0 / 0.0 = NaN, with float f(x) operands
+0.0 + 0.0 = 0.0, with float lExpr operands
+0.0 - 0.0 = 0.0, with float lExpr operands
+0.0 * 0.0 = 0.0, with float lExpr operands
+0.0 / 0.0 = NaN, with float lExpr operands
+0.0 + 0.0 = 0.0, with float rExpr operands
+0.0 - 0.0 = 0.0, with float rExpr operands
+0.0 * 0.0 = 0.0, with float rExpr operands
+0.0 / 0.0 = NaN, with float rExpr operands
+0.0 + 0.0 = 0.0, with float exprs operands
+0.0 - 0.0 = 0.0, with float exprs operands
+0.0 * 0.0 = 0.0, with float exprs operands
+0.0 / 0.0 = NaN, with float exprs operands
+0.0 + -Infinity = -Infinity, with float param operands
+0.0 - -Infinity = Infinity, with float param operands
+0.0 * -Infinity = NaN, with float param operands
+0.0 / -Infinity = -0.0, with float param operands
+0.0 + -Infinity = -Infinity, with float local operands
+0.0 - -Infinity = Infinity, with float local operands
+0.0 * -Infinity = NaN, with float local operands
+0.0 / -Infinity = -0.0, with float local operands
+0.0 + -Infinity = -Infinity, with float static operands
+0.0 - -Infinity = Infinity, with float static operands
+0.0 * -Infinity = NaN, with float static operands
+0.0 / -Infinity = -0.0, with float static operands
+0.0 + -Infinity = -Infinity, with float field operands
+0.0 - -Infinity = Infinity, with float field operands
+0.0 * -Infinity = NaN, with float field operands
+0.0 / -Infinity = -0.0, with float field operands
+0.0 + -Infinity = -Infinity, with float a[i] operands
+0.0 - -Infinity = Infinity, with float a[i] operands
+0.0 * -Infinity = NaN, with float a[i] operands
+0.0 / -Infinity = -0.0, with float a[i] operands
+0.0 + -Infinity = -Infinity, with float f(x) operands
+0.0 - -Infinity = Infinity, with float f(x) operands
+0.0 * -Infinity = NaN, with float f(x) operands
+0.0 / -Infinity = -0.0, with float f(x) operands
+0.0 + -Infinity = -Infinity, with float lExpr operands
+0.0 - -Infinity = Infinity, with float lExpr operands
+0.0 * -Infinity = NaN, with float lExpr operands
+0.0 / -Infinity = -0.0, with float lExpr operands
+0.0 + -Infinity = -Infinity, with float rExpr operands
+0.0 - -Infinity = Infinity, with float rExpr operands
+0.0 * -Infinity = NaN, with float rExpr operands
+0.0 / -Infinity = -0.0, with float rExpr operands
+0.0 + -Infinity = -Infinity, with float exprs operands
+0.0 - -Infinity = Infinity, with float exprs operands
+0.0 * -Infinity = NaN, with float exprs operands
+0.0 / -Infinity = -0.0, with float exprs operands
+0.0 + Infinity = Infinity, with float param operands
+0.0 - Infinity = -Infinity, with float param operands
+0.0 * Infinity = NaN, with float param operands
+0.0 / Infinity = 0.0, with float param operands
+0.0 + Infinity = Infinity, with float local operands
+0.0 - Infinity = -Infinity, with float local operands
+0.0 * Infinity = NaN, with float local operands
+0.0 / Infinity = 0.0, with float local operands
+0.0 + Infinity = Infinity, with float static operands
+0.0 - Infinity = -Infinity, with float static operands
+0.0 * Infinity = NaN, with float static operands
+0.0 / Infinity = 0.0, with float static operands
+0.0 + Infinity = Infinity, with float field operands
+0.0 - Infinity = -Infinity, with float field operands
+0.0 * Infinity = NaN, with float field operands
+0.0 / Infinity = 0.0, with float field operands
+0.0 + Infinity = Infinity, with float a[i] operands
+0.0 - Infinity = -Infinity, with float a[i] operands
+0.0 * Infinity = NaN, with float a[i] operands
+0.0 / Infinity = 0.0, with float a[i] operands
+0.0 + Infinity = Infinity, with float f(x) operands
+0.0 - Infinity = -Infinity, with float f(x) operands
+0.0 * Infinity = NaN, with float f(x) operands
+0.0 / Infinity = 0.0, with float f(x) operands
+0.0 + Infinity = Infinity, with float lExpr operands
+0.0 - Infinity = -Infinity, with float lExpr operands
+0.0 * Infinity = NaN, with float lExpr operands
+0.0 / Infinity = 0.0, with float lExpr operands
+0.0 + Infinity = Infinity, with float rExpr operands
+0.0 - Infinity = -Infinity, with float rExpr operands
+0.0 * Infinity = NaN, with float rExpr operands
+0.0 / Infinity = 0.0, with float rExpr operands
+0.0 + Infinity = Infinity, with float exprs operands
+0.0 - Infinity = -Infinity, with float exprs operands
+0.0 * Infinity = NaN, with float exprs operands
+0.0 / Infinity = 0.0, with float exprs operands
+0.0 + NaN = NaN, with float param operands
+0.0 - NaN = NaN, with float param operands
+0.0 * NaN = NaN, with float param operands
+0.0 / NaN = NaN, with float param operands
+0.0 + NaN = NaN, with float local operands
+0.0 - NaN = NaN, with float local operands
+0.0 * NaN = NaN, with float local operands
+0.0 / NaN = NaN, with float local operands
+0.0 + NaN = NaN, with float static operands
+0.0 - NaN = NaN, with float static operands
+0.0 * NaN = NaN, with float static operands
+0.0 / NaN = NaN, with float static operands
+0.0 + NaN = NaN, with float field operands
+0.0 - NaN = NaN, with float field operands
+0.0 * NaN = NaN, with float field operands
+0.0 / NaN = NaN, with float field operands
+0.0 + NaN = NaN, with float a[i] operands
+0.0 - NaN = NaN, with float a[i] operands
+0.0 * NaN = NaN, with float a[i] operands
+0.0 / NaN = NaN, with float a[i] operands
+0.0 + NaN = NaN, with float f(x) operands
+0.0 - NaN = NaN, with float f(x) operands
+0.0 * NaN = NaN, with float f(x) operands
+0.0 / NaN = NaN, with float f(x) operands
+0.0 + NaN = NaN, with float lExpr operands
+0.0 - NaN = NaN, with float lExpr operands
+0.0 * NaN = NaN, with float lExpr operands
+0.0 / NaN = NaN, with float lExpr operands
+0.0 + NaN = NaN, with float rExpr operands
+0.0 - NaN = NaN, with float rExpr operands
+0.0 * NaN = NaN, with float rExpr operands
+0.0 / NaN = NaN, with float rExpr operands
+0.0 + NaN = NaN, with float exprs operands
+0.0 - NaN = NaN, with float exprs operands
+0.0 * NaN = NaN, with float exprs operands
+0.0 / NaN = NaN, with float exprs operands
+-Infinity + 1.4E-45 = -Infinity, with float param operands
+-Infinity - 1.4E-45 = -Infinity, with float param operands
+-Infinity * 1.4E-45 = -Infinity, with float param operands
+-Infinity / 1.4E-45 = -Infinity, with float param operands
+-Infinity + 1.4E-45 = -Infinity, with float local operands
+-Infinity - 1.4E-45 = -Infinity, with float local operands
+-Infinity * 1.4E-45 = -Infinity, with float local operands
+-Infinity / 1.4E-45 = -Infinity, with float local operands
+-Infinity + 1.4E-45 = -Infinity, with float static operands
+-Infinity - 1.4E-45 = -Infinity, with float static operands
+-Infinity * 1.4E-45 = -Infinity, with float static operands
+-Infinity / 1.4E-45 = -Infinity, with float static operands
+-Infinity + 1.4E-45 = -Infinity, with float field operands
+-Infinity - 1.4E-45 = -Infinity, with float field operands
+-Infinity * 1.4E-45 = -Infinity, with float field operands
+-Infinity / 1.4E-45 = -Infinity, with float field operands
+-Infinity + 1.4E-45 = -Infinity, with float a[i] operands
+-Infinity - 1.4E-45 = -Infinity, with float a[i] operands
+-Infinity * 1.4E-45 = -Infinity, with float a[i] operands
+-Infinity / 1.4E-45 = -Infinity, with float a[i] operands
+-Infinity + 1.4E-45 = -Infinity, with float f(x) operands
+-Infinity - 1.4E-45 = -Infinity, with float f(x) operands
+-Infinity * 1.4E-45 = -Infinity, with float f(x) operands
+-Infinity / 1.4E-45 = -Infinity, with float f(x) operands
+-Infinity + 1.4E-45 = -Infinity, with float lExpr operands
+-Infinity - 1.4E-45 = -Infinity, with float lExpr operands
+-Infinity * 1.4E-45 = -Infinity, with float lExpr operands
+-Infinity / 1.4E-45 = -Infinity, with float lExpr operands
+-Infinity + 1.4E-45 = -Infinity, with float rExpr operands
+-Infinity - 1.4E-45 = -Infinity, with float rExpr operands
+-Infinity * 1.4E-45 = -Infinity, with float rExpr operands
+-Infinity / 1.4E-45 = -Infinity, with float rExpr operands
+-Infinity + 1.4E-45 = -Infinity, with float exprs operands
+-Infinity - 1.4E-45 = -Infinity, with float exprs operands
+-Infinity * 1.4E-45 = -Infinity, with float exprs operands
+-Infinity / 1.4E-45 = -Infinity, with float exprs operands
+-Infinity + 3.4028235E38 = -Infinity, with float param operands
+-Infinity - 3.4028235E38 = -Infinity, with float param operands
+-Infinity * 3.4028235E38 = -Infinity, with float param operands
+-Infinity / 3.4028235E38 = -Infinity, with float param operands
+-Infinity + 3.4028235E38 = -Infinity, with float local operands
+-Infinity - 3.4028235E38 = -Infinity, with float local operands
+-Infinity * 3.4028235E38 = -Infinity, with float local operands
+-Infinity / 3.4028235E38 = -Infinity, with float local operands
+-Infinity + 3.4028235E38 = -Infinity, with float static operands
+-Infinity - 3.4028235E38 = -Infinity, with float static operands
+-Infinity * 3.4028235E38 = -Infinity, with float static operands
+-Infinity / 3.4028235E38 = -Infinity, with float static operands
+-Infinity + 3.4028235E38 = -Infinity, with float field operands
+-Infinity - 3.4028235E38 = -Infinity, with float field operands
+-Infinity * 3.4028235E38 = -Infinity, with float field operands
+-Infinity / 3.4028235E38 = -Infinity, with float field operands
+-Infinity + 3.4028235E38 = -Infinity, with float a[i] operands
+-Infinity - 3.4028235E38 = -Infinity, with float a[i] operands
+-Infinity * 3.4028235E38 = -Infinity, with float a[i] operands
+-Infinity / 3.4028235E38 = -Infinity, with float a[i] operands
+-Infinity + 3.4028235E38 = -Infinity, with float f(x) operands
+-Infinity - 3.4028235E38 = -Infinity, with float f(x) operands
+-Infinity * 3.4028235E38 = -Infinity, with float f(x) operands
+-Infinity / 3.4028235E38 = -Infinity, with float f(x) operands
+-Infinity + 3.4028235E38 = -Infinity, with float lExpr operands
+-Infinity - 3.4028235E38 = -Infinity, with float lExpr operands
+-Infinity * 3.4028235E38 = -Infinity, with float lExpr operands
+-Infinity / 3.4028235E38 = -Infinity, with float lExpr operands
+-Infinity + 3.4028235E38 = -Infinity, with float rExpr operands
+-Infinity - 3.4028235E38 = -Infinity, with float rExpr operands
+-Infinity * 3.4028235E38 = -Infinity, with float rExpr operands
+-Infinity / 3.4028235E38 = -Infinity, with float rExpr operands
+-Infinity + 3.4028235E38 = -Infinity, with float exprs operands
+-Infinity - 3.4028235E38 = -Infinity, with float exprs operands
+-Infinity * 3.4028235E38 = -Infinity, with float exprs operands
+-Infinity / 3.4028235E38 = -Infinity, with float exprs operands
+-Infinity + -1.4E-45 = -Infinity, with float param operands
+-Infinity - -1.4E-45 = -Infinity, with float param operands
+-Infinity * -1.4E-45 = Infinity, with float param operands
+-Infinity / -1.4E-45 = Infinity, with float param operands
+-Infinity + -1.4E-45 = -Infinity, with float local operands
+-Infinity - -1.4E-45 = -Infinity, with float local operands
+-Infinity * -1.4E-45 = Infinity, with float local operands
+-Infinity / -1.4E-45 = Infinity, with float local operands
+-Infinity + -1.4E-45 = -Infinity, with float static operands
+-Infinity - -1.4E-45 = -Infinity, with float static operands
+-Infinity * -1.4E-45 = Infinity, with float static operands
+-Infinity / -1.4E-45 = Infinity, with float static operands
+-Infinity + -1.4E-45 = -Infinity, with float field operands
+-Infinity - -1.4E-45 = -Infinity, with float field operands
+-Infinity * -1.4E-45 = Infinity, with float field operands
+-Infinity / -1.4E-45 = Infinity, with float field operands
+-Infinity + -1.4E-45 = -Infinity, with float a[i] operands
+-Infinity - -1.4E-45 = -Infinity, with float a[i] operands
+-Infinity * -1.4E-45 = Infinity, with float a[i] operands
+-Infinity / -1.4E-45 = Infinity, with float a[i] operands
+-Infinity + -1.4E-45 = -Infinity, with float f(x) operands
+-Infinity - -1.4E-45 = -Infinity, with float f(x) operands
+-Infinity * -1.4E-45 = Infinity, with float f(x) operands
+-Infinity / -1.4E-45 = Infinity, with float f(x) operands
+-Infinity + -1.4E-45 = -Infinity, with float lExpr operands
+-Infinity - -1.4E-45 = -Infinity, with float lExpr operands
+-Infinity * -1.4E-45 = Infinity, with float lExpr operands
+-Infinity / -1.4E-45 = Infinity, with float lExpr operands
+-Infinity + -1.4E-45 = -Infinity, with float rExpr operands
+-Infinity - -1.4E-45 = -Infinity, with float rExpr operands
+-Infinity * -1.4E-45 = Infinity, with float rExpr operands
+-Infinity / -1.4E-45 = Infinity, with float rExpr operands
+-Infinity + -1.4E-45 = -Infinity, with float exprs operands
+-Infinity - -1.4E-45 = -Infinity, with float exprs operands
+-Infinity * -1.4E-45 = Infinity, with float exprs operands
+-Infinity / -1.4E-45 = Infinity, with float exprs operands
+-Infinity + -3.4028235E38 = -Infinity, with float param operands
+-Infinity - -3.4028235E38 = -Infinity, with float param operands
+-Infinity * -3.4028235E38 = Infinity, with float param operands
+-Infinity / -3.4028235E38 = Infinity, with float param operands
+-Infinity + -3.4028235E38 = -Infinity, with float local operands
+-Infinity - -3.4028235E38 = -Infinity, with float local operands
+-Infinity * -3.4028235E38 = Infinity, with float local operands
+-Infinity / -3.4028235E38 = Infinity, with float local operands
+-Infinity + -3.4028235E38 = -Infinity, with float static operands
+-Infinity - -3.4028235E38 = -Infinity, with float static operands
+-Infinity * -3.4028235E38 = Infinity, with float static operands
+-Infinity / -3.4028235E38 = Infinity, with float static operands
+-Infinity + -3.4028235E38 = -Infinity, with float field operands
+-Infinity - -3.4028235E38 = -Infinity, with float field operands
+-Infinity * -3.4028235E38 = Infinity, with float field operands
+-Infinity / -3.4028235E38 = Infinity, with float field operands
+-Infinity + -3.4028235E38 = -Infinity, with float a[i] operands
+-Infinity - -3.4028235E38 = -Infinity, with float a[i] operands
+-Infinity * -3.4028235E38 = Infinity, with float a[i] operands
+-Infinity / -3.4028235E38 = Infinity, with float a[i] operands
+-Infinity + -3.4028235E38 = -Infinity, with float f(x) operands
+-Infinity - -3.4028235E38 = -Infinity, with float f(x) operands
+-Infinity * -3.4028235E38 = Infinity, with float f(x) operands
+-Infinity / -3.4028235E38 = Infinity, with float f(x) operands
+-Infinity + -3.4028235E38 = -Infinity, with float lExpr operands
+-Infinity - -3.4028235E38 = -Infinity, with float lExpr operands
+-Infinity * -3.4028235E38 = Infinity, with float lExpr operands
+-Infinity / -3.4028235E38 = Infinity, with float lExpr operands
+-Infinity + -3.4028235E38 = -Infinity, with float rExpr operands
+-Infinity - -3.4028235E38 = -Infinity, with float rExpr operands
+-Infinity * -3.4028235E38 = Infinity, with float rExpr operands
+-Infinity / -3.4028235E38 = Infinity, with float rExpr operands
+-Infinity + -3.4028235E38 = -Infinity, with float exprs operands
+-Infinity - -3.4028235E38 = -Infinity, with float exprs operands
+-Infinity * -3.4028235E38 = Infinity, with float exprs operands
+-Infinity / -3.4028235E38 = Infinity, with float exprs operands
+-Infinity + -1.0 = -Infinity, with float param operands
+-Infinity - -1.0 = -Infinity, with float param operands
+-Infinity * -1.0 = Infinity, with float param operands
+-Infinity / -1.0 = Infinity, with float param operands
+-Infinity + -1.0 = -Infinity, with float local operands
+-Infinity - -1.0 = -Infinity, with float local operands
+-Infinity * -1.0 = Infinity, with float local operands
+-Infinity / -1.0 = Infinity, with float local operands
+-Infinity + -1.0 = -Infinity, with float static operands
+-Infinity - -1.0 = -Infinity, with float static operands
+-Infinity * -1.0 = Infinity, with float static operands
+-Infinity / -1.0 = Infinity, with float static operands
+-Infinity + -1.0 = -Infinity, with float field operands
+-Infinity - -1.0 = -Infinity, with float field operands
+-Infinity * -1.0 = Infinity, with float field operands
+-Infinity / -1.0 = Infinity, with float field operands
+-Infinity + -1.0 = -Infinity, with float a[i] operands
+-Infinity - -1.0 = -Infinity, with float a[i] operands
+-Infinity * -1.0 = Infinity, with float a[i] operands
+-Infinity / -1.0 = Infinity, with float a[i] operands
+-Infinity + -1.0 = -Infinity, with float f(x) operands
+-Infinity - -1.0 = -Infinity, with float f(x) operands
+-Infinity * -1.0 = Infinity, with float f(x) operands
+-Infinity / -1.0 = Infinity, with float f(x) operands
+-Infinity + -1.0 = -Infinity, with float lExpr operands
+-Infinity - -1.0 = -Infinity, with float lExpr operands
+-Infinity * -1.0 = Infinity, with float lExpr operands
+-Infinity / -1.0 = Infinity, with float lExpr operands
+-Infinity + -1.0 = -Infinity, with float rExpr operands
+-Infinity - -1.0 = -Infinity, with float rExpr operands
+-Infinity * -1.0 = Infinity, with float rExpr operands
+-Infinity / -1.0 = Infinity, with float rExpr operands
+-Infinity + -1.0 = -Infinity, with float exprs operands
+-Infinity - -1.0 = -Infinity, with float exprs operands
+-Infinity * -1.0 = Infinity, with float exprs operands
+-Infinity / -1.0 = Infinity, with float exprs operands
+-Infinity + 1.0 = -Infinity, with float param operands
+-Infinity - 1.0 = -Infinity, with float param operands
+-Infinity * 1.0 = -Infinity, with float param operands
+-Infinity / 1.0 = -Infinity, with float param operands
+-Infinity + 1.0 = -Infinity, with float local operands
+-Infinity - 1.0 = -Infinity, with float local operands
+-Infinity * 1.0 = -Infinity, with float local operands
+-Infinity / 1.0 = -Infinity, with float local operands
+-Infinity + 1.0 = -Infinity, with float static operands
+-Infinity - 1.0 = -Infinity, with float static operands
+-Infinity * 1.0 = -Infinity, with float static operands
+-Infinity / 1.0 = -Infinity, with float static operands
+-Infinity + 1.0 = -Infinity, with float field operands
+-Infinity - 1.0 = -Infinity, with float field operands
+-Infinity * 1.0 = -Infinity, with float field operands
+-Infinity / 1.0 = -Infinity, with float field operands
+-Infinity + 1.0 = -Infinity, with float a[i] operands
+-Infinity - 1.0 = -Infinity, with float a[i] operands
+-Infinity * 1.0 = -Infinity, with float a[i] operands
+-Infinity / 1.0 = -Infinity, with float a[i] operands
+-Infinity + 1.0 = -Infinity, with float f(x) operands
+-Infinity - 1.0 = -Infinity, with float f(x) operands
+-Infinity * 1.0 = -Infinity, with float f(x) operands
+-Infinity / 1.0 = -Infinity, with float f(x) operands
+-Infinity + 1.0 = -Infinity, with float lExpr operands
+-Infinity - 1.0 = -Infinity, with float lExpr operands
+-Infinity * 1.0 = -Infinity, with float lExpr operands
+-Infinity / 1.0 = -Infinity, with float lExpr operands
+-Infinity + 1.0 = -Infinity, with float rExpr operands
+-Infinity - 1.0 = -Infinity, with float rExpr operands
+-Infinity * 1.0 = -Infinity, with float rExpr operands
+-Infinity / 1.0 = -Infinity, with float rExpr operands
+-Infinity + 1.0 = -Infinity, with float exprs operands
+-Infinity - 1.0 = -Infinity, with float exprs operands
+-Infinity * 1.0 = -Infinity, with float exprs operands
+-Infinity / 1.0 = -Infinity, with float exprs operands
+-Infinity + -0.0 = -Infinity, with float param operands
+-Infinity - -0.0 = -Infinity, with float param operands
+-Infinity * -0.0 = NaN, with float param operands
+-Infinity / -0.0 = Infinity, with float param operands
+-Infinity + -0.0 = -Infinity, with float local operands
+-Infinity - -0.0 = -Infinity, with float local operands
+-Infinity * -0.0 = NaN, with float local operands
+-Infinity / -0.0 = Infinity, with float local operands
+-Infinity + -0.0 = -Infinity, with float static operands
+-Infinity - -0.0 = -Infinity, with float static operands
+-Infinity * -0.0 = NaN, with float static operands
+-Infinity / -0.0 = Infinity, with float static operands
+-Infinity + -0.0 = -Infinity, with float field operands
+-Infinity - -0.0 = -Infinity, with float field operands
+-Infinity * -0.0 = NaN, with float field operands
+-Infinity / -0.0 = Infinity, with float field operands
+-Infinity + -0.0 = -Infinity, with float a[i] operands
+-Infinity - -0.0 = -Infinity, with float a[i] operands
+-Infinity * -0.0 = NaN, with float a[i] operands
+-Infinity / -0.0 = Infinity, with float a[i] operands
+-Infinity + -0.0 = -Infinity, with float f(x) operands
+-Infinity - -0.0 = -Infinity, with float f(x) operands
+-Infinity * -0.0 = NaN, with float f(x) operands
+-Infinity / -0.0 = Infinity, with float f(x) operands
+-Infinity + -0.0 = -Infinity, with float lExpr operands
+-Infinity - -0.0 = -Infinity, with float lExpr operands
+-Infinity * -0.0 = NaN, with float lExpr operands
+-Infinity / -0.0 = Infinity, with float lExpr operands
+-Infinity + 0.0 = -Infinity, with float rExpr operands
+-Infinity - 0.0 = -Infinity, with float rExpr operands
+-Infinity * 0.0 = NaN, with float rExpr operands
+-Infinity / 0.0 = -Infinity, with float rExpr operands
+-Infinity + 0.0 = -Infinity, with float exprs operands
+-Infinity - 0.0 = -Infinity, with float exprs operands
+-Infinity * 0.0 = NaN, with float exprs operands
+-Infinity / 0.0 = -Infinity, with float exprs operands
+-Infinity + 0.0 = -Infinity, with float param operands
+-Infinity - 0.0 = -Infinity, with float param operands
+-Infinity * 0.0 = NaN, with float param operands
+-Infinity / 0.0 = -Infinity, with float param operands
+-Infinity + 0.0 = -Infinity, with float local operands
+-Infinity - 0.0 = -Infinity, with float local operands
+-Infinity * 0.0 = NaN, with float local operands
+-Infinity / 0.0 = -Infinity, with float local operands
+-Infinity + 0.0 = -Infinity, with float static operands
+-Infinity - 0.0 = -Infinity, with float static operands
+-Infinity * 0.0 = NaN, with float static operands
+-Infinity / 0.0 = -Infinity, with float static operands
+-Infinity + 0.0 = -Infinity, with float field operands
+-Infinity - 0.0 = -Infinity, with float field operands
+-Infinity * 0.0 = NaN, with float field operands
+-Infinity / 0.0 = -Infinity, with float field operands
+-Infinity + 0.0 = -Infinity, with float a[i] operands
+-Infinity - 0.0 = -Infinity, with float a[i] operands
+-Infinity * 0.0 = NaN, with float a[i] operands
+-Infinity / 0.0 = -Infinity, with float a[i] operands
+-Infinity + 0.0 = -Infinity, with float f(x) operands
+-Infinity - 0.0 = -Infinity, with float f(x) operands
+-Infinity * 0.0 = NaN, with float f(x) operands
+-Infinity / 0.0 = -Infinity, with float f(x) operands
+-Infinity + 0.0 = -Infinity, with float lExpr operands
+-Infinity - 0.0 = -Infinity, with float lExpr operands
+-Infinity * 0.0 = NaN, with float lExpr operands
+-Infinity / 0.0 = -Infinity, with float lExpr operands
+-Infinity + 0.0 = -Infinity, with float rExpr operands
+-Infinity - 0.0 = -Infinity, with float rExpr operands
+-Infinity * 0.0 = NaN, with float rExpr operands
+-Infinity / 0.0 = -Infinity, with float rExpr operands
+-Infinity + 0.0 = -Infinity, with float exprs operands
+-Infinity - 0.0 = -Infinity, with float exprs operands
+-Infinity * 0.0 = NaN, with float exprs operands
+-Infinity / 0.0 = -Infinity, with float exprs operands
+-Infinity + -Infinity = -Infinity, with float param operands
+-Infinity - -Infinity = NaN, with float param operands
+-Infinity * -Infinity = Infinity, with float param operands
+-Infinity / -Infinity = NaN, with float param operands
+-Infinity + -Infinity = -Infinity, with float local operands
+-Infinity - -Infinity = NaN, with float local operands
+-Infinity * -Infinity = Infinity, with float local operands
+-Infinity / -Infinity = NaN, with float local operands
+-Infinity + -Infinity = -Infinity, with float static operands
+-Infinity - -Infinity = NaN, with float static operands
+-Infinity * -Infinity = Infinity, with float static operands
+-Infinity / -Infinity = NaN, with float static operands
+-Infinity + -Infinity = -Infinity, with float field operands
+-Infinity - -Infinity = NaN, with float field operands
+-Infinity * -Infinity = Infinity, with float field operands
+-Infinity / -Infinity = NaN, with float field operands
+-Infinity + -Infinity = -Infinity, with float a[i] operands
+-Infinity - -Infinity = NaN, with float a[i] operands
+-Infinity * -Infinity = Infinity, with float a[i] operands
+-Infinity / -Infinity = NaN, with float a[i] operands
+-Infinity + -Infinity = -Infinity, with float f(x) operands
+-Infinity - -Infinity = NaN, with float f(x) operands
+-Infinity * -Infinity = Infinity, with float f(x) operands
+-Infinity / -Infinity = NaN, with float f(x) operands
+-Infinity + -Infinity = -Infinity, with float lExpr operands
+-Infinity - -Infinity = NaN, with float lExpr operands
+-Infinity * -Infinity = Infinity, with float lExpr operands
+-Infinity / -Infinity = NaN, with float lExpr operands
+-Infinity + -Infinity = -Infinity, with float rExpr operands
+-Infinity - -Infinity = NaN, with float rExpr operands
+-Infinity * -Infinity = Infinity, with float rExpr operands
+-Infinity / -Infinity = NaN, with float rExpr operands
+-Infinity + -Infinity = -Infinity, with float exprs operands
+-Infinity - -Infinity = NaN, with float exprs operands
+-Infinity * -Infinity = Infinity, with float exprs operands
+-Infinity / -Infinity = NaN, with float exprs operands
+-Infinity + Infinity = NaN, with float param operands
+-Infinity - Infinity = -Infinity, with float param operands
+-Infinity * Infinity = -Infinity, with float param operands
+-Infinity / Infinity = NaN, with float param operands
+-Infinity + Infinity = NaN, with float local operands
+-Infinity - Infinity = -Infinity, with float local operands
+-Infinity * Infinity = -Infinity, with float local operands
+-Infinity / Infinity = NaN, with float local operands
+-Infinity + Infinity = NaN, with float static operands
+-Infinity - Infinity = -Infinity, with float static operands
+-Infinity * Infinity = -Infinity, with float static operands
+-Infinity / Infinity = NaN, with float static operands
+-Infinity + Infinity = NaN, with float field operands
+-Infinity - Infinity = -Infinity, with float field operands
+-Infinity * Infinity = -Infinity, with float field operands
+-Infinity / Infinity = NaN, with float field operands
+-Infinity + Infinity = NaN, with float a[i] operands
+-Infinity - Infinity = -Infinity, with float a[i] operands
+-Infinity * Infinity = -Infinity, with float a[i] operands
+-Infinity / Infinity = NaN, with float a[i] operands
+-Infinity + Infinity = NaN, with float f(x) operands
+-Infinity - Infinity = -Infinity, with float f(x) operands
+-Infinity * Infinity = -Infinity, with float f(x) operands
+-Infinity / Infinity = NaN, with float f(x) operands
+-Infinity + Infinity = NaN, with float lExpr operands
+-Infinity - Infinity = -Infinity, with float lExpr operands
+-Infinity * Infinity = -Infinity, with float lExpr operands
+-Infinity / Infinity = NaN, with float lExpr operands
+-Infinity + Infinity = NaN, with float rExpr operands
+-Infinity - Infinity = -Infinity, with float rExpr operands
+-Infinity * Infinity = -Infinity, with float rExpr operands
+-Infinity / Infinity = NaN, with float rExpr operands
+-Infinity + Infinity = NaN, with float exprs operands
+-Infinity - Infinity = -Infinity, with float exprs operands
+-Infinity * Infinity = -Infinity, with float exprs operands
+-Infinity / Infinity = NaN, with float exprs operands
+-Infinity + NaN = NaN, with float param operands
+-Infinity - NaN = NaN, with float param operands
+-Infinity * NaN = NaN, with float param operands
+-Infinity / NaN = NaN, with float param operands
+-Infinity + NaN = NaN, with float local operands
+-Infinity - NaN = NaN, with float local operands
+-Infinity * NaN = NaN, with float local operands
+-Infinity / NaN = NaN, with float local operands
+-Infinity + NaN = NaN, with float static operands
+-Infinity - NaN = NaN, with float static operands
+-Infinity * NaN = NaN, with float static operands
+-Infinity / NaN = NaN, with float static operands
+-Infinity + NaN = NaN, with float field operands
+-Infinity - NaN = NaN, with float field operands
+-Infinity * NaN = NaN, with float field operands
+-Infinity / NaN = NaN, with float field operands
+-Infinity + NaN = NaN, with float a[i] operands
+-Infinity - NaN = NaN, with float a[i] operands
+-Infinity * NaN = NaN, with float a[i] operands
+-Infinity / NaN = NaN, with float a[i] operands
+-Infinity + NaN = NaN, with float f(x) operands
+-Infinity - NaN = NaN, with float f(x) operands
+-Infinity * NaN = NaN, with float f(x) operands
+-Infinity / NaN = NaN, with float f(x) operands
+-Infinity + NaN = NaN, with float lExpr operands
+-Infinity - NaN = NaN, with float lExpr operands
+-Infinity * NaN = NaN, with float lExpr operands
+-Infinity / NaN = NaN, with float lExpr operands
+-Infinity + NaN = NaN, with float rExpr operands
+-Infinity - NaN = NaN, with float rExpr operands
+-Infinity * NaN = NaN, with float rExpr operands
+-Infinity / NaN = NaN, with float rExpr operands
+-Infinity + NaN = NaN, with float exprs operands
+-Infinity - NaN = NaN, with float exprs operands
+-Infinity * NaN = NaN, with float exprs operands
+-Infinity / NaN = NaN, with float exprs operands
+Infinity + 1.4E-45 = Infinity, with float param operands
+Infinity - 1.4E-45 = Infinity, with float param operands
+Infinity * 1.4E-45 = Infinity, with float param operands
+Infinity / 1.4E-45 = Infinity, with float param operands
+Infinity + 1.4E-45 = Infinity, with float local operands
+Infinity - 1.4E-45 = Infinity, with float local operands
+Infinity * 1.4E-45 = Infinity, with float local operands
+Infinity / 1.4E-45 = Infinity, with float local operands
+Infinity + 1.4E-45 = Infinity, with float static operands
+Infinity - 1.4E-45 = Infinity, with float static operands
+Infinity * 1.4E-45 = Infinity, with float static operands
+Infinity / 1.4E-45 = Infinity, with float static operands
+Infinity + 1.4E-45 = Infinity, with float field operands
+Infinity - 1.4E-45 = Infinity, with float field operands
+Infinity * 1.4E-45 = Infinity, with float field operands
+Infinity / 1.4E-45 = Infinity, with float field operands
+Infinity + 1.4E-45 = Infinity, with float a[i] operands
+Infinity - 1.4E-45 = Infinity, with float a[i] operands
+Infinity * 1.4E-45 = Infinity, with float a[i] operands
+Infinity / 1.4E-45 = Infinity, with float a[i] operands
+Infinity + 1.4E-45 = Infinity, with float f(x) operands
+Infinity - 1.4E-45 = Infinity, with float f(x) operands
+Infinity * 1.4E-45 = Infinity, with float f(x) operands
+Infinity / 1.4E-45 = Infinity, with float f(x) operands
+Infinity + 1.4E-45 = Infinity, with float lExpr operands
+Infinity - 1.4E-45 = Infinity, with float lExpr operands
+Infinity * 1.4E-45 = Infinity, with float lExpr operands
+Infinity / 1.4E-45 = Infinity, with float lExpr operands
+Infinity + 1.4E-45 = Infinity, with float rExpr operands
+Infinity - 1.4E-45 = Infinity, with float rExpr operands
+Infinity * 1.4E-45 = Infinity, with float rExpr operands
+Infinity / 1.4E-45 = Infinity, with float rExpr operands
+Infinity + 1.4E-45 = Infinity, with float exprs operands
+Infinity - 1.4E-45 = Infinity, with float exprs operands
+Infinity * 1.4E-45 = Infinity, with float exprs operands
+Infinity / 1.4E-45 = Infinity, with float exprs operands
+Infinity + 3.4028235E38 = Infinity, with float param operands
+Infinity - 3.4028235E38 = Infinity, with float param operands
+Infinity * 3.4028235E38 = Infinity, with float param operands
+Infinity / 3.4028235E38 = Infinity, with float param operands
+Infinity + 3.4028235E38 = Infinity, with float local operands
+Infinity - 3.4028235E38 = Infinity, with float local operands
+Infinity * 3.4028235E38 = Infinity, with float local operands
+Infinity / 3.4028235E38 = Infinity, with float local operands
+Infinity + 3.4028235E38 = Infinity, with float static operands
+Infinity - 3.4028235E38 = Infinity, with float static operands
+Infinity * 3.4028235E38 = Infinity, with float static operands
+Infinity / 3.4028235E38 = Infinity, with float static operands
+Infinity + 3.4028235E38 = Infinity, with float field operands
+Infinity - 3.4028235E38 = Infinity, with float field operands
+Infinity * 3.4028235E38 = Infinity, with float field operands
+Infinity / 3.4028235E38 = Infinity, with float field operands
+Infinity + 3.4028235E38 = Infinity, with float a[i] operands
+Infinity - 3.4028235E38 = Infinity, with float a[i] operands
+Infinity * 3.4028235E38 = Infinity, with float a[i] operands
+Infinity / 3.4028235E38 = Infinity, with float a[i] operands
+Infinity + 3.4028235E38 = Infinity, with float f(x) operands
+Infinity - 3.4028235E38 = Infinity, with float f(x) operands
+Infinity * 3.4028235E38 = Infinity, with float f(x) operands
+Infinity / 3.4028235E38 = Infinity, with float f(x) operands
+Infinity + 3.4028235E38 = Infinity, with float lExpr operands
+Infinity - 3.4028235E38 = Infinity, with float lExpr operands
+Infinity * 3.4028235E38 = Infinity, with float lExpr operands
+Infinity / 3.4028235E38 = Infinity, with float lExpr operands
+Infinity + 3.4028235E38 = Infinity, with float rExpr operands
+Infinity - 3.4028235E38 = Infinity, with float rExpr operands
+Infinity * 3.4028235E38 = Infinity, with float rExpr operands
+Infinity / 3.4028235E38 = Infinity, with float rExpr operands
+Infinity + 3.4028235E38 = Infinity, with float exprs operands
+Infinity - 3.4028235E38 = Infinity, with float exprs operands
+Infinity * 3.4028235E38 = Infinity, with float exprs operands
+Infinity / 3.4028235E38 = Infinity, with float exprs operands
+Infinity + -1.4E-45 = Infinity, with float param operands
+Infinity - -1.4E-45 = Infinity, with float param operands
+Infinity * -1.4E-45 = -Infinity, with float param operands
+Infinity / -1.4E-45 = -Infinity, with float param operands
+Infinity + -1.4E-45 = Infinity, with float local operands
+Infinity - -1.4E-45 = Infinity, with float local operands
+Infinity * -1.4E-45 = -Infinity, with float local operands
+Infinity / -1.4E-45 = -Infinity, with float local operands
+Infinity + -1.4E-45 = Infinity, with float static operands
+Infinity - -1.4E-45 = Infinity, with float static operands
+Infinity * -1.4E-45 = -Infinity, with float static operands
+Infinity / -1.4E-45 = -Infinity, with float static operands
+Infinity + -1.4E-45 = Infinity, with float field operands
+Infinity - -1.4E-45 = Infinity, with float field operands
+Infinity * -1.4E-45 = -Infinity, with float field operands
+Infinity / -1.4E-45 = -Infinity, with float field operands
+Infinity + -1.4E-45 = Infinity, with float a[i] operands
+Infinity - -1.4E-45 = Infinity, with float a[i] operands
+Infinity * -1.4E-45 = -Infinity, with float a[i] operands
+Infinity / -1.4E-45 = -Infinity, with float a[i] operands
+Infinity + -1.4E-45 = Infinity, with float f(x) operands
+Infinity - -1.4E-45 = Infinity, with float f(x) operands
+Infinity * -1.4E-45 = -Infinity, with float f(x) operands
+Infinity / -1.4E-45 = -Infinity, with float f(x) operands
+Infinity + -1.4E-45 = Infinity, with float lExpr operands
+Infinity - -1.4E-45 = Infinity, with float lExpr operands
+Infinity * -1.4E-45 = -Infinity, with float lExpr operands
+Infinity / -1.4E-45 = -Infinity, with float lExpr operands
+Infinity + -1.4E-45 = Infinity, with float rExpr operands
+Infinity - -1.4E-45 = Infinity, with float rExpr operands
+Infinity * -1.4E-45 = -Infinity, with float rExpr operands
+Infinity / -1.4E-45 = -Infinity, with float rExpr operands
+Infinity + -1.4E-45 = Infinity, with float exprs operands
+Infinity - -1.4E-45 = Infinity, with float exprs operands
+Infinity * -1.4E-45 = -Infinity, with float exprs operands
+Infinity / -1.4E-45 = -Infinity, with float exprs operands
+Infinity + -3.4028235E38 = Infinity, with float param operands
+Infinity - -3.4028235E38 = Infinity, with float param operands
+Infinity * -3.4028235E38 = -Infinity, with float param operands
+Infinity / -3.4028235E38 = -Infinity, with float param operands
+Infinity + -3.4028235E38 = Infinity, with float local operands
+Infinity - -3.4028235E38 = Infinity, with float local operands
+Infinity * -3.4028235E38 = -Infinity, with float local operands
+Infinity / -3.4028235E38 = -Infinity, with float local operands
+Infinity + -3.4028235E38 = Infinity, with float static operands
+Infinity - -3.4028235E38 = Infinity, with float static operands
+Infinity * -3.4028235E38 = -Infinity, with float static operands
+Infinity / -3.4028235E38 = -Infinity, with float static operands
+Infinity + -3.4028235E38 = Infinity, with float field operands
+Infinity - -3.4028235E38 = Infinity, with float field operands
+Infinity * -3.4028235E38 = -Infinity, with float field operands
+Infinity / -3.4028235E38 = -Infinity, with float field operands
+Infinity + -3.4028235E38 = Infinity, with float a[i] operands
+Infinity - -3.4028235E38 = Infinity, with float a[i] operands
+Infinity * -3.4028235E38 = -Infinity, with float a[i] operands
+Infinity / -3.4028235E38 = -Infinity, with float a[i] operands
+Infinity + -3.4028235E38 = Infinity, with float f(x) operands
+Infinity - -3.4028235E38 = Infinity, with float f(x) operands
+Infinity * -3.4028235E38 = -Infinity, with float f(x) operands
+Infinity / -3.4028235E38 = -Infinity, with float f(x) operands
+Infinity + -3.4028235E38 = Infinity, with float lExpr operands
+Infinity - -3.4028235E38 = Infinity, with float lExpr operands
+Infinity * -3.4028235E38 = -Infinity, with float lExpr operands
+Infinity / -3.4028235E38 = -Infinity, with float lExpr operands
+Infinity + -3.4028235E38 = Infinity, with float rExpr operands
+Infinity - -3.4028235E38 = Infinity, with float rExpr operands
+Infinity * -3.4028235E38 = -Infinity, with float rExpr operands
+Infinity / -3.4028235E38 = -Infinity, with float rExpr operands
+Infinity + -3.4028235E38 = Infinity, with float exprs operands
+Infinity - -3.4028235E38 = Infinity, with float exprs operands
+Infinity * -3.4028235E38 = -Infinity, with float exprs operands
+Infinity / -3.4028235E38 = -Infinity, with float exprs operands
+Infinity + -1.0 = Infinity, with float param operands
+Infinity - -1.0 = Infinity, with float param operands
+Infinity * -1.0 = -Infinity, with float param operands
+Infinity / -1.0 = -Infinity, with float param operands
+Infinity + -1.0 = Infinity, with float local operands
+Infinity - -1.0 = Infinity, with float local operands
+Infinity * -1.0 = -Infinity, with float local operands
+Infinity / -1.0 = -Infinity, with float local operands
+Infinity + -1.0 = Infinity, with float static operands
+Infinity - -1.0 = Infinity, with float static operands
+Infinity * -1.0 = -Infinity, with float static operands
+Infinity / -1.0 = -Infinity, with float static operands
+Infinity + -1.0 = Infinity, with float field operands
+Infinity - -1.0 = Infinity, with float field operands
+Infinity * -1.0 = -Infinity, with float field operands
+Infinity / -1.0 = -Infinity, with float field operands
+Infinity + -1.0 = Infinity, with float a[i] operands
+Infinity - -1.0 = Infinity, with float a[i] operands
+Infinity * -1.0 = -Infinity, with float a[i] operands
+Infinity / -1.0 = -Infinity, with float a[i] operands
+Infinity + -1.0 = Infinity, with float f(x) operands
+Infinity - -1.0 = Infinity, with float f(x) operands
+Infinity * -1.0 = -Infinity, with float f(x) operands
+Infinity / -1.0 = -Infinity, with float f(x) operands
+Infinity + -1.0 = Infinity, with float lExpr operands
+Infinity - -1.0 = Infinity, with float lExpr operands
+Infinity * -1.0 = -Infinity, with float lExpr operands
+Infinity / -1.0 = -Infinity, with float lExpr operands
+Infinity + -1.0 = Infinity, with float rExpr operands
+Infinity - -1.0 = Infinity, with float rExpr operands
+Infinity * -1.0 = -Infinity, with float rExpr operands
+Infinity / -1.0 = -Infinity, with float rExpr operands
+Infinity + -1.0 = Infinity, with float exprs operands
+Infinity - -1.0 = Infinity, with float exprs operands
+Infinity * -1.0 = -Infinity, with float exprs operands
+Infinity / -1.0 = -Infinity, with float exprs operands
+Infinity + 1.0 = Infinity, with float param operands
+Infinity - 1.0 = Infinity, with float param operands
+Infinity * 1.0 = Infinity, with float param operands
+Infinity / 1.0 = Infinity, with float param operands
+Infinity + 1.0 = Infinity, with float local operands
+Infinity - 1.0 = Infinity, with float local operands
+Infinity * 1.0 = Infinity, with float local operands
+Infinity / 1.0 = Infinity, with float local operands
+Infinity + 1.0 = Infinity, with float static operands
+Infinity - 1.0 = Infinity, with float static operands
+Infinity * 1.0 = Infinity, with float static operands
+Infinity / 1.0 = Infinity, with float static operands
+Infinity + 1.0 = Infinity, with float field operands
+Infinity - 1.0 = Infinity, with float field operands
+Infinity * 1.0 = Infinity, with float field operands
+Infinity / 1.0 = Infinity, with float field operands
+Infinity + 1.0 = Infinity, with float a[i] operands
+Infinity - 1.0 = Infinity, with float a[i] operands
+Infinity * 1.0 = Infinity, with float a[i] operands
+Infinity / 1.0 = Infinity, with float a[i] operands
+Infinity + 1.0 = Infinity, with float f(x) operands
+Infinity - 1.0 = Infinity, with float f(x) operands
+Infinity * 1.0 = Infinity, with float f(x) operands
+Infinity / 1.0 = Infinity, with float f(x) operands
+Infinity + 1.0 = Infinity, with float lExpr operands
+Infinity - 1.0 = Infinity, with float lExpr operands
+Infinity * 1.0 = Infinity, with float lExpr operands
+Infinity / 1.0 = Infinity, with float lExpr operands
+Infinity + 1.0 = Infinity, with float rExpr operands
+Infinity - 1.0 = Infinity, with float rExpr operands
+Infinity * 1.0 = Infinity, with float rExpr operands
+Infinity / 1.0 = Infinity, with float rExpr operands
+Infinity + 1.0 = Infinity, with float exprs operands
+Infinity - 1.0 = Infinity, with float exprs operands
+Infinity * 1.0 = Infinity, with float exprs operands
+Infinity / 1.0 = Infinity, with float exprs operands
+Infinity + -0.0 = Infinity, with float param operands
+Infinity - -0.0 = Infinity, with float param operands
+Infinity * -0.0 = NaN, with float param operands
+Infinity / -0.0 = -Infinity, with float param operands
+Infinity + -0.0 = Infinity, with float local operands
+Infinity - -0.0 = Infinity, with float local operands
+Infinity * -0.0 = NaN, with float local operands
+Infinity / -0.0 = -Infinity, with float local operands
+Infinity + -0.0 = Infinity, with float static operands
+Infinity - -0.0 = Infinity, with float static operands
+Infinity * -0.0 = NaN, with float static operands
+Infinity / -0.0 = -Infinity, with float static operands
+Infinity + -0.0 = Infinity, with float field operands
+Infinity - -0.0 = Infinity, with float field operands
+Infinity * -0.0 = NaN, with float field operands
+Infinity / -0.0 = -Infinity, with float field operands
+Infinity + -0.0 = Infinity, with float a[i] operands
+Infinity - -0.0 = Infinity, with float a[i] operands
+Infinity * -0.0 = NaN, with float a[i] operands
+Infinity / -0.0 = -Infinity, with float a[i] operands
+Infinity + -0.0 = Infinity, with float f(x) operands
+Infinity - -0.0 = Infinity, with float f(x) operands
+Infinity * -0.0 = NaN, with float f(x) operands
+Infinity / -0.0 = -Infinity, with float f(x) operands
+Infinity + -0.0 = Infinity, with float lExpr operands
+Infinity - -0.0 = Infinity, with float lExpr operands
+Infinity * -0.0 = NaN, with float lExpr operands
+Infinity / -0.0 = -Infinity, with float lExpr operands
+Infinity + 0.0 = Infinity, with float rExpr operands
+Infinity - 0.0 = Infinity, with float rExpr operands
+Infinity * 0.0 = NaN, with float rExpr operands
+Infinity / 0.0 = Infinity, with float rExpr operands
+Infinity + 0.0 = Infinity, with float exprs operands
+Infinity - 0.0 = Infinity, with float exprs operands
+Infinity * 0.0 = NaN, with float exprs operands
+Infinity / 0.0 = Infinity, with float exprs operands
+Infinity + 0.0 = Infinity, with float param operands
+Infinity - 0.0 = Infinity, with float param operands
+Infinity * 0.0 = NaN, with float param operands
+Infinity / 0.0 = Infinity, with float param operands
+Infinity + 0.0 = Infinity, with float local operands
+Infinity - 0.0 = Infinity, with float local operands
+Infinity * 0.0 = NaN, with float local operands
+Infinity / 0.0 = Infinity, with float local operands
+Infinity + 0.0 = Infinity, with float static operands
+Infinity - 0.0 = Infinity, with float static operands
+Infinity * 0.0 = NaN, with float static operands
+Infinity / 0.0 = Infinity, with float static operands
+Infinity + 0.0 = Infinity, with float field operands
+Infinity - 0.0 = Infinity, with float field operands
+Infinity * 0.0 = NaN, with float field operands
+Infinity / 0.0 = Infinity, with float field operands
+Infinity + 0.0 = Infinity, with float a[i] operands
+Infinity - 0.0 = Infinity, with float a[i] operands
+Infinity * 0.0 = NaN, with float a[i] operands
+Infinity / 0.0 = Infinity, with float a[i] operands
+Infinity + 0.0 = Infinity, with float f(x) operands
+Infinity - 0.0 = Infinity, with float f(x) operands
+Infinity * 0.0 = NaN, with float f(x) operands
+Infinity / 0.0 = Infinity, with float f(x) operands
+Infinity + 0.0 = Infinity, with float lExpr operands
+Infinity - 0.0 = Infinity, with float lExpr operands
+Infinity * 0.0 = NaN, with float lExpr operands
+Infinity / 0.0 = Infinity, with float lExpr operands
+Infinity + 0.0 = Infinity, with float rExpr operands
+Infinity - 0.0 = Infinity, with float rExpr operands
+Infinity * 0.0 = NaN, with float rExpr operands
+Infinity / 0.0 = Infinity, with float rExpr operands
+Infinity + 0.0 = Infinity, with float exprs operands
+Infinity - 0.0 = Infinity, with float exprs operands
+Infinity * 0.0 = NaN, with float exprs operands
+Infinity / 0.0 = Infinity, with float exprs operands
+Infinity + -Infinity = NaN, with float param operands
+Infinity - -Infinity = Infinity, with float param operands
+Infinity * -Infinity = -Infinity, with float param operands
+Infinity / -Infinity = NaN, with float param operands
+Infinity + -Infinity = NaN, with float local operands
+Infinity - -Infinity = Infinity, with float local operands
+Infinity * -Infinity = -Infinity, with float local operands
+Infinity / -Infinity = NaN, with float local operands
+Infinity + -Infinity = NaN, with float static operands
+Infinity - -Infinity = Infinity, with float static operands
+Infinity * -Infinity = -Infinity, with float static operands
+Infinity / -Infinity = NaN, with float static operands
+Infinity + -Infinity = NaN, with float field operands
+Infinity - -Infinity = Infinity, with float field operands
+Infinity * -Infinity = -Infinity, with float field operands
+Infinity / -Infinity = NaN, with float field operands
+Infinity + -Infinity = NaN, with float a[i] operands
+Infinity - -Infinity = Infinity, with float a[i] operands
+Infinity * -Infinity = -Infinity, with float a[i] operands
+Infinity / -Infinity = NaN, with float a[i] operands
+Infinity + -Infinity = NaN, with float f(x) operands
+Infinity - -Infinity = Infinity, with float f(x) operands
+Infinity * -Infinity = -Infinity, with float f(x) operands
+Infinity / -Infinity = NaN, with float f(x) operands
+Infinity + -Infinity = NaN, with float lExpr operands
+Infinity - -Infinity = Infinity, with float lExpr operands
+Infinity * -Infinity = -Infinity, with float lExpr operands
+Infinity / -Infinity = NaN, with float lExpr operands
+Infinity + -Infinity = NaN, with float rExpr operands
+Infinity - -Infinity = Infinity, with float rExpr operands
+Infinity * -Infinity = -Infinity, with float rExpr operands
+Infinity / -Infinity = NaN, with float rExpr operands
+Infinity + -Infinity = NaN, with float exprs operands
+Infinity - -Infinity = Infinity, with float exprs operands
+Infinity * -Infinity = -Infinity, with float exprs operands
+Infinity / -Infinity = NaN, with float exprs operands
+Infinity + Infinity = Infinity, with float param operands
+Infinity - Infinity = NaN, with float param operands
+Infinity * Infinity = Infinity, with float param operands
+Infinity / Infinity = NaN, with float param operands
+Infinity + Infinity = Infinity, with float local operands
+Infinity - Infinity = NaN, with float local operands
+Infinity * Infinity = Infinity, with float local operands
+Infinity / Infinity = NaN, with float local operands
+Infinity + Infinity = Infinity, with float static operands
+Infinity - Infinity = NaN, with float static operands
+Infinity * Infinity = Infinity, with float static operands
+Infinity / Infinity = NaN, with float static operands
+Infinity + Infinity = Infinity, with float field operands
+Infinity - Infinity = NaN, with float field operands
+Infinity * Infinity = Infinity, with float field operands
+Infinity / Infinity = NaN, with float field operands
+Infinity + Infinity = Infinity, with float a[i] operands
+Infinity - Infinity = NaN, with float a[i] operands
+Infinity * Infinity = Infinity, with float a[i] operands
+Infinity / Infinity = NaN, with float a[i] operands
+Infinity + Infinity = Infinity, with float f(x) operands
+Infinity - Infinity = NaN, with float f(x) operands
+Infinity * Infinity = Infinity, with float f(x) operands
+Infinity / Infinity = NaN, with float f(x) operands
+Infinity + Infinity = Infinity, with float lExpr operands
+Infinity - Infinity = NaN, with float lExpr operands
+Infinity * Infinity = Infinity, with float lExpr operands
+Infinity / Infinity = NaN, with float lExpr operands
+Infinity + Infinity = Infinity, with float rExpr operands
+Infinity - Infinity = NaN, with float rExpr operands
+Infinity * Infinity = Infinity, with float rExpr operands
+Infinity / Infinity = NaN, with float rExpr operands
+Infinity + Infinity = Infinity, with float exprs operands
+Infinity - Infinity = NaN, with float exprs operands
+Infinity * Infinity = Infinity, with float exprs operands
+Infinity / Infinity = NaN, with float exprs operands
+Infinity + NaN = NaN, with float param operands
+Infinity - NaN = NaN, with float param operands
+Infinity * NaN = NaN, with float param operands
+Infinity / NaN = NaN, with float param operands
+Infinity + NaN = NaN, with float local operands
+Infinity - NaN = NaN, with float local operands
+Infinity * NaN = NaN, with float local operands
+Infinity / NaN = NaN, with float local operands
+Infinity + NaN = NaN, with float static operands
+Infinity - NaN = NaN, with float static operands
+Infinity * NaN = NaN, with float static operands
+Infinity / NaN = NaN, with float static operands
+Infinity + NaN = NaN, with float field operands
+Infinity - NaN = NaN, with float field operands
+Infinity * NaN = NaN, with float field operands
+Infinity / NaN = NaN, with float field operands
+Infinity + NaN = NaN, with float a[i] operands
+Infinity - NaN = NaN, with float a[i] operands
+Infinity * NaN = NaN, with float a[i] operands
+Infinity / NaN = NaN, with float a[i] operands
+Infinity + NaN = NaN, with float f(x) operands
+Infinity - NaN = NaN, with float f(x) operands
+Infinity * NaN = NaN, with float f(x) operands
+Infinity / NaN = NaN, with float f(x) operands
+Infinity + NaN = NaN, with float lExpr operands
+Infinity - NaN = NaN, with float lExpr operands
+Infinity * NaN = NaN, with float lExpr operands
+Infinity / NaN = NaN, with float lExpr operands
+Infinity + NaN = NaN, with float rExpr operands
+Infinity - NaN = NaN, with float rExpr operands
+Infinity * NaN = NaN, with float rExpr operands
+Infinity / NaN = NaN, with float rExpr operands
+Infinity + NaN = NaN, with float exprs operands
+Infinity - NaN = NaN, with float exprs operands
+Infinity * NaN = NaN, with float exprs operands
+Infinity / NaN = NaN, with float exprs operands
+NaN + 1.4E-45 = NaN, with float param operands
+NaN - 1.4E-45 = NaN, with float param operands
+NaN * 1.4E-45 = NaN, with float param operands
+NaN / 1.4E-45 = NaN, with float param operands
+NaN + 1.4E-45 = NaN, with float local operands
+NaN - 1.4E-45 = NaN, with float local operands
+NaN * 1.4E-45 = NaN, with float local operands
+NaN / 1.4E-45 = NaN, with float local operands
+NaN + 1.4E-45 = NaN, with float static operands
+NaN - 1.4E-45 = NaN, with float static operands
+NaN * 1.4E-45 = NaN, with float static operands
+NaN / 1.4E-45 = NaN, with float static operands
+NaN + 1.4E-45 = NaN, with float field operands
+NaN - 1.4E-45 = NaN, with float field operands
+NaN * 1.4E-45 = NaN, with float field operands
+NaN / 1.4E-45 = NaN, with float field operands
+NaN + 1.4E-45 = NaN, with float a[i] operands
+NaN - 1.4E-45 = NaN, with float a[i] operands
+NaN * 1.4E-45 = NaN, with float a[i] operands
+NaN / 1.4E-45 = NaN, with float a[i] operands
+NaN + 1.4E-45 = NaN, with float f(x) operands
+NaN - 1.4E-45 = NaN, with float f(x) operands
+NaN * 1.4E-45 = NaN, with float f(x) operands
+NaN / 1.4E-45 = NaN, with float f(x) operands
+NaN + 1.4E-45 = NaN, with float lExpr operands
+NaN - 1.4E-45 = NaN, with float lExpr operands
+NaN * 1.4E-45 = NaN, with float lExpr operands
+NaN / 1.4E-45 = NaN, with float lExpr operands
+NaN + 1.4E-45 = NaN, with float rExpr operands
+NaN - 1.4E-45 = NaN, with float rExpr operands
+NaN * 1.4E-45 = NaN, with float rExpr operands
+NaN / 1.4E-45 = NaN, with float rExpr operands
+NaN + 1.4E-45 = NaN, with float exprs operands
+NaN - 1.4E-45 = NaN, with float exprs operands
+NaN * 1.4E-45 = NaN, with float exprs operands
+NaN / 1.4E-45 = NaN, with float exprs operands
+NaN + 3.4028235E38 = NaN, with float param operands
+NaN - 3.4028235E38 = NaN, with float param operands
+NaN * 3.4028235E38 = NaN, with float param operands
+NaN / 3.4028235E38 = NaN, with float param operands
+NaN + 3.4028235E38 = NaN, with float local operands
+NaN - 3.4028235E38 = NaN, with float local operands
+NaN * 3.4028235E38 = NaN, with float local operands
+NaN / 3.4028235E38 = NaN, with float local operands
+NaN + 3.4028235E38 = NaN, with float static operands
+NaN - 3.4028235E38 = NaN, with float static operands
+NaN * 3.4028235E38 = NaN, with float static operands
+NaN / 3.4028235E38 = NaN, with float static operands
+NaN + 3.4028235E38 = NaN, with float field operands
+NaN - 3.4028235E38 = NaN, with float field operands
+NaN * 3.4028235E38 = NaN, with float field operands
+NaN / 3.4028235E38 = NaN, with float field operands
+NaN + 3.4028235E38 = NaN, with float a[i] operands
+NaN - 3.4028235E38 = NaN, with float a[i] operands
+NaN * 3.4028235E38 = NaN, with float a[i] operands
+NaN / 3.4028235E38 = NaN, with float a[i] operands
+NaN + 3.4028235E38 = NaN, with float f(x) operands
+NaN - 3.4028235E38 = NaN, with float f(x) operands
+NaN * 3.4028235E38 = NaN, with float f(x) operands
+NaN / 3.4028235E38 = NaN, with float f(x) operands
+NaN + 3.4028235E38 = NaN, with float lExpr operands
+NaN - 3.4028235E38 = NaN, with float lExpr operands
+NaN * 3.4028235E38 = NaN, with float lExpr operands
+NaN / 3.4028235E38 = NaN, with float lExpr operands
+NaN + 3.4028235E38 = NaN, with float rExpr operands
+NaN - 3.4028235E38 = NaN, with float rExpr operands
+NaN * 3.4028235E38 = NaN, with float rExpr operands
+NaN / 3.4028235E38 = NaN, with float rExpr operands
+NaN + 3.4028235E38 = NaN, with float exprs operands
+NaN - 3.4028235E38 = NaN, with float exprs operands
+NaN * 3.4028235E38 = NaN, with float exprs operands
+NaN / 3.4028235E38 = NaN, with float exprs operands
+NaN + -1.4E-45 = NaN, with float param operands
+NaN - -1.4E-45 = NaN, with float param operands
+NaN * -1.4E-45 = NaN, with float param operands
+NaN / -1.4E-45 = NaN, with float param operands
+NaN + -1.4E-45 = NaN, with float local operands
+NaN - -1.4E-45 = NaN, with float local operands
+NaN * -1.4E-45 = NaN, with float local operands
+NaN / -1.4E-45 = NaN, with float local operands
+NaN + -1.4E-45 = NaN, with float static operands
+NaN - -1.4E-45 = NaN, with float static operands
+NaN * -1.4E-45 = NaN, with float static operands
+NaN / -1.4E-45 = NaN, with float static operands
+NaN + -1.4E-45 = NaN, with float field operands
+NaN - -1.4E-45 = NaN, with float field operands
+NaN * -1.4E-45 = NaN, with float field operands
+NaN / -1.4E-45 = NaN, with float field operands
+NaN + -1.4E-45 = NaN, with float a[i] operands
+NaN - -1.4E-45 = NaN, with float a[i] operands
+NaN * -1.4E-45 = NaN, with float a[i] operands
+NaN / -1.4E-45 = NaN, with float a[i] operands
+NaN + -1.4E-45 = NaN, with float f(x) operands
+NaN - -1.4E-45 = NaN, with float f(x) operands
+NaN * -1.4E-45 = NaN, with float f(x) operands
+NaN / -1.4E-45 = NaN, with float f(x) operands
+NaN + -1.4E-45 = NaN, with float lExpr operands
+NaN - -1.4E-45 = NaN, with float lExpr operands
+NaN * -1.4E-45 = NaN, with float lExpr operands
+NaN / -1.4E-45 = NaN, with float lExpr operands
+NaN + -1.4E-45 = NaN, with float rExpr operands
+NaN - -1.4E-45 = NaN, with float rExpr operands
+NaN * -1.4E-45 = NaN, with float rExpr operands
+NaN / -1.4E-45 = NaN, with float rExpr operands
+NaN + -1.4E-45 = NaN, with float exprs operands
+NaN - -1.4E-45 = NaN, with float exprs operands
+NaN * -1.4E-45 = NaN, with float exprs operands
+NaN / -1.4E-45 = NaN, with float exprs operands
+NaN + -3.4028235E38 = NaN, with float param operands
+NaN - -3.4028235E38 = NaN, with float param operands
+NaN * -3.4028235E38 = NaN, with float param operands
+NaN / -3.4028235E38 = NaN, with float param operands
+NaN + -3.4028235E38 = NaN, with float local operands
+NaN - -3.4028235E38 = NaN, with float local operands
+NaN * -3.4028235E38 = NaN, with float local operands
+NaN / -3.4028235E38 = NaN, with float local operands
+NaN + -3.4028235E38 = NaN, with float static operands
+NaN - -3.4028235E38 = NaN, with float static operands
+NaN * -3.4028235E38 = NaN, with float static operands
+NaN / -3.4028235E38 = NaN, with float static operands
+NaN + -3.4028235E38 = NaN, with float field operands
+NaN - -3.4028235E38 = NaN, with float field operands
+NaN * -3.4028235E38 = NaN, with float field operands
+NaN / -3.4028235E38 = NaN, with float field operands
+NaN + -3.4028235E38 = NaN, with float a[i] operands
+NaN - -3.4028235E38 = NaN, with float a[i] operands
+NaN * -3.4028235E38 = NaN, with float a[i] operands
+NaN / -3.4028235E38 = NaN, with float a[i] operands
+NaN + -3.4028235E38 = NaN, with float f(x) operands
+NaN - -3.4028235E38 = NaN, with float f(x) operands
+NaN * -3.4028235E38 = NaN, with float f(x) operands
+NaN / -3.4028235E38 = NaN, with float f(x) operands
+NaN + -3.4028235E38 = NaN, with float lExpr operands
+NaN - -3.4028235E38 = NaN, with float lExpr operands
+NaN * -3.4028235E38 = NaN, with float lExpr operands
+NaN / -3.4028235E38 = NaN, with float lExpr operands
+NaN + -3.4028235E38 = NaN, with float rExpr operands
+NaN - -3.4028235E38 = NaN, with float rExpr operands
+NaN * -3.4028235E38 = NaN, with float rExpr operands
+NaN / -3.4028235E38 = NaN, with float rExpr operands
+NaN + -3.4028235E38 = NaN, with float exprs operands
+NaN - -3.4028235E38 = NaN, with float exprs operands
+NaN * -3.4028235E38 = NaN, with float exprs operands
+NaN / -3.4028235E38 = NaN, with float exprs operands
+NaN + -1.0 = NaN, with float param operands
+NaN - -1.0 = NaN, with float param operands
+NaN * -1.0 = NaN, with float param operands
+NaN / -1.0 = NaN, with float param operands
+NaN + -1.0 = NaN, with float local operands
+NaN - -1.0 = NaN, with float local operands
+NaN * -1.0 = NaN, with float local operands
+NaN / -1.0 = NaN, with float local operands
+NaN + -1.0 = NaN, with float static operands
+NaN - -1.0 = NaN, with float static operands
+NaN * -1.0 = NaN, with float static operands
+NaN / -1.0 = NaN, with float static operands
+NaN + -1.0 = NaN, with float field operands
+NaN - -1.0 = NaN, with float field operands
+NaN * -1.0 = NaN, with float field operands
+NaN / -1.0 = NaN, with float field operands
+NaN + -1.0 = NaN, with float a[i] operands
+NaN - -1.0 = NaN, with float a[i] operands
+NaN * -1.0 = NaN, with float a[i] operands
+NaN / -1.0 = NaN, with float a[i] operands
+NaN + -1.0 = NaN, with float f(x) operands
+NaN - -1.0 = NaN, with float f(x) operands
+NaN * -1.0 = NaN, with float f(x) operands
+NaN / -1.0 = NaN, with float f(x) operands
+NaN + -1.0 = NaN, with float lExpr operands
+NaN - -1.0 = NaN, with float lExpr operands
+NaN * -1.0 = NaN, with float lExpr operands
+NaN / -1.0 = NaN, with float lExpr operands
+NaN + -1.0 = NaN, with float rExpr operands
+NaN - -1.0 = NaN, with float rExpr operands
+NaN * -1.0 = NaN, with float rExpr operands
+NaN / -1.0 = NaN, with float rExpr operands
+NaN + -1.0 = NaN, with float exprs operands
+NaN - -1.0 = NaN, with float exprs operands
+NaN * -1.0 = NaN, with float exprs operands
+NaN / -1.0 = NaN, with float exprs operands
+NaN + 1.0 = NaN, with float param operands
+NaN - 1.0 = NaN, with float param operands
+NaN * 1.0 = NaN, with float param operands
+NaN / 1.0 = NaN, with float param operands
+NaN + 1.0 = NaN, with float local operands
+NaN - 1.0 = NaN, with float local operands
+NaN * 1.0 = NaN, with float local operands
+NaN / 1.0 = NaN, with float local operands
+NaN + 1.0 = NaN, with float static operands
+NaN - 1.0 = NaN, with float static operands
+NaN * 1.0 = NaN, with float static operands
+NaN / 1.0 = NaN, with float static operands
+NaN + 1.0 = NaN, with float field operands
+NaN - 1.0 = NaN, with float field operands
+NaN * 1.0 = NaN, with float field operands
+NaN / 1.0 = NaN, with float field operands
+NaN + 1.0 = NaN, with float a[i] operands
+NaN - 1.0 = NaN, with float a[i] operands
+NaN * 1.0 = NaN, with float a[i] operands
+NaN / 1.0 = NaN, with float a[i] operands
+NaN + 1.0 = NaN, with float f(x) operands
+NaN - 1.0 = NaN, with float f(x) operands
+NaN * 1.0 = NaN, with float f(x) operands
+NaN / 1.0 = NaN, with float f(x) operands
+NaN + 1.0 = NaN, with float lExpr operands
+NaN - 1.0 = NaN, with float lExpr operands
+NaN * 1.0 = NaN, with float lExpr operands
+NaN / 1.0 = NaN, with float lExpr operands
+NaN + 1.0 = NaN, with float rExpr operands
+NaN - 1.0 = NaN, with float rExpr operands
+NaN * 1.0 = NaN, with float rExpr operands
+NaN / 1.0 = NaN, with float rExpr operands
+NaN + 1.0 = NaN, with float exprs operands
+NaN - 1.0 = NaN, with float exprs operands
+NaN * 1.0 = NaN, with float exprs operands
+NaN / 1.0 = NaN, with float exprs operands
+NaN + -0.0 = NaN, with float param operands
+NaN - -0.0 = NaN, with float param operands
+NaN * -0.0 = NaN, with float param operands
+NaN / -0.0 = NaN, with float param operands
+NaN + -0.0 = NaN, with float local operands
+NaN - -0.0 = NaN, with float local operands
+NaN * -0.0 = NaN, with float local operands
+NaN / -0.0 = NaN, with float local operands
+NaN + -0.0 = NaN, with float static operands
+NaN - -0.0 = NaN, with float static operands
+NaN * -0.0 = NaN, with float static operands
+NaN / -0.0 = NaN, with float static operands
+NaN + -0.0 = NaN, with float field operands
+NaN - -0.0 = NaN, with float field operands
+NaN * -0.0 = NaN, with float field operands
+NaN / -0.0 = NaN, with float field operands
+NaN + -0.0 = NaN, with float a[i] operands
+NaN - -0.0 = NaN, with float a[i] operands
+NaN * -0.0 = NaN, with float a[i] operands
+NaN / -0.0 = NaN, with float a[i] operands
+NaN + -0.0 = NaN, with float f(x) operands
+NaN - -0.0 = NaN, with float f(x) operands
+NaN * -0.0 = NaN, with float f(x) operands
+NaN / -0.0 = NaN, with float f(x) operands
+NaN + -0.0 = NaN, with float lExpr operands
+NaN - -0.0 = NaN, with float lExpr operands
+NaN * -0.0 = NaN, with float lExpr operands
+NaN / -0.0 = NaN, with float lExpr operands
+NaN + 0.0 = NaN, with float rExpr operands
+NaN - 0.0 = NaN, with float rExpr operands
+NaN * 0.0 = NaN, with float rExpr operands
+NaN / 0.0 = NaN, with float rExpr operands
+NaN + 0.0 = NaN, with float exprs operands
+NaN - 0.0 = NaN, with float exprs operands
+NaN * 0.0 = NaN, with float exprs operands
+NaN / 0.0 = NaN, with float exprs operands
+NaN + 0.0 = NaN, with float param operands
+NaN - 0.0 = NaN, with float param operands
+NaN * 0.0 = NaN, with float param operands
+NaN / 0.0 = NaN, with float param operands
+NaN + 0.0 = NaN, with float local operands
+NaN - 0.0 = NaN, with float local operands
+NaN * 0.0 = NaN, with float local operands
+NaN / 0.0 = NaN, with float local operands
+NaN + 0.0 = NaN, with float static operands
+NaN - 0.0 = NaN, with float static operands
+NaN * 0.0 = NaN, with float static operands
+NaN / 0.0 = NaN, with float static operands
+NaN + 0.0 = NaN, with float field operands
+NaN - 0.0 = NaN, with float field operands
+NaN * 0.0 = NaN, with float field operands
+NaN / 0.0 = NaN, with float field operands
+NaN + 0.0 = NaN, with float a[i] operands
+NaN - 0.0 = NaN, with float a[i] operands
+NaN * 0.0 = NaN, with float a[i] operands
+NaN / 0.0 = NaN, with float a[i] operands
+NaN + 0.0 = NaN, with float f(x) operands
+NaN - 0.0 = NaN, with float f(x) operands
+NaN * 0.0 = NaN, with float f(x) operands
+NaN / 0.0 = NaN, with float f(x) operands
+NaN + 0.0 = NaN, with float lExpr operands
+NaN - 0.0 = NaN, with float lExpr operands
+NaN * 0.0 = NaN, with float lExpr operands
+NaN / 0.0 = NaN, with float lExpr operands
+NaN + 0.0 = NaN, with float rExpr operands
+NaN - 0.0 = NaN, with float rExpr operands
+NaN * 0.0 = NaN, with float rExpr operands
+NaN / 0.0 = NaN, with float rExpr operands
+NaN + 0.0 = NaN, with float exprs operands
+NaN - 0.0 = NaN, with float exprs operands
+NaN * 0.0 = NaN, with float exprs operands
+NaN / 0.0 = NaN, with float exprs operands
+NaN + -Infinity = NaN, with float param operands
+NaN - -Infinity = NaN, with float param operands
+NaN * -Infinity = NaN, with float param operands
+NaN / -Infinity = NaN, with float param operands
+NaN + -Infinity = NaN, with float local operands
+NaN - -Infinity = NaN, with float local operands
+NaN * -Infinity = NaN, with float local operands
+NaN / -Infinity = NaN, with float local operands
+NaN + -Infinity = NaN, with float static operands
+NaN - -Infinity = NaN, with float static operands
+NaN * -Infinity = NaN, with float static operands
+NaN / -Infinity = NaN, with float static operands
+NaN + -Infinity = NaN, with float field operands
+NaN - -Infinity = NaN, with float field operands
+NaN * -Infinity = NaN, with float field operands
+NaN / -Infinity = NaN, with float field operands
+NaN + -Infinity = NaN, with float a[i] operands
+NaN - -Infinity = NaN, with float a[i] operands
+NaN * -Infinity = NaN, with float a[i] operands
+NaN / -Infinity = NaN, with float a[i] operands
+NaN + -Infinity = NaN, with float f(x) operands
+NaN - -Infinity = NaN, with float f(x) operands
+NaN * -Infinity = NaN, with float f(x) operands
+NaN / -Infinity = NaN, with float f(x) operands
+NaN + -Infinity = NaN, with float lExpr operands
+NaN - -Infinity = NaN, with float lExpr operands
+NaN * -Infinity = NaN, with float lExpr operands
+NaN / -Infinity = NaN, with float lExpr operands
+NaN + -Infinity = NaN, with float rExpr operands
+NaN - -Infinity = NaN, with float rExpr operands
+NaN * -Infinity = NaN, with float rExpr operands
+NaN / -Infinity = NaN, with float rExpr operands
+NaN + -Infinity = NaN, with float exprs operands
+NaN - -Infinity = NaN, with float exprs operands
+NaN * -Infinity = NaN, with float exprs operands
+NaN / -Infinity = NaN, with float exprs operands
+NaN + Infinity = NaN, with float param operands
+NaN - Infinity = NaN, with float param operands
+NaN * Infinity = NaN, with float param operands
+NaN / Infinity = NaN, with float param operands
+NaN + Infinity = NaN, with float local operands
+NaN - Infinity = NaN, with float local operands
+NaN * Infinity = NaN, with float local operands
+NaN / Infinity = NaN, with float local operands
+NaN + Infinity = NaN, with float static operands
+NaN - Infinity = NaN, with float static operands
+NaN * Infinity = NaN, with float static operands
+NaN / Infinity = NaN, with float static operands
+NaN + Infinity = NaN, with float field operands
+NaN - Infinity = NaN, with float field operands
+NaN * Infinity = NaN, with float field operands
+NaN / Infinity = NaN, with float field operands
+NaN + Infinity = NaN, with float a[i] operands
+NaN - Infinity = NaN, with float a[i] operands
+NaN * Infinity = NaN, with float a[i] operands
+NaN / Infinity = NaN, with float a[i] operands
+NaN + Infinity = NaN, with float f(x) operands
+NaN - Infinity = NaN, with float f(x) operands
+NaN * Infinity = NaN, with float f(x) operands
+NaN / Infinity = NaN, with float f(x) operands
+NaN + Infinity = NaN, with float lExpr operands
+NaN - Infinity = NaN, with float lExpr operands
+NaN * Infinity = NaN, with float lExpr operands
+NaN / Infinity = NaN, with float lExpr operands
+NaN + Infinity = NaN, with float rExpr operands
+NaN - Infinity = NaN, with float rExpr operands
+NaN * Infinity = NaN, with float rExpr operands
+NaN / Infinity = NaN, with float rExpr operands
+NaN + Infinity = NaN, with float exprs operands
+NaN - Infinity = NaN, with float exprs operands
+NaN * Infinity = NaN, with float exprs operands
+NaN / Infinity = NaN, with float exprs operands
+NaN + NaN = NaN, with float param operands
+NaN - NaN = NaN, with float param operands
+NaN * NaN = NaN, with float param operands
+NaN / NaN = NaN, with float param operands
+NaN + NaN = NaN, with float local operands
+NaN - NaN = NaN, with float local operands
+NaN * NaN = NaN, with float local operands
+NaN / NaN = NaN, with float local operands
+NaN + NaN = NaN, with float static operands
+NaN - NaN = NaN, with float static operands
+NaN * NaN = NaN, with float static operands
+NaN / NaN = NaN, with float static operands
+NaN + NaN = NaN, with float field operands
+NaN - NaN = NaN, with float field operands
+NaN * NaN = NaN, with float field operands
+NaN / NaN = NaN, with float field operands
+NaN + NaN = NaN, with float a[i] operands
+NaN - NaN = NaN, with float a[i] operands
+NaN * NaN = NaN, with float a[i] operands
+NaN / NaN = NaN, with float a[i] operands
+NaN + NaN = NaN, with float f(x) operands
+NaN - NaN = NaN, with float f(x) operands
+NaN * NaN = NaN, with float f(x) operands
+NaN / NaN = NaN, with float f(x) operands
+NaN + NaN = NaN, with float lExpr operands
+NaN - NaN = NaN, with float lExpr operands
+NaN * NaN = NaN, with float lExpr operands
+NaN / NaN = NaN, with float lExpr operands
+NaN + NaN = NaN, with float rExpr operands
+NaN - NaN = NaN, with float rExpr operands
+NaN * NaN = NaN, with float rExpr operands
+NaN / NaN = NaN, with float rExpr operands
+NaN + NaN = NaN, with float exprs operands
+NaN - NaN = NaN, with float exprs operands
+NaN * NaN = NaN, with float exprs operands
+NaN / NaN = NaN, with float exprs operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double param operands
+4.9E-324 - 4.9E-324 = 0.0, with double param operands
+4.9E-324 * 4.9E-324 = 0.0, with double param operands
+4.9E-324 / 4.9E-324 = 1.0, with double param operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double local operands
+4.9E-324 - 4.9E-324 = 0.0, with double local operands
+4.9E-324 * 4.9E-324 = 0.0, with double local operands
+4.9E-324 / 4.9E-324 = 1.0, with double local operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double static operands
+4.9E-324 - 4.9E-324 = 0.0, with double static operands
+4.9E-324 * 4.9E-324 = 0.0, with double static operands
+4.9E-324 / 4.9E-324 = 1.0, with double static operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double field operands
+4.9E-324 - 4.9E-324 = 0.0, with double field operands
+4.9E-324 * 4.9E-324 = 0.0, with double field operands
+4.9E-324 / 4.9E-324 = 1.0, with double field operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double a[i] operands
+4.9E-324 - 4.9E-324 = 0.0, with double a[i] operands
+4.9E-324 * 4.9E-324 = 0.0, with double a[i] operands
+4.9E-324 / 4.9E-324 = 1.0, with double a[i] operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double f(x) operands
+4.9E-324 - 4.9E-324 = 0.0, with double f(x) operands
+4.9E-324 * 4.9E-324 = 0.0, with double f(x) operands
+4.9E-324 / 4.9E-324 = 1.0, with double f(x) operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double lExpr operands
+4.9E-324 - 4.9E-324 = 0.0, with double lExpr operands
+4.9E-324 * 4.9E-324 = 0.0, with double lExpr operands
+4.9E-324 / 4.9E-324 = 1.0, with double lExpr operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double rExpr operands
+4.9E-324 - 4.9E-324 = 0.0, with double rExpr operands
+4.9E-324 * 4.9E-324 = 0.0, with double rExpr operands
+4.9E-324 / 4.9E-324 = 1.0, with double rExpr operands
+4.9E-324 + 4.9E-324 = 1.0E-323, with double exprs operands
+4.9E-324 - 4.9E-324 = 0.0, with double exprs operands
+4.9E-324 * 4.9E-324 = 0.0, with double exprs operands
+4.9E-324 / 4.9E-324 = 1.0, with double exprs operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double param operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double param operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double local operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double local operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double static operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double static operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double field operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double field operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double a[i] operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double a[i] operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double f(x) operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double f(x) operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double lExpr operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double lExpr operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double rExpr operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double rExpr operands
+4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+4.9E-324 * 1.7976931348623157E308 = 8.881784197001251E-16, with double exprs operands
+4.9E-324 / 1.7976931348623157E308 = 0.0, with double exprs operands
+4.9E-324 + -4.9E-324 = 0.0, with double param operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double param operands
+4.9E-324 * -4.9E-324 = -0.0, with double param operands
+4.9E-324 / -4.9E-324 = -1.0, with double param operands
+4.9E-324 + -4.9E-324 = 0.0, with double local operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double local operands
+4.9E-324 * -4.9E-324 = -0.0, with double local operands
+4.9E-324 / -4.9E-324 = -1.0, with double local operands
+4.9E-324 + -4.9E-324 = 0.0, with double static operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double static operands
+4.9E-324 * -4.9E-324 = -0.0, with double static operands
+4.9E-324 / -4.9E-324 = -1.0, with double static operands
+4.9E-324 + -4.9E-324 = 0.0, with double field operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double field operands
+4.9E-324 * -4.9E-324 = -0.0, with double field operands
+4.9E-324 / -4.9E-324 = -1.0, with double field operands
+4.9E-324 + -4.9E-324 = 0.0, with double a[i] operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double a[i] operands
+4.9E-324 * -4.9E-324 = -0.0, with double a[i] operands
+4.9E-324 / -4.9E-324 = -1.0, with double a[i] operands
+4.9E-324 + -4.9E-324 = 0.0, with double f(x) operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double f(x) operands
+4.9E-324 * -4.9E-324 = -0.0, with double f(x) operands
+4.9E-324 / -4.9E-324 = -1.0, with double f(x) operands
+4.9E-324 + -4.9E-324 = 0.0, with double lExpr operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double lExpr operands
+4.9E-324 * -4.9E-324 = -0.0, with double lExpr operands
+4.9E-324 / -4.9E-324 = -1.0, with double lExpr operands
+4.9E-324 + -4.9E-324 = 0.0, with double rExpr operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double rExpr operands
+4.9E-324 * -4.9E-324 = -0.0, with double rExpr operands
+4.9E-324 / -4.9E-324 = -1.0, with double rExpr operands
+4.9E-324 + -4.9E-324 = 0.0, with double exprs operands
+4.9E-324 - -4.9E-324 = 1.0E-323, with double exprs operands
+4.9E-324 * -4.9E-324 = -0.0, with double exprs operands
+4.9E-324 / -4.9E-324 = -1.0, with double exprs operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double param operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double param operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double local operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double local operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double static operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double static operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double field operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double field operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double a[i] operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double a[i] operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double f(x) operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double f(x) operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double lExpr operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double lExpr operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double rExpr operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double rExpr operands
+4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+4.9E-324 * -1.7976931348623157E308 = -8.881784197001251E-16, with double exprs operands
+4.9E-324 / -1.7976931348623157E308 = -0.0, with double exprs operands
+4.9E-324 + -1.0 = -1.0, with double param operands
+4.9E-324 - -1.0 = 1.0, with double param operands
+4.9E-324 * -1.0 = -4.9E-324, with double param operands
+4.9E-324 / -1.0 = -4.9E-324, with double param operands
+4.9E-324 + -1.0 = -1.0, with double local operands
+4.9E-324 - -1.0 = 1.0, with double local operands
+4.9E-324 * -1.0 = -4.9E-324, with double local operands
+4.9E-324 / -1.0 = -4.9E-324, with double local operands
+4.9E-324 + -1.0 = -1.0, with double static operands
+4.9E-324 - -1.0 = 1.0, with double static operands
+4.9E-324 * -1.0 = -4.9E-324, with double static operands
+4.9E-324 / -1.0 = -4.9E-324, with double static operands
+4.9E-324 + -1.0 = -1.0, with double field operands
+4.9E-324 - -1.0 = 1.0, with double field operands
+4.9E-324 * -1.0 = -4.9E-324, with double field operands
+4.9E-324 / -1.0 = -4.9E-324, with double field operands
+4.9E-324 + -1.0 = -1.0, with double a[i] operands
+4.9E-324 - -1.0 = 1.0, with double a[i] operands
+4.9E-324 * -1.0 = -4.9E-324, with double a[i] operands
+4.9E-324 / -1.0 = -4.9E-324, with double a[i] operands
+4.9E-324 + -1.0 = -1.0, with double f(x) operands
+4.9E-324 - -1.0 = 1.0, with double f(x) operands
+4.9E-324 * -1.0 = -4.9E-324, with double f(x) operands
+4.9E-324 / -1.0 = -4.9E-324, with double f(x) operands
+4.9E-324 + -1.0 = -1.0, with double lExpr operands
+4.9E-324 - -1.0 = 1.0, with double lExpr operands
+4.9E-324 * -1.0 = -4.9E-324, with double lExpr operands
+4.9E-324 / -1.0 = -4.9E-324, with double lExpr operands
+4.9E-324 + -1.0 = -1.0, with double rExpr operands
+4.9E-324 - -1.0 = 1.0, with double rExpr operands
+4.9E-324 * -1.0 = -4.9E-324, with double rExpr operands
+4.9E-324 / -1.0 = -4.9E-324, with double rExpr operands
+4.9E-324 + -1.0 = -1.0, with double exprs operands
+4.9E-324 - -1.0 = 1.0, with double exprs operands
+4.9E-324 * -1.0 = -4.9E-324, with double exprs operands
+4.9E-324 / -1.0 = -4.9E-324, with double exprs operands
+4.9E-324 + 1.0 = 1.0, with double param operands
+4.9E-324 - 1.0 = -1.0, with double param operands
+4.9E-324 * 1.0 = 4.9E-324, with double param operands
+4.9E-324 / 1.0 = 4.9E-324, with double param operands
+4.9E-324 + 1.0 = 1.0, with double local operands
+4.9E-324 - 1.0 = -1.0, with double local operands
+4.9E-324 * 1.0 = 4.9E-324, with double local operands
+4.9E-324 / 1.0 = 4.9E-324, with double local operands
+4.9E-324 + 1.0 = 1.0, with double static operands
+4.9E-324 - 1.0 = -1.0, with double static operands
+4.9E-324 * 1.0 = 4.9E-324, with double static operands
+4.9E-324 / 1.0 = 4.9E-324, with double static operands
+4.9E-324 + 1.0 = 1.0, with double field operands
+4.9E-324 - 1.0 = -1.0, with double field operands
+4.9E-324 * 1.0 = 4.9E-324, with double field operands
+4.9E-324 / 1.0 = 4.9E-324, with double field operands
+4.9E-324 + 1.0 = 1.0, with double a[i] operands
+4.9E-324 - 1.0 = -1.0, with double a[i] operands
+4.9E-324 * 1.0 = 4.9E-324, with double a[i] operands
+4.9E-324 / 1.0 = 4.9E-324, with double a[i] operands
+4.9E-324 + 1.0 = 1.0, with double f(x) operands
+4.9E-324 - 1.0 = -1.0, with double f(x) operands
+4.9E-324 * 1.0 = 4.9E-324, with double f(x) operands
+4.9E-324 / 1.0 = 4.9E-324, with double f(x) operands
+4.9E-324 + 1.0 = 1.0, with double lExpr operands
+4.9E-324 - 1.0 = -1.0, with double lExpr operands
+4.9E-324 * 1.0 = 4.9E-324, with double lExpr operands
+4.9E-324 / 1.0 = 4.9E-324, with double lExpr operands
+4.9E-324 + 1.0 = 1.0, with double rExpr operands
+4.9E-324 - 1.0 = -1.0, with double rExpr operands
+4.9E-324 * 1.0 = 4.9E-324, with double rExpr operands
+4.9E-324 / 1.0 = 4.9E-324, with double rExpr operands
+4.9E-324 + 1.0 = 1.0, with double exprs operands
+4.9E-324 - 1.0 = -1.0, with double exprs operands
+4.9E-324 * 1.0 = 4.9E-324, with double exprs operands
+4.9E-324 / 1.0 = 4.9E-324, with double exprs operands
+4.9E-324 + -0.0 = 4.9E-324, with double param operands
+4.9E-324 - -0.0 = 4.9E-324, with double param operands
+4.9E-324 * -0.0 = -0.0, with double param operands
+4.9E-324 / -0.0 = -Infinity, with double param operands
+4.9E-324 + -0.0 = 4.9E-324, with double local operands
+4.9E-324 - -0.0 = 4.9E-324, with double local operands
+4.9E-324 * -0.0 = -0.0, with double local operands
+4.9E-324 / -0.0 = -Infinity, with double local operands
+4.9E-324 + -0.0 = 4.9E-324, with double static operands
+4.9E-324 - -0.0 = 4.9E-324, with double static operands
+4.9E-324 * -0.0 = -0.0, with double static operands
+4.9E-324 / -0.0 = -Infinity, with double static operands
+4.9E-324 + -0.0 = 4.9E-324, with double field operands
+4.9E-324 - -0.0 = 4.9E-324, with double field operands
+4.9E-324 * -0.0 = -0.0, with double field operands
+4.9E-324 / -0.0 = -Infinity, with double field operands
+4.9E-324 + -0.0 = 4.9E-324, with double a[i] operands
+4.9E-324 - -0.0 = 4.9E-324, with double a[i] operands
+4.9E-324 * -0.0 = -0.0, with double a[i] operands
+4.9E-324 / -0.0 = -Infinity, with double a[i] operands
+4.9E-324 + -0.0 = 4.9E-324, with double f(x) operands
+4.9E-324 - -0.0 = 4.9E-324, with double f(x) operands
+4.9E-324 * -0.0 = -0.0, with double f(x) operands
+4.9E-324 / -0.0 = -Infinity, with double f(x) operands
+4.9E-324 + -0.0 = 4.9E-324, with double lExpr operands
+4.9E-324 - -0.0 = 4.9E-324, with double lExpr operands
+4.9E-324 * -0.0 = -0.0, with double lExpr operands
+4.9E-324 / -0.0 = -Infinity, with double lExpr operands
+4.9E-324 + 0.0 = 4.9E-324, with double rExpr operands
+4.9E-324 - 0.0 = 4.9E-324, with double rExpr operands
+4.9E-324 * 0.0 = 0.0, with double rExpr operands
+4.9E-324 / 0.0 = Infinity, with double rExpr operands
+4.9E-324 + 0.0 = 4.9E-324, with double exprs operands
+4.9E-324 - 0.0 = 4.9E-324, with double exprs operands
+4.9E-324 * 0.0 = 0.0, with double exprs operands
+4.9E-324 / 0.0 = Infinity, with double exprs operands
+4.9E-324 + 0.0 = 4.9E-324, with double param operands
+4.9E-324 - 0.0 = 4.9E-324, with double param operands
+4.9E-324 * 0.0 = 0.0, with double param operands
+4.9E-324 / 0.0 = Infinity, with double param operands
+4.9E-324 + 0.0 = 4.9E-324, with double local operands
+4.9E-324 - 0.0 = 4.9E-324, with double local operands
+4.9E-324 * 0.0 = 0.0, with double local operands
+4.9E-324 / 0.0 = Infinity, with double local operands
+4.9E-324 + 0.0 = 4.9E-324, with double static operands
+4.9E-324 - 0.0 = 4.9E-324, with double static operands
+4.9E-324 * 0.0 = 0.0, with double static operands
+4.9E-324 / 0.0 = Infinity, with double static operands
+4.9E-324 + 0.0 = 4.9E-324, with double field operands
+4.9E-324 - 0.0 = 4.9E-324, with double field operands
+4.9E-324 * 0.0 = 0.0, with double field operands
+4.9E-324 / 0.0 = Infinity, with double field operands
+4.9E-324 + 0.0 = 4.9E-324, with double a[i] operands
+4.9E-324 - 0.0 = 4.9E-324, with double a[i] operands
+4.9E-324 * 0.0 = 0.0, with double a[i] operands
+4.9E-324 / 0.0 = Infinity, with double a[i] operands
+4.9E-324 + 0.0 = 4.9E-324, with double f(x) operands
+4.9E-324 - 0.0 = 4.9E-324, with double f(x) operands
+4.9E-324 * 0.0 = 0.0, with double f(x) operands
+4.9E-324 / 0.0 = Infinity, with double f(x) operands
+4.9E-324 + 0.0 = 4.9E-324, with double lExpr operands
+4.9E-324 - 0.0 = 4.9E-324, with double lExpr operands
+4.9E-324 * 0.0 = 0.0, with double lExpr operands
+4.9E-324 / 0.0 = Infinity, with double lExpr operands
+4.9E-324 + 0.0 = 4.9E-324, with double rExpr operands
+4.9E-324 - 0.0 = 4.9E-324, with double rExpr operands
+4.9E-324 * 0.0 = 0.0, with double rExpr operands
+4.9E-324 / 0.0 = Infinity, with double rExpr operands
+4.9E-324 + 0.0 = 4.9E-324, with double exprs operands
+4.9E-324 - 0.0 = 4.9E-324, with double exprs operands
+4.9E-324 * 0.0 = 0.0, with double exprs operands
+4.9E-324 / 0.0 = Infinity, with double exprs operands
+4.9E-324 + -Infinity = -Infinity, with double param operands
+4.9E-324 - -Infinity = Infinity, with double param operands
+4.9E-324 * -Infinity = -Infinity, with double param operands
+4.9E-324 / -Infinity = -0.0, with double param operands
+4.9E-324 + -Infinity = -Infinity, with double local operands
+4.9E-324 - -Infinity = Infinity, with double local operands
+4.9E-324 * -Infinity = -Infinity, with double local operands
+4.9E-324 / -Infinity = -0.0, with double local operands
+4.9E-324 + -Infinity = -Infinity, with double static operands
+4.9E-324 - -Infinity = Infinity, with double static operands
+4.9E-324 * -Infinity = -Infinity, with double static operands
+4.9E-324 / -Infinity = -0.0, with double static operands
+4.9E-324 + -Infinity = -Infinity, with double field operands
+4.9E-324 - -Infinity = Infinity, with double field operands
+4.9E-324 * -Infinity = -Infinity, with double field operands
+4.9E-324 / -Infinity = -0.0, with double field operands
+4.9E-324 + -Infinity = -Infinity, with double a[i] operands
+4.9E-324 - -Infinity = Infinity, with double a[i] operands
+4.9E-324 * -Infinity = -Infinity, with double a[i] operands
+4.9E-324 / -Infinity = -0.0, with double a[i] operands
+4.9E-324 + -Infinity = -Infinity, with double f(x) operands
+4.9E-324 - -Infinity = Infinity, with double f(x) operands
+4.9E-324 * -Infinity = -Infinity, with double f(x) operands
+4.9E-324 / -Infinity = -0.0, with double f(x) operands
+4.9E-324 + -Infinity = -Infinity, with double lExpr operands
+4.9E-324 - -Infinity = Infinity, with double lExpr operands
+4.9E-324 * -Infinity = -Infinity, with double lExpr operands
+4.9E-324 / -Infinity = -0.0, with double lExpr operands
+4.9E-324 + -Infinity = -Infinity, with double rExpr operands
+4.9E-324 - -Infinity = Infinity, with double rExpr operands
+4.9E-324 * -Infinity = -Infinity, with double rExpr operands
+4.9E-324 / -Infinity = -0.0, with double rExpr operands
+4.9E-324 + -Infinity = -Infinity, with double exprs operands
+4.9E-324 - -Infinity = Infinity, with double exprs operands
+4.9E-324 * -Infinity = -Infinity, with double exprs operands
+4.9E-324 / -Infinity = -0.0, with double exprs operands
+4.9E-324 + Infinity = Infinity, with double param operands
+4.9E-324 - Infinity = -Infinity, with double param operands
+4.9E-324 * Infinity = Infinity, with double param operands
+4.9E-324 / Infinity = 0.0, with double param operands
+4.9E-324 + Infinity = Infinity, with double local operands
+4.9E-324 - Infinity = -Infinity, with double local operands
+4.9E-324 * Infinity = Infinity, with double local operands
+4.9E-324 / Infinity = 0.0, with double local operands
+4.9E-324 + Infinity = Infinity, with double static operands
+4.9E-324 - Infinity = -Infinity, with double static operands
+4.9E-324 * Infinity = Infinity, with double static operands
+4.9E-324 / Infinity = 0.0, with double static operands
+4.9E-324 + Infinity = Infinity, with double field operands
+4.9E-324 - Infinity = -Infinity, with double field operands
+4.9E-324 * Infinity = Infinity, with double field operands
+4.9E-324 / Infinity = 0.0, with double field operands
+4.9E-324 + Infinity = Infinity, with double a[i] operands
+4.9E-324 - Infinity = -Infinity, with double a[i] operands
+4.9E-324 * Infinity = Infinity, with double a[i] operands
+4.9E-324 / Infinity = 0.0, with double a[i] operands
+4.9E-324 + Infinity = Infinity, with double f(x) operands
+4.9E-324 - Infinity = -Infinity, with double f(x) operands
+4.9E-324 * Infinity = Infinity, with double f(x) operands
+4.9E-324 / Infinity = 0.0, with double f(x) operands
+4.9E-324 + Infinity = Infinity, with double lExpr operands
+4.9E-324 - Infinity = -Infinity, with double lExpr operands
+4.9E-324 * Infinity = Infinity, with double lExpr operands
+4.9E-324 / Infinity = 0.0, with double lExpr operands
+4.9E-324 + Infinity = Infinity, with double rExpr operands
+4.9E-324 - Infinity = -Infinity, with double rExpr operands
+4.9E-324 * Infinity = Infinity, with double rExpr operands
+4.9E-324 / Infinity = 0.0, with double rExpr operands
+4.9E-324 + Infinity = Infinity, with double exprs operands
+4.9E-324 - Infinity = -Infinity, with double exprs operands
+4.9E-324 * Infinity = Infinity, with double exprs operands
+4.9E-324 / Infinity = 0.0, with double exprs operands
+4.9E-324 + NaN = NaN, with double param operands
+4.9E-324 - NaN = NaN, with double param operands
+4.9E-324 * NaN = NaN, with double param operands
+4.9E-324 / NaN = NaN, with double param operands
+4.9E-324 + NaN = NaN, with double local operands
+4.9E-324 - NaN = NaN, with double local operands
+4.9E-324 * NaN = NaN, with double local operands
+4.9E-324 / NaN = NaN, with double local operands
+4.9E-324 + NaN = NaN, with double static operands
+4.9E-324 - NaN = NaN, with double static operands
+4.9E-324 * NaN = NaN, with double static operands
+4.9E-324 / NaN = NaN, with double static operands
+4.9E-324 + NaN = NaN, with double field operands
+4.9E-324 - NaN = NaN, with double field operands
+4.9E-324 * NaN = NaN, with double field operands
+4.9E-324 / NaN = NaN, with double field operands
+4.9E-324 + NaN = NaN, with double a[i] operands
+4.9E-324 - NaN = NaN, with double a[i] operands
+4.9E-324 * NaN = NaN, with double a[i] operands
+4.9E-324 / NaN = NaN, with double a[i] operands
+4.9E-324 + NaN = NaN, with double f(x) operands
+4.9E-324 - NaN = NaN, with double f(x) operands
+4.9E-324 * NaN = NaN, with double f(x) operands
+4.9E-324 / NaN = NaN, with double f(x) operands
+4.9E-324 + NaN = NaN, with double lExpr operands
+4.9E-324 - NaN = NaN, with double lExpr operands
+4.9E-324 * NaN = NaN, with double lExpr operands
+4.9E-324 / NaN = NaN, with double lExpr operands
+4.9E-324 + NaN = NaN, with double rExpr operands
+4.9E-324 - NaN = NaN, with double rExpr operands
+4.9E-324 * NaN = NaN, with double rExpr operands
+4.9E-324 / NaN = NaN, with double rExpr operands
+4.9E-324 + NaN = NaN, with double exprs operands
+4.9E-324 - NaN = NaN, with double exprs operands
+4.9E-324 * NaN = NaN, with double exprs operands
+4.9E-324 / NaN = NaN, with double exprs operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double param operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double param operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double local operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double local operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double static operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double static operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double field operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double field operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double a[i] operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double a[i] operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double f(x) operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double f(x) operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double lExpr operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double lExpr operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double rExpr operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double rExpr operands
+1.7976931348623157E308 + 4.9E-324 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 - 4.9E-324 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 * 4.9E-324 = 8.881784197001251E-16, with double exprs operands
+1.7976931348623157E308 / 4.9E-324 = Infinity, with double exprs operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double param operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double param operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double param operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double param operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double local operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double local operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double local operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double local operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double static operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double static operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double static operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double static operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double field operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double field operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double field operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double field operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double a[i] operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double a[i] operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double a[i] operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double a[i] operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double f(x) operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double f(x) operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double f(x) operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double f(x) operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double lExpr operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double lExpr operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double lExpr operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double lExpr operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double rExpr operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double rExpr operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double rExpr operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double rExpr operands
+1.7976931348623157E308 + 1.7976931348623157E308 = Infinity, with double exprs operands
+1.7976931348623157E308 - 1.7976931348623157E308 = 0.0, with double exprs operands
+1.7976931348623157E308 * 1.7976931348623157E308 = Infinity, with double exprs operands
+1.7976931348623157E308 / 1.7976931348623157E308 = 1.0, with double exprs operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double param operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double param operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double local operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double local operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double static operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double static operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double field operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double field operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double a[i] operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double a[i] operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double f(x) operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double f(x) operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double lExpr operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double lExpr operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double rExpr operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double rExpr operands
+1.7976931348623157E308 + -4.9E-324 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 - -4.9E-324 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 * -4.9E-324 = -8.881784197001251E-16, with double exprs operands
+1.7976931348623157E308 / -4.9E-324 = -Infinity, with double exprs operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double param operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double param operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double param operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double param operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double local operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double local operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double local operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double local operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double static operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double static operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double static operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double static operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double field operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double field operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double field operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double field operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double a[i] operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double a[i] operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double a[i] operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double a[i] operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double f(x) operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double f(x) operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double f(x) operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double f(x) operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double lExpr operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double lExpr operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double lExpr operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double lExpr operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double rExpr operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double rExpr operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double rExpr operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double rExpr operands
+1.7976931348623157E308 + -1.7976931348623157E308 = 0.0, with double exprs operands
+1.7976931348623157E308 - -1.7976931348623157E308 = Infinity, with double exprs operands
+1.7976931348623157E308 * -1.7976931348623157E308 = -Infinity, with double exprs operands
+1.7976931348623157E308 / -1.7976931348623157E308 = -1.0, with double exprs operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double param operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double param operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double local operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double local operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double static operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double static operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double field operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double field operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 + -1.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 - -1.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 * -1.0 = -1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 / -1.0 = -1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 + 1.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 - 1.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 * 1.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 / 1.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 * -0.0 = -0.0, with double param operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double param operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 * -0.0 = -0.0, with double local operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double local operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 * -0.0 = -0.0, with double static operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double static operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 * -0.0 = -0.0, with double field operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double field operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 * -0.0 = -0.0, with double a[i] operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double a[i] operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 * -0.0 = -0.0, with double f(x) operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double f(x) operands
+1.7976931348623157E308 + -0.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 - -0.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 * -0.0 = -0.0, with double lExpr operands
+1.7976931348623157E308 / -0.0 = -Infinity, with double lExpr operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 * 0.0 = 0.0, with double rExpr operands
+1.7976931348623157E308 / 0.0 = Infinity, with double rExpr operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 * 0.0 = 0.0, with double exprs operands
+1.7976931348623157E308 / 0.0 = Infinity, with double exprs operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double param operands
+1.7976931348623157E308 * 0.0 = 0.0, with double param operands
+1.7976931348623157E308 / 0.0 = Infinity, with double param operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double local operands
+1.7976931348623157E308 * 0.0 = 0.0, with double local operands
+1.7976931348623157E308 / 0.0 = Infinity, with double local operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double static operands
+1.7976931348623157E308 * 0.0 = 0.0, with double static operands
+1.7976931348623157E308 / 0.0 = Infinity, with double static operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double field operands
+1.7976931348623157E308 * 0.0 = 0.0, with double field operands
+1.7976931348623157E308 / 0.0 = Infinity, with double field operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double a[i] operands
+1.7976931348623157E308 * 0.0 = 0.0, with double a[i] operands
+1.7976931348623157E308 / 0.0 = Infinity, with double a[i] operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double f(x) operands
+1.7976931348623157E308 * 0.0 = 0.0, with double f(x) operands
+1.7976931348623157E308 / 0.0 = Infinity, with double f(x) operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double lExpr operands
+1.7976931348623157E308 * 0.0 = 0.0, with double lExpr operands
+1.7976931348623157E308 / 0.0 = Infinity, with double lExpr operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double rExpr operands
+1.7976931348623157E308 * 0.0 = 0.0, with double rExpr operands
+1.7976931348623157E308 / 0.0 = Infinity, with double rExpr operands
+1.7976931348623157E308 + 0.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 - 0.0 = 1.7976931348623157E308, with double exprs operands
+1.7976931348623157E308 * 0.0 = 0.0, with double exprs operands
+1.7976931348623157E308 / 0.0 = Infinity, with double exprs operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double param operands
+1.7976931348623157E308 - -Infinity = Infinity, with double param operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double param operands
+1.7976931348623157E308 / -Infinity = -0.0, with double param operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double local operands
+1.7976931348623157E308 - -Infinity = Infinity, with double local operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double local operands
+1.7976931348623157E308 / -Infinity = -0.0, with double local operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double static operands
+1.7976931348623157E308 - -Infinity = Infinity, with double static operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double static operands
+1.7976931348623157E308 / -Infinity = -0.0, with double static operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double field operands
+1.7976931348623157E308 - -Infinity = Infinity, with double field operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double field operands
+1.7976931348623157E308 / -Infinity = -0.0, with double field operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double a[i] operands
+1.7976931348623157E308 - -Infinity = Infinity, with double a[i] operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double a[i] operands
+1.7976931348623157E308 / -Infinity = -0.0, with double a[i] operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double f(x) operands
+1.7976931348623157E308 - -Infinity = Infinity, with double f(x) operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double f(x) operands
+1.7976931348623157E308 / -Infinity = -0.0, with double f(x) operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double lExpr operands
+1.7976931348623157E308 - -Infinity = Infinity, with double lExpr operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double lExpr operands
+1.7976931348623157E308 / -Infinity = -0.0, with double lExpr operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double rExpr operands
+1.7976931348623157E308 - -Infinity = Infinity, with double rExpr operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double rExpr operands
+1.7976931348623157E308 / -Infinity = -0.0, with double rExpr operands
+1.7976931348623157E308 + -Infinity = -Infinity, with double exprs operands
+1.7976931348623157E308 - -Infinity = Infinity, with double exprs operands
+1.7976931348623157E308 * -Infinity = -Infinity, with double exprs operands
+1.7976931348623157E308 / -Infinity = -0.0, with double exprs operands
+1.7976931348623157E308 + Infinity = Infinity, with double param operands
+1.7976931348623157E308 - Infinity = -Infinity, with double param operands
+1.7976931348623157E308 * Infinity = Infinity, with double param operands
+1.7976931348623157E308 / Infinity = 0.0, with double param operands
+1.7976931348623157E308 + Infinity = Infinity, with double local operands
+1.7976931348623157E308 - Infinity = -Infinity, with double local operands
+1.7976931348623157E308 * Infinity = Infinity, with double local operands
+1.7976931348623157E308 / Infinity = 0.0, with double local operands
+1.7976931348623157E308 + Infinity = Infinity, with double static operands
+1.7976931348623157E308 - Infinity = -Infinity, with double static operands
+1.7976931348623157E308 * Infinity = Infinity, with double static operands
+1.7976931348623157E308 / Infinity = 0.0, with double static operands
+1.7976931348623157E308 + Infinity = Infinity, with double field operands
+1.7976931348623157E308 - Infinity = -Infinity, with double field operands
+1.7976931348623157E308 * Infinity = Infinity, with double field operands
+1.7976931348623157E308 / Infinity = 0.0, with double field operands
+1.7976931348623157E308 + Infinity = Infinity, with double a[i] operands
+1.7976931348623157E308 - Infinity = -Infinity, with double a[i] operands
+1.7976931348623157E308 * Infinity = Infinity, with double a[i] operands
+1.7976931348623157E308 / Infinity = 0.0, with double a[i] operands
+1.7976931348623157E308 + Infinity = Infinity, with double f(x) operands
+1.7976931348623157E308 - Infinity = -Infinity, with double f(x) operands
+1.7976931348623157E308 * Infinity = Infinity, with double f(x) operands
+1.7976931348623157E308 / Infinity = 0.0, with double f(x) operands
+1.7976931348623157E308 + Infinity = Infinity, with double lExpr operands
+1.7976931348623157E308 - Infinity = -Infinity, with double lExpr operands
+1.7976931348623157E308 * Infinity = Infinity, with double lExpr operands
+1.7976931348623157E308 / Infinity = 0.0, with double lExpr operands
+1.7976931348623157E308 + Infinity = Infinity, with double rExpr operands
+1.7976931348623157E308 - Infinity = -Infinity, with double rExpr operands
+1.7976931348623157E308 * Infinity = Infinity, with double rExpr operands
+1.7976931348623157E308 / Infinity = 0.0, with double rExpr operands
+1.7976931348623157E308 + Infinity = Infinity, with double exprs operands
+1.7976931348623157E308 - Infinity = -Infinity, with double exprs operands
+1.7976931348623157E308 * Infinity = Infinity, with double exprs operands
+1.7976931348623157E308 / Infinity = 0.0, with double exprs operands
+1.7976931348623157E308 + NaN = NaN, with double param operands
+1.7976931348623157E308 - NaN = NaN, with double param operands
+1.7976931348623157E308 * NaN = NaN, with double param operands
+1.7976931348623157E308 / NaN = NaN, with double param operands
+1.7976931348623157E308 + NaN = NaN, with double local operands
+1.7976931348623157E308 - NaN = NaN, with double local operands
+1.7976931348623157E308 * NaN = NaN, with double local operands
+1.7976931348623157E308 / NaN = NaN, with double local operands
+1.7976931348623157E308 + NaN = NaN, with double static operands
+1.7976931348623157E308 - NaN = NaN, with double static operands
+1.7976931348623157E308 * NaN = NaN, with double static operands
+1.7976931348623157E308 / NaN = NaN, with double static operands
+1.7976931348623157E308 + NaN = NaN, with double field operands
+1.7976931348623157E308 - NaN = NaN, with double field operands
+1.7976931348623157E308 * NaN = NaN, with double field operands
+1.7976931348623157E308 / NaN = NaN, with double field operands
+1.7976931348623157E308 + NaN = NaN, with double a[i] operands
+1.7976931348623157E308 - NaN = NaN, with double a[i] operands
+1.7976931348623157E308 * NaN = NaN, with double a[i] operands
+1.7976931348623157E308 / NaN = NaN, with double a[i] operands
+1.7976931348623157E308 + NaN = NaN, with double f(x) operands
+1.7976931348623157E308 - NaN = NaN, with double f(x) operands
+1.7976931348623157E308 * NaN = NaN, with double f(x) operands
+1.7976931348623157E308 / NaN = NaN, with double f(x) operands
+1.7976931348623157E308 + NaN = NaN, with double lExpr operands
+1.7976931348623157E308 - NaN = NaN, with double lExpr operands
+1.7976931348623157E308 * NaN = NaN, with double lExpr operands
+1.7976931348623157E308 / NaN = NaN, with double lExpr operands
+1.7976931348623157E308 + NaN = NaN, with double rExpr operands
+1.7976931348623157E308 - NaN = NaN, with double rExpr operands
+1.7976931348623157E308 * NaN = NaN, with double rExpr operands
+1.7976931348623157E308 / NaN = NaN, with double rExpr operands
+1.7976931348623157E308 + NaN = NaN, with double exprs operands
+1.7976931348623157E308 - NaN = NaN, with double exprs operands
+1.7976931348623157E308 * NaN = NaN, with double exprs operands
+1.7976931348623157E308 / NaN = NaN, with double exprs operands
+-4.9E-324 + 4.9E-324 = 0.0, with double param operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double param operands
+-4.9E-324 * 4.9E-324 = -0.0, with double param operands
+-4.9E-324 / 4.9E-324 = -1.0, with double param operands
+-4.9E-324 + 4.9E-324 = 0.0, with double local operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double local operands
+-4.9E-324 * 4.9E-324 = -0.0, with double local operands
+-4.9E-324 / 4.9E-324 = -1.0, with double local operands
+-4.9E-324 + 4.9E-324 = 0.0, with double static operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double static operands
+-4.9E-324 * 4.9E-324 = -0.0, with double static operands
+-4.9E-324 / 4.9E-324 = -1.0, with double static operands
+-4.9E-324 + 4.9E-324 = 0.0, with double field operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double field operands
+-4.9E-324 * 4.9E-324 = -0.0, with double field operands
+-4.9E-324 / 4.9E-324 = -1.0, with double field operands
+-4.9E-324 + 4.9E-324 = 0.0, with double a[i] operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double a[i] operands
+-4.9E-324 * 4.9E-324 = -0.0, with double a[i] operands
+-4.9E-324 / 4.9E-324 = -1.0, with double a[i] operands
+-4.9E-324 + 4.9E-324 = 0.0, with double f(x) operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double f(x) operands
+-4.9E-324 * 4.9E-324 = -0.0, with double f(x) operands
+-4.9E-324 / 4.9E-324 = -1.0, with double f(x) operands
+-4.9E-324 + 4.9E-324 = 0.0, with double lExpr operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double lExpr operands
+-4.9E-324 * 4.9E-324 = -0.0, with double lExpr operands
+-4.9E-324 / 4.9E-324 = -1.0, with double lExpr operands
+-4.9E-324 + 4.9E-324 = 0.0, with double rExpr operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double rExpr operands
+-4.9E-324 * 4.9E-324 = -0.0, with double rExpr operands
+-4.9E-324 / 4.9E-324 = -1.0, with double rExpr operands
+-4.9E-324 + 4.9E-324 = 0.0, with double exprs operands
+-4.9E-324 - 4.9E-324 = -1.0E-323, with double exprs operands
+-4.9E-324 * 4.9E-324 = -0.0, with double exprs operands
+-4.9E-324 / 4.9E-324 = -1.0, with double exprs operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double param operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double param operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double local operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double local operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double static operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double static operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double field operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double field operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double a[i] operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double a[i] operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double f(x) operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double f(x) operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double lExpr operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double lExpr operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double rExpr operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double rExpr operands
+-4.9E-324 + 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+-4.9E-324 - 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+-4.9E-324 * 1.7976931348623157E308 = -8.881784197001251E-16, with double exprs operands
+-4.9E-324 / 1.7976931348623157E308 = -0.0, with double exprs operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double param operands
+-4.9E-324 - -4.9E-324 = 0.0, with double param operands
+-4.9E-324 * -4.9E-324 = 0.0, with double param operands
+-4.9E-324 / -4.9E-324 = 1.0, with double param operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double local operands
+-4.9E-324 - -4.9E-324 = 0.0, with double local operands
+-4.9E-324 * -4.9E-324 = 0.0, with double local operands
+-4.9E-324 / -4.9E-324 = 1.0, with double local operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double static operands
+-4.9E-324 - -4.9E-324 = 0.0, with double static operands
+-4.9E-324 * -4.9E-324 = 0.0, with double static operands
+-4.9E-324 / -4.9E-324 = 1.0, with double static operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double field operands
+-4.9E-324 - -4.9E-324 = 0.0, with double field operands
+-4.9E-324 * -4.9E-324 = 0.0, with double field operands
+-4.9E-324 / -4.9E-324 = 1.0, with double field operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double a[i] operands
+-4.9E-324 - -4.9E-324 = 0.0, with double a[i] operands
+-4.9E-324 * -4.9E-324 = 0.0, with double a[i] operands
+-4.9E-324 / -4.9E-324 = 1.0, with double a[i] operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double f(x) operands
+-4.9E-324 - -4.9E-324 = 0.0, with double f(x) operands
+-4.9E-324 * -4.9E-324 = 0.0, with double f(x) operands
+-4.9E-324 / -4.9E-324 = 1.0, with double f(x) operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double lExpr operands
+-4.9E-324 - -4.9E-324 = 0.0, with double lExpr operands
+-4.9E-324 * -4.9E-324 = 0.0, with double lExpr operands
+-4.9E-324 / -4.9E-324 = 1.0, with double lExpr operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double rExpr operands
+-4.9E-324 - -4.9E-324 = 0.0, with double rExpr operands
+-4.9E-324 * -4.9E-324 = 0.0, with double rExpr operands
+-4.9E-324 / -4.9E-324 = 1.0, with double rExpr operands
+-4.9E-324 + -4.9E-324 = -1.0E-323, with double exprs operands
+-4.9E-324 - -4.9E-324 = 0.0, with double exprs operands
+-4.9E-324 * -4.9E-324 = 0.0, with double exprs operands
+-4.9E-324 / -4.9E-324 = 1.0, with double exprs operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double param operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double param operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double local operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double local operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double static operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double static operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double field operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double field operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double a[i] operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double a[i] operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double f(x) operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double f(x) operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double lExpr operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double lExpr operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double rExpr operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double rExpr operands
+-4.9E-324 + -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+-4.9E-324 - -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+-4.9E-324 * -1.7976931348623157E308 = 8.881784197001251E-16, with double exprs operands
+-4.9E-324 / -1.7976931348623157E308 = 0.0, with double exprs operands
+-4.9E-324 + -1.0 = -1.0, with double param operands
+-4.9E-324 - -1.0 = 1.0, with double param operands
+-4.9E-324 * -1.0 = 4.9E-324, with double param operands
+-4.9E-324 / -1.0 = 4.9E-324, with double param operands
+-4.9E-324 + -1.0 = -1.0, with double local operands
+-4.9E-324 - -1.0 = 1.0, with double local operands
+-4.9E-324 * -1.0 = 4.9E-324, with double local operands
+-4.9E-324 / -1.0 = 4.9E-324, with double local operands
+-4.9E-324 + -1.0 = -1.0, with double static operands
+-4.9E-324 - -1.0 = 1.0, with double static operands
+-4.9E-324 * -1.0 = 4.9E-324, with double static operands
+-4.9E-324 / -1.0 = 4.9E-324, with double static operands
+-4.9E-324 + -1.0 = -1.0, with double field operands
+-4.9E-324 - -1.0 = 1.0, with double field operands
+-4.9E-324 * -1.0 = 4.9E-324, with double field operands
+-4.9E-324 / -1.0 = 4.9E-324, with double field operands
+-4.9E-324 + -1.0 = -1.0, with double a[i] operands
+-4.9E-324 - -1.0 = 1.0, with double a[i] operands
+-4.9E-324 * -1.0 = 4.9E-324, with double a[i] operands
+-4.9E-324 / -1.0 = 4.9E-324, with double a[i] operands
+-4.9E-324 + -1.0 = -1.0, with double f(x) operands
+-4.9E-324 - -1.0 = 1.0, with double f(x) operands
+-4.9E-324 * -1.0 = 4.9E-324, with double f(x) operands
+-4.9E-324 / -1.0 = 4.9E-324, with double f(x) operands
+-4.9E-324 + -1.0 = -1.0, with double lExpr operands
+-4.9E-324 - -1.0 = 1.0, with double lExpr operands
+-4.9E-324 * -1.0 = 4.9E-324, with double lExpr operands
+-4.9E-324 / -1.0 = 4.9E-324, with double lExpr operands
+-4.9E-324 + -1.0 = -1.0, with double rExpr operands
+-4.9E-324 - -1.0 = 1.0, with double rExpr operands
+-4.9E-324 * -1.0 = 4.9E-324, with double rExpr operands
+-4.9E-324 / -1.0 = 4.9E-324, with double rExpr operands
+-4.9E-324 + -1.0 = -1.0, with double exprs operands
+-4.9E-324 - -1.0 = 1.0, with double exprs operands
+-4.9E-324 * -1.0 = 4.9E-324, with double exprs operands
+-4.9E-324 / -1.0 = 4.9E-324, with double exprs operands
+-4.9E-324 + 1.0 = 1.0, with double param operands
+-4.9E-324 - 1.0 = -1.0, with double param operands
+-4.9E-324 * 1.0 = -4.9E-324, with double param operands
+-4.9E-324 / 1.0 = -4.9E-324, with double param operands
+-4.9E-324 + 1.0 = 1.0, with double local operands
+-4.9E-324 - 1.0 = -1.0, with double local operands
+-4.9E-324 * 1.0 = -4.9E-324, with double local operands
+-4.9E-324 / 1.0 = -4.9E-324, with double local operands
+-4.9E-324 + 1.0 = 1.0, with double static operands
+-4.9E-324 - 1.0 = -1.0, with double static operands
+-4.9E-324 * 1.0 = -4.9E-324, with double static operands
+-4.9E-324 / 1.0 = -4.9E-324, with double static operands
+-4.9E-324 + 1.0 = 1.0, with double field operands
+-4.9E-324 - 1.0 = -1.0, with double field operands
+-4.9E-324 * 1.0 = -4.9E-324, with double field operands
+-4.9E-324 / 1.0 = -4.9E-324, with double field operands
+-4.9E-324 + 1.0 = 1.0, with double a[i] operands
+-4.9E-324 - 1.0 = -1.0, with double a[i] operands
+-4.9E-324 * 1.0 = -4.9E-324, with double a[i] operands
+-4.9E-324 / 1.0 = -4.9E-324, with double a[i] operands
+-4.9E-324 + 1.0 = 1.0, with double f(x) operands
+-4.9E-324 - 1.0 = -1.0, with double f(x) operands
+-4.9E-324 * 1.0 = -4.9E-324, with double f(x) operands
+-4.9E-324 / 1.0 = -4.9E-324, with double f(x) operands
+-4.9E-324 + 1.0 = 1.0, with double lExpr operands
+-4.9E-324 - 1.0 = -1.0, with double lExpr operands
+-4.9E-324 * 1.0 = -4.9E-324, with double lExpr operands
+-4.9E-324 / 1.0 = -4.9E-324, with double lExpr operands
+-4.9E-324 + 1.0 = 1.0, with double rExpr operands
+-4.9E-324 - 1.0 = -1.0, with double rExpr operands
+-4.9E-324 * 1.0 = -4.9E-324, with double rExpr operands
+-4.9E-324 / 1.0 = -4.9E-324, with double rExpr operands
+-4.9E-324 + 1.0 = 1.0, with double exprs operands
+-4.9E-324 - 1.0 = -1.0, with double exprs operands
+-4.9E-324 * 1.0 = -4.9E-324, with double exprs operands
+-4.9E-324 / 1.0 = -4.9E-324, with double exprs operands
+-4.9E-324 + -0.0 = -4.9E-324, with double param operands
+-4.9E-324 - -0.0 = -4.9E-324, with double param operands
+-4.9E-324 * -0.0 = 0.0, with double param operands
+-4.9E-324 / -0.0 = Infinity, with double param operands
+-4.9E-324 + -0.0 = -4.9E-324, with double local operands
+-4.9E-324 - -0.0 = -4.9E-324, with double local operands
+-4.9E-324 * -0.0 = 0.0, with double local operands
+-4.9E-324 / -0.0 = Infinity, with double local operands
+-4.9E-324 + -0.0 = -4.9E-324, with double static operands
+-4.9E-324 - -0.0 = -4.9E-324, with double static operands
+-4.9E-324 * -0.0 = 0.0, with double static operands
+-4.9E-324 / -0.0 = Infinity, with double static operands
+-4.9E-324 + -0.0 = -4.9E-324, with double field operands
+-4.9E-324 - -0.0 = -4.9E-324, with double field operands
+-4.9E-324 * -0.0 = 0.0, with double field operands
+-4.9E-324 / -0.0 = Infinity, with double field operands
+-4.9E-324 + -0.0 = -4.9E-324, with double a[i] operands
+-4.9E-324 - -0.0 = -4.9E-324, with double a[i] operands
+-4.9E-324 * -0.0 = 0.0, with double a[i] operands
+-4.9E-324 / -0.0 = Infinity, with double a[i] operands
+-4.9E-324 + -0.0 = -4.9E-324, with double f(x) operands
+-4.9E-324 - -0.0 = -4.9E-324, with double f(x) operands
+-4.9E-324 * -0.0 = 0.0, with double f(x) operands
+-4.9E-324 / -0.0 = Infinity, with double f(x) operands
+-4.9E-324 + -0.0 = -4.9E-324, with double lExpr operands
+-4.9E-324 - -0.0 = -4.9E-324, with double lExpr operands
+-4.9E-324 * -0.0 = 0.0, with double lExpr operands
+-4.9E-324 / -0.0 = Infinity, with double lExpr operands
+-4.9E-324 + 0.0 = -4.9E-324, with double rExpr operands
+-4.9E-324 - 0.0 = -4.9E-324, with double rExpr operands
+-4.9E-324 * 0.0 = -0.0, with double rExpr operands
+-4.9E-324 / 0.0 = -Infinity, with double rExpr operands
+-4.9E-324 + 0.0 = -4.9E-324, with double exprs operands
+-4.9E-324 - 0.0 = -4.9E-324, with double exprs operands
+-4.9E-324 * 0.0 = -0.0, with double exprs operands
+-4.9E-324 / 0.0 = -Infinity, with double exprs operands
+-4.9E-324 + 0.0 = -4.9E-324, with double param operands
+-4.9E-324 - 0.0 = -4.9E-324, with double param operands
+-4.9E-324 * 0.0 = -0.0, with double param operands
+-4.9E-324 / 0.0 = -Infinity, with double param operands
+-4.9E-324 + 0.0 = -4.9E-324, with double local operands
+-4.9E-324 - 0.0 = -4.9E-324, with double local operands
+-4.9E-324 * 0.0 = -0.0, with double local operands
+-4.9E-324 / 0.0 = -Infinity, with double local operands
+-4.9E-324 + 0.0 = -4.9E-324, with double static operands
+-4.9E-324 - 0.0 = -4.9E-324, with double static operands
+-4.9E-324 * 0.0 = -0.0, with double static operands
+-4.9E-324 / 0.0 = -Infinity, with double static operands
+-4.9E-324 + 0.0 = -4.9E-324, with double field operands
+-4.9E-324 - 0.0 = -4.9E-324, with double field operands
+-4.9E-324 * 0.0 = -0.0, with double field operands
+-4.9E-324 / 0.0 = -Infinity, with double field operands
+-4.9E-324 + 0.0 = -4.9E-324, with double a[i] operands
+-4.9E-324 - 0.0 = -4.9E-324, with double a[i] operands
+-4.9E-324 * 0.0 = -0.0, with double a[i] operands
+-4.9E-324 / 0.0 = -Infinity, with double a[i] operands
+-4.9E-324 + 0.0 = -4.9E-324, with double f(x) operands
+-4.9E-324 - 0.0 = -4.9E-324, with double f(x) operands
+-4.9E-324 * 0.0 = -0.0, with double f(x) operands
+-4.9E-324 / 0.0 = -Infinity, with double f(x) operands
+-4.9E-324 + 0.0 = -4.9E-324, with double lExpr operands
+-4.9E-324 - 0.0 = -4.9E-324, with double lExpr operands
+-4.9E-324 * 0.0 = -0.0, with double lExpr operands
+-4.9E-324 / 0.0 = -Infinity, with double lExpr operands
+-4.9E-324 + 0.0 = -4.9E-324, with double rExpr operands
+-4.9E-324 - 0.0 = -4.9E-324, with double rExpr operands
+-4.9E-324 * 0.0 = -0.0, with double rExpr operands
+-4.9E-324 / 0.0 = -Infinity, with double rExpr operands
+-4.9E-324 + 0.0 = -4.9E-324, with double exprs operands
+-4.9E-324 - 0.0 = -4.9E-324, with double exprs operands
+-4.9E-324 * 0.0 = -0.0, with double exprs operands
+-4.9E-324 / 0.0 = -Infinity, with double exprs operands
+-4.9E-324 + -Infinity = -Infinity, with double param operands
+-4.9E-324 - -Infinity = Infinity, with double param operands
+-4.9E-324 * -Infinity = Infinity, with double param operands
+-4.9E-324 / -Infinity = 0.0, with double param operands
+-4.9E-324 + -Infinity = -Infinity, with double local operands
+-4.9E-324 - -Infinity = Infinity, with double local operands
+-4.9E-324 * -Infinity = Infinity, with double local operands
+-4.9E-324 / -Infinity = 0.0, with double local operands
+-4.9E-324 + -Infinity = -Infinity, with double static operands
+-4.9E-324 - -Infinity = Infinity, with double static operands
+-4.9E-324 * -Infinity = Infinity, with double static operands
+-4.9E-324 / -Infinity = 0.0, with double static operands
+-4.9E-324 + -Infinity = -Infinity, with double field operands
+-4.9E-324 - -Infinity = Infinity, with double field operands
+-4.9E-324 * -Infinity = Infinity, with double field operands
+-4.9E-324 / -Infinity = 0.0, with double field operands
+-4.9E-324 + -Infinity = -Infinity, with double a[i] operands
+-4.9E-324 - -Infinity = Infinity, with double a[i] operands
+-4.9E-324 * -Infinity = Infinity, with double a[i] operands
+-4.9E-324 / -Infinity = 0.0, with double a[i] operands
+-4.9E-324 + -Infinity = -Infinity, with double f(x) operands
+-4.9E-324 - -Infinity = Infinity, with double f(x) operands
+-4.9E-324 * -Infinity = Infinity, with double f(x) operands
+-4.9E-324 / -Infinity = 0.0, with double f(x) operands
+-4.9E-324 + -Infinity = -Infinity, with double lExpr operands
+-4.9E-324 - -Infinity = Infinity, with double lExpr operands
+-4.9E-324 * -Infinity = Infinity, with double lExpr operands
+-4.9E-324 / -Infinity = 0.0, with double lExpr operands
+-4.9E-324 + -Infinity = -Infinity, with double rExpr operands
+-4.9E-324 - -Infinity = Infinity, with double rExpr operands
+-4.9E-324 * -Infinity = Infinity, with double rExpr operands
+-4.9E-324 / -Infinity = 0.0, with double rExpr operands
+-4.9E-324 + -Infinity = -Infinity, with double exprs operands
+-4.9E-324 - -Infinity = Infinity, with double exprs operands
+-4.9E-324 * -Infinity = Infinity, with double exprs operands
+-4.9E-324 / -Infinity = 0.0, with double exprs operands
+-4.9E-324 + Infinity = Infinity, with double param operands
+-4.9E-324 - Infinity = -Infinity, with double param operands
+-4.9E-324 * Infinity = -Infinity, with double param operands
+-4.9E-324 / Infinity = -0.0, with double param operands
+-4.9E-324 + Infinity = Infinity, with double local operands
+-4.9E-324 - Infinity = -Infinity, with double local operands
+-4.9E-324 * Infinity = -Infinity, with double local operands
+-4.9E-324 / Infinity = -0.0, with double local operands
+-4.9E-324 + Infinity = Infinity, with double static operands
+-4.9E-324 - Infinity = -Infinity, with double static operands
+-4.9E-324 * Infinity = -Infinity, with double static operands
+-4.9E-324 / Infinity = -0.0, with double static operands
+-4.9E-324 + Infinity = Infinity, with double field operands
+-4.9E-324 - Infinity = -Infinity, with double field operands
+-4.9E-324 * Infinity = -Infinity, with double field operands
+-4.9E-324 / Infinity = -0.0, with double field operands
+-4.9E-324 + Infinity = Infinity, with double a[i] operands
+-4.9E-324 - Infinity = -Infinity, with double a[i] operands
+-4.9E-324 * Infinity = -Infinity, with double a[i] operands
+-4.9E-324 / Infinity = -0.0, with double a[i] operands
+-4.9E-324 + Infinity = Infinity, with double f(x) operands
+-4.9E-324 - Infinity = -Infinity, with double f(x) operands
+-4.9E-324 * Infinity = -Infinity, with double f(x) operands
+-4.9E-324 / Infinity = -0.0, with double f(x) operands
+-4.9E-324 + Infinity = Infinity, with double lExpr operands
+-4.9E-324 - Infinity = -Infinity, with double lExpr operands
+-4.9E-324 * Infinity = -Infinity, with double lExpr operands
+-4.9E-324 / Infinity = -0.0, with double lExpr operands
+-4.9E-324 + Infinity = Infinity, with double rExpr operands
+-4.9E-324 - Infinity = -Infinity, with double rExpr operands
+-4.9E-324 * Infinity = -Infinity, with double rExpr operands
+-4.9E-324 / Infinity = -0.0, with double rExpr operands
+-4.9E-324 + Infinity = Infinity, with double exprs operands
+-4.9E-324 - Infinity = -Infinity, with double exprs operands
+-4.9E-324 * Infinity = -Infinity, with double exprs operands
+-4.9E-324 / Infinity = -0.0, with double exprs operands
+-4.9E-324 + NaN = NaN, with double param operands
+-4.9E-324 - NaN = NaN, with double param operands
+-4.9E-324 * NaN = NaN, with double param operands
+-4.9E-324 / NaN = NaN, with double param operands
+-4.9E-324 + NaN = NaN, with double local operands
+-4.9E-324 - NaN = NaN, with double local operands
+-4.9E-324 * NaN = NaN, with double local operands
+-4.9E-324 / NaN = NaN, with double local operands
+-4.9E-324 + NaN = NaN, with double static operands
+-4.9E-324 - NaN = NaN, with double static operands
+-4.9E-324 * NaN = NaN, with double static operands
+-4.9E-324 / NaN = NaN, with double static operands
+-4.9E-324 + NaN = NaN, with double field operands
+-4.9E-324 - NaN = NaN, with double field operands
+-4.9E-324 * NaN = NaN, with double field operands
+-4.9E-324 / NaN = NaN, with double field operands
+-4.9E-324 + NaN = NaN, with double a[i] operands
+-4.9E-324 - NaN = NaN, with double a[i] operands
+-4.9E-324 * NaN = NaN, with double a[i] operands
+-4.9E-324 / NaN = NaN, with double a[i] operands
+-4.9E-324 + NaN = NaN, with double f(x) operands
+-4.9E-324 - NaN = NaN, with double f(x) operands
+-4.9E-324 * NaN = NaN, with double f(x) operands
+-4.9E-324 / NaN = NaN, with double f(x) operands
+-4.9E-324 + NaN = NaN, with double lExpr operands
+-4.9E-324 - NaN = NaN, with double lExpr operands
+-4.9E-324 * NaN = NaN, with double lExpr operands
+-4.9E-324 / NaN = NaN, with double lExpr operands
+-4.9E-324 + NaN = NaN, with double rExpr operands
+-4.9E-324 - NaN = NaN, with double rExpr operands
+-4.9E-324 * NaN = NaN, with double rExpr operands
+-4.9E-324 / NaN = NaN, with double rExpr operands
+-4.9E-324 + NaN = NaN, with double exprs operands
+-4.9E-324 - NaN = NaN, with double exprs operands
+-4.9E-324 * NaN = NaN, with double exprs operands
+-4.9E-324 / NaN = NaN, with double exprs operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double param operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double param operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double local operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double local operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double static operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double static operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double field operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double field operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double a[i] operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double a[i] operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double f(x) operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double f(x) operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double lExpr operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double lExpr operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double rExpr operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double rExpr operands
+-1.7976931348623157E308 + 4.9E-324 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 - 4.9E-324 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 * 4.9E-324 = -8.881784197001251E-16, with double exprs operands
+-1.7976931348623157E308 / 4.9E-324 = -Infinity, with double exprs operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double param operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double param operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double param operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double param operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double local operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double local operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double local operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double local operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double static operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double static operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double static operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double static operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double field operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double field operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double field operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double field operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double a[i] operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double a[i] operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double a[i] operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double a[i] operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double f(x) operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double f(x) operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double f(x) operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double f(x) operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double lExpr operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double lExpr operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double lExpr operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double lExpr operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double rExpr operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double rExpr operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double rExpr operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double rExpr operands
+-1.7976931348623157E308 + 1.7976931348623157E308 = 0.0, with double exprs operands
+-1.7976931348623157E308 - 1.7976931348623157E308 = -Infinity, with double exprs operands
+-1.7976931348623157E308 * 1.7976931348623157E308 = -Infinity, with double exprs operands
+-1.7976931348623157E308 / 1.7976931348623157E308 = -1.0, with double exprs operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double param operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double param operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double local operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double local operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double static operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double static operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double field operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double field operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double a[i] operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double a[i] operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double f(x) operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double f(x) operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double lExpr operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double lExpr operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double rExpr operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double rExpr operands
+-1.7976931348623157E308 + -4.9E-324 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 - -4.9E-324 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 * -4.9E-324 = 8.881784197001251E-16, with double exprs operands
+-1.7976931348623157E308 / -4.9E-324 = Infinity, with double exprs operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double param operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double param operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double param operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double param operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double local operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double local operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double local operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double local operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double static operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double static operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double static operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double static operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double field operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double field operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double field operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double field operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double a[i] operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double a[i] operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double a[i] operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double a[i] operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double f(x) operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double f(x) operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double f(x) operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double f(x) operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double lExpr operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double lExpr operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double lExpr operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double lExpr operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double rExpr operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double rExpr operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double rExpr operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double rExpr operands
+-1.7976931348623157E308 + -1.7976931348623157E308 = -Infinity, with double exprs operands
+-1.7976931348623157E308 - -1.7976931348623157E308 = 0.0, with double exprs operands
+-1.7976931348623157E308 * -1.7976931348623157E308 = Infinity, with double exprs operands
+-1.7976931348623157E308 / -1.7976931348623157E308 = 1.0, with double exprs operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 + -1.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 - -1.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 * -1.0 = 1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 / -1.0 = 1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 + 1.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 - 1.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 * 1.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 / 1.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double param operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double param operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double local operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double local operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double static operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double static operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double field operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double field operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double a[i] operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double a[i] operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double f(x) operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double f(x) operands
+-1.7976931348623157E308 + -0.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 - -0.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 * -0.0 = 0.0, with double lExpr operands
+-1.7976931348623157E308 / -0.0 = Infinity, with double lExpr operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double rExpr operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double rExpr operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double exprs operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double exprs operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double param operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double param operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double param operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double local operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double local operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double local operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double static operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double static operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double static operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double field operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double field operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double field operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double a[i] operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double a[i] operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double a[i] operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double f(x) operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double f(x) operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double f(x) operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double lExpr operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double lExpr operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double lExpr operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double rExpr operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double rExpr operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double rExpr operands
+-1.7976931348623157E308 + 0.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 - 0.0 = -1.7976931348623157E308, with double exprs operands
+-1.7976931348623157E308 * 0.0 = -0.0, with double exprs operands
+-1.7976931348623157E308 / 0.0 = -Infinity, with double exprs operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double param operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double param operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double param operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double param operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double local operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double local operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double local operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double local operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double static operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double static operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double static operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double static operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double field operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double field operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double field operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double field operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double a[i] operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double a[i] operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double a[i] operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double a[i] operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double f(x) operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double f(x) operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double f(x) operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double f(x) operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double lExpr operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double lExpr operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double lExpr operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double lExpr operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double rExpr operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double rExpr operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double rExpr operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double rExpr operands
+-1.7976931348623157E308 + -Infinity = -Infinity, with double exprs operands
+-1.7976931348623157E308 - -Infinity = Infinity, with double exprs operands
+-1.7976931348623157E308 * -Infinity = Infinity, with double exprs operands
+-1.7976931348623157E308 / -Infinity = 0.0, with double exprs operands
+-1.7976931348623157E308 + Infinity = Infinity, with double param operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double param operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double param operands
+-1.7976931348623157E308 / Infinity = -0.0, with double param operands
+-1.7976931348623157E308 + Infinity = Infinity, with double local operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double local operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double local operands
+-1.7976931348623157E308 / Infinity = -0.0, with double local operands
+-1.7976931348623157E308 + Infinity = Infinity, with double static operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double static operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double static operands
+-1.7976931348623157E308 / Infinity = -0.0, with double static operands
+-1.7976931348623157E308 + Infinity = Infinity, with double field operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double field operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double field operands
+-1.7976931348623157E308 / Infinity = -0.0, with double field operands
+-1.7976931348623157E308 + Infinity = Infinity, with double a[i] operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double a[i] operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double a[i] operands
+-1.7976931348623157E308 / Infinity = -0.0, with double a[i] operands
+-1.7976931348623157E308 + Infinity = Infinity, with double f(x) operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double f(x) operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double f(x) operands
+-1.7976931348623157E308 / Infinity = -0.0, with double f(x) operands
+-1.7976931348623157E308 + Infinity = Infinity, with double lExpr operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double lExpr operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double lExpr operands
+-1.7976931348623157E308 / Infinity = -0.0, with double lExpr operands
+-1.7976931348623157E308 + Infinity = Infinity, with double rExpr operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double rExpr operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double rExpr operands
+-1.7976931348623157E308 / Infinity = -0.0, with double rExpr operands
+-1.7976931348623157E308 + Infinity = Infinity, with double exprs operands
+-1.7976931348623157E308 - Infinity = -Infinity, with double exprs operands
+-1.7976931348623157E308 * Infinity = -Infinity, with double exprs operands
+-1.7976931348623157E308 / Infinity = -0.0, with double exprs operands
+-1.7976931348623157E308 + NaN = NaN, with double param operands
+-1.7976931348623157E308 - NaN = NaN, with double param operands
+-1.7976931348623157E308 * NaN = NaN, with double param operands
+-1.7976931348623157E308 / NaN = NaN, with double param operands
+-1.7976931348623157E308 + NaN = NaN, with double local operands
+-1.7976931348623157E308 - NaN = NaN, with double local operands
+-1.7976931348623157E308 * NaN = NaN, with double local operands
+-1.7976931348623157E308 / NaN = NaN, with double local operands
+-1.7976931348623157E308 + NaN = NaN, with double static operands
+-1.7976931348623157E308 - NaN = NaN, with double static operands
+-1.7976931348623157E308 * NaN = NaN, with double static operands
+-1.7976931348623157E308 / NaN = NaN, with double static operands
+-1.7976931348623157E308 + NaN = NaN, with double field operands
+-1.7976931348623157E308 - NaN = NaN, with double field operands
+-1.7976931348623157E308 * NaN = NaN, with double field operands
+-1.7976931348623157E308 / NaN = NaN, with double field operands
+-1.7976931348623157E308 + NaN = NaN, with double a[i] operands
+-1.7976931348623157E308 - NaN = NaN, with double a[i] operands
+-1.7976931348623157E308 * NaN = NaN, with double a[i] operands
+-1.7976931348623157E308 / NaN = NaN, with double a[i] operands
+-1.7976931348623157E308 + NaN = NaN, with double f(x) operands
+-1.7976931348623157E308 - NaN = NaN, with double f(x) operands
+-1.7976931348623157E308 * NaN = NaN, with double f(x) operands
+-1.7976931348623157E308 / NaN = NaN, with double f(x) operands
+-1.7976931348623157E308 + NaN = NaN, with double lExpr operands
+-1.7976931348623157E308 - NaN = NaN, with double lExpr operands
+-1.7976931348623157E308 * NaN = NaN, with double lExpr operands
+-1.7976931348623157E308 / NaN = NaN, with double lExpr operands
+-1.7976931348623157E308 + NaN = NaN, with double rExpr operands
+-1.7976931348623157E308 - NaN = NaN, with double rExpr operands
+-1.7976931348623157E308 * NaN = NaN, with double rExpr operands
+-1.7976931348623157E308 / NaN = NaN, with double rExpr operands
+-1.7976931348623157E308 + NaN = NaN, with double exprs operands
+-1.7976931348623157E308 - NaN = NaN, with double exprs operands
+-1.7976931348623157E308 * NaN = NaN, with double exprs operands
+-1.7976931348623157E308 / NaN = NaN, with double exprs operands
+-1.0 + 4.9E-324 = -1.0, with double param operands
+-1.0 - 4.9E-324 = -1.0, with double param operands
+-1.0 * 4.9E-324 = -4.9E-324, with double param operands
+-1.0 / 4.9E-324 = -Infinity, with double param operands
+-1.0 + 4.9E-324 = -1.0, with double local operands
+-1.0 - 4.9E-324 = -1.0, with double local operands
+-1.0 * 4.9E-324 = -4.9E-324, with double local operands
+-1.0 / 4.9E-324 = -Infinity, with double local operands
+-1.0 + 4.9E-324 = -1.0, with double static operands
+-1.0 - 4.9E-324 = -1.0, with double static operands
+-1.0 * 4.9E-324 = -4.9E-324, with double static operands
+-1.0 / 4.9E-324 = -Infinity, with double static operands
+-1.0 + 4.9E-324 = -1.0, with double field operands
+-1.0 - 4.9E-324 = -1.0, with double field operands
+-1.0 * 4.9E-324 = -4.9E-324, with double field operands
+-1.0 / 4.9E-324 = -Infinity, with double field operands
+-1.0 + 4.9E-324 = -1.0, with double a[i] operands
+-1.0 - 4.9E-324 = -1.0, with double a[i] operands
+-1.0 * 4.9E-324 = -4.9E-324, with double a[i] operands
+-1.0 / 4.9E-324 = -Infinity, with double a[i] operands
+-1.0 + 4.9E-324 = -1.0, with double f(x) operands
+-1.0 - 4.9E-324 = -1.0, with double f(x) operands
+-1.0 * 4.9E-324 = -4.9E-324, with double f(x) operands
+-1.0 / 4.9E-324 = -Infinity, with double f(x) operands
+-1.0 + 4.9E-324 = -1.0, with double lExpr operands
+-1.0 - 4.9E-324 = -1.0, with double lExpr operands
+-1.0 * 4.9E-324 = -4.9E-324, with double lExpr operands
+-1.0 / 4.9E-324 = -Infinity, with double lExpr operands
+-1.0 + 4.9E-324 = -1.0, with double rExpr operands
+-1.0 - 4.9E-324 = -1.0, with double rExpr operands
+-1.0 * 4.9E-324 = -4.9E-324, with double rExpr operands
+-1.0 / 4.9E-324 = -Infinity, with double rExpr operands
+-1.0 + 4.9E-324 = -1.0, with double exprs operands
+-1.0 - 4.9E-324 = -1.0, with double exprs operands
+-1.0 * 4.9E-324 = -4.9E-324, with double exprs operands
+-1.0 / 4.9E-324 = -Infinity, with double exprs operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double param operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double local operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double static operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double field operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double a[i] operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double f(x) operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double lExpr operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double rExpr operands
+-1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+-1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+-1.0 * 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+-1.0 / 1.7976931348623157E308 = -5.562684646268003E-309, with double exprs operands
+-1.0 + -4.9E-324 = -1.0, with double param operands
+-1.0 - -4.9E-324 = -1.0, with double param operands
+-1.0 * -4.9E-324 = 4.9E-324, with double param operands
+-1.0 / -4.9E-324 = Infinity, with double param operands
+-1.0 + -4.9E-324 = -1.0, with double local operands
+-1.0 - -4.9E-324 = -1.0, with double local operands
+-1.0 * -4.9E-324 = 4.9E-324, with double local operands
+-1.0 / -4.9E-324 = Infinity, with double local operands
+-1.0 + -4.9E-324 = -1.0, with double static operands
+-1.0 - -4.9E-324 = -1.0, with double static operands
+-1.0 * -4.9E-324 = 4.9E-324, with double static operands
+-1.0 / -4.9E-324 = Infinity, with double static operands
+-1.0 + -4.9E-324 = -1.0, with double field operands
+-1.0 - -4.9E-324 = -1.0, with double field operands
+-1.0 * -4.9E-324 = 4.9E-324, with double field operands
+-1.0 / -4.9E-324 = Infinity, with double field operands
+-1.0 + -4.9E-324 = -1.0, with double a[i] operands
+-1.0 - -4.9E-324 = -1.0, with double a[i] operands
+-1.0 * -4.9E-324 = 4.9E-324, with double a[i] operands
+-1.0 / -4.9E-324 = Infinity, with double a[i] operands
+-1.0 + -4.9E-324 = -1.0, with double f(x) operands
+-1.0 - -4.9E-324 = -1.0, with double f(x) operands
+-1.0 * -4.9E-324 = 4.9E-324, with double f(x) operands
+-1.0 / -4.9E-324 = Infinity, with double f(x) operands
+-1.0 + -4.9E-324 = -1.0, with double lExpr operands
+-1.0 - -4.9E-324 = -1.0, with double lExpr operands
+-1.0 * -4.9E-324 = 4.9E-324, with double lExpr operands
+-1.0 / -4.9E-324 = Infinity, with double lExpr operands
+-1.0 + -4.9E-324 = -1.0, with double rExpr operands
+-1.0 - -4.9E-324 = -1.0, with double rExpr operands
+-1.0 * -4.9E-324 = 4.9E-324, with double rExpr operands
+-1.0 / -4.9E-324 = Infinity, with double rExpr operands
+-1.0 + -4.9E-324 = -1.0, with double exprs operands
+-1.0 - -4.9E-324 = -1.0, with double exprs operands
+-1.0 * -4.9E-324 = 4.9E-324, with double exprs operands
+-1.0 / -4.9E-324 = Infinity, with double exprs operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double param operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double local operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double static operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double field operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double a[i] operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double f(x) operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double lExpr operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double rExpr operands
+-1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+-1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+-1.0 * -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+-1.0 / -1.7976931348623157E308 = 5.562684646268003E-309, with double exprs operands
+-1.0 + -1.0 = -2.0, with double param operands
+-1.0 - -1.0 = 0.0, with double param operands
+-1.0 * -1.0 = 1.0, with double param operands
+-1.0 / -1.0 = 1.0, with double param operands
+-1.0 + -1.0 = -2.0, with double local operands
+-1.0 - -1.0 = 0.0, with double local operands
+-1.0 * -1.0 = 1.0, with double local operands
+-1.0 / -1.0 = 1.0, with double local operands
+-1.0 + -1.0 = -2.0, with double static operands
+-1.0 - -1.0 = 0.0, with double static operands
+-1.0 * -1.0 = 1.0, with double static operands
+-1.0 / -1.0 = 1.0, with double static operands
+-1.0 + -1.0 = -2.0, with double field operands
+-1.0 - -1.0 = 0.0, with double field operands
+-1.0 * -1.0 = 1.0, with double field operands
+-1.0 / -1.0 = 1.0, with double field operands
+-1.0 + -1.0 = -2.0, with double a[i] operands
+-1.0 - -1.0 = 0.0, with double a[i] operands
+-1.0 * -1.0 = 1.0, with double a[i] operands
+-1.0 / -1.0 = 1.0, with double a[i] operands
+-1.0 + -1.0 = -2.0, with double f(x) operands
+-1.0 - -1.0 = 0.0, with double f(x) operands
+-1.0 * -1.0 = 1.0, with double f(x) operands
+-1.0 / -1.0 = 1.0, with double f(x) operands
+-1.0 + -1.0 = -2.0, with double lExpr operands
+-1.0 - -1.0 = 0.0, with double lExpr operands
+-1.0 * -1.0 = 1.0, with double lExpr operands
+-1.0 / -1.0 = 1.0, with double lExpr operands
+-1.0 + -1.0 = -2.0, with double rExpr operands
+-1.0 - -1.0 = 0.0, with double rExpr operands
+-1.0 * -1.0 = 1.0, with double rExpr operands
+-1.0 / -1.0 = 1.0, with double rExpr operands
+-1.0 + -1.0 = -2.0, with double exprs operands
+-1.0 - -1.0 = 0.0, with double exprs operands
+-1.0 * -1.0 = 1.0, with double exprs operands
+-1.0 / -1.0 = 1.0, with double exprs operands
+-1.0 + 1.0 = 0.0, with double param operands
+-1.0 - 1.0 = -2.0, with double param operands
+-1.0 * 1.0 = -1.0, with double param operands
+-1.0 / 1.0 = -1.0, with double param operands
+-1.0 + 1.0 = 0.0, with double local operands
+-1.0 - 1.0 = -2.0, with double local operands
+-1.0 * 1.0 = -1.0, with double local operands
+-1.0 / 1.0 = -1.0, with double local operands
+-1.0 + 1.0 = 0.0, with double static operands
+-1.0 - 1.0 = -2.0, with double static operands
+-1.0 * 1.0 = -1.0, with double static operands
+-1.0 / 1.0 = -1.0, with double static operands
+-1.0 + 1.0 = 0.0, with double field operands
+-1.0 - 1.0 = -2.0, with double field operands
+-1.0 * 1.0 = -1.0, with double field operands
+-1.0 / 1.0 = -1.0, with double field operands
+-1.0 + 1.0 = 0.0, with double a[i] operands
+-1.0 - 1.0 = -2.0, with double a[i] operands
+-1.0 * 1.0 = -1.0, with double a[i] operands
+-1.0 / 1.0 = -1.0, with double a[i] operands
+-1.0 + 1.0 = 0.0, with double f(x) operands
+-1.0 - 1.0 = -2.0, with double f(x) operands
+-1.0 * 1.0 = -1.0, with double f(x) operands
+-1.0 / 1.0 = -1.0, with double f(x) operands
+-1.0 + 1.0 = 0.0, with double lExpr operands
+-1.0 - 1.0 = -2.0, with double lExpr operands
+-1.0 * 1.0 = -1.0, with double lExpr operands
+-1.0 / 1.0 = -1.0, with double lExpr operands
+-1.0 + 1.0 = 0.0, with double rExpr operands
+-1.0 - 1.0 = -2.0, with double rExpr operands
+-1.0 * 1.0 = -1.0, with double rExpr operands
+-1.0 / 1.0 = -1.0, with double rExpr operands
+-1.0 + 1.0 = 0.0, with double exprs operands
+-1.0 - 1.0 = -2.0, with double exprs operands
+-1.0 * 1.0 = -1.0, with double exprs operands
+-1.0 / 1.0 = -1.0, with double exprs operands
+-1.0 + -0.0 = -1.0, with double param operands
+-1.0 - -0.0 = -1.0, with double param operands
+-1.0 * -0.0 = 0.0, with double param operands
+-1.0 / -0.0 = Infinity, with double param operands
+-1.0 + -0.0 = -1.0, with double local operands
+-1.0 - -0.0 = -1.0, with double local operands
+-1.0 * -0.0 = 0.0, with double local operands
+-1.0 / -0.0 = Infinity, with double local operands
+-1.0 + -0.0 = -1.0, with double static operands
+-1.0 - -0.0 = -1.0, with double static operands
+-1.0 * -0.0 = 0.0, with double static operands
+-1.0 / -0.0 = Infinity, with double static operands
+-1.0 + -0.0 = -1.0, with double field operands
+-1.0 - -0.0 = -1.0, with double field operands
+-1.0 * -0.0 = 0.0, with double field operands
+-1.0 / -0.0 = Infinity, with double field operands
+-1.0 + -0.0 = -1.0, with double a[i] operands
+-1.0 - -0.0 = -1.0, with double a[i] operands
+-1.0 * -0.0 = 0.0, with double a[i] operands
+-1.0 / -0.0 = Infinity, with double a[i] operands
+-1.0 + -0.0 = -1.0, with double f(x) operands
+-1.0 - -0.0 = -1.0, with double f(x) operands
+-1.0 * -0.0 = 0.0, with double f(x) operands
+-1.0 / -0.0 = Infinity, with double f(x) operands
+-1.0 + -0.0 = -1.0, with double lExpr operands
+-1.0 - -0.0 = -1.0, with double lExpr operands
+-1.0 * -0.0 = 0.0, with double lExpr operands
+-1.0 / -0.0 = Infinity, with double lExpr operands
+-1.0 + 0.0 = -1.0, with double rExpr operands
+-1.0 - 0.0 = -1.0, with double rExpr operands
+-1.0 * 0.0 = -0.0, with double rExpr operands
+-1.0 / 0.0 = -Infinity, with double rExpr operands
+-1.0 + 0.0 = -1.0, with double exprs operands
+-1.0 - 0.0 = -1.0, with double exprs operands
+-1.0 * 0.0 = -0.0, with double exprs operands
+-1.0 / 0.0 = -Infinity, with double exprs operands
+-1.0 + 0.0 = -1.0, with double param operands
+-1.0 - 0.0 = -1.0, with double param operands
+-1.0 * 0.0 = -0.0, with double param operands
+-1.0 / 0.0 = -Infinity, with double param operands
+-1.0 + 0.0 = -1.0, with double local operands
+-1.0 - 0.0 = -1.0, with double local operands
+-1.0 * 0.0 = -0.0, with double local operands
+-1.0 / 0.0 = -Infinity, with double local operands
+-1.0 + 0.0 = -1.0, with double static operands
+-1.0 - 0.0 = -1.0, with double static operands
+-1.0 * 0.0 = -0.0, with double static operands
+-1.0 / 0.0 = -Infinity, with double static operands
+-1.0 + 0.0 = -1.0, with double field operands
+-1.0 - 0.0 = -1.0, with double field operands
+-1.0 * 0.0 = -0.0, with double field operands
+-1.0 / 0.0 = -Infinity, with double field operands
+-1.0 + 0.0 = -1.0, with double a[i] operands
+-1.0 - 0.0 = -1.0, with double a[i] operands
+-1.0 * 0.0 = -0.0, with double a[i] operands
+-1.0 / 0.0 = -Infinity, with double a[i] operands
+-1.0 + 0.0 = -1.0, with double f(x) operands
+-1.0 - 0.0 = -1.0, with double f(x) operands
+-1.0 * 0.0 = -0.0, with double f(x) operands
+-1.0 / 0.0 = -Infinity, with double f(x) operands
+-1.0 + 0.0 = -1.0, with double lExpr operands
+-1.0 - 0.0 = -1.0, with double lExpr operands
+-1.0 * 0.0 = -0.0, with double lExpr operands
+-1.0 / 0.0 = -Infinity, with double lExpr operands
+-1.0 + 0.0 = -1.0, with double rExpr operands
+-1.0 - 0.0 = -1.0, with double rExpr operands
+-1.0 * 0.0 = -0.0, with double rExpr operands
+-1.0 / 0.0 = -Infinity, with double rExpr operands
+-1.0 + 0.0 = -1.0, with double exprs operands
+-1.0 - 0.0 = -1.0, with double exprs operands
+-1.0 * 0.0 = -0.0, with double exprs operands
+-1.0 / 0.0 = -Infinity, with double exprs operands
+-1.0 + -Infinity = -Infinity, with double param operands
+-1.0 - -Infinity = Infinity, with double param operands
+-1.0 * -Infinity = Infinity, with double param operands
+-1.0 / -Infinity = 0.0, with double param operands
+-1.0 + -Infinity = -Infinity, with double local operands
+-1.0 - -Infinity = Infinity, with double local operands
+-1.0 * -Infinity = Infinity, with double local operands
+-1.0 / -Infinity = 0.0, with double local operands
+-1.0 + -Infinity = -Infinity, with double static operands
+-1.0 - -Infinity = Infinity, with double static operands
+-1.0 * -Infinity = Infinity, with double static operands
+-1.0 / -Infinity = 0.0, with double static operands
+-1.0 + -Infinity = -Infinity, with double field operands
+-1.0 - -Infinity = Infinity, with double field operands
+-1.0 * -Infinity = Infinity, with double field operands
+-1.0 / -Infinity = 0.0, with double field operands
+-1.0 + -Infinity = -Infinity, with double a[i] operands
+-1.0 - -Infinity = Infinity, with double a[i] operands
+-1.0 * -Infinity = Infinity, with double a[i] operands
+-1.0 / -Infinity = 0.0, with double a[i] operands
+-1.0 + -Infinity = -Infinity, with double f(x) operands
+-1.0 - -Infinity = Infinity, with double f(x) operands
+-1.0 * -Infinity = Infinity, with double f(x) operands
+-1.0 / -Infinity = 0.0, with double f(x) operands
+-1.0 + -Infinity = -Infinity, with double lExpr operands
+-1.0 - -Infinity = Infinity, with double lExpr operands
+-1.0 * -Infinity = Infinity, with double lExpr operands
+-1.0 / -Infinity = 0.0, with double lExpr operands
+-1.0 + -Infinity = -Infinity, with double rExpr operands
+-1.0 - -Infinity = Infinity, with double rExpr operands
+-1.0 * -Infinity = Infinity, with double rExpr operands
+-1.0 / -Infinity = 0.0, with double rExpr operands
+-1.0 + -Infinity = -Infinity, with double exprs operands
+-1.0 - -Infinity = Infinity, with double exprs operands
+-1.0 * -Infinity = Infinity, with double exprs operands
+-1.0 / -Infinity = 0.0, with double exprs operands
+-1.0 + Infinity = Infinity, with double param operands
+-1.0 - Infinity = -Infinity, with double param operands
+-1.0 * Infinity = -Infinity, with double param operands
+-1.0 / Infinity = -0.0, with double param operands
+-1.0 + Infinity = Infinity, with double local operands
+-1.0 - Infinity = -Infinity, with double local operands
+-1.0 * Infinity = -Infinity, with double local operands
+-1.0 / Infinity = -0.0, with double local operands
+-1.0 + Infinity = Infinity, with double static operands
+-1.0 - Infinity = -Infinity, with double static operands
+-1.0 * Infinity = -Infinity, with double static operands
+-1.0 / Infinity = -0.0, with double static operands
+-1.0 + Infinity = Infinity, with double field operands
+-1.0 - Infinity = -Infinity, with double field operands
+-1.0 * Infinity = -Infinity, with double field operands
+-1.0 / Infinity = -0.0, with double field operands
+-1.0 + Infinity = Infinity, with double a[i] operands
+-1.0 - Infinity = -Infinity, with double a[i] operands
+-1.0 * Infinity = -Infinity, with double a[i] operands
+-1.0 / Infinity = -0.0, with double a[i] operands
+-1.0 + Infinity = Infinity, with double f(x) operands
+-1.0 - Infinity = -Infinity, with double f(x) operands
+-1.0 * Infinity = -Infinity, with double f(x) operands
+-1.0 / Infinity = -0.0, with double f(x) operands
+-1.0 + Infinity = Infinity, with double lExpr operands
+-1.0 - Infinity = -Infinity, with double lExpr operands
+-1.0 * Infinity = -Infinity, with double lExpr operands
+-1.0 / Infinity = -0.0, with double lExpr operands
+-1.0 + Infinity = Infinity, with double rExpr operands
+-1.0 - Infinity = -Infinity, with double rExpr operands
+-1.0 * Infinity = -Infinity, with double rExpr operands
+-1.0 / Infinity = -0.0, with double rExpr operands
+-1.0 + Infinity = Infinity, with double exprs operands
+-1.0 - Infinity = -Infinity, with double exprs operands
+-1.0 * Infinity = -Infinity, with double exprs operands
+-1.0 / Infinity = -0.0, with double exprs operands
+-1.0 + NaN = NaN, with double param operands
+-1.0 - NaN = NaN, with double param operands
+-1.0 * NaN = NaN, with double param operands
+-1.0 / NaN = NaN, with double param operands
+-1.0 + NaN = NaN, with double local operands
+-1.0 - NaN = NaN, with double local operands
+-1.0 * NaN = NaN, with double local operands
+-1.0 / NaN = NaN, with double local operands
+-1.0 + NaN = NaN, with double static operands
+-1.0 - NaN = NaN, with double static operands
+-1.0 * NaN = NaN, with double static operands
+-1.0 / NaN = NaN, with double static operands
+-1.0 + NaN = NaN, with double field operands
+-1.0 - NaN = NaN, with double field operands
+-1.0 * NaN = NaN, with double field operands
+-1.0 / NaN = NaN, with double field operands
+-1.0 + NaN = NaN, with double a[i] operands
+-1.0 - NaN = NaN, with double a[i] operands
+-1.0 * NaN = NaN, with double a[i] operands
+-1.0 / NaN = NaN, with double a[i] operands
+-1.0 + NaN = NaN, with double f(x) operands
+-1.0 - NaN = NaN, with double f(x) operands
+-1.0 * NaN = NaN, with double f(x) operands
+-1.0 / NaN = NaN, with double f(x) operands
+-1.0 + NaN = NaN, with double lExpr operands
+-1.0 - NaN = NaN, with double lExpr operands
+-1.0 * NaN = NaN, with double lExpr operands
+-1.0 / NaN = NaN, with double lExpr operands
+-1.0 + NaN = NaN, with double rExpr operands
+-1.0 - NaN = NaN, with double rExpr operands
+-1.0 * NaN = NaN, with double rExpr operands
+-1.0 / NaN = NaN, with double rExpr operands
+-1.0 + NaN = NaN, with double exprs operands
+-1.0 - NaN = NaN, with double exprs operands
+-1.0 * NaN = NaN, with double exprs operands
+-1.0 / NaN = NaN, with double exprs operands
+1.0 + 4.9E-324 = 1.0, with double param operands
+1.0 - 4.9E-324 = 1.0, with double param operands
+1.0 * 4.9E-324 = 4.9E-324, with double param operands
+1.0 / 4.9E-324 = Infinity, with double param operands
+1.0 + 4.9E-324 = 1.0, with double local operands
+1.0 - 4.9E-324 = 1.0, with double local operands
+1.0 * 4.9E-324 = 4.9E-324, with double local operands
+1.0 / 4.9E-324 = Infinity, with double local operands
+1.0 + 4.9E-324 = 1.0, with double static operands
+1.0 - 4.9E-324 = 1.0, with double static operands
+1.0 * 4.9E-324 = 4.9E-324, with double static operands
+1.0 / 4.9E-324 = Infinity, with double static operands
+1.0 + 4.9E-324 = 1.0, with double field operands
+1.0 - 4.9E-324 = 1.0, with double field operands
+1.0 * 4.9E-324 = 4.9E-324, with double field operands
+1.0 / 4.9E-324 = Infinity, with double field operands
+1.0 + 4.9E-324 = 1.0, with double a[i] operands
+1.0 - 4.9E-324 = 1.0, with double a[i] operands
+1.0 * 4.9E-324 = 4.9E-324, with double a[i] operands
+1.0 / 4.9E-324 = Infinity, with double a[i] operands
+1.0 + 4.9E-324 = 1.0, with double f(x) operands
+1.0 - 4.9E-324 = 1.0, with double f(x) operands
+1.0 * 4.9E-324 = 4.9E-324, with double f(x) operands
+1.0 / 4.9E-324 = Infinity, with double f(x) operands
+1.0 + 4.9E-324 = 1.0, with double lExpr operands
+1.0 - 4.9E-324 = 1.0, with double lExpr operands
+1.0 * 4.9E-324 = 4.9E-324, with double lExpr operands
+1.0 / 4.9E-324 = Infinity, with double lExpr operands
+1.0 + 4.9E-324 = 1.0, with double rExpr operands
+1.0 - 4.9E-324 = 1.0, with double rExpr operands
+1.0 * 4.9E-324 = 4.9E-324, with double rExpr operands
+1.0 / 4.9E-324 = Infinity, with double rExpr operands
+1.0 + 4.9E-324 = 1.0, with double exprs operands
+1.0 - 4.9E-324 = 1.0, with double exprs operands
+1.0 * 4.9E-324 = 4.9E-324, with double exprs operands
+1.0 / 4.9E-324 = Infinity, with double exprs operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double param operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double local operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double static operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double field operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double a[i] operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double f(x) operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double lExpr operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double rExpr operands
+1.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+1.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+1.0 * 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+1.0 / 1.7976931348623157E308 = 5.562684646268003E-309, with double exprs operands
+1.0 + -4.9E-324 = 1.0, with double param operands
+1.0 - -4.9E-324 = 1.0, with double param operands
+1.0 * -4.9E-324 = -4.9E-324, with double param operands
+1.0 / -4.9E-324 = -Infinity, with double param operands
+1.0 + -4.9E-324 = 1.0, with double local operands
+1.0 - -4.9E-324 = 1.0, with double local operands
+1.0 * -4.9E-324 = -4.9E-324, with double local operands
+1.0 / -4.9E-324 = -Infinity, with double local operands
+1.0 + -4.9E-324 = 1.0, with double static operands
+1.0 - -4.9E-324 = 1.0, with double static operands
+1.0 * -4.9E-324 = -4.9E-324, with double static operands
+1.0 / -4.9E-324 = -Infinity, with double static operands
+1.0 + -4.9E-324 = 1.0, with double field operands
+1.0 - -4.9E-324 = 1.0, with double field operands
+1.0 * -4.9E-324 = -4.9E-324, with double field operands
+1.0 / -4.9E-324 = -Infinity, with double field operands
+1.0 + -4.9E-324 = 1.0, with double a[i] operands
+1.0 - -4.9E-324 = 1.0, with double a[i] operands
+1.0 * -4.9E-324 = -4.9E-324, with double a[i] operands
+1.0 / -4.9E-324 = -Infinity, with double a[i] operands
+1.0 + -4.9E-324 = 1.0, with double f(x) operands
+1.0 - -4.9E-324 = 1.0, with double f(x) operands
+1.0 * -4.9E-324 = -4.9E-324, with double f(x) operands
+1.0 / -4.9E-324 = -Infinity, with double f(x) operands
+1.0 + -4.9E-324 = 1.0, with double lExpr operands
+1.0 - -4.9E-324 = 1.0, with double lExpr operands
+1.0 * -4.9E-324 = -4.9E-324, with double lExpr operands
+1.0 / -4.9E-324 = -Infinity, with double lExpr operands
+1.0 + -4.9E-324 = 1.0, with double rExpr operands
+1.0 - -4.9E-324 = 1.0, with double rExpr operands
+1.0 * -4.9E-324 = -4.9E-324, with double rExpr operands
+1.0 / -4.9E-324 = -Infinity, with double rExpr operands
+1.0 + -4.9E-324 = 1.0, with double exprs operands
+1.0 - -4.9E-324 = 1.0, with double exprs operands
+1.0 * -4.9E-324 = -4.9E-324, with double exprs operands
+1.0 / -4.9E-324 = -Infinity, with double exprs operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double param operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double local operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double static operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double field operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double a[i] operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double f(x) operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double lExpr operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double rExpr operands
+1.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+1.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+1.0 * -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+1.0 / -1.7976931348623157E308 = -5.562684646268003E-309, with double exprs operands
+1.0 + -1.0 = 0.0, with double param operands
+1.0 - -1.0 = 2.0, with double param operands
+1.0 * -1.0 = -1.0, with double param operands
+1.0 / -1.0 = -1.0, with double param operands
+1.0 + -1.0 = 0.0, with double local operands
+1.0 - -1.0 = 2.0, with double local operands
+1.0 * -1.0 = -1.0, with double local operands
+1.0 / -1.0 = -1.0, with double local operands
+1.0 + -1.0 = 0.0, with double static operands
+1.0 - -1.0 = 2.0, with double static operands
+1.0 * -1.0 = -1.0, with double static operands
+1.0 / -1.0 = -1.0, with double static operands
+1.0 + -1.0 = 0.0, with double field operands
+1.0 - -1.0 = 2.0, with double field operands
+1.0 * -1.0 = -1.0, with double field operands
+1.0 / -1.0 = -1.0, with double field operands
+1.0 + -1.0 = 0.0, with double a[i] operands
+1.0 - -1.0 = 2.0, with double a[i] operands
+1.0 * -1.0 = -1.0, with double a[i] operands
+1.0 / -1.0 = -1.0, with double a[i] operands
+1.0 + -1.0 = 0.0, with double f(x) operands
+1.0 - -1.0 = 2.0, with double f(x) operands
+1.0 * -1.0 = -1.0, with double f(x) operands
+1.0 / -1.0 = -1.0, with double f(x) operands
+1.0 + -1.0 = 0.0, with double lExpr operands
+1.0 - -1.0 = 2.0, with double lExpr operands
+1.0 * -1.0 = -1.0, with double lExpr operands
+1.0 / -1.0 = -1.0, with double lExpr operands
+1.0 + -1.0 = 0.0, with double rExpr operands
+1.0 - -1.0 = 2.0, with double rExpr operands
+1.0 * -1.0 = -1.0, with double rExpr operands
+1.0 / -1.0 = -1.0, with double rExpr operands
+1.0 + -1.0 = 0.0, with double exprs operands
+1.0 - -1.0 = 2.0, with double exprs operands
+1.0 * -1.0 = -1.0, with double exprs operands
+1.0 / -1.0 = -1.0, with double exprs operands
+1.0 + 1.0 = 2.0, with double param operands
+1.0 - 1.0 = 0.0, with double param operands
+1.0 * 1.0 = 1.0, with double param operands
+1.0 / 1.0 = 1.0, with double param operands
+1.0 + 1.0 = 2.0, with double local operands
+1.0 - 1.0 = 0.0, with double local operands
+1.0 * 1.0 = 1.0, with double local operands
+1.0 / 1.0 = 1.0, with double local operands
+1.0 + 1.0 = 2.0, with double static operands
+1.0 - 1.0 = 0.0, with double static operands
+1.0 * 1.0 = 1.0, with double static operands
+1.0 / 1.0 = 1.0, with double static operands
+1.0 + 1.0 = 2.0, with double field operands
+1.0 - 1.0 = 0.0, with double field operands
+1.0 * 1.0 = 1.0, with double field operands
+1.0 / 1.0 = 1.0, with double field operands
+1.0 + 1.0 = 2.0, with double a[i] operands
+1.0 - 1.0 = 0.0, with double a[i] operands
+1.0 * 1.0 = 1.0, with double a[i] operands
+1.0 / 1.0 = 1.0, with double a[i] operands
+1.0 + 1.0 = 2.0, with double f(x) operands
+1.0 - 1.0 = 0.0, with double f(x) operands
+1.0 * 1.0 = 1.0, with double f(x) operands
+1.0 / 1.0 = 1.0, with double f(x) operands
+1.0 + 1.0 = 2.0, with double lExpr operands
+1.0 - 1.0 = 0.0, with double lExpr operands
+1.0 * 1.0 = 1.0, with double lExpr operands
+1.0 / 1.0 = 1.0, with double lExpr operands
+1.0 + 1.0 = 2.0, with double rExpr operands
+1.0 - 1.0 = 0.0, with double rExpr operands
+1.0 * 1.0 = 1.0, with double rExpr operands
+1.0 / 1.0 = 1.0, with double rExpr operands
+1.0 + 1.0 = 2.0, with double exprs operands
+1.0 - 1.0 = 0.0, with double exprs operands
+1.0 * 1.0 = 1.0, with double exprs operands
+1.0 / 1.0 = 1.0, with double exprs operands
+1.0 + -0.0 = 1.0, with double param operands
+1.0 - -0.0 = 1.0, with double param operands
+1.0 * -0.0 = -0.0, with double param operands
+1.0 / -0.0 = -Infinity, with double param operands
+1.0 + -0.0 = 1.0, with double local operands
+1.0 - -0.0 = 1.0, with double local operands
+1.0 * -0.0 = -0.0, with double local operands
+1.0 / -0.0 = -Infinity, with double local operands
+1.0 + -0.0 = 1.0, with double static operands
+1.0 - -0.0 = 1.0, with double static operands
+1.0 * -0.0 = -0.0, with double static operands
+1.0 / -0.0 = -Infinity, with double static operands
+1.0 + -0.0 = 1.0, with double field operands
+1.0 - -0.0 = 1.0, with double field operands
+1.0 * -0.0 = -0.0, with double field operands
+1.0 / -0.0 = -Infinity, with double field operands
+1.0 + -0.0 = 1.0, with double a[i] operands
+1.0 - -0.0 = 1.0, with double a[i] operands
+1.0 * -0.0 = -0.0, with double a[i] operands
+1.0 / -0.0 = -Infinity, with double a[i] operands
+1.0 + -0.0 = 1.0, with double f(x) operands
+1.0 - -0.0 = 1.0, with double f(x) operands
+1.0 * -0.0 = -0.0, with double f(x) operands
+1.0 / -0.0 = -Infinity, with double f(x) operands
+1.0 + -0.0 = 1.0, with double lExpr operands
+1.0 - -0.0 = 1.0, with double lExpr operands
+1.0 * -0.0 = -0.0, with double lExpr operands
+1.0 / -0.0 = -Infinity, with double lExpr operands
+1.0 + 0.0 = 1.0, with double rExpr operands
+1.0 - 0.0 = 1.0, with double rExpr operands
+1.0 * 0.0 = 0.0, with double rExpr operands
+1.0 / 0.0 = Infinity, with double rExpr operands
+1.0 + 0.0 = 1.0, with double exprs operands
+1.0 - 0.0 = 1.0, with double exprs operands
+1.0 * 0.0 = 0.0, with double exprs operands
+1.0 / 0.0 = Infinity, with double exprs operands
+1.0 + 0.0 = 1.0, with double param operands
+1.0 - 0.0 = 1.0, with double param operands
+1.0 * 0.0 = 0.0, with double param operands
+1.0 / 0.0 = Infinity, with double param operands
+1.0 + 0.0 = 1.0, with double local operands
+1.0 - 0.0 = 1.0, with double local operands
+1.0 * 0.0 = 0.0, with double local operands
+1.0 / 0.0 = Infinity, with double local operands
+1.0 + 0.0 = 1.0, with double static operands
+1.0 - 0.0 = 1.0, with double static operands
+1.0 * 0.0 = 0.0, with double static operands
+1.0 / 0.0 = Infinity, with double static operands
+1.0 + 0.0 = 1.0, with double field operands
+1.0 - 0.0 = 1.0, with double field operands
+1.0 * 0.0 = 0.0, with double field operands
+1.0 / 0.0 = Infinity, with double field operands
+1.0 + 0.0 = 1.0, with double a[i] operands
+1.0 - 0.0 = 1.0, with double a[i] operands
+1.0 * 0.0 = 0.0, with double a[i] operands
+1.0 / 0.0 = Infinity, with double a[i] operands
+1.0 + 0.0 = 1.0, with double f(x) operands
+1.0 - 0.0 = 1.0, with double f(x) operands
+1.0 * 0.0 = 0.0, with double f(x) operands
+1.0 / 0.0 = Infinity, with double f(x) operands
+1.0 + 0.0 = 1.0, with double lExpr operands
+1.0 - 0.0 = 1.0, with double lExpr operands
+1.0 * 0.0 = 0.0, with double lExpr operands
+1.0 / 0.0 = Infinity, with double lExpr operands
+1.0 + 0.0 = 1.0, with double rExpr operands
+1.0 - 0.0 = 1.0, with double rExpr operands
+1.0 * 0.0 = 0.0, with double rExpr operands
+1.0 / 0.0 = Infinity, with double rExpr operands
+1.0 + 0.0 = 1.0, with double exprs operands
+1.0 - 0.0 = 1.0, with double exprs operands
+1.0 * 0.0 = 0.0, with double exprs operands
+1.0 / 0.0 = Infinity, with double exprs operands
+1.0 + -Infinity = -Infinity, with double param operands
+1.0 - -Infinity = Infinity, with double param operands
+1.0 * -Infinity = -Infinity, with double param operands
+1.0 / -Infinity = -0.0, with double param operands
+1.0 + -Infinity = -Infinity, with double local operands
+1.0 - -Infinity = Infinity, with double local operands
+1.0 * -Infinity = -Infinity, with double local operands
+1.0 / -Infinity = -0.0, with double local operands
+1.0 + -Infinity = -Infinity, with double static operands
+1.0 - -Infinity = Infinity, with double static operands
+1.0 * -Infinity = -Infinity, with double static operands
+1.0 / -Infinity = -0.0, with double static operands
+1.0 + -Infinity = -Infinity, with double field operands
+1.0 - -Infinity = Infinity, with double field operands
+1.0 * -Infinity = -Infinity, with double field operands
+1.0 / -Infinity = -0.0, with double field operands
+1.0 + -Infinity = -Infinity, with double a[i] operands
+1.0 - -Infinity = Infinity, with double a[i] operands
+1.0 * -Infinity = -Infinity, with double a[i] operands
+1.0 / -Infinity = -0.0, with double a[i] operands
+1.0 + -Infinity = -Infinity, with double f(x) operands
+1.0 - -Infinity = Infinity, with double f(x) operands
+1.0 * -Infinity = -Infinity, with double f(x) operands
+1.0 / -Infinity = -0.0, with double f(x) operands
+1.0 + -Infinity = -Infinity, with double lExpr operands
+1.0 - -Infinity = Infinity, with double lExpr operands
+1.0 * -Infinity = -Infinity, with double lExpr operands
+1.0 / -Infinity = -0.0, with double lExpr operands
+1.0 + -Infinity = -Infinity, with double rExpr operands
+1.0 - -Infinity = Infinity, with double rExpr operands
+1.0 * -Infinity = -Infinity, with double rExpr operands
+1.0 / -Infinity = -0.0, with double rExpr operands
+1.0 + -Infinity = -Infinity, with double exprs operands
+1.0 - -Infinity = Infinity, with double exprs operands
+1.0 * -Infinity = -Infinity, with double exprs operands
+1.0 / -Infinity = -0.0, with double exprs operands
+1.0 + Infinity = Infinity, with double param operands
+1.0 - Infinity = -Infinity, with double param operands
+1.0 * Infinity = Infinity, with double param operands
+1.0 / Infinity = 0.0, with double param operands
+1.0 + Infinity = Infinity, with double local operands
+1.0 - Infinity = -Infinity, with double local operands
+1.0 * Infinity = Infinity, with double local operands
+1.0 / Infinity = 0.0, with double local operands
+1.0 + Infinity = Infinity, with double static operands
+1.0 - Infinity = -Infinity, with double static operands
+1.0 * Infinity = Infinity, with double static operands
+1.0 / Infinity = 0.0, with double static operands
+1.0 + Infinity = Infinity, with double field operands
+1.0 - Infinity = -Infinity, with double field operands
+1.0 * Infinity = Infinity, with double field operands
+1.0 / Infinity = 0.0, with double field operands
+1.0 + Infinity = Infinity, with double a[i] operands
+1.0 - Infinity = -Infinity, with double a[i] operands
+1.0 * Infinity = Infinity, with double a[i] operands
+1.0 / Infinity = 0.0, with double a[i] operands
+1.0 + Infinity = Infinity, with double f(x) operands
+1.0 - Infinity = -Infinity, with double f(x) operands
+1.0 * Infinity = Infinity, with double f(x) operands
+1.0 / Infinity = 0.0, with double f(x) operands
+1.0 + Infinity = Infinity, with double lExpr operands
+1.0 - Infinity = -Infinity, with double lExpr operands
+1.0 * Infinity = Infinity, with double lExpr operands
+1.0 / Infinity = 0.0, with double lExpr operands
+1.0 + Infinity = Infinity, with double rExpr operands
+1.0 - Infinity = -Infinity, with double rExpr operands
+1.0 * Infinity = Infinity, with double rExpr operands
+1.0 / Infinity = 0.0, with double rExpr operands
+1.0 + Infinity = Infinity, with double exprs operands
+1.0 - Infinity = -Infinity, with double exprs operands
+1.0 * Infinity = Infinity, with double exprs operands
+1.0 / Infinity = 0.0, with double exprs operands
+1.0 + NaN = NaN, with double param operands
+1.0 - NaN = NaN, with double param operands
+1.0 * NaN = NaN, with double param operands
+1.0 / NaN = NaN, with double param operands
+1.0 + NaN = NaN, with double local operands
+1.0 - NaN = NaN, with double local operands
+1.0 * NaN = NaN, with double local operands
+1.0 / NaN = NaN, with double local operands
+1.0 + NaN = NaN, with double static operands
+1.0 - NaN = NaN, with double static operands
+1.0 * NaN = NaN, with double static operands
+1.0 / NaN = NaN, with double static operands
+1.0 + NaN = NaN, with double field operands
+1.0 - NaN = NaN, with double field operands
+1.0 * NaN = NaN, with double field operands
+1.0 / NaN = NaN, with double field operands
+1.0 + NaN = NaN, with double a[i] operands
+1.0 - NaN = NaN, with double a[i] operands
+1.0 * NaN = NaN, with double a[i] operands
+1.0 / NaN = NaN, with double a[i] operands
+1.0 + NaN = NaN, with double f(x) operands
+1.0 - NaN = NaN, with double f(x) operands
+1.0 * NaN = NaN, with double f(x) operands
+1.0 / NaN = NaN, with double f(x) operands
+1.0 + NaN = NaN, with double lExpr operands
+1.0 - NaN = NaN, with double lExpr operands
+1.0 * NaN = NaN, with double lExpr operands
+1.0 / NaN = NaN, with double lExpr operands
+1.0 + NaN = NaN, with double rExpr operands
+1.0 - NaN = NaN, with double rExpr operands
+1.0 * NaN = NaN, with double rExpr operands
+1.0 / NaN = NaN, with double rExpr operands
+1.0 + NaN = NaN, with double exprs operands
+1.0 - NaN = NaN, with double exprs operands
+1.0 * NaN = NaN, with double exprs operands
+1.0 / NaN = NaN, with double exprs operands
+-0.0 + 4.9E-324 = 4.9E-324, with double param operands
+-0.0 - 4.9E-324 = -4.9E-324, with double param operands
+-0.0 * 4.9E-324 = -0.0, with double param operands
+-0.0 / 4.9E-324 = -0.0, with double param operands
+-0.0 + 4.9E-324 = 4.9E-324, with double local operands
+-0.0 - 4.9E-324 = -4.9E-324, with double local operands
+-0.0 * 4.9E-324 = -0.0, with double local operands
+-0.0 / 4.9E-324 = -0.0, with double local operands
+-0.0 + 4.9E-324 = 4.9E-324, with double static operands
+-0.0 - 4.9E-324 = -4.9E-324, with double static operands
+-0.0 * 4.9E-324 = -0.0, with double static operands
+-0.0 / 4.9E-324 = -0.0, with double static operands
+-0.0 + 4.9E-324 = 4.9E-324, with double field operands
+-0.0 - 4.9E-324 = -4.9E-324, with double field operands
+-0.0 * 4.9E-324 = -0.0, with double field operands
+-0.0 / 4.9E-324 = -0.0, with double field operands
+-0.0 + 4.9E-324 = 4.9E-324, with double a[i] operands
+-0.0 - 4.9E-324 = -4.9E-324, with double a[i] operands
+-0.0 * 4.9E-324 = -0.0, with double a[i] operands
+-0.0 / 4.9E-324 = -0.0, with double a[i] operands
+-0.0 + 4.9E-324 = 4.9E-324, with double f(x) operands
+-0.0 - 4.9E-324 = -4.9E-324, with double f(x) operands
+-0.0 * 4.9E-324 = -0.0, with double f(x) operands
+-0.0 / 4.9E-324 = -0.0, with double f(x) operands
+0.0 + 4.9E-324 = 4.9E-324, with double lExpr operands
+0.0 - 4.9E-324 = -4.9E-324, with double lExpr operands
+0.0 * 4.9E-324 = 0.0, with double lExpr operands
+0.0 / 4.9E-324 = 0.0, with double lExpr operands
+-0.0 + 4.9E-324 = 4.9E-324, with double rExpr operands
+-0.0 - 4.9E-324 = -4.9E-324, with double rExpr operands
+-0.0 * 4.9E-324 = -0.0, with double rExpr operands
+-0.0 / 4.9E-324 = -0.0, with double rExpr operands
+0.0 + 4.9E-324 = 4.9E-324, with double exprs operands
+0.0 - 4.9E-324 = -4.9E-324, with double exprs operands
+0.0 * 4.9E-324 = 0.0, with double exprs operands
+0.0 / 4.9E-324 = 0.0, with double exprs operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double param operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double param operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double local operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double local operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double static operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double static operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double field operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double field operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double a[i] operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double a[i] operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double f(x) operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double f(x) operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+0.0 * 1.7976931348623157E308 = 0.0, with double lExpr operands
+0.0 / 1.7976931348623157E308 = 0.0, with double lExpr operands
+-0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-0.0 * 1.7976931348623157E308 = -0.0, with double rExpr operands
+-0.0 / 1.7976931348623157E308 = -0.0, with double rExpr operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+0.0 * 1.7976931348623157E308 = 0.0, with double exprs operands
+0.0 / 1.7976931348623157E308 = 0.0, with double exprs operands
+-0.0 + -4.9E-324 = -4.9E-324, with double param operands
+-0.0 - -4.9E-324 = 4.9E-324, with double param operands
+-0.0 * -4.9E-324 = 0.0, with double param operands
+-0.0 / -4.9E-324 = 0.0, with double param operands
+-0.0 + -4.9E-324 = -4.9E-324, with double local operands
+-0.0 - -4.9E-324 = 4.9E-324, with double local operands
+-0.0 * -4.9E-324 = 0.0, with double local operands
+-0.0 / -4.9E-324 = 0.0, with double local operands
+-0.0 + -4.9E-324 = -4.9E-324, with double static operands
+-0.0 - -4.9E-324 = 4.9E-324, with double static operands
+-0.0 * -4.9E-324 = 0.0, with double static operands
+-0.0 / -4.9E-324 = 0.0, with double static operands
+-0.0 + -4.9E-324 = -4.9E-324, with double field operands
+-0.0 - -4.9E-324 = 4.9E-324, with double field operands
+-0.0 * -4.9E-324 = 0.0, with double field operands
+-0.0 / -4.9E-324 = 0.0, with double field operands
+-0.0 + -4.9E-324 = -4.9E-324, with double a[i] operands
+-0.0 - -4.9E-324 = 4.9E-324, with double a[i] operands
+-0.0 * -4.9E-324 = 0.0, with double a[i] operands
+-0.0 / -4.9E-324 = 0.0, with double a[i] operands
+-0.0 + -4.9E-324 = -4.9E-324, with double f(x) operands
+-0.0 - -4.9E-324 = 4.9E-324, with double f(x) operands
+-0.0 * -4.9E-324 = 0.0, with double f(x) operands
+-0.0 / -4.9E-324 = 0.0, with double f(x) operands
+0.0 + -4.9E-324 = -4.9E-324, with double lExpr operands
+0.0 - -4.9E-324 = 4.9E-324, with double lExpr operands
+0.0 * -4.9E-324 = -0.0, with double lExpr operands
+0.0 / -4.9E-324 = -0.0, with double lExpr operands
+-0.0 + -4.9E-324 = -4.9E-324, with double rExpr operands
+-0.0 - -4.9E-324 = 4.9E-324, with double rExpr operands
+-0.0 * -4.9E-324 = 0.0, with double rExpr operands
+-0.0 / -4.9E-324 = 0.0, with double rExpr operands
+0.0 + -4.9E-324 = -4.9E-324, with double exprs operands
+0.0 - -4.9E-324 = 4.9E-324, with double exprs operands
+0.0 * -4.9E-324 = -0.0, with double exprs operands
+0.0 / -4.9E-324 = -0.0, with double exprs operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double param operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double param operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double local operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double local operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double static operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double static operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double field operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double field operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double a[i] operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double a[i] operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double f(x) operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double f(x) operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+0.0 * -1.7976931348623157E308 = -0.0, with double lExpr operands
+0.0 / -1.7976931348623157E308 = -0.0, with double lExpr operands
+-0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+-0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+-0.0 * -1.7976931348623157E308 = 0.0, with double rExpr operands
+-0.0 / -1.7976931348623157E308 = 0.0, with double rExpr operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+0.0 * -1.7976931348623157E308 = -0.0, with double exprs operands
+0.0 / -1.7976931348623157E308 = -0.0, with double exprs operands
+-0.0 + -1.0 = -1.0, with double param operands
+-0.0 - -1.0 = 1.0, with double param operands
+-0.0 * -1.0 = 0.0, with double param operands
+-0.0 / -1.0 = 0.0, with double param operands
+-0.0 + -1.0 = -1.0, with double local operands
+-0.0 - -1.0 = 1.0, with double local operands
+-0.0 * -1.0 = 0.0, with double local operands
+-0.0 / -1.0 = 0.0, with double local operands
+-0.0 + -1.0 = -1.0, with double static operands
+-0.0 - -1.0 = 1.0, with double static operands
+-0.0 * -1.0 = 0.0, with double static operands
+-0.0 / -1.0 = 0.0, with double static operands
+-0.0 + -1.0 = -1.0, with double field operands
+-0.0 - -1.0 = 1.0, with double field operands
+-0.0 * -1.0 = 0.0, with double field operands
+-0.0 / -1.0 = 0.0, with double field operands
+-0.0 + -1.0 = -1.0, with double a[i] operands
+-0.0 - -1.0 = 1.0, with double a[i] operands
+-0.0 * -1.0 = 0.0, with double a[i] operands
+-0.0 / -1.0 = 0.0, with double a[i] operands
+-0.0 + -1.0 = -1.0, with double f(x) operands
+-0.0 - -1.0 = 1.0, with double f(x) operands
+-0.0 * -1.0 = 0.0, with double f(x) operands
+-0.0 / -1.0 = 0.0, with double f(x) operands
+0.0 + -1.0 = -1.0, with double lExpr operands
+0.0 - -1.0 = 1.0, with double lExpr operands
+0.0 * -1.0 = -0.0, with double lExpr operands
+0.0 / -1.0 = -0.0, with double lExpr operands
+-0.0 + -1.0 = -1.0, with double rExpr operands
+-0.0 - -1.0 = 1.0, with double rExpr operands
+-0.0 * -1.0 = 0.0, with double rExpr operands
+-0.0 / -1.0 = 0.0, with double rExpr operands
+0.0 + -1.0 = -1.0, with double exprs operands
+0.0 - -1.0 = 1.0, with double exprs operands
+0.0 * -1.0 = -0.0, with double exprs operands
+0.0 / -1.0 = -0.0, with double exprs operands
+-0.0 + 1.0 = 1.0, with double param operands
+-0.0 - 1.0 = -1.0, with double param operands
+-0.0 * 1.0 = -0.0, with double param operands
+-0.0 / 1.0 = -0.0, with double param operands
+-0.0 + 1.0 = 1.0, with double local operands
+-0.0 - 1.0 = -1.0, with double local operands
+-0.0 * 1.0 = -0.0, with double local operands
+-0.0 / 1.0 = -0.0, with double local operands
+-0.0 + 1.0 = 1.0, with double static operands
+-0.0 - 1.0 = -1.0, with double static operands
+-0.0 * 1.0 = -0.0, with double static operands
+-0.0 / 1.0 = -0.0, with double static operands
+-0.0 + 1.0 = 1.0, with double field operands
+-0.0 - 1.0 = -1.0, with double field operands
+-0.0 * 1.0 = -0.0, with double field operands
+-0.0 / 1.0 = -0.0, with double field operands
+-0.0 + 1.0 = 1.0, with double a[i] operands
+-0.0 - 1.0 = -1.0, with double a[i] operands
+-0.0 * 1.0 = -0.0, with double a[i] operands
+-0.0 / 1.0 = -0.0, with double a[i] operands
+-0.0 + 1.0 = 1.0, with double f(x) operands
+-0.0 - 1.0 = -1.0, with double f(x) operands
+-0.0 * 1.0 = -0.0, with double f(x) operands
+-0.0 / 1.0 = -0.0, with double f(x) operands
+0.0 + 1.0 = 1.0, with double lExpr operands
+0.0 - 1.0 = -1.0, with double lExpr operands
+0.0 * 1.0 = 0.0, with double lExpr operands
+0.0 / 1.0 = 0.0, with double lExpr operands
+-0.0 + 1.0 = 1.0, with double rExpr operands
+-0.0 - 1.0 = -1.0, with double rExpr operands
+-0.0 * 1.0 = -0.0, with double rExpr operands
+-0.0 / 1.0 = -0.0, with double rExpr operands
+0.0 + 1.0 = 1.0, with double exprs operands
+0.0 - 1.0 = -1.0, with double exprs operands
+0.0 * 1.0 = 0.0, with double exprs operands
+0.0 / 1.0 = 0.0, with double exprs operands
+-0.0 + -0.0 = -0.0, with double param operands
+-0.0 - -0.0 = 0.0, with double param operands
+-0.0 * -0.0 = 0.0, with double param operands
+-0.0 / -0.0 = NaN, with double param operands
+-0.0 + -0.0 = -0.0, with double local operands
+-0.0 - -0.0 = 0.0, with double local operands
+-0.0 * -0.0 = 0.0, with double local operands
+-0.0 / -0.0 = NaN, with double local operands
+-0.0 + -0.0 = -0.0, with double static operands
+-0.0 - -0.0 = 0.0, with double static operands
+-0.0 * -0.0 = 0.0, with double static operands
+-0.0 / -0.0 = NaN, with double static operands
+-0.0 + -0.0 = -0.0, with double field operands
+-0.0 - -0.0 = 0.0, with double field operands
+-0.0 * -0.0 = 0.0, with double field operands
+-0.0 / -0.0 = NaN, with double field operands
+-0.0 + -0.0 = -0.0, with double a[i] operands
+-0.0 - -0.0 = 0.0, with double a[i] operands
+-0.0 * -0.0 = 0.0, with double a[i] operands
+-0.0 / -0.0 = NaN, with double a[i] operands
+-0.0 + -0.0 = -0.0, with double f(x) operands
+-0.0 - -0.0 = 0.0, with double f(x) operands
+-0.0 * -0.0 = 0.0, with double f(x) operands
+-0.0 / -0.0 = NaN, with double f(x) operands
+0.0 + -0.0 = 0.0, with double lExpr operands
+0.0 - -0.0 = 0.0, with double lExpr operands
+0.0 * -0.0 = -0.0, with double lExpr operands
+0.0 / -0.0 = NaN, with double lExpr operands
+-0.0 + 0.0 = 0.0, with double rExpr operands
+-0.0 - 0.0 = -0.0, with double rExpr operands
+-0.0 * 0.0 = -0.0, with double rExpr operands
+-0.0 / 0.0 = NaN, with double rExpr operands
+0.0 + 0.0 = 0.0, with double exprs operands
+0.0 - 0.0 = 0.0, with double exprs operands
+0.0 * 0.0 = 0.0, with double exprs operands
+0.0 / 0.0 = NaN, with double exprs operands
+-0.0 + 0.0 = 0.0, with double param operands
+-0.0 - 0.0 = -0.0, with double param operands
+-0.0 * 0.0 = -0.0, with double param operands
+-0.0 / 0.0 = NaN, with double param operands
+-0.0 + 0.0 = 0.0, with double local operands
+-0.0 - 0.0 = -0.0, with double local operands
+-0.0 * 0.0 = -0.0, with double local operands
+-0.0 / 0.0 = NaN, with double local operands
+-0.0 + 0.0 = 0.0, with double static operands
+-0.0 - 0.0 = -0.0, with double static operands
+-0.0 * 0.0 = -0.0, with double static operands
+-0.0 / 0.0 = NaN, with double static operands
+-0.0 + 0.0 = 0.0, with double field operands
+-0.0 - 0.0 = -0.0, with double field operands
+-0.0 * 0.0 = -0.0, with double field operands
+-0.0 / 0.0 = NaN, with double field operands
+-0.0 + 0.0 = 0.0, with double a[i] operands
+-0.0 - 0.0 = -0.0, with double a[i] operands
+-0.0 * 0.0 = -0.0, with double a[i] operands
+-0.0 / 0.0 = NaN, with double a[i] operands
+-0.0 + 0.0 = 0.0, with double f(x) operands
+-0.0 - 0.0 = -0.0, with double f(x) operands
+-0.0 * 0.0 = -0.0, with double f(x) operands
+-0.0 / 0.0 = NaN, with double f(x) operands
+0.0 + 0.0 = 0.0, with double lExpr operands
+0.0 - 0.0 = 0.0, with double lExpr operands
+0.0 * 0.0 = 0.0, with double lExpr operands
+0.0 / 0.0 = NaN, with double lExpr operands
+-0.0 + 0.0 = 0.0, with double rExpr operands
+-0.0 - 0.0 = -0.0, with double rExpr operands
+-0.0 * 0.0 = -0.0, with double rExpr operands
+-0.0 / 0.0 = NaN, with double rExpr operands
+0.0 + 0.0 = 0.0, with double exprs operands
+0.0 - 0.0 = 0.0, with double exprs operands
+0.0 * 0.0 = 0.0, with double exprs operands
+0.0 / 0.0 = NaN, with double exprs operands
+-0.0 + -Infinity = -Infinity, with double param operands
+-0.0 - -Infinity = Infinity, with double param operands
+-0.0 * -Infinity = NaN, with double param operands
+-0.0 / -Infinity = 0.0, with double param operands
+-0.0 + -Infinity = -Infinity, with double local operands
+-0.0 - -Infinity = Infinity, with double local operands
+-0.0 * -Infinity = NaN, with double local operands
+-0.0 / -Infinity = 0.0, with double local operands
+-0.0 + -Infinity = -Infinity, with double static operands
+-0.0 - -Infinity = Infinity, with double static operands
+-0.0 * -Infinity = NaN, with double static operands
+-0.0 / -Infinity = 0.0, with double static operands
+-0.0 + -Infinity = -Infinity, with double field operands
+-0.0 - -Infinity = Infinity, with double field operands
+-0.0 * -Infinity = NaN, with double field operands
+-0.0 / -Infinity = 0.0, with double field operands
+-0.0 + -Infinity = -Infinity, with double a[i] operands
+-0.0 - -Infinity = Infinity, with double a[i] operands
+-0.0 * -Infinity = NaN, with double a[i] operands
+-0.0 / -Infinity = 0.0, with double a[i] operands
+-0.0 + -Infinity = -Infinity, with double f(x) operands
+-0.0 - -Infinity = Infinity, with double f(x) operands
+-0.0 * -Infinity = NaN, with double f(x) operands
+-0.0 / -Infinity = 0.0, with double f(x) operands
+0.0 + -Infinity = -Infinity, with double lExpr operands
+0.0 - -Infinity = Infinity, with double lExpr operands
+0.0 * -Infinity = NaN, with double lExpr operands
+0.0 / -Infinity = -0.0, with double lExpr operands
+-0.0 + -Infinity = -Infinity, with double rExpr operands
+-0.0 - -Infinity = Infinity, with double rExpr operands
+-0.0 * -Infinity = NaN, with double rExpr operands
+-0.0 / -Infinity = 0.0, with double rExpr operands
+0.0 + -Infinity = -Infinity, with double exprs operands
+0.0 - -Infinity = Infinity, with double exprs operands
+0.0 * -Infinity = NaN, with double exprs operands
+0.0 / -Infinity = -0.0, with double exprs operands
+-0.0 + Infinity = Infinity, with double param operands
+-0.0 - Infinity = -Infinity, with double param operands
+-0.0 * Infinity = NaN, with double param operands
+-0.0 / Infinity = -0.0, with double param operands
+-0.0 + Infinity = Infinity, with double local operands
+-0.0 - Infinity = -Infinity, with double local operands
+-0.0 * Infinity = NaN, with double local operands
+-0.0 / Infinity = -0.0, with double local operands
+-0.0 + Infinity = Infinity, with double static operands
+-0.0 - Infinity = -Infinity, with double static operands
+-0.0 * Infinity = NaN, with double static operands
+-0.0 / Infinity = -0.0, with double static operands
+-0.0 + Infinity = Infinity, with double field operands
+-0.0 - Infinity = -Infinity, with double field operands
+-0.0 * Infinity = NaN, with double field operands
+-0.0 / Infinity = -0.0, with double field operands
+-0.0 + Infinity = Infinity, with double a[i] operands
+-0.0 - Infinity = -Infinity, with double a[i] operands
+-0.0 * Infinity = NaN, with double a[i] operands
+-0.0 / Infinity = -0.0, with double a[i] operands
+-0.0 + Infinity = Infinity, with double f(x) operands
+-0.0 - Infinity = -Infinity, with double f(x) operands
+-0.0 * Infinity = NaN, with double f(x) operands
+-0.0 / Infinity = -0.0, with double f(x) operands
+0.0 + Infinity = Infinity, with double lExpr operands
+0.0 - Infinity = -Infinity, with double lExpr operands
+0.0 * Infinity = NaN, with double lExpr operands
+0.0 / Infinity = 0.0, with double lExpr operands
+-0.0 + Infinity = Infinity, with double rExpr operands
+-0.0 - Infinity = -Infinity, with double rExpr operands
+-0.0 * Infinity = NaN, with double rExpr operands
+-0.0 / Infinity = -0.0, with double rExpr operands
+0.0 + Infinity = Infinity, with double exprs operands
+0.0 - Infinity = -Infinity, with double exprs operands
+0.0 * Infinity = NaN, with double exprs operands
+0.0 / Infinity = 0.0, with double exprs operands
+-0.0 + NaN = NaN, with double param operands
+-0.0 - NaN = NaN, with double param operands
+-0.0 * NaN = NaN, with double param operands
+-0.0 / NaN = NaN, with double param operands
+-0.0 + NaN = NaN, with double local operands
+-0.0 - NaN = NaN, with double local operands
+-0.0 * NaN = NaN, with double local operands
+-0.0 / NaN = NaN, with double local operands
+-0.0 + NaN = NaN, with double static operands
+-0.0 - NaN = NaN, with double static operands
+-0.0 * NaN = NaN, with double static operands
+-0.0 / NaN = NaN, with double static operands
+-0.0 + NaN = NaN, with double field operands
+-0.0 - NaN = NaN, with double field operands
+-0.0 * NaN = NaN, with double field operands
+-0.0 / NaN = NaN, with double field operands
+-0.0 + NaN = NaN, with double a[i] operands
+-0.0 - NaN = NaN, with double a[i] operands
+-0.0 * NaN = NaN, with double a[i] operands
+-0.0 / NaN = NaN, with double a[i] operands
+-0.0 + NaN = NaN, with double f(x) operands
+-0.0 - NaN = NaN, with double f(x) operands
+-0.0 * NaN = NaN, with double f(x) operands
+-0.0 / NaN = NaN, with double f(x) operands
+0.0 + NaN = NaN, with double lExpr operands
+0.0 - NaN = NaN, with double lExpr operands
+0.0 * NaN = NaN, with double lExpr operands
+0.0 / NaN = NaN, with double lExpr operands
+-0.0 + NaN = NaN, with double rExpr operands
+-0.0 - NaN = NaN, with double rExpr operands
+-0.0 * NaN = NaN, with double rExpr operands
+-0.0 / NaN = NaN, with double rExpr operands
+0.0 + NaN = NaN, with double exprs operands
+0.0 - NaN = NaN, with double exprs operands
+0.0 * NaN = NaN, with double exprs operands
+0.0 / NaN = NaN, with double exprs operands
+0.0 + 4.9E-324 = 4.9E-324, with double param operands
+0.0 - 4.9E-324 = -4.9E-324, with double param operands
+0.0 * 4.9E-324 = 0.0, with double param operands
+0.0 / 4.9E-324 = 0.0, with double param operands
+0.0 + 4.9E-324 = 4.9E-324, with double local operands
+0.0 - 4.9E-324 = -4.9E-324, with double local operands
+0.0 * 4.9E-324 = 0.0, with double local operands
+0.0 / 4.9E-324 = 0.0, with double local operands
+0.0 + 4.9E-324 = 4.9E-324, with double static operands
+0.0 - 4.9E-324 = -4.9E-324, with double static operands
+0.0 * 4.9E-324 = 0.0, with double static operands
+0.0 / 4.9E-324 = 0.0, with double static operands
+0.0 + 4.9E-324 = 4.9E-324, with double field operands
+0.0 - 4.9E-324 = -4.9E-324, with double field operands
+0.0 * 4.9E-324 = 0.0, with double field operands
+0.0 / 4.9E-324 = 0.0, with double field operands
+0.0 + 4.9E-324 = 4.9E-324, with double a[i] operands
+0.0 - 4.9E-324 = -4.9E-324, with double a[i] operands
+0.0 * 4.9E-324 = 0.0, with double a[i] operands
+0.0 / 4.9E-324 = 0.0, with double a[i] operands
+0.0 + 4.9E-324 = 4.9E-324, with double f(x) operands
+0.0 - 4.9E-324 = -4.9E-324, with double f(x) operands
+0.0 * 4.9E-324 = 0.0, with double f(x) operands
+0.0 / 4.9E-324 = 0.0, with double f(x) operands
+0.0 + 4.9E-324 = 4.9E-324, with double lExpr operands
+0.0 - 4.9E-324 = -4.9E-324, with double lExpr operands
+0.0 * 4.9E-324 = 0.0, with double lExpr operands
+0.0 / 4.9E-324 = 0.0, with double lExpr operands
+0.0 + 4.9E-324 = 4.9E-324, with double rExpr operands
+0.0 - 4.9E-324 = -4.9E-324, with double rExpr operands
+0.0 * 4.9E-324 = 0.0, with double rExpr operands
+0.0 / 4.9E-324 = 0.0, with double rExpr operands
+0.0 + 4.9E-324 = 4.9E-324, with double exprs operands
+0.0 - 4.9E-324 = -4.9E-324, with double exprs operands
+0.0 * 4.9E-324 = 0.0, with double exprs operands
+0.0 / 4.9E-324 = 0.0, with double exprs operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+0.0 * 1.7976931348623157E308 = 0.0, with double param operands
+0.0 / 1.7976931348623157E308 = 0.0, with double param operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+0.0 * 1.7976931348623157E308 = 0.0, with double local operands
+0.0 / 1.7976931348623157E308 = 0.0, with double local operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+0.0 * 1.7976931348623157E308 = 0.0, with double static operands
+0.0 / 1.7976931348623157E308 = 0.0, with double static operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+0.0 * 1.7976931348623157E308 = 0.0, with double field operands
+0.0 / 1.7976931348623157E308 = 0.0, with double field operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+0.0 * 1.7976931348623157E308 = 0.0, with double a[i] operands
+0.0 / 1.7976931348623157E308 = 0.0, with double a[i] operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+0.0 * 1.7976931348623157E308 = 0.0, with double f(x) operands
+0.0 / 1.7976931348623157E308 = 0.0, with double f(x) operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+0.0 * 1.7976931348623157E308 = 0.0, with double lExpr operands
+0.0 / 1.7976931348623157E308 = 0.0, with double lExpr operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+0.0 * 1.7976931348623157E308 = 0.0, with double rExpr operands
+0.0 / 1.7976931348623157E308 = 0.0, with double rExpr operands
+0.0 + 1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+0.0 - 1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+0.0 * 1.7976931348623157E308 = 0.0, with double exprs operands
+0.0 / 1.7976931348623157E308 = 0.0, with double exprs operands
+0.0 + -4.9E-324 = -4.9E-324, with double param operands
+0.0 - -4.9E-324 = 4.9E-324, with double param operands
+0.0 * -4.9E-324 = -0.0, with double param operands
+0.0 / -4.9E-324 = -0.0, with double param operands
+0.0 + -4.9E-324 = -4.9E-324, with double local operands
+0.0 - -4.9E-324 = 4.9E-324, with double local operands
+0.0 * -4.9E-324 = -0.0, with double local operands
+0.0 / -4.9E-324 = -0.0, with double local operands
+0.0 + -4.9E-324 = -4.9E-324, with double static operands
+0.0 - -4.9E-324 = 4.9E-324, with double static operands
+0.0 * -4.9E-324 = -0.0, with double static operands
+0.0 / -4.9E-324 = -0.0, with double static operands
+0.0 + -4.9E-324 = -4.9E-324, with double field operands
+0.0 - -4.9E-324 = 4.9E-324, with double field operands
+0.0 * -4.9E-324 = -0.0, with double field operands
+0.0 / -4.9E-324 = -0.0, with double field operands
+0.0 + -4.9E-324 = -4.9E-324, with double a[i] operands
+0.0 - -4.9E-324 = 4.9E-324, with double a[i] operands
+0.0 * -4.9E-324 = -0.0, with double a[i] operands
+0.0 / -4.9E-324 = -0.0, with double a[i] operands
+0.0 + -4.9E-324 = -4.9E-324, with double f(x) operands
+0.0 - -4.9E-324 = 4.9E-324, with double f(x) operands
+0.0 * -4.9E-324 = -0.0, with double f(x) operands
+0.0 / -4.9E-324 = -0.0, with double f(x) operands
+0.0 + -4.9E-324 = -4.9E-324, with double lExpr operands
+0.0 - -4.9E-324 = 4.9E-324, with double lExpr operands
+0.0 * -4.9E-324 = -0.0, with double lExpr operands
+0.0 / -4.9E-324 = -0.0, with double lExpr operands
+0.0 + -4.9E-324 = -4.9E-324, with double rExpr operands
+0.0 - -4.9E-324 = 4.9E-324, with double rExpr operands
+0.0 * -4.9E-324 = -0.0, with double rExpr operands
+0.0 / -4.9E-324 = -0.0, with double rExpr operands
+0.0 + -4.9E-324 = -4.9E-324, with double exprs operands
+0.0 - -4.9E-324 = 4.9E-324, with double exprs operands
+0.0 * -4.9E-324 = -0.0, with double exprs operands
+0.0 / -4.9E-324 = -0.0, with double exprs operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double param operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double param operands
+0.0 * -1.7976931348623157E308 = -0.0, with double param operands
+0.0 / -1.7976931348623157E308 = -0.0, with double param operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double local operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double local operands
+0.0 * -1.7976931348623157E308 = -0.0, with double local operands
+0.0 / -1.7976931348623157E308 = -0.0, with double local operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double static operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double static operands
+0.0 * -1.7976931348623157E308 = -0.0, with double static operands
+0.0 / -1.7976931348623157E308 = -0.0, with double static operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double field operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double field operands
+0.0 * -1.7976931348623157E308 = -0.0, with double field operands
+0.0 / -1.7976931348623157E308 = -0.0, with double field operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double a[i] operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double a[i] operands
+0.0 * -1.7976931348623157E308 = -0.0, with double a[i] operands
+0.0 / -1.7976931348623157E308 = -0.0, with double a[i] operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double f(x) operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double f(x) operands
+0.0 * -1.7976931348623157E308 = -0.0, with double f(x) operands
+0.0 / -1.7976931348623157E308 = -0.0, with double f(x) operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double lExpr operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double lExpr operands
+0.0 * -1.7976931348623157E308 = -0.0, with double lExpr operands
+0.0 / -1.7976931348623157E308 = -0.0, with double lExpr operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double rExpr operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double rExpr operands
+0.0 * -1.7976931348623157E308 = -0.0, with double rExpr operands
+0.0 / -1.7976931348623157E308 = -0.0, with double rExpr operands
+0.0 + -1.7976931348623157E308 = -1.7976931348623157E308, with double exprs operands
+0.0 - -1.7976931348623157E308 = 1.7976931348623157E308, with double exprs operands
+0.0 * -1.7976931348623157E308 = -0.0, with double exprs operands
+0.0 / -1.7976931348623157E308 = -0.0, with double exprs operands
+0.0 + -1.0 = -1.0, with double param operands
+0.0 - -1.0 = 1.0, with double param operands
+0.0 * -1.0 = -0.0, with double param operands
+0.0 / -1.0 = -0.0, with double param operands
+0.0 + -1.0 = -1.0, with double local operands
+0.0 - -1.0 = 1.0, with double local operands
+0.0 * -1.0 = -0.0, with double local operands
+0.0 / -1.0 = -0.0, with double local operands
+0.0 + -1.0 = -1.0, with double static operands
+0.0 - -1.0 = 1.0, with double static operands
+0.0 * -1.0 = -0.0, with double static operands
+0.0 / -1.0 = -0.0, with double static operands
+0.0 + -1.0 = -1.0, with double field operands
+0.0 - -1.0 = 1.0, with double field operands
+0.0 * -1.0 = -0.0, with double field operands
+0.0 / -1.0 = -0.0, with double field operands
+0.0 + -1.0 = -1.0, with double a[i] operands
+0.0 - -1.0 = 1.0, with double a[i] operands
+0.0 * -1.0 = -0.0, with double a[i] operands
+0.0 / -1.0 = -0.0, with double a[i] operands
+0.0 + -1.0 = -1.0, with double f(x) operands
+0.0 - -1.0 = 1.0, with double f(x) operands
+0.0 * -1.0 = -0.0, with double f(x) operands
+0.0 / -1.0 = -0.0, with double f(x) operands
+0.0 + -1.0 = -1.0, with double lExpr operands
+0.0 - -1.0 = 1.0, with double lExpr operands
+0.0 * -1.0 = -0.0, with double lExpr operands
+0.0 / -1.0 = -0.0, with double lExpr operands
+0.0 + -1.0 = -1.0, with double rExpr operands
+0.0 - -1.0 = 1.0, with double rExpr operands
+0.0 * -1.0 = -0.0, with double rExpr operands
+0.0 / -1.0 = -0.0, with double rExpr operands
+0.0 + -1.0 = -1.0, with double exprs operands
+0.0 - -1.0 = 1.0, with double exprs operands
+0.0 * -1.0 = -0.0, with double exprs operands
+0.0 / -1.0 = -0.0, with double exprs operands
+0.0 + 1.0 = 1.0, with double param operands
+0.0 - 1.0 = -1.0, with double param operands
+0.0 * 1.0 = 0.0, with double param operands
+0.0 / 1.0 = 0.0, with double param operands
+0.0 + 1.0 = 1.0, with double local operands
+0.0 - 1.0 = -1.0, with double local operands
+0.0 * 1.0 = 0.0, with double local operands
+0.0 / 1.0 = 0.0, with double local operands
+0.0 + 1.0 = 1.0, with double static operands
+0.0 - 1.0 = -1.0, with double static operands
+0.0 * 1.0 = 0.0, with double static operands
+0.0 / 1.0 = 0.0, with double static operands
+0.0 + 1.0 = 1.0, with double field operands
+0.0 - 1.0 = -1.0, with double field operands
+0.0 * 1.0 = 0.0, with double field operands
+0.0 / 1.0 = 0.0, with double field operands
+0.0 + 1.0 = 1.0, with double a[i] operands
+0.0 - 1.0 = -1.0, with double a[i] operands
+0.0 * 1.0 = 0.0, with double a[i] operands
+0.0 / 1.0 = 0.0, with double a[i] operands
+0.0 + 1.0 = 1.0, with double f(x) operands
+0.0 - 1.0 = -1.0, with double f(x) operands
+0.0 * 1.0 = 0.0, with double f(x) operands
+0.0 / 1.0 = 0.0, with double f(x) operands
+0.0 + 1.0 = 1.0, with double lExpr operands
+0.0 - 1.0 = -1.0, with double lExpr operands
+0.0 * 1.0 = 0.0, with double lExpr operands
+0.0 / 1.0 = 0.0, with double lExpr operands
+0.0 + 1.0 = 1.0, with double rExpr operands
+0.0 - 1.0 = -1.0, with double rExpr operands
+0.0 * 1.0 = 0.0, with double rExpr operands
+0.0 / 1.0 = 0.0, with double rExpr operands
+0.0 + 1.0 = 1.0, with double exprs operands
+0.0 - 1.0 = -1.0, with double exprs operands
+0.0 * 1.0 = 0.0, with double exprs operands
+0.0 / 1.0 = 0.0, with double exprs operands
+0.0 + -0.0 = 0.0, with double param operands
+0.0 - -0.0 = 0.0, with double param operands
+0.0 * -0.0 = -0.0, with double param operands
+0.0 / -0.0 = NaN, with double param operands
+0.0 + -0.0 = 0.0, with double local operands
+0.0 - -0.0 = 0.0, with double local operands
+0.0 * -0.0 = -0.0, with double local operands
+0.0 / -0.0 = NaN, with double local operands
+0.0 + -0.0 = 0.0, with double static operands
+0.0 - -0.0 = 0.0, with double static operands
+0.0 * -0.0 = -0.0, with double static operands
+0.0 / -0.0 = NaN, with double static operands
+0.0 + -0.0 = 0.0, with double field operands
+0.0 - -0.0 = 0.0, with double field operands
+0.0 * -0.0 = -0.0, with double field operands
+0.0 / -0.0 = NaN, with double field operands
+0.0 + -0.0 = 0.0, with double a[i] operands
+0.0 - -0.0 = 0.0, with double a[i] operands
+0.0 * -0.0 = -0.0, with double a[i] operands
+0.0 / -0.0 = NaN, with double a[i] operands
+0.0 + -0.0 = 0.0, with double f(x) operands
+0.0 - -0.0 = 0.0, with double f(x) operands
+0.0 * -0.0 = -0.0, with double f(x) operands
+0.0 / -0.0 = NaN, with double f(x) operands
+0.0 + -0.0 = 0.0, with double lExpr operands
+0.0 - -0.0 = 0.0, with double lExpr operands
+0.0 * -0.0 = -0.0, with double lExpr operands
+0.0 / -0.0 = NaN, with double lExpr operands
+0.0 + 0.0 = 0.0, with double rExpr operands
+0.0 - 0.0 = 0.0, with double rExpr operands
+0.0 * 0.0 = 0.0, with double rExpr operands
+0.0 / 0.0 = NaN, with double rExpr operands
+0.0 + 0.0 = 0.0, with double exprs operands
+0.0 - 0.0 = 0.0, with double exprs operands
+0.0 * 0.0 = 0.0, with double exprs operands
+0.0 / 0.0 = NaN, with double exprs operands
+0.0 + 0.0 = 0.0, with double param operands
+0.0 - 0.0 = 0.0, with double param operands
+0.0 * 0.0 = 0.0, with double param operands
+0.0 / 0.0 = NaN, with double param operands
+0.0 + 0.0 = 0.0, with double local operands
+0.0 - 0.0 = 0.0, with double local operands
+0.0 * 0.0 = 0.0, with double local operands
+0.0 / 0.0 = NaN, with double local operands
+0.0 + 0.0 = 0.0, with double static operands
+0.0 - 0.0 = 0.0, with double static operands
+0.0 * 0.0 = 0.0, with double static operands
+0.0 / 0.0 = NaN, with double static operands
+0.0 + 0.0 = 0.0, with double field operands
+0.0 - 0.0 = 0.0, with double field operands
+0.0 * 0.0 = 0.0, with double field operands
+0.0 / 0.0 = NaN, with double field operands
+0.0 + 0.0 = 0.0, with double a[i] operands
+0.0 - 0.0 = 0.0, with double a[i] operands
+0.0 * 0.0 = 0.0, with double a[i] operands
+0.0 / 0.0 = NaN, with double a[i] operands
+0.0 + 0.0 = 0.0, with double f(x) operands
+0.0 - 0.0 = 0.0, with double f(x) operands
+0.0 * 0.0 = 0.0, with double f(x) operands
+0.0 / 0.0 = NaN, with double f(x) operands
+0.0 + 0.0 = 0.0, with double lExpr operands
+0.0 - 0.0 = 0.0, with double lExpr operands
+0.0 * 0.0 = 0.0, with double lExpr operands
+0.0 / 0.0 = NaN, with double lExpr operands
+0.0 + 0.0 = 0.0, with double rExpr operands
+0.0 - 0.0 = 0.0, with double rExpr operands
+0.0 * 0.0 = 0.0, with double rExpr operands
+0.0 / 0.0 = NaN, with double rExpr operands
+0.0 + 0.0 = 0.0, with double exprs operands
+0.0 - 0.0 = 0.0, with double exprs operands
+0.0 * 0.0 = 0.0, with double exprs operands
+0.0 / 0.0 = NaN, with double exprs operands
+0.0 + -Infinity = -Infinity, with double param operands
+0.0 - -Infinity = Infinity, with double param operands
+0.0 * -Infinity = NaN, with double param operands
+0.0 / -Infinity = -0.0, with double param operands
+0.0 + -Infinity = -Infinity, with double local operands
+0.0 - -Infinity = Infinity, with double local operands
+0.0 * -Infinity = NaN, with double local operands
+0.0 / -Infinity = -0.0, with double local operands
+0.0 + -Infinity = -Infinity, with double static operands
+0.0 - -Infinity = Infinity, with double static operands
+0.0 * -Infinity = NaN, with double static operands
+0.0 / -Infinity = -0.0, with double static operands
+0.0 + -Infinity = -Infinity, with double field operands
+0.0 - -Infinity = Infinity, with double field operands
+0.0 * -Infinity = NaN, with double field operands
+0.0 / -Infinity = -0.0, with double field operands
+0.0 + -Infinity = -Infinity, with double a[i] operands
+0.0 - -Infinity = Infinity, with double a[i] operands
+0.0 * -Infinity = NaN, with double a[i] operands
+0.0 / -Infinity = -0.0, with double a[i] operands
+0.0 + -Infinity = -Infinity, with double f(x) operands
+0.0 - -Infinity = Infinity, with double f(x) operands
+0.0 * -Infinity = NaN, with double f(x) operands
+0.0 / -Infinity = -0.0, with double f(x) operands
+0.0 + -Infinity = -Infinity, with double lExpr operands
+0.0 - -Infinity = Infinity, with double lExpr operands
+0.0 * -Infinity = NaN, with double lExpr operands
+0.0 / -Infinity = -0.0, with double lExpr operands
+0.0 + -Infinity = -Infinity, with double rExpr operands
+0.0 - -Infinity = Infinity, with double rExpr operands
+0.0 * -Infinity = NaN, with double rExpr operands
+0.0 / -Infinity = -0.0, with double rExpr operands
+0.0 + -Infinity = -Infinity, with double exprs operands
+0.0 - -Infinity = Infinity, with double exprs operands
+0.0 * -Infinity = NaN, with double exprs operands
+0.0 / -Infinity = -0.0, with double exprs operands
+0.0 + Infinity = Infinity, with double param operands
+0.0 - Infinity = -Infinity, with double param operands
+0.0 * Infinity = NaN, with double param operands
+0.0 / Infinity = 0.0, with double param operands
+0.0 + Infinity = Infinity, with double local operands
+0.0 - Infinity = -Infinity, with double local operands
+0.0 * Infinity = NaN, with double local operands
+0.0 / Infinity = 0.0, with double local operands
+0.0 + Infinity = Infinity, with double static operands
+0.0 - Infinity = -Infinity, with double static operands
+0.0 * Infinity = NaN, with double static operands
+0.0 / Infinity = 0.0, with double static operands
+0.0 + Infinity = Infinity, with double field operands
+0.0 - Infinity = -Infinity, with double field operands
+0.0 * Infinity = NaN, with double field operands
+0.0 / Infinity = 0.0, with double field operands
+0.0 + Infinity = Infinity, with double a[i] operands
+0.0 - Infinity = -Infinity, with double a[i] operands
+0.0 * Infinity = NaN, with double a[i] operands
+0.0 / Infinity = 0.0, with double a[i] operands
+0.0 + Infinity = Infinity, with double f(x) operands
+0.0 - Infinity = -Infinity, with double f(x) operands
+0.0 * Infinity = NaN, with double f(x) operands
+0.0 / Infinity = 0.0, with double f(x) operands
+0.0 + Infinity = Infinity, with double lExpr operands
+0.0 - Infinity = -Infinity, with double lExpr operands
+0.0 * Infinity = NaN, with double lExpr operands
+0.0 / Infinity = 0.0, with double lExpr operands
+0.0 + Infinity = Infinity, with double rExpr operands
+0.0 - Infinity = -Infinity, with double rExpr operands
+0.0 * Infinity = NaN, with double rExpr operands
+0.0 / Infinity = 0.0, with double rExpr operands
+0.0 + Infinity = Infinity, with double exprs operands
+0.0 - Infinity = -Infinity, with double exprs operands
+0.0 * Infinity = NaN, with double exprs operands
+0.0 / Infinity = 0.0, with double exprs operands
+0.0 + NaN = NaN, with double param operands
+0.0 - NaN = NaN, with double param operands
+0.0 * NaN = NaN, with double param operands
+0.0 / NaN = NaN, with double param operands
+0.0 + NaN = NaN, with double local operands
+0.0 - NaN = NaN, with double local operands
+0.0 * NaN = NaN, with double local operands
+0.0 / NaN = NaN, with double local operands
+0.0 + NaN = NaN, with double static operands
+0.0 - NaN = NaN, with double static operands
+0.0 * NaN = NaN, with double static operands
+0.0 / NaN = NaN, with double static operands
+0.0 + NaN = NaN, with double field operands
+0.0 - NaN = NaN, with double field operands
+0.0 * NaN = NaN, with double field operands
+0.0 / NaN = NaN, with double field operands
+0.0 + NaN = NaN, with double a[i] operands
+0.0 - NaN = NaN, with double a[i] operands
+0.0 * NaN = NaN, with double a[i] operands
+0.0 / NaN = NaN, with double a[i] operands
+0.0 + NaN = NaN, with double f(x) operands
+0.0 - NaN = NaN, with double f(x) operands
+0.0 * NaN = NaN, with double f(x) operands
+0.0 / NaN = NaN, with double f(x) operands
+0.0 + NaN = NaN, with double lExpr operands
+0.0 - NaN = NaN, with double lExpr operands
+0.0 * NaN = NaN, with double lExpr operands
+0.0 / NaN = NaN, with double lExpr operands
+0.0 + NaN = NaN, with double rExpr operands
+0.0 - NaN = NaN, with double rExpr operands
+0.0 * NaN = NaN, with double rExpr operands
+0.0 / NaN = NaN, with double rExpr operands
+0.0 + NaN = NaN, with double exprs operands
+0.0 - NaN = NaN, with double exprs operands
+0.0 * NaN = NaN, with double exprs operands
+0.0 / NaN = NaN, with double exprs operands
+-Infinity + 4.9E-324 = -Infinity, with double param operands
+-Infinity - 4.9E-324 = -Infinity, with double param operands
+-Infinity * 4.9E-324 = -Infinity, with double param operands
+-Infinity / 4.9E-324 = -Infinity, with double param operands
+-Infinity + 4.9E-324 = -Infinity, with double local operands
+-Infinity - 4.9E-324 = -Infinity, with double local operands
+-Infinity * 4.9E-324 = -Infinity, with double local operands
+-Infinity / 4.9E-324 = -Infinity, with double local operands
+-Infinity + 4.9E-324 = -Infinity, with double static operands
+-Infinity - 4.9E-324 = -Infinity, with double static operands
+-Infinity * 4.9E-324 = -Infinity, with double static operands
+-Infinity / 4.9E-324 = -Infinity, with double static operands
+-Infinity + 4.9E-324 = -Infinity, with double field operands
+-Infinity - 4.9E-324 = -Infinity, with double field operands
+-Infinity * 4.9E-324 = -Infinity, with double field operands
+-Infinity / 4.9E-324 = -Infinity, with double field operands
+-Infinity + 4.9E-324 = -Infinity, with double a[i] operands
+-Infinity - 4.9E-324 = -Infinity, with double a[i] operands
+-Infinity * 4.9E-324 = -Infinity, with double a[i] operands
+-Infinity / 4.9E-324 = -Infinity, with double a[i] operands
+-Infinity + 4.9E-324 = -Infinity, with double f(x) operands
+-Infinity - 4.9E-324 = -Infinity, with double f(x) operands
+-Infinity * 4.9E-324 = -Infinity, with double f(x) operands
+-Infinity / 4.9E-324 = -Infinity, with double f(x) operands
+-Infinity + 4.9E-324 = -Infinity, with double lExpr operands
+-Infinity - 4.9E-324 = -Infinity, with double lExpr operands
+-Infinity * 4.9E-324 = -Infinity, with double lExpr operands
+-Infinity / 4.9E-324 = -Infinity, with double lExpr operands
+-Infinity + 4.9E-324 = -Infinity, with double rExpr operands
+-Infinity - 4.9E-324 = -Infinity, with double rExpr operands
+-Infinity * 4.9E-324 = -Infinity, with double rExpr operands
+-Infinity / 4.9E-324 = -Infinity, with double rExpr operands
+-Infinity + 4.9E-324 = -Infinity, with double exprs operands
+-Infinity - 4.9E-324 = -Infinity, with double exprs operands
+-Infinity * 4.9E-324 = -Infinity, with double exprs operands
+-Infinity / 4.9E-324 = -Infinity, with double exprs operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double param operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double param operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double param operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double param operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double local operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double local operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double local operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double local operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double static operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double static operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double static operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double static operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double field operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double field operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double field operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double field operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double a[i] operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double a[i] operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double a[i] operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double a[i] operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double f(x) operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double f(x) operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double f(x) operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double f(x) operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double lExpr operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double lExpr operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double lExpr operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double lExpr operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double rExpr operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double rExpr operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double rExpr operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double rExpr operands
+-Infinity + 1.7976931348623157E308 = -Infinity, with double exprs operands
+-Infinity - 1.7976931348623157E308 = -Infinity, with double exprs operands
+-Infinity * 1.7976931348623157E308 = -Infinity, with double exprs operands
+-Infinity / 1.7976931348623157E308 = -Infinity, with double exprs operands
+-Infinity + -4.9E-324 = -Infinity, with double param operands
+-Infinity - -4.9E-324 = -Infinity, with double param operands
+-Infinity * -4.9E-324 = Infinity, with double param operands
+-Infinity / -4.9E-324 = Infinity, with double param operands
+-Infinity + -4.9E-324 = -Infinity, with double local operands
+-Infinity - -4.9E-324 = -Infinity, with double local operands
+-Infinity * -4.9E-324 = Infinity, with double local operands
+-Infinity / -4.9E-324 = Infinity, with double local operands
+-Infinity + -4.9E-324 = -Infinity, with double static operands
+-Infinity - -4.9E-324 = -Infinity, with double static operands
+-Infinity * -4.9E-324 = Infinity, with double static operands
+-Infinity / -4.9E-324 = Infinity, with double static operands
+-Infinity + -4.9E-324 = -Infinity, with double field operands
+-Infinity - -4.9E-324 = -Infinity, with double field operands
+-Infinity * -4.9E-324 = Infinity, with double field operands
+-Infinity / -4.9E-324 = Infinity, with double field operands
+-Infinity + -4.9E-324 = -Infinity, with double a[i] operands
+-Infinity - -4.9E-324 = -Infinity, with double a[i] operands
+-Infinity * -4.9E-324 = Infinity, with double a[i] operands
+-Infinity / -4.9E-324 = Infinity, with double a[i] operands
+-Infinity + -4.9E-324 = -Infinity, with double f(x) operands
+-Infinity - -4.9E-324 = -Infinity, with double f(x) operands
+-Infinity * -4.9E-324 = Infinity, with double f(x) operands
+-Infinity / -4.9E-324 = Infinity, with double f(x) operands
+-Infinity + -4.9E-324 = -Infinity, with double lExpr operands
+-Infinity - -4.9E-324 = -Infinity, with double lExpr operands
+-Infinity * -4.9E-324 = Infinity, with double lExpr operands
+-Infinity / -4.9E-324 = Infinity, with double lExpr operands
+-Infinity + -4.9E-324 = -Infinity, with double rExpr operands
+-Infinity - -4.9E-324 = -Infinity, with double rExpr operands
+-Infinity * -4.9E-324 = Infinity, with double rExpr operands
+-Infinity / -4.9E-324 = Infinity, with double rExpr operands
+-Infinity + -4.9E-324 = -Infinity, with double exprs operands
+-Infinity - -4.9E-324 = -Infinity, with double exprs operands
+-Infinity * -4.9E-324 = Infinity, with double exprs operands
+-Infinity / -4.9E-324 = Infinity, with double exprs operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double param operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double param operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double param operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double param operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double local operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double local operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double local operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double local operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double static operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double static operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double static operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double static operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double field operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double field operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double field operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double field operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double a[i] operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double a[i] operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double a[i] operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double a[i] operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double f(x) operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double f(x) operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double f(x) operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double f(x) operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double lExpr operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double lExpr operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double lExpr operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double lExpr operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double rExpr operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double rExpr operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double rExpr operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double rExpr operands
+-Infinity + -1.7976931348623157E308 = -Infinity, with double exprs operands
+-Infinity - -1.7976931348623157E308 = -Infinity, with double exprs operands
+-Infinity * -1.7976931348623157E308 = Infinity, with double exprs operands
+-Infinity / -1.7976931348623157E308 = Infinity, with double exprs operands
+-Infinity + -1.0 = -Infinity, with double param operands
+-Infinity - -1.0 = -Infinity, with double param operands
+-Infinity * -1.0 = Infinity, with double param operands
+-Infinity / -1.0 = Infinity, with double param operands
+-Infinity + -1.0 = -Infinity, with double local operands
+-Infinity - -1.0 = -Infinity, with double local operands
+-Infinity * -1.0 = Infinity, with double local operands
+-Infinity / -1.0 = Infinity, with double local operands
+-Infinity + -1.0 = -Infinity, with double static operands
+-Infinity - -1.0 = -Infinity, with double static operands
+-Infinity * -1.0 = Infinity, with double static operands
+-Infinity / -1.0 = Infinity, with double static operands
+-Infinity + -1.0 = -Infinity, with double field operands
+-Infinity - -1.0 = -Infinity, with double field operands
+-Infinity * -1.0 = Infinity, with double field operands
+-Infinity / -1.0 = Infinity, with double field operands
+-Infinity + -1.0 = -Infinity, with double a[i] operands
+-Infinity - -1.0 = -Infinity, with double a[i] operands
+-Infinity * -1.0 = Infinity, with double a[i] operands
+-Infinity / -1.0 = Infinity, with double a[i] operands
+-Infinity + -1.0 = -Infinity, with double f(x) operands
+-Infinity - -1.0 = -Infinity, with double f(x) operands
+-Infinity * -1.0 = Infinity, with double f(x) operands
+-Infinity / -1.0 = Infinity, with double f(x) operands
+-Infinity + -1.0 = -Infinity, with double lExpr operands
+-Infinity - -1.0 = -Infinity, with double lExpr operands
+-Infinity * -1.0 = Infinity, with double lExpr operands
+-Infinity / -1.0 = Infinity, with double lExpr operands
+-Infinity + -1.0 = -Infinity, with double rExpr operands
+-Infinity - -1.0 = -Infinity, with double rExpr operands
+-Infinity * -1.0 = Infinity, with double rExpr operands
+-Infinity / -1.0 = Infinity, with double rExpr operands
+-Infinity + -1.0 = -Infinity, with double exprs operands
+-Infinity - -1.0 = -Infinity, with double exprs operands
+-Infinity * -1.0 = Infinity, with double exprs operands
+-Infinity / -1.0 = Infinity, with double exprs operands
+-Infinity + 1.0 = -Infinity, with double param operands
+-Infinity - 1.0 = -Infinity, with double param operands
+-Infinity * 1.0 = -Infinity, with double param operands
+-Infinity / 1.0 = -Infinity, with double param operands
+-Infinity + 1.0 = -Infinity, with double local operands
+-Infinity - 1.0 = -Infinity, with double local operands
+-Infinity * 1.0 = -Infinity, with double local operands
+-Infinity / 1.0 = -Infinity, with double local operands
+-Infinity + 1.0 = -Infinity, with double static operands
+-Infinity - 1.0 = -Infinity, with double static operands
+-Infinity * 1.0 = -Infinity, with double static operands
+-Infinity / 1.0 = -Infinity, with double static operands
+-Infinity + 1.0 = -Infinity, with double field operands
+-Infinity - 1.0 = -Infinity, with double field operands
+-Infinity * 1.0 = -Infinity, with double field operands
+-Infinity / 1.0 = -Infinity, with double field operands
+-Infinity + 1.0 = -Infinity, with double a[i] operands
+-Infinity - 1.0 = -Infinity, with double a[i] operands
+-Infinity * 1.0 = -Infinity, with double a[i] operands
+-Infinity / 1.0 = -Infinity, with double a[i] operands
+-Infinity + 1.0 = -Infinity, with double f(x) operands
+-Infinity - 1.0 = -Infinity, with double f(x) operands
+-Infinity * 1.0 = -Infinity, with double f(x) operands
+-Infinity / 1.0 = -Infinity, with double f(x) operands
+-Infinity + 1.0 = -Infinity, with double lExpr operands
+-Infinity - 1.0 = -Infinity, with double lExpr operands
+-Infinity * 1.0 = -Infinity, with double lExpr operands
+-Infinity / 1.0 = -Infinity, with double lExpr operands
+-Infinity + 1.0 = -Infinity, with double rExpr operands
+-Infinity - 1.0 = -Infinity, with double rExpr operands
+-Infinity * 1.0 = -Infinity, with double rExpr operands
+-Infinity / 1.0 = -Infinity, with double rExpr operands
+-Infinity + 1.0 = -Infinity, with double exprs operands
+-Infinity - 1.0 = -Infinity, with double exprs operands
+-Infinity * 1.0 = -Infinity, with double exprs operands
+-Infinity / 1.0 = -Infinity, with double exprs operands
+-Infinity + -0.0 = -Infinity, with double param operands
+-Infinity - -0.0 = -Infinity, with double param operands
+-Infinity * -0.0 = NaN, with double param operands
+-Infinity / -0.0 = Infinity, with double param operands
+-Infinity + -0.0 = -Infinity, with double local operands
+-Infinity - -0.0 = -Infinity, with double local operands
+-Infinity * -0.0 = NaN, with double local operands
+-Infinity / -0.0 = Infinity, with double local operands
+-Infinity + -0.0 = -Infinity, with double static operands
+-Infinity - -0.0 = -Infinity, with double static operands
+-Infinity * -0.0 = NaN, with double static operands
+-Infinity / -0.0 = Infinity, with double static operands
+-Infinity + -0.0 = -Infinity, with double field operands
+-Infinity - -0.0 = -Infinity, with double field operands
+-Infinity * -0.0 = NaN, with double field operands
+-Infinity / -0.0 = Infinity, with double field operands
+-Infinity + -0.0 = -Infinity, with double a[i] operands
+-Infinity - -0.0 = -Infinity, with double a[i] operands
+-Infinity * -0.0 = NaN, with double a[i] operands
+-Infinity / -0.0 = Infinity, with double a[i] operands
+-Infinity + -0.0 = -Infinity, with double f(x) operands
+-Infinity - -0.0 = -Infinity, with double f(x) operands
+-Infinity * -0.0 = NaN, with double f(x) operands
+-Infinity / -0.0 = Infinity, with double f(x) operands
+-Infinity + -0.0 = -Infinity, with double lExpr operands
+-Infinity - -0.0 = -Infinity, with double lExpr operands
+-Infinity * -0.0 = NaN, with double lExpr operands
+-Infinity / -0.0 = Infinity, with double lExpr operands
+-Infinity + 0.0 = -Infinity, with double rExpr operands
+-Infinity - 0.0 = -Infinity, with double rExpr operands
+-Infinity * 0.0 = NaN, with double rExpr operands
+-Infinity / 0.0 = -Infinity, with double rExpr operands
+-Infinity + 0.0 = -Infinity, with double exprs operands
+-Infinity - 0.0 = -Infinity, with double exprs operands
+-Infinity * 0.0 = NaN, with double exprs operands
+-Infinity / 0.0 = -Infinity, with double exprs operands
+-Infinity + 0.0 = -Infinity, with double param operands
+-Infinity - 0.0 = -Infinity, with double param operands
+-Infinity * 0.0 = NaN, with double param operands
+-Infinity / 0.0 = -Infinity, with double param operands
+-Infinity + 0.0 = -Infinity, with double local operands
+-Infinity - 0.0 = -Infinity, with double local operands
+-Infinity * 0.0 = NaN, with double local operands
+-Infinity / 0.0 = -Infinity, with double local operands
+-Infinity + 0.0 = -Infinity, with double static operands
+-Infinity - 0.0 = -Infinity, with double static operands
+-Infinity * 0.0 = NaN, with double static operands
+-Infinity / 0.0 = -Infinity, with double static operands
+-Infinity + 0.0 = -Infinity, with double field operands
+-Infinity - 0.0 = -Infinity, with double field operands
+-Infinity * 0.0 = NaN, with double field operands
+-Infinity / 0.0 = -Infinity, with double field operands
+-Infinity + 0.0 = -Infinity, with double a[i] operands
+-Infinity - 0.0 = -Infinity, with double a[i] operands
+-Infinity * 0.0 = NaN, with double a[i] operands
+-Infinity / 0.0 = -Infinity, with double a[i] operands
+-Infinity + 0.0 = -Infinity, with double f(x) operands
+-Infinity - 0.0 = -Infinity, with double f(x) operands
+-Infinity * 0.0 = NaN, with double f(x) operands
+-Infinity / 0.0 = -Infinity, with double f(x) operands
+-Infinity + 0.0 = -Infinity, with double lExpr operands
+-Infinity - 0.0 = -Infinity, with double lExpr operands
+-Infinity * 0.0 = NaN, with double lExpr operands
+-Infinity / 0.0 = -Infinity, with double lExpr operands
+-Infinity + 0.0 = -Infinity, with double rExpr operands
+-Infinity - 0.0 = -Infinity, with double rExpr operands
+-Infinity * 0.0 = NaN, with double rExpr operands
+-Infinity / 0.0 = -Infinity, with double rExpr operands
+-Infinity + 0.0 = -Infinity, with double exprs operands
+-Infinity - 0.0 = -Infinity, with double exprs operands
+-Infinity * 0.0 = NaN, with double exprs operands
+-Infinity / 0.0 = -Infinity, with double exprs operands
+-Infinity + -Infinity = -Infinity, with double param operands
+-Infinity - -Infinity = NaN, with double param operands
+-Infinity * -Infinity = Infinity, with double param operands
+-Infinity / -Infinity = NaN, with double param operands
+-Infinity + -Infinity = -Infinity, with double local operands
+-Infinity - -Infinity = NaN, with double local operands
+-Infinity * -Infinity = Infinity, with double local operands
+-Infinity / -Infinity = NaN, with double local operands
+-Infinity + -Infinity = -Infinity, with double static operands
+-Infinity - -Infinity = NaN, with double static operands
+-Infinity * -Infinity = Infinity, with double static operands
+-Infinity / -Infinity = NaN, with double static operands
+-Infinity + -Infinity = -Infinity, with double field operands
+-Infinity - -Infinity = NaN, with double field operands
+-Infinity * -Infinity = Infinity, with double field operands
+-Infinity / -Infinity = NaN, with double field operands
+-Infinity + -Infinity = -Infinity, with double a[i] operands
+-Infinity - -Infinity = NaN, with double a[i] operands
+-Infinity * -Infinity = Infinity, with double a[i] operands
+-Infinity / -Infinity = NaN, with double a[i] operands
+-Infinity + -Infinity = -Infinity, with double f(x) operands
+-Infinity - -Infinity = NaN, with double f(x) operands
+-Infinity * -Infinity = Infinity, with double f(x) operands
+-Infinity / -Infinity = NaN, with double f(x) operands
+-Infinity + -Infinity = -Infinity, with double lExpr operands
+-Infinity - -Infinity = NaN, with double lExpr operands
+-Infinity * -Infinity = Infinity, with double lExpr operands
+-Infinity / -Infinity = NaN, with double lExpr operands
+-Infinity + -Infinity = -Infinity, with double rExpr operands
+-Infinity - -Infinity = NaN, with double rExpr operands
+-Infinity * -Infinity = Infinity, with double rExpr operands
+-Infinity / -Infinity = NaN, with double rExpr operands
+-Infinity + -Infinity = -Infinity, with double exprs operands
+-Infinity - -Infinity = NaN, with double exprs operands
+-Infinity * -Infinity = Infinity, with double exprs operands
+-Infinity / -Infinity = NaN, with double exprs operands
+-Infinity + Infinity = NaN, with double param operands
+-Infinity - Infinity = -Infinity, with double param operands
+-Infinity * Infinity = -Infinity, with double param operands
+-Infinity / Infinity = NaN, with double param operands
+-Infinity + Infinity = NaN, with double local operands
+-Infinity - Infinity = -Infinity, with double local operands
+-Infinity * Infinity = -Infinity, with double local operands
+-Infinity / Infinity = NaN, with double local operands
+-Infinity + Infinity = NaN, with double static operands
+-Infinity - Infinity = -Infinity, with double static operands
+-Infinity * Infinity = -Infinity, with double static operands
+-Infinity / Infinity = NaN, with double static operands
+-Infinity + Infinity = NaN, with double field operands
+-Infinity - Infinity = -Infinity, with double field operands
+-Infinity * Infinity = -Infinity, with double field operands
+-Infinity / Infinity = NaN, with double field operands
+-Infinity + Infinity = NaN, with double a[i] operands
+-Infinity - Infinity = -Infinity, with double a[i] operands
+-Infinity * Infinity = -Infinity, with double a[i] operands
+-Infinity / Infinity = NaN, with double a[i] operands
+-Infinity + Infinity = NaN, with double f(x) operands
+-Infinity - Infinity = -Infinity, with double f(x) operands
+-Infinity * Infinity = -Infinity, with double f(x) operands
+-Infinity / Infinity = NaN, with double f(x) operands
+-Infinity + Infinity = NaN, with double lExpr operands
+-Infinity - Infinity = -Infinity, with double lExpr operands
+-Infinity * Infinity = -Infinity, with double lExpr operands
+-Infinity / Infinity = NaN, with double lExpr operands
+-Infinity + Infinity = NaN, with double rExpr operands
+-Infinity - Infinity = -Infinity, with double rExpr operands
+-Infinity * Infinity = -Infinity, with double rExpr operands
+-Infinity / Infinity = NaN, with double rExpr operands
+-Infinity + Infinity = NaN, with double exprs operands
+-Infinity - Infinity = -Infinity, with double exprs operands
+-Infinity * Infinity = -Infinity, with double exprs operands
+-Infinity / Infinity = NaN, with double exprs operands
+-Infinity + NaN = NaN, with double param operands
+-Infinity - NaN = NaN, with double param operands
+-Infinity * NaN = NaN, with double param operands
+-Infinity / NaN = NaN, with double param operands
+-Infinity + NaN = NaN, with double local operands
+-Infinity - NaN = NaN, with double local operands
+-Infinity * NaN = NaN, with double local operands
+-Infinity / NaN = NaN, with double local operands
+-Infinity + NaN = NaN, with double static operands
+-Infinity - NaN = NaN, with double static operands
+-Infinity * NaN = NaN, with double static operands
+-Infinity / NaN = NaN, with double static operands
+-Infinity + NaN = NaN, with double field operands
+-Infinity - NaN = NaN, with double field operands
+-Infinity * NaN = NaN, with double field operands
+-Infinity / NaN = NaN, with double field operands
+-Infinity + NaN = NaN, with double a[i] operands
+-Infinity - NaN = NaN, with double a[i] operands
+-Infinity * NaN = NaN, with double a[i] operands
+-Infinity / NaN = NaN, with double a[i] operands
+-Infinity + NaN = NaN, with double f(x) operands
+-Infinity - NaN = NaN, with double f(x) operands
+-Infinity * NaN = NaN, with double f(x) operands
+-Infinity / NaN = NaN, with double f(x) operands
+-Infinity + NaN = NaN, with double lExpr operands
+-Infinity - NaN = NaN, with double lExpr operands
+-Infinity * NaN = NaN, with double lExpr operands
+-Infinity / NaN = NaN, with double lExpr operands
+-Infinity + NaN = NaN, with double rExpr operands
+-Infinity - NaN = NaN, with double rExpr operands
+-Infinity * NaN = NaN, with double rExpr operands
+-Infinity / NaN = NaN, with double rExpr operands
+-Infinity + NaN = NaN, with double exprs operands
+-Infinity - NaN = NaN, with double exprs operands
+-Infinity * NaN = NaN, with double exprs operands
+-Infinity / NaN = NaN, with double exprs operands
+Infinity + 4.9E-324 = Infinity, with double param operands
+Infinity - 4.9E-324 = Infinity, with double param operands
+Infinity * 4.9E-324 = Infinity, with double param operands
+Infinity / 4.9E-324 = Infinity, with double param operands
+Infinity + 4.9E-324 = Infinity, with double local operands
+Infinity - 4.9E-324 = Infinity, with double local operands
+Infinity * 4.9E-324 = Infinity, with double local operands
+Infinity / 4.9E-324 = Infinity, with double local operands
+Infinity + 4.9E-324 = Infinity, with double static operands
+Infinity - 4.9E-324 = Infinity, with double static operands
+Infinity * 4.9E-324 = Infinity, with double static operands
+Infinity / 4.9E-324 = Infinity, with double static operands
+Infinity + 4.9E-324 = Infinity, with double field operands
+Infinity - 4.9E-324 = Infinity, with double field operands
+Infinity * 4.9E-324 = Infinity, with double field operands
+Infinity / 4.9E-324 = Infinity, with double field operands
+Infinity + 4.9E-324 = Infinity, with double a[i] operands
+Infinity - 4.9E-324 = Infinity, with double a[i] operands
+Infinity * 4.9E-324 = Infinity, with double a[i] operands
+Infinity / 4.9E-324 = Infinity, with double a[i] operands
+Infinity + 4.9E-324 = Infinity, with double f(x) operands
+Infinity - 4.9E-324 = Infinity, with double f(x) operands
+Infinity * 4.9E-324 = Infinity, with double f(x) operands
+Infinity / 4.9E-324 = Infinity, with double f(x) operands
+Infinity + 4.9E-324 = Infinity, with double lExpr operands
+Infinity - 4.9E-324 = Infinity, with double lExpr operands
+Infinity * 4.9E-324 = Infinity, with double lExpr operands
+Infinity / 4.9E-324 = Infinity, with double lExpr operands
+Infinity + 4.9E-324 = Infinity, with double rExpr operands
+Infinity - 4.9E-324 = Infinity, with double rExpr operands
+Infinity * 4.9E-324 = Infinity, with double rExpr operands
+Infinity / 4.9E-324 = Infinity, with double rExpr operands
+Infinity + 4.9E-324 = Infinity, with double exprs operands
+Infinity - 4.9E-324 = Infinity, with double exprs operands
+Infinity * 4.9E-324 = Infinity, with double exprs operands
+Infinity / 4.9E-324 = Infinity, with double exprs operands
+Infinity + 1.7976931348623157E308 = Infinity, with double param operands
+Infinity - 1.7976931348623157E308 = Infinity, with double param operands
+Infinity * 1.7976931348623157E308 = Infinity, with double param operands
+Infinity / 1.7976931348623157E308 = Infinity, with double param operands
+Infinity + 1.7976931348623157E308 = Infinity, with double local operands
+Infinity - 1.7976931348623157E308 = Infinity, with double local operands
+Infinity * 1.7976931348623157E308 = Infinity, with double local operands
+Infinity / 1.7976931348623157E308 = Infinity, with double local operands
+Infinity + 1.7976931348623157E308 = Infinity, with double static operands
+Infinity - 1.7976931348623157E308 = Infinity, with double static operands
+Infinity * 1.7976931348623157E308 = Infinity, with double static operands
+Infinity / 1.7976931348623157E308 = Infinity, with double static operands
+Infinity + 1.7976931348623157E308 = Infinity, with double field operands
+Infinity - 1.7976931348623157E308 = Infinity, with double field operands
+Infinity * 1.7976931348623157E308 = Infinity, with double field operands
+Infinity / 1.7976931348623157E308 = Infinity, with double field operands
+Infinity + 1.7976931348623157E308 = Infinity, with double a[i] operands
+Infinity - 1.7976931348623157E308 = Infinity, with double a[i] operands
+Infinity * 1.7976931348623157E308 = Infinity, with double a[i] operands
+Infinity / 1.7976931348623157E308 = Infinity, with double a[i] operands
+Infinity + 1.7976931348623157E308 = Infinity, with double f(x) operands
+Infinity - 1.7976931348623157E308 = Infinity, with double f(x) operands
+Infinity * 1.7976931348623157E308 = Infinity, with double f(x) operands
+Infinity / 1.7976931348623157E308 = Infinity, with double f(x) operands
+Infinity + 1.7976931348623157E308 = Infinity, with double lExpr operands
+Infinity - 1.7976931348623157E308 = Infinity, with double lExpr operands
+Infinity * 1.7976931348623157E308 = Infinity, with double lExpr operands
+Infinity / 1.7976931348623157E308 = Infinity, with double lExpr operands
+Infinity + 1.7976931348623157E308 = Infinity, with double rExpr operands
+Infinity - 1.7976931348623157E308 = Infinity, with double rExpr operands
+Infinity * 1.7976931348623157E308 = Infinity, with double rExpr operands
+Infinity / 1.7976931348623157E308 = Infinity, with double rExpr operands
+Infinity + 1.7976931348623157E308 = Infinity, with double exprs operands
+Infinity - 1.7976931348623157E308 = Infinity, with double exprs operands
+Infinity * 1.7976931348623157E308 = Infinity, with double exprs operands
+Infinity / 1.7976931348623157E308 = Infinity, with double exprs operands
+Infinity + -4.9E-324 = Infinity, with double param operands
+Infinity - -4.9E-324 = Infinity, with double param operands
+Infinity * -4.9E-324 = -Infinity, with double param operands
+Infinity / -4.9E-324 = -Infinity, with double param operands
+Infinity + -4.9E-324 = Infinity, with double local operands
+Infinity - -4.9E-324 = Infinity, with double local operands
+Infinity * -4.9E-324 = -Infinity, with double local operands
+Infinity / -4.9E-324 = -Infinity, with double local operands
+Infinity + -4.9E-324 = Infinity, with double static operands
+Infinity - -4.9E-324 = Infinity, with double static operands
+Infinity * -4.9E-324 = -Infinity, with double static operands
+Infinity / -4.9E-324 = -Infinity, with double static operands
+Infinity + -4.9E-324 = Infinity, with double field operands
+Infinity - -4.9E-324 = Infinity, with double field operands
+Infinity * -4.9E-324 = -Infinity, with double field operands
+Infinity / -4.9E-324 = -Infinity, with double field operands
+Infinity + -4.9E-324 = Infinity, with double a[i] operands
+Infinity - -4.9E-324 = Infinity, with double a[i] operands
+Infinity * -4.9E-324 = -Infinity, with double a[i] operands
+Infinity / -4.9E-324 = -Infinity, with double a[i] operands
+Infinity + -4.9E-324 = Infinity, with double f(x) operands
+Infinity - -4.9E-324 = Infinity, with double f(x) operands
+Infinity * -4.9E-324 = -Infinity, with double f(x) operands
+Infinity / -4.9E-324 = -Infinity, with double f(x) operands
+Infinity + -4.9E-324 = Infinity, with double lExpr operands
+Infinity - -4.9E-324 = Infinity, with double lExpr operands
+Infinity * -4.9E-324 = -Infinity, with double lExpr operands
+Infinity / -4.9E-324 = -Infinity, with double lExpr operands
+Infinity + -4.9E-324 = Infinity, with double rExpr operands
+Infinity - -4.9E-324 = Infinity, with double rExpr operands
+Infinity * -4.9E-324 = -Infinity, with double rExpr operands
+Infinity / -4.9E-324 = -Infinity, with double rExpr operands
+Infinity + -4.9E-324 = Infinity, with double exprs operands
+Infinity - -4.9E-324 = Infinity, with double exprs operands
+Infinity * -4.9E-324 = -Infinity, with double exprs operands
+Infinity / -4.9E-324 = -Infinity, with double exprs operands
+Infinity + -1.7976931348623157E308 = Infinity, with double param operands
+Infinity - -1.7976931348623157E308 = Infinity, with double param operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double param operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double param operands
+Infinity + -1.7976931348623157E308 = Infinity, with double local operands
+Infinity - -1.7976931348623157E308 = Infinity, with double local operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double local operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double local operands
+Infinity + -1.7976931348623157E308 = Infinity, with double static operands
+Infinity - -1.7976931348623157E308 = Infinity, with double static operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double static operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double static operands
+Infinity + -1.7976931348623157E308 = Infinity, with double field operands
+Infinity - -1.7976931348623157E308 = Infinity, with double field operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double field operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double field operands
+Infinity + -1.7976931348623157E308 = Infinity, with double a[i] operands
+Infinity - -1.7976931348623157E308 = Infinity, with double a[i] operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double a[i] operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double a[i] operands
+Infinity + -1.7976931348623157E308 = Infinity, with double f(x) operands
+Infinity - -1.7976931348623157E308 = Infinity, with double f(x) operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double f(x) operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double f(x) operands
+Infinity + -1.7976931348623157E308 = Infinity, with double lExpr operands
+Infinity - -1.7976931348623157E308 = Infinity, with double lExpr operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double lExpr operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double lExpr operands
+Infinity + -1.7976931348623157E308 = Infinity, with double rExpr operands
+Infinity - -1.7976931348623157E308 = Infinity, with double rExpr operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double rExpr operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double rExpr operands
+Infinity + -1.7976931348623157E308 = Infinity, with double exprs operands
+Infinity - -1.7976931348623157E308 = Infinity, with double exprs operands
+Infinity * -1.7976931348623157E308 = -Infinity, with double exprs operands
+Infinity / -1.7976931348623157E308 = -Infinity, with double exprs operands
+Infinity + -1.0 = Infinity, with double param operands
+Infinity - -1.0 = Infinity, with double param operands
+Infinity * -1.0 = -Infinity, with double param operands
+Infinity / -1.0 = -Infinity, with double param operands
+Infinity + -1.0 = Infinity, with double local operands
+Infinity - -1.0 = Infinity, with double local operands
+Infinity * -1.0 = -Infinity, with double local operands
+Infinity / -1.0 = -Infinity, with double local operands
+Infinity + -1.0 = Infinity, with double static operands
+Infinity - -1.0 = Infinity, with double static operands
+Infinity * -1.0 = -Infinity, with double static operands
+Infinity / -1.0 = -Infinity, with double static operands
+Infinity + -1.0 = Infinity, with double field operands
+Infinity - -1.0 = Infinity, with double field operands
+Infinity * -1.0 = -Infinity, with double field operands
+Infinity / -1.0 = -Infinity, with double field operands
+Infinity + -1.0 = Infinity, with double a[i] operands
+Infinity - -1.0 = Infinity, with double a[i] operands
+Infinity * -1.0 = -Infinity, with double a[i] operands
+Infinity / -1.0 = -Infinity, with double a[i] operands
+Infinity + -1.0 = Infinity, with double f(x) operands
+Infinity - -1.0 = Infinity, with double f(x) operands
+Infinity * -1.0 = -Infinity, with double f(x) operands
+Infinity / -1.0 = -Infinity, with double f(x) operands
+Infinity + -1.0 = Infinity, with double lExpr operands
+Infinity - -1.0 = Infinity, with double lExpr operands
+Infinity * -1.0 = -Infinity, with double lExpr operands
+Infinity / -1.0 = -Infinity, with double lExpr operands
+Infinity + -1.0 = Infinity, with double rExpr operands
+Infinity - -1.0 = Infinity, with double rExpr operands
+Infinity * -1.0 = -Infinity, with double rExpr operands
+Infinity / -1.0 = -Infinity, with double rExpr operands
+Infinity + -1.0 = Infinity, with double exprs operands
+Infinity - -1.0 = Infinity, with double exprs operands
+Infinity * -1.0 = -Infinity, with double exprs operands
+Infinity / -1.0 = -Infinity, with double exprs operands
+Infinity + 1.0 = Infinity, with double param operands
+Infinity - 1.0 = Infinity, with double param operands
+Infinity * 1.0 = Infinity, with double param operands
+Infinity / 1.0 = Infinity, with double param operands
+Infinity + 1.0 = Infinity, with double local operands
+Infinity - 1.0 = Infinity, with double local operands
+Infinity * 1.0 = Infinity, with double local operands
+Infinity / 1.0 = Infinity, with double local operands
+Infinity + 1.0 = Infinity, with double static operands
+Infinity - 1.0 = Infinity, with double static operands
+Infinity * 1.0 = Infinity, with double static operands
+Infinity / 1.0 = Infinity, with double static operands
+Infinity + 1.0 = Infinity, with double field operands
+Infinity - 1.0 = Infinity, with double field operands
+Infinity * 1.0 = Infinity, with double field operands
+Infinity / 1.0 = Infinity, with double field operands
+Infinity + 1.0 = Infinity, with double a[i] operands
+Infinity - 1.0 = Infinity, with double a[i] operands
+Infinity * 1.0 = Infinity, with double a[i] operands
+Infinity / 1.0 = Infinity, with double a[i] operands
+Infinity + 1.0 = Infinity, with double f(x) operands
+Infinity - 1.0 = Infinity, with double f(x) operands
+Infinity * 1.0 = Infinity, with double f(x) operands
+Infinity / 1.0 = Infinity, with double f(x) operands
+Infinity + 1.0 = Infinity, with double lExpr operands
+Infinity - 1.0 = Infinity, with double lExpr operands
+Infinity * 1.0 = Infinity, with double lExpr operands
+Infinity / 1.0 = Infinity, with double lExpr operands
+Infinity + 1.0 = Infinity, with double rExpr operands
+Infinity - 1.0 = Infinity, with double rExpr operands
+Infinity * 1.0 = Infinity, with double rExpr operands
+Infinity / 1.0 = Infinity, with double rExpr operands
+Infinity + 1.0 = Infinity, with double exprs operands
+Infinity - 1.0 = Infinity, with double exprs operands
+Infinity * 1.0 = Infinity, with double exprs operands
+Infinity / 1.0 = Infinity, with double exprs operands
+Infinity + -0.0 = Infinity, with double param operands
+Infinity - -0.0 = Infinity, with double param operands
+Infinity * -0.0 = NaN, with double param operands
+Infinity / -0.0 = -Infinity, with double param operands
+Infinity + -0.0 = Infinity, with double local operands
+Infinity - -0.0 = Infinity, with double local operands
+Infinity * -0.0 = NaN, with double local operands
+Infinity / -0.0 = -Infinity, with double local operands
+Infinity + -0.0 = Infinity, with double static operands
+Infinity - -0.0 = Infinity, with double static operands
+Infinity * -0.0 = NaN, with double static operands
+Infinity / -0.0 = -Infinity, with double static operands
+Infinity + -0.0 = Infinity, with double field operands
+Infinity - -0.0 = Infinity, with double field operands
+Infinity * -0.0 = NaN, with double field operands
+Infinity / -0.0 = -Infinity, with double field operands
+Infinity + -0.0 = Infinity, with double a[i] operands
+Infinity - -0.0 = Infinity, with double a[i] operands
+Infinity * -0.0 = NaN, with double a[i] operands
+Infinity / -0.0 = -Infinity, with double a[i] operands
+Infinity + -0.0 = Infinity, with double f(x) operands
+Infinity - -0.0 = Infinity, with double f(x) operands
+Infinity * -0.0 = NaN, with double f(x) operands
+Infinity / -0.0 = -Infinity, with double f(x) operands
+Infinity + -0.0 = Infinity, with double lExpr operands
+Infinity - -0.0 = Infinity, with double lExpr operands
+Infinity * -0.0 = NaN, with double lExpr operands
+Infinity / -0.0 = -Infinity, with double lExpr operands
+Infinity + 0.0 = Infinity, with double rExpr operands
+Infinity - 0.0 = Infinity, with double rExpr operands
+Infinity * 0.0 = NaN, with double rExpr operands
+Infinity / 0.0 = Infinity, with double rExpr operands
+Infinity + 0.0 = Infinity, with double exprs operands
+Infinity - 0.0 = Infinity, with double exprs operands
+Infinity * 0.0 = NaN, with double exprs operands
+Infinity / 0.0 = Infinity, with double exprs operands
+Infinity + 0.0 = Infinity, with double param operands
+Infinity - 0.0 = Infinity, with double param operands
+Infinity * 0.0 = NaN, with double param operands
+Infinity / 0.0 = Infinity, with double param operands
+Infinity + 0.0 = Infinity, with double local operands
+Infinity - 0.0 = Infinity, with double local operands
+Infinity * 0.0 = NaN, with double local operands
+Infinity / 0.0 = Infinity, with double local operands
+Infinity + 0.0 = Infinity, with double static operands
+Infinity - 0.0 = Infinity, with double static operands
+Infinity * 0.0 = NaN, with double static operands
+Infinity / 0.0 = Infinity, with double static operands
+Infinity + 0.0 = Infinity, with double field operands
+Infinity - 0.0 = Infinity, with double field operands
+Infinity * 0.0 = NaN, with double field operands
+Infinity / 0.0 = Infinity, with double field operands
+Infinity + 0.0 = Infinity, with double a[i] operands
+Infinity - 0.0 = Infinity, with double a[i] operands
+Infinity * 0.0 = NaN, with double a[i] operands
+Infinity / 0.0 = Infinity, with double a[i] operands
+Infinity + 0.0 = Infinity, with double f(x) operands
+Infinity - 0.0 = Infinity, with double f(x) operands
+Infinity * 0.0 = NaN, with double f(x) operands
+Infinity / 0.0 = Infinity, with double f(x) operands
+Infinity + 0.0 = Infinity, with double lExpr operands
+Infinity - 0.0 = Infinity, with double lExpr operands
+Infinity * 0.0 = NaN, with double lExpr operands
+Infinity / 0.0 = Infinity, with double lExpr operands
+Infinity + 0.0 = Infinity, with double rExpr operands
+Infinity - 0.0 = Infinity, with double rExpr operands
+Infinity * 0.0 = NaN, with double rExpr operands
+Infinity / 0.0 = Infinity, with double rExpr operands
+Infinity + 0.0 = Infinity, with double exprs operands
+Infinity - 0.0 = Infinity, with double exprs operands
+Infinity * 0.0 = NaN, with double exprs operands
+Infinity / 0.0 = Infinity, with double exprs operands
+Infinity + -Infinity = NaN, with double param operands
+Infinity - -Infinity = Infinity, with double param operands
+Infinity * -Infinity = -Infinity, with double param operands
+Infinity / -Infinity = NaN, with double param operands
+Infinity + -Infinity = NaN, with double local operands
+Infinity - -Infinity = Infinity, with double local operands
+Infinity * -Infinity = -Infinity, with double local operands
+Infinity / -Infinity = NaN, with double local operands
+Infinity + -Infinity = NaN, with double static operands
+Infinity - -Infinity = Infinity, with double static operands
+Infinity * -Infinity = -Infinity, with double static operands
+Infinity / -Infinity = NaN, with double static operands
+Infinity + -Infinity = NaN, with double field operands
+Infinity - -Infinity = Infinity, with double field operands
+Infinity * -Infinity = -Infinity, with double field operands
+Infinity / -Infinity = NaN, with double field operands
+Infinity + -Infinity = NaN, with double a[i] operands
+Infinity - -Infinity = Infinity, with double a[i] operands
+Infinity * -Infinity = -Infinity, with double a[i] operands
+Infinity / -Infinity = NaN, with double a[i] operands
+Infinity + -Infinity = NaN, with double f(x) operands
+Infinity - -Infinity = Infinity, with double f(x) operands
+Infinity * -Infinity = -Infinity, with double f(x) operands
+Infinity / -Infinity = NaN, with double f(x) operands
+Infinity + -Infinity = NaN, with double lExpr operands
+Infinity - -Infinity = Infinity, with double lExpr operands
+Infinity * -Infinity = -Infinity, with double lExpr operands
+Infinity / -Infinity = NaN, with double lExpr operands
+Infinity + -Infinity = NaN, with double rExpr operands
+Infinity - -Infinity = Infinity, with double rExpr operands
+Infinity * -Infinity = -Infinity, with double rExpr operands
+Infinity / -Infinity = NaN, with double rExpr operands
+Infinity + -Infinity = NaN, with double exprs operands
+Infinity - -Infinity = Infinity, with double exprs operands
+Infinity * -Infinity = -Infinity, with double exprs operands
+Infinity / -Infinity = NaN, with double exprs operands
+Infinity + Infinity = Infinity, with double param operands
+Infinity - Infinity = NaN, with double param operands
+Infinity * Infinity = Infinity, with double param operands
+Infinity / Infinity = NaN, with double param operands
+Infinity + Infinity = Infinity, with double local operands
+Infinity - Infinity = NaN, with double local operands
+Infinity * Infinity = Infinity, with double local operands
+Infinity / Infinity = NaN, with double local operands
+Infinity + Infinity = Infinity, with double static operands
+Infinity - Infinity = NaN, with double static operands
+Infinity * Infinity = Infinity, with double static operands
+Infinity / Infinity = NaN, with double static operands
+Infinity + Infinity = Infinity, with double field operands
+Infinity - Infinity = NaN, with double field operands
+Infinity * Infinity = Infinity, with double field operands
+Infinity / Infinity = NaN, with double field operands
+Infinity + Infinity = Infinity, with double a[i] operands
+Infinity - Infinity = NaN, with double a[i] operands
+Infinity * Infinity = Infinity, with double a[i] operands
+Infinity / Infinity = NaN, with double a[i] operands
+Infinity + Infinity = Infinity, with double f(x) operands
+Infinity - Infinity = NaN, with double f(x) operands
+Infinity * Infinity = Infinity, with double f(x) operands
+Infinity / Infinity = NaN, with double f(x) operands
+Infinity + Infinity = Infinity, with double lExpr operands
+Infinity - Infinity = NaN, with double lExpr operands
+Infinity * Infinity = Infinity, with double lExpr operands
+Infinity / Infinity = NaN, with double lExpr operands
+Infinity + Infinity = Infinity, with double rExpr operands
+Infinity - Infinity = NaN, with double rExpr operands
+Infinity * Infinity = Infinity, with double rExpr operands
+Infinity / Infinity = NaN, with double rExpr operands
+Infinity + Infinity = Infinity, with double exprs operands
+Infinity - Infinity = NaN, with double exprs operands
+Infinity * Infinity = Infinity, with double exprs operands
+Infinity / Infinity = NaN, with double exprs operands
+Infinity + NaN = NaN, with double param operands
+Infinity - NaN = NaN, with double param operands
+Infinity * NaN = NaN, with double param operands
+Infinity / NaN = NaN, with double param operands
+Infinity + NaN = NaN, with double local operands
+Infinity - NaN = NaN, with double local operands
+Infinity * NaN = NaN, with double local operands
+Infinity / NaN = NaN, with double local operands
+Infinity + NaN = NaN, with double static operands
+Infinity - NaN = NaN, with double static operands
+Infinity * NaN = NaN, with double static operands
+Infinity / NaN = NaN, with double static operands
+Infinity + NaN = NaN, with double field operands
+Infinity - NaN = NaN, with double field operands
+Infinity * NaN = NaN, with double field operands
+Infinity / NaN = NaN, with double field operands
+Infinity + NaN = NaN, with double a[i] operands
+Infinity - NaN = NaN, with double a[i] operands
+Infinity * NaN = NaN, with double a[i] operands
+Infinity / NaN = NaN, with double a[i] operands
+Infinity + NaN = NaN, with double f(x) operands
+Infinity - NaN = NaN, with double f(x) operands
+Infinity * NaN = NaN, with double f(x) operands
+Infinity / NaN = NaN, with double f(x) operands
+Infinity + NaN = NaN, with double lExpr operands
+Infinity - NaN = NaN, with double lExpr operands
+Infinity * NaN = NaN, with double lExpr operands
+Infinity / NaN = NaN, with double lExpr operands
+Infinity + NaN = NaN, with double rExpr operands
+Infinity - NaN = NaN, with double rExpr operands
+Infinity * NaN = NaN, with double rExpr operands
+Infinity / NaN = NaN, with double rExpr operands
+Infinity + NaN = NaN, with double exprs operands
+Infinity - NaN = NaN, with double exprs operands
+Infinity * NaN = NaN, with double exprs operands
+Infinity / NaN = NaN, with double exprs operands
+NaN + 4.9E-324 = NaN, with double param operands
+NaN - 4.9E-324 = NaN, with double param operands
+NaN * 4.9E-324 = NaN, with double param operands
+NaN / 4.9E-324 = NaN, with double param operands
+NaN + 4.9E-324 = NaN, with double local operands
+NaN - 4.9E-324 = NaN, with double local operands
+NaN * 4.9E-324 = NaN, with double local operands
+NaN / 4.9E-324 = NaN, with double local operands
+NaN + 4.9E-324 = NaN, with double static operands
+NaN - 4.9E-324 = NaN, with double static operands
+NaN * 4.9E-324 = NaN, with double static operands
+NaN / 4.9E-324 = NaN, with double static operands
+NaN + 4.9E-324 = NaN, with double field operands
+NaN - 4.9E-324 = NaN, with double field operands
+NaN * 4.9E-324 = NaN, with double field operands
+NaN / 4.9E-324 = NaN, with double field operands
+NaN + 4.9E-324 = NaN, with double a[i] operands
+NaN - 4.9E-324 = NaN, with double a[i] operands
+NaN * 4.9E-324 = NaN, with double a[i] operands
+NaN / 4.9E-324 = NaN, with double a[i] operands
+NaN + 4.9E-324 = NaN, with double f(x) operands
+NaN - 4.9E-324 = NaN, with double f(x) operands
+NaN * 4.9E-324 = NaN, with double f(x) operands
+NaN / 4.9E-324 = NaN, with double f(x) operands
+NaN + 4.9E-324 = NaN, with double lExpr operands
+NaN - 4.9E-324 = NaN, with double lExpr operands
+NaN * 4.9E-324 = NaN, with double lExpr operands
+NaN / 4.9E-324 = NaN, with double lExpr operands
+NaN + 4.9E-324 = NaN, with double rExpr operands
+NaN - 4.9E-324 = NaN, with double rExpr operands
+NaN * 4.9E-324 = NaN, with double rExpr operands
+NaN / 4.9E-324 = NaN, with double rExpr operands
+NaN + 4.9E-324 = NaN, with double exprs operands
+NaN - 4.9E-324 = NaN, with double exprs operands
+NaN * 4.9E-324 = NaN, with double exprs operands
+NaN / 4.9E-324 = NaN, with double exprs operands
+NaN + 1.7976931348623157E308 = NaN, with double param operands
+NaN - 1.7976931348623157E308 = NaN, with double param operands
+NaN * 1.7976931348623157E308 = NaN, with double param operands
+NaN / 1.7976931348623157E308 = NaN, with double param operands
+NaN + 1.7976931348623157E308 = NaN, with double local operands
+NaN - 1.7976931348623157E308 = NaN, with double local operands
+NaN * 1.7976931348623157E308 = NaN, with double local operands
+NaN / 1.7976931348623157E308 = NaN, with double local operands
+NaN + 1.7976931348623157E308 = NaN, with double static operands
+NaN - 1.7976931348623157E308 = NaN, with double static operands
+NaN * 1.7976931348623157E308 = NaN, with double static operands
+NaN / 1.7976931348623157E308 = NaN, with double static operands
+NaN + 1.7976931348623157E308 = NaN, with double field operands
+NaN - 1.7976931348623157E308 = NaN, with double field operands
+NaN * 1.7976931348623157E308 = NaN, with double field operands
+NaN / 1.7976931348623157E308 = NaN, with double field operands
+NaN + 1.7976931348623157E308 = NaN, with double a[i] operands
+NaN - 1.7976931348623157E308 = NaN, with double a[i] operands
+NaN * 1.7976931348623157E308 = NaN, with double a[i] operands
+NaN / 1.7976931348623157E308 = NaN, with double a[i] operands
+NaN + 1.7976931348623157E308 = NaN, with double f(x) operands
+NaN - 1.7976931348623157E308 = NaN, with double f(x) operands
+NaN * 1.7976931348623157E308 = NaN, with double f(x) operands
+NaN / 1.7976931348623157E308 = NaN, with double f(x) operands
+NaN + 1.7976931348623157E308 = NaN, with double lExpr operands
+NaN - 1.7976931348623157E308 = NaN, with double lExpr operands
+NaN * 1.7976931348623157E308 = NaN, with double lExpr operands
+NaN / 1.7976931348623157E308 = NaN, with double lExpr operands
+NaN + 1.7976931348623157E308 = NaN, with double rExpr operands
+NaN - 1.7976931348623157E308 = NaN, with double rExpr operands
+NaN * 1.7976931348623157E308 = NaN, with double rExpr operands
+NaN / 1.7976931348623157E308 = NaN, with double rExpr operands
+NaN + 1.7976931348623157E308 = NaN, with double exprs operands
+NaN - 1.7976931348623157E308 = NaN, with double exprs operands
+NaN * 1.7976931348623157E308 = NaN, with double exprs operands
+NaN / 1.7976931348623157E308 = NaN, with double exprs operands
+NaN + -4.9E-324 = NaN, with double param operands
+NaN - -4.9E-324 = NaN, with double param operands
+NaN * -4.9E-324 = NaN, with double param operands
+NaN / -4.9E-324 = NaN, with double param operands
+NaN + -4.9E-324 = NaN, with double local operands
+NaN - -4.9E-324 = NaN, with double local operands
+NaN * -4.9E-324 = NaN, with double local operands
+NaN / -4.9E-324 = NaN, with double local operands
+NaN + -4.9E-324 = NaN, with double static operands
+NaN - -4.9E-324 = NaN, with double static operands
+NaN * -4.9E-324 = NaN, with double static operands
+NaN / -4.9E-324 = NaN, with double static operands
+NaN + -4.9E-324 = NaN, with double field operands
+NaN - -4.9E-324 = NaN, with double field operands
+NaN * -4.9E-324 = NaN, with double field operands
+NaN / -4.9E-324 = NaN, with double field operands
+NaN + -4.9E-324 = NaN, with double a[i] operands
+NaN - -4.9E-324 = NaN, with double a[i] operands
+NaN * -4.9E-324 = NaN, with double a[i] operands
+NaN / -4.9E-324 = NaN, with double a[i] operands
+NaN + -4.9E-324 = NaN, with double f(x) operands
+NaN - -4.9E-324 = NaN, with double f(x) operands
+NaN * -4.9E-324 = NaN, with double f(x) operands
+NaN / -4.9E-324 = NaN, with double f(x) operands
+NaN + -4.9E-324 = NaN, with double lExpr operands
+NaN - -4.9E-324 = NaN, with double lExpr operands
+NaN * -4.9E-324 = NaN, with double lExpr operands
+NaN / -4.9E-324 = NaN, with double lExpr operands
+NaN + -4.9E-324 = NaN, with double rExpr operands
+NaN - -4.9E-324 = NaN, with double rExpr operands
+NaN * -4.9E-324 = NaN, with double rExpr operands
+NaN / -4.9E-324 = NaN, with double rExpr operands
+NaN + -4.9E-324 = NaN, with double exprs operands
+NaN - -4.9E-324 = NaN, with double exprs operands
+NaN * -4.9E-324 = NaN, with double exprs operands
+NaN / -4.9E-324 = NaN, with double exprs operands
+NaN + -1.7976931348623157E308 = NaN, with double param operands
+NaN - -1.7976931348623157E308 = NaN, with double param operands
+NaN * -1.7976931348623157E308 = NaN, with double param operands
+NaN / -1.7976931348623157E308 = NaN, with double param operands
+NaN + -1.7976931348623157E308 = NaN, with double local operands
+NaN - -1.7976931348623157E308 = NaN, with double local operands
+NaN * -1.7976931348623157E308 = NaN, with double local operands
+NaN / -1.7976931348623157E308 = NaN, with double local operands
+NaN + -1.7976931348623157E308 = NaN, with double static operands
+NaN - -1.7976931348623157E308 = NaN, with double static operands
+NaN * -1.7976931348623157E308 = NaN, with double static operands
+NaN / -1.7976931348623157E308 = NaN, with double static operands
+NaN + -1.7976931348623157E308 = NaN, with double field operands
+NaN - -1.7976931348623157E308 = NaN, with double field operands
+NaN * -1.7976931348623157E308 = NaN, with double field operands
+NaN / -1.7976931348623157E308 = NaN, with double field operands
+NaN + -1.7976931348623157E308 = NaN, with double a[i] operands
+NaN - -1.7976931348623157E308 = NaN, with double a[i] operands
+NaN * -1.7976931348623157E308 = NaN, with double a[i] operands
+NaN / -1.7976931348623157E308 = NaN, with double a[i] operands
+NaN + -1.7976931348623157E308 = NaN, with double f(x) operands
+NaN - -1.7976931348623157E308 = NaN, with double f(x) operands
+NaN * -1.7976931348623157E308 = NaN, with double f(x) operands
+NaN / -1.7976931348623157E308 = NaN, with double f(x) operands
+NaN + -1.7976931348623157E308 = NaN, with double lExpr operands
+NaN - -1.7976931348623157E308 = NaN, with double lExpr operands
+NaN * -1.7976931348623157E308 = NaN, with double lExpr operands
+NaN / -1.7976931348623157E308 = NaN, with double lExpr operands
+NaN + -1.7976931348623157E308 = NaN, with double rExpr operands
+NaN - -1.7976931348623157E308 = NaN, with double rExpr operands
+NaN * -1.7976931348623157E308 = NaN, with double rExpr operands
+NaN / -1.7976931348623157E308 = NaN, with double rExpr operands
+NaN + -1.7976931348623157E308 = NaN, with double exprs operands
+NaN - -1.7976931348623157E308 = NaN, with double exprs operands
+NaN * -1.7976931348623157E308 = NaN, with double exprs operands
+NaN / -1.7976931348623157E308 = NaN, with double exprs operands
+NaN + -1.0 = NaN, with double param operands
+NaN - -1.0 = NaN, with double param operands
+NaN * -1.0 = NaN, with double param operands
+NaN / -1.0 = NaN, with double param operands
+NaN + -1.0 = NaN, with double local operands
+NaN - -1.0 = NaN, with double local operands
+NaN * -1.0 = NaN, with double local operands
+NaN / -1.0 = NaN, with double local operands
+NaN + -1.0 = NaN, with double static operands
+NaN - -1.0 = NaN, with double static operands
+NaN * -1.0 = NaN, with double static operands
+NaN / -1.0 = NaN, with double static operands
+NaN + -1.0 = NaN, with double field operands
+NaN - -1.0 = NaN, with double field operands
+NaN * -1.0 = NaN, with double field operands
+NaN / -1.0 = NaN, with double field operands
+NaN + -1.0 = NaN, with double a[i] operands
+NaN - -1.0 = NaN, with double a[i] operands
+NaN * -1.0 = NaN, with double a[i] operands
+NaN / -1.0 = NaN, with double a[i] operands
+NaN + -1.0 = NaN, with double f(x) operands
+NaN - -1.0 = NaN, with double f(x) operands
+NaN * -1.0 = NaN, with double f(x) operands
+NaN / -1.0 = NaN, with double f(x) operands
+NaN + -1.0 = NaN, with double lExpr operands
+NaN - -1.0 = NaN, with double lExpr operands
+NaN * -1.0 = NaN, with double lExpr operands
+NaN / -1.0 = NaN, with double lExpr operands
+NaN + -1.0 = NaN, with double rExpr operands
+NaN - -1.0 = NaN, with double rExpr operands
+NaN * -1.0 = NaN, with double rExpr operands
+NaN / -1.0 = NaN, with double rExpr operands
+NaN + -1.0 = NaN, with double exprs operands
+NaN - -1.0 = NaN, with double exprs operands
+NaN * -1.0 = NaN, with double exprs operands
+NaN / -1.0 = NaN, with double exprs operands
+NaN + 1.0 = NaN, with double param operands
+NaN - 1.0 = NaN, with double param operands
+NaN * 1.0 = NaN, with double param operands
+NaN / 1.0 = NaN, with double param operands
+NaN + 1.0 = NaN, with double local operands
+NaN - 1.0 = NaN, with double local operands
+NaN * 1.0 = NaN, with double local operands
+NaN / 1.0 = NaN, with double local operands
+NaN + 1.0 = NaN, with double static operands
+NaN - 1.0 = NaN, with double static operands
+NaN * 1.0 = NaN, with double static operands
+NaN / 1.0 = NaN, with double static operands
+NaN + 1.0 = NaN, with double field operands
+NaN - 1.0 = NaN, with double field operands
+NaN * 1.0 = NaN, with double field operands
+NaN / 1.0 = NaN, with double field operands
+NaN + 1.0 = NaN, with double a[i] operands
+NaN - 1.0 = NaN, with double a[i] operands
+NaN * 1.0 = NaN, with double a[i] operands
+NaN / 1.0 = NaN, with double a[i] operands
+NaN + 1.0 = NaN, with double f(x) operands
+NaN - 1.0 = NaN, with double f(x) operands
+NaN * 1.0 = NaN, with double f(x) operands
+NaN / 1.0 = NaN, with double f(x) operands
+NaN + 1.0 = NaN, with double lExpr operands
+NaN - 1.0 = NaN, with double lExpr operands
+NaN * 1.0 = NaN, with double lExpr operands
+NaN / 1.0 = NaN, with double lExpr operands
+NaN + 1.0 = NaN, with double rExpr operands
+NaN - 1.0 = NaN, with double rExpr operands
+NaN * 1.0 = NaN, with double rExpr operands
+NaN / 1.0 = NaN, with double rExpr operands
+NaN + 1.0 = NaN, with double exprs operands
+NaN - 1.0 = NaN, with double exprs operands
+NaN * 1.0 = NaN, with double exprs operands
+NaN / 1.0 = NaN, with double exprs operands
+NaN + -0.0 = NaN, with double param operands
+NaN - -0.0 = NaN, with double param operands
+NaN * -0.0 = NaN, with double param operands
+NaN / -0.0 = NaN, with double param operands
+NaN + -0.0 = NaN, with double local operands
+NaN - -0.0 = NaN, with double local operands
+NaN * -0.0 = NaN, with double local operands
+NaN / -0.0 = NaN, with double local operands
+NaN + -0.0 = NaN, with double static operands
+NaN - -0.0 = NaN, with double static operands
+NaN * -0.0 = NaN, with double static operands
+NaN / -0.0 = NaN, with double static operands
+NaN + -0.0 = NaN, with double field operands
+NaN - -0.0 = NaN, with double field operands
+NaN * -0.0 = NaN, with double field operands
+NaN / -0.0 = NaN, with double field operands
+NaN + -0.0 = NaN, with double a[i] operands
+NaN - -0.0 = NaN, with double a[i] operands
+NaN * -0.0 = NaN, with double a[i] operands
+NaN / -0.0 = NaN, with double a[i] operands
+NaN + -0.0 = NaN, with double f(x) operands
+NaN - -0.0 = NaN, with double f(x) operands
+NaN * -0.0 = NaN, with double f(x) operands
+NaN / -0.0 = NaN, with double f(x) operands
+NaN + -0.0 = NaN, with double lExpr operands
+NaN - -0.0 = NaN, with double lExpr operands
+NaN * -0.0 = NaN, with double lExpr operands
+NaN / -0.0 = NaN, with double lExpr operands
+NaN + 0.0 = NaN, with double rExpr operands
+NaN - 0.0 = NaN, with double rExpr operands
+NaN * 0.0 = NaN, with double rExpr operands
+NaN / 0.0 = NaN, with double rExpr operands
+NaN + 0.0 = NaN, with double exprs operands
+NaN - 0.0 = NaN, with double exprs operands
+NaN * 0.0 = NaN, with double exprs operands
+NaN / 0.0 = NaN, with double exprs operands
+NaN + 0.0 = NaN, with double param operands
+NaN - 0.0 = NaN, with double param operands
+NaN * 0.0 = NaN, with double param operands
+NaN / 0.0 = NaN, with double param operands
+NaN + 0.0 = NaN, with double local operands
+NaN - 0.0 = NaN, with double local operands
+NaN * 0.0 = NaN, with double local operands
+NaN / 0.0 = NaN, with double local operands
+NaN + 0.0 = NaN, with double static operands
+NaN - 0.0 = NaN, with double static operands
+NaN * 0.0 = NaN, with double static operands
+NaN / 0.0 = NaN, with double static operands
+NaN + 0.0 = NaN, with double field operands
+NaN - 0.0 = NaN, with double field operands
+NaN * 0.0 = NaN, with double field operands
+NaN / 0.0 = NaN, with double field operands
+NaN + 0.0 = NaN, with double a[i] operands
+NaN - 0.0 = NaN, with double a[i] operands
+NaN * 0.0 = NaN, with double a[i] operands
+NaN / 0.0 = NaN, with double a[i] operands
+NaN + 0.0 = NaN, with double f(x) operands
+NaN - 0.0 = NaN, with double f(x) operands
+NaN * 0.0 = NaN, with double f(x) operands
+NaN / 0.0 = NaN, with double f(x) operands
+NaN + 0.0 = NaN, with double lExpr operands
+NaN - 0.0 = NaN, with double lExpr operands
+NaN * 0.0 = NaN, with double lExpr operands
+NaN / 0.0 = NaN, with double lExpr operands
+NaN + 0.0 = NaN, with double rExpr operands
+NaN - 0.0 = NaN, with double rExpr operands
+NaN * 0.0 = NaN, with double rExpr operands
+NaN / 0.0 = NaN, with double rExpr operands
+NaN + 0.0 = NaN, with double exprs operands
+NaN - 0.0 = NaN, with double exprs operands
+NaN * 0.0 = NaN, with double exprs operands
+NaN / 0.0 = NaN, with double exprs operands
+NaN + -Infinity = NaN, with double param operands
+NaN - -Infinity = NaN, with double param operands
+NaN * -Infinity = NaN, with double param operands
+NaN / -Infinity = NaN, with double param operands
+NaN + -Infinity = NaN, with double local operands
+NaN - -Infinity = NaN, with double local operands
+NaN * -Infinity = NaN, with double local operands
+NaN / -Infinity = NaN, with double local operands
+NaN + -Infinity = NaN, with double static operands
+NaN - -Infinity = NaN, with double static operands
+NaN * -Infinity = NaN, with double static operands
+NaN / -Infinity = NaN, with double static operands
+NaN + -Infinity = NaN, with double field operands
+NaN - -Infinity = NaN, with double field operands
+NaN * -Infinity = NaN, with double field operands
+NaN / -Infinity = NaN, with double field operands
+NaN + -Infinity = NaN, with double a[i] operands
+NaN - -Infinity = NaN, with double a[i] operands
+NaN * -Infinity = NaN, with double a[i] operands
+NaN / -Infinity = NaN, with double a[i] operands
+NaN + -Infinity = NaN, with double f(x) operands
+NaN - -Infinity = NaN, with double f(x) operands
+NaN * -Infinity = NaN, with double f(x) operands
+NaN / -Infinity = NaN, with double f(x) operands
+NaN + -Infinity = NaN, with double lExpr operands
+NaN - -Infinity = NaN, with double lExpr operands
+NaN * -Infinity = NaN, with double lExpr operands
+NaN / -Infinity = NaN, with double lExpr operands
+NaN + -Infinity = NaN, with double rExpr operands
+NaN - -Infinity = NaN, with double rExpr operands
+NaN * -Infinity = NaN, with double rExpr operands
+NaN / -Infinity = NaN, with double rExpr operands
+NaN + -Infinity = NaN, with double exprs operands
+NaN - -Infinity = NaN, with double exprs operands
+NaN * -Infinity = NaN, with double exprs operands
+NaN / -Infinity = NaN, with double exprs operands
+NaN + Infinity = NaN, with double param operands
+NaN - Infinity = NaN, with double param operands
+NaN * Infinity = NaN, with double param operands
+NaN / Infinity = NaN, with double param operands
+NaN + Infinity = NaN, with double local operands
+NaN - Infinity = NaN, with double local operands
+NaN * Infinity = NaN, with double local operands
+NaN / Infinity = NaN, with double local operands
+NaN + Infinity = NaN, with double static operands
+NaN - Infinity = NaN, with double static operands
+NaN * Infinity = NaN, with double static operands
+NaN / Infinity = NaN, with double static operands
+NaN + Infinity = NaN, with double field operands
+NaN - Infinity = NaN, with double field operands
+NaN * Infinity = NaN, with double field operands
+NaN / Infinity = NaN, with double field operands
+NaN + Infinity = NaN, with double a[i] operands
+NaN - Infinity = NaN, with double a[i] operands
+NaN * Infinity = NaN, with double a[i] operands
+NaN / Infinity = NaN, with double a[i] operands
+NaN + Infinity = NaN, with double f(x) operands
+NaN - Infinity = NaN, with double f(x) operands
+NaN * Infinity = NaN, with double f(x) operands
+NaN / Infinity = NaN, with double f(x) operands
+NaN + Infinity = NaN, with double lExpr operands
+NaN - Infinity = NaN, with double lExpr operands
+NaN * Infinity = NaN, with double lExpr operands
+NaN / Infinity = NaN, with double lExpr operands
+NaN + Infinity = NaN, with double rExpr operands
+NaN - Infinity = NaN, with double rExpr operands
+NaN * Infinity = NaN, with double rExpr operands
+NaN / Infinity = NaN, with double rExpr operands
+NaN + Infinity = NaN, with double exprs operands
+NaN - Infinity = NaN, with double exprs operands
+NaN * Infinity = NaN, with double exprs operands
+NaN / Infinity = NaN, with double exprs operands
+NaN + NaN = NaN, with double param operands
+NaN - NaN = NaN, with double param operands
+NaN * NaN = NaN, with double param operands
+NaN / NaN = NaN, with double param operands
+NaN + NaN = NaN, with double local operands
+NaN - NaN = NaN, with double local operands
+NaN * NaN = NaN, with double local operands
+NaN / NaN = NaN, with double local operands
+NaN + NaN = NaN, with double static operands
+NaN - NaN = NaN, with double static operands
+NaN * NaN = NaN, with double static operands
+NaN / NaN = NaN, with double static operands
+NaN + NaN = NaN, with double field operands
+NaN - NaN = NaN, with double field operands
+NaN * NaN = NaN, with double field operands
+NaN / NaN = NaN, with double field operands
+NaN + NaN = NaN, with double a[i] operands
+NaN - NaN = NaN, with double a[i] operands
+NaN * NaN = NaN, with double a[i] operands
+NaN / NaN = NaN, with double a[i] operands
+NaN + NaN = NaN, with double f(x) operands
+NaN - NaN = NaN, with double f(x) operands
+NaN * NaN = NaN, with double f(x) operands
+NaN / NaN = NaN, with double f(x) operands
+NaN + NaN = NaN, with double lExpr operands
+NaN - NaN = NaN, with double lExpr operands
+NaN * NaN = NaN, with double lExpr operands
+NaN / NaN = NaN, with double lExpr operands
+NaN + NaN = NaN, with double rExpr operands
+NaN - NaN = NaN, with double rExpr operands
+NaN * NaN = NaN, with double rExpr operands
+NaN / NaN = NaN, with double rExpr operands
+NaN + NaN = NaN, with double exprs operands
+NaN - NaN = NaN, with double exprs operands
+NaN * NaN = NaN, with double exprs operands
+NaN / NaN = NaN, with double exprs operands
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java
new file mode 100644
index 00000000000..587f15cfbb8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java
@@ -0,0 +1,416 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/FPCompare/TestFPBinop.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.FloatingPoint.FPCompare.TestFPBinop.TestFPBinop
+ */
+
+package jit.FloatingPoint.FPCompare.TestFPBinop;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+/** Test of Floating Point Binary Ops.
+ ** This is intended to be run on a known-correct system and the
+ ** answer compared with the golden answer with diff or equivalent.
+ */
+public class TestFPBinop {
+    public static final GoldChecker goldChecker = new GoldChecker( "TestFPBinop" );
+
+    static float floatValues [] = {
+        Float.MIN_VALUE, Float.MAX_VALUE,
+        -Float.MIN_VALUE, -Float.MAX_VALUE,
+        -1.0f, 1.0f, -0.0f, 0.0f,
+        Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY,
+        Float.NaN
+    };
+    static double doubleValues [] = {
+        Double.MIN_VALUE, Double.MAX_VALUE,
+        -Double.MIN_VALUE, -Double.MAX_VALUE,
+        -1.0, 1.0, -0.0, 0.0,
+        Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
+        Double.NaN
+    };
+
+    static int nValues = floatValues.length;
+
+    static float fOne, fZero;
+    static double dOne, dZero;
+
+    /* This is intended to thrwart an optimizing compiler
+     * from simplifying some of the expressions by using algebraic
+     * identities. */
+    static {
+        fOne = new Integer(1).floatValue();
+        fZero = new Integer(0).floatValue();
+        dOne = new Integer(1).doubleValue();
+        dZero = new Integer(0).doubleValue();
+    }
+
+    static final boolean DEBUG = false;
+
+    static String operandType = "";
+
+    // static values
+    static float xs, ys;
+    static double xS, yS;
+
+    /** Test of Floating Point Binary operators.
+     ** The following orthogonal variables need to be tested.
+     ** <ul>
+     ** <li> Data type: float or double
+     ** <li> Operator: +, -, *, /
+     ** <li> Data values: +-normal, +-zero, NaN, +-infinity, +- min, +-max
+     ** <li> Operand: variable, parameter, static, field, array element,
+     **      function reference, expression, explicit constant.
+     ** </ul>
+     */
+    public static void main (String [] args) {
+        testFloats();
+        testDoubles();
+        TestFPBinop.goldChecker.check();
+    }
+
+    static void testFloats() {
+        for (int i = 0; i < floatValues.length; i++) {
+            float iVal = floatValues[i];
+            for (int j = 0; j < floatValues.length; j++) {
+                float jVal = floatValues[j];
+                testFloat(iVal, jVal);
+            }
+        }
+    }
+    static void testDoubles() {
+        for (int i = 0; i < doubleValues.length; i++) {
+            double iVal = doubleValues[i];
+            for (int j = 0; j < doubleValues.length; j++) {
+                double jVal = doubleValues[j];
+                testDouble(iVal, jVal);
+            }
+        }
+    }
+
+    static void testFloat (float x, float y) {
+
+        testFloatP(x, y);
+        testFloatL(x, y);
+        testFloatS(x, y);
+        testFloatF(x, y);
+        testFloatA(x, y);
+        testFloatM(x, y);
+        testFloat1(x, y);
+        testFloat2(x, y);
+        testFloat3(x, y);
+    }
+
+    static void testFloatP(float x, float y) {
+
+        check(x, y, x + y, "param", "+");
+        check(x, y, x - y, "param", "-");
+        check(x, y, x * y, "param", "*");
+        check(x, y, x / y, "param", "/");
+
+    }
+
+    static void testFloatL(float x, float y) {
+
+        float xl = x;
+        float yl = y;
+
+        check(xl, yl, xl + yl, "local", "+");
+        check(xl, yl, xl - yl, "local", "-");
+        check(xl, yl, xl * yl, "local", "*");
+        check(xl, yl, xl / yl, "local", "/");
+
+    }
+
+    static void testFloatS(float x, float y) {
+
+        xs = x;
+        ys = y;
+
+        check(xs, ys, xs + ys, "static", "+");
+        check(xs, ys, xs - ys, "static", "-");
+        check(xs, ys, xs * ys, "static", "*");
+        check(xs, ys, xs / ys, "static", "/");
+
+    }
+
+    static void testFloatF(float x, float y) {
+
+        FloatObject xo = new FloatObject(x);
+        FloatObject yo = new FloatObject(y);
+
+        check(xo.f, yo.f, xo.f + yo.f, "field", "+");
+        check(xo.f, yo.f, xo.f - yo.f, "field", "-");
+        check(xo.f, yo.f, xo.f * yo.f, "field", "*");
+        check(xo.f, yo.f, xo.f / yo.f, "field", "/");
+
+    }
+
+    static void testFloatA(float x, float y) {
+
+        int i = index(x);
+        int j = index(y);
+        float a [] = floatValues;
+
+        check(a[i], a[j], a[i] + a[j], "a[i]", "+");
+        check(a[i], a[j], a[i] - a[j], "a[i]", "-");
+        check(a[i], a[j], a[i] * a[j], "a[i]", "*");
+        check(a[i], a[j], a[i] / a[j], "a[i]", "/");
+
+    }
+
+    static void testFloatM(float x, float y) {
+
+        check(i(x), i(y), i(x) + i(y), "f(x)", "+");
+        check(i(x), i(y), i(x) - i(y), "f(x)", "-");
+        check(i(x), i(y), i(x) * i(y), "f(x)", "*");
+        check(i(x), i(y), i(x) / i(y), "f(x)", "/");
+
+    }
+
+    static void testFloat1(float x, float y) {
+
+        float zero = fZero;
+        float one = fOne;
+
+        check(((x + zero) * one), y, ((x + zero) * one) + y, "lExpr", "+");
+        check(((x + zero) * one), y, ((x + zero) * one) - y, "lExpr", "-");
+        check(((x + zero) * one), y, ((x + zero) * one) * y, "lExpr", "*");
+        check(((x + zero) * one), y, ((x + zero) * one) / y, "lExpr", "/");
+
+    }
+
+    static void testFloat3(float x, float y) {
+
+        float zero = fZero;
+        float one = fOne;
+
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) + (zero + one * y), "exprs", "+");
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) - (zero + one * y), "exprs", "-");
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) * (zero + one * y), "exprs", "*");
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) / (zero + one * y), "exprs", "/");
+
+    }
+
+    static void testFloat2(float x, float y) {
+
+        float zero = fZero;
+        float one = fOne;
+
+        operandType = "rExpr";
+
+        check(x, (zero + one * y), x + (zero + one * y), "rExpr", "+");
+        check(x, (zero + one * y), x - (zero + one * y), "rExpr", "-");
+        check(x, (zero + one * y), x * (zero + one * y), "rExpr", "*");
+        check(x, (zero + one * y), x / (zero + one * y), "rExpr", "/");
+
+    }
+
+    static void testDouble (double x, double y) {
+
+        testDoubleP(x, y);
+        testDoubleL(x, y);
+        testDoubleS(x, y);
+        testDoubleF(x, y);
+        testDoubleA(x, y);
+        testDoubleM(x, y);
+        testDouble1(x, y);
+        testDouble2(x, y);
+        testDouble3(x, y);
+    }
+
+    static void testDoubleP (double x, double y) {
+
+        check(x, y, x + y, "param", "+");
+        check(x, y, x - y, "param", "-");
+        check(x, y, x * y, "param", "*");
+        check(x, y, x / y, "param", "/");
+
+    }
+
+    static void testDoubleL (double x, double y) {
+
+        double xl = x;
+        double yl = y;
+
+        check(xl, yl, xl + yl, "local", "+");
+        check(xl, yl, xl - yl, "local", "-");
+        check(xl, yl, xl * yl, "local", "*");
+        check(xl, yl, xl / yl, "local", "/");
+
+    }
+
+    static void testDoubleS (double x, double y) {
+
+        xS = x;
+        yS = y;
+
+        check(xS, yS, xS + yS, "static", "+");
+        check(xS, yS, xS - yS, "static", "-");
+        check(xS, yS, xS * yS, "static", "*");
+        check(xS, yS, xS / yS, "static", "/");
+
+    }
+
+    static void testDoubleF (double x, double y) {
+
+        DoubleObject xo = new DoubleObject(x);
+        DoubleObject yo = new DoubleObject(y);
+
+        check(xo.f, yo.f, xo.f + yo.f, "field", "+");
+        check(xo.f, yo.f, xo.f - yo.f, "field", "-");
+        check(xo.f, yo.f, xo.f * yo.f, "field", "*");
+        check(xo.f, yo.f, xo.f / yo.f, "field", "/");
+
+    }
+
+    static void testDoubleA (double x, double y) {
+
+        int i = index(x);
+        int j = index(y);
+        double a [] = doubleValues;
+
+        check(a[i], a[j], a[i] + a[j], "a[i]", "+");
+        check(a[i], a[j], a[i] - a[j], "a[i]", "-");
+        check(a[i], a[j], a[i] * a[j], "a[i]", "*");
+        check(a[i], a[j], a[i] / a[j], "a[i]", "/");
+
+    }
+
+    static void testDoubleM (double x, double y) {
+
+        check(i(x), i(y), i(x) + i(y), "f(x)", "+");
+        check(i(x), i(y), i(x) - i(y), "f(x)", "-");
+        check(i(x), i(y), i(x) * i(y), "f(x)", "*");
+        check(i(x), i(y), i(x) / i(y), "f(x)", "/");
+
+    }
+
+    static void testDouble1 (double x, double y) {
+
+        double zero = dZero;
+        double one = dOne;
+
+        check(((x + zero) * one), y, ((x + zero) * one) + y, "lExpr", "+");
+        check(((x + zero) * one), y, ((x + zero) * one) - y, "lExpr", "-");
+        check(((x + zero) * one), y, ((x + zero) * one) * y, "lExpr", "*");
+        check(((x + zero) * one), y, ((x + zero) * one) / y, "lExpr", "/");
+
+    }
+
+    static void testDouble3 (double x, double y) {
+
+        double zero = dZero;
+        double one = dOne;
+
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) + (zero + one * y), "exprs", "+");
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) - (zero + one * y), "exprs", "-");
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) * (zero + one * y), "exprs", "*");
+        check(((x + zero) * one), (zero + one * y), ((x + zero) * one) / (zero + one * y), "exprs", "/");
+
+    }
+
+    static void testDouble2 (double x, double y) {
+
+        double zero = dZero;
+        double one = dOne;
+
+        check(x, (zero + one * y), x + (zero + one * y), "rExpr", "+");
+        check(x, (zero + one * y), x - (zero + one * y), "rExpr", "-");
+        check(x, (zero + one * y), x * (zero + one * y), "rExpr", "*");
+        check(x, (zero + one * y), x / (zero + one * y), "rExpr", "/");
+
+    }
+
+
+    /* The convoluted coding is intended to prevent inlining */
+    static float i(float x) {
+        while (Float.isNaN(x) && Float.floatToIntBits(x) == 0) {
+            x = 0.0f;
+        }
+        return x;
+    }
+    static double i(double x) {
+        while (Double.isNaN(x) && Double.doubleToLongBits(x) == 0L) {
+            x = 0.0;
+        }
+        return x;
+    }
+
+    static int index(float x) {
+        for (int i = 0; i < floatValues.length; i++) {
+            if (new Float(x).equals(new Float(floatValues[i])))
+                return i;
+        }
+        throw new TestFailure("ERROR: can't find " + x + " in floatValues.");
+    }
+
+    static int index(double x) {
+        for (int i = 0; i < doubleValues.length; i++) {
+            if (new Double(x).equals(new Double(doubleValues[i])))
+                return i;
+        }
+        throw new TestFailure("ERROR: can't find " + x + " in doubleValues.");
+    }
+
+    static void check (float x, float y, float result,
+                       String operands, String operator) {
+      TestFPBinop.goldChecker.println(x + " " + operator + " " + y +
+                         " = " + result + ", with float " +
+                         operands + " operands");
+    }
+
+    static void check (double x, double y, double result,
+                       String operands, String operator) {
+      TestFPBinop.goldChecker.println(x + " " + operator + " " + y +
+                         " = " + result + ", with double " +
+                         operands + " operands");
+    }
+
+}
+
+class FloatObject {
+    public float f;
+
+    public FloatObject(float x) {
+        f = x;
+    }
+}
+
+class DoubleObject {
+    public double f;
+
+    public DoubleObject(double x) {
+        f = x;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java
new file mode 100644
index 00000000000..3c4a7658f71
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java
@@ -0,0 +1,161 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Filtering.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Filtering.Filtering
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Filtering.Filtering
+ */
+
+package jit.FloatingPoint.gen_math.Filtering;
+
+import nsk.share.TestFailure;
+
+class Filtering
+{
+   static int N = 1000;
+   static double xx[];
+   static double yy[];
+
+   public static void main (String args[])
+   {
+
+        double Error = 0.0001;
+
+        xx = new double[N];
+        yy = new double[N];
+
+
+        double r1, r2, r3, r4;
+
+        double rn = N;
+        double dx = 1/rn;
+        double A = 0.5;
+        double B = 0.75;
+
+        for(int i = 0; i < N; i++)
+        {       r1 = i * dx;
+                xx[i] = A * Math.sin(3 * r1) + B * Math.cos(3 * r1);
+        }
+
+        Filtering ff;
+        ff = new Filtering();
+
+        double normaX = ff.Norma1(N,xx);
+
+        ff.Filter1(N);
+        double norma1 = ff.Norma1(N,yy);
+
+        ff.Filter2(N);
+        double norma2 = ff.Norma1(N,yy);
+
+        ff.Filter3(N);
+        double norma3 = ff.Norma1(N,yy);
+
+        r4 = (norma1 * norma1 + norma2 * norma2 + norma3 * norma3) / 3 ;
+        r4 = Math.sqrt(r4);
+        double errrr = Math.abs(r4 - normaX);
+
+        ff.Echeck(errrr,Error);
+
+  }
+
+   public double Norma1(int nn, double uu[])
+   {
+        double nor = 0;
+        double r1 = nn;
+        double r2;
+        for(int i = 0; i < nn; i++)
+        {       r2 = uu[i] * uu[i];
+                nor = nor + r2;
+        }
+        nor = nor / r1;
+        return nor;
+   }
+
+
+   public void Filter1 (int nn)
+   {    yy[0] = xx[0];
+        yy[nn - 1] = xx[nn - 1];
+        for(int i = 1; i < nn - 1; i++)
+        {
+                yy[i] = 0.5 * (xx[i - 1] + xx[i + 1]);
+        }
+   }
+
+
+   public void Filter2 (int nn)
+   {    yy[0] = xx[0];
+        yy[nn - 1] = xx[nn - 1];
+        for(int i = 1; i < nn - 1; i++)
+        {
+                yy[i] = 0.25 * (xx[i - 1] + 2 * xx[i] + xx[i + 1]);
+        }
+
+   }
+
+   public void Filter3 (int nn)
+   {    yy[0] = xx[0];
+        yy[nn - 1] = xx[nn - 1];
+        yy[1] = 0.5 * (xx[0] + xx[2]);
+        yy[nn - 2] = 0.5 * (xx[nn - 1] + xx[nn - 3]);
+        for(int i = 2; i < nn - 2; i++)
+        {
+                yy[i] = 0.1 * (xx[i - 2] + 2 * xx[i - 1] + 4 * xx[i] +
+                        2 * xx[i + 1] + xx[i + 2]);
+        }
+
+   }
+
+
+
+
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+
+        }
+
+   }
+
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java
new file mode 100644
index 00000000000..44727f7e1b7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java
@@ -0,0 +1,120 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops01.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops01.Loops01
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops01.Loops01
+ */
+
+package jit.FloatingPoint.gen_math.Loops01;
+
+import nsk.share.TestFailure;
+
+class Loops01
+{
+
+   static final int N = 500;
+
+   public static void main (String args[])
+   {
+
+        double Error = 0.01;
+
+        double xx[][];
+        xx = new double[N][N];
+
+        double rn = N;
+        double dx = 1/rn;
+        double dy = 1/rn;
+
+        double r1, r2, r3, r4, r5;
+
+        Loops01 ll;
+        ll = new Loops01();
+
+        for(int i = 0; i < N; i++)
+        {       for(int j = 0; j < N; j++)
+                {
+                        r1 = i * dx;
+                        r2 = j * dy;
+                        r3 = Math.sqrt(r1 * r1 + r2 * r2);
+                        r4 = Math.sin(4 * r1) + Math.cos(4 * r2);
+                        r5 = r3 * (2 + r4);
+                        xx[i][j] = r5;
+                }
+        }
+
+        double norma = ll.Norma(N,xx);
+        double er = Math.abs(2.5 - norma);
+        ll.Echeck(er,Error);
+
+  }
+
+   public double Norma(int nn, double ww[][])
+   {
+        double nor = 0;
+        double r1 = nn;
+        double r2 = r1 * r1;
+        double r3;
+
+        for(int i = 0; i < nn; i++)
+        {
+                for(int j = 0; j < nn; j++)
+                {       r3 = ww[i][j] * ww[i][j];
+                        nor = nor + r3;
+                }
+        }
+        nor = nor/r2;
+        return nor;
+   }
+
+
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+        }
+
+   }
+
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java
new file mode 100644
index 00000000000..fdda4920507
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java
@@ -0,0 +1,95 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops02.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops02.Loops02
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops02.Loops02
+ */
+
+package jit.FloatingPoint.gen_math.Loops02;
+
+// Test working with  loops and random functions.
+import nsk.share.TestFailure;
+
+class Loops02
+{
+
+   static final int N = 300;
+
+   public static void main (String args[])
+   {
+
+
+        double x;
+        double r1, r2, r3;
+
+        double rn = N;
+        double dx = 1/rn;
+        double Min_count = rn/2;
+
+        Loops02 ll;
+        ll = new Loops02();
+
+        x = 0.5;
+        int count = 0;
+        do
+        {
+                r1 = Math.random();
+                r2 = Math.random();
+                x = x + dx * (r1 - r2);
+                count++;
+
+        } while(x > 0 && x < 1);
+
+        ll.Echeck(Min_count,count);
+
+  }
+
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+        }
+
+   }
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java
new file mode 100644
index 00000000000..85a2f44e17b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java
@@ -0,0 +1,119 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops03.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops03.Loops03
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops03.Loops03
+ */
+
+package jit.FloatingPoint.gen_math.Loops03;
+
+import nsk.share.TestFailure;
+
+class Loops03
+{
+
+   static final int N = 100000;
+
+   public static void main (String args[])
+   {
+
+
+        double x;
+        double r1, r2, r3, r4, r5, r6, r7;
+        double Error = 0.001;
+
+
+        Loops03 ll;
+        ll = new Loops03();
+
+        int i = 1;
+        double sum = 0;
+        double prod = 1;
+        while(i < N)
+        {       r1 = ll.Random_arg(i);
+                r3 = Math.sin(r1);
+                r4 = Math.cos(r1);
+                r5 = r3 * r3 + r4 * r4;
+                r6 = i + i;
+                r7 = r6 * r6;
+                sum = sum + r5/r7;
+
+                r2 = ll.Random_arg(i);
+                r3 = Math.sin(r1);
+                r4 = Math.cos(r1);
+                r5 = r3 * r3 + r4 * r4;
+                r6 = i + i;
+                r7 = r6 * r6;
+                prod = prod * (1 + r5/r7);
+                i++;
+        }
+        double er1 = Math.abs(sum - 0.411);
+        double er2 = Math.abs(prod - 1.465);
+        double errrr = Math.sqrt(er1 * er1 + er2 * er2);
+
+
+        ll.Echeck(errrr,Error);
+
+  }
+
+// method below return double random number in interval
+//              (0, int nn)
+
+   public double Random_arg(int nn)
+   {
+        double rr;
+        rr = Math.random();
+        double rn = nn;
+        double ru = rr * rn;
+        return ru;
+
+   }
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+        }
+
+   }
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java
new file mode 100644
index 00000000000..b5b9b28bbb1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java
@@ -0,0 +1,135 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops04.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops04.Loops04
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops04.Loops04
+ */
+
+package jit.FloatingPoint.gen_math.Loops04;
+
+// Test working with nested loops.
+import nsk.share.TestFailure;
+
+class Loops04
+{
+
+   public static void main (String args[])
+   {
+
+        int N = 25;
+
+        double Error = 0.01;
+
+        double xx[];
+        double yy[];
+        double zz[];
+
+        xx = new double[N];
+        yy = new double[N];
+        zz = new double[N];
+
+        Loops04 ll;
+        ll = new Loops04();
+
+        for(int i = 0; i < N; i++)
+        {
+                xx[i] = i;
+                yy[i] = i + 1;
+                zz[i] = Math.max(xx[i],yy[i]);
+        }
+
+        double x_max = 0; double x_min = 0;
+        double y_max = 0; double y_min = 0;
+        double z_max = 0; double z_min = 0;
+
+        for(int i = 1; i< N - 1; i++)
+        {
+           xx[i] = 1;
+           for(int j = 1; j < N - 1; j++)
+           {
+                yy[j] = 2;
+                for(int k = 1; k< N - 1; k++)
+                {
+                   zz[k] = 3;
+                   for(int n = 1; n < N - 1; n++)
+                   {
+                        xx[i] = 0.5 * (yy[i - 1] + yy[i + 1]);
+                        yy[j] = 0.5 * (zz[j - 1] + zz[j + 1]);
+                        zz[k] = 0.5 * (xx[k - 1] + xx[k + 1]);
+
+                        x_max = Math.max(x_max, xx[i]);
+                        x_min = Math.min(x_min, xx[i]);
+                        y_max = Math.max(y_max, yy[j]);
+                        y_min = Math.min(y_min, yy[j]);
+                        z_max = Math.max(z_max, zz[k]);
+                        z_min = Math.min(z_min, zz[k]);
+
+                   }
+                }
+           }
+        }
+
+        double xy_max = Math.max(x_max,y_max);
+        double xy_min = Math.min(x_min,y_min);
+
+        double xy_MaxMin = xy_max - xy_min;
+
+        System.out.println(xy_MaxMin);
+
+        double er = Math.abs(xy_MaxMin - 23.6407);
+
+        ll.Echeck(er,Error);
+
+  }
+
+
+
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+        }
+
+   }
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java
new file mode 100644
index 00000000000..1e448a6ed7b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java
@@ -0,0 +1,144 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops05.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops05.Loops05
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops05.Loops05
+ */
+
+package jit.FloatingPoint.gen_math.Loops05;
+
+import nsk.share.TestFailure;
+
+class Loops05
+{
+
+   static final int N = 100;
+   static final double pi = 3.14;
+
+   public static void main (String args[])
+   {
+
+        double Error = 0.01;
+        double xx[][];
+        xx = new double[N][N];
+
+        double x_norma_n, x_norma_0;
+        double t = 0;
+        double dt = 0.01;
+        double tn = 1;
+
+        double r1, r2, r3, r4, r5;
+
+
+        Loops05 ll;
+        ll = new Loops05();
+
+
+        for(int i = 0; i < N; i++)
+        {       for(int j = 0; j < N; j++)
+                {
+                        r1 = i * i + j * j;
+                        r2 = N;
+                        r3 = r1/N;
+                        r4 = r3/N;
+                        xx[i][j] = r4;
+                }
+        }
+
+        x_norma_0 = ll.Norma(N,xx);
+        while(t < tn)
+        {
+                for(int i = 0; i < N; i++)
+                {
+                        for(int j = 0; j < N; j++)
+                        {
+                                double fff = ll.F_function(t, 0.2, 0.6, 10);
+                                xx[i][j]= xx[i][j] + fff * dt;
+                        }
+                }
+                t = t + dt;
+        }
+        x_norma_n = ll.Norma(N,xx);
+        double errrr = Math.abs(x_norma_0 - x_norma_n);
+        ll.Echeck(errrr,Error);
+
+  }
+
+   public double F_function(double tt, double t1, double t2, double magn)
+   {    double fff;
+        double r1;
+
+        r1 = Math.sin(2 * pi * tt / (t2 - t1));
+        if(tt > t1 && tt < t2) fff = r1 * magn;
+        else fff = 0;
+
+        return fff;
+   }
+
+   public double Norma(int nn, double ww[][])
+   {
+        double nor = 0;
+        double r1 = nn;
+        double r2 = r1 * r1;
+        double r3;
+
+        for(int i = 0; i < nn; i++)
+        {
+                for(int j = 0; j < nn; j++)
+                {       r3 = ww[i][j] * ww[i][j];
+                        nor = nor + r3;
+                }
+        }
+        nor = nor/r2;
+        return nor;
+   }
+
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+        }
+
+   }
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java
new file mode 100644
index 00000000000..4af9e8a7609
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java
@@ -0,0 +1,146 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops06.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops06.Loops06
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops06.Loops06
+ */
+
+package jit.FloatingPoint.gen_math.Loops06;
+
+import nsk.share.TestFailure;
+
+class Loops06
+{
+
+   static final int N = 20;
+   static final double pi = 3.14;
+
+   public static void main (String args[])
+   {
+
+        double Error = 0.01;
+        double xx[];
+        double yy[];
+        double zz[];
+
+        xx = new double[N];
+        yy = new double[N];
+        zz = new double[N];
+
+        double r1, r2, r3, r4, r5;
+        double rN = N;
+
+        Loops06 ll;
+        ll = new Loops06();
+
+
+        for(int i = 0; i < N; i++)
+        {       r1 = i;
+                xx[i] = Math.sin( 2 * pi * r1 / rN);
+        }
+        int i=0;
+        while( i < N)
+        {       r2 = i;
+                yy[i] = xx[i] * Math.sin(r2);
+                zz[i] = xx[i] * Math.cos(r2);
+                i++;
+        }
+
+        for( i = 1; i < N - 1; i++)
+        {
+                for(int j = 1; j < N - 1; j++)
+                {       zz[0] = 0;
+                        for(int k = 1; k < N - 1; k++)
+                        {
+                                for(int n = 1; n < N - 1; n++)
+                                {       yy[0] = 0;
+                                        for(int m = 1; m < N - 1; m++)
+                                        {
+                                                for(int l = 1; l < N - 1; l++)
+                                                {
+                                                        xx[i] = xx[i - 1] + xx[i+1];
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+
+        double norma_x = ll.norma(N,xx);
+        double norma_y = ll.norma(N,yy);
+        double norma_z = ll.norma(N,zz);
+
+        r5 = norma_x * norma_x + norma_y * norma_y + norma_z * norma_z;
+        double total_norma = Math.sqrt(r5);
+
+
+        double errrr = Math.abs(total_norma - 0.83);
+        ll.Echeck(errrr,Error);
+   }
+
+   public double norma(int nn, double ww[])
+   {
+        double nor = 0;
+        double r1 = nn;
+        double r2 = r1 * r1;
+        double r3;
+
+        for(int i = 0; i < nn; i++)
+        {
+                r3 = ww[i] * ww[i];
+                nor = nor + r3;
+        }
+        nor = nor/r2;
+        nor = Math.sqrt(nor);
+        return nor;
+   }
+
+
+   public void Echeck(double er, double ER)
+   {
+
+        if( er < ER)
+                System.out.println("test PASS");
+        else
+        {
+                System.out.println("expected error: " + ER);
+                System.out.println("   found error: " + er);
+                throw new TestFailure("test FAIL");
+        }
+
+   }
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java
new file mode 100644
index 00000000000..092a002c7f7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java
@@ -0,0 +1,121 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Loops07.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Loops07.Loops07
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops07.Loops07
+ */
+
+package jit.FloatingPoint.gen_math.Loops07;
+
+// Test working with nested loops.
+// Code is subject to different types of optimization
+// and parallelization - empty loops, dead code, etc.
+
+import nsk.share.TestFailure;
+
+class Loops07
+{
+
+   public static void main (String args[])
+   {
+
+        int N = 8;
+        double Error = 1;
+        double r1, r2, r3, r4, r5, r6;
+
+        double xx[][];
+        double z1, z2, z3;
+
+        xx = new double[N][N];
+
+        Loops07 ll;
+        ll = new Loops07();
+
+        for(int i = 0; i < N; i++)
+        {
+           for(int j = 0; j < N; j++)
+           {
+                r1 = i * i + j * j;
+                r2 = Math.sqrt(r1);
+                r3 = 1 / r2 ;
+                r4 = i + j ;
+                r5 = r4 / r3 ;
+
+                xx[i][j] = r5;
+           }
+        }
+
+// main loop ---------------------------
+        z1 = 0;
+        for(int m1 = 0; m1 < N; m1++)
+        {
+           for(int m2 = 0; m2 < N; m2++)
+           {
+              z1 = z1 - 0.5 * xx[m1][m2];
+              for(int m3 = 0; m3 < N; m3++)
+              {
+                 for(int m4 = 0; m4 < N; m4++)
+                 {
+                    z1 = z1 + xx[m3][m4];
+
+                    for(int m5 = 0; m5 < N; m5++)
+                    {
+                       for(int m6 = 0; m6 < N; m6++)
+                       {
+                          for(int m7 = 0; m7 < N; m7++)
+                          {
+                                z2 = Math.abs(1 + Math.sin(2 + Math.cos(3 +
+                                     Math.sqrt(4 - Math.cos(5)))));
+
+                          }
+                       }
+                    }
+                 }
+              }
+           }
+        }
+
+// ---------------------------------------
+        double er = Math.abs(184401 - z1);
+
+        if( er < Error)
+                System.out.println("test PASS");
+        else
+                throw new TestFailure("test FAIL");
+
+   }
+
+
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java
new file mode 100644
index 00000000000..d79a8116228
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java
@@ -0,0 +1,123 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Matrix_3d.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d
+ */
+
+package jit.FloatingPoint.gen_math.Matrix_3d;
+
+// Test working with 3D matrix.
+// There are no data dependences in code.
+
+import nsk.share.TestFailure;
+
+class Matrix_3d
+{
+
+   public static void main (String args[])
+   {
+
+        int N = 50;
+        double Error = 0.001;
+        double r1, r2, r3, r4, r5, r6;
+
+        double xxx[][][];
+        double yyy[][][];
+        double zzz[][][];
+
+        xxx = new double[N][N][N];
+        yyy = new double[N][N][N];
+        zzz = new double[N][N][N];
+
+        Matrix_3d mm;
+        mm = new Matrix_3d();
+
+        for(int i = 0; i < N; i++)
+        {
+           for(int j = 0; j < N; j++)
+           {
+              for(int k = 0; k < N; k++)
+              {
+                 r1 = i;
+                 r2 = Math.sin(r1);
+                 r3 = j;
+                 r4 = Math.cos(r3);
+                 r5 = k;
+                 r6 = Math.sqrt(r5);
+                 xxx[i][j][k] = r6 * (r2 * r2 + r4 * r4);
+              }
+           }
+        }
+
+        for(int i = 0; i < N; i++)
+        {
+           for(int j = 0; j < N; j++)
+           {
+              for(int k = 0; k < N; k++)
+              {
+                 yyy[i][j][k] = xxx[k][j][i];
+                 zzz[i][j][k] = xxx[k][i][j];
+              }
+           }
+        }
+
+
+
+        double trace_xxx = mm.trace_matrix(N,xxx);
+        double trace_yyy = mm.trace_matrix(N,yyy);
+        double trace_zzz = mm.trace_matrix(N,zzz);
+
+        double trace_3d = trace_xxx + trace_yyy + trace_zzz;
+
+        double er = Math.abs(105 - trace_3d);
+
+        if( er < Error)
+                System.out.println("test PASS");
+        else
+                throw new TestFailure("test FAIL");
+   }
+
+
+  public double trace_matrix(int nn, double www[][][])
+   {    double trace = 0;
+        for(int i = 0; i < nn; i++)
+        {
+           trace = trace + www[i][i][i] *  www[i][i][i];
+        }
+        return Math.sqrt(trace);
+
+   }
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/ShortCircuitTest/ShortCircuitTest.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/ShortCircuitTest/ShortCircuitTest.java
new file mode 100644
index 00000000000..9595f972dbd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/ShortCircuitTest/ShortCircuitTest.java
@@ -0,0 +1,373 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/ShortCircuitTest.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.FloatingPoint.gen_math.ShortCircuitTest.ShortCircuitTest
+ */
+
+package jit.FloatingPoint.gen_math.ShortCircuitTest;
+
+////////////////////////////////////////////////////////////////////////////////
+// A complete set of tests for the binary Java operators {&&, ||, &, |} to
+// ensure that (C-style) short circuit evaluation is used where required, and
+// also is not used where prohibited.  Checks has been constructed carefully to
+// be independent of the operators under scrutiny, so that passing these tests
+// constitutes validation of those operators.
+//
+// The exit status is the number of errors found, at most sixteen.
+////////////////////////////////////////////////////////////////////////////////
+
+// If the first test below, a check such as
+//
+//   if(t == 2 && f == 0){...
+//
+// would be inappropriate, since it contains the item under scrutiny, namely
+// short circuit evaluation of AND (&&).  Avoid it by slightly tedious
+// if-then-else statements, and similarly for the rest of the file.
+
+import nsk.share.TestFailure;
+
+public class ShortCircuitTest {
+    private static int f = 0, t = 0;
+
+    // constr
+    public ShortCircuitTest(){
+    }
+
+    public boolean f(){
+        f++;
+        return false;
+    }
+
+    public boolean t(){
+        t++;
+        return true;
+    }
+
+    public static void main(String[] args){
+        ShortCircuitTest s = new ShortCircuitTest();
+        int errors = 0;
+        ////////////////////////////////////////////////////////////////////////
+        // &&
+        f = t = 0;
+        if(s.t() && s.t()){
+            if(t == 2){
+                if(f == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true && true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true && true");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: true && true");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.t() && s.f()){
+            System.out.println("Short circuit error: true && false");
+            errors++;
+        }else{
+            if(t == 1){
+                if(f == 1){
+                    //  System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true && false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true && false");
+                errors++;
+            }
+        }
+
+        f = t = 0;
+        if(s.f() && s.t()){
+            System.out.println("Short circuit error: false && true");
+            errors++;
+        }else{
+            if(f == 1){
+                if(t == 0){
+                    //  System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false && true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false && true");
+                errors++;
+            }
+        }
+
+        f = t = 0;
+        if(s.f() && s.f()){
+            System.out.println("Short circuit error: false && false");
+            errors++;
+        }else{
+            if(f == 1){
+                if(t == 0){
+                    //  System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false && false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false && false");
+                errors++;
+            }
+        }
+        ////////////////////////////////////////////////////////////////////////
+        // ||
+        f = t = 0;
+        if(s.t() || s.t()){
+            if(t == 1){
+                if(f == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true || true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true || true");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: true || true");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.t() || s.f()){
+            if(t == 1){
+                if(f == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true || false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true || false");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: true || false");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.f() || s.t()){
+            if(f == 1){
+                if(t == 1){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false || true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false || true");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: false || true");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.f() || s.f()){
+            System.out.println("Short circuit error: false || false");
+            errors++;
+        }else{
+            if(f == 2){
+                if(t == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false || false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false || false");
+                errors++;
+            }
+        }
+        ////////////////////////////////////////////////////////////////////////
+        // &
+        f = t = 0;
+        if(s.t() & s.t()){
+            if(t == 2){
+                if(f == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true & true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true & true");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: true & true");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.t() & s.f()){
+            System.out.println("Short circuit error: true & false");
+            errors++;
+        }else{
+            if(t == 1){
+                if(f == 1){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true & false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true & false");
+                errors++;
+            }
+        }
+
+        f = t = 0;
+        if(s.f() & s.t()){
+            System.out.println("Short circuit error: false & true");
+            errors++;
+        }else{
+            if(f == 1){
+                if(t == 1){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false & true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false & true");
+                errors++;
+            }
+        }
+
+        f = t = 0;
+        if(s.f() & s.f()){
+            System.out.println("Short circuit error: false & false");
+            errors++;
+        }else{
+            if(f == 2){
+                if(t == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false & false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false & false");
+                errors++;
+            }
+        }
+        ////////////////////////////////////////////////////////////////////////
+        // |
+        f = t = 0;
+        if(s.t() | s.t()){
+            if(t == 2){
+                if(f == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true | true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true | true");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: true | true");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.t() | s.f()){
+            if(t == 1){
+                if(f == 1){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: true | false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: true | false");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: true | false");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.f() | s.t()){
+            if(f == 1){
+                if(t == 1){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false | true");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false | true");
+                errors++;
+            }
+        }else{
+            System.out.println("Short circuit error: false | true");
+            errors++;
+        }
+
+        f = t = 0;
+        if(s.f() | s.f()){
+            System.out.println("Short circuit error: false | false");
+            errors++;
+        }else{
+            if(f == 2){
+                if(t == 0){
+                    // System.out.println("PASS");
+                }else{
+                    System.out.println("Short circuit error: false | false");
+                    errors++;
+                }
+            }else{
+                System.out.println("Short circuit error: false | false");
+                errors++;
+            }
+        }
+        if (errors > 0)
+            throw new TestFailure("Test failed: got " + errors + "errors");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java
new file mode 100644
index 00000000000..9de7737547e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/FloatingPoint/gen_math/Summ.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.FloatingPoint.gen_math.Summ.Summ
+ * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Summ.Summ
+ */
+
+package jit.FloatingPoint.gen_math.Summ;
+
+// Test on sums/series
+
+import nsk.share.TestFailure;
+
+class Summ
+{
+   public static void main (String args[])
+   {
+        double Error = 1.3488e-06;
+        double A1 = 0.5;
+        double Decr = 0.5;
+        int NN = 20;
+        Summ ss;
+        ss = new Summ();
+        double sum_plus = ss.sum1(NN, Decr);
+        double sum_minus = ss.sum1(NN, -Decr);
+        double er_plus = 1.0 - sum_plus;
+        double er_minus = 1.0 - 3.0 * sum_minus;
+        double er = er_plus * er_plus + er_minus * er_minus;
+        double er_total = Math.sqrt(er);
+
+        if ( er_total < Error )
+                System.out.println("test PASS");
+        else
+            {
+                System.out.println("expected error - 1.3488e-06");
+                System.out.println("found - " + er_total);
+                throw new TestFailure("test FAIL");
+            }
+    }
+
+
+        public double sum1(int nn, double decr)
+        {
+           double An = 0.5;
+           double sum = 0.0;
+           for(int i = 1; i<=nn; i++)
+           {  sum = sum + An;
+              An = An * decr;
+           }
+           return sum;
+        }
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/PrintProperties/PrintProperties.java b/test/hotspot/jtreg/vmTestbase/jit/PrintProperties/PrintProperties.java
new file mode 100644
index 00000000000..541d2028a6c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/PrintProperties/PrintProperties.java
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/PrintProperties.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.PrintProperties.PrintProperties
+ */
+
+package jit.PrintProperties;
+
+import nsk.share.TestFailure;
+
+public class PrintProperties {
+  public static void main(String[] args) {
+    System.out.println("System properties");
+    System.getProperties().list(System.out);
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/PrintThis/PrintThis.java b/test/hotspot/jtreg/vmTestbase/jit/PrintThis/PrintThis.java
new file mode 100644
index 00000000000..12e33681142
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/PrintThis/PrintThis.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/PrintThis.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.PrintThis.PrintThis
+ */
+
+package jit.PrintThis;
+
+import nsk.share.TestFailure;
+
+
+public class PrintThis {
+  static PrintThis hc = new PrintThis();
+
+  public static void main (String s[]) {
+    System.out.println(hc);
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java b/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java
new file mode 100644
index 00000000000..fb6f4dbf94a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java
@@ -0,0 +1,120 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/Robert.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.Robert.Robert
+ * @run driver ExecDriver --java jit.Robert.Robert
+ */
+
+package jit.Robert;
+
+import java.io.*;
+import nsk.share.TestFailure;
+
+class Robert
+   {
+   Robert()
+      throws Exception
+      {
+      try{
+         testSoftwareException();
+         }
+      catch (Exception e)
+         {
+         throw e;
+         }
+      }
+
+   static void
+   testHardwareException()
+      throws Exception
+      {
+      int i = 1; int j = 0; int k = i / j;
+      System.out.println(k);
+      }
+
+   static void
+   testSoftwareException()
+      throws Exception
+      {
+      Float f = Float.valueOf("abc");
+      System.out.println(f);
+      }
+
+   static void
+   testUserException()
+      throws Exception
+      {
+      throw new IOException();
+      }
+
+   static void
+   testRethrownException()
+      throws Exception
+      {
+      new Robert();
+      }
+
+   static void
+   trouble(int choice)
+      throws Exception
+      {
+      if (choice == 2) testSoftwareException();
+      if (choice == 3) testUserException();
+      if (choice == 4) testRethrownException();
+      }
+
+   public static void main(String args[])
+      throws Exception
+      {
+      boolean failed = false;
+      System.out.println("Robert");
+      for (int i = 2; i <= 4; ++i)
+         {
+         System.out.println("test " + i);
+         try{
+            trouble(i);
+            }
+         catch (Exception e)
+            {
+            System.out.println("caught " + e);
+            e.printStackTrace(System.out);
+            continue;
+            }
+         failed = true;
+         }
+      if (failed)
+         throw new TestFailure("Test failed.");
+      else
+         System.out.println("Test passed.");
+
+      }
+   }
diff --git a/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java b/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java
new file mode 100644
index 00000000000..ee17ec1aefb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java
@@ -0,0 +1,51 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/Sleeper.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.Sleeper.Sleeper
+ * @run driver ExecDriver --java jit.Sleeper.Sleeper
+ */
+
+package jit.Sleeper;
+
+import nsk.share.TestFailure;
+
+class Sleeper {
+    public static void main(String args[] ) {
+      System.out.println ("1");
+      try { Thread.sleep(1000); } catch (InterruptedException e) {}
+      System.out.println ("2");
+      try { Thread.sleep(1000); } catch (InterruptedException e) {}
+      System.out.println ("3");
+      try { Thread.sleep(1000); } catch (InterruptedException e) {}
+      System.out.println ("4");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java b/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java
new file mode 100644
index 00000000000..20183182306
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/bounds.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.bounds.bounds
+ * @run driver ExecDriver --java jit.bounds.bounds
+ */
+
+package jit.bounds;
+
+// This test makes sure that array bounds checking is enabled
+// with the JIT on
+
+import nsk.share.TestFailure;
+
+class bounds {
+    public static void main(String[] argv) {
+        int i;
+        int a[] = new int[2];
+        int k = 0;
+
+        for(i=-1; i<3; i+=1) {
+            try {
+                a[i] = i;
+            } catch(Throwable t) {
+                k++;
+            }
+        }
+        if (k == 2) {
+           System.out.println("Test PASSES");
+        } else {
+           throw new TestFailure("Test FAILS");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.gold b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.gold
new file mode 100644
index 00000000000..55ca12ed9a6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.gold
@@ -0,0 +1,8 @@
+int + test: 72 should equal 72
+long + test: 72 should equal 72
+double + test: 72.0 should equal 72.0
+float + test: 72.0 should equal 72.0
+int += test: 72 should equal 72
+long += test: 72 should equal 72
+double += test: 72.0 should equal 72.0
+float += test: 72.0 should equal 72.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java
new file mode 100644
index 00000000000..661eaa159c5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java
@@ -0,0 +1,151 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/collapse.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.collapse.collapse
+ * @run driver ExecDriver --java jit.collapse.collapse
+ */
+
+package jit.collapse;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class collapse {
+        public static final GoldChecker goldChecker = new GoldChecker( "collapse" );
+
+        public static void main( String[] argv )
+        {
+                int i;
+                int j=0, k=0;
+                long lj=0L, lk=0L;
+                float fj=0.0F, fk=0.0F;
+                double dj=0.0D, dk=0.0D;
+                int n = 4;
+                boolean boolPass = true;
+                for (i=1; i<n; i++) {
+                        j = j + 6;
+                        j = j + 6;
+                        j = j + 6;
+                        j = j + 6;
+                }
+                for (i=1; i<n; i++) {
+                        k = k + 24;
+                }
+                boolPass &= j==k;
+                collapse.goldChecker.println("int + test: "+j+" should equal "+k);
+                for (i=1; i<n; i++) {
+                        lj = lj + 6L;
+                        lj = lj + 6L;
+                        lj = lj + 6L;
+                        lj = lj + 6L;
+                }
+                for (i=1; i<n; i++) {
+                        lk = lk + 24L;
+                }
+                boolPass &= lj==lk;
+                collapse.goldChecker.println("long + test: "+lj+" should equal "+lk);
+                for (i=1; i<n; i++) {
+                        dj = dj + 6;
+                        dj = dj + 6;
+                        dj = dj + 6;
+                        dj = dj + 6;
+                }
+                for (i=1; i<n; i++) {
+                        dk = dk + 24;
+                }
+                boolPass &= dj==dk;
+                collapse.goldChecker.println("double + test: "+dj+" should equal "+dk);
+                for (i=1; i<n; i++) {
+                        fj = fj + 6;
+                        fj = fj + 6;
+                        fj = fj + 6;
+                        fj = fj + 6;
+                }
+                for (i=1; i<n; i++) {
+                        fk = fk + 24;
+                }
+                boolPass &= fj==fk;
+                collapse.goldChecker.println("float + test: "+fj+" should equal "+fk);
+                j=0; k=0;
+                lj=0L; lk=0L;
+                fj=0.0F; fk=0.0F;
+                dj=0.0D; dk=0.0D;
+                for (i=1; i<n; i++) {
+                        j += 6;
+                        j += 6;
+                        j += 6;
+                        j += 6;
+                }
+                for (i=1; i<n; i++) {
+                        k += 24;
+                }
+                boolPass &= j==k;
+                collapse.goldChecker.println("int += test: "+j+" should equal "+k);
+                for (i=1; i<n; i++) {
+                        lj += 6;
+                        lj += 6;
+                        lj += 6;
+                        lj += 6;
+                }
+                for (i=1; i<n; i++) {
+                        lk += 24;
+                }
+                boolPass &= lj==lk;
+                collapse.goldChecker.println("long += test: "+lj+" should equal "+lk);
+                for (i=1; i<n; i++) {
+                        dj += 6;
+                        dj += 6;
+                        dj += 6;
+                        dj += 6;
+                }
+                for (i=1; i<n; i++) {
+                        dk += 24;
+                }
+                boolPass &= dj==dk;
+                collapse.goldChecker.println("double += test: "+dj+" should equal "+dk);
+                for (i=1; i<n; i++) {
+                        fj += 6;
+                        fj += 6;
+                        fj += 6;
+                        fj += 6;
+                }
+                for (i=1; i<n; i++) {
+                        fk += 24;
+                }
+                boolPass &= fj==fk;
+                collapse.goldChecker.println("float += test: "+fj+" should equal "+fk);
+
+                if (!boolPass)
+                    throw new TestFailure("Test failed.");
+                collapse.goldChecker.check();
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java
new file mode 100644
index 00000000000..90ce7c6f312
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java
@@ -0,0 +1,82 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test01.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test01.test01
+ * @run driver ExecDriver --java jit.deoptimization.test01.test01
+ */
+
+package jit.deoptimization.test01;
+
+import nsk.share.TestFailure;
+
+/*
+ *      Simple loop causes the optimizer to deoptimize
+ *      foo methos when an instance of class B is created.
+ *
+ *      run with the -XX:TraceDeoptimization to observ the result.
+ */
+
+class test01 {
+  public static void main (String[] args) {
+    A obj = new A();
+    for (int index = 0; index < 100; index++) {
+      obj.used_alot();
+    }
+  }
+}
+
+class A {
+        protected final int counter = 25000;
+        protected int count = 0;
+        public void foo(int index) {
+                count++;
+                if (index == counter - 1) {
+                        try {
+                                ((B)Class.forName("B").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+        }
+
+        public void used_alot() {
+                for (int index = 0; index < counter; index++) {
+                        foo(index);
+                }
+        }
+}
+
+class B extends A {
+  public void foo(int index) {
+    count--;
+  }
+};
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java
new file mode 100644
index 00000000000..8edba20a2b6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test02.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test02.test02
+ * @run driver ExecDriver --java jit.deoptimization.test02.test02
+ */
+
+package jit.deoptimization.test02;
+
+import nsk.share.TestFailure;
+
+/*
+ *      Simple loop causes the optimizer to deoptimize
+ *      foo methos when an instance of class B is created.
+ *
+ *      run with the -XX:TraceDeoptimization to observ the result.
+ */
+
+class test02 {
+  public static void main (String[] args) {
+    A obj = new A();
+    for (int index = 0; index < 100; index++) {
+      obj.used_alot();
+    }
+  }
+}
+
+class A {
+        protected final int counter = 25000;
+        protected int count = 0;
+        public void foo(int index) {
+                count++;
+
+                if (index == counter - 1) {
+                        try {
+                                ((B)Class.forName("B").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+        }
+
+        public synchronized void used_alot() {
+                for (int index = 0; index < counter; index++) {
+                        foo(index);
+                }
+        }
+}
+
+class B extends A {
+  public void foo(int index) {
+    count--;
+  }
+};
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java
new file mode 100644
index 00000000000..762a49fa892
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java
@@ -0,0 +1,87 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test03.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test03.test03
+ * @run driver ExecDriver --java jit.deoptimization.test03.test03
+ */
+
+package jit.deoptimization.test03;
+
+import nsk.share.TestFailure;
+
+/*
+ *      Simple loop causes the optimizer to deoptimize
+ *      foo methos when an instance of class B is created.
+ *
+ *      run with the -XX:TraceDeoptimization to observ the result.
+ */
+
+class test03 {
+  public static void main (String[] args) {
+    A obj = new A();
+    for (int index = 0; index < 100; index++) {
+      obj.used_alot();
+    }
+  }
+}
+
+class A {
+        protected final int counter = 25000;
+        protected int count = 0;
+        public void foo(int index) {
+                count++;
+
+                if (index == counter - 1) {
+                        try {
+                                ((B)Class.forName("B").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+        }
+
+        public synchronized void used_alot() {
+                for (int index = 0; index < counter - 1; index++) {
+                        synchronized (extern_Lock) {
+                                foo(index);
+                        }
+                }
+        }
+
+        Object extern_Lock = new Object();
+}
+
+class B extends A {
+  public void foo(int index) {
+    count--;
+  }
+};
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java
new file mode 100644
index 00000000000..064f8c2290b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java
@@ -0,0 +1,148 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test04.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test04.test04
+ * @run driver ExecDriver --java jit.deoptimization.test04.test04
+ */
+
+package jit.deoptimization.test04;
+
+import nsk.share.TestFailure;
+
+/*
+ *
+ */
+
+class test04 {
+        public static void main (String[] args) {
+                A obj = new A();
+
+                int result = -1;
+                for (int index = 0; index < 1; index++) {
+                        result += obj.used_alot();
+                }
+
+                if (result != 1) {
+                        throw new TestFailure("result : " + result + " must equal 1");
+                }
+        }
+}
+
+
+class A {
+        protected int count;
+        public int foo(int index) {
+                int rv = ++count;
+                if (index < A.sIndex / 2)
+                        rv = index;
+                else {
+                        try {
+                                rv = ((A)Class.forName("jit.deoptimization.test04.B").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+                return rv;
+        }
+
+        public int used_alot() {
+                int result = 1;
+                for (int i = 0; i < A.sIndex; i++) {
+                        result = foo(i);
+                }
+                return result;
+        }
+
+        protected static final int sIndex = 25000;
+}
+
+class B extends A {
+        public int foo(int index) {
+                int rv = 0;
+                int qrtr = A.sIndex / 4;
+                if (index > 3 * qrtr) {
+                        try {
+                                if (index < A.sIndex - qrtr)
+                                        rv = ((B)Class.forName("jit.deoptimization.test04.C").newInstance()).foo(index);
+                                else
+                                        rv = ((B)Class.forName("jit.deoptimization.test04.D").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+                else {
+                        rv = 1;
+                }
+                return rv;
+        }
+}
+
+class C extends B {
+        public C () {
+                --this.count;
+        }
+
+        public int foo(int index) {
+                int j = count;
+                for (int i=0; i<500; i++)
+                        j += used_alot();
+                return j;
+        }
+
+        public int used_alot() {
+                int i=1;
+                int j=4;
+                int k=i+j;
+                byte ba[] = new byte[1000];
+                int ia[] = new int[1000];
+                return this.count + (ba.length + i + j - k - ia.length);
+        }
+
+        protected int count = 1;
+}
+
+class D extends C {
+        public D () {
+                super();
+
+                this.count+=2;
+        }
+
+        public int foo(int index) {
+                return super.foo(index);
+        }
+
+        public synchronized int used_alot() {
+                count += (--count);
+                return 0;
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java
new file mode 100644
index 00000000000..e91c6858145
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java
@@ -0,0 +1,162 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test05.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test05.test05
+ * @run driver ExecDriver --java jit.deoptimization.test05.test05
+ */
+
+package jit.deoptimization.test05;
+
+import nsk.share.TestFailure;
+
+/*
+ *
+ */
+
+class test05 {
+        public static void main (String[] args) {
+                A obj = new A();
+
+                int result = -1;
+                for (int index = 0; index < 1; index++) {
+                        result += obj.used_alot();
+                }
+
+                if (result != -1) {
+                        throw new TestFailure("result : " + result + " must equal 1");
+                }
+        }
+}
+
+
+class A {
+        protected int count;
+        public synchronized int foo(int index) {
+                int rv = ++count;
+                if (index < A.sIndex / 2)
+                        rv = index;
+                else {
+                        try {
+                                rv = ((A)Class.forName("jit.deoptimization.test05.B").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+                return rv;
+        }
+
+        public synchronized int used_alot() {
+                int result = 1;
+                for (int i = 0; i < A.sIndex; i++) {
+                        result = foo(i);
+                }
+                return result;
+        }
+
+        protected static final int sIndex = 25000;
+}
+
+class B extends A {
+        public synchronized int foo(int index) {
+                int rv = 0;
+                int qrtr = A.sIndex / 4;
+                if (index > 3 * qrtr) {
+                        try {
+                                if (index < A.sIndex - qrtr)
+                                        rv = ((B)Class.forName("jit.deoptimization.test05.C").newInstance()).foo(index);
+                                else
+                                        rv = ((B)Class.forName("jit.deoptimization.test05.D").newInstance()).foo(index);
+                        }
+                        catch(Exception e) {
+                        }
+                }
+                else {
+                        rv = 1;
+                }
+                return rv;
+        }
+}
+
+class C extends B {
+        public C () {
+                --this.count;
+        }
+
+        public synchronized int foo(int index) {
+                int j = count;
+                for (int i=0; i<5000; i++) {
+                        j += used_alot();
+
+                        if (i==4999) {
+                                try {
+                                        j = ((D2)Class.forName("jit.deoptimization.test05.D2").newInstance()).foo(index);
+                                }
+                                catch (Exception e) {}
+                        }
+                }
+                return j;
+        }
+
+        public synchronized int used_alot() {
+                int i=1;
+                int j=4;
+                int k=i+j;
+                byte ba[] = new byte[1000];
+                int ia[] = new int[1000];
+                return this.count + (ba.length + i + j - k - ia.length);
+        }
+
+        protected int count = 1;
+}
+
+class D extends C {
+        public D () {
+                super();
+
+                this.count+=2;
+        }
+
+        public int foo(int index) {
+                return super.foo(index);
+        }
+
+        public synchronized int used_alot() {
+                count += (--count);
+                return 0;
+        }
+}
+
+class D2 extends C {
+        public int foo(int index) {
+                return 0;
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java
new file mode 100644
index 00000000000..68071854259
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java
@@ -0,0 +1,154 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test06.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test06.test06
+ * @run driver ExecDriver --java jit.deoptimization.test06.test06
+ */
+
+package jit.deoptimization.test06;
+
+import nsk.share.TestFailure;
+
+/*
+ *      Simple recursion that should causes hotspot to deoptimize
+ *      used_alot and A.foo and A.bar methods
+ *      Expected result for the test is: 0
+ *
+ *      run with the -XX:TraceDeoptimization to observ the result.
+ */
+
+class test06 {
+  public static void main (String[] args) {
+    A obj = new A();
+    for (int index = 0; index < 1; index++) {
+      obj.used_alot();
+    }
+  }
+}
+
+class A {
+        static int result = 0;
+
+        public int foo(int index, int iter) {
+                if (index == 0)
+                        return result;
+                else if (iter <= sIteration / 2) {
+                        result = bar(index) * foo(--index, iter);
+                } else {
+                        try {
+                                // halfway through the max iterations
+                                // create a B. This should cause the
+                                // used_alot to be deoptimized
+                                // Call b.frame for the remaining part of the recursion
+                                if (b == null)
+                                        b = Class.forName("jit.deoptimization.test06.B").newInstance();
+                                result *= ((B)b).foo(index, iter);
+                        } catch (Exception x) {
+                                throw new TestFailure("Class not found: B");
+                        }
+                }
+                return result;
+        }
+
+        // Does nothing but it will let be over written in class C, See Below
+        public int bar(int index) {
+                synchronized (this) {
+                        for (int i=0; i<5; i++)
+                                index--;
+                }
+                return 0;
+        }
+
+        public void used_alot() {
+                int result = 1;
+
+                for (int index = 1; index <= sIteration; index++) {
+                        result *= foo(index, index);
+                }
+
+                if (result != 0) {
+                        throw new TestFailure("Result: " + result);
+                }
+        }
+
+        protected Object b = null;
+        protected static final int sIteration = 1000;
+}
+
+class B extends A {
+        //      Override foo in order to force deoptimization.
+        //      Also creates and instance of class C in the last
+        //      iteration in order to force A.foo to get deoptimized
+        //      otherwise just do something stupid.
+  public int foo(int index, int iter) {
+                //      Make sure that this class was created at least
+                //      halfway through the iteration. Simple sanity check
+        if (iter < sIteration /2) {
+                throw new TestFailure("class B create to early");
+        }
+
+                if (iter == sIteration) {
+                        try {
+                                result = ((C)(Class.forName("jit.deoptimization.test06.C").newInstance())).foo(index,iter);
+                                result *= ((C)(Class.forName("jit.deoptimization.test06.C").newInstance())).bar(index);
+
+                        } catch (Exception x) {
+                                throw new TestFailure("Class not found: C");
+                        }
+                } else {
+                        result = bar(index);
+                        if (index != 0)
+                                result += foo(--index, iter);
+                }
+        return result;
+  }
+}
+
+class C extends B {
+  public int foo(int index, int iter) {
+        for (int i=0; i<iter; i++)
+                result = bar(i);
+
+                try {
+                        result = ((D)(Class.forName("jit.deoptimization.test06.D").newInstance())).bar(index);
+                } catch (Exception x) {
+                        throw new TestFailure("Class not found: D");
+                }
+                return result;
+        }
+}
+
+class D extends C {
+  public int bar(int index) {
+                return 1;
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java
new file mode 100644
index 00000000000..1a0e12ce0d9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java
@@ -0,0 +1,155 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test07.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test07.test07
+ * @run driver ExecDriver --java jit.deoptimization.test07.test07
+ */
+
+package jit.deoptimization.test07;
+
+import nsk.share.TestFailure;
+
+/*
+ *      Simple recursion that should cause hotspot to deoptimize
+ *      used_alot and A.foo and A.bar methods
+ *      Expected result for the test is: 0
+ *
+ *      run with the -XX:TraceDeoptimization to observ the result.
+ */
+
+class test07 {
+  public static void main (String[] args) {
+    A obj = new A();
+    for (int index = 0; index < 1; index++) {
+      obj.used_alot();
+    }
+  }
+}
+
+class A {
+        static int result = 0;
+
+        synchronized public int foo(int index, int iter) {
+                if (index == 0)
+                        return result;
+                else if (iter <= sIteration / 2) {
+                        result = bar(index) * foo(--index, iter);
+                } else {
+                        try {
+                                // halfway through the max iterations
+                                // create a B. This should cause the
+                                // used_alot to be deoptimized
+                                // Call b.frame for the remaining part of the recursion
+                                if (b == null)
+                                        b = Class.forName("jit.deoptimization.test07.B").newInstance();
+                                result *= ((B)b).foo(index, iter);
+                        } catch (Exception x) {
+                                throw new TestFailure("Class not found: B");
+                        }
+                }
+                return result;
+        }
+
+        // Does nothing but it will let be over written in class C, See Below
+        synchronized public int bar(int index) {
+                synchronized (this) {
+                        for (int i=0; i<5; i++)
+                                index--;
+                }
+                return 0;
+        }
+
+        synchronized public void used_alot() {
+                int result = 1;
+
+                for (int index = 1; index <= sIteration; index++) {
+                        result *= foo(index, index);
+                }
+
+                if (result != 0) {
+                        throw new TestFailure("Result: " + result);
+                }
+        }
+
+        protected Object b = null;
+        protected static final int sIteration = 1000;
+}
+
+class B extends A {
+        //      Override foo in order to force deoptimization.
+        //      Also creates and instance of class C in the last
+        //      iteration in order to force A.foo to get deoptimized
+        //      otherwise just do something stupid.
+  synchronized public int foo(int index, int iter) {
+                //      Make sure that this class was created at least
+                //      halfway through the iteration. Simple sanity check
+        if (iter < sIteration /2) {
+                System.out.println ("class B create to early");
+                System.exit(1);
+        }
+
+                if (iter == sIteration) {
+                        try {
+                                result = ((C)(Class.forName("jit.deoptimization.test07.C").newInstance())).foo(index,iter);
+                                result *= ((C)(Class.forName("jit.deoptimization.test07.C").newInstance())).bar(index);
+
+                        } catch (Exception x) {
+                                throw new TestFailure("Class not found: C");
+                        }
+                } else {
+                        result = bar(index);
+                        if (index != 0)
+                                result += foo(--index, iter);
+                }
+        return result;
+  }
+}
+
+class C extends B {
+  synchronized public int foo(int index, int iter) {
+        for (int i=0; i<iter; i++)
+                result = bar(i);
+
+                try {
+                        result = ((D)(Class.forName("jit.deoptimization.test07.D").newInstance())).bar(index);
+                } catch (Exception x) {
+                        throw new TestFailure("Class not found: D");
+                }
+                return result;
+        }
+}
+
+class D extends C {
+  synchronized public int bar(int index) {
+                return 1;
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java
new file mode 100644
index 00000000000..8cf0a07f1a6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java
@@ -0,0 +1,175 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/deoptimization/test08.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.deoptimization.test08.test08
+ * @run driver ExecDriver --java jit.deoptimization.test08.test08
+ */
+
+package jit.deoptimization.test08;
+
+import nsk.share.TestFailure;
+
+/*
+ *      Simple recursion that should causes hotspot to deoptimize
+ *      used_alot and A.foo and A.bar methods
+ *      Expected result for the test is: 0
+ *
+ *      run with the -XX:TraceDeoptimization to observ the result.
+ */
+
+class test08 {
+  public static void main (String[] args) {
+    A obj = new A();
+    for (int index = 0; index < 1; index++) {
+      obj.used_alot();
+    }
+  }
+}
+
+class A {
+        static int result = 0;
+
+        synchronized public int foo(int index, int iter) {
+                synchronized (A.a_ext) {
+                        if (index == 0)
+                                return result;
+                        else if (iter <= sIteration / 2) {
+                                result = bar(index) * foo(--index, iter);
+                        } else {
+                                try {
+                                        // halfway through the max iterations
+                                        // create a B. This should cause the
+                                        // used_alot to be deoptimized
+                                        // Call b.frame for the remaining part of the recursion
+                                        if (b == null)
+                                                b = Class.forName("jit.deoptimization.test08.B").newInstance();
+                                        result *= ((B)b).foo(index, iter);
+                                } catch (Exception x) {
+                                                        throw new TestFailure("Class not found: B");
+                                }
+                        }
+                }
+                return result;
+        }
+
+        // Does nothing but it will let be over written in class C, See Below
+        synchronized public int bar(int index) {
+                synchronized (a_ext) {
+                        for (int i=0; i<5; i++)
+                                index--;
+                }
+                return 0;
+        }
+
+        synchronized public void used_alot() {
+                int result = 1;
+
+                synchronized (a_ext) {
+                        for (int index = 1; index <= sIteration; index++) {
+                                result *= foo(index, index);
+                        }
+                }
+
+                if (result != 0) {
+                        System.err.println ("Result: " + result);
+                        System.exit (1);
+                }
+        }
+
+        protected Object b = null;
+        protected static final int sIteration = 1000;
+        protected static final Object a_ext = new Object();
+}
+
+class B extends A {
+        //      Override foo in order to force deoptimization.
+        //      Also creates and instance of class C in the last
+        //      iteration in order to force A.foo to get deoptimized
+        //      otherwise just do something stupid.
+  synchronized public int foo(int index, int iter) {
+        synchronized (A.a_ext) {
+                synchronized (B.b_ext) {
+                                //      Make sure that this class was created at least
+                                //      halfway through the iteration. Simple sanity check
+                        if (iter < sIteration /2) {
+                                System.out.println ("class B create to early");
+                                System.exit(1);
+                        }
+
+                                if (iter == sIteration) {
+                                        try {
+                                                result = ((C)(Class.forName("jit.deoptimization.test08.C").newInstance())).foo(index,iter);
+                                                result *= ((C)(Class.forName("jit.deoptimization.test08.C").newInstance())).bar(index);
+
+                                        } catch (Exception x) {
+                                                                        throw new TestFailure("Class not found: C");
+                                        }
+                                } else {
+                                        result = bar(index);
+                                        if (index != 0)
+                                                result += foo(--index, iter);
+                                }
+                        }
+                }
+        return result;
+  }
+        protected static final Object b_ext = new Object();
+}
+
+class C extends B {
+  synchronized public int foo(int index, int iter) {
+        synchronized (A.a_ext) {
+                synchronized (B.b_ext) {
+                        synchronized (C.c_ext) {
+                                        for (int i=0; i<iter; i++) {
+                                                result = bar(i);
+                                                if (i == iter-2) {
+                                                        try {
+                                                                result = ((D)(Class.forName("jit.deoptimization.test08.D").newInstance())).bar(index);
+                                                        } catch (Exception x) {
+                                                                                                        throw new TestFailure("Class not found: D");
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+                return result;
+        }
+        protected static final Object c_ext = new Object();
+}
+
+class D extends C {
+  synchronized public int bar(int index) {
+                return 1;
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/description.txt b/test/hotspot/jtreg/vmTestbase/jit/description.txt
new file mode 100644
index 00000000000..68e8187ad78
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/description.txt
@@ -0,0 +1,604 @@
+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
+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.
+
+* common/ArrayBounds
+
+Checks whether the compiler makes incorrect array bounds removal optimizations.
+
+* common/ArrayTests
+
+Checks whether array stores and reads are correct for integral types and floating points.
+
+* common/bounds
+
+Makes sure that array bounds checking is enabled with the JIT on
+
+* common/CEETest
+
+Checks whether comparision operations work properly.
+
+* common/collapse
+
+Checks constatnt propagation facilities of the JIT compiler.
+
+* common/CondExpr
+
+Checks that code for conditional expressions is generated properly.
+
+* common/deoptimization/test01
+* common/deoptimization/test02
+* common/deoptimization/test03
+* common/deoptimization/test04
+* common/deoptimization/test05
+* common/deoptimization/test06
+* common/deoptimization/test07
+* common/deoptimization/test08
+
+Check compiler deoptimization facilities.
+
+* common/DivTest
+
+Checks some special cases of divide operation.
+
+* common/exception
+
+This JIT buster test checks to see if a JIT doing register allocation
+on a machine with a callees saves ABI for non-volatile registers can
+get the exception handling correct. Intel and PowerPC are both such
+machines.
+
+* common/exceptiontest
+
+Does exactly the same as common/exception
+
+* common/ExcOpt
+
+Tests exception handler inside optimizable loop and around it.
+
+* common/FPCompare/TestFPBinop
+
+Tests floating point binary operations.
+
+* common/FPCompare/TestFPCompare
+
+Test of floating point comparison.
+
+* common/gen_math/Filtering
+* common/gen_math/Loops_1
+* common/gen_math/Loops_2
+* common/gen_math/Loops_3
+* common/gen_math/Loops_4
+* common/gen_math/Loops_5
+* common/gen_math/Loops_6
+* common/gen_math/Loops_7
+* common/gen_math/Matrix_3d
+* common/gen_math/Summ
+
+These tests check math preciction stuff.
+
+* common/gen_math/ShortCircuitTest
+
+A complete set of tests for the binary Java operators {&&, ||, &, |} to
+ensure that (C-style) short circuit evaluation is used where required, and
+also is not used where prohibited.  Checks has been constructed carefully to
+be independent of the operators under scrutiny, so that passing these tests
+constitutes validation of those operators.
+
+* common/graph
+
+The test checks the dynamic class creation and method invokation reflection features. A number of threads is created. They call
+methods dynamically and recursively. Also, exceptions, thrown from the dynamically called methods are checked.
+
+* common/inittest
+
+Checks correctness of class initialization order.
+
+* common/inittest2
+
+Checks that JIT doesn't perform an initialization of class which is never used.
+
+* common/inline001
+
+This test is valid in JDK 1.1.4 and in prior JDKs.  It
+ceased to work in JDK 1.2e.  The test relied on the JIT
+to inline some final methods and to never inline non-final
+methods.
+
+* common/inline002
+
+Look for inlined final methods in java.Math.  Do this by comparing
+execution times against estimates of call overheads for various
+method signatures.
+
+The current (08/04/97) list of inlined methods is short:
+    abs(float)
+    abs(double)
+    sqrt(double)  [i386 only]
+If new methods are inlined or dropped from the list of inlined
+codes, record this fact by changing the value of an element of the
+array expectInline.  This is done in the method result().
+
+This test will fail if the JIT is disabled.  There are two modes
+of operation.  The first is to merely record a pass/fail for each
+method tested.  This output should be machine independent and
+suitable for a golden file.
+  java -Djava.compiler=sunwjit inline002
+The other mode is a report generation mode.  It reports the
+number of iterations, call overhead in nanoseconds, and a judgement
+as to whether a method was inlined or not.
+  java -Djava.compiler=sunwjit inline002 -report
+
+* common/inline003
+* common/inline004
+
+Check inlining of final methods.
+
+* common/inline005
+
+Checks correctness of evaluation order in inlined math functions (?).
+
+* common/inline006
+* common/inline007
+
+Checks access to final class fields.
+
+* common/JITSuite
+
+Does exactly the same as common/inittest2
+
+* common/jtest
+
+Does some client-server communications via sockets. Not actually a JIT test!
+
+* common/Linpack
+
+Math presiction test.
+
+* common/loops/arg01
+* common/loops/arg03
+
+Fill arrays in a loops and then makes a number of checks (?)
+
+* common/loops/arg04
+
+Checks correctness of interprocedural data flow analysis, tests for recognition of
+loop independent dependences between statements in mutually exclusive regions, checks
+global data flow analysis.
+
+* common/loops/arg05
+
+Checks loop vectorization stuff.
+
+* common/loops/arg06
+
+Checks statement reordering, loop distribution, partial loop vectorization, recurrence
+in the middle of the loop.
+
+* common/loops/arg07
+
+Checks loop interchange, node splitting.
+
+* common/loops/arg08
+
+Checks scalar and array expansion.
+
+* common/loops/arg09
+
+Checks scalar and array expansion, control flow (loop with independent conditional).
+
+* common/loops/arg10
+
+Some control flow-related checks.
+
+* common/loops/dec01
+* common/loops/dec02
+* common/loops/dec03
+* common/loops/dec04
+* common/loops/dec05
+* common/loops/dec06
+* common/loops/dec07
+* common/loops/dec08
+* common/loops/dec09
+* common/loops/dec10
+* common/loops/dec11
+
+Some aritmetic operations within loops and a number of comparisions (?).
+
+* common/loops/fuse1
+* common/loops/fuse10
+* common/loops/fuse101
+* common/loops/fuse102
+* common/loops/fuse103
+* common/loops/fuse105
+* common/loops/fuse106
+* common/loops/fuse108
+* common/loops/fuse11
+* common/loops/fuse111
+* common/loops/fuse113
+* common/loops/fuse116
+* common/loops/fuse117
+* common/loops/fuse12
+* common/loops/fuse13
+* common/loops/fuse14
+* common/loops/fuse16
+* common/loops/fuse17
+* common/loops/fuse18
+* common/loops/fuse2
+* common/loops/fuse3
+* common/loops/fuse4
+* common/loops/fuse5
+* common/loops/fuse6
+* common/loops/fuse8
+
+Check correctness of loop fusion.
+
+* common/loops/fuse107
+* common/loops/fuse109
+* common/loops/fuse15
+* common/loops/fuse19
+* common/loops/fuse7
+* common/loops/fuse9
+
+Construct a number of loops and make some calculations. These tests seems to be
+incomplete (incorrectly translated from Fortran).
+
+* common/loops/private1
+
+Single dimensional private array, with no carried dependence in the inner
+loop - simple subscripts.
+
+* common/loops/private2
+
+Single dimensional private array, with no carried dependence in the inner
+loop - non-simple subscripts (test incomplete).
+
+* common/loops/private3
+
+Single dimensional private array, with no carried dependence
+in the inner loop  (test incomplete).
+
+* common/loops/private4
+
+Loop with condionals, both arms of the conditional cover the entire array
+which is private.
+
+* common/loops/private5
+
+Single dimensional private array, 2 inner loops; all uses of array in the 2nd loop are
+covered by defs in the 1st one.
+
+* common/loops/private6
+
+Single dimensional private array; all uses of array in the inner loop are
+covered by defs in the outer one.
+
+* common/loops/private7
+
+Single dimensional private array, 3 inner loops; all uses of array in the 3rd loop are
+covered by defs in the 1st and 2nd one.
+
+* common/loops/private8
+
+Single dimensional private array, 3 inner loops; the defs of array in the 2nd loop cover
+all the defs and uses within loops 2 and 3.
+
+* common/loops/private9
+
+Single dimensional private array, the two loops effectively cover the array.
+
+* common/loops/private10
+
+Single dimensional private array, the two asignments to the array in the inner loop
+effectively cover the entire array.
+
+* common/loops/private104
+
+Loop with condionals. Both arms of the conditional cover the entire array.
+
+* common/loops/private105
+
+Single dimensional private array, 2 inner loops; all uses of array in the 2nd loop are
+covered by defs in the 1st one.
+
+* common/loops/private107
+
+Single dimensional private array, 3 inner loops; all uses of array in the 3rd loop are
+covered by defs in the 1st and 2nd one.
+
+* common/loops/private109
+
+Single dimensional private array, the two loops effectively cover the array.
+
+* common/loops/private11
+
+The two loops each cover disjoint triangular regions of the array. Together they
+cover the entire array.
+
+* common/loops/private110
+
+Single dimensional private array, the two asignments to the array in the inner loop
+effectively cover the entire array.
+
+* common/loops/private111
+
+The two loops each cover disjoint triangular regions of the array. Together they
+cover the entire array.
+
+* common/loops/private112
+* common/loops/private113
+* common/loops/private12
+* common/loops/private13
+
+Private array sections. Even though only a portion of the array is covered by the
+definitions, but the uses are covered entirely by the defs in the array.
+
+* common/loops/private117
+
+Single dimensional private array, 2 inner loops; all uses of array in the 2nd loop are
+covered by defs in the 1st one.
+
+* common/loops/private118
+
+Two dimensional private array and some loop unrolling made by hand.
+
+* common/loops/private119
+
+Two dimensional private array.
+
+* common/loops/private120
+
+Loop peeling before and after the loop.
+
+* common/loops/private122
+
+Two dimensional private array.
+
+* common/loops/private123
+
+Single dimensional private array; even though not all elements of the array are modified
+in the inner loop, and all uses of array are covered.
+
+* common/loops/private124
+
+Two dimensional private array. Loop with condionals; both arms of the conditional cover
+the entire array, there are uses in the either arm the are entirely covered.
+
+* common/loops/private125
+
+Two dimensional private array. Loop with condionals; the uses of the array outside the
+conditional are not guaranteed to be covered entirely.
+
+* common/loops/private126
+
+Two dimensional array. Here array is not private, as one element is not covered in the loop.
+
+* common/loops/private128
+
+Two and single dimensional arrays.
+
+* common/loops/private130
+
+2 two dimensional and 1 single dimension array.
+
+* common/loops/private133
+
+Single dimensional private array, 2 inner loops.
+
+* common/loops/private14
+
+This is an involved test. The first j loop covers 1..m elements of the
+1..n array. Since overindexing is prohibited, the compiler should assume
+that 1..m is a subset of 1..n. In the k loop first m uses of the array
+a() are covered by defs in the j loop. The next m+1..n iterations of the
+loop do not have any uncovered uses. Therefore the array a() ought to be
+a private array.
+
+* common/loops/private15
+
+Similar to common/loops/private14, but uses no conditionals.
+
+* common/loops/private17
+
+Single dimensional array, assuming no overindexing.
+
+* common/loops/private18
+* common/loops/private19
+* common/loops/private20
+* common/loops/private22
+
+Single dimensional private array, 3 inner loops.
+
+* common/loops/private21
+
+3 inner loops, the 1st and 2nd loop together cover the entire array, and all the uses
+of the array in the 3rd loop are covered.
+
+* common/loops/private23
+
+Private array, even though not all elements of the array are modified in inner loop,
+and all uses of the array are covered.
+
+* common/loops/private24
+
+Conditional inside the loop, 2 inner loops in both arms.
+
+* common/loops/private25
+
+Conditional inside the loop, inner loops in both arms and one inner loop after
+the conditional.
+
+* common/loops/private26
+* common/loops/private27
+* common/loops/private28
+
+Single dimensional private array, 3 inner loops.
+
+* common/loops/private29
+
+Single dimensional private array, 2 inner loops.
+
+* common/loops/private30
+
+Conditional inside the loop, inner loops in both arms and one inner loop before
+the conditional.
+
+* common/loops/private31
+
+Conditional inside the loop, inner loop in both arms.
+
+* common/loops/private32
+
+2 loops, inner loop inside the 2nd one.
+
+* common/loops/private33
+
+Single dimensional private array, 2 inner loops.
+
+* common/misctests/classes
+
+No test found!
+
+* common/misctests/clss14702
+
+Checks that NullPointerException is thrown.
+
+* common/misctests/FileViewer
+
+Not a JIT test!
+
+* common/misctests/Foo
+
+Does nothing.
+
+* common/misctests/fpustack
+
+Not a JIT test!
+
+* common/misctests/Jdk116JitProblem
+
+The test illustrates a problem with the new JDK 1.1.6 JIT. The JIT compiler
+included with JDK 1.1.6 takes forever to compile the transform() method, thereby
+hanging up the virtual machine.
+
+* common/misctests/JitBug
+
+Symantec's JIT seems to optimize away important code. The test compiled using
+the standard javac, demonstrates a bug in the JIT on NT4/sp3.
+
+* common/misctests/JitBug1
+
+Demonstrates yet another JIT bug.
+
+* common/misctests/JitTest
+
+Tests equals() method.
+
+* common/misctests/NoHeader
+
+Not a JIT test!
+
+* common/misctests/noop
+
+Not a JIT test!
+
+* common/misctests/Pi
+
+Not a JIT test!
+
+* common/misctests/putfield00802
+
+Tests NullPointerException. Should be removed (common/misctests/clss14702 is a better test).
+
+* common/misctests/t5
+
+Not a JIT test!
+
+* common/misctests/testbug
+
+If this test is run under JRE 1.1.6, it gets the following error: "A nonfatal internal
+JIT (3.00.039(x)) error 'Unuse_LRU' hasoccu4rred in: 'testbug.dk ([BI)V': Interpreting method."
+
+* common/misctests/whet
+
+Not a JIT test!
+
+* common/misctests/test.java
+
+Not a JIT test!
+
+* common/overflow
+
+Test StackOverflowException.
+
+* common/pat001
+
+Tests arithmetic series.
+
+* common/Peano
+
+Computes factorials by using the Peano axioms only. Not a test!
+
+* common/PrintProperties
+* common/PrintThis
+
+Not a JIT test!
+
+* common/Robert
+
+Tests some exception stuff
+
+* common/Sleeper
+
+Not a JIT test!
+
+* common/tXXX
+
+Do some arithmetic operations, but do not actually report results. Should be removed.
+
+* common/testForBugs/4427606/TestDivByZero
+
+Tests correctness of division by zero handling.
+
+* common/testForBugs/4427606/Security
+* common/testForBugs/4446672/TestThreadStart.java
+
+Not a JIT test!
+
+* common/testForBugs/CrashC1
+
+Test for bug in C1.
+
+* common/wide
+* common/too_wide
+
+Check for intermediate results that are too wide.
+
+* common/TsdCase
+
+performance benchmarks. Not a test!
+
+* common/verifier/VerifyInitLocal
+
+Makes sure verifier allows initialization of local fields.
+
+* common/verifier/VerifyMergeStack
+
+Makes sure verifier fails when two distinct types meet on operand stack.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java b/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java
new file mode 100644
index 00000000000..ca986a45f19
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2010, 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
+ *
+ * @summary converted from VM Testbase jit/escape/AdaptiveBlocking/AdaptiveBlocking001.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * This is a basic JIT compiler adaptive blocking test. The test runs 2 threads
+ * contending for a shared resource. In the first round, the lock is held for
+ * a short period of time, provoking spinlock-style locking. In the second round,
+ * the lock is held for a long period of time, provoking blocked locking. The
+ * described scenario is repeated numRounds (specified by the -numRounds
+ * parameter) times.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.escape.AdaptiveBlocking.AdaptiveBlocking001.AdaptiveBlocking001
+ * @run driver/timeout=300 ExecDriver --java -server -Xcomp -XX:+DoEscapeAnalysis
+ *             jit.escape.AdaptiveBlocking.AdaptiveBlocking001.AdaptiveBlocking001 -numRounds 10
+ */
+
+package jit.escape.AdaptiveBlocking.AdaptiveBlocking001;
+
+import nsk.share.TestFailure;
+
+class AdaptiveBlocking001
+{
+        public static int numRounds = 10;
+
+        private static Object sharedLock = new Object();
+        private static boolean lockEntered1;
+        private static boolean lockEntered2;
+
+        private static boolean latentLocks;
+
+        private static boolean done;
+
+        private static boolean failed;
+
+        public static void main( String[] args )
+        {
+                System.out.println( "Adaptive blocking test" );
+
+                parseArgs( args );
+
+                for( int i=0; i < numRounds; ++i )
+                {
+                        doRound(i, false);
+                        doRound(i, true);
+                }
+
+                if( !failed )
+                        System.out.println( "TEST PASSED" );
+                else
+                        throw new TestFailure( "TEST FAILED" );
+        }
+
+        private static void parseArgs( String[] args )
+        {
+                for( int i=0; i < args.length; ++i )
+                {
+                        String arg = args[i];
+                        String val;
+
+                        if( arg.equals( "-numRounds" ) )
+                        {
+                                if( ++i < args.length )
+                                        val = args[i];
+                                else
+                                        throw new TestFailure( "Need value for '" + arg + "' parameter" );
+
+                                try {
+                                        numRounds = Integer.parseInt( val );
+                                } catch( NumberFormatException e ) {
+                                        throw new TestFailure( "Invalid value for '" + arg + "' parameter: " + val );
+                                }
+                        }
+                        else
+                        {
+                                throw new TestFailure( "Invalid argument: " + args );
+                        }
+                }
+        }
+
+        private static void doRound(int ord, boolean latent_locks)
+        {
+                System.out.println( "round #" + ord + ", latent locks: " + (latent_locks ? "yes" : "no") + "..." );
+
+                latentLocks = latent_locks;
+
+                Thread_1 t1 = new Thread_1();
+                Thread_2 t2 = new Thread_2();
+
+                done = false;
+
+                t1.start();
+                t2.start();
+
+                for( int i=0; i < 10; ++i )
+                {
+                        try {
+                                Thread.sleep( 1000 );
+                        } catch( InterruptedException e ) {
+                        }
+
+                        if( done )
+                                break;
+                }
+
+                done = true;
+
+                try {
+                        t1.join();
+                        t2.join();
+                } catch( InterruptedException e ) {
+                }
+        }
+
+        private static class Thread_1 extends Thread
+        {
+                public void run()
+                {
+                        while( !done )
+                        {
+                                synchronized( sharedLock )
+                                {
+                                        lockEntered1 = true;
+                                        if( lockEntered2 )
+                                        {
+                                                Fail();
+                                                done = true;
+                                                break;
+                                        }
+
+                                        holdLock();
+
+                                        lockEntered1 = false;
+                                }
+                        }
+                }
+        }
+
+        private static class Thread_2 extends Thread
+        {
+                public void run()
+                {
+                        while( !done )
+                        {
+                                synchronized( sharedLock )
+                                {
+                                        lockEntered2 = true;
+                                        if( lockEntered1 )
+                                        {
+                                                Fail();
+                                                done = true;
+                                                break;
+                                        }
+
+                                        holdLock();
+
+                                        lockEntered2 = false;
+                                }
+                        }
+                }
+        }
+
+        private static void holdLock()
+        {
+                if( latentLocks )
+                {
+                        try {
+                                Thread.sleep( 500 );
+                        } catch( InterruptedException e ) {
+                        }
+                }
+        }
+
+        private static void Fail()
+        {
+                failed = true;
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening.java b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening.java
new file mode 100644
index 00000000000..7e68cd17595
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening.java
@@ -0,0 +1,1476 @@
+/*
+ * 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 jit.escape.LockCoarsening;
+
+import nsk.share.TestFailure;
+
+class LockCoarsening {
+    // JVM option '-XX:+EliminateLocks' specified
+    public static boolean eliminateLocks = false;
+    // Number of chances Thread 2 has to acquire the lock
+    public static int numChances = 16;
+
+    // Signals to Threads_2 that Thread_1 started execuition
+    public static volatile boolean start;
+    // Signals to Thread_2 to stop execution
+    public static volatile boolean done;
+    // Thread_2 has acquired the lock
+    public static volatile boolean acquiredLock;
+    // Actually running the test
+    public static volatile boolean realrun;
+    // Thread 2 'acquire lock chance' number
+    public static volatile int currentChance;
+
+    static Thread_2 t2;
+
+    public static void main(String[] args) {
+        parseArgs(args);
+
+        Thread.currentThread().getThreadGroup().setMaxPriority(Thread.MAX_PRIORITY);
+
+        currentChance = 1;
+
+        do {
+            System.out.println("Chance " + currentChance + ":");
+
+            Thread_1 t1 = new Thread_1();
+            t1.getThreadGroup().setMaxPriority(Thread.MAX_PRIORITY);
+            t1.setPriority(Thread.MIN_PRIORITY);
+            t1.start();
+
+            try {
+                t1.join();
+            } catch (InterruptedException e) {
+            }
+
+            System.out.println();
+
+            // if thread 2 hasn't acquired lock and we are not eliminating them, give it one more try...
+        } while (!eliminateLocks && !acquiredLock && ++currentChance <= numChances);
+
+        System.out.println("Thread 2 has acquired lock: " + acquiredLock);
+
+        boolean failed = false;
+
+        if (!eliminateLocks) {
+            if (!acquiredLock) {
+                failed = true;
+
+                throw new TestFailure("acquiredLock == false, though, '-XX:-EliminateLocks' specified");
+            }
+        } else {
+            if (acquiredLock) {
+                failed = true;
+
+                throw new TestFailure("acquiredLock == true, though, '-XX:+EliminateLocks' specified");
+            }
+        }
+
+        if (!failed)
+            System.out.println("TEST PASSED");
+        else
+            throw new TestFailure("TEST FAILED");
+    }
+
+    private static void parseArgs(String[] args) {
+        eliminateLocks = false;
+
+        for (int i = 0; i < args.length; ++i) {
+            String arg = args[i];
+            String val;
+
+            if (arg.equals("-eliminateLocks")) {
+                eliminateLocks = true;
+            } else if (arg.equals("-numChances")) {
+                if (++i >= args.length)
+                    throw new TestFailure("'numChances' parameter requires an integer value");
+                val = args[i];
+                try {
+                    numChances = Integer.parseInt(val);
+                } catch (NumberFormatException e) {
+                    throw new TestFailure("invalid value for 'numChances'");
+                }
+            } else {
+                System.out.println("Invalid argument: " + args);
+
+            }
+        }
+    }
+
+    /**
+     * Thread that enters synchronized parts which are subject of
+     * lock coarsening
+     */
+    public static class Thread_1 extends Thread {
+        public void run() {
+            Dummy lock = new Dummy();
+
+            // An ugly-terrible hack to force JIT to compile Thread_1.doit():
+            // 1: call method from a static method of another class within a loop
+            System.out.println("**** Compilation warm-up *****");
+            realrun = false;
+            Helper.callMethod(this, lock);
+
+            // 2: call method normally
+            System.out.println("**** Starting real run ****");
+            realrun = true;
+            this.doit(lock);
+        }
+
+        public final void doit(Dummy _lock) {
+            Dummy lock = new Dummy();
+
+            start = false;
+            done = false;
+            acquiredLock = false;
+
+            /*Thread_2*/
+            t2 = new Thread_2(lock);
+            t2.getThreadGroup().setMaxPriority(Thread.MAX_PRIORITY);
+            t2.setPriority(Thread.MAX_PRIORITY);
+            t2.start();
+
+            //waiting for the Thread_2 to invoke lock.wait()
+            while (t2.getState() != Thread.State.WAITING) { }
+            start = true;
+
+            // The following code is subject to lock coarsening if eliminateLocks == true
+            {
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                synchronized (lock) {
+                    lock.foo();
+                }
+
+                // Footer
+                synchronized (lock) {
+                    lock.foo();
+
+                    done = true;
+
+                    lock.notify();
+                }
+            }
+            try {
+                t2.join();
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+    /**
+     * Thread that tries to acquire lock during lock coarsening.
+     * If it unable to do it then lock coarsening occurred.
+     */
+    private static class Thread_2 extends Thread {
+        private Dummy lock;
+
+        public Thread_2(Dummy lock) {
+            this.lock = lock;
+        }
+
+        public void run() {
+            Dummy lock = this.lock;
+
+            synchronized (lock) {
+                if (!done) {
+                    while (!start) {
+                        try {
+                            lock.wait();
+                        } catch (InterruptedException e) {
+                            System.out.println("Interrupted!");
+                        }
+                    }
+
+                    if (!done) {
+                        done = true;
+
+                        acquiredLock = true;
+
+                        if (realrun) {
+                            System.out.println("Acquired lock at " + lock.counter + " iteration of " + currentChance + " chance");
+                        } else if (eliminateLocks) {
+                            //forcibly stop warm-up as we see that lock coarsening occurs
+                            Helper.allowExec = true;
+                        }
+
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     *  Helper class to make method Thread_1.doit() be compiled.
+     */
+    public static class Helper {
+        public static volatile boolean allowExec = false;
+        private static int iterations = 10000;
+
+        public static void callMethod(Thread_1 t, Dummy lock) {
+            for (int i = 0; i < iterations; ++i) {
+                t.doit(lock);
+                if (allowExec)
+                    break;
+            }
+        }
+    }
+
+    /**
+     *  Class to count number of synchronized statement.
+     *  If test fails Dummy.counter shows iteration when lock coarsening did not happen
+     */
+    public static class Dummy {
+        public volatile int counter = 0;
+
+        public void foo() {
+            if (done)
+                return;
+
+            while (t2.getState() != Thread.State.BLOCKED && t2.getState() != Thread.State.WAITING) {
+                this.notifyAll();
+
+                Thread.yield();
+            }
+
+            this.notifyAll();
+
+            while (t2.getState() != Thread.State.BLOCKED) {
+                Thread.yield();
+            }
+
+            ++counter;
+
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+            Thread.yield();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java
new file mode 100644
index 00000000000..b3943048d63
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/escape/LockCoarsening/LockCoarsening001.
+ * VM Testbase keywords: [jit, quarantine]
+ * VM Testbase comments: JDK-8148743
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.escape.LockCoarsening.LockCoarsening
+ * @run shell ../run.sh EliminateLocks
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java
new file mode 100644
index 00000000000..10f547272f9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/escape/LockCoarsening/LockCoarsening002.
+ * VM Testbase keywords: [jit, quick, quarantine]
+ * VM Testbase comments: JDK-8079666
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.escape.LockCoarsening.LockCoarsening
+ * @run shell ../run.sh
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/readme b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/readme
new file mode 100644
index 00000000000..c7bee6adfab
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/readme
@@ -0,0 +1,68 @@
+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.
+
+DESCRIPTION
+
+    This is a lock coarsening test. There are 2 threads, trying to acquire a shared
+    resource. The 1st thread has a number of adjacent lock that are subject to lock
+    coarsening:
+
+    ...
+
+    synchronized( lock )
+    {
+        lock.foo();
+    }
+
+    // (*)
+
+    synchronized( lock )
+    {
+        lock.foo();
+    }
+
+    ...
+
+
+    The test is written in such a way, that thread 2 will acquire the lock, if and
+    only if thread 1 is somewhere at point (*). Therefore, the fact that lock
+    coarsening occurred is described by the condition (numAcquiredLocks != 0).
+
+IMPLEMENTATION
+    The test has one parameter, -eliminateLocks, that tells whether the JVM option
+    -XX:+EliminateLocks has been specified, so running the test without
+    -eliminateLocks checks that lock coarsening didn't occur, and running it with
+    this option check that lock coarsening occurred.
+
+    Some hacks have been made to force JIT compile the method doit() (see comments in
+    the source).
+
+FAILURE ANALYSIS
+    If test fails try to run it with -XX:+PrintOptoAssembly and -XX:+LogCompilation
+    to understand if this is a test or product bug.
+
+    If compiled code of Thread_1::doit method have lot of locks that surround each
+    lock.foo() then coarsening did not happen and this is a product bug.
+
+    If lock coarsening occurs but not triggered by test then it's a test bug
+    that should be investigated. One of such problems could be caused if method doit()
+    was not compiled due to insufficient warm-up iterations. Also there may be a product bug
+    in compilation.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh
new file mode 100644
index 00000000000..61c325f141a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# 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
+# 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.
+#
+
+EXECUTE_CLASS=jit.escape.LockCoarsening.LockCoarsening
+JAVA="$TESTJAVA/bin/java"
+JAVA_OPTS="-cp $TESTCLASSPATH $TESTJAVAOPTS $TESTVMOPTS"
+
+#
+# Run the test in EA mode if -server and -Xcomp JVM options specified
+# Set EliminateLocks commandline option to enable -XX:+EliminateLocks
+#
+
+if [ "$1" = "EliminateLocks" ]; then
+    EA_OPTS="-XX:+DoEscapeAnalysis -XX:+EliminateLocks"
+    TEST_ARGS="$TEST_ARGS -eliminateLocks"
+else
+    EA_OPTS="-XX:-DoEscapeAnalysis -XX:-EliminateLocks"
+fi
+
+# Additional VM options
+ADD_OPTS="-XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeALot"
+
+echo "Check if EscapeAnalysis is supported"
+$JAVA $JAVA_OPTS $EA_OPTS -version
+
+if [ "$?" = 0 ]; then
+        echo "EA options '$EA_OPTS' are supported"
+
+        b1=0
+        b2=0
+
+        for param in $JAVA_OPTS; do
+                case "$param" in
+                        -server )
+                                b1=1
+                                ;;
+                        -Xcomp )
+                                b2=1
+                                ;;
+                esac
+        done
+
+        if [ "$b1$b2" = 11 ]; then
+                JAVA_OPTS="$JAVA_OPTS $ADD_OPTS $EA_OPTS"
+                echo "Java options: $JAVA_OPTS"
+
+                $JAVA $JAVA_OPTS $EXECUTE_CLASS $TEST_ARGS
+
+                exit $?
+        else
+                echo "JVM options '-server -Xcomp' not specified"
+
+                exit 0
+        fi
+fi
+
+echo "EA not supported, passing test"
+
+exit 0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java b/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java
new file mode 100644
index 00000000000..7fddf8efef3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java
@@ -0,0 +1,676 @@
+/*
+ * Copyright (c) 2010, 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
+ *
+ * @summary converted from VM Testbase jit/escape/LockElision/MatMul.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     The test multiplies 2 matrices, first, by directly calculating matrix product
+ *     elements, and second, by calculating them parallelly in diffenent threads.
+ *     The results are compared then.
+ *     The test, in addition to required locks, introduces locks on local variables or
+ *     variables not escaping from the executing thread, and nests them manifoldly.
+ *     In case of a buggy compiler, during lock elimination some code, required by
+ *     the calulation may be eliminated as well, or the code may be overoptimized in
+ *     some other way, causing difference in the execution results.
+ *     The test has one parameter, -dim, which specifies the dimensions of matrices.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.escape.LockElision.MatMul.MatMul
+ * @run driver ExecDriver --java jit.escape.LockElision.MatMul.MatMul -dim 30 -threadCount 10
+ */
+
+package jit.escape.LockElision.MatMul;
+
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import nsk.share.Consts;
+import nsk.share.Log;
+import nsk.share.Pair;
+
+import nsk.share.test.StressOptions;
+import vm.share.options.Option;
+import vm.share.options.OptionSupport;
+import vm.share.options.Options;
+
+
+class MatMul {
+
+    @Option(name = "dim", description = "dimension of matrices")
+    int dim;
+
+    @Option(name = "verbose", default_value = "false",
+            description = "verbose mode")
+    boolean verbose;
+
+    @Option(name = "threadCount", description = "thread count")
+    int threadCount;
+
+    @Options
+    StressOptions stressOptions = new StressOptions();
+
+    private Log log;
+
+    public static void main(String[] args) {
+        MatMul test = new MatMul();
+        OptionSupport.setup(test, args);
+        System.exit(Consts.JCK_STATUS_BASE + test.run());
+    }
+
+    public int run() {
+        log = new Log(System.out, verbose);
+        log.display("Parallel matrix multiplication test");
+
+        Matrix a = Matrix.randomMatrix(dim);
+        Matrix b = Matrix.randomMatrix(dim);
+        long t1, t2;
+
+        t1 = System.currentTimeMillis();
+        Matrix serialResult = serialMul(a, b);
+        t2 = System.currentTimeMillis();
+        log.display("serial time: " + (t2 - t1) + "ms");
+
+        try {
+            t1 = System.currentTimeMillis();
+            Matrix parallelResult = parallelMul(a, b,
+                    threadCount * stressOptions.getThreadsFactor());
+            t2 = System.currentTimeMillis();
+            log.display("parallel time: " + (t2 - t1) + "ms");
+
+            if (!serialResult.equals(parallelResult)) {
+                log.complain("a = \n" + a);
+                log.complain("b = \n" + b);
+
+                log.complain("serial: a * b = \n" + serialResult);
+                log.complain("serial: a * b = \n" + parallelResult);
+                return Consts.TEST_FAILED;
+            }
+            return Consts.TEST_PASSED;
+
+        } catch (CounterIncorrectStateException e) {
+            log.complain("incorrect state of counter " + e.counter.name);
+            log.complain("expected = " + e.counter.expected);
+            log.complain("actual " + e.counter.state());
+            return Consts.TEST_FAILED;
+        }
+    }
+
+    public static int convolution(Seq<Integer> one, Seq<Integer> two) {
+        int res = 0;
+        int upperBound = Math.min(one.size(), two.size());
+        for (int i = 0; i < upperBound; i++) {
+            res += one.get(i) * two.get(i);
+        }
+        return res;
+    }
+
+    /**
+     * calculate chunked convolutuion of two sequences
+     * <p/>
+     * This special version of this method:
+     * <pre>{@code
+     * public static int chunkedConvolution(Seq<Integer> one, Seq<Integer> two, int from, int to) {
+     * int res = 0;
+     *  int upperBound = Math.min(Math.min(one.size(), two.size()), to + 1);
+     *  for (int i = from; i < upperBound; i++) {
+     *    res += one.get(i) * two.get(i);
+     *   }
+     *  return res;
+     * }}</pre>
+     * <p/>
+     * that tries to fool the Lock Elision optimization:
+     * Most lock objects in these lines are really thread local, so related synchronized blocks (dummy blocks) can be removed.
+     * But several synchronized blocks (all that protected by Counter instances) are really necessary, and removing them we obtain
+     * an incorrect result.
+     *
+     * @param one
+     * @param two
+     * @param from     - lower bound of sum
+     * @param to       - upper bound of sum
+     * @param local    - reference ThreadLocal that will be used for calculations
+     * @param bCounter - Counter instance, need to perfom checks
+     */
+    public static int chunkedConvolutionWithDummy(Seq<Integer> one,
+            Seq<Integer> two, int from, int to, ThreadLocals local,
+            Counter bCounter) {
+        ThreadLocals conv_local1 = new ThreadLocals(local, "conv_local1");
+        ThreadLocals conv_local2 = new ThreadLocals(conv_local1, "conv_local2");
+        ThreadLocals conv_local3 = new ThreadLocals(null, "conv_local3");
+        int res = 0;
+        synchronized (local) {
+            local.updateHash();
+            int upperBound = 0;
+            synchronized (conv_local1) {
+                upperBound = local.min(one.size(), two.size());
+                synchronized (two) {
+                    //int upperBound = Math.min(Math.min(one.size(), two.size()), to + 1) :
+                    upperBound = conv_local1.min(upperBound, to + 1);
+                    synchronized (bCounter) {
+                        bCounter.inc();
+                    }
+                }
+                for (int i = from; i < upperBound; i++) {
+                    synchronized (conv_local2) {
+                        conv_local1.updateHash();
+                        int prod = 0;
+                        synchronized (one) {
+                            int t = conv_local2.mult(one.get(i), two.get(i));
+                            synchronized (conv_local3) {
+                                prod = t;
+
+                            }
+                            //res += one.get(i) * two.get(i)
+                            res = conv_local3.sum(res, prod);
+                        }
+                    }
+                }
+            }
+            return res;
+        }
+    }
+
+    public boolean productCheck(Matrix a, Matrix b) {
+        if (a == null || b == null) {
+            log.complain("null matrix!");
+            return false;
+        }
+
+        if (a.dim != b.dim) {
+            log.complain("matrices dimension are differs");
+            return false;
+        }
+        return true;
+    }
+
+    public Matrix serialMul(Matrix a, Matrix b) {
+        if (!productCheck(a, b)) {
+            throw new IllegalArgumentException();
+        }
+
+        Matrix result = Matrix.zeroMatrix(a.dim);
+        for (int i = 0; i < a.dim; i++) {
+            for (int j = 0; j < a.dim; j++) {
+                result.set(i, j, convolution(a.row(i), b.column(j)));
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * Parallel multiplication of matrices.
+     * <p/>
+     * This special version of this method:
+     * <pre>{@code
+     *  public Matrix parallelMul1(final Matrix a, final Matrix b, int threadCount) {
+     *   if (!productCheck(a, b)) {
+     *       throw new IllegalArgumentException();
+     *   }
+     *   final int dim = a.dim;
+     *   final Matrix result = Matrix.zeroMatrix(dim);
+     * <p/>
+     *   ExecutorService threadPool = Executors.newFixedThreadPool(threadCount);
+     *   final CountDownLatch latch = new CountDownLatch(threadCount);
+     *   List<Pair<Integer, Integer>> parts = splitInterval(Pair.of(0, dim - 1), threadCount);
+     *   for (final Pair<Integer, Integer> part : parts) {
+     *       threadPool.submit(new Runnable() {
+     *           @Override
+     *           public void run() {
+     *               for (int i = 0; i < dim; i++) {
+     *                   for (int j = 0; j < dim; j++) {
+     *                       synchronized (result) {
+     *                           int from = part.first;
+     *                           int to = part.second;
+     *                           result.add(i, j, chunkedConvolution(a.row(i), b.column(j), from, to));
+     *                       }
+     *                   }
+     *               }
+     *               latch.countDown();
+     *           }
+     *       });
+     *   }
+     * <p/>
+     *   try {
+     *       latch.await();
+     *   } catch (InterruptedException e) {
+     *       e.printStackTrace();
+     *   }
+     *   threadPool.shutdown();
+     *   return result;
+     * }}</pre>
+     * Lines marked with NOP comments need to fool the Lock Elision optimization:
+     * All lock objects in these lines are really thread local, so related synchronized blocks (dummy blocks) can be removed.
+     * But several synchronized blocks (that are nested in dummy blocks) are really necessary, and removing them we obtain
+     * an incorrect result.
+     *
+     * @param a           first operand
+     * @param b           second operand
+     * @param threadCount number of threads that will be used for calculations
+     * @return product of matrices a and b
+     */
+    public Matrix parallelMul(final Matrix a, final Matrix b, int threadCount)
+            throws CounterIncorrectStateException {
+        if (!productCheck(a, b)) {
+            throw new IllegalArgumentException();
+        }
+        final int dim = a.dim;
+        final Matrix result = Matrix.zeroMatrix(dim);
+
+        ExecutorService threadPool = Executors.newFixedThreadPool(threadCount);
+        final CountDownLatch latch = new CountDownLatch(threadCount);
+        List<Pair<Integer, Integer>> parts = splitInterval(Pair.of(0, dim - 1),
+                threadCount);
+
+        final Counter lCounter1 = new Counter(threadCount, "lCounter1");
+        final Counter lCounter2 = new Counter(threadCount, "lCounter2");
+        final Counter lCounter3 = new Counter(threadCount, "lCounter3");
+
+        final Counter bCounter1 = new Counter(threadCount * dim * dim,
+                "bCounter1");
+        final Counter bCounter2 = new Counter(threadCount * dim * dim,
+                "bCounter2");
+        final Counter bCounter3 = new Counter(threadCount * dim * dim,
+                "bCounter3");
+
+        final Counter[] counters = {lCounter1, lCounter2, lCounter3,
+                bCounter1, bCounter2, bCounter3};
+
+        final Map<Pair<Integer, Integer>, ThreadLocals> locals1
+                = CollectionsUtils.newHashMap();
+        final Map<Pair<Integer, Integer>, ThreadLocals> locals2
+                = CollectionsUtils.newHashMap();
+        final Map<Pair<Integer, Integer>, ThreadLocals> locals3
+                = CollectionsUtils.newHashMap();
+
+        for (final Pair<Integer, Integer> part : parts) {
+
+            ThreadLocals local1 = new ThreadLocals(null,
+                    "locals1[" + part + "]");
+            ThreadLocals local2 = new ThreadLocals(local1,
+                    "locals2[" + part + "]");
+            ThreadLocals local3 = new ThreadLocals(local2,
+                    "locals3[" + part + "]");
+
+            locals1.put(part, local1);
+            locals2.put(part, local2);
+            locals3.put(part, local3);
+        }
+
+        for (final Pair<Integer, Integer> part : parts) {
+            threadPool.submit(new Runnable() {
+                @Override
+                public void run() {
+                    ThreadLocals local1 = locals1.get(part);
+                    ThreadLocals local2 = locals2.get(part);
+                    ThreadLocals local3 = locals3.get(part);
+                    ThreadLocals local4 = locals3.get(part);
+                    synchronized (local1) {
+                        local1.updateHash();
+                        synchronized (lCounter1) {
+                            lCounter1.inc();
+                        }
+                        synchronized (lCounter3) {
+                            synchronized (local2) {
+                                local2.updateHash();
+                                lCounter3.inc();
+                            }
+                        }
+                        synchronized (new Object()) {
+                            synchronized (lCounter2) {
+                                lCounter2.inc();
+                            }
+                            for (int i = 0; i < dim; i++) {
+                                for (int j = 0; j < dim; j++) {
+                                    synchronized (bCounter1) {
+                                        synchronized (new Object()) {
+                                            bCounter1.inc();
+                                        }
+                                    }
+                                    synchronized (local3) {
+                                        local3.updateHash();
+                                        synchronized (bCounter2) {
+                                            bCounter2.inc();
+                                        }
+                                        synchronized (result) {
+                                            local1.updateHash();
+                                            synchronized (local2) {
+                                                local2.updateHash();
+                                                int from = part.first;
+                                                int to = part.second;
+                                                result.add(i, j,
+                                                        chunkedConvolutionWithDummy(
+                                                                a.row(i),
+                                                                b.column(j),
+                                                                from, to,
+                                                                local4,
+                                                                bCounter3));
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    latch.countDown();
+                }
+            });
+        }
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        threadPool.shutdown();
+        for (final Pair<Integer, Integer> part : parts) {
+            log.display(
+                    "hash for " + part + " = " + locals1.get(part).getHash());
+        }
+
+
+        for (Counter counter : counters) {
+            if (!counter.check()) {
+                throw new CounterIncorrectStateException(counter);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Split interval into parts
+     *
+     * @param interval  - pair than encode bounds of interval
+     * @param partCount - count of parts
+     * @return list of pairs than encode bounds of parts
+     */
+    public static List<Pair<Integer, Integer>> splitInterval(
+            Pair<Integer, Integer> interval, int partCount) {
+        if (partCount == 0) {
+            throw new IllegalArgumentException();
+        }
+
+        if (partCount == 1) {
+            return CollectionsUtils.asList(interval);
+        }
+
+        int intervalSize = interval.second - interval.first + 1;
+        int partSize = intervalSize / partCount;
+
+        List<Pair<Integer, Integer>> init = splitInterval(
+                Pair.of(interval.first, interval.second - partSize),
+                partCount - 1);
+        Pair<Integer, Integer> lastPart = Pair
+                .of(interval.second - partSize + 1, interval.second);
+
+        return CollectionsUtils.append(init, lastPart);
+    }
+
+    public static class Counter {
+        private int state;
+
+        public final int expected;
+        public final String name;
+
+        public void inc() {
+            state++;
+        }
+
+        public int state() {
+            return state;
+        }
+
+        public boolean check() {
+            return state == expected;
+        }
+
+        public Counter(int expected, String name) {
+            this.expected = expected;
+            this.name = name;
+        }
+    }
+
+    private static class CounterIncorrectStateException extends Exception {
+        public final Counter counter;
+
+        public CounterIncorrectStateException(Counter counter) {
+            this.counter = counter;
+        }
+    }
+
+    private static abstract class Seq<E> implements Iterable<E> {
+        @Override
+        public Iterator<E> iterator() {
+            return new Iterator<E>() {
+                private int p = 0;
+
+                @Override
+                public boolean hasNext() {
+                    return p < size();
+                }
+
+                @Override
+                public E next() {
+                    return get(p++);
+                }
+
+                @Override
+                public void remove() {
+                }
+            };
+        }
+
+        public abstract E get(int i);
+
+        public abstract int size();
+    }
+
+    private static class CollectionsUtils {
+
+        public static <K, V> Map<K, V> newHashMap() {
+            return new HashMap<K, V>();
+        }
+
+        public static <E> List<E> newArrayList() {
+            return new ArrayList<E>();
+        }
+
+        public static <E> List<E> newArrayList(Collection<E> collection) {
+            return new ArrayList<E>(collection);
+        }
+
+        public static <E> List<E> asList(E e) {
+            List<E> result = newArrayList();
+            result.add(e);
+            return result;
+        }
+
+        public static <E> List<E> append(List<E> init, E last) {
+            List<E> result = newArrayList(init);
+            result.add(last);
+            return result;
+        }
+    }
+
+    private static class Matrix {
+
+        public final int dim;
+        private int[] coeffs;
+
+        private Matrix(int dim) {
+            this.dim = dim;
+            this.coeffs = new int[dim * dim];
+        }
+
+        public void set(int i, int j, int value) {
+            coeffs[i * dim + j] = value;
+        }
+
+        public void add(int i, int j, int value) {
+            coeffs[i * dim + j] += value;
+        }
+
+        public int get(int i, int j) {
+            return coeffs[i * dim + j];
+        }
+
+        public Seq<Integer> row(final int i) {
+            return new Seq<Integer>() {
+                @Override
+                public Integer get(int j) {
+                    return Matrix.this.get(i, j);
+                }
+
+                @Override
+                public int size() {
+                    return Matrix.this.dim;
+                }
+            };
+        }
+
+        public Seq<Integer> column(final int j) {
+            return new Seq<Integer>() {
+                @Override
+                public Integer get(int i) {
+                    return Matrix.this.get(i, j);
+                }
+
+                @Override
+                public int size() {
+                    return Matrix.this.dim;
+                }
+            };
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < dim; i++) {
+                for (int j = 0; j < dim; j++) {
+                    builder.append((j == 0) ? "" : "\t\t");
+                    builder.append(get(i, j));
+                }
+                builder.append("\n");
+            }
+            return builder.toString();
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof Matrix)) {
+                return false;
+            }
+
+            Matrix b = (Matrix) other;
+            if (b.dim != this.dim) {
+                return false;
+            }
+            for (int i = 0; i < dim; i++) {
+                for (int j = 0; j < dim; j++) {
+                    if (this.get(i, j) != b.get(i, j)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        private static Random random = new Random();
+
+        public static Matrix randomMatrix(int dim) {
+            Matrix result = new Matrix(dim);
+            for (int i = 0; i < dim; i++) {
+                for (int j = 0; j < dim; j++) {
+                    result.set(i, j, random.nextInt(50));
+                }
+            }
+            return result;
+        }
+
+        public static Matrix zeroMatrix(int dim) {
+            Matrix result = new Matrix(dim);
+            for (int i = 0; i < dim; i++) {
+                for (int j = 0; j < dim; j++) {
+                    result.set(i, j, 0);
+                }
+            }
+            return result;
+        }
+    }
+
+    /**
+     * All instances of this class will be used in thread local context
+     */
+    private static class ThreadLocals {
+        private static final int HASH_BOUND = 424242;
+
+        private ThreadLocals parent;
+        private int hash = 42;
+        public final String name;
+
+        public ThreadLocals(ThreadLocals parent, String name) {
+            this.parent = parent;
+            this.name = name;
+        }
+
+        public int min(int a, int b) {
+            updateHash(a + b + 1);
+            return Math.min(a, b);
+        }
+
+        public int mult(int a, int b) {
+            updateHash(a + b + 2);
+            return a * b;
+        }
+
+        public int sum(int a, int b) {
+            updateHash(a + b + 3);
+            return a + b;
+        }
+
+
+        public int updateHash() {
+            return updateHash(42);
+        }
+
+        public int updateHash(int data) {
+            hash = (hash + data) % HASH_BOUND;
+            if (parent != null) {
+                hash = parent.updateHash(hash) % HASH_BOUND;
+            }
+            return hash;
+        }
+
+        public int getHash() {
+            return hash;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java b/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java
new file mode 100644
index 00000000000..710ef51dd4e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java
@@ -0,0 +1,79 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/exception.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.exception.exception
+ * @run driver ExecDriver --java jit.exception.exception
+ */
+
+package jit.exception;
+
+/*
+   This JIT buster test checks to see if a JIT doing register allocation
+   on a machine with a callees saves ABI for non-volatile registers can
+   get the exception handling correct. Intel and PowerPC are both such
+   machines. The problem is restoring the correct values of i and j in
+   the catch block. If i and j are never put into registers, then the
+   JIT won't have a problem with correctness because the catch block
+   will load the correct values from memory. If the JIT puts i and j
+   into registers, then restoring their correct values at the catch
+   block gets a little bit tougher.
+*/
+
+import nsk.share.TestFailure;
+
+class exception {
+    public static void main(String[] args) {
+        int i, j;
+
+        for (i=0,j=0; i<1000000; i++) {
+           j=j+1;
+           j=j+1;
+        }
+        try {
+           int k;
+           k = div(0);
+        } catch (Exception e) {
+           if ((i != 1000000) || (j != 2000000)) {
+              System.out.println("i=" + i + "(expected 1000000), j = " + j + "(expected 2000000)");
+              throw new TestFailure("Test FAILS");
+           } else {
+              System.out.println("Test PASSES");
+           }
+        }
+    }
+
+    static int div(int n) {
+        int m=15;
+        m = m/n;
+        return m;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/CGT.java b/test/hotspot/jtreg/vmTestbase/jit/graph/CGT.java
new file mode 100644
index 00000000000..52145717464
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/CGT.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 1998, 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 jit.graph;
+import java.util.*;
+import nsk.share.TestFailure;
+import nsk.share.test.StressOptions;
+
+class CGT extends Thread
+{
+  private static StressOptions stressOptions = new StressOptions();
+  private final static String           version = "1.0";
+  private       static String       ClistPath = "";
+
+  private static long finishTime;
+
+  public CGT( String[] args )
+  {
+    parse (args);
+    Globals.initialize(ClistPath);
+    outputStats (args);
+  }
+
+
+  public static void main( String[] args )
+  {
+    stressOptions.parseCommandLine(args);
+    CGT jnimt = new CGT(args);
+    jnimt.start();
+  }
+
+  public void outputStats( String[] args )
+  {
+    System.out.println("CGT command line options:");
+    for (int i=0; i < args.length; ++i )
+            System.out.println("# " + args[i] );
+
+    System.out.println();
+
+    System.out.println("CGT parameters");
+    System.out.println("Seed: " +Globals.RANDOM_SEED);
+    System.out.println("Number of Threads: " +Globals.NUM_THREADS);
+    System.out.println("Number of Random Loop iterations: " + Globals.RANDOM_LOOP);
+    System.out.println("Number of Static Loop iterations: " + Globals.STATIC_LOOP);
+    System.out.println("Max number of Methods in the Graph: " +  Globals.NUM_TEST_CLASSES);
+    System.out.println("Verbose function calls: " + Globals.VERBOSE);
+
+    System.out.println();
+  }
+
+  public void run()
+  {
+    finishTime = System.currentTimeMillis() + stressOptions.getTime() * 1000;
+
+    for (int i = 0; i< Globals.NUM_THREADS; i++)
+      new CGTThread("CGT Thread " + i).start();
+  }
+
+  public static boolean shouldFinish()
+  {
+     return System.currentTimeMillis() >= finishTime;
+  }
+
+  public void parse (String args[])
+  {
+    for (int i = 0; i<args.length; i++)
+      {
+        if ((args[i].equalsIgnoreCase("-help")) || (args[i].equalsIgnoreCase("-h")) || (args[i].equalsIgnoreCase("-?")))
+          {
+            usage ();
+          }
+        else if (args[i].equalsIgnoreCase("-version"))
+          {
+            version();
+          }
+        else if (args[i].equalsIgnoreCase("-seed"))
+          {
+            int argIndex = i+1;
+            if (argIndex < args.length)
+              {
+                try
+                  {
+                    Globals.RANDOM_SEED = Math.abs(Long.parseLong(args[argIndex]));
+                  }
+                catch (NumberFormatException e)
+                  {
+                    System.out.println("Improper Argument: " + args[i] + " " + args[argIndex]);
+                    usage ();
+                  }
+                i++;
+              }
+            else
+              {
+                System.out.println("Improper Argument: " + args[i]);
+                usage ();
+              }
+
+          }
+        else if ((args[i].equalsIgnoreCase("-thread")) || (args[i].equalsIgnoreCase("-threads")))
+          {
+            int argIndex = i+1;
+            if (argIndex < args.length)
+              {
+                try
+                  {
+                    Globals.NUM_THREADS = Math.abs(Integer.parseInt(args[argIndex])) * stressOptions.getThreadsFactor();
+                  }
+                catch (NumberFormatException e)
+                  {
+                    System.out.println("Improper Argument: " + args[i] + " " + args[argIndex]);
+                    usage ();
+                  }
+                if(Globals.NUM_THREADS == 0)
+                  Globals.NUM_THREADS = 1;
+                i++;
+              }
+            else
+              {
+                System.out.println("Improper Argument: " + args[i]);
+                usage ();
+              }
+
+          }
+        else if (args[i].equalsIgnoreCase("-staticLoop"))
+          {
+            int argIndex = i+1;
+            if (argIndex < args.length)
+              {
+                try
+                  {
+                    Globals.STATIC_LOOP = Math.abs(Integer.parseInt(args[argIndex])) * stressOptions.getIterationsFactor();
+                  }
+                catch (NumberFormatException e)
+                  {
+                    System.out.println("Improper Argument: " + args[i] + " " + args[argIndex]);
+                    usage ();
+                  }
+                i++;
+              }
+            else
+              {
+                System.out.println("Improper Argument: " + args[i]);
+                usage ();
+              }
+
+          }
+        else if (args[i].equalsIgnoreCase("-randomLoop"))
+          {
+            int argIndex = i+1;
+            if (argIndex < args.length)
+              {
+                try
+                  {
+                    Globals.RANDOM_LOOP = Math.abs(Long.parseLong(args[argIndex])) * stressOptions.getIterationsFactor();
+                  }
+                catch (NumberFormatException e)
+                  {
+                    System.out.println("Improper Argument: " + args[i] + " " + args[argIndex]);
+                    usage ();
+                  }
+                i++;
+              }
+            else
+              {
+                System.out.println("Improper Argument: " + args[i]);
+                usage ();
+              }
+
+          }
+        else if (args[i].equalsIgnoreCase("-numTestClass"))
+          {
+            int argIndex = i+1;
+            if (argIndex < args.length)
+              {
+                try
+                  {
+                    Globals.NUM_TEST_CLASSES = Math.abs(Integer.parseInt(args[argIndex]));
+                  }
+                catch (NumberFormatException e)
+                  {
+                    System.out.println("Improper Argument: " + args[i] + " " + args[argIndex]);
+                    usage ();
+                  }
+                i++;
+              }
+            else
+              {
+                System.out.println("Improper Argument: " + args[i]);
+                usage ();
+              }
+
+          }
+        else if (args[i].equalsIgnoreCase("-v") || args[i].equalsIgnoreCase("-verbose"))
+          {
+            Globals.VERBOSE = true;
+          }
+        else if (args[i].equalsIgnoreCase("-path"))
+          {
+            int argIndex = i+1;
+            if (argIndex < args.length)
+              {
+                ClistPath = args[argIndex];
+                i++;
+              }
+            else
+              {
+                System.out.println("Improper Argument: " + args[i]);
+                usage ();
+              }
+          }
+        else if (args[i].startsWith("-stress"))
+          {
+              break;
+          }
+        else
+          {
+            System.out.println("Invalid Argument: " + args[i]);
+            usage ();
+          }
+        }
+        if (ClistPath.equals(""))
+        {
+                System.out.println("class list path not defined");
+                usage();
+        }
+  }
+
+  public void usage ()
+  {
+    System.out.println("usage: java CGT [options]");
+    System.out.println("  -help                               prints out this message");
+    System.out.println("  -numTestClass #                     limits the number of \"Test Methods\" to #");
+    System.out.println("  -randomcLoop #                      # of random function calls");
+    System.out.println("  -seed #                             uses the specified seed rather than the System Time");
+    System.out.println("  -staticLoop #                       # of non-random static function calls");
+    System.out.println("  -threads #                          # number of test threads, NOTE: no maximum value");
+    System.out.println("  -version                            print out the tool version");
+    System.out.println("  -v -verbose                         turn on verbose mode");
+    throw new TestFailure("  -path <path to classlist>           required, argument so program can find classes");
+  }
+
+  public void version ()
+  {
+    throw new TestFailure("CGT version = " + version);
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/CGTThread.java b/test/hotspot/jtreg/vmTestbase/jit/graph/CGTThread.java
new file mode 100644
index 00000000000..0845feb603c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/CGTThread.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 1998, 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 jit.graph;
+import java.util.*;
+import java.lang.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+class CGTThread extends Thread
+{
+    private String ThreadName = null;
+    private Vector Sumation = new Vector(100000);
+    private Vector IDlist = new Vector(100000);
+
+
+    CGTThread( String name )
+    {
+                ThreadName = name;
+                setName(name);
+    }
+
+
+    public void run()
+    {
+                if (Globals.VERBOSE)
+                    System.out.println("\t\t" + Thread.currentThread().getName() + " started");
+                Long numFcalls = new Long(Globals.RANDOM_LOOP - 1);
+                Integer staticFcalls = new Integer(Globals.STATIC_LOOP);
+                MethodData methodCallStr = Globals.nextRandomMethod();
+                Globals.addFunctionIDToVector(methodCallStr.id, IDlist);
+                Throwable invocationExcept = null;
+
+                boolean skipVerify = false;
+
+                try
+                {
+                        methodCallStr.nextMethod.invoke(methodCallStr.instance, new Object []{Sumation, IDlist, numFcalls, staticFcalls});
+                }
+                catch (IllegalAccessException iax)
+                {
+                        throw new TestFailure("Illegal Access Exception");
+                }
+                catch (InvocationTargetException itx)
+                {
+                        System.out.println("Invocation Target Exception");
+                        invocationExcept = itx.getTargetException();
+                        System.out.println(invocationExcept);
+                        if (invocationExcept.getClass() == itx.getClass())
+                        {
+                                System.out.println("Processing Exception Invocation Target Exception");
+                                while (invocationExcept.getClass() == itx.getClass())
+                                        invocationExcept = ((InvocationTargetException)invocationExcept).getTargetException();
+                                System.out.println(invocationExcept);
+                        }
+                        if (invocationExcept instanceof StackOverflowError)
+                        //StackOverFlow is not a failure
+                        {
+                                System.out.println("Warning: stack overflow: skipping verification...");
+                                skipVerify = true;
+                        }
+                        else if (invocationExcept instanceof OutOfMemoryError)
+                        //OutOfMemoryError is not a failure
+                        {
+                                System.out.println("Warning: test devoured heap ;), skipping verification...");
+                                skipVerify = true;
+                        }
+                        else
+                        {
+                                invocationExcept.printStackTrace();
+                                System.exit(1);
+                        }
+                }
+
+            if( !skipVerify )
+                verify(Sumation, IDlist);
+    }
+
+    void verify(Vector Sum, Vector ID)
+    {
+                long oldsum = 0;
+                long newsum;
+                System.out.println(ThreadName + " has begun call stack validation");
+                if (Sum.size() != ID.size())
+                    {
+                                System.out.println("Vector Length's Do Not Match, VERIFY ERROR");
+                                System.out.println("Thread Name: " + ThreadName);
+                                throw new TestFailure("Sumation Element Count = " + Sum.size() + " ID Element Count = " +ID.size());
+                    }
+                long vectorSize = Sum.size();
+                while (!Sum.isEmpty())
+                    {
+                                if (CGT.shouldFinish())
+                                {
+                                   System.out.println(Thread.currentThread().getName() + ": skipping verification due to timeout");
+                                   return;
+                                }
+
+                                newsum = ((Long)Sum.firstElement()).longValue();
+                                Sum.removeElementAt(0);
+
+                                int functionID = ((Integer)ID.firstElement()).intValue();
+                                ID.removeElementAt(0);
+
+                                if ((newsum - oldsum) != (functionID))
+                                    {
+                                                System.out.println("Function Call structure invalid, VERIFY ERROR");
+                                                System.out.println("Thread Name: " + ThreadName);
+                                                System.out.println("Expected = " +(newsum - oldsum) + " Actual = " +functionID);
+                                                throw new TestFailure("Test failed.");
+//                                                System.exit(1);
+                                    }
+                                oldsum = newsum;
+                    }
+                Globals.decNumThreads();
+                System.out.println(ThreadName + "'s function call structure validated succesfully ("+vectorSize+" calls validated)");
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/Globals.java b/test/hotspot/jtreg/vmTestbase/jit/graph/Globals.java
new file mode 100644
index 00000000000..3d0b5126ab8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/Globals.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 1998, 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 jit.graph;
+import java.io.*;
+import java.util.*;
+import java.lang.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+
+public final class Globals
+{
+    // Minimum and Maximum number of threads
+    public static int     NUM_THREADS      = 1;
+    public static long    RANDOM_SEED      = System.currentTimeMillis();
+    public static int     STATIC_LOOP      = 0;
+    public static int     NUM_TEST_CLASSES = 7;
+    public static long    RANDOM_LOOP      = 100;
+    public static boolean VERBOSE          = false;
+    private static Random indexGenerator   = null;
+
+  //private static TestLoader CGTTestLoader = null;
+    private static String [] ClassArray = null;
+    private static Class [] ClassInstanceArray = null;
+    private static int       maxClassIndex    = 0;
+
+    private static String [] MethodName_Array = null;
+    private static Method [] MethodInstance_Array = null;
+
+    //Should be prime, so that odds of an incorrect verification reduced
+    public static  int    [] MethodID_Array   = null;
+
+
+    //Number of threads will be reduced as threads finish
+    public static synchronized void decNumThreads(){NUM_THREADS--;};
+
+    public static synchronized void initialize(String testListPath)
+    {
+
+        File td = new File (testListPath);
+        if (!td.exists())
+            {
+                System.err.println("File " + testListPath + " Not found");
+                System.exit(1);
+            }
+        if (!td.isFile())
+            {
+                System.err.println(testListPath + " Must be a File");
+                System.exit(1);
+            }
+
+        BufferedReader classList = null;
+
+        try
+          {
+            classList = new BufferedReader(new FileReader(td));
+          }
+        catch (FileNotFoundException  fnfx)
+          {
+            System.err.println("Error finding Classlist");
+            System.exit(1);
+          }
+
+        String line = null;
+        try
+            {
+                line = classList.readLine();
+            }
+        catch (IOException iox)
+            {
+                System.err.println("Error reading Classlist");
+                System.exit(1);
+            }
+
+        try
+            {
+                maxClassIndex = Math.abs(Integer.parseInt(line));//ClassArray.length;
+            }
+        catch (NumberFormatException nfx)
+            {
+                System.err.println("Error reading Classlist - first number must be number of methods defined");
+                System.exit(1);
+            }
+
+        ClassArray = new String [maxClassIndex];
+ClassInstanceArray = new Class [maxClassIndex];
+        MethodName_Array = new String [maxClassIndex];
+        MethodInstance_Array = new Method [maxClassIndex];
+        MethodID_Array = new int [maxClassIndex];
+
+        int i;
+        for (i = 0; (i<maxClassIndex) && (line != null); i++)
+            {
+                try
+                    {
+                        line = classList.readLine();
+                    }
+                catch (IOException iox)
+                    {
+                        System.err.println("Error reading ClasslistFile: testListPath");
+                        System.exit(1);
+                    }
+                StringTokenizer lineTokens = new StringTokenizer(line, "\t ");
+                if (lineTokens.countTokens() <3)
+                  {
+                    System.out.println("Error reading ClasslistFile: Errored line");
+                    i--;
+                  }
+                else
+                  {
+                    ClassArray[i] = lineTokens.nextToken();
+                    MethodName_Array[i] =lineTokens.nextToken();
+                    MethodID_Array[i] = Integer.parseInt(lineTokens.nextToken());
+                  }
+            }
+        maxClassIndex = i;
+
+        indexGenerator = new Random(RANDOM_SEED);
+        if ((NUM_TEST_CLASSES < ClassArray.length) && (NUM_TEST_CLASSES > 0))
+          maxClassIndex = NUM_TEST_CLASSES;
+        else
+          NUM_TEST_CLASSES = maxClassIndex;
+    }
+
+    //does a binary serach to find the index for the ID of a method
+    private static int ID_BinSearch(int begin, int end, int ID)
+    {
+        if (end < begin)
+            return(-1);
+
+        int mid = (begin + end)/2;
+        int midvalue = MethodID_Array[mid];
+
+        if (ID == midvalue)
+            return (mid);
+        else if (ID < midvalue)
+            return(ID_BinSearch(begin, mid-1, ID));
+        else
+            return(ID_BinSearch(mid+1, end, ID));
+    }
+
+
+    //based off a static index, this function selects the method to be called
+    public static MethodData returnNextStaticMethod(int Method_ID)
+    {
+      //int i = ID_BinSearch(0, MethodID_Array.length - 1, Method_ID);
+      int i = ID_BinSearch(0, maxClassIndex - 1, Method_ID);
+
+      return(nextStaticMethod((i==-1)?0:i));
+    }
+
+    //this function randomly selects the next method to be called by the test class
+    public static MethodData nextRandomMethod()
+    {
+
+        int i = indexGenerator.nextInt(maxClassIndex);
+        return(nextStaticMethod(i));
+    }
+
+    private static MethodData nextStaticMethod(int i)
+    {
+        Class methodsClass = null;
+        Method nextMethod = null;
+
+        try
+            {
+              //methodsClass = CGTTestLoader.findClass(ClassArray[i]);
+              methodsClass = ClassInstanceArray[i];
+              if (methodsClass == null)
+              {
+                  methodsClass = Class.forName(ClassArray[i]);
+                  ClassInstanceArray[i] = methodsClass;
+              }
+              nextMethod = MethodInstance_Array[i];
+              if (nextMethod == null )
+              {
+              nextMethod =
+                methodsClass.getMethod(MethodName_Array[i],
+                                       new Class[]{java.util.Vector.class, java.util.Vector.class,
+                                                     java.lang.Long.class, java.lang.Integer.class});
+              //sum vector, ID vector, function depth, static function call depth
+              MethodInstance_Array[i] = nextMethod;
+              }
+            }
+        catch (ClassNotFoundException cnfx)
+            {
+                System.out.println("Class: " +ClassArray[i]+ " Not Found");
+                System.exit(-1);
+            }
+        catch (NoSuchMethodException nsmx)
+            {
+                System.out.println("Class: " +ClassArray[i]);
+                System.out.println("Method: " +MethodName_Array[i]+" Not Found");
+                System.exit(-1);
+            }
+        catch (SecurityException sx)
+            {
+                System.out.println("Class: " +ClassArray[i]);
+                System.out.println("Method: " +MethodName_Array[i]);
+                System.out.println("Security Exception Generated, by above method call");
+                System.exit(-1);
+            }
+        return(new MethodData(ClassArray[i], MethodName_Array[i], methodsClass, nextMethod, MethodID_Array[i]));
+    }
+
+
+    /*These two functions are used to verify that all function were called in the proper order*/
+
+    //called by "parent" function to add childs ID to vector
+    public static void addFunctionIDToVector(int FunctionIndex, Vector IDVector)
+    {
+        IDVector.addElement(new Integer(FunctionIndex));
+    }
+
+    //called by "child" to add Function Index to Vector
+    public static void appendSumToSumationVector(int FunctionIndex, Vector SummationVector)
+    {
+        if (SummationVector.isEmpty())
+            SummationVector.addElement(new Long(FunctionIndex));
+        else
+            SummationVector.addElement(new Long(((Long)SummationVector.lastElement()).longValue() + FunctionIndex));
+    }
+
+    //This function calls a method based off of MethodData
+    public static void callMethod(MethodData methodCallStr,
+                                  Vector summation, Vector ID,
+                                  Long numFcalls, Integer staticFcalls)
+                                  throws InvocationTargetException
+
+    {
+                if(NUM_THREADS >1)
+                    {
+                        if ((staticFcalls.intValue() + numFcalls.longValue()) %23 == 0)
+                            {
+                                try
+                                    {
+                                        Thread.sleep(225);
+                                    }
+                                catch (InterruptedException ie)
+                                    {}
+                                if (VERBOSE)
+                                    System.out.println("\t\tCurrentThread:" + Thread.currentThread().getName());
+                            }
+                    }
+
+                try
+            {
+                        methodCallStr.nextMethod.invoke(methodCallStr.instance,
+                                new Object []{summation, ID, numFcalls, staticFcalls});
+            }
+                catch (IllegalAccessException iax)  //should never happen with a valid testfile
+            {
+                        throw new TestFailure("Illegal Access Exception");
+            }
+                    /*
+                catch (InvocationTargetException itx)
+                    {
+                        itx.printStackTrace();
+                        System.out.println("Invocation Target Exception");
+                        System.exit(1);
+                    }*/
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/MethodData.java b/test/hotspot/jtreg/vmTestbase/jit/graph/MethodData.java
new file mode 100644
index 00000000000..a773e5ffc91
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/MethodData.java
@@ -0,0 +1,56 @@
+/*
+ * 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
+ * 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 jit.graph;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+public final class MethodData
+{
+  public String ClassName;
+  public String MethodName;
+  public Class  ClassObject;
+  public Method nextMethod;
+  public int id;
+  public Object instance = null;
+
+  MethodData(String ClassName, String MethodName, Class ClassObject,Method nextMethod, int id)
+  {
+    this.ClassName = ClassName;
+    this.MethodName = MethodName;
+    this.nextMethod = nextMethod;
+    this.id = id;
+    this.ClassObject = ClassObject;
+    try
+      {
+        this.instance = ClassObject.newInstance();
+      }
+    catch (InstantiationException ix)
+      {
+        throw new TestFailure("Class: " +ClassName+ " Instantiation Exception");
+      }
+    catch (IllegalAccessException iax)
+      {
+        throw new TestFailure("Class: " +ClassName+ " Illegal Access Exception");
+      }
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/Node.java b/test/hotspot/jtreg/vmTestbase/jit/graph/Node.java
new file mode 100644
index 00000000000..1c1fdb6b15a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/Node.java
@@ -0,0 +1,133 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import nsk.share.TestFailure;
+// This class define the tree node.
+
+public class Node
+{
+   public final static int Black = 0;    // constants used to define the
+   public final static int Red = 1;      // node color
+   public final static int Left_son = 2; // constants used to identify
+   public final static int Right_son = 3;// the node parent and sons.
+   public final static int Parent = 4;
+
+
+   private int  color;
+   private int  key;
+   private Node L,R,P;      // L-left son,R-right son,P-parent
+
+   // constructor create a new node the default color is red
+   // the default appearance (bold) is regular.
+   // initialize the key field.
+
+   public Node(int k)
+   {
+      color = Red;
+      key = k;
+      L = null;
+      R = null;
+      P = null;
+   }
+
+   // constructor for constructing a tree null object, is color
+   // is black.
+
+   public Node()
+   {
+      color = Black;
+      key = -1;
+      L = null;
+      R = null;
+      P = null;
+   }
+
+   // This method set the node key.
+
+   public void setKey(int k)
+   {
+      key = k;
+   }
+
+   // This method return the node key.
+
+   public int getKey()
+   {
+      return (key);
+   }
+
+   // This method set the node color.
+
+   public void setColor(int c)
+   {
+      if (c == Black)
+         color = Black;
+      else
+         if (c == Red)
+            color = Red;
+   }
+
+   // This method return the node color.
+
+   public int getColor()
+   {
+      return (color);
+   }
+
+   // This method set the node parent or childs acording to the who
+   // parameter.
+
+   public void setNode(int who,Node n)
+   {
+      switch (who)
+      {
+          case Left_son:
+               L = n;
+               break;
+          case Right_son:
+               R = n;
+               break;
+          case Parent:
+               P = n;
+               break;
+      }
+   }
+
+   // This method return the node parent or childs acording to the who
+   // parameter.
+
+   public Node getNode(int who)
+   {
+      switch (who)
+      {
+          case Left_son:
+               return (L);
+          case Right_son:
+               return (R);
+          case Parent:
+               return (P);
+      }
+      return (null);
+   }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/RBTree.java b/test/hotspot/jtreg/vmTestbase/jit/graph/RBTree.java
new file mode 100644
index 00000000000..b67a881d43d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/RBTree.java
@@ -0,0 +1,727 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import nsk.share.TestFailure;
+
+//import Node;
+
+// This class defines the tree object.
+
+public class RBTree
+{
+   public final static int  maxNodes = 70;        // maximum nodes allowed.
+   public final static int  INSERT   = 0;         // constants indicating
+   public final static int  DELETE   = 1;         // the current operation
+   public final static int  NOP      = 2;
+   public final static Node treeNull = new Node(); // the tree NULL node.
+
+   private Node    root;
+   private int     num_of_nodes;
+   private int     height;           // The tree heigth ,it is updated
+                                     // in each operation.
+
+   // since the algorithem is executed in stages I have to remember data
+   // on the state.
+   private Node    node;  // The current operation is being done on it.
+   private int     action;// The operation being performed (insert / delete)
+   private int     stage; // The current stage of execution
+
+   // the constructor initialize the object fields.
+
+   public RBTree()
+   {
+      root         = treeNull;
+      node         = treeNull;
+      num_of_nodes = 0;
+      height       = 0;
+      action       = NOP;
+      stage        = 0;
+   }
+
+   // This method return the root of the tree.
+
+   public Node getRoot()
+   {
+      return root;
+   }
+
+   // This method return the number of nodes in the tree.
+
+   public int getNodes()
+   {
+      return num_of_nodes;
+   }
+
+   // This method return the heigth of the tree.
+
+   public int getHeight()
+   {
+      return height;
+   }
+
+
+
+   // This method inserts k into the Red Black Tree
+
+   public boolean RBInsert(int k)
+   {
+
+      Thread Pause = new Thread();   // this thread is used for delay
+                                     // between the stages.
+      if (action != NOP)  // checking similar to the RB_Insert method
+      {
+         System.out.println
+         ("Only one operation can be done at a time.");
+         return false;
+      }
+      if (num_of_nodes == maxNodes)
+      {
+         System.out.println
+         ("The maximum nodes allowed is already reached.");
+         return false;
+      }
+      if (Search(k) == treeNull) // Check if there is already node with key k.
+      {
+         action = INSERT;
+         node = new Node(k);
+         node.setNode(Node.Left_son,treeNull);
+         node.setNode(Node.Right_son,treeNull);
+         node.setNode(Node.Parent,treeNull);
+         stage = 1;
+         while (stage != 0)     // This is the loop that perform all the
+         {                      // operation steps.
+            InsertStep();       // perform one step
+            updateHeight();     // update the tree height
+         }
+         action = NOP;           // set the action to NoOPretion.
+         return true;
+      }
+      else
+        System.out.println
+        ("Insertion failed. This key already exist.");
+      return false;
+   }
+
+
+   // This method deletes the element k from the Red Black tree
+
+   public boolean RBDelete(int k)
+   {
+      Thread Pause = new Thread();   // this thread is used for delay
+                                     // between the stages.
+      if (action != NOP)
+      {                              // checking like in RB_Delete method
+         System.out.println
+         ("Only one operation can be done at a time.");
+         return false;
+      }
+      node = Search(k);
+      if (node != treeNull)       // Check if there is a node with key k.
+      {
+         action = DELETE;
+         stage = 1;
+         while (stage != 0)    // this loop perform all the operation
+         {                     // steps.
+            DeleteStep();               // perform one step
+            updateHeight();             // update the tree height
+
+         }
+         action = NOP;
+         return true;
+      }
+      else
+         System.out.println
+         ("Deletion failed. This key doesn't exist.");
+      return false;
+   }
+
+   // This method perform one step in the insertion operation.
+   // If perform a step acording to the stage variable.
+   // I will not explain exactly what each stage do, just that they
+   // divided to 4 categories:
+   // 1. inserting a node to the tree.
+   // 2. marking nodes that will be recolored.
+   // 3. recoloring nodes.
+   // 4. rotating right or left.
+
+   private void InsertStep()
+   {
+      Node Pr,GrPr,Un; // Pr is parent, GrPr is grandparent
+                       // and Un is uncle.
+      switch (stage)
+      {
+           case 1: // Inserting a node to the tree
+               /*
+                  System.out.println  // send a message to the screen
+                  (new String("Inserting ")
+                  .concat(Integer.toString(node.getKey())));
+               */
+                  Tree_Insert();        // inserting an element to the tree
+                  break;
+           case 2:       // mid stage that move to algorithem to the
+                         // proper next stage, and send proper message
+                         // to the screen
+                  Pr = node.getNode(Node.Parent);
+                  GrPr = Pr.getNode(Node.Parent);
+                  if (Pr == GrPr.getNode(Node.Left_son))
+                  {
+                     Un = GrPr.getNode(Node.Right_son);
+                     if (Un.getColor() == Node.Red)
+                     {
+                        stage = 3;
+                     }
+                     else
+                        if (node == Pr.getNode(Node.Right_son))
+                        {
+                           node = Pr;
+                           stage = 5;
+                        }
+                        else
+                        {
+                           stage = 6;
+                        }
+                  }
+                  else
+                  {
+                     Un = GrPr.getNode(Node.Left_son);
+                     if (Un.getColor() == Node.Red)
+                     {
+                        stage = 3;
+                     }
+                     else
+                        if (node == Pr.getNode(Node.Left_son))
+                        {
+                           node = Pr;
+                           stage = 5;
+                        }
+                        else
+                        {
+                           stage = 6;
+                        }
+                  }
+                  break;
+           case 3:       // This stage marks node that will be recolored
+                  Pr = node.getNode(Node.Parent);
+                  GrPr = Pr.getNode(Node.Parent);
+                  if (Pr == GrPr.getNode(Node.Left_son))
+                     Un = GrPr.getNode(Node.Right_son);
+                  else
+                      Un = GrPr.getNode(Node.Left_son);
+
+                  node = GrPr;
+                  stage = 4;
+                  break;
+           case 4:          // this stage recolor marked nodes.
+                  node.setColor(Node.Red);
+                  (node.getNode(Node.Left_son)).setColor(Node.Black);
+                  (node.getNode(Node.Right_son)).setColor(Node.Black);
+
+                  if ((node == root) ||
+                     ((node.getNode(Node.Parent)).getColor() == Node.Black))
+                     if (root.getColor() == Node.Red)
+                     {
+                        stage = 9;
+                     }
+                     else
+                        stage = 0;
+                  else
+                  {
+                     stage = 2;
+                     InsertStep();
+                  }
+                  break;
+           case 5:        // This stage perform rotation operation
+                  Pr = node.getNode(Node.Parent);
+                  if (node == Pr.getNode(Node.Left_son))
+                     Left_Rotate(node);
+                  else
+                     Right_Rotate(node);
+
+                  stage = 6;
+                  break;
+           case 6:        // This stage marks nodes that will be recolor.
+                  Pr = node.getNode(Node.Parent);
+                  GrPr = Pr.getNode(Node.Parent);
+
+                  stage = 7;
+                  break;
+           case 7:        // This stage recolor marked nodes.
+                  Pr = node.getNode(Node.Parent);
+                  Pr.setColor(Node.Black);
+                  GrPr = Pr.getNode(Node.Parent);
+                  GrPr.setColor(Node.Red);
+
+                  stage = 8;
+                  break;
+           case 8:        // This stage perform rotation operation
+                  Pr = node.getNode(Node.Parent);
+                  GrPr = Pr.getNode(Node.Parent);
+                  if (Pr == GrPr.getNode(Node.Left_son))
+                     Right_Rotate(GrPr);
+                  else
+                     Left_Rotate(GrPr);
+                  if (root.getColor() == Node.Red)
+                  {
+                     stage = 9;
+                  }
+                  else
+                     stage = 0;
+                  break;
+           case 9:        // this stage mark the root.
+                   stage = 10;
+                  break;
+           case 10:       // This stage recolor the root.
+                  root.setColor(Node.Black);
+                  stage = 0;
+                  break;
+      }
+   }
+
+   // This method perform one step in the deletion operation.
+   // If perform a step acording to the stage variable.
+   // I will explain exactly what each stage do, just that they
+   // divided to 4 categories:
+   // 1. deleting a node from the tree.
+   // 2. marking nodes that will be recolored.
+   // 3. recoloring nodes.
+   // 4. rotating right or left.
+
+   public void DeleteStep()
+   {
+       Node Pr,Br;     // Pr is Parent ,Br is Brother
+       switch (stage)
+       {
+             case 1:   // This stage delete a node from the tree.
+                 /*
+                    System.out.println
+                    (new String("Deleting ")
+                    .concat(Integer.toString(node.getKey())));
+                 */
+                    Tree_Delete();
+                    break;
+             case 2:   // This stage marks a nodes that will be recolored
+                       // or perform other stage.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                       Br = Pr.getNode(Node.Right_son);
+                    else
+                       Br = Pr.getNode(Node.Left_son);
+                    if (Br.getColor() == Node.Red)
+                    {
+                        stage = 3;
+                    }
+                    else
+                       if (((Br.getNode(Node.Right_son)).getColor() == Node.Black)
+                          && ((Br.getNode(Node.Left_son)).getColor() == Node.Black))
+                       {
+                          stage = 5;
+                          DeleteStep();
+                       }
+                       else
+                       {
+                          stage = 7;
+                          DeleteStep();
+                       }
+                    break;
+             case 3:    // this stage recolor marked nodes.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Br = Pr.getNode(Node.Right_son);
+
+                    }
+                    else
+                    {
+                       Br = Pr.getNode(Node.Left_son);
+                    }
+                    Br.setColor(Node.Black);
+                    Pr.setColor(Node.Red);
+
+                    stage = 4;
+                    break;
+             case 4:     // this stage perform rotation operation
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Left_Rotate(Pr);
+                       Br = Pr.getNode(Node.Right_son);
+                    }
+                    else
+                    {
+                       Right_Rotate(Pr);
+                       Br = Pr.getNode(Node.Left_son);
+                    }
+                    if (((Br.getNode(Node.Right_son)).getColor() == Node.Black)
+                       && ((Br.getNode(Node.Left_son)).getColor() == Node.Black))
+                       stage = 5;
+                    else
+                       stage = 7;
+
+                    break;
+             case 5:     // this stage marks nodes that will be recolor.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                       Br = Pr.getNode(Node.Right_son);
+                    else
+                       Br = Pr.getNode(Node.Left_son);
+
+                    stage = 6;
+                    break;
+             case 6:     // This stage recolor marked nodes.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                       Br = Pr.getNode(Node.Right_son);
+                    else
+                       Br = Pr.getNode(Node.Left_son);
+                    Br.setColor(Node.Red);
+                    node = Pr;
+
+                    if ((node != root) && (node.getColor() == Node.Black))
+                       stage = 2;
+                    else
+                       if (node.getColor() == Node.Red)
+                       {
+                          stage = 13;
+                       }
+                       else
+                          stage = 0;
+                    break;
+             case 7:     // this stage marks nodes that will be recolor
+                         // or perform other stage.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Br = Pr.getNode(Node.Right_son);
+                       if ((Br.getNode(Node.Right_son)).getColor() == Node.Black)
+                       {
+                          stage = 8;
+                       }
+                       else
+                       {
+                          stage = 10;
+                          DeleteStep();
+                       }
+                    }
+                    else
+                    {
+                       Br = Pr.getNode(Node.Left_son);
+                       if ((Br.getNode(Node.Left_son)).getColor() == Node.Black)
+                       {
+                          stage = 8;
+                       }
+                       else
+                       {
+                          stage = 10;
+                          DeleteStep();
+                       }
+                    }
+                    break;
+             case 8:     // this stage recolor marked nodes.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Br = Pr.getNode(Node.Right_son);
+                       (Br.getNode(Node.Left_son)).setColor(Node.Black);
+
+                    }
+                    else
+                    {
+                       Br = Pr.getNode(Node.Left_son);
+                       (Br.getNode(Node.Right_son)).setColor(Node.Black);
+
+                    }
+                    Br.setColor(Node.Red);
+                    stage = 9;
+                    break;
+             case 9:    // this stage perform rotation operation
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Br = Pr.getNode(Node.Right_son);
+                       Right_Rotate(Br);
+                    }
+                    else
+                    {
+                       Br = Pr.getNode(Node.Left_son);
+                       Left_Rotate(Br);
+                    }
+
+                    stage = 10;
+                    break;
+             case 10:   // This stage marks node that will be recolor.
+
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Br = Pr.getNode(Node.Right_son);
+                    }
+                    else
+                    {
+                       Br = Pr.getNode(Node.Left_son);
+                    }
+
+                    stage = 11;
+                    break;
+             case 11:    // this stage recolor marked nodes.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                    {
+                       Br = Pr.getNode(Node.Right_son);
+                       (Br.getNode(Node.Right_son)).setColor(Node.Black);
+                    }
+                    else
+                    {
+                       Br = Pr.getNode(Node.Left_son);
+                       (Br.getNode(Node.Left_son)).setColor(Node.Black);
+
+                    }
+                    if (Br.getColor() != Pr.getColor())
+                       Br.setColor(Pr.getColor());
+                    if (Pr.getColor() != Node.Black)
+                       Pr.setColor(Node.Black);
+
+                    stage = 12;
+                    break;
+             case 12:    // this stage perform rotation operation.
+                    Pr = node.getNode(Node.Parent);
+                    if (node == Pr.getNode(Node.Left_son))
+                       Left_Rotate(Pr);
+                    else
+                       Right_Rotate(Pr);
+                    node = root;
+                    if (node.getColor() == Node.Red)
+                    {
+                       stage = 13;
+                    }
+                    else
+                       stage = 0;
+                    break;
+             case 13:    // this stage marks a node that will be recolor
+                    stage = 14;
+                    break;
+             case 14:    // this stage recolor marked node.
+                    node.setColor(Node.Black);
+                    stage = 0;
+                    break;
+       }
+   }
+
+   // This method insert the node 'node' to the tree.
+   // it called from the first stage in the InsertStep method.
+   // we 'dive' from the root to a leaf acording to the node key
+   // and insert the node in the proper place.
+
+   private void Tree_Insert()
+   {
+       Node n1,n2;
+       n1 = root;
+       n2 = treeNull;
+       while (n1 != treeNull)
+       {
+          n2 = n1;
+          if (node.getKey() < n1.getKey())
+             n1 = n1.getNode(Node.Left_son);
+          else
+             n1 = n1.getNode(Node.Right_son);
+       }
+       node.setNode(Node.Parent,n2);
+       if (n2 == treeNull)
+          root = node;
+       else
+       {
+          if (node.getKey() < n2.getKey())
+             n2.setNode(Node.Left_son,node);
+          else
+             n2.setNode(Node.Right_son,node);
+       }
+       //Parent.display.drawTree();
+       // updating the insertion stage.
+       if ((node == root) ||
+          ((node.getNode(Node.Parent)).getColor() == Node.Black))
+          if (root.getColor() == Node.Red)
+          {
+             stage = 9;
+          }
+          else
+             stage = 0;
+       else
+       {
+          stage = 2;
+          InsertStep();
+       }
+       num_of_nodes++;   // increasing the number of nodes
+   }
+
+   // This method delete the node 'node' from the tree.
+   // it called from the first stage in the DeleteStep method.
+   // if node has at most one son we just remove it and connect
+   // his son and parent. If it has 2 sons we delete his successor
+   // that has at most one son and replace him with the successor.
+
+   private void Tree_Delete()
+   {
+      Node n1,n2,n3;
+      if ((node.getNode(Node.Left_son) == treeNull) ||
+          (node.getNode(Node.Right_son) == treeNull))
+         n1 = node;
+      else
+         n1 = Tree_Successor(node);
+      if (n1.getNode(node.Left_son) != treeNull)
+         n2 = n1.getNode(Node.Left_son);
+      else
+         n2 = n1.getNode(Node.Right_son);
+
+      n3 = n1.getNode(Node.Parent);
+      n2.setNode(Node.Parent,n3);
+      if (n3 == treeNull)
+         root = n2;
+      else
+         if (n1 == n3.getNode(Node.Left_son))
+            n3.setNode(Node.Left_son,n2);
+         else
+            n3.setNode(Node.Right_son,n2);
+
+      if (n1 != node)
+      {
+         node.setKey(n1.getKey());
+      }
+
+
+      node = n2;
+      if (n1.getColor() == Node.Black)
+         if ((node != root) && (node.getColor() == Node.Black))
+            stage = 2;
+         else
+            if (node.getColor() == Node.Red)
+               stage = 13;
+            else
+               stage = 0;
+      else
+         stage = 0;
+      num_of_nodes--;      // decrease the number of nodes.
+   }
+
+   // This method return the successor of the node n in the tree.
+
+   private Node Tree_Successor(Node n)
+   {
+      Node n1;
+      if (n.getNode(Node.Right_son) != treeNull)
+      {
+         n = n.getNode(Node.Right_son);
+         while (n.getNode(Node.Left_son) != treeNull)
+             n = n.getNode(Node.Left_son);
+         return n;
+      }
+      n1 = n.getNode(Node.Parent);
+      while ((n1 != treeNull) && (n == n1.getNode(Node.Right_son)))
+      {
+         n = n1;
+         n1 = n1.getNode(Node.Parent);
+      }
+      return n1;
+   }
+
+   // This method perform Left Rotation with n1.
+
+   private void Left_Rotate(Node n1)
+   {
+      Node n2;
+
+      n2 = n1.getNode(Node.Right_son);
+      n1.setNode(Node.Right_son,n2.getNode(Node.Left_son));
+      if (n2.getNode(Node.Left_son) != treeNull)
+         (n2.getNode(Node.Left_son)).setNode(Node.Parent,n1);
+      n2.setNode(Node.Parent,n1.getNode(Node.Parent));
+      if (n1.getNode(Node.Parent) == treeNull)
+         root = n2;
+      else
+         if (n1 == (n1.getNode(Node.Parent)).getNode(Node.Left_son))
+            (n1.getNode(Node.Parent)).setNode(Node.Left_son,n2);
+         else
+            (n1.getNode(Node.Parent)).setNode(Node.Right_son,n2);
+      n2.setNode(Node.Left_son,n1);
+      n1.setNode(Node.Parent,n2);
+   }
+
+   // This method perform Right Rotation with n1.
+
+   private void Right_Rotate(Node n1)
+   {
+      Node n2;
+
+      n2 = n1.getNode(Node.Left_son);
+      n1.setNode(Node.Left_son,n2.getNode(Node.Right_son));
+      if (n2.getNode(Node.Right_son) != treeNull)
+         (n2.getNode(Node.Right_son)).setNode(Node.Parent,n1);
+      n2.setNode(Node.Parent,n1.getNode(Node.Parent));
+      if (n1.getNode(Node.Parent) == treeNull)
+         root = n2;
+      else
+         if (n1 == (n1.getNode(Node.Parent)).getNode(Node.Left_son))
+            (n1.getNode(Node.Parent)).setNode(Node.Left_son,n2);
+         else
+            (n1.getNode(Node.Parent)).setNode(Node.Right_son,n2);
+      n2.setNode(Node.Right_son,n1);
+      n1.setNode(Node.Parent,n2);
+   }
+
+   // This method search the tree for a node with key 'key', and
+   // return the node on success otherwise treeNull.
+
+   public Node Search(int key)
+   {
+      Node node;
+      node = root;
+      while ((node != treeNull) && (key != node.getKey()))
+         if (key < node.getKey())
+            node = node.getNode(Node.Left_son);
+         else
+            node = node.getNode(Node.Right_son);
+      return node;
+   }
+
+   // This method update the tree height it uses a recursive method
+   // findheight.
+
+   private void updateHeight()
+   {
+      height = 0;
+      if (root != treeNull)
+         findHeight(root,1);
+   }
+
+   // This is a recursive method that find a node height.
+
+   private void findHeight(Node n,int curr)
+   {
+      if (height < curr)
+         height = curr;
+      if (n.getNode(Node.Left_son) != treeNull)
+         findHeight(n.getNode(Node.Left_son),curr+1);
+      if (n.getNode(Node.Right_son) != treeNull)
+         findHeight(n.getNode(Node.Right_son),curr+1);
+   }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt0/cgt0.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt0/cgt0.java
new file mode 100644
index 00000000000..f1ca8a98ca3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt0/cgt0.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt0.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 1
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt1/cgt1.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt1/cgt1.java
new file mode 100644
index 00000000000..2f407b456c8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt1/cgt1.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt1.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 2
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt10/cgt10.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt10/cgt10.java
new file mode 100644
index 00000000000..f0cd7789876
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt10/cgt10.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt10.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 11
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt11/cgt11.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt11/cgt11.java
new file mode 100644
index 00000000000..5022b45c053
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt11/cgt11.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt11.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 12
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt2/cgt2.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt2/cgt2.java
new file mode 100644
index 00000000000..e5cd0f368a1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt2/cgt2.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt2.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 3
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt3/cgt3.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt3/cgt3.java
new file mode 100644
index 00000000000..17f219865d9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt3/cgt3.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt3.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 4
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt4/cgt4.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt4/cgt4.java
new file mode 100644
index 00000000000..2d1a2dff1ae
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt4/cgt4.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt4.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 5
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt5/cgt5.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt5/cgt5.java
new file mode 100644
index 00000000000..4d49567b78e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt5/cgt5.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt5.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 6
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt6/cgt6.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt6/cgt6.java
new file mode 100644
index 00000000000..ad0631fa8c9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt6/cgt6.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt6.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 7
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt7/cgt7.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt7/cgt7.java
new file mode 100644
index 00000000000..d9c9345dd4e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt7/cgt7.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt7.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 8
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt8/cgt8.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt8/cgt8.java
new file mode 100644
index 00000000000..0de17c9e9d2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt8/cgt8.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt8.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 9
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/cgt9/cgt9.java b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt9/cgt9.java
new file mode 100644
index 00000000000..7846f53c3fd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/cgt9/cgt9.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/graph/cgt9.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run driver jdk.test.lib.FileInstaller ../data/main.data main.data
+ * @build jit.graph.*
+ * @run driver ExecDriver --java
+ *      jit.graph.CGT
+ *      -path main.data
+ *      -numTestClass 10
+ *      -thread 1
+ *      -randomLoop 40
+ *      -staticLoop 40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/data/main.data b/test/hotspot/jtreg/vmTestbase/jit/graph/data/main.data
new file mode 100644
index 00000000000..5867243ba21
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/data/main.data
@@ -0,0 +1,13 @@
+12
+jit.graph.test1	callMe		1
+jit.graph.test2	callMe		2
+jit.graph.test2	CallCallMe	3
+jit.graph.test3	callMe		5
+jit.graph.test3	selfRecursion	7
+jit.graph.test4	CallCallMe	11
+jit.graph.test4	callMe		13
+jit.graph.test5	factTest	17
+jit.graph.test5	fiboTest	19
+jit.graph.test5	combTest	23
+jit.graph.test5	pascalTest	29
+jit.graph.test6	rbTest		31
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/test1.java b/test/hotspot/jtreg/vmTestbase/jit/graph/test1.java
new file mode 100644
index 00000000000..fbf51694445
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/test1.java
@@ -0,0 +1,78 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+
+
+import java.util.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+class test1
+{
+    private final int classID = Globals.MethodID_Array[0];
+
+    public void callMe(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(classID, summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test1.callMe");
+
+        if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+        {
+            return;
+        }
+
+        MethodData methodCallStr;
+        Long numFcalls;
+        Integer staticFcalls;
+
+        if (staticFunctionDepth.intValue() > 0)
+        {
+            numFcalls = functionDepth;
+            staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+            //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(classID));
+            methodCallStr = Globals.returnNextStaticMethod(classID);
+        }
+        else
+        {
+            numFcalls = new Long(functionDepth.longValue() -1);
+            staticFcalls = staticFunctionDepth;
+            methodCallStr = Globals.nextRandomMethod();
+        }
+
+        Globals.addFunctionIDToVector(methodCallStr.id, ID);
+
+        try {
+                                methodCallStr.nextMethod.invoke(methodCallStr.instance,
+                                        new Object []{summation, ID, numFcalls, staticFcalls});
+        } catch (IllegalAccessException iax) {
+                                throw new TestFailure("Illegal Access Exception");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/test2.java b/test/hotspot/jtreg/vmTestbase/jit/graph/test2.java
new file mode 100644
index 00000000000..2c1e7a7ff39
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/test2.java
@@ -0,0 +1,145 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import java.util.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+class test2
+{
+    private final int[] MethodID = {Globals.MethodID_Array[1],Globals.MethodID_Array[2]};
+
+    public void CallCallMe(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+
+    {
+        Globals.appendSumToSumationVector(MethodID[1], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test2.CallCallMe");
+
+                if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+                    {
+                        return;
+                    }
+
+                MethodData methodCallStr;
+                Long numFcalls;
+                Integer staticFcalls;
+                if (staticFunctionDepth.intValue() > 0)
+                    {
+                        numFcalls = functionDepth;
+                        staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                        //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[1]));
+                        methodCallStr = Globals.returnNextStaticMethod(MethodID[1]);
+
+                        Globals.addFunctionIDToVector(methodCallStr.id, ID);
+                    }
+                else
+                    {
+                        numFcalls = new Long(functionDepth.longValue()-1);
+                        staticFcalls = staticFunctionDepth;
+                        Globals.addFunctionIDToVector(MethodID[0], ID);
+                        callMe(summation, ID, numFcalls, staticFcalls);
+                        return;
+                    }
+
+
+                try
+                    {
+                        methodCallStr.nextMethod.invoke(methodCallStr.instance,
+                                                        new Object []{summation, ID, numFcalls, staticFcalls});
+                    }
+                catch (IllegalAccessException iax)
+                    {
+                        throw new TestFailure("Illegal Access Exception");
+                    }
+                /*
+                catch (InvocationTargetException itx)
+                    {
+                                throw itx;
+                    }
+                */
+    }
+
+    public void callMe(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(MethodID[0], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test2.callMe");
+
+                if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+                    {
+                        return;
+                    }
+
+                MethodData methodCallStr;
+                Long numFcalls;
+                Integer staticFcalls;
+                if (staticFunctionDepth.intValue() > 0)
+            {
+                        numFcalls = functionDepth;
+                        staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                        //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[0]));
+                        methodCallStr = Globals.returnNextStaticMethod(MethodID[0]);
+
+            }
+                else
+            {
+                        numFcalls = new Long(functionDepth.longValue() -1);
+                        staticFcalls = staticFunctionDepth;
+                        methodCallStr = Globals.nextRandomMethod();
+            }
+
+                Globals.addFunctionIDToVector(methodCallStr.id, ID);
+
+
+                try
+            {
+                        methodCallStr.nextMethod.invoke(methodCallStr.instance,
+                                new Object []{summation, ID, numFcalls, staticFcalls});
+            }
+                catch (IllegalAccessException iax)
+            {
+                        throw new TestFailure("Illegal Access Exception");
+            }
+/*
+                catch (InvocationTargetException itx)
+                    {
+                                System.out.println("itx test 2");
+
+                                throw itx;
+                    }
+                    */
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/test3.java b/test/hotspot/jtreg/vmTestbase/jit/graph/test3.java
new file mode 100644
index 00000000000..740a55b9408
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/test3.java
@@ -0,0 +1,121 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import java.util.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+
+class test3 extends test1
+{
+
+    private final int[] MethodID = {Globals.MethodID_Array[3],Globals.MethodID_Array[4]};
+    private static Random loopNumGen = new Random(Globals.RANDOM_SEED);
+
+    private final int maxLoops = 10;
+    private int localNumLoops = loopNumGen.nextInt(maxLoops);
+
+    public void selfRecursion(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+                throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(MethodID[1], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test3.selfRecursion");
+        if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+            {
+                return;
+            }
+
+        MethodData methodCallStr;
+        Long numFcalls;
+        Integer staticFcalls;
+        if (staticFunctionDepth.intValue() > 0) //make a static call
+            {
+                numFcalls = functionDepth;
+                staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[1]));
+                methodCallStr = Globals.returnNextStaticMethod(MethodID[1]);
+            }
+        else if (localNumLoops > 0)  //make a recursive call
+            {
+                numFcalls = new Long(functionDepth.longValue()-1);
+                staticFcalls = staticFunctionDepth;
+                Globals.addFunctionIDToVector(MethodID[1], ID);
+                localNumLoops--;
+                selfRecursion(summation, ID, numFcalls, staticFcalls);
+                return;
+            }
+        else //make a random call
+            {
+                numFcalls = new Long(functionDepth.longValue() -1);
+                staticFcalls = staticFunctionDepth;
+                methodCallStr = Globals.nextRandomMethod();
+
+                localNumLoops = loopNumGen.nextInt(maxLoops);   //get ready for the next call to this method
+            }
+        Globals.addFunctionIDToVector(methodCallStr.id, ID);
+        Globals.callMethod(methodCallStr, summation, ID, numFcalls, staticFcalls);
+
+    }
+
+    public void callMe(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+                throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(MethodID[0], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test3.callMe");
+
+        if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+            {
+                return;
+            }
+        MethodData methodCallStr;
+        Long numFcalls;
+        Integer staticFcalls;
+        if (staticFunctionDepth.intValue() > 0)
+            {
+                numFcalls = functionDepth;
+                staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[0]));
+                methodCallStr = Globals.returnNextStaticMethod(MethodID[0]);
+            }
+        else
+            {
+                numFcalls = new Long(functionDepth.longValue() -1);
+                staticFcalls = staticFunctionDepth;
+                methodCallStr = Globals.nextRandomMethod();
+            }
+        Globals.addFunctionIDToVector(methodCallStr.id, ID);
+        Globals.callMethod(methodCallStr, summation, ID, numFcalls, staticFcalls);
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/test4.java b/test/hotspot/jtreg/vmTestbase/jit/graph/test4.java
new file mode 100644
index 00000000000..7cccf608ad6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/test4.java
@@ -0,0 +1,135 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import java.util.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+
+class test4 extends test2
+{
+    private final int[] MethodID = {Globals.MethodID_Array[1],Globals.MethodID_Array[5], Globals.MethodID_Array[6]};
+
+    //this method verifies that a child can make a call to its parent
+    public void CallCallMe(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(MethodID[1], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test4.CallCallMe");
+
+        if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+            {
+                return;
+            }
+
+        MethodData methodCallStr;
+        Long numFcalls;
+        Integer staticFcalls;
+        if (staticFunctionDepth.intValue() > 0)
+            {
+                numFcalls = functionDepth;
+                staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[1]));
+                methodCallStr = Globals.returnNextStaticMethod(MethodID[1]);
+
+                Globals.addFunctionIDToVector(methodCallStr.id, ID);
+            }
+        else
+            {
+                numFcalls = new Long(functionDepth.longValue()-1);
+                staticFcalls = staticFunctionDepth;
+                Globals.addFunctionIDToVector(MethodID[0], ID);
+                super.callMe(summation, ID, numFcalls, staticFcalls);
+                return;
+            }
+
+
+        Globals.callMethod(methodCallStr, summation, ID, numFcalls, staticFcalls);
+    }
+
+    //this method makes a Y fork in the method call structure
+    public void callMe(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+                throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(MethodID[2], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test4.callMe");
+
+        if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+            {
+                return;
+            }
+
+        MethodData methodCallStr;
+        Long numFcalls;
+        Integer staticFcalls;
+        if (staticFunctionDepth.intValue() > 0)
+            {
+                numFcalls = functionDepth;
+                staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[2]));
+                methodCallStr = Globals.returnNextStaticMethod(MethodID[2]);
+
+            }
+        else
+            {
+                long temp = functionDepth.longValue()-2;
+                numFcalls = new Long(temp/2);
+                staticFcalls = staticFunctionDepth;
+
+                if (Globals.VERBOSE)
+                    System.out.println(" test4.callMe - Starting Branch 1");
+                methodCallStr = Globals.nextRandomMethod();
+                Globals.addFunctionIDToVector(methodCallStr.id, ID);
+                Globals.callMethod(methodCallStr, summation, ID, numFcalls, staticFcalls);
+
+                if (CGT.shouldFinish())
+                    return;
+
+                temp -= temp/2;
+                if (temp <0)
+                  {
+                    if (Globals.VERBOSE)
+                      System.out.println(" test4.callMe - Skipping Branch 2");
+                    return;
+                  }
+                if (Globals.VERBOSE)
+                    System.out.println(" test4.callMe - Starting Branch 2");
+                numFcalls = new Long(temp);
+                methodCallStr = Globals.nextRandomMethod();
+            }
+        Globals.addFunctionIDToVector(methodCallStr.id, ID);
+        Globals.callMethod(methodCallStr, summation, ID, numFcalls, staticFcalls);
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/test5.java b/test/hotspot/jtreg/vmTestbase/jit/graph/test5.java
new file mode 100644
index 00000000000..b4c19e65adb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/test5.java
@@ -0,0 +1,339 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import java.util.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+class test5
+{
+  private final int[] MethodID = {Globals.MethodID_Array[7],
+                                  Globals.MethodID_Array[8],
+                                  Globals.MethodID_Array[9],
+                                  Globals.MethodID_Array[10]};
+  private static Random loopNumGen = new Random(Globals.RANDOM_SEED);
+
+  private final int maxLoops = 12;
+
+  private long factorial(int n)
+  {
+    if(n>1)
+      return(n*factorial(n-1));
+    else
+      return (1);
+  }
+
+  private long fibonacci(long num1, long num2, int n)
+  {
+    if (n <= 0)
+      return(num2);
+    else
+      return (fibonacci(num2, num1+num2, n-1));
+  }
+
+  private long combination(int n, int r)
+  {
+    if ((r==0) || (n==r))
+      return 1;
+    else
+      return(combination(n-1, r) +combination(n - 1, r - 1));
+  }
+
+  private int[] pascalsTriangle(int[] source, int n)
+  {
+    if (n>0)
+      {
+        int sourceLength = source.length;
+        int [] temp = new int[sourceLength +1];
+        temp[0] = 1;
+        temp[sourceLength] = 1;
+
+        int j=1;
+        for(int i = 0; i<(sourceLength - 1); i++)
+          temp[j++] = source[i] + source[i+1];
+
+        return(pascalsTriangle(temp, n-1));
+      }
+    else
+      return source;
+  }
+
+  private boolean verifyArray(int[] ArrayToBeVerified, int[] MasterArray)
+  {
+    if (ArrayToBeVerified.length != MasterArray.length)
+      return false;
+
+    for (int i =0; i<MasterArray.length; i++)
+      if (MasterArray[i] != ArrayToBeVerified[i])
+        return false;
+    return true;
+  }
+
+  private int[] verifyPascal(int n)
+  {
+    int []   pascalOut = new int[n+1];
+    int [][] dataArray = new int[n+1][n+1];
+
+    for (int i = 0; i<=n; i++)
+      {
+        for (int j = 0; j<=n; j++)
+          {
+            if (j==0)
+              dataArray[i][0] = 1;
+            else if (j==i)
+              dataArray[i][i] = 1;
+            else if (j<i)
+              dataArray[i][j] =  dataArray[i-1][j-1] + dataArray[i-1][j];
+          }
+      }
+
+    int j = n;                            //could be a little more efficient
+    for (int i = 0; i<=n; i++)            //but not that important
+      pascalOut[i] = dataArray[j][i];
+    return pascalOut;
+  }
+
+  private long verifyFact(int n)
+  {
+    long answer = 1;
+    for (int i=2; i<=n; i++)
+        answer*=i;
+    return answer;
+  }
+
+  private long verifyFibo(int n)
+  {
+    long num1=1;
+    long num2=1;
+
+    for (int i = 0; i< n; i++)
+      {
+        long temp = num1+num2;
+        num1 = num2;
+        num2 = temp;
+      }
+
+    return num2;
+  }
+
+  private long verifyComb(int n, int r)
+  {
+    return(verifyFact(n)/(verifyFact(n-r)*verifyFact(r)));
+  }
+
+  public void factTest(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+  {
+    Globals.appendSumToSumationVector(MethodID[0], summation);
+
+    if (CGT.shouldFinish())
+      return;
+
+    if (Globals.VERBOSE)
+      System.out.println("test5.factTest");
+
+    if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+      {
+        return;
+      }
+    MethodData methodCallStr;
+    Long numFcalls;
+    Integer staticFcalls;
+
+    if (staticFunctionDepth.intValue() > 0)
+      {
+        numFcalls = functionDepth;
+        staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+        methodCallStr = Globals.returnNextStaticMethod(MethodID[0]);
+        //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[0]));
+      }
+    else
+      {
+        numFcalls = new Long(functionDepth.longValue() -1);
+        staticFcalls = staticFunctionDepth;
+        methodCallStr = Globals.nextRandomMethod();
+      }
+
+    int localNumLoops    = loopNumGen.nextInt(maxLoops);
+    long facFunctionValue = factorial(localNumLoops);
+    long facVerValue      = verifyFact(localNumLoops);
+    if (facFunctionValue != facVerValue)
+      {
+        System.out.println("Factorial Computed Incorrectly");
+        System.out.println("Specific Factorial Requested "+localNumLoops +"!");
+        throw new TestFailure("Expected: " + facVerValue + " Actual "+ facFunctionValue);
+      }
+
+    Globals.addFunctionIDToVector(methodCallStr.id, ID);
+    Globals.callMethod(methodCallStr,summation, ID, numFcalls, staticFcalls);
+  }
+
+  public void fiboTest(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+  {
+    Globals.appendSumToSumationVector(MethodID[1], summation);
+
+    if (CGT.shouldFinish())
+        return;
+
+    if (Globals.VERBOSE)
+      System.out.println("test5.fiboTest");
+
+    if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+      {
+        return;
+      }
+    MethodData methodCallStr;
+    Long numFcalls;
+    Integer staticFcalls;
+    if (staticFunctionDepth.intValue() > 0)
+      {
+        numFcalls = functionDepth;
+        staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+        methodCallStr = Globals.returnNextStaticMethod(MethodID[1]);
+      }
+    else
+      {
+        numFcalls = new Long(functionDepth.longValue() -1);
+        staticFcalls = staticFunctionDepth;
+        methodCallStr = Globals.nextRandomMethod();
+      }
+    int localNumLoops      = loopNumGen.nextInt(maxLoops*3);
+    long fiboFunctionValue = fibonacci(1,1,localNumLoops);
+    long fiboVerValue      = verifyFibo(localNumLoops);
+    if (fiboFunctionValue != fiboVerValue)
+      {
+        System.out.println("Fibonacci Series Computed Incorrectly");
+        System.out.println("Specific Digit Requested "+localNumLoops);
+        throw new TestFailure("Expected: " + fiboVerValue + " Actual "+ fiboFunctionValue);
+      }
+
+    Globals.addFunctionIDToVector(methodCallStr.id, ID);
+    Globals.callMethod(methodCallStr,summation, ID, numFcalls, staticFcalls);
+  }
+
+
+  public void combTest(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+  {
+    Globals.appendSumToSumationVector(MethodID[2], summation);
+
+    if (CGT.shouldFinish())
+        return;
+
+    if (Globals.VERBOSE)
+      System.out.println("test5.combTest");
+
+    if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+      {
+        return;
+      }
+    MethodData methodCallStr;
+    Long numFcalls;
+    Integer staticFcalls;
+    if (staticFunctionDepth.intValue() > 0)
+      {
+        numFcalls = functionDepth;
+        staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+
+        methodCallStr = Globals.returnNextStaticMethod(MethodID[2]);
+        //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[2]));
+      }
+    else
+      {
+        numFcalls = new Long(functionDepth.longValue() -1);
+        staticFcalls = staticFunctionDepth;
+        methodCallStr = Globals.nextRandomMethod();
+      }
+    int n = loopNumGen.nextInt(maxLoops);
+    int k = (n>0)?loopNumGen.nextInt(n):0;
+    long combFunctionValue = combination(n, k);
+    long combVerValue      = verifyComb(n, k);
+    if (combFunctionValue != combVerValue)
+      {
+        System.out.println("Combination Computed Incorrectly");
+        System.out.println("N = " + n +"K = " + k);
+        throw new TestFailure("Expected: " + combVerValue + " Actual "+ combFunctionValue);
+      }
+
+    Globals.addFunctionIDToVector(methodCallStr.id, ID);
+    Globals.callMethod(methodCallStr,summation, ID, numFcalls, staticFcalls);
+  }
+
+
+  public void pascalTest(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+        throws InvocationTargetException
+  {
+    Globals.appendSumToSumationVector(MethodID[3], summation);
+
+    if (CGT.shouldFinish())
+        return;
+
+int [] x = new int[1 << 30];
+x[1 << 24] = 1;
+
+    if (Globals.VERBOSE)
+      System.out.println("test5.pascalTest");
+
+    if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+      {
+        return;
+      }
+    MethodData methodCallStr;
+    Long numFcalls;
+    Integer staticFcalls;
+    if (staticFunctionDepth.intValue() > 0)
+      {
+        numFcalls = functionDepth;
+        staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+        methodCallStr = Globals.returnNextStaticMethod(MethodID[3]);
+        //methodCallStr = Globals.nextStaticMethod(Globals.getIndexFromID(MethodID[3]));
+      }
+    else
+      {
+        numFcalls = new Long(functionDepth.longValue() -1);
+        staticFcalls = staticFunctionDepth;
+        methodCallStr = Globals.nextRandomMethod();
+      }
+    int num = loopNumGen.nextInt(maxLoops);
+
+    int[] pascalFunctionValue = pascalsTriangle(new int[] {1}, num);
+    int[] pascalVerValue      = verifyPascal(num);
+    if (!verifyArray(pascalFunctionValue, pascalVerValue))
+      {
+        String temp = new String("Expected: ");
+        for (int i=0; i<pascalVerValue.length; i++)
+          temp += pascalVerValue[i] +", ";
+        temp+=  " Actual ";
+        for (int i=0; i<pascalFunctionValue.length; i++)
+          temp += pascalFunctionValue[i] +", ";
+        System.out.println("Pascal Tringle Row Computed Incorrectly");
+        System.out.println("Row Number " + num);
+        throw new TestFailure(temp);
+      }
+
+    Globals.addFunctionIDToVector(methodCallStr.id, ID);
+    Globals.callMethod(methodCallStr,summation, ID, numFcalls, staticFcalls);
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/graph/test6.java b/test/hotspot/jtreg/vmTestbase/jit/graph/test6.java
new file mode 100644
index 00000000000..b2486b1549e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/graph/test6.java
@@ -0,0 +1,162 @@
+/*
+ * 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
+ * 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 jit.graph;
+
+import java.util.*;
+import java.lang.reflect.*;
+import nsk.share.TestFailure;
+
+public class test6
+{
+    private static final int[] MethodID = {Globals.MethodID_Array[11]};
+
+    private static Random localNumGen = new Random(Globals.RANDOM_SEED);
+    private static final int maxEntries = 25;
+
+    //flattens the binary tree into an array
+    private void getSortedArray(Node root, int [] dataArray, int[] index)
+    {
+        if ((root != null) && (root!=RBTree.treeNull))
+            {
+                getSortedArray(root.getNode(Node.Left_son), dataArray, index);
+                dataArray[index[0]++] = root.getKey();
+                getSortedArray(root.getNode(Node.Right_son), dataArray, index);
+            }
+    }
+
+    public synchronized void rbTest(Vector summation, Vector ID, Long functionDepth, Integer staticFunctionDepth)
+                throws InvocationTargetException
+    {
+        Globals.appendSumToSumationVector(MethodID[0], summation);
+
+        if (CGT.shouldFinish())
+            return;
+
+        if (Globals.VERBOSE)
+            System.out.println("test6.rbTest");
+
+        if ((functionDepth.longValue() <= 0) && (staticFunctionDepth.intValue() <=  0))
+            {
+                return;
+            }
+        MethodData methodCallStr;
+        Long numFcalls;
+        Integer staticFcalls;
+
+        if (staticFunctionDepth.intValue() > 0)
+            {
+                numFcalls = functionDepth;
+                staticFcalls = new Integer(staticFunctionDepth.intValue()-1);
+                methodCallStr = Globals.returnNextStaticMethod(MethodID[0]);
+            }
+        else
+            {
+                numFcalls = new Long(functionDepth.longValue() -1);
+                staticFcalls = staticFunctionDepth;
+                methodCallStr = Globals.nextRandomMethod();
+            }
+
+        RBTree myTree = new RBTree();
+        int numElements = 1 + localNumGen.nextInt(maxEntries);
+        int dataArray[] = new int[numElements];
+        boolean insertArray[] = new boolean[numElements];
+
+        Vector temp = new Vector(numElements);
+        for(int i=0; i<numElements; i++)
+            {                                         //code guarantees no duplicates
+                int nextKey = localNumGen.nextInt(16385);
+                while (temp.indexOf(new Integer(nextKey)) != -1)
+                    nextKey = localNumGen.nextInt(16385);
+
+                temp.addElement(new Integer(nextKey));
+                dataArray[i] = nextKey;
+
+                insertArray[i] = false;
+            }
+        temp = null;
+
+        int numLoops = 10 + localNumGen.nextInt(1024);
+        for (int i=0; i<numLoops; i++)
+            {
+                int nextIndex = localNumGen.nextInt(numElements);
+                if (!insertArray[nextIndex])
+                    {
+                        myTree.RBInsert(dataArray[nextIndex]);
+                        insertArray[nextIndex] = true;
+                    }
+                else
+                    {
+                        myTree.RBDelete(dataArray[nextIndex]);
+                        insertArray[nextIndex] = false;
+                    }
+            }
+
+        int numValid = 0;
+        for (int i = 0; i<numElements; i++)
+            {
+                Node searchNode = myTree.Search(dataArray[i]);
+                if (insertArray[i] && (searchNode == RBTree.treeNull))
+                    {
+                        System.out.println("Valid Node Not Found in Binary Tree");
+                        System.out.println("Node " + dataArray[i]);
+                        System.exit(1);
+                    }
+                else if ((!insertArray[i]) && (searchNode != RBTree.treeNull))
+                    {
+                        System.out.println("Deleted Node Found in Binary Tree");
+                        System.out.println("Node " + dataArray[i]);
+                        System.exit(1);
+                    }
+                else if (insertArray[i])
+                    numValid++;
+                insertArray[i] = true;        //so that verification is only done once
+            }
+
+        int [] sortedArray = new int[numValid];
+        getSortedArray(myTree.getRoot(), sortedArray, new int [] {0});
+
+        for (int i=1; i<numValid; i++)
+            if (sortedArray[i] <= sortedArray[i-1])
+                {
+                    String outStr = new String("Actual ");
+                    for (int j=0; j<sortedArray.length; j++)
+                        outStr += sortedArray[j] +", ";
+                    System.out.println("Binary Tree Property Not Held");
+                    System.out.println("Root " + myTree.getRoot().getKey());
+                    System.out.println(outStr);
+                    System.exit(1);
+                }
+
+        //Should make more memory available for future instances
+        myTree = null;
+        sortedArray = null;
+        dataArray = null;
+        insertArray = null;
+//        System.gc();
+
+        Globals.addFunctionIDToVector(methodCallStr.id, ID);
+        Globals.callMethod(methodCallStr,summation, ID, numFcalls, staticFcalls);
+
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/incomplete_tests.txt b/test/hotspot/jtreg/vmTestbase/jit/incomplete_tests.txt
new file mode 100644
index 00000000000..15762acdd56
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/incomplete_tests.txt
@@ -0,0 +1,29 @@
+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
+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.
+
+* common/loops/fuse7
+* common/loops/fuse9
+* common/loops/fuse107
+* common/loops/fuse109
+* common/loops/fuse15
+* common/loops/fuse19
+* common/loops/private2
+* common/loops/private3
diff --git a/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java b/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java
new file mode 100644
index 00000000000..ad3939b5110
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java
@@ -0,0 +1,68 @@
+/*
+ * 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
+ * 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.
+ */
+// testing correct initialization order
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/init/init01.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.init.init01.init01
+ * @run driver ExecDriver --java jit.init.init01.init01
+ */
+
+package jit.init.init01;
+
+import nsk.share.TestFailure;
+
+class InitTest1 {
+  static int ix1 = 0;
+  int i_ix;
+  InitTest1 () {
+    i_ix = ix1;
+  }
+}
+
+class InitTest2 {
+  static int ix2;
+  static InitTest1 oop = new InitTest1();
+}
+
+class init01 {
+
+
+  public static void main (String s[]) {
+        InitTest1.ix1 = 5445;
+        InitTest2.ix2 = 1;
+        if (InitTest2.oop.i_ix == 5445)
+           System.out.println ("Correct order of initialization");
+        else
+           throw new TestFailure("Incorrect order of initialization");
+  }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java b/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java
new file mode 100644
index 00000000000..c27b4674702
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java
@@ -0,0 +1,71 @@
+/*
+ * 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
+ * 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.
+ */
+/*
+   The init02.java test checks if a JIT changes the order in which
+   classes are initialized. Java semantics do not allow a class to be
+   initialized until it is actually used.
+*/
+
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/init/init02.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.init.init02.init02
+ * @run driver ExecDriver --java jit.init.init02.init02
+ */
+
+package jit.init.init02;
+
+import nsk.share.TestFailure;
+
+class init02 {
+    public static boolean failed = false;
+    public static void main(String args[]) {
+        int i, x;
+        for (i = 0; i < 10; i++) {
+            x = i * 10;
+            if (x < 0) {
+                inittest.foo(x);
+            }
+        }
+
+        if (failed)
+            throw new TestFailure("\n\nInitializing inittest, test FAILS\n");
+    }
+}
+
+class inittest {
+    static {
+        init02.failed = true;
+    }
+
+    public static void foo(int x) {
+        System.out.println("foo value = " + x);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.gold b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.gold
new file mode 100644
index 00000000000..dd5dc78d966
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.gold
@@ -0,0 +1,16 @@
+MPAT_Const4_fs00              4      
+MPAT_GetStatic4_fsc1          4      
+MPAT_GetStatic4_fsc2          4      
+MPAT_GetStatic4_fsc3          4      
+MPAT_GetStatic4_fsc4          4      
+MPAT_GetStatic4_fnc1          4      
+MPAT_GetStatic4_fnc2          4      
+MPAT_GetStatic4_fnc3          4      
+MPAT_GetStatic4_fnc4          4      
+MPAT_Const4_fn00              4      
+MPAT_GetField4_fni1           4      
+MPAT_GetField4_fni2           4      
+MPAT_GetField4_fni3           4      
+MPAT_GetField4_fni4           4      
+MPAT_Handle_fi                4      
+PASSED.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java
new file mode 100644
index 00000000000..af69d62d189
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java
@@ -0,0 +1,412 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/inline/inline003.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.inline.inline003.inline003
+ * @run driver ExecDriver --java jit.inline.inline003.inline003
+ */
+
+package jit.inline.inline003;
+
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class inline003_1 {
+        final protected static int[] inlineClassObj1 = { 1, 2 };
+        protected static int[] inlineClassObj2 = { 3, 4};
+        final protected static int[] trash = { 10, 11};
+}
+
+class inline003 extends inline003_1 {
+        public static final GoldChecker goldChecker = new GoldChecker( "inline003" );
+
+        final private static int ITERS=4;
+        private static int pFlag = 0;
+        private static int[] myIters = new int[15];
+
+        final private static int[] inlineClassObj3 = { 4, 5 };
+        private static int[] inlineClassObj4 = { 5, 6 };
+
+        final private static int[] inlineObj5 = { 6, 7 };
+        final private static int[] inlineObj6 = { 7, 8 };
+        final private static int[] inlineObj7 = { 8, 9 };
+        final private static int[] inlineObj8 = { 9, 10 };
+
+        private Object inlineInstanceObj1 = inline003.inlineObj5;
+        private Object inlineInstanceObj2 = inline003.inlineObj6;
+        private Object inlineInstanceObj3 = inline003.inlineObj7;
+        private Object inlineInstanceObj4 = inline003.inlineObj8;
+
+        private final static Object MPAT_Const4_fs00() {
+                return null;
+        }
+        private final static Object MPAT_GetStatic4_fsc1() {
+                return inlineClassObj1;
+        }
+        private final static Object MPAT_GetStatic4_fsc2() {
+                return inlineClassObj2;
+        }
+        private final static Object MPAT_GetStatic4_fsc3() {
+                return inlineClassObj3;
+        }
+        private final static Object MPAT_GetStatic4_fsc4() {
+                return inlineClassObj4;
+        }
+        private final Object MPAT_GetStatic4_fnc1() {
+                return inlineClassObj1;
+        }
+        private final Object MPAT_GetStatic4_fnc2() {
+                return inlineClassObj2;
+        }
+        private final Object MPAT_GetStatic4_fnc3() {
+                return inlineClassObj3;
+        }
+        private final Object MPAT_GetStatic4_fnc4() {
+                return inlineClassObj4;
+        }
+
+        private final Object MPAT_Const4_fn00() {
+                return null;
+        }
+        private final Object MPAT_GetField4_fni1() {
+                return inlineInstanceObj1;
+        }
+        private final Object MPAT_GetField4_fni2() {
+                return inlineInstanceObj2;
+        }
+        private final Object MPAT_GetField4_fni3() {
+                return inlineInstanceObj3;
+        }
+        private final Object MPAT_GetField4_fni4() {
+                return inlineInstanceObj4;
+        }
+        private final Object MPAT_Handle_fi() {
+                return this;
+        }
+
+
+        private void runFinals () {
+                int jcount=0;
+                Object locObj = null;
+                if (pFlag==2) inline003.goldChecker.print("MPAT_Const4_fs00");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_Const4_fs00();
+                                if (locObj != null) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[0] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fsc1");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fsc1();
+                                if (locObj != inlineClassObj1) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[1] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fsc2");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fsc2();
+                                if (locObj != inlineClassObj2) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[2] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fsc3");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fsc3();
+                                if (locObj != inlineClassObj3) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[3] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fsc4");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fsc4();
+                                if (locObj != inlineClassObj4) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[4] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fnc1");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fnc1();
+                                if (locObj != inlineClassObj1) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[5] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fnc2");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fnc2();
+                                if (locObj != inlineClassObj2) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[6] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fnc3");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fnc3();
+                                if (locObj != inlineClassObj3) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[7] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetStatic4_fnc4");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetStatic4_fnc4();
+                                if (locObj != inlineClassObj4) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[8] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_Const4_fn00");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_Const4_fn00();
+                                if (locObj != null) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[9] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetField4_fni1");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetField4_fni1();
+                                if (locObj != inlineInstanceObj1) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[10] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetField4_fni2");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetField4_fni2();
+                                if (locObj != inlineInstanceObj2) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[11] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetField4_fni3");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetField4_fni3();
+                                if (locObj != inlineInstanceObj3) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[12] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_GetField4_fni4");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_GetField4_fni4();
+                                if (locObj != inlineInstanceObj4) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[13] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+                if (pFlag==2) inline003.goldChecker.print("MPAT_Handle_fi");
+                try {
+                        jcount = 0;
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                locObj = trash;
+                                locObj = MPAT_Handle_fi();
+                                if (locObj != this) break;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline003.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[14] = jcount;
+                        if (pFlag==2) inline003.goldChecker.println();
+                }
+        }
+
+
+        public static int result() {
+                String[] label = {
+                        "MPAT_Const4_fs00",
+                        "MPAT_GetStatic4_fsc1",
+                        "MPAT_GetStatic4_fsc2",
+                        "MPAT_GetStatic4_fsc3",
+                        "MPAT_GetStatic4_fsc4",
+                        "MPAT_GetStatic4_fnc1",
+                        "MPAT_GetStatic4_fnc2",
+                        "MPAT_GetStatic4_fnc3",
+                        "MPAT_GetStatic4_fnc4",
+                        "MPAT_Const4_fn00",
+                        "MPAT_GetField4_fni1",
+                        "MPAT_GetField4_fni2",
+                        "MPAT_GetField4_fni3",
+                        "MPAT_GetField4_fni4",
+                        "MPAT_Handle_fi" };
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(80);
+                byte[] ba = new byte[80];
+                String s = null;
+                int ierr = 0;
+                for (int icount=0; icount < 15; icount++) {
+                        if (pFlag >= 1) {
+                                baos.reset();
+                                try {
+                                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                        for (int i=0; i<label[icount].length(); i++)
+                                                ba[i]=(byte)label[icount].charAt(i);
+                                        baos.write(ba,0,27);
+                                }
+                                catch (IndexOutOfBoundsException e) {
+                                }
+                                try {
+                                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                        baos.write(ba,0,3);
+                                        s = Long.toString(myIters[icount]);
+                                        for (int i=0; i<s.length(); i++)
+                                                ba[i]=(byte)s.charAt(i);
+                                        baos.write(ba,0,7);
+                                }
+                                catch (IndexOutOfBoundsException e) {
+                                }
+                                inline003.goldChecker.print(baos.toString());
+                                inline003.goldChecker.println();
+                        }
+                        if (myIters[icount] != ITERS) ierr=1;
+                }
+                return ierr;
+        }
+
+        public static void main( String args[] ) {
+                int ierr=0;
+                inline003 myInline_f = new inline003();
+
+
+                if (args.length > 0 && args[0].equals("-help")) {
+                        inline003.goldChecker.println("usage: java inline003 [-print]");
+                        inline003.goldChecker.check();
+                        return;
+                }
+                pFlag = 1;
+                if (args.length > 0 && args[0].equals("-print"))
+                        pFlag = 2;
+                for (int ii=0; ii<15; ii++) myIters[ii]=ITERS;
+                if (pFlag==2) inline003.goldChecker.println("inline003");
+
+                                /* Give the JIT an initial look at all the methods */
+                myInline_f.runFinals();
+                ierr = inline003.result();
+                if (ierr == 0) {
+                        inline003.goldChecker.println("PASSED.");
+                }
+                else {
+                        inline003.goldChecker.println("FAILED. (ierr = " + ierr + ")");
+                }
+                inline003.goldChecker.check();
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.gold b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.gold
new file mode 100644
index 00000000000..036926a6fb3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.gold
@@ -0,0 +1,17 @@
+Pattern                            Errors   Iterations   State
+=======                            ======   ==========   =====
+Const4 class method (int)          0        5            PASS 
+Const4 class method (ref)          0        5            PASS 
+GetStatic4 class method (int)      0        5            PASS 
+GetStatic4 class method (ref)      0        5            PASS 
+Const4 instance method (int)       0        5            PASS 
+Const4 instance method (ref)       0        5            PASS 
+GetStatic4 instance method (int)   0        5            PASS 
+GetStatic4 instance method (ref)   0        5            PASS 
+GetField4 instance method (int)    0        5            PASS 
+GetField4 instance method (ref)    0        5            PASS 
+PutField4 instance method (int)    0        5            PASS 
+PutField4 instance method (ref)    0        5            PASS 
+PutField4Const4 instance method    0        5            PASS 
+Handle instance method             0        5            PASS 
+PASSED.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java
new file mode 100644
index 00000000000..5f279e7190e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java
@@ -0,0 +1,585 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/inline/inline004.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.inline.inline004.inline004
+ * @run driver ExecDriver --java jit.inline.inline004.inline004
+ */
+
+package jit.inline.inline004;
+
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class inline004_1 {
+        final protected static int[] inlineObj = { 1, 2 };
+        protected static int   inlineInt = 3;           /* Not final */
+        protected final Object MPAT_Super() {
+                return this;
+        }
+}
+
+class inline004 extends inline004_1 {
+        public static final GoldChecker goldChecker = new GoldChecker( "inline004" );
+
+        static int pFlag = 0;
+        final static int ITERS=5;
+        private int i1 = 0;
+        Object obj1 = inline004_1.inlineObj;
+        Object obj2 = inline004_1.inlineObj;
+        Object obj3 = inline004_1.inlineObj;
+        static int[] myIters = new int[14];
+        static int[] errFlag = new int[14];
+        int intTarg1 = 0;
+        int intTarg2 = 0;
+        Object objTarg1 = null;
+        Object objTarg2 = null;
+
+        private final static int MPAT_Const4_fs_0() {
+                return 1;
+        }
+        private final static Object MPAT_Const4_fs_1() {
+                return null;
+        }
+        private final static int MPAT_GetStatic4_fs_0() {
+                return inlineInt;
+        }
+        private final static Object MPAT_GetStatic4_fs_1() {
+                return inlineObj;
+        }
+        private final int MPAT_Const4_fi_0() {
+                return 1;
+        }
+        private final Object MPAT_Const4_fi_1() {
+                return null;
+        }
+        private final int MPAT_GetField4_fi_0() {
+                return i1;
+        }
+        private final Object MPAT_GetField4_fi_1() {
+                return obj1;
+        }
+        private final void MPAT_PutField4_fi_0(int ival) {
+                i1 = ival;
+                return;
+        }
+        private final void MPAT_PutField4_fi_1(Object oval) {
+                obj1 = oval;
+                return;
+        }
+        private final void MPAT_PutField4Const4_fi() {
+                i1 = -1;
+                return;
+        }
+        private final int MPAT_GetStatic4_fi_0() {
+                return inlineInt;
+        }
+        private final Object MPAT_GetStatic4_fi_1() {
+                return inlineObj;
+        }
+        private final Object MPAT_Handle_fi() {
+                return this;
+        }
+
+        private static int MPAT_Const4_ns_0() {
+                return 1;
+        }
+        private static Object MPAT_Const4_ns_1() {
+                return null;
+        }
+        private static int MPAT_GetStatic4_ns_0() {
+                return inlineInt;
+        }
+        private static Object MPAT_GetStatic4_ns_1() {
+                return inlineObj;
+        }
+        private int MPAT_Const4_ni_0() {
+                return 1;
+        }
+        private Object MPAT_Const4_ni_1() {
+                return null;
+        }
+        private int MPAT_GetField4_ni_0() {
+                return i1;
+        }
+        private Object MPAT_GetField4_ni_1() {
+                return obj1;
+        }
+        private void MPAT_PutField4_ni_0(int ival) {
+                i1 = ival;
+                return;
+        }
+        private void MPAT_PutField4_ni_1(Object oval) {
+                obj1 = oval;
+                return;
+        }
+        private void MPAT_PutField4Const4_ni() {
+                i1 = -1;
+                return;
+        }
+        private int MPAT_GetStatic4_ni_0() {
+                return inlineInt;
+        }
+        private Object MPAT_GetStatic4_ni_1() {
+                return inlineObj;
+        }
+        private Object MPAT_Handle_ni() {
+                return this;
+        }
+
+        private void runFinals () {
+                int jcount = 0;
+                int icount = 0;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_Const4_fs_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg1 = MPAT_Const4_fs_0();
+                                intTarg2 = MPAT_Const4_ns_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_Const4_fs_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = MPAT_Const4_fs_1();
+                                objTarg1 = MPAT_Const4_ns_1();
+                                if (objTarg2 != objTarg1) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_GetStatic4_fs_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg2 = MPAT_GetStatic4_fs_0();
+                                intTarg1 = MPAT_GetStatic4_ns_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_GetStatic4_fs_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = MPAT_GetStatic4_fs_1();
+                                objTarg1 = MPAT_GetStatic4_ns_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+
+                /* Check inlining of instance methods */
+                if (pFlag==2) inline004.goldChecker.print("MPAT_Const4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg1 = MPAT_Const4_fi_0();
+                                intTarg2 = MPAT_Const4_ni_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_Const4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg1 = MPAT_Const4_fi_1();
+                                objTarg2 = MPAT_Const4_ni_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_GetStatic4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg2 = MPAT_GetStatic4_fi_0();
+                                intTarg1 = MPAT_GetStatic4_ni_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                if (pFlag==2) inline004.goldChecker.print("MPAT_GetStatic4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = MPAT_GetStatic4_fi_1();
+                                objTarg1 = MPAT_GetStatic4_ni_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_GetField4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg1 = MPAT_GetField4_fi_0();
+                                intTarg2 = MPAT_GetField4_ni_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_GetField4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = MPAT_GetField4_fi_1();
+                                objTarg1 = MPAT_GetField4_ni_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_PutField4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                MPAT_PutField4_fi_0(10);
+                                intTarg1 = MPAT_GetField4_ni_0();
+                                if (intTarg1 != 10) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_PutField4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                MPAT_PutField4_fi_1("String1");
+                                objTarg1 = MPAT_GetField4_fi_1();
+                                if (objTarg1 != "String1") errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_PutField4Const4_fi");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                MPAT_PutField4Const4_fi();
+                                intTarg2 = MPAT_GetField4_ni_0();
+                                if (intTarg2 != -1) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline004.goldChecker.print("MPAT_Handle_fi");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg1 = MPAT_Handle_fi();
+                                objTarg2 = MPAT_Handle_ni();
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline004.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline004.goldChecker.println();
+                }
+                icount++;
+        }
+
+
+        public static int result() {
+                int ierr = 0;
+                String state = null;
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(80);
+                byte[] ba = new byte[80];
+                String s = null;
+
+                String[] label = new String[14];
+                label[0]  = new String("Const4 class method (int)       ");
+                label[1]  = new String("Const4 class method (ref)       ");
+                label[2]  = new String("GetStatic4 class method (int)   ");
+                label[3]  = new String("GetStatic4 class method (ref)   ");
+                label[4]  = new String("Const4 instance method (int)    ");
+                label[5]  = new String("Const4 instance method (ref)    ");
+                label[6]  = new String("GetStatic4 instance method (int)");
+                label[7]  = new String("GetStatic4 instance method (ref)");
+                label[8] = new String("GetField4 instance method (int) ");
+                label[9] = new String("GetField4 instance method (ref) ");
+                label[10] = new String("PutField4 instance method (int) ");
+                label[11] = new String("PutField4 instance method (ref) ");
+                label[12] = new String("PutField4Const4 instance method ");
+                label[13] = new String("Handle instance method          ");
+                                                                // Report headers
+                baos.reset();
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        s = "Pattern";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,32);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Errors";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,6);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Iterations";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,10);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "State";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,5);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                inline004.goldChecker.print(baos.toString());
+                inline004.goldChecker.println();
+
+                                                                // Report header underlining
+                baos.reset();
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        s = "Pattern";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,32);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Errors";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,6);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Iterations";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,10);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "State";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,5);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                inline004.goldChecker.print(baos.toString());
+                inline004.goldChecker.println();
+
+                for (int icount=0; icount<14; icount++) {
+                        if (myIters[icount] == ITERS && errFlag[icount] == 0)
+                                state="PASS";
+                        else {
+                                ierr++;
+                                state="FAIL";
+                        }
+                        baos.reset();
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                for (int i=0; i<label[icount].length(); i++)
+                                        ba[i]=(byte)label[icount].charAt(i);
+                                baos.write(ba,0,32);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline004.goldChecker.println("0: "+e);
+                        }
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                baos.write(ba,0,3);
+                                s = Integer.toString(errFlag[icount]);
+                                for (int i=0; i<s.length(); i++)
+                                        ba[i]=(byte)s.charAt(i);
+                                baos.write(ba,0,6);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline004.goldChecker.println("1: "+e);
+                        }
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                baos.write(ba,0,3);
+                                s = Integer.toString(myIters[icount]);
+                                for (int i=0; i<s.length(); i++)
+                                        ba[i]=(byte)s.charAt(i);
+                                baos.write(ba,0,10);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline004.goldChecker.println("1: "+e);
+                        }
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                baos.write(ba,0,3);
+                                for (int i=0; i<state.length(); i++)
+                                        ba[i]=(byte)state.charAt(i);
+                                baos.write(ba,0,5);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline004.goldChecker.println("3: "+e);
+                        }
+                        inline004.goldChecker.print(baos.toString());
+                        inline004.goldChecker.println();
+                }
+                return ierr;
+        }
+
+        public static void main( String args[] ) {
+                int ierr;
+                inline004 myInline_n = new inline004();
+                inline004 myInline_f = new inline004();
+
+                if (args.length > 0 && args[0].equals("-help")) {
+                        inline004.goldChecker.println("usage: java inline004 [-print | -report]");
+                        inline004.goldChecker.check();
+                        return;
+                }
+                if (args.length > 0 && args[0].equals("-print"))
+                        pFlag = 2;
+                if (args.length > 0 && args[0].equals("-report"))
+                        pFlag = 1;
+                for (int ii=0; ii<14; ii++) myIters[ii]=ITERS;
+                if (pFlag==2) inline004.goldChecker.println("inline004");
+
+                                /* Give the JIT an initial look at all the methods */
+                myInline_f.runFinals();
+                ierr = inline004.result();
+                if (ierr == 0) {
+                        inline004.goldChecker.println("PASSED.");
+                }
+                else {
+                        inline004.goldChecker.println("FAILED. (ierr = " + ierr + ")");
+                }
+                inline004.goldChecker.check();
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline005/inline005.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline005/inline005.java
new file mode 100644
index 00000000000..1c8c043e1c2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline005/inline005.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/inline/inline005.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Bug 4079776.  Make inlining of sqrt and abs work with register allocation.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.inline.inline005.inline005
+ */
+
+package jit.inline.inline005;
+
+import nsk.share.TestFailure;
+
+public class inline005 {
+
+  private static double fun (double x)
+  {
+    double t1 = Math.sqrt(x);
+    return t1*Math.exp(x);
+  }
+
+/***************************************************************/
+
+  private static double fun_correct (double x)
+  {
+    return Math.sqrt(x)*Math.exp(x);
+  }
+
+/***************************************************************/
+
+  public static void main(String[] argv) {
+    double x = 31.5;
+    if (fun(x) != fun_correct(x)) {
+       System.out.println(" Error: result = "+fun(x));
+       System.out.println("       must be = "+fun_correct(x));
+       throw new TestFailure("TEST FAILED");
+    }
+    else {
+       System.out.println("TEST PASSED");
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.gold b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.gold
new file mode 100644
index 00000000000..036926a6fb3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.gold
@@ -0,0 +1,17 @@
+Pattern                            Errors   Iterations   State
+=======                            ======   ==========   =====
+Const4 class method (int)          0        5            PASS 
+Const4 class method (ref)          0        5            PASS 
+GetStatic4 class method (int)      0        5            PASS 
+GetStatic4 class method (ref)      0        5            PASS 
+Const4 instance method (int)       0        5            PASS 
+Const4 instance method (ref)       0        5            PASS 
+GetStatic4 instance method (int)   0        5            PASS 
+GetStatic4 instance method (ref)   0        5            PASS 
+GetField4 instance method (int)    0        5            PASS 
+GetField4 instance method (ref)    0        5            PASS 
+PutField4 instance method (int)    0        5            PASS 
+PutField4 instance method (ref)    0        5            PASS 
+PutField4Const4 instance method    0        5            PASS 
+Handle instance method             0        5            PASS 
+PASSED.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java
new file mode 100644
index 00000000000..3db807f949e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java
@@ -0,0 +1,598 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/inline/inline007.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Inline007 is similar to inline004 in that it tests inlining.
+ * Inline004 still functions, but is not testing inlining, in
+ * JDK 1.2e.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.inline.inline007.inline007
+ * @run driver ExecDriver --java jit.inline.inline007.inline007
+ */
+
+package jit.inline.inline007;
+
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class inline007_1 {
+        final protected static int[] inlineObj = { 1, 2 };
+        protected static int   inlineInt = 3;           /* Not final */
+}
+
+class inline007Sup extends inline007_1 {
+        private int i1 = 0;
+        Object obj1 = inline007_1.inlineObj;
+        Object obj2 = inline007_1.inlineObj;
+        Object obj3 = inline007_1.inlineObj;
+
+        static int MPAT_Const4_fs_0() {
+                return 1;
+        }
+        static Object MPAT_Const4_fs_1() {
+                return null;
+        }
+        static int MPAT_GetStatic4_fs_0() {
+                return inlineInt;
+        }
+        static Object MPAT_GetStatic4_fs_1() {
+                return inlineObj;
+        }
+        int MPAT_Const4_fi_0() {
+                return 1;
+        }
+        Object MPAT_Const4_fi_1() {
+                return null;
+        }
+        int MPAT_GetField4_fi_0() {
+                return i1;
+        }
+        Object MPAT_GetField4_fi_1() {
+                return obj1;
+        }
+        void MPAT_PutField4_fi_0(int ival) {
+                i1 = ival;
+                return;
+        }
+        void MPAT_PutField4_fi_1(Object oval) {
+                obj1 = oval;
+                return;
+        }
+        void MPAT_PutField4Const4_fi() {
+                i1 = -1;
+                return;
+        }
+        int MPAT_GetStatic4_fi_0() {
+                return inlineInt;
+        }
+        Object MPAT_GetStatic4_fi_1() {
+                return inlineObj;
+        }
+        Object MPAT_Handle_fi() {
+                return this;
+        }
+}
+
+class inline007Sub extends inline007Sup {
+        private int i1 = 0;
+        Object obj1 = inline007_1.inlineObj;
+        Object obj2 = inline007_1.inlineObj;
+        Object obj3 = inline007_1.inlineObj;
+
+        static int MPAT_Const4_fs_0() {
+                return 1;
+        }
+        static Object MPAT_Const4_fs_1() {
+                return null;
+        }
+        static int MPAT_GetStatic4_fs_0() {
+                return inlineInt;
+        }
+        static Object MPAT_GetStatic4_fs_1() {
+                return inlineObj;
+        }
+        int MPAT_Const4_fi_0() {
+                return 1;
+        }
+        Object MPAT_Const4_fi_1() {
+                return null;
+        }
+        int MPAT_GetField4_fi_0() {
+                return i1;
+        }
+        Object MPAT_GetField4_fi_1() {
+                return obj1;
+        }
+        void MPAT_PutField4_fi_0(int ival) {
+                i1 = ival;
+                return;
+        }
+        void MPAT_PutField4_fi_1(Object oval) {
+                obj1 = oval;
+                return;
+        }
+        void MPAT_PutField4Const4_fi() {
+                i1 = -1;
+                return;
+        }
+        int MPAT_GetStatic4_fi_0() {
+                return inlineInt;
+        }
+        Object MPAT_GetStatic4_fi_1() {
+                return inlineObj;
+        }
+        Object MPAT_Handle_fi() {
+                return this;
+        }
+}
+
+class inline007 extends inline007_1 {
+        public static final GoldChecker goldChecker = new GoldChecker( "inline007" );
+
+        static int[] myIters = new int[14];
+        static int[] errFlag = new int[14];
+        static int pFlag = 0;
+        final static int ITERS=5;
+        int intTarg1 = 0;
+        int intTarg2 = 0;
+        Object objTarg1 = null;
+        Object objTarg2 = null;
+        inline007Sub inline007sub = new inline007Sub();
+        inline007Sup inline007sup = inline007sub;
+
+        private void runFinals () {
+                int jcount = 0;
+                int icount = 0;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_Const4_fs_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg1 = inline007Sub.MPAT_Const4_fs_0();
+                                intTarg2 = inline007Sup.MPAT_Const4_fs_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_Const4_fs_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = inline007Sub.MPAT_Const4_fs_1();
+                                objTarg1 = inline007Sup.MPAT_Const4_fs_1();
+                                if (objTarg2 != objTarg1) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_GetStatic4_fs_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg2 = inline007Sub.MPAT_GetStatic4_fs_0();
+                                intTarg1 = inline007Sup.MPAT_GetStatic4_fs_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_GetStatic4_fs_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = inline007Sub.MPAT_GetStatic4_fs_1();
+                                objTarg1 = inline007Sup.MPAT_GetStatic4_fs_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+
+                /* Check inlining of instance methods */
+                if (pFlag==2) inline007.goldChecker.print("MPAT_Const4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg1 = inline007sub.MPAT_Const4_fi_0();
+                                intTarg2 = inline007sup.MPAT_Const4_fi_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_Const4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg1 = inline007sub.MPAT_Const4_fi_1();
+                                objTarg2 = inline007sup.MPAT_Const4_fi_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_GetStatic4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg2 = inline007sub.MPAT_GetStatic4_fi_0();
+                                intTarg1 = inline007sup.MPAT_GetStatic4_fi_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                if (pFlag==2) inline007.goldChecker.print("MPAT_GetStatic4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = inline007sub.MPAT_GetStatic4_fi_1();
+                                objTarg1 = inline007sup.MPAT_GetStatic4_fi_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_GetField4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                intTarg1 = inline007sub.MPAT_GetField4_fi_0();
+                                intTarg2 = inline007sup.MPAT_GetField4_fi_0();
+                                if (intTarg1 != intTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_GetField4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg2 = inline007sub.MPAT_GetField4_fi_1();
+                                objTarg1 = inline007sup.MPAT_GetField4_fi_1();
+                                if (objTarg1 != objTarg2) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_PutField4_fi_0");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                inline007sub.MPAT_PutField4_fi_0(10);
+                                intTarg1 = inline007sup.MPAT_GetField4_fi_0();
+                                if (intTarg1 != 10) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_PutField4_fi_1");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                inline007sub.MPAT_PutField4_fi_1("String1");
+                                objTarg1 = inline007sub.MPAT_GetField4_fi_1();
+                                if (objTarg1 != "String1") errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_PutField4Const4_fi");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                inline007sub.MPAT_PutField4Const4_fi();
+                                intTarg2 = inline007sup.MPAT_GetField4_fi_0();
+                                if (intTarg2 != -1) errFlag[icount]++;
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+
+                if (pFlag==2) inline007.goldChecker.print("MPAT_Handle_fi");
+                try {
+                        for (jcount=0; jcount<ITERS; jcount++) {
+                                objTarg1 = inline007sub.MPAT_Handle_fi();
+                                objTarg2 = inline007sup.MPAT_Handle_fi();
+                        }
+                } catch (Exception e) {
+                        if (pFlag==2) inline007.goldChecker.print(": iteration="+(jcount+1)+": "+e);
+                } finally {
+                        myIters[icount] = jcount;
+                        if (jcount != ITERS) errFlag[icount]++;
+                        if (pFlag==2) inline007.goldChecker.println();
+                }
+                icount++;
+        }
+
+
+        public static int result() {
+                int ierr = 0;
+                String state = null;
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(80);
+                byte[] ba = new byte[80];
+                String s = null;
+
+                String[] label = new String[14];
+                label[0]  = new String("Const4 class method (int)       ");
+                label[1]  = new String("Const4 class method (ref)       ");
+                label[2]  = new String("GetStatic4 class method (int)   ");
+                label[3]  = new String("GetStatic4 class method (ref)   ");
+                label[4]  = new String("Const4 instance method (int)    ");
+                label[5]  = new String("Const4 instance method (ref)    ");
+                label[6]  = new String("GetStatic4 instance method (int)");
+                label[7]  = new String("GetStatic4 instance method (ref)");
+                label[8] = new String("GetField4 instance method (int) ");
+                label[9] = new String("GetField4 instance method (ref) ");
+                label[10] = new String("PutField4 instance method (int) ");
+                label[11] = new String("PutField4 instance method (ref) ");
+                label[12] = new String("PutField4Const4 instance method ");
+                label[13] = new String("Handle instance method          ");
+                                                                // Report headers
+                baos.reset();
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        s = "Pattern";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,32);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Errors";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,6);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Iterations";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,10);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "State";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)s.charAt(i);
+                        baos.write(ba,0,5);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                inline007.goldChecker.print(baos.toString());
+                inline007.goldChecker.println();
+
+                                                                // Report header underlining
+                baos.reset();
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        s = "Pattern";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,32);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Errors";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,6);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "Iterations";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,10);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                try {
+                        for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                        baos.write(ba,0,3);
+                        s = "State";
+                        for (int i=0; i<s.length(); i++)
+                                ba[i]=(byte)'=';
+                        baos.write(ba,0,5);
+                }
+                catch (IndexOutOfBoundsException e){
+                }
+                inline007.goldChecker.print(baos.toString());
+                inline007.goldChecker.println();
+
+                for (int icount=0; icount<14; icount++) {
+                        if (myIters[icount] == ITERS && errFlag[icount] == 0)
+                                state="PASS";
+                        else {
+                                ierr++;
+                                state="FAIL";
+                        }
+                        baos.reset();
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                for (int i=0; i<label[icount].length(); i++)
+                                        ba[i]=(byte)label[icount].charAt(i);
+                                baos.write(ba,0,32);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline007.goldChecker.println("0: "+e);
+                        }
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                baos.write(ba,0,3);
+                                s = Integer.toString(errFlag[icount]);
+                                for (int i=0; i<s.length(); i++)
+                                        ba[i]=(byte)s.charAt(i);
+                                baos.write(ba,0,6);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline007.goldChecker.println("1: "+e);
+                        }
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                baos.write(ba,0,3);
+                                s = Integer.toString(myIters[icount]);
+                                for (int i=0; i<s.length(); i++)
+                                        ba[i]=(byte)s.charAt(i);
+                                baos.write(ba,0,10);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline007.goldChecker.println("1: "+e);
+                        }
+                        try {
+                                for (int i=0; i<ba.length; i++) ba[i]=(byte)' ';
+                                baos.write(ba,0,3);
+                                for (int i=0; i<state.length(); i++)
+                                        ba[i]=(byte)state.charAt(i);
+                                baos.write(ba,0,5);
+                        }
+                        catch (IndexOutOfBoundsException e){
+                                inline007.goldChecker.println("3: "+e);
+                        }
+                        inline007.goldChecker.print(baos.toString());
+                        inline007.goldChecker.println();
+                }
+                return ierr;
+        }
+
+        public static void main( String args[] ) {
+                int ierr;
+                inline007 myInline_n = new inline007();
+                inline007 myInline_f = new inline007();
+
+                if (args.length > 0 && args[0].equals("-help")) {
+                        inline007.goldChecker.println("usage: java inline007 [-print | -report]");
+                        inline007.goldChecker.check();
+                        return;
+                }
+                if (args.length > 0 && args[0].equals("-print"))
+                        pFlag = 2;
+                if (args.length > 0 && args[0].equals("-report"))
+                        pFlag = 1;
+                for (int ii=0; ii<14; ii++) myIters[ii]=ITERS;
+                if (pFlag==2) inline007.goldChecker.println("inline007");
+
+                                /* Give the JIT an initial look at all the methods */
+                myInline_f.runFinals();
+                ierr = inline007.result();
+                if (ierr == 0) {
+                        inline007.goldChecker.println("PASSED.");
+                }
+                else {
+                        inline007.goldChecker.println("FAILED. (ierr = " + ierr + ")");
+                }
+                inline007.goldChecker.check();
+        }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/JitBug1/JitBug1.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/JitBug1/JitBug1.java
new file mode 100644
index 00000000000..5387f17a96a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/JitBug1/JitBug1.java
@@ -0,0 +1,61 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/misctests/JitBug1.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.misctests.JitBug1.JitBug1
+ */
+
+package jit.misctests.JitBug1;
+
+import nsk.share.TestFailure;
+
+public class JitBug1
+{
+  public static void main(String[] args) {
+    JitBug1 me = new JitBug1();
+
+    System.out.println(me.foo(10));
+    System.out.println(me.foo(10));
+    System.out.println(me.foo(10));
+  }
+
+  private int foo(long width) {
+    width += bar();
+    if (width > Integer.MAX_VALUE) {
+      width = Integer.MAX_VALUE;
+    }
+    return (int)width;
+  }
+
+  public int bar() {
+    return 5;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java
new file mode 100644
index 00000000000..bc4e2757357
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java
@@ -0,0 +1,75 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/misctests/Pi.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.misctests.Pi.Pi
+ * @run driver ExecDriver --java jit.misctests.Pi.Pi
+ */
+
+package jit.misctests.Pi;
+
+import java.util.Random;
+import nsk.share.TestFailure;
+
+class Pi{
+    static double pi;
+    static int imKreis=0, imQuadrat=0, i=0;
+
+    public static void main(String args[]) {
+        for(int i=0;i<=100;i++) {
+            wurf(10000);
+            pi=4.0*imKreis/imQuadrat;
+            ausgabe();
+        }
+        System.out.print("\n");
+    }
+
+    static void wurf(int wieOft) {
+        double x,y;
+        Random zufall;
+        zufall=new Random();
+        for(int i=0;i<=wieOft;i++) {
+            x=zufall.nextDouble();
+            y=zufall.nextDouble();
+            imQuadrat++;
+            if(x*x+y*y<1)imKreis++;
+        }
+    }
+
+    static void ausgabe() {
+        System.out.print(pi);
+        if ((++i % 4) == 0){
+            System.out.print("\n");
+        } else {
+            System.out.print(" ");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/clss14702/clss14702.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/clss14702/clss14702.java
new file mode 100644
index 00000000000..1b6c9c0fcbb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/clss14702/clss14702.java
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/misctests/clss14702.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.misctests.clss14702.clss14702
+ */
+
+package jit.misctests.clss14702;
+
+import nsk.share.TestFailure;
+
+public class  clss14702 {
+    static int ML = 1;
+    public static void main(String argv[]) {
+        clss14702 test = null;
+        for (int i = 0; i < ML; i++)
+            try {
+                if ( test.equals(null) ) {
+                    System.out.println("Error! NullPointerException should be thrown.");
+                }
+                throw new TestFailure("Error! No exception.");
+            } catch (Exception e) {
+                if ( ! NullPointerException.class.isInstance(e) ) {
+                    throw new TestFailure("Error! Exception: " + e);
+                }
+            }
+            System.out.println("Passed");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphApplet.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphApplet.java
new file mode 100644
index 00000000000..49488c4b14d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphApplet.java
@@ -0,0 +1,157 @@
+/*
+ * 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
+ * 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
+ * @key headful
+ *
+ * @summary converted from VM Testbase jit/misctests/fpustack.
+ * VM Testbase keywords: [jit, desktop, jdk_desktop, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.misctests.fpustack.GraphApplet
+ */
+
+package jit.misctests.fpustack;
+
+import java.util.*;
+import java.awt.*;
+import java.applet.Applet;
+import nsk.share.TestFailure;
+
+
+public class GraphApplet extends Applet {
+    private GraphPanel panel;
+    private boolean isApplet = true;
+    private boolean initialized = false;
+
+    /**
+    ** main method for testing that class
+    **
+    **/
+    public static void main( String[] args )        {
+        Frame f = new Frame("GraphApplet");
+        GraphApplet app = new GraphApplet();
+        app.isApplet = false;
+        app.setSize(600,400);
+        f.setLayout( new BorderLayout() );
+        f.add("Center",app);
+        f.setSize(600,400);
+
+        app.init();
+        //      f.pack();
+        f.show(true);
+        app.start();
+
+        try {
+            Thread.currentThread().sleep(5*1000);
+        } catch (InterruptedException e) {
+        }
+
+        f.show(false);
+        app.stop();
+        f.dispose();
+        return;
+    }
+
+    /**
+    ** init-Method in applet's lifecycle.
+    ** the graphic panel is build up and the date is filled.
+    **/
+    public synchronized void init() {
+        System.out.println( "GraphApplet : init");
+        setLayout(new BorderLayout());
+
+        panel = new GraphPanel(this, new layout() );
+        fill( panel );
+        add("Center", panel);
+        Panel p = new Panel();
+        add("South", p);
+        initialized = true;
+    }
+
+    public synchronized void start() {
+        System.out.println( "GraphApplet : start");
+        panel.formatNodes();
+    }
+    public synchronized void stop() {
+        initialized = false;
+        System.out.println( "GraphApplet : stop");
+    }
+
+    public synchronized void destroy() {
+        System.out.println( "GraphApplet : destroy");
+    }
+
+    /**
+    ** paint the Applet
+    **/
+    public synchronized void paint(Graphics g) {
+        try {
+            while ( ! initialized )
+                Thread.currentThread().sleep(5);
+        } catch (InterruptedException e) {}
+        if (g instanceof PrintGraphics )
+            System.out.println( "printing GraphApplet ...");
+    }
+
+    public synchronized void print(Graphics g) {
+        try {
+            while ( ! initialized )
+                Thread.currentThread().sleep(5);
+        } catch (InterruptedException e) {}
+        System.out.println( "Print Applet "  + g);
+        panel.print(g);
+    }
+
+    public void print() {
+        // System.out.println( "Print Applet");
+        Toolkit kit = getToolkit();
+        try {
+
+            PrintJob job = kit.getPrintJob( new Frame("x"), "PrintableFrame print job",
+                                            null);
+            // do the printing if the user didn't cancel the print job
+            if (job != null) {
+                Graphics g = job.getGraphics();
+                printAll(g);                                    // not paint(g)
+                g.dispose();                                    // finish with this page
+                job.end();                                              // finish with the PrintJob
+            }
+        } catch (Exception ex) {
+            System.out.println( "print exception " + ex);
+        }
+    }
+
+    /**
+    **
+    ** @param      panel   the container for nodes
+    **
+    **/
+    private void
+        fill(  GraphPanel panel )       {
+            panel.addNodes("Node1", "Node2", "Node3" );
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphPanel.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphPanel.java
new file mode 100644
index 00000000000..db36e0a3101
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphPanel.java
@@ -0,0 +1,111 @@
+/*
+ * 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
+ * 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 jit.misctests.fpustack;
+
+import java.util.*;
+import java.awt.*;
+import java.applet.Applet;
+import nsk.share.TestFailure;
+
+public class GraphPanel extends Panel {
+    private Panel graph;                                                        // the container
+
+    private ilayout layout = null;  // the strategy
+
+
+    private int nodesN;                                                         // number of nodes
+    private Node nodes[] = new Node[200];                       // nodes container
+
+    /**
+    ** constructor
+    **
+    ** @param      Panel                   the container
+    ** @param      layout  a strategy to layout the nodes
+    **
+    **/
+    GraphPanel(Panel graph, layout ls ) {
+        this.graph = graph;
+        layout = ls;
+    }
+
+
+
+
+    /**
+    ** add a node via label text.
+    **
+    ** @param      lbl             the label
+    ** @return     the index of the node in array nodes[]
+    **
+    **/
+
+    public int addNode(String lbl) {
+        Node n = new Node();
+        if (nodesN > 0) {
+            n.x = nodes[nodesN-1].x + 30;
+            n.y = nodes[nodesN-1].y + 30;
+        }
+        n.lbl = lbl;
+
+        nodes[nodesN] = n;
+        return nodesN++;
+    }
+
+
+
+    /**
+    ** add a node via label text.
+    **
+    ** @param      lbl             the label
+    ** @return     the index of the node in array nodes[]
+    **
+    **/
+
+    public void addNodes(String lb1, String lb2, String lb3) {
+        addNode(lb1);
+        addNode(lb2);
+        addNode(lb3);
+    }
+
+
+
+    /**
+    ** layout the nodes on the panel. the layout is used
+    **
+    **
+    **/
+    public synchronized void formatNodes( ) {
+
+        // format nodes
+        FontMetrics fm = getFontMetrics(getFont());
+        Dimension d = getSize();
+
+        Node[] ns = new Node[ nodesN ];
+        System.arraycopy(nodes, 0, ns, 0, nodesN);
+        layout.formatNodes( ns, d, fm );
+
+    }
+
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/Node.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/Node.java
new file mode 100644
index 00000000000..8bee7fb7265
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/Node.java
@@ -0,0 +1,34 @@
+/*
+ * 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
+ * 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 jit.misctests.fpustack;
+
+import nsk.share.TestFailure;
+
+public class Node {
+
+        double x = 0.0;
+        double y = 0.0;
+
+        String lbl;
+
+    }
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/ilayout.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/ilayout.java
new file mode 100644
index 00000000000..9550dd08415
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/ilayout.java
@@ -0,0 +1,33 @@
+/*
+ * 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
+ * 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 jit.misctests.fpustack;
+
+import java.util.*;
+import java.awt.*;
+import nsk.share.TestFailure;
+
+interface ilayout {
+
+    public void formatNodes( Node[] n, Dimension d, FontMetrics fm );
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/layout.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/layout.java
new file mode 100644
index 00000000000..feb6e46e375
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/layout.java
@@ -0,0 +1,46 @@
+/*
+ * 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
+ * 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 jit.misctests.fpustack;
+
+import java.util.*;
+import java.awt.*;
+import java.applet.Applet;
+import nsk.share.TestFailure;
+
+public class layout implements ilayout {
+    public  void formatNodes( Node[] nodes, Dimension d, FontMetrics fm )   {
+        int h = d.height/2 - 10 ;
+
+        double alpha = -Math.PI/2;
+        for ( int j = 0; j < nodes.length; j++) {
+            Node n = nodes[j];
+            int w = d.width/2 - fm.stringWidth( n.lbl )/2;
+
+            n.x = d.width/2 + (int)(w*Math.cos( alpha ));
+
+            n.y = d.height/2 + (int)(h*Math.sin( alpha ));
+            alpha += 2*Math.PI/nodes.length;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/putfield00802/putfield00802.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/putfield00802/putfield00802.java
new file mode 100644
index 00000000000..ae8a4c1151f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/putfield00802/putfield00802.java
@@ -0,0 +1,59 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/misctests/putfield00802.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.misctests.putfield00802.putfield00802
+ */
+
+package jit.misctests.putfield00802;
+
+import java.io.PrintStream;
+import nsk.share.TestFailure;
+
+public class putfield00802 {
+
+    public double dou_v;
+    public static putfield00802 always_null;
+
+    public static void main(String args[]) {
+      System.exit(run(args, System.out) + 95/*STATUS_TEMP*/);
+    }
+
+    public static int run(String args[], PrintStream out) {
+        try {
+            always_null.dou_v = 17.0;
+            //int i = 1;                        // (1)
+        } catch (NullPointerException e) {      // (2)
+            return 0/*STATUS_PASSED*/;
+        }
+        return 2/*STATUS_FAILED*/;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java
new file mode 100644
index 00000000000..e2860a08552
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java
@@ -0,0 +1,79 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/misctests/t5.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.misctests.t5.t5
+ * @run driver ExecDriver --java jit.misctests.t5.t5
+ */
+
+package jit.misctests.t5;
+
+import nsk.share.TestFailure;
+
+class t5
+{
+    public static void main (String [] args)
+    {
+        byte[] data = new byte[16];
+        //foo (data, 0, 16, data, 0);
+        foo();
+
+    }
+
+    public static int FF (int a, int b, int c, int d, int x, int s, int ac)
+    {
+        return (((a += ((b & c) | (~b & d)) + x + ac) << s) | (a >>> (32-s))
++ b);
+    }
+
+    //static void foo (byte[] data, int off, int len, byte[] to, int pos)
+    static void foo ()
+    {
+        System.out.println ("Starting foo ...");
+        int[] W = new int[16];
+
+        int   a = 0x67452301;
+        int   b = 0xefcdab89;
+        int   c = 0x98badcfe;
+        int   d = 0x10325476;
+        for (int i = 0; i < 16; i++) {
+            a = FF (a, b, c, d, W[0],   7, 0xd76aa478);
+            d = FF (d, a, b, c, W[1],  12, 0xe8c7b756);
+            c = FF (c, d, a, b, W[2],  17, 0x242070db);
+            b = FF (b, c, d, a, W[3],  22, 0xc1bdceee);
+            a = FF (a, b, c, d, W[4],   7, 0xf57c0faf);
+            d = FF (d, a, b, c, W[5],  12, 0x4787c62a);
+            c = FF (c, d, a, b, W[6],  17, 0xa8304613);
+            b = FF (b, c, d, a, W[7],  22, 0xfd469501);
+        }
+        System.out.println ("foo ended.");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/non_jit_tests.txt b/test/hotspot/jtreg/vmTestbase/jit/non_jit_tests.txt
new file mode 100644
index 00000000000..77fb2539211
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/non_jit_tests.txt
@@ -0,0 +1,38 @@
+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
+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.
+
+* common/jtest
+* common/misctests/FileViewer
+* common/misctests/Foo
+* common/misctests/fpustack
+* common/misctests/NoHeader
+* common/misctests/noop
+* common/misctests/Pi
+* common/misctests/t5
+* common/misctests/whet
+* common/misctests/test.java
+* common/Peano
+* common/PrintProperties
+* common/PrintThis
+* common/Sleeper
+* common/testForBugs/4427606/Security
+* common/testForBugs/4446672/TestThreadStart.java
+* common/TsdCase
diff --git a/test/hotspot/jtreg/vmTestbase/jit/non_reporting_tests.txt b/test/hotspot/jtreg/vmTestbase/jit/non_reporting_tests.txt
new file mode 100644
index 00000000000..337f5576210
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/non_reporting_tests.txt
@@ -0,0 +1,56 @@
+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
+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.
+
+* common/deoptimization/test01
+* common/deoptimization/test02
+* common/deoptimization/test03
+* common/deoptimization/test04
+* common/deoptimization/test05
+* common/deoptimization/test06
+* common/deoptimization/test07
+* common/deoptimization/test08
+* common/DivTest
+* common/ExcOpt
+* common/FPCompare/TestFPBinop
+* common/FPCompare/TestFPCompare
+* common/loops/arg06
+* common/loops/arg07
+* common/loops/arg08
+* common/loops/arg09
+* common/loops/arg10
+* common/loops/dec01
+* common/loops/dec06
+* common/loops/dec07
+* common/loops/dec08
+* common/loops/dec09
+* common/loops/dec10
+* common/loops/dec11
+* common/loops/fuse7
+* common/loops/fuse9
+* common/loops/fuse107
+* common/loops/fuse109
+* common/loops/fuse15
+* common/loops/fuse19
+* common/loops/private2
+* common/loops/private3
+* common/Peano
+* common/tXXX
+* common/TsdCase
diff --git a/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java b/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java
new file mode 100644
index 00000000000..8ca05d3ce1a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java
@@ -0,0 +1,67 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/overflow.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.overflow.overflow
+ * @run driver ExecDriver --java jit.overflow.overflow
+ */
+
+package jit.overflow;
+
+/*
+   This test checks if a JIT can still detect stack overflow. Method
+   invocation overhead is expensive in Java and improving it is a
+   nobel cause for a JIT. JITs just have to be careful that they
+   don't loose some error handling ability in doing so.
+*/
+
+import java.lang.*;
+
+import nsk.share.TestFailure;
+
+class overflow {
+    public static void main(String[] args) {
+        try {
+           recurse(1);
+        } catch (StackOverflowError e) {
+           System.out.println("Test PASSES");
+           return;
+        }
+        throw new TestFailure("Test FAILED");
+    }
+
+    static int recurse(int n) {
+        if (n != 0) {
+            return recurse(n+1);
+        }
+        return 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/regression/CrashC1/CrashC1.java b/test/hotspot/jtreg/vmTestbase/jit/regression/CrashC1/CrashC1.java
new file mode 100644
index 00000000000..b186e517a09
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/regression/CrashC1/CrashC1.java
@@ -0,0 +1,48 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/regression/CrashC1.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.regression.CrashC1.CrashC1
+ */
+
+package jit.regression.CrashC1;
+
+import nsk.share.TestFailure;
+
+public class CrashC1 {
+  public long alignUp(long size, long alignment) {
+    return (size + alignment - 1) & ~(alignment - 1);
+  }
+
+  public static void main(String[] args) {
+    new CrashC1().alignUp(8, 8);
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/regression/b4427606/b4427606.java b/test/hotspot/jtreg/vmTestbase/jit/regression/b4427606/b4427606.java
new file mode 100644
index 00000000000..fc3a94532ed
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/regression/b4427606/b4427606.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ * 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 4427606
+ *
+ * @summary converted from VM Testbase jit/regression/b4427606.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.regression.b4427606.b4427606
+ */
+
+package jit.regression.b4427606;
+
+import nsk.share.TestFailure;
+
+/*
+ *  This is a reproducible case for a few bugs reported in merlin.
+ *  mainly: 4427606
+ */
+public class b4427606 {
+  private static final int NUM_ITERATIONS = 1000000;
+
+  public static void main(String[] args) {
+    new b4427606().run();
+  }
+
+  public void run() {
+    new DivByZero().start();
+    new NeverDivByZero().start();
+  }
+
+  class DivByZero extends Thread {
+    public void run() {
+      long source = 1L;
+      long iter = NUM_ITERATIONS;
+      while (--iter > 0) {
+        try {
+          long ignore = source % zero;
+          throw new RuntimeException("Should Not Reach Here....");
+        } catch (java.lang.ArithmeticException ax) {
+        } catch (RuntimeException rx) {
+          rx.printStackTrace();
+          throw new TestFailure("Test failed.");
+        }
+      }
+    }
+  }
+
+  class NeverDivByZero extends Thread {
+    public void run() {
+      long source = 1L;
+      long iter = NUM_ITERATIONS;
+      while (--iter > 0) {
+        try {
+         long ignore = source % notzero;
+        } catch (java.lang.ArithmeticException ax) {
+          ax.printStackTrace();
+          throw new TestFailure("Test failed.");
+        }
+      }
+    }
+  }
+  long zero = 0;
+  long notzero = 10;
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/regression/b4446672/b4446672.java b/test/hotspot/jtreg/vmTestbase/jit/regression/b4446672/b4446672.java
new file mode 100644
index 00000000000..bbd1d27f470
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/regression/b4446672/b4446672.java
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * 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 4446672
+ *
+ * @summary converted from VM Testbase jit/regression/b4446672.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm jit.regression.b4446672.b4446672
+ */
+
+package jit.regression.b4446672;
+
+import nsk.share.TestFailure;
+
+public class b4446672 {
+
+  public static void main(String[] args) {
+    new b4446672().run();
+  }
+
+  private void run() {
+    new GCThread().start();
+    new TestThreadStarter().start();
+
+    while (!gcing) Thread.yield();
+    while (!starting) Thread.yield();
+      done = true;
+    while (!testing) Thread.yield();
+  }
+
+  class TestThread extends Thread {
+    public void run() {
+      System.out.println ("TestThread.");
+      testing = true;
+    }
+  }
+
+  class TestThreadStarter extends Thread {
+    public void run() {
+      System.out.println ("TestThreadStarter.");
+      starting=true;
+      testThread.start();
+    }
+  }
+
+  class GCThread extends Thread {
+    public void run() {
+      System.out.println ("GCThread run.");
+      synchronized (testThread) {
+        System.out.println ("GCThread synchronized.");
+              while (!done) {
+                gcing=true;
+                yield();
+                System.gc();
+              }
+            }
+        System.out.println ("GCThread done.");
+    }
+  }
+
+  TestThread testThread = new TestThread();
+  boolean done = false;
+  boolean gcing = false;
+  boolean testing = false;
+  boolean starting = false;
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt b/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt
new file mode 100644
index 00000000000..f9628bfa685
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt
@@ -0,0 +1,45 @@
+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
+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.
+
+* common/exception
+* common/inline001
+* common/inline002
+* common/JITSuite
+* common/jtest
+* common/misctests/classes
+* common/misctests/FileViewer
+* common/misctests/Foo
+* common/misctests/fpustack
+* common/misctests/NoHeader
+* common/misctests/noop
+* common/misctests/Pi
+* common/misctests/putfield00802
+* common/misctests/t5
+* common/misctests/whet
+* common/misctests/test.java
+* common/Peano
+* common/PrintProperties
+* common/PrintThis
+* common/Sleeper
+* common/tXXX
+* common/testForBugs/4427606/Security
+* common/testForBugs/4446672/TestThreadStart.java
+* common/TsdCase
diff --git a/test/hotspot/jtreg/vmTestbase/jit/series/series.gold b/test/hotspot/jtreg/vmTestbase/jit/series/series.gold
new file mode 100644
index 00000000000..1de2ba645c1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/series/series.gold
@@ -0,0 +1,8 @@
+1: 0
+2: 0
+3: 0
+4: 0
+5: 0.0
+6: 0.0
+7: 0.0
+8: 0.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/series/series.java b/test/hotspot/jtreg/vmTestbase/jit/series/series.java
new file mode 100644
index 00000000000..68e1aedded2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/series/series.java
@@ -0,0 +1,200 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/series.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.series.series
+ * @run driver ExecDriver --java jit.series.series
+ */
+
+package jit.series;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class series {
+
+  public static final GoldChecker goldChecker = new GoldChecker( "series" );
+
+  private double arithmeticSeries(double i)
+  {
+    if (i == 0.0D)
+      return 0.0D;
+    else
+      return i + arithmeticSeries(i - 1.0D);
+  }
+
+  private float arithmeticSeries(float i)
+  {
+    if (i == 0.0F)
+      return 0.0F;
+    else
+      return i + arithmeticSeries(i - 1.0F);
+  }
+
+  private long arithmeticSeries(long i)
+  {
+    if (i == 0L)
+      return 0L;
+    else
+      return i + arithmeticSeries(i - 1L);
+  }
+
+  private int arithmeticSeries(int i)
+  {
+    if (i == 0)
+      return 0;
+    else
+      return i + arithmeticSeries(i - 1);
+  }
+
+  private double fake(double i)
+  {
+    if (i == 0.0D)
+      return 0.0D;
+    else
+      return i + mul100(i - 1.0D);
+  }
+  private double mul100(double i)
+  {
+    return i * 100.0D;
+  }
+
+  private float fake(float i)
+  {
+    if (i == 0.0F)
+      return 0.0F;
+    else
+      return i + mul100(i - 1.0F);
+  }
+  private float mul100(float i)
+  {
+    return i * 100F;
+  }
+
+  private long fake(long i)
+  {
+    if (i == 0L)
+      return 0L;
+    else
+      return i + mul100(i - 1L);
+  }
+  private long mul100(long i)
+  {
+    return i * 100L;
+  }
+
+  private int fake(int i)
+  {
+    if (i == 0)
+      return 0;
+    else
+      return i + mul100(i - 1);
+  }
+  private int mul100(int i)
+  {
+    return i * 100;
+  }
+
+  int runit()
+  {
+     double dres;
+     float fres;
+     long lres;
+     int res;
+     int failures = 0;
+
+     res = arithmeticSeries(50);
+     series.goldChecker.println("1: "+Math.abs(res - 1275));
+     if (res != 1275) {
+      series.goldChecker.println(" *** Fail test 1: expected = 1275, computed = " +
+res);
+      failures++;
+     }
+     res = fake(50);
+     series.goldChecker.println("2: "+Math.abs(res - 4950));
+     if (res != 4950) {
+      series.goldChecker.println(" *** Fail test 2: expected = 4950, computed = " +
+res);
+      failures++;
+     }
+     lres = arithmeticSeries(50L);
+     series.goldChecker.println("3: "+Math.abs(lres - 1275L));
+     if (lres != 1275L) {
+      series.goldChecker.println(" *** Fail test 3: expected = 1275, computed = " +
+res);
+      failures++;
+     }
+     lres = fake(50L);
+     series.goldChecker.println("4: "+Math.abs(lres - 4950L));
+     if (lres != 4950L) {
+      series.goldChecker.println(" *** Fail test 4: expected = 4950, computed = " +
+res);
+      failures++;
+     }
+     dres = arithmeticSeries(50.0D);
+     series.goldChecker.println("5: "+Math.abs(dres - 1275.0D));
+     if (Math.abs(dres - 1275.0D) > 1.0E-09D) {
+      series.goldChecker.println(" *** Fail test 5: expected = 1275, computed = " +
+dres);
+      failures++;
+     }
+     dres = fake(50.0D);
+     series.goldChecker.println("6: "+Math.abs(dres - 4950.0D));
+     if (Math.abs(dres - 4950.0D) > 5.0E-09D) {
+      series.goldChecker.println(" *** Fail test 6: expected = 4950, computed = " +
+dres);
+      failures++;
+     }
+     fres = arithmeticSeries(50.0F);
+     series.goldChecker.println("7: "+Math.abs(fres - 1275.0F));
+     if (Math.abs(fres - 1275.0F) > 1.0E-04F) {
+      series.goldChecker.println(" *** Fail test 7: expected = 1275, computed = " +
+fres);
+      failures++;
+     }
+     fres = fake(50.0F);
+     series.goldChecker.println("8: "+Math.abs(fres - 4950.0F));
+     if (Math.abs(fres - 4950.0F) > 5.0E-04F) {
+      series.goldChecker.println(" *** Fail test 8: expected = 4950, computed = " +
+fres);
+      failures++;
+     }
+     return(failures);
+}
+
+  static public void main(String args[])
+  {
+      series patObj = new series();
+      if (patObj.runit()!=0)
+         throw new TestFailure("Test failed.");;
+                                               series.goldChecker.check();
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.gold
new file mode 100644
index 00000000000..fb3a541106e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.gold
@@ -0,0 +1,12 @@
+!(39>=40)
+!(39==40)
+39<=40
+39!=40
+39<40
+!(39>40)
+39>=39
+39==39
+39<=39
+!(39!=39)
+!(39<39)
+!(39>39)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java
new file mode 100644
index 00000000000..947376ea15a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java
@@ -0,0 +1,78 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t001.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t001.t001
+ * @run driver ExecDriver --java jit.t.t001.t001
+ */
+
+package jit.t.t001;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t001
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t001" );
+
+    public static void main(String argv[])
+    {
+        int i = 39;
+        int j = 40;
+
+        if(i>=j)t001.goldChecker.println("39>=40");
+        else t001.goldChecker.println("!(39>=40)");
+        if(i==j)t001.goldChecker.println("39==40");
+        else t001.goldChecker.println("!(39==40)");
+        if(i<=j)t001.goldChecker.println("39<=40");
+        else t001.goldChecker.println("!(39<=40)");
+        if(i!=j)t001.goldChecker.println("39!=40");
+        else t001.goldChecker.println("!(39!=40)");
+        if(i<j)t001.goldChecker.println("39<40");
+        else t001.goldChecker.println("!(39<40)");
+        if(i>j)t001.goldChecker.println("39>40");
+        else t001.goldChecker.println("!(39>40)");
+
+        if(i>=i)t001.goldChecker.println("39>=39");
+        else t001.goldChecker.println("!(39>=39)");
+        if(i==i)t001.goldChecker.println("39==39");
+        else t001.goldChecker.println("!(39==39)");
+        if(i<=i)t001.goldChecker.println("39<=39");
+        else t001.goldChecker.println("!(39<=39)");
+        if(i!=i)t001.goldChecker.println("39!=39");
+        else t001.goldChecker.println("!(39!=39)");
+        if(i<i)t001.goldChecker.println("39<39");
+        else t001.goldChecker.println("!(39<39)");
+        if(i>i)t001.goldChecker.println("39>39");
+        else t001.goldChecker.println("!(39>39)");
+        t001.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.gold
new file mode 100644
index 00000000000..fb3a541106e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.gold
@@ -0,0 +1,12 @@
+!(39>=40)
+!(39==40)
+39<=40
+39!=40
+39<40
+!(39>40)
+39>=39
+39==39
+39<=39
+!(39!=39)
+!(39<39)
+!(39>39)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java
new file mode 100644
index 00000000000..ac147f89b3a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t002.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t002.t002
+ * @run driver ExecDriver --java jit.t.t002.t002
+ */
+
+package jit.t.t002;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t002
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t002" );
+
+    public static void main(String argv[])
+    {
+        int i = 39;
+
+        if(i>=40)t002.goldChecker.println("39>=40");
+        else t002.goldChecker.println("!(39>=40)");
+        if(i==40)t002.goldChecker.println("39==40");
+        else t002.goldChecker.println("!(39==40)");
+        if(i<=40)t002.goldChecker.println("39<=40");
+        else t002.goldChecker.println("!(39<=40)");
+        if(i!=40)t002.goldChecker.println("39!=40");
+        else t002.goldChecker.println("!(39!=40)");
+        if(i<40)t002.goldChecker.println("39<40");
+        else t002.goldChecker.println("!(39<40)");
+        if(i>40)t002.goldChecker.println("39>40");
+        else t002.goldChecker.println("!(39>40)");
+
+        if(i>=39)t002.goldChecker.println("39>=39");
+        else t002.goldChecker.println("!(39>=39)");
+        if(i==39)t002.goldChecker.println("39==39");
+        else t002.goldChecker.println("!(39==39)");
+        if(i<=39)t002.goldChecker.println("39<=39");
+        else t002.goldChecker.println("!(39<=39)");
+        if(i!=39)t002.goldChecker.println("39!=39");
+        else t002.goldChecker.println("!(39!=39)");
+        if(i<39)t002.goldChecker.println("39<39");
+        else t002.goldChecker.println("!(39<39)");
+        if(i>39)t002.goldChecker.println("39>39");
+        else t002.goldChecker.println("!(39>39)");
+        t002.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.gold
new file mode 100644
index 00000000000..50bbbbcd86e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.gold
@@ -0,0 +1,4 @@
+a[0] == 39
+a[1] == 40
+o-o-r high threw exception
+o-o-r low threw exception
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java
new file mode 100644
index 00000000000..643f8365577
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t003.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t003.t003
+ * @run driver ExecDriver --java jit.t.t003.t003
+ */
+
+package jit.t.t003;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t003
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t003" );
+
+    public static void main(String argv[])
+    {
+        int a[] = new int[2];
+        int i = -1;
+
+        a[0] = 39;
+        a[1] = 40;
+        t003.goldChecker.println("a[0] == " + a[0]);
+        t003.goldChecker.println("a[1] == " + a[1]);
+
+        try
+        {
+            a[2] = 41;
+            t003.goldChecker.println("o-o-r high didn't throw exception");
+        }
+        catch(Throwable x)
+        {
+            t003.goldChecker.println("o-o-r high threw exception");
+        }
+
+        try
+        {
+            a[i] = 41;
+            t003.goldChecker.println("o-o-r low didn't throw exception");
+        }
+        catch(Throwable x)
+        {
+            t003.goldChecker.println("o-o-r low threw exception");
+        }
+        t003.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.gold
new file mode 100644
index 00000000000..fb3a541106e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.gold
@@ -0,0 +1,12 @@
+!(39>=40)
+!(39==40)
+39<=40
+39!=40
+39<40
+!(39>40)
+39>=39
+39==39
+39<=39
+!(39!=39)
+!(39<39)
+!(39>39)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java
new file mode 100644
index 00000000000..13fb1507867
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t004.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t004.t004
+ * @run driver ExecDriver --java jit.t.t004.t004
+ */
+
+package jit.t.t004;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t004
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t004" );
+
+    public static void main(String argv[])
+    {
+        long i = 39;
+
+        if(i>=40)t004.goldChecker.println("39>=40");
+        else t004.goldChecker.println("!(39>=40)");
+        if(i==40)t004.goldChecker.println("39==40");
+        else t004.goldChecker.println("!(39==40)");
+        if(i<=40)t004.goldChecker.println("39<=40");
+        else t004.goldChecker.println("!(39<=40)");
+        if(i!=40)t004.goldChecker.println("39!=40");
+        else t004.goldChecker.println("!(39!=40)");
+        if(i<40)t004.goldChecker.println("39<40");
+        else t004.goldChecker.println("!(39<40)");
+        if(i>40)t004.goldChecker.println("39>40");
+        else t004.goldChecker.println("!(39>40)");
+
+        if(i>=39)t004.goldChecker.println("39>=39");
+        else t004.goldChecker.println("!(39>=39)");
+        if(i==39)t004.goldChecker.println("39==39");
+        else t004.goldChecker.println("!(39==39)");
+        if(i<=39)t004.goldChecker.println("39<=39");
+        else t004.goldChecker.println("!(39<=39)");
+        if(i!=39)t004.goldChecker.println("39!=39");
+        else t004.goldChecker.println("!(39!=39)");
+        if(i<39)t004.goldChecker.println("39<39");
+        else t004.goldChecker.println("!(39<39)");
+        if(i>39)t004.goldChecker.println("39>39");
+        else t004.goldChecker.println("!(39>39)");
+        t004.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.gold
new file mode 100644
index 00000000000..fb3a541106e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.gold
@@ -0,0 +1,12 @@
+!(39>=40)
+!(39==40)
+39<=40
+39!=40
+39<40
+!(39>40)
+39>=39
+39==39
+39<=39
+!(39!=39)
+!(39<39)
+!(39>39)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java
new file mode 100644
index 00000000000..9d3eeae0d66
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java
@@ -0,0 +1,78 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t005.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t005.t005
+ * @run driver ExecDriver --java jit.t.t005.t005
+ */
+
+package jit.t.t005;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t005
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t005" );
+
+    public static void main(String argv[])
+    {
+        long i = 39;
+        long j = 40;
+
+        if(i>=j)t005.goldChecker.println("39>=40");
+        else t005.goldChecker.println("!(39>=40)");
+        if(i==j)t005.goldChecker.println("39==40");
+        else t005.goldChecker.println("!(39==40)");
+        if(i<=j)t005.goldChecker.println("39<=40");
+        else t005.goldChecker.println("!(39<=40)");
+        if(i!=j)t005.goldChecker.println("39!=40");
+        else t005.goldChecker.println("!(39!=40)");
+        if(i<j)t005.goldChecker.println("39<40");
+        else t005.goldChecker.println("!(39<40)");
+        if(i>j)t005.goldChecker.println("39>40");
+        else t005.goldChecker.println("!(39>40)");
+
+        if(i>=i)t005.goldChecker.println("39>=39");
+        else t005.goldChecker.println("!(39>=39)");
+        if(i==i)t005.goldChecker.println("39==39");
+        else t005.goldChecker.println("!(39==39)");
+        if(i<=i)t005.goldChecker.println("39<=39");
+        else t005.goldChecker.println("!(39<=39)");
+        if(i!=i)t005.goldChecker.println("39!=39");
+        else t005.goldChecker.println("!(39!=39)");
+        if(i<i)t005.goldChecker.println("39<39");
+        else t005.goldChecker.println("!(39<39)");
+        if(i>i)t005.goldChecker.println("39>39");
+        else t005.goldChecker.println("!(39>39)");
+        t005.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.gold
new file mode 100644
index 00000000000..aff1b94bdc6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.gold
@@ -0,0 +1,29 @@
+-4345233046326321844
+-4046813629
+-2023406815
+-1
+
+1065811888404264240
+-40992765600858112
+-81985531201716224
+0
+
+4878138990528453964
+4543120963
+2271560481
+1
+
+-4345233046326321844
+-4046813629
+-2023406815
+-1
+
+1065811888404264240
+-40992765600858112
+-81985531201716224
+0
+
+4878138990528453964
+4543120963
+2271560481
+1
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java
new file mode 100644
index 00000000000..7e55b409ae6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t006.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t006.t006
+ * @run driver ExecDriver --java jit.t.t006.t006
+ */
+
+package jit.t.t006;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t006
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t006" );
+
+    public static void main(String argv[])
+    {
+        long i = 0x87654321fedcba98l;
+        int i1, i31, i32, i63;
+        i1 = 1;
+        i31 = 31;
+        i32 = 32;
+        i63 = 63;
+
+        t006.goldChecker.println(i >> 1);
+        t006.goldChecker.println(i >> 31);
+        t006.goldChecker.println(i >> 32);
+        t006.goldChecker.println(i >> 63);
+
+        t006.goldChecker.println("");
+        t006.goldChecker.println(i << 1);
+        t006.goldChecker.println(i << 31);
+        t006.goldChecker.println(i << 32);
+        t006.goldChecker.println(i << 63);
+
+        t006.goldChecker.println("");
+        t006.goldChecker.println(i >>> 1);
+        t006.goldChecker.println(i >>> 31);
+        t006.goldChecker.println(i >>> 32);
+        t006.goldChecker.println(i >>> 63);
+
+        t006.goldChecker.println("");
+        t006.goldChecker.println(i >> i1);
+        t006.goldChecker.println(i >> i31);
+        t006.goldChecker.println(i >> i32);
+        t006.goldChecker.println(i >> i63);
+
+        t006.goldChecker.println("");
+        t006.goldChecker.println(i << i1);
+        t006.goldChecker.println(i << i31);
+        t006.goldChecker.println(i << i32);
+        t006.goldChecker.println(i << i63);
+
+        t006.goldChecker.println("");
+        t006.goldChecker.println(i >>> i1);
+        t006.goldChecker.println(i >>> i31);
+        t006.goldChecker.println(i >>> i32);
+        t006.goldChecker.println(i >>> i63);
+
+        t006.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java b/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java
new file mode 100644
index 00000000000..a83349fd561
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t007.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t007.t007
+ * @run driver ExecDriver --java jit.t.t007.t007
+ */
+
+package jit.t.t007;
+
+import nsk.share.TestFailure;
+
+class t007
+{
+    public static void main(String argv[])
+    {
+        int i;
+        i = 39;
+        int result;
+        switch(i)
+        {
+        case 30: result = 30; break;
+        case 31: result = 31; break;
+        case 32: result = 32; break;
+        case 33: result = 33; break;
+        case 34: result = 34; break;
+        case 35: result = 35; break;
+        case 36: result = 36; break;
+        case 37: result = 37; break;
+        case 38: result = 38; break;
+        case 39: result = 39; break;
+        case 40: result = 40; break;
+        case 41: result = 41; break;
+        case 42: result = 42; break;
+        case 43: result = 43; break;
+        case 44: result = 44; break;
+        case 45: result = 45; break;
+        case 46: result = 46; break;
+        default: result = -1; break;
+        }
+
+        if(result != 39)
+                throw new TestFailure("Test failed: result != 39 (" + result + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java b/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java
new file mode 100644
index 00000000000..b1797ae0bcd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t008.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t008.t008
+ * @run driver ExecDriver --java jit.t.t008.t008
+ */
+
+package jit.t.t008;
+
+import nsk.share.TestFailure;
+
+class t008
+{
+    public static void main(String argv[])
+    {
+        int i;
+        i = 39;
+        int result;
+        switch(i)
+        {
+        case 30: result = 30; break;
+        case 39: result = 31; break;
+        case 402: result = 32; break;
+        case 1033: result = 33; break;
+        case 2034: result = 34; break;
+        case 2135: result = 35; break;
+        case 35036: result = 36; break;
+        case 35037: result = 37; break;
+        case 100038: result = 38; break;
+        case 200039: result = 39; break;
+        case 300040: result = 40; break;
+        case 400041: result = 41; break;
+        case 500042: result = 42; break;
+        case 600043: result = 43; break;
+        case 700044: result = 44; break;
+        case 800045: result = 45; break;
+        case 900046: result = 46; break;
+        default: result = -1; break;
+        }
+
+        if(result != 31)
+                throw new TestFailure("Test failed: result != 31 (" + result + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java b/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java
new file mode 100644
index 00000000000..9d24c818835
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t009.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t009.t009
+ * @run driver ExecDriver --java jit.t.t009.t009
+ */
+
+package jit.t.t009;
+
+import nsk.share.TestFailure;
+
+class t009
+{
+    public static void main(String argv[])
+    {
+        int i = 39;
+        int j = 42;
+        if(i/j!=0) throw new TestFailure("i/j!=0");
+        if(j/i!=1) throw new TestFailure("j/i!=1");
+        if(i%j!=39) throw new TestFailure("i%j!=39");
+        if(j%i!=3) throw new TestFailure("j%i!=3");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.gold
new file mode 100644
index 00000000000..b750ce88a51
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.gold
@@ -0,0 +1,11 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+All done.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java
new file mode 100644
index 00000000000..537204c28cf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t011.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t011.t011
+ * @run driver ExecDriver --java jit.t.t011.t011
+ */
+
+package jit.t.t011;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t011
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t011" );
+
+    public static void main(String argv[])
+    {
+        int i;
+
+        for(i=0; i<10; i+=1)
+            t011.goldChecker.println(i);
+        t011.goldChecker.println("All done.");
+        t011.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java b/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java
new file mode 100644
index 00000000000..ddf0bb12b61
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java
@@ -0,0 +1,60 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t012.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t012.t012
+ * @run driver ExecDriver --java jit.t.t012.t012
+ */
+
+package jit.t.t012;
+
+import nsk.share.TestFailure;
+
+class t012
+{
+    public static void main(String argv[])
+    {
+        if(fib(20) != 6765)
+                throw new TestFailure("fib(20) != 6765");
+    }
+
+    static int fib(int n)
+    {
+        int res;
+        if(n <= 0)
+            res = 0;
+        else if(n == 1)
+            res = 1;
+        else
+            res = fib(n-2) + fib(n-1);
+        return res;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.gold
new file mode 100644
index 00000000000..b60c145c124
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.gold
@@ -0,0 +1,61 @@
+Peg(1)
+Peg(2)
+Peg(3)
+moving 4 disks...
+addDisk(4, 1)
+addDisk(3, 1)
+addDisk(2, 1)
+addDisk(1, 1)
+moveDisks(4, 1, 3, 2)
+moveDisks(3, 1, 2, 3)
+moveDisks(2, 1, 3, 2)
+moveDisks(1, 1, 2, 3)
+removeDisk(1)
+addDisk(1, 2)
+moveDisks(1, 1, 3, 2)
+removeDisk(1)
+addDisk(2, 3)
+moveDisks(1, 2, 3, 1)
+removeDisk(2)
+addDisk(1, 3)
+moveDisks(1, 1, 2, 3)
+removeDisk(1)
+addDisk(3, 2)
+moveDisks(2, 3, 2, 1)
+moveDisks(1, 3, 1, 2)
+removeDisk(3)
+addDisk(1, 1)
+moveDisks(1, 3, 2, 1)
+removeDisk(3)
+addDisk(2, 2)
+moveDisks(1, 1, 2, 3)
+removeDisk(1)
+addDisk(1, 2)
+moveDisks(1, 1, 3, 2)
+removeDisk(1)
+addDisk(4, 3)
+moveDisks(3, 2, 3, 1)
+moveDisks(2, 2, 1, 3)
+moveDisks(1, 2, 3, 1)
+removeDisk(2)
+addDisk(1, 3)
+moveDisks(1, 2, 1, 3)
+removeDisk(2)
+addDisk(2, 1)
+moveDisks(1, 3, 1, 2)
+removeDisk(3)
+addDisk(1, 1)
+moveDisks(1, 2, 3, 1)
+removeDisk(2)
+addDisk(3, 3)
+moveDisks(2, 1, 3, 2)
+moveDisks(1, 1, 2, 3)
+removeDisk(1)
+addDisk(1, 2)
+moveDisks(1, 1, 3, 2)
+removeDisk(1)
+addDisk(2, 3)
+moveDisks(1, 2, 3, 1)
+removeDisk(2)
+addDisk(1, 3)
+finished, but I won't tell you how long it took
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java
new file mode 100644
index 00000000000..597aa364ba5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t013.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t013.t013
+ * @run driver ExecDriver --java jit.t.t013.t013
+ */
+
+package jit.t.t013;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class Globals {
+        static public int NumDisks;
+        static public int MaxDisks = 64; // this will do!
+}
+
+class t013 {
+
+    public static final GoldChecker goldChecker = new GoldChecker( "t013" );
+
+    static Peg peg1 = new Peg(1),
+               peg2 = new Peg(2),
+               peg3 = new Peg(3);
+
+    public static void main(String args[]) {
+
+       Globals.NumDisks = 4;
+
+       t013.goldChecker.println("moving " + Globals.NumDisks + " disks...");
+
+       if (Globals.NumDisks > Globals.MaxDisks)
+           Globals.NumDisks = Globals.MaxDisks;
+
+       for (int i = Globals.NumDisks; i > 0; i--)
+           peg1.addDisk(i);
+
+        long start = System.currentTimeMillis();
+
+        moveDisks(Globals.NumDisks, peg1, peg3, peg2);
+
+        long stop = System.currentTimeMillis();
+
+        long t = (stop - start) / 100;
+
+        t013.goldChecker.println("finished, but I won't tell you how long it took");
+        t013.goldChecker.check();
+    }
+
+    public static void moveDisks(int numDisks, Peg fromPeg, Peg toPeg, Peg usingPeg) {
+        t013.goldChecker.println
+        (
+            "moveDisks(" +
+            numDisks +
+            ", " +
+            fromPeg.pegNum +
+            ", " +
+            toPeg.pegNum +
+            ", " +
+            usingPeg.pegNum +
+            ")"
+        );
+        if (numDisks == 1) {
+            int disk;
+            toPeg.addDisk(disk = fromPeg.removeDisk());
+        } else {
+            moveDisks(numDisks - 1, fromPeg, usingPeg, toPeg);
+            moveDisks(1, fromPeg, toPeg, usingPeg);
+            moveDisks(numDisks - 1, usingPeg, toPeg, fromPeg);
+        }
+    }
+}
+
+class Peg {
+
+    int pegNum;
+    int disks[] = new int[64];
+    int nDisks;
+
+    public Peg(int n) {
+        t013.goldChecker.println("Peg(" + n + ")");
+        pegNum = n;
+        for (int i = 0; i < Globals.NumDisks; i++)
+            disks[i] = 0;
+        nDisks = 0;
+    }
+
+    public int pegNum() {
+        return pegNum;
+    }
+
+    public void addDisk(int diskNum) {
+        t013.goldChecker.println("addDisk(" + diskNum + ", " + pegNum() +")");
+        disks[nDisks++] = diskNum;
+    }
+
+    public int removeDisk() {
+        t013.goldChecker.println("removeDisk(" + pegNum() + ")");
+        return disks[--nDisks];
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java b/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java
new file mode 100644
index 00000000000..a25e3e968a9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t014.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t014.t014
+ * @run driver ExecDriver --java jit.t.t014.t014
+ */
+
+package jit.t.t014;
+
+import nsk.share.TestFailure;
+
+class t014
+{
+    void foo()
+    {
+        System.out.println("Hiya.");
+    }
+
+    public static void main(String argv[])
+    {
+        t014 o;
+
+        o = new t014();
+        try
+        {
+            o.foo();
+        }
+        catch(Throwable x)
+        {
+                throw new TestFailure("Exception thrown");
+        }
+
+        o = null;
+        try
+        {
+            o.foo();
+                throw new TestFailure("Exception NOT thrown");
+        }
+        catch(Throwable x)
+        {
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.gold
new file mode 100644
index 00000000000..f30ea16f887
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.gold
@@ -0,0 +1,5 @@
+Cookin' ...
+Pass 1 checking ...
+Initializing elements ...
+Pass 2 checking ...
+Except as noted above, I'm a happy camper.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java
new file mode 100644
index 00000000000..e969f8ab549
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java
@@ -0,0 +1,84 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t015.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t015.t015
+ * @run driver ExecDriver --java jit.t.t015.t015
+ */
+
+package jit.t.t015;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t015
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t015" );
+
+    int x;
+
+    t015(int i)
+    {
+        x = i;
+    }
+
+
+    public static void main(String argv[])
+    {
+        t015 a[] = new t015[2];
+        int i;
+
+        t015.goldChecker.println("Cookin' ...");
+        for(i=0; i<2; i+=1)
+            a[i] = null;
+
+        t015.goldChecker.println("Pass 1 checking ...");
+        for(i=0; i<2; i+=1)
+            if(a[i] != null)
+                t015.goldChecker.println("Fubar at " + i + " on pass 1");
+
+        t015.goldChecker.println("Initializing elements ...");
+        for(i=0; i<2; i+=1)
+            a[i] = new t015(i);
+
+        t015.goldChecker.println("Pass 2 checking ...");
+        for(i=0; i<2; i+=1)
+        {
+            if(a[i] == null)
+                t015.goldChecker.println("Null at " + i + " on pass 2");
+            else if(a[i].x != i)
+                t015.goldChecker.println("a[i].x != i at " + i + " on pass 2");
+        }
+
+        t015.goldChecker.println("Except as noted above, I'm a happy camper.");
+        t015.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.gold
new file mode 100644
index 00000000000..ef533f279ab
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.gold
@@ -0,0 +1,5 @@
+39
+42
+409
+-1
+7743
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java
new file mode 100644
index 00000000000..00d9097b380
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t016.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t016.t016
+ * @run driver ExecDriver --java jit.t.t016.t016
+ */
+
+package jit.t.t016;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t016
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t016" );
+
+    int x;
+
+    t016(int i)
+    {
+        x = i;
+    }
+
+    public static void main(String argv[])
+    {
+        t016 a,b,c,d,e;
+
+        a = new t016(39);
+        b = new t016(42);
+        c = new t016(409);
+        d = new t016(-1);
+        e = new t016(7743);
+        t016.goldChecker.println(a.x);
+        t016.goldChecker.println(b.x);
+        t016.goldChecker.println(c.x);
+        t016.goldChecker.println(d.x);
+        t016.goldChecker.println(e.x);
+        t016.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.gold
new file mode 100644
index 00000000000..f6867eb7e57
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.gold
@@ -0,0 +1,2 @@
+Exception on first try
+i==-1, j==39
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java
new file mode 100644
index 00000000000..18ec1b4e077
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java
@@ -0,0 +1,78 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t017.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t017.t017
+ * @run driver ExecDriver --java jit.t.t017.t017
+ */
+
+package jit.t.t017;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_arraylength
+
+class t017
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t017" );
+
+    public static void main(String argv[])
+    {
+        int a[] = null;
+        int i,j;
+
+        i = j = -1;
+
+        try
+        {
+            i = a.length;
+        }
+        catch(Throwable x)
+        {
+            t017.goldChecker.println("Exception on first try");
+        }
+
+        a = new int[39];
+
+        try
+        {
+            j = a.length;
+        }
+        catch(Throwable x)
+        {
+            t017.goldChecker.println("Exception on second try");
+        }
+
+        t017.goldChecker.println("i==" + i + ", j==" + j);
+        t017.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.gold
new file mode 100644
index 00000000000..6ebb634c77d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.gold
@@ -0,0 +1 @@
+Exception caught; msg is Hey dee ho.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java
new file mode 100644
index 00000000000..70439d515ae
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t018.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t018.t018
+ * @run driver ExecDriver --java jit.t.t018.t018
+ */
+
+package jit.t.t018;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_athrow
+
+class jj extends Throwable
+{
+    String msg;
+
+    jj(String s)
+    {
+        msg = s;
+    }
+}
+
+class t018
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t018" );
+
+    public static void main(String argv[])
+    {
+        try
+        {
+            jj x = new jj("Hey dee ho.");
+            throw x;
+        }
+        catch(jj x)
+        {
+            t018.goldChecker.println("Exception caught; msg is " + x.msg);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.gold
new file mode 100644
index 00000000000..09d4817eb38
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.gold
@@ -0,0 +1,14 @@
+b[0] == 0
+b[1] == 127
+b[2] == -128
+b[3] == -1
+
+(int) c[0] == 0
+(int) c[1] == 32767
+(int) c[2] == 32768
+(int) c[3] == 65535
+
+s[0] == 0
+s[1] == 32767
+s[2] == -32768
+s[3] == -1
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java
new file mode 100644
index 00000000000..641482bcef6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java
@@ -0,0 +1,71 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t019.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t019.t019
+ * @run driver ExecDriver --java jit.t.t019.t019
+ */
+
+package jit.t.t019;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_baload, opc_bastore,
+// opc_caload, opc_castore,
+// opc_saload, opc_sastore
+
+class t019
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t019" );
+
+    public static void main(String argv[])
+    {
+        byte b[] = new byte[4];
+        char c[] = new char[4];
+        short s[] = new short[4];
+
+        b[0] = 0; b[1] = 127; b[2] = (byte) 128; b[3] = (byte) 255;
+        for(int i=0; i<4; i+=1)
+            t019.goldChecker.println("b[" + i + "] == " + b[i]);
+
+        t019.goldChecker.println();
+        c[0] = 0; c[1] = 32767; c[2] = 32768; c[3] = 65535;
+        for(int i=0; i<4; i+=1)
+            t019.goldChecker.println("(int) c[" + i + "] == " + (int) c[i]);
+
+        t019.goldChecker.println();
+        s[0] = 0; s[1] = 32767; s[2] = (short) 32768; s[3] = (short) 65535;
+        for(int i=0; i<4; i+=1)
+            t019.goldChecker.println("s[" + i + "] == " + s[i]);
+        t019.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.gold
new file mode 100644
index 00000000000..3607b2bf529
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.gold
@@ -0,0 +1,9 @@
+a[0] is a t020 and also not null.
+a[1] is a t020 and also a k and also not null.
+a[2] is a t020 and also null.
+a[3] is a t020 and also null.
+
+Assigning a[0] to u failed.
+Assigning a[1] to u worked ok.
+Assigning a[2] to u worked ok.
+Assigning a[3] to u worked ok.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java
new file mode 100644
index 00000000000..2c4167a0c7c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t020.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t020.t020
+ * @run driver ExecDriver --java jit.t.t020.t020
+ */
+
+package jit.t.t020;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_checkcast, opc_instanceof, opc_ifnull, opc_ifnonnull
+
+class t020
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t020" );
+
+    private static void show(t020 x)
+    {
+        try
+        {
+            t020.goldChecker.print(" is a t020");
+            if(x instanceof k)
+                t020.goldChecker.print(" and also a k");
+            if(x == null)
+                t020.goldChecker.print(" and also null");
+            if(x != null)
+                t020.goldChecker.print(" and also not null");
+            t020.goldChecker.println(".");
+        }
+        catch(Throwable e)
+        {
+            t020.goldChecker.println(" " + e.getMessage());
+        }
+    }
+
+    public static void main(String argv[])
+    {
+        t020 a[] = new t020[4];
+        t020 t = new k();
+        k u = null;
+        a[0] = new t020();
+        a[1] = t;
+        a[3] = u;
+
+        for(int i=0; i<4; i+=1)
+        {
+            t020.goldChecker.print("a[" + i + "]");
+            show(a[i]);
+        }
+
+        t020.goldChecker.println();
+        for(int i=0; i<4; i+=1)
+        {
+            try
+            {
+                t020.goldChecker.print("Assigning a[" + i + "] to u");
+                u = (k) a[i];
+                t020.goldChecker.print(" worked ok");
+            }
+            catch(Throwable x)
+            {
+                t020.goldChecker.print(" failed");
+            }
+            finally
+            {
+                t020.goldChecker.println(".");
+            }
+        }
+        t020.goldChecker.check();
+    }
+
+}
+
+class k extends t020
+{
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.gold
new file mode 100644
index 00000000000..34534e7ad06
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.gold
@@ -0,0 +1,4 @@
+0.0
+1.0
+2.0
+0.051282052
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java
new file mode 100644
index 00000000000..9caed6caf4f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t021.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t021.t021
+ * @run driver ExecDriver --java jit.t.t021.t021
+ */
+
+package jit.t.t021;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_fconst_0, opc_fconst_1, opc_fconst_2, opc_fload_<n>, opc_fload,
+// opc_fadd, opc_fsub, opc_fmul, opc_fdiv
+class t021
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t021" );
+
+    public static void main(String argv[])
+    {
+        float a, b, c, d, e;
+
+        a = 0.0f;
+        b = 1.0f;
+        c = 2.0f;
+        e = 41.0f - c;
+        d = a + b * c / e;
+
+        t021.goldChecker.println(a);
+        t021.goldChecker.println(b);
+        t021.goldChecker.println(c);
+        t021.goldChecker.println(d);
+        t021.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.gold
new file mode 100644
index 00000000000..f616682eb45
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.gold
@@ -0,0 +1,4 @@
+0.0
+1.0
+2.0
+0.05128205128205128
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java
new file mode 100644
index 00000000000..a1188b2998e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t022.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t022.t022
+ * @run driver ExecDriver --java jit.t.t022.t022
+ */
+
+package jit.t.t022;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// The double-precision version of t021.java.
+
+class t022
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t022" );
+
+    public static void main(String argv[])
+    {
+        double a, b, c, d, e;
+
+        a = 0.0;
+        b = 1.0;
+        c = 2.0;
+        e = 41.0 - c;
+        d = a + b * c / e;
+
+        t022.goldChecker.println(a);
+        t022.goldChecker.println(b);
+        t022.goldChecker.println(c);
+        t022.goldChecker.println(d);
+        t022.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.gold
new file mode 100644
index 00000000000..ce2ac0ef31a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.gold
@@ -0,0 +1,20 @@
+
+39.0
+39
+39
+39.0
+
+1.0E10
+2147483647
+10000000000
+1.0E10
+
+1.0E300
+2147483647
+9223372036854775807
+Infinity
+
+1.23456789876
+1
+1
+1.2345679
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java
new file mode 100644
index 00000000000..0d2ef87fb46
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java
@@ -0,0 +1,71 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t023.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t023.t023
+ * @run driver ExecDriver --java jit.t.t023.t023
+ */
+
+package jit.t.t023;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_d2f, opc_d2i, opc_d2l
+
+class t023
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t023" );
+
+    static void do1(double d)
+    {
+        int i;
+        long l;
+        float f;
+        i = (int) d;
+        l = (long) d;
+        f = (float) d;
+        t023.goldChecker.println();
+        t023.goldChecker.println(d);
+        t023.goldChecker.println(i);
+        t023.goldChecker.println(l);
+        t023.goldChecker.println(f);
+    }
+
+    public static void main(String argv[])
+    {
+        do1(39.0);
+        do1(1e10);
+        do1(1e300);
+        do1(1.23456789876);
+        t023.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.gold
new file mode 100644
index 00000000000..f71b2b91e6f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.gold
@@ -0,0 +1,21 @@
+t024
+
+39.0
+39
+39
+39.0
+
+1.0E10
+2147483647
+10000000000
+1.0E10
+
+Infinity
+2147483647
+9223372036854775807
+Infinity
+
+1.2345679
+1
+1
+1.2345678806304932
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java
new file mode 100644
index 00000000000..2ca8683620e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t024.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t024.t024
+ * @run driver ExecDriver --java jit.t.t024.t024
+ */
+
+package jit.t.t024;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_f2d, opc_f2i, opc_f2l
+
+class t024
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t024" );
+
+    static void do1(float f)
+    {
+        int i;
+        long l;
+        double d;
+        i = (int) f;
+        l = (long) f;
+        d = f;
+        t024.goldChecker.println();
+        t024.goldChecker.println(f);
+        t024.goldChecker.println(i);
+        t024.goldChecker.println(l);
+        t024.goldChecker.println(d);
+    }
+
+    public static void main(String argv[])
+    {
+        t024.goldChecker.println("t024");
+        do1(39.0f);
+        do1(1e10f);
+        do1((float) 1e300);
+        do1(1.23456789876f);
+        t024.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.gold
new file mode 100644
index 00000000000..1280c22f106
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.gold
@@ -0,0 +1,10 @@
+0: 0.0, 0.0
+1: 1.0, 1.0
+2: 1.0, 1.0
+3: 2.0, 2.0
+4: 3.0, 3.0
+5: 5.0, 5.0
+6: 8.0, 8.0
+7: 13.0, 13.0
+8: 21.0, 21.0
+9: 34.0, 34.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java
new file mode 100644
index 00000000000..c84421f3d80
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t025.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t025.t025
+ * @run driver ExecDriver --java jit.t.t025.t025
+ */
+
+package jit.t.t025;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_daload, opc_dastore, opc_faload, opc_fastore
+
+class t025
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t025" );
+
+    static void show(double d[], float f[])
+    {
+        for(int i=0; i<10; i+=1)
+            t025.goldChecker.println(i + ": " + f[i] + ", " + d[i]);
+    }
+
+    public static void main(String argv[])
+    {
+        double d[] = new double[10];
+        float f[] = new float[10];
+        d[0] = f[0] = 0.0f;
+        d[1] = f[1] = 1.0f;
+        for(int i=2; i<10; i+=1)
+            d[i] = f[i] = f[i-1] + f[i-2];
+        show(d, f);
+        t025.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java b/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java
new file mode 100644
index 00000000000..c86a25e3f24
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t026.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t026.t026
+ * @run driver ExecDriver --java jit.t.t026.t026
+ */
+
+package jit.t.t026;
+
+import nsk.share.TestFailure;
+
+// opc_areturn
+
+class t026
+{
+    t026 foo()
+    {
+        return new t026();
+    }
+
+    void doit()
+    {
+        t026 o = foo();
+        if(o == this)
+            throw new TestFailure("Say wut?");
+        else
+            System.out.println("Ommmm.");
+    }
+
+    public static void main(String argv[])
+    {
+        t026 o = new t026();
+        o.doit();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.gold
new file mode 100644
index 00000000000..d738b9c2f67
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.gold
@@ -0,0 +1,10 @@
+d==1.0  e==0.5
+2g
+3l
+d==1.0E300  e==5.0E-301
+2g
+3l
+d==Infinity  e==5.0E-301
+2g
+3l
+d==NaN  e==5.0E-301
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java
new file mode 100644
index 00000000000..f9a3dd7a23d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t027.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t027.t027
+ * @run driver ExecDriver --java jit.t.t027.t027
+ */
+
+package jit.t.t027;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_dcmpg, opc_dcmpl
+
+class t027
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t027" );
+
+    public static void main(String argv[])
+    {
+        double d = 1.0, e = 0.5;
+
+        t027.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t027.goldChecker.println("1l");
+        if(d > e) t027.goldChecker.println("2g");
+        if(e < d) t027.goldChecker.println("3l");
+        if(e > d) t027.goldChecker.println("4g");
+
+        d *= 1e300;
+        e /= 1e300;
+
+        t027.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t027.goldChecker.println("1l");
+        if(d > e) t027.goldChecker.println("2g");
+        if(e < d) t027.goldChecker.println("3l");
+        if(e > d) t027.goldChecker.println("4g");
+
+        d /= e;
+
+        t027.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t027.goldChecker.println("1l");
+        if(d > e) t027.goldChecker.println("2g");
+        if(e < d) t027.goldChecker.println("3l");
+        if(e > d) t027.goldChecker.println("4g");
+
+        d = 0.0/0.0;
+
+        t027.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t027.goldChecker.println("1l");
+        if(d > e) t027.goldChecker.println("2g");
+        if(e < d) t027.goldChecker.println("3l");
+        if(e > d) t027.goldChecker.println("4g");
+
+        t027.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.gold
new file mode 100644
index 00000000000..cec7fa86a51
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.gold
@@ -0,0 +1,8 @@
+1.0E300
+1.0E-34
+-1.0E300
+-1.0E-34
+Infinity
+1.0E-34
+-Infinity
+-1.0E-34
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java
new file mode 100644
index 00000000000..c8d5316bbe7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t028.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t028.t028
+ * @run driver ExecDriver --java jit.t.t028.t028
+ */
+
+package jit.t.t028;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_dneg, opc_fneg
+
+class t028
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t028" );
+
+    public static void main(String argv[])
+    {
+        double d = 1e300;
+        double x, y;
+        float e = 1e-34f;
+        float f, g;
+        t028.goldChecker.println(d); t028.goldChecker.println(e);
+        d = -(x = -(y = -d)); e = -(f = -(g = -e));
+        t028.goldChecker.println(d); t028.goldChecker.println(e);
+        d = -d; e = -e;
+        d /= e;
+        t028.goldChecker.println(d); t028.goldChecker.println(e);
+        d = -d; e = -e;
+        t028.goldChecker.println(d); t028.goldChecker.println(e);
+                               t028.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.gold
new file mode 100644
index 00000000000..19695546bd3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.gold
@@ -0,0 +1,40 @@
+
+39.12345
+10.766499999999994
+39.12345
+10.766495
+
+-39.12345
+10.766499999999994
+-39.12345
+10.766495
+
+-39.12345
+-10.766499999999994
+-39.12345
+-10.766495
+
+39.12345
+-10.766499999999994
+39.12345
+-10.766495
+
+39.12345
+10.766499999999994
+39.12345
+10.766495
+
+-39.12345
+10.766499999999994
+-39.12345
+10.766495
+
+-39.12345
+-10.766499999999994
+-39.12345
+-10.766495
+
+39.12345
+-10.766499999999994
+39.12345
+-10.766495
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java
new file mode 100644
index 00000000000..68f06352380
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java
@@ -0,0 +1,151 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t029.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t029.t029
+ * @run driver ExecDriver --java jit.t.t029.t029
+ */
+
+package jit.t.t029;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_drem, opc_frem, opc_dreturn opc_freturn
+
+class t029
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t029" );
+
+    static float frem(float f, float g)
+    {
+        return f % g;
+    }
+
+    static double drem(double d, double e)
+    {
+        return d % e;
+    }
+
+    public static void main(String argv[])
+    {
+        double d = 39.12345, e = 402.001;
+        float f = 39.12345f, g = 402.001f;
+        double x;
+        float y;
+
+        // Both pos.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(d%e);
+        t029.goldChecker.println(e%(x=d));
+        t029.goldChecker.println(f%g);
+        t029.goldChecker.println(g%(y=f));
+
+        d = -d;
+        f = -f;
+
+        // First neg; second pos.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(d%e);
+        t029.goldChecker.println(e%(x=d));
+        t029.goldChecker.println(f%g);
+        t029.goldChecker.println(g%(y=f));
+
+        e = -e;
+        g = -g;
+
+        // Both neg.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(d%e);
+        t029.goldChecker.println(e%(x=d));
+        t029.goldChecker.println(f%g);
+        t029.goldChecker.println(g%(y=f));
+
+        d = -d;
+        f = -f;
+
+        // First pos; second neg;
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(d%e);
+        t029.goldChecker.println(e%(x=d));
+        t029.goldChecker.println(f%g);
+        t029.goldChecker.println(g%(y=f));
+
+        e = -e;
+        g = -g;
+
+        // Both pos.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(drem(d,e));
+        t029.goldChecker.println(drem(e, x=d));
+        t029.goldChecker.println(frem(f, g));
+        t029.goldChecker.println(frem(g, y=f));
+
+        d = -d;
+        f = -f;
+
+        // First neg; second pos.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(drem(d,e));
+        t029.goldChecker.println(drem(e, x=d));
+        t029.goldChecker.println(frem(f, g));
+        t029.goldChecker.println(frem(g, y=f));
+
+        e = -e;
+        g = -g;
+
+        // Both neg.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(drem(d,e));
+        t029.goldChecker.println(drem(e, x=d));
+        t029.goldChecker.println(frem(f, g));
+        t029.goldChecker.println(frem(g, y=f));
+
+        d = -d;
+        f = -f;
+
+        // First pos; second neg.
+
+        t029.goldChecker.println();
+        t029.goldChecker.println(drem(d,e));
+        t029.goldChecker.println(drem(e, x=d));
+        t029.goldChecker.println(frem(f, g));
+        t029.goldChecker.println(frem(g, y=f));
+        t029.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.gold
new file mode 100644
index 00000000000..97c8f1b96c0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.gold
@@ -0,0 +1,3 @@
+39.0
+39.0
+39.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java
new file mode 100644
index 00000000000..9955e58d3cf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t030.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t030.t030
+ * @run driver ExecDriver --java jit.t.t030.t030
+ */
+
+package jit.t.t030;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_dup2, opc_dup2_x1, opc_dup2_x2
+
+class t030
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t030" );
+
+    double a[] = new double[1];
+    double d, e;
+
+    void doit()
+    {
+        e = d = a[0] = 39.0;
+        t030.goldChecker.println();
+        t030.goldChecker.println(a[0]);
+        t030.goldChecker.println(d);
+        t030.goldChecker.println(e);
+    }
+
+    public static void main(String argv[])
+    {
+        double a[] = new double[1];
+        double d, e;
+        t030 o = new t030();
+
+        e = d = a[0] = 39.0;
+        t030.goldChecker.println(a[0]);
+        t030.goldChecker.println(d);
+        t030.goldChecker.println(e);
+        t030.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.gold
new file mode 100644
index 00000000000..85a518c8db5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.gold
@@ -0,0 +1,10 @@
+d==1.0  e==0.5
+2g
+3l
+d==1.0E30  e==5.0E-31
+2g
+3l
+d==Infinity  e==5.0E-31
+2g
+3l
+d==NaN  e==5.0E-31
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java
new file mode 100644
index 00000000000..60890bae826
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java
@@ -0,0 +1,86 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t031.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t031.t031
+ * @run driver ExecDriver --java jit.t.t031.t031
+ */
+
+package jit.t.t031;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+
+// opc_fcmpg, opc_fcmpl
+
+class t031
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t031" );
+
+    public static void main(String argv[])
+    {
+        float d = 1.0f, e = 0.5f;
+
+        t031.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t031.goldChecker.println("1l");
+        if(d > e) t031.goldChecker.println("2g");
+        if(e < d) t031.goldChecker.println("3l");
+        if(e > d) t031.goldChecker.println("4g");
+
+        d *= 1e30f;
+        e /= 1e30f;
+
+        t031.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t031.goldChecker.println("1l");
+        if(d > e) t031.goldChecker.println("2g");
+        if(e < d) t031.goldChecker.println("3l");
+        if(e > d) t031.goldChecker.println("4g");
+
+        d /= e;
+
+        t031.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t031.goldChecker.println("1l");
+        if(d > e) t031.goldChecker.println("2g");
+        if(e < d) t031.goldChecker.println("3l");
+        if(e > d) t031.goldChecker.println("4g");
+
+        d = 0.0f/0.0f;
+
+        t031.goldChecker.println("d==" + d + "  e==" + e);
+        if(d < e) t031.goldChecker.println("1l");
+        if(d > e) t031.goldChecker.println("2g");
+        if(e < d) t031.goldChecker.println("3l");
+        if(e > d) t031.goldChecker.println("4g");
+
+        t031.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.gold
new file mode 100644
index 00000000000..2645f4bc5a5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.gold
@@ -0,0 +1,15 @@
+
+39.0
+39.0
+39
+39
+
+39.0
+39.0
+39
+39
+
+1.0E9
+1.0E9
+1000000000
+1000000000
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java
new file mode 100644
index 00000000000..796c2516fc7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t032.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t032.t032
+ * @run driver ExecDriver --java jit.t.t032.t032
+ */
+
+package jit.t.t032;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_i2d, opc_i2f, opc_i2l
+// opc_l2d, opc_l2f, opc_l2i
+
+class t032
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t032" );
+
+    static int i;
+    static long l;
+    static double d;
+    static float f;
+
+    static void showem()
+    {
+        t032.goldChecker.println();
+        t032.goldChecker.println(d);
+        t032.goldChecker.println(f);
+        t032.goldChecker.println(i);
+        t032.goldChecker.println(l);
+    }
+
+    public static void main(String argv[])
+    {
+        i = 39;
+        d = i;
+        f = (float) i;
+        l = i;
+        showem();
+
+        l = 39;
+        d = (double) l;
+        f = (float) l;
+        i = (int) l;
+        showem();
+
+        l = 1000000000;;
+        d = (double) l;
+        f = (float) l;
+        i = (int) l;
+        showem();
+
+        t032.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.gold
new file mode 100644
index 00000000000..c9affe84850
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.gold
@@ -0,0 +1,6 @@
+4
+47
+43
+4
+47
+43
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java
new file mode 100644
index 00000000000..b27b5215d96
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t033.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t033.t033
+ * @run driver ExecDriver --java jit.t.t033.t033
+ */
+
+package jit.t.t033;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_iand, opc_ior, opc_ixor
+// opc_land, opc_lor, opc_lxor
+
+class t033
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t033" );
+
+    int i = 39;
+    int j = 12;
+    long l = 39;
+    long m = 12;
+
+    void doit()
+    {
+        t033.goldChecker.println(i&j);
+        t033.goldChecker.println(i|j);
+        t033.goldChecker.println(i^j);
+        t033.goldChecker.println(l&m);
+        t033.goldChecker.println(l|m);
+        t033.goldChecker.println(l^m);
+    }
+
+    public static void main(String argv[])
+    {
+        t033 o = new t033();
+        o.doit();
+        t033.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.gold
new file mode 100644
index 00000000000..29a569fce7b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.gold
@@ -0,0 +1,21 @@
+0
+99
+6
+1
+1
+409
+57
+2814
+3
+395
+
+0
+-99
+-6
+-2
+2147483646
+-395
+-57
+-2814
+-3
+-409
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java
new file mode 100644
index 00000000000..1385fb2f52b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java
@@ -0,0 +1,95 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t034.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t034.t034
+ * @run driver ExecDriver --java jit.t.t034.t034
+ */
+
+package jit.t.t034;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_idiv
+// opc_imul
+// opc_ishl
+// opc_ishr
+// opc_iushr
+// opc_ladd
+// opc_ldiv
+// opc_lmul
+// opc_lrem
+// opc_lsub
+
+class t034
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t034" );
+
+    public static void main(String argv[])
+    {
+        int i, j;
+        long l, m;
+
+        i = 3;
+        j = 33;
+        l = 402;
+        m = 7;
+
+        t034.goldChecker.println(i/j);
+        t034.goldChecker.println(i*j);
+        t034.goldChecker.println(i<<j);
+        t034.goldChecker.println(i>>j);
+        t034.goldChecker.println(i>>>j);
+        t034.goldChecker.println(l+m);
+        t034.goldChecker.println(l/m);
+        t034.goldChecker.println(l*m);
+        t034.goldChecker.println(l%m);
+        t034.goldChecker.println(l-m);
+
+        i = -i;
+        l = -l;
+
+        t034.goldChecker.println();
+        t034.goldChecker.println(i/j);
+        t034.goldChecker.println(i*j);
+        t034.goldChecker.println(i<<j);
+        t034.goldChecker.println(i>>j);
+        t034.goldChecker.println(i>>>j);
+        t034.goldChecker.println(l+m);
+        t034.goldChecker.println(l/m);
+        t034.goldChecker.println(l*m);
+        t034.goldChecker.println(l%m);
+        t034.goldChecker.println(l-m);
+
+        t034.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.gold
new file mode 100644
index 00000000000..cb961ac671a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.gold
@@ -0,0 +1,21 @@
+0
+99
+6
+1
+1
+403
+402
+402
+0
+401
+
+0
+-99
+-6
+-2
+2147483646
+-401
+-402
+-402
+0
+-403
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java
new file mode 100644
index 00000000000..a28188cc20e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java
@@ -0,0 +1,95 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t035.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t035.t035
+ * @run driver ExecDriver --java jit.t.t035.t035
+ */
+
+package jit.t.t035;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_idiv
+// opc_imul
+// opc_ishl
+// opc_ishr
+// opc_iushr
+// opc_ladd
+// opc_ldiv
+// opc_lmul
+// opc_lrem
+// opc_lsub
+
+class t035
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t035" );
+
+    public static void main(String argv[])
+    {
+        int i, j;
+        long l, m;
+
+        i = 3;
+        j = 33;
+        l = 402;
+        m = 1;
+
+        t035.goldChecker.println(i/j);
+        t035.goldChecker.println(i*j);
+        t035.goldChecker.println(i<<j);
+        t035.goldChecker.println(i>>j);
+        t035.goldChecker.println(i>>>j);
+        t035.goldChecker.println(l+m);
+        t035.goldChecker.println(l/m);
+        t035.goldChecker.println(l*m);
+        t035.goldChecker.println(l%m);
+        t035.goldChecker.println(l-m);
+
+        i = -i;
+        l = -l;
+
+        t035.goldChecker.println();
+        t035.goldChecker.println(i/j);
+        t035.goldChecker.println(i*j);
+        t035.goldChecker.println(i<<j);
+        t035.goldChecker.println(i>>j);
+        t035.goldChecker.println(i>>>j);
+        t035.goldChecker.println(l+m);
+        t035.goldChecker.println(l/m);
+        t035.goldChecker.println(l*m);
+        t035.goldChecker.println(l%m);
+        t035.goldChecker.println(l-m);
+
+        t035.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.gold
new file mode 100644
index 00000000000..b7acc349111
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.gold
@@ -0,0 +1,70 @@
+
+39
+39
+39
+39
+
+-1
+-1
+65535
+-1
+
+127
+127
+127
+127
+
+128
+-128
+128
+128
+
+-128
+-128
+65408
+-128
+
+-129
+127
+65407
+-129
+
+32767
+-1
+32767
+32767
+
+32768
+0
+32768
+-32768
+
+-32768
+0
+32768
+-32768
+
+-32769
+-1
+32767
+32767
+
+65535
+-1
+65535
+-1
+
+65536
+0
+0
+0
+
+-65536
+0
+0
+0
+
+-65537
+-1
+65535
+-1
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java
new file mode 100644
index 00000000000..ab4c81ac9ac
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java
@@ -0,0 +1,80 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t036.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t036.t036
+ * @run driver ExecDriver --java jit.t.t036.t036
+ */
+
+package jit.t.t036;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_int2byte, opc_int2char, opc_int2short
+
+class t036
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t036" );
+
+    static void show(int i, byte b, char c, short s)
+    {
+        t036.goldChecker.println();
+        t036.goldChecker.println(i);
+        t036.goldChecker.println(b);
+        t036.goldChecker.println((int) c);
+        t036.goldChecker.println(s);
+    }
+
+    public static void main(String argv[])
+    {
+        int i;
+        char c;
+        short s;
+        byte b;
+
+        i = 39; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -1; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = 127; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = 128; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -128; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -129; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = 32767; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = 32768; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -32768; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -32769; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = 65535; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = 65536; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -65536; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+        i = -65537; b = (byte) i; c = (char) i; s = (short) i; show(i,b,c,s);
+                                                               t036.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.gold
new file mode 100644
index 00000000000..a9b6972f84c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.gold
@@ -0,0 +1 @@
+Hey dee ho from Lilliput.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java
new file mode 100644
index 00000000000..87ac4f7540b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t037.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t037.t037
+ * @run driver ExecDriver --java jit.t.t037.t037
+ */
+
+package jit.t.t037;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_invokeinterface
+
+interface foo
+{
+    void doit();
+}
+
+class t037 implements foo
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t037" );
+
+    public void doit()
+    {
+        t037.goldChecker.println("Hey dee ho from Lilliput.");
+    }
+
+    public static void main(String argv[])
+    {
+        foo o = new t037();
+        o.doit();
+        t037.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.gold
new file mode 100644
index 00000000000..f6cdd598aa3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.gold
@@ -0,0 +1,10 @@
+0
+1
+1
+2
+3
+5
+8
+13
+21
+34
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java
new file mode 100644
index 00000000000..8ba0fab425c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t038.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t038.t038
+ * @run driver ExecDriver --java jit.t.t038.t038
+ */
+
+package jit.t.t038;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_laload, opc_lastore, opc_lconst_0
+
+class t038
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t038" );
+
+    public static void main(String argv[])
+    {
+        long a[] = new long[10];
+        int i;
+        a[0] = 0l;
+        a[1] = 1l;
+        for(i = 2; i < 10; i++)
+            a[i] = a[i-1] + a[i-2];
+        i = 0;
+        do
+            t038.goldChecker.println(a[i++]);
+        while(i < 10);
+        t038.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.gold
new file mode 100644
index 00000000000..073a2dc8a5b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.gold
@@ -0,0 +1,8 @@
+2: 1
+3: 2
+4: 3
+5: 5
+6: 8
+7: 13
+8: 21
+9: 34
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java
new file mode 100644
index 00000000000..ce4ca0b3aa4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t039.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t039.t039
+ * @run driver ExecDriver --java jit.t.t039.t039
+ */
+
+package jit.t.t039;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// opc_lreturn, opc_monitorenter, opc_monitorexit
+
+class t039
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t039" );
+
+    private static long f0 = 0, f1 = 1;
+    private static Object x = new Object();
+
+    private static long nextFib()
+    {
+        long res;
+
+        synchronized(x)
+        {
+            res = f0 + f1;
+            f0 = f1;
+            f1 = res;
+        }
+        return res;
+    }
+
+    public static void main(String argv[])
+    {
+        for(int i=2; i<10; ++i)
+            t039.goldChecker.println(i + ": " + nextFib());
+        t039.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.gold
new file mode 100644
index 00000000000..006e7d18c38
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.gold
@@ -0,0 +1,64 @@
+0,0,0 <-> 0,0,0: 0.0
+0,0,0 <-> 0,0,1: 1.0
+0,0,1 <-> 0,0,0: 1.0
+0,0,1 <-> 0,0,1: 0.0
+0,0,0 <-> 0,1,0: 1.0
+0,0,0 <-> 0,1,1: 1.414213562373095
+0,0,1 <-> 0,1,0: 1.414213562373095
+0,0,1 <-> 0,1,1: 1.0
+0,1,0 <-> 0,0,0: 1.0
+0,1,0 <-> 0,0,1: 1.414213562373095
+0,1,1 <-> 0,0,0: 1.414213562373095
+0,1,1 <-> 0,0,1: 1.0
+0,1,0 <-> 0,1,0: 0.0
+0,1,0 <-> 0,1,1: 1.0
+0,1,1 <-> 0,1,0: 1.0
+0,1,1 <-> 0,1,1: 0.0
+0,0,0 <-> 1,0,0: 1.0
+0,0,0 <-> 1,0,1: 1.414213562373095
+0,0,1 <-> 1,0,0: 1.414213562373095
+0,0,1 <-> 1,0,1: 1.0
+0,0,0 <-> 1,1,0: 1.414213562373095
+0,0,0 <-> 1,1,1: 1.7320508075688774
+0,0,1 <-> 1,1,0: 1.7320508075688774
+0,0,1 <-> 1,1,1: 1.414213562373095
+0,1,0 <-> 1,0,0: 1.414213562373095
+0,1,0 <-> 1,0,1: 1.7320508075688774
+0,1,1 <-> 1,0,0: 1.7320508075688774
+0,1,1 <-> 1,0,1: 1.414213562373095
+0,1,0 <-> 1,1,0: 1.0
+0,1,0 <-> 1,1,1: 1.414213562373095
+0,1,1 <-> 1,1,0: 1.414213562373095
+0,1,1 <-> 1,1,1: 1.0
+1,0,0 <-> 0,0,0: 1.0
+1,0,0 <-> 0,0,1: 1.414213562373095
+1,0,1 <-> 0,0,0: 1.414213562373095
+1,0,1 <-> 0,0,1: 1.0
+1,0,0 <-> 0,1,0: 1.414213562373095
+1,0,0 <-> 0,1,1: 1.7320508075688774
+1,0,1 <-> 0,1,0: 1.7320508075688774
+1,0,1 <-> 0,1,1: 1.414213562373095
+1,1,0 <-> 0,0,0: 1.414213562373095
+1,1,0 <-> 0,0,1: 1.7320508075688774
+1,1,1 <-> 0,0,0: 1.7320508075688774
+1,1,1 <-> 0,0,1: 1.414213562373095
+1,1,0 <-> 0,1,0: 1.0
+1,1,0 <-> 0,1,1: 1.414213562373095
+1,1,1 <-> 0,1,0: 1.414213562373095
+1,1,1 <-> 0,1,1: 1.0
+1,0,0 <-> 1,0,0: 0.0
+1,0,0 <-> 1,0,1: 1.0
+1,0,1 <-> 1,0,0: 1.0
+1,0,1 <-> 1,0,1: 0.0
+1,0,0 <-> 1,1,0: 1.0
+1,0,0 <-> 1,1,1: 1.414213562373095
+1,0,1 <-> 1,1,0: 1.414213562373095
+1,0,1 <-> 1,1,1: 1.0
+1,1,0 <-> 1,0,0: 1.0
+1,1,0 <-> 1,0,1: 1.414213562373095
+1,1,1 <-> 1,0,0: 1.414213562373095
+1,1,1 <-> 1,0,1: 1.0
+1,1,0 <-> 1,1,0: 0.0
+1,1,0 <-> 1,1,1: 1.0
+1,1,1 <-> 1,1,0: 1.0
+1,1,1 <-> 1,1,1: 0.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java
new file mode 100644
index 00000000000..b6390a013b7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t040.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t040.t040
+ * @run driver ExecDriver --java jit.t.t040.t040
+ */
+
+package jit.t.t040;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+
+// opc_multianewarray
+
+class t040
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t040" );
+
+    private static int id(int i)
+    {
+        return i;
+    }
+    private static double sqrt(double x)
+    {
+        double q;
+        double qsquared;
+        if(x == 0.0)
+            return 0.0;
+        q = x;
+        for(int i=0; i<6; i+=1)
+        {
+            qsquared = q * q;
+            q += (x - qsquared) / (2.0 * q);
+        }
+        return q;
+    }
+
+    private static double abs(double x)
+    {
+        return x >= 0.0 ? x : -x;
+    }
+
+    public static void main(String argv[])
+    {
+        int c[][][] = null;
+
+        c = new int[id(2)][id(2)][id(2)];
+        for(int i1=id(0); i1<id(2); i1+=id(1))
+        {
+        for(int j1=id(0); j1<id(2); j1+=id(1))
+        {
+            for(int i2=id(0); i2<id(2); i2+=id(1))
+            {
+            for(int j2=id(0); j2<id(2); j2+=id(1))
+            {
+                for(int i3=id(0); i3<id(2); i3+=id(1))
+                {
+                for(int j3=id(0); j3<id(2); j3+=id(1))
+                {
+                    double d;
+                    int d1,d2,d3;
+                    t040.goldChecker.print(i1 + "," + i2 + "," + i3 + " <-> ");
+                    t040.goldChecker.print(j1 + "," + j2 + "," + j3 +": ");
+                    d1 = j1 - i1;
+                    d2 = j2 - i2;
+                    d3 = j3 - i3;
+                    d = sqrt(d1*d1 + d2*d2 + d3*d3);
+                    t040.goldChecker.println(d);
+                }
+                }
+            }
+            }
+        }
+        }
+        t040.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java b/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java
new file mode 100644
index 00000000000..10765714a1d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t041.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t041.t041
+ * @run driver ExecDriver --java jit.t.t041.t041
+ */
+
+package jit.t.t041;
+
+import nsk.share.TestFailure;
+
+// opc_swap
+
+class t041
+{
+    public static void main(String argv[])
+    {
+        String j = "Now now";
+        j += ", Brown Cow?";
+        if(!j.equals("Now now, Brown Cow?"))
+                throw new TestFailure("Test failed");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.gold
new file mode 100644
index 00000000000..24e41612cd3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.gold
@@ -0,0 +1,41 @@
+sameAs(a, a): true
+sameAs(a, b): false
+sameAs(a, c): true
+sameAs(a, x): true
+sameAs(a, y): false
+sameAs(a, z): false
+
+sameAs(b, a): left object is null
+sameAs(b, b): left object is null
+sameAs(b, c): left object is null
+sameAs(b, x): left object is null
+sameAs(b, y): left object is null
+sameAs(b, z): left object is null
+
+sameAs(c, a): true
+sameAs(c, b): false
+sameAs(c, c): true
+sameAs(c, x): true
+sameAs(c, y): false
+sameAs(c, z): false
+
+sameAs(x, a): true
+sameAs(x, b): false
+sameAs(x, c): true
+sameAs(x, x): true
+sameAs(x, y): false
+sameAs(x, z): false
+
+sameAs(y, a): false
+sameAs(y, b): false
+sameAs(y, c): false
+sameAs(y, x): false
+sameAs(y, y): true
+sameAs(y, z): false
+
+sameAs(z, a): left object is null
+sameAs(z, b): left object is null
+sameAs(z, c): left object is null
+sameAs(z, x): left object is null
+sameAs(z, y): left object is null
+sameAs(z, z): left object is null
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java
new file mode 100644
index 00000000000..9d8f0eb2513
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java
@@ -0,0 +1,115 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t042.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t042.t042
+ * @run driver ExecDriver --java jit.t.t042.t042
+ */
+
+package jit.t.t042;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// The special little twiddle that occurs when you invoke a method
+// of an array.
+
+class t042
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t042" );
+
+    static void sameAs(Object x, Object y, String call)
+    {
+        t042.goldChecker.print(call + ": ");
+        if(x == null)
+            t042.goldChecker.println("left object is null");
+        if(x != null)
+            t042.goldChecker.println(x.equals(y));
+    }
+
+    public static void main(String argv[])
+    {
+        int a[] = new int[3];
+        int b[] = null;
+        int c[] = a;
+        Object x = a;
+        Object y = new Object();
+        Object z = null;
+
+        sameAs(a, a, "sameAs(a, a)");
+        sameAs(a, b, "sameAs(a, b)");
+        sameAs(a, c, "sameAs(a, c)");
+        sameAs(a, x, "sameAs(a, x)");
+        sameAs(a, y, "sameAs(a, y)");
+        sameAs(a, z, "sameAs(a, z)");
+
+        t042.goldChecker.println();
+        sameAs(b, a, "sameAs(b, a)");
+        sameAs(b, b, "sameAs(b, b)");
+        sameAs(b, c, "sameAs(b, c)");
+        sameAs(b, x, "sameAs(b, x)");
+        sameAs(b, y, "sameAs(b, y)");
+        sameAs(b, z, "sameAs(b, z)");
+
+        t042.goldChecker.println();
+        sameAs(c, a, "sameAs(c, a)");
+        sameAs(c, b, "sameAs(c, b)");
+        sameAs(c, c, "sameAs(c, c)");
+        sameAs(c, x, "sameAs(c, x)");
+        sameAs(c, y, "sameAs(c, y)");
+        sameAs(c, z, "sameAs(c, z)");
+
+        t042.goldChecker.println();
+        sameAs(x, a, "sameAs(x, a)");
+        sameAs(x, b, "sameAs(x, b)");
+        sameAs(x, c, "sameAs(x, c)");
+        sameAs(x, x, "sameAs(x, x)");
+        sameAs(x, y, "sameAs(x, y)");
+        sameAs(x, z, "sameAs(x, z)");
+
+        t042.goldChecker.println();
+        sameAs(y, a, "sameAs(y, a)");
+        sameAs(y, b, "sameAs(y, b)");
+        sameAs(y, c, "sameAs(y, c)");
+        sameAs(y, x, "sameAs(y, x)");
+        sameAs(y, y, "sameAs(y, y)");
+        sameAs(y, z, "sameAs(y, z)");
+
+        t042.goldChecker.println();
+        sameAs(z, a, "sameAs(z, a)");
+        sameAs(z, b, "sameAs(z, b)");
+        sameAs(z, c, "sameAs(z, c)");
+        sameAs(z, x, "sameAs(z, x)");
+        sameAs(z, y, "sameAs(z, y)");
+        sameAs(z, z, "sameAs(z, z)");
+        t042.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.gold
new file mode 100644
index 00000000000..3086305e213
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.gold
@@ -0,0 +1,4 @@
+Int: 78
+Long: 78
+Float: 210.0
+Double: 210.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java
new file mode 100644
index 00000000000..d5d9f347fc2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t043.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t043.t043
+ * @run driver ExecDriver --java jit.t.t043.t043
+ */
+
+package jit.t.t043;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Register jams and spills
+
+class t043
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t043" );
+
+    static void intAdds()
+    {
+        int a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a+b) + ((c+d) + ((e+f) + ((g+h) + ((i+j) + (k+l)))));
+        t043.goldChecker.println("Int: " + z);
+    }
+
+    static void longAdds()
+    {
+        long a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a+b) + ((c+d) + ((e+f) + ((g+h) + ((i+j) + (k+l)))));
+        t043.goldChecker.println("Long: " + z);
+    }
+
+    static void floatAdds()
+    {
+        float a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a+b) + ((c+d) + ((e+f) + ((g+h) + ((i+j) + ((k+l) + ((m+n) +
+            ((o+p) + ((q+r) + (s+t)))))))));
+        t043.goldChecker.println("Float: " + z);
+    }
+
+    static void doubleAdds()
+    {
+        double a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a+b) + ((c+d) + ((e+f) + ((g+h) + ((i+j) + ((k+l) + ((m+n) +
+            ((o+p) + ((q+r) + (s+t)))))))));
+        t043.goldChecker.println("Double: " + z);
+    }
+
+    public static void main(String argv[])
+    {
+        intAdds();
+        longAdds();
+        floatAdds();
+        doubleAdds();
+        t043.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java b/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java
new file mode 100644
index 00000000000..bac3c535989
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java
@@ -0,0 +1,61 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t044.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t044.t044
+ * @run driver ExecDriver --java jit.t.t044.t044
+ */
+
+package jit.t.t044;
+
+import nsk.share.TestFailure;
+
+// Call interferes with one lazy load but not the other.
+
+class t044
+{
+    static double x = 409.0;
+
+    static double doodah()
+    {
+        return 39.0;
+    }
+
+    public static void main(String argv[])
+    {
+        double d = 42.0;
+        double a;
+
+        a = d + (x + doodah());
+        if(a != 490.0)
+                throw new TestFailure("a != 490.0 (" + a + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java b/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java
new file mode 100644
index 00000000000..754dfb43b8a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t045.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t045.t045
+ * @run driver ExecDriver --java jit.t.t045.t045
+ */
+
+package jit.t.t045;
+
+import nsk.share.TestFailure;
+
+// Putfield interferes with one lazy load but not the other.
+
+class t045
+{
+    static double x = 409.0;
+    static double y;
+
+    public static void main(String argv[])
+    {
+        double d = 42.0;
+        double a;
+
+        a = d + (x + (y=39.0));
+        if(a != 490.0)
+                throw new TestFailure("a != 490.0 (" + a + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.gold
new file mode 100644
index 00000000000..5f44f8a0ad6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.gold
@@ -0,0 +1,4 @@
+Int: 0
+Long: 0
+Float: 0.0
+Double: 0.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java
new file mode 100644
index 00000000000..ff595b81fbd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t046.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t046.t046
+ * @run driver ExecDriver --java jit.t.t046.t046
+ */
+
+package jit.t.t046;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Register jams and spills
+
+class t046
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t046" );
+
+    static void intSubs()
+    {
+        int a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a-b) - ((c-d) - ((e-f) - ((g-h) - ((i-j) - (k-l)))));
+        t046.goldChecker.println("Int: " + z);
+    }
+
+    static void longSubs()
+    {
+        long a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a-b) - ((c-d) - ((e-f) - ((g-h) - ((i-j) - (k-l)))));
+        t046.goldChecker.println("Long: " + z);
+    }
+
+    static void floatSubs()
+    {
+        float a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a-b) - ((c-d) - ((e-f) - ((g-h) - ((i-j) - ((k-l) - ((m-n) -
+            ((o-p) - ((q-r) - (s-t)))))))));
+        t046.goldChecker.println("Float: " + z);
+    }
+
+    static void doubleSubs()
+    {
+        double a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a-b) - ((c-d) - ((e-f) - ((g-h) - ((i-j) - ((k-l) - ((m-n) -
+            ((o-p) - ((q-r) - (s-t)))))))));
+        t046.goldChecker.println("Double: " + z);
+    }
+
+    public static void main(String argv[])
+    {
+        intSubs();
+        longSubs();
+        floatSubs();
+        doubleSubs();
+        t046.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.gold
new file mode 100644
index 00000000000..505ec66c45c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.gold
@@ -0,0 +1,4 @@
+Int: 479001600
+Long: 479001600
+Float: 2.43290202E18
+Double: 2.43290200817664E18
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java
new file mode 100644
index 00000000000..f44ba40a789
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t047.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t047.t047
+ * @run driver ExecDriver --java jit.t.t047.t047
+ */
+
+package jit.t.t047;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Register jams and spills
+
+class t047
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t047" );
+
+    static void intMuls()
+    {
+        int a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a*b) * ((c*d) * ((e*f) * ((g*h) * ((i*j) * (k*l)))));
+        t047.goldChecker.println("Int: " + z);
+    }
+
+    static void longMuls()
+    {
+        long a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a*b) * ((c*d) * ((e*f) * ((g*h) * ((i*j) * (k*l)))));
+        t047.goldChecker.println("Long: " + z);
+    }
+
+    static void floatMuls()
+    {
+        float a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a*b) * ((c*d) * ((e*f) * ((g*h) * ((i*j) * ((k*l) * ((m*n) *
+            ((o*p) * ((q*r) * (s*t)))))))));
+        t047.goldChecker.println("Float: " + z);
+    }
+
+    static void doubleMuls()
+    {
+        double a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a*b) * ((c*d) * ((e*f) * ((g*h) * ((i*j) * ((k*l) * ((m*n) *
+            ((o*p) * ((q*r) * (s*t)))))))));
+        t047.goldChecker.println("Double: " + z);
+    }
+
+    public static void main(String argv[])
+    {
+        intMuls();
+        longMuls();
+        floatMuls();
+        doubleMuls();
+        t047.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.gold
new file mode 100644
index 00000000000..186a1210415
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.gold
@@ -0,0 +1,28 @@
+t6 = 1
+t5 = 1
+t5 = 1
+t4 = 1
+t1 == 1
+i: 13, j: 12, res: 1
+i: 11, j: 10, res: 1
+i: 9, j: 8, res: 1
+i: 7, j: 6, res: 1
+i: 5, j: 4, res: 1
+i: 3, j: 2, res: 1
+i: 1, j: 1, res: 1
+i: 1, j: 1, res: 1
+i: 1, j: 1, res: 1
+i: 1, j: 1, res: 1
+i: 1, j: 1, res: 1
+Int: 1
+Long: 1
+Float: 0.61382884
+Float: 1.0
+Float: 1.6291187
+Float: 2.6540277
+Float: 4.323726
+Float: 7.043863
+Float: 11.475288
+Float: 18.694607
+Float: 30.455732
+Double: 0.6138289446560126
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java
new file mode 100644
index 00000000000..3abc9f42d91
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java
@@ -0,0 +1,172 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t048.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t048.t048
+ * @run driver ExecDriver --java jit.t.t048.t048
+ */
+
+package jit.t.t048;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Register jams and spills
+
+class t048
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t048" );
+
+    static int idiv(int i, int j)
+    {
+        int res = i / j;
+        t048.goldChecker.println("i: " + i + ", j: " + j + ", res: " + res);
+        return res;
+    }
+
+    static void intDivs()
+    {
+        int a, b, c, d, e, f, g, h, i, j, k, l, z;
+        int t1, t2, t3, t4, t5, t6, t7;
+
+        a=13; b=12; c=11; d=10; e=9; f=8; g=7; h=6; i=5; j=4; k=3; l=2;
+
+        t1 = a/b;
+        t2 = c/d;
+        t3 = e/f;
+        t4 = g/h;
+        t5 = i/j;
+        t6 = k/l;
+        t048.goldChecker.println("t6 = " + t6);
+        t048.goldChecker.println("t5 = " + t5);
+        t5 /= t6;
+        t048.goldChecker.println("t5 = " + t5);
+        t048.goldChecker.println("t4 = " + t4);
+        t4 /= t5;
+        t3 /= t4;
+        t2 /= t3;
+        t1 /= t2;
+
+        t048.goldChecker.println("t1 == " + t1);
+        z = idiv
+        (
+            idiv(a,b),
+            idiv
+            (
+                idiv(c,d),
+                idiv
+                (
+                    idiv(e,f),
+                    idiv
+                    (
+                        idiv(g,h),
+                        idiv
+                        (
+                            idiv(i,j),
+                            idiv(k, l)
+                        )
+                    )
+                )
+            )
+        );
+        z = (a/b) /
+            ((c/d) /
+            ((e/f) /
+            ((g/h) /
+            ((i/j) / (k/l)))));
+        t048.goldChecker.println("Int: " + z);
+    }
+
+    static void longDivs()
+    {
+        long a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=13; b=12; c=11; d=10; e=9; f=8; g=7; h=6; i=5; j=4; k=3; l=2;
+
+        z = (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / (k/l)))));
+        t048.goldChecker.println("Long: " + z);
+    }
+
+    static void floatDivs()
+    {
+        float a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+        z /= (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Float: " + z);
+    }
+
+    static void doubleDivs()
+    {
+        double a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a/b) / ((c/d) / ((e/f) / ((g/h) / ((i/j) / ((k/l) / ((m/n) /
+            ((o/p) / ((q/r) / (s/t)))))))));
+        t048.goldChecker.println("Double: " + z);
+    }
+
+    public static void main(String argv[])
+    {
+        intDivs();
+        longDivs();
+        floatDivs();
+        doubleDivs();
+        t048.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.gold
new file mode 100644
index 00000000000..8c2168e996e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.gold
@@ -0,0 +1,4 @@
+Int: 1
+Long: 1
+Float: 1.0
+Double: 1.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java
new file mode 100644
index 00000000000..1d19325cee5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t049.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t049.t049
+ * @run driver ExecDriver --java jit.t.t049.t049
+ */
+
+package jit.t.t049;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Register jams and spills
+
+class t049
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t049" );
+
+    static void intRems()
+    {
+        int a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a%b) % ((c%d) % ((e%f) % ((g%h) % ((i%j) % (k%l)))));
+        t049.goldChecker.println("Int: " + z);
+    }
+
+    static void longRems()
+    {
+        long a, b, c, d, e, f, g, h, i, j, k, l, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        z = (a%b) % ((c%d) % ((e%f) % ((g%h) % ((i%j) % (k%l)))));
+        t049.goldChecker.println("Long: " + z);
+    }
+
+    static void floatRems()
+    {
+        float a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a%b) % ((c%d) % ((e%f) % ((g%h) % ((i%j) % ((k%l) % ((m%n) %
+            ((o%p) % ((q%r) % (s%t)))))))));
+        t049.goldChecker.println("Float: " + z);
+    }
+
+    static void doubleRems()
+    {
+        double a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, z;
+
+        a=1; b=2; c=3; d=4; e=5; f=6; g=7; h=8; i=9; j=10; k=11; l=12;
+        m=13; n=14; o=15; p=16; q=17; r=18; s=19; t=20;
+        z = (a%b) % ((c%d) % ((e%f) % ((g%h) % ((i%j) % ((k%l) % ((m%n) %
+            ((o%p) % ((q%r) % (s%t)))))))));
+        t049.goldChecker.println("Double: " + z);
+    }
+
+    public static void main(String argv[])
+    {
+        intRems();
+        longRems();
+        floatRems();
+        doubleRems();
+        t049.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java b/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java
new file mode 100644
index 00000000000..ac3c9d52b84
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java
@@ -0,0 +1,53 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t050.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t050.t050
+ * @run driver ExecDriver --java jit.t.t050.t050
+ */
+
+package jit.t.t050;
+
+import nsk.share.TestFailure;
+
+// Pending local load clobbered by local store.
+
+class t050
+{
+    public static void main(String argv[])
+    {
+        int i;
+        i = 39;
+        i = i + (i = 42);
+        if(i != 81)
+                throw new TestFailure("i != 81 (" + i + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.gold
new file mode 100644
index 00000000000..445480f8908
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.gold
@@ -0,0 +1,100 @@
+0: 0.0
+1: -0.4972521760464922
+2: -0.9945043520929844
+3: -1.491756528139476
+4: -1.9890087041859688
+5: -2.4862608802324604
+6: -2.983513056278952
+7: -3.480765232325445
+8: -3.9780174083719375
+9: -4.475269584418431
+10: -4.972521760464921
+11: -5.469773936511414
+12: -5.967026112557904
+13: -6.464278288604402
+14: -6.96153046465089
+15: -7.458782640697382
+16: -7.956034816743875
+17: -8.45328699279037
+18: -8.950539168836862
+19: -9.447791344883354
+20: -9.945043520929842
+21: -10.442295696976343
+22: -10.939547873022828
+23: -11.436800049069317
+24: -11.934052225115808
+25: -12.431304401162302
+26: -12.928556577208804
+27: -13.425808753255291
+28: -13.92306092930178
+29: -14.420313105348281
+30: -14.917565281394763
+31: -15.414817457441274
+32: -15.91206963348775
+33: -16.409321809534248
+34: -16.90657398558074
+35: -17.403826161627222
+36: -17.901078337673724
+37: -18.398330513720232
+38: -18.89558268976671
+39: -19.392834865813207
+40: -19.890087041859683
+41: -20.387339217906167
+42: -20.884591393952686
+43: -21.381843569999166
+44: -21.879095746045657
+45: -22.37634792209214
+46: -22.873600098138635
+47: -23.370852274185143
+48: -23.868104450231616
+49: -24.3653566262781
+50: -24.862608802324605
+51: -25.359860978371124
+52: -25.857113154417608
+53: -26.35436533046408
+54: -26.851617506510582
+55: -27.348869682557083
+56: -27.84612185860356
+57: -28.34337403465006
+58: -28.840626210696563
+59: -29.337878386743036
+60: -29.835130562789526
+61: -30.332382738836014
+62: -30.829634914882547
+63: -31.326887090929016
+64: -31.8241392669755
+65: -32.321391443021994
+66: -32.818643619068496
+67: -33.31589579511496
+68: -33.81314797116148
+69: -34.31040014720795
+70: -34.807652323254445
+71: -35.30490449930095
+72: -35.80215667534745
+73: -36.29940885139391
+74: -36.796661027440464
+75: -37.29391320348694
+76: -37.79116537953342
+77: -38.288417555579905
+78: -38.78566973162641
+79: -39.282921907672915
+80: -39.780174083719366
+81: -40.27742625976585
+82: -40.77467843581233
+83: -41.27193061185887
+84: -41.76918278790537
+85: -42.2664349639518
+86: -42.76368713999833
+87: -43.26093931604482
+88: -43.75819149209131
+89: -44.25544366813782
+90: -44.75269584418428
+91: -45.249948020230825
+92: -45.74720019627727
+93: -46.24445237232375
+94: -46.741704548370286
+95: -47.23895672441677
+96: -47.73620890046323
+97: -48.23346107650974
+98: -48.7307132525562
+99: -49.227965428602765
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java
new file mode 100644
index 00000000000..8cd0d32abe6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t051.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t051.t051
+ * @run driver ExecDriver --java jit.t.t051.t051
+ */
+
+package jit.t.t051;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t051
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t051" );
+
+    static final int N = 1000;
+
+    public static void main(String argv[])
+    {
+
+        double a[] = new double[100];
+        double b[] = new double[100];
+        double x, y;
+        int i, ii;
+
+        for(i=0; i<100; i+=1)
+        {
+            a[i] = i;
+            b[i] = -i;
+        }
+
+        x = .99999999999998;
+        y = 1.0;
+
+        for(ii=0; ii<N; ii+=1)
+        {
+            for(i=0; i<100; i+=1)
+                a[i] += x*b[i];
+            x *= x*y;
+            y = -y;
+        }
+
+        for(i=0; i<100; i+=1)
+            t051.goldChecker.println(i + ": " + a[i]);
+        t051.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.gold
new file mode 100644
index 00000000000..6df6bc41989
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.gold
@@ -0,0 +1,62 @@
+
+init
+3
+0.0
+0.1
+0.98
+1
+5.0E-8
+0.5
+2.0408163265306123
+
+at init loop
+N: 3
+inside outer
+inside inner
+1
+1
+0.45
+
+entering loop
+x[1][1]: 0.45
+
+first blast in loop
+2
+0
+1.0
+-0.45
+0.0
+0.55
+0.07562500000000001
+0.30062500000000003
+-0.030937500000000003
+0.0
+0.0
+
+opnds of pxx
+1.0
+0.45
+0.0
+
+second blast in loop
+-0.30062500000000003
+0.7555867346938776
+0.09999999999999998
+0.05499999999999994
+0.09999999999999998
+0.05499999999999999
+0.0
+-0.9
+
+first elts of rx[], ry[]
+rx[1][0]: 0.03762499999999999
+ry[1][0]: -0.007150000000000007
+
+Rxm, rym
+0.0
+0.0
+
+1
+1
+0.0
+5.0E-8
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java
new file mode 100644
index 00000000000..f3c534f5183
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java
@@ -0,0 +1,286 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t052.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t052.t052
+ * @run driver ExecDriver --java jit.t.t052.t052
+ */
+
+package jit.t.t052;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// This is a whittle-down of a tomcatv failure.  At the time it found
+// its way in among the tests, it failed because of a failure correctly
+// to reverse the sense of an integer branch when swapping the operands.
+
+class t052 {
+    public static final GoldChecker goldChecker = new GoldChecker( "t052" );
+
+    static double aa[][],dd[][],x[][],y[][],
+           rx[][],ry[][],d[][];
+
+    static double s1alt,alfa,relfa,eps,h,rel;
+    static int lmax;
+    static int N;
+    static int i1p,j1p,i2m,j2m,ll,ixcm,jxcm,iycm,jycm,irxm,jrxm;
+    static int irym,jrym,m,ip,im,jp,jm;
+    static double dxcm,dycm,rxm,rym,xx,yx,xy,yy,a,b,c,qi,qj;
+    static double pxx,pyy,qxx,qyy,pxy,qxy;
+ public static void main (String args[]) {
+   int i,j,l,k;
+   double abx,aby,dmax,r;
+        N = 3;
+        s1alt = 0.0;
+        alfa = 0.1;
+        relfa = 0.98;
+        lmax = 1;
+        eps = 0.5e-7;
+        h = 1.0/(N-1);
+        rel = 2.0/relfa;
+
+t052.goldChecker.println();
+t052.goldChecker.println("init");
+t052.goldChecker.println(N);
+t052.goldChecker.println(s1alt);
+t052.goldChecker.println(alfa);
+t052.goldChecker.println(relfa);
+t052.goldChecker.println(lmax);
+t052.goldChecker.println(eps);
+t052.goldChecker.println(h);
+t052.goldChecker.println(rel);
+
+        aa = new double [N][N];
+        dd = new double [N][N];
+         x = new double [N][N];
+         y = new double [N][N];
+        rx = new double [N][N];
+        ry = new double [N][N];
+         d = new double [N][N];
+
+   for(i=0;i<N;i++) {
+       x[i][0] = (i+1-1.0)/(N-1.0);
+   }
+
+   for(i=0;i<N;i++) {
+       x[i][N-1] = x[i][0];
+       x[0][i] = 0.0;
+       x[N-1][i] = 1.0;
+   }
+
+   for(i=0;i<N;i++) {
+       y[i][0] = 0.0;
+       y[0][i] = x[i][0];
+       y[N-1][i] = alfa*x[i][0];
+   }
+
+   for(i=0;i<N;i++) {
+       y[i][N-1] = (1.0 - x[i][0])*y[0][N-1] + x[i][0]*y[N-1][N-1];
+   }
+
+t052.goldChecker.println();
+t052.goldChecker.println("at init loop");
+t052.goldChecker.println("N: " + N);
+   for(j=1;j<(N-1);j++) {
+t052.goldChecker.println("inside outer");
+       for(i=1;i<(N-1);i++) {
+t052.goldChecker.println("inside inner");
+           x[i][j] = 0.9*x[i][0];
+t052.goldChecker.println(i);
+t052.goldChecker.println(j);
+t052.goldChecker.println(x[i][j]);
+           y[i][j] = 0.9*((1.0 - x[i][0])*y[0][j]+x[i][0]*y[N-1][j]);
+           //System.out.println(i + " " + j + " " + x[i][j] + " " + y[i][j]);
+       }
+   }
+
+
+                                //  the values are dec on purpose
+   i1p = 1;
+   j1p = 1;
+   i2m = N-1;
+   j2m = N-1;
+   ll = 0;
+   do {
+
+   ixcm = jxcm = iycm = jycm = irxm = jrxm = irym = jrym = m = -1;
+   dxcm = dycm = rxm = rym = 0.0;
+
+
+t052.goldChecker.println();
+t052.goldChecker.println("entering loop");
+t052.goldChecker.println("x[1][1]: " + x[1][1]);
+
+   for(j=j1p ; j < j2m ; j++) {
+
+       jp = j+1;
+       jm = j-1;
+       m = m+1;
+       for(i=i1p;i<i2m;i++) {
+           ip = i+1;
+           im = i-1;
+           xx = x[ip][j]-x[im][j];
+           yx = y[ip][j]-y[im][j];
+           xy = x[i][jp]-x[i][jm];
+           yy = y[i][jp]-y[i][jm];
+           a = 0.25*(xy*xy+yy*yy);
+           b = 0.25*(xx*xx+yx*yx);
+           c = 0.125*(xx*xy+yx*yy);
+           qi = 0.0;
+           qj = 0.0;
+
+t052.goldChecker.println();
+t052.goldChecker.println("first blast in loop");
+t052.goldChecker.println(ip);
+t052.goldChecker.println(im);
+t052.goldChecker.println(xx);
+t052.goldChecker.println(yx);
+t052.goldChecker.println(xy);
+t052.goldChecker.println(yy);
+t052.goldChecker.println(a);
+t052.goldChecker.println(b);
+t052.goldChecker.println(c);
+t052.goldChecker.println(qi);
+t052.goldChecker.println(qj);
+
+           aa[i][m] = -b;
+           dd[i][m] = b+b+a*rel;
+
+t052.goldChecker.println();
+t052.goldChecker.println("opnds of pxx");
+t052.goldChecker.println(x[ip][j]);
+t052.goldChecker.println(x[i][j]);
+t052.goldChecker.println(x[im][j]);
+
+           pxx = x[ip][j]-2.0*x[i][j]+x[im][j];
+           qxx = y[ip][j]-2.0*y[i][j]+y[im][j];
+
+           pyy = x[i][jp]-2.0*x[i][j]+x[i][jm];
+           qyy = y[i][jp]-2.0*y[i][j]+y[i][jm];
+
+           pxy = x[ip][jp]-x[ip][jm]-x[im][jp]+x[im][jm];
+           qxy = y[ip][jp]-y[ip][jm]-y[im][jp]+y[im][jm];
+
+t052.goldChecker.println();
+t052.goldChecker.println("second blast in loop");
+t052.goldChecker.println(aa[i][m]);
+t052.goldChecker.println(dd[i][m]);
+t052.goldChecker.println(pxx);
+t052.goldChecker.println(qxx);
+t052.goldChecker.println(pyy);
+t052.goldChecker.println(qyy);
+t052.goldChecker.println(pxy);
+t052.goldChecker.println(qxy);
+
+           rx[i][m] = a*pxx+b*pyy-c*pxy+xx*qi+xy*qj;
+           ry[i][m] = a*qxx+b*qyy-c*qxy+yx*qi+yy*qj;
+       }
+   }
+
+t052.goldChecker.println();
+t052.goldChecker.println("first elts of rx[], ry[]");
+t052.goldChecker.println("rx[1][0]: " + rx[1][0]);
+t052.goldChecker.println("ry[1][0]: " + ry[1][0]);
+
+   for (j=0; j<m; j++) {
+      for (i=i1p; i<i2m; i++) {
+        if (Math.abs(rx[i][j]) >= Math.abs(rxm)) {
+           rxm = rx[i][j];
+           irxm = i;
+           jrxm = j;
+        }
+        if (Math.abs(ry[i][j]) >= Math.abs(rym)) {
+           rym = ry[i][j];
+           irym = i;
+           jrym = j;
+        }
+      }
+   }
+
+t052.goldChecker.println();
+t052.goldChecker.println("Rxm, rym");
+t052.goldChecker.println(rxm);
+t052.goldChecker.println(rym);
+
+   for (i=i1p; i<i2m; i++) {
+      d[i][0] = 1.0/dd[i][0];
+   }
+
+   for (j=1; j<=m; j++) {
+      for (i=i1p; i<i2m; i++) {
+         r = aa[i][j]*d[i][j-1];
+         d[i][j] = 1.0/(dd[i][j]-aa[i][j-1]*r);
+         rx[i][j] = rx[i][j] - rx[i][j-1]*r;
+         ry[i][j] = ry[i][j] - ry[i][j-1]*r;
+      }
+   }
+
+   for (i=i1p; i<i2m; i++) {
+      rx[i][m] = rx[i][m]*d[i][m];
+      ry[i][m] = ry[i][m]*d[i][m];
+   }
+
+   for (j=1; j<=m; j++) {
+      k = m-j;
+      for (i=i1p; i<i2m; i++) {
+         rx[i][k] = (rx[i][k]-aa[i][k]*rx[i][k+1])*d[i][k];
+         ry[i][k] = (ry[i][k]-aa[i][k]*ry[i][k+1])*d[i][k];
+      }
+   }
+
+   l = -1;
+   for (j=j1p; j<j2m; j++) {
+      l = l+1;
+      for (i=i1p; i<i2m; i++) {
+         x[i][j] = x[i][j]+rx[i][l];
+         y[i][j] = y[i][j]+ry[i][l];
+      }
+   }
+
+   ll = ll+1;
+   abx = Math.abs(rxm);
+   aby = Math.abs(rym);
+   dmax = (abx > aby) ? abx : aby;
+
+//   System.out.println(ll+"  "+ixcm+"  "+jxcm+"  "+dxcm+"  "+iycm+"  "+jycm+"  "+dycm+"  "+irxm+"  "+jrxm+"  "+rxm+"  "+irym+"  "+jrym+"  "+rym);
+
+   t052.goldChecker.println();
+   t052.goldChecker.println(ll);
+   t052.goldChecker.println(lmax);
+   t052.goldChecker.println(dmax);
+   t052.goldChecker.println(eps);
+   } while ((ll < lmax) && (dmax > eps));
+
+
+   t052.goldChecker.check();
+ }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.gold
new file mode 100644
index 00000000000..917f12b1934
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.gold
@@ -0,0 +1,629 @@
+1 1 0.0375 0.03609375
+2 1 0.075 0.034687499999999996
+3 1 0.1125 0.03328125
+4 1 0.15 0.031875
+5 1 0.1875 0.030468749999999992
+6 1 0.225 0.029062500000000005
+7 1 0.2625 0.027656249999999997
+8 1 0.3 0.026250000000000002
+9 1 0.3375 0.02484375
+10 1 0.375 0.0234375
+11 1 0.4125 0.022031250000000002
+12 1 0.45 0.020624999999999998
+13 1 0.4875 0.01921875
+14 1 0.525 0.0178125
+15 1 0.5625 0.01640625
+16 1 0.6 0.015
+17 1 0.6375000000000001 0.013593749999999998
+18 1 0.675 0.0121875
+19 1 0.7125 0.010781250000000001
+20 1 0.75 0.009374999999999998
+21 1 0.7875 0.00796875
+22 1 0.825 0.0065625000000000015
+23 1 0.8625 0.0051562499999999985
+1 2 0.0375 0.0721875
+2 2 0.075 0.06937499999999999
+3 2 0.1125 0.0665625
+4 2 0.15 0.06375
+5 2 0.1875 0.060937499999999985
+6 2 0.225 0.05812500000000001
+7 2 0.2625 0.055312499999999994
+8 2 0.3 0.052500000000000005
+9 2 0.3375 0.0496875
+10 2 0.375 0.046875
+11 2 0.4125 0.044062500000000004
+12 2 0.45 0.041249999999999995
+13 2 0.4875 0.0384375
+14 2 0.525 0.035625
+15 2 0.5625 0.0328125
+16 2 0.6 0.03
+17 2 0.6375000000000001 0.027187499999999996
+18 2 0.675 0.024375
+19 2 0.7125 0.021562500000000002
+20 2 0.75 0.018749999999999996
+21 2 0.7875 0.0159375
+22 2 0.825 0.013125000000000003
+23 2 0.8625 0.010312499999999997
+1 3 0.0375 0.10828125000000001
+2 3 0.075 0.10406249999999999
+3 3 0.1125 0.09984375
+4 3 0.15 0.09562500000000002
+5 3 0.1875 0.09140625000000001
+6 3 0.225 0.0871875
+7 3 0.2625 0.08296875
+8 3 0.3 0.07875000000000001
+9 3 0.3375 0.07453125
+10 3 0.375 0.07031249999999999
+11 3 0.4125 0.06609375000000002
+12 3 0.45 0.061875000000000006
+13 3 0.4875 0.057656250000000006
+14 3 0.525 0.0534375
+15 3 0.5625 0.04921875
+16 3 0.6 0.045000000000000005
+17 3 0.6375000000000001 0.04078125
+18 3 0.675 0.036562500000000005
+19 3 0.7125 0.032343750000000004
+20 3 0.75 0.028124999999999997
+21 3 0.7875 0.023906250000000004
+22 3 0.825 0.019687500000000007
+23 3 0.8625 0.015468749999999995
+1 4 0.0375 0.144375
+2 4 0.075 0.13874999999999998
+3 4 0.1125 0.133125
+4 4 0.15 0.1275
+5 4 0.1875 0.12187499999999997
+6 4 0.225 0.11625000000000002
+7 4 0.2625 0.11062499999999999
+8 4 0.3 0.10500000000000001
+9 4 0.3375 0.099375
+10 4 0.375 0.09375
+11 4 0.4125 0.08812500000000001
+12 4 0.45 0.08249999999999999
+13 4 0.4875 0.076875
+14 4 0.525 0.07125
+15 4 0.5625 0.065625
+16 4 0.6 0.06
+17 4 0.6375000000000001 0.05437499999999999
+18 4 0.675 0.04875
+19 4 0.7125 0.043125000000000004
+20 4 0.75 0.03749999999999999
+21 4 0.7875 0.031875
+22 4 0.825 0.026250000000000006
+23 4 0.8625 0.020624999999999994
+1 5 0.0375 0.18046875
+2 5 0.075 0.1734375
+3 5 0.1125 0.16640625
+4 5 0.15 0.15937500000000002
+5 5 0.1875 0.15234375
+6 5 0.225 0.1453125
+7 5 0.2625 0.13828125000000002
+8 5 0.3 0.13125000000000003
+9 5 0.3375 0.12421875000000002
+10 5 0.375 0.11718749999999999
+11 5 0.4125 0.11015625000000001
+12 5 0.45 0.10312500000000001
+13 5 0.4875 0.09609375
+14 5 0.525 0.0890625
+15 5 0.5625 0.08203125000000001
+16 5 0.6 0.07500000000000002
+17 5 0.6375000000000001 0.06796875
+18 5 0.675 0.06093750000000001
+19 5 0.7125 0.05390625000000001
+20 5 0.75 0.046875
+21 5 0.7875 0.039843750000000004
+22 5 0.825 0.03281250000000001
+23 5 0.8625 0.025781249999999995
+1 6 0.0375 0.21656250000000002
+2 6 0.075 0.20812499999999998
+3 6 0.1125 0.1996875
+4 6 0.15 0.19125000000000003
+5 6 0.1875 0.18281250000000002
+6 6 0.225 0.174375
+7 6 0.2625 0.1659375
+8 6 0.3 0.15750000000000003
+9 6 0.3375 0.1490625
+10 6 0.375 0.14062499999999997
+11 6 0.4125 0.13218750000000004
+12 6 0.45 0.12375000000000001
+13 6 0.4875 0.11531250000000001
+14 6 0.525 0.106875
+15 6 0.5625 0.0984375
+16 6 0.6 0.09000000000000001
+17 6 0.6375000000000001 0.0815625
+18 6 0.675 0.07312500000000001
+19 6 0.7125 0.06468750000000001
+20 6 0.75 0.056249999999999994
+21 6 0.7875 0.04781250000000001
+22 6 0.825 0.039375000000000014
+23 6 0.8625 0.03093749999999999
+1 7 0.0375 0.25265625
+2 7 0.075 0.2428125
+3 7 0.1125 0.23296875000000006
+4 7 0.15 0.22312500000000005
+5 7 0.1875 0.21328125000000003
+6 7 0.225 0.2034375
+7 7 0.2625 0.19359374999999998
+8 7 0.3 0.18375000000000002
+9 7 0.3375 0.17390625
+10 7 0.375 0.1640625
+11 7 0.4125 0.15421875000000004
+12 7 0.45 0.144375
+13 7 0.4875 0.13453125000000002
+14 7 0.525 0.1246875
+15 7 0.5625 0.11484375
+16 7 0.6 0.10500000000000001
+17 7 0.6375000000000001 0.09515624999999998
+18 7 0.675 0.08531250000000001
+19 7 0.7125 0.07546875000000001
+20 7 0.75 0.06562499999999999
+21 7 0.7875 0.055781250000000004
+22 7 0.825 0.04593750000000001
+23 7 0.8625 0.03609375
+1 8 0.0375 0.28875
+2 8 0.075 0.27749999999999997
+3 8 0.1125 0.26625
+4 8 0.15 0.255
+5 8 0.1875 0.24374999999999994
+6 8 0.225 0.23250000000000004
+7 8 0.2625 0.22124999999999997
+8 8 0.3 0.21000000000000002
+9 8 0.3375 0.19875
+10 8 0.375 0.1875
+11 8 0.4125 0.17625000000000002
+12 8 0.45 0.16499999999999998
+13 8 0.4875 0.15375
+14 8 0.525 0.1425
+15 8 0.5625 0.13125
+16 8 0.6 0.12
+17 8 0.6375000000000001 0.10874999999999999
+18 8 0.675 0.0975
+19 8 0.7125 0.08625000000000001
+20 8 0.75 0.07499999999999998
+21 8 0.7875 0.06375
+22 8 0.825 0.05250000000000001
+23 8 0.8625 0.04124999999999999
+1 9 0.0375 0.32484375000000004
+2 9 0.075 0.3121875
+3 9 0.1125 0.29953125
+4 9 0.15 0.286875
+5 9 0.1875 0.27421875
+6 9 0.225 0.26156250000000003
+7 9 0.2625 0.24890625
+8 9 0.3 0.23625000000000002
+9 9 0.3375 0.22359375
+10 9 0.375 0.21093749999999997
+11 9 0.4125 0.19828125000000002
+12 9 0.45 0.18562499999999998
+13 9 0.4875 0.17296875
+14 9 0.525 0.1603125
+15 9 0.5625 0.14765625000000002
+16 9 0.6 0.135
+17 9 0.6375000000000001 0.12234374999999999
+18 9 0.675 0.10968750000000001
+19 9 0.7125 0.09703125000000001
+20 9 0.75 0.084375
+21 9 0.7875 0.07171875000000001
+22 9 0.825 0.05906250000000002
+23 9 0.8625 0.04640624999999999
+1 10 0.0375 0.3609375
+2 10 0.075 0.346875
+3 10 0.1125 0.3328125
+4 10 0.15 0.31875000000000003
+5 10 0.1875 0.3046875
+6 10 0.225 0.290625
+7 10 0.2625 0.27656250000000004
+8 10 0.3 0.26250000000000007
+9 10 0.3375 0.24843750000000003
+10 10 0.375 0.23437499999999997
+11 10 0.4125 0.22031250000000002
+12 10 0.45 0.20625000000000002
+13 10 0.4875 0.1921875
+14 10 0.525 0.178125
+15 10 0.5625 0.16406250000000003
+16 10 0.6 0.15000000000000005
+17 10 0.6375000000000001 0.1359375
+18 10 0.675 0.12187500000000002
+19 10 0.7125 0.10781250000000002
+20 10 0.75 0.09375
+21 10 0.7875 0.07968750000000001
+22 10 0.825 0.06562500000000002
+23 10 0.8625 0.05156249999999999
+1 11 0.0375 0.39703125
+2 11 0.075 0.38156249999999997
+3 11 0.1125 0.36609375
+4 11 0.15 0.35062499999999996
+5 11 0.1875 0.33515625
+6 11 0.225 0.3196875
+7 11 0.2625 0.3042187499999999
+8 11 0.3 0.28875
+9 11 0.3375 0.27328125000000003
+10 11 0.375 0.25781249999999994
+11 11 0.4125 0.24234375000000002
+12 11 0.45 0.226875
+13 11 0.4875 0.21140625
+14 11 0.525 0.19593750000000001
+15 11 0.5625 0.18046875
+16 11 0.6 0.165
+17 11 0.6375000000000001 0.14953124999999998
+18 11 0.675 0.1340625
+19 11 0.7125 0.11859375000000001
+20 11 0.75 0.10312499999999998
+21 11 0.7875 0.08765625
+22 11 0.825 0.07218750000000002
+23 11 0.8625 0.056718749999999984
+1 12 0.0375 0.43312500000000004
+2 12 0.075 0.41624999999999995
+3 12 0.1125 0.399375
+4 12 0.15 0.38250000000000006
+5 12 0.1875 0.36562500000000003
+6 12 0.225 0.34875
+7 12 0.2625 0.331875
+8 12 0.3 0.31500000000000006
+9 12 0.3375 0.298125
+10 12 0.375 0.28124999999999994
+11 12 0.4125 0.2643750000000001
+12 12 0.45 0.24750000000000003
+13 12 0.4875 0.23062500000000002
+14 12 0.525 0.21375
+15 12 0.5625 0.196875
+16 12 0.6 0.18000000000000002
+17 12 0.6375000000000001 0.163125
+18 12 0.675 0.14625000000000002
+19 12 0.7125 0.12937500000000002
+20 12 0.75 0.11249999999999999
+21 12 0.7875 0.09562500000000002
+22 12 0.825 0.07875000000000003
+23 12 0.8625 0.06187499999999998
+1 13 0.0375 0.46921875
+2 13 0.075 0.45093749999999994
+3 13 0.1125 0.43265625
+4 13 0.15 0.41437500000000005
+5 13 0.1875 0.39609374999999997
+6 13 0.225 0.3778125
+7 13 0.2625 0.35953124999999997
+8 13 0.3 0.34125
+9 13 0.3375 0.32296874999999997
+10 13 0.375 0.3046875
+11 13 0.4125 0.28640625000000003
+12 13 0.45 0.268125
+13 13 0.4875 0.24984375
+14 13 0.525 0.23156249999999998
+15 13 0.5625 0.21328125000000003
+16 13 0.6 0.195
+17 13 0.6375000000000001 0.17671874999999998
+18 13 0.675 0.15843749999999998
+19 13 0.7125 0.14015625000000004
+20 13 0.75 0.12187499999999997
+21 13 0.7875 0.10359375
+22 13 0.825 0.08531250000000003
+23 13 0.8625 0.06703124999999999
+1 14 0.0375 0.5053125
+2 14 0.075 0.485625
+3 14 0.1125 0.4659375000000001
+4 14 0.15 0.4462500000000001
+5 14 0.1875 0.42656250000000007
+6 14 0.225 0.406875
+7 14 0.2625 0.38718749999999996
+8 14 0.3 0.36750000000000005
+9 14 0.3375 0.3478125
+10 14 0.375 0.328125
+11 14 0.4125 0.3084375000000001
+12 14 0.45 0.28875
+13 14 0.4875 0.26906250000000004
+14 14 0.525 0.249375
+15 14 0.5625 0.2296875
+16 14 0.6 0.21000000000000002
+17 14 0.6375000000000001 0.19031249999999997
+18 14 0.675 0.17062500000000003
+19 14 0.7125 0.15093750000000003
+20 14 0.75 0.13124999999999998
+21 14 0.7875 0.11156250000000001
+22 14 0.825 0.09187500000000003
+23 14 0.8625 0.0721875
+1 15 0.0375 0.54140625
+2 15 0.075 0.5203125000000001
+3 15 0.1125 0.49921875
+4 15 0.15 0.478125
+5 15 0.1875 0.45703125
+6 15 0.225 0.43593750000000003
+7 15 0.2625 0.41484374999999996
+8 15 0.3 0.39375000000000004
+9 15 0.3375 0.37265625
+10 15 0.375 0.35156249999999994
+11 15 0.4125 0.33046875000000003
+12 15 0.45 0.309375
+13 15 0.4875 0.28828125000000004
+14 15 0.525 0.26718749999999997
+15 15 0.5625 0.24609375
+16 15 0.6 0.22500000000000006
+17 15 0.6375000000000001 0.20390624999999998
+18 15 0.675 0.18281250000000002
+19 15 0.7125 0.16171875000000002
+20 15 0.75 0.14062499999999997
+21 15 0.7875 0.11953125
+22 15 0.825 0.09843750000000002
+23 15 0.8625 0.07734374999999998
+1 16 0.0375 0.5775
+2 16 0.075 0.5549999999999999
+3 16 0.1125 0.5325
+4 16 0.15 0.51
+5 16 0.1875 0.4874999999999999
+6 16 0.225 0.4650000000000001
+7 16 0.2625 0.44249999999999995
+8 16 0.3 0.42000000000000004
+9 16 0.3375 0.3975
+10 16 0.375 0.375
+11 16 0.4125 0.35250000000000004
+12 16 0.45 0.32999999999999996
+13 16 0.4875 0.3075
+14 16 0.525 0.285
+15 16 0.5625 0.2625
+16 16 0.6 0.24
+17 16 0.6375000000000001 0.21749999999999997
+18 16 0.675 0.195
+19 16 0.7125 0.17250000000000001
+20 16 0.75 0.14999999999999997
+21 16 0.7875 0.1275
+22 16 0.825 0.10500000000000002
+23 16 0.8625 0.08249999999999998
+1 17 0.0375 0.6135937500000002
+2 17 0.075 0.5896875
+3 17 0.1125 0.5657812500000001
+4 17 0.15 0.541875
+5 17 0.1875 0.51796875
+6 17 0.225 0.4940625
+7 17 0.2625 0.47015624999999994
+8 17 0.3 0.44625000000000015
+9 17 0.3375 0.42234375
+10 17 0.375 0.3984375
+11 17 0.4125 0.3745312500000001
+12 17 0.45 0.350625
+13 17 0.4875 0.32671875000000006
+14 17 0.525 0.30281250000000004
+15 17 0.5625 0.27890625
+16 17 0.6 0.25500000000000006
+17 17 0.6375000000000001 0.23109375000000001
+18 17 0.675 0.20718750000000002
+19 17 0.7125 0.18328125000000003
+20 17 0.75 0.159375
+21 17 0.7875 0.13546875000000003
+22 17 0.825 0.11156250000000004
+23 17 0.8625 0.08765624999999999
+1 18 0.0375 0.6496875000000001
+2 18 0.075 0.624375
+3 18 0.1125 0.5990625
+4 18 0.15 0.57375
+5 18 0.1875 0.5484375
+6 18 0.225 0.5231250000000001
+7 18 0.2625 0.4978125
+8 18 0.3 0.47250000000000003
+9 18 0.3375 0.4471875
+10 18 0.375 0.42187499999999994
+11 18 0.4125 0.39656250000000004
+12 18 0.45 0.37124999999999997
+13 18 0.4875 0.3459375
+14 18 0.525 0.320625
+15 18 0.5625 0.29531250000000003
+16 18 0.6 0.27
+17 18 0.6375000000000001 0.24468749999999997
+18 18 0.675 0.21937500000000001
+19 18 0.7125 0.19406250000000003
+20 18 0.75 0.16875
+21 18 0.7875 0.14343750000000002
+22 18 0.825 0.11812500000000004
+23 18 0.8625 0.09281249999999998
+1 19 0.0375 0.68578125
+2 19 0.075 0.6590625
+3 19 0.1125 0.63234375
+4 19 0.15 0.605625
+5 19 0.1875 0.57890625
+6 19 0.225 0.5521875
+7 19 0.2625 0.5254687499999999
+8 19 0.3 0.49875
+9 19 0.3375 0.47203124999999996
+10 19 0.375 0.44531249999999994
+11 19 0.4125 0.41859375000000004
+12 19 0.45 0.39187500000000003
+13 19 0.4875 0.36515624999999996
+14 19 0.525 0.33843749999999995
+15 19 0.5625 0.31171875000000004
+16 19 0.6 0.285
+17 19 0.6375000000000001 0.25828124999999996
+18 19 0.675 0.23156249999999998
+19 19 0.7125 0.20484375000000002
+20 19 0.75 0.17812499999999998
+21 19 0.7875 0.15140625
+22 19 0.825 0.1246875
+23 19 0.8625 0.09796874999999997
+1 20 0.0375 0.721875
+2 20 0.075 0.69375
+3 20 0.1125 0.665625
+4 20 0.15 0.6375000000000001
+5 20 0.1875 0.609375
+6 20 0.225 0.58125
+7 20 0.2625 0.5531250000000001
+8 20 0.3 0.5250000000000001
+9 20 0.3375 0.49687500000000007
+10 20 0.375 0.46874999999999994
+11 20 0.4125 0.44062500000000004
+12 20 0.45 0.41250000000000003
+13 20 0.4875 0.384375
+14 20 0.525 0.35625
+15 20 0.5625 0.32812500000000006
+16 20 0.6 0.3000000000000001
+17 20 0.6375000000000001 0.271875
+18 20 0.675 0.24375000000000005
+19 20 0.7125 0.21562500000000004
+20 20 0.75 0.1875
+21 20 0.7875 0.15937500000000002
+22 20 0.825 0.13125000000000003
+23 20 0.8625 0.10312499999999998
+1 21 0.0375 0.7579687500000001
+2 21 0.075 0.7284375
+3 21 0.1125 0.6989062500000001
+4 21 0.15 0.669375
+5 21 0.1875 0.6398437499999999
+6 21 0.225 0.6103125
+7 21 0.2625 0.58078125
+8 21 0.3 0.55125
+9 21 0.3375 0.52171875
+10 21 0.375 0.4921875
+11 21 0.4125 0.4626562500000001
+12 21 0.45 0.43312500000000004
+13 21 0.4875 0.40359375000000003
+14 21 0.525 0.37406249999999996
+15 21 0.5625 0.34453125
+16 21 0.6 0.31500000000000006
+17 21 0.6375000000000001 0.28546875
+18 21 0.675 0.2559375
+19 21 0.7125 0.22640625000000003
+20 21 0.75 0.196875
+21 21 0.7875 0.16734375
+22 21 0.825 0.13781250000000003
+23 21 0.8625 0.10828124999999998
+1 22 0.0375 0.7940625
+2 22 0.075 0.7631249999999999
+3 22 0.1125 0.7321875
+4 22 0.15 0.7012499999999999
+5 22 0.1875 0.6703125
+6 22 0.225 0.639375
+7 22 0.2625 0.6084374999999999
+8 22 0.3 0.5775
+9 22 0.3375 0.5465625000000001
+10 22 0.375 0.5156249999999999
+11 22 0.4125 0.48468750000000005
+12 22 0.45 0.45375
+13 22 0.4875 0.4228125
+14 22 0.525 0.39187500000000003
+15 22 0.5625 0.3609375
+16 22 0.6 0.33
+17 22 0.6375000000000001 0.29906249999999995
+18 22 0.675 0.268125
+19 22 0.7125 0.23718750000000002
+20 22 0.75 0.20624999999999996
+21 22 0.7875 0.1753125
+22 22 0.825 0.14437500000000003
+23 22 0.8625 0.11343749999999997
+1 23 0.0375 0.83015625
+2 23 0.075 0.7978125
+3 23 0.1125 0.76546875
+4 23 0.15 0.7331250000000001
+5 23 0.1875 0.70078125
+6 23 0.225 0.6684375
+7 23 0.2625 0.63609375
+8 23 0.3 0.6037500000000001
+9 23 0.3375 0.57140625
+10 23 0.375 0.5390625
+11 23 0.4125 0.5067187500000001
+12 23 0.45 0.47437500000000005
+13 23 0.4875 0.44203125000000004
+14 23 0.525 0.4096875
+15 23 0.5625 0.37734375
+16 23 0.6 0.34500000000000003
+17 23 0.6375000000000001 0.31265624999999997
+18 23 0.675 0.2803125
+19 23 0.7125 0.24796875000000004
+20 23 0.75 0.21562499999999998
+21 23 0.7875 0.18328125000000003
+22 23 0.825 0.15093750000000003
+23 23 0.8625 0.11859374999999998
+1  -1  -1  0.0  -1  -1  0.0  23  0  0.0011585697654441552  1  21  1.0008065287272195E-4
+2  -1  -1  0.0  -1  -1  0.0  22  0  5.620114795560142E-4  2  21  8.502092902765939E-5
+3  -1  -1  0.0  -1  -1  0.0  21  0  2.3517988923455816E-4  1  21  9.068952955312718E-5
+4  -1  -1  0.0  -1  -1  0.0  20  0  8.094044807828313E-5  2  21  1.0248207151327383E-4
+5  -1  -1  0.0  -1  -1  0.0  19  0  2.4334396822382606E-5  3  21  7.592818015106038E-5
+6  -1  -1  0.0  -1  -1  0.0  4  21  8.7099545319201E-6  4  21  4.908987951523957E-5
+7  -1  -1  0.0  -1  -1  0.0  5  21  7.5457761249149125E-6  3  21  4.3997178056340965E-5
+8  -1  -1  0.0  -1  -1  0.0  6  21  6.284819917095018E-6  4  21  3.416232349613688E-5
+9  -1  -1  0.0  -1  -1  0.0  5  21  5.397892350439829E-6  3  20  2.3600062827290277E-5
+10  -1  -1  0.0  -1  -1  0.0  6  21  4.515342928431198E-6  4  21  2.0905161260958235E-5
+11  -1  -1  0.0  -1  -1  0.0  7  21  3.621108137026673E-6  5  21  1.5729395350595382E-5
+12  -1  -1  0.0  -1  -1  0.0  6  20  3.185726299332794E-6  4  20  1.3844979385656259E-5
+13  -1  -1  0.0  -1  -1  0.0  7  20  2.7483501533990217E-6  3  19  1.064407749752844E-5
+14  -1  -1  0.0  -1  -1  0.0  6  20  2.5108345328495165E-6  4  20  9.788651019120633E-6
+15  -1  -1  0.0  -1  -1  0.0  7  20  2.197604652651871E-6  5  20  7.998675261120603E-6
+16  -1  -1  0.0  -1  -1  0.0  6  19  2.0249131450075526E-6  4  19  7.2839330959641794E-6
+17  -1  -1  0.0  -1  -1  0.0  7  19  1.839656862080923E-6  5  20  5.990237510511579E-6
+18  -1  -1  0.0  -1  -1  0.0  6  19  1.7019805368908983E-6  4  19  5.577179377158582E-6
+19  -1  -1  0.0  -1  -1  0.0  13  12  1.6293597776932763E-6  5  19  4.735171968259174E-6
+20  -1  -1  0.0  -1  -1  0.0  12  12  1.544927710938047E-6  4  18  4.350145388065789E-6
+21  -1  -1  0.0  -1  -1  0.0  13  12  1.4851625538477641E-6  5  19  3.7684980795571333E-6
+22  -1  -1  0.0  -1  -1  0.0  12  12  1.4490715327343567E-6  4  18  3.4970793834787733E-6
+23  -1  -1  0.0  -1  -1  0.0  11  12  1.3876875742259857E-6  5  18  3.0204019699442856E-6
+24  -1  -1  0.0  -1  -1  0.0  12  12  1.3356058149736007E-6  4  18  2.8180650701471464E-6
+25  -1  -1  0.0  -1  -1  0.0  11  12  1.3085566614046277E-6  5  18  2.4922038312693095E-6
+26  -1  -1  0.0  -1  -1  0.0  10  12  1.259799632787451E-6  4  17  2.3092892028108393E-6
+27  -1  -1  0.0  -1  -1  0.0  11  12  1.2185997657798947E-6  5  18  2.0587695092656654E-6
+28  -1  -1  0.0  -1  -1  0.0  10  12  1.1948099783134456E-6  4  17  1.9177547856428542E-6
+29  -1  -1  0.0  -1  -1  0.0  9  12  1.1519387996635334E-6  5  18  1.7044736828473696E-6
+30  -1  -1  0.0  -1  -1  0.0  10  13  1.1229965583154242E-6  4  17  1.5956878069138908E-6
+31  -1  -1  0.0  -1  -1  0.0  9  12  1.09791951395877E-6  5  17  1.426581050199061E-6
+32  -1  -1  0.0  -1  -1  0.0  8  12  1.055374757341771E-6  4  17  1.330870782277823E-6
+33  -1  -1  0.0  -1  -1  0.0  9  13  1.0387816150933697E-6  5  17  1.2042640198214577E-6
+34  -1  -1  0.0  -1  -1  0.0  8  12  1.0093877228213775E-6  4  16  1.1238065369417962E-6
+35  -1  -1  0.0  -1  -1  0.0  9  13  9.778304982157243E-7  5  17  1.0174362394715848E-6
+36  -1  -1  0.0  -1  -1  0.0  8  12  9.593648654004852E-7  4  16  9.5289313558678E-7
+37  -1  -1  0.0  -1  -1  0.0  7  12  9.210113674852077E-7  5  17  8.60478321358924E-7
+38  -1  -1  0.0  -1  -1  0.0  8  12  9.072398381405229E-7  4  16  8.087704356389366E-7
+39  -1  -1  0.0  -1  -1  0.0  7  12  8.777103671123774E-7  5  17  7.2855190147969E-7
+40  -1  -1  0.0  -1  -1  0.0  8  12  8.544941111761292E-7  4  16  6.871900176154783E-7
+41  -1  -1  0.0  -1  -1  0.0  7  12  8.327773986928429E-7  5  16  6.187624962507783E-7
+42  -1  -1  0.0  -1  -1  0.0  8  12  8.022249954025781E-7  4  16  5.845440988780752E-7
+43  -1  -1  0.0  -1  -1  0.0  7  12  7.872666967443028E-7  5  16  5.292256365240031E-7
+44  -1  -1  0.0  -1  -1  0.0  8  12  7.512174193934604E-7  4  15  4.995402323603997E-7
+45  -1  -1  0.0  -1  -1  0.0  7  12  7.419901046847734E-7  5  16  4.528777786928594E-7
+46  -1  -1  0.0  -1  -1  0.0  6  11  7.08587101674523E-7  4  15  4.2912379790242687E-7
+47  -1  -1  0.0  -1  -1  0.0  7  12  6.975557985127472E-7  5  16  3.8778556534280563E-7
+48  -1  -1  0.0  -1  -1  0.0  6  11  6.691090777967805E-7  4  15  3.6890494019213555E-7
+49  -1  -1  0.0  -1  -1  0.0  7  12  6.544055180113372E-7  5  16  3.3228462833982953E-7
+50  -1  -1  0.0  -1  -1  0.0  6  11  6.30219752162472E-7  4  15  3.1740132487468546E-7
+51  -1  -1  0.0  -1  -1  0.0  7  12  6.128478813540568E-7  5  16  2.849493989681149E-7
+52  -1  -1  0.0  -1  -1  0.0  6  11  5.923033516937422E-7  4  15  2.7333935438241147E-7
+53  -1  -1  0.0  -1  -1  0.0  7  12  5.73086882974213E-7  5  15  2.4532279559469315E-7
+54  -1  -1  0.0  -1  -1  0.0  6  11  5.55639256325219E-7  4  14  2.3633559069205758E-7
+55  -1  -1  0.0  -1  -1  0.0  7  12  5.352455410940648E-7  5  15  2.123387176934267E-7
+56  -1  -1  0.0  -1  -1  0.0  6  11  5.204221485964264E-7  4  14  2.0561024737443112E-7
+57  -1  -1  0.0  -1  -1  0.0  7  12  4.993851013027461E-7  5  15  1.839747744545429E-7
+58  -1  -1  0.0  -1  -1  0.0  6  12  4.870190700948427E-7  4  14  1.7908770645309803E-7
+59  -1  -1  0.0  -1  -1  0.0  7  12  4.6552038442979057E-7  5  14  1.5972418225871158E-7
+60  -1  -1  0.0  -1  -1  0.0  6  12  4.5525641160946055E-7  4  13  1.5691499704328573E-7
+61  -1  -1  0.0  -1  -1  0.0  7  12  4.3363190330018484E-7  5  14  1.4001148703255125E-7
+62  -1  -1  0.0  -1  -1  0.0  6  12  4.2514884392563226E-7  4  13  1.38368735204777E-7
+63  -1  -1  0.0  -1  -1  0.0  7  12  4.036753345913607E-7  3  11  1.2432740529658352E-7
+64  -1  -1  0.0  -1  -1  0.0  6  12  3.9669519684365645E-7  4  11  1.2362188726713625E-7
+65  -1  -1  0.0  -1  -1  0.0  7  12  3.755888610175161E-7  3  9  1.1251360969524836E-7
+66  -1  -1  0.0  -1  -1  0.0  6  12  3.698725287571754E-7  4  9  1.1236685836173837E-7
+67  -1  -1  0.0  -1  -1  0.0  5  11  3.497116446619992E-7  3  8  1.0348144951832221E-7
+68  -1  -1  0.0  -1  -1  0.0  6  12  3.4464170060642976E-7  4  8  1.036734443892546E-7
+69  -1  -1  0.0  -1  -1  0.0  5  11  3.2618418228655665E-7  3  8  9.574171470647599E-8
+70  -1  -1  0.0  -1  -1  0.0  6  12  3.2095183532571695E-7  4  8  9.621289506465901E-8
+71  -1  -1  0.0  -1  -1  0.0  5  11  3.040301803239853E-7  3  7  8.902050464970409E-8
+72  -1  -1  0.0  -1  -1  0.0  6  12  2.9874386018701356E-7  4  7  8.926387932519467E-8
+73  -1  -1  0.0  -1  -1  0.0  5  11  2.832101430118606E-7  3  7  8.27571047987327E-8
+74  -1  -1  0.0  -1  -1  0.0  6  12  2.7795330018378114E-7  4  7  8.311084204839548E-8
+75  -1  -1  0.0  -1  -1  0.0  6  12  2.6367936227004454E-7  3  7  7.687038597054273E-8
+76  -1  -1  0.0  -1  -1  0.0  6  12  2.58512463504662E-7  4  7  7.73122301616323E-8
+77  -1  -1  0.0  -1  -1  0.0  6  12  2.454867029742104E-7  3  6  7.13772557890214E-8
+78  -1  -1  0.0  -1  -1  0.0  6  12  2.4035213613144016E-7  4  7  7.186366400293371E-8
+79  -1  -1  0.0  -1  -1  0.0  6  12  2.2846114657565502E-7  3  6  6.643448993261628E-8
+80  -1  -1  0.0  -1  -1  0.0  6  12  2.234028818581624E-7  4  7  6.675661962174401E-8
+81  -1  -1  0.0  -1  -1  0.0  6  12  2.1254313177647105E-7  3  6  6.178675269943597E-8
+82  -1  -1  0.0  -1  -1  0.0  6  12  2.0759602648136558E-7  4  7  6.19795966797847E-8
+83  -1  -1  0.0  -1  -1  0.0  6  12  1.9767325308502968E-7  3  6  5.742705419392286E-8
+84  -1  -1  0.0  -1  -1  0.0  6  12  1.9286439023906887E-7  4  7  5.751904543965608E-8
+85  -1  -1  0.0  -1  -1  0.0  6  12  1.8379294828666547E-7  3  6  5.334593266617802E-8
+86  -1  -1  0.0  -1  -1  0.0  6  12  1.7914282044198122E-7  4  6  5.339563662252246E-8
+87  -1  -1  0.0  -1  -1  0.0  6  12  1.708450173410339E-7  3  6  4.953221016672601E-8
+88  -1  -1  0.0  -1  -1  0.0  6  12  1.6636856625104565E-7  4  6  4.960899471579952E-8
+89  -1  -1  0.0  -1  -1  0.0  6  12  1.587740053146964E-7  3  6  4.597358899431713E-8
+90  -1  -1  0.0  -1  -1  0.0  6  12  1.5448152940996935E-7  4  6  4.607287254821659E-8
+91  -1  -1  0.0  -1  -1  0.0  6  12  1.4752647606928309E-7  3  6  4.2657117659162956E-8
+92  -1  -1  0.0  -1  -1  0.0  6  12  1.4342441809452198E-7  4  6  4.2774728550117886E-8
+93  -1  -1  0.0  -1  -1  0.0  6  12  1.3705119859578697E-7  4  6  3.9636347447070805E-8
+94  -1  -1  0.0  -1  -1  0.0  6  12  1.3314282565310056E-7  4  6  3.970173596284571E-8
+95  -1  -1  0.0  -1  -1  0.0  6  12  1.2729926386695281E-7  4  6  3.690649366072992E-8
+96  -1  -1  0.0  -1  -1  0.0  6  12  1.235852516543764E-7  4  6  3.684104278676827E-8
+97  -1  -1  0.0  -1  -1  0.0  6  12  1.1822414680253986E-7  4  6  3.434766762690565E-8
+98  -1  -1  0.0  -1  -1  0.0  6  12  1.1470307913178255E-7  4  6  3.417996700014113E-8
+99  -1  -1  0.0  -1  -1  0.0  6  12  1.0978172521948588E-7  4  6  3.1952435345944995E-8
+100  -1  -1  0.0  -1  -1  0.0  6  12  1.0645051907604706E-7  4  6  3.170614018068429E-8
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java
new file mode 100644
index 00000000000..c36b239c2dd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java
@@ -0,0 +1,216 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t053.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t053.t053
+ * @run driver ExecDriver --java jit.t.t053.t053
+ */
+
+package jit.t.t053;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+//
+// Tomcatv in java, with prints active
+//
+
+class t053 {
+    public static final GoldChecker goldChecker = new GoldChecker( "t053" );
+
+    static double aa[][],dd[][],x[][],y[][],
+           rx[][],ry[][],d[][];
+
+    static double s1alt,alfa,relfa,eps,h,rel;
+    static int lmax;
+    static int N;
+    static int i1p,j1p,i2m,j2m,ll,ixcm,jxcm,iycm,jycm,irxm,jrxm;
+    static int irym,jrym,m,ip,im,jp,jm;
+    static double dxcm,dycm,rxm,rym,xx,yx,xy,yy,a,b,c,qi,qj;
+    static double pxx,pyy,qxx,qyy,pxy,qxy;
+ public static void main (String args[]) {
+   int i,j,l,k;
+   double abx,aby,dmax,r;
+        N = 25;
+        s1alt = 0.0;
+        alfa = 0.1;
+        relfa = 0.98;
+        lmax = 100;
+        eps = 0.5e-7;
+        h = 1.0/(N-1);
+        rel = 2.0/relfa;
+
+
+        aa = new double [N][N];
+        dd = new double [N][N];
+         x = new double [N][N];
+         y = new double [N][N];
+        rx = new double [N][N];
+        ry = new double [N][N];
+         d = new double [N][N];
+
+   for(i=0;i<N;i++) {
+       x[i][0] = (i+1-1.0)/(N-1.0);
+   }
+
+   for(i=0;i<N;i++) {
+       x[i][N-1] = x[i][0];
+       x[0][i] = 0.0;
+       x[N-1][i] = 1.0;
+   }
+
+   for(i=0;i<N;i++) {
+       y[i][0] = 0.0;
+       y[0][i] = x[i][0];
+       y[N-1][i] = alfa*x[i][0];
+   }
+
+   for(i=0;i<N;i++) {
+       y[i][N-1] = (1.0 - x[i][0])*y[0][N-1] + x[i][0]*y[N-1][N-1];
+   }
+
+   for(j=1;j<(N-1);j++) {
+       for(i=1;i<(N-1);i++) {
+           x[i][j] = 0.9*x[i][0];
+           y[i][j] = 0.9*((1.0 - x[i][0])*y[0][j]+x[i][0]*y[N-1][j]);
+           t053.goldChecker.println(i + " " + j + " " + x[i][j] + " " + y[i][j]);
+       }
+   }
+
+
+                                //  the values are dec on purpose
+   i1p = 1;
+   j1p = 1;
+   i2m = N-1;
+   j2m = N-1;
+   ll = 0;
+   do {
+
+   ixcm = jxcm = iycm = jycm = irxm = jrxm = irym = jrym = m = -1;
+   dxcm = dycm = rxm = rym = 0.0;
+
+
+   for(j=j1p ; j < j2m ; j++) {
+
+       jp = j+1;
+       jm = j-1;
+       m = m+1;
+       for(i=i1p;i<i2m;i++) {
+           ip = i+1;
+           im = i-1;
+           xx = x[ip][j]-x[im][j];
+           yx = y[ip][j]-y[im][j];
+           xy = x[i][jp]-x[i][jm];
+           yy = y[i][jp]-y[i][jm];
+           a = 0.25*(xy*xy+yy*yy);
+           b = 0.25*(xx*xx+yx*yx);
+           c = 0.125*(xx*xy+yx*yy);
+           qi = 0.0;
+           qj = 0.0;
+           aa[i][m] = -b;
+           dd[i][m] = b+b+a*rel;
+           pxx = x[ip][j]-2.0*x[i][j]+x[im][j];
+           qxx = y[ip][j]-2.0*y[i][j]+y[im][j];
+
+           pyy = x[i][jp]-2.0*x[i][j]+x[i][jm];
+           qyy = y[i][jp]-2.0*y[i][j]+y[i][jm];
+
+           pxy = x[ip][jp]-x[ip][jm]-x[im][jp]+x[im][jm];
+           qxy = y[ip][jp]-y[ip][jm]-y[im][jp]+y[im][jm];
+
+           rx[i][m] = a*pxx+b*pyy-c*pxy+xx*qi+xy*qj;
+           ry[i][m] = a*qxx+b*qyy-c*qxy+yx*qi+yy*qj;
+       }
+   }
+
+   for (j=0; j<m; j++) {
+      for (i=i1p; i<i2m; i++) {
+        if (Math.abs(rx[i][j]) >= Math.abs(rxm)) {
+           rxm = rx[i][j];
+           irxm = i;
+           jrxm = j;
+        }
+        if (Math.abs(ry[i][j]) >= Math.abs(rym)) {
+           rym = ry[i][j];
+           irym = i;
+           jrym = j;
+        }
+      }
+   }
+
+   for (i=i1p; i<i2m; i++) {
+      d[i][0] = 1.0/dd[i][0];
+   }
+
+   for (j=1; j<=m; j++) {
+      for (i=i1p; i<i2m; i++) {
+         r = aa[i][j]*d[i][j-1];
+         d[i][j] = 1.0/(dd[i][j]-aa[i][j-1]*r);
+         rx[i][j] = rx[i][j] - rx[i][j-1]*r;
+         ry[i][j] = ry[i][j] - ry[i][j-1]*r;
+      }
+   }
+
+   for (i=i1p; i<i2m; i++) {
+      rx[i][m] = rx[i][m]*d[i][m];
+      ry[i][m] = ry[i][m]*d[i][m];
+   }
+
+   for (j=1; j<=m; j++) {
+      k = m-j;
+      for (i=i1p; i<i2m; i++) {
+         rx[i][k] = (rx[i][k]-aa[i][k]*rx[i][k+1])*d[i][k];
+         ry[i][k] = (ry[i][k]-aa[i][k]*ry[i][k+1])*d[i][k];
+      }
+   }
+
+   l = -1;
+   for (j=j1p; j<j2m; j++) {
+      l = l+1;
+      for (i=i1p; i<i2m; i++) {
+         x[i][j] = x[i][j]+rx[i][l];
+         y[i][j] = y[i][j]+ry[i][l];
+      }
+   }
+
+   ll = ll+1;
+   abx = Math.abs(rxm);
+   aby = Math.abs(rym);
+   dmax = (abx > aby) ? abx : aby;
+
+   t053.goldChecker.println(ll+"  "+ixcm+"  "+jxcm+"  "+dxcm+"  "+iycm+"  "+jycm+"  "+dycm+"  "+irxm+"  "+jrxm+"  "+rxm+"  "+irym+"  "+jrym+"  "+rym);
+
+   } while ((ll < lmax) && (dmax > eps));
+
+
+   t053.goldChecker.check();
+ }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.gold
new file mode 100644
index 00000000000..155ca8f84ae
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.gold
@@ -0,0 +1,15 @@
+vbl :: vbl
+1
+2
+3
+4
+5
+6
+
+vbl :: reg
+1
+2
+3
+4
+5
+6
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java
new file mode 100644
index 00000000000..439add7ce39
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java
@@ -0,0 +1,87 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t054.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t054.t054
+ * @run driver ExecDriver --java jit.t.t054.t054
+ */
+
+package jit.t.t054;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+
+// A more comprehensive test for the tomcatv bug, that being failure
+// correctly to reverse the sense of a jump.
+
+class t054
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t054" );
+
+    public static void main(String argv[])
+    {
+        int i;
+        int n;
+
+        t054.goldChecker.println("vbl :: vbl");
+        n = 1;
+        for(i=0; i<n; i+=1)
+            t054.goldChecker.println("1");
+        for(i=1; i<=n; i+=1)
+            t054.goldChecker.println("2");
+        for(i=1; i==n; i+=1)
+            t054.goldChecker.println("3");
+        for(i=0; i!=n; i+=1)
+            t054.goldChecker.println("4");
+        for(i=2; i>n; i-=1)
+            t054.goldChecker.println("5");
+        for(i=1; i>=n; i-=1)
+            t054.goldChecker.println("6");
+
+        t054.goldChecker.println();
+        t054.goldChecker.println("vbl :: reg");
+        n = 2;
+        for(i=0; i<n-1; i+=1)
+            t054.goldChecker.println("1");
+        for(i=1; i<=n-1; i+=1)
+            t054.goldChecker.println("2");
+        for(i=1; i==n-1; i+=1)
+            t054.goldChecker.println("3");
+        for(i=0; i!=n-1; i+=1)
+            t054.goldChecker.println("4");
+        for(i=2; i>n-1; i-=1)
+            t054.goldChecker.println("5");
+        for(i=1; i>=n-1; i-=1)
+            t054.goldChecker.println("6");
+        t054.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.gold
new file mode 100644
index 00000000000..88f21abf084
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.gold
@@ -0,0 +1,6 @@
+1: Caught by Palmer
+2: Caught by Tinker
+3: Caught by Evers
+4: Caught by Chance
+5: Caught in main
+So long for now from Candlestick Park.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java
new file mode 100644
index 00000000000..3d6c64f7f0a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java
@@ -0,0 +1,127 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t055.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t055.t055
+ * @run driver ExecDriver --java jit.t.t055.t055
+ */
+
+package jit.t.t055;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t055
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t055" );
+
+    static void Palmer(int catcher) throws Throwable
+    {
+        try
+        {
+            Throwable slider = new Throwable();
+            throw slider;
+        }
+        catch(Throwable splitter)
+        {
+            if(catcher == 1)
+                t055.goldChecker.println("Caught by Palmer");
+            else
+                throw splitter;
+        }
+    }
+
+    static void Tinker(int catcher) throws Throwable
+    {
+        try
+        {
+            Palmer(catcher);
+        }
+        catch(Throwable curve)
+        {
+            if(catcher == 2)
+                t055.goldChecker.println("Caught by Tinker");
+            else
+                throw curve;
+        }
+    }
+
+    static void Evers(int catcher) throws Throwable
+    {
+        try
+        {
+            Tinker(catcher);
+        }
+        catch(Throwable straightChange)
+        {
+            if(catcher == 3)
+                t055.goldChecker.println("Caught by Evers");
+            else
+                throw straightChange;
+        }
+    }
+
+    static void Chance(int catcher) throws Throwable
+    {
+        try
+        {
+            Evers(catcher);
+        }
+        catch(Throwable knuckler)
+        {
+            if(catcher == 4)
+                t055.goldChecker.println("Caught by Chance");
+            else
+                throw knuckler;
+        }
+    }
+
+    public static void main(String argv[])
+    {
+        int i;
+
+        for(i=1; i<=5; i+=1)
+        {
+            try
+            {
+                t055.goldChecker.print(i + ": ");
+                Chance(i);
+            }
+            catch(Throwable screwball)
+            {
+                t055.goldChecker.println("Caught in main");
+            }
+        }
+
+        t055.goldChecker.println("So long for now from Candlestick Park.");
+        t055.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.gold
new file mode 100644
index 00000000000..05571700f9f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.gold
@@ -0,0 +1,4 @@
+Calling r14: caught in r44
+Calling r13: caught in r33
+Calling r12: caught in r22
+Calling r11: caught in r11
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java
new file mode 100644
index 00000000000..81605c82aed
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java
@@ -0,0 +1,136 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t056.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t056.t056
+ * @run driver ExecDriver --java jit.t.t056.t056
+ */
+
+package jit.t.t056;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t056
+{
+    // Routine nest in which exception is thrown and caught in
+    // the fourth routine.
+
+    public static final GoldChecker goldChecker = new GoldChecker( "t056" );
+
+    static void r14(){r24();}
+    static void r24(){r34();}
+    static void r34(){r44();}
+    static void r44()
+    {
+        try
+        {
+            Throwable t = new Throwable();
+            throw t;
+        }
+        catch(Throwable t)
+        {
+            t056.goldChecker.println("caught in r44");
+        }
+    }
+
+    // Thrown in the fourth; caught in the third.
+
+    static void r13(){r23();}
+    static void r23(){r33();}
+    static void r33()
+    {
+        try
+        {
+            r43();
+        }
+        catch(Throwable t)
+        {
+            t056.goldChecker.println("caught in r33");
+        }
+    }
+    static void r43() throws Throwable
+    {
+        Throwable t = new Throwable();
+        throw t;
+    }
+
+    // Thrown in fourth; caught in second.
+
+    static void r12(){r22();}
+    static void r22()
+    {
+        try
+        {
+            r32();
+        }
+        catch(Throwable t)
+        {
+            t056.goldChecker.println("caught in r22");
+        }
+    }
+    static void r32() throws Throwable {r42();}
+    static void r42() throws Throwable
+    {
+        Throwable t = new Throwable();
+        throw t;
+    }
+
+    // Thrown in fourth; caught in first.
+
+    static void r11()
+    {
+        try
+        {
+            r21();
+        }
+        catch(Throwable t)
+        {
+            t056.goldChecker.println("caught in r11");
+        }
+    }
+    static void r21() throws Throwable {r31();}
+    static void r31() throws Throwable {r41();}
+    static void r41() throws Throwable
+    {
+        Throwable t = new Throwable();
+        throw t;
+    }
+
+    public static void main(String argv[])
+    {
+        t056.goldChecker.print("Calling r14: "); r14();
+        t056.goldChecker.print("Calling r13: "); r13();
+        t056.goldChecker.print("Calling r12: "); r12();
+        t056.goldChecker.print("Calling r11: "); r11();
+                                           t056.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.gold
new file mode 100644
index 00000000000..05571700f9f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.gold
@@ -0,0 +1,4 @@
+Calling r14: caught in r44
+Calling r13: caught in r33
+Calling r12: caught in r22
+Calling r11: caught in r11
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java
new file mode 100644
index 00000000000..1509ee6d6b6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java
@@ -0,0 +1,137 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t057.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t057.t057
+ * @run driver ExecDriver --java jit.t.t057.t057
+ */
+
+package jit.t.t057;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Just like t056 except here the exception is not explicitly thrown.
+
+class t057
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t057" );
+
+    static int i;
+    static int j;
+
+    // Routine nest in which exception is thrown and caught in
+    // the fourth routine.
+
+    static void r14(){r24();}
+    static void r24(){r34();}
+    static void r34(){r44();}
+    static void r44()
+    {
+        try
+        {
+            i/=j;
+        }
+        catch(Throwable t)
+        {
+            t057.goldChecker.println("caught in r44");
+        }
+    }
+
+    // Thrown in the fourth; caught in the third.
+
+    static void r13(){r23();}
+    static void r23(){r33();}
+    static void r33()
+    {
+        try
+        {
+            r43();
+        }
+        catch(Throwable t)
+        {
+            t057.goldChecker.println("caught in r33");
+        }
+    }
+    static void r43() throws Throwable
+    {
+        i/=j;
+    }
+
+    // Thrown in fourth; caught in second.
+
+    static void r12(){r22();}
+    static void r22()
+    {
+        try
+        {
+            r32();
+        }
+        catch(Throwable t)
+        {
+            t057.goldChecker.println("caught in r22");
+        }
+    }
+    static void r32() throws Throwable {r42();}
+    static void r42() throws Throwable
+    {
+        i/=j;
+    }
+
+    // Thrown in fourth; caught in first.
+
+    static void r11()
+    {
+        try
+        {
+            r21();
+        }
+        catch(Throwable t)
+        {
+            t057.goldChecker.println("caught in r11");
+        }
+    }
+    static void r21() throws Throwable {r31();}
+    static void r31() throws Throwable {r41();}
+    static void r41() throws Throwable
+    {
+        i/=j;
+    }
+
+    public static void main(String argv[])
+    {
+        t057.goldChecker.print("Calling r14: "); r14();
+        t057.goldChecker.print("Calling r13: "); r13();
+        t057.goldChecker.print("Calling r12: "); r12();
+        t057.goldChecker.print("Calling r11: "); r11();
+                                           t057.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.gold
new file mode 100644
index 00000000000..d7997010a45
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.gold
@@ -0,0 +1,42 @@
+Voodoo 1
+Voodoo 2
+[Ljit.t.t058.k;
+[[[Ljit.t.t058.k;
+[Ljit.t.t058.k;
+[[[Ljit.t.t058.k;
+jit.t.t058.k
+jit.t.t058.k
+o instanceof k: true
+Voodoo 3
+java.lang.Object
+
+Here come the instance variables of ko:
+39.0
+40
+41
+42.0
+43
+44
+45
+
+Here come the static variables of k:
+46.0
+47
+48
+49.0
+50
+51
+52
+
+Here come the array values
+0
+0
+1
+10
+11
+
+1
+100
+101
+110
+111
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java
new file mode 100644
index 00000000000..fa388d76c3f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java
@@ -0,0 +1,195 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t058.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t058.t058
+ * @run driver ExecDriver --java jit.t.t058.t058
+ */
+
+package jit.t.t058;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+interface l
+{
+    void voodoo();
+}
+
+class k implements l
+{
+    double d;
+    long l;
+    int i;
+    float f;
+    short s;
+    char c;
+    byte b;
+
+    static double sd;
+    static long sl;
+    static int si;
+    static float sf;
+    static short ss;
+    static char sc;
+    static byte sb;
+
+    int value;
+
+    private int voodooCount;
+
+    k()
+    {
+        value = 0;
+    }
+
+    k(int n)
+    {
+        value = n;
+    }
+
+    public void voodoo()
+    {
+        voodooCount += 1;
+        t058.goldChecker.println("Voodoo " + voodooCount);
+    }
+}
+
+class t058
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t058" );
+
+    public static void main(String argv[])
+    {
+        k ko;
+        l lo;
+        k ka[];
+        k kaaa[][][];
+        Object o;
+        boolean b;
+        int i,j,z;
+
+        ko = new k();
+        ko.voodoo();
+        lo = ko;
+        lo.voodoo();
+        ka = new k[2];
+        t058.goldChecker.println(ka.getClass().getName());
+        kaaa = new k[2][2][2];
+        t058.goldChecker.println(kaaa.getClass().getName());
+
+        o = ka;
+        t058.goldChecker.println(o.getClass().getName());
+        o = kaaa;
+        t058.goldChecker.println(o.getClass().getName());
+        o = ko;
+        t058.goldChecker.println(o.getClass().getName());
+        ko = (k) o;
+        t058.goldChecker.println(ko.getClass().getName());
+        b = o instanceof k;
+        t058.goldChecker.println("o instanceof k: " + b);
+        lo.voodoo();
+
+        o = new Object();
+        t058.goldChecker.println(o.getClass().getName());
+
+        t058.goldChecker.println();
+        t058.goldChecker.println("Here come the instance variables of ko:");
+
+        ko.d = 39.0;
+        ko.l = 40;
+        ko.i = 41;
+        ko.f = 42.0f;
+        ko.s = (short) 43;
+        ko.c = (char) 44;
+        ko.b = (byte) 45;
+
+        t058.goldChecker.println(ko.d);
+        t058.goldChecker.println(ko.l);
+        t058.goldChecker.println(ko.i);
+        t058.goldChecker.println(ko.f);
+        t058.goldChecker.println((int) ko.s);
+        t058.goldChecker.println((int) ko.c);
+        t058.goldChecker.println((int) ko.b);
+
+
+        t058.goldChecker.println();
+        t058.goldChecker.println("Here come the static variables of k:");
+
+        k.sd = 46.0;
+        k.sl = 47;
+        k.si = 48;
+        k.sf = 49.0f;
+        k.ss = (short) 50;
+        k.sc = (char) 51;
+        k.sb = (byte) 52;
+
+        t058.goldChecker.println(k.sd);
+        t058.goldChecker.println(k.sl);
+        t058.goldChecker.println(k.si);
+        t058.goldChecker.println(k.sf);
+        t058.goldChecker.println((int) k.ss);
+        t058.goldChecker.println((int) k.sc);
+        t058.goldChecker.println((int) k.sb);
+
+        /* Initialize the arrays. */
+        for(i=0; i<2; i+=1)
+        {
+            ka[i] = new k(i);
+            for(j=0; j<2; j+=1)
+            {
+                for(z=0; z<2; z+=1)
+                {
+                    kaaa[i][j][z] = new k(100*i + 10*j + z);
+                }
+            }
+        }
+
+        /* Display the arrays. */
+        t058.goldChecker.println();
+        t058.goldChecker.println("Here come the array values");
+        for(i=0; i<2; i+=1)
+        {
+            t058.goldChecker.println(ka[i].value);
+            for(j=0; j<2; j+=1)
+            {
+                for(z=0; z<2; z+=1)
+                {
+                    t058.goldChecker.println(kaaa[i][j][z].value);
+                }
+            }
+            if (i < 1) {
+                t058.goldChecker.println();
+            }
+        }
+        t058.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.gold
new file mode 100644
index 00000000000..27fd6553d22
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.gold
@@ -0,0 +1,8 @@
+012
+01
+0123
+
+01234
+56789
+1011121314
+1516171819
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java
new file mode 100644
index 00000000000..7a07bc0298c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java
@@ -0,0 +1,82 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t059.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t059.t059
+ * @run driver ExecDriver --java jit.t.t059.t059
+ */
+
+package jit.t.t059;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t059
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t059" );
+
+    static int a[][] =
+    {
+        {0,1,2},
+        {0,1},
+        {0,1,2,3}
+    };
+
+    final int b[][] =
+    {
+        {0, 1, 2, 3, 4},
+        {5, 6, 7, 8, 9},
+        {10, 11, 12, 13, 14},
+        {15, 16, 17, 18, 19}
+    };
+
+    public static void main(String argv[])
+    {
+        int i, j;
+        t059 o = new t059();
+
+        for(i=0; i<a.length; i+=1)
+        {
+            for(j=0; j<a[i].length; j+=1)
+                t059.goldChecker.print(a[i][j]);
+            t059.goldChecker.println();
+        }
+
+        t059.goldChecker.println();
+        for(i=0; i<o.b.length; i+=1)
+        {
+            for(j=0; j<o.b[i].length; j+=1)
+                t059.goldChecker.print(o.b[i][j]);
+            t059.goldChecker.println();
+        }
+        t059.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.gold
new file mode 100644
index 00000000000..7738555144c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.gold
@@ -0,0 +1,9 @@
+t060:
+012
+01
+0123
+
+01234
+56789
+1011121314
+1516171819
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java
new file mode 100644
index 00000000000..affab1d22d6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java
@@ -0,0 +1,84 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t060.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t060.t060
+ * @run driver ExecDriver --java jit.t.t060.t060
+ */
+
+package jit.t.t060;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t060
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t060" );
+
+    static String a[][] =
+    {
+        {"0","1","2"},
+        {"0","1"},
+        {"0","1","2","3"}
+    };
+
+    final String b[][] =
+    {
+        {"0", "1", "2", "3", "4"},
+        {"5", "6", "7", "8", "9"},
+        {"10", "11", "12", "13", "14"},
+        {"15", "16", "17", "18", "19"}
+    };
+
+    public static void main(String argv[])
+    {
+        int i, j;
+        t060 o = new t060();
+
+        t060.goldChecker.println("t060:");
+
+        for(i=0; i<a.length; i+=1)
+        {
+            for(j=0; j<a[i].length; j+=1)
+                t060.goldChecker.print(a[i][j]);
+            t060.goldChecker.println();
+        }
+
+        t060.goldChecker.println();
+        for(i=0; i<o.b.length; i+=1)
+        {
+            for(j=0; j<o.b[i].length; j+=1)
+                t060.goldChecker.print(o.b[i][j]);
+            t060.goldChecker.println();
+        }
+        t060.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.gold
new file mode 100644
index 00000000000..f38e32d76df
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.gold
@@ -0,0 +1,9 @@
+39.0
+42.0
+402.0
+-1.0
+
+-2
+10000000000
+10000000001
+2147483648
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java
new file mode 100644
index 00000000000..d7982cb22bb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java
@@ -0,0 +1,68 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t061.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t061.t061
+ * @run driver ExecDriver --java jit.t.t061.t061
+ */
+
+package jit.t.t061;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Long and double array loads with variable and constant subscripts.
+
+class t061
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t061" );
+
+    static double d[] = {39, 42, 402, -1};
+    static long l[] = {-2l, 10000000000l, 10000000001l, 2147483648l};
+
+    public static void main(String argv[])
+    {
+        int i = 1;
+        int j = 3;
+
+        t061.goldChecker.println(d[0]);
+        t061.goldChecker.println(d[i]);
+        t061.goldChecker.println(d[2]);
+        t061.goldChecker.println(d[j]);
+
+        t061.goldChecker.println();
+        t061.goldChecker.println(l[0]);
+        t061.goldChecker.println(l[i]);
+        t061.goldChecker.println(l[2]);
+        t061.goldChecker.println(l[j]);
+        t061.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.gold
new file mode 100644
index 00000000000..50e8942cdcb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.gold
@@ -0,0 +1,42 @@
+Voodoo 1
+Voodoo 2
+[Ljit.t.t062.t062;
+[[[Ljit.t.t062.t062;
+[Ljit.t.t062.t062;
+[[[Ljit.t.t062.t062;
+jit.t.t062.t062
+jit.t.t062.t062
+o instanceof t062: true
+Voodoo 3
+java.lang.Object
+
+Here come the instance variables of ko:
+39.0
+40
+41
+42.0
+43
+44
+45
+
+Here come the static variables of t062:
+46.0
+47
+48
+49.0
+50
+51
+52
+
+Here come the array values
+0
+0
+1
+10
+11
+
+1
+100
+101
+110
+111
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java
new file mode 100644
index 00000000000..f6515d4d62c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java
@@ -0,0 +1,204 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t062.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t062.t062
+ * @run driver ExecDriver --java jit.t.t062.t062
+ */
+
+package jit.t.t062;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Like t058.java except in this case the class with all the fields and
+// stuff is loaded before the client class, so no patching is required.
+
+interface l
+{
+    void voodoo();
+}
+
+class t062 implements l
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t062" );
+
+    double d;
+    long l;
+    int i;
+    float f;
+    short s;
+    char c;
+    byte b;
+
+    static double sd;
+    static long sl;
+    static int si;
+    static float sf;
+    static short ss;
+    static char sc;
+    static byte sb;
+
+    int value;
+
+    private int voodooCount;
+
+    t062()
+    {
+        value = 0;
+    }
+
+    t062(int n)
+    {
+        value = n;
+    }
+
+    public void voodoo()
+    {
+        voodooCount += 1;
+        t062.goldChecker.println("Voodoo " + voodooCount);
+    }
+
+    public static void main(String argv[])
+    {
+        k.main();
+        t062.goldChecker.check();
+    }
+}
+
+class k
+{
+    public static void main()
+    {
+        t062 ko;
+        l lo;
+        t062 ka[];
+        t062 kaaa[][][];
+        Object o;
+        boolean b;
+        int i,ii,z;
+
+        ko = new t062();
+        ko.voodoo();
+        lo = ko;
+        lo.voodoo();
+        ka = new t062[2];
+        t062.goldChecker.println(ka.getClass().getName());
+        kaaa = new t062[2][2][2];
+        t062.goldChecker.println(kaaa.getClass().getName());
+
+        o = ka;
+        t062.goldChecker.println(o.getClass().getName());
+        o = kaaa;
+        t062.goldChecker.println(o.getClass().getName());
+        o = ko;
+        t062.goldChecker.println(o.getClass().getName());
+        ko = (t062) o;
+        t062.goldChecker.println(ko.getClass().getName());
+        b = o instanceof t062;
+        t062.goldChecker.println("o instanceof t062: " + b);
+        lo.voodoo();
+
+        o = new Object();
+        t062.goldChecker.println(o.getClass().getName());
+
+        t062.goldChecker.println();
+        t062.goldChecker.println("Here come the instance variables of ko:");
+
+        ko.d = 39.0;
+        ko.l = 40;
+        ko.i = 41;
+        ko.f = 42.0f;
+        ko.s = (short) 43;
+        ko.c = (char) 44;
+        ko.b = (byte) 45;
+
+        t062.goldChecker.println(ko.d);
+        t062.goldChecker.println(ko.l);
+        t062.goldChecker.println(ko.i);
+        t062.goldChecker.println(ko.f);
+        t062.goldChecker.println((int) ko.s);
+        t062.goldChecker.println((int) ko.c);
+        t062.goldChecker.println((int) ko.b);
+
+
+        t062.goldChecker.println();
+        t062.goldChecker.println("Here come the static variables of t062:");
+
+        t062.sd = 46.0;
+        t062.sl = 47;
+        t062.si = 48;
+        t062.sf = 49.0f;
+        t062.ss = (short) 50;
+        t062.sc = (char) 51;
+        t062.sb = (byte) 52;
+
+        t062.goldChecker.println(t062.sd);
+        t062.goldChecker.println(t062.sl);
+        t062.goldChecker.println(t062.si);
+        t062.goldChecker.println(t062.sf);
+        t062.goldChecker.println((int) t062.ss);
+        t062.goldChecker.println((int) t062.sc);
+        t062.goldChecker.println((int) t062.sb);
+
+        /* Initialize the arrays. */
+        for(i=0; i<2; i+=1)
+        {
+            ka[i] = new t062(i);
+            for(ii=0; ii<2; ii+=1)
+            {
+                for(z=0; z<2; z+=1)
+                {
+                    kaaa[i][ii][z] = new t062(100*i + 10*ii + z);
+                }
+            }
+        }
+
+        /* Display the arrays. */
+        t062.goldChecker.println();
+        t062.goldChecker.println("Here come the array values");
+        for(i=0; i<2; i+=1)
+        {
+            t062.goldChecker.println(ka[i].value);
+            for(ii=0; ii<2; ii+=1)
+            {
+                for(z=0; z<2; z+=1)
+                {
+                    t062.goldChecker.println(kaaa[i][ii][z].value);
+                }
+            }
+            if (i < 1) {
+                t062.goldChecker.println();
+            }
+        }
+        t062.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.gold
new file mode 100644
index 00000000000..33cb5f45779
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.gold
@@ -0,0 +1,2 @@
+Hi, t063.java here.
+... and that's all the news that's fit to print.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java
new file mode 100644
index 00000000000..df0779adb0b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t063.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t063.t063
+ * @run driver ExecDriver --java jit.t.t063.t063
+ */
+
+package jit.t.t063;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t063
+{
+  public static final GoldChecker goldChecker = new GoldChecker( "t063" );
+
+  t063() { }
+
+  byte b = 0;
+  short s = 0;
+  int i = 0;
+  long l = 0;
+
+  static void chkCond(String s, boolean b)
+  {
+      if(!b)
+          t063.goldChecker.println(s);
+  }
+
+  static void chkIntVal(String s, String t, int x, int y)
+  {
+      if(x != y)
+          t063.goldChecker.println(s + " " + t + " is " + x + " sb " + y);
+  }
+
+  public static void chkBounds()
+  {
+       t063 ox = new t063();
+
+       ox.b = -128;
+       chkCond("err_1", ox.b == -128);
+
+       ox.b = 127;
+       chkCond("err_2", ox.b == 127);
+
+       ox.s = -32768;
+       chkCond("err_3", ox.s == -32768);
+
+       ox.s = 32767;
+       chkCond("err_4", ox.s == 32767);
+
+       ox.i = -2147483647 -1;
+       chkCond("err_5", ox.i == 0x80000000);
+
+       ox.i = 2147483647;
+       chkCond("err_6", ox.i == 017777777777);
+
+       ox.l = -9223372036854775807L -1;
+       chkCond("err_7", ox.l == 0x8000000000000000l);
+
+       ox.l = 9223372036854775807L;
+       chkCond("err_8", ox.l == 0x7fffffffffffffffl);
+
+       ox.i = -2147483647 - 2;
+       chkCond("err_9", ox.i <= 2147483647);
+       chkCond("err_10", ox.i >= 0x80000000);
+
+       ox.i = 2147483647 + 1;
+       chkCond("err_11", ox.i <= 2147483647);
+       chkCond("err_12", ox.i >= 0x80000000);
+
+       ox.l = -9223372036854775807l - 2;
+       chkCond("err_13", ox.l <= 9223372036854775807l);
+       chkCond("err_14", ox.l >= 0x8000000000000000l);
+
+       ox.l = 9223372036854775807l + 1;
+       chkCond("err_15", ox.l <= 9223372036854775807l);
+       chkCond("err_16", ox.l >= 0x8000000000000000l);
+
+       ox.b = 100;
+       chkIntVal("err_17", "ox.b * ox.b", ox.b * ox.b, 10000);
+       for (int i = 0; i < 10000; i++)
+            ox.b++;
+       chkCond("err_18", ox.b <= 127);
+       chkCond("err_19", ox.b >= -128);
+
+       ox.s = 32750;
+       chkIntVal("err_20", "ox.s * ox.s", ox.s * ox.s,  1072562500);
+       for (int i = 0; i < 1000000; i++)
+            ox.s++;
+       chkCond("err_21", ox.s <= 32767);
+       chkCond("err_22", ox.s >= -32768);
+  }
+
+  public static void main(String argv[])
+  {
+      t063.goldChecker.println("Hi, t063.java here.");
+      chkBounds();
+      t063.goldChecker.println("... and that's all the news that's fit to print.");
+      t063.goldChecker.check();
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.gold
new file mode 100644
index 00000000000..60a92b57299
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.gold
@@ -0,0 +1,516 @@
+k.b == 127
+l.b == 127
+k.b == -128
+l.b == -128
+k.b == -127
+l.b == -127
+k.b == -126
+l.b == -126
+k.b == -125
+l.b == -125
+k.b == -124
+l.b == -124
+k.b == -123
+l.b == -123
+k.b == -122
+l.b == -122
+k.b == -121
+l.b == -121
+k.b == -120
+l.b == -120
+k.b == -119
+l.b == -119
+k.b == -118
+l.b == -118
+k.b == -117
+l.b == -117
+k.b == -116
+l.b == -116
+k.b == -115
+l.b == -115
+k.b == -114
+l.b == -114
+k.b == -113
+l.b == -113
+k.b == -112
+l.b == -112
+k.b == -111
+l.b == -111
+k.b == -110
+l.b == -110
+k.b == -109
+l.b == -109
+k.b == -108
+l.b == -108
+k.b == -107
+l.b == -107
+k.b == -106
+l.b == -106
+k.b == -105
+l.b == -105
+k.b == -104
+l.b == -104
+k.b == -103
+l.b == -103
+k.b == -102
+l.b == -102
+k.b == -101
+l.b == -101
+k.b == -100
+l.b == -100
+k.b == -99
+l.b == -99
+k.b == -98
+l.b == -98
+k.b == -97
+l.b == -97
+k.b == -96
+l.b == -96
+k.b == -95
+l.b == -95
+k.b == -94
+l.b == -94
+k.b == -93
+l.b == -93
+k.b == -92
+l.b == -92
+k.b == -91
+l.b == -91
+k.b == -90
+l.b == -90
+k.b == -89
+l.b == -89
+k.b == -88
+l.b == -88
+k.b == -87
+l.b == -87
+k.b == -86
+l.b == -86
+k.b == -85
+l.b == -85
+k.b == -84
+l.b == -84
+k.b == -83
+l.b == -83
+k.b == -82
+l.b == -82
+k.b == -81
+l.b == -81
+k.b == -80
+l.b == -80
+k.b == -79
+l.b == -79
+k.b == -78
+l.b == -78
+k.b == -77
+l.b == -77
+k.b == -76
+l.b == -76
+k.b == -75
+l.b == -75
+k.b == -74
+l.b == -74
+k.b == -73
+l.b == -73
+k.b == -72
+l.b == -72
+k.b == -71
+l.b == -71
+k.b == -70
+l.b == -70
+k.b == -69
+l.b == -69
+k.b == -68
+l.b == -68
+k.b == -67
+l.b == -67
+k.b == -66
+l.b == -66
+k.b == -65
+l.b == -65
+k.b == -64
+l.b == -64
+k.b == -63
+l.b == -63
+k.b == -62
+l.b == -62
+k.b == -61
+l.b == -61
+k.b == -60
+l.b == -60
+k.b == -59
+l.b == -59
+k.b == -58
+l.b == -58
+k.b == -57
+l.b == -57
+k.b == -56
+l.b == -56
+k.b == -55
+l.b == -55
+k.b == -54
+l.b == -54
+k.b == -53
+l.b == -53
+k.b == -52
+l.b == -52
+k.b == -51
+l.b == -51
+k.b == -50
+l.b == -50
+k.b == -49
+l.b == -49
+k.b == -48
+l.b == -48
+k.b == -47
+l.b == -47
+k.b == -46
+l.b == -46
+k.b == -45
+l.b == -45
+k.b == -44
+l.b == -44
+k.b == -43
+l.b == -43
+k.b == -42
+l.b == -42
+k.b == -41
+l.b == -41
+k.b == -40
+l.b == -40
+k.b == -39
+l.b == -39
+k.b == -38
+l.b == -38
+k.b == -37
+l.b == -37
+k.b == -36
+l.b == -36
+k.b == -35
+l.b == -35
+k.b == -34
+l.b == -34
+k.b == -33
+l.b == -33
+k.b == -32
+l.b == -32
+k.b == -31
+l.b == -31
+k.b == -30
+l.b == -30
+k.b == -29
+l.b == -29
+k.b == -28
+l.b == -28
+k.b == -27
+l.b == -27
+k.b == -26
+l.b == -26
+k.b == -25
+l.b == -25
+k.b == -24
+l.b == -24
+k.b == -23
+l.b == -23
+k.b == -22
+l.b == -22
+k.b == -21
+l.b == -21
+k.b == -20
+l.b == -20
+k.b == -19
+l.b == -19
+k.b == -18
+l.b == -18
+k.b == -17
+l.b == -17
+k.b == -16
+l.b == -16
+k.b == -15
+l.b == -15
+k.b == -14
+l.b == -14
+k.b == -13
+l.b == -13
+k.b == -12
+l.b == -12
+k.b == -11
+l.b == -11
+k.b == -10
+l.b == -10
+k.b == -9
+l.b == -9
+k.b == -8
+l.b == -8
+k.b == -7
+l.b == -7
+k.b == -6
+l.b == -6
+k.b == -5
+l.b == -5
+k.b == -4
+l.b == -4
+k.b == -3
+l.b == -3
+k.b == -2
+l.b == -2
+k.b == -1
+l.b == -1
+k.b == 0
+l.b == 0
+k.b == 1
+l.b == 1
+k.b == 2
+l.b == 2
+k.b == 3
+l.b == 3
+k.b == 4
+l.b == 4
+k.b == 5
+l.b == 5
+k.b == 6
+l.b == 6
+k.b == 7
+l.b == 7
+k.b == 8
+l.b == 8
+k.b == 9
+l.b == 9
+k.b == 10
+l.b == 10
+k.b == 11
+l.b == 11
+k.b == 12
+l.b == 12
+k.b == 13
+l.b == 13
+k.b == 14
+l.b == 14
+k.b == 15
+l.b == 15
+k.b == 16
+l.b == 16
+k.b == 17
+l.b == 17
+k.b == 18
+l.b == 18
+k.b == 19
+l.b == 19
+k.b == 20
+l.b == 20
+k.b == 21
+l.b == 21
+k.b == 22
+l.b == 22
+k.b == 23
+l.b == 23
+k.b == 24
+l.b == 24
+k.b == 25
+l.b == 25
+k.b == 26
+l.b == 26
+k.b == 27
+l.b == 27
+k.b == 28
+l.b == 28
+k.b == 29
+l.b == 29
+k.b == 30
+l.b == 30
+k.b == 31
+l.b == 31
+k.b == 32
+l.b == 32
+k.b == 33
+l.b == 33
+k.b == 34
+l.b == 34
+k.b == 35
+l.b == 35
+k.b == 36
+l.b == 36
+k.b == 37
+l.b == 37
+k.b == 38
+l.b == 38
+k.b == 39
+l.b == 39
+k.b == 40
+l.b == 40
+k.b == 41
+l.b == 41
+k.b == 42
+l.b == 42
+k.b == 43
+l.b == 43
+k.b == 44
+l.b == 44
+k.b == 45
+l.b == 45
+k.b == 46
+l.b == 46
+k.b == 47
+l.b == 47
+k.b == 48
+l.b == 48
+k.b == 49
+l.b == 49
+k.b == 50
+l.b == 50
+k.b == 51
+l.b == 51
+k.b == 52
+l.b == 52
+k.b == 53
+l.b == 53
+k.b == 54
+l.b == 54
+k.b == 55
+l.b == 55
+k.b == 56
+l.b == 56
+k.b == 57
+l.b == 57
+k.b == 58
+l.b == 58
+k.b == 59
+l.b == 59
+k.b == 60
+l.b == 60
+k.b == 61
+l.b == 61
+k.b == 62
+l.b == 62
+k.b == 63
+l.b == 63
+k.b == 64
+l.b == 64
+k.b == 65
+l.b == 65
+k.b == 66
+l.b == 66
+k.b == 67
+l.b == 67
+k.b == 68
+l.b == 68
+k.b == 69
+l.b == 69
+k.b == 70
+l.b == 70
+k.b == 71
+l.b == 71
+k.b == 72
+l.b == 72
+k.b == 73
+l.b == 73
+k.b == 74
+l.b == 74
+k.b == 75
+l.b == 75
+k.b == 76
+l.b == 76
+k.b == 77
+l.b == 77
+k.b == 78
+l.b == 78
+k.b == 79
+l.b == 79
+k.b == 80
+l.b == 80
+k.b == 81
+l.b == 81
+k.b == 82
+l.b == 82
+k.b == 83
+l.b == 83
+k.b == 84
+l.b == 84
+k.b == 85
+l.b == 85
+k.b == 86
+l.b == 86
+k.b == 87
+l.b == 87
+k.b == 88
+l.b == 88
+k.b == 89
+l.b == 89
+k.b == 90
+l.b == 90
+k.b == 91
+l.b == 91
+k.b == 92
+l.b == 92
+k.b == 93
+l.b == 93
+k.b == 94
+l.b == 94
+k.b == 95
+l.b == 95
+k.b == 96
+l.b == 96
+k.b == 97
+l.b == 97
+k.b == 98
+l.b == 98
+k.b == 99
+l.b == 99
+k.b == 100
+l.b == 100
+k.b == 101
+l.b == 101
+k.b == 102
+l.b == 102
+k.b == 103
+l.b == 103
+k.b == 104
+l.b == 104
+k.b == 105
+l.b == 105
+k.b == 106
+l.b == 106
+k.b == 107
+l.b == 107
+k.b == 108
+l.b == 108
+k.b == 109
+l.b == 109
+k.b == 110
+l.b == 110
+k.b == 111
+l.b == 111
+k.b == 112
+l.b == 112
+k.b == 113
+l.b == 113
+k.b == 114
+l.b == 114
+k.b == 115
+l.b == 115
+k.b == 116
+l.b == 116
+k.b == 117
+l.b == 117
+k.b == 118
+l.b == 118
+k.b == 119
+l.b == 119
+k.b == 120
+l.b == 120
+k.b == 121
+l.b == 121
+k.b == 122
+l.b == 122
+k.b == 123
+l.b == 123
+k.b == 124
+l.b == 124
+k.b == 125
+l.b == 125
+k.b == 126
+l.b == 126
+k.b == 127
+l.b == 127
+k.b == -128
+l.b == -128
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java
new file mode 100644
index 00000000000..aee68aef1d1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java
@@ -0,0 +1,84 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t064.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t064.t064
+ * @run driver ExecDriver --java jit.t.t064.t064
+ */
+
+package jit.t.t064;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Main() does getstatics of k.b and putstatics of l.b.  K.set() does putstatics
+// of k.b; l.show() does getstatics of l.b.  The idea is, you jit only
+// main.  If the jit and the VM agree about the container size of a static
+// field of type byte, you get the right answers.  If not, the test fails.
+class k
+{
+    static byte b;
+    static int i = -129;
+    static void set()
+    {
+        b = (byte) i;
+        ++i;
+    }
+}
+
+class l
+{
+    static byte b;
+    static int i = -129;
+    static void show()
+    {
+        t064.goldChecker.println("l.b == " + b);
+    }
+}
+
+class t064
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t064" );
+
+    public static void main(String argv[])
+    {
+        int i;
+        for(i=0; i<258; i+=1)
+        {
+            k.set();
+            t064.goldChecker.println("k.b == " + k.b);
+            l.b = (byte) l.i;
+            ++l.i;
+            l.show();
+        }
+        t064.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.gold
new file mode 100644
index 00000000000..7afaec2cee3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.gold
@@ -0,0 +1,516 @@
+ko.b == 127
+lo.b == 127
+ko.b == -128
+lo.b == -128
+ko.b == -127
+lo.b == -127
+ko.b == -126
+lo.b == -126
+ko.b == -125
+lo.b == -125
+ko.b == -124
+lo.b == -124
+ko.b == -123
+lo.b == -123
+ko.b == -122
+lo.b == -122
+ko.b == -121
+lo.b == -121
+ko.b == -120
+lo.b == -120
+ko.b == -119
+lo.b == -119
+ko.b == -118
+lo.b == -118
+ko.b == -117
+lo.b == -117
+ko.b == -116
+lo.b == -116
+ko.b == -115
+lo.b == -115
+ko.b == -114
+lo.b == -114
+ko.b == -113
+lo.b == -113
+ko.b == -112
+lo.b == -112
+ko.b == -111
+lo.b == -111
+ko.b == -110
+lo.b == -110
+ko.b == -109
+lo.b == -109
+ko.b == -108
+lo.b == -108
+ko.b == -107
+lo.b == -107
+ko.b == -106
+lo.b == -106
+ko.b == -105
+lo.b == -105
+ko.b == -104
+lo.b == -104
+ko.b == -103
+lo.b == -103
+ko.b == -102
+lo.b == -102
+ko.b == -101
+lo.b == -101
+ko.b == -100
+lo.b == -100
+ko.b == -99
+lo.b == -99
+ko.b == -98
+lo.b == -98
+ko.b == -97
+lo.b == -97
+ko.b == -96
+lo.b == -96
+ko.b == -95
+lo.b == -95
+ko.b == -94
+lo.b == -94
+ko.b == -93
+lo.b == -93
+ko.b == -92
+lo.b == -92
+ko.b == -91
+lo.b == -91
+ko.b == -90
+lo.b == -90
+ko.b == -89
+lo.b == -89
+ko.b == -88
+lo.b == -88
+ko.b == -87
+lo.b == -87
+ko.b == -86
+lo.b == -86
+ko.b == -85
+lo.b == -85
+ko.b == -84
+lo.b == -84
+ko.b == -83
+lo.b == -83
+ko.b == -82
+lo.b == -82
+ko.b == -81
+lo.b == -81
+ko.b == -80
+lo.b == -80
+ko.b == -79
+lo.b == -79
+ko.b == -78
+lo.b == -78
+ko.b == -77
+lo.b == -77
+ko.b == -76
+lo.b == -76
+ko.b == -75
+lo.b == -75
+ko.b == -74
+lo.b == -74
+ko.b == -73
+lo.b == -73
+ko.b == -72
+lo.b == -72
+ko.b == -71
+lo.b == -71
+ko.b == -70
+lo.b == -70
+ko.b == -69
+lo.b == -69
+ko.b == -68
+lo.b == -68
+ko.b == -67
+lo.b == -67
+ko.b == -66
+lo.b == -66
+ko.b == -65
+lo.b == -65
+ko.b == -64
+lo.b == -64
+ko.b == -63
+lo.b == -63
+ko.b == -62
+lo.b == -62
+ko.b == -61
+lo.b == -61
+ko.b == -60
+lo.b == -60
+ko.b == -59
+lo.b == -59
+ko.b == -58
+lo.b == -58
+ko.b == -57
+lo.b == -57
+ko.b == -56
+lo.b == -56
+ko.b == -55
+lo.b == -55
+ko.b == -54
+lo.b == -54
+ko.b == -53
+lo.b == -53
+ko.b == -52
+lo.b == -52
+ko.b == -51
+lo.b == -51
+ko.b == -50
+lo.b == -50
+ko.b == -49
+lo.b == -49
+ko.b == -48
+lo.b == -48
+ko.b == -47
+lo.b == -47
+ko.b == -46
+lo.b == -46
+ko.b == -45
+lo.b == -45
+ko.b == -44
+lo.b == -44
+ko.b == -43
+lo.b == -43
+ko.b == -42
+lo.b == -42
+ko.b == -41
+lo.b == -41
+ko.b == -40
+lo.b == -40
+ko.b == -39
+lo.b == -39
+ko.b == -38
+lo.b == -38
+ko.b == -37
+lo.b == -37
+ko.b == -36
+lo.b == -36
+ko.b == -35
+lo.b == -35
+ko.b == -34
+lo.b == -34
+ko.b == -33
+lo.b == -33
+ko.b == -32
+lo.b == -32
+ko.b == -31
+lo.b == -31
+ko.b == -30
+lo.b == -30
+ko.b == -29
+lo.b == -29
+ko.b == -28
+lo.b == -28
+ko.b == -27
+lo.b == -27
+ko.b == -26
+lo.b == -26
+ko.b == -25
+lo.b == -25
+ko.b == -24
+lo.b == -24
+ko.b == -23
+lo.b == -23
+ko.b == -22
+lo.b == -22
+ko.b == -21
+lo.b == -21
+ko.b == -20
+lo.b == -20
+ko.b == -19
+lo.b == -19
+ko.b == -18
+lo.b == -18
+ko.b == -17
+lo.b == -17
+ko.b == -16
+lo.b == -16
+ko.b == -15
+lo.b == -15
+ko.b == -14
+lo.b == -14
+ko.b == -13
+lo.b == -13
+ko.b == -12
+lo.b == -12
+ko.b == -11
+lo.b == -11
+ko.b == -10
+lo.b == -10
+ko.b == -9
+lo.b == -9
+ko.b == -8
+lo.b == -8
+ko.b == -7
+lo.b == -7
+ko.b == -6
+lo.b == -6
+ko.b == -5
+lo.b == -5
+ko.b == -4
+lo.b == -4
+ko.b == -3
+lo.b == -3
+ko.b == -2
+lo.b == -2
+ko.b == -1
+lo.b == -1
+ko.b == 0
+lo.b == 0
+ko.b == 1
+lo.b == 1
+ko.b == 2
+lo.b == 2
+ko.b == 3
+lo.b == 3
+ko.b == 4
+lo.b == 4
+ko.b == 5
+lo.b == 5
+ko.b == 6
+lo.b == 6
+ko.b == 7
+lo.b == 7
+ko.b == 8
+lo.b == 8
+ko.b == 9
+lo.b == 9
+ko.b == 10
+lo.b == 10
+ko.b == 11
+lo.b == 11
+ko.b == 12
+lo.b == 12
+ko.b == 13
+lo.b == 13
+ko.b == 14
+lo.b == 14
+ko.b == 15
+lo.b == 15
+ko.b == 16
+lo.b == 16
+ko.b == 17
+lo.b == 17
+ko.b == 18
+lo.b == 18
+ko.b == 19
+lo.b == 19
+ko.b == 20
+lo.b == 20
+ko.b == 21
+lo.b == 21
+ko.b == 22
+lo.b == 22
+ko.b == 23
+lo.b == 23
+ko.b == 24
+lo.b == 24
+ko.b == 25
+lo.b == 25
+ko.b == 26
+lo.b == 26
+ko.b == 27
+lo.b == 27
+ko.b == 28
+lo.b == 28
+ko.b == 29
+lo.b == 29
+ko.b == 30
+lo.b == 30
+ko.b == 31
+lo.b == 31
+ko.b == 32
+lo.b == 32
+ko.b == 33
+lo.b == 33
+ko.b == 34
+lo.b == 34
+ko.b == 35
+lo.b == 35
+ko.b == 36
+lo.b == 36
+ko.b == 37
+lo.b == 37
+ko.b == 38
+lo.b == 38
+ko.b == 39
+lo.b == 39
+ko.b == 40
+lo.b == 40
+ko.b == 41
+lo.b == 41
+ko.b == 42
+lo.b == 42
+ko.b == 43
+lo.b == 43
+ko.b == 44
+lo.b == 44
+ko.b == 45
+lo.b == 45
+ko.b == 46
+lo.b == 46
+ko.b == 47
+lo.b == 47
+ko.b == 48
+lo.b == 48
+ko.b == 49
+lo.b == 49
+ko.b == 50
+lo.b == 50
+ko.b == 51
+lo.b == 51
+ko.b == 52
+lo.b == 52
+ko.b == 53
+lo.b == 53
+ko.b == 54
+lo.b == 54
+ko.b == 55
+lo.b == 55
+ko.b == 56
+lo.b == 56
+ko.b == 57
+lo.b == 57
+ko.b == 58
+lo.b == 58
+ko.b == 59
+lo.b == 59
+ko.b == 60
+lo.b == 60
+ko.b == 61
+lo.b == 61
+ko.b == 62
+lo.b == 62
+ko.b == 63
+lo.b == 63
+ko.b == 64
+lo.b == 64
+ko.b == 65
+lo.b == 65
+ko.b == 66
+lo.b == 66
+ko.b == 67
+lo.b == 67
+ko.b == 68
+lo.b == 68
+ko.b == 69
+lo.b == 69
+ko.b == 70
+lo.b == 70
+ko.b == 71
+lo.b == 71
+ko.b == 72
+lo.b == 72
+ko.b == 73
+lo.b == 73
+ko.b == 74
+lo.b == 74
+ko.b == 75
+lo.b == 75
+ko.b == 76
+lo.b == 76
+ko.b == 77
+lo.b == 77
+ko.b == 78
+lo.b == 78
+ko.b == 79
+lo.b == 79
+ko.b == 80
+lo.b == 80
+ko.b == 81
+lo.b == 81
+ko.b == 82
+lo.b == 82
+ko.b == 83
+lo.b == 83
+ko.b == 84
+lo.b == 84
+ko.b == 85
+lo.b == 85
+ko.b == 86
+lo.b == 86
+ko.b == 87
+lo.b == 87
+ko.b == 88
+lo.b == 88
+ko.b == 89
+lo.b == 89
+ko.b == 90
+lo.b == 90
+ko.b == 91
+lo.b == 91
+ko.b == 92
+lo.b == 92
+ko.b == 93
+lo.b == 93
+ko.b == 94
+lo.b == 94
+ko.b == 95
+lo.b == 95
+ko.b == 96
+lo.b == 96
+ko.b == 97
+lo.b == 97
+ko.b == 98
+lo.b == 98
+ko.b == 99
+lo.b == 99
+ko.b == 100
+lo.b == 100
+ko.b == 101
+lo.b == 101
+ko.b == 102
+lo.b == 102
+ko.b == 103
+lo.b == 103
+ko.b == 104
+lo.b == 104
+ko.b == 105
+lo.b == 105
+ko.b == 106
+lo.b == 106
+ko.b == 107
+lo.b == 107
+ko.b == 108
+lo.b == 108
+ko.b == 109
+lo.b == 109
+ko.b == 110
+lo.b == 110
+ko.b == 111
+lo.b == 111
+ko.b == 112
+lo.b == 112
+ko.b == 113
+lo.b == 113
+ko.b == 114
+lo.b == 114
+ko.b == 115
+lo.b == 115
+ko.b == 116
+lo.b == 116
+ko.b == 117
+lo.b == 117
+ko.b == 118
+lo.b == 118
+ko.b == 119
+lo.b == 119
+ko.b == 120
+lo.b == 120
+ko.b == 121
+lo.b == 121
+ko.b == 122
+lo.b == 122
+ko.b == 123
+lo.b == 123
+ko.b == 124
+lo.b == 124
+ko.b == 125
+lo.b == 125
+ko.b == 126
+lo.b == 126
+ko.b == 127
+lo.b == 127
+ko.b == -128
+lo.b == -128
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java
new file mode 100644
index 00000000000..e120f8bcf79
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java
@@ -0,0 +1,86 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t065.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t065.t065
+ * @run driver ExecDriver --java jit.t.t065.t065
+ */
+
+package jit.t.t065;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Main() does getfields of k.b and putfields of l.b.  K.set() does putfields
+// of k.b; l.show() does getfields of l.b.  The idea is, you jit only
+// main.  If the jit and the VM agree about the container size of a static
+// field of type byte, you get the right answers.  If not, the test fails.
+class k
+{
+    byte b;
+    int i = -129;
+    void set()
+    {
+        b = (byte) i;
+        ++i;
+    }
+}
+
+class l
+{
+    byte b;
+    int i = -129;
+    void show()
+    {
+        t065.goldChecker.println("lo.b == " + b);
+    }
+}
+
+class t065
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t065" );
+
+    public static void main(String argv[])
+    {
+        k ko = new k();
+        l lo = new l();
+        int i;
+        for(i=0; i<258; i+=1)
+        {
+            ko.set();
+            t065.goldChecker.println("ko.b == " + ko.b);
+            lo.b = (byte) lo.i;
+            ++lo.i;
+            lo.show();
+        }
+        t065.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java b/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java
new file mode 100644
index 00000000000..c3094873ca0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t066.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t066.t066
+ * @run driver ExecDriver --java jit.t.t066.t066
+ */
+
+package jit.t.t066;
+
+import nsk.share.TestFailure;
+
+// Time was when j86MakeDoubleUsable was screwing up the
+// offsets on the stores of the two halves of the double
+// constant.
+
+class t066
+{
+    public static void main(String argv[])
+    {
+        float f;
+
+        f = (float) (-1 * 1 * Math.pow(2.0, -150.0));
+        if(f != -0.0)
+                throw new TestFailure("f != -0.0 (" + f + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.gold
new file mode 100644
index 00000000000..5433b5a4026
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.gold
@@ -0,0 +1,14 @@
+Integer.MIN_VALUE == -2147483648
+err_1 ok
+err_2 ok
+err_3 ok
+err_4 ok
+err_5 ok
+err_6 ok
+err_7 ok
+err_9 ok
+err_10 ok
+err_11 ok
+err_12 ok
+err_13 ok
+Miller time.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java
new file mode 100644
index 00000000000..cd5890a9451
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java
@@ -0,0 +1,97 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t067.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t067.t067
+ * @run driver ExecDriver --java jit.t.t067.t067
+ */
+
+package jit.t.t067;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t067
+{
+  public static final GoldChecker goldChecker = new GoldChecker( "t067" );
+
+  static int i = -1;
+
+  static void chkCond(String s, boolean b)
+  {
+      t067.goldChecker.print(s);
+      if(b)
+          t067.goldChecker.println(" ok");
+      else
+          t067.goldChecker.println(" fubar");
+  }
+
+  private static void check_sign()
+  {
+   // dividend is positive
+   //
+     chkCond("err_1", (Integer.MAX_VALUE%Integer.MIN_VALUE)>=0);
+     chkCond("err_2", (Integer.MAX_VALUE%i)>=0);
+     chkCond("err_3", (1%Integer.MIN_VALUE)>=0);
+     chkCond("err_4", (1%(-1))>=0);
+     chkCond("err_5", (3%4)>=0);
+
+   // dividend is negative
+   //
+     chkCond("err_6", (Integer.MIN_VALUE%Integer.MAX_VALUE)<=0);
+     chkCond("err_7", (Integer.MIN_VALUE%1)<=0);
+
+     // This one fails because the division raises some sort of
+     // hardware arithmetic exception.  I guess the hardware notices
+     // that it can't represent the result of 0x80000000 / -1 or
+     // something.  Anyhow, the behavior is the same, jit or no jit.
+     // If they ever get the VM fixed, I'll have to make the
+     // corresponding fix to the jit.
+     // chkCond("err_8", (Integer.MIN_VALUE%(i))<=0);
+
+     chkCond("err_9", ((-1)%Integer.MAX_VALUE)<=0);
+     chkCond("err_10", ((-1)%Integer.MIN_VALUE)<=0);
+     chkCond("err_11", (-2)%(-1)<=0);
+     chkCond("err_12", (-2)%(-3)<=0);
+
+   // dividend is zero
+   //
+     chkCond("err_13", (0%Integer.MIN_VALUE)==0);
+  }
+
+  public static void main(String argv[])
+  {
+      t067.goldChecker.println("Integer.MIN_VALUE == " + Integer.MIN_VALUE);
+      check_sign();
+      t067.goldChecker.println("Miller time.");
+      t067.goldChecker.check();
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.gold
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.gold
@@ -0,0 +1,2 @@
+1
+1
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java
new file mode 100644
index 00000000000..320b7db2b08
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t068.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t068.t068
+ * @run driver ExecDriver --java jit.t.t068.t068
+ */
+
+package jit.t.t068;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t068
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t068" );
+
+    static byte s1,s2,s3,s4;
+    byte i1,i2,i3,i4;
+    public static void main(String[] argv)
+    {
+        t068 o = new t068();
+        s4 = 4;
+        s3 = 3;
+        s2 = 2;
+        s1 = 1;
+        o.i4 = 4;
+        o.i3 = 3;
+        o.i2 = 2;
+        o.i1 = 1;
+        t068.goldChecker.println(s1);
+        t068.goldChecker.println(o.i1);
+        t068.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.gold
new file mode 100644
index 00000000000..72b157f57af
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.gold
@@ -0,0 +1,2 @@
+39 39 42 42
+39 39 42 42
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java
new file mode 100644
index 00000000000..c0c183bf045
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t069.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t069.t069
+ * @run driver ExecDriver --java jit.t.t069.t069
+ */
+
+package jit.t.t069;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Dup, dup_x2, and dup2_x2.
+
+class t069
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t069" );
+
+    public static void main(String[] argv)
+    {
+        int ia[] = new int[2];
+        long la[] = new long[2];
+        int i, j;
+
+        ia[0] = ia[1] = 39;
+        la[1] = la[0] = 42;
+        t069.goldChecker.println(ia[0] + " " + ia[1] + " " + la[1] + " " + la[0]);
+
+        i = 0;
+        j = 1;
+
+        ia[i] = ia[j] = 39;
+        la[j] = la[i] = 42;
+        t069.goldChecker.println(ia[i] + " " + ia[j] + " " + la[j] + " " + la[i]);
+        t069.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.gold
new file mode 100644
index 00000000000..0d803539cd0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.gold
@@ -0,0 +1,2 @@
+81 81 -3 -3
+81 81 -3 -3
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java
new file mode 100644
index 00000000000..ba67926c901
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java
@@ -0,0 +1,67 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t070.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t070.t070
+ * @run driver ExecDriver --java jit.t.t070.t070
+ */
+
+package jit.t.t070;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Dup, dup_x2, and dup2_x2.
+
+class t070
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t070" );
+
+    public static void main(String[] argv)
+    {
+        int ia[] = new int[2];
+        long la[] = new long[2];
+        int i, j;
+        int x = 39, y = 42;
+
+        ia[0] = ia[1] = x + y;
+        la[1] = la[0] = x - y;
+        t070.goldChecker.println(ia[0] + " " + ia[1] + " " + la[1] + " " + la[0]);
+
+        i = 0;
+        j = 1;
+
+        ia[i] = ia[j] = x + y;
+        la[j] = la[i] = x - y;
+        t070.goldChecker.println(ia[i] + " " + ia[j] + " " + la[j] + " " + la[i]);
+        t070.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.gold
new file mode 100644
index 00000000000..bc7f96cf348
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.gold
@@ -0,0 +1,2 @@
+39.0 39.0 42.0 42.0
+39.0 39.0 42.0 42.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java
new file mode 100644
index 00000000000..8e08230944b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t071.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t071.t071
+ * @run driver ExecDriver --java jit.t.t071.t071
+ */
+
+package jit.t.t071;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t071
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t071" );
+
+    public static void main(String[] argv)
+    {
+        float ia[] = new float[2];
+        double la[] = new double[2];
+        int i, j;
+
+        ia[0] = ia[1] = 39.0f;
+        la[1] = la[0] = 42.0;
+        t071.goldChecker.println(ia[0] + " " + ia[1] + " " + la[1] + " " + la[0]);
+
+        i = 0;
+        j = 1;
+
+        ia[i] = ia[j] = 39.0f;
+        la[j] = la[i] = 42.0;
+        t071.goldChecker.println(ia[i] + " " + ia[j] + " " + la[j] + " " + la[i]);
+        t071.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.gold
new file mode 100644
index 00000000000..a4dc029b673
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.gold
@@ -0,0 +1,2 @@
+81.0 81.0 81.0 81.0
+-3.0 -3.0 -3.0 -3.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java
new file mode 100644
index 00000000000..601d4fd8969
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t072.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t072.t072
+ * @run driver ExecDriver --java jit.t.t072.t072
+ */
+
+package jit.t.t072;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t072
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t072" );
+
+    public static void main(String[] argv)
+    {
+        float ia[] = new float[2];
+        double la[] = new double[2];
+        int i, j;
+        float x = 39.0f, y = 42.0f;
+        double p = 39.0, q = 42.0;
+
+        ia[0] = ia[1] = x + y;
+        la[1] = la[0] = p + q;
+        t072.goldChecker.println(ia[0] + " " + ia[1] + " " + la[1] + " " + la[0]);
+
+        i = 0;
+        j = 1;
+
+        ia[i] = ia[j] = x - y;
+        la[j] = la[i] = p - q;
+        t072.goldChecker.println(ia[i] + " " + ia[j] + " " + la[j] + " " + la[i]);
+        t072.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.gold
new file mode 100644
index 00000000000..9902f17848a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.gold
@@ -0,0 +1 @@
+28
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java
new file mode 100644
index 00000000000..e215adbca04
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java
@@ -0,0 +1,61 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t073.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t073.t073
+ * @run driver ExecDriver --java jit.t.t073.t073
+ */
+
+package jit.t.t073;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t073{
+    public static final GoldChecker goldChecker = new GoldChecker( "t073" );
+
+    static int i0 = 0;
+    static int i1 = 1;
+    static int i2 = 2;
+    static int i3 = 3;
+    static int i4 = 4;
+    static int i5 = 5;
+    static int i6 = 6;
+    static int i7 = 7;
+
+    public static void main(String[] argv){
+        int a;
+        a =
+        (((i0 + i1) + (i2 + i3)) + ((i4 + i5) + (i6 + i7)));
+        t073.goldChecker.println(a);
+        t073.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.gold
new file mode 100644
index 00000000000..52bd8e43afb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.gold
@@ -0,0 +1 @@
+120
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java
new file mode 100644
index 00000000000..8c07663e365
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t074.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t074.t074
+ * @run driver ExecDriver --java jit.t.t074.t074
+ */
+
+package jit.t.t074;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t074{
+    public static final GoldChecker goldChecker = new GoldChecker( "t074" );
+
+    static int i0 = 0;
+    static int i1 = 1;
+    static int i2 = 2;
+    static int i3 = 3;
+    static int i4 = 4;
+    static int i5 = 5;
+    static int i6 = 6;
+    static int i7 = 7;
+    static int i8 = 8;
+    static int i9 = 9;
+    static int i10 = 10;
+    static int i11 = 11;
+    static int i12 = 12;
+    static int i13 = 13;
+    static int i14 = 14;
+    static int i15 = 15;
+
+    public static void main(String[] argv){
+        int a;
+        a =
+        ((((i0 + i1) + (i2 + i3)) + ((i4 + i5) + (i6 + i7))) +
+        (((i8 + i9) + (i10 + i11)) + ((i12 + i13) + (i14 + i15))));
+        t074.goldChecker.println(a);
+        t074.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.gold
new file mode 100644
index 00000000000..39efca76c88
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.gold
@@ -0,0 +1 @@
+496
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java
new file mode 100644
index 00000000000..85a0b6c9540
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java
@@ -0,0 +1,88 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t075.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t075.t075
+ * @run driver ExecDriver --java jit.t.t075.t075
+ */
+
+package jit.t.t075;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t075{
+    public static final GoldChecker goldChecker = new GoldChecker( "t075" );
+
+    static int i0 = 0;
+    static int i1 = 1;
+    static int i2 = 2;
+    static int i3 = 3;
+    static int i4 = 4;
+    static int i5 = 5;
+    static int i6 = 6;
+    static int i7 = 7;
+    static int i8 = 8;
+    static int i9 = 9;
+    static int i10 = 10;
+    static int i11 = 11;
+    static int i12 = 12;
+    static int i13 = 13;
+    static int i14 = 14;
+    static int i15 = 15;
+    static int i16 = 16;
+    static int i17 = 17;
+    static int i18 = 18;
+    static int i19 = 19;
+    static int i20 = 20;
+    static int i21 = 21;
+    static int i22 = 22;
+    static int i23 = 23;
+    static int i24 = 24;
+    static int i25 = 25;
+    static int i26 = 26;
+    static int i27 = 27;
+    static int i28 = 28;
+    static int i29 = 29;
+    static int i30 = 30;
+    static int i31 = 31;
+
+    public static void main(String[] argv){
+        int a;
+        a =
+        (((((i0 + i1) + (i2 + i3)) + ((i4 + i5) + (i6 + i7))) +
+        (((i8 + i9) + (i10 + i11)) + ((i12 + i13) + (i14 + i15)))) +
+        ((((i16 + i17) + (i18 + i19)) + ((i20 + i21) + (i22 + i23))) +
+        (((i24 + i25) + (i26 + i27)) + ((i28 + i29) + (i30 + i31)))));
+        t075.goldChecker.println(a);
+        t075.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.gold
new file mode 100644
index 00000000000..39efca76c88
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.gold
@@ -0,0 +1 @@
+496
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java
new file mode 100644
index 00000000000..76bdd70fdcb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java
@@ -0,0 +1,88 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t076.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t076.t076
+ * @run driver ExecDriver --java jit.t.t076.t076
+ */
+
+package jit.t.t076;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t076{
+    public static final GoldChecker goldChecker = new GoldChecker( "t076" );
+
+    static long i0 = 0;
+    static long i1 = 1;
+    static long i2 = 2;
+    static long i3 = 3;
+    static long i4 = 4;
+    static long i5 = 5;
+    static long i6 = 6;
+    static long i7 = 7;
+    static long i8 = 8;
+    static long i9 = 9;
+    static long i10 = 10;
+    static long i11 = 11;
+    static long i12 = 12;
+    static long i13 = 13;
+    static long i14 = 14;
+    static long i15 = 15;
+    static long i16 = 16;
+    static long i17 = 17;
+    static long i18 = 18;
+    static long i19 = 19;
+    static long i20 = 20;
+    static long i21 = 21;
+    static long i22 = 22;
+    static long i23 = 23;
+    static long i24 = 24;
+    static long i25 = 25;
+    static long i26 = 26;
+    static long i27 = 27;
+    static long i28 = 28;
+    static long i29 = 29;
+    static long i30 = 30;
+    static long i31 = 31;
+
+    public static void main(String[] argv){
+        long a;
+        a =
+        (((((i0 + i1) + (i2 + i3)) + ((i4 + i5) + (i6 + i7))) +
+        (((i8 + i9) + (i10 + i11)) + ((i12 + i13) + (i14 + i15)))) +
+        ((((i16 + i17) + (i18 + i19)) + ((i20 + i21) + (i22 + i23))) +
+        (((i24 + i25) + (i26 + i27)) + ((i28 + i29) + (i30 + i31)))));
+        t076.goldChecker.println(a);
+        t076.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.gold
new file mode 100644
index 00000000000..59cc7c9593c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.gold
@@ -0,0 +1 @@
+496.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java
new file mode 100644
index 00000000000..9f8a2f2b1b8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java
@@ -0,0 +1,88 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t077.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t077.t077
+ * @run driver ExecDriver --java jit.t.t077.t077
+ */
+
+package jit.t.t077;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t077{
+    public static final GoldChecker goldChecker = new GoldChecker( "t077" );
+
+    static float i0 = 0.0f;
+    static float i1 = 1.0f;
+    static float i2 = 2.0f;
+    static float i3 = 3.0f;
+    static float i4 = 4.0f;
+    static float i5 = 5.0f;
+    static float i6 = 6.0f;
+    static float i7 = 7.0f;
+    static float i8 = 8.0f;
+    static float i9 = 9.0f;
+    static float i10 = 10.0f;
+    static float i11 = 11.0f;
+    static float i12 = 12.0f;
+    static float i13 = 13.0f;
+    static float i14 = 14.0f;
+    static float i15 = 15.0f;
+    static float i16 = 16.0f;
+    static float i17 = 17.0f;
+    static float i18 = 18.0f;
+    static float i19 = 19.0f;
+    static float i20 = 20.0f;
+    static float i21 = 21.0f;
+    static float i22 = 22.0f;
+    static float i23 = 23.0f;
+    static float i24 = 24.0f;
+    static float i25 = 25.0f;
+    static float i26 = 26.0f;
+    static float i27 = 27.0f;
+    static float i28 = 28.0f;
+    static float i29 = 29.0f;
+    static float i30 = 30.0f;
+    static float i31 = 31.0f;
+
+    public static void main(String[] argv){
+        float a;
+        a =
+        (((((i0 + i1) + (i2 + i3)) + ((i4 + i5) + (i6 + i7))) +
+        (((i8 + i9) + (i10 + i11)) + ((i12 + i13) + (i14 + i15)))) +
+        ((((i16 + i17) + (i18 + i19)) + ((i20 + i21) + (i22 + i23))) +
+        (((i24 + i25) + (i26 + i27)) + ((i28 + i29) + (i30 + i31)))));
+        t077.goldChecker.println(a);
+        t077.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.gold
new file mode 100644
index 00000000000..59cc7c9593c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.gold
@@ -0,0 +1 @@
+496.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java
new file mode 100644
index 00000000000..45048e4ab9e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java
@@ -0,0 +1,88 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t078.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t078.t078
+ * @run driver ExecDriver --java jit.t.t078.t078
+ */
+
+package jit.t.t078;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t078{
+    public static final GoldChecker goldChecker = new GoldChecker( "t078" );
+
+    static double i0 = 0.0;
+    static double i1 = 1.0;
+    static double i2 = 2.0;
+    static double i3 = 3.0;
+    static double i4 = 4.0;
+    static double i5 = 5.0;
+    static double i6 = 6.0;
+    static double i7 = 7.0;
+    static double i8 = 8.0;
+    static double i9 = 9.0;
+    static double i10 = 10.0;
+    static double i11 = 11.0;
+    static double i12 = 12.0;
+    static double i13 = 13.0;
+    static double i14 = 14.0;
+    static double i15 = 15.0;
+    static double i16 = 16.0;
+    static double i17 = 17.0;
+    static double i18 = 18.0;
+    static double i19 = 19.0;
+    static double i20 = 20.0;
+    static double i21 = 21.0;
+    static double i22 = 22.0;
+    static double i23 = 23.0;
+    static double i24 = 24.0;
+    static double i25 = 25.0;
+    static double i26 = 26.0;
+    static double i27 = 27.0;
+    static double i28 = 28.0;
+    static double i29 = 29.0;
+    static double i30 = 30.0;
+    static double i31 = 31.0;
+
+    public static void main(String[] argv){
+        double a;
+        a =
+        (((((i0 + i1) + (i2 + i3)) + ((i4 + i5) + (i6 + i7))) +
+        (((i8 + i9) + (i10 + i11)) + ((i12 + i13) + (i14 + i15)))) +
+        ((((i16 + i17) + (i18 + i19)) + ((i20 + i21) + (i22 + i23))) +
+        (((i24 + i25) + (i26 + i27)) + ((i28 + i29) + (i30 + i31)))));
+        t078.goldChecker.println(a);
+        t078.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.gold
new file mode 100644
index 00000000000..42b60e1b22e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.gold
@@ -0,0 +1 @@
+81.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java
new file mode 100644
index 00000000000..a5a2b078ecb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t079.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t079.t079
+ * @run driver ExecDriver --java jit.t.t079.t079
+ */
+
+package jit.t.t079;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t079
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t079" );
+
+    public static void main(String[] argv)
+    {
+        double d[] = new double[2];
+        double e[] = null;
+        double x = 39.0, y = 42.0;
+        double z;
+        int i = 0, j = 1;
+        int r;
+        (e = d)[r = i + j] = (z = x + y);
+        t079.goldChecker.println(e[1]);
+        t079.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.gold
new file mode 100644
index 00000000000..42b60e1b22e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.gold
@@ -0,0 +1 @@
+81.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java
new file mode 100644
index 00000000000..694ef5a3802
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t080.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t080.t080
+ * @run driver ExecDriver --java jit.t.t080.t080
+ */
+
+package jit.t.t080;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Like t079.java except this one has lots of local variables.
+
+class t080
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t080" );
+
+    public static void main(String[] argv)
+    {
+        double d[] = new double[2];
+        double e[] = null;
+        double x = 39.0, y = 42.0;
+        double z;
+        int i = 0, j = 1;
+        int r;
+
+        // The following is just bulk.  It's designed to get the offset
+        // of the (used) locals outside the reach of a signed byte.
+        int i00; i00 = 0;
+        int i01; i01 = 1;
+        int i02; i02 = 2;
+        int i03; i03 = 3;
+        int i04; i04 = 4;
+        int i05; i05 = 5;
+        int i06; i06 = 6;
+        int i07; i07 = 7;
+        int i08; i08 = 8;
+        int i09; i09 = 9;
+
+        int i10; i10 = 0;
+        int i11; i11 = 1;
+        int i12; i12 = 2;
+        int i13; i13 = 3;
+        int i14; i14 = 4;
+        int i15; i15 = 5;
+        int i16; i16 = 6;
+        int i17; i17 = 7;
+        int i18; i18 = 8;
+        int i19; i19 = 9;
+
+        int i20; i20 = 0;
+        int i21; i21 = 1;
+        int i22; i22 = 2;
+        int i23; i23 = 3;
+        int i24; i24 = 4;
+        int i25; i25 = 5;
+        int i26; i26 = 6;
+        int i27; i27 = 7;
+        int i28; i28 = 8;
+        int i29; i29 = 9;
+
+        int i30; i30 = 0;
+        int i31; i31 = 1;
+        int i32; i32 = 2;
+        int i33; i33 = 3;
+        int i34; i34 = 4;
+        int i35; i35 = 5;
+        int i36; i36 = 6;
+        int i37; i37 = 7;
+        int i38; i38 = 8;
+        int i39; i39 = 9;
+
+        (e = d)[r = i + j] = (z = x + y);
+        t080.goldChecker.println(e[1]);
+        t080.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.gold
new file mode 100644
index 00000000000..634cb7839c7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.gold
@@ -0,0 +1,29 @@
+-1011703408
+-1
+-2023406815
+-1
+
+248153666
+-2147483648
+-2023406815
+-2147483648
+
+1135780240
+1
+-2023406815
+1
+
+-1011703408
+-1
+-2023406815
+-1
+
+248153666
+-2147483648
+-2023406815
+-2147483648
+
+1135780240
+1
+-2023406815
+1
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java
new file mode 100644
index 00000000000..c087fd07f96
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t081.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t081.t081
+ * @run driver ExecDriver --java jit.t.t081.t081
+ */
+
+package jit.t.t081;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t081
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t081" );
+
+    public static void main(String argv[])
+    {
+        int i = 0x87654321;
+        int i1, i31, i32, i63;
+        i1 = 1;
+        i31 = 31;
+        i32 = 32;
+        i63 = 63;
+
+        t081.goldChecker.println(i >> 1);
+        t081.goldChecker.println(i >> 31);
+        t081.goldChecker.println(i >> 32);
+        t081.goldChecker.println(i >> 63);
+
+        t081.goldChecker.println("");
+        t081.goldChecker.println(i << 1);
+        t081.goldChecker.println(i << 31);
+        t081.goldChecker.println(i << 32);
+        t081.goldChecker.println(i << 63);
+
+        t081.goldChecker.println("");
+        t081.goldChecker.println(i >>> 1);
+        t081.goldChecker.println(i >>> 31);
+        t081.goldChecker.println(i >>> 32);
+        t081.goldChecker.println(i >>> 63);
+
+        t081.goldChecker.println("");
+        t081.goldChecker.println(i >> i1);
+        t081.goldChecker.println(i >> i31);
+        t081.goldChecker.println(i >> i32);
+        t081.goldChecker.println(i >> i63);
+
+        t081.goldChecker.println("");
+        t081.goldChecker.println(i << i1);
+        t081.goldChecker.println(i << i31);
+        t081.goldChecker.println(i << i32);
+        t081.goldChecker.println(i << i63);
+
+        t081.goldChecker.println("");
+        t081.goldChecker.println(i >>> i1);
+        t081.goldChecker.println(i >>> i31);
+        t081.goldChecker.println(i >>> i32);
+        t081.goldChecker.println(i >>> i63);
+
+        t081.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.gold
new file mode 100644
index 00000000000..e1d7f67d006
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.gold
@@ -0,0 +1,3 @@
+Hi.
+Caught exception.
+G'bye.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java
new file mode 100644
index 00000000000..fc7886b97e0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java
@@ -0,0 +1,79 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t086.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t086.t086
+ * @run driver ExecDriver --java jit.t.t086.t086
+ */
+
+package jit.t.t086;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Exception at patch time.
+
+class foo
+{
+    static int i;
+    static int j;
+    static
+    {
+        i = 0;
+        j = 409;
+        j /= i;
+    }
+
+    static void heydee()
+    {
+        t086.goldChecker.println("Heydee ho.");
+    }
+}
+
+class t086
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t086" );
+
+    public static void main(String argv[])
+    {
+        t086.goldChecker.println("Hi.");
+        try
+        {
+            foo.heydee();
+        }
+        catch(Throwable t)
+        {
+            t086.goldChecker.println("Caught exception.");
+        }
+        t086.goldChecker.println("G'bye.");
+        t086.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.gold
new file mode 100644
index 00000000000..368a80e3152
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.gold
@@ -0,0 +1,2 @@
+Exception on try1
+Exception on try2
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.java b/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.java
new file mode 100644
index 00000000000..74fc3b654c1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.java
@@ -0,0 +1,100 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t087.
+ * VM Testbase keywords: [jit, quick, jdk, javac]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build ExecDriver
+ *
+ * @comment build all dependencies
+ * @build jit.t.t087.t087
+ *
+ * @comment make sure foo.class is only in the current directory
+ * @clean jit.t.t087.foo
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${compile.jdk}/bin/javac
+ *      -d .
+ *      -cp ${test.class.path}
+ *      ${test.src}/t087.java
+ *
+ * @comment run the test
+ * @run driver PropertyResolvingWrapper ExecDriver --java
+ *      -cp .${path.separator}${test.class.path}
+ *      jit.t.t087.t087
+ *      -WorkDir ./jit/t/t087
+ */
+
+package jit.t.t087;
+
+import java.io.File;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class foo
+{
+    static void bar()
+    {
+        t087.goldChecker.println("You shouldn't see this.");
+    }
+}
+
+class t087
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t087" );
+
+    public static void main(String[] argv)
+    {
+        File f;
+        if (argv.length < 2 || !argv[0].equals("-WorkDir"))
+                f = new File(".", "foo.class");
+        else
+                f = new File(argv[1], "foo.class");
+        if(f.isFile())
+        {
+
+            f.delete();
+
+            for(int i = 1; i <= 2; i += 1)
+            {
+                try
+                {
+                    foo.bar();
+                }
+                catch(Throwable t)
+                {
+                    t087.goldChecker.println("Exception on try" + i);
+                }
+            }
+
+        }
+        else
+            t087.goldChecker.println("No foo.class in cwd");
+        t087.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.gold
new file mode 100644
index 00000000000..766376a42b9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.gold
@@ -0,0 +1,2 @@
+Exception on first try
+Exception on second try
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.java b/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.java
new file mode 100644
index 00000000000..a1102f99c97
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.java
@@ -0,0 +1,109 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t088.
+ * VM Testbase keywords: [jit, quick, jdk, javac]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build ExecDriver
+ *
+ * @comment build all dependencies
+ * @build jit.t.t088.t088
+ *
+ * @comment make sure foo.class is only in the current directory
+ * @clean jit.t.t088.foo
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${compile.jdk}/bin/javac
+ *      -d .
+ *      -cp ${test.class.path}
+ *      ${test.src}/t088.java
+ *
+ * @comment run the test
+ * @run driver PropertyResolvingWrapper ExecDriver --java
+ *      -cp .${path.separator}${test.class.path}
+ *      jit.t.t088.t088
+ *      -WorkDir ./jit/t/t088
+ */
+
+package jit.t.t088;
+
+// Just like the one before except that the two patched calls
+// are attempted from distinct call sites.
+
+import java.io.File;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class foo
+{
+    static void bar()
+    {
+        t088.goldChecker.println("You shouldn't see this.");
+    }
+}
+
+class t088
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t088" );
+
+    public static void main(String[] argv)
+    {
+        File f;
+    if (argv.length < 2 || !argv[0].equals("-WorkDir"))
+        f = new File(".", "foo.class");
+    else
+        f = new File(argv[1], "foo.class");
+        if(f.isFile())
+        {
+
+            f.delete();
+
+            try
+            {
+                foo.bar();
+            }
+            catch(Throwable t)
+            {
+                t088.goldChecker.println("Exception on first try");
+            }
+
+            try
+            {
+                foo.bar();
+            }
+            catch(Throwable t)
+            {
+                t088.goldChecker.println("Exception on second try");
+            }
+
+        }
+        else
+            t088.goldChecker.println("No foo.class in cwd");
+        t088.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.gold
new file mode 100644
index 00000000000..d88e3136998
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.gold
@@ -0,0 +1 @@
+81
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java
new file mode 100644
index 00000000000..c4bbc7aeaa0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java
@@ -0,0 +1,577 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t091.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t091.t091
+ * @run driver ExecDriver --java jit.t.t091.t091
+ */
+
+package jit.t.t091;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// This one has a couple of opc_wide prefixes.  These things are hard to
+// generate.  All the gratuitous-looking ifs in this test are necessary
+// in order to keep javac limping along.  If the assignments aren't
+// conditional, javac croaks about "statement not reached" every 64
+// assignments.
+//
+// At time of writing, this didn't work because pass1 of the jit was
+// screwing up the flags in the state[] vector around the wide
+// instructions.
+
+class t091
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t091" );
+
+    public static void main(String[] argv)
+    {
+        int i;
+        int x0;
+        int x1;
+        int x2;
+        int x3;
+        int x4;
+        int x5;
+        int x6;
+        int x7;
+        int x8;
+        int x9;
+        int x10;
+        int x11;
+        int x12;
+        int x13;
+        int x14;
+        int x15;
+        int x16;
+        int x17;
+        int x18;
+        int x19;
+        int x20;
+        int x21;
+        int x22;
+        int x23;
+        int x24;
+        int x25;
+        int x26;
+        int x27;
+        int x28;
+        int x29;
+        int x30;
+        int x31;
+        int x32;
+        int x33;
+        int x34;
+        int x35;
+        int x36;
+        int x37;
+        int x38;
+        int x39;
+        int x40;
+        int x41;
+        int x42;
+        int x43;
+        int x44;
+        int x45;
+        int x46;
+        int x47;
+        int x48;
+        int x49;
+        int x50;
+        int x51;
+        int x52;
+        int x53;
+        int x54;
+        int x55;
+        int x56;
+        int x57;
+        int x58;
+        int x59;
+        int x60;
+        int x61;
+        int x62;
+        int x63;
+        int x64;
+        int x65;
+        int x66;
+        int x67;
+        int x68;
+        int x69;
+        int x70;
+        int x71;
+        int x72;
+        int x73;
+        int x74;
+        int x75;
+        int x76;
+        int x77;
+        int x78;
+        int x79;
+        int x80;
+        int x81;
+        int x82;
+        int x83;
+        int x84;
+        int x85;
+        int x86;
+        int x87;
+        int x88;
+        int x89;
+        int x90;
+        int x91;
+        int x92;
+        int x93;
+        int x94;
+        int x95;
+        int x96;
+        int x97;
+        int x98;
+        int x99;
+        int x100;
+        int x101;
+        int x102;
+        int x103;
+        int x104;
+        int x105;
+        int x106;
+        int x107;
+        int x108;
+        int x109;
+        int x110;
+        int x111;
+        int x112;
+        int x113;
+        int x114;
+        int x115;
+        int x116;
+        int x117;
+        int x118;
+        int x119;
+        int x120;
+        int x121;
+        int x122;
+        int x123;
+        int x124;
+        int x125;
+        int x126;
+        int x127;
+        int x128;
+        int x129;
+        int x130;
+        int x131;
+        int x132;
+        int x133;
+        int x134;
+        int x135;
+        int x136;
+        int x137;
+        int x138;
+        int x139;
+        int x140;
+        int x141;
+        int x142;
+        int x143;
+        int x144;
+        int x145;
+        int x146;
+        int x147;
+        int x148;
+        int x149;
+        int x150;
+        int x151;
+        int x152;
+        int x153;
+        int x154;
+        int x155;
+        int x156;
+        int x157;
+        int x158;
+        int x159;
+        int x160;
+        int x161;
+        int x162;
+        int x163;
+        int x164;
+        int x165;
+        int x166;
+        int x167;
+        int x168;
+        int x169;
+        int x170;
+        int x171;
+        int x172;
+        int x173;
+        int x174;
+        int x175;
+        int x176;
+        int x177;
+        int x178;
+        int x179;
+        int x180;
+        int x181;
+        int x182;
+        int x183;
+        int x184;
+        int x185;
+        int x186;
+        int x187;
+        int x188;
+        int x189;
+        int x190;
+        int x191;
+        int x192;
+        int x193;
+        int x194;
+        int x195;
+        int x196;
+        int x197;
+        int x198;
+        int x199;
+        int x200;
+        int x201;
+        int x202;
+        int x203;
+        int x204;
+        int x205;
+        int x206;
+        int x207;
+        int x208;
+        int x209;
+        int x210;
+        int x211;
+        int x212;
+        int x213;
+        int x214;
+        int x215;
+        int x216;
+        int x217;
+        int x218;
+        int x219;
+        int x220;
+        int x221;
+        int x222;
+        int x223;
+        int x224;
+        int x225;
+        int x226;
+        int x227;
+        int x228;
+        int x229;
+        int x230;
+        int x231;
+        int x232;
+        int x233;
+        int x234;
+        int x235;
+        int x236;
+        int x237;
+        int x238;
+        int x239;
+        int x240;
+        int x241;
+        int x242;
+        int x243;
+        int x244;
+        int x245;
+        int x246;
+        int x247;
+        int x248;
+        int x249;
+        int x250;
+        int x251;
+        int x252;
+        int x253;
+        int x254;
+        int x255;
+        int j;
+        i = 39;
+        if(i == 0)x0 = 0;
+        if(i == 0)x1 = 1;
+        if(i == 0)x2 = 2;
+        if(i == 0)x3 = 3;
+        if(i == 0)x4 = 4;
+        if(i == 0)x5 = 5;
+        if(i == 0)x6 = 6;
+        if(i == 0)x7 = 7;
+        if(i == 0)x8 = 8;
+        if(i == 0)x9 = 9;
+        if(i == 0)x10 = 10;
+        if(i == 0)x11 = 11;
+        if(i == 0)x12 = 12;
+        if(i == 0)x13 = 13;
+        if(i == 0)x14 = 14;
+        if(i == 0)x15 = 15;
+        if(i == 0)x16 = 16;
+        if(i == 0)x17 = 17;
+        if(i == 0)x18 = 18;
+        if(i == 0)x19 = 19;
+        if(i == 0)x20 = 20;
+        if(i == 0)x21 = 21;
+        if(i == 0)x22 = 22;
+        if(i == 0)x23 = 23;
+        if(i == 0)x24 = 24;
+        if(i == 0)x25 = 25;
+        if(i == 0)x26 = 26;
+        if(i == 0)x27 = 27;
+        if(i == 0)x28 = 28;
+        if(i == 0)x29 = 29;
+        if(i == 0)x30 = 30;
+        if(i == 0)x31 = 31;
+        if(i == 0)x32 = 32;
+        if(i == 0)x33 = 33;
+        if(i == 0)x34 = 34;
+        if(i == 0)x35 = 35;
+        if(i == 0)x36 = 36;
+        if(i == 0)x37 = 37;
+        if(i == 0)x38 = 38;
+        if(i == 0)x39 = 39;
+        if(i == 0)x40 = 40;
+        if(i == 0)x41 = 41;
+        if(i == 0)x42 = 42;
+        if(i == 0)x43 = 43;
+        if(i == 0)x44 = 44;
+        if(i == 0)x45 = 45;
+        if(i == 0)x46 = 46;
+        if(i == 0)x47 = 47;
+        if(i == 0)x48 = 48;
+        if(i == 0)x49 = 49;
+        if(i == 0)x50 = 50;
+        if(i == 0)x51 = 51;
+        if(i == 0)x52 = 52;
+        if(i == 0)x53 = 53;
+        if(i == 0)x54 = 54;
+        if(i == 0)x55 = 55;
+        if(i == 0)x56 = 56;
+        if(i == 0)x57 = 57;
+        if(i == 0)x58 = 58;
+        if(i == 0)x59 = 59;
+        if(i == 0)x60 = 60;
+        if(i == 0)x61 = 61;
+        if(i == 0)x62 = 62;
+        if(i == 0)x63 = 63;
+        if(i == 0)x64 = 64;
+        if(i == 0)x65 = 65;
+        if(i == 0)x66 = 66;
+        if(i == 0)x67 = 67;
+        if(i == 0)x68 = 68;
+        if(i == 0)x69 = 69;
+        if(i == 0)x70 = 70;
+        if(i == 0)x71 = 71;
+        if(i == 0)x72 = 72;
+        if(i == 0)x73 = 73;
+        if(i == 0)x74 = 74;
+        if(i == 0)x75 = 75;
+        if(i == 0)x76 = 76;
+        if(i == 0)x77 = 77;
+        if(i == 0)x78 = 78;
+        if(i == 0)x79 = 79;
+        if(i == 0)x80 = 80;
+        if(i == 0)x81 = 81;
+        if(i == 0)x82 = 82;
+        if(i == 0)x83 = 83;
+        if(i == 0)x84 = 84;
+        if(i == 0)x85 = 85;
+        if(i == 0)x86 = 86;
+        if(i == 0)x87 = 87;
+        if(i == 0)x88 = 88;
+        if(i == 0)x89 = 89;
+        if(i == 0)x90 = 90;
+        if(i == 0)x91 = 91;
+        if(i == 0)x92 = 92;
+        if(i == 0)x93 = 93;
+        if(i == 0)x94 = 94;
+        if(i == 0)x95 = 95;
+        if(i == 0)x96 = 96;
+        if(i == 0)x97 = 97;
+        if(i == 0)x98 = 98;
+        if(i == 0)x99 = 99;
+        if(i == 0)x100 = 100;
+        if(i == 0)x101 = 101;
+        if(i == 0)x102 = 102;
+        if(i == 0)x103 = 103;
+        if(i == 0)x104 = 104;
+        if(i == 0)x105 = 105;
+        if(i == 0)x106 = 106;
+        if(i == 0)x107 = 107;
+        if(i == 0)x108 = 108;
+        if(i == 0)x109 = 109;
+        if(i == 0)x110 = 110;
+        if(i == 0)x111 = 111;
+        if(i == 0)x112 = 112;
+        if(i == 0)x113 = 113;
+        if(i == 0)x114 = 114;
+        if(i == 0)x115 = 115;
+        if(i == 0)x116 = 116;
+        if(i == 0)x117 = 117;
+        if(i == 0)x118 = 118;
+        if(i == 0)x119 = 119;
+        if(i == 0)x120 = 120;
+        if(i == 0)x121 = 121;
+        if(i == 0)x122 = 122;
+        if(i == 0)x123 = 123;
+        if(i == 0)x124 = 124;
+        if(i == 0)x125 = 125;
+        if(i == 0)x126 = 126;
+        if(i == 0)x127 = 127;
+        if(i == 0)x128 = 128;
+        if(i == 0)x129 = 129;
+        if(i == 0)x130 = 130;
+        if(i == 0)x131 = 131;
+        if(i == 0)x132 = 132;
+        if(i == 0)x133 = 133;
+        if(i == 0)x134 = 134;
+        if(i == 0)x135 = 135;
+        if(i == 0)x136 = 136;
+        if(i == 0)x137 = 137;
+        if(i == 0)x138 = 138;
+        if(i == 0)x139 = 139;
+        if(i == 0)x140 = 140;
+        if(i == 0)x141 = 141;
+        if(i == 0)x142 = 142;
+        if(i == 0)x143 = 143;
+        if(i == 0)x144 = 144;
+        if(i == 0)x145 = 145;
+        if(i == 0)x146 = 146;
+        if(i == 0)x147 = 147;
+        if(i == 0)x148 = 148;
+        if(i == 0)x149 = 149;
+        if(i == 0)x150 = 150;
+        if(i == 0)x151 = 151;
+        if(i == 0)x152 = 152;
+        if(i == 0)x153 = 153;
+        if(i == 0)x154 = 154;
+        if(i == 0)x155 = 155;
+        if(i == 0)x156 = 156;
+        if(i == 0)x157 = 157;
+        if(i == 0)x158 = 158;
+        if(i == 0)x159 = 159;
+        if(i == 0)x160 = 160;
+        if(i == 0)x161 = 161;
+        if(i == 0)x162 = 162;
+        if(i == 0)x163 = 163;
+        if(i == 0)x164 = 164;
+        if(i == 0)x165 = 165;
+        if(i == 0)x166 = 166;
+        if(i == 0)x167 = 167;
+        if(i == 0)x168 = 168;
+        if(i == 0)x169 = 169;
+        if(i == 0)x170 = 170;
+        if(i == 0)x171 = 171;
+        if(i == 0)x172 = 172;
+        if(i == 0)x173 = 173;
+        if(i == 0)x174 = 174;
+        if(i == 0)x175 = 175;
+        if(i == 0)x176 = 176;
+        if(i == 0)x177 = 177;
+        if(i == 0)x178 = 178;
+        if(i == 0)x179 = 179;
+        if(i == 0)x180 = 180;
+        if(i == 0)x181 = 181;
+        if(i == 0)x182 = 182;
+        if(i == 0)x183 = 183;
+        if(i == 0)x184 = 184;
+        if(i == 0)x185 = 185;
+        if(i == 0)x186 = 186;
+        if(i == 0)x187 = 187;
+        if(i == 0)x188 = 188;
+        if(i == 0)x189 = 189;
+        if(i == 0)x190 = 190;
+        if(i == 0)x191 = 191;
+        if(i == 0)x192 = 192;
+        if(i == 0)x193 = 193;
+        if(i == 0)x194 = 194;
+        if(i == 0)x195 = 195;
+        if(i == 0)x196 = 196;
+        if(i == 0)x197 = 197;
+        if(i == 0)x198 = 198;
+        if(i == 0)x199 = 199;
+        if(i == 0)x200 = 200;
+        if(i == 0)x201 = 201;
+        if(i == 0)x202 = 202;
+        if(i == 0)x203 = 203;
+        if(i == 0)x204 = 204;
+        if(i == 0)x205 = 205;
+        if(i == 0)x206 = 206;
+        if(i == 0)x207 = 207;
+        if(i == 0)x208 = 208;
+        if(i == 0)x209 = 209;
+        if(i == 0)x210 = 210;
+        if(i == 0)x211 = 211;
+        if(i == 0)x212 = 212;
+        if(i == 0)x213 = 213;
+        if(i == 0)x214 = 214;
+        if(i == 0)x215 = 215;
+        if(i == 0)x216 = 216;
+        if(i == 0)x217 = 217;
+        if(i == 0)x218 = 218;
+        if(i == 0)x219 = 219;
+        if(i == 0)x220 = 220;
+        if(i == 0)x221 = 221;
+        if(i == 0)x222 = 222;
+        if(i == 0)x223 = 223;
+        if(i == 0)x224 = 224;
+        if(i == 0)x225 = 225;
+        if(i == 0)x226 = 226;
+        if(i == 0)x227 = 227;
+        if(i == 0)x228 = 228;
+        if(i == 0)x229 = 229;
+        if(i == 0)x230 = 230;
+        if(i == 0)x231 = 231;
+        if(i == 0)x232 = 232;
+        if(i == 0)x233 = 233;
+        if(i == 0)x234 = 234;
+        if(i == 0)x235 = 235;
+        if(i == 0)x236 = 236;
+        if(i == 0)x237 = 237;
+        if(i == 0)x238 = 238;
+        if(i == 0)x239 = 239;
+        if(i == 0)x240 = 240;
+        if(i == 0)x241 = 241;
+        if(i == 0)x242 = 242;
+        if(i == 0)x243 = 243;
+        if(i == 0)x244 = 244;
+        if(i == 0)x245 = 245;
+        if(i == 0)x246 = 246;
+        if(i == 0)x247 = 247;
+        if(i == 0)x248 = 248;
+        if(i == 0)x249 = 249;
+        if(i == 0)x250 = 250;
+        if(i == 0)x251 = 251;
+        if(i == 0)x252 = 252;
+        if(i == 0)x253 = 253;
+        if(i == 0)x254 = 254;
+        if(i == 0)x255 = 255;
+        j = 42;
+        t091.goldChecker.println(i+j);
+        t091.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.gold
new file mode 100644
index 00000000000..9611c395d9b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.gold
@@ -0,0 +1,2 @@
+Hiya.
+Bye.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java
new file mode 100644
index 00000000000..08f9a41717e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t093.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t093.t093
+ * @run driver ExecDriver --java jit.t.t093.t093
+ */
+
+package jit.t.t093;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t093
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t093" );
+
+    static long i, j;
+
+    static void foo()
+    {
+        i /= j;
+    }
+
+    public static void main(String argv[])
+    {
+        try
+        {
+            foo();
+        }
+        catch(Throwable x)
+        {
+            t093.goldChecker.println("Hiya.");
+        }
+        try
+        {
+            foo();
+        }
+        catch(Throwable x)
+        {
+            t093.goldChecker.println("Bye.");
+        }
+        t093.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.gold
new file mode 100644
index 00000000000..9611c395d9b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.gold
@@ -0,0 +1,2 @@
+Hiya.
+Bye.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java
new file mode 100644
index 00000000000..8fead244030
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t094.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t094.t094
+ * @run driver ExecDriver --java jit.t.t094.t094
+ */
+
+package jit.t.t094;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t094
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t094" );
+
+    static int i, j;
+
+    static void foo()
+    {
+        i /= j;
+    }
+
+    public static void main(String argv[])
+    {
+        try
+        {
+            foo();
+        }
+        catch(Throwable x)
+        {
+            t094.goldChecker.println("Hiya.");
+        }
+        try
+        {
+            foo();
+        }
+        catch(Throwable x)
+        {
+            t094.goldChecker.println("Bye.");
+        }
+        t094.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.gold
new file mode 100644
index 00000000000..e456cb14f68
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.gold
@@ -0,0 +1,6 @@
+6442450944
+715827882
+2
+6442450944
+0
+3
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java
new file mode 100644
index 00000000000..4f5a1dd8d50
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java
@@ -0,0 +1,60 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t095.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t095.t095
+ * @run driver ExecDriver --java jit.t.t095.t095
+ */
+
+package jit.t.t095;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t095
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t095" );
+
+    public static void main(String[] argv)
+    {
+        long l1 = 0x80000000l;
+        long l2 = 0x3l;
+
+        t095.goldChecker.println(l1*l2);
+        t095.goldChecker.println(l1/l2);
+        t095.goldChecker.println(l1%l2);
+
+        t095.goldChecker.println(l2*l1);
+        t095.goldChecker.println(l2/l1);
+        t095.goldChecker.println(l2%l1);
+        t095.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.gold
new file mode 100644
index 00000000000..71d5a39aca0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.gold
@@ -0,0 +1,2 @@
+I'm running.
+I've stopped.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java
new file mode 100644
index 00000000000..fc37d4f1a5c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t096.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t096.t096
+ * @run driver ExecDriver --java jit.t.t096.t096
+ */
+
+package jit.t.t096;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Empty synchronized methods.
+
+class t096
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t096" );
+
+    static synchronized void foo(){}
+    synchronized void bar(){}
+    public static void main(String[] argv)
+    {
+        int i;
+        t096 o;
+        t096.goldChecker.println("I'm running.");
+        o = new t096();
+        for(i=0; i<2; i+=1)
+        {
+            foo();
+            o.bar();
+        }
+        t096.goldChecker.println("I've stopped.");
+        t096.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.gold
new file mode 100644
index 00000000000..ff88f5e99a3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.gold
@@ -0,0 +1,2 @@
+Float intermediate results appear to be ok.
+Double intermediate results appear to be ok.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java
new file mode 100644
index 00000000000..d89afe96062
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java
@@ -0,0 +1,76 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t098.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t098.t098
+ * @run driver ExecDriver --java jit.t.t098.t098
+ */
+
+package jit.t.t098;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Check for too-wide intermediate results.
+
+class t098
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t098" );
+
+    static double twoto(int n)
+    {
+        double res = 1.0;
+        while(n > 0)
+        {
+            res *= 2.0;
+            n -= 1;
+        }
+        return res;
+    }
+
+    public static void main(String[] arg)
+    {
+        float f0 = (float) twoto(0);
+        float f24 = (float) twoto(24);
+        if(f0 + f24 + f0 == f24)
+            t098.goldChecker.println("Float intermediate results appear to be ok.");
+        else
+            t098.goldChecker.println("Float intermediate results probably too wide");
+
+        double d0 = twoto(0);
+        double d53 = twoto(53);
+        if(d0 + d53 + d0 == d53)
+            t098.goldChecker.println("Double intermediate results appear to be ok.");
+        else
+            t098.goldChecker.println("Double intermediate results probably too wide");
+        t098.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.gold
new file mode 100644
index 00000000000..b77dcc2bd81
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.gold
@@ -0,0 +1 @@
+java.lang.StackOverflowError detected, thrown, and caught.
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java
new file mode 100644
index 00000000000..06044a38dc1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t099.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t099.t099
+ * @run driver ExecDriver --java jit.t.t099.t099
+ */
+
+package jit.t.t099;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t099
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t099" );
+
+    static void foo(int a, int b, int c, int d, int e,
+                    int f, int g, int h, int i, int j)
+    {
+        foo(a,b,c,d,e,f,g,h,i,j);
+    }
+
+    public static void main(String[] argv)
+    {
+        try
+        {
+            foo(1,2,3,4,5,6,7,8,9,10);
+        }
+        catch (Throwable t)
+        {
+            t099.goldChecker.println(t.toString() + " detected, thrown, and caught.");
+        }
+        t099.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.gold
new file mode 100644
index 00000000000..4e8b90d5f19
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.gold
@@ -0,0 +1 @@
+Test PASSES
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java
new file mode 100644
index 00000000000..91a1fd35c9d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java
@@ -0,0 +1,68 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t100.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t100.t100
+ * @run driver ExecDriver --java jit.t.t100.t100
+ */
+
+package jit.t.t100;
+
+/*
+   This test check it a JIT can still detect stack overflow. Method
+   invocation overhead is expensive in Java and improving it is a
+   nobel cause for a JIT. JITs just have to be careful that they
+   don't loose some error handling ability in doing so.
+*/
+
+import java.lang.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t100 {
+    public static final GoldChecker goldChecker = new GoldChecker( "t100" );
+
+    public static void main(String[] args) {
+        try {
+           recurse(1);
+        } catch (StackOverflowError e) {
+           t100.goldChecker.println("Test PASSES");
+        }
+        t100.goldChecker.check();
+    }
+
+    static int recurse(int n) {
+        if (n != 0) {
+            return recurse(n+1);
+        }
+        return 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.gold
new file mode 100644
index 00000000000..de6d65b2e67
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.gold
@@ -0,0 +1 @@
+... and the answer is 28
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java
new file mode 100644
index 00000000000..cc8e3f5951d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t101.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t101.t101
+ * @run driver ExecDriver --java jit.t.t101.t101
+ */
+
+package jit.t.t101;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// int2char when the int resides in esi.  The temptation is to emit, say,
+//
+//     movzwl %esi, %eax
+//
+// , which ain't anything Ma Intel understands.
+
+class t101
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t101" );
+
+    public static void main(String[] argv)
+    {
+        char a[] = new char[8];
+        char x,x0,x1,x2,x3,x4,x5,x6,x7;
+        int i;
+        for(i=0; i<8; i+=1)
+            a[i] = (char) i;
+        x = (char) (
+            (x0=(char)(int)a[0]) +
+            ((x1=(char)(int)a[1]) +
+            ((x2=(char)(int)a[2]) +
+            ((x3=(char)(int)a[3]) +
+            ((x4=(char)(int)a[4]) +
+            ((x5=(char)(int)a[5]) +
+            ((x6=(char)(int)a[6]) +
+            (x7=(char)(int)a[7])))))))
+            );
+
+        t101.goldChecker.println("... and the answer is " + (int) x);
+        t101.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.gold
new file mode 100644
index 00000000000..23387838f25
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.gold
@@ -0,0 +1 @@
+... and the answer is -4
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java
new file mode 100644
index 00000000000..c73b15eb220
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t102.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t102.t102
+ * @run driver ExecDriver --java jit.t.t102.t102
+ */
+
+package jit.t.t102;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Like t101.java except the short intege type is short instead of char.
+
+class t102
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t102" );
+
+    public static void main(String[] argv)
+    {
+        short a[] = new short[8];
+        short x,x0,x1,x2,x3,x4,x5,x6,x7;
+        int i;
+        for(i=0; i<8; i+=1)
+            a[i] = (short) (i - 4);
+        x = (short) (
+            (x0=(short)(int)a[0]) +
+            ((x1=(short)(int)a[1]) +
+            ((x2=(short)(int)a[2]) +
+            ((x3=(short)(int)a[3]) +
+            ((x4=(short)(int)a[4]) +
+            ((x5=(short)(int)a[5]) +
+            ((x6=(short)(int)a[6]) +
+            (x7=(short)(int)a[7])))))))
+            );
+
+        t102.goldChecker.println("... and the answer is " + (int) x);
+        t102.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.gold
new file mode 100644
index 00000000000..19f06bc4ed1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.gold
@@ -0,0 +1 @@
+... and the answer is 20
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java
new file mode 100644
index 00000000000..f54a30a76dc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t103.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t103.t103
+ * @run driver ExecDriver --java jit.t.t103.t103
+ */
+
+package jit.t.t103;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// Like t101.java except the short intege type is byte instead of char.
+
+class t103
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t103" );
+
+    public static void main(String[] argv)
+    {
+        byte a[] = new byte[8];
+        byte x,x0,x1,x2,x3,x4,x5,x6,x7;
+        int i;
+        for(i=0; i<8; i+=1)
+            a[i] = (byte) (i - 1);
+        x = (byte) (
+            (x0=(byte)(int)a[0]) +
+            ((x1=(byte)(int)a[1]) +
+            ((x2=(byte)(int)a[2]) +
+            ((x3=(byte)(int)a[3]) +
+            ((x4=(byte)(int)a[4]) +
+            ((x5=(byte)(int)a[5]) +
+            ((x6=(byte)(int)a[6]) +
+            (x7=(byte)(int)a[7])))))))
+            );
+
+        t103.goldChecker.println("... and the answer is " + (int) x);
+        t103.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.gold
new file mode 100644
index 00000000000..e3a49f7ec64
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.gold
@@ -0,0 +1,2 @@
+Exception thrown.
+java.lang.NullPointerException
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java
new file mode 100644
index 00000000000..999d7a35c12
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t104.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t104.t104
+ * @run driver ExecDriver --java jit.t.t104.t104
+ */
+
+package jit.t.t104;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t104
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t104" );
+
+    public static void main(String[] argv)
+    {
+        t104 o = null;
+        try
+        {
+            synchronized(o)
+            {
+                System.out.println("Fubar: monitorenter didn't throw.");
+            }
+            t104.goldChecker.println("Bottom of try block.");
+        }
+        catch(Throwable t)
+        {
+            t104.goldChecker.println("Exception thrown.");
+            t104.goldChecker.println(t.toString());
+        }
+        t104.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.gold
new file mode 100644
index 00000000000..50fbc677c23
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.gold
@@ -0,0 +1,4 @@
+java.lang.ArrayIndexOutOfBoundsException: Index -1 out of bounds for length 2
+ok at 0
+ok at 1
+java.lang.ArrayIndexOutOfBoundsException: Index 2 out of bounds for length 2
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java
new file mode 100644
index 00000000000..631f99492c1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t105.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t105.t105
+ * @run driver ExecDriver --java jit.t.t105.t105
+ */
+
+package jit.t.t105;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t105
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t105" );
+
+    public static void main(String[] argv)
+    {
+        int i;
+        int a[] = new int[2];
+
+        for(i=-1; i<3; i+=1)
+        {
+            try
+            {
+                a[i] = i;
+                t105.goldChecker.println("ok at " + i);
+            }
+            catch(Throwable t)
+            {
+                t105.goldChecker.println(t.toString());
+            }
+        }
+        t105.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.gold
new file mode 100644
index 00000000000..2d027041b59
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.gold
@@ -0,0 +1,2 @@
+i = 2
+f = 2.0
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java
new file mode 100644
index 00000000000..6169deccd81
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t106.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t106.t106
+ * @run driver ExecDriver --java jit.t.t106.t106
+ */
+
+package jit.t.t106;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t106 {
+   public static final GoldChecker goldChecker = new GoldChecker( "t106" );
+
+   static public void main(String argv[]) {
+      float f;
+      int i;
+
+      f = (i = 2);
+      t106.goldChecker.println("i = " + i);
+      t106.goldChecker.println("f = " + f);
+      t106.goldChecker.check();
+   }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.gold
new file mode 100644
index 00000000000..ace6be55120
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.gold
@@ -0,0 +1,5 @@
+l << 0x40 == -2
+l << (0x40 & 0x1F) == -2
+
+l >>> 0xFFFFFFC2 == 4611686018427387903
+l >>> (0xFFFFFFC2 & 0x1F) == 4611686018427387903
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java
new file mode 100644
index 00000000000..b9d8fd67f51
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/t/t107.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t107.t107
+ * @run driver ExecDriver --java jit.t.t107.t107
+ */
+
+package jit.t.t107;
+
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+class t107 {
+
+        public static final GoldChecker goldChecker = new GoldChecker( "t107" );
+
+        public static void main(String args[]) {
+                long l = - 2l;
+                int m = 0x1F;
+                int s1 = 0;
+                int s2 = 0x40;
+                int s3 = 63;
+                int s4 = 0x7F;
+                int s5 = 2;
+                int s6 = 0xFFFFFFC2;
+
+                if (l << 0x40 == l << (0 & 0x1F)) {
+                        t107.goldChecker.print("l << 0x40 == ");
+                        t107.goldChecker.println(l << s2);
+                        t107.goldChecker.print("l << (0x40 & 0x1F) == ");
+                        t107.goldChecker.println(l << (s2 & m));
+                        t107.goldChecker.print('\n');
+                }
+                if (l >>> 0xFFFFFFC2 == l >>> (0xFFFFFFC2 & 0x1F)) {
+                        t107.goldChecker.print("l >>> 0xFFFFFFC2 == ");
+                        t107.goldChecker.println(l >>> s6);
+                        t107.goldChecker.print("l >>> (0xFFFFFFC2 & 0x1F) == ");
+                        t107.goldChecker.println(l >>> (s6 & m));
+                }
+                t107.goldChecker.check();
+        }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t108/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/t/t108/TestDescription.java
new file mode 100644
index 00000000000..5eb928abcb0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t108/TestDescription.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/t/t108.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t083.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t108.t108
+ * @run driver ExecDriver --java jit.t.t108.t108
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.gold
new file mode 100644
index 00000000000..07725f68b22
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.gold
@@ -0,0 +1,3 @@
+java.lang.Throwable
+        at jit.t.t108.t108.doit(t108.java:51)
+        at jit.t.t108.t108.main(t108.java:40)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java
new file mode 100644
index 00000000000..428324fbd8f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * 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 jit.t.t108;
+
+import java.io.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+// Uncaught exception, one jit'd frame on the stack.
+
+class t108
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t108" );
+
+    public static void main(String argv[])
+    {
+        try {
+            doit();
+        } catch (Throwable t) {
+                StringWriter sr = new StringWriter();
+                t.printStackTrace(new PrintWriter(sr));
+                t108.goldChecker.print(sr.toString().replace("\t", "        "));
+        }
+        t108.goldChecker.check();
+    }
+
+    static void doit() throws Throwable
+    {
+        Throwable t = new Throwable();
+        throw t;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t109/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/t/t109/TestDescription.java
new file mode 100644
index 00000000000..50403104cf1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t109/TestDescription.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/t/t109.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t084.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t109.t109
+ * @run driver ExecDriver --java jit.t.t109.t109
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.gold
new file mode 100644
index 00000000000..5aa4e5b8936
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.gold
@@ -0,0 +1,3 @@
+java.lang.ArithmeticException: / by zero
+        at jit.t.t109.t109.doit(t109.java:53)
+        at jit.t.t109.t109.main(t109.java:40)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java
new file mode 100644
index 00000000000..7c8683f594f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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 jit.t.t109;
+
+import java.io.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+// Uncaught exception, one jit'd frame on the stack, implicit exception.
+
+class t109
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t109" );
+
+    public static void main(String argv[])
+    {
+        try {
+            doit();
+        } catch (Throwable t) {
+                StringWriter sr = new StringWriter();
+                t.printStackTrace(new PrintWriter(sr));
+                t109.goldChecker.print(sr.toString().replace("\t", "        "));
+        }
+        t109.goldChecker.check();
+    }
+
+    public static void doit()
+    {
+        int i = 0;
+        int j = 39;
+        j /= i;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t110/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/t/t110/TestDescription.java
new file mode 100644
index 00000000000..bb29a89425d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t110/TestDescription.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/t/t110.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t085.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t110.t110
+ * @run driver ExecDriver --java jit.t.t110.t110
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.gold
new file mode 100644
index 00000000000..917f1d7692e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.gold
@@ -0,0 +1,3 @@
+java.lang.ArithmeticException: / by zero
+        at jit.t.t110.t110.doit(t110.java:53)
+        at jit.t.t110.t110.main(t110.java:40)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java
new file mode 100644
index 00000000000..b5ef1388914
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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 jit.t.t110;
+
+import java.io.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+// Uncaught exception, one jit'd frame on the stack, implicit exception.
+
+class t110
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t110" );
+
+    public static void main(String argv[])
+    {
+        try {
+            doit();
+        } catch(Throwable t) {
+                StringWriter sr = new StringWriter();
+                t.printStackTrace(new PrintWriter(sr));
+                t110.goldChecker.print(sr.toString().replace("\t", "        "));
+        }
+        t110.goldChecker.check();
+    }
+
+    static void doit()
+    {
+        int i = 0;
+        int j = 39;
+        j /= i;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t111/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/t/t111/TestDescription.java
new file mode 100644
index 00000000000..e0e2a757008
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t111/TestDescription.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/t/t111.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t089.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t111.t111
+ * @run driver ExecDriver --java jit.t.t111.t111
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.gold
new file mode 100644
index 00000000000..71dfe95f029
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.gold
@@ -0,0 +1,3 @@
+java.lang.Throwable
+        at jit.t.t111.t111.doit(t111.java:52)
+        at jit.t.t111.t111.main(t111.java:40)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java
new file mode 100644
index 00000000000..d0d82716480
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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 jit.t.t111;
+
+import java.io.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+// Uncaught exception, one jit'd frame on the stack.
+
+class t111
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t111" );
+
+    public static void main(String argv[])
+    {
+        try {
+            doit();
+        } catch (Throwable t) {
+                StringWriter sr = new StringWriter();
+                t.printStackTrace(new PrintWriter(sr));
+                t111.goldChecker.print(sr.toString().replace("\t", "        "));
+        }
+        t111.goldChecker.check();
+    }
+
+    public static void doit() throws Throwable
+    {
+        Throwable t = new Throwable();
+        t.fillInStackTrace();
+        throw t;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t112/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/t/t112/TestDescription.java
new file mode 100644
index 00000000000..fd57a2a6370
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t112/TestDescription.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/t/t112.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t090.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t112.t112
+ * @run driver ExecDriver --java jit.t.t112.t112
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.gold
new file mode 100644
index 00000000000..0a1ca4de859
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.gold
@@ -0,0 +1,3 @@
+java.lang.Throwable
+        at jit.t.t112.t112.doit(t112.java:52)
+        at jit.t.t112.t112.main(t112.java:40)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java
new file mode 100644
index 00000000000..76d422c87fa
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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 jit.t.t112;
+
+import java.io.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+// Uncaught exception, one jit'd frame on the stack.
+
+class t112
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t112" );
+
+    public static void main(String argv[])
+    {
+        try {
+            doit();
+        } catch (Throwable t) {
+                StringWriter sr = new StringWriter();
+                t.printStackTrace(new PrintWriter(sr));
+                t112.goldChecker.print(sr.toString().replace("\t", "        "));
+        }
+        t112.goldChecker.check();
+    }
+
+    static void doit() throws Throwable
+    {
+        Throwable t = new Throwable();
+        t.fillInStackTrace();
+        throw t;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t113/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/t/t113/TestDescription.java
new file mode 100644
index 00000000000..43bf0d5f5a5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t113/TestDescription.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/t/t113.
+ * VM Testbase keywords: [jit, quick, vm6]
+ * VM Testbase readme:
+ * Clone of t097.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.t.t113.t113
+ * @run driver ExecDriver --java jit.t.t113.t113
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.gold b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.gold
new file mode 100644
index 00000000000..d827cf5f7f4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.gold
@@ -0,0 +1,2 @@
+java.lang.ClassCastException: jit.t.t113.kid1 cannot be cast to jit.t.t113.kid2
+        at jit.t.t113.t113.main(t113.java:59)
diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java
new file mode 100644
index 00000000000..f29ddd99f5b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ * 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 jit.t.t113;
+
+import java.io.*;
+import nsk.share.TestFailure;
+import nsk.share.GoldChecker;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+// Exception thrown by checkcast.
+
+class parent
+{
+}
+
+class kid1 extends parent
+{
+    int i;
+}
+
+class kid2 extends parent
+{
+    int j;
+}
+
+class t113
+{
+    public static final GoldChecker goldChecker = new GoldChecker( "t113" );
+
+    public static void main(String[] argv) throws Throwable
+    {
+        parent p;
+        kid2 k2;
+
+        p = new kid1();
+        try
+        {
+            k2 = (kid2) p;
+        }
+        catch(Throwable t)
+        {
+                StringWriter sr = new StringWriter();
+                t.printStackTrace(new PrintWriter(sr));
+                // Relaxing the gold checking to allow jigsaw module names
+                // appear in ClassCastException message
+                t113.goldChecker.print(sr.toString().replace("\t", "        ")
+                        .replaceAll(" \\(in module: [ \\w\\.]*\\)",""));
+        }
+        t113.goldChecker.check();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/test_duplicates.txt b/test/hotspot/jtreg/vmTestbase/jit/test_duplicates.txt
new file mode 100644
index 00000000000..4120f58f461
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/test_duplicates.txt
@@ -0,0 +1,24 @@
+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
+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.
+
+* common/exception, common/exceptiontest
+* common/inittest2, common/JITSuite
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java b/test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java
new file mode 100644
index 00000000000..5ec3391d459
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase jit/tiered.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Description
+ *     The test verifies that JVM prints tiered events with -XX:+PrintTieredEvents
+ *     for tiered compilation explicitly enabled with -XX:+TieredCompilation.
+ *     If tiered compilation is explicitly disabled the test verifies that there are no
+ *     output from PrintTieredEvents.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run shell tieredTest.sh
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh b/test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh
new file mode 100644
index 00000000000..2c91754e98e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Copyright (c) 2012, 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.
+#
+
+JAVA_OPTS="$TESTJAVAOPTS $TESTVMOPTS"
+JAVA="$TESTJAVA/bin/java"
+
+log=output.txt
+tiered="off"
+
+if echo "$JAVA_OPTS" | grep "[-]XX:+TieredCompilation"; then
+    tiered="on"
+elif echo "$JAVA_OPTS" | grep "[-]XX:-TieredCompilation"; then
+    tiered="off"
+else
+    echo "TEST PASSED: TieredCompilation option is not specified. Nothing to test"
+    exit 0
+fi
+
+echo "Tiered is ${tiered}"
+
+$JAVA $JAVA_OPTS -XX:+PrintTieredEvents -version >$log 2>&1
+
+if grep "Client VM" $log; then
+    echo "TEST PASSED: Client VM. The test is useless"
+    exit 0
+fi
+
+if ! egrep '^[0-9.]+: \[compile level=[0-9]' $log; then
+    if [ "${tiered}" == "on" ]; then
+        echo "TEST FAILED: No PrintTieredEvents output"
+        exit 2
+    else
+        echo "TEST PASSED: No events with TieredCompilation turned off"
+        exit 0
+    fi
+else
+    if [ "${tiered}" == "off" ]; then
+        echo "TEST FAILED: PrintTieredEvents output found but TieredCompilation is turned off"
+        exit 2
+    else
+        echo "TEST PASSED: PrintTieredEvents output found"
+        exit 0
+    fi
+fi
diff --git a/test/hotspot/jtreg/vmTestbase/jit/unclear_tests.txt b/test/hotspot/jtreg/vmTestbase/jit/unclear_tests.txt
new file mode 100644
index 00000000000..84fe1c03202
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/unclear_tests.txt
@@ -0,0 +1,35 @@
+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
+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.
+
+* common/inline005
+* common/loops/arg01
+* common/loops/arg03
+* common/loops/dec01
+* common/loops/dec02
+* common/loops/dec03
+* common/loops/dec04
+* common/loops/dec05
+* common/loops/dec06
+* common/loops/dec07
+* common/loops/dec08
+* common/loops/dec09
+* common/loops/dec10
+* common/loops/dec11
diff --git a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java
new file mode 100644
index 00000000000..b54aa01da16
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/verifier/VerifyInitLocal.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @compile VerifyInitLocal1P.jasm
+ * @compile VerifyInitLocal2N.jasm
+ * @compile VerifyInitLocal3N.jasm
+ * @run main/othervm jit.verifier.VerifyInitLocal.VerifyInitLocal
+ */
+
+package jit.verifier.VerifyInitLocal;
+
+import nsk.share.TestFailure;
+
+/**
+ * @(#)VerifyInitLocal.java       1.1 01/03/15
+ * @bug 4408261
+ * @summary Make sure verifier allows initialization of local fields.
+ */
+
+public abstract class VerifyInitLocal {
+    static final boolean debug = true;
+    public static void main(String[] args) throws Exception {
+        String[] classes = { "jit.verifier.VerifyInitLocal.VerifyInitLocal1P",
+                             "jit.verifier.VerifyInitLocal.VerifyInitLocal2N",
+                             "jit.verifier.VerifyInitLocal.VerifyInitLocal3N" };
+        for (int i = 0; i < classes.length; i++) {
+            boolean is_neg = classes[i].endsWith("N");
+            try {
+                if (debug)  System.out.println(classes[i]);
+                Class.forName(classes[i]).newInstance();
+                if (is_neg) {
+                    throw new TestFailure("shouldn't successfully verify " +
+                                            classes[i]);
+                }
+            } catch (VerifyError e) {
+                if (!is_neg) {
+                    System.out.println(e);
+                    throw new TestFailure("should successfully verify " +
+                                            classes[i]);
+                }
+                if (debug)  System.out.println(e);
+            }
+        }
+    }
+
+    // Superclass stuff for tests to inherit from:
+    protected boolean touch_me_not;
+    VerifyInitLocal() {
+        if (!verify()) {
+            throw new TestFailure("verify()==false in " + getClass());
+        }
+    }
+    public abstract boolean verify();
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal1P.jasm b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal1P.jasm
new file mode 100644
index 00000000000..3f7222f3976
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal1P.jasm
@@ -0,0 +1,59 @@
+/*
+ * 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
+ * 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.
+ */
+/*
+variation of:
+	class VerifyInitLocal1P extends VerifyInitLocal {
+	  private boolean verified;
+	  public VerifyInitLocal1P() { verified = true; }
+	  public boolean verify() { return verified; }
+	}
+*/
+
+super class jit/verifier/VerifyInitLocal/VerifyInitLocal1P
+	extends jit/verifier/VerifyInitLocal/VerifyInitLocal
+{
+
+private Field verified:Z;
+
+public Method "<init>":"()V"
+	stack 2 locals 1
+{
+		// Early initialization to local field must succeed:
+		aload_0;
+		iconst_1;
+		putfield	Field verified:"Z";   //NEEDED
+
+		aload_0;
+		invokespecial	Method jit/verifier/VerifyInitLocal/VerifyInitLocal."<init>":"()V";
+		return;
+}
+
+public Method verify:"()Z"
+	stack 1 locals 1
+{
+		aload_0;
+		getfield	Field verified:"Z";
+		ireturn;
+}
+
+} // end Class VerifyInitLocal1P
diff --git a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal2N.jasm b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal2N.jasm
new file mode 100644
index 00000000000..6d00e5a211e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal2N.jasm
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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.
+ */
+/*
+variation of:
+	class VerifyInitLocal2N extends VerifyInitLocal {
+	  private boolean isfalse;
+	  private boolean verified;
+	  public VerifyInitLocal2N() { verified = !isfalse; }
+	  public boolean verify() { return verified; }
+	}
+*/
+
+super class jit/verifier/VerifyInitLocal/VerifyInitLocal2N
+	extends jit/verifier/VerifyInitLocal/VerifyInitLocal
+{
+
+private Field isfalse:Z;
+private Field verified:Z;
+
+public Method "<init>":"()V"
+	stack 3 locals 1
+{
+		// Early initialization of local field must not include a read:
+		aload_0;
+		aload_0;
+		getfield	Field isfalse:"Z";   //BAD
+		iconst_1;
+		ixor;
+		putfield	Field verified:"Z";
+
+		aload_0;
+		invokespecial	Method jit/verifier/VerifyInitLocal/VerifyInitLocal."<init>":"()V";
+		return;
+}
+
+public Method verify:"()Z"
+	stack 1 locals 1
+{
+		aload_0;
+		getfield	Field verified:"Z";
+		ireturn;
+}
+
+} // end Class VerifyInitLocal2N
diff --git a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal3N.jasm b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal3N.jasm
new file mode 100644
index 00000000000..6734d04c359
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal3N.jasm
@@ -0,0 +1,56 @@
+/*
+ * 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
+ * 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.
+ */
+/*
+variation of:
+	class VerifyInitLocal3N extends VerifyInitLocal {
+	  public VerifyInitLocal3N() { touch_me_not = true; }
+	  public boolean verify() { return true; }
+	}
+*/
+
+super class jit/verifier/VerifyInitLocal/VerifyInitLocal3N
+	extends jit/verifier/VerifyInitLocal/VerifyInitLocal
+{
+
+
+public Method "<init>":"()V"
+	stack 2 locals 1
+{
+		// Early initialization to non-local field must fail:
+		aload_0;
+		iconst_1;
+		putfield	Field VerifyInitLocal.touch_me_not:"Z";  //BAD
+
+		aload_0;
+		invokespecial	Method jit/verifier/VerifyInitLocal/VerifyInitLocal."<init>":"()V";
+		return;
+}
+
+public Method verify:"()Z"
+	stack 1 locals 1
+{
+		iconst_1;
+		ireturn;
+}
+
+} // end Class VerifyInitLocal3N
diff --git a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/MergeStack.jasm b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/MergeStack.jasm
new file mode 100644
index 00000000000..239772ce4b2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/MergeStack.jasm
@@ -0,0 +1,41 @@
+/*
+ * 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
+ * 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.
+ */
+super public class jit/verifier/VerifyMergeStack/MergeStack
+{
+
+public static Method test:"()V"
+stack 1 locals 1
+{
+aload_0;
+ifnonnull L8; 
+iconst_0; // load integer
+goto L9;
+L8:
+aconst_null; // load reference
+L9:
+pop;
+return;
+}
+
+} // end Class MergeStack
+
diff --git a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java
new file mode 100644
index 00000000000..798ca0fb732
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/verifier/VerifyMergeStack.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @compile MergeStack.jasm
+ * @run main/othervm jit.verifier.VerifyMergeStack.VerifyMergeStack
+ */
+
+package jit.verifier.VerifyMergeStack;
+
+import nsk.share.TestFailure;
+
+/**
+ * @(#)VerifyMergeStack.java      1.1 01/25/01
+ * @bug 4336916
+ * @summary Make sure verifier fails when two distinct types meet on operand stack
+ */
+
+public class VerifyMergeStack {
+    public static void main(String[] args) throws Exception {
+            try {
+                MergeStack.test();
+                throw new TestFailure("shouldn't successfullly verify MergeStack");
+            } catch (VerifyError e) {
+            }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java b/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java
new file mode 100644
index 00000000000..aa726cfee34
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/wide/wide01.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.wide.wide01.wide01
+ * @run driver ExecDriver --java jit.wide.wide01.wide01
+ */
+
+package jit.wide.wide01;
+
+import nsk.share.TestFailure;
+
+/*
+     Check for intermediate results that are too wide.
+     The wide.java test will fail if the the result of the
+     expression (f0+f24) is maintained in greater-than-double precision
+     or if the result of the expression (d0+d53) is maintained in
+     greater-than-double precision.
+*/
+
+strictfp class wide01
+{
+   public static void main(String[] arg) {
+       float  f1 = Float.MAX_VALUE;
+       float  f2 = Float.MAX_VALUE;
+       double d1 = Double.MAX_VALUE;
+       double d2 = Double.MAX_VALUE;
+
+       float f = f1 * f2;
+       if(f == Float.POSITIVE_INFINITY)
+           System.out.println("Float test PASSES.");
+       else
+           throw new TestFailure("Float test FAILS");
+
+       double d = d1 * d2;
+       if(d == Double.POSITIVE_INFINITY)
+           System.out.println("Double test PASSES.");
+       else
+           throw new TestFailure("Double test FAILS");
+
+   }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java b/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java
new file mode 100644
index 00000000000..3f5222a7dc1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java
@@ -0,0 +1,74 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase jit/wide/wide02.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build jit.wide.wide02.wide02
+ * @run driver ExecDriver --java jit.wide.wide02.wide02
+ */
+
+package jit.wide.wide02;
+
+import nsk.share.TestFailure;
+
+/*
+     Check for intermediate results that are too wide.
+     The too-wide.java test will fail if the the result of the
+     expression (f0+f24) is maintained in greater-than-float precision
+     or if the result of the expression (d0+d53) is maintained in
+     greater-than-double precision.
+*/
+class wide02
+{
+   static double twoto(int n) {
+       double res = 1.0;
+       while(n > 0) {
+           res *= 2.0;
+           n -= 1;
+       }
+       return res;
+   }
+
+   public static void main(String[] arg) {
+       float f0 = (float) twoto(0);
+       float f24 = (float) twoto(24);
+       if(f0 + f24 + f0 == f24)
+           System.out.println("Float test PASSES.");
+       else
+           throw new TestFailure("Float test FAILS");
+
+       double d0 = twoto(0);
+       double d53 = twoto(53);
+       if(d0 + d53 + d0 == d53)
+           System.out.println("Double test PASSES.");
+       else
+           throw new TestFailure("Double test FAILS");
+   }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/gc/HighWaterMarkTest.java b/test/hotspot/jtreg/vmTestbase/metaspace/gc/HighWaterMarkTest.java
index f26fef94b49..af666b1608d 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/HighWaterMarkTest.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/HighWaterMarkTest.java
@@ -187,30 +187,22 @@ public class HighWaterMarkTest extends FirstGCTest {
         }
         System.out.println("% GC has been invoked: " + gcCount + " times");
 
-        if (VMRuntimeEnvUtils.isVMOptionEnabled("UseG1GC") &&
-              VMRuntimeEnvUtils.isVMOptionEnabled("ClassUnloadingWithConcurrentMark")) {
-            System.out.println("% isG1ClassUnloading: true");
-            if (gcCount != 0) {
-                throw new Fault ("G1 should unload classes, full GC is not expected");
-            }
+        if (maxMetaspaceFreeRatio <= 1) {
+            // min/max = 0/1  boundary value
+            // GC should happen very often
+            checkGCCount(gcCount, 20, -1);
+        } else if (minMetaspaceFreeRatio >= 99) {
+            // min/max = 99/100  boundary value
+            // GC should happen very rare
+            checkGCCount(gcCount, -1, 2);
+        } else if (minMetaspaceFreeRatio >= 10  && maxMetaspaceFreeRatio <= 20) {
+            // GC should happen quite often
+            checkGCCount(gcCount, 3, 30);
+        } else if (minMetaspaceFreeRatio >= 70  && maxMetaspaceFreeRatio <= 80) {
+            // GC should happen quite often
+            checkGCCount(gcCount, 1, 3);
         } else {
-            if (maxMetaspaceFreeRatio <= 1) {
-                // min/max = 0/1  boundary value
-                // GC should happen very often
-                checkGCCount(gcCount, 20, -1);
-            } else if (minMetaspaceFreeRatio >= 99) {
-                // min/max = 99/100  boundary value
-                // GC should happen very rare
-                checkGCCount(gcCount, -1, 2);
-            } else if (minMetaspaceFreeRatio >= 10  && maxMetaspaceFreeRatio <= 20) {
-                // GC should happen quite often
-                checkGCCount(gcCount, 3, 30);
-            } else if (minMetaspaceFreeRatio >= 70  && maxMetaspaceFreeRatio <= 80) {
-                // GC should happen quite often
-                checkGCCount(gcCount, 1, 3);
-            } else {
-                // hard to estimate
-            }
+            // hard to estimate
         }
 
     }
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/gc/MetaspaceBaseGC.java b/test/hotspot/jtreg/vmTestbase/metaspace/gc/MetaspaceBaseGC.java
index 93f0778ee36..3b814056df2 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/MetaspaceBaseGC.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/MetaspaceBaseGC.java
@@ -180,14 +180,13 @@ public abstract class MetaspaceBaseGC {
 
     /**
      * Reads gc.log file and counts GC induced by metaspace.
-     * Note: this method doesn't work for ConcMarkSweep...
      * @return how many times GC induced by metaspace has occurred.
      */
     protected int getMetaspaceGCCount() {
         int count = 0;
         try {
             for (String line: readGCLog()) {
-                if (line.indexOf("Pause Full") > 0 && line.indexOf("Meta") > 0) {
+                if (line.indexOf("Metadata GC ") > 0) {
                     count++;
                 }
             }
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java
index c4a8ef1d809..760f9081d34 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java
@@ -29,6 +29,7 @@
  * VM Testbase keywords: [monitoring, quarantine]
  * VM Testbase comments: JDK-8058967
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java
index b696a2651f0..be2e0bd9350 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/shrink_grow/ShrinkGrowMultiJVM.
  * VM Testbase keywords: [nonconcurrent]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build metaspace.shrink_grow.ShrinkGrowMultiJVM.ShrinkGrowMultiJVM
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
index 5e3fa631345..ebef5a587ef 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
@@ -27,6 +27,7 @@
  *
  * @summary converted from VM Testbase metaspace/shrink_grow/ShrinkGrowTest.
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java b/test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java
index 80b2f6a3d66..4174f109ad1 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/staticReferences.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java
index a8419abc852..0e217d2fabc 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy001.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType CLASSES
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java
index abe47ff0ceb..aa66d3cf157 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy002.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType CLASSES
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java
index 4cd2928d669..d9734d5ced1 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy003.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType INTERFACES
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java
index 95a3e4f76e9..607533faf91 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy004.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType INTERFACES
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java
index 506fa86994a..4bf2c66ef30 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy005.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType MIXED
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java
index 1051afd74fa..90081ea4df1 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy006.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType MIXED
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java
index d11277a8741..8db17d9de4b 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy007.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -48,4 +49,3 @@
  *      -hierarchyType CLASSES
  *      -triggerUnloadingByFillingMetaspace
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java
index 8130d64db3a..170641120a9 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy008.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -48,4 +49,3 @@
  *      -hierarchyType CLASSES
  *      -triggerUnloadingByFillingMetaspace
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java
index 515354584c9..cfdde602e72 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy009.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -48,4 +49,3 @@
  *      -hierarchyType INTERFACES
  *      -triggerUnloadingByFillingMetaspace
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java
index 08d92d43ec8..6774d21e168 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy010.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -48,4 +49,3 @@
  *      -hierarchyType INTERFACES
  *      -triggerUnloadingByFillingMetaspace
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java
index 1856992d3b0..240404910ed 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy011.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -48,4 +49,3 @@
  *      -hierarchyType MIXED
  *      -triggerUnloadingByFillingMetaspace
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java
index 34421350e84..17e243db99f 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy012.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -48,4 +49,3 @@
  *      -hierarchyType MIXED
  *      -triggerUnloadingByFillingMetaspace
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java
index 8e49f5e3eee..bed44c182b2 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy013.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType CLASSES
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java
index eed8d5ac10c..05cc3b8984e 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy014.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType INTERFACES
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java
index c3ff7bd2afa..238107fe9d7 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java
@@ -28,6 +28,7 @@
  * @summary converted from VM Testbase metaspace/stressHierarchy/stressHierarchy015.
  * VM Testbase keywords: [nonconcurrent, javac, no_cds]
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @build sun.hotspot.WhiteBox
@@ -44,4 +45,3 @@
  *      -maxLevelSize 100
  *      -hierarchyType MIXED
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider01/AttachProvider01.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider01/AttachProvider01.java
new file mode 100644
index 00000000000..1907fe21aa1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider01/AttachProvider01.java
@@ -0,0 +1,98 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/AttachProvider/AttachProvider01.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks that method AttachProvider.listVirtualMachines() returns
+ *     VirtualMachineDescriptors for 2 VMs started by this test.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.AttachProvider.AttachProvider01.AttachProvider01
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.AttachProvider.AttachProvider01.AttachProvider01
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.AttachProvider.AttachProvider01;
+
+import java.util.List;
+import com.sun.tools.attach.*;
+import com.sun.tools.attach.spi.AttachProvider;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+/*
+ * Test checks method AttachProvider.listVirtualMachines()
+ * (test checks that collection returned by AttachProvider.listVirtualMachines() contains current VM
+ * and another VM started by this test)
+ */
+public class AttachProvider01 extends AODTestRunner {
+
+    public AttachProvider01(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        String currentVMId = getCurrentVMId();
+
+        for (AttachProvider provider : AttachProvider.providers()) {
+            log.display("Checking AttachProvider.listVirtualMachines() (provider: " + provider + ")");
+            checkList(provider.listVirtualMachines(), currentVMId, targetVMId);
+        }
+    }
+
+    private void checkList(List<VirtualMachineDescriptor> vmDescriptors, String currentVMId, String targetVMId) {
+        VirtualMachineDescriptor currentVMDesc = null;
+        VirtualMachineDescriptor targetVMDesc = null;
+
+        for (VirtualMachineDescriptor vmDescriptor : VirtualMachine.list()) {
+            log.display("VirtualMachineDescriptor: " + vmDescriptor);
+
+            if (vmDescriptor.id().equals(currentVMId)) {
+                currentVMDesc = vmDescriptor;
+            } else if (vmDescriptor.id().equals(targetVMId)) {
+                targetVMDesc = vmDescriptor;
+            }
+        }
+
+        TestUtils.assertNotNull(currentVMDesc, "VirtualMachine.list() didn't return descriptor for the current VM");
+        TestUtils.assertNotNull(targetVMDesc, "VirtualMachine.list() didn't return descriptor for VM with id '" +
+                targetVMId + "'");
+    }
+
+    public static void main(String[] args) {
+        new AttachProvider01(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider02/AttachProvider02.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider02/AttachProvider02.java
new file mode 100644
index 00000000000..7880e3906c9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider02/AttachProvider02.java
@@ -0,0 +1,123 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/AttachProvider/AttachProvider02.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test tries to attach to the VM started by this test using 2 methods:
+ *         - AttachProvider.attachVirtualMachine(String id)
+ *         - AttachProvider.attachVirtualMachine(VirtualMachineDescriptor vmd)
+ *     After attaching test tries to use created VirtualMachine object (tries to call VirtualMachine.getSystemProperties()).
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.AttachProvider.AttachProvider02.AttachProvider02
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -Djdk.attach.allowAttachSelf -XX:+UsePerfData
+ *      PropertyResolvingWrapper
+ *      nsk.aod.AttachProvider.AttachProvider02.AttachProvider02
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.AttachProvider.AttachProvider02;
+
+import java.util.Properties;
+import com.sun.tools.attach.*;
+import com.sun.tools.attach.spi.AttachProvider;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+/*
+ * Test checks following methods:
+ *      - AttachProvider.attachVirtualMachine(String id)
+ *      - AttachProvider.attachVirtualMachine(VirtualMachineDescriptor vmd)
+ */
+public class AttachProvider02 extends AODTestRunner {
+
+    public AttachProvider02(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        TestUtils.assertTrue(AttachProvider.providers().size() > 0, "Method AttachProvider.providers() returns empty collection");
+
+        String currentVMId = getCurrentVMId();
+
+        for (AttachProvider provider : AttachProvider.providers()) {
+            log.display("Provider: " + provider);
+            log.display("Provider.name(): " + provider.name());
+            log.display("Provider.type(): " + provider.type());
+
+            TestUtils.assertNotNull(provider.name(), "Provider.name() returns null");
+            TestUtils.assertNotNull(provider.type(), "Provider.type() returns null");
+
+            tryAttach(provider, currentVMId, false);
+
+            tryAttach(provider, currentVMId, true);
+
+            tryAttach(provider, targetVMId, false);
+
+            tryAttach(provider, targetVMId, true);
+        }
+    }
+
+    void tryAttach(AttachProvider provider, String vmId, boolean useVMDescriptor) throws Throwable {
+        log.display("Attaching to vm " + vmId + " using " +
+                (useVMDescriptor ? "VirtualMachineDescriptor " : "VM id"));
+
+        VirtualMachine vm;
+
+        if (useVMDescriptor)
+            vm = provider.attachVirtualMachine(new VirtualMachineDescriptor(provider, vmId));
+        else
+            vm = provider.attachVirtualMachine(vmId);
+
+        try {
+            log.display("Attached to vm: " + vm);
+            TestUtils.assertEquals(vm.id(), vmId, "VirtualMachine.id() returns unexpected value for attached vm: " + vm.id());
+
+            // try to use created VirtualMachine
+
+            log.display("Trying to call VirtualMachine.getSystemProperties()");
+            Properties properties = vm.getSystemProperties();
+            TestUtils.assertNotNull(properties, "VirtualMachine.getSystemProperties() returns null");
+
+            TestUtils.assertTrue(properties.size() > 0, "VirtualMachine.getSystemProperties() returns empty collection");
+        } finally {
+            vm.detach();
+        }
+    }
+
+    public static void main(String[] args) {
+        new AttachProvider02(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine01/VirtualMachine01.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine01/VirtualMachine01.java
new file mode 100644
index 00000000000..336be5f42c2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine01/VirtualMachine01.java
@@ -0,0 +1,171 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine01.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     Test checks that methods of VirtualMachine throws expected exceptions
+ *     in following cases:
+ *         - VirtualMachine.attach(null) should throw NullPointerException
+ *         - VirtualMachine.attach(<invalid vm id>) should throw AttachNotSupportedException
+ *         - VirtualMachine.loadAgent(null), VirtualMachine.loadAgentLibrary(null),
+ *         VirtualMachine.loadAgentPath(null) should throw NullPointerException
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine01.VirtualMachine01
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine01.VirtualMachine01
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine01;
+
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+import com.sun.tools.attach.*;
+import com.sun.tools.attach.spi.AttachProvider;
+
+/*
+ * Test provokes exception which should be thrown by VirtualMachine methods:
+ *      - VirtualMachine.attach(null) should throw NullPointerException
+ *      - VirtualMachine.attach(<invalid vm id>) should throw AttachNotSupportedException
+ *      - VirtualMachine.loadAgent(null), VirtualMachine.loadAgentLibrary(null),
+ *      VirtualMachine.loadAgentPath(null) should throw NullPointerException
+ */
+public class VirtualMachine01 extends AODTestRunner {
+
+    VirtualMachine01(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        try {
+            log.display("VirtualMachine.attach((String)null)");
+            VirtualMachine.attach((String) null);
+            TestUtils.testFailed("NullPointerException wasn't thrown");
+        } catch (NullPointerException e) {
+            log.display("Expected exception: " + e);
+        }
+
+        try {
+            log.display("VirtualMachine.attach((VirtualMachineDescriptor)null)");
+            VirtualMachine.attach((VirtualMachineDescriptor) null);
+            TestUtils.testFailed("NullPointerException wasn't thrown");
+        } catch (NullPointerException e) {
+            log.display("Expected exception: " + e);
+        }
+
+        final String invalidVMId = "InvalidID";
+
+        try {
+            log.display("VirtualMachine.attach(" + invalidVMId + ")");
+            VirtualMachine.attach(invalidVMId);
+            TestUtils.testFailed("AttachNotSupportedException wasn't thrown");
+        } catch (AttachNotSupportedException e) {
+            log.display("Expected exception: " + e);
+        }
+
+        try {
+            TestUtils.assertTrue(AttachProvider.providers().size() > 0, "AttachProvider.providers() returns empty list");
+            log.display("Create VirtualMachineDescriptor using provider '" + AttachProvider.providers().get(0) + "'");
+            VirtualMachineDescriptor vmd = new VirtualMachineDescriptor(AttachProvider.providers().get(0), invalidVMId);
+            log.display("VirtualMachine.attach(new VirtualMachineDescriptor(provider, " + invalidVMId + "))");
+            VirtualMachine.attach(vmd);
+            TestUtils.testFailed("AttachNotSupportedException wasn't thrown");
+        } catch (AttachNotSupportedException e) {
+            log.display("Expected exception: " + e);
+        }
+
+        // create VirtualMachine object VM to check non-static methods
+
+        VirtualMachine vm = VirtualMachine.attach(targetVMId);
+        try {
+            try {
+                log.display("VirtualMachine.loadAgent(null)");
+                vm.loadAgent(null);
+                TestUtils.testFailed("NullPointerException wasn't thrown");
+            } catch (NullPointerException e) {
+                log.display("Expected exception: " + e);
+            }
+
+            try {
+                log.display("VirtualMachine.loadAgent(null, null)");
+                vm.loadAgent(null, null);
+                TestUtils.testFailed("NullPointerException wasn't thrown");
+            } catch (NullPointerException e) {
+                log.display("Expected exception: " + e);
+            }
+
+            try {
+                log.display("VirtualMachine.loadAgentLibrary(null)");
+                vm.loadAgentLibrary(null);
+                TestUtils.testFailed("NullPointerException wasn't thrown");
+            } catch (NullPointerException e) {
+                log.display("Expected exception: " + e);
+            }
+
+            try {
+                log.display("VirtualMachine.loadAgentLibrary(null, null)");
+                vm.loadAgentLibrary(null, null);
+                TestUtils.testFailed("NullPointerException wasn't thrown");
+            } catch (NullPointerException e) {
+                log.display("Expected exception: " + e);
+            }
+
+            try {
+                log.display("VirtualMachine.loadAgentPath(null)");
+                vm.loadAgentPath(null);
+                TestUtils.testFailed("NullPointerException wasn't thrown");
+            } catch (NullPointerException e) {
+                log.display("Expected exception: " + e);
+            }
+
+            try {
+                log.display("VirtualMachine.loadAgentPath(null, null)");
+                vm.loadAgentPath(null, null);
+                TestUtils.testFailed("NullPointerException wasn't thrown");
+            } catch (NullPointerException e) {
+                log.display("Expected exception: " + e);
+            }
+
+        } finally {
+            vm.detach();
+        }
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine01(args).runTest();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine02/VirtualMachine02.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine02/VirtualMachine02.java
new file mode 100644
index 00000000000..09c7c6b050d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine02/VirtualMachine02.java
@@ -0,0 +1,149 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine02.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     Test checks following methods:
+ *         - VirtualMachine.attach(String id) (test tries to attach to the VM running test
+ *         and to the another VM started by this test)
+ *         - VirtualMachine.attach(VirtualMachineDescriptor vmd) (test tries to attach to the VM running test
+ *         and to the another VM started by this test)
+ *         -  VirtualMachine.detach() (test checks that after detaching operations on VirtualMachine throw IOException)
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine02.VirtualMachine02
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -Djdk.attach.allowAttachSelf -XX:+UsePerfData
+ *      PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine02.VirtualMachine02
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine02;
+
+import java.io.IOException;
+import com.sun.tools.attach.*;
+import com.sun.tools.attach.spi.AttachProvider;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+/*
+ * Test checks following methods:
+ *      -  VirtualMachine.attach(String) (test tries to attach to current and to another VM)
+ *
+ *      -  VirtualMachine.attach(VirtualMachineDescriptor) (test tries to attach to current and to another VM)
+ *
+ *      -  VirtualMachine.detach() (test checks that after detaching operations on VirtualMachine
+ *      throw IOException)
+ */
+public class VirtualMachine02 extends AODTestRunner {
+
+    public VirtualMachine02(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        log.display("Executing test for current VM");
+        String currentVMId = getCurrentVMId();
+        doTest(currentVMId);
+        log.display("");
+
+        log.display("Executing test for another VM (id = " + targetVMId + ")");
+        doTest(targetVMId);
+    }
+
+    void doTest(String targetVMId) throws Throwable {
+        VirtualMachine vm;
+
+        log.display("Trying to attach using VirtualMachine(\"" + targetVMId + "\")");
+        vm = VirtualMachine.attach(targetVMId);
+        log.display("Attached: " + vm);
+        checkDetach(vm);
+
+        log.display("Trying to attach using VirtualMachine(VirtualMachineDescriptor)");
+        AttachProvider provider;
+        TestUtils.assertTrue(AttachProvider.providers().size() > 0, "AttachProvider.providers() returns empty list");
+        provider = AttachProvider.providers().get(0);
+        log.display("Create VirtualMachineDescriptor using provider '" + provider + "'");
+        VirtualMachineDescriptor vmDescriptor = new VirtualMachineDescriptor(provider, targetVMId);
+        vm = VirtualMachine.attach(vmDescriptor);
+        log.display("Attached: " + vm);
+        TestUtils.assertEquals(vm.provider(), provider, "vm.provider() returns unexpected value: " + vm.provider());
+        checkDetach(vm);
+    }
+
+    void checkDetach(VirtualMachine vm) throws Throwable {
+        log.display("Detaching from " + vm);
+        vm.detach();
+
+        try {
+            vm.getSystemProperties();
+            TestUtils.testFailed("Expected IOException wasn't thrown");
+        } catch (IOException e) {
+            // expected exception
+        }
+        try {
+            vm.getAgentProperties();
+            TestUtils.testFailed("Expected IOException wasn't thrown");
+        } catch (IOException e) {
+            // expected exception
+        }
+        try {
+            vm.loadAgent("agent");
+            TestUtils.testFailed("Expected IOException wasn't thrown");
+        } catch (IOException e) {
+            // expected exception
+        }
+        try {
+            vm.loadAgentLibrary("agent");
+            TestUtils.testFailed("Expected IOException wasn't thrown");
+        } catch (IOException e) {
+            // expected exception
+        }
+        try {
+            vm.loadAgentPath("agent");
+            TestUtils.testFailed("Expected IOException wasn't thrown");
+        } catch (IOException e) {
+            // expected exception
+        }
+
+        // shouldn't throw exception
+        log.display("Trying to call detach one more time for " + vm);
+        vm.detach();
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine02(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine03/VirtualMachine03.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine03/VirtualMachine03.java
new file mode 100644
index 00000000000..367b8b29159
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine03/VirtualMachine03.java
@@ -0,0 +1,110 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine03.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     Test checks semantics of the method VirtualMachine.equals(Object obj).
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine03.VirtualMachine03
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -Djdk.attach.allowAttachSelf -XX:+UsePerfData
+ *      PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine03.VirtualMachine03
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine03;
+
+import com.sun.tools.attach.VirtualMachine;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+/*
+ * Test checks method VirtualMachine.equals(Object)
+ */
+public class VirtualMachine03 extends AODTestRunner {
+
+    public VirtualMachine03(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        String currentVMId = getCurrentVMId();
+
+        VirtualMachine vm1 = VirtualMachine.attach(currentVMId);
+
+        VirtualMachine vm2 = VirtualMachine.attach(targetVMId);
+
+        try {
+            TestUtils.assertEquals(vm1.id(), currentVMId, "vm.id() returns unexpected value: " + vm1.id());
+
+            TestUtils.assertEquals(vm2.id(), targetVMId, "vm.id() returns unexpected value: " + vm2.id());
+
+            TestUtils.assertTrue(!vm1.equals(vm2), vm1 + ".equals(" + vm2 + ") returns 'true'");
+
+            checkVM(vm1);
+
+            checkVM(vm2);
+        } finally {
+            vm1.detach();
+
+            vm2.detach();
+        }
+    }
+
+    void checkVM(VirtualMachine vm1) throws Throwable {
+        TestUtils.assertEquals(vm1, vm1, "vm.equals(itself) returns 'false'");
+
+        // create one more VirtualMachine object for the same VM
+        VirtualMachine vm2 = VirtualMachine.attach(vm1.id());
+        try {
+            TestUtils.assertEquals(vm1, vm2, vm1 + ".equals(" + vm2 + ") returns 'false'");
+
+            TestUtils.assertTrue(vm1.hashCode() == vm2.hashCode(), "vm.hashCode() returns different values for " + vm1 + " and " + vm2);
+
+            TestUtils.assertEquals(vm1.provider(), vm2.provider(), "vm.provider() returns non-equals objects for " + vm1 + " and " + vm2);
+        } finally {
+            vm2.detach();
+        }
+
+        TestUtils.assertTrue(!vm1.equals(new String()), "vm.equals(String) returns 'true'");
+
+        TestUtils.assertTrue(!vm1.equals(null), "vm.equals(null) returns 'true'");
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine03(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VM04Target.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VM04Target.java
new file mode 100644
index 00000000000..005deb88116
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VM04Target.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ * 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 nsk.aod.VirtualMachine.VirtualMachine04;
+
+import nsk.share.TestBug;
+import nsk.share.aod.DummyTargetApplication;
+
+/*
+ * This target application during initialization sets special system property,
+ * main test application tries to get this property using VirtualMachine.getSystemProperties()
+ */
+public class VM04Target extends DummyTargetApplication {
+
+    static String testPropertyKey = "VirtualMachine04_testPropertyKey";
+
+    static String testPropertyValue = "VirtualMachine04_testPropertyValue";
+
+    static String changedTestPropertyValue = "VirtualMachine04_testPropertyValue_changed";
+
+    VM04Target(String[] args) {
+        super(args);
+
+        log.display("Setting property " + testPropertyKey + " = " + testPropertyValue);
+        System.setProperty(testPropertyKey, testPropertyValue);
+    }
+
+    protected void targetApplicationActions() {
+        String signal = pipe.readln();
+        log.display("Received signal: "  + signal);
+        if (!signal.equals(VirtualMachine04.SIGNAL_CHANGE_PROPERTY))
+            throw new TestBug("Received unexpected signal: " + signal);
+
+        log.display("Setting property " + testPropertyKey + " = " + changedTestPropertyValue);
+        System.setProperty(testPropertyKey, changedTestPropertyValue);
+
+        log.display("Sending signal " + VirtualMachine04.SIGNAL_PROPERTY_CHANGED);
+        pipe.println(VirtualMachine04.SIGNAL_PROPERTY_CHANGED);
+    }
+
+    public static void main(String[] args) {
+        new VM04Target(args).runTargetApplication();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VirtualMachine04.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VirtualMachine04.java
new file mode 100644
index 00000000000..7a5b49d18e9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VirtualMachine04.java
@@ -0,0 +1,132 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine04.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     Test checks following methods:
+ *         - VirtualMachine.getSystemProperties() (test checks that returned properties contains
+ *         expected property and tested method returns properties whose key and value is a String)
+ *         - VirtualMachine.getAgentProperties() (test checks that method returns properties whose
+ *         key and value is a String)
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine04.VirtualMachine04
+ *        nsk.aod.VirtualMachine.VirtualMachine04.VM04Target
+ * @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine04.VirtualMachine04
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.aod.VirtualMachine.VirtualMachine04.VM04Target
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine04;
+
+import java.util.Properties;
+import com.sun.tools.attach.VirtualMachine;
+import nsk.share.aod.AODTestRunner;
+import nsk.share.test.TestUtils;
+import nsk.share.*;
+
+/*
+ * Test checks following methods:
+ *      - VirtualMachine.getSystemProperties()
+ *
+ *      - VirtualMachine.getAgentProperties()
+ */
+public class VirtualMachine04 extends AODTestRunner {
+
+    static final String SIGNAL_CHANGE_PROPERTY = "change_property";
+
+    static final String SIGNAL_PROPERTY_CHANGED = "property_changed";
+
+    public VirtualMachine04(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        VirtualMachine vm = VirtualMachine.attach(targetVMId);
+
+        try {
+            checkSystemProperties(vm, VM04Target.testPropertyKey, VM04Target.testPropertyValue);
+
+            log.display("Sending signal " + SIGNAL_CHANGE_PROPERTY);
+            pipe.println(SIGNAL_CHANGE_PROPERTY);
+            String signal = pipe.readln();
+            log.display("Received signal " + signal);
+            if (!signal.equals(SIGNAL_PROPERTY_CHANGED))
+                throw new TestBug("Unexpected signal received: " + signal);
+
+            checkSystemProperties(vm, VM04Target.testPropertyKey, VM04Target.changedTestPropertyValue);
+
+            Properties properties = vm.getAgentProperties();
+            System.out.println("VirtualMachine.getAgentProperties(): " + properties);
+            checkProperties(properties);
+        } finally {
+            vm.detach();
+        }
+    }
+
+    void checkSystemProperties(VirtualMachine vm,
+            String propertyToCheck,
+            String expectedPropertyValue) throws Throwable {
+
+        Properties properties = vm.getSystemProperties();
+        System.out.println("VirtualMachine.getSystemProperties(): " + properties);
+        checkProperties(properties);
+
+        String checkedPropertyValue  = properties.getProperty(propertyToCheck);
+        TestUtils.assertNotNull(checkedPropertyValue, "Properties doesn't contain property '" + propertyToCheck + "'");
+        TestUtils.assertEquals(checkedPropertyValue, expectedPropertyValue,
+                "Unexpected value of the property '" + propertyToCheck + "': " + checkedPropertyValue + ", expected value is '" + expectedPropertyValue + "'");
+    }
+
+    /*
+     * Check following spec clause: VirtualMachine.getSystemProperties() and
+     * VirtualMachine.getAgentProperties() return the properties whose key and value is a String
+     */
+    void checkProperties(Properties properties) {
+        TestUtils.assertNotNull(properties, "Method returns null Properties");
+
+        for (Object key : properties.keySet()) {
+            Object value = properties.get(key);
+            log.display("Value of '" + key + "' = " + value);
+
+            TestUtils.assertTrue(key instanceof String, "Property key isn't String: " + key.getClass().getName());
+
+            TestUtils.assertTrue(value instanceof String, "Property value isn't String: " + value.getClass().getName());
+        }
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine04(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine05/VirtualMachine05.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine05/VirtualMachine05.java
new file mode 100644
index 00000000000..b8601267975
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine05/VirtualMachine05.java
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine05.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks that method VirtualMachine.list() returns
+ *     VirtualMachineDescriptors for 2 VMs started by this test.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine05.VirtualMachine05
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine05.VirtualMachine05
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine05;
+
+import java.util.List;
+import com.sun.tools.attach.*;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+/*
+ * Test checks method VirtualMachine.list()
+ * (test checks that collection returned by VirtualMachine.list() contains current VM
+ * and another VM started by this test)
+ */
+public class VirtualMachine05 extends AODTestRunner {
+
+    public VirtualMachine05(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        String currentVMId = getCurrentVMId();
+
+        log.display("Checking VirtualMachine.list()");
+        checkList(VirtualMachine.list(), currentVMId, targetVMId);
+    }
+
+    private void checkList(List<VirtualMachineDescriptor> vmDescriptors, String currentVMId, String targetVMId) {
+        VirtualMachineDescriptor currentVM = null;
+        VirtualMachineDescriptor targetVM = null;
+
+        for (VirtualMachineDescriptor vmDescriptor : VirtualMachine.list()) {
+            log.display("VirtualMachineDescriptor: " + vmDescriptor);
+
+            if (vmDescriptor.id().equals(currentVMId)) {
+                currentVM = vmDescriptor;
+            } else if (vmDescriptor.id().equals(targetVMId)) {
+                targetVM = vmDescriptor;
+            }
+        }
+
+        TestUtils.assertNotNull(currentVM, "VirtualMachine.list() didn't return descriptor for the current VM");
+
+        TestUtils.assertNotNull(targetVM, "VirtualMachine.list() didn't return descriptor for VM with id '" +
+                targetVMId + "'");
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine05(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.java
new file mode 100644
index 00000000000..7f3f24affcf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * 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 nsk.aod.VirtualMachine.VirtualMachine06;
+
+import java.lang.instrument.Instrumentation;
+
+import nsk.share.aod.TargetApplicationWaitingAgents;
+
+public class VM06Agent00 {
+    public static void agentmain(String options, Instrumentation inst) {
+        boolean success = true;
+
+        TargetApplicationWaitingAgents.agentLoaded(VM06Agent00.class.getName());
+        try {
+            System.out.println("Agent options: " + options);
+            if (options != null) {
+                success = false;
+                System.out.println("ERROR: unexpected non-null options");
+            }
+        } catch (Throwable t) {
+            success = false;
+            System.out.println("Unexpected exception: " + t);
+        } finally {
+            TargetApplicationWaitingAgents.agentFinished(VM06Agent00.class.getName(), success);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.mf b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.mf
new file mode 100644
index 00000000000..e224e7852df
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Agent-Class: nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent00
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.java
new file mode 100644
index 00000000000..e468e1f1d17
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * 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 nsk.aod.VirtualMachine.VirtualMachine06;
+
+import java.lang.instrument.Instrumentation;
+
+import nsk.share.aod.TargetApplicationWaitingAgents;
+
+public class VM06Agent01 {
+    public static void agentmain(String options, Instrumentation inst) {
+        boolean success = true;
+
+        TargetApplicationWaitingAgents.agentLoaded(VM06Agent01.class.getName());
+        try {
+            System.out.println("Agent options: " + options);
+            if (options != null) {
+                success = false;
+                System.out.println("ERROR: unexpected non-null options");
+            }
+        } catch (Throwable t) {
+            success = false;
+            System.out.println("Unexpected exception: " + t);
+        } finally {
+            TargetApplicationWaitingAgents.agentFinished(VM06Agent01.class.getName(), success);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.mf b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.mf
new file mode 100644
index 00000000000..eceacbc7abb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Agent-Class: nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent01
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.java
new file mode 100644
index 00000000000..04ae20a38ac
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * 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 nsk.aod.VirtualMachine.VirtualMachine06;
+
+import java.lang.instrument.Instrumentation;
+
+import nsk.share.aod.TargetApplicationWaitingAgents;
+
+public class VM06Agent02 {
+    public static void agentmain(String options, Instrumentation inst) {
+        boolean success = true;
+
+        TargetApplicationWaitingAgents.agentLoaded(VM06Agent02.class.getName());
+        try {
+            System.out.println("Agent options: " + options);
+            if (options == null || !options.equals("VirtualMachine06_TestOptions")) {
+                success = false;
+                System.out.println("ERROR: unexpected non-null options");
+            }
+        } catch (Throwable t) {
+            success = false;
+            System.out.println("Unexpected exception: " + t);
+        } finally {
+            TargetApplicationWaitingAgents.agentFinished(VM06Agent02.class.getName(), success);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.mf b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.mf
new file mode 100644
index 00000000000..70c2f0d0ee0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Agent-Class: nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent02
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.java
new file mode 100644
index 00000000000..87558ec9e3a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.java
@@ -0,0 +1,36 @@
+/*
+ * 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
+ * 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 nsk.aod.VirtualMachine.VirtualMachine06;
+
+import java.lang.instrument.Instrumentation;
+
+import nsk.share.aod.TargetApplicationWaitingAgents;
+
+public class VM06Agent03 {
+    public static void agentmain(String options, Instrumentation inst) {
+        TargetApplicationWaitingAgents.agentLoaded(VM06Agent03.class.getName());
+        TargetApplicationWaitingAgents.agentFinished(VM06Agent03.class.getName(), true);
+
+        throw new RuntimeException("Test exception");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.mf b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.mf
new file mode 100644
index 00000000000..ec146e3632c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Agent-Class: nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent03
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VirtualMachine06.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VirtualMachine06.java
new file mode 100644
index 00000000000..f5aab3414bd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine06/VirtualMachine06.java
@@ -0,0 +1,150 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine06.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks methods VirtualMachine.loadAgent(String agent) and
+ *     VirtualMachine.loadAgent(String agent, String options).
+ *     Test checks following cases:
+ *         - it is possible to pass options to agent using loadAgent(String agent, String options)
+ *         - it is possible to specify null options (in this case null is passed to the agentmain)
+ *         - if agent throws exception from 'agentmain' VirtualMachine.loadAgent throws AgentInitializationException
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ *
+ * @run driver jdk.test.lib.FileInstaller . .
+ *
+ * @comment compile VM06Agent0[0-3].java to current directory
+ * @build nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent00
+ *        nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent01
+ *        nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent02
+ *        nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent03
+ * @run driver ClassFileInstaller
+ *      nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent00
+ *      nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent01
+ *      nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent02
+ *      nsk.aod.VirtualMachine.VirtualMachine06.VM06Agent03
+ *
+ * @comment create VM06Agent0[0-3].jar in current directory
+ * @build ExecDriver
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${test.jdk}/bin/jar -cmf VM06Agent00.mf VM06Agent00.jar
+ *      nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent00.class
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${test.jdk}/bin/jar -cmf VM06Agent01.mf VM06Agent01.jar
+ *      nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent01.class
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${test.jdk}/bin/jar -cmf VM06Agent02.mf VM06Agent02.jar
+ *      nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent02.class
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${test.jdk}/bin/jar -cmf VM06Agent03.mf VM06Agent03.jar
+ *      nsk/aod/VirtualMachine/VirtualMachine06/VM06Agent03.class
+ *
+ *
+ * @build nsk.aod.VirtualMachine.VirtualMachine06.VirtualMachine06
+ *        nsk.share.aod.TargetApplicationWaitingAgents
+ * @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine06.VirtualMachine06
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.TargetApplicationWaitingAgents
+ *      -ja VM06Agent00.jar,VM06Agent01.jar,VM06Agent02.jar,VM06Agent03.jar
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine06;
+
+import nsk.share.TestBug;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+import java.util.*;
+import com.sun.tools.attach.*;
+
+/*
+ * Test checks following methods:
+ *      - VirtualMachine.loadAgent(String)
+ *
+ *      - VirtualMachine.loadAgent(String, String)
+ */
+public class VirtualMachine06 extends AODTestRunner {
+
+    public VirtualMachine06(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        // check that all required parameters were passed to the test
+        List<AgentInformation> agents = argParser.getAgents();
+        if (agents.size() != 4)
+            throw new TestBug("Test requires 4 agents, actually " + agents.size() + " were specified");
+
+        for (AgentInformation agent : agents) {
+            if (!agent.jarAgent)
+                throw new TestBug("Non JAR agent was specified");
+        }
+
+        VirtualMachine vm = VirtualMachine.attach(targetVMId);
+
+        try {
+            AgentInformation agent;
+
+            agent = agents.get(0);
+            log.display("Loading '" + agent.pathToAgent + "'");
+            // pass null options to agent
+            vm.loadAgent(agent.pathToAgent);
+
+            agent = agents.get(1);
+            log.display("Loading '" + agent.pathToAgent + "'");
+            // pass null options to agent
+            vm.loadAgent(agent.pathToAgent, null);
+
+            agent = agents.get(2);
+            log.display("Loading '" + agent.pathToAgent + "'");
+            // pass non-null options to agent
+            vm.loadAgent(agent.pathToAgent, "VirtualMachine06_TestOptions");
+
+            agent = agents.get(3);
+            log.display("Loading '" + agent.pathToAgent + "' (this agent throws exception from agentmain)");
+            try {
+                // check agent throwing exception from agentmain
+                vm.loadAgent(agent.pathToAgent);
+                TestUtils.testFailed("Expected AgentInitializationException wasn't thrown");
+            } catch (AgentInitializationException e) {
+                // expected exception
+            }
+        } finally {
+            vm.detach();
+        }
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine06(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/VirtualMachine07.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/VirtualMachine07.java
new file mode 100644
index 00000000000..41d31f780bd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/VirtualMachine07.java
@@ -0,0 +1,223 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine07.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks methods VirtualMachine.loadAgentLibrary(String agent) and
+ *     VirtualMachine.loadAgentLibrary(String agent, String options).
+ *     Test checks following cases:
+ *         - it is possible to pass options to agent using loadAgentLibrary(String agent, String options)
+ *         - it is possible to specify null options (in this case zero-length is passed to the Agent_OnAttach)
+ *         - if Agent_OnAttach returns error code loadAgentLibrary throws AgentInitializationException and
+ *         AgentInitializationException.returnValue() returns this error code
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine07.VirtualMachine07
+ *        nsk.share.aod.TargetApplicationWaitingAgents
+ * @run main/othervm/native -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine07.VirtualMachine07
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.TargetApplicationWaitingAgents
+ *      -na VirtualMachine07agent00,VirtualMachine07agent01,VirtualMachine07agent02,VirtualMachine07agent03
+ *      -testedMethod loadAgentLibrary
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine07;
+
+import nsk.share.*;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+import java.util.*;
+
+import com.sun.tools.attach.*;
+
+/*
+ * Test is written to test following methods:
+ *      - VirtualMachine.loadAgentLibrary
+ *
+ *      - VirtualMachine.loadAgentPath
+ *
+ *(method to test is specified via command line parameter 'testedMethod')
+ */
+public class VirtualMachine07 extends AODTestRunner {
+
+    static class ArgParser extends AODRunnerArgParser {
+
+        final String testedMethodOpt = "testedMethod";
+
+        ArgParser(String[] args) {
+            super(args);
+        }
+
+        protected boolean checkOption(String option, String value) {
+            if (super.checkOption(option, value))
+                return true;
+
+            if (option.equals(testedMethodOpt)) {
+                if (value.equals("loadAgentLibrary") || value.equals("loadAgentPath"))
+                    return true;
+                else
+                    throw new TestBug("Unexpected value of '" + testedMethodOpt + "': " + value);
+            }
+
+            return false;
+        }
+
+        protected void checkOptions() {
+            super.checkOptions();
+
+            // if test loadAgentPath parameter arch is needed
+            if (!testLoadAgentLibrary()) {
+                if (!options.containsKey("arch"))
+                    throw new TestBug("Option 'arch' wasn't specified");
+            }
+        }
+
+        boolean testLoadAgentLibrary() {
+            return options.getProperty(testedMethodOpt).equals("loadAgentLibrary");
+        }
+    }
+
+    public VirtualMachine07(String[] args) {
+        super(args);
+    }
+
+    /*
+     * When test method loadAgentPath platform specific agent name should be
+     * created (lib<agent>.so for unix, lib<agent>.dylib for macosx and
+     * <agent>.dll for windows)
+     */
+    protected String expandAgentPath(String path) {
+        int index = path.lastIndexOf('/');
+        if (index < 0)
+            throw new TestBug("Unexpected agent library name format");
+
+        String dir = path.substring(0, index);
+        String libName = path.substring(index + 1);
+
+        if (argParser.getArch().startsWith("windows")) {
+            return dir + "/" + libName + ".dll";
+        } else if (argParser.getArch().startsWith("mac")) {
+            return dir + "/" + "lib" + libName + ".dylib";
+        } else {
+            return dir + "/" + "lib" + libName + ".so";
+        }
+    }
+
+    protected AODRunnerArgParser createArgParser(String[] args) {
+        return new ArgParser(args);
+    }
+
+    protected void loadAgent(VirtualMachine vm, String agent) throws Throwable {
+        boolean testLoadAgentLibrary = ((ArgParser) argParser).testLoadAgentLibrary();
+
+        if (testLoadAgentLibrary)
+            log.display("Test method VirtualMachine.loadAgentLibrary");
+        else
+            log.display("Test method VirtualMachine.loadAgentPath");
+
+        if (testLoadAgentLibrary) {
+            log.display("Loading '" + agent + "'");
+            vm.loadAgentLibrary(agent);
+        } else {
+            String expandedName = (agent == null ? null : expandAgentPath(agent));
+            log.display("Loading '" + expandedName + "'");
+            vm.loadAgentPath(expandedName);
+        }
+    }
+
+    protected void loadAgent(VirtualMachine vm, String agent, String options) throws Throwable {
+        boolean testLoadAgentLibrary = ((ArgParser) argParser).testLoadAgentLibrary();
+
+        if (testLoadAgentLibrary)
+            log.display("Test method VirtualMachine.loadAgentLibrary");
+        else
+            log.display("Test method VirtualMachine.loadAgentPath");
+
+        if (testLoadAgentLibrary) {
+            log.display("Loading '" + agent + "'");
+            vm.loadAgentLibrary(agent, options);
+        } else {
+            String expandedName = (agent == null ? null : expandAgentPath(agent));
+            log.display("Loading '" + expandedName + "'");
+            vm.loadAgentPath(expandedName, options);
+        }
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        // check that all required parameters were passed to the test
+        List<AgentInformation> agents = argParser.getAgents();
+        if (agents.size() != 4)
+            throw new TestBug("Test requires 4 agents, actually " + agents.size() + " were specified");
+
+        for (AgentInformation agent : agents) {
+            if (agent.jarAgent)
+                throw new TestBug("Non native agent was specified");
+        }
+
+        VirtualMachine vm = VirtualMachine.attach(targetVMId);
+
+        try {
+            AgentInformation agent;
+
+            agent = agents.get(0);
+            loadAgent(vm, agent.pathToAgent);
+
+            agent = agents.get(1);
+            loadAgent(vm, agent.pathToAgent, null);
+
+            agent = agents.get(2);
+            loadAgent(vm, agent.pathToAgent, "VirtualMachine_TestOptions");
+
+            agent = agents.get(3);
+            log.display("Loading '" + agent.pathToAgent + "' (this agent fails to initialize)");
+            try {
+                loadAgent(vm, agent.pathToAgent);
+
+                TestUtils.testFailed("Expected AgentInitializationException wasn't thrown");
+            } catch (AgentInitializationException e) {
+                log.display("Expected AgentInitializationException was caught");
+                log.display("AgentInitializationException.returnValue(): " + e.returnValue());
+                TestUtils.assertEquals(e.returnValue(), 10,
+                        "AgentInitializationException.returnValue() returns unexpected value: " + e.returnValue()+ ", expected value is 10");
+            }
+        } finally {
+            vm.detach();
+        }
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine07(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.c
new file mode 100644
index 00000000000..1137e1a988c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.c
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <jni.h>
+#include <aod.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define AGENT_NAME "VMNativeAgent00"
+
+JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) {
+    JNIEnv* jni;
+    int success = 1;
+
+    // can't use NSK_DISPLAY since needed for nsk_ functions initialization isn't done here
+
+    if ((jni = (JNIEnv*) nsk_aod_createJNIEnv(vm)) == NULL)
+        return JNI_ERR;
+
+    printf("%s: initialization was done\n", AGENT_NAME);
+    fflush(stdout);
+
+    if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, AGENT_NAME)))
+        return JNI_ERR;
+
+    if (optionsString == NULL) {
+        success = 0;
+        printf("%s: ERROR: unexpected null options\n", AGENT_NAME);
+        fflush(stdout);
+    } else {
+        size_t length = strlen(optionsString);
+        if (length != 0) {
+            success = 0;
+            printf("%s: ERROR: unexpected non-zero length options string: '%s'\n", AGENT_NAME, optionsString);
+            fflush(stdout);
+        }
+    }
+
+    nsk_aod_agentFinished(jni, AGENT_NAME, success);
+
+    return JNI_OK;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.c
new file mode 100644
index 00000000000..2a2986a3e7d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.c
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <jni.h>
+#include <aod.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define AGENT_NAME "VMNativeAgent01"
+
+/*
+ */
+
+JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) {
+    JNIEnv* jni;
+    int success = 1;
+
+    // can't use NSK_DISPLAY since needed for nsk_ functions initialization isn't done here
+
+    if ((jni = (JNIEnv*) nsk_aod_createJNIEnv(vm)) == NULL)
+        return JNI_ERR;
+
+    printf("%s: initialization was done\n", AGENT_NAME);
+    fflush(stdout);
+
+    if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, AGENT_NAME)))
+        return JNI_ERR;
+
+    if (optionsString == NULL) {
+        success = 0;
+        printf("%s: ERROR: unexpected null options\n", AGENT_NAME);
+        fflush(stdout);
+    } else {
+        size_t length = strlen(optionsString);
+        if (length != 0) {
+            success = 0;
+            printf("%s: ERROR: unexpected non-zero length options string: '%s'\n", AGENT_NAME, optionsString);
+            fflush(stdout);
+        }
+    }
+
+    nsk_aod_agentFinished(jni, AGENT_NAME, success);
+
+    return JNI_OK;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.c
new file mode 100644
index 00000000000..718e25ffc0c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.c
@@ -0,0 +1,75 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <jni.h>
+#include <aod.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define AGENT_NAME "VMNativeAgent02"
+
+#define EXPECTED_OPTIONS "VirtualMachine_TestOptions"
+
+/*
+ */
+
+JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) {
+    JNIEnv* jni;
+    int success = 1;
+
+    // can't use NSK_DISPLAY since needed for nsk_ functions initialization isn't done here
+
+    if ((jni = (JNIEnv*) nsk_aod_createJNIEnv(vm)) == NULL)
+        return JNI_ERR;
+
+    printf("%s: initialization was done\n", AGENT_NAME);
+    fflush(stdout);
+
+    if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, AGENT_NAME)))
+        return JNI_ERR;
+
+    if (optionsString == NULL) {
+        success = 0;
+        printf("%s: ERROR: unexpected null options\n", AGENT_NAME);
+        fflush(stdout);
+    } else {
+        if (strcmp(optionsString, EXPECTED_OPTIONS)) {
+            success = 0;
+            printf("%s: ERROR: unexpected options string: '%s', expected is '%s'\n",
+                    AGENT_NAME, optionsString, EXPECTED_OPTIONS);
+            fflush(stdout);
+        }
+    }
+
+    nsk_aod_agentFinished(jni, AGENT_NAME, success);
+
+    return JNI_OK;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.c
new file mode 100644
index 00000000000..48681eb547c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.c
@@ -0,0 +1,64 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <jni.h>
+#include <aod.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define AGENT_NAME "VMNativeAgent03"
+
+#define ON_ATTACH_EXIT_CODE 10
+
+/*
+ */
+
+JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) {
+    JNIEnv* jni;
+
+    if ((jni = (JNIEnv*) nsk_aod_createJNIEnv(vm)) == NULL)
+        return JNI_ERR;
+
+    // can't use NSK_DISPLAY since needed for nsk_ functions initialization isn't done here
+
+    printf("%s: initialization was done\n", AGENT_NAME);
+    fflush(stdout);
+
+    if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, AGENT_NAME)))
+        return JNI_ERR;
+
+    nsk_aod_agentFinished(jni, AGENT_NAME, 1);
+
+    printf("%s: warning: agent is intentionally exiting from Agent_OnAttach with error code %d\n", AGENT_NAME, ON_ATTACH_EXIT_CODE);
+    fflush(stdout);
+
+    return ON_ATTACH_EXIT_CODE;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent00.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent00.c
new file mode 100644
index 00000000000..b08040b69bf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent00.c
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#include "aod.c"
+#include "jni_tools.c"
+#include "nsk_tools.c"
+#include "agent00.c"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent01.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent01.c
new file mode 100644
index 00000000000..f75f3e154cb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent01.c
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#include "aod.c"
+#include "jni_tools.c"
+#include "nsk_tools.c"
+#include "agent01.c"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent02.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent02.c
new file mode 100644
index 00000000000..b44ef2443ff
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent02.c
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#include "aod.c"
+#include "jni_tools.c"
+#include "nsk_tools.c"
+#include "agent02.c"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent03.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent03.c
new file mode 100644
index 00000000000..8a7e2defbaa
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/libVirtualMachine07agent03.c
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#include "aod.c"
+#include "jni_tools.c"
+#include "nsk_tools.c"
+#include "agent03.c"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine08/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine08/TestDescription.java
new file mode 100644
index 00000000000..726d1920480
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine08/TestDescription.java
@@ -0,0 +1,56 @@
+/*
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine08.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks methods VirtualMachine.loadAgentPath(String agent) and
+ *     VirtualMachine.loadAgentPath(String agent, String options).
+ *     Test checks following cases:
+ *         - it is possible to pass options to agent using loadAgentPath(String agent, String options)
+ *         - it is possible to specify null options (in this case zero-length is passed to the Agent_OnAttach)
+ *         - if Agent_OnAttach returns error code loadAgentPath throws AgentInitializationException and
+ *         AgentInitializationException.returnValue() returns this error code
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine07.VirtualMachine07
+ *        nsk.share.aod.TargetApplicationWaitingAgents
+ * @run main/othervm/native -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine07.VirtualMachine07
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.TargetApplicationWaitingAgents
+ *      -na ${test.nativepath}/VirtualMachine07agent00,${test.nativepath}/VirtualMachine07agent01,${test.nativepath}/VirtualMachine07agent02,${test.nativepath}/VirtualMachine07agent03
+ *      -testedMethod loadAgentPath
+ *      -arch ${os.family}-${os.simpleArch}
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/VM09Target.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/VM09Target.java
new file mode 100644
index 00000000000..d7103d3b648
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/VM09Target.java
@@ -0,0 +1,35 @@
+/*
+ * 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
+ * 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 nsk.aod.VirtualMachine.VirtualMachine09;
+
+import nsk.share.aod.TargetApplicationWaitingAgents;
+
+public class VM09Target {
+
+    public static void main(String[] args) {
+        System.loadLibrary("VirtualMachine09agent00");
+        System.out.println("Agent library was loaded");
+
+        new TargetApplicationWaitingAgents().runTargetApplication(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/VirtualMachine09.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/VirtualMachine09.java
new file mode 100644
index 00000000000..89025d9bf93
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/VirtualMachine09.java
@@ -0,0 +1,99 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine09.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks method VirtualMachine.loadAgentLibrary(String agent).
+ *     Test checks following spec clause: "Agent_OnAttach function is invoked even if the agent library was loaded
+ *     prior to invoking this method". In this test the same agent library first loaded via VM command line
+ *     option 'agentlib:', then it is loaded using method 'System.loadLibrary' and than dynamically attached.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine09.VirtualMachine09
+ *        nsk.aod.VirtualMachine.VirtualMachine09.VM09Target
+ * @run main/othervm/native -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine09.VirtualMachine09
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-agentlib:VirtualMachine09agent00 -XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.aod.VirtualMachine.VirtualMachine09.VM09Target
+ *      -na VirtualMachine09agent00
+ *      -testedMethod loadAgentLibrary
+ */
+
+package nsk.aod.VirtualMachine.VirtualMachine09;
+
+import nsk.aod.VirtualMachine.VirtualMachine07.VirtualMachine07;
+import nsk.share.TestBug;
+import nsk.share.aod.*;
+
+import java.util.*;
+
+import com.sun.tools.attach.*;
+
+/*
+ * Test checks methods VirtualMachine.loadAgentLib and VirtualMachineloadAgentPath.
+ *
+ * Test checks following spec clause: "Agent_OnAttach function is invoked even if the agent library was loaded
+ * prior to invoking this method"
+ */
+public class VirtualMachine09 extends VirtualMachine07 {
+
+    public VirtualMachine09(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        // check that all required parameters were passed to the test
+        List<AgentInformation> agents = argParser.getAgents();
+        if (agents.size() != 1)
+            throw new TestBug("Test requires 1 agent, actually " + agents.size() + " were specified");
+
+        for (AgentInformation agent : agents) {
+            if (agent.jarAgent)
+                throw new TestBug("Non native agent was specified");
+        }
+
+        VirtualMachine vm = VirtualMachine.attach(targetVMId);
+
+        try {
+            AgentInformation agent;
+            agent = agents.get(0);
+            loadAgent(vm, agent.pathToAgent, agent.agentOptions);
+        } finally {
+            vm.detach();
+        }
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachine09(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.c
new file mode 100644
index 00000000000..3c1a2c43c33
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.c
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <jni.h>
+#include <aod.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Test checks following spec clause: "Agent_OnAttach function is invoked even if the agent library was loaded
+ * prior to invoking this method"
+ *
+ * This agent is loaded as static agent via 'agentlib:' VM option and also dynamically attached, so this agent
+ * has both Agent_OnLoad and Agent_OnAttach.
+ */
+
+JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *vm, char *optionsString, void *reserved) {
+    // can't use NSK_DISPLAY since needed for nsk_ functions initialization isn't done here
+    printf("Agent_OnLoad: agent is loaded\n");
+    fflush(stdout);
+    return JNI_OK;
+}
+
+JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) {
+    JNIEnv* jni = NULL;
+    Options* options = NULL;
+    const char* agentName;
+
+    if (!NSK_VERIFY((options = (Options*) nsk_aod_createOptions(optionsString)) != NULL))
+        return JNI_ERR;
+
+    agentName = nsk_aod_getOptionValue(options, NSK_AOD_AGENT_NAME_OPTION);
+
+    if ((jni = (JNIEnv*) nsk_aod_createJNIEnv(vm)) == NULL)
+        return JNI_ERR;
+
+    NSK_DISPLAY1("%s: initialization was done\n", agentName);
+
+    if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, agentName)))
+        return JNI_ERR;
+
+    nsk_aod_agentFinished(jni, agentName, 1);
+
+    return JNI_OK;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/libVirtualMachine09agent00.c b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/libVirtualMachine09agent00.c
new file mode 100644
index 00000000000..b08040b69bf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/libVirtualMachine09agent00.c
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#include "aod.c"
+#include "jni_tools.c"
+#include "nsk_tools.c"
+#include "agent00.c"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine10/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine10/TestDescription.java
new file mode 100644
index 00000000000..008b4e5d620
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine10/TestDescription.java
@@ -0,0 +1,53 @@
+/*
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachine/VirtualMachine10.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This test checks method VirtualMachine.loadAgentPath(String agent).
+ *     Test checks following spec clause: "Agent_OnAttach function is invoked even if the agent library was loaded
+ *     prior to invoking this method". In this test the same agent library first loaded via VM command line
+ *     option 'agentlib:', then it is loaded using method 'System.loadLibrary' and than dynamically attached.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachine.VirtualMachine09.VirtualMachine09
+ *        nsk.aod.VirtualMachine.VirtualMachine09.VM09Target
+ * @run main/othervm/native -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachine.VirtualMachine09.VirtualMachine09
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-agentlib:VirtualMachine09agent00 -XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.aod.VirtualMachine.VirtualMachine09.VM09Target
+ *      -na ${test.nativepath}/VirtualMachine09agent00
+ *      -testedMethod loadAgentPath
+ *      -arch ${os.family}-${os.simpleArch}
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachineDescriptor/VirtualMachineDescriptor01/VirtualMachineDescriptor01.java b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachineDescriptor/VirtualMachineDescriptor01/VirtualMachineDescriptor01.java
new file mode 100644
index 00000000000..af2c4e883db
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachineDescriptor/VirtualMachineDescriptor01/VirtualMachineDescriptor01.java
@@ -0,0 +1,122 @@
+/*
+ * 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
+ * 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
+ *
+ * @summary converted from VM Testbase nsk/aod/VirtualMachineDescriptor/VirtualMachineDescriptor01.
+ * VM Testbase keywords: [feature_282, jdk]
+ * VM Testbase readme:
+ * Description :
+ *     Test checks work of Attach API (com.sun.tools.attach).
+ *     Test is based on the nsk.share.aod framework.
+ *     This is sanity test for class VirtualMachineDescriptor.
+ *     Test checks that its methods toString(), displayName(), id(), provider() return
+ *     non-null values and also test checks semantics of the method VirtualMachineDescriptor.equals(Object obj).
+ *     Tested VirtualMachineDescriptors are obtained using VirtualMachine.list()
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.aod.VirtualMachineDescriptor.VirtualMachineDescriptor01.VirtualMachineDescriptor01
+ *        nsk.share.aod.DummyTargetApplication
+ * @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
+ *      nsk.aod.VirtualMachineDescriptor.VirtualMachineDescriptor01.VirtualMachineDescriptor01
+ *      -jdk ${test.jdk}
+ *      "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
+ *      -target nsk.share.aod.DummyTargetApplication
+ */
+
+package nsk.aod.VirtualMachineDescriptor.VirtualMachineDescriptor01;
+
+import com.sun.tools.attach.*;
+import com.sun.tools.attach.spi.AttachProvider;
+import nsk.share.aod.*;
+import nsk.share.test.TestUtils;
+
+/*
+ * Basic sanity checks for class com.sun.tools.attach.VirtualMachineDescriptor
+ */
+public class VirtualMachineDescriptor01 extends AODTestRunner {
+
+    public VirtualMachineDescriptor01(String[] args) {
+        super(args);
+    }
+
+    public void doTestActions(String targetVMId) throws Throwable {
+        String currentVMId = getCurrentVMId();
+
+        VirtualMachineDescriptor currentVMDesc = null;
+        VirtualMachineDescriptor targetVMDesc = null;
+
+        for (VirtualMachineDescriptor vmDescriptor : VirtualMachine.list()) {
+            log.display("VirtualMachineDescriptor: " + vmDescriptor);
+            log.display("VirtualMachineDescriptor.displayName(): " + vmDescriptor.displayName());
+            log.display("VirtualMachineDescriptor.id(): " + vmDescriptor.id());
+            log.display("VirtualMachineDescriptor.provider(): " + vmDescriptor.provider());
+
+            TestUtils.assertNotNull(vmDescriptor.toString(), "VirtualMachineDescriptor.toString() returns null");
+            TestUtils.assertNotNull(vmDescriptor.displayName(), "VirtualMachineDescriptor.displayName() returns null");
+            TestUtils.assertNotNull(vmDescriptor.id(), "VirtualMachineDescriptor.id() returns null");
+            TestUtils.assertNotNull(vmDescriptor.provider(), "VirtualMachineDescriptor.provider() returns null");
+
+            TestUtils.assertTrue(AttachProvider.providers().contains(vmDescriptor.provider()),
+                    "AttachProvider.providers() doesn't contain provider '" + vmDescriptor.provider() + "'");
+
+            if (vmDescriptor.id().equals(currentVMId)) {
+                currentVMDesc = vmDescriptor;
+            } else if (vmDescriptor.id().equals(targetVMId)) {
+                targetVMDesc = vmDescriptor;
+            }
+        }
+
+        TestUtils.assertNotNull(currentVMDesc, "VirtualMachine.list() didn't return descriptor for the current VM");
+        TestUtils.assertNotNull(targetVMDesc, "VirtualMachine.list() didn't return descriptor for VM with id '" + targetVMId + "'");
+
+        TestUtils.assertTrue(!currentVMDesc.equals(targetVMDesc),
+                "VirtualMachineDescriptor.equals() returns 'true' for '" + currentVMDesc + "' and '" + targetVMDesc + "'");
+        TestUtils.assertTrue(currentVMDesc.hashCode() != targetVMDesc.hashCode(),
+                "VirtualMachineDescriptor.hashCode() returns the same value (" + currentVMDesc.hashCode() + ")" + " for '"
+                + currentVMDesc + "' and '" + targetVMDesc + "'");
+
+        VirtualMachine targetVM = VirtualMachine.attach(targetVMDesc);
+
+        try {
+            // create another VirtualMachineDescriptor for target VM
+            VirtualMachineDescriptor targetVMDesc2 = new VirtualMachineDescriptor(targetVM.provider(), targetVM.id());
+
+            TestUtils.assertEquals(targetVMDesc, targetVMDesc2,
+                    "VirtualMachineDescriptor.equals() returns 'false' for '" + targetVMDesc + "' and '" + targetVMDesc2 + "'");
+
+            TestUtils.assertEquals(targetVMDesc.hashCode(), targetVMDesc2.hashCode(),
+                    "VirtualMachineDescriptor.hashCode() returns different values " + "(" + targetVMDesc.hashCode() + " and " + targetVMDesc2.hashCode() + ")" +
+                    " for '" + targetVMDesc + "' and '" + targetVMDesc2 + "'");
+        } finally {
+            targetVM.detach();
+        }
+    }
+
+    public static void main(String[] args) {
+        new VirtualMachineDescriptor01(args).runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java
index de92a5943ac..76d50160651 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java
@@ -83,6 +83,6 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java
index ca16253e2e4..eba040c07cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java
@@ -51,6 +51,7 @@
  *         create references of all possible types to single object, ObjectReference.referringObjects should return only
  *         referrers with supported type(Strong, PhantomReference, SoftReference, WeakReference)
  *
+ * @requires vm.gc != "Z"
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
@@ -151,6 +152,11 @@ public class referringObjects001 extends HeapwalkingDebugger {
         else
             expectedInstanceCount = 0;
 
+        // Note! This test is broken, in the sense that it incorrectly assumes
+        // that no GC can happen before it walks the heap. In practice, it seems
+        // to only affect this test when using ZGC. However, this test will also
+        // fail when using other GCs if an explicit GC is done here.
+
         checkDebugeeAnswer_instanceCounts(className, expectedInstanceCount, objectsToFilter);
         checkDebugeeAnswer_instances_referringObjects(objectsToFilter, className, expectedInstanceCount, includedInReferrersCount, referrerCount);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
index df9d745d8cf..cff164dc178 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
@@ -49,6 +49,7 @@
  *                 - enable collection of class object using ObjectReference.enableCollection
  *                 - check class object was collected
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
@@ -62,7 +63,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -testClassPath ${test.class.path}
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java
index dcced7f9a6d..45331f836b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java
@@ -64,7 +64,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  */
 
 package nsk.jdi.ObjectReference.referringObjects.referringObjects003;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java
index d7d166e2898..b5d26aa02ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java
@@ -66,7 +66,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  */
 
 package nsk.jdi.ReferenceType.instances.instances001;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java
index fdb07c6c85c..fc0efd3660c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java
@@ -41,6 +41,7 @@
  *         done
  *         Test is executed for following sublcasses of ObjectReference: StringReference, ThreadReference, ClassLoaderReference
  *
+ * @requires vm.gc != "Z"
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
@@ -125,6 +126,11 @@ public class instances003 extends HeapwalkingDebugger {
             ":" + referrerCount + ":" + referrerType +
             (referrerType.equals(ObjectInstancesManager.WEAK_REFERENCE) ? "|" + ObjectInstancesManager.STRONG_REFERENCE : ""));
 
+        // Note! This test is broken, in the sense that it incorrectly assumes
+        // that no GC can happen before it walks the heap. In practice, it seems
+        // to only affect this test when using ZGC. However, this test will also
+        // fail when using other GCs if an explicit GC is done here.
+
         // the instance counts should not be affected by creating multiple references
         checkDebugeeAnswer_instanceCounts(className, createInstanceCount, objectsToFilter);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java
index fb684c807c5..c79bc92c3ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java
@@ -33,55 +33,16 @@ import java.util.*;
 import java.io.*;
 
 public class issynthetic002 {
-    final static String METHOD_NAME[] = {
-        "<init>",
-        "Mv",
-        "Mz", "Mz1", "Mz2",
-        "Mb", "Mb1", "Mb2",
-        "Mc", "Mc1", "Mc2",
-        "Md", "Md1", "Md2",
-        "Mf", "Mf1", "Mf2",
-        "Mi", "Mi1", "Mi2",
-        "Ml", "Ml1", "Ml2",
-        "Mr", "Mr1", "Mr2",
 
-        "MvF", "MlF", "MlF1", "MlF2",
-        "MvN", "MlN", "MlN1", "MlN2",
-        "MvS", "MlS", "MlS1", "MlS2",
-        "MvI", "MlI", "MlI1", "MlI2",
-        "MvY", "MlY", "MlY1", "MlY2",
-        "MvU", "MlU", "MlU1", "MlU2",
-        "MvR", "MlR", "MlR1", "MlR2",
-        "MvP", "MlP", "MlP1", "MlP2",
 
-        "MX", "MX1", "MX2",
-        "MO", "MO1", "MO2",
-
-        "MLF", "MLF1", "MLF2",
-        "MLN", "MLN1", "MLN2",
-        "MLS", "MLS1", "MLS2",
-        "MLI", "MLI1", "MLI2",
-        "MLY", "MLY1", "MLY2",
-        "MLU", "MLU1", "MLU2",
-        "MLR", "MLR1", "MLR2",
-        "MLP", "MLP1", "MLP2",
-
-        "ME", "ME1", "ME2",
-        "MEF", "MEF1", "MEF2",
-        "MEN", "MEN1", "MEN2",
-        "MES", "ME1S", "ME2S",
-        "MEI", "MEI1", "MEI2",
-        "MEY", "MEY1", "MEY2",
-        "MEU", "MEU1", "MEU2",
-        "MER", "MER1", "MER2",
-        "MEP", "MEP1", "MEP2"
-    };
+    final static String SYNTHETIC_METHOD_NAME = "test";
+    final static String SYNTHETIC_METHOD_SIGNATURE = "(Ljava/lang/Object;)Ljava/lang/Object;";
 
     private static Log log;
     private final static String prefix = "nsk.jdi.TypeComponent.isSynthetic.";
     private final static String className = "issynthetic002";
-    private final static String debugerName = prefix + className;
-    private final static String debugeeName = debugerName + "a";
+    private final static String debuggerName = prefix + className;
+    private final static String debuggeeName = debuggerName + "a";
     private final static String classToCheckName = prefix + "issynthetic002aClassToCheck";
 
     public static void main(String argv[]) {
@@ -92,38 +53,38 @@ public class issynthetic002 {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
         Binder binder = new Binder(argHandler, log);
-        Debugee debugee = binder.bindToDebugee(debugeeName
+        Debugee debuggee = binder.bindToDebugee(debuggeeName
                               + (argHandler.verbose() ? " -verbose" : ""));
-        VirtualMachine vm = debugee.VM();
+        VirtualMachine vm = debuggee.VM();
         boolean canGetSynthetic = vm.canGetSyntheticAttribute();
-        IOPipe pipe = new IOPipe(debugee);
+        IOPipe pipe = new IOPipe(debuggee);
         boolean testFailed = false;
         List methods;
         int totalSyntheticMethods = 0;
 
-        log.display("debuger> Value of canGetSyntheticAttribute in current "
+        log.display("debugger> Value of canGetSyntheticAttribute in current "
                   + "VM is " + canGetSynthetic);
 
-        // Connect with debugee and resume it
-        debugee.redirectStderr(out);
-        debugee.resume();
+        // Connect with debuggee and resume it
+        debuggee.redirectStderr(out);
+        debuggee.resume();
         String line = pipe.readln();
         if (line == null) {
-            log.complain("debuger FAILURE> UNEXPECTED debugee's signal - null");
+            log.complain("debugger FAILURE> UNEXPECTED debuggee's signal - null");
             return 2;
         }
         if (!line.equals("ready")) {
-            log.complain("debuger FAILURE> UNEXPECTED debugee's signal - "
+            log.complain("debugger FAILURE> UNEXPECTED debuggee's signal - "
                       + line);
             return 2;
         }
         else {
-            log.display("debuger> debugee's \"ready\" signal recieved.");
+            log.display("debugger> debuggee's \"ready\" signal received.");
         }
 
-        ReferenceType refType = debugee.classByName(classToCheckName);
+        ReferenceType refType = debuggee.classByName(classToCheckName);
         if (refType == null) {
-            log.complain("debuger FAILURE> Class " + classToCheckName
+            log.complain("debugger FAILURE> Class " + classToCheckName
                        + " not found.");
             return 2;
         }
@@ -132,51 +93,50 @@ public class issynthetic002 {
         try {
             methods = refType.methods();
         } catch (Exception e) {
-            log.complain("debuger FAILURE> Can't get methods from "
+            log.complain("debugger FAILURE> Can't get methods from "
                        + classToCheckName);
-            log.complain("debuger FAILURE> Exception: " + e);
+            log.complain("debugger FAILURE> Exception: " + e);
             return 2;
         }
         int totalMethods = methods.size();
         if (totalMethods < 1) {
-            log.complain("debuger FAILURE> Total number of methods in debuggee "
+            log.complain("debugger FAILURE> Total number of methods in debuggee "
                        + "read " + totalMethods);
             return 2;
         }
-        log.display("debuger> Total methods in debuggee read: "
-                  + totalMethods + " total methods in debuger: "
-                  + METHOD_NAME.length);
+        log.display("debugger> Total methods in debuggee read: "
+                  + totalMethods);
         for (int i = 0; i < totalMethods; i++) {
             Method method = (Method)methods.get(i);
             String name = method.name();
+            String signature = method.signature();
             boolean isSynthetic;
-            boolean isRealSynthetic = true;
 
             try {
                 isSynthetic = method.isSynthetic();
 
                 if (!canGetSynthetic) {
-                    log.complain("debuger FAILURE 1> Value of "
+                    log.complain("debugger FAILURE 1> Value of "
                                + "canGetSyntheticAttribute in current VM is "
                                + "false, so UnsupportedOperationException was "
                                + "expected for " + i + " method " + name);
                     testFailed = true;
                     continue;
                 } else {
-                    log.display("debuger> " + i + " method " + name + " with "
+                    log.display("debugger> " + i + " method " + name + " with "
                               + "synthetic value " + isSynthetic + " read "
                               + "without UnsupportedOperationException");
                 }
             } catch (UnsupportedOperationException e) {
                 if (canGetSynthetic) {
-                    log.complain("debuger FAILURE 2> Value of "
+                    log.complain("debugger FAILURE 2> Value of "
                                + "canGetSyntheticAttribute in current VM is "
                                + "true, but cannot get synthetic for method "
                                + "name.");
-                    log.complain("debuger FAILURE 2> Exception: " + e);
+                    log.complain("debugger FAILURE 2> Exception: " + e);
                     testFailed = true;
                 } else {
-                    log.display("debuger> UnsupportedOperationException was "
+                    log.display("debugger> UnsupportedOperationException was "
                               + "thrown while getting isSynthetic for " + i
                               + " method " + name + " because value "
                               + "canGetSynthetic is false.");
@@ -184,49 +144,39 @@ public class issynthetic002 {
                 continue;
             }
 
-            // Find out if method exists in list of methods
-            for (int j = 0; j < METHOD_NAME.length; j++) {
-                String nameFromList = METHOD_NAME[j];
-
-                if (nameFromList.equals(name)) {
-                    // Method found in list - is not synthetic
-
-                    isRealSynthetic = false;
-                    break;
-                }
-            }
-
-            if (isRealSynthetic != isSynthetic) {
-                log.complain("debuger FAILURE 3> Method's " + name
-                           + " synthetic is " + isSynthetic + ", but expected "
-                           + "is " + isRealSynthetic);
-                testFailed = true;
-                continue;
-            }
 
             if (isSynthetic) {
-                totalSyntheticMethods++;
+                if (SYNTHETIC_METHOD_NAME.equals(name) && SYNTHETIC_METHOD_SIGNATURE.equals(signature)) {
+                    totalSyntheticMethods++;
+                } else {
+                    testFailed = true;
+                    log.complain("debugger FAILURE 3> Found unexpected synthetic method " + name
+                            + signature);
+                }
             }
         }
 
         if (totalSyntheticMethods == 0) {
-            log.complain("debuger FAILURE 4> Synthetic methods not found.");
+            log.complain("debugger FAILURE 4> Synthetic methods not found.");
+            testFailed = true;
+        } else if (totalSyntheticMethods > 1 ) {
+            log.complain("debugger FAILURE 5> More than one Synthetic method is found.");
             testFailed = true;
         }
 
         pipe.println("quit");
-        debugee.waitFor();
-        int status = debugee.getStatus();
+        debuggee.waitFor();
+        int status = debuggee.getStatus();
         if (testFailed) {
-            log.complain("debuger FAILURE> TEST FAILED");
+            log.complain("debugger FAILURE> TEST FAILED");
             return 2;
         } else {
             if (status == 95) {
-                log.display("debuger> expected Debugee's exit "
+                log.display("debugger> expected Debuggee's exit "
                           + "status - " + status);
                 return 0;
             } else {
-                log.complain("debuger FAILURE> UNEXPECTED Debugee's exit "
+                log.complain("debugger FAILURE> UNEXPECTED Debuggee's exit "
                            + "status (not 95) - " + status);
                 return 2;
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002a.java
index 710b8e58859..49f55532a2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002a.java
@@ -51,7 +51,11 @@ public class issynthetic002a {
     }
 }
 
-class issynthetic002aClassToCheck {
+interface issynthetic002aClassToCheckIntf<T> {
+    T test(T t);
+}
+
+class issynthetic002aClassToCheck implements issynthetic002aClassToCheckIntf<String> {
     // Not-synthetic methods
 
     // User class and interface
@@ -178,26 +182,13 @@ class issynthetic002aClassToCheck {
     private      Inter[]   MEP1(Inter[] E)   { return E; };
     private      Inter[][] MEP2(Inter[][] E) { return E; };
 
-    // Synthetic methods
 
-    private int i;
-    private String s;
-
-    class NestedClass {
-        boolean MS(String str) {
-            // Method uses private variable s from ClassToCheck,
-            // so two synthetic methods must appear in ClassToCheck
-
-            s = s + "NestedClass";
-            return s.equals(str);
-        };
-
-        boolean Mi(int j) {
-            // Method uses private variable i from ClassToCheck,
-            // so two synthetic methods must appear in ClassToCheck
-
-            i = i + 1;
-            return (i == j);
-        };
+   // The implementation of the parametrized interface issynthetic002aClassToCheckIntf
+   // triggers the compiler to create the synthetic bridge method
+   // "test(Ljava/lang/Object;)Ljava/lang/Object;".
+    public String test(String s) {
+        return s;
     }
+
+
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java
index 77dd0f5afaa..90cb843a2ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java
@@ -46,7 +46,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  */
 
 package nsk.jdi.VMOutOfMemoryException.VMOutOfMemoryException001;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java
index 8502ee0d4a9..65801037f73 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java
@@ -56,7 +56,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -forceGC
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
index 79e59f2f524..4df798fe729 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
@@ -41,6 +41,7 @@
  *         com.sun.jdi.ObjectCollectedException or com.sun.jdi.ClassNotLoadedException
  *         exception is thrown.
  *
+ * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
@@ -54,7 +55,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -testClassPath ${test.class.path}
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java
index c1bdc45f9f2..9513018931b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java
@@ -49,7 +49,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  */
 
 package nsk.jdi.VirtualMachine.instanceCounts.instancecounts004;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java
index 3b925d509e7..95bf37ae580 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java
@@ -58,7 +58,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -testClassPath ${test.class.path}
  *      -configFile ./heapwalking001.tests
  */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java
index 2c6cc6a2121..fd73a28c6e4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java
@@ -60,7 +60,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -testClassPath ${test.class.path}
  *      -configFile ./heapwalking002.tests
  *      -testWorkDir .
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java
index 3397778dd12..5c8f0d16ac0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java
@@ -68,7 +68,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -testClassPath ${test.class.path}
  *      -configFile ./mixed001.tests
  */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java
index 192a98dde45..8360612d006 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java
@@ -66,7 +66,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      "-debugee.vmkeys=-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ *      "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
  *      -testClassPath ${test.class.path}
  *      -configFile ./mixed002.tests
  *      -testWorkDir .
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001.java
new file mode 100644
index 00000000000..60ae805703b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001.java
@@ -0,0 +1,371 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.GetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ArrayReference.GetValues.
+ *
+ * See getvalues001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class getvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ArrayReference.GetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "getvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ArrayReference.GetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ArrayReference.GetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the static field in the tested class with the tested object value
+    static final String ARRAY_FIELD_NAME = getvalues001a.ARRAY_FIELD_NAME;
+    static final int ARRAY_LENGTH = getvalues001a.ARRAY_LENGTH;
+
+    // first index and number of array components to get
+    static final int ARRAY_FIRST_INDEX = 4;
+    static final int ARRAY_ITEMS_COUNT = 10;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new getvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for arrayID value from static field
+                log.display("Getting arrayID value from static field: "
+                            + ARRAY_FIELD_NAME);
+                long arrayID = queryObjectID(classID,
+                            ARRAY_FIELD_NAME, JDWP.Tag.ARRAY);
+                log.display("  got arrayID: " + arrayID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(arrayID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified objectID.
+     */
+    void testCommand(long arrayID) {
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  arrayID: " + arrayID);
+        command.addObjectID(arrayID);
+        log.display("  firstIndex: " + ARRAY_FIRST_INDEX);
+        command.addInt(ARRAY_FIRST_INDEX);
+        log.display("  length: " + ARRAY_ITEMS_COUNT);
+        command.addInt(ARRAY_ITEMS_COUNT);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract values tag
+        byte tag = (byte)0;
+        try {
+            tag = reply.getByte();
+            log.display("  tag: " + tag);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract values tag from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check if number of values are as expected
+        if (tag != JDWP.Tag.INT) {
+            log.complain("Unexpected values tag received:" + tag
+                        + " (expected: " + JDWP.Tag.INT + ")");
+            success = false;
+        }
+
+        // extract number of values
+        int values = 0;
+        try {
+            values = reply.getInt();
+            log.display("  values: " + values);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of values from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check if number of values are as expected
+        if (values < 0) {
+            log.complain("Negative number of values received:" + values
+                        + " (expected: " + ARRAY_ITEMS_COUNT + ")");
+            success = false;
+        } else if (values != ARRAY_ITEMS_COUNT) {
+            log.complain("Unexpected number of values received:" + values
+                        + " (expected: " + ARRAY_ITEMS_COUNT + ")");
+            success = false;
+        }
+
+        // extract and check each value
+        for (int i = 0; i < values; i++ ) {
+            int index = i + ARRAY_FIRST_INDEX;
+            log.display("  value #" + i + " (index: " + index  + ")");
+
+            // extract value
+            JDWP.UntaggedValue value = null;
+            try {
+                value = reply.getUntaggedValue(JDWP.Tag.INT);
+                log.display("    untagged_value: " + value);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " value from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // check that extracted value is as expected
+            int intValue = ((Integer)value.getValue()).intValue();
+            if (intValue != index * 10) {
+                log.complain("Unexpected value for " + index + " component received: "
+                            + intValue + " (expected: " + (index * 10) + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java
new file mode 100644
index 00000000000..d62c176b75f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ArrayReference/GetValues/getvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ArrayReference
+ *         command: GetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the returned values of requested array components are equal
+ *     to the expected ones. Tested array contains primitive values.
+ *     Test consists of two compoments:
+ *         debugger: getvalues001
+ *         debuggee: getvalues001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains from debuggee classID for the tested class and
+ *     arrayID as the value of the class static field. Checked array in
+ *     debuggee is filled with the regular integer values.
+ *     Then, debugger creates command packet for GetValues command with the
+ *     found arrayID and start index and number of components as arguments,
+ *     writes packet to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts values of the array components. Also test checks
+ *     that extracted values are equal to the expected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ArrayReference.GetValues.getvalues001
+ *        nsk.jdwp.ArrayReference.GetValues.getvalues001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ArrayReference.GetValues.getvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001a.java
new file mode 100644
index 00000000000..8eb27a603dc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001a.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.GetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class getvalues001a {
+
+    public static final String ARRAY_FIELD_NAME = "array";
+    public static final int ARRAY_LENGTH = 16;
+
+    public static void main(String args[]) {
+        getvalues001a _getvalues001a = new getvalues001a();
+        System.exit(getvalues001.JCK_STATUS_BASE + _getvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating and fille tested array");
+        TestedClass.setArrayValues();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + getvalues001.READY);
+        pipe.println(getvalues001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + getvalues001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(getvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + getvalues001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return getvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return getvalues001.PASSED;
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+
+        // static field with tested array
+        public static int array[] = null;
+
+        public static void setArrayValues() {
+            array = new int[ARRAY_LENGTH];
+            for (int i = 0; i < ARRAY_LENGTH; i++) {
+                array[i] = i * 10;
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002.java
new file mode 100644
index 00000000000..47f4097dae6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002.java
@@ -0,0 +1,527 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.GetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ArrayReference.GetValues.
+ *
+ * See getvalues002.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class getvalues002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ArrayReference.GetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "getvalues002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ArrayReference.GetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ArrayReference.GetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the static field in the tested class with the tested object value
+    static final String ARRAY_FIELD_NAME = getvalues002a.ARRAY_FIELD_NAME;
+    static final int ARRAY_LENGTH = getvalues002a.ARRAY_LENGTH;
+
+    // names of the statc fields with object values
+    static final int FIELDS_COUNT = getvalues002a.FIELDS_COUNT;
+    static final String FIELD_NAMES[] = {
+                            "nullObject",
+                            "baseObject",
+                            "derivedObject",
+                            "stringObject",
+                            "primitiveArrayObject",
+                            "objectArrayObject",
+                            "threadObject",
+                            "threadGroupObject",
+                            "classObject",
+                            "classLoaderObject",
+                        };
+    static final byte FIELD_TAGS[] = {
+                            JDWP.Tag.OBJECT,        // nullObject
+                            JDWP.Tag.OBJECT,        // baseobject
+                            JDWP.Tag.OBJECT,        // derivedObject
+                            JDWP.Tag.STRING,        // stringObject
+                            JDWP.Tag.ARRAY,         // primitiveArrayObject
+                            JDWP.Tag.ARRAY,         // objectArrayObject
+                            JDWP.Tag.THREAD,        // threadObject
+                            JDWP.Tag.THREAD_GROUP,  // threadGroupObject
+                            JDWP.Tag.CLASS_OBJECT,  // classObject
+                            JDWP.Tag.CLASS_LOADER   // classLoaderObject
+                        };
+
+    // first index and number of array components to get
+    static final int ARRAY_FIRST_INDEX = getvalues002a.ARRAY_FIRST_INDEX;
+    static final int ARRAY_ITEMS_COUNT = FIELDS_COUNT;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new getvalues002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debugee for fieldIDs of the class static fields
+                log.display("Getting fieldIDs for static fields of the class");
+                long fieldIDs[] = queryClassFieldIDs(classID);
+                log.display("  got fields: " + fieldIDs.length);
+
+                // query debugee for object values of the fields
+                log.display("Getting objectID values of the static fields");
+                long objectIDs[] = queryClassFieldValues(classID, fieldIDs);
+                log.display("  got objectIDs: " + objectIDs.length);
+
+                // query debuggee for arrayID value from static field
+                log.display("Getting arrayID value from static field: "
+                            + ARRAY_FIELD_NAME);
+                long arrayID = queryObjectID(classID,
+                            ARRAY_FIELD_NAME, JDWP.Tag.ARRAY);
+                log.display("  got arrayID: " + arrayID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(arrayID, objectIDs);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debugee for fieldID's of the class static fields.
+     */
+    long[] queryClassFieldIDs(long classID) {
+
+        long[] fieldIDs = new long[FIELDS_COUNT];
+        for (int i = 0; i < FIELDS_COUNT; i++) {
+            fieldIDs[i] = 0;
+        }
+
+        // compose ReferenceType.Fields command packet
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+        command.addReferenceTypeID(classID);
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract fieldIDs from the reply packet
+        try {
+            reply.resetPosition();
+
+            int declared = reply.getInt();
+
+            for (int i = 0; i < declared; i++ ) {
+                long fieldID = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                for (int j = 0; j < FIELDS_COUNT; j++) {
+                    if (FIELD_NAMES[j].equals(name)) {
+                        fieldIDs[j] = fieldID;
+                    }
+                }
+            }
+
+            for (int i = 0; i < FIELDS_COUNT; i++) {
+                if (fieldIDs[i] == 0) {
+                    log.complain("Not found fieldID for static field: " + FIELD_NAMES[i]);
+                    throw new Failure("Error occured while getting static fieldIDs for classID: "
+                                    + classID);
+                }
+            }
+
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.Fields command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fieldIDs for classID: " + classID);
+        }
+
+        return fieldIDs;
+    }
+
+    /**
+     * Query debugee for objectID values of the class fields.
+     */
+    long[] queryClassFieldValues(long classID, long fieldIDs[]) {
+        String error = "Error occured while getting object values for static fields of classID: "
+                                + classID;
+
+        // compose ReferenceType.Fields command packet
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.GetValues);
+        command.addReferenceTypeID(classID);
+        command.addInt(FIELDS_COUNT);
+        for (int i = 0; i < FIELDS_COUNT; i++) {
+            command.addFieldID(fieldIDs[i]);
+        }
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract values from the reply packet
+        try {
+            reply.resetPosition();
+
+            int valuesCount = reply.getInt();
+            if (valuesCount != FIELDS_COUNT) {
+                log.complain("Unexpected number of values for static fields: " + valuesCount
+                            + " (expected: " + FIELDS_COUNT + ")");
+                throw new Failure(error);
+            }
+
+            long objectIDs[] = new long[valuesCount];
+            for (int i = 0; i < valuesCount; i++ ) {
+                JDWP.Value value = reply.getValue();
+                byte tag = value.getTag();
+                if (tag != FIELD_TAGS[i]) {
+                    log.complain("Unexpected tag of oblectID value for static field "
+                                + FIELD_NAMES[i] + ": " + tag
+                                + " (expected: " + FIELD_TAGS[i] + ")");
+                    throw new Failure(error);
+                }
+                long objectID = ((Long)value.getValue()).longValue();
+                objectIDs[i] = objectID;
+            }
+            return objectIDs;
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.GetValues command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fields values for classID: " + classID);
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified objectID.
+     */
+    void testCommand(long arrayID, long objectIDs[]) {
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  arrayID: " + arrayID);
+        command.addObjectID(arrayID);
+        log.display("  firstIndex: " + ARRAY_FIRST_INDEX);
+        command.addInt(ARRAY_FIRST_INDEX);
+        log.display("  length: " + ARRAY_ITEMS_COUNT);
+        command.addInt(ARRAY_ITEMS_COUNT);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract values tag
+        byte tag = (byte)0;
+        try {
+            tag = reply.getByte();
+            log.display("  tag: " + tag);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract values tag from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check if number of values are as expected
+        if (tag != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected values tag received:" + tag
+                        + " (expected: " + JDWP.Tag.OBJECT + ")");
+            success = false;
+        }
+
+        // extract number of values
+        int values = 0;
+        try {
+            values = reply.getInt();
+            log.display("  values: " + values);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of values from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check if number of values are as expected
+        if (values < 0) {
+            log.complain("Negative number of values received:" + values
+                        + " (expected: " + ARRAY_ITEMS_COUNT + ")");
+            success = false;
+        } else if (values != ARRAY_ITEMS_COUNT) {
+            log.complain("Unexpected number of values received:" + values
+                        + " (expected: " + ARRAY_ITEMS_COUNT + ")");
+            success = false;
+        }
+
+        // extract and check each value
+        for (int i = 0; i < values; i++ ) {
+            int index = i + ARRAY_FIRST_INDEX;
+            log.display("  value #" + i + " (index: " + index  + ")");
+
+            // extract value
+            JDWP.Value value = null;
+            try {
+                value = reply.getValue();
+                log.display("    value: " + value);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " value from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // check that value's tag is as expected
+            byte valueTag = value.getTag();
+            if (valueTag != FIELD_TAGS[i]) {
+                log.complain("Unexpected value tag for " + index + " component ("
+                            + FIELD_NAMES[i] + ") received: " + valueTag
+                            + " (expected: " + FIELD_TAGS[i] + ")");
+                success = false;
+            }
+
+            // check that value's objectID is as expected
+            long objectID = ((Long)value.getValue()).longValue();
+            if (objectID != objectIDs[i]) {
+                log.complain("Unexpected objectID for " + index + " component ("
+                            + FIELD_NAMES[i]  + ") received: " + objectID
+                            + " (expected: " + objectIDs[i] + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java
new file mode 100644
index 00000000000..78f35cde8ef
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ArrayReference/GetValues/getvalues002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ArrayReference
+ *         command: GetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the returned values of requested array components are equal
+ *     to the expected ones. Tested array contains object values
+ *     of several kinds (objects, strings, arrays, threads, etc.)
+ *     Test consists of two compoments:
+ *         debugger: getvalues002
+ *         debuggee: getvalues002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains from debuggee classID for the tested class and
+ *     arrayID as the value of the class static field. Also debugger obtains
+ *     object values from static fileds. These values are the same as components
+ *     of the tested array.
+ *     Then, debugger creates command packet for GetValues command with the
+ *     found arrayID and start index and number of components as arguments,
+ *     writes packet to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts values of the array components. Also test checks
+ *     that extracted object values are equal to the expected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ArrayReference.GetValues.getvalues002
+ *        nsk.jdwp.ArrayReference.GetValues.getvalues002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ArrayReference.GetValues.getvalues002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002a.java
new file mode 100644
index 00000000000..0d5cc1b22b3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002a.java
@@ -0,0 +1,116 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.GetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class getvalues002a {
+
+    public static final String ARRAY_FIELD_NAME = "array";
+    public static final int FIELDS_COUNT = 10;
+    public static final int ARRAY_FIRST_INDEX = 4;
+    public static final int ARRAY_LENGTH = ARRAY_FIRST_INDEX + FIELDS_COUNT + 5;
+
+    public static void main(String args[]) {
+        getvalues002a _getvalues002a = new getvalues002a();
+        System.exit(getvalues002.JCK_STATUS_BASE + _getvalues002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating and fille tested array");
+        TestedClass.setArrayValues();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + getvalues002.READY);
+        pipe.println(getvalues002.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + getvalues002.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(getvalues002.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + getvalues002.QUIT + ")");
+            log.display("Debugee FAILED");
+            return getvalues002.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return getvalues002.PASSED;
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+
+        // static field with tested array
+        public static Object array[] = null;
+
+        // static fields with object values
+        public static Object      nullObject           = null;
+        public static Object      baseObject           = new Object();
+        public static TestedClass derivedObject        = new TestedClass();
+        public static String      stringObject         = new String("string");
+        public static int[]       primitiveArrayObject = new int[10];
+        public static Object[]    objectArrayObject    = new Object[10];
+        public static Thread      threadObject         = Thread.currentThread();
+        public static ThreadGroup threadGroupObject    = threadObject.getThreadGroup();
+        public static Class       classObject          = derivedObject.getClass();
+        public static ClassLoader classLoaderObject    = classObject.getClassLoader();
+
+        public static void setArrayValues() {
+            array = new Object[ARRAY_LENGTH];
+            for (int i = 0; i < ARRAY_LENGTH; i++) {
+                array[i] = null;
+            }
+
+            int i = ARRAY_FIRST_INDEX;
+            array[i + 0] = nullObject;
+            array[i + 1] = baseObject;
+            array[i + 2] = derivedObject;
+            array[i + 3] = stringObject;
+            array[i + 4] = primitiveArrayObject;
+            array[i + 5] = objectArrayObject;
+            array[i + 6] = threadObject;
+            array[i + 7] = threadGroupObject;
+            array[i + 8] = classObject;
+            array[i + 9] = classLoaderObject;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001.java
new file mode 100644
index 00000000000..36324982533
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001.java
@@ -0,0 +1,318 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.Length;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ArrayReference.Length.
+ *
+ * See length001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class length001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ArrayReference.Length";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "length001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ArrayReference.Length";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ArrayReference.Length;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the static field in the tested class with the tested object value
+    static final String ARRAY_FIELD_NAME = length001a.ARRAY_FIELD_NAME;
+    static final int ARRAY_LENGTH = length001a.ARRAY_LENGTH;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new length001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for arrayID value from static field
+                log.display("Getting arrayID value from static field: "
+                            + ARRAY_FIELD_NAME);
+                long arrayID = queryObjectID(classID,
+                            ARRAY_FIELD_NAME, JDWP.Tag.ARRAY);
+                log.display("  got arrayID: " + arrayID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(arrayID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified arrayID.
+     */
+    void testCommand(long arrayID) {
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  arrayID: " + arrayID);
+        command.addObjectID(arrayID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract array length
+        int arrayLength = 0;
+        try {
+            arrayLength = reply.getInt();
+            log.display("  arrayLength: " + arrayLength);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract arrayLength from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check if arrayLength is as expected
+        if (arrayLength < 0) {
+            log.complain("Negative number of arrayLength received:" + arrayLength
+                        + " (expected: " + ARRAY_LENGTH + ")");
+            success = false;
+        } else if (arrayLength != ARRAY_LENGTH) {
+            log.complain("Unexpected number of values received:" + arrayLength
+                        + " (expected: " + ARRAY_LENGTH + ")");
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java
new file mode 100644
index 00000000000..1ec5727c615
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ArrayReference/Length/length001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ArrayReference
+ *         command: Length
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the returned array length is equal to the expected one.
+ *     Test consists of two compoments:
+ *         debugger: length001
+ *         debuggee: length001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains from debuggee classID for the tested class and
+ *     arrayID as the value of the class static field. Checked array in
+ *     debuggee is filled with the regular integer values.
+ *     Then, debugger creates command packet for Length command with the
+ *     found arrayID and start index and number of components as arguments,
+ *     writes packet to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts array length value. Also test checks that extracted array
+ *     length is equal to the expected one.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ArrayReference.Length.length001
+ *        nsk.jdwp.ArrayReference.Length.length001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ArrayReference.Length.length001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001a.java
new file mode 100644
index 00000000000..bb137498976
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001a.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.Length;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class length001a {
+
+    public static final String ARRAY_FIELD_NAME = "array";
+    public static final int ARRAY_LENGTH = 16;
+
+    public static void main(String args[]) {
+        length001a _length001a = new length001a();
+        System.exit(length001.JCK_STATUS_BASE + _length001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating and fille tested array");
+        TestedClass.setArrayValues();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + length001.READY);
+        pipe.println(length001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + length001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(length001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + length001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return length001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return length001.PASSED;
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+
+        // static field with tested array
+        public static int array[] = null;
+
+        public static void setArrayValues() {
+            array = new int[ARRAY_LENGTH];
+            for (int i = 0; i < ARRAY_LENGTH; i++) {
+                array[i] = i * 10;
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001.java
new file mode 100644
index 00000000000..b7d458d28b1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001.java
@@ -0,0 +1,346 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.SetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ArrayReference.SetValues.
+ *
+ * See setvalues001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class setvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String RUN = "run";
+    static final String DONE = "done";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ArrayReference.SetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "setvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ArrayReference.SetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ArrayReference.SetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the static field in the tested class with the tested object value
+    static final String ARRAY_FIELD_NAME = setvalues001a.ARRAY_FIELD_NAME;
+
+    // length, first index and number of array components to get
+    static final int ARRAY_LENGTH = setvalues001a.ARRAY_LENGTH;
+    static final int ARRAY_FIRST_INDEX = setvalues001a.ARRAY_FIRST_INDEX;
+    static final int ARRAY_ITEMS_COUNT = setvalues001a.ARRAY_ITEMS_COUNT;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new setvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for arrayID value from static field
+                log.display("Getting arrayID value from static field: "
+                            + ARRAY_FIELD_NAME);
+                long arrayID = queryObjectID(classID,
+                            ARRAY_FIELD_NAME, JDWP.Tag.ARRAY);
+                log.display("  got arrayID: " + arrayID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(arrayID);
+
+                // check confirmation from debuggee that values have been set correctly
+                log.display("\n>>> Checking that the values have been set correctly \n");
+                checkValuesChanged();
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified objectID.
+     */
+    void testCommand(long arrayID) {
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  arrayID: " + arrayID);
+        command.addObjectID(arrayID);
+        log.display("  firstIndex: " + ARRAY_FIRST_INDEX);
+        command.addInt(ARRAY_FIRST_INDEX);
+        log.display("  values: " + ARRAY_ITEMS_COUNT);
+        command.addInt(ARRAY_ITEMS_COUNT);
+        // add new int values for array components
+        for (int i = ARRAY_FIRST_INDEX; i < ARRAY_FIRST_INDEX + ARRAY_ITEMS_COUNT; i++) {
+            int intValue = i * 100 + 1;
+            JDWP.UntaggedValue value = new JDWP.UntaggedValue(new Integer(intValue));
+            log.display("  untagged_value: " + value);
+            command.addUntaggedValue(value, JDWP.Tag.INT);
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no reply data to extract
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+    /**
+     * Check confirmation from debuggee that values are changed correctly.
+     */
+    void checkValuesChanged() {
+        // send debugee signal RUN
+        log.display("Sending signal to debugee: " + RUN);
+        pipe.println(RUN);
+
+        // wait for DONE signal from debugee
+        log.display("Waiting for signal from debugee: " + DONE);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        // check received signal
+        if (signal == null) {
+            throw new TestBug("<null> signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        } else if (signal.equals(DONE)) {
+            log.display("All array values have been correctly set into debuggee VM");
+        } else if (signal.equals(ERROR)) {
+            log.complain("Not all array values have been correctly set into debuggee VM");
+            success = false;
+        } else {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java
new file mode 100644
index 00000000000..0d25290b341
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ArrayReference/SetValues/setvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ArrayReference
+ *         command: SetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the new set values of array components are equal to the
+ *     expected ones.
+ *     Test consists of two compoments:
+ *         debugger: setvalues001
+ *         debuggee: setvalues001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains from debuggee classID for the tested class and
+ *     arrayID as the value of the class static field. Checked array in
+ *     debuggee is filled with the initial integer values.
+ *     Then, debugger creates command packet for SetValues command with the
+ *     found arrayID, start index and number of components as arguments,
+ *     and new integer values, writes packet to the transport channel
+ *     and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and ensures there is no data in the packet. Also test send signal
+ *     <RUN> to debuggee to check new array values. If new values are set
+ *     correctly debuggee replies with signal DONE.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ArrayReference.SetValues.setvalues001
+ *        nsk.jdwp.ArrayReference.SetValues.setvalues001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ArrayReference.SetValues.setvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001a.java
new file mode 100644
index 00000000000..6a717c7990c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001a.java
@@ -0,0 +1,163 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayReference.SetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class setvalues001a {
+
+    // name of the static field with the tested array object
+    public static final String ARRAY_FIELD_NAME = "array";
+
+    // length, first index and number of array components to get
+    public static final int ARRAY_LENGTH = 16;
+    public static final int ARRAY_FIRST_INDEX = 4;
+    public static final int ARRAY_ITEMS_COUNT = 10;
+
+    private static ArgumentHandler argumentHandler = null;
+    private static Log log = null;
+
+    public static void main(String args[]) {
+        setvalues001a _setvalues001a = new setvalues001a();
+        System.exit(setvalues001.JCK_STATUS_BASE + _setvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating and initializing tested array");
+        TestedClass.initArrayValues();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + setvalues001.READY);
+        pipe.println(setvalues001.READY);
+
+        // wait for signal RUN from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.RUN);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+        // check received signal
+        if (signal == null || !signal.equals(setvalues001.RUN)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.RUN + ")");
+            log.display("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // check assigned values
+        log.display("Checking new array values");
+        if (TestedClass.checkArrayValues()) {
+            log.display("Sending signal to debugger: " + setvalues001.DONE);
+            pipe.println(setvalues001.DONE);
+        } else {
+            log.display("Sending signal to debugger: " + setvalues001.ERROR);
+            pipe.println(setvalues001.ERROR);
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.QUIT);
+        signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(setvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return setvalues001.PASSED;
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+
+        // static field with tested array
+        public static int array[] = null;
+
+        public static void initArrayValues() {
+            array = new int[ARRAY_LENGTH];
+            for (int i = 0; i < ARRAY_LENGTH; i++) {
+                array[i] = i * 10;
+            }
+        }
+
+        public static boolean checkArrayValues() {
+            if (array == null) {
+                log.complain("Checked array == null after setting values: " + array);
+                return false;
+            }
+
+            boolean success = true;
+            if (array.length != ARRAY_LENGTH) {
+                log.complain("Unexpected array length after setting values: "
+                            + array.length + " (expected: " + ARRAY_LENGTH + ")");
+                success = false;
+            }
+
+            for (int i = 0; i < array.length; i++) {
+                int initial = i * 10;
+                int changed = i * 100 + 1;
+                if (i < ARRAY_FIRST_INDEX || i >= ARRAY_FIRST_INDEX + ARRAY_ITEMS_COUNT) {
+                    log.display("  " + i + " (not changed): " + initial + " -> " + array[i]);
+                    if (array[i] != initial) {
+                        log.complain("Changed value of " + i + " component which is out of changed region: "
+                                    + array[i] + "(initial: " + initial + ")");
+                        success = false;
+                    }
+                } else {
+                    log.display("  " + i + " (changed): " + initial + " -> " + array[i]);
+                    if (array[i] != changed) {
+                        if (array[i] == initial) {
+                            log.complain("Value of " + i + " component not changed: "
+                                    + array[i] + "(expected: " + changed + ")");
+                            success = false;
+                        } else {
+                            log.complain("Value of " + i + " component changed incorrectly: "
+                                    + array[i] + "(expected: " + changed + ")");
+                            success = false;
+                        }
+                    }
+                }
+            }
+
+            return success;
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001.java
new file mode 100644
index 00000000000..c56ccde4c2f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001.java
@@ -0,0 +1,297 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayType.NewInstance;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ArrayType.NewInstance.
+ *
+ * See newinstance001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class newinstance001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ArrayType.NewInstance";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "newinstance001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ArrayType.NewInstance";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ArrayType.NewInstance;
+
+    // tested array type signature constant
+    static final String TESTED_ARRAY_SIGNATURE = "[I";
+
+    // tested array type size constant
+    static final int TESTED_ARRAY_SIZE = 100;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new newinstance001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting arrayTypeID by signature:\n"
+                            + "  " + TESTED_ARRAY_SIGNATURE);
+                long typeID = debugee.getReferenceTypeID(TESTED_ARRAY_SIGNATURE);
+                log.display("  got TypeID: " + typeID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(typeID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long typeID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  arrayTypeID: " + typeID);
+        command.addReferenceTypeID(typeID);
+        log.display("  length: " + TESTED_ARRAY_SIZE);
+        command.addInt(TESTED_ARRAY_SIZE);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check number of nested classes
+        JDWP.Value newArray = null;
+        try {
+            newArray = reply.getValue();
+            log.display("  newArray: " + newArray);
+
+            byte tag = newArray.getTag();
+            if (tag != JDWP.Tag.ARRAY) {
+                log.complain("Unexpected tag of new array value in the reply packet:"
+                            + tag + " (expected: " + JDWP.Tag.ARRAY + ")");
+                success = false;
+            }
+
+            long objectID = 0;
+            try {
+                objectID = ((Long)newArray.getValue()).longValue();
+            } catch (ClassCastException e) {
+                throw new TestBug("Caught ClassCastException vhile extracting objectID from tagged value: "
+                                    + newArray);
+            }
+
+            if (objectID == 0) {
+                log.complain("Null objectID returned for new array value in the reply packet");
+                success = false;
+            }
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract newArray value from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: " + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java
new file mode 100644
index 00000000000..87e544abfd1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ArrayType/NewInstance/newinstance001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ArrayType
+ *         command: NewInstance
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: newinstance001
+ *         debuggee: newinstance001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains arrayTypeIDs for the tested class from debugee.
+ *     Then, debugger creates command packet for ArrayType.NewInstance command
+ *     with the found arrayTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts tagged objectID value of the new created array. Also test
+ *     checks that the tag of the extracted value is ARRAY_ID and objectID is
+ *     not null.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ArrayType.NewInstance.newinstance001
+ *        nsk.jdwp.ArrayType.NewInstance.newinstance001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ArrayType.NewInstance.newinstance001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001a.java
new file mode 100644
index 00000000000..6b7d3021a52
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001a.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ArrayType.NewInstance;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class newinstance001a {
+
+    public static void main(String args[]) {
+        newinstance001a _newinstance001a = new newinstance001a();
+        System.exit(newinstance001.JCK_STATUS_BASE + _newinstance001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested array type is loaded
+        log.display("Creating array of integer");
+        int foo[] = new int[10];
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + newinstance001.READY);
+        pipe.println(newinstance001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + newinstance001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(newinstance001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + newinstance001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return newinstance001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return newinstance001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001.java
new file mode 100644
index 00000000000..ba21914994d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001.java
@@ -0,0 +1,371 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassLoaderReference.VisibleClasses;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ClassLoaderReference.VisibleClasses.
+ *
+ * See visibclasses001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class visibclasses001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ClassLoaderReference.VisibleClasses";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "visibclasses001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ClassLoaderReference.VisibleClasses";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ClassLoaderReference.VisibleClasses;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new visibclasses001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debugee for TypeIDs of classes been nested
+                log.display("Getting classLoaderID for tested classes");
+                long classLoaderID = queryClassLoaderID(classID);
+                log.display("  got classLoaderID: " + classLoaderID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classLoaderID, classID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debugee for classLoaderID for specified classID.
+     */
+    long queryClassLoaderID(long classID) {
+        CommandPacket command =
+                        new CommandPacket(JDWP.Command.ReferenceType.ClassLoader);
+        command.addReferenceTypeID(classID);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        try {
+            reply.resetPosition();
+
+            long classLoaderID = reply.getObjectID();
+            return classLoaderID;
+        } catch (BoundException e) {
+            throw new Failure("Unable to parse reply packet for ReferenceType.ClassLoader:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified classLoaderID.
+     */
+    void testCommand(long classLoaderID, long expectedClassID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        log.display("  classLoaderID: " + classLoaderID);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        command.addObjectID(classLoaderID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check number of nested classes
+        int classes = 0;
+        try {
+            classes = reply.getInt();
+            log.display("  classes: " + classes);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of nested classes from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        if (classes < 0) {
+            log.complain("Negative number of classes in the reply packet:" + classes);
+            success = false;
+        } else if (classes == 0) {
+            log.complain("Zero number of classes in the reply packet:" + classes);
+            success = false;
+        }
+
+        boolean found = false;
+        // extract and check TypeID for each received class
+        for (int i = 0; i < classes; i++ ) {
+                log.display("  class #" + i);
+
+            // extract TypeTag byte
+            byte refTypeTag = (byte)0;
+            String refTypeTagName = null;
+            try {
+                refTypeTag = reply.getByte();
+                String tag;
+                switch (refTypeTag) {
+                    case JDWP.TypeTag.CLASS:
+                        refTypeTagName = "CLASS";
+                        break;
+                    case JDWP.TypeTag.INTERFACE:
+                        refTypeTagName = "INTERFACE";
+                        break;
+                    case JDWP.TypeTag.ARRAY:
+                        refTypeTagName = "ARRAY";
+                        break;
+                    default:
+                        refTypeTagName = "UNKNOWN";
+                        break;
+                }
+                log.display("    refTypeTag: " + refTypeTag + "=" + refTypeTagName);
+            } catch (BoundException e) {
+                log.complain("Unable to extract refTypetag of " + i
+                            + " class from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // extract and check TypeID
+            long typeID = 0;
+            try {
+                typeID = reply.getReferenceTypeID();
+                log.display("    typeID: " + typeID);
+
+            } catch (BoundException e) {
+                log.complain("Unable to extract TypeID of " + i
+                                + " nested class from reply packet:\n\t"
+                                + e.getMessage());
+                success = false;
+                break;
+            }
+
+            if (typeID == expectedClassID) {
+                log.display("Found expected classID: " + expectedClassID);
+                found = true;
+                if (refTypeTag != JDWP.TypeTag.CLASS) {
+                    log.complain("unexpected refTypeTag returned for checked class: "
+                                + refTypeTag + "=" + refTypeTagName
+                                + " (expected: " + JDWP.TypeTag.CLASS + "=CLASS)");
+                    success = false;
+                }
+            }
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: " + reply.offsetString());
+            success = false;
+        }
+
+        if (!found) {
+            log.complain("Expected classID not found in the list of visible classes: " + expectedClassID);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001/TestDescription.java
new file mode 100644
index 00000000000..4fa3829f481
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001/TestDescription.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ClassLoaderReference
+ *         command: VisibleClasses
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     list of classes returned for classObjectID contains at least
+ *     one expected classID.
+ *     Test consists of two compoments:
+ *         debugger: visibclasses001
+ *         debuggee: visibclasses001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID for the tested class and its
+ *     classLoaderID from debugee.
+ *     Then, debugger creates command packet for VisibleClasses command
+ *     with the found classObjectID as an argument, writes packet to the
+ *     transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts list of typeIDs of the visible classes. Also test checks
+ *     that this list includes expected classID of the original class.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ClassLoaderReference.VisibleClasses.visibclasses001
+ *        nsk.jdwp.ClassLoaderReference.VisibleClasses.visibclasses001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ClassLoaderReference.VisibleClasses.visibclasses001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001a.java
new file mode 100644
index 00000000000..2024c012833
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001a.java
@@ -0,0 +1,81 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassLoaderReference.VisibleClasses;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class visibclasses001a {
+
+    public static void main(String args[]) {
+        visibclasses001a _visibclasses001a = new visibclasses001a();
+        System.exit(visibclasses001.JCK_STATUS_BASE + _visibclasses001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + visibclasses001.READY);
+        pipe.println(visibclasses001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + visibclasses001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(visibclasses001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + visibclasses001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return visibclasses001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return visibclasses001.PASSED;
+    }
+
+    // tested class with nested classes
+    public static class TestedClass {
+        int foo = 0;
+        public TestedClass() {
+            foo = 100;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001.java
new file mode 100644
index 00000000000..b894d10c1b0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001.java
@@ -0,0 +1,194 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassObjectReference.ReflectedType;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class reflectype001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ClassObjectReference.ReflectedType";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "reflectype001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ClassObjectReference.ReflectedType";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ClassObjectReference.ReflectedType;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new reflectype001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+
+                    // get referenceTypeID for debugee class
+
+                    long originalTypeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // get classObjectID for originalTypeID
+
+                    long classObjectID = 0;
+                    {
+                        log.display("Getting classObjectID for referenceTypeID: " + originalTypeID);
+
+                        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.ClassObject);
+                        command.addReferenceTypeID(originalTypeID);
+
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+                        classObjectID = reply.getObjectID();
+                        log.display("Found classObjectID: " + classObjectID);
+
+                    }
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with classObjectID: " + classObjectID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addObjectID(classObjectID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    byte refTypeTag = reply.getByte();
+                    log.display("  refTypeTag: " + classObjectID);
+
+                    long typeID = reply.getReferenceTypeID();
+                    log.display("  typeID: " + typeID);
+
+                    if (refTypeTag != JDWP.TypeTag.CLASS) {
+                        log.complain("No JDWP.TypeTag.CLASS tag returned for class object: " + refTypeTag);
+                        success = false;
+                    }
+
+                    if (typeID != originalTypeID) {
+                        log.complain("Returned typeID does not equal to original referenceTypeID: " + originalTypeID);
+                        success = false;
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while connecting to debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001/TestDescription.java
new file mode 100644
index 00000000000..3e24f02d688
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ClassObjectReference
+ *         command: RefelectedType
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test check if
+ *     received referenceTypeID for class object is equal to
+ *     the original one.
+ *     Test consists of two compoments:
+ *         debugger: reflectype001
+ *         debuggee: reflectype001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class and then
+ *     classObjectID, which will be used to test JDWP command.
+ *     Then, debugger creates command packet for RefelectedType command with the
+ *     found classObjectID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts referenceTypeID. Debugger tests also that obtained
+ *     referenceTypeID has the proper tag and is equal to the original one.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     Fixed misprint in package name according to test bug:
+ *     4782469 TEST_RFE: incorrect package name in some JPDA tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ClassObjectReference.ReflectedType.reflectype001
+ *        nsk.jdwp.ClassObjectReference.ReflectedType.reflectype001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ClassObjectReference.ReflectedType.reflectype001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001a.java
new file mode 100644
index 00000000000..aa68ffaca04
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001a.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassObjectReference.ReflectedType;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class reflectype001a {
+
+    public static void main(String args[]) {
+        reflectype001a _reflectype001a = new reflectype001a();
+        System.exit(reflectype001.JCK_STATUS_BASE + _reflectype001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return reflectype001.PASSED;
+    }
+
+    static public class TestedClass {
+        int foo = 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001.java
new file mode 100644
index 00000000000..6ed567a5882
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001.java
@@ -0,0 +1,411 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassType.InvokeMethod;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ClassType.InvokeMethod.
+ *
+ * See invokemeth001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class invokemeth001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names
+    static final String PACKAGE_NAME = "nsk.jdwp.ClassType.InvokeMethod";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "invokemeth001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command
+    static final String JDWP_COMMAND_NAME = "ClassType.InvokeMethod";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ClassType.InvokeMethod;
+
+    // tested class name and signature
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedObjectClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // field and method names
+    static final String RESULT_FIELD_NAME = "result";
+    static final String TESTED_METHOD_NAME = "testedMethod";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE_NUMBER = invokemeth001a.BREAKPOINT_LINE_NUMBER;
+
+    // data for invoked method
+    static final int ARGUMENTS_COUNT = 1;
+    static final int INITIAL_VALUE = invokemeth001a.INITIAL_VALUE;
+    static final int ARGUMENT_VALUE = invokemeth001a.FINAL_VALUE;
+    static final int RETURN_VALUE = INITIAL_VALUE;
+    static final int INVOKE_OPTIONS = 0;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // data obtained from debuggee
+    long classID = 0;
+    long threadID = 0;
+    long methodID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new invokemeth001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();  // minutes
+        timeout = waitTime * 60 * 1000;           // milliseconds
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee VM");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debuggee launched");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for VM_INIT event
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee for testing and obtain required data
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>> Testing JDWP command \n");
+            testCommand();
+
+            // check command results
+            if (success) {
+                log.display("\n>>> Checking result of tested command \n");
+                checkResult();
+            }
+
+            // finish debuggee
+            log.display("\n>> Finishing debuggee \n");
+
+            // resume debuggee after testing command
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for VM_DEATH event
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            log.display("  ... VM_DEATH event received");
+            dead = true;
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            log.display("\n>>> Finishing test \n");
+
+            // disconnect debugee and wait for its exit
+            if (debugee != null) {
+                quitDebugee();
+            }
+        }
+
+        // check result
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+        out.println("TEST PASSED");
+        return PASSED;
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded on debuggee startup and obtain its classID
+        log.display("Waiting for class loaded:\n\t" + TESTED_CLASS_NAME);
+        classID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... class loaded with classID: " + classID);
+        log.display("");
+
+        // query debuggee for tested methodID
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + methodID);
+        log.display("");
+
+        // set breakpoint and wait for debugee reached it
+        log.display("Waiting for breakpoint reached at: "
+                    + BREAKPOINT_METHOD_NAME + ":" +  BREAKPOINT_LINE_NUMBER);
+        threadID = debugee.waitForBreakpointReached(classID,
+                                                BREAKPOINT_METHOD_NAME,
+                                                BREAKPOINT_LINE_NUMBER,
+                                                JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + threadID);
+        log.display("Tested thread is suspended by breakpoint event");
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  classID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        log.display("  arguments: " + ARGUMENTS_COUNT);
+        command.addInt(ARGUMENTS_COUNT);
+        for (int i = 0; i < ARGUMENTS_COUNT; i++) {
+            JDWP.Value value = new JDWP.Value(JDWP.Tag.INT, new Integer(ARGUMENT_VALUE));
+            log.display("    arg: " + value);
+            command.addValue(value);
+        }
+        log.display("  options: " + INVOKE_OPTIONS);
+        command.addInt(INVOKE_OPTIONS);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet for tested command:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // extract return value
+        JDWP.Value returnValue = null;
+        try {
+            returnValue = reply.getValue();
+            log.display("    returnValue: " + returnValue);
+        } catch (BoundException e) {
+            log.complain("Unable to extract returnValues from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract exception tag
+        JDWP.Value exception = null;
+        try {
+            exception = reply.getValue();
+            log.display("    exception: " + exception);
+        } catch (BoundException e) {
+            log.complain("Unable to extract exception from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... packed data parsed");
+
+        // check that return value is an integer
+        if (returnValue.getTag() != JDWP.Tag.INT) {
+            log.complain("Unexpected tag of returnValue returned: " + returnValue.getTag()
+                        + " (expected: " + JDWP.Tag.INT + ")");
+            success = false;
+        }
+
+        // check that return value is as expected
+        int intValue = ((Integer)returnValue.getValue()).intValue();
+        if (intValue != RETURN_VALUE) {
+            log.complain("Unexpected value of returnValue returned: " + intValue
+                        + " (expected: " + RETURN_VALUE + ")");
+            success = false;
+        }
+
+        // check that exception value is an object
+        if (exception.getTag() != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected tag of exception returned: " + exception.getTag()
+                        + " (expected: " + JDWP.Tag.OBJECT + ")");
+            success = false;
+        }
+
+        // check that exception object is null
+        long exceptionID = ((Long)exception.getValue()).longValue();
+        if (exceptionID != 0) {
+            log.complain("Non-null exception object returned: " + exceptionID
+                        + " (expected: " + 0 + ")");
+            success = false;
+        }
+    }
+
+    /**
+     * Check result of the tested JDWP command.
+     */
+    void checkResult() {
+        // query debuggee for result value from a static field
+        log.display("Getting result value from static field: " + RESULT_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(classID, RESULT_FIELD_NAME, JDWP.Tag.INT);
+        int result = ((Integer)value.getValue()).intValue();
+        log.display("  ... got result: " + result);
+
+        // check if the result value is changed as expected
+        if (result != ARGUMENT_VALUE) {
+            log.complain("Method has not been really invoked: \n\t"
+                        + "variable not changed by the method: " + result
+                        + " (expected: " + ARGUMENT_VALUE + ")");
+            success = false;
+        } else {
+            log.display("Method has been really invoked: \n\t"
+                        + " variable changed by the method: " + result
+                        + " (expected: " + ARGUMENT_VALUE + ")");
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001/TestDescription.java
new file mode 100644
index 00000000000..a627e42f003
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ClassType/InvokeMethod/invokemeth001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ClassType
+ *         command: InvokeMethod
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the tested static method is really invoked into debuggee.
+ *     Test consists of two compoments:
+ *         debugger: invokemeth001
+ *         debuggee: invokemeth001a
+ *     First, debugger uses nsk.share.* support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded, requests methodID
+ *     for tested method, sets breakpoint and wait for breakpoint reached.
+ *     When breakpoint event received the tested thread into debuggee
+ *     is suspended by this event.
+ *     Then, debugger creates command packet for ClassType.InvokeMethod
+ *     command with the found classID, methodID, threadID, and also adds
+ *     one integer argument for the method invocation. Then debugger writes
+ *     packet to the transport channel and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts method's result value and exception objectID. Test checks
+ *     if result value is an expected integer and exception objectID is null.
+ *     Also test gets value of static field, wich should be modified by
+ *     the invoked method, to verify if this method was really invoked
+ *     into debuggee.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ClassType.InvokeMethod.invokemeth001
+ *        nsk.jdwp.ClassType.InvokeMethod.invokemeth001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ClassType.InvokeMethod.invokemeth001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001a.java
new file mode 100644
index 00000000000..607f406a190
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001a.java
@@ -0,0 +1,101 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.ClassType.InvokeMethod;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class invokemeth001a {
+
+    // name of the tested thread
+    public static final String THREAD_NAME = "testedThread";
+
+    // line nunber for breakpoint
+    public static final int BREAKPOINT_LINE_NUMBER = 86;
+
+    // initial and final value of variable changed by the method invoked from debugger
+    public static final int INITIAL_VALUE = 10;
+    public static final int FINAL_VALUE = 1234;
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        invokemeth001a _invokemeth001a = new invokemeth001a();
+        System.exit(invokemeth001.JCK_STATUS_BASE + _invokemeth001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested of tested class
+        log.display("Creating object of tested class");
+        TestedObjectClass foo = new TestedObjectClass();
+        log.display("  ... object created");
+
+        // run method with breakpoint
+        TestedObjectClass.run();
+
+        log.display("Debugee PASSED");
+        return invokemeth001.PASSED;
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+        // result of invoking tested mathod
+        public static volatile int result = INITIAL_VALUE;
+
+        // suspend current thread on breakpoint
+        public static void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE_NUMBER
+            log.display("Breakpoint line passed");
+
+            log.display("Tested thread: finished");
+        }
+
+        // tested method for invocation from debugger
+        public static int testedMethod(int arg) {
+            log.display("Tested method invoked with argument:" + arg);
+            int old = result;
+            result = arg;
+            log.display("Tested method returned with result:" + old);
+            return old;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001.java
new file mode 100644
index 00000000000..16ffdb96059
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001.java
@@ -0,0 +1,442 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassType.NewInstance;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ClassType.NewInstance.
+ *
+ * See newinst001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class newinst001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names
+    static final String PACKAGE_NAME = "nsk.jdwp.ClassType.NewInstance";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "newinst001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command
+    static final String JDWP_COMMAND_NAME = "ClassType.NewInstance";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ClassType.NewInstance;
+
+    // tested class name and signature
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedObjectClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // field and method names
+    static final String RESULT_FIELD_NAME = "result";
+    static final String TESTED_CONSTRUCTOR_NAME = "<init>";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE_NUMBER = newinst001a.BREAKPOINT_LINE_NUMBER;
+
+    // data for invoked method
+    static final int ARGUMENTS_COUNT = 1;
+    static final int INITIAL_VALUE = newinst001a.INITIAL_VALUE;
+    static final int ARGUMENT_VALUE = newinst001a.FINAL_VALUE;
+    static final int RETURN_VALUE = INITIAL_VALUE;
+    static final int INVOKE_OPTIONS = 0;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+    boolean dead = false;
+
+    // data obtained from debuggee
+    long classID = 0;
+    long threadID = 0;
+    long methodID = 0;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new newinst001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee VM");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debuggee launched");
+
+            // set timeout for debuggee responces
+            int waitTime = argumentHandler.getWaitTime();  // minutes
+            long timeout = waitTime * 60 * 1000;           // milliseconds
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for VM_INIT event
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // run the test
+            runTest();
+
+            // wait for VM_DEATH event
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            log.display("  ... VM_DEATH event received");
+            dead = true;
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            log.display("\n>>> Finishing test \n");
+
+            // disconnect debugee and wait for its exit
+            if (debugee != null) {
+                quitDebugee();
+            }
+        }
+
+        // check result
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+        out.println("TEST PASSED");
+        return PASSED;
+    }
+
+    /**
+     * Obtain required data and test JDWP command.
+     */
+    void runTest() {
+        log.display("\n>>> Obtaining required data \n");
+
+        // wait for tested class loaded on debuggee startup and obtain its classID
+        log.display("Waiting for class loaded:\n\t" + TESTED_CLASS_NAME);
+        classID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + classID);
+        log.display("");
+
+        // query debuggee for tested methodID
+        log.display("Getting tested methodID by constructor name: " + TESTED_CONSTRUCTOR_NAME);
+        methodID = debugee.getMethodID(classID, TESTED_CONSTRUCTOR_NAME, true);
+        log.display("  ... got methodID: " + methodID);
+        log.display("");
+
+        // set breakpoint and wait for debugee reached it
+        log.display("Waiting for breakpoint reached at: "
+                    + BREAKPOINT_METHOD_NAME + ":" +  BREAKPOINT_LINE_NUMBER);
+        threadID = debugee.waitForBreakpointReached(classID,
+                                                BREAKPOINT_METHOD_NAME,
+                                                BREAKPOINT_LINE_NUMBER,
+                                                JDWP.SuspendPolicy.EVENT_THREAD);
+        log.display("  ... breakpoint reached with threadID: " + threadID);
+
+        // test JDWP command
+        log.display("\n>> Testing JDWP command \n");
+        testCommand();
+
+        // check command results
+        if (success) {
+            log.display("\n>>> Checking command results \n");
+            checkResult();
+        }
+
+        // resume debuggee after the command
+        log.display("Resuming debuggee");
+        debugee.resume();
+        log.display("  ... debuggee resumed");
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  classID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        log.display("  arguments: " + ARGUMENTS_COUNT);
+        command.addInt(ARGUMENTS_COUNT);
+        for (int i = 0; i < ARGUMENTS_COUNT; i++) {
+            JDWP.Value value = new JDWP.Value(JDWP.Tag.INT, new Integer(ARGUMENT_VALUE));
+            log.display("    arg: " + value);
+            command.addValue(value);
+        }
+        log.display("  options: " + INVOKE_OPTIONS);
+        command.addInt(INVOKE_OPTIONS);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet for tested command:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // extract return value
+        JDWP.Value newObject = null;
+        try {
+            newObject = reply.getValue();
+            log.display("    newObject: " + newObject);
+        } catch (BoundException e) {
+            log.complain("Unable to extract returnValues from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract exception tag
+        JDWP.Value exception = null;
+        try {
+            exception = reply.getValue();
+            log.display("    exception: " + exception);
+        } catch (BoundException e) {
+            log.complain("Unable to extract exception from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... packed data parsed");
+
+        // check that return value is an integer
+        if (newObject.getTag() != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected tag of returnValue returned: " + newObject.getTag()
+                        + " (expected: " + JDWP.Tag.OBJECT + ")");
+            success = false;
+        }
+
+        // check that return value is as expected
+        long newObjectID = ((Long)newObject.getValue()).longValue();
+        if (newObjectID == 0) {
+            log.complain("Unexpected null objectID for newObject value returned: "
+                        + newObjectID + " (expected: not " + 0 + ")");
+            success = false;
+        }
+
+        // check that exception value is an object
+        if (exception.getTag() != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected tag of exception returned: " + exception.getTag()
+                        + " (expected: " + JDWP.Tag.OBJECT + ")");
+            success = false;
+        }
+
+        // check that exception object is null
+        long exceptionID = ((Long)exception.getValue()).longValue();
+        if (exceptionID != 0) {
+            log.complain("Not null objectID for exception value returned: " + exceptionID
+                        + " (expected: " + 0 + ")");
+            success = false;
+        }
+    }
+
+    /**
+     * Check result of the tested JDWP command.
+     */
+    void checkResult() {
+        // query debuggee for result value from a static field
+        log.display("Getting result value from static field: " + RESULT_FIELD_NAME);
+        int result = queryInt(classID, RESULT_FIELD_NAME, JDWP.Tag.INT);
+        log.display("  ... got result: " + result);
+
+        // check if the result value is changed as expected
+        if (result != ARGUMENT_VALUE) {
+            log.complain("Method has not been really invoked: \n\t"
+                        + "variable not changed by the method: " + result
+                        + " (expected: " + ARGUMENT_VALUE + ")");
+            success = false;
+        } else {
+            log.display("Method has been really invoked: \n\t"
+                        + " variable changed by the method: " + result
+                        + " (expected: " + ARGUMENT_VALUE + ")");
+        }
+    }
+
+    /**
+     * Query debuggee for value of static field of the class.
+     */
+    JDWP.Value queryFieldValue(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            log.complain("unexpedted value tag returned from debuggee: " + value.getTag()
+                        + " (expected: " + tag + ")");
+            throw new Failure("Error occured while getting value from static field: "
+                            + fieldName);
+        }
+
+        return value;
+    }
+
+    /**
+     * Query debuggee for objectID value of static field of the class.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        JDWP.Value value = queryFieldValue(classID, fieldName, tag);
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Query debuggee for int value of static field of the class.
+     */
+    int queryInt(long classID, String fieldName, byte tag) {
+        JDWP.Value value = queryFieldValue(classID, fieldName, tag);
+        int intValue = ((Integer)value.getValue()).intValue();
+        return intValue;
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debuggee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally dispose debuggee:\n\t" + e.getMessage());
+            }
+        }
+
+        // wait for debugee exits
+        log.display("Waiting for debuggee exits");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee finished with exit code: " + code);
+
+        // analize debuggee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001/TestDescription.java
new file mode 100644
index 00000000000..a0e82b842f1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ClassType/NewInstance/newinst001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ClassType
+ *         command: NewInstance
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the tested constructor is really invoked into debuggee.
+ *     Test consists of two compoments:
+ *         debugger: newinst001
+ *         debuggee: newinst001a
+ *     First, debugger uses nsk.share.* support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded, requests methodID
+ *     for tested constructtor, sets breakpoint and wait for breakpoint reached.
+ *     When breakpoint event is received the tested thread into debuggee
+ *     is suspended by this event.
+ *     Then, debugger creates command packet for classType.NewInstance
+ *     command with the found classID, methodID, threadID, and also adds one
+ *     integer argument for the constructor invocation. Then debugger writes
+ *     packet to the transport channel and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts tegged objectID's of new created object and exception.
+ *     Test checks if objectID is not null and exception objectID is null.
+ *     Also test gets value of static field, wich should be modified by
+ *     the invoked constructor, to verify if this constructor was really
+ *     invoked into debuggee.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ClassType.NewInstance.newinst001
+ *        nsk.jdwp.ClassType.NewInstance.newinst001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ClassType.NewInstance.newinst001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001a.java
new file mode 100644
index 00000000000..45c7be9ae81
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001a.java
@@ -0,0 +1,104 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.ClassType.NewInstance;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class newinst001a {
+
+    // name of the tested thread
+    public static final String THREAD_NAME = "testedThread";
+
+    // line nunber for breakpoint
+    public static final int BREAKPOINT_LINE_NUMBER = 88;
+
+    // initial and final value of variable changed by the method invoked from debugger
+    public static final int INITIAL_VALUE = 10;
+    public static final int FINAL_VALUE = 1234;
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        newinst001a _newinst001a = new newinst001a();
+        System.exit(newinst001.JCK_STATUS_BASE + _newinst001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested of tested class
+        log.display("Accessing to tested class");
+        TestedObjectClass.foo = 100;
+        log.display("  ... class loaded");
+
+        // invoke method with breakpoint
+        TestedObjectClass.run();
+
+        log.display("Debugee PASSED");
+        return newinst001.PASSED;
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+        public static int foo = 0;
+
+        // result of invoking tested mathod
+        public static volatile int result = INITIAL_VALUE;
+
+        // suspend current thread on on breakpoint
+        public static void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE_NUMBER
+            log.display("Breakpoint line passed");
+
+            log.display("Tested thread: finished");
+        }
+
+        // tested constructor for invokation from debugger
+        public TestedObjectClass(int arg) {
+            log.display("Tested constructor invoked with argument:" + arg);
+            if (arg != FINAL_VALUE) {
+                log.complain("Unexpected value of constructor argument: " + arg
+                            + " (expected: " + FINAL_VALUE + ")");
+            }
+            result = arg;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001.java
new file mode 100644
index 00000000000..7931560a853
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001.java
@@ -0,0 +1,426 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassType.SetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ClassType.SetValues.
+ *
+ * See setvalues001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class setvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String RUN = "run";
+    static final String DONE = "done";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ClassType.SetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "setvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ClassType.SetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ClassType.SetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // target values class name and signature constants
+    static final String TARGET_VALUES_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TargetValuesClass";
+    static final String TARGET_VALUES_CLASS_SIGNATURE = "L" + TARGET_VALUES_CLASS_NAME.replace('.', '/') + ";";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new setvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for classID for the class with target values
+                log.display("Getting classID for class with target values by signature:\n"
+                            + "  " + TARGET_VALUES_CLASS_SIGNATURE);
+                long targetValuesClassID =
+                            debugee.getReferenceTypeID(TARGET_VALUES_CLASS_SIGNATURE);
+                log.display("  got classID: " + targetValuesClassID);
+
+                // query debugee for fieldIDs of the class static fields
+                log.display("Getting fieldIDs for static fields of the class");
+                long targetValuesFieldIDs[] = queryClassFieldIDs(targetValuesClassID);
+                log.display("  got fields: " + targetValuesFieldIDs.length);
+                int count = targetValuesFieldIDs.length;
+
+                // query debugee for values of the fields
+                log.display("Getting values of the static fields");
+                JDWP.Value targetValues[] =
+                        queryClassFieldValues(targetValuesClassID, targetValuesFieldIDs);
+                log.display("  got values: " + targetValues.length);
+                if (targetValues.length != count) {
+                    throw new Failure("Unexpected number of static fields values received: "
+                                    + targetValues.length + "(expected: " + count + ")");
+                }
+
+                // query debugee for classID of the tested class
+                log.display("Getting tested classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long testedClassID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + testedClassID);
+
+                // query debugee for fieldIDs of tested class static fields
+                log.display("Getting fieldIDs for static fields of the tested class");
+                long testedFieldIDs[] = queryClassFieldIDs(testedClassID);
+                log.display("  got fields: " + testedFieldIDs.length);
+                if (testedFieldIDs.length != count) {
+                    throw new Failure("Unexpected number of static fields of tested class received: "
+                                    + testedFieldIDs.length + "(expected: " + count + ")");
+                }
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(testedClassID, testedFieldIDs, targetValues);
+
+                // check confirmation from debuggee that values have been set properly
+                log.display("\n>>> Checking that the values have been set properly \n");
+                checkValuesChanged();
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debugee for fieldID's of the class static fields.
+     */
+    long[] queryClassFieldIDs(long classID) {
+        // compose ReferenceType.Fields command packet
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+        command.addReferenceTypeID(classID);
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract fieldIDs from the reply packet
+        try {
+            reply.resetPosition();
+
+            int declared = reply.getInt();
+            long[] fieldIDs = new long[declared];
+
+            for (int i = 0; i < declared; i++ ) {
+                long fieldID = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                fieldIDs[i] = fieldID;
+            }
+            return fieldIDs;
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.Fields command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fieldIDs for classID: " + classID);
+        }
+    }
+
+    /**
+     * Query debugee for values of the class static fields.
+     */
+    JDWP.Value[] queryClassFieldValues(long classID, long fieldIDs[]) {
+        // compose ReferenceType.Fields command packet
+        int count = fieldIDs.length;
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.GetValues);
+        command.addReferenceTypeID(classID);
+        command.addInt(count);
+        for (int i = 0; i < count; i++) {
+            command.addFieldID(fieldIDs[i]);
+        }
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract values from the reply packet
+        try {
+            reply.resetPosition();
+
+            int valuesCount = reply.getInt();
+            JDWP.Value values[] = new JDWP.Value[valuesCount];
+            for (int i = 0; i < valuesCount; i++ ) {
+                JDWP.Value value = reply.getValue();
+                values[i] = value;
+            }
+            return values;
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.GetValues command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fields values for classID: " + classID);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified classID.
+     */
+    void testCommand(long classID, long fieldIDs[], JDWP.Value values[]) {
+        int count = fieldIDs.length;
+
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  classID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  values: " + count);
+        command.addInt(count);
+        for (int i = 0; i < count; i++) {
+            log.display("    field #" + i +":");
+            log.display("      fieldID: " + fieldIDs[i]);
+            command.addFieldID(fieldIDs[i]);
+
+            JDWP.Value value = values[i];
+            JDWP.UntaggedValue untaggedValue =
+                    new JDWP.UntaggedValue(value.getValue());
+            log.display("      untagged_value: " + untaggedValue.getValue());
+            command.addUntaggedValue(untaggedValue, value.getTag());
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no data to extract
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+    /**
+     * Check confiramtion from debuggee that values are changed.
+     */
+    void checkValuesChanged() {
+        // send debugee signal RUN
+        log.display("Sending signal to debugee: " + RUN);
+        pipe.println(RUN);
+
+        // wait for DONE signal from debugee
+        log.display("Waiting for signal from debugee: " + DONE);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        // check received signal
+        if (signal == null) {
+            throw new TestBug("<null> signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        } else if (signal.equals(DONE)) {
+            log.display("All static fields values have been correctly set into debuggee VM");
+        } else if (signal.equals(ERROR)) {
+            log.complain("Not all static fields values have been correctly set into debuggee VM");
+            success = false;
+        } else {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001/TestDescription.java
new file mode 100644
index 00000000000..1f0dbf79d99
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001/TestDescription.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ClassType/SetValues/setvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ClassType
+ *         command: SetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the values are correctly set to debuggee class fields.
+ *     Test consists of two compoments:
+ *         debugger: setvalues001
+ *         debuggee: setvalues001a
+ *     To set values to the static fields of the tested class
+ *     and check that they are set correctly, test defines
+ *     following classes into debuggee VM:
+ *         OriginalValuesClass - with original values of static fields
+ *         TargetValuesClass - with target values of static fields
+ *         TestedClass - tested class with static fields to set values to
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains classIDs for the tested class and class with
+ *     the target values from debugee, it obtains also fieldIDs for thess
+ *     classese and target values of the fields.
+ *     Then, debugger creates command packet for SetValues command with the
+ *     found referenceTypeID and list of fieldIDs as arguments, writes packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and and checks that there is no data in the reply packet.
+ *     Then debugger sends signal RUN to debuggee to ask it to verify
+ *     new fields values of tested class. Debuggee compares compares
+ *     these values with original and terget values and sends ERROR signal
+ *     to debugger if the values was not set correctly.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ClassType.SetValues.setvalues001
+ *        nsk.jdwp.ClassType.SetValues.setvalues001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ClassType.SetValues.setvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001a.java
new file mode 100644
index 00000000000..ff3eb2789d4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001a.java
@@ -0,0 +1,334 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassType.SetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part of the test.
+ */
+public class setvalues001a {
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        setvalues001a _setvalues001a = new setvalues001a();
+        System.exit(setvalues001.JCK_STATUS_BASE + _setvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        // make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of all required classes");
+        OriginalValuesClass original = new OriginalValuesClass();
+        TargetValuesClass target = new TargetValuesClass();
+        TestedClass tested = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + setvalues001.READY);
+        pipe.println(setvalues001.READY);
+
+        // wait for signal RUN from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.RUN);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+        // check received signal
+        if (signal == null || !signal.equals(setvalues001.RUN)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.RUN + ")");
+            log.display("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // check assigned values
+        if (checkValues()) {
+            log.display("Sending signal to debugger: " + setvalues001.DONE);
+            pipe.println(setvalues001.DONE);
+        } else {
+            log.display("Sending signal to debugger: " + setvalues001.ERROR);
+            pipe.println(setvalues001.ERROR);
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.QUIT);
+        signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+        // check received signal
+        if (! signal.equals(setvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return setvalues001.PASSED;
+    }
+
+    // check values of static fields for both classes
+    static boolean checkValues() {
+        int different = 0;
+        log.display("Checking that values have been set correctly:");
+
+        // check value of the field
+        if (TestedClass.booleanValue != TargetValuesClass.booleanValue) {
+            different++;
+            log.complain("  booleanValue = " + TestedClass.booleanValue + "\n"
+                       + "    setting: " + OriginalValuesClass.booleanValue
+                                + " -> " + TargetValuesClass.booleanValue);
+            if (TestedClass.booleanValue == OriginalValuesClass.booleanValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  booleanValue: " + OriginalValuesClass.booleanValue
+                                    + " -> " + TargetValuesClass.booleanValue);
+        }
+
+        // check value of the field
+        if (TestedClass.byteValue != TargetValuesClass.byteValue) {
+            different++;
+            log.complain("  byteValue = " + TestedClass.byteValue + "\n"
+                       + "    setting: " + OriginalValuesClass.byteValue
+                                + " -> " + TargetValuesClass.byteValue);
+            if (TestedClass.byteValue == OriginalValuesClass.byteValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  byteValue: " + OriginalValuesClass.byteValue
+                                    + " -> " + TargetValuesClass.byteValue);
+        }
+
+        // check value of the field
+        if (TestedClass.charValue != TargetValuesClass.charValue) {
+            different++;
+            log.complain("  charValue = " + TestedClass.charValue + "\n"
+                       + "    setting: " + OriginalValuesClass.charValue
+                                + " -> " + TargetValuesClass.charValue);
+            if (TestedClass.charValue == OriginalValuesClass.charValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  charValue: " + OriginalValuesClass.charValue
+                                    + " -> " + TargetValuesClass.charValue);
+        }
+
+        // check value of the field
+        if (TestedClass.intValue != TargetValuesClass.intValue) {
+            different++;
+            log.complain("  intValue = " + TestedClass.intValue + "\n"
+                       + "    setting: " + OriginalValuesClass.intValue
+                                + " -> " + TargetValuesClass.intValue);
+            if (TestedClass.intValue == OriginalValuesClass.intValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  intValue: " + OriginalValuesClass.intValue
+                                    + " -> " + TargetValuesClass.intValue);
+        }
+
+        // check value of the field
+        if (TestedClass.shortValue != TargetValuesClass.shortValue) {
+            different++;
+            log.complain("  shortValue = " + TestedClass.shortValue + "\n"
+                       + "    setting: " + OriginalValuesClass.shortValue
+                                + " -> " + TargetValuesClass.shortValue);
+            if (TestedClass.shortValue == OriginalValuesClass.shortValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  shortValue: " + OriginalValuesClass.shortValue
+                                    + " -> " + TargetValuesClass.shortValue);
+        }
+        // check value of the field
+        if (TestedClass.longValue != TargetValuesClass.longValue) {
+            different++;
+            log.complain("  longValue = " + TestedClass.longValue + "\n"
+                       + "    setting: " + OriginalValuesClass.longValue
+                                + " -> " + TargetValuesClass.longValue);
+            if (TestedClass.longValue == OriginalValuesClass.longValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  longValue: " + OriginalValuesClass.longValue
+                                    + " -> " + TargetValuesClass.longValue);
+        }
+        // check value of the field
+        if (TestedClass.floatValue != TargetValuesClass.floatValue) {
+            different++;
+            log.complain("  floatValue = " + TestedClass.floatValue + "\n"
+                       + "    setting: " + OriginalValuesClass.floatValue
+                                + " -> " + TargetValuesClass.floatValue);
+            if (TestedClass.floatValue == OriginalValuesClass.floatValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  floatValue: " + OriginalValuesClass.floatValue
+                                    + " -> " + TargetValuesClass.floatValue);
+        }
+        // check value of the field
+        if (TestedClass.doubleValue != TargetValuesClass.doubleValue) {
+            different++;
+            log.complain("  doubleValue = " + TestedClass.doubleValue + "\n"
+                       + "    setting: " + OriginalValuesClass.doubleValue
+                                + " -> " + TargetValuesClass.doubleValue);
+            if (TestedClass.doubleValue == OriginalValuesClass.doubleValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  doubleValue: " + OriginalValuesClass.doubleValue
+                                    + " -> " + TargetValuesClass.doubleValue);
+        }
+
+        // check value of the field
+        if (TestedClass.stringValue != TargetValuesClass.stringValue) {
+            different++;
+            log.complain("  stringValue = " + TestedClass.stringValue + "\n"
+                       + "    setting: " + OriginalValuesClass.stringValue
+                                + " -> " + TargetValuesClass.stringValue);
+            if (TestedClass.stringValue == OriginalValuesClass.stringValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  stringValue: " + OriginalValuesClass.stringValue
+                                    + " -> " + TargetValuesClass.stringValue);
+        }
+
+        // check value of the field
+        if (TestedClass.objectValue != TargetValuesClass.objectValue) {
+            different++;
+            log.complain("  objectValue = " + TestedClass.objectValue + "\n"
+                       + "    setting: " + OriginalValuesClass.objectValue
+                                + " -> " + TargetValuesClass.objectValue);
+            if (TestedClass.objectValue == OriginalValuesClass.objectValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  objectValue: " + OriginalValuesClass.objectValue
+                                    + " -> " + TargetValuesClass.objectValue);
+        }
+
+/*
+        // check value of the field
+        if (TestedClass.Value != TargetValuesClass.Value) {
+            different++;
+            log.complain("  Value = " + TestedClass.Value + "\n"
+                       + "    setting: " + OriginalValuesClass.Value
+                                + " -> " + TargetValuesClass.Value);
+            if (TestedClass.Value == OriginalValuesClass.Value) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  Value: " + OriginalValuesClass.Value
+                                    + " -> " + TargetValuesClass.Value);
+        }
+*/
+
+        // check taht no any changed value differs from target
+        if (different > 0) {
+            log.complain("Values of " + different + " fields have not been set correctly");
+            return false;
+        }
+
+        log.display("Values of all fields have been set correctly");
+        return true;
+    }
+
+    // class with the original values of static fields
+    public static class OriginalValuesClass {
+        static final boolean booleanValue = true;
+        static final byte    byteValue    = (byte)0x01;
+        static final char    charValue    = 'Z';
+        static final int     intValue     = 100;
+        static final short   shortValue   = (short)10;
+        static final long    longValue    = (long)1000000;
+        static final float   floatValue   = (float)3.14;
+        static final double  doubleValue  = (double)2.8e-12;
+        static final String  stringValue  = "text";
+        static final Object  objectValue  = new OriginalValuesClass();
+    }
+
+    // class with the original values of static fields
+    public static class TargetValuesClass {
+        static final boolean booleanValue = false;
+        static final byte    byteValue    = (byte)0x0F;
+        static final char    charValue    = 'A';
+        static final int     intValue     = 999;
+        static final short   shortValue   = (short)88;
+        static final long    longValue    = (long)11111111;
+        static final float   floatValue   = (float)7.19;
+        static final double  doubleValue  = (double)4.6e24;
+        static final String  stringValue  = "new text";
+        static final Object  objectValue  = new TargetValuesClass();
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+        private   static boolean  booleanValue = OriginalValuesClass.booleanValue;
+        private   static byte     byteValue    = OriginalValuesClass.byteValue;
+        protected static char     charValue    = OriginalValuesClass.charValue;
+        protected static int      intValue     = OriginalValuesClass.intValue;
+        public    static short    shortValue   = OriginalValuesClass.shortValue;
+        public    static long     longValue    = OriginalValuesClass.longValue;
+                  static float    floatValue   = OriginalValuesClass.floatValue;
+                  static double   doubleValue  = OriginalValuesClass.doubleValue;
+                  static String   stringValue  = OriginalValuesClass.stringValue;
+                  static Object   objectValue  = OriginalValuesClass.objectValue;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001.java
new file mode 100644
index 00000000000..1e46507079e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001.java
@@ -0,0 +1,282 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassType.Superclass;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ClassType.Superclass.
+ *
+ * See superclass001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class superclass001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ClassType.Superclass";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "superclass001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ClassType.Superclass";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ClassType.Superclass;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // tested superclass name and signature constants
+    static final String TESTED_SUPERCLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "Superclass";
+    static final String TESTED_SUPERCLASS_SIGNATURE = "L" + TESTED_SUPERCLASS_NAME.replace('.', '/') + ";";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new superclass001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for classID of tested class
+                log.display("Getting classID of tested class by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debugee for classID of tested superclass
+                log.display("Getting classID of tested superclass by signature:\n"
+                            + "  " + TESTED_SUPERCLASS_SIGNATURE);
+                long superclassID = debugee.getReferenceTypeID(TESTED_SUPERCLASS_SIGNATURE);
+                log.display("  got classID: " + superclassID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classID, superclassID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified classID's.
+     */
+    void testCommand(long classID, long superclassID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        log.display("  ClassID: " + classID);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        command.addReferenceTypeID(classID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check superclass ID
+        try {
+            long superclass = reply.getReferenceTypeID();
+            log.display("  superclass: " + superclass);
+
+            if (superclass != superclassID) {
+                log.complain("Unexpected classID for superclass in the reply packet:" + superclass
+                            + " (expected: " + superclassID + ")");
+                success = false;
+            }
+        } catch (BoundException e) {
+            log.complain("Unable to extract superclass ID from reply packet:\n" + e.getMessage());
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001/TestDescription.java
new file mode 100644
index 00000000000..ec46917afbc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ClassType/Superclass/superclass001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ClassType
+ *         command: Superclass
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test check that the
+ *     returned classID for a superclass is equal to the expected one.
+ *     Test consists of two compoments:
+ *         debugger: superclass001
+ *         debuggee: superclass001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger prepares for testing JDWP command and obtains
+ *     classID's for the tested class and its superclass.
+ *     Then, debugger creates command packet for Superclass command with the
+ *     found classID as an argument, writes packet to the transport channel,
+ *     and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts classID of a superclass. Also test checks that extracted
+ *     classID for a superclass is equal to the expected one.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ClassType.Superclass.superclass001
+ *        nsk.jdwp.ClassType.Superclass.superclass001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ClassType.Superclass.superclass001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001a.java
new file mode 100644
index 00000000000..7f3ae84f95c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001a.java
@@ -0,0 +1,95 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ClassType.Superclass;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class superclass001a {
+
+    public static void main(String args[]) {
+        superclass001a _superclass001a = new superclass001a();
+        System.exit(superclass001.JCK_STATUS_BASE + _superclass001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + superclass001.READY);
+        pipe.println(superclass001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + superclass001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(superclass001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + superclass001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return superclass001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return superclass001.PASSED;
+    }
+
+    // indirect superclass for tested class
+    public static class IndirectSuperclass {
+        int foo = 0;
+        public IndirectSuperclass() {
+            foo = 100;
+        }
+    }
+
+    // direct superclass for tested class
+    public static class Superclass extends IndirectSuperclass {
+        public Superclass() {
+            super();
+        }
+    }
+
+    // tested class
+    public static class TestedClass extends Superclass {
+        public TestedClass() {
+            super();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001.java
new file mode 100644
index 00000000000..60b926256ad
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001.java
@@ -0,0 +1,653 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.BREAKPOINT;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: BREAKPOINT.
+ *
+ * See breakpoint001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class breakpoint001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.BREAKPOINT";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "breakpoint001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.BREAKPOINT;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = breakpoint001a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new breakpoint001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+
+            // request tested event
+            log.display("Making request for BREAKPOINT event at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested BREAKPOINT event
+            log.display("Waiting for BREAKPOINT event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // check if event is for expected thread
+            if (success) {
+                log.display("Checking thread of BREAKPOINT event");
+                checkThread();
+                log.display("");
+            }
+
+
+            // clear tested request for BREAKPOINT event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for tested method
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for breakpoint line
+        log.display("Getting codeIndex for breakpoint line: " + BREAKPOINT_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, BREAKPOINT_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for breakpoint
+        log.display("Creating location for breakpoint request");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+    }
+
+    /**
+     * Make request for tested BREAKPOINT event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.LOCATION_ONLY);
+        command.addByte(JDWP.EventModifierKind.LOCATION_ONLY);
+        log.display("      location: " + testedLocation);
+        command.addLocation(testedLocation);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested BREAKPOINT event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested BREAKPOINT event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.BREAKPOINT + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.BREAKPOINT) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.BREAKPOINT + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // save threadID for further checking
+            testedThreadID = threadID;
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            if (location.getTag() != testedLocation.getTag()) {
+                log.complain("Unexpected class tag of location of event " + i
+                            + " in tested event packet: " + location.getTag()
+                            + " (expected: " + testedLocation.getTag() + ")");
+                success = false;
+            }
+            if (location.getClassID() != testedLocation.getClassID()) {
+                log.complain("Unexpected classID of location of event " + i
+                            + " in tested event packet: " + location.getClassID()
+                            + " (expected: " + testedLocation.getClassID() + ")");
+                success = false;
+            }
+            if (location.getMethodID() != testedLocation.getMethodID()) {
+                log.complain("Unexpected methodID of location of event " + i
+                            + " in tested event packet: " + location.getMethodID()
+                            + " (expected: " + testedLocation.getMethodID() + ")");
+                success = false;
+            }
+            if (location.getIndex() != testedLocation.getIndex()) {
+                log.complain("Unexpected codeIndex of location of event " + i
+                            + " in tested event packet: " + location.getIndex()
+                            + " (expected: " + testedLocation.getIndex() + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Check if threadID received by BREAKPOINT event is as expected one.
+     */
+    void checkThread() {
+        // get thread value from static field of tested class
+        log.display("Getting thread value from static field: " + THREAD_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID, THREAD_FIELD_NAME,
+                                                                        JDWP.Tag.THREAD);
+        long threadID = ((Long)value.getValue()).longValue();
+        log.display("  ... got threadID: " + testedThreadID);
+
+        // check threadID
+        if (threadID != testedThreadID) {
+            log.complain("Unexpected threadID of BREAKPOINT event received: " +
+                        testedThreadID + " (expected: " + threadID + ")");
+            success = false;
+        } else {
+            log.display("Received threadID is as expected");
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001/TestDescription.java
new file mode 100644
index 00000000000..cbfacd5c6cd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/BREAKPOINT/breakpoint001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: BREAKPOINT
+ *     Test checks that
+ *         1) debuggee successfully creates BREAKPOINT event request
+ *            for particular location
+ *         2) expected BREAKPOINT event is received when the thread
+ *            reaches breakpoint and has correct attributes
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: breakpoint001
+ *         debuggee: breakpoint001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and makes BREAKPOINT
+ *     event request for location into method run() of the tested thread,
+ *     When event is received debugger checks if the received event
+ *     is for this location and has correct attributes. Then debugger
+ *     removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.BREAKPOINT.breakpoint001
+ *        nsk.jdwp.Event.BREAKPOINT.breakpoint001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.BREAKPOINT.breakpoint001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001a.java
new file mode 100644
index 00000000000..537c75014af
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001a.java
@@ -0,0 +1,97 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.BREAKPOINT;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class breakpoint001a {
+
+    static final int BREAKPOINT_LINE = 91;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        breakpoint001a _breakpoint001a = new breakpoint001a();
+        System.exit(breakpoint001.JCK_STATUS_BASE + _breakpoint001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass.thread = new TestedClass(breakpoint001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        TestedClass.thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            TestedClass.thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return breakpoint001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return breakpoint001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public static volatile TestedClass thread = null;
+
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+            log.display("Tested thread: finished");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001.java
new file mode 100644
index 00000000000..4bb0add7c65
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001.java
@@ -0,0 +1,607 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.CLASS_PREPARE;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: CLASS_PREPARE.
+ *
+ * See clsprepare001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class clsprepare001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.CLASS_PREPARE";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "clsprepare001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.CLASS_PREPARE;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new clsprepare001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // make request for CLASS_PREPARE event
+            log.display("\n>>> Making request for tested event \n");
+
+            log.display("Making request for CLASS_PREPARE event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for tested CLASS_PREPARE event
+            log.display("\n>>> Testing JDWP event \n");
+            waitForTestedEvent();
+
+            // clear tested request for CLASS_PREPARE event
+            log.display("\n>>> Clearing request for tested event \n");
+            clearTestedRequest();
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Make request for tested CLASS_PREPARE event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.CLASS_MATCH);
+        command.addByte(JDWP.EventModifierKind.CLASS_MATCH);
+        log.display("      classPattern: " + TESTED_CLASS_NAME);
+        command.addString(TESTED_CLASS_NAME);
+        command.setLength();
+        log.display("  ... command packet composed");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested CLASS_PREPARE event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested CLASS_PREPARE event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet (for " + timeout + "ms timeout)");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind != JDWP.EventKind.CLASS_PREPARE) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.CLASS_PREPARE + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID == 0) {
+                log.complain("Unexpected null threadID of event " + i + " in tested event packet: " +
+                            threadID);
+                success = false;
+            }
+
+            // get refTypeTag
+            byte refTypeTag = 0;
+            try {
+                refTypeTag = eventPacket.getByte();
+                log.display("      refTypeTag: " + refTypeTag);
+            } catch (BoundException e) {
+                log.complain("Unable to get refTypeTag of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check refTypeGag
+            if (refTypeTag != JDWP.TypeTag.CLASS) {
+                log.complain("Unexpected refTypeTag of event " + i + " in tested event packet: " +
+                            refTypeTag + " (expected: " + JDWP.TypeTag.CLASS + ")");
+                success = false;
+            }
+
+            // get referenceTypeID
+            long referenceTypeID = 0;
+            try {
+                referenceTypeID = eventPacket.getReferenceTypeID();
+                log.display("      referenceTypeID: " + referenceTypeID);
+            } catch (BoundException e) {
+                log.complain("Unable to get referenceTypeID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check referenceTypeID
+            if (referenceTypeID == 0) {
+                log.complain("Unexpected null referenceTypeID of event " + i + " in tested event packet: " +
+                            referenceTypeID);
+                success = false;
+            }
+
+            // get signature
+            String signature = null;
+            try {
+                signature = eventPacket.getString();
+                log.display("      signature: " + signature);
+            } catch (BoundException e) {
+                log.complain("Unable to get class signature of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check signature
+            if (!signature.equals(TESTED_CLASS_SIGNATURE)) {
+                log.complain("Unexpected class signature of event " + i + " in tested event packet: " +
+                            signature + " (expected: " + TESTED_CLASS_SIGNATURE + ")");
+                success = false;
+            }
+
+            // get status
+            int status = 0;
+            try {
+                status = eventPacket.getInt();
+                log.display("      status: " + status);
+            } catch (BoundException e) {
+                log.complain("Unable to get class status of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check status
+            if ((status & JDWP.ClassStatus.ERROR) != 0) {
+                log.complain("Unexpected class status of event " + i + " in tested event packet: " +
+                            status + " (expected: w/o bit " + JDWP.ClassStatus.ERROR + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001/TestDescription.java
new file mode 100644
index 00000000000..cc404ab44ce
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/CLASS_PREPARE/clsprepare001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: CLASS_PREPARE
+ *     Test checks that
+ *         1) debuggee successfully creates CLASS_PREPARE event request
+ *            for tested class name
+ *         2) expected CLASS_PREPARE event is received when this class
+ *            is loaded at the debuggee's startup.
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: thrstart001
+ *         debuggee: thrstart001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger makes CLASS_PREPARE event request for tested class
+ *     and resumes debuggee to permit it to load classes.
+ *     When expected CLASS_PREPARE event is received debugger checks
+ *     if this event is for tested class and has correct attributes.
+ *     Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.CLASS_PREPARE.clsprepare001
+ *        nsk.jdwp.Event.CLASS_PREPARE.clsprepare001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.CLASS_PREPARE.clsprepare001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001a.java
new file mode 100644
index 00000000000..2cd7596e28c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001a.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.CLASS_PREPARE;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class clsprepare001a {
+
+    public static void main(String args[]) {
+        clsprepare001a _clsprepare001a = new clsprepare001a();
+        System.exit(clsprepare001.JCK_STATUS_BASE + _clsprepare001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("  ... object created");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return clsprepare001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001.java
new file mode 100644
index 00000000000..ba6905a68bd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001.java
@@ -0,0 +1,540 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.CLASS_UNLOAD;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: CLASS_UNLOAD.
+ *
+ * See clsunload001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class clsunload001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.CLASS_UNLOAD";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "clsunload001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.CLASS_UNLOAD;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new clsunload001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // make request for CLASS_UNLOAD event
+            log.display("\n>>> Making request for tested event \n");
+
+            log.display("Making request for CLASS_UNLOAD event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for tested CLASS_UNLOAD event
+            log.display("\n>>> Testing JDWP event \n");
+            waitForTestedEvent();
+
+            if (!dead) {
+                // clear tested request for CLASS_UNLOAD event
+                log.display("\n>>> Clearing request for tested event \n");
+                clearTestedRequest();
+
+                // finish debuggee after testing
+                log.display("\n>>> Finishing debuggee \n");
+
+                // resume debuggee
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+
+                // wait for debuggee exited
+                log.display("Waiting for VM_DEATH event");
+                debugee.waitForVMDeath();
+                dead = true;
+                log.display("  ... VM_DEATH event received");
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Make request for tested CLASS_UNLOAD event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.CLASS_MATCH);
+        command.addByte(JDWP.EventModifierKind.CLASS_MATCH);
+        log.display("      classPattern: " + TESTED_CLASS_NAME);
+        command.addString(TESTED_CLASS_NAME);
+        command.setLength();
+        log.display("  ... command packet composed");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested CLASS_UNLOAD event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested CLASS_UNLOAD event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet (for " + timeout + "ms timeout)");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check if VM_DEATH event
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Got VM_DEATH event while waiting for tested event");
+                dead = true;
+                log.println("No CLASS_UNLOAD event occured at all so treat test as PASSED");
+                return;
+            }
+
+            // check eventKind
+            if (eventKind != JDWP.EventKind.CLASS_UNLOAD) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.CLASS_UNLOAD + ")");
+                success = false;
+                return;
+            }
+
+            // check suspendPolicy value
+            if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+                log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                            suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+                success = false;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get signature
+            String signature = null;
+            try {
+                signature = eventPacket.getString();
+                log.display("      signature: " + signature);
+            } catch (BoundException e) {
+                log.complain("Unable to get class signature of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check signature
+            if (!signature.equals(TESTED_CLASS_SIGNATURE)) {
+                log.complain("Unexpected class signature of event " + i + " in tested event packet: " +
+                            signature + " (expected: " + TESTED_CLASS_SIGNATURE + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001/TestDescription.java
new file mode 100644
index 00000000000..97df66c31f1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001/TestDescription.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/CLASS_UNLOAD/clsunload001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: CLASS_UNLOAD
+ *     Test checks that
+ *         1) debuggee successfully creates CLASS_UNLOAD event request
+ *            for particular class name
+ *         2) expected CLASS_UNLOAD event is received if this class is
+ *            unloaded at debuggee's exit
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: clsunload001
+ *         debuggee: clsunload001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger makes request for CLASS_UNLOAD event for tested class,
+ *     and resumes debuggee to permit it to exit.
+ *     If expected CLASS_UNLOAD event is received debugger checks that
+ *     this event if for tested class and has correct attributes.
+ *     If no CLASS_UNLOAD event occures, tests pass anyway.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *     Test was fixed due to test bug:
+ *     4864576 TEST_BUG: copy/paste error in JDWP test clsunload001
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.CLASS_UNLOAD.clsunload001
+ *        nsk.jdwp.Event.CLASS_UNLOAD.clsunload001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.CLASS_UNLOAD.clsunload001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001a.java
new file mode 100644
index 00000000000..87c3a6170dc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001a.java
@@ -0,0 +1,67 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.CLASS_UNLOAD;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class clsunload001a {
+
+    public static void main(String args[]) {
+        clsunload001a _clsunload001a = new clsunload001a();
+        System.exit(clsunload001.JCK_STATUS_BASE + _clsunload001a.runIt(args, System.err));
+//        _clsunload001a.runIt(args, System.err);
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("  ... object created");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return clsunload001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001.java
new file mode 100644
index 00000000000..0d6c11c40c8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001.java
@@ -0,0 +1,303 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.Composite;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Event.Composite.
+ *
+ * See composite001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class composite001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.Composite";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "composite001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Event.Composite";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Event.Composite;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.VM_START;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new composite001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP event \n");
+            testCommand();
+
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    suspendPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    events: " + 1);
+        command.addInt(1);
+        log.display("      eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("      requestID: " + 0);
+        command.addInt(0);
+        log.display("      threadID: " + 0);
+        command.addObjectID(0);
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        log.display("Checking header of reply packet:");
+
+        // extract and check length field
+        int length = reply.getLength();
+        log.display("    length: " + length);
+        if (length != reply.length()) {
+            log.complain("Unexpected value of length field in header of reply packet: "
+                        + length + "(actual: " + reply.length() + ")");
+            success = false;
+        }
+
+        // extract and check id field
+        int id = reply.getPacketID();
+        log.display("    id: " + id);
+        if (id != command.getPacketID()) {
+            log.complain("Unexpected value of id field in header of reply packet: "
+                        + id + "(expected: " + command.getPacketID() + ")");
+            success = false;
+        }
+
+        // extract and check flags field
+        byte flags = reply.getFlags();
+        log.display("    flags: " + flags);
+        if (flags != JDWP.Flag.REPLY_PACKET) {
+            log.complain("Unexpected value of flags field in header of reply packet: "
+                        + flags + "(expected: " + JDWP.Flag.REPLY_PACKET + ")");
+            success = false;
+        }
+
+        // extract and check error field (should be not null!)
+        int error = reply.getErrorCode();
+        log.display("    error: " + error);
+        if (error == JDWP.Error.NONE) {
+            log.complain("Unexpected null value of error field in header of reply packet: "
+                        + error + "(expected: not " + JDWP.Error.NONE + ")");
+            success = false;
+        }
+
+        log.display("  ... packet header is parsed");
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no out data
+        log.display("    no out data");
+
+        log.display("  ... packet data is parsed");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001/TestDescription.java
new file mode 100644
index 00000000000..5f0d38ae626
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001/TestDescription.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/Composite/composite001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *     Test checks that debugee replies with some error code when command
+ *     Event.Composite with correct event is sent to debugee, because
+ *     only debuggee is permited to send such a command to debugger.
+ *     Test consists of two compoments:
+ *         debugger: composite001
+ *         debuggee: composite001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger creates command packet for Event.Composite command
+ *     with VM_START event and sends it to debuggee. Then debugger reads
+ *     reply packet and checks if an error code is in the packet header.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.Composite.composite001
+ *        nsk.jdwp.Event.Composite.composite001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.Composite.composite001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001a.java
new file mode 100644
index 00000000000..e84f2043b81
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.Composite;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class composite001a {
+
+    public static void main(String args[]) {
+        composite001a _composite001a = new composite001a();
+        System.exit(composite001.JCK_STATUS_BASE + _composite001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return composite001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java
new file mode 100644
index 00000000000..4a482ab2164
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java
@@ -0,0 +1,747 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.EXCEPTION;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: EXCEPTION.
+ *
+ * See exception001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class exception001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.EXCEPTION";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "exception001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.EXCEPTION;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedThreadClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String EXCEPTION_FIELD_NAME = "exception";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final String THROW_METHOD_NAME = "methodForThrow";
+    static final String CATCH_METHOD_NAME = "methodForCatch";
+    static final int BREAKPOINT_LINE = exception001a.BREAKPOINT_LINE;
+    static final int EXCEPTION_THROW_LINE = exception001a.EXCEPTION_THROW_LINE;
+    static final int EXCEPTION_CATCH_LINE = exception001a.EXCEPTION_CATCH_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long catchMethodID = 0;
+    long throwMethodID = 0;
+    JDWP.Location throwLocation = null;
+    JDWP.Location catchLocation = null;
+    long exceptionObjectID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new exception001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for EXCEPTION event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested EXCEPTION event
+            log.display("Waiting for EXCEPTION event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for EXCEPTION event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for the exception throw method
+        log.display("Getting methodID for exception throw method: " + THROW_METHOD_NAME);
+        throwMethodID = debugee.getMethodID(testedClassID, THROW_METHOD_NAME, true);
+        log.display("  ... got methodID: " + throwMethodID);
+
+        // get codeIndex for exception throw line
+        log.display("Getting codeIndex for exception throw line: " + EXCEPTION_THROW_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, throwMethodID, EXCEPTION_THROW_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for exception throw line
+        log.display("Creating location for exception throw");
+        throwLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        throwMethodID, codeIndex);
+        log.display("  ... got location: " + throwLocation);
+
+        // get methodID for the exception catch method
+        log.display("Getting methodID for exception catch method: " + CATCH_METHOD_NAME);
+        catchMethodID = debugee.getMethodID(testedClassID, CATCH_METHOD_NAME, true);
+        log.display("  ... got methodID: " + catchMethodID);
+
+        // get codeIndex for exception catch line
+        log.display("Getting codeIndex for exception catch line: " + EXCEPTION_CATCH_LINE);
+        codeIndex = debugee.getCodeIndex(testedClassID, catchMethodID, EXCEPTION_CATCH_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for exception catch line
+        log.display("Creating location for exception catch");
+        catchLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        catchMethodID, codeIndex);
+        log.display("  ... got location: " + catchLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+
+        // get excepion objectID value for static field
+        log.display("Getting exception objectID from static field: " + EXCEPTION_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID,  EXCEPTION_FIELD_NAME, JDWP.Tag.OBJECT);
+        exceptionObjectID = ((Long)value.getValue()).longValue();
+        log.display("  ... got exception objectID: " + exceptionObjectID);
+        log.display("");
+    }
+
+    /**
+     * Make request for tested EXCEPTION event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.CLASS_ONLY + " (CLASS_ONLY)");
+        command.addByte(JDWP.EventModifierKind.CLASS_ONLY);
+        log.display("      classID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested EXCEPTION event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested EXCEPTION event.
+     */
+    void waitForTestedEvent() {
+
+        // receive reply packet from debugee
+        EventPacket eventPacket = null;
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.EXCEPTION + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.EXCEPTION) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.EXCEPTION + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get throw location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      throw_location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get throw location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            checkLocation(location, throwLocation, i, EXCEPTION_THROW_LINE, "throw");
+
+            // get exception tag
+            byte tag = 0;
+            try {
+                tag = eventPacket.getByte();
+                log.display("      exception_tag: " + tag);
+            } catch (BoundException e) {
+                log.complain("Unable to get exception tag of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check tag
+            if (tag != JDWP.Tag.OBJECT) {
+                log.complain("Unexpected exception tag of event " + i + " in tested event packet: " +
+                            tag + " (expected: " + JDWP.Tag.OBJECT + ")");
+                success = false;
+            }
+
+            // get exception objectID
+            long objectID = 0;
+            try {
+                objectID = eventPacket.getObjectID();
+                log.display("      exception_objectID: " + objectID);
+            } catch (BoundException e) {
+                log.complain("Unable to get exception objectID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (objectID != exceptionObjectID) {
+                log.complain("Unexpected exception objectID of event " + i + " in tested event packet: " +
+                            objectID + " (expected: " + exceptionObjectID + ")");
+                success = false;
+            }
+
+            // get catch location
+            location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      catch_location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get catch location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            checkLocation(location, catchLocation, i, EXCEPTION_CATCH_LINE, "catch");
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Check if given location is equal to the expected one.
+     */
+    void checkLocation(JDWP.Location location, JDWP.Location expectedLocation,
+                                    int eventNumber, int expectedLine, String kind) {
+        if (location.getTag() != expectedLocation.getTag()) {
+            log.complain("Unexpected class tag of " + kind + " location of event "
+                        + eventNumber + " in tested event packet: " + location.getTag()
+                        + " (expected: " + expectedLocation.getTag() + ")");
+            success = false;
+        }
+        if (location.getClassID() != expectedLocation.getClassID()) {
+            log.complain("Unexpected classID of " + kind + " location of event "
+                        + eventNumber + " in tested event packet: " + location.getClassID()
+                        + " (expected: " + expectedLocation.getClassID() + ")");
+            success = false;
+        }
+        if (location.getMethodID() != expectedLocation.getMethodID()) {
+            log.complain("Unexpected methodID of " + kind + " location of event "
+                        + eventNumber + " in tested event packet: " + location.getMethodID()
+                        + " (expected: " + expectedLocation.getMethodID() + ")");
+            success = false;
+        }
+        if (location.getIndex() != expectedLocation.getIndex()) {
+/*
+            log.complain("Unexpected codeIndex of " + kind + " location of event " + i
+                        + " in tested event packet: " + location.getIndex()
+                        + " (expected: " + expectedLocation.getIndex() + ")");
+            success = false;
+*/
+            try {
+                // find approximate line number for location
+                int lineNumber = debugee.getLineNumber(location, true);
+                if (lineNumber != expectedLine) {
+                    log.complain("Unexpected line number of " + kind + " location of event "
+                                + eventNumber + " in tested event packet: " + lineNumber
+                                + " (expected: " + expectedLine + ")");
+                    success = false;
+                } else {
+                    log.display("Unexpected codeIndex of " + kind + " location: " + location.getIndex()
+                                + " (expected: " + expectedLocation.getIndex() + ")");
+                    log.display("Though line number of catch location is as expected: "
+                                + expectedLine);
+                }
+            } catch (Failure e) {
+                log.complain("Unable to get line number for " + kind + " location of event "
+                            + eventNumber + " in tested event packet:\n\t" + e.getMessage());
+                success = false;
+            }
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001/TestDescription.java
new file mode 100644
index 00000000000..7ad4ef1a5c0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001/TestDescription.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/EXCEPTION/exception001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: EXCEPTION
+ *     Test checks that
+ *         1) debuggee successfully creates EXCEPTION event request
+ *            occured for particular classID
+ *         2) expected EXCEPTION event is received when the exception
+ *            is thrown into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: exception001
+ *         debuggee: exception001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and obtains expected
+ *     locations for throw and catch clauses of the tested exception.
+ *     Then debugger waits for a breakpoint for tested thread is reached,
+ *     end makes request for EXCEPTION event for found classID.
+ *     When event is received debugger checks if the received event is for
+ *     expected request, thread, and has correct locations of throw and
+ *     catch clauses. Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     The test was fixed due to the following bug:
+ *     4740123 Wrong exception catch location in ExceptionEvent
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.EXCEPTION.exception001
+ *        nsk.jdwp.Event.EXCEPTION.exception001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.EXCEPTION.exception001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001a.java
new file mode 100644
index 00000000000..eba8fe6e1de
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001a.java
@@ -0,0 +1,136 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.EXCEPTION;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class exception001a {
+
+    static final int BREAKPOINT_LINE = 102;
+    static final int EXCEPTION_THROW_LINE = 114;
+    static final int EXCEPTION_CATCH_LINE = 121; // line number was changed due to 4740123
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        exception001a _exception001a = new exception001a();
+        System.exit(exception001.JCK_STATUS_BASE + _exception001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedThreadClass thread = new TestedThreadClass(exception001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // create tested exception
+        log.display("Creating tested exception object");
+        TestedThreadClass.exception = new TestedExceptionClass("tested exception");
+        log.display("  ... exception object created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return exception001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return exception001.PASSED;
+    }
+
+    // tested class
+    public static class TestedThreadClass extends Thread {
+
+        // static field with tested exception object
+        public static volatile TestedExceptionClass exception = null;
+
+        public TestedThreadClass(String name) {
+            super(name);
+        }
+
+        // reach breakpoint before testing exception
+        public void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+
+            methodForCatch();
+
+            log.display("Tested thread: finished");
+        }
+
+        // throw tested exception
+        public void methodForThrow() throws TestedExceptionClass {
+            log.display("Throwing tested exception:\n\t" + exception);
+            // next line is location of exception throw
+            throw exception; // EXCEPTION_THROW_LINE
+        }
+
+        // catch tested exception
+        public void methodForCatch() {
+            try {
+                methodForThrow();
+            } catch (TestedExceptionClass e) { // EXCEPTION_CATCH_LINE
+                    // due to evaluation of 4740123: "the first instruction at the target
+                    // of the exception is code to assign to the formal parameter"
+                log.display("Caught tested exception:\n\t" + e);
+            }
+        }
+
+    }
+
+    // tested exception class
+    public static class TestedExceptionClass extends Exception {
+        public TestedExceptionClass(String message) {
+            super(message);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001.java
new file mode 100644
index 00000000000..c81d901115c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001.java
@@ -0,0 +1,804 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.FIELD_ACCESS;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: FIELD_ACCESS.
+ *
+ * See fldaccess001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class fldaccess001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_WATCH_FIELD_ACCESS;
+    static final String VM_CAPABILITY_NAME = "canWatchFieldAccess";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.FIELD_ACCESS";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "fldaccess001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.FIELD_ACCESS;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedObjectClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String OBJECT_FIELD_NAME = "object";
+    static final String VALUE_FIELD_NAME = "value";
+    static final String TESTED_METHOD_NAME = "methodForAccess";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = fldaccess001a.BREAKPOINT_LINE;
+    static final int FIELD_ACCESS_LINE = fldaccess001a.FIELD_ACCESS_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    long testedFieldID = 0;
+    long testedObjectID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new fldaccess001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // check for VM capability
+            log.display("\n>>> Checking VM capability \n");
+            log.display("Getting VM capability: " + VM_CAPABILITY_NAME);
+            boolean capable = debugee.getCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME);
+            log.display("  ... got VM capability: " + capable);
+
+            // exit as PASSED if this capability is not supported
+            if (!capable) {
+                out.println("TEST PASSED: unsupported VM capability: "
+                            + VM_CAPABILITY_NAME);
+                return PASSED;
+            }
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for FIELD_ACCESS event for field: "
+                    + VALUE_FIELD_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested FIELD_ACCESS event
+            log.display("Waiting for FIELD_ACCESS event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for FIELD_ACCESS event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded:\n\t" + TESTED_CLASS_NAME);
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... class loaded with classID: " + testedClassID);
+        log.display("");
+
+        // get fieldID for the tested field
+        log.display("Getting tested fieldID for field name: " + VALUE_FIELD_NAME);
+        testedFieldID = debugee.getClassFieldID(testedClassID, VALUE_FIELD_NAME, true);
+        log.display("  ... got fieldID: " + testedFieldID);
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for field access line
+        log.display("Getting codeIndex for field acccess line: " + FIELD_ACCESS_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, FIELD_ACCESS_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location for field access line");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+
+        // get objectID of the tested object from static field
+        log.display("Getting tested objectID from static field: " + OBJECT_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID, OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+        testedObjectID = ((Long)value.getValue()).longValue();
+        log.display("  ... got objectID: " + testedObjectID);
+    }
+
+    /**
+     * Make request for tested FIELD_ACCESS event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.FIELD_ONLY + " (FIELD_ONLY)");
+        command.addByte(JDWP.EventModifierKind.FIELD_ONLY);
+        log.display("      classID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        log.display("      fieldID: " + testedFieldID);
+        command.addFieldID(testedFieldID);
+/*
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.CLASS_ONLY + " (CLASS_ONLY)");
+        command.addByte(JDWP.EventModifierKind.CLASS_ONLY);
+        log.display("      classID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+*/
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested FIELD_ACCESS event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested FIELD_ACCESS event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.FIELD_ACCESS + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.FIELD_ACCESS) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.FIELD_ACCESS + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            checkLocation(location, testedLocation, i, FIELD_ACCESS_LINE);
+
+            // get type tag
+            byte refTypeTag = 0;
+            try {
+                refTypeTag = eventPacket.getByte();
+                log.display("      refTypeTag: " + refTypeTag);
+            } catch (BoundException e) {
+                log.complain("Unable to get reftypetag of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check type tag
+            if (refTypeTag != JDWP.TypeTag.CLASS) {
+                log.complain("Unexpected refTypeTag of event " + i + " in tested event packet: " +
+                            refTypeTag + " (expected: " + JDWP.TypeTag.CLASS + ")");
+                success = false;
+            }
+
+            // get typeID
+            long typeID = 0;
+            try {
+                typeID = eventPacket.getReferenceTypeID();
+                log.display("      typeID: " + typeID);
+            } catch (BoundException e) {
+                log.complain("Unable to get typeID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check typeID
+            if (typeID != testedClassID) {
+                log.complain("Unexpected typeID of event " + i + " in tested event packet: " +
+                            typeID + " (expected: " + testedClassID + ")");
+                success = false;
+            }
+
+            // get fieldID
+            long fieldID = 0;
+            try {
+                fieldID = eventPacket.getFieldID();
+                log.display("      fieldID: " + fieldID);
+            } catch (BoundException e) {
+                log.complain("Unable to get fieldID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check fieldID
+            if (fieldID != testedFieldID) {
+                log.complain("Unexpected fieldID of event " + i + " in tested event packet: " +
+                            fieldID + " (expected: " + testedFieldID + ")");
+                success = false;
+            }
+
+            // get object tag
+            byte objectTag = 0;
+            try {
+                objectTag = eventPacket.getByte();
+                log.display("      objectTag: " + objectTag);
+            } catch (BoundException e) {
+                log.complain("Unable to get object tag of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check object tag
+            if (objectTag != JDWP.Tag.OBJECT) {
+                log.complain("Unexpected object tag of event " + i + " in tested event packet: " +
+                            objectTag + " (expected: " + JDWP.Tag.OBJECT + ")");
+                success = false;
+            }
+
+            // get objectID
+            long objectID = 0;
+            try {
+                objectID = eventPacket.getObjectID();
+                log.display("      objectID: " + objectID);
+            } catch (BoundException e) {
+                log.complain("Unable to get objectID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check objectID
+            if (objectID != 0) {
+                log.complain("Unexpected objectID of event " + i + " in tested event packet: " +
+                            objectID + " (expected: " + 0 + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Check if given location is equal to the expected one.
+     */
+    void checkLocation(JDWP.Location location, JDWP.Location expectedLocation,
+                                                int eventNumber, int expectedLine) {
+        if (location.getTag() != expectedLocation.getTag()) {
+            log.complain("Unexpected class tag of location of event "
+                        + eventNumber + " in tested event packet: " + location.getTag()
+                        + " (expected: " + expectedLocation.getTag() + ")");
+            success = false;
+        }
+        if (location.getClassID() != expectedLocation.getClassID()) {
+            log.complain("Unexpected classID of location of event "
+                        + eventNumber + " in tested event packet: " + location.getClassID()
+                        + " (expected: " + expectedLocation.getClassID() + ")");
+            success = false;
+        }
+        if (location.getMethodID() != expectedLocation.getMethodID()) {
+            log.complain("Unexpected methodID of location of event "
+                        + eventNumber + " in tested event packet: " + location.getMethodID()
+                        + " (expected: " + expectedLocation.getMethodID() + ")");
+            success = false;
+        }
+        if (location.getIndex() != expectedLocation.getIndex()) {
+/*
+            log.complain("Unexpected codeIndex of location of event " + i
+                        + " in tested event packet: " + location.getIndex()
+                        + " (expected: " + expectedLocation.getIndex() + ")");
+            success = false;
+*/
+            try {
+                // find approximate line number for location
+                int lineNumber = debugee.getLineNumber(location, true);
+                if (lineNumber != expectedLine) {
+                    log.complain("Unexpected line number of location of event "
+                                + eventNumber + " in tested event packet: " + lineNumber
+                                + " (expected: " + expectedLine + ")");
+                    success = false;
+                } else {
+                    log.display("Unexpected codeIndex of location: " + location.getIndex()
+                                + " (expected: " + expectedLocation.getIndex() + ")");
+                    log.display("Though line number of catch location is as expected: "
+                                + expectedLine);
+                }
+            } catch (Failure e) {
+                log.complain("Unable to get line number for location of event "
+                            + eventNumber + " in tested event packet:\n\t" + e.getMessage());
+                success = false;
+            }
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001/TestDescription.java
new file mode 100644
index 00000000000..84374b25200
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001/TestDescription.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/FIELD_ACCESS/fldaccess001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: FIELD_ACCESS
+ *     Test checks that
+ *         1) debuggee successfully creates FIELD_ACCESS event request
+ *            for particular static filed
+ *         2) expected FIELD_ACCESS event is received when the thread
+ *            accesses tested field into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: fldaccess001
+ *         debuggee: fldaccess001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and obtains fieldID
+ *     for tested static field and expected location of FIELD_ACCESS event.
+ *     Then debugger waits for breakpoint is reached by a thread in
+ *     debuggee makes request for FIELD_ACCESS event for known classID and
+ *     fieldID.
+ *     When event is received debugger checks if the received event is for
+ *     expected request, class, thread, field and location, and has correct
+ *     attributes. Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.FIELD_ACCESS.fldaccess001
+ *        nsk.jdwp.Event.FIELD_ACCESS.fldaccess001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.FIELD_ACCESS.fldaccess001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001a.java
new file mode 100644
index 00000000000..f027416d975
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001a.java
@@ -0,0 +1,130 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.FIELD_ACCESS;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class fldaccess001a {
+
+    static final int BREAKPOINT_LINE = 114;
+    static final int FIELD_ACCESS_LINE = 125;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        fldaccess001a _fldaccess001a = new fldaccess001a();
+        System.exit(fldaccess001.JCK_STATUS_BASE + _fldaccess001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread and object
+        log.display("Creating object of the tested class");
+        TestedObjectClass.object = new TestedObjectClass();
+        log.display("  ... object created");
+
+        log.display("Creating tested thread");
+        TestedThreadClass thread = new TestedThreadClass(fldaccess001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return fldaccess001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return fldaccess001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedThreadClass extends Thread {
+
+        public TestedThreadClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            // invoke method of tested object class
+            TestedObjectClass.run();
+
+            log.display("Tested thread: finished");
+        }
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+
+        // static field with object been accessed
+        public static volatile TestedObjectClass object = null;
+
+        // static field been accessed
+        public static int value = 0;
+
+        // reach breakpoint and then touch field
+        public static void run() {
+            log.display("Breakpoint line reached");
+            // next line is location of BREAKPOINT event
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+
+            // invoke method which accesses the field
+            methodForAccess();
+        }
+
+        // access the tested field
+        public static void methodForAccess() {
+            log.display("Before tested field accessed");
+            // next line is location of FIELD_ACCESS event
+            int foo = value; // FIELD_ACCESS_LINE
+            log.display("After tested field accessed");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001.java
new file mode 100644
index 00000000000..7bcf14c87c3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001.java
@@ -0,0 +1,825 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.FIELD_MODIFICATION;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: FIELD_MODIFICATION.
+ *
+ * See fldmodification001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class fldmodification001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_WATCH_FIELD_MODIFICATION;
+    static final String VM_CAPABILITY_NAME = "canWatchFieldModification";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.FIELD_MODIFICATION";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "fldmodification001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.FIELD_MODIFICATION;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedObjectClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String OBJECT_FIELD_NAME = "object";
+    static final String VALUE_FIELD_NAME = "value";
+    static final String TESTED_METHOD_NAME = "methodForAccess";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = fldmodification001a.BREAKPOINT_LINE;
+    static final int FIELD_MODIFICATION_LINE = fldmodification001a.FIELD_MODIFICATION_LINE;
+    static final int FIELD_MODIFICATION_VALUE = 6574;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    long testedFieldID = 0;
+    long testedObjectID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new fldmodification001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // check for VM capability
+            log.display("\n>>> Checking VM capability \n");
+            log.display("Getting VM capability: " + VM_CAPABILITY_NAME);
+            boolean capable = debugee.getCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME);
+            log.display("  ... got VM capability: " + capable);
+
+            // exit as PASSED if this capability is not supported
+            if (!capable) {
+                out.println("TEST PASSED: unsupported VM capability: "
+                            + VM_CAPABILITY_NAME);
+                return PASSED;
+            }
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for FIELD_MODIFICATION event for field: "
+                    + VALUE_FIELD_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested FIELD_MODIFICATION event
+            log.display("Waiting for FIELD_MODIFICATION event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for FIELD_MODIFICATION event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded:\n\t" + TESTED_CLASS_NAME);
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... class loaded with classID: " + testedClassID);
+        log.display("");
+
+        // get fieldID for the tested field
+        log.display("Getting tested fieldID for field name: " + VALUE_FIELD_NAME);
+        testedFieldID = debugee.getClassFieldID(testedClassID, VALUE_FIELD_NAME, true);
+        log.display("  ... got fieldID: " + testedFieldID);
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for field access line
+        log.display("Getting codeIndex for field modification line: " + FIELD_MODIFICATION_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, FIELD_MODIFICATION_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location for field modofication line");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+
+        // get objectID of the tested object from static field
+        log.display("Getting tested objectID from static field: " + OBJECT_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID, OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+        testedObjectID = ((Long)value.getValue()).longValue();
+        log.display("  ... got objectID: " + testedObjectID);
+    }
+
+    /**
+     * Make request for tested FIELD_MODIFICATION event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.FIELD_ONLY + " (FIELD_ONLY)");
+        command.addByte(JDWP.EventModifierKind.FIELD_ONLY);
+        log.display("      classID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        log.display("      fieldID: " + testedFieldID);
+        command.addFieldID(testedFieldID);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested FIELD_MODIFICATION event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested FIELD_MODIFICATION event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.FIELD_MODIFICATION + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.FIELD_MODIFICATION) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.FIELD_MODIFICATION + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            checkLocation(location, testedLocation, i, FIELD_MODIFICATION_LINE);
+
+            // get type tag
+            byte refTypeTag = 0;
+            try {
+                refTypeTag = eventPacket.getByte();
+                log.display("      refTypeTag: " + refTypeTag);
+            } catch (BoundException e) {
+                log.complain("Unable to get reftypetag of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check type tag
+            if (refTypeTag != JDWP.TypeTag.CLASS) {
+                log.complain("Unexpected refTypeTag of event " + i + " in tested event packet: " +
+                            refTypeTag + " (expected: " + JDWP.TypeTag.CLASS + ")");
+                success = false;
+            }
+
+            // get typeID
+            long typeID = 0;
+            try {
+                typeID = eventPacket.getReferenceTypeID();
+                log.display("      typeID: " + typeID);
+            } catch (BoundException e) {
+                log.complain("Unable to get typeID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check typeID
+            if (typeID != testedClassID) {
+                log.complain("Unexpected typeID of event " + i + " in tested event packet: " +
+                            typeID + " (expected: " + testedClassID + ")");
+                success = false;
+            }
+
+            // get fieldID
+            long fieldID = 0;
+            try {
+                fieldID = eventPacket.getFieldID();
+                log.display("      fieldID: " + fieldID);
+            } catch (BoundException e) {
+                log.complain("Unable to get fieldID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check fieldID
+            if (fieldID != testedFieldID) {
+                log.complain("Unexpected fieldID of event " + i + " in tested event packet: " +
+                            fieldID + " (expected: " + testedFieldID + ")");
+                success = false;
+            }
+
+            // get object tag
+            byte objectTag = 0;
+            try {
+                objectTag = eventPacket.getByte();
+                log.display("      objectTag: " + objectTag);
+            } catch (BoundException e) {
+                log.complain("Unable to get object tag of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check object tag
+            if (objectTag != JDWP.Tag.OBJECT) {
+                log.complain("Unexpected object tag of event " + i + " in tested event packet: " +
+                            objectTag + " (expected: " + JDWP.Tag.OBJECT + ")");
+                success = false;
+            }
+
+            // get objectID
+            long objectID = 0;
+            try {
+                objectID = eventPacket.getObjectID();
+                log.display("      objectID: " + objectID);
+            } catch (BoundException e) {
+                log.complain("Unable to get objectID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check objectID
+            if (objectID != 0) {
+                log.complain("Unexpected objectID of event " + i + " in tested event packet: " +
+                            objectID + " (expected: " + 0 + ")");
+                success = false;
+            }
+
+            // get valueToBe
+            JDWP.Value valueToBe = null;
+            try {
+                valueToBe = eventPacket.getValue();
+                log.display("      valueToBe: " + valueToBe);
+            } catch (BoundException e) {
+                log.complain("Unable to get valueToBe of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check value tag
+            byte valueTag = valueToBe.getTag();
+            if (valueTag != JDWP.Tag.INT) {
+                log.complain("Unexpected valueToBe tag of event " + i + " in tested event packet: " +
+                            valueTag + " (expected: " + JDWP.Tag.INT + ")");
+                success = false;
+            }
+
+            // check integer value
+            int intValue = ((Integer)valueToBe.getValue()).intValue();
+            if (intValue != FIELD_MODIFICATION_VALUE) {
+                log.complain("Unexpected valueToBe of event " + i + " in tested event packet: " +
+                            intValue + " (expected: " + FIELD_MODIFICATION_VALUE + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Check if given location is equal to the expected one.
+     */
+    void checkLocation(JDWP.Location location, JDWP.Location expectedLocation,
+                                                int eventNumber, int expectedLine) {
+        if (location.getTag() != expectedLocation.getTag()) {
+            log.complain("Unexpected class tag of location of event "
+                        + eventNumber + " in tested event packet: " + location.getTag()
+                        + " (expected: " + expectedLocation.getTag() + ")");
+            success = false;
+        }
+        if (location.getClassID() != expectedLocation.getClassID()) {
+            log.complain("Unexpected classID of location of event "
+                        + eventNumber + " in tested event packet: " + location.getClassID()
+                        + " (expected: " + expectedLocation.getClassID() + ")");
+            success = false;
+        }
+        if (location.getMethodID() != expectedLocation.getMethodID()) {
+            log.complain("Unexpected methodID of location of event "
+                        + eventNumber + " in tested event packet: " + location.getMethodID()
+                        + " (expected: " + expectedLocation.getMethodID() + ")");
+            success = false;
+        }
+        if (location.getIndex() != expectedLocation.getIndex()) {
+/*
+            log.complain("Unexpected codeIndex of location of event " + i
+                        + " in tested event packet: " + location.getIndex()
+                        + " (expected: " + expectedLocation.getIndex() + ")");
+            success = false;
+*/
+            try {
+                // find approximate line number for location
+                int lineNumber = debugee.getLineNumber(location, true);
+                if (lineNumber != expectedLine) {
+                    log.complain("Unexpected line number of location of event "
+                                + eventNumber + " in tested event packet: " + lineNumber
+                                + " (expected: " + expectedLine + ")");
+                    success = false;
+                } else {
+                    log.display("Unexpected codeIndex of location: " + location.getIndex()
+                                + " (expected: " + expectedLocation.getIndex() + ")");
+                    log.display("Though line number of catch location is as expected: "
+                                + expectedLine);
+                }
+            } catch (Failure e) {
+                log.complain("Unable to get line number for location of event "
+                            + eventNumber + " in tested event packet:\n\t" + e.getMessage());
+                success = false;
+            }
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001/TestDescription.java
new file mode 100644
index 00000000000..b1770a26546
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001/TestDescription.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: FIELD_MODIFICATION
+ *     Test checks that
+ *         1) debuggee successfully creates FIELD_MODIFICATION event request
+ *            for particular static filed
+ *         2) expected FIELD_MODIFICATION event is received when the thread
+ *            modifies tested field into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: fldmodification001
+ *         debuggee: fldmodification001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and obtains fieldID
+ *     for tested static field and expected location of FIELD_MODIFICATION
+ *     event. Then debugger waits for breakpoint is reached by a thread in
+ *     debuggee makes request for FIELD_MODIFICATION event for known
+ *     classID and fieldID.
+ *     When event is received debugger checks if the received event is for
+ *     expected request, class, thread, field and location, and has correct
+ *     value to be assigned and ather attributes. Then debugger removes
+ *     event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.FIELD_MODIFICATION.fldmodification001
+ *        nsk.jdwp.Event.FIELD_MODIFICATION.fldmodification001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.FIELD_MODIFICATION.fldmodification001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001a.java
new file mode 100644
index 00000000000..89ac3b88279
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001a.java
@@ -0,0 +1,130 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.FIELD_MODIFICATION;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class fldmodification001a {
+
+    static final int BREAKPOINT_LINE = 114;
+    static final int FIELD_MODIFICATION_LINE = 126;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        fldmodification001a _fldmodification001a = new fldmodification001a();
+        System.exit(fldmodification001.JCK_STATUS_BASE + _fldmodification001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread and object
+        log.display("Creating object of the tested class");
+        TestedObjectClass.object = new TestedObjectClass();
+        log.display("  ... object created");
+
+        log.display("Creating tested thread");
+        TestedThreadClass thread = new TestedThreadClass(fldmodification001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return fldmodification001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return fldmodification001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedThreadClass extends Thread {
+
+        public TestedThreadClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            // invoke method of tested object class
+            TestedObjectClass.run();
+
+            log.display("Tested thread: finished");
+        }
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+
+        // static field with object been accessed
+        public static volatile TestedObjectClass object = null;
+
+        // static field been accessed
+        public static int value = 0;
+
+        // reach breakpoint and then touch field
+        public static void run() {
+            log.display("Breakpoint line reached");
+            // next line is location of BREAKPOINT event
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+
+            // invoke method which accesses the field
+            methodForAccess();
+        }
+
+        // access the tested field
+        public static void methodForAccess() {
+            log.display("Assigning to tested field new value: "
+                        + fldmodification001.FIELD_MODIFICATION_VALUE);
+            // next line is location of FIELD_MODIFICATION event
+            value = fldmodification001.FIELD_MODIFICATION_VALUE; // FIELD_MODIFICATION_LINE
+            log.display("Tested field modified");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001.java
new file mode 100644
index 00000000000..6d75896e2df
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001.java
@@ -0,0 +1,640 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.METHOD_ENTRY;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: METHOD_ENTRY.
+ *
+ * See methentry001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class methentry001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.METHOD_ENTRY";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "methentry001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.METHOD_ENTRY;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String TESTED_METHOD_NAME = "testedMethod";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = methentry001a.BREAKPOINT_LINE;
+    static final int METHOD_ENTRY_LINE = methentry001a.METHOD_ENTRY_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new methentry001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for METHOD_ENTRY event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested METHOD_ENTRY event
+            log.display("Waiting for METHOD_ENTRY event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for METHOD_ENTRY event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for method entry line
+        log.display("Getting codeIndex for method entry line: " + METHOD_ENTRY_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, METHOD_ENTRY_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location for method entry");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+    }
+
+    /**
+     * Make request for tested METHOD_ENTRY event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.CLASS_ONLY);
+        command.addByte(JDWP.EventModifierKind.CLASS_ONLY);
+        log.display("      classID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested METHOD_ENTRY event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested METHOD_ENTRY event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.METHOD_ENTRY + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.METHOD_ENTRY) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.METHOD_ENTRY + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            if (location.getTag() != testedLocation.getTag()) {
+                log.complain("Unexpected class tag of location of event " + i
+                            + " in tested event packet: " + location.getTag()
+                            + " (expected: " + testedLocation.getTag() + ")");
+                success = false;
+            }
+            if (location.getClassID() != testedLocation.getClassID()) {
+                log.complain("Unexpected classID of location of event " + i
+                            + " in tested event packet: " + location.getClassID()
+                            + " (expected: " + testedLocation.getClassID() + ")");
+                success = false;
+            }
+            if (location.getMethodID() != testedLocation.getMethodID()) {
+                log.complain("Unexpected methodID of location of event " + i
+                            + " in tested event packet: " + location.getMethodID()
+                            + " (expected: " + testedLocation.getMethodID() + ")");
+                success = false;
+            }
+            if (location.getIndex() != testedLocation.getIndex()) {
+                log.complain("Unexpected codeIndex of location of event " + i
+                            + " in tested event packet: " + location.getIndex()
+                            + " (expected: " + testedLocation.getIndex() + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001/TestDescription.java
new file mode 100644
index 00000000000..702735a17b9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/METHOD_ENTRY/methentry001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: METHOD_ENTRY
+ *     Test checks that
+ *         1) debuggee successfully creates METHOD_ENTRY event request
+ *            for particular classID
+ *         2) expected METHOD_ENTRY event is received when the thread
+ *            entered tested method into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: methentry001
+ *         debuggee: methentry001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and breakpoint reached.
+ *     Then debugger gets methodID and entry location for tested method and
+ *     makes request for METHOD_ENTRY event of methods of this class.
+ *     When event is received debugger checks if the received event is for
+ *     expected class, thread, method and location and has correct attributes.
+ *     Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.METHOD_ENTRY.methentry001
+ *        nsk.jdwp.Event.METHOD_ENTRY.methentry001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.METHOD_ENTRY.methentry001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001a.java
new file mode 100644
index 00000000000..c231340f532
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001a.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.METHOD_ENTRY;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class methentry001a {
+
+    static final int BREAKPOINT_LINE = 91;
+    static final int METHOD_ENTRY_LINE = 103;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        methentry001a _methentry001a = new methentry001a();
+        System.exit(methentry001.JCK_STATUS_BASE + _methentry001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass thread = new TestedClass(methentry001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return methentry001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return methentry001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+
+            log.display("Invoking tested method");
+            testedMethod();
+            log.display("Tested method invoked");
+
+            log.display("Tested thread: finished");
+        }
+
+        public static void testedMethod() {
+            // next line is for method entry location
+            log.display("Tested method entered"); // METHOD_ENTRY_LINE
+            log.display("Tested method exited");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001.java
new file mode 100644
index 00000000000..a113161ca32
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001.java
@@ -0,0 +1,640 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.METHOD_EXIT;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: METHOD_EXIT.
+ *
+ * See methexit001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class methexit001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.METHOD_EXIT";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "methexit001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.METHOD_EXIT;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String TESTED_METHOD_NAME = "testedMethod";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = methexit001a.BREAKPOINT_LINE;
+    static final int METHOD_EXIT_LINE = methexit001a.METHOD_EXIT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new methexit001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for METHOD_EXIT event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested METHOD_EXIT event
+            log.display("Waiting for METHOD_EXIT event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for METHOD_EXIT event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for method entry line
+        log.display("Getting codeIndex for method exit line: " + METHOD_EXIT_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, METHOD_EXIT_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location for method exit");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+    }
+
+    /**
+     * Make request for tested METHOD_EXIT event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.CLASS_ONLY);
+        command.addByte(JDWP.EventModifierKind.CLASS_ONLY);
+        log.display("      classID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested METHOD_EXIT event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested METHOD_EXIT event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.METHOD_EXIT + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.METHOD_EXIT) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.METHOD_EXIT + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            if (location.getTag() != testedLocation.getTag()) {
+                log.complain("Unexpected class tag of location of event " + i
+                            + " in tested event packet: " + location.getTag()
+                            + " (expected: " + testedLocation.getTag() + ")");
+                success = false;
+            }
+            if (location.getClassID() != testedLocation.getClassID()) {
+                log.complain("Unexpected classID of location of event " + i
+                            + " in tested event packet: " + location.getClassID()
+                            + " (expected: " + testedLocation.getClassID() + ")");
+                success = false;
+            }
+            if (location.getMethodID() != testedLocation.getMethodID()) {
+                log.complain("Unexpected methodID of location of event " + i
+                            + " in tested event packet: " + location.getMethodID()
+                            + " (expected: " + testedLocation.getMethodID() + ")");
+                success = false;
+            }
+            if (location.getIndex() != testedLocation.getIndex()) {
+                log.complain("Unexpected codeIndex of location of event " + i
+                            + " in tested event packet: " + location.getIndex()
+                            + " (expected: " + testedLocation.getIndex() + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001/TestDescription.java
new file mode 100644
index 00000000000..9b0622d2eb5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/METHOD_EXIT/methexit001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: METHOD_EXIT
+ *     Test checks that
+ *         1) debuggee successfully creates METHOD_EXIT event request
+ *            for particular classID
+ *         2) expected METHOD_EXIT event is received when the thread
+ *            exited tested method into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: methexit001
+ *         debuggee: methexit001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and breakpoint reached.
+ *     Then debugger gets methodID and method exit location for tested method
+ *     and makes request for METHOD_EXIT event of methods of this class.
+ *     When event is received debugger checks if the received event is for
+ *     expected class, thread, method and location and has correct attributes.
+ *     Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.METHOD_EXIT.methexit001
+ *        nsk.jdwp.Event.METHOD_EXIT.methexit001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.METHOD_EXIT.methexit001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001a.java
new file mode 100644
index 00000000000..4cd940f15d8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001a.java
@@ -0,0 +1,108 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.METHOD_EXIT;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class methexit001a {
+
+    static final int BREAKPOINT_LINE = 91;
+    static final int METHOD_EXIT_LINE = 105;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        methexit001a _methexit001a = new methexit001a();
+        System.exit(methexit001.JCK_STATUS_BASE + _methexit001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass thread = new TestedClass(methexit001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return methexit001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return methexit001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+
+            log.display("Invoking tested method");
+            testedMethod();
+            log.display("Tested method invoked");
+
+            log.display("Tested thread: finished");
+        }
+
+        public static void testedMethod() {
+            log.display("Tested method entered");
+            log.display("Tested method exited");
+            // next line is for method exit location
+            return; // METHOD_EXIT_LINE
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001.java
new file mode 100644
index 00000000000..25003f018a0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001.java
@@ -0,0 +1,645 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.SINGLE_STEP;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: SINGLE_STEP.
+ *
+ * See singlestep001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class singlestep001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.SINGLE_STEP";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "singlestep001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.SINGLE_STEP;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+    static final int STEP_DEPTH = JDWP.StepDepth.OVER;
+    static final int STEP_SIZE = JDWP.StepSize.LINE;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = singlestep001a.BREAKPOINT_LINE;
+    static final int SINGLE_STEP_LINE = singlestep001a.SINGLE_STEP_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new singlestep001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for SINGLE_STEP event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested SINGLE_STEP event
+            log.display("Waiting for SINGLE_STEP event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for SINGLE_STEP event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + BREAKPOINT_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, BREAKPOINT_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for method entry line
+        log.display("Getting codeIndex for single step line: " + SINGLE_STEP_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, SINGLE_STEP_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location of single step event");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+    }
+
+    /**
+     * Make request for tested SINGLE_STEP event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.STEP + " (STEP)");
+        command.addByte(JDWP.EventModifierKind.STEP);
+        log.display("      threadID: " + testedThreadID);
+        command.addObjectID(testedThreadID);
+        log.display("      size: " + STEP_SIZE);
+        command.addInt(STEP_SIZE);
+        log.display("      depth: " + STEP_DEPTH);
+        command.addInt(STEP_DEPTH);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested SINGLE_STEP event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested SINGLE_STEP event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.SINGLE_STEP + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.SINGLE_STEP) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.SINGLE_STEP + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            if (location.getTag() != testedLocation.getTag()) {
+                log.complain("Unexpected class tag of location of event " + i
+                            + " in tested event packet: " + location.getTag()
+                            + " (expected: " + testedLocation.getTag() + ")");
+                success = false;
+            }
+            if (location.getClassID() != testedLocation.getClassID()) {
+                log.complain("Unexpected classID of location of event " + i
+                            + " in tested event packet: " + location.getClassID()
+                            + " (expected: " + testedLocation.getClassID() + ")");
+                success = false;
+            }
+            if (location.getMethodID() != testedLocation.getMethodID()) {
+                log.complain("Unexpected methodID of location of event " + i
+                            + " in tested event packet: " + location.getMethodID()
+                            + " (expected: " + testedLocation.getMethodID() + ")");
+                success = false;
+            }
+            if (location.getIndex() != testedLocation.getIndex()) {
+                log.complain("Unexpected codeIndex of location of event " + i
+                            + " in tested event packet: " + location.getIndex()
+                            + " (expected: " + testedLocation.getIndex() + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001/TestDescription.java
new file mode 100644
index 00000000000..03ba24361ee
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001/TestDescription.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/SINGLE_STEP/singlestep001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: SINGLE_STEP
+ *     Test checks that
+ *         1) debuggee successfully creates SINGLE_STEP event request
+ *            for particular threadID with attributes:
+ *            depth=OVER, size=LINE
+ *         2) expected SINGLE_STEP event is received when the thread
+ *            in debuggee steps to the next line after breakpoint
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: singlestep001
+ *         debuggee: singlestep001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and gets methodID
+ *     and location for expected single step event after breakpoint.
+ *     Then debugger waits for breakpoint reached with some thread
+ *     and makes request for SINGLE_STEP event for this threadID.
+ *     When event is received debugger checks if the received event is for
+ *     expected request, thread, and location and has correct attributes.
+ *     Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.SINGLE_STEP.singlestep001
+ *        nsk.jdwp.Event.SINGLE_STEP.singlestep001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.SINGLE_STEP.singlestep001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001a.java
new file mode 100644
index 00000000000..cf2937c5266
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001a.java
@@ -0,0 +1,99 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.SINGLE_STEP;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class singlestep001a {
+
+    static final int BREAKPOINT_LINE = 91;
+    static final int SINGLE_STEP_LINE = 94;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        singlestep001a _singlestep001a = new singlestep001a();
+        System.exit(singlestep001.JCK_STATUS_BASE + _singlestep001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass thread = new TestedClass(singlestep001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return singlestep001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return singlestep001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+
+            // next line is for SINGLE_STEP event
+            foo = 10; // SINGLE_STEP_LINE
+
+            log.display("Tested thread: finished");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002.java
new file mode 100644
index 00000000000..50e55925d0d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002.java
@@ -0,0 +1,652 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.SINGLE_STEP;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: SINGLE_STEP.
+ *
+ * See singlestep002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class singlestep002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.SINGLE_STEP";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "singlestep002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.SINGLE_STEP;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+    static final int STEP_DEPTH = JDWP.StepDepth.INTO;
+    static final int STEP_SIZE = JDWP.StepSize.LINE;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final String STEP_METHOD_NAME = "methodForStep";
+    static final int BREAKPOINT_LINE = singlestep002a.BREAKPOINT_LINE;
+    static final int SINGLE_STEP_LINE = singlestep002a.SINGLE_STEP_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    long stepMethodID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new singlestep002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for SINGLE_STEP event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested SINGLE_STEP event
+            log.display("Waiting for SINGLE_STEP event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for SINGLE_STEP event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + BREAKPOINT_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, BREAKPOINT_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get methodID for the method with STEP_EVENT
+        log.display("Getting methodID for STEP_EVENT method name: " + STEP_METHOD_NAME);
+        stepMethodID = debugee.getMethodID(testedClassID, STEP_METHOD_NAME, true);
+        log.display("  ... got methodID: " + stepMethodID);
+
+        // get codeIndex for method entry line
+        log.display("Getting codeIndex for single step line: " + SINGLE_STEP_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, stepMethodID, SINGLE_STEP_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location of single step event");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        stepMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+    }
+
+    /**
+     * Make request for tested SINGLE_STEP event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.STEP + " (STEP)");
+        command.addByte(JDWP.EventModifierKind.STEP);
+        log.display("      threadID: " + testedThreadID);
+        command.addObjectID(testedThreadID);
+        log.display("      size: " + STEP_SIZE);
+        command.addInt(STEP_SIZE);
+        log.display("      depth: " + STEP_DEPTH);
+        command.addInt(STEP_DEPTH);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested SINGLE_STEP event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested SINGLE_STEP event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.SINGLE_STEP + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.SINGLE_STEP) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.SINGLE_STEP + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            if (location.getTag() != testedLocation.getTag()) {
+                log.complain("Unexpected class tag of location of event " + i
+                            + " in tested event packet: " + location.getTag()
+                            + " (expected: " + testedLocation.getTag() + ")");
+                success = false;
+            }
+            if (location.getClassID() != testedLocation.getClassID()) {
+                log.complain("Unexpected classID of location of event " + i
+                            + " in tested event packet: " + location.getClassID()
+                            + " (expected: " + testedLocation.getClassID() + ")");
+                success = false;
+            }
+            if (location.getMethodID() != testedLocation.getMethodID()) {
+                log.complain("Unexpected methodID of location of event " + i
+                            + " in tested event packet: " + location.getMethodID()
+                            + " (expected: " + testedLocation.getMethodID() + ")");
+                success = false;
+            }
+            if (location.getIndex() != testedLocation.getIndex()) {
+                log.complain("Unexpected codeIndex of location of event " + i
+                            + " in tested event packet: " + location.getIndex()
+                            + " (expected: " + testedLocation.getIndex() + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002/TestDescription.java
new file mode 100644
index 00000000000..a64286bcd15
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002/TestDescription.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/SINGLE_STEP/singlestep002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: SINGLE_STEP
+ *     Test checks that
+ *         1) debuggee successfully creates SINGLE_STEP event request
+ *            for particular threadID with attributes:
+ *            depth=INTO, size=LINE
+ *         2) expected SINGLE_STEP event is received when the thread
+ *            in debuggee steps to the next line after breakpoint
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: singlestep002
+ *         debuggee: singlestep002a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and gets methodID
+ *     and location for expected single step event into invoked method.
+ *     Then debugger waits for breakpoint reached with some thread
+ *     and makes request for SINGLE_STEP event for this threadID.
+ *     When event is received debugger checks if the received event is for
+ *     expected request, thread, and location and has correct attributes.
+ *     Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.SINGLE_STEP.singlestep002
+ *        nsk.jdwp.Event.SINGLE_STEP.singlestep002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.SINGLE_STEP.singlestep002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002a.java
new file mode 100644
index 00000000000..b79a8b0b322
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002a.java
@@ -0,0 +1,105 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.SINGLE_STEP;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class singlestep002a {
+
+    static final int BREAKPOINT_LINE = 91;
+    static final int SINGLE_STEP_LINE = 101;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        singlestep002a _singlestep002a = new singlestep002a();
+        System.exit(singlestep002.JCK_STATUS_BASE + _singlestep002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass thread = new TestedClass(singlestep002.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return singlestep002.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return singlestep002.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            methodForStep(); // BREAKPOINT_LINE
+
+            // next line should be reached after step request removed
+            int foo = 0;
+
+            log.display("Tested thread: finished");
+        }
+
+        public void methodForStep() {
+            // next line is for SINGLE_STEP event
+            int foo = 100; // SINGLE_STEP_LINE
+            log.display("Method for step event entered");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003.java
new file mode 100644
index 00000000000..ae98242c0ee
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003.java
@@ -0,0 +1,652 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.SINGLE_STEP;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: SINGLE_STEP.
+ *
+ * See singlestep003.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class singlestep003 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.SINGLE_STEP";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "singlestep003";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.SINGLE_STEP;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+    static final int STEP_DEPTH = JDWP.StepDepth.OUT;
+    static final int STEP_SIZE = JDWP.StepSize.LINE;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String BREAKPOINT_METHOD_NAME = "methodForBreakpoint";
+    static final String STEP_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = singlestep003a.BREAKPOINT_LINE;
+    static final int SINGLE_STEP_LINE = singlestep003a.SINGLE_STEP_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    long stepMethodID = 0;
+    JDWP.Location testedLocation = null;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new singlestep003().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for SINGLE_STEP event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested SINGLE_STEP event
+            log.display("Waiting for SINGLE_STEP event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for SINGLE_STEP event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for the tested method
+        log.display("Getting tested methodID for method name: " + BREAKPOINT_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, BREAKPOINT_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get methodID for the method with STEP_EVENT
+        log.display("Getting methodID for STEP_EVENT method name: " + STEP_METHOD_NAME);
+        stepMethodID = debugee.getMethodID(testedClassID, STEP_METHOD_NAME, true);
+        log.display("  ... got methodID: " + stepMethodID);
+
+        // get codeIndex for method entry line
+        log.display("Getting codeIndex for single step line: " + SINGLE_STEP_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, stepMethodID, SINGLE_STEP_LINE);
+        log.display("  ... got index: " + codeIndex);
+
+        // create location for method entry line
+        log.display("Creating location of single step event");
+        testedLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                        stepMethodID, codeIndex);
+        log.display("  ... got location: " + testedLocation);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        testedThreadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+        log.display("");
+    }
+
+    /**
+     * Make request for tested SINGLE_STEP event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.STEP + " (STEP)");
+        command.addByte(JDWP.EventModifierKind.STEP);
+        log.display("      threadID: " + testedThreadID);
+        command.addObjectID(testedThreadID);
+        log.display("      size: " + STEP_SIZE);
+        command.addInt(STEP_SIZE);
+        log.display("      depth: " + STEP_DEPTH);
+        command.addInt(STEP_DEPTH);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested SINGLE_STEP event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested SINGLE_STEP event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.SINGLE_STEP + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.SINGLE_STEP) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.SINGLE_STEP + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check location
+            if (location.getTag() != testedLocation.getTag()) {
+                log.complain("Unexpected class tag of location of event " + i
+                            + " in tested event packet: " + location.getTag()
+                            + " (expected: " + testedLocation.getTag() + ")");
+                success = false;
+            }
+            if (location.getClassID() != testedLocation.getClassID()) {
+                log.complain("Unexpected classID of location of event " + i
+                            + " in tested event packet: " + location.getClassID()
+                            + " (expected: " + testedLocation.getClassID() + ")");
+                success = false;
+            }
+            if (location.getMethodID() != testedLocation.getMethodID()) {
+                log.complain("Unexpected methodID of location of event " + i
+                            + " in tested event packet: " + location.getMethodID()
+                            + " (expected: " + testedLocation.getMethodID() + ")");
+                success = false;
+            }
+            if (location.getIndex() != testedLocation.getIndex()) {
+                log.complain("Unexpected codeIndex of location of event " + i
+                            + " in tested event packet: " + location.getIndex()
+                            + " (expected: " + testedLocation.getIndex() + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003/TestDescription.java
new file mode 100644
index 00000000000..89de2413a52
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003/TestDescription.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/SINGLE_STEP/singlestep003.
+ * VM Testbase keywords: [quick, jpda, jdwp, exclude]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: SINGLE_STEP
+ *     Test checks that
+ *         1) debuggee successfully creates SINGLE_STEP event request
+ *            for particular threadID with attributes:
+ *            depth=OUT, size=LINE
+ *         2) expected SINGLE_STEP event is received when the thread
+ *            in debuggee steps to the next line after breakpoint
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: singlestep003
+ *         debuggee: singlestep003a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and gets methodID
+ *     and location for expected single step event out of invoked method.
+ *     Then debugger waits for breakpoint reached with some thread
+ *     and makes request for SINGLE_STEP event for this threadID.
+ *     When event is received debugger checks if the received event is for
+ *     expected request, thread, and location and has correct attributes.
+ *     Then debugger removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.SINGLE_STEP.singlestep003
+ *        nsk.jdwp.Event.SINGLE_STEP.singlestep003a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.SINGLE_STEP.singlestep003
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003a.java
new file mode 100644
index 00000000000..164db266ce7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003a.java
@@ -0,0 +1,109 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.SINGLE_STEP;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class singlestep003a {
+
+    static final int BREAKPOINT_LINE = 101;
+    static final int SINGLE_STEP_LINE = 92;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        singlestep003a _singlestep003a = new singlestep003a();
+        System.exit(singlestep003.JCK_STATUS_BASE + _singlestep003a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass thread = new TestedClass(singlestep003.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return singlestep003.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return singlestep003.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+
+            log.display("Invoking tested method");
+            methodForBreakpoint();
+            // next line is for out step event
+            int foo = 0; // SINGLE_STEP_LINE
+            log.display("  ... tested method invoked");
+
+            log.display("Tested thread: finished");
+        }
+
+        public void methodForBreakpoint() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint before out step event request
+            int foo = 100; // BREAKPOINT_LINE
+            foo = foo + 100;
+            foo = foo + 100;
+            foo = foo + 100;
+            foo = foo + 100;
+            log.display("Returned from tested method");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001.java
new file mode 100644
index 00000000000..f5aae7067db
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001.java
@@ -0,0 +1,588 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.THREAD_DEATH;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: THREAD_DEATH.
+ *
+ * See thrdeath001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class thrdeath001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.THREAD_DEATH";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "thrdeath001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.THREAD_DEATH;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String BREAKPOINT_METHOD_NAME = "ready";
+    static final int BREAKPOINT_LINE = thrdeath001a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new thrdeath001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for THREAD_DEATH event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested THREAD_DEATH event
+            log.display("Waiting for THREAD_DEATH event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for THREAD_DEATH event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        long threadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + threadID);
+        log.display("");
+
+        // get thread value from static field of tested class
+        log.display("Getting thread value from static field: " + THREAD_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID, THREAD_FIELD_NAME,
+                                                                        JDWP.Tag.THREAD);
+        testedThreadID = ((Long)value.getValue()).longValue();
+        log.display("  ... got threadID: " + testedThreadID);
+    }
+
+    /**
+     * Make request for tested THREAD_DEATH event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.THREAD_ONLY);
+        command.addByte(JDWP.EventModifierKind.THREAD_ONLY);
+        log.display("      threadID: " + testedThreadID);
+        command.addObjectID(testedThreadID);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested THREAD_DEATH event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested THREAD_DEATH event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.THREAD_DEATH + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.THREAD_DEATH) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.THREAD_DEATH + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001/TestDescription.java
new file mode 100644
index 00000000000..8453ff8a008
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/THREAD_DEATH/thrdeath001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: THREAD_DEATH
+ *     Test checks that
+ *         1) debuggee successfully creates THREAD_DEATH event request
+ *            for particular threadID
+ *         2) expected THREAD_DEATH event is received when the thread
+ *            finished into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: thrdeath001
+ *         debuggee: thrdeath001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and breakpoint reached.
+ *     Then debugger gets threadID from the class static field and makes
+ *     THREAD_DEATH event request for this thread,
+ *     When event is received debugger checks if the received event
+ *     is for this thread and has correct attributes. Then debugger
+ *     removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.THREAD_DEATH.thrdeath001
+ *        nsk.jdwp.Event.THREAD_DEATH.thrdeath001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.THREAD_DEATH.thrdeath001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001a.java
new file mode 100644
index 00000000000..140ae1257f6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001a.java
@@ -0,0 +1,103 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.THREAD_DEATH;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class thrdeath001a {
+
+    static final int BREAKPOINT_LINE = 93;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        thrdeath001a _thrdeath001a = new thrdeath001a();
+        System.exit(thrdeath001.JCK_STATUS_BASE + _thrdeath001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass.thread = new TestedClass(thrdeath001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // reach breakpoint
+        TestedClass.ready();
+
+        // start tested thread
+        log.display("Starting tested thread");
+        TestedClass.thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            TestedClass.thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return thrdeath001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return thrdeath001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public static volatile TestedClass thread = null;
+
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public static void ready() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+            log.display("Tested thread: finished");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001.java
new file mode 100644
index 00000000000..f525d7d550f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001.java
@@ -0,0 +1,588 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.THREAD_START;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: THREAD_START.
+ *
+ * See thrstart001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class thrstart001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.THREAD_START";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "thrstart001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.THREAD_START;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_THREAD_NAME = "TestedThread";
+
+    // name of field and method of tested class
+    static final String THREAD_FIELD_NAME = "thread";
+    static final String BREAKPOINT_METHOD_NAME = "ready";
+    static final int BREAKPOINT_LINE = thrstart001a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new thrstart001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // prepare debuggee
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for THREAD_START event for class:\n\t"
+                    + TESTED_CLASS_NAME);
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested THREAD_START event
+            log.display("Waiting for THREAD_START event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            // clear tested request for THREAD_START event
+            log.display("Clearing request for tested event");
+            clearTestedRequest();
+            log.display("  ... request removed");
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + BREAKPOINT_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        long threadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        BREAKPOINT_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + threadID);
+        log.display("");
+
+        // get thread value from static field of tested class
+        log.display("Getting thread value from static field: " + THREAD_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID, THREAD_FIELD_NAME,
+                                                                        JDWP.Tag.THREAD);
+        testedThreadID = ((Long)value.getValue()).longValue();
+        log.display("  ... got threadID: " + testedThreadID);
+    }
+
+    /**
+     * Make request for tested THREAD_START event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("      modKind: " + JDWP.EventModifierKind.THREAD_ONLY);
+        command.addByte(JDWP.EventModifierKind.THREAD_ONLY);
+        log.display("      threadID: " + testedThreadID);
+        command.addObjectID(testedThreadID);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Clear request for tested THREAD_START event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested THREAD_START event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.THREAD_START + ")");
+                dead = true;
+                success = false;
+                return;
+            }  else if (eventKind != JDWP.EventKind.THREAD_START) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.THREAD_START + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID != testedThreadID) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: " + testedThreadID + ")");
+                success = false;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001/TestDescription.java
new file mode 100644
index 00000000000..148083d6510
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/THREAD_START/thrstart001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         command set: EventRequest
+ *         command: Set, Clear
+ *         event kind: THREAD_START
+ *     Test checks that
+ *         1) debuggee successfully creates THREAD_START event request
+ *            for particular threadID
+ *         2) expected THREAD_START event is received when the thread
+ *            started into debuggee
+ *         3) debuggee successfully removes event request
+ *     Test consists of two compoments:
+ *         debugger: thrstart001
+ *         debuggee: thrstart001a
+ *     First, debugger uses nsk.share support classes to launch debuggee,
+ *     and obtains Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and breakpoint reached.
+ *     Then debugger gets threadID from the class static field and makes
+ *     THREAD_START event request for this thread,
+ *     When event is received debugger checks if the received event
+ *     is for this thread and has correct attributes. Then debugger
+ *     removes event request.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.THREAD_START.thrstart001
+ *        nsk.jdwp.Event.THREAD_START.thrstart001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.THREAD_START.thrstart001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001a.java
new file mode 100644
index 00000000000..674a49d942b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001a.java
@@ -0,0 +1,103 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Event.THREAD_START;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class thrstart001a {
+
+    static final int BREAKPOINT_LINE = 93;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        thrstart001a _thrstart001a = new thrstart001a();
+        System.exit(thrstart001.JCK_STATUS_BASE + _thrstart001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating tested thread");
+        TestedClass.thread = new TestedClass(thrstart001.TESTED_THREAD_NAME);
+        log.display("  ... thread created");
+
+        // reach breakpoint
+        TestedClass.ready();
+
+        // start tested thread
+        log.display("Starting tested thread");
+        TestedClass.thread.start();
+        log.display("  ... thread started");
+
+        // wait for thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            TestedClass.thread.join();
+            log.display("  ... thread finished");
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished");
+            return thrstart001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return thrstart001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass extends Thread {
+        public static volatile TestedClass thread = null;
+
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        public static void ready() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+
+        public void run() {
+            log.display("Tested thread: started");
+            log.display("Tested thread: finished");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001.java
new file mode 100644
index 00000000000..771e121d8ce
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001.java
@@ -0,0 +1,325 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.VM_DEATH;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: VM_DEATH.
+ *
+ * See vmdeath001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class vmdeath001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.VM_DEATH";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "vmdeath001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Event.Composite";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Event.Composite;
+    static final int JDWP_EVENT_KIND = JDWP.EventKind.VM_DEATH;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new vmdeath001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for tested VM_DEATH event
+            log.display("\n>>> Testing JDWP event \n");
+            waitForTestedEvent();
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Wait for tested VM_DEATH event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet (for " + timeout + "ms timeout)");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is OK");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != JDWP.SuspendPolicy.NONE) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + JDWP.SuspendPolicy.NONE + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind != JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+                return;
+            }
+            dead = true;
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != 0) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + 0 + ")");
+                success = false;
+                return;
+            }
+
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001/TestDescription.java
new file mode 100644
index 00000000000..7503fabb5a7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001/TestDescription.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/VM_DEATH/vmdeath001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         event kind: VM_DEATH
+ *     Test checks that debugee accept the event packet with correct
+ *     attributes at debuggee's exit.
+ *     Test consists of two compoments:
+ *         debugger: vmdeath001
+ *         debuggee: vmdeath001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Debugger waits for debuggee started and resumes it to allow debuggee
+ *     to exit.
+ *     Next, debugger waits for an event packet and check if the received
+ *     event is a single VM_DEATH event with correct attributes.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.VM_DEATH.vmdeath001
+ *        nsk.jdwp.Event.VM_DEATH.vmdeath001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.VM_DEATH.vmdeath001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001a.java
new file mode 100644
index 00000000000..fef39f1e1b7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.VM_DEATH;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class vmdeath001a {
+
+    public static void main(String args[]) {
+        vmdeath001a _vmdeath001a = new vmdeath001a();
+        System.exit(vmdeath001.JCK_STATUS_BASE + _vmdeath001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return vmdeath001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002.java
new file mode 100644
index 00000000000..20f96d064d1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002.java
@@ -0,0 +1,550 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.VM_DEATH;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: VM_DEATH.
+ *
+ * See vmdeath002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class vmdeath002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // VM capability constants
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_REQUEST_VMDEATH_EVENT;
+    static final String VM_CAPABILITY_NAME = "canRequestVMDeathEvent";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.VM_DEATH";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "vmdeath002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP event constants
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.VM_DEATH;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean resumed = false;
+    boolean success = true;
+
+    // obtained data
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new vmdeath002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // check for VM capability
+            log.display("\n>>> Checking VM capability \n");
+            log.display("Getting VM capability: " + VM_CAPABILITY_NAME);
+            boolean capable = debugee.getNewCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME);
+            log.display("  ... got VM capability: " + capable);
+
+            // exit as PASSED if this capability is not supported
+            if (!capable) {
+                out.println("TEST PASSED: unsupported VM capability: "
+                            + VM_CAPABILITY_NAME);
+                return PASSED;
+            }
+
+            // test JDWP event
+            log.display("\n>>> Testing JDWP event \n");
+            log.display("Making request for METHOD_DEATH event");
+            requestTestedEvent();
+            log.display("  ... got requestID: " + eventRequestID);
+            log.display("");
+
+            // resume debuggee
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+            log.display("");
+
+            // wait for tested VM_DEATH event
+            log.display("Waiting for VM_DEATH event received");
+            waitForTestedEvent();
+            log.display("  ... event received");
+            log.display("");
+
+            if (!dead) {
+                // clear tested request for VM_DEATH event
+                log.display("\n>>> Clearing request for tested event \n");
+                clearTestedRequest();
+
+                // finish debuggee after testing
+                log.display("\n>>> Finishing debuggee \n");
+
+                // resume debuggee
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+
+                // wait for debuggee exited
+                log.display("Waiting for VM_DEATH event");
+                debugee.waitForVMDeath();
+                dead = true;
+                log.display("  ... VM_DEATH event received");
+            } else if (!resumed) {
+                // resume debuggee
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Make request for tested METHOD_ENTRY event.
+     */
+    void requestTestedEvent() {
+        Failure failure = new Failure("Error occured while makind request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Set");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        log.display("    eventKind: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    eventPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 0);
+        command.addInt(0);
+        command.setLength();
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+            throw failure;
+        }
+
+        eventRequestID = requestID;
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+
+    }
+
+    /**
+     * Clear request for tested METHOD_ENTRY event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+        log.display("");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+        log.display("");
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested VM_DEATH event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is OK");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check suspendPolicy value
+        if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        int eventReceived = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind != TESTED_EVENT_KIND) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + TESTED_EVENT_KIND + ")");
+                success = false;
+                continue;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                dead = true;
+                resumed = (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY);
+                return;
+            }
+
+            // check requestID
+            if (requestID == eventRequestID) {
+                eventReceived++;
+            } else if (requestID == 0) {
+                dead = true;
+                resumed = (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY);
+            } else {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + " or 0)");
+                success = false;
+                return;
+            }
+
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            int extra = eventPacket.length() - eventPacket.currentPosition();
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString() + " (" + extra + " bytes)");
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+
+        if (eventReceived <= 0) {
+            log.complain("No requested event received: " + eventReceived + " (expected: 1)");
+            success = false;
+        }
+
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002/TestDescription.java
new file mode 100644
index 00000000000..61a5ed32930
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/VM_DEATH/vmdeath002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         event kind: VM_DEATH
+ *     Test checks that resquested VM_DEATH event is received upon
+ *     debuggee VM exit either together with automatically generated
+ *     VM_DEATH event or in a singleton event packet.
+ *     Test consists of two compoments:
+ *         debugger: vmdeath002
+ *         debuggee: vmdeath002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Debugger waits for debuggee started and makes an request for VM_DEATH
+ *     event. Then, it resumes debuggee to allow it to exit.
+ *     Next, debugger waits for an event packet and check if the received
+ *     event contains only VM_DEATH events either requested one or automatically
+ *     generated one. Received event should have expected requestID and
+ *     correct attributes.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *     Test was fixed due to test bug:
+ *     4863716 TEST_BUG: misprint in JDWP test vmdeath002
+ *     Test was fixed due to test bug:
+ *     4973268 TEST_BUG: nsk/jdwp/Event/VM_DEATH/vmdeath002 needs to be updated
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.VM_DEATH.vmdeath002
+ *        nsk.jdwp.Event.VM_DEATH.vmdeath002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.VM_DEATH.vmdeath002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002a.java
new file mode 100644
index 00000000000..0b0dc020015
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.VM_DEATH;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class vmdeath002a {
+
+    public static void main(String args[]) {
+        vmdeath002a _vmdeath002a = new vmdeath002a();
+        System.exit(vmdeath002.JCK_STATUS_BASE + _vmdeath002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return vmdeath002.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001.java
new file mode 100644
index 00000000000..58d77cd8901
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001.java
@@ -0,0 +1,347 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.VM_START;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP event: VM_START.
+ *
+ * See vmstart001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP event is tested in the method waitForTestedEvent().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class vmstart001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Event.VM_START";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "vmstart001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Event.Composite";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Event.Composite;
+    static final int JDWP_EVENT_KIND = JDWP.EventKind.VM_START;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new vmstart001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for tested VM_START event
+            log.display("\n>>> Testing JDWP event \n");
+            waitForTestedEvent();
+
+            // finish debuggee after testing
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Wait for tested VM_START event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is OK");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        if (suspendPolicy != JDWP.SuspendPolicy.ALL) {
+            log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                        suspendPolicy + " (expected: " + JDWP.SuspendPolicy.ALL + ")");
+            success = false;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.complain("Unexpected VM_DEATH event received: " +
+                            eventKind + " (expected: " + JDWP.EventKind.THREAD_START + ")");
+                dead = true;
+                success = false;
+                return;
+            } else if (eventKind != JDWP.EventKind.VM_START) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_START + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != 0) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + 0 + ")");
+                success = false;
+                return;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (threadID == 0) {
+                log.complain("Unexpected null threadID of event " + i + " in tested event packet: " +
+                            threadID + " (expected: not " + 0 + ")");
+                success = false;
+                return;
+            }
+
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001/TestDescription.java
new file mode 100644
index 00000000000..3d15f1bc248
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001/TestDescription.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Event/VM_START/vmstart001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Event
+ *         command: Composite
+ *         event kind: VM_START
+ *     Test checks that debugee accept the event packet with correct
+ *     attributes at debuggee's startup.
+ *     Test consists of two compoments:
+ *         debugger: vmstart001
+ *         debuggee: vmstart001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for an event packet and check if the received
+ *     event is a single VM_START event with correct attributes.
+ *     Finally, debugger disconnects debuggee, waits for it exited
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Event.VM_START.vmstart001
+ *        nsk.jdwp.Event.VM_START.vmstart001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Event.VM_START.vmstart001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001a.java
new file mode 100644
index 00000000000..6c9f313a6b0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Event.VM_START;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class vmstart001a {
+
+    public static void main(String args[]) {
+        vmstart001a _vmstart001a = new vmstart001a();
+        System.exit(vmstart001.JCK_STATUS_BASE + _vmstart001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return vmstart001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001.java
new file mode 100644
index 00000000000..4973cac34a7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001.java
@@ -0,0 +1,477 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.Clear;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: EventRequest.Clear.
+ *
+ * See clear001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class clear001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.EventRequest.Clear";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "clear001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "EventRequest.Clear";
+    static final int JDWP_COMMAND_ID = JDWP.Command.EventRequest.Clear;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.BREAKPOINT;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of field and method of tested class
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = clear001a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedMethodID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new clear001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Get debuggee prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand();
+
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event instead of BREAKPOINT event");
+            waitForVMDeathEvent();
+
+            if (!dead) {
+                // resume debuggee after BREAKPOINT event
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+
+                // wait for debuggee exited
+                log.display("Waiting for final VM_DEATH event");
+                debugee.waitForVMDeath();
+                dead = true;
+                log.display("  ... VM_DEATH event received");
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for tested method
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // make request for BREAKPOINT event
+        log.display("Making request for BREAKPOINT event at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        eventRequestID = debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... got requestID: " + eventRequestID);
+    }
+
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no out data
+        log.display("    no out data");
+
+        log.display("  ... packet data is parsed");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Wait for VM_DEATH event.
+     */
+    void waitForVMDeathEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Expected VM_DEATH event received intead of BREAKPOINT event");
+                dead = true;
+                return;
+            }  else if (eventKind == JDWP.EventKind.BREAKPOINT) {
+                log.complain("Unexpected BREAKPOINT event received in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+            }  else {
+                log.complain("Unexpected eventKind of event " + i + " in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in BREAKPOINT event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001/TestDescription.java
new file mode 100644
index 00000000000..00362415ad3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/EventRequest/Clear/clear001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: EventRequest
+ *         command: Clear
+ *         event kind: BREAKPOINT
+ *     Test checks that debuggee accept tested command and replies
+ *     with correct reply packet. Also test checks that no breakpoint
+ *     events occurs for cleared BREAKPOINT request.
+ *     Test consists of two compoments:
+ *         debugger: clear001
+ *         debuggee: clear001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded into debuggee and
+ *     makes request for BREAKPOINT at method run().
+ *     Then, debugger creates creates command packet for command
+ *     EventRequest.Clear with created requestID, sends it to debuggee,
+ *     waits for reply packet and check that reply is correct and has
+ *     no reply data.
+ *     Then, debugger resumes debuggee and waits for an VM_DEATH event.
+ *     If received event is BREAKPOINT event, debugger complains an error.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.EventRequest.Clear.clear001
+ *        nsk.jdwp.EventRequest.Clear.clear001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.EventRequest.Clear.clear001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001a.java
new file mode 100644
index 00000000000..428efd91931
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001a.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.EventRequest.Clear;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class clear001a {
+
+    static final int BREAKPOINT_LINE = 80;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        clear001a _clear001a = new clear001a();
+        System.exit(clear001.JCK_STATUS_BASE + _clear001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass object = new TestedClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        log.display("Invoking method with breakpoint");
+        object.run();
+        log.display("  ... method invoked");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return clear001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+
+        public void run() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001.java
new file mode 100644
index 00000000000..b4cbd4f2072
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001.java
@@ -0,0 +1,474 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.ClearAllBreakpoints;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: EventRequest.ClearAllBreakpoints.
+ *
+ * See clrallbreakp001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class clrallbreakp001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.EventRequest.ClearAllBreakpoints";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "clrallbreakp001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "EventRequest.ClearAllBreakpoints";
+    static final int JDWP_COMMAND_ID = JDWP.Command.EventRequest.ClearAllBreakpoints;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.VM_START;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of field and method of tested class
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = clrallbreakp001a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedMethodID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new clrallbreakp001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Get debuggee prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand();
+
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event instead of BREAKPOINT event");
+            waitForVMDeathEvent();
+
+            if (!dead) {
+                // resume debuggee after BREAKPOINT event
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+
+                // wait for debuggee exited
+                log.display("Waiting for fianl VM_DEATH event");
+                debugee.waitForVMDeath();
+                dead = true;
+                log.display("  ... VM_DEATH event received");
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for tested method
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // make request for BREAKPOINT event
+        log.display("Making request for BREAKPOINT event at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        eventRequestID = debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... got requestID: " + eventRequestID);
+    }
+
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    no out data");
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no out data
+        log.display("    no out data");
+
+        log.display("  ... packet data is parsed");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Wait for VM_DEATH event.
+     */
+    void waitForVMDeathEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Expected VM_DEATH event received intead of BREAKPOINT event");
+                dead = true;
+                return;
+            }  else if (eventKind == JDWP.EventKind.BREAKPOINT) {
+                log.complain("Unexpected BREAKPOINT event received in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+            }  else {
+                log.complain("Unexpected eventKind of event " + i + " in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in BREAKPOINT event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001/TestDescription.java
new file mode 100644
index 00000000000..c851583fbe8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: EventRequest
+ *         command: ClearAllBreakpoints
+ *     Test checks that debuggee accept tested command and replies
+ *     with correct reply packet. Also test checks that no breakpoint
+ *     events occures for previously created BREAKPOINT request.
+ *     Test consists of two compoments:
+ *         debugger: clrallbreakp001
+ *         debuggee: clrallbreakp001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded into debuggee and
+ *     makes request for BREAKPOINT at method run().
+ *     Then, debugger creates creates command packet for command
+ *     EventRequest.ClearAllBreakpoints, sends it to debuggee, waits
+ *     for reply packet and check that reply is correct and has no reply data.
+ *     Then, debugger resumes debuggee and waits for an VM_DEATH event.
+ *     If received event is BREAKPOINT event, debugger complains an error.
+ *     Finally, debugger disconnectes debuggee, waits for it exits
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp001
+ *        nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001a.java
new file mode 100644
index 00000000000..f0672db053d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001a.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.EventRequest.ClearAllBreakpoints;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class clrallbreakp001a {
+
+    static final int BREAKPOINT_LINE = 80;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        clrallbreakp001a _clrallbreakp001a = new clrallbreakp001a();
+        System.exit(clrallbreakp001.JCK_STATUS_BASE + _clrallbreakp001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass object = new TestedClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        log.display("Invoking method with breakpoint");
+        object.run();
+        log.display("  ... method invoked");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return clrallbreakp001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+
+        public void run() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002.java
new file mode 100644
index 00000000000..c106daa64ff
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002.java
@@ -0,0 +1,288 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.ClearAllBreakpoints;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: EventRequest.ClearAllBreakpoints.
+ *
+ * See clrallbreakp002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class clrallbreakp002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.EventRequest.ClearAllBreakpoints";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "clrallbreakp002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "EventRequest.ClearAllBreakpoints";
+    static final int JDWP_COMMAND_ID = JDWP.Command.EventRequest.ClearAllBreakpoints;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.VM_START;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new clrallbreakp002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand();
+
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+    }
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    no out data");
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no out data
+        log.display("    no out data");
+
+        log.display("  ... packet data is parsed");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002/TestDescription.java
new file mode 100644
index 00000000000..88c566b5619
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002/TestDescription.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: EventRequest
+ *         command: ClearAllBreakpoints
+ *     Test checks that debugee accepts command packet for tested command
+ *     and replies with correct reply packet, even if no requests for
+ *     BREAKPOINT event had been made before.
+ *     Test consists of two compoments:
+ *         debugger: clrallbreakp002
+ *         debuggee: clrallbreakp002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded, creates command packet
+ *     for EventRequest.ClearAllBreakpoints command and sends it to debuggee.
+ *     Then debugger reads reply packet and checks if reply packet is correct
+ *     and has no reply data.
+ *     Finally, debugger disconnectes debuggee, waits for it exits
+ *     and exits too with proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp002
+ *        nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002a.java
new file mode 100644
index 00000000000..91bcba5e057
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002a.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.ClearAllBreakpoints;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class clrallbreakp002a {
+
+    public static void main(String args[]) {
+        clrallbreakp002a _clrallbreakp002a = new clrallbreakp002a();
+        System.exit(clrallbreakp002.JCK_STATUS_BASE + _clrallbreakp002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("  ... object created");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return clrallbreakp002.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003.java
new file mode 100644
index 00000000000..34a69758774
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003.java
@@ -0,0 +1,310 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.ClearAllBreakpoints;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: EventRequest.ClearAllBreakpoints.
+ *
+ * See clrallbreakp003.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class clrallbreakp003 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.EventRequest.ClearAllBreakpoints";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "clrallbreakp003";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "EventRequest.ClearAllBreakpoints";
+    static final int JDWP_COMMAND_ID = JDWP.Command.EventRequest.ClearAllBreakpoints;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.VM_START;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of field and method of tested class
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = clrallbreakp003a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedMethodID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new clrallbreakp003().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Get debuggee prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand();
+
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for fianl VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for tested method
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // make request for BREAKPOINT event
+        log.display("Making request for BREAKPOINT event at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        eventRequestID = debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... got requestID: " + eventRequestID);
+
+        // clear request for BREAKPOINT event
+        log.display("Clearing BREAKPOINT event requestID: " + eventRequestID);
+        debugee.clearEventRequest(JDWP.EventKind.BREAKPOINT, eventRequestID);
+        log.display("  ... request removed");
+    }
+
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    no out data");
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no out data
+        log.display("    no out data");
+
+        log.display("  ... packet data is parsed");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003/TestDescription.java
new file mode 100644
index 00000000000..e6f6cb9125d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003/TestDescription.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: EventRequest
+ *         command: ClearAllBreakpoints
+ *     Test checks that debuggee accept tested command and replies
+ *     with correct reply packet, even if all requests for breakpoint
+ *     event had been cleared before.
+ *     Test consists of two compoments:
+ *         debugger: clrallbreakp003
+ *         debuggee: clrallbreakp003a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded into debuggee,
+ *     makes request for BREAKPOINT at method run() and immediately
+ *     cleares this request.
+ *     Then, debugger creates command packet for tested command
+ *     EventRequest.ClearAllBreakpoints, sends it to debuggee, waits
+ *     for reply packet and checks that reply is correct and has no
+ *     reply data.
+ *     Finally, debugger disconnectes debuggee, waits for it exits
+ *     and exits too with proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp003
+ *        nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp003a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp003
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003a.java
new file mode 100644
index 00000000000..98ba583a556
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003a.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.EventRequest.ClearAllBreakpoints;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class clrallbreakp003a {
+
+    static final int BREAKPOINT_LINE = 80;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        clrallbreakp003a _clrallbreakp003a = new clrallbreakp003a();
+        System.exit(clrallbreakp003.JCK_STATUS_BASE + _clrallbreakp003a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass object = new TestedClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        log.display("Invoking method with breakpoint");
+        object.run();
+        log.display("  ... method invoked");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return clrallbreakp003.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+
+        public void run() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001.java
new file mode 100644
index 00000000000..522c6096cdf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001.java
@@ -0,0 +1,509 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.Set;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: EventRequest.Set.
+ *
+ * See set001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class set001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.EventRequest.Set";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "set001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "EventRequest.Set";
+    static final int JDWP_COMMAND_ID = JDWP.Command.EventRequest.Set;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.BREAKPOINT;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+    static final byte TESTED_EVENT_MODIFIER = JDWP.EventModifierKind.LOCATION_ONLY;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of field and method of tested class
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = set001a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedMethodID = 0;
+    int eventRequestID = 0;
+    JDWP.Location breakpointLocation = null;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new set001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Get debuggee prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand();
+
+            if (success) {
+                log.display("\n>>> Checking request result \n");
+
+                // resume debuggee
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+
+                // wait for BREAKPOINT event
+                log.display("Waiting for BREAKPOINT event");
+                long threadID = debugee.waitForBreakpointEvent(eventRequestID);
+                log.display("  ... BREAKPOINT event received with threadID: " + threadID);
+            }
+
+            log.display("\n>>> Finishing debuggee \n");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for debuggee exited
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            dead = true;
+            log.display("  ... VM_DEATH event received");
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debuggee for testing.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for breakpoint method
+        log.display("Getting breakpoint methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // get codeIndex for breakpoint line
+        log.display("Getting code index for breakpoint line: " + BREAKPOINT_LINE);
+        long codeIndex = debugee.getCodeIndex(testedClassID, testedMethodID, BREAKPOINT_LINE);
+        log.display("  ... got breakpoint codeIndex: " + codeIndex);
+
+        // create breakpoint location
+        log.display("Creating location for breakpoint at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        breakpointLocation = new JDWP.Location(JDWP.TypeTag.CLASS, testedClassID,
+                                                    testedMethodID, codeIndex);
+        log.display("  ... got breakpoint location: " + breakpointLocation);
+    }
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    suspendPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 1);
+        command.addInt(1);
+        log.display("       modKind: " + TESTED_EVENT_MODIFIER);
+        command.addByte(TESTED_EVENT_MODIFIER);
+        log.display("         location: " + breakpointLocation);
+        command.addLocation(breakpointLocation);
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // extract requestID
+        int requestID = 0;
+        try {
+            requestID = reply.getInt();
+            log.display("    requestID: " + requestID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract requestID from request reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // check requestID
+        if (requestID == 0) {
+            log.complain("Unexpected null requestID returned: " + requestID);
+            success = false;
+        }
+        eventRequestID = requestID;
+
+        log.display("  ... packet data is parsed");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Wait for VM_DEATH event.
+     */
+    void waitForVMDeathEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Expected VM_DEATH event received intead of BREAKPOINT event");
+                dead = true;
+                return;
+            }  else if (eventKind == JDWP.EventKind.BREAKPOINT) {
+                log.complain("Unexpected BREAKPOINT event received in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+            }  else {
+                log.complain("Unexpected eventKind of event " + i + " in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in BREAKPOINT event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001/TestDescription.java
new file mode 100644
index 00000000000..97136e9c5f6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001/TestDescription.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/EventRequest/Set/set001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: EventRequest
+ *         command: Set
+ *         event kind: BREAKPOINT
+ *     Test checks that debuggee accept tested command and replies
+ *     with correct reply packet. Also test checks that requested
+ *     breakpoint events occurs for created request.
+ *     Test consists of two compoments:
+ *         debugger: set001
+ *         debuggee: set001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and constructs
+ *     location for breakpoint request.
+ *     Then, debugger creates command packet for command EventRequest.Set
+ *     for this breakpoint location, sends it to debuggee and waits for
+ *     reply packet. When reply packed is received, debugger extracts
+ *     requestID and checks if it is not null.
+ *     Then, debugger resumes debuggee and waits for expected BREAKPOINT
+ *     event. If received event is not BREAKPOINT event, debugger
+ *     complains an error.
+ *     Finally, debugger disconnectes debuggee, waits for it exits
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test was fixed due to test bug:
+ *     4797978 TEST_BUG: potential race condition in a number of JDWP tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.EventRequest.Set.set001
+ *        nsk.jdwp.EventRequest.Set.set001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.EventRequest.Set.set001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001a.java
new file mode 100644
index 00000000000..17049c4eb75
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001a.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.EventRequest.Set;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class set001a {
+
+    static final int BREAKPOINT_LINE = 80;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        set001a _set001a = new set001a();
+        System.exit(set001.JCK_STATUS_BASE + _set001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass object = new TestedClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        log.display("Invoking method with breakpoint");
+        object.run();
+        log.display("  ... method invoked");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return set001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+
+        public void run() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002.java
new file mode 100644
index 00000000000..ae25ddc2fe2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002.java
@@ -0,0 +1,533 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.Set;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: EventRequest.Set.
+ *
+ * See set002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #waitForTestedEvent()
+ */
+public class set002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.EventRequest.Set";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "set002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "EventRequest.Set";
+    static final int JDWP_COMMAND_ID = JDWP.Command.EventRequest.Set;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.VM_START;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new set002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand();
+
+            log.display("Resumindg debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for tested VM_START or VM_DEATH event
+            log.display("\n>>> Testing JDWP event \n");
+            waitForTestedEvent();
+
+            if (!dead) {
+                // clear tested request for VM_START event
+                log.display("\n>>> Clearing request for tested event \n");
+                clearTestedRequest();
+
+                // finish debuggee after testing
+                log.display("\n>>> Finishing debuggee \n");
+
+                // resume debuggee
+                log.display("Resuming debuggee");
+                debugee.resume();
+                log.display("  ... debuggee resumed");
+
+                // wait for debuggee exited
+                log.display("Waiting for VM_DEATH event");
+                debugee.waitForVMDeath();
+                dead = true;
+                log.display("  ... VM_DEATH event received");
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Test JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    suspendPolicy: " + TESTED_EVENT_SUSPEND_POLICY);
+        command.addByte(TESTED_EVENT_SUSPEND_POLICY);
+        log.display("    modifiers: " + 0);
+        command.addInt(0);
+        command.setLength();
+        log.display("  ... command packet created");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        {
+            // extract requestID
+            try {
+                eventRequestID = reply.getInt();
+                log.display("    requestID: " + eventRequestID);
+            } catch (BoundException e) {
+                log.complain("Unable to extract requestID from request reply packet:\n\t"
+                                + e.getMessage());
+                success = false;
+            }
+
+            // check requestID
+            if (eventRequestID == 0) {
+                log.complain("Unexpected null requestID returned: " + eventRequestID);
+                success = false;
+            }
+
+            log.display("  ... packet data is parsed");
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Clear request for tested VM_START event.
+     */
+    void clearTestedRequest() {
+        Failure failure = new Failure("Error occured while clearing request for tested event");
+
+        // create command packet and fill requred out data
+        log.display("Create command packet: " + "EventRequest.Clear");
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        log.display("    event: " + TESTED_EVENT_KIND);
+        command.addByte(TESTED_EVENT_KIND);
+        log.display("    requestID: " + eventRequestID);
+        command.addInt(eventRequestID);
+        log.display("  ... command packet composed");
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+            log.display("  ... command packet sent");
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            throw failure;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  .. packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            throw failure;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        log.display("    no data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in request reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... reply packet parsed");
+    }
+
+    /**
+     * Wait for tested CLASS_UNLOAD event.
+     */
+    void waitForTestedEvent() {
+
+        EventPacket eventPacket = null;
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet (for " + timeout + "ms timeout)");
+            eventPacket = debugee.getEventPacket(timeout);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.complain("Unable to read tested event packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from tested event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in tested event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check if VM_DEATH event
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Got VM_DEATH event while waiting for tested event");
+                dead = true;
+                log.display("No VM_START event occured so treat test as PASSED");
+                return;
+            }
+
+            // check eventKind
+            if (eventKind != JDWP.EventKind.VM_START) {
+                log.complain("Unexpected eventKind of event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+                return;
+            }
+
+            if (eventKind == JDWP.EventKind.VM_START) {
+                log.complain("Unexpected VM_START event " + i + " in tested event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.VM_DEATH + ")");
+                success = false;
+                return;
+            }
+            // check suspendPolicy value
+            if (suspendPolicy != TESTED_EVENT_SUSPEND_POLICY) {
+                log.complain("Unexpected SuspendPolicy in tested event packet: " +
+                            suspendPolicy + " (expected: " + TESTED_EVENT_SUSPEND_POLICY + ")");
+                success = false;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from tested event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check threadID
+            if (threadID == 0) {
+                log.complain("Unexpected threadID of event " + i + " in tested event packet: " +
+                            requestID + " (expected: not 0)");
+                success = false;
+            }
+
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002/TestDescription.java
new file mode 100644
index 00000000000..3fe51ecd2bc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/EventRequest/Set/set002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: EventRequest
+ *         command: Set
+ *         event kind: VM_START
+ *     Test checks that debuggee accepts tested command and replies
+ *     with no error code for VM_START event request. The tests also
+ *     checks that requested VM_START event is never received after
+ *     initial automatically generated VM_START event.
+ *     Test consists of two compoments:
+ *         debugger: set002
+ *         debuggee: set002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Then, debugger creates creates command packet for command
+ *     EventRequest.Set with VM_START event and no event modifiers;
+ *     and sends it to debuggee. After reply packet is received
+ *     debuggeer checks if it has no errors and valid requestID.
+ *     Then, debugger lets debuggee to run and exit and waits for any event
+ *     is received. If VM_START event is received, then debugger complains
+ *     error and removes event request. Otherwise, if event is VM_DEATH
+ *     the test passes.
+ *     Finally, debugger disconnectes debuggee, waits for it exits
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test fixed due to test bug:
+ *     4909273 TEST_BUG: Fix nsk/jdwp/EventRequest/Set/set002
+ *     Test fixed due to test bug:
+ *     4973741 nsk/jdwp/EventRequest/Set/set002 expects request for VMStart event to fail
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.EventRequest.Set.set002
+ *        nsk.jdwp.EventRequest.Set.set002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.EventRequest.Set.set002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002a.java
new file mode 100644
index 00000000000..7bd1150dd3f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002a.java
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * 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 nsk.jdwp.EventRequest.Set;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class set002a {
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        set002a _set002a = new set002a();
+        System.exit(set002.JCK_STATUS_BASE + _set002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return set002.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001.java
new file mode 100644
index 00000000000..29a06be58fc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001.java
@@ -0,0 +1,334 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.Bytecodes;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Method.Bytecodes.
+ *
+ * See bytecodes001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class bytecodes001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Method.Bytecodes";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "bytecodes001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_GET_BYTECODES;
+    static final String VM_CAPABILITY_NAME = "canGetBytecodes";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Method.Bytecodes";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Method.Bytecodes;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // tested method name constant
+    static final String TESTED_METHOD_NAME = "testedMethod";
+
+    // expected values for bound line numbers
+    static final int FIRST_LINE_NUMBER = bytecodes001a.FIRST_LINE_NUMBER;
+    static final int LAST_LINE_NUMBER = bytecodes001a.LAST_LINE_NUMBER;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new bytecodes001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Checking VM capability \n");
+
+                // check for VM capability
+                log.display("Checking VM capability: " + VM_CAPABILITY_NAME);
+                if (!debugee.getCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME)) {
+                    out.println("TEST PASSED: unsupported VM capability: "
+                                + VM_CAPABILITY_NAME);
+                    return PASSED;
+                }
+
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for methodID of tested method (declared in the class)
+                log.display("Getting methodID by name: " + TESTED_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classID, methodID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long classID, long methodID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  referenceTypeID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check reply data
+
+        // extract number of lines
+        int bytes = 0;
+        try {
+            bytes = reply.getInt();
+            log.display("  bytes: " + bytes);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of bytes from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        if (bytes < 0) {
+            log.complain("Negative number of bytes in reply packet: " + bytes);
+            success = false;
+            return;
+        }
+
+        if (bytes == 0) {
+            log.complain("Zero number of bytes in reply packet: " + bytes);
+            success = false;
+            return;
+        }
+
+        // extract all bytes
+        ByteBuffer bytecode = new ByteBuffer();
+        for (int i = 0; i < bytes; i++) {
+            // extract next byte of bytecode
+            try {
+                byte aByte = reply.getByte();
+                bytecode.addByte(aByte);
+            } catch (BoundException e) {
+                log.complain("Unable to extract byte #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+        }
+
+        log.display("  bytecode:\n" + bytecode);
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001/TestDescription.java
new file mode 100644
index 00000000000..c5e5ddfd13c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001/TestDescription.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Method/Bytecodes/bytecodes001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Method
+ *         command: Bytecodes
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: bytecodes001
+ *         debuggee: bytecodes001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID and methodID for the tested class
+ *     and method from debuggee.
+ *     Then, debugger creates command packet for Method.Bytecodes command
+ *     with the found classID and methodID as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts all bytes of bytecode for requested method.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Method.Bytecodes.bytecodes001
+ *        nsk.jdwp.Method.Bytecodes.bytecodes001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Method.Bytecodes.bytecodes001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001a.java
new file mode 100644
index 00000000000..d63e71128b9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001a.java
@@ -0,0 +1,98 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.Bytecodes;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class bytecodes001a {
+
+    public static final int FIRST_LINE_NUMBER = 65;
+    public static final int LAST_LINE_NUMBER = 76;
+
+    public static void main(String args[]) {
+        bytecodes001a _bytecodes001a = new bytecodes001a();
+        System.exit(bytecodes001.JCK_STATUS_BASE + _bytecodes001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + bytecodes001.READY);
+        pipe.println(bytecodes001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + bytecodes001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(bytecodes001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + bytecodes001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return bytecodes001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return bytecodes001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public void testedMethod() {
+            foo = 1;        // foo == 1
+            foo++;          // foo == 2
+            foo++;          // foo == 3
+            foo++;          // foo == 4
+            foo++;          // foo == 5
+            foo++;          // foo == 6
+            foo++;          // foo == 7
+            foo++;          // foo == 8
+            foo++;          // foo == 9
+            foo++;          // foo == 10
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001.java
new file mode 100644
index 00000000000..c9e558363a2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001.java
@@ -0,0 +1,306 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.IsObsolete;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Method.IsObsolete.
+ *
+ * See isobsolete001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class isobsolete001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Method.IsObsolete";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "isobsolete001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_REDEFINE_CLASSES;
+    static final String VM_CAPABILITY_NAME = "canRedefineClasses";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Method.IsObsolete";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Method.IsObsolete;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // tested method name constant
+    static final String TESTED_METHOD_NAME = "testedMethod";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new isobsolete001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Checking VM capability \n");
+
+                // check for VM capability
+                log.display("Checking VM capability: " + VM_CAPABILITY_NAME);
+                if (!debugee.getNewCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME)) {
+                    out.println("TEST PASSED: unsupported VM capability: "
+                                + VM_CAPABILITY_NAME);
+                    return PASSED;
+                }
+
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for methodID of tested method (declared in the class)
+                log.display("Getting methodID by name: " + TESTED_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classID, methodID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long classID, long methodID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  referenceTypeID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract boolean result
+        byte isObsolete = 0;
+        try {
+            isObsolete = reply.getByte();
+            log.display("  isObsolete: " + isObsolete);
+        } catch (BoundException e) {
+            log.complain("Unable to extract isObsolete value from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that result value is false
+        if (isObsolete != 0) {
+            log.complain("Unexpected true isObsolete value received for not obsolete method: "
+                        + isObsolete);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001/TestDescription.java
new file mode 100644
index 00000000000..62444f19958
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001/TestDescription.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Method/IsObsolete/isobsolete001.
+ * VM Testbase keywords: [quick, jpda, jdwp, redefine]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Method
+ *         command: IsObsolete
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     return value is false, because method of not redefined class
+ *     is not obsolete.
+ *     Test consists of two compoments:
+ *         debugger: isobsolete001
+ *         debuggee: isobsolete001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID and methodID for the tested class
+ *     and method from debuggee.
+ *     Then, debugger creates command packet for Method.IsObsolete command
+ *     with the found classID and methodID as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts boolean isObsolete value. Also test checks that extracted
+ *     value is false.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Method.IsObsolete.isobsolete001
+ *        nsk.jdwp.Method.IsObsolete.isobsolete001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Method.IsObsolete.isobsolete001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001a.java
new file mode 100644
index 00000000000..2a1bc36e3ac
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001a.java
@@ -0,0 +1,86 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.IsObsolete;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class isobsolete001a {
+
+    public static void main(String args[]) {
+        isobsolete001a _isobsolete001a = new isobsolete001a();
+        System.exit(isobsolete001.JCK_STATUS_BASE + _isobsolete001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + isobsolete001.READY);
+        pipe.println(isobsolete001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + isobsolete001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(isobsolete001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + isobsolete001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return isobsolete001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return isobsolete001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public void testedMethod() {
+            foo = 1;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002.java
new file mode 100644
index 00000000000..14fb826ee53
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002.java
@@ -0,0 +1,490 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.IsObsolete;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Method.IsObsolete.
+ *
+ * See isobsolete002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class isobsolete002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_REDEFINE_CLASSES;
+    static final String VM_CAPABILITY_NAME = "canRedefineClasses";
+
+    // package and classes names
+    static final String PACKAGE_NAME = "nsk.jdwp.Method.IsObsolete";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "isobsolete002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command
+    static final String JDWP_COMMAND_NAME = "Method.IsObsolete";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Method.IsObsolete;
+
+    // tested class name and signature
+    static final String TESTED_CLASS_NAME = TEST_CLASS_NAME + "b";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // tested method name
+    static final String TESTED_METHOD_NAME = "testedMethod";
+    static final int BREAKPOINT_LINE = isobsolete002a.BREAKPOINT_LINE;
+
+    // filename for redefined class
+//   4691123 TEST: some jdi tests contain precompiled .klass files undes SCCS
+//   precomiled class was removed
+//    static final String REDEFINED_CLASS_FILE_NAME = "isobsolete002b.klass";
+    static final String REDEFINED_CLASS_FILE_NAME = "newclass"
+                    + File.separator + PACKAGE_NAME.replace('.',File.separatorChar)
+                    + File.separator + "isobsolete002b.class";
+//                    + File.separator + "isobsolete002b.klass";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    String testDir = null;
+    boolean dead = false;
+    boolean success = true;
+
+    // data obtained from debuggee
+    long testedClassID = 0;
+    long testedMethodID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new isobsolete002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();  // minutes
+        timeout = waitTime * 60 * 1000;           // milliseconds
+
+        // get testDir as first positional parameter
+        String args[] = argumentHandler.getArguments();
+        if (args.length < 1) {
+            log.complain("Test dir required as the first positional argument");
+            return FAILED;
+        }
+        testDir = args[0];
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Loading redefined class \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee VM");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debuggee launched");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for VM_INIT event
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // check for VM capability
+            log.display("\n>>> Checking VM capability \n");
+            log.display("Getting new VM capability: " + VM_CAPABILITY_NAME);
+            boolean capable = debugee.getNewCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME);
+            log.display("  ... got VM capability: " + capable);
+
+            // exit as PASSED if this capability is not supported
+            if (!capable) {
+                out.println("TEST PASSED: unsupported VM capability: "
+                            + VM_CAPABILITY_NAME);
+                return PASSED;
+            }
+
+            // prepare debuggee for testing and obtain required data
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+            testCommand(testedMethodID, TESTED_METHOD_NAME);
+
+            // finish debuggee
+            log.display("\n>> Finishing debuggee \n");
+
+            // resume debuggee after testing command
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for VM_DEATH event
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            log.display("  ... VM_DEATH event received");
+            dead = true;
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            log.display("\n>>> Finishing test \n");
+
+            // disconnect debugee and wait for its exit
+            if (debugee != null) {
+                quitDebugee();
+            }
+        }
+
+        // check result
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+        out.println("TEST PASSED");
+        return PASSED;
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for debuggee and tested classes loaded on debuggee startup
+        log.display("Waiting for classes loaded:"
+                        + "\n\t" + TESTED_CLASS_NAME);
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME,
+                                                    JDWP.SuspendPolicy.ALL);
+        log.display("  ... class loaded with classID: " + testedClassID);
+        log.display("");
+
+/*
+        // get tested methodID by names
+        log.display("Getting methodID for method name :" + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+        log.display("");
+*/
+
+        // wait for breakpoint reached
+        log.display("Waiting for breakpoint reached at: "
+                        + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        long threadID = debugee.waitForBreakpointReached(testedClassID,
+                                                        TESTED_METHOD_NAME,
+                                                        BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint reached with threadID: " + threadID);
+        log.display("");
+
+        // load class file for redefined class
+        log.display("Loading bytecode of redefined class from file: " +
+                    REDEFINED_CLASS_FILE_NAME);
+        byte[] classBytes = loadClassBytes(REDEFINED_CLASS_FILE_NAME, testDir);
+        log.display("   ... loaded bytes: " + classBytes.length);
+
+        // redefine class
+        log.display("Redefine class by classID: " + testedClassID);
+        redefineClass(testedClassID, classBytes);
+        log.display("  ... class redefined");
+        log.display("");
+
+        // get top frameID of the thread
+        log.display("Getting top frameID of the threadID: " + threadID);
+        JDWP.Location location = queryTopFrameLocation(threadID);
+        log.display("  ... got location: " + location);
+
+        // get methodID of the top frameID
+        log.display("Getting methodID for the location :" + location);
+        testedMethodID = location.getMethodID();
+        log.display("  ... got methodID: " + testedMethodID);
+        log.display("");
+
+    }
+
+    /**
+     * Perform testing JDWP command for given methodID.
+     */
+    void testCommand(long testedMethodID, String methodName) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("    refTypeID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        log.display("    methodID: " + testedMethodID);
+        command.addMethodID(testedMethodID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet for method " + methodName + ":\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet for method " + methodName + ":\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for method " + methodName + ":\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // extract boolean isObsolete
+        byte isObsolete = 0;
+        try {
+            isObsolete = reply.getByte();
+            log.display("    isObsolete: " + isObsolete);
+        } catch (BoundException e) {
+            log.complain("Unable to extract isObsolete value from reply packet for method "
+                        + methodName + ":\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // check isObsolete
+        if (isObsolete == 0) {
+            log.complain("Unexpected isObsolete value for method "
+                        + methodName + ": " + isObsolete + " (expected: not " + 0 + ")");
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes in reply packet for "
+                        + methodName + " method at: " + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... packed data parsed");
+    }
+
+    /**
+     * Redefine class bytes for given classID.
+     */
+    void redefineClass(long classID, byte[] classBytes) {
+        int length = classBytes.length;
+
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.RedefineClasses);
+        command.addInt(1);
+        command.addReferenceTypeID(classID);
+        command.addInt(length);
+        command.addBytes(classBytes, 0, length);
+
+        // receive reply packet from debugee
+        ReplyPacket reply = debugee.receiveReplyFor(command, "VirtualMachine.RedefineClasses");
+    }
+
+    /**
+     * Query debuggee VM for top frameID of the thread.
+     */
+    JDWP.Location queryTopFrameLocation(long threadID) {
+        String error = "Error occured while getting top frameID for threadID: " + threadID;
+
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Frames);
+        command.addObjectID(threadID);
+        command.addInt(0);
+        command.addInt(1);
+        command.setLength();
+
+        ReplyPacket reply = debugee.receiveReplyFor(command, "ThreadReference.Frames");
+        reply.resetPosition();
+
+        // extract number of frames
+        int frames = 0;
+        try {
+            frames = reply.getInt();
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of frames from reply packet:\n\t"
+                        + e.getMessage());
+            throw new Failure(error);
+        }
+
+        // check frames count
+        if (frames != 1) {
+            log.complain("Unexpected number of frames returned: "
+                        + frames + " (expected: " + 1 + ")");
+            throw new Failure(error);
+        }
+
+        // extract frame ID
+        long frameID = 0;
+        try {
+            frameID = reply.getFrameID();
+        } catch (BoundException e) {
+            log.complain("Unable to extract top frameID from reply packet:\n\t"
+                    + e.getMessage());
+            throw new Failure(error);
+        }
+
+        // extract frame location
+        JDWP.Location location = null;
+        try {
+            location = reply.getLocation();
+        } catch (BoundException e) {
+            log.complain("Unable to extract location for top frame from reply packet:\n\t"
+                    + e.getMessage());
+            throw new Failure(error);
+        }
+
+        return location;
+    }
+
+
+    /**
+     * Load class bytes form the given file.
+     */
+    byte[] loadClassBytes(String fileName, String dirName) {
+        String fileSep = System.getProperty("file.separator");
+        String filePath = dirName + fileSep + fileName;
+
+        String error = "Unable to read bytes from class file:\n\t" + filePath;
+
+        int length = 0;
+        byte bytes[] = null;
+        try {
+            File file = new File(filePath);
+            length = (int)file.length();
+            FileInputStream is = new FileInputStream(file);
+            bytes = new byte[length];
+            int number = is.read(bytes);
+            if (number < 0) {
+                log.complain("EOF reached while reading bytes from file");
+                throw new Failure(error);
+            } else if (number != length) {
+                log.complain("Unexpected number of bytes red from file: " + number
+                            + " (expected: " + length + ")");
+                throw new Failure(error);
+            }
+            is.close();
+        } catch ( IOException e ) {
+            log.complain("Caught IOException while reading bytes from file:\n\t" + e);
+            throw new Failure(error);
+        }
+        return bytes;
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java
new file mode 100644
index 00000000000..ab7ea75490e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Method/IsObsolete/isobsolete002.
+ * VM Testbase keywords: [quick, jpda, jdwp, redefine]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Method
+ *         command: IsObsolete
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet after class redefinition
+ *     for redefined method being at that time with active stack
+ *     frame.
+ *     Test consists of two compoments:
+ *         debugger: isobsolete002
+ *         debuggee: isobsolete002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     It waits for tested class is loaded, sets breakpoint on the tested
+ *     method, and waits for breakpoint is reached.
+ *     Then, it loads bytecode of redefined class from *.klass file and
+ *     redefines the class. After class redefinition, debugger queries
+ *     debiggi for the methodID of to level stack frame and checks this
+ *     method.
+ *     Debugger creates command packet with Method.IsObsolete command for
+ *     the tested method, writes this packet to the transport channel,
+ *     and waits for a reply packet. When reply packet is received,
+ *     debugger parses the packet structure and checks if expected
+ *     isObsolete value returned in the packet.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     First positional argument for the test should be path to the test
+ *     work directory where loaded *.klass file should be located.
+ *         Test was fixed due to test bug:
+ *         4514956 Method.isObsolete() returns false for redefined method
+ *     Test was updated according to rfe:
+ *     4691123 TEST: some jdi tests contain precompiled .klass files undes SCCS.
+ *     isobsolete002b.ja was moved into newclass directory and renamed
+ *     to isobsolete002b.java.
+ *     The precompiled class file is created during test base build process.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build ExecDriver
+ * @build nsk.jdwp.Method.IsObsolete.isobsolete002
+ *        nsk.jdwp.Method.IsObsolete.isobsolete002a
+ *        nsk.jdwp.Method.IsObsolete.isobsolete002b
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${compile.jdk}/bin/javac
+ *      -cp ${test.class.path}
+ *      -d newclass
+ *      newclass/isobsolete002b.java
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Method.IsObsolete.isobsolete002
+ *      .
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/newclass/isobsolete002b.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/newclass/isobsolete002b.java
new file mode 100644
index 00000000000..026cb62914f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/newclass/isobsolete002b.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002, 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Method.IsObsolete;
+
+import nsk.share.*;
+
+/**
+ * This class is for redefinition.
+ */
+public class isobsolete002b {
+
+    // static field
+    public static int staticField = 0;
+    // object field
+    public int objectField = 0;
+
+    public static Log log;
+
+    // method to be redefined
+    public void testedMethod(int arg) {
+        log.display("Object method invoked: REDEFINED and MODIFIED"); // isobsolete002a.BREAKPOINT_LINE
+        objectField = arg;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002a.java
new file mode 100644
index 00000000000..40466d6a0e9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002a.java
@@ -0,0 +1,71 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.IsObsolete;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class isobsolete002a {
+
+    // scaffold objects
+    static volatile ArgumentHandler argumentHandler = null;
+    static volatile Log log = null;
+
+    // breakpoint line in isobsolete002b
+    static final int BREAKPOINT_LINE = 44;
+
+    public static void main(String args[]) {
+        System.exit(isobsolete002.JCK_STATUS_BASE + isobsolete002a.runIt(args, System.err));
+    }
+
+    public static int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating object of tested class");
+        isobsolete002b.log = log;
+        isobsolete002b object = new isobsolete002b();
+        log.display("  ... object created");
+
+        log.display("Invoking tested method before class redefinition");
+        object.testedMethod(100);
+        log.display("  ... tested method invoked");
+
+        log.display("Invoking tested method after class redefinition");
+        object.testedMethod(100);
+        log.display("  ... tested method invoked");
+
+        // exit
+        log.display("Debugee PASSED");
+        return isobsolete002.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002b.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002b.java
new file mode 100644
index 00000000000..987ad1f3ec2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002b.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Method.IsObsolete;
+
+import nsk.share.*;
+
+/**
+ * This class is to be redefined.
+ */
+public class isobsolete002b {
+
+    // static field
+    public static int staticField = 0;
+    // object field
+    public int objectField = 0;
+
+    public static Log log;
+
+    // tested method to be redefined
+    public void testedMethod(int arg) {
+        int value = arg; // isobsolete002a.BREAKPOINT_LINE
+        log.display("Object method invoked: NOT_REDEFINED");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001.java
new file mode 100644
index 00000000000..ebb30638938
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001.java
@@ -0,0 +1,463 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.LineTable;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Method.LineTable.
+ *
+ * See linetable001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class linetable001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Method.LineTable";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "linetable001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Method.LineTable";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Method.LineTable;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // tested method name constant
+    static final String TESTED_METHOD_NAME = "testedMethod";
+
+    // expected values for bound line numbers
+    static final int FIRST_LINE_NUMBER = linetable001a.FIRST_LINE_NUMBER;
+    static final int LAST_LINE_NUMBER = linetable001a.LAST_LINE_NUMBER;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new linetable001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for methodID of tested method (declared in the class)
+                log.display("Getting methodID by name: " + TESTED_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classID, methodID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long classID, long methodID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  referenceTypeID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check reply data
+
+        // extract start code index
+        long start = 0;
+        try {
+            start = reply.getLong();
+            log.display("  start: " + start);
+        } catch (BoundException e) {
+            log.complain("Unable to extract start line index from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that start code index is not negative
+        if (start < 0) {
+            log.complain("Negative value of start code index in reply packet: " + start);
+            success = false;
+        }
+
+        // extract end code index
+        long end = 0;
+        try {
+            end = reply.getLong();
+            log.display("  end: " + end);
+        } catch (BoundException e) {
+            log.complain("Unable to extract end line index from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that end code index is not negative
+        if (start < 0) {
+            log.complain("Negative value of end code index in reply packet: " + end);
+            success = false;
+        }
+
+        // check that start code is strongly less than end code index
+        if (start > end) {
+            log.complain("Start code index (" + start
+                        + ") is greater than end code index (" + end + ")");
+            success = false;
+        } else if (start == end) {
+            log.complain("Start code index (" + start
+                        + ") is equal to end code index (" + end + ")");
+            success = false;
+        }
+
+        // extract number of lines
+        int lines = 0;
+        try {
+            lines = reply.getInt();
+            log.display("  lines: " + lines);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of lines from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        if (lines < 0) {
+            log.complain("Negative number of lines in reply packet: " + lines);
+            success = false;
+            return;
+        }
+
+        if (lines == 0) {
+            log.complain("Zero number of lines in reply packet: " + lines);
+            success = false;
+            return;
+        }
+
+        // extract and check each line attributes
+        long lineCodeIndex = 0, prevLineCodeIndex = 0;
+        int lineNumber = 0, prevLineNumber = 0;
+
+        for (int i = 0; i < lines; i++) {
+            log.display("  line #" + i + ":");
+
+            // extract code index of a line
+            try {
+                lineCodeIndex = reply.getLong();
+                log.display("    lineCodeIndex: " + lineCodeIndex);
+            } catch (BoundException e) {
+                log.complain("Unable to extract code index of line #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check that code index is between start and end values
+            if (lineCodeIndex < start) {
+                log.complain("Code index of line #" + i + " (" + lineCodeIndex
+                            + ") is less than start code index (" + start + ")");
+                success = false;
+            }
+
+            if (lineCodeIndex > end) {
+                log.complain("Code index of line #" + i + " (" + lineCodeIndex
+                            + ") is greater than end code index (" + end + ")");
+                success = false;
+            }
+
+            // check that code index ot the first line is equal to start value
+            if (i == 0) {
+                if (lineCodeIndex != start) {
+                    log.complain("Code index of first line (" + lineCodeIndex
+                                + ") is not equal to start code index (" + start + ")");
+                    success = false;
+                }
+            }
+
+            // check that code index of a line is strongly greater than for previous line
+            if (i > 0) {
+                if (lineCodeIndex < prevLineCodeIndex) {
+                    log.complain("Code index of line #" + i + " (" + lineCodeIndex
+                                + ") is less than code index of previous line ("
+                                + prevLineCodeIndex + ")");
+                    success = false;
+                } else  if (lineCodeIndex == prevLineCodeIndex) {
+                    log.complain("Code index of line #" + i + " (" + lineCodeIndex
+                                + ") is equal to code index of previous line ("
+                                + prevLineCodeIndex + ")");
+                    success = false;
+                }
+            }
+
+            // extract number of a line
+            try {
+                lineNumber = reply.getInt();
+                log.display("    lineNumber: " + lineNumber);
+            } catch (BoundException e) {
+                log.complain("Unable to extract number of line #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check that code index ot the line is not negative
+            if (lineNumber < 0) {
+                log.complain("Number of line #" + i + " (" + lineNumber
+                            + ") is negative");
+                success = false;
+            }
+
+            // check that code index ot the line is not less than expected
+            if (lineNumber < FIRST_LINE_NUMBER) {
+                log.complain("Number of line #" + i + " (" + lineNumber
+                            + ") is less than expected (" + FIRST_LINE_NUMBER + ")");
+                success = false;
+            }
+
+            // check that code index ot the line is not greater than expected
+            if (lineNumber > LAST_LINE_NUMBER) {
+                log.complain("Number of line #" + i + " (" + lineNumber
+                            + ") is greater than expected (" + LAST_LINE_NUMBER + ")");
+                success = false;
+            }
+
+            // check that line number follows directly to the number of previous line
+            if (i > 0) {
+                if (lineNumber < prevLineNumber) {
+                    log.complain("Number of line #" + i + " (" + lineCodeIndex
+                                + ") is less than number of previous line ("
+                                + prevLineNumber + ")");
+                    success = false;
+                } else  if (lineNumber == prevLineNumber) {
+                    log.complain("Number of line #" + i + " (" + lineCodeIndex
+                                + ") is equal to number of previous line ("
+                                + prevLineNumber + ")");
+                    success = false;
+                } else if (lineNumber != prevLineNumber + 1) {
+                    log.complain("Number of line #" + i + " (" + lineCodeIndex
+                                + ") does not follows to number of previous line ("
+                                + prevLineNumber + ")");
+                    success = false;
+                }
+            }
+
+            // save values to use them as previous line attributes
+            prevLineCodeIndex = lineCodeIndex;
+            prevLineNumber = lineNumber;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001/TestDescription.java
new file mode 100644
index 00000000000..ab4917d0109
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001/TestDescription.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Method/LineTable/linetable001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Method
+ *         command: LineTable
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that code index and number for returned lines
+ *     have expected values, namely:
+ *         1) start code index is strongly less than
+ *            end code index
+ *     and for each line:
+ *         2) line code index is between start and end code index
+ *         3) line code index for previous line is strongly less
+ *            then for next line
+ *         4) line number is between start and end line number
+ *         5) line number for previous line is no greater
+ *            then for next line
+ *         6) number of next line follows directly to the number
+ *            of previous line
+ *     Test consists of two compoments:
+ *         debugger: linetable001
+ *         debuggee: linetable001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID and methodID for the tested class
+ *     and method from debuggee.
+ *     Then, debugger creates command packet for Method.LineTable command
+ *     with the found classID and methodID as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts code index and number for each lines. Also test
+ *     checks above mentioned assertions.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Method.LineTable.linetable001
+ *        nsk.jdwp.Method.LineTable.linetable001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Method.LineTable.linetable001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001a.java
new file mode 100644
index 00000000000..75caf246460
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001a.java
@@ -0,0 +1,100 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.Method.LineTable;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class linetable001a {
+
+    public static final int FIRST_LINE_NUMBER = 86;
+    public static final int LAST_LINE_NUMBER = 97;
+
+    public static void main(String args[]) {
+        linetable001a _linetable001a = new linetable001a();
+        System.exit(linetable001.JCK_STATUS_BASE + _linetable001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + linetable001.READY);
+        pipe.println(linetable001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + linetable001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(linetable001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + linetable001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return linetable001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return linetable001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public void testedMethod() { // FIRST_LINE_NUMBER
+            foo = 1;        // foo == 1
+            foo++;          // foo == 2
+            foo++;          // foo == 3
+            foo++;          // foo == 4
+            foo++;          // foo == 5
+            foo++;          // foo == 6
+            foo++;          // foo == 7
+            foo++;          // foo == 8
+            foo++;          // foo == 9
+            foo++;          // foo == 10
+        } // LAST_LINE_NUMBER
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001.java
new file mode 100644
index 00000000000..9953dc9c94f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001.java
@@ -0,0 +1,489 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.VariableTable;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Method.VariableTable.
+ *
+ * See vartable001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class vartable001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Method.VariableTable";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "vartable001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Method.VariableTable";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Method.VariableTable;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // tested types signature conatants
+    static final String OBJECT_CLASS_SIGNATURE = "Ljava/lang/Object;";
+    static final String STRING_CLASS_SIGNATURE = "Ljava/lang/String;";
+
+
+    // tested method name constant
+    static final String TESTED_METHOD_NAME = "testedMethod";
+
+    // list of tested variables names and signatures
+    static final String variablesList[][] = {
+                // synthetic method arguments
+                {"this",            TESTED_CLASS_SIGNATURE},
+                // method arguments
+                {"booleanArgument", "Z"},
+                {"byteArgument",    "B"},
+                {"charArgument",    "C"},
+                {"shortArgument",   "S"},
+                {"intArgument",     "I"},
+                {"longArgument",    "J"},
+                {"floatArgument",   "F"},
+                {"doubleArgument",  "D"},
+                {"objectArgument",  OBJECT_CLASS_SIGNATURE},
+                {"stringArgument",  STRING_CLASS_SIGNATURE},
+                // local variables
+                {"booleanLocal",    "Z"},
+                {"byteLocal",       "B"},
+                {"charLocal",       "C"},
+                {"shortLocal",      "S"},
+                {"intLocal",        "I"},
+                {"longLocal",       "J"},
+                {"floatLocal",      "F"},
+                {"doubleLocal",     "D"},
+                {"objectLocal",     OBJECT_CLASS_SIGNATURE},
+                {"stringLocal",     STRING_CLASS_SIGNATURE}
+    };
+    static final int variablesCount = variablesList.length;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new vartable001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for methodID of tested method (declared in the class)
+                log.display("Getting methodID by name: " + TESTED_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classID, methodID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long classID, long methodID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  referenceTypeID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // clear list of found variables
+        int[] foundVariablesList = new int[variablesCount];
+        for (int i = 0; i < variablesCount; i++) {
+            foundVariablesList[i] = 0;
+        }
+
+        // extract and check reply data
+
+        // extract number of argumnets
+        int argCount = 0;
+        try {
+            argCount = reply.getInt();
+            log.display("  argCount: " + argCount);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of arguments from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that number of arguments is not negative
+        if (argCount < 0) {
+            log.complain("Negative of arguments in reply packet: " + argCount);
+            success = false;
+        }
+
+        // extract number of slots
+        int slots = 0;
+        try {
+            slots = reply.getInt();
+            log.display("  slots: " + slots);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of slots from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that number of slots is not negative
+        if (slots < 0) {
+            log.complain("Negative value of end code index in reply packet: " + slots);
+            success = false;
+        }
+
+        // check that start code is not less than expected
+        if (slots < variablesCount) {
+            log.complain("Number of slots (" + slots
+                        + ") is less than expected (" + variablesCount + ")");
+            success = false;
+        }
+
+        // extract and check each slot attributes
+        for (int i = 0; i < slots; i++) {
+            log.display("  slot #" + i + ":");
+
+            // extract code index of a slot
+            long codeIndex = 0;
+            try {
+                codeIndex = reply.getLong();
+                log.display("    codeIndex: " + codeIndex);
+            } catch (BoundException e) {
+                log.complain("Unable to extract code index of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check that code index is not negative
+            if (codeIndex < 0) {
+                log.complain("Negative code index of slot #" + i + ":" + codeIndex);
+                success = false;
+            }
+
+            // extract name of a slot
+            String name = null;
+            try {
+                name = reply.getString();
+                log.display("    name: " + name);
+            } catch (BoundException e) {
+                log.complain("Unable to extract name of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract signature of a slot
+            String signature = null;
+            try {
+                signature = reply.getString();
+                log.display("    signature: " + signature);
+            } catch (BoundException e) {
+                log.complain("Unable to extract signature of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract code length
+            int length = 0;
+            try {
+                length = reply.getInt();
+                log.display("    length: " + length);
+            } catch (BoundException e) {
+                log.complain("Unable to extract code length for slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract code length
+            int slot = 0;
+            try {
+                slot = reply.getInt();
+                log.display("    slot: " + length);
+            } catch (BoundException e) {
+                log.complain("Unable to extract slot index of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // find slot name into list of expected variables
+            int found = -1;
+            for (int j = 0; j < variablesCount; j++) {
+                if (variablesList[j][0].equals(name)) {
+                    found = j;
+                    break;
+                }
+            }
+
+            // check if slot is found and not duplicated
+            if (found >= 0) {
+                if (foundVariablesList[found] > 0) {
+                    log.complain("Slot #" + i + " is duplicated "
+                                + foundVariablesList[found] + " times: "
+                                + name);
+                    success = false;
+/*
+                } else {
+                    log.display("Found expected variable #" + found + ": "
+                                + variablesList[found][0]);
+*/
+                }
+                foundVariablesList[found]++;
+
+                // check slot signature
+                if (!variablesList[found][1].equals(signature)) {
+                    log.complain("Unexpected signature for slot #" + i + ": " + signature
+                                + " (expected: " + variablesList[found][1] + ")");
+                    success = false;
+                }
+            } else {
+                log.display("Unexpected slot #" + i + " (may be synthetic): " + name);
+            }
+
+            // check that code length is not negative
+            if (length < 0) {
+                log.complain("Code length for slot #" + i + " is negative: " + length);
+                success = false;
+            }
+
+            // check that slot index is not negative
+            if (slot < 0) {
+                log.complain("Index of slot #" + i + " is negative: " + slot);
+                success = false;
+            }
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that all expected variables found
+        for (int i = 0; i < variablesCount; i++) {
+            if (foundVariablesList[i] <= 0) {
+                log.complain("No slot found in reply packet for variable: "
+                            + variablesList[i][0]);
+                success = false;
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001/TestDescription.java
new file mode 100644
index 00000000000..d2e7476aa4d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Method/VariableTable/vartable001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Method
+ *         command: VariableTable
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that names and signatures of returned
+ *     arguments and local variables are equal to expected ones.
+ *     Test consists of two compoments:
+ *         debugger: vartable001
+ *         debuggee: vartable001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID and methodID for the tested class
+ *     and method from debuggee.
+ *     Then, debugger creates command packet for Method.VariableTable command
+ *     with the found classID and methodID as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts attributes of all arguments and variables. Also test
+ *     checks that extracted attributes have expected values.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Method.VariableTable.vartable001
+ *        nsk.jdwp.Method.VariableTable.vartable001a
+ * @comment debuggee should be compiled w/ debug info
+ * @clean nsk.jdwp.Method.VariableTable.vartable001a
+ * @compile -g:lines,source,vars ../vartable001a.java
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Method.VariableTable.vartable001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001a.java
new file mode 100644
index 00000000000..e40dc63e2fd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001a.java
@@ -0,0 +1,121 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.VariableTable;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class vartable001a {
+
+    public static void main(String args[]) {
+        vartable001a _vartable001a = new vartable001a();
+        System.exit(vartable001.JCK_STATUS_BASE + _vartable001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + vartable001.READY);
+        pipe.println(vartable001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + vartable001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(vartable001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + vartable001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return vartable001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return vartable001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        // tested method
+        public void testedMethod(
+                        boolean booleanArgument,
+                        byte    byteArgument,
+                        char    charArgument,
+                        short   shortArgument,
+                        int     intArgument,
+                        long    longArgument,
+                        float   floatArgument,
+                        double  doubleArgument,
+                        Object  objectArgument,
+                        String  stringArgument
+                    ) {
+
+            boolean booleanLocal = booleanArgument;
+            byte    byteLocal    = byteArgument;
+            char    charLocal    = charArgument;
+            short   shortLocal   = shortArgument;
+            int     intLocal     = intArgument;
+            long    longLocal    = longArgument;
+            float   floatLocal   = floatArgument;
+            double  doubleLocal  = doubleArgument;
+            Object  objectLocal  = objectArgument;
+            String  stringLocal  = stringArgument;
+
+            System.out.println(
+                "booleanLocal = " + booleanLocal + "\n" +
+                "byteLocal = "    + byteLocal    + "\n" +
+                "charLocal = "    + charLocal    + "\n" +
+                "shortLocal = "   + shortLocal   + "\n" +
+                "intLocal = "     + intLocal     + "\n" +
+                "longLocal = "    + longLocal    + "\n" +
+                "floatLocal = "   + floatLocal   + "\n" +
+                "doubleLocal = "  + doubleLocal  + "\n" +
+                "objectLocal = "  + objectLocal  + "\n" +
+                "stringLocal = "  + stringLocal  + "\n"
+            );
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001.java
new file mode 100644
index 00000000000..a2e18c4f759
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001.java
@@ -0,0 +1,531 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.VariableTableWithGeneric;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: Method.VariableTableWithGeneric.
+ *
+ * See vartblwithgen001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class vartblwithgen001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.Method.VariableTableWithGeneric";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "vartblwithgen001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "Method.VariableTableWithGeneric";
+    static final int JDWP_COMMAND_ID = JDWP.Command.Method.VariableTableWithGeneric;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String THIS_GENERIC_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + "<TT;TN;>" + ";";
+
+    // tested types signature conatants
+    static final String OBJECT_CLASS_SIGNATURE = "Ljava/lang/Object;";
+    static final String STRING_CLASS_SIGNATURE = "Ljava/lang/String;";
+
+
+    // tested method name constant
+    static final String TESTED_METHOD_NAME = "testedMethod";
+
+    // list of tested variables names and signatures
+    static final String variablesList[][] = {
+
+                // synthetic arguments
+                {"this", TESTED_CLASS_SIGNATURE, THIS_GENERIC_SIGNATURE},
+
+                // not generic arguments
+                {"arg11PrimBoolean", "Z", ""},
+                {"arg12PrimInt", "I", ""},
+                {"arg13Object", "Ljava/lang/Object;", ""},
+                {"arg14String", "Ljava/lang/String;", ""},
+                {"arg15PrimArrShort", "[S", ""},
+                {"arg16ObjArrObject", "[Ljava/lang/Object;", ""},
+
+                // generic arguments
+                {"arg21GenObject", "Ljava/lang/Object;", "TT;"},
+                {"arg22GenNumber", "Ljava/lang/Number;", "TN;"},
+                {"arg23GenObjectArr", "[Ljava/lang/Object;", "[TT;"},
+                {"arg24GenNumberArr", "[Ljava/lang/Number;", "[TN;"},
+                {"arg25GenObjectList", "Ljava/util/List;", "Ljava/util/List<TT;>;"},
+                {"arg26GenNumberList", "Ljava/util/List;", "Ljava/util/List<TN;>;"},
+                {"arg27GenObjectDerivedList", "Ljava/util/List;", "Ljava/util/List<+TT;>;"},
+                {"arg28GenNumberDerivedList", "Ljava/util/List;", "Ljava/util/List<+TN;>;"},
+
+                // not generic variables
+                {"var11PrimBoolean", "Z", ""},
+                {"var12PrimInt", "I", ""},
+                {"var13Object", "Ljava/lang/Object;", ""},
+                {"var14String", "Ljava/lang/String;", ""},
+                {"var15PrimArrShort", "[S", ""},
+                {"var16ObjArrObject", "[Ljava/lang/Object;", ""},
+
+                // generic variables
+                {"var21GenObject", "Ljava/lang/Object;", "TT;"},
+                {"var22GenNumber", "Ljava/lang/Number;", "TN;"},
+                {"var23GenObjectArr", "[Ljava/lang/Object;", "[TT;"},
+                {"var24GenNumberArr", "[Ljava/lang/Number;", "[TN;"},
+                {"var25GenObjectList", "Ljava/util/List;", "Ljava/util/List<TT;>;"},
+                {"var26GenNumberList", "Ljava/util/List;", "Ljava/util/List<TN;>;"},
+                {"var27GenObjectDerivedList", "Ljava/util/List;", "Ljava/util/List<+TT;>;"},
+                {"var28GenNumberDerivedList", "Ljava/util/List;", "Ljava/util/List<+TN;>;"},
+
+    };
+    static final int variablesCount = variablesList.length;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new vartblwithgen001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for methodID of tested method (declared in the class)
+                log.display("Getting methodID by name: " + TESTED_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(classID, methodID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long classID, long methodID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  referenceTypeID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // clear list of found variables
+        int[] foundVariablesList = new int[variablesCount];
+        for (int i = 0; i < variablesCount; i++) {
+            foundVariablesList[i] = 0;
+        }
+
+        // extract and check reply data
+
+        // extract number of argumnets
+        int argCount = 0;
+        try {
+            argCount = reply.getInt();
+            log.display("  argCount: " + argCount);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of arguments from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that number of arguments is not negative
+        if (argCount < 0) {
+            log.complain("Negative of arguments in reply packet: " + argCount);
+            success = false;
+        }
+
+        // extract number of slots
+        int slots = 0;
+        try {
+            slots = reply.getInt();
+            log.display("  slots: " + slots);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of slots from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that number of slots is not negative
+        if (slots < 0) {
+            log.complain("Negative value of end code index in reply packet: " + slots);
+            success = false;
+        }
+
+        // check that start code is not less than expected
+        if (slots < variablesCount) {
+            log.complain("Number of slots (" + slots
+                        + ") is less than expected (" + variablesCount + ")");
+            success = false;
+        }
+
+        // extract and check each slot attributes
+        for (int i = 0; i < slots; i++) {
+            log.display("  slot #" + i + ":");
+
+            // extract code index of a slot
+            long codeIndex = 0;
+            try {
+                codeIndex = reply.getLong();
+                log.display("    codeIndex: " + codeIndex);
+            } catch (BoundException e) {
+                log.complain("Unable to extract code index of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check that code index is not negative
+            if (codeIndex < 0) {
+                log.complain("Negative code index of slot #" + i + ":" + codeIndex);
+                success = false;
+            }
+
+            // extract name of a slot
+            String name = null;
+            try {
+                name = reply.getString();
+                log.display("    name: " + name);
+            } catch (BoundException e) {
+                log.complain("Unable to extract name of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract signature of a slot
+            String signature = null;
+            try {
+                signature = reply.getString();
+                log.display("    signature: " + signature);
+            } catch (BoundException e) {
+                log.complain("Unable to extract signature of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract generic signature of a slot
+            String genericSignature = null;
+            try {
+                genericSignature = reply.getString();
+                log.display("    generic: " + genericSignature);
+            } catch (BoundException e) {
+                log.complain("Unable to extract generic signature of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract code length
+            int length = 0;
+            try {
+                length = reply.getInt();
+                log.display("    length: " + length);
+            } catch (BoundException e) {
+                log.complain("Unable to extract code length for slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract code length
+            int slot = 0;
+            try {
+                slot = reply.getInt();
+                log.display("    slot: " + length);
+            } catch (BoundException e) {
+                log.complain("Unable to extract slot index of slot #" + i
+                            + " from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // find slot name into list of expected variables
+            int found = -1;
+            for (int j = 0; j < variablesCount; j++) {
+                if (variablesList[j][0].equals(name)) {
+                    found = j;
+                    break;
+                }
+            }
+
+            // check if slot is found and not duplicated
+            if (found >= 0) {
+                if (foundVariablesList[found] > 0) {
+                    log.complain("Slot #" + i + " is duplicated "
+                                + foundVariablesList[found] + " times: "
+                                + name);
+                    success = false;
+/*
+                } else {
+                    log.display("Found expected variable #" + found + ": "
+                                + variablesList[found][0]);
+*/
+                }
+                foundVariablesList[found]++;
+
+                // check slot signature
+                if (!variablesList[found][1].equals(signature)) {
+                    log.complain("Unexpected signature for slot #" + i + ": " + signature
+                                + " (expected: " + variablesList[found][1] + ")");
+                    success = false;
+                }
+
+                // check slot generic signature
+                if (variablesList[found][2] == null && genericSignature != null) {
+                    log.complain("Unexpected generic signature for slot #" + i + ": " + genericSignature
+                                + " (expected: " + variablesList[found][2] + ")");
+                    success = false;
+                } else if (!variablesList[found][2].equals(genericSignature)) {
+                    log.complain("Unexpected generic signature for slot #" + i + ": " + genericSignature
+                                + " (expected: " + variablesList[found][2] + ")");
+                    success = false;
+                }
+
+            } else {
+                log.display("Unexpected slot #" + i + " (may be synthetic): " + name);
+            }
+
+            // check that code length is not negative
+            if (length < 0) {
+                log.complain("Code length for slot #" + i + " is negative: " + length);
+                success = false;
+            }
+
+            // check that slot index is not negative
+            if (slot < 0) {
+                log.complain("Index of slot #" + i + " is negative: " + slot);
+                success = false;
+            }
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that all expected variables found
+        for (int i = 0; i < variablesCount; i++) {
+            if (foundVariablesList[i] <= 0) {
+                log.complain("No slot found in reply packet for variable: "
+                            + variablesList[i][0]);
+                success = false;
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001/TestDescription.java
new file mode 100644
index 00000000000..7c24fe6633c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: Method
+ *         command: VariableTableWithGeneric
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that names and generic signatures of returned
+ *     arguments and local variables are equal to expected ones.
+ *     Test consists of two compoments:
+ *         debugger: vartblwithgen001
+ *         debuggee: vartblwithgen001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID and methodID for the tested class
+ *     and method from debuggee.
+ *     Then, debugger creates command packet for Method.VariableTableWithGeneric
+ *     command with the found classID and methodID as arguments, writes packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts attributes of all arguments and variables. Also test
+ *     checks that extracted attributes have expected values.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.Method.VariableTableWithGeneric.vartblwithgen001
+ *        nsk.jdwp.Method.VariableTableWithGeneric.vartblwithgen001a
+ * @comment debuggee should be compiled w/ debug info
+ * @clean nsk.jdwp.Method.VariableTableWithGeneric.vartblwithgen001a
+ * @compile -g:lines,source,vars ../vartblwithgen001a.java
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.Method.VariableTableWithGeneric.vartblwithgen001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001a.java
new file mode 100644
index 00000000000..af1f18a338a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001a.java
@@ -0,0 +1,122 @@
+/*
+ * 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
+ * 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 nsk.jdwp.Method.VariableTableWithGeneric;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class vartblwithgen001a {
+
+    public static void main(String args[]) {
+        vartblwithgen001a _vartblwithgen001a = new vartblwithgen001a();
+        System.exit(vartblwithgen001.JCK_STATUS_BASE + _vartblwithgen001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass<String, Long> foo = new TestedClass<String, Long>();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + vartblwithgen001.READY);
+        pipe.println(vartblwithgen001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + vartblwithgen001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(vartblwithgen001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + vartblwithgen001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return vartblwithgen001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return vartblwithgen001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass<T, N extends Number> {
+        int foo = 0;
+
+        // tested method
+        public void testedMethod(
+                        // not generic argumments
+                        boolean arg11PrimBoolean,
+                        int     arg12PrimInt,
+                        Object  arg13Object,
+                        String  arg14String,
+                        short[] arg15PrimArrShort,
+                        Object[] arg16ObjArrObject,
+
+                        // generic arguments
+                        T       arg21GenObject,
+                        N       arg22GenNumber,
+                        T[]     arg23GenObjectArr,
+                        N[]     arg24GenNumberArr,
+                        List<T> arg25GenObjectList,
+                        List<N> arg26GenNumberList,
+                        List<? extends T> arg27GenObjectDerivedList,
+                        List<? extends N> arg28GenNumberDerivedList
+                    ) {
+
+            // not generic variables
+            boolean var11PrimBoolean    = arg11PrimBoolean;
+            int     var12PrimInt        = arg12PrimInt;
+            Object  var13Object         = arg13Object;
+            String  var14String         = arg14String;
+            short[] var15PrimArrShort   = arg15PrimArrShort;
+            Object[] var16ObjArrObject  = arg16ObjArrObject;
+
+            // generic variables
+            T       var21GenObject      = arg21GenObject;
+            N       var22GenNumber      = arg22GenNumber;
+            T[]     var23GenObjectArr   = arg23GenObjectArr;
+            N[]     var24GenNumberArr   = arg24GenNumberArr;
+            List<T> var25GenObjectList  = arg25GenObjectList;
+            List<N> var26GenNumberList  = arg26GenNumberList;
+            List<? extends T> var27GenObjectDerivedList = arg27GenObjectDerivedList;
+            List<? extends N> var28GenNumberDerivedList = arg28GenNumberDerivedList;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001.java
new file mode 100644
index 00000000000..419d944398a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001.java
@@ -0,0 +1,302 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.DisableCollection;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.DisableCollection.
+ *
+ * See disablecol001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class disablecol001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.DisableCollection";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "disablecol001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.DisableCollection";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.DisableCollection;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String OBJECT_FIELD_NAME = disablecol001a.OBJECT_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new disablecol001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debuggee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long objectID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001/TestDescription.java
new file mode 100644
index 00000000000..932cb2bab0f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001/TestDescription.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/DisableCollection/disablecol001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: DisableCollection
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: disablecol001
+ *         debuggee: disablecol001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for the tested class
+ *     and objectID as the value of the class static field.
+ *     Then, debugger creates command packet for ObjectReference.DisableCollection
+ *     command with the found objectID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks that there is no reply data in the package.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.DisableCollection.disablecol001
+ *        nsk.jdwp.ObjectReference.DisableCollection.disablecol001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.DisableCollection.disablecol001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001a.java
new file mode 100644
index 00000000000..328a48d8192
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001a.java
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.DisableCollection;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class disablecol001a {
+
+    // name for the tested thread
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    public static void main(String args[]) {
+        disablecol001a _disablecol001a = new disablecol001a();
+        System.exit(disablecol001.JCK_STATUS_BASE + _disablecol001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.object = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + disablecol001.READY);
+        pipe.println(disablecol001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + disablecol001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(disablecol001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + disablecol001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return disablecol001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return disablecol001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+
+        // static field with the tested object value
+        public static volatile TestedClass object = null;
+
+        private int foo = 0;
+
+        public TestedClass() {
+            foo = 100;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001.java
new file mode 100644
index 00000000000..45219ea7b09
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001.java
@@ -0,0 +1,315 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.EnableCollection;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.EnableCollection.
+ *
+ * See enablecol001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class enablecol001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.EnableCollection";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "enablecol001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.EnableCollection";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.EnableCollection;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String OBJECT_FIELD_NAME = enablecol001a.OBJECT_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new enablecol001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debuggee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // query debuggee to disable garbage collection for this object
+                log.display("Disabling garbage collection for objectID: " + objectID);
+                disableObjectCollection(objectID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void disableObjectCollection(long objectID) {
+        CommandPacket command = new CommandPacket(JDWP.Command.ObjectReference.DisableCollection);
+        command.addObjectID(objectID);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long objectID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001/TestDescription.java
new file mode 100644
index 00000000000..73dbfa9a8ae
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001/TestDescription.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/EnableCollection/enablecol001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: EnableCollection
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: enablecol001
+ *         debuggee: enablecol001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for the tested class
+ *     and objectID as the value of the class static field. Debugger
+ *     queries debuggee to disable garbage collection for this object.
+ *     Then, debugger creates command packet for ObjectReference.EnableCollection
+ *     command with the found objectID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks that there is no reply data in the package.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.EnableCollection.enablecol001
+ *        nsk.jdwp.ObjectReference.EnableCollection.enablecol001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.EnableCollection.enablecol001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001a.java
new file mode 100644
index 00000000000..9f9a37f2aac
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001a.java
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.EnableCollection;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class enablecol001a {
+
+    // name for the tested thread
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    public static void main(String args[]) {
+        enablecol001a _enablecol001a = new enablecol001a();
+        System.exit(enablecol001.JCK_STATUS_BASE + _enablecol001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.object = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + enablecol001.READY);
+        pipe.println(enablecol001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + enablecol001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(enablecol001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + enablecol001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return enablecol001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return enablecol001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+
+        // static field with the tested object value
+        public static volatile TestedClass object = null;
+
+        private int foo = 0;
+
+        public TestedClass() {
+            foo = 100;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001.java
new file mode 100644
index 00000000000..6f4fbff45b3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001.java
@@ -0,0 +1,426 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.GetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.GetValues.
+ *
+ * See getvalues001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class getvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.GetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "getvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.GetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.GetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the static field in the tested class with the tested object value
+    static final String OBJECT_FIELD_NAME = getvalues001a.OBJECT_FIELD_NAME;
+
+    // names and expected values of the tested fields
+    static final Object fields [][] = {
+                    { "booleanValue", "boolean",  new Boolean(true),           "own"},
+                    { "byteValue",    "byte",     new Byte((byte)0x0F),        "own"},
+                    { "charValue",    "char",     new Character('Z'),          "own"},
+                    { "intValue",     "int",      new Integer(100),            "own"},
+                    { "shortValue",   "short",    new Short((short)10),        "own"},
+                    { "longValue",    "long",     new Long((long)1000000),     "own"},
+                    { "floatValue",   "float",    new Float((float)3.14),      "own"},
+                    { "doubleValue",  "double",   new Double((double)2.8e-12), "own"},
+                    { "objectValue",  "objectID", new Long((long)0),           "own"},
+
+                };
+    static final int FIELDS_COUNT = fields.length;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new getvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // query debugee for fieldIDs of tested class static fields
+                log.display("Getting fieldIDs the tested class with the tested values");
+                long fieldIDs[] = queryClassFieldIDs(classID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectID, fieldIDs);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Query debugee for fieldIDs and them into nested_classesIDs array.
+     */
+    long[] queryClassFieldIDs(long typeID) {
+        // create array for expected filedIDs
+        long fieldIDs[] = new long[FIELDS_COUNT];
+        for (int i = 0; i < FIELDS_COUNT; i++) {
+            fieldIDs[i] = 0;
+        }
+
+        // obtain requested fieldIDs form debuggee
+        int count = 0;
+        try {
+            CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+            command.addReferenceTypeID(typeID);
+            command.setLength();
+
+            ReplyPacket reply = debugee.receiveReplyFor(command);
+            reply.resetPosition();
+
+            long declared = reply.getInt();
+            if (declared < FIELDS_COUNT) {
+                throw new Failure("Too few fields of the tested class returned: " + declared
+                                    + " (expected: at least " + FIELDS_COUNT + ")");
+            }
+
+            for (int i = 0; i < declared; i++ ) {
+                long fieldID = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                for (int j = 0; j < FIELDS_COUNT; j++) {
+                    if (fields[j][0].equals(name)) {
+                        fieldIDs[j] = fieldID;
+                        break;
+                    }
+                }
+            }
+
+            if (!reply.isParsed()) {
+                throw new Failure("Extra trailing bytes found in the reply packet at: "
+                                    + reply.currentPosition());
+            }
+
+        } catch (BoundException e) {
+            throw new Failure("Unable to extract field IDs from the reply packet:\n"
+                            + e.getMessage());
+        }
+
+        return fieldIDs;
+    }
+
+    /**
+     * Extract and check i-th value from the reply packet.
+     */
+    void checkValue(int i, JDWP.Value value) {
+        if (!fields[i][2].equals(value.getValue())) {
+            log.complain("Unexpected value for " + i + " field received: " + value
+                            + " (expected: " + fields[i][2] + ")");
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified objectID.
+     */
+    void testCommand(long objectID, long fieldIDs[]) {
+        int count = fieldIDs.length;
+
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        log.display("  fields: " + count);
+        command.addInt(count);
+        for (int i = 0; i < count; i++) {
+            log.display("  #" + i +": fieldID: " + fieldIDs[i]);
+            command.addFieldID(fieldIDs[i]);
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check number of values
+        int values = 0;
+        try {
+            values = reply.getInt();
+            log.display("  values: " + values);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of values form reply packet:\n" + e.getMessage());
+            success = false;
+        }
+
+        // check if number of values are as expected
+        if (values < 0) {
+            log.complain("Negative number of values received:" + values
+                        + " (expected: " + count + ")");
+            success = false;
+        } else if (values != count) {
+            log.complain("Unexpected number of values received:" + values
+                        + " (expected: " + count + ")");
+            success = false;
+        }
+
+        // extract and check each value
+        for (int i = 0; i < values; i++ ) {
+            log.display("  value #" + i + " (field: " + fields[i][0] + ")");
+
+            // extract value
+            JDWP.Value value = null;
+            try {
+                value = reply.getValue();
+                log.display("    value: " + value);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " value:\n" + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // extract and check value by known type tag
+            checkValue(i, value);
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001/TestDescription.java
new file mode 100644
index 00000000000..5d250e74876
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/GetValues/getvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: GetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the returned values of requested fields are equal to
+ *     the expected ones.
+ *     Test consists of two compoments:
+ *         debugger: getvalues001
+ *         debuggee: getvalues001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains from debuggee classID for the tested class and
+ *     objectID as the value of the class static field. Also debugger obtains
+ *     fieldIDs for all tested fields of the class.
+ *     Then, debugger creates command packet for GetValues command with the
+ *     found objectID and list of fieldIDs as arguments, writes packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts values of the requested fields. Also test checks
+ *     that extracted values are equal to the expected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.GetValues.getvalues001
+ *        nsk.jdwp.ObjectReference.GetValues.getvalues001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.GetValues.getvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001a.java
new file mode 100644
index 00000000000..1b0d3782c08
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001a.java
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.GetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class getvalues001a {
+
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    public static void main(String args[]) {
+        getvalues001a _getvalues001a = new getvalues001a();
+        System.exit(getvalues001.JCK_STATUS_BASE + _getvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass.object = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + getvalues001.READY);
+        pipe.println(getvalues001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + getvalues001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(getvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + getvalues001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return getvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return getvalues001.PASSED;
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+
+        // static field with tested object
+        public static TestedClass object = null;
+
+        // fields with tested values
+        private   boolean       booleanValue = true;
+        private   final byte    byteValue    = (byte)0x0F;
+        protected char          charValue    = 'Z';
+        protected final int     intValue     = 100;
+        public    short         shortValue   = (short)10;
+        public    final long    longValue    = (long)1000000;
+                  float         floatValue   = (float)3.14;
+                  final double  doubleValue  = (double)2.8e-12;
+                  TestedClass   objectValue  = null;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001.java
new file mode 100644
index 00000000000..ad4698feec4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001.java
@@ -0,0 +1,453 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.InvokeMethod;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.InvokeMethod.
+ *
+ * See invokemeth001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class invokemeth001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.InvokeMethod";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "invokemeth001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command
+    static final String JDWP_COMMAND_NAME = "ObjectReference.InvokeMethod";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.InvokeMethod;
+
+    // tested class name and signature
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedObjectClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // field and method names
+    static final String OBJECT_FIELD_NAME = "object";
+    static final String RESULT_FIELD_NAME = "result";
+    static final String TESTED_METHOD_NAME = "testedMethod";
+    static final String BREAKPOINT_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE_NUMBER = invokemeth001a.BREAKPOINT_LINE_NUMBER;
+
+    // data for invoked method
+    static final int ARGUMENTS_COUNT = 1;
+    static final int INITIAL_VALUE = invokemeth001a.INITIAL_VALUE;
+    static final int ARGUMENT_VALUE = invokemeth001a.FINAL_VALUE;
+    static final int RETURN_VALUE = INITIAL_VALUE;
+    static final int INVOKE_OPTIONS = 0;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+    boolean dead = false;
+
+    // data obtained from debuggee
+    long classID = 0;
+    long threadID = 0;
+    long methodID = 0;
+    long objectID = 0;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new invokemeth001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee VM");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debuggee launched");
+
+            // set timeout for debuggee responces
+            int waitTime = argumentHandler.getWaitTime();  // minutes
+            long timeout = waitTime * 60 * 1000;           // milliseconds
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for VM_INIT event
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // run the test
+            runTest();
+
+            // wait for VM_DEATH event
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            log.display("  ... VM_DEATH event received");
+            dead = true;
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            log.display("\n>>> Finishing test \n");
+
+            // disconnect debugee and wait for its exit
+            if (debugee != null) {
+                quitDebugee();
+            }
+        }
+
+        // check result
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+        out.println("TEST PASSED");
+        return PASSED;
+    }
+
+    /**
+     * Obtain required data and test JDWP command.
+     */
+    void runTest() {
+        log.display("\n>>> Obtaining required data \n");
+
+        // wait for tested class loaded on debuggee startup and obtain its classID
+        log.display("Waiting for class loaded:\n\t" + TESTED_CLASS_NAME);
+        classID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + classID);
+        log.display("");
+
+        // query debuggee for tested methodID
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + methodID);
+        log.display("");
+
+        // set breakpoint and wait for debugee reached it
+        log.display("Waiting for breakpoint reached at: "
+                    + BREAKPOINT_METHOD_NAME + ":" +  BREAKPOINT_LINE_NUMBER);
+        threadID = debugee.waitForBreakpointReached(classID,
+                                                BREAKPOINT_METHOD_NAME,
+                                                BREAKPOINT_LINE_NUMBER,
+                                                JDWP.SuspendPolicy.EVENT_THREAD);
+        log.display("  ... breakpoint reached with threadID: " + threadID);
+        log.display("");
+
+        // get object value from static field
+        log.display("Getting object value from static field: " + OBJECT_FIELD_NAME);
+        objectID = queryObjectID(classID, OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+        log.display("  ... got objectID: " + objectID);
+
+
+        // test JDWP command
+        log.display("\n>> Testing JDWP command \n");
+        testCommand();
+
+        // check command results
+        if (success) {
+            log.display("\n>>> Checking command results \n");
+            checkResult();
+        }
+
+        // resume debuggee after the command
+        log.display("Resuming debuggee");
+        debugee.resume();
+        log.display("  ... debuggee resumed");
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  classID: " + classID);
+        command.addReferenceTypeID(classID);
+        log.display("  methodID: " + methodID);
+        command.addMethodID(methodID);
+        log.display("  arguments: " + ARGUMENTS_COUNT);
+        command.addInt(ARGUMENTS_COUNT);
+        for (int i = 0; i < ARGUMENTS_COUNT; i++) {
+            JDWP.Value value = new JDWP.Value(JDWP.Tag.INT, new Integer(ARGUMENT_VALUE));
+            log.display("    arg: " + value);
+            command.addValue(value);
+        }
+        log.display("  options: " + INVOKE_OPTIONS);
+        command.addInt(INVOKE_OPTIONS);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet for tested command:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // extract return value
+        JDWP.Value returnValue = null;
+        try {
+            returnValue = reply.getValue();
+            log.display("    returnValue: " + returnValue);
+        } catch (BoundException e) {
+            log.complain("Unable to extract returnValues from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract exception tag
+        JDWP.Value exception = null;
+        try {
+            exception = reply.getValue();
+            log.display("    exception: " + exception);
+        } catch (BoundException e) {
+            log.complain("Unable to extract exception from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... packed data parsed");
+
+        // check that return value is an integer
+        if (returnValue.getTag() != JDWP.Tag.INT) {
+            log.complain("Unexpected tag of returnValue returned: " + returnValue.getTag()
+                        + " (expected: " + JDWP.Tag.INT + ")");
+            success = false;
+        }
+
+        // check that return value is as expected
+        int intValue = ((Integer)returnValue.getValue()).intValue();
+        if (intValue != RETURN_VALUE) {
+            log.complain("Unexpected value of returnValue returned: " + intValue
+                        + " (expected: " + RETURN_VALUE + ")");
+            success = false;
+        }
+
+        // check that exception value is an object
+        if (exception.getTag() != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected tag of exception returned: " + exception.getTag()
+                        + " (expected: " + JDWP.Tag.OBJECT + ")");
+            success = false;
+        }
+
+        // check that exception object is null
+        long exceptionID = ((Long)exception.getValue()).longValue();
+        if (exceptionID != 0) {
+            log.complain("Non-null exception object returned: " + exceptionID
+                        + " (expected: " + 0 + ")");
+            success = false;
+        }
+    }
+
+    /**
+     * Check result of the tested JDWP command.
+     */
+    void checkResult() {
+        // query debuggee for result value from a static field
+        log.display("Getting result value from static field: " + RESULT_FIELD_NAME);
+        int result = queryInt(classID, RESULT_FIELD_NAME, JDWP.Tag.INT);
+        log.display("  ... got result: " + result);
+
+        // check if the result value is changed as expected
+        if (result != ARGUMENT_VALUE) {
+            log.complain("Method has not been really invoked: \n\t"
+                        + "variable not changed by the method: " + result
+                        + " (expected: " + ARGUMENT_VALUE + ")");
+            success = false;
+        } else {
+            log.display("Method has been really invoked: \n\t"
+                        + " variable changed by the method: " + result
+                        + " (expected: " + ARGUMENT_VALUE + ")");
+        }
+    }
+
+    /**
+     * Query debuggee for value of static field of the class.
+     */
+    JDWP.Value queryFieldValue(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            log.complain("unexpedted value tag returned from debuggee: " + value.getTag()
+                        + " (expected: " + tag + ")");
+            throw new Failure("Error occured while getting value from static field: "
+                            + fieldName);
+        }
+
+        return value;
+    }
+
+    /**
+     * Query debuggee for objectID value of static field of the class.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        JDWP.Value value = queryFieldValue(classID, fieldName, tag);
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Query debuggee for int value of static field of the class.
+     */
+    int queryInt(long classID, String fieldName, byte tag) {
+        JDWP.Value value = queryFieldValue(classID, fieldName, tag);
+        int intValue = ((Integer)value.getValue()).intValue();
+        return intValue;
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debuggee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally dispose debuggee:\n\t" + e.getMessage());
+            }
+        }
+
+        // wait for debugee exits
+        log.display("Waiting for debuggee exits");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee finished with exit code: " + code);
+
+        // analize debuggee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001/TestDescription.java
new file mode 100644
index 00000000000..08d1dcddff0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: InvokeMethod
+ *     Test checks that debugee accept the command packet and replies
+ *     with correct reply packet. Also test checks that the tested method
+ *     is really invoked for an object into debuggee.
+ *     Test consists of two compoments:
+ *         debugger: invokemeth001
+ *         debuggee: invokemeth001a
+ *     First, debugger uses nsk.share.* support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded, requests methodID
+ *     for tested method, sets breakpoint and wait for breakpoint reached.
+ *     When breakpoint event received the tested thread into debuggee
+ *     is suspended by this event. Debugger gets objectID value for tested
+ *     object from static field of the tested class.
+ *     Then, debugger creates command packet for ObjectReference.InvokeMethod
+ *     command with the found objectID, classID, methodID, threadID, and also
+ *     adds one integer argument for the method invocation. Then debugger writes
+ *     packet to the transport channel and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts method's result value and exception objectID. Test checks
+ *     if result value is an expected integer and exception objectID is null.
+ *     Also test gets value of static field, wich should be modified by
+ *     the invoked method, to verify if this method was really invoked
+ *     into debuggee.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.InvokeMethod.invokemeth001
+ *        nsk.jdwp.ObjectReference.InvokeMethod.invokemeth001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.InvokeMethod.invokemeth001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001a.java
new file mode 100644
index 00000000000..33097bbeeda
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001a.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.ObjectReference.InvokeMethod;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class invokemeth001a {
+
+    // name of the tested thread
+    public static final String THREAD_NAME = "testedThread";
+
+    // line nunber for breakpoint
+    public static final int BREAKPOINT_LINE_NUMBER = 90;
+
+    // initial and final value of variable changed by the method invoked from debugger
+    public static final int INITIAL_VALUE = 10;
+    public static final int FINAL_VALUE = 1234;
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        invokemeth001a _invokemeth001a = new invokemeth001a();
+        System.exit(invokemeth001.JCK_STATUS_BASE + _invokemeth001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested of tested class
+        log.display("Creating object of tested class");
+        TestedObjectClass.object = new TestedObjectClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        TestedObjectClass.run();
+
+        log.display("Debugee PASSED");
+        return invokemeth001.PASSED;
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+
+        // tested object value
+        public static volatile TestedObjectClass object = null;
+
+        // result of invoking tested mathod
+        public static volatile int result = INITIAL_VALUE;
+
+        // start the thread and suspend on breakpoint
+        public static void run() {
+            log.display("Tested thread: started");
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            int foo = 0; // BREAKPOINT_LINE_NUMBER
+            log.display("Breakpoint line passed");
+
+            log.display("Tested thread: finished");
+        }
+
+        // tested method for invokation from debugger
+        public int testedMethod(int arg) {
+            log.display("Tested method invoked with argument:" + arg);
+            int old = result;
+            result = arg;
+            log.display("Tested method returned with result:" + old);
+            return old;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001.java
new file mode 100644
index 00000000000..284765bd25a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001.java
@@ -0,0 +1,321 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.IsCollected;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.IsCollected.
+ *
+ * See iscollected001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class iscollected001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.IsCollected";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "iscollected001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.IsCollected";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.IsCollected;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String OBJECT_FIELD_NAME = iscollected001a.OBJECT_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new iscollected001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debuggee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectID, classID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long objectID, long classID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract boolean result value
+        byte isCollected = (byte)0;
+        try {
+            isCollected = reply.getByte();
+            log.display("    isCollected: " + isCollected);
+        } catch (BoundException e) {
+            log.complain("Unable to extract isCollected boolean value from reply packet:\n\t"
+                    + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that isCollected is false (i.e. 0)
+        if (isCollected != 0) {
+            log.complain("Unexpected true isCollected value received:" + isCollected
+                        + " (expected" + 0);
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001/TestDescription.java
new file mode 100644
index 00000000000..678d23f0cb7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001/TestDescription.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/IsCollected/iscollected001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: IsCollected
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that the returned isCollected value is false
+ *     because tested object is not garbage collected into debuggee.
+ *     Test consists of two compoments:
+ *         debugger: iscollected001
+ *         debuggee: iscollected001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for the tested class
+ *     and objectID as the value of the class static field.
+ *     Then, debugger creates command packet for ObjectReference.IsCollected
+ *     command with the found objectID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts isCollected boolean value. Also test checks that the
+ *     extracted isCollected value is false.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.IsCollected.iscollected001
+ *        nsk.jdwp.ObjectReference.IsCollected.iscollected001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.IsCollected.iscollected001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001a.java
new file mode 100644
index 00000000000..f4d9d40bc7b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001a.java
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.IsCollected;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class iscollected001a {
+
+    // name for the tested thread
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    public static void main(String args[]) {
+        iscollected001a _iscollected001a = new iscollected001a();
+        System.exit(iscollected001.JCK_STATUS_BASE + _iscollected001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.object = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + iscollected001.READY);
+        pipe.println(iscollected001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + iscollected001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(iscollected001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + iscollected001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return iscollected001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return iscollected001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+
+        // static field with the tested object value
+        public static volatile TestedClass object = null;
+
+        private int foo = 0;
+
+        public TestedClass() {
+            foo = 100;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001.java
new file mode 100644
index 00000000000..8834b30e21b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001.java
@@ -0,0 +1,487 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.MonitorInfo;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.MonitorInfo.
+ *
+ * See monitorinfo001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class monitorinfo001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.MonitorInfo";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "monitorinfo001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_GET_MONITOR_INFO;
+    static final String VM_CAPABILITY_NAME = "canGetMonitorInfo";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.MonitorInfo";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.MonitorInfo;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME =
+                            DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE =
+                            "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String OBJECT_FIELD_NAME =
+                            monitorinfo001a.OBJECT_FIELD_NAME;
+    static final String MONITOR_OWNER_FIELD_NAME =
+                            monitorinfo001a.MONITOR_OWNER_FIELD_NAME;
+    static final String MONITOR_WAITER_FIELD_NAMES[] =
+                            monitorinfo001a.MONITOR_WAITER_FIELD_NAMES;
+
+    // threadIDs of threads owning or waiting for monitor of the tested object
+    long ownerThreadID = 0;
+    long waiterThreadIDs[] = null;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new monitorinfo001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Checking VM capability \n");
+
+                // check for VM capability
+                log.display("Checking VM capability: " + VM_CAPABILITY_NAME);
+                if (!debugee.getCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME)) {
+                    out.println("TEST PASSED: unsupported VM capability: "
+                                + VM_CAPABILITY_NAME);
+                    return PASSED;
+                }
+
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // query debuggee for threadIDs from static fields
+                queryThreadIDs(classID);
+
+                log.display("\n>>> Testing JDWP command \n");
+
+                // suspend all threads into debuggee
+                log.display("Suspending all threads into debuggee");
+                debugee.suspend();
+                log.display("  debuggee suspended");
+
+                // perform testing JDWP command
+                testCommand(objectID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume all threads into debuggee
+                log.display("resuming all threads into debuggee");
+                debugee.resume();
+                log.display("  debuggee resumed");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested threads"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Query debuggee for threadID values of static class fields.
+     */
+    void queryThreadIDs(long classID) {
+
+        // get threadID for thread which ownes monitor of the tested object
+        ownerThreadID = queryObjectID(classID, MONITOR_OWNER_FIELD_NAME, JDWP.Tag.THREAD);
+
+        // get threadIDs for threads which wait for monitor of the tested object
+        int count = MONITOR_WAITER_FIELD_NAMES.length;
+        waiterThreadIDs = new long[count];
+        for (int i = 0; i < count; i++) {
+            waiterThreadIDs[i] = queryObjectID(classID,
+                                    MONITOR_WAITER_FIELD_NAMES[i], JDWP.Tag.THREAD);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified objectID.
+     */
+    void testCommand(long objectID) {
+        // make an array for results of found expected monitor waiters
+        int expectedWaiters = waiterThreadIDs.length;
+        int foundWaiters[] = new int[expectedWaiters];
+        for (int i = 0; i < expectedWaiters; i++) {
+            foundWaiters[i] = 0;
+        }
+
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract monitor owner threadID
+        long owner = 0;
+        try {
+            owner = reply.getObjectID();
+            log.display("    owner: " + owner);
+        } catch (BoundException e) {
+            log.complain("Unable to extract monitor owner threadID from reply packet:\n\t"
+                    + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that monitor owner is as expected
+        if (owner < 0) {
+            log.complain("Negative value of monitor owner threadID received: "
+                        + owner);
+            success = false;
+        } else if (owner == 0) {
+            log.complain("No monitor owner threadID received: "
+                        + owner + " (expected: " + ownerThreadID + ")");
+            success = false;
+        } else if (owner != ownerThreadID) {
+            log.complain("Unexpected monitor owner threadID received: "
+                        + owner + " (expected: " + ownerThreadID + ")");
+            success = false;
+        }
+
+        // extract number of monitor entries
+        int entryCount = 0;
+        try {
+            entryCount = reply.getInt();
+            log.display("  entryCount: " + entryCount);
+        } catch (BoundException e) {
+            log.complain("Unable to extract monitor entryCount from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that number of waiters is not negative and not zero
+        if (entryCount < 0) {
+            log.complain("Negative number of monitor entryCount received: "
+                        + entryCount);
+            success = false;
+        } else if (entryCount == 0) {
+            log.complain("Zero number of monitor entryCount received: "
+                        + entryCount);
+            success = false;
+        }
+
+        // extract number of monitor waiter threads
+        int waiters = 0;
+        try {
+            waiters = reply.getInt();
+            log.display("  waiters: " + waiters);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of monitor waiters from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that number of waiters is not negative
+        if (waiters < 0) {
+            log.complain("Negative number of monitor waiters received: "
+                        + waiters);
+            success = false;
+        }
+
+        // check that number of waiters is as expected
+        if (waiters != expectedWaiters) {
+            log.complain("Unexpected number of monitors waiters received: "
+                        + waiters + " (expected: " + expectedWaiters + ")");
+            success = false;
+        }
+
+        // extract monitor waiter threadIDs
+        for (int i = 0; i < waiters; i++) {
+
+            log.display("  waiter #" + i + ":");
+
+            // extract threadID
+            long threadID = 0;
+            try {
+                threadID = reply.getObjectID();
+                log.display("    threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " monitor waiter threadID from reply packet:\n\t"
+                        + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // find threadID among expected monitor owner threadIDs
+            boolean found = false;
+            for (int j = 0; j < expectedWaiters; j++) {
+                if (threadID == waiterThreadIDs[j]) {
+                    foundWaiters[j]++;
+                    found = true;
+                }
+            }
+            if (!found) {
+                log.complain("Unexpected monitor waiter threadID received: " + threadID);
+                success = false;
+            }
+
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check if all expected monitor waiter threadIDs found
+        for (int j = 0; j < expectedWaiters; j++) {
+            if (foundWaiters[j] <= 0) {
+                log.complain("Expected monitor waiter threadID NOT received: "
+                            + waiterThreadIDs[j]);
+                success = false;
+            } else if (foundWaiters[j] > 1) {
+                log.complain("Expected monitor waiter threadID (" +
+                            + waiterThreadIDs[j] + ") received multiply times: "
+                            + foundWaiters[j]);
+                success = false;
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001/TestDescription.java
new file mode 100644
index 00000000000..24454e0aeed
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001/TestDescription.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: MonitorInfo
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that expected threadIDs returned either for
+ *     monitor owner and waiter threads.
+ *     Test consists of two compoments:
+ *         debugger: monitorinfo001
+ *         debuggee: monitorinfo001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Debuggee created oan object of the tested class as value of the class
+ *     static field and starts several threads, which are waiting for this
+ *     object monitor, and one thread, which ownes the object monitor.
+ *     Then debuggee sends signal READY to the debugger.
+ *     Debugger obtains from debuggee classID for tested class and objectID
+ *     as the value of the class static field. Also debugger obtains threadIDs
+ *     for all tested thread into debuggee.
+ *     Debugger suspends debuggee (and all threads into it) before sending
+ *     tested JDWP command.
+ *     Then, debugger creates command packet for ObjectReference.MonitorInfo
+ *     command with the found objectID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts threadIDs of thread waiting and owning the object monitor.
+ *     Debugger checks that extracted threadIDs are equals to the expected ones..
+ *     Finally, debugger resumes debuggee, sends it signal to quit, waits
+ *     for it exits and exits too with the proper exit code.
+ * COMMENTS
+ *     For JDK 1.4.0-beta3 (build 1.4.0-beta3-b84) and earlier this test passed
+ *     because target VM does not support VM capability: canGetMonitorInfo
+ *     Test was fixed due to test bug:
+ *     4864492 TEST_BUG: potential race in JDWP test monitorinfo001
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.MonitorInfo.monitorinfo001
+ *        nsk.jdwp.ObjectReference.MonitorInfo.monitorinfo001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.MonitorInfo.monitorinfo001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001a.java
new file mode 100644
index 00000000000..fa0386cfa5d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001a.java
@@ -0,0 +1,289 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.MonitorInfo;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class monitorinfo001a {
+
+    // static field names for the tested objects
+    public static final String OBJECT_FIELD_NAME = "object";
+    public static final String MONITOR_OWNER_FIELD_NAME = "monitorOwner";
+    public static final String MONITOR_WAITER_FIELD_NAMES[] =
+                            { "monitorWaiter1", "monitorWaiter2" };
+
+    // lock object to prevent thread from exit
+    private static Object threadExiting = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        monitorinfo001a _monitorinfo001a = new monitorinfo001a();
+        System.exit(monitorinfo001.JCK_STATUS_BASE + _monitorinfo001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        // make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        long timeout = argumentHandler.getWaitTime() * 60 * 1000;
+
+        boolean success = true;
+
+        // lock the object to prevent threads from exit
+        synchronized (threadExiting) {
+
+            // load tested class and create tested object and threads
+            log.display("Creating object of tested class and threads");
+            TestedClass.object = new TestedClass();
+            TestedClass.monitorOwner = new MonitorOwnerThread("MonitorOwnerThread");
+            TestedClass.monitorWaiter1 = new MonitorWaiterThread("MonitorWaiterThread1");
+            TestedClass.monitorWaiter2 = new MonitorWaiterThread("MonitorWaiterThread2");
+
+            // start MonitorWaiterThreads and wait for them become ready
+            if (success) {
+                if (!startMonitorWaiterThread(TestedClass.monitorWaiter1))
+                    success = false;
+            }
+            if (success) {
+                if (!startMonitorWaiterThread(TestedClass.monitorWaiter2))
+                    success = false;
+            }
+
+            // start MonitorOwnerThread and wait for it becomes ready
+            if (success) {
+                if (!startMonitorOwnerThread(TestedClass.monitorOwner))
+                    success = false;
+            }
+
+            // notify debugger if all threads started
+            if (success) {
+                log.display("Send signal to debugger: " + monitorinfo001.READY);
+                pipe.println(monitorinfo001.READY);
+            } else {
+                log.complain("Send signal to debugger: " + monitorinfo001.ERROR);
+                pipe.println(monitorinfo001.ERROR);
+            }
+
+            if (success) {
+                // wait for signal QUIT from debugeer
+                log.display("Waiting for signal from debugger: " + monitorinfo001.QUIT);
+                String signal = pipe.readln();
+                log.display("Received signal from debugger: " + signal);
+
+                // check received signal
+                if (signal == null || !signal.equals(monitorinfo001.QUIT)) {
+                    log.complain("Unexpected communication signal from debugee: " + signal
+                                + " (expected: " + monitorinfo001.QUIT + ")");
+                    success = false;
+                }
+            }
+
+            // allow started threads to exit
+        }
+
+        // finish monitor owner thread
+        finishThread(TestedClass.monitorOwner, timeout);
+
+        // notify monitor waiting threads
+        synchronized (TestedClass.object) {
+            TestedClass.object.notifyAll();
+        }
+
+        // finish monitor waiting threads
+        finishThread(TestedClass.monitorWaiter2, timeout);
+        finishThread(TestedClass.monitorWaiter1, timeout);
+
+        // exit debugee
+        if (!success) {
+            log.display("Debugee FAILED");
+            return monitorinfo001.FAILED;
+        }
+
+        log.display("Debugee PASSED");
+        return monitorinfo001.PASSED;
+    }
+
+    // start MonitorWaiterThread and waits for it becomes ready
+    private boolean startMonitorWaiterThread(MonitorWaiterThread thread) {
+        // start thread and wait for it becomes ready
+        synchronized (thread.ready) {
+            thread.start();
+            try {
+                thread.ready.wait();
+            } catch (InterruptedException e) {
+                log.complain("Interruption while waiting for MonitorWaiterThread started:\n\t"
+                            + e);
+                return false;
+            }
+        }
+
+        // ensure that thread becomes waiting for tested object
+        synchronized (TestedClass.object) {
+            return true;
+        }
+    }
+
+    // start MonitorOwnrerThread and waits for it becomes ready
+    private boolean startMonitorOwnerThread(MonitorOwnerThread thread) {
+        // start thread an wait for it becomes ready
+        synchronized (thread.ready) {
+            thread.start();
+            try {
+                thread.ready.wait();
+            } catch (InterruptedException e) {
+                log.complain("Interruption while waiting for MonitorOwnerThread started:\n\t"
+                            + e);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    // interrupt thread if it is alive
+    private void finishThread(Thread thread, long timeout) {
+        try {
+            thread.join(timeout);
+        } catch (InterruptedException e) {
+            throw new Failure("Interruption while waiting for thread to finish:\n\t" + e);
+        }
+
+        if (thread.isAlive()) {
+            log.display("Interrupting alive thread: " + thread.getName());
+            thread.interrupt();
+        }
+    }
+
+    /////////////////// Tested class and threads ////////////////
+
+    // tested thread class
+    public static class TestedClass {
+
+        // field with the tested object value
+        public static volatile TestedClass object = null;
+
+        // field with the thread which ownes monitor of the tested object
+        public static MonitorOwnerThread monitorOwner = null;
+
+        // fields with the threads which wait for monitor of the tested object
+        public static MonitorWaiterThread monitorWaiter1 = null;
+        public static MonitorWaiterThread monitorWaiter2 = null;
+
+        // internal field
+        private int foo = 0;
+
+        // constructor
+        public TestedClass() {
+            foo = 100;
+        }
+
+    } // TestedClass class
+
+    // thread which will owns monitor of the tested object
+    public static class MonitorOwnerThread extends Thread {
+
+        public Object ready = new Object();
+
+        public MonitorOwnerThread(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display(getName() + " started");
+
+            // get ownership for monitor of the tested object
+            synchronized (TestedClass.object) {
+                log.display(getName() + " owns monitor of the tested object");
+
+                // notify debuggee that thread is ready
+                synchronized (ready) {
+                    ready.notifyAll();
+                }
+
+                // wait for debuggee releses object to finish threads
+                synchronized (threadExiting) {
+                    log.display(getName() + " finished");
+                }
+
+            }
+
+        }
+
+    } // MonitorOwnerThreadClass
+
+    // thread which will wait for monitor of the tested object
+    public static class MonitorWaiterThread extends Thread {
+
+        public Object ready = new Object();
+
+        public MonitorWaiterThread(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display(getName() + " started");
+
+            // get ownership for object monitor for futher waiting
+            synchronized (TestedClass.object) {
+
+                // notify debuggee that thread is ready
+                synchronized (ready) {
+                    ready.notifyAll();
+                }
+
+                // go to the waiting state for monitor of the tested object
+                log.display(getName() + " waits for monitor of the tested object");
+                try {
+                    TestedClass.object.wait();
+                } catch (InterruptedException e) {
+                    log.display(getName() + " is interrupted while waiting for tested object");
+                }
+            }
+
+            // wait for debuggee releses object to finish threads
+            synchronized (threadExiting) {
+                log.display(getName() + " finished");
+            }
+
+        }
+
+    } // MonitorWaiterThread class
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001.java
new file mode 100644
index 00000000000..cc5530cf82a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001.java
@@ -0,0 +1,345 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.ReferenceType;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.ReferenceType.
+ *
+ * See referencetype001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class referencetype001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.ReferenceType";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "referencetype001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.ReferenceType";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.ReferenceType;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String OBJECT_FIELD_NAME = referencetype001a.OBJECT_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new referencetype001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectID, classID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long objectID, long classID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract type tag
+        byte tag = (byte)0;
+        try {
+            tag = reply.getByte();
+            log.display("    refTypeTag: " + tag);
+        } catch (BoundException e) {
+            log.complain("Unable to extract refTypeTag from reply packet:\n\t"
+                    + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract typeID
+        long typeID = 0;
+        try {
+            typeID = reply.getReferenceTypeID();
+            log.display("    typeID: " + typeID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract referencTypeID from reply packet:\n\t"
+                    + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that tag is an CLASS type tag
+        if (tag != JDWP.TypeTag.CLASS) {
+            log.complain("Unexpected referenceTypetag received:" + tag
+                        + " (expected" + JDWP.TypeTag.CLASS);
+            success = false;
+        }
+
+        // check that typeID is not negative integer
+        if (typeID < 0) {
+            log.complain("Negative value of typeID received: " + typeID);
+            success = false;
+        }
+
+        // check that typeID is equal to the expected classID
+        if (typeID != classID) {
+            log.display("Unexpected typeID received: " + typeID
+                        + " (expected" + classID);
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001/TestDescription.java
new file mode 100644
index 00000000000..9d8b0248bd3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001/TestDescription.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/ReferenceType/referencetype001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: ReferenceType
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that the returned referenceTypeID for the tested
+ *     object is equals to the expected typeID of the tested class.
+ *     Test consists of two compoments:
+ *         debugger: referencetype001
+ *         debuggee: referencetype001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and objectID as the value of a class static field.
+ *     thread is waiting for the object at this moment.
+ *     Then, debugger creates command packet for ObjectReference.ReferenceType
+ *     command with the found objectID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts typeTag and typeID for the requested object type.
+ *     Also test checks that the extracted objectID is equals to the
+ *     expected classID and typeTag is a CLASS type tag.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.ReferenceType.referencetype001
+ *        nsk.jdwp.ObjectReference.ReferenceType.referencetype001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.ReferenceType.referencetype001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001a.java
new file mode 100644
index 00000000000..e0afdca065f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001a.java
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.ReferenceType;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class referencetype001a {
+
+    // name for the tested thread
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    public static void main(String args[]) {
+        referencetype001a _referencetype001a = new referencetype001a();
+        System.exit(referencetype001.JCK_STATUS_BASE + _referencetype001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.object = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + referencetype001.READY);
+        pipe.println(referencetype001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + referencetype001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(referencetype001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + referencetype001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return referencetype001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return referencetype001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+
+        // static field with the tested object value
+        public static volatile TestedClass object = null;
+
+        private int foo = 0;
+
+        public TestedClass() {
+            foo = 100;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001.java
new file mode 100644
index 00000000000..4e76fc84c83
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: ReferringObjects
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: referringObjects001
+ *         debuggee: referringObjects001a
+ *     Debuggee during startup initializes static field 'testInstance' with java.lang.Object instance
+ *     and creates objects refer to this instance via references with types which should be supported
+ *     by command ObjectReference.ReferringObjects:
+ *         - strong reference
+ *         - soft reference
+ *         - weak reference
+ *         - phantom reference
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     For maxReferrers in [1, 0, Interger.MAX_VALUE]
+ *     do
+ *         Debugger obtains objectID for instance assigned to the debuggee's static field 'testInstance'.
+ *         Then, debugger creates command packet for ReferringObjects command with the
+ *         found objectID and maxReferrers as an arguments, writes packet to the transport
+ *         channel, and waits for a reply packet.
+ *         When reply packet is received, debugger parses the packet structure
+ *         and extracts number of referring objects and referring objects ids.
+ *         Debugger checks that received number of referring objects is correct:
+ *             - if maxReferrers=1 only 1 referring object should be returned
+ *             - if maxReferrers=0 or maxReferrers=Integer.MAX_VALUE all referring objects should be returned
+ *     done
+ *     Also, test performs checks for cases when incorrect data is sent in command.
+ *     Following cases are tested:
+ *         - create command with maxReferrers=-1, expect ILLEGAL_ARGUMENT error
+ *         - create command with objectID = -1, expect INVALID_OBJECT error
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001.referringObjects001
+ * @run main/othervm/native PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001.referringObjects001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="-Xmx256M ${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+import nsk.share.jpda.AbstractDebuggeeTest;
+
+public class referringObjects001 extends TestDebuggerType1 {
+
+    protected String getDebugeeClassName() {
+        return nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001.referringObjects001a.class.getName();
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new referringObjects001().runIt(argv, out);
+    }
+
+    private void testCommand(long objectID, int maxReferrers, int expectedReferrersCount, boolean expectError, int errorCode) {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.ReferringObjects;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("objectID = " + objectID);
+            log.display("maxReferrers = " + maxReferrers);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addObjectID(objectID);
+            command.addInt(maxReferrers);
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command, expectError, errorCode);
+
+            if (expectError)
+                return;
+
+            int referringObjects = reply.getInt();
+            log.display("referringObjects = " + referringObjects);
+
+            // check that correct 'referringObjects' value was received
+            if (referringObjects != expectedReferrersCount) {
+                log.complain("Unexpected value 'referringObjects': " + referringObjects + " expected is " + expectedReferrersCount);
+                setSuccess(false);
+            }
+
+            for (int i = 0; i < referringObjects; i++) {
+                JDWP.Value value = reply.getValue();
+                log.display("tagged-ObjectID = " + value);
+            }
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        /*
+         * Provoke GC here to be sure that GC won't start during test execution
+         */
+        forceGC();
+        pipe.println(referringObjects001a.COMMAND_CREATE_TEST_INSTANCES);
+
+        if (!isDebuggeeReady())
+            return;
+
+
+        int referrersCount = referringObjects001a.expectedCount;
+
+        long objectID = queryObjectID(debuggee.getReferenceTypeID(createTypeSignature(getDebugeeClassName())), "testInstance", JDWP.Tag.OBJECT);
+
+        // create command with maxReferrers=1, only 1 referrer should be returned
+        testCommand(objectID, 1, 1, false, 0);
+        // create command with maxReferrers=0, all referrers should be returned
+        testCommand(objectID, 0, referrersCount, false, 0);
+        // create command with maxReferrers=Integer.MAX_VALUE, all referrers should be returned
+        testCommand(objectID, Integer.MAX_VALUE, referrersCount, false, 0);
+
+        // create command with maxReferrers=-1, expect ILLEGAL_ARGUMENT error
+        testCommand(objectID, -1, referrersCount, true, JDWP.Error.ILLEGAL_ARGUMENT);
+
+        // create command with objectID = -1, expect INVALID_OBJECT error
+        testCommand(-1, Integer.MAX_VALUE, referrersCount, true, JDWP.Error.INVALID_OBJECT);
+
+        resetStatusIfGC();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001a.java
new file mode 100644
index 00000000000..e98b41cf7ea
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001a.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001;
+
+import java.util.*;
+import nsk.share.ReferringObjectSet;
+import nsk.share.jdi.HeapwalkingDebuggee;
+import nsk.share.jdwp.*;
+
+public class referringObjects001a extends AbstractJDWPDebuggee {
+    public static Object testInstance;
+
+    public static final String COMMAND_CREATE_TEST_INSTANCES = "COMMAND_CREATE_TEST_INSTANCES";
+
+    public static final int expectedCount = HeapwalkingDebuggee.includedIntoReferrersCountTypes.size() + 1;
+
+    private ArrayList<ReferringObjectSet> referrers = new ArrayList<ReferringObjectSet>();
+
+    public boolean parseCommand(String command) {
+        if (super.parseCommand(command))
+            return true;
+
+        if (command.equals(COMMAND_CREATE_TEST_INSTANCES)) {
+            testInstance = new Object();
+
+            // create objects refering to 'testInstance' via references with types which should be supported by command ObjectReference.ReferringObjects
+            for (String referenceType : HeapwalkingDebuggee.includedIntoReferrersCountTypes) {
+                referrers.add(new ReferringObjectSet(testInstance, 1, referenceType));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void main(String args[]) {
+        new referringObjects001a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002.java
new file mode 100644
index 00000000000..23f7abf5a13
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: ReferringObjects
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: referringObjects002
+ *         debuggee: referringObjects002a
+ *     Debuggee contains static field 'testInstance' which initialized with java.lang.Object instance.
+ *     Also debuggee contains 6 static fields with names referringObject1, ..., referringObject6, this fields
+ *     are initialized with objects which refer to 'testInstance' and there are no more objects referring to
+ *     the 'testInstance'.
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Debugger obtains objectID for instance assigned to the debuggee's static field 'testInstance'.
+ *     Then, debugger creates command packet for ReferringObjects command with the
+ *     found objectID and maxReferrers=0 as an arguments, writes packet to the transport
+ *         channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts number of referring objects and referring objects ids.
+ *     Debugger checks that number of referring objects is correct - 6.
+ *     Debugger obtains objectIDs for object instances stored in debuggee's fields referringObject1, ..., referringObject6
+ *     and checks that this values and referring objects ids received via JDWP command are identical.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002.referringObjects002
+ * @run main/othervm/native PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002.referringObjects002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002;
+
+import java.io.PrintStream;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+
+public class referringObjects002 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002.referringObjects002a.class.getName();
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new referringObjects002().runIt(argv, out);
+    }
+
+    private void testCommand() {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.ReferringObjects;
+
+            long objectID = queryObjectID(
+                    debuggee.getReferenceTypeID(createTypeSignature(getDebugeeClassName())),
+                    "testInstance",
+                    JDWP.Tag.OBJECT);
+
+            // create command with maxReferrers=0 (receive all referrers)
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("objectID = " + objectID);
+            log.display("maxReferrers = " + 0);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addObjectID(objectID);
+            command.addInt(0);
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command);
+
+            int referringObjects = reply.getInt();
+            log.display("referringObjects = " + referringObjects);
+
+            // there are 6 referrers in debuggee
+            int expectedReferrersCount = 6;
+
+            if (referringObjects != expectedReferrersCount) {
+                log.complain("Unexpected value 'referringObjects': " + referringObjects + " expected is " + expectedReferrersCount);
+                setSuccess(false);
+            }
+
+            long expectedReferrersID[] = new long[expectedReferrersCount];
+
+            // initialize expected IDs of referrers
+            for (int i = 0; i < expectedReferrersCount; i++) {
+                expectedReferrersID[i] = queryObjectID(debuggee.getReferenceTypeID(createTypeSignature(getDebugeeClassName())), "referringObject"
+                        + (i + 1));
+            }
+
+            long receivedReferrersID[] = new long[referringObjects];
+
+            for (int i = 0; i < referringObjects; i++) {
+                JDWP.Value value = reply.getValue();
+                log.display("tagged-ObjectID = " + value);
+
+                receivedReferrersID[i] = ((Long) value.getValue()).longValue();
+            }
+
+            // check that correct IDs of referrers was received
+            for (int i = 0; i < referringObjects; i++) {
+                boolean isIDExpected = false;
+
+                for (int j = 0; j < expectedReferrersID.length; j++) {
+                    if (receivedReferrersID[i] == expectedReferrersID[j]) {
+                        isIDExpected = true;
+                        break;
+                    }
+                }
+
+                if (!isIDExpected) {
+                    setSuccess(false);
+                    log.complain("Unexpected 'referrerID' value: " + receivedReferrersID[i]);
+                }
+            }
+
+            if (!getSuccess()) {
+                log.complain("Expected IDs:");
+                for (int i = 0; i < expectedReferrersID.length; i++)
+                    log.complain("" + expectedReferrersID[i]);
+            }
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        testCommand();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002a.java
new file mode 100644
index 00000000000..12e589fcaec
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002a.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002;
+
+import nsk.share.ObjectInstancesManager;
+import nsk.share.ReferringObject;
+import nsk.share.jdwp.*;
+
+public class referringObjects002a extends AbstractJDWPDebuggee {
+    public static Object testInstance = new Object();
+
+    // create 5 referrers for 'testInstance'
+    public static ReferringObject referringObject1 = new ReferringObject(testInstance, ObjectInstancesManager.STRONG_REFERENCE);
+
+    public static ReferringObject referringObject2 = new ReferringObject(testInstance, ObjectInstancesManager.STRONG_REFERENCE);
+
+    public static ReferringObject referringObject3 = new ReferringObject(testInstance, ObjectInstancesManager.STRONG_REFERENCE);
+
+    public static ReferringObject referringObject4 = new ReferringObject(testInstance, ObjectInstancesManager.STRONG_REFERENCE);
+
+    public static ReferringObject referringObject5 = new ReferringObject(testInstance, ObjectInstancesManager.STRONG_REFERENCE);
+
+    // since 'testInstance' is static field one of the referrers is referringObjects002a.class
+    public static Class<?> referringObject6 = referringObjects002a.class;
+
+    public static void main(String args[]) {
+        new referringObjects002a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001.java
new file mode 100644
index 00000000000..3d20db7fa7e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001.java
@@ -0,0 +1,467 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.SetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ObjectReference.SetValues.
+ *
+ * See setvalues001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class setvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String RUN = "run";
+    static final String DONE = "done";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ObjectReference.SetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "setvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ObjectReference.SetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ObjectReference.SetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // target values class name and signature constants
+    static final String TARGET_VALUES_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TargetValuesClass";
+    static final String TARGET_VALUES_CLASS_SIGNATURE = "L" + TARGET_VALUES_CLASS_NAME.replace('.', '/') + ";";
+
+    // name and siagnature of a class with static field with the tested object value
+    static final String OBJECT_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "ObjectClass";
+    static final String OBJECT_CLASS_SIGNATURE = "L" + OBJECT_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the static field in the tested class with the tested object value
+    static final String OBJECT_FIELD_NAME = setvalues001a.OBJECT_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new setvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for classID for the class with target values
+                log.display("Getting classID for class with target values by signature:\n"
+                            + "  " + TARGET_VALUES_CLASS_SIGNATURE);
+                long targetValuesClassID =
+                            debugee.getReferenceTypeID(TARGET_VALUES_CLASS_SIGNATURE);
+                log.display("  got classID: " + targetValuesClassID);
+
+                // query debugee for fieldIDs of the class static fields
+                log.display("Getting fieldIDs for static fields of the class");
+                long targetValuesFieldIDs[] = queryClassFieldIDs(targetValuesClassID);
+                log.display("  got fields: " + targetValuesFieldIDs.length);
+                int count = targetValuesFieldIDs.length;
+
+                // query debugee for values of the fields
+                log.display("Getting values of the static fields");
+                JDWP.Value targetValues[] =
+                        queryClassFieldValues(targetValuesClassID, targetValuesFieldIDs);
+                log.display("  got values: " + targetValues.length);
+                if (targetValues.length != count) {
+                    throw new Failure("Unexpected number of static fields values received: "
+                                    + targetValues.length + "(expected: " + count + ")");
+                }
+
+                // query debugee for classID of the tested class
+                log.display("Getting tested classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long testedClassID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + testedClassID);
+
+                // query debugee for fieldIDs of tested class fields
+                log.display("Getting fieldIDs for tested fields of the tested class");
+                long testedFieldIDs[] = queryClassFieldIDs(testedClassID);
+                log.display("  got fields: " + testedFieldIDs.length);
+                if (testedFieldIDs.length != count) {
+                    throw new Failure("Unexpected number of fields of tested class received: "
+                                    + testedFieldIDs.length + "(expected: " + count + ")");
+                }
+
+                // query debugee for classID of the object class
+                log.display("Getting object classID by signature:\n"
+                            + "  " + OBJECT_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(OBJECT_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID,
+                            OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectID, testedFieldIDs, targetValues);
+
+                // check confirmation from debuggee that values have been set properly
+                log.display("\n>>> Checking that the values have been set properly \n");
+                checkValuesChanged();
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debugee for fieldID's of the class static fields.
+     */
+    long[] queryClassFieldIDs(long classID) {
+        // compose ReferenceType.Fields command packet
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+        command.addReferenceTypeID(classID);
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract fieldIDs from the reply packet
+        try {
+            reply.resetPosition();
+
+            int declared = reply.getInt();
+            long[] fieldIDs = new long[declared];
+
+            int j = 0;
+            for (int i = 0; i < declared; i++ ) {
+                long fieldID = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                fieldIDs[i] = fieldID;
+            }
+            return fieldIDs;
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.Fields command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fieldIDs for classID: " + classID);
+        }
+    }
+
+    /**
+     * Query debugee for values of the class fields.
+     */
+    JDWP.Value[] queryClassFieldValues(long classID, long fieldIDs[]) {
+        // compose ReferenceType.Fields command packet
+        int count = fieldIDs.length;
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.GetValues);
+        command.addReferenceTypeID(classID);
+        command.addInt(count);
+        for (int i = 0; i < count; i++) {
+            command.addFieldID(fieldIDs[i]);
+        }
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract values from the reply packet
+        try {
+            reply.resetPosition();
+
+            int valuesCount = reply.getInt();
+            JDWP.Value values[] = new JDWP.Value[valuesCount];
+            for (int i = 0; i < valuesCount; i++ ) {
+                JDWP.Value value = reply.getValue();
+                values[i] = value;
+            }
+            return values;
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.GetValues command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fields values for classID: " + classID);
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified classID.
+     */
+    void testCommand(long objectID, long fieldIDs[], JDWP.Value values[]) {
+        int count = fieldIDs.length;
+
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  objectID: " + objectID);
+        command.addObjectID(objectID);
+        log.display("  values: " + count);
+        command.addInt(count);
+        for (int i = 0; i < count; i++) {
+            log.display("    field #" + i +":");
+            log.display("      fieldID: " + fieldIDs[i]);
+            command.addFieldID(fieldIDs[i]);
+
+            JDWP.Value value = values[i];
+            JDWP.UntaggedValue untaggedValue =
+                    new JDWP.UntaggedValue(value.getValue());
+            log.display("      untagged_value: " + untaggedValue.getValue());
+            command.addUntaggedValue(untaggedValue, value.getTag());
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no data to extract
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+    /**
+     * Check confiramtion from debuggee that values are changed.
+     */
+    void checkValuesChanged() {
+        // send debugee signal RUN
+        log.display("Sending signal to debugee: " + RUN);
+        pipe.println(RUN);
+
+        // wait for DONE signal from debugee
+        log.display("Waiting for signal from debugee: " + DONE);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        // check received signal
+        if (signal == null) {
+            throw new TestBug("<null> signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        } else if (signal.equals(DONE)) {
+            log.display("All fields values have been correctly set into debuggee VM");
+        } else if (signal.equals(ERROR)) {
+            log.complain("Not all fields values have been correctly set into debuggee VM");
+            success = false;
+        } else {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001/TestDescription.java
new file mode 100644
index 00000000000..3675a74be3b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001/TestDescription.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ObjectReference/SetValues/setvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ObjectReference
+ *         command: SetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the values are correctly set to debuggee class fields.
+ *     Test consists of two compoments:
+ *         debugger: setvalues001
+ *         debuggee: setvalues001a
+ *     To set values to the static fields of the tested class
+ *     and check that they are set correctly, test defines
+ *     following classes into debuggee VM:
+ *         OriginalValuesClass - class with original values of static fields
+ *         TargetValuesClass - class with target values of static fields
+ *         TestedClass - tested class with tested fields to set values to
+ *         ObjectClass - class with one static field for the tested object
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains classIDs for the tested class and class with
+ *     the target values from debugee. It obtains also fieldIDs for thess
+ *     classese and target values of the fields. It obtains also objectID
+ *     as the value of a static field of the object class.
+ *     Then, debugger creates command packet for SetValues command with the
+ *     found objectID and list of fieldIDs as arguments, writes packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and and checks that there is no data in the reply packet.
+ *     Then debugger sends signal RUN to debuggee to ask it to verify
+ *     new fields values of tested class. Debuggee compares these values
+ *     with the original and target values and sends ERROR signal
+ *     to debugger if the values was not set correctly.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ObjectReference.SetValues.setvalues001
+ *        nsk.jdwp.ObjectReference.SetValues.setvalues001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ObjectReference.SetValues.setvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001a.java
new file mode 100644
index 00000000000..1814034cd58
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001a.java
@@ -0,0 +1,345 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ObjectReference.SetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part of the test.
+ */
+public class setvalues001a {
+
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        setvalues001a _setvalues001a = new setvalues001a();
+        System.exit(setvalues001.JCK_STATUS_BASE + _setvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        // make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of all required classes");
+        OriginalValuesClass original = new OriginalValuesClass();
+        TargetValuesClass target = new TargetValuesClass();
+        ObjectClass.object = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + setvalues001.READY);
+        pipe.println(setvalues001.READY);
+
+        // wait for signal RUN from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.RUN);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+        // check received signal
+        if (signal == null || !signal.equals(setvalues001.RUN)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.RUN + ")");
+            log.display("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // check assigned values
+        if (checkValues(ObjectClass.object)) {
+            log.display("Sending signal to debugger: " + setvalues001.DONE);
+            pipe.println(setvalues001.DONE);
+        } else {
+            log.display("Sending signal to debugger: " + setvalues001.ERROR);
+            pipe.println(setvalues001.ERROR);
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.QUIT);
+        signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+        // check received signal
+        if (! signal.equals(setvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return setvalues001.PASSED;
+    }
+
+    // check values of static fields for both classes
+    static boolean checkValues(TestedClass object) {
+        int different = 0;
+        log.display("Checking that values have been set correctly:");
+
+        // check value of the field
+        if (object.booleanValue != TargetValuesClass.booleanValue) {
+            different++;
+            log.complain("  booleanValue = " + object.booleanValue + "\n"
+                       + "    setting: " + OriginalValuesClass.booleanValue
+                                + " -> " + TargetValuesClass.booleanValue);
+            if (object.booleanValue == OriginalValuesClass.booleanValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  booleanValue: " + OriginalValuesClass.booleanValue
+                                    + " -> " + TargetValuesClass.booleanValue);
+        }
+
+        // check value of the field
+        if (object.byteValue != TargetValuesClass.byteValue) {
+            different++;
+            log.complain("  byteValue = " + object.byteValue + "\n"
+                       + "    setting: " + OriginalValuesClass.byteValue
+                                + " -> " + TargetValuesClass.byteValue);
+            if (object.byteValue == OriginalValuesClass.byteValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  byteValue: " + OriginalValuesClass.byteValue
+                                    + " -> " + TargetValuesClass.byteValue);
+        }
+
+        // check value of the field
+        if (object.charValue != TargetValuesClass.charValue) {
+            different++;
+            log.complain("  charValue = " + object.charValue + "\n"
+                       + "    setting: " + OriginalValuesClass.charValue
+                                + " -> " + TargetValuesClass.charValue);
+            if (object.charValue == OriginalValuesClass.charValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  charValue: " + OriginalValuesClass.charValue
+                                    + " -> " + TargetValuesClass.charValue);
+        }
+
+        // check value of the field
+        if (object.intValue != TargetValuesClass.intValue) {
+            different++;
+            log.complain("  intValue = " + object.intValue + "\n"
+                       + "    setting: " + OriginalValuesClass.intValue
+                                + " -> " + TargetValuesClass.intValue);
+            if (object.intValue == OriginalValuesClass.intValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  intValue: " + OriginalValuesClass.intValue
+                                    + " -> " + TargetValuesClass.intValue);
+        }
+
+        // check value of the field
+        if (object.shortValue != TargetValuesClass.shortValue) {
+            different++;
+            log.complain("  shortValue = " + object.shortValue + "\n"
+                       + "    setting: " + OriginalValuesClass.shortValue
+                                + " -> " + TargetValuesClass.shortValue);
+            if (object.shortValue == OriginalValuesClass.shortValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  shortValue: " + OriginalValuesClass.shortValue
+                                    + " -> " + TargetValuesClass.shortValue);
+        }
+
+        // check value of the field
+        if (object.longValue != TargetValuesClass.longValue) {
+            different++;
+            log.complain("  longValue = " + object.longValue + "\n"
+                       + "    setting: " + OriginalValuesClass.longValue
+                                + " -> " + TargetValuesClass.longValue);
+            if (object.longValue == OriginalValuesClass.longValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  longValue: " + OriginalValuesClass.longValue
+                                    + " -> " + TargetValuesClass.longValue);
+        }
+
+        // check value of the field
+        if (object.floatValue != TargetValuesClass.floatValue) {
+            different++;
+            log.complain("  floatValue = " + object.floatValue + "\n"
+                       + "    setting: " + OriginalValuesClass.floatValue
+                                + " -> " + TargetValuesClass.floatValue);
+            if (object.floatValue == OriginalValuesClass.floatValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  floatValue: " + OriginalValuesClass.floatValue
+                                    + " -> " + TargetValuesClass.floatValue);
+        }
+
+        // check value of the field
+        if (object.doubleValue != TargetValuesClass.doubleValue) {
+            different++;
+            log.complain("  doubleValue = " + object.doubleValue + "\n"
+                       + "    setting: " + OriginalValuesClass.doubleValue
+                                + " -> " + TargetValuesClass.doubleValue);
+            if (object.doubleValue == OriginalValuesClass.doubleValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  doubleValue: " + OriginalValuesClass.doubleValue
+                                    + " -> " + TargetValuesClass.doubleValue);
+        }
+
+        // check value of the field
+        if (object.stringValue != TargetValuesClass.stringValue) {
+            different++;
+            log.complain("  stringValue = " + object.stringValue + "\n"
+                       + "    setting: " + OriginalValuesClass.stringValue
+                                + " -> " + TargetValuesClass.stringValue);
+            if (object.stringValue == OriginalValuesClass.stringValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  stringValue: " + OriginalValuesClass.stringValue
+                                    + " -> " + TargetValuesClass.stringValue);
+        }
+
+        // check value of the field
+        if (object.objectValue != TargetValuesClass.objectValue) {
+            different++;
+            log.complain("  objectValue = " + object.objectValue + "\n"
+                       + "    setting: " + OriginalValuesClass.objectValue
+                                + " -> " + TargetValuesClass.objectValue);
+            if (object.objectValue == OriginalValuesClass.objectValue) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  objectValue: " + OriginalValuesClass.objectValue
+                                    + " -> " + TargetValuesClass.objectValue);
+        }
+
+/*
+        // check value of the field
+        if (object.Value != TargetValuesClass.Value) {
+            different++;
+            log.complain("  Value = " + object.Value + "\n"
+                       + "    setting: " + OriginalValuesClass.Value
+                                + " -> " + TargetValuesClass.Value);
+            if (object.Value == OriginalValuesClass.Value) {
+                log.complain("      not changed!");
+            } else {
+                log.complain("      changed incorrectly!");
+            }
+        } else {
+            log.display("  Value: " + OriginalValuesClass.Value
+                                    + " -> " + TargetValuesClass.Value);
+        }
+*/
+
+        // check taht no any changed value differs from target
+        if (different > 0) {
+            log.complain("Values of " + different + " fields have not been set correctly");
+            return false;
+        }
+
+        log.display("Values of all fields have been set correctly");
+        return true;
+    }
+
+    // class with the original values of static fields
+    public static class OriginalValuesClass {
+        static final boolean booleanValue = true;
+        static final byte    byteValue    = (byte)0x01;
+        static final char    charValue    = 'Z';
+        static final int     intValue     = 100;
+        static final short   shortValue   = (short)10;
+        static final long    longValue    = (long)1000000;
+        static final float   floatValue   = (float)3.14;
+        static final double  doubleValue  = (double)2.8e-12;
+        static final String  stringValue  = "text";
+        static final Object  objectValue  = new OriginalValuesClass();
+    }
+
+    // class with the original values of static fields
+    public static class TargetValuesClass {
+        static final boolean booleanValue = false;
+        static final byte    byteValue    = (byte)0x0F;
+        static final char    charValue    = 'A';
+        static final int     intValue     = 999;
+        static final short   shortValue   = (short)88;
+        static final long    longValue    = (long)11111111;
+        static final float   floatValue   = (float)7.19;
+        static final double  doubleValue  = (double)4.6e24;
+        static final String  stringValue  = "new text";
+        static final Object  objectValue  = new TargetValuesClass();
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+        private   boolean  booleanValue = OriginalValuesClass.booleanValue;
+        private   byte     byteValue    = OriginalValuesClass.byteValue;
+        protected char     charValue    = OriginalValuesClass.charValue;
+        protected int      intValue     = OriginalValuesClass.intValue;
+        public    short    shortValue   = OriginalValuesClass.shortValue;
+        public    long     longValue    = OriginalValuesClass.longValue;
+                  float    floatValue   = OriginalValuesClass.floatValue;
+                  double   doubleValue  = OriginalValuesClass.doubleValue;
+                  String   stringValue  = OriginalValuesClass.stringValue;
+                  Object   objectValue  = OriginalValuesClass.objectValue;
+    }
+
+    // class with static field with the tested object
+    public static class ObjectClass {
+        // static field with the tested object
+        public static TestedClass object = null;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001.java
new file mode 100644
index 00000000000..23b1c3de7ee
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001.java
@@ -0,0 +1,162 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.ClassLoader;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class classloader001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.ClassLoader";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "classloader001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.ClassLoader";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.ClassLoader;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new classloader001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    long classLoaderID = reply.getObjectID();
+                    log.display("  classLoaderID: " + classLoaderID);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while connecting to debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001/TestDescription.java
new file mode 100644
index 00000000000..f4df6fd970a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001/TestDescription.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/ClassLoader/classloader001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: ClassLoader
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: classloader001
+ *         debuggee: classloader001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class, which
+ *     will be used to test JDWP command.
+ *     Then, debugger creates command packet for ClassLoader command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts classLoaderID.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.ClassLoader.classloader001
+ *        nsk.jdwp.ReferenceType.ClassLoader.classloader001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.ClassLoader.classloader001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001a.java
new file mode 100644
index 00000000000..9027e4abb04
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001a.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.ClassLoader;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class classloader001a {
+
+    public static void main(String args[]) {
+        classloader001a _classloader001a = new classloader001a();
+        System.exit(classloader001.JCK_STATUS_BASE + _classloader001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return classloader001.PASSED;
+    }
+
+    static public class TestedClass {
+        int foo = 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001.java
new file mode 100644
index 00000000000..b86d17d752f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001.java
@@ -0,0 +1,164 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.ClassObject;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class classobj001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.ClassObject";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "classobj001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.ClassObject";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.ClassObject;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new classobj001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    long classObjectID = reply.getObjectID();
+                    log.display("  classObjectID: " + classObjectID);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+
+                } finally {
+
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while connecting to debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001/TestDescription.java
new file mode 100644
index 00000000000..61603d8d49e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001/TestDescription.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/ClassObject/classobj001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: ClassObject
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: classobj001
+ *         debuggee: classobj001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class, which
+ *     will be used to test JDWP command.
+ *     Then, debugger creates command packet for ClassObject command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts classObjectID.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.ClassObject.classobj001
+ *        nsk.jdwp.ReferenceType.ClassObject.classobj001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.ClassObject.classobj001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001a.java
new file mode 100644
index 00000000000..9931589a78c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001a.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.ClassObject;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class classobj001a {
+
+    public static void main(String args[]) {
+        classobj001a _classobj001a = new classobj001a();
+        System.exit(classobj001.JCK_STATUS_BASE + _classobj001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return classobj001.PASSED;
+    }
+
+    static public class TestedClass {
+        int foo = 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001.java
new file mode 100644
index 00000000000..b6f559a5ae0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001.java
@@ -0,0 +1,220 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Fields;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class fields001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.Fields";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "fields001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.Fields";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Fields;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    static final String[][] fields = {
+                    {"byteField", "B"},
+                    {"booleanField", "Z"},
+                    {"charField", "C"},
+                    {"shortField", "S"},
+                    {"intField", "I"},
+                    {"longField", "J"},
+                    {"floatField", "F"},
+                    {"doubleField", "D"},
+                    {"stringField", "Ljava/lang/String;"},
+                    {"objectField",  TESTED_CLASS_SIGNATURE},
+                    {"intArrayField", "[I"}
+                 };
+    static final int DECLARED_FIELDS = fields.length;
+    static final int FIELD_MODIFIER_FLAGS = JDWP.ModifierFlag.PUBLIC;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new fields001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    long declared = reply.getInt();
+                    log.display("  declared: " + declared);
+
+                    if (declared != DECLARED_FIELDS) {
+                        log.complain("Unexpected number of declared fields in the reply packet :" + declared
+                                    + " (expected: " + DECLARED_FIELDS + ")");
+                        success = false;
+                    }
+
+                    for (int i = 0; i < declared; i++ ) {
+
+                        log.display("  field #" + i);
+
+                        long fieldID = reply.getFieldID();
+                        log.display("    fieldID: " + fieldID);
+
+                        String name = reply.getString();
+                        log.display("    name: " + name);
+                        if (! name.equals(fields[i][0])) {
+                            log.complain("Unexpected name of field #" + i + " in the reply packet: " + name
+                                          + " (expected: " + fields[i][0] + ")");
+                            success = false;
+                        }
+
+                        String signature = reply.getString();
+                        log.display("    signature: " + signature);
+                        if (! signature.equals(fields[i][1])) {
+                            log.complain("Unexpected type signature of field #" + i + " in the reply packet: " + signature
+                                          + " (expected: " + fields[i][1] + ")");
+                            success = false;
+                        }
+
+                        int modBits = reply.getInt();
+                        String modBitsString = "0x" + Packet.toHexString(modBits, 8);
+                        log.display("    modBits: " + modBitsString);
+                        modBits &= JDWP.ModifierFlag.FIELD_MASK;
+                        if (modBits != FIELD_MODIFIER_FLAGS) {
+                            String expectedModBitsString = "0x" + Packet.toHexString(FIELD_MODIFIER_FLAGS, 8);
+                            log.complain("Unexpected modifier flag of field #" + i + " in the reply packet: " + modBitsString
+                                          + " (expected: " + expectedModBitsString + ")");
+                            success = false;
+                        }
+
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001/TestDescription.java
new file mode 100644
index 00000000000..d56c4fae811
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Fields/fields001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Fields
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     reply contains expected set of fields.
+ *     Test consists of two compoments:
+ *         debugger: fields001
+ *         debuggee: fields001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class, which
+ *     will be used to test JDWP command.
+ *     Then, debugger creates command packet for Fields command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts fields info. Test checks that all fields are equal to
+ *     expected.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Fields.fields001
+ *        nsk.jdwp.ReferenceType.Fields.fields001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Fields.fields001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001a.java
new file mode 100644
index 00000000000..b31b5355bdb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001a.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Fields;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class fields001a {
+
+    public static void main(String args[]) {
+        fields001a _fields001a = new fields001a();
+        System.exit(fields001.JCK_STATUS_BASE + _fields001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return fields001.PASSED;
+    }
+
+    static class TestedClass {
+        public byte byteField = (byte) 0xEE;
+        public boolean booleanField = false;
+        public char charField = 'Z';
+        public short shortField = 10;
+        public int intField = 100;
+        public long longField = 1000000;
+        public float floatField = (float) 3.14;
+        public double doubleField = 2.48e-10;
+        public String stringField = "stringFieldValue";
+        public TestedClass objectField = this;
+        public int[] intArrayField = {intField};
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001.java
new file mode 100644
index 00000000000..24ac7321b9f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001.java
@@ -0,0 +1,271 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.FieldsWithGeneric;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * This test checks that the JDWP command <code>FieldsWithGeneric</code>
+ * from the <code>ReferenceType</code> command set returns generic signature
+ * information properly.<br>
+ * Debuggee part of the test contains several tested fields. Some of them
+ * are generic including the inherited fields. Debugger part obtains
+ * information for each field in a reference type of a tested class.
+ * Proper generic signature should be returned for the generic fields, or
+ * an empty string for non-generic ones. Information for the inherited
+ * fields should not be returned.
+ */
+public class fldwithgeneric001 {
+    static final String DEBUGGEE_CLASS =
+        "nsk.jdwp.ReferenceType.FieldsWithGeneric.fldwithgeneric001t";
+    static final String TESTED_CLASS_SIGNATURE =
+        "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001a;";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.FieldsWithGeneric";
+    static final int JDWP_COMMAND_ID =
+        JDWP.Command.ReferenceType.FieldsWithGeneric;
+
+    static final String COMMAND_READY = "ready";
+    static final String COMMAND_QUIT = "quit";
+
+    static final String[][] fields = {
+        {"_fldwithgeneric001St",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001;",
+            "NULL"},
+
+        {"_fldwithgeneric001b",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001b;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001b<Ljava/lang/String;>;"},
+        {"_fldwithgeneric001bSt",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001b;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001b<Ljava/lang/String;>;"},
+
+        {"_fldwithgeneric001c",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001c;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001c<Ljava/lang/Boolean;Ljava/lang/Integer;>;"},
+        {"_fldwithgeneric001cSt",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001c;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001c<Ljava/lang/Boolean;Ljava/lang/Integer;>;"},
+
+        {"_fldwithgeneric001e",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001e;",
+            "NULL"},
+        {"_fldwithgeneric001eSt",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001e;",
+            "NULL"},
+
+        {"_fldwithgeneric001if",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001if;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001if<Ljava/lang/Object;>;"},
+        {"_fldwithgeneric001ifSt",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001if;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001if<Ljava/lang/Object;>;"},
+
+        {"_fldwithgeneric001g",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001g;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001g<Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001f;>;"},
+        {"_fldwithgeneric001gSt",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001g;",
+            "Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001g<Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001f;>;"},
+
+        {"_fldwithgeneric001gArr",
+            "[Lnsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001g;",
+            "NULL"}
+    };
+
+    static final int FLDS_NUM = fields.length;
+
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new fldwithgeneric001().runThis(argv, out);
+    }
+
+    public int runThis(String argv[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+        Log log = new Log(out, argumentHandler);
+        boolean result = true;
+
+        try {
+            Binder binder = new Binder(argumentHandler, log);
+
+            log.display("Starting debuggee VM ...");
+            Debugee debuggee = binder.bindToDebugee(DEBUGGEE_CLASS);
+
+            Transport transport = debuggee.getTransport();
+            IOPipe pipe = debuggee.createIOPipe();
+
+            log.display("Waiting for VM_INIT event ...");
+            debuggee.waitForVMInit();
+
+            log.display("Querying for IDSizes ...");
+            debuggee.queryForIDSizes();
+
+            log.display("Resuming debuggee VM ...");
+            debuggee.resume();
+
+            log.display("Waiting for command: " + COMMAND_READY
+                + " ...");
+            String cmd = pipe.readln();
+            log.display(" ... Received command: " + cmd);
+
+            try {
+                long typeID = debuggee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                /////// begin test of JDWP command
+                log.display("\nCreate command " + JDWP_COMMAND_NAME
+                            + " with ReferenceTypeID: " + typeID);
+                CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                command.addReferenceTypeID(typeID);
+                command.setLength();
+
+                log.display("Sending command packet:\n" + command);
+                transport.write(command);
+
+                log.display("\nWaiting for reply packet ...");
+                ReplyPacket reply = new ReplyPacket();
+                transport.read(reply);
+                log.display(" ... Reply packet received:\n" + reply);
+
+                log.display("\nChecking reply packet header");
+                reply.checkHeader(command.getPacketID());
+
+/* parsing of reply data:
+    int declared - Number of declared fields
+
+    ---- Repeated 'declared' times:
+    fieldID fieldID - Field ID
+    string nam - The name of the field
+    string signature - The JNI signature of the field.
+    string genericSignature - The generic signature of the field,
+                                or an empty string if there is none.
+    int modBits - The modifier bit flags (also known as access flags)
+    ----
+*/
+                log.display("\nParsing reply packet:");
+                reply.resetPosition();
+
+                long declared = reply.getInt();
+                log.display("\tdeclared: " + declared);
+
+                if (declared != FLDS_NUM) {
+                    log.complain("TEST FAILED: Unexpected number of declared fields in the reply packet:"
+                        + "\n\tGot: " + declared
+                        + "\n\tExpected: " + FLDS_NUM + "\n");
+                    result = false;
+                }
+
+                for (int i=0; i<declared; i++) {
+                    log.display("\t>>> field #" + i);
+
+                    long fieldID = reply.getFieldID();
+                    log.display("\t\tfieldID: " + fieldID);
+
+                    String name = reply.getString();
+                    log.display("\t\tname: " + name);
+                    if (!name.equals(fields[i][0])) {
+                        log.complain("TEST FAILED: Unexpected name of field #" + i
+                            + " in the reply packet:"
+                            + "\n\tGot: " + name
+                            + "\n\tExpected: " + fields[i][0] + "\n");
+                        result = false;
+                    }
+
+                    String signature = reply.getString();
+                    log.display("\t\tsignature: " + signature);
+                    if (!signature.equals(fields[i][1])) {
+                        log.complain("TEST FAILED: Unexpected type signature of field #" + i
+                            + " in the reply packet:"
+                            + "\n\tGot: " + signature
+                            + "\n\tExpected: " + fields[i][1] + "\n");
+                        result = false;
+                    }
+
+                    String genSignature = reply.getString();
+                    log.display("\t\tgeneric signature: " + genSignature);
+                    if (genSignature.length() == 0) // a non-generic field
+                        genSignature = "NULL";
+                    if (!genSignature.equals(fields[i][2])) {
+                        log.complain("TEST FAILED: Unexpected generic signature of field #" + i
+                            + " in the reply packet:"
+                            + "\n\tGot: " + genSignature
+                            + "\n\tExpected: " + fields[i][2] + "\n");
+                        result = false;
+                    }
+
+                    int modBits = reply.getInt();
+                    String modBitsString = "0x" + Packet.toHexString(modBits, 8);
+                    log.display("\t\tmodBits: " + modBitsString);
+                }
+
+                if (!reply.isParsed()) {
+                    log.complain("TEST FAILED: Extra trailing bytes found in reply packet at: "
+                        + reply.currentPosition());
+                    result = false;
+                } else
+                    log.display("\nReply packet parsed");
+                /////// end test of JDWP command
+
+            } catch (Exception e) {
+                e.printStackTrace(out);
+                log.complain("Caught exception while testing JDWP command: "
+                    + e);
+                result = false;
+            } finally {
+                log.display("Sending command: " + COMMAND_QUIT + " ...");
+                pipe.println(COMMAND_QUIT);
+
+                log.display("Waiting for debuggee exits ...");
+                int code = debuggee.waitFor();
+                if (code == Consts.JCK_STATUS_BASE + Consts.TEST_PASSED) {
+                    log.display(" ... Debuggee PASSED with the exit code: "
+                        + code);
+                } else {
+                    log.complain(" ... Debuggee FAILED with the exit code: "
+                        + code);
+                    result = false;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while communicating with debugee: "
+                + e);
+            result = false;
+        }
+
+        if (!result)
+            return Consts.TEST_FAILED;
+
+        return Consts.TEST_PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001/TestDescription.java
new file mode 100644
index 00000000000..93dd4cd4bb7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001/TestDescription.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         JDWP command set: ReferenceType
+ *         JDWP command: FieldsWithGeneric
+ *     It checks that the command returns generic signature information
+ *     properly.
+ *     Debuggee part of the test contains several tested fields. Some of them
+ *     are generic including the inherited fields. Debugger part obtains
+ *     information for each field in a reference type of a tested class.
+ *     Proper generic signature should be returned for the generic fields, or
+ *     NULL for non-generic ones. Information for the inherited fields should
+ *     not be returned.
+ * COMMENTS
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.FieldsWithGeneric.fldwithgeneric001
+ *        nsk.jdwp.ReferenceType.FieldsWithGeneric.fldwithgeneric001t
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.FieldsWithGeneric.fldwithgeneric001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001t.java
new file mode 100644
index 00000000000..08af0eb4028
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001t.java
@@ -0,0 +1,110 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.FieldsWithGeneric;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class fldwithgeneric001t {
+    public static void main(String args[]) {
+        ArgumentHandler argHandler = new ArgumentHandler(args);
+        Log log = new Log(System.err, argHandler);
+        IOPipe pipe = argHandler.createDebugeeIOPipe(log);
+
+        // load a tested class
+        fldwithgeneric001a _fldwithgeneric001a =
+            new fldwithgeneric001a();
+
+        log.display("Debuggee VM started\nSending command: "
+            + fldwithgeneric001.COMMAND_READY);
+        pipe.println(fldwithgeneric001.COMMAND_READY);
+
+        log.display("Waiting for command: "
+            + fldwithgeneric001.COMMAND_QUIT + " ...");
+        String cmd = pipe.readln();
+        log.display(" ... Received command: " + cmd
+            + "\nDebuggee is exiting ...");
+
+        System.exit(Consts.JCK_STATUS_BASE + Consts.TEST_PASSED);
+    }
+}
+
+/*
+ * Dummy classes used only for verifying generic signature information
+ * in a debugger.
+ */
+
+class fldwithgeneric001b<L extends String> {}
+
+class fldwithgeneric001c<A, B extends Integer> {}
+
+interface fldwithgeneric001if<I> {}
+
+class fldwithgeneric001d<T> implements fldwithgeneric001if<T> {}
+
+class fldwithgeneric001e {}
+
+class fldwithgeneric001f extends fldwithgeneric001e implements fldwithgeneric001if {}
+
+class fldwithgeneric001g<E extends fldwithgeneric001e & fldwithgeneric001if> {}
+
+class fldwithgeneric001h {
+    // dummy fields to be inherited. They must not be included into
+    // information for reference type fields.
+    public fldwithgeneric001 _fldwithgeneric001h =
+        new fldwithgeneric001();
+    public fldwithgeneric001b<String> _fldwithgeneric001bh =
+        new fldwithgeneric001b<String>();
+}
+
+class fldwithgeneric001a extends fldwithgeneric001h {
+    // dummy fields used for testing
+    public static fldwithgeneric001 _fldwithgeneric001St =
+        new fldwithgeneric001();
+    fldwithgeneric001b<String> _fldwithgeneric001b =
+        new fldwithgeneric001b<String>();
+    static fldwithgeneric001b<String> _fldwithgeneric001bSt =
+        new fldwithgeneric001b<String>();
+    fldwithgeneric001c<Boolean, Integer> _fldwithgeneric001c =
+        new fldwithgeneric001c<Boolean, Integer>();
+    static fldwithgeneric001c<Boolean, Integer> _fldwithgeneric001cSt =
+        new fldwithgeneric001c<Boolean, Integer>();
+    fldwithgeneric001e _fldwithgeneric001e =
+        new fldwithgeneric001e();
+    static fldwithgeneric001e _fldwithgeneric001eSt =
+        new fldwithgeneric001e();
+    fldwithgeneric001if<Object> _fldwithgeneric001if =
+        new fldwithgeneric001d<Object>();
+    static fldwithgeneric001if<Object> _fldwithgeneric001ifSt =
+        new fldwithgeneric001d<Object>();
+    fldwithgeneric001g<fldwithgeneric001f> _fldwithgeneric001g =
+        new fldwithgeneric001g<fldwithgeneric001f>();
+    static fldwithgeneric001g<fldwithgeneric001f> _fldwithgeneric001gSt =
+        new fldwithgeneric001g<fldwithgeneric001f>();
+    fldwithgeneric001g[] _fldwithgeneric001gArr =
+        new fldwithgeneric001g[]{};
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001.java
new file mode 100644
index 00000000000..0d35a81873a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001.java
@@ -0,0 +1,402 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.GetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ReferenceType.GetValues.
+ *
+ * See getvalues001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class getvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.GetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "getvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ReferenceType.GetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.GetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // nested classes names and signatures array
+    static final Object fields [][] = {
+                    { "booleanValue", "boolean",  new Boolean(true),           "own"},
+                    { "byteValue",    "byte",     new Byte((byte)0x0F),        "own"},
+                    { "charValue",    "char",     new Character('Z'),          "own"},
+                    { "intValue",     "int",      new Integer(100),            "own"},
+                    { "shortValue",   "short",    new Short((short)10),        "own"},
+                    { "longValue",    "long",     new Long((long)1000000),     "own"},
+                    { "floatValue",   "float",    new Float((float)3.14),      "own"},
+                    { "doubleValue",  "double",   new Double((double)2.8e-12), "own"},
+                    { "objectValue",  "objectID", new Long((long)0),           "own"},
+
+                };
+    static final int FIELDS_COUNT = fields.length;
+
+    // field ID's for tested class static fields
+    static final long[] fieldIDs = new long[FIELDS_COUNT];
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new getvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got TypeID: " + typeID);
+
+                // query debugee for fieldIDs of tested class static fields
+                log.display("Getting fieldIDs for static fields of the tested class");
+                queryClassFieldIDs(typeID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(typeID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            e.printStackTrace(out);
+            success = false;
+        } catch (Exception e) {
+            log.complain("Caught unexpected exception:\n" + e);
+            e.printStackTrace(out);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received form debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debugee for TypeIDs for nested classes from nested_classes array
+     * and put them into nested_classesIDs array.
+     */
+    void queryClassFieldIDs(long typeID) {
+        for (int i = 0; i < FIELDS_COUNT; i++) {
+            fieldIDs[i] = 0;
+        }
+
+        int count = 0;
+        try {
+            CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+            command.addReferenceTypeID(typeID);
+            command.setLength();
+
+            ReplyPacket reply = debugee.receiveReplyFor(command);
+            reply.resetPosition();
+
+            long declared = reply.getInt();
+            log.display("  declared: " + declared);
+
+            for (int i = 0; i < declared; i++ ) {
+                long fieldID = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                boolean found = false;
+                for (int j = 0; j < FIELDS_COUNT; j++) {
+                    if (fields[j][0].equals(name)) {
+                        if (fieldIDs[j] != 0) {
+                            throw new Failure("Duplicated field name of the tested class returned: " + name);
+                        }
+                        fieldIDs[j] = fieldID;
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found) {
+                    throw new Failure("Unexpected field of the tested class returned: " + name);
+                }
+            }
+
+            if (declared < FIELDS_COUNT) {
+                throw new Failure("Too few fields of the tested class returned: " + declared
+                                    + " (expected: " + FIELDS_COUNT + ")");
+            }
+
+            if (declared > FIELDS_COUNT) {
+                throw new Failure("Too many fields of the tested class returned: " + declared
+                                    + " (expected: " + FIELDS_COUNT + ")");
+            }
+
+            if (!reply.isParsed()) {
+                throw new Failure("Extra trailing bytes found in the reply packet at: "
+                                    + reply.currentPosition());
+            }
+
+        } catch (BoundException e) {
+            throw new Failure("Unable to extract field IDs from the reply packet:\n"
+                            + e.getMessage());
+        }
+    }
+
+    /**
+     * Extract and check i-th value from the reply packet.
+     */
+    void checkValue(int i, JDWP.Value value) {
+        if (!fields[i][2].equals(value.getValue())) {
+            log.complain("Unexpected value for " + i + " field in reply packet: " + value
+                            + " (expected value: " + fields[i][2] + ")");
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long typeID) {
+        // create command packet
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        // add out data to the command packet
+        log.display("  refType: " + typeID);
+        command.addReferenceTypeID(typeID);
+        log.display("  fields: " + FIELDS_COUNT);
+        command.addInt(FIELDS_COUNT);
+        for (int i = 0; i < FIELDS_COUNT; i++) {
+            log.display("  #" + i +": fieldID: " + fieldIDs[i]);
+            command.addFieldID(fieldIDs[i]);
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet: " + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check number of values
+        int values = 0;
+        try {
+            values = reply.getInt();
+            log.display("  values: " + values);
+
+            if (values != FIELDS_COUNT) {
+                log.complain("Unexpected number of values in the reply packet:" + values
+                            + " (expected: " + FIELDS_COUNT + ")");
+                success = false;
+            }
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of values form reply packet:\n" + e.getMessage());
+            success = false;
+        }
+
+        // extract and check TypeID for each nested class
+        for (int i = 0; i < values; i++ ) {
+            log.display("  value #" + i + " (field: " + fields[i][0] + ")");
+
+            // extract TypeTag byte
+            JDWP.Value value = null;
+            try {
+                value = reply.getValue();
+                log.display("    value: " + value);
+            } catch (BoundException e) {
+                log.complain("Unable to extract type tag of " + i + " value:\n" + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // extract and check value by known type tag
+            checkValue(i, value);
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + "0x" + reply.toHexString(reply.currentDataPosition(), 4));
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001/TestDescription.java
new file mode 100644
index 00000000000..9ea4cdb73a9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001/TestDescription.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/GetValues/getvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: GetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the returned values of requested fields are equal to
+ *     the expected ones.
+ *     Test consists of two compoments:
+ *         debugger: getvalues001
+ *         debuggee: getvalues001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization messages.
+ *     Next, debugger obtains ReferenceTypeIDs for the tested class from
+ *     debugee, and obtains also fieldIDs for all tested fields of this class.
+ *     Then, debugger creates command packet for GetValues command with the
+ *     found referenceTypeID and list of fieldIDs as arguments, writes packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts values of the requested fields. Also test checks
+ *     that extracted values are equal to the expected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.GetValues.getvalues001
+ *        nsk.jdwp.ReferenceType.GetValues.getvalues001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.GetValues.getvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001a.java
new file mode 100644
index 00000000000..0d7627544fc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001a.java
@@ -0,0 +1,86 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.GetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class getvalues001a {
+
+    public static void main(String args[]) {
+        getvalues001a _getvalues001a = new getvalues001a();
+        System.exit(getvalues001.JCK_STATUS_BASE + _getvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // meke communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + getvalues001.READY);
+        pipe.println(getvalues001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + getvalues001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(getvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + getvalues001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return getvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return getvalues001.PASSED;
+    }
+
+    // tested class with own static fields values
+    public static class TestedClass {
+        private   static boolean       booleanValue = true;
+        private   static final byte    byteValue    = (byte)0x0F;
+        protected static char          charValue    = 'Z';
+        protected static final int     intValue     = 100;
+        public    static short         shortValue   = (short)10;
+        public    static final long    longValue    = (long)1000000;
+                  static float         floatValue   = (float)3.14;
+                  static final double  doubleValue  = (double)2.8e-12;
+                  static TestedClass   objectValue  = null;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001.java
new file mode 100644
index 00000000000..a40b5fa65a7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Instances/instances001.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Instances
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: instances001
+ *         debuggee: instances001a
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     For maxInstances in [1, 0, Interger.MAX_VALUE]
+ *     do
+ *         Debugger obtains referenceTypeID for 'nsk.share.jdwp.ReferenceType.instances.instances001.TestClass'.
+ *         Then, debugger creates command packet for Instances command with the
+ *         found referenceTypeID and maxInstances as an arguments, writes packet to the transport
+ *         channel, and waits for a reply packet.
+ *         When reply packet is received, debugger parses the packet structure
+ *         and extracts number of instances and instance's ids.
+ *         Debugger checks that received number of instances is correct:
+ *             - if maxInstances=1 only 1 instance should be returned
+ *             - if maxInstances=0 or maxInstances=Integer.MAX_VALUE all instances should be returned
+ *     done
+ *     Also, test performs checks for cases when incorrect data is sent in command.
+ *     Following cases are tested:
+ *         - create command with maxInstances < 0, expect ILLEGAL_ARGUMENT error
+ *         - create command with typeID = -1, expect INVALID_OBJECT error
+ *         - create command with threadID instead of referenceTypeID, expect INVALID_CLASS error
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @requires vm.gc != "Z"
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Instances.instances001.instances001
+ * @run main/othervm/native PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Instances.instances001.instances001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ReferenceType.Instances.instances001;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+import nsk.share.jpda.AbstractDebuggeeTest;
+
+public class instances001 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return nsk.jdwp.ReferenceType.Instances.instances001.instances001a.class.getName();
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new instances001().runIt(argv, out);
+    }
+
+    private void testClass(long typeID, int maxInstances, int expectedInstances, boolean expectError, int errorCode) {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Instances;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("referenceType = " + typeID);
+            log.display("maxInstances = " + maxInstances);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addReferenceTypeID(typeID);
+            command.addInt(maxInstances);
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command, expectError, errorCode);
+
+            if (expectError)
+                return;
+
+            int instances = reply.getInt();
+            log.display("instances = " + instances);
+
+            // check that correct value of 'instances' was received
+            if (instances != expectedInstances) {
+                setSuccess(false);
+                log.complain("Unexpected 'instances' value: " + instances + ", expected is " + expectedInstances);
+            }
+
+            for (int i = 0; i < instances; i++) {
+                JDWP.Value value = reply.getValue();
+                log.display("tagged-ObjectID = " + value);
+            }
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        // force GC in debuggee VM to avoid collection of weak references during test execution
+        forceGC();
+        pipe.println(instances001a.COMMAND_CREATE_TEST_INSTANCES);
+
+        if (!isDebuggeeReady())
+            return;
+
+        int expectedInstances = instances001a.expectedCount;
+
+        String testClassName = nsk.jdwp.ReferenceType.Instances.instances001.TestClass.class.getName();
+
+        long typeID = debuggee.getReferenceTypeID(createTypeSignature(testClassName));
+
+        // Note! This test is broken, in the sense that it incorrectly assumes
+        // that no GC can happen before it walks the heap. In practice, it seems
+        // to only affect this test when using ZGC. However, this test will also
+        // fail when using other GCs if an explicit GC is done here.
+
+        // create command with maxInstances=1, only 1 instance should be returned
+        testClass(typeID, 1, 1, false, 0);
+        // create command with maxInstances=0, all instances should be returned
+        testClass(typeID, 0, expectedInstances, false, 0);
+        // create command with maxInstances=Integer.MAX_VALUE, all instances should be returned
+        testClass(typeID, Integer.MAX_VALUE, expectedInstances, false, 0);
+
+        // create command with maxInstances < 0, expect ILLEGAL_ARGUMENT error
+        testClass(typeID, -1, expectedInstances, true, JDWP.Error.ILLEGAL_ARGUMENT);
+
+        // create command with typeID = 1, expect INVALID_OBJECT error
+        testClass(-1, Integer.MAX_VALUE, expectedInstances, true, JDWP.Error.INVALID_OBJECT);
+
+        // create command with threadID instead of referenceTypeID, expect INVALID_CLASS error
+        testClass(debuggee.getThreadID("main"), Integer.MAX_VALUE, expectedInstances, true, JDWP.Error.INVALID_CLASS);
+
+        // if GC occurs during test the results should be ignored
+        resetStatusIfGC();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001a.java
new file mode 100644
index 00000000000..be05693768b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001a.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ReferenceType.Instances.instances001;
+
+import java.util.ArrayList;
+import nsk.share.ReferringObjectSet;
+import nsk.share.jdi.HeapwalkingDebuggee;
+import nsk.share.jdwp.AbstractJDWPDebuggee;
+
+class TestClass {
+
+}
+
+public class instances001a extends AbstractJDWPDebuggee {
+    public static final int expectedCount = HeapwalkingDebuggee.includedIntoInstancesCountTypes.size();
+
+    private ArrayList<ReferringObjectSet> referrers = new ArrayList<ReferringObjectSet>();
+
+    public static final String COMMAND_CREATE_TEST_INSTANCES = "COMMAND_CREATE_TEST_INSTANCES";
+
+    public boolean parseCommand(String command) {
+        if (super.parseCommand(command))
+            return true;
+
+        if (command.equals(COMMAND_CREATE_TEST_INSTANCES)) {
+            // create object instances reachable via references with types which should be supported by command ReferenceType.Instances
+            for (String referenceType : HeapwalkingDebuggee.includedIntoInstancesCountTypes) {
+                referrers.add(new ReferringObjectSet(new TestClass(), 1, referenceType));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void main(String args[]) {
+        new instances001a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002.java
new file mode 100644
index 00000000000..3d55f9453a4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Instances/instances002.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Instances
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: instances002
+ *         debuggee: instances002a
+ *     Debuggee contains 5 static fields with names instance1, ..., instance5 initialized with
+ *     different instances of 'nsk.jdwp.ReferenceType.Instances.instances002.TestClass' and
+ *     there are no more instances of 'nsk.jdwp.ReferenceType.Instances.instances002.TestClass' in debugee VM.
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Debugger obtains referenceTypeID for 'nsk.jdwp.ReferenceType.Instances.instances002.TestClass'.
+ *     Then, debugger creates command packet for Instances command with the
+ *     found referenceTypeID and maxInstances as an arguments, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts number of instances and instance's ids.
+ *     Debugger checks that received number of instances is correct.
+ *     Debugger obtains objectIDs for object instances stored in debuggee's fields instance1, ..., instance5
+ *     and checks that this values and instances ids received via JDWP command are identical.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Instances.instances002.instances002
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Instances.instances002.instances002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ReferenceType.Instances.instances002;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+
+public class instances002 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return nsk.jdwp.ReferenceType.Instances.instances002.instances002a.class.getName();
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new instances002().runIt(argv, out);
+    }
+
+    private void testClass(String className, int maxInstances, int expectedInstances) {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Instances;
+
+            long typeID = debuggee.getReferenceTypeID(className);
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("referenceType = " + typeID);
+            log.display("maxInstances = " + maxInstances);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addReferenceTypeID(typeID);
+            command.addInt(maxInstances);
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command);
+
+            int instances = reply.getInt();
+            log.display("instances = " + instances);
+
+            // check that correct value of 'instances' was received
+            if (instances != expectedInstances) {
+                setSuccess(false);
+                log.complain("Unexpected 'instances' value: " + instances + ", expected is " + expectedInstances);
+            }
+
+            long expectedInstancesID[] = new long[expectedInstances];
+
+            // initialize expected IDs of instances
+            for (int i = 0; i < expectedInstances; i++) {
+                expectedInstancesID[i] = queryObjectID(debuggee.getReferenceTypeID(createTypeSignature(getDebugeeClassName())), "instance" + (i + 1),
+                        JDWP.Tag.OBJECT);
+            }
+
+            long receivedInstancesID[] = new long[instances];
+
+            for (int i = 0; i < instances; i++) {
+                JDWP.Value value = reply.getValue();
+                log.display("tagged-ObjectID = " + value);
+
+                receivedInstancesID[i] = ((Long) value.getValue()).longValue();
+            }
+
+            // check that correct IDs of instances was received
+            for (int i = 0; i < instances; i++) {
+                boolean isIDExpected = false;
+
+                for (int j = 0; j < expectedInstancesID.length; j++) {
+                    if (receivedInstancesID[i] == expectedInstancesID[j]) {
+                        isIDExpected = true;
+                        break;
+                    }
+                }
+
+                if (!isIDExpected) {
+                    setSuccess(false);
+                    log.complain("Unexpected 'instance' value: " + receivedInstancesID[i]);
+                }
+            }
+
+            if (!getSuccess()) {
+                log.complain("Expected IDs:");
+                for (int i = 0; i < expectedInstancesID.length; i++)
+                    log.complain("" + expectedInstancesID[i]);
+            }
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        int expectedInstances = instances002a.expectedInstanceCount;
+
+        String testClassName = nsk.jdwp.ReferenceType.Instances.instances002.TestClass.class.getName();
+        testClass(createTypeSignature(testClassName), 0, expectedInstances);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002a.java
new file mode 100644
index 00000000000..0875f9d346f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002a.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ReferenceType.Instances.instances002;
+
+import nsk.share.jdwp.*;
+
+class TestClass {
+
+}
+
+public class instances002a extends AbstractJDWPDebuggee {
+    public static final int expectedInstanceCount = 5;
+
+    public static TestClass instance1 = new TestClass();
+
+    public static TestClass instance2 = new TestClass();
+
+    public static TestClass instance3 = new TestClass();
+
+    public static TestClass instance4 = new TestClass();
+
+    public static TestClass instance5 = new TestClass();
+
+    public static void main(String args[]) {
+        new instances002a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001.java
new file mode 100644
index 00000000000..e7e06473d7b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001.java
@@ -0,0 +1,197 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Interfaces;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class interfaces001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.Interfaces";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "interfaces001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.Interfaces";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Interfaces;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    static final String class_interfaces [][] = {
+                    { DEBUGEE_CLASS_NAME + "$" + "TestedClassInterface1", "" },
+                    { DEBUGEE_CLASS_NAME + "$" + "TestedClassInterface2", "" }
+                };
+    static final int DECLARED_INTERFACES = class_interfaces.length;
+    static final long interfaceIDs[] = new long[DECLARED_INTERFACES];
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new interfaces001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+
+                    log.display("Getting ReferenceTypeID for class signature: " + TESTED_CLASS_SIGNATURE);
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    for (int i = 0; i < DECLARED_INTERFACES; i++) {
+                        class_interfaces[i][1] = "L" + class_interfaces[i][0].replace('.', '/') + ";";
+                        log.display("Getting ReferenceTypeID for interface signature: " + class_interfaces[i][1]);
+                        interfaceIDs[i] = debugee.getReferenceTypeID(class_interfaces[i][1]);
+                    }
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int interfaces = reply.getInt();
+                    log.display("  interfaces: " + interfaces);
+
+                    if (interfaces != DECLARED_INTERFACES) {
+                        log.complain("Unexpected number of declared interfaces in the reply packet:" + interfaces
+                                    + " (expected: " + DECLARED_INTERFACES + ")");
+                        success = false;
+                    }
+
+                    for (int i = 0; i < interfaces; i++ ) {
+
+                        log.display("  interface #" + i);
+
+                        long interfaceID = reply.getReferenceTypeID();
+                        log.display("    interfaceID: " + interfaceID);
+
+                        if (interfaceID != interfaceIDs[i]) {
+                            log.complain("Unexpected interface ID for interface #" + i + " in the reply packet: " + interfaceID
+                                        + " (expected: " + interfaceIDs[i] + ")");
+                            success = false;
+                        }
+
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001/TestDescription.java
new file mode 100644
index 00000000000..67d205e1616
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Interfaces/interfaces001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Interfaces
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test check that
+ *     returned InterfaceIDs are equal to the ReferenceTypeIDs
+ *     queried for these interfaces.
+ *     Test consists of two compoments:
+ *         debugger: interfaces001
+ *         debuggee: interfaces001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains ReferenceTypeID for tested class, which
+ *     will be used to test JDWP command. Also it obtains ReferenceTypeIDs
+ *     for all interfaces of that class.
+ *     Then, debugger creates command packet for Interfaces command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts interfaces IDs. Also it checks that extracted InterfaceIDs
+ *     are equal to expected ReferenceTypeIDs.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Interfaces.interfaces001
+ *        nsk.jdwp.ReferenceType.Interfaces.interfaces001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Interfaces.interfaces001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001a.java
new file mode 100644
index 00000000000..c7495efa723
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001a.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Interfaces;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class interfaces001a {
+
+    public static void main(String args[]) {
+        interfaces001a _interfaces001a = new interfaces001a();
+        System.exit(interfaces001.JCK_STATUS_BASE + _interfaces001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return interfaces001.PASSED;
+    }
+
+    static public interface TestedClassInterface1 {
+        public int methodOfInterface1(int x);
+    }
+
+    static public interface TestedClassInterface2 {
+        public byte methodOfInterface2(byte b);
+    }
+
+    static class TestedClass implements TestedClassInterface1, TestedClassInterface2 {
+//    static class TestedClass implements TestedClassInterface1 {
+        int foo = 0;
+        public int methodOfInterface1(int x) { return x; }
+        public byte methodOfInterface2(byte b) { return b; }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001.java
new file mode 100644
index 00000000000..22e656e1f41
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001.java
@@ -0,0 +1,222 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Methods;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class methods001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.Methods";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "methods001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.Methods";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Methods;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    static final String[][] methods = {
+                    {"<init>", "()V"},
+                    {"byteMethod", "(B)B"},
+                    {"booleanMethod", "()Z"},
+                    {"charMethod", "(B)C"},
+                    {"shortMethod", "(SS)S"},
+                    {"intMethod", "(IS)I"},
+                    {"longMethod", "(I)J"},
+                    {"floatMethod", "(D)F"},
+                    {"doubleMethod", "()D"},
+                    {"stringMethod", "(Ljava/lang/String;C)Ljava/lang/String;"},
+                    {"objectMethod",  "()" + TESTED_CLASS_SIGNATURE},
+                    {"intArrayMethod", "(I)[I"},
+                    {"<init>", "(Z)V"}
+                 };
+    static final int DECLARED_METHODS = methods.length;
+    static final int METHOD_MODIFIER_FLAGS = JDWP.ModifierFlag.PUBLIC;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new methods001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    long declared = reply.getInt();
+                    log.display("  declared: " + declared);
+
+                    if (declared != DECLARED_METHODS) {
+                        log.complain("Unexpected number of declared methods in the reply packet" + declared
+                                    + " (expected: " + DECLARED_METHODS + ")");
+                        success = false;
+                    }
+
+                    for (int i = 0; i < declared; i++ ) {
+
+                        log.display("  method #" + i);
+
+                        long methodID = reply.getMethodID();
+                        log.display("    methodID: " + methodID);
+
+                        String name = reply.getString();
+                        log.display("    name: " + name);
+                        if (! name.equals(methods[i][0])) {
+                            log.complain("Unexpected name of method #" + i + " in the reply packet: " + name
+                                        + " (expected: " + methods[i][0] + ")");
+                            success = false;
+                        }
+
+                        String signature = reply.getString();
+                        log.display("    signature: " + signature);
+                        if (! signature.equals(methods[i][1])) {
+                            log.complain("Unexpected signature of method #" + i + " in the reply packet: " + signature
+                                        + " (expected: " + methods[i][1] + ")");
+                            success = false;
+                        }
+
+                        int modBits = reply.getInt();
+                        String modBitsString = "0x" + Packet.toHexString(modBits, 8);
+                        log.display("    modBits: " + modBitsString);
+                        modBits &= JDWP.ModifierFlag.METHOD_MASK;
+                        if (modBits != METHOD_MODIFIER_FLAGS) {
+                            String expectedModBitsString = "0x" + Packet.toHexString(METHOD_MODIFIER_FLAGS, 8);
+                            log.complain("Unexpected modifier flags of method #" + i + " in the reply packet: " + modBitsString
+                                        + " (expected: " + expectedModBitsString + ")");
+                            success = false;
+                        }
+
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001/TestDescription.java
new file mode 100644
index 00000000000..dc744bcff89
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Methods/methods001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Methods
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     reply contains expected set of fields.
+ *     Test consists of two compoments:
+ *         debugger: methods001
+ *         debuggee: methods001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class, which
+ *     will be used to test JDWP command.
+ *     Then, debugger creates command packet for Methods command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts fields info. Test checks that all fields are equal to
+ *     expected.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Methods.methods001
+ *        nsk.jdwp.ReferenceType.Methods.methods001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Methods.methods001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001a.java
new file mode 100644
index 00000000000..6f7e1c0c67a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001a.java
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Methods;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class methods001a {
+
+    public static void main(String args[]) {
+        methods001a _methods001a = new methods001a();
+        System.exit(methods001.JCK_STATUS_BASE + _methods001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return methods001.PASSED;
+    }
+
+    static class TestedClass {
+        public TestedClass() {}
+        public byte byteMethod(byte b) { return b; }
+        public boolean booleanMethod() { return true; }
+        public char charMethod(byte b) { return (char) b; }
+        public short shortMethod(short x, short y) { return (short) (x - y); }
+        public int intMethod(int x, short y) { return x - y; }
+        public long longMethod(int x) { return (long) x; }
+        public float floatMethod(double x) { return (float) x; }
+        public double doubleMethod() { return 2.48e-10; }
+        public String stringMethod(String s, char ch) { return s + ch; };
+        public TestedClass objectMethod() { return this; }
+        public int[] intArrayMethod(int n) { return new int[n]; };
+        public TestedClass(boolean b) {}
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001.java
new file mode 100644
index 00000000000..e2e633222b3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001.java
@@ -0,0 +1,283 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.MethodsWithGeneric;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * This test checks that the JDWP command <code>MethodsWithGeneric</code>
+ * from the <code>ReferenceType</code> command set returns generic signature
+ * information properly.<br>
+ * Debuggee part of the test creates instances of several tested classes with
+ * methods to be checked. Some of the classes are generic and accordingly
+ * contain generic methods. Debugger part obtains information for each method
+ * in a reference type of a tested class. Proper generic signature should be
+ * returned for the generic methods, or an empty string for non-generic ones.
+ */
+public class methwithgeneric001 {
+    static final String DEBUGGEE_CLASS =
+        "nsk.jdwp.ReferenceType.MethodsWithGeneric.methwithgeneric001t";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.MethodsWithGeneric";
+    static final int JDWP_COMMAND_ID =
+        JDWP.Command.ReferenceType.MethodsWithGeneric;
+
+    static final String COMMAND_READY = "ready";
+    static final String COMMAND_QUIT = "quit";
+
+    static final String[][][] methods = {
+       {{"<init>",
+            "()V",
+            "NULL"},
+        {"methwithgeneric001bMeth",
+            "(Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b;)Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b;",
+            "<L:Ljava/lang/String;>(Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b<TL;>;)Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b<Ljava/lang/String;>;"},
+        {"methwithgeneric001bMethSt",
+            "(Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b;)Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b;",
+            "<T:Ljava/lang/String;>(Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b<TT;>;)Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b<Ljava/lang/String;>;"}},
+
+       {{"<init>",
+            "()V",
+            "NULL"},
+        {"methwithgeneric001cMeth",
+            "(Ljava/lang/Class;)Ljava/lang/Object;",
+            "<U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;)TU;"},
+         {"methwithgeneric001cMethSt",
+            "(Ljava/lang/Class;)Ljava/lang/Object;",
+            "<U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;)TU;"}},
+
+       {{"<init>",
+            "()V",
+            "NULL"},
+        {"methwithgeneric001eMeth",
+           "(Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001e;)V",
+           "NULL"},
+        {"methwithgeneric001eMethSt",
+           "(Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001e;)V",
+           "NULL"}},
+
+       {{"methwithgeneric001ifMeth",
+            "()I",
+            "NULL"},
+        {"methwithgeneric001ifMeth2",
+            "(Ljava/lang/Object;)I",
+            "<I:Ljava/lang/Object;>(TI;)I"}},
+
+       {{"<init>",
+            "()V",
+            "NULL"},
+        {"methwithgeneric001gMeth",
+            "(Ljava/lang/Byte;Ljava/lang/Double;[Ljava/lang/Class;)V",
+            "<A:Ljava/lang/Byte;B:Ljava/lang/Double;>(TA;TB;[Ljava/lang/Class<*>;)V"},
+        {"methwithgeneric001gMethSt",
+            "(Ljava/lang/Byte;Ljava/lang/Double;)V",
+            "<A:Ljava/lang/Byte;B:Ljava/lang/Double;>(TA;TB;)V"}}
+    };
+
+    static final String[][] classes = {
+        {"Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001b;", "3"},
+        {"Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001c;", "3"},
+        {"Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001e;", "3"},
+        {"Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001if;", "2"},
+        {"Lnsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001g;", "3"}
+    };
+
+    static final int CLS_NUM = classes.length;
+
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new methwithgeneric001().runThis(argv, out);
+    }
+
+    public int runThis(String argv[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+        Log log = new Log(out, argumentHandler);
+        boolean result = true;
+
+        try {
+            Binder binder = new Binder(argumentHandler, log);
+
+            log.display("Starting debuggee VM ...");
+            Debugee debuggee = binder.bindToDebugee(DEBUGGEE_CLASS);
+
+            Transport transport = debuggee.getTransport();
+            IOPipe pipe = debuggee.createIOPipe();
+
+            log.display("Waiting for VM_INIT event ...");
+            debuggee.waitForVMInit();
+
+            log.display("Querying for IDSizes ...");
+            debuggee.queryForIDSizes();
+
+            log.display("Resuming debuggee VM ...");
+            debuggee.resume();
+
+            log.display("Waiting for command: " + COMMAND_READY
+                + " ...");
+            String cmd = pipe.readln();
+            log.display(" ... Received command: " + cmd);
+
+            try {
+                for (int i=0; i<CLS_NUM; i++) {
+                    long typeID = debuggee.getReferenceTypeID(classes[i][0]);
+
+                    /////// begin test of JDWP command
+                    log.display("\n>>>>>> Create command " + JDWP_COMMAND_NAME
+                        + "\n\twith ReferenceTypeID: " + typeID
+                        + "\n\tof the class: " + classes[i][0]);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("\nWaiting for reply packet ...");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display(" ... Reply packet received:\n" + reply);
+
+                    log.display("\nChecking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                 /* parsing of reply data:
+                     int declared - Number of declared methods
+
+                     ---- Repeated 'declared' times:
+                     methodID methodID - Method ID
+                     string nam - The name of the field
+                     string signature - The JNI signature of the field.
+                     string genericSignature - The generic signature of the field,
+                                                 or an empty string if there is none.
+                     int modBits - The modifier bit flags (also known as access flags)
+                     ----
+                 */
+                    log.display("\nParsing reply packet:");
+                    reply.resetPosition();
+
+                    long declared = reply.getInt();
+                    log.display("\tdeclared: " + declared);
+                    int meth_num = Integer.parseInt(classes[i][1]);
+                    if (declared != meth_num) {
+                        log.complain("TEST FAILED: Unexpected number of declared methods in the reply packet:"
+                            + "\n\tGot: " + declared
+                            + "\n\tExpected: " + meth_num + "\n");
+                        result = false;
+                    }
+
+                    for (int j=0; j<declared; j++) {
+                        log.display("\t--> method #" + j);
+
+                        long methodID = reply.getMethodID();
+                        log.display("\t\tmethodID: " + methodID);
+
+                        String name = reply.getString();
+                        log.display("\t\tname: " + name);
+                        if (!name.equals(methods[i][j][0])) {
+                            log.complain("TEST FAILED: Unexpected name of method #" + i
+                                + " in the reply packet:"
+                                + "\n\tGot: " + name
+                                + "\n\tExpected: " + methods[i][j][0] + "\n");
+                            result = false;
+                        }
+
+                        String signature = reply.getString();
+                        log.display("\t\tsignature: " + signature);
+                        if (!signature.equals(methods[i][j][1])) {
+                            log.complain("TEST FAILED: Unexpected type signature of field #" + i
+                                + " in the reply packet:"
+                                + "\n\tGot: " + signature
+                                + "\n\tExpected: " + methods[i][j][1] + "\n");
+                            result = false;
+                        }
+
+                        String genSignature = reply.getString();
+                        log.display("\t\tgeneric signature: " + genSignature);
+                        if (genSignature.length() == 0) // a non-generic field
+                            genSignature = "NULL";
+                        if (!genSignature.equals(methods[i][j][2])) {
+                            log.complain("TEST FAILED: Unexpected generic signature of field #" + i
+                                + " in the reply packet:"
+                                + "\n\tGot: " + genSignature
+                                + "\n\tExpected: " + methods[i][j][2] + "\n");
+                            result = false;
+                        }
+
+                        int modBits = reply.getInt();
+                        String modBitsString = "0x" + Packet.toHexString(modBits, 8);
+                        log.display("\t\tmodBits: " + modBitsString);
+                    }
+
+                    if (!reply.isParsed()) {
+                        log.complain("TEST FAILED: Extra trailing bytes found in reply packet at: "
+                            + reply.currentPosition());
+                        result = false;
+                    } else
+                        log.display("\n<<<<<< Reply packet parsed");
+                    /////// end test of JDWP command
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace(out);
+                log.complain("Caught exception while testing JDWP command: "
+                    + e);
+                result = false;
+            } finally {
+                log.display("Sending command: " + COMMAND_QUIT + " ...");
+                pipe.println(COMMAND_QUIT);
+
+                log.display("Waiting for debuggee exits ...");
+                int code = debuggee.waitFor();
+                if (code == Consts.JCK_STATUS_BASE + Consts.TEST_PASSED) {
+                    log.display(" ... Debuggee PASSED with the exit code: "
+                        + code);
+                } else {
+                    log.complain(" ... Debuggee FAILED with the exit code: "
+                        + code);
+                    result = false;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while communicating with debugee: "
+                + e);
+            result = false;
+        }
+
+        if (!result)
+            return Consts.TEST_FAILED;
+
+        return Consts.TEST_PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001/TestDescription.java
new file mode 100644
index 00000000000..0a7201db7c0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001/TestDescription.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         JDWP command set: ReferenceType
+ *         JDWP command: MethodsWithGeneric
+ *     It checks that the command returns generic signature information
+ *     properly.
+ *     Debuggee part of the test creates instances of several tested classes
+ *     with methods to be checked. Some of the classes are generic and
+ *     accordingly contain generic methods. Debugger part obtains information
+ *     for each method in a reference type of a tested class. Proper generic
+ *     signature should be returned for the generic methods, or an empty string
+ *     for non-generic ones.
+ * COMMENTS
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.MethodsWithGeneric.methwithgeneric001
+ *        nsk.jdwp.ReferenceType.MethodsWithGeneric.methwithgeneric001t
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.MethodsWithGeneric.methwithgeneric001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001t.java
new file mode 100644
index 00000000000..f2ab1341d59
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001t.java
@@ -0,0 +1,124 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.MethodsWithGeneric;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class methwithgeneric001t {
+    public static void main(String args[]) {
+        ArgumentHandler argHandler = new ArgumentHandler(args);
+        Log log = new Log(System.err, argHandler);
+        IOPipe pipe = argHandler.createDebugeeIOPipe(log);
+
+        // load tested classes
+        methwithgeneric001b<String> _methwithgeneric001b =
+            new methwithgeneric001b<String>();
+        methwithgeneric001c<Boolean, Integer> _methwithgeneric001c =
+            new methwithgeneric001c<Boolean, Integer>();
+        methwithgeneric001e _methwithgeneric001e =
+            new methwithgeneric001e();
+        methwithgeneric001if<Object> _methwithgeneric001if =
+            new methwithgeneric001d<Object>();
+        methwithgeneric001g<methwithgeneric001f> _methwithgeneric001g =
+            new methwithgeneric001g<methwithgeneric001f>();
+
+        log.display("Debuggee VM started\nSending command: "
+            + methwithgeneric001.COMMAND_READY);
+        pipe.println(methwithgeneric001.COMMAND_READY);
+
+        log.display("Waiting for command: "
+            + methwithgeneric001.COMMAND_QUIT + " ...");
+        String cmd = pipe.readln();
+        log.display(" ... Received command: " + cmd
+            + "\nDebuggee is exiting ...");
+
+        System.exit(Consts.JCK_STATUS_BASE + Consts.TEST_PASSED);
+    }
+}
+
+/*
+ * Dummy classes used only for verifying generic signature information
+ * in a debugger.
+ */
+
+class methwithgeneric001b<L extends String> {
+    <L extends String> methwithgeneric001b<String> methwithgeneric001bMeth(methwithgeneric001b<L> m) {
+        return new methwithgeneric001b<String>();
+    }
+
+    static <T extends String> methwithgeneric001b<String> methwithgeneric001bMethSt(methwithgeneric001b<T> m) {
+        return new methwithgeneric001b<String>();
+    }
+}
+
+class methwithgeneric001c<A, B extends Integer> {
+    public <U> U methwithgeneric001cMeth(Class<U> klass) throws Exception {
+        return klass.newInstance();
+    }
+
+    static public <U> U methwithgeneric001cMethSt(Class<U> klass) throws Exception {
+        return klass.newInstance();
+    }
+}
+
+interface methwithgeneric001if<I> {
+    int methwithgeneric001ifMeth();
+
+    <I> int methwithgeneric001ifMeth2(I v);
+}
+
+class methwithgeneric001d<T> implements methwithgeneric001if<T> {
+    public int methwithgeneric001ifMeth() {
+        return 1;
+    }
+
+    public <T> int methwithgeneric001ifMeth2(T v) {
+        return 2;
+    }
+}
+
+class methwithgeneric001e {
+    void methwithgeneric001eMeth(methwithgeneric001e e) {}
+    static void methwithgeneric001eMethSt(methwithgeneric001e e) {}
+}
+
+class methwithgeneric001f extends methwithgeneric001e implements methwithgeneric001if {
+    public int methwithgeneric001ifMeth() {
+        return 3;
+    }
+
+    public int methwithgeneric001ifMeth2(Object v) {
+        return 4;
+    }
+}
+
+class methwithgeneric001g<E extends methwithgeneric001e & methwithgeneric001if> {
+    <A extends Byte, B extends Double> void methwithgeneric001gMeth(A a, B b, Class<?>[] c) {}
+
+    static <A extends Byte, B extends Double> void methwithgeneric001gMethSt(A a, B b) {}
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001.java
new file mode 100644
index 00000000000..92e4f6f6b7c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001.java
@@ -0,0 +1,192 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Modifiers;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class modifiers001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.Modifiers";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "modifiers001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.Modifiers";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Modifiers;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    static final int TESTED_CLASS_MODIFIER_FLAGS = JDWP.ModifierFlag.PUBLIC
+                                                 | JDWP.ModifierFlag.FINAL;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new modifiers001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int modBits = reply.getInt();
+                    String modBitsString = "0x" + Packet.toHexString(modBits, 8);
+                    log.display("  modBits: " + modBitsString);
+
+//                    modBits &= JDWP.ModifierFlag.CLASS_MASK;
+
+                    if ((JDWP.ModifierFlag.PUBLIC & modBits) == 0) {
+                        log.complain("No expected PUBLIC modifier found into class modifier flags in the reply packet: " + modBitsString
+                                    + " (expected: " + Packet.toHexString(JDWP.ModifierFlag.PUBLIC,8) + ")");
+                        success = false;
+                    }
+
+                    if ((JDWP.ModifierFlag.FINAL & modBits) == 0) {
+                        log.complain("No expected FINAL modifier found into class modifier flags in the reply packet: " + modBitsString
+                                    + " (expected: " + Packet.toHexString(JDWP.ModifierFlag.FINAL,8) + ")");
+                        success = false;
+                    }
+
+                    if ((JDWP.ModifierFlag.INTERFACE & modBits) != 0) {
+                        log.complain("Unexpected INTERFACE modifier found into class modifier flags in the reply packet: " + modBitsString
+                                    + " (not expected: " + Packet.toHexString(JDWP.ModifierFlag.INTERFACE,8) + ")");
+                        success = false;
+                    }
+
+                    if ((JDWP.ModifierFlag.ABSTRACT & modBits) != 0) {
+                        log.complain("Unexpected ABSTRACT modifier found into class modifier flags in the reply packet: " + modBitsString
+                                    + " (not expected: " + Packet.toHexString(JDWP.ModifierFlag.ABSTRACT,8) + ")");
+                        success = false;
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001/TestDescription.java
new file mode 100644
index 00000000000..ae6c9e911e6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Modifiers/modifiers001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Modifiers
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     reply contains expected set of class modifiers.
+ *     Test consists of two compoments:
+ *         debugger: modifiers001
+ *         debuggee: modifiers001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class, which
+ *     will be used to test JDWP command.
+ *     Then, debugger creates command packet for Modifiers command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts fields info. Test checks that the received set of class
+ *     modifiers contains expected flags and does not contain unexpected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Modifiers.modifiers001
+ *        nsk.jdwp.ReferenceType.Modifiers.modifiers001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Modifiers.modifiers001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001a.java
new file mode 100644
index 00000000000..af8de46b1cd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001a.java
@@ -0,0 +1,59 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Modifiers;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class modifiers001a {
+
+    public static void main(String args[]) {
+        modifiers001a _modifiers001a = new modifiers001a();
+        System.exit(modifiers001.JCK_STATUS_BASE + _modifiers001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return modifiers001.PASSED;
+    }
+
+    static final public class TestedClass {
+        int foo = 0;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001.java
new file mode 100644
index 00000000000..33e4727bfe8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001.java
@@ -0,0 +1,378 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.NestedTypes;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ReferenceType.NestedTypes.
+ *
+ * See nestedtypes001.README for description of test execution.
+ *
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class nestedtypes001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.NestedTypes";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "nestedtypes001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ReferenceType.NestedTypes";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.NestedTypes;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // nested classes names and signatures array
+    static final String nested_classes [][] = {
+                    { TESTED_CLASS_NAME + "$" + "NestedInterface", "" },
+                    { TESTED_CLASS_NAME + "$" + "StaticNestedClass", "" },
+                    { TESTED_CLASS_NAME + "$" + "InnerNestedClass", "" }
+                };
+    static final int NESTED_CLASSES = nested_classes.length;
+
+    // nested classes IDs array
+    static final long nested_classesIDs[] = new long[NESTED_CLASSES];
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new nestedtypes001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debugee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debugee for TypeID of tested class
+                log.display("Getting ReferenceTypeID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got TypeID: " + typeID);
+
+                // query debugee for TypeIDs of classes been nested
+                log.display("Getting ReferenceTypeIDs for nested classes");
+                queryNestedClassesTypeIDs();
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(typeID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debugee for TypeIDs for nested classes from nested_classes array
+     * and put them into nested_classesIDs array.
+     */
+    void queryNestedClassesTypeIDs() {
+        for (int i = 0; i < NESTED_CLASSES; i++) {
+            nested_classes[i][1] = "L" + nested_classes[i][0].replace('.', '/') + ";";
+            log.display("Getting ReferenceTypeID by signature:\n"
+                        + "  " + nested_classes[i][1]);
+            nested_classesIDs[i] = debugee.getReferenceTypeID(nested_classes[i][1]);
+            log.display("  got TypeID: " + nested_classesIDs[i]);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long typeID) {
+
+        // count nested classes found in the reply packet
+        int found_classes[] = new int[NESTED_CLASSES];
+        for (int i = 0; i < NESTED_CLASSES; i++) {
+            found_classes[i] = 0;
+        }
+
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        log.display("  ReferenceTypeID: " + typeID);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        command.addReferenceTypeID(typeID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check number of nested classes
+        int classes = 0;
+        try {
+            classes = reply.getInt();
+            log.display("  classes: " + classes);
+
+            if (classes != NESTED_CLASSES) {
+                log.complain("Unexpected number of nested classes in the reply packet:"
+                            + classes + " (expected: " + NESTED_CLASSES + ")");
+                success = false;
+            }
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of nested classes from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+        }
+
+        // extract and check TypeID for each nested class
+        for (int i = 0; i < classes; i++ ) {
+            log.display("  nested class #" + i);
+
+            // extract TypeTag byte
+            try {
+                byte refTypeTag = reply.getByte();
+                log.display("    refTypeTag: " + refTypeTag);
+            } catch (BoundException e) {
+                log.complain("Unable to extract refTypetag of " + i + " nested class from reply packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // extract and check TypeID
+            long referenceTypeID;
+            try {
+                referenceTypeID = reply.getReferenceTypeID();
+                log.display("    referenceTypeID: " + referenceTypeID);
+
+            } catch (BoundException e) {
+                log.complain("Unable to extract TypeID of " + i
+                                + " nested class from reply packet:\n\t"
+                                + e.getMessage());
+                success = false;
+                break;
+            }
+
+            if (referenceTypeID == 0) {
+                log.complain("Unexpected null ReferenceTypeID for nested class #" + i
+                            + " in the reply packet: " + referenceTypeID);
+                success = false;
+            } else {
+                boolean found = false;;
+                for (int j = 0; j < NESTED_CLASSES; j++) {
+                    if (referenceTypeID == nested_classesIDs[j]) {
+                        log.display("! Found expected nested class #" + j + ": "
+                                    + nested_classes[j][0]);
+                        found = true;
+                        found_classes[j]++;
+                        break;
+                    }
+                }
+                if (!found) {
+                    log.complain("Unexpected TypeID of nested class found in reply packet: "
+                                + referenceTypeID);
+                    success = false;
+                }
+            }
+        }
+
+        // check for extra data in reply packet
+        if (! reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: " + reply.offsetString());
+            success = false;
+        }
+
+        // check if all expected nested classes are found
+        for (int j = 0; j < NESTED_CLASSES; j++) {
+            if (found_classes[j] <= 0) {
+                log.complain("No TypeID for expected nested class found in reply packet: "
+                            + nested_classesIDs[j] + " (" + nested_classes[j][0] + ")");
+                success = false;
+            } else if (found_classes[j] > 1) {
+                log.complain("Duplicated " + found_classes[j] + " TypeIDs for expected nested class found in reply packet: "
+                            + nested_classesIDs[j] + " (" + nested_classes[j][0] + ")");
+                success = false;
+            }
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001/TestDescription.java
new file mode 100644
index 00000000000..8022d049ab2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001/TestDescription.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: NestedTypes
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned ReferenceTypeIDs for nested types are equal to
+ *     thye expected ones.
+ *     Test consists of two compoments:
+ *         debugger: nestedtypes001
+ *         debuggee: nestedtypes001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains ReferenceTypeIDs for the tested class
+ *     from debugee, and for all classes been nested for this class.
+ *     Then, debugger creates command packet for NestedTypes command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts ReferenceTypeIDs of the nested types. Also test checks
+ *     that the extreacted ReferenceTypeIDs for nested types are equal
+ *     to the expected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     Test fixed due to test bug:
+ *     4908513 TEST_BUG: nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001 assumes order
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.NestedTypes.nestedtypes001
+ *        nsk.jdwp.ReferenceType.NestedTypes.nestedtypes001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.NestedTypes.nestedtypes001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001a.java
new file mode 100644
index 00000000000..031bb08f06c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001a.java
@@ -0,0 +1,95 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.NestedTypes;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class nestedtypes001a {
+
+    public static void main(String args[]) {
+        nestedtypes001a _nestedtypes001a = new nestedtypes001a();
+        System.exit(nestedtypes001.JCK_STATUS_BASE + _nestedtypes001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + nestedtypes001.READY);
+        pipe.println(nestedtypes001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + nestedtypes001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(nestedtypes001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + nestedtypes001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return nestedtypes001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return nestedtypes001.PASSED;
+    }
+
+    // tested class with nested classes
+    public static class TestedClass {
+
+        public interface NestedInterface {
+            public int methodFoo();
+        }
+
+        public static class StaticNestedClass implements NestedInterface {
+            int foo = 0;
+            public int methodFoo() { return foo; }
+        }
+
+        public class InnerNestedClass extends StaticNestedClass {
+            public int methodFoo() { return foo + foo; }
+        }
+
+        public TestedClass() {
+            // ensure all nested classes are loaded
+            InnerNestedClass foo = new InnerNestedClass();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001.java
new file mode 100644
index 00000000000..641079ba7fa
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001.java
@@ -0,0 +1,167 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Signature;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class signature001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.Signature";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "signature001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.Signature";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Signature;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new signature001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    String signature = reply.getString();
+                    log.display("  signature: " + signature);
+
+                    if (! signature.equals(TESTED_CLASS_SIGNATURE)) {
+                        log.complain("Unexpected class signature found in the reply packet: " + signature
+                                    + " (expected: " + TESTED_CLASS_SIGNATURE + ")");
+                        success = false;
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001/TestDescription.java
new file mode 100644
index 00000000000..9336640017b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001/TestDescription.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Signature/signature001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Signature
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet. Also test checks that
+ *     returned signature of the requested class is equal
+ *     to the expected one.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test queries debugee VM for ReferenceTypeID for
+ *     debugee class.
+ *     Then test sends Signature command with received ReferenceTypeID
+ *     as an command argument and waits for a reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracted signature string is equal to
+ *     the expected signature of debugee class.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Signature.signature001
+ *        nsk.jdwp.ReferenceType.Signature.signature001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Signature.signature001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001a.java
new file mode 100644
index 00000000000..5f79b2022a5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001a.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Signature;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class signature001a {
+
+    public static void main(String args[]) {
+        signature001a _signature001a = new signature001a();
+        System.exit(signature001.JCK_STATUS_BASE + _signature001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return signature001.PASSED;
+    }
+
+    static public class TestedClass {
+        int foo = 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001.java
new file mode 100644
index 00000000000..c6bbcd437f8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001.java
@@ -0,0 +1,220 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.SignatureWithGeneric;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * This test checks that the JDWP command <code>SignatureWithGeneric</code>
+ * from the <code>ReferenceType</code> command set returns generic signature
+ * information properly.<br>
+ * Debuggee part of the test creates instances of several tested classes. Some
+ * of the classes are generic. Debugger part obtains signature information for
+ * reference types of the each tested class. Proper generic signature should
+ * be returned for the generic classes, or an empty string for non-generic ones.
+ */
+public class sigwithgeneric001 {
+    static final String DEBUGGEE_CLASS =
+        "nsk.jdwp.ReferenceType.SignatureWithGeneric.sigwithgeneric001t";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.SignatureWithGeneric";
+    static final int JDWP_COMMAND_ID =
+        JDWP.Command.ReferenceType.SignatureWithGeneric;
+
+    static final String COMMAND_READY = "ready";
+    static final String COMMAND_QUIT = "quit";
+
+    static final String[][] classes = {
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001t;",
+            "NULL"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001b;",
+            "<L:Ljava/lang/String;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001c;",
+            "<A:Ljava/lang/Object;B:Ljava/lang/Integer;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001d;",
+            "<T:Ljava/lang/Object;>Ljava/lang/Object;Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001if<TT;>;"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001e;",
+            "NULL"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001if;",
+            "<I:Ljava/lang/Object;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001f;",
+            "NULL"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001g;",
+            "<E:Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001e;:Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001if;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001h;",
+            "<A1:Ljava/lang/Object;B1:Ljava/lang/Object;C1:Ljava/lang/Object;>Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001d<TA1;>;Lnsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001if2<TA1;TB1;TC1;>;"}
+    };
+
+    static final int CLS_NUM = classes.length;
+
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new sigwithgeneric001().runThis(argv, out);
+    }
+
+    public int runThis(String argv[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+        Log log = new Log(out, argumentHandler);
+        boolean result = true;
+
+        try {
+            Binder binder = new Binder(argumentHandler, log);
+
+            log.display("Starting debuggee VM ...");
+            Debugee debuggee = binder.bindToDebugee(DEBUGGEE_CLASS);
+
+            Transport transport = debuggee.getTransport();
+            IOPipe pipe = debuggee.createIOPipe();
+
+            log.display("Waiting for VM_INIT event ...");
+            debuggee.waitForVMInit();
+
+            log.display("Querying for IDSizes ...");
+            debuggee.queryForIDSizes();
+
+            log.display("Resuming debuggee VM ...");
+            debuggee.resume();
+
+            log.display("Waiting for command: " + COMMAND_READY
+                + " ...");
+            String cmd = pipe.readln();
+            log.display(" ... Received command: " + cmd);
+
+            try {
+                for (int i=0; i<CLS_NUM; i++) {
+                    long typeID = debuggee.getReferenceTypeID(classes[i][0]);
+
+                    /////// begin test of JDWP command
+                    log.display("\n>>>>>> Create command " + JDWP_COMMAND_NAME
+                        + "\n\twith ReferenceTypeID: " + typeID
+                        + "\n\tof the class: " + classes[i][0]);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("\nWaiting for reply packet ...");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display(" ... Reply packet received:\n" + reply);
+
+                    log.display("\nChecking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                 /* parsing of reply data:
+                    string signature - The JNI signature for the reference type.
+                    string genericSignature - The generic signature for the reference type
+                                              or an empty string if there is none.
+                 */
+                    log.display("\nParsing reply packet:");
+                    reply.resetPosition();
+
+                    String signature = reply.getString();
+                    if (!signature.equals(classes[i][0])) {
+                        log.complain("TEST FAILED: Unexpected signature of tested class #"
+                            + (i+1) + " (" + classes[i][0] + ")"
+                            + " in the reply packet:"
+                            + "\n\tGot: " + signature
+                            + "\n\tExpected: " + classes[i][0] + "\n");
+                        result = false;
+                    }
+                    else
+                        log.display("\t\tsignature: " + signature);
+
+                    String genSignature = reply.getString();
+                    if (genSignature.length() == 0) // a non-generic class
+                        genSignature = "NULL";
+                    if (!genSignature.equals(classes[i][1])) {
+                        log.complain("TEST FAILED: Unexpected generic signature of tested class #"
+                            + (i+1) + " (" + classes[i][0] + ")"
+                            + " in the reply packet:"
+                            + "\n\tGot: " + genSignature
+                            + "\n\tExpected: " + classes[i][1] + "\n");
+                        result = false;
+                    }
+                    else
+                        log.display("\t\tgeneric signature: " + genSignature);
+
+                    if (!reply.isParsed()) {
+                        log.complain("TEST FAILED: Extra trailing bytes found in reply packet at: "
+                            + reply.currentPosition());
+                        result = false;
+                    } else
+                        log.display("\n<<<<<< Reply packet parsed");
+                    /////// end test of JDWP command
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace(out);
+                log.complain("Caught exception while testing JDWP command: "
+                    + e);
+                result = false;
+            } finally {
+                log.display("Sending command: " + COMMAND_QUIT + " ...");
+                pipe.println(COMMAND_QUIT);
+
+                log.display("Waiting for debuggee exits ...");
+                int code = debuggee.waitFor();
+                if (code == Consts.JCK_STATUS_BASE + Consts.TEST_PASSED) {
+                    log.display(" ... Debuggee PASSED with the exit code: "
+                        + code);
+                } else {
+                    log.complain(" ... Debuggee FAILED with the exit code: "
+                        + code);
+                    result = false;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while communicating with debugee: "
+                + e);
+            result = false;
+        }
+
+        if (!result)
+            return Consts.TEST_FAILED;
+
+        return Consts.TEST_PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001/TestDescription.java
new file mode 100644
index 00000000000..fb896680357
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001/TestDescription.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         JDWP command set: ReferenceType
+ *         JDWP command: SignatureWithGeneric
+ *     It checks that the command returns generic signature information
+ *     properly.
+ *     Debuggee part of the test creates instances of several tested classes.
+ *     Some of the classes are generic. Debugger part obtains signature
+ *     information for reference types of the each tested class. Proper
+ *     generic signature should be returned for the generic classes, or
+ *     an empty string for non-generic ones.
+ * COMMENTS
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.SignatureWithGeneric.sigwithgeneric001
+ *        nsk.jdwp.ReferenceType.SignatureWithGeneric.sigwithgeneric001t
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.SignatureWithGeneric.sigwithgeneric001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001t.java
new file mode 100644
index 00000000000..8a148077c31
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001t.java
@@ -0,0 +1,111 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.SignatureWithGeneric;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class sigwithgeneric001t {
+    public static void main(String args[]) {
+        ArgumentHandler argHandler = new ArgumentHandler(args);
+        Log log = new Log(System.err, argHandler);
+        IOPipe pipe = argHandler.createDebugeeIOPipe(log);
+
+        // load tested classes
+        sigwithgeneric001b<String> _sigwithgeneric001b =
+            new sigwithgeneric001b<String>();
+        sigwithgeneric001c<Boolean, Integer> _sigwithgeneric001c =
+            new sigwithgeneric001c<Boolean, Integer>();
+        sigwithgeneric001e _sigwithgeneric001e =
+            new sigwithgeneric001e();
+        sigwithgeneric001if<Object> _sigwithgeneric001if =
+            new sigwithgeneric001d<Object>();
+        sigwithgeneric001f _sigwithgeneric001f =
+            new sigwithgeneric001f();
+        sigwithgeneric001g<sigwithgeneric001f> _sigwithgeneric001g =
+            new sigwithgeneric001g<sigwithgeneric001f>();
+        sigwithgeneric001h<Byte, Double, Float> _sigwithgeneric001h =
+            new sigwithgeneric001h<Byte, Double, Float>();
+
+        log.display("Debuggee VM started\nSending command: "
+            + sigwithgeneric001.COMMAND_READY);
+        pipe.println(sigwithgeneric001.COMMAND_READY);
+
+        log.display("Waiting for command: "
+            + sigwithgeneric001.COMMAND_QUIT + " ...");
+        String cmd = pipe.readln();
+        log.display(" ... Received command: " + cmd
+            + "\nDebuggee is exiting ...");
+
+        System.exit(Consts.JCK_STATUS_BASE + Consts.TEST_PASSED);
+    }
+}
+
+/*
+ * Dummy classes used only for verifying generic signature information
+ * in a debugger.
+ */
+
+class sigwithgeneric001b<L extends String> {}
+
+class sigwithgeneric001c<A, B extends Integer> {}
+
+interface sigwithgeneric001if<I> {
+    int sigwithgeneric001ifMeth();
+
+    <I> int sigwithgeneric001ifMeth2(I v);
+}
+
+class sigwithgeneric001d<T> implements sigwithgeneric001if<T> {
+    public int sigwithgeneric001ifMeth() {
+        return 1;
+    }
+
+    public <T> int sigwithgeneric001ifMeth2(T v) {
+        return 2;
+    }
+}
+
+class sigwithgeneric001e {}
+
+class sigwithgeneric001f extends sigwithgeneric001e implements sigwithgeneric001if {
+    public int sigwithgeneric001ifMeth() {
+        return 3;
+    }
+
+    public int sigwithgeneric001ifMeth2(Object v) {
+        return 4;
+    }
+}
+
+class sigwithgeneric001g<E extends sigwithgeneric001e & sigwithgeneric001if> {}
+
+interface sigwithgeneric001if2<A, B, C> {}
+
+class sigwithgeneric001h<A1, B1, C1>
+    extends sigwithgeneric001d<A1>
+    implements sigwithgeneric001if2<A1, B1, C1> {}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001.java
new file mode 100644
index 00000000000..af9d7a26021
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001.java
@@ -0,0 +1,217 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.SourceDebugExtension;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * The test checks that the <code>SourceDebugExtension class file
+ * attribute</code> can be obtained at the JDWP level of JDPA via
+ * the <code>SourceDebugExtension</code> command in the
+ * <code>ReferenceType</code> command set. The command is sent
+ * by a debugger. Received reply data should contain the debug
+ * extension string or the JDWP error <code>ABSENT_INFORMATION</code>.
+ */
+public class srcdebugext001 {
+    public static final int JCK_STATUS_BASE = 95;
+    public static final int PASSED = 0;
+    public static final int FAILED = 2;
+    static final String DEBUGGEE_CLASS =
+        "nsk.jdwp.ReferenceType.SourceDebugExtension.srcdebugext001t";
+    static final String COMMAND_READY = "ready";
+    static final String COMMAND_QUIT = "quit";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.SourceDebugExtension";
+    static final int JDWP_COMMAND_ID =
+        JDWP.Command.ReferenceType.SourceDebugExtension;
+
+    private Log log;
+    private IOPipe pipe;
+    private Debugee debuggee;
+    private Transport transport;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new srcdebugext001().runIt(argv, out);
+    }
+
+    private int runIt(String args[], PrintStream out) {
+        ArgumentHandler argHandler = new ArgumentHandler(args);
+        CommandPacket cmdPack = new CommandPacket(JDWP_COMMAND_ID);
+        ReplyPacket replyPack = new ReplyPacket();
+
+        log = new Log(out, argHandler);
+        Binder binder = new Binder(argHandler, log);
+        try {
+            debuggee = binder.bindToDebugee(DEBUGGEE_CLASS);
+            debuggee.waitForVMInit();
+            pipe = debuggee.createIOPipe();
+            debuggee.resume();
+        } catch(Exception e) {
+            log.complain("FAILURE: caught: " + e);
+            e.printStackTrace();
+            return FAILED;
+        }
+        String cmd = pipe.readln();
+        if (!cmd.equals(COMMAND_READY)) {
+            log.complain("TEST BUG: unknown debuggee's command: "
+                + cmd);
+            return quitDebuggee(FAILED);
+        }
+
+// send a command packet
+        transport = debuggee.getTransport();
+        long rTypeID = getRefTypeID(DEBUGGEE_CLASS);
+        cmdPack.addReferenceTypeID(rTypeID);
+        cmdPack.setLength();
+        try {
+            log.display("Sending a command: " + JDWP_COMMAND_NAME);
+            transport.write(cmdPack);
+            log.display("Waiting for reply");
+            transport.read(replyPack);
+                log.display("Reply received:\n" + replyPack);
+
+// check received reply packet
+            if (checkReplyPacket(replyPack,cmdPack) != PASSED)
+                return quitDebuggee(FAILED);
+            switch(replyPack.getErrorCode()) {
+                case JDWP.Error.NONE:
+                    replyPack.resetPosition();
+                    log.display("TEST PASSED: received reply does not contain errors.\n\t"
+                        + "The debug extension string is: "
+                        + replyPack.getString());
+                    break;
+                case JDWP.Error.ABSENT_INFORMATION:
+                    log.display("TEST PASSED: received reply contains a valid error: ABSENT_INFORMATION");
+                    break;
+                default:
+                    log.complain("Unexpected error code "
+                        + replyPack.getErrorCode() + " in reply:\n"
+                        + replyPack);
+                    return quitDebuggee(FAILED);
+            }
+        } catch(Exception e) {
+            log.complain("FAILURE: caught: " + e);
+            e.printStackTrace();
+            return quitDebuggee(FAILED);
+        }
+        return quitDebuggee(PASSED);
+    }
+
+    private long getRefTypeID(String cls) {
+        ReplyPacket reply = new ReplyPacket();
+        long typeID = 0;
+        String clsSig = "L" + cls.replace('.', '/') + ";";
+
+        log.display("\ngetRefTypeID: getting a RefetenceType ID for the signature:\n\t"
+            + clsSig);
+        CommandPacket cmd =
+            new CommandPacket(JDWP.Command.VirtualMachine.ClassesBySignature);
+        cmd.addString(clsSig);
+        cmd.setLength();
+        try {
+            log.display("\ngetRefTypeID: sending a command VirtualMachine.ClassesBySignature:\n"
+                + cmd);
+            transport.write(cmd);
+            log.display("getRefTypeID: Waiting for reply");
+            transport.read(reply);
+                log.display("getRefTypeID: Reply received:\n" + reply);
+            if (checkReplyPacket(reply,cmd) != PASSED)
+                throw new Failure("TEST FAILED");
+//            reply = debuggee.receiveReplyFor(cmd);
+//            log.display("getRefTypeID: reply received:\n" + reply);
+            log.display("getRefTypeID: extracting ReferenceTypeID from the reply packet");
+            reply.resetPosition();
+
+/* parsing of reply data:
+       int classes - number of reference types that follow
+       ---- Repeated 'classes' times:
+       byte refTypeTag - kind of following reference type
+       referenceTypeID - typeID matching loaded reference type
+       int status - the current class status
+       ---- */
+            int cls_num = reply.getInt();
+            if (cls_num != 1) {
+                throw new Failure("TEST FAILED: Illegal number of returned classes: "
+                    + cls_num + ", expected: 1");
+            }
+            else
+                log.display("getRefTypeID: reply data:\n\tnumber of returned classes: "
+                    + cls_num);
+            byte refTypeTag = reply.getByte();
+            typeID = reply.getReferenceTypeID();
+            log.display("\treferenceTypeID: " + typeID);
+            int status = reply.getInt();
+            log.display("\tstatus: " + status + "\n");
+        } catch(Exception e) {
+            quitDebuggee(FAILED);
+            if (e instanceof Failure)
+                throw new Failure(e);
+            else {
+                e.printStackTrace();
+                throw new Failure("TEST FAILED: " + e.toString());
+            }
+        }
+
+        if (!reply.isParsed()) {
+            quitDebuggee(FAILED);
+            throw new Failure("TEST FAILED: Extra bytes in reply packet at: "
+                + reply.currentPosition());
+        }
+
+        return typeID;
+    }
+
+    private int checkReplyPacket(ReplyPacket reply, CommandPacket cmd) {
+        int ret = PASSED;
+
+        if (reply.getFlags() != JDWP.Flag.REPLY_PACKET) {
+            log.complain("TEST FAILED: Unexpected flags in reply packet:\n\tgot=0x"
+                + Packet.toHexString(reply.getFlags(), 2)
+                + " should be: 0x"
+                + Integer.toHexString(JDWP.Flag.REPLY_PACKET));
+            ret = FAILED;
+        }
+        if (reply.getPacketID() != cmd.getPacketID()) {
+            log.complain("TEST FAILED: Unexpected id field in reply packet:\n\tgot=0x"
+                + Packet.toHexString(reply.getPacketID(), 8)
+                + " should be: 0x" + Packet.toHexString(cmd.getPacketID(), 8));
+            ret = FAILED;
+        }
+        return ret;
+    }
+
+    private int quitDebuggee(int stat) {
+        pipe.println(COMMAND_QUIT);
+        debuggee.waitFor();
+        return stat;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java
new file mode 100644
index 00000000000..0635f9de952
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test checks that the SourceDebugExtension class file
+ *     attribute can be obtained at the JDWP level of JPDA via
+ *     the SourceDebugExtension command in the ReferenceType command
+ *     set. The command is sent by a debugger. Received reply data
+ *     should contain the debug extension string or the JDWP error
+ *     ABSENT_INFORMATION.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.SourceDebugExtension.srcdebugext001
+ *        nsk.jdwp.ReferenceType.SourceDebugExtension.srcdebugext001t
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.SourceDebugExtension.srcdebugext001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001t.java
new file mode 100644
index 00000000000..3d2a58a947f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001t.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.SourceDebugExtension;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * This is a debuggee class.
+ */
+public class srcdebugext001t {
+    public static void main(String args[]) {
+        ArgumentHandler argHandler = new ArgumentHandler(args);
+        IOPipe pipe = argHandler.createDebugeeIOPipe();
+        Log log = new Log(System.out, argHandler);
+
+        pipe.println(srcdebugext001.COMMAND_READY);
+        String cmd = pipe.readln();
+        if (!cmd.equals(srcdebugext001.COMMAND_QUIT)) {
+            log.complain("TEST BUG: unknown debugger command: "
+                + cmd);
+            System.exit(srcdebugext001.JCK_STATUS_BASE +
+                srcdebugext001.FAILED);
+        }
+        log.display("Received command: " + cmd
+            + "\nDebuggee is exiting...");
+        System.exit(srcdebugext001.JCK_STATUS_BASE +
+            srcdebugext001.PASSED);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001.java
new file mode 100644
index 00000000000..fb9d8948ef5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001.java
@@ -0,0 +1,168 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.SourceFile;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class srcfile001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.SourceFile";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "srcfile001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.SourceFile";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.SourceFile;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final String TESTED_CLASS_SRCFILENAME = "srcfile001a.java";
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new srcfile001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    String sourceFile = reply.getString();
+                    log.display("  sourceFile: " + sourceFile);
+
+                    if (! sourceFile.equals(TESTED_CLASS_SRCFILENAME)) {
+                        log.complain("Unexpected class source file name found in the reply packet: " + sourceFile
+                                    + " (expected: " + TESTED_CLASS_SRCFILENAME + ")");
+                        success = false;
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001/TestDescription.java
new file mode 100644
index 00000000000..ffc1561fe03
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001/TestDescription.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/SourceFile/srcfile001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: SourceFile
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet. Also test checks that
+ *     returned source file name for the requested class
+ *     is equal to the expected one.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test queries debugee VM for ReferenceTypeID for
+ *     debugee class.
+ *     Then test sends SourceFile command with received ReferenceTypeID
+ *     as an command argument and waits for a reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracted source file name is equal to
+ *     the expected name of the file with debugee class.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee VM exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.SourceFile.srcfile001
+ *        nsk.jdwp.ReferenceType.SourceFile.srcfile001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.SourceFile.srcfile001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001a.java
new file mode 100644
index 00000000000..dec56b1eec3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001a.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.SourceFile;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class srcfile001a {
+
+    public static void main(String args[]) {
+        srcfile001a _srcfile001a = new srcfile001a();
+        System.exit(srcfile001.JCK_STATUS_BASE + _srcfile001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return srcfile001.PASSED;
+    }
+
+    static public class TestedClass {
+        int foo = 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001.java
new file mode 100644
index 00000000000..f0e357b4840
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001.java
@@ -0,0 +1,174 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Status;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class status001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ReferenceType.Status";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "status001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ReferenceType.Status";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ReferenceType.Status;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+    static final int    TESTED_CLASS_STATUS = JDWP.ClassStatus.VERIFIED
+                                            | JDWP.ClassStatus.PREPARED
+                                            | JDWP.ClassStatus.INITIALIZED;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new status001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+                    long typeID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+
+                    // begin test of JDWP command
+
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with ReferenceTypeID: " + typeID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addReferenceTypeID(typeID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int status = reply.getInt();
+                    String statusString = "0x" + Packet.toHexString(status, 4);
+                    log.display("  status: " + statusString);
+
+                    if (status != TESTED_CLASS_STATUS) {
+                        log.complain("Unexpected class status extracted from reply packet: " + statusString
+                                    + " (expected: " + "0x" + Packet.toHexString(TESTED_CLASS_STATUS, 4) + ")");
+                        success = false;
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                } catch (Exception e) {
+
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+
+                } finally {
+
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while connecting to debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001/TestDescription.java
new file mode 100644
index 00000000000..be7e1181b6d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001/TestDescription.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ReferenceType/Status/status001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ReferenceType
+ *         command: Status
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: status001
+ *         debuggee: status001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Next, debugger obtains referenceTypeID for debuggee class, which
+ *     will be used to test JDWP command.
+ *     Then, debugger creates command packet for Status command with the
+ *     found referenceTypeID as an argument, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts classObjectID.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ReferenceType.Status.status001
+ *        nsk.jdwp.ReferenceType.Status.status001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ReferenceType.Status.status001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001a.java
new file mode 100644
index 00000000000..12d36b48b8e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001a.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ReferenceType.Status;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class status001a {
+
+    public static void main(String args[]) {
+        status001a _status001a = new status001a();
+        System.exit(status001.JCK_STATUS_BASE + _status001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return status001.PASSED;
+    }
+
+    static public class TestedClass {
+        int foo = 0;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001.java
new file mode 100644
index 00000000000..63ce5229785
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001.java
@@ -0,0 +1,476 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.GetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: StackFrame.GetValues.
+ *
+ * See getvalues001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class getvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.StackFrame.GetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "getvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "StackFrame.GetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.StackFrame.GetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + getvalues001a.OBJECT_CLASS_NAME;
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // names of the static fields with the tested thread and object values
+    static final String TESTED_THREAD_FIELD_NAME = getvalues001a.THREAD_FIELD_NAME;
+    static final String TESTED_OBJECT_FIELD_NAME = getvalues001a.OBJECT_FIELD_NAME;
+    static final String TESTED_OBJECT_METHOD_NAME = getvalues001a.OBJECT_METHOD_NAME;
+
+    // list of tested variables names and values
+    static final Object variables[][] = {
+                    { "booleanValue", "boolean",  new Boolean(true),           new Byte(JDWP.Tag.BOOLEAN)},
+                    { "byteValue",    "byte",     new Byte((byte)0x0F),        new Byte(JDWP.Tag.BYTE)   },
+                    { "charValue",    "char",     new Character('Z'),          new Byte(JDWP.Tag.CHAR)   },
+                    { "intValue",     "int",      new Integer(100),            new Byte(JDWP.Tag.INT)    },
+                    { "shortValue",   "short",    new Short((short)10),        new Byte(JDWP.Tag.SHORT)  },
+                    { "longValue",    "long",     new Long((long)1000000),     new Byte(JDWP.Tag.LONG)   },
+                    { "floatValue",   "float",    new Float((float)3.14),      new Byte(JDWP.Tag.FLOAT)  },
+                    { "doubleValue",  "double",   new Double((double)2.8e-12), new Byte(JDWP.Tag.DOUBLE) },
+                    { "objectValue",  "objectID", new Long((long)0),           new Byte(JDWP.Tag.OBJECT) }
+                };
+    static final int VARIABLES_COUNT = variables.length;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new getvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting tested classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for tested methodID
+                log.display("Getting tested methodID by name: " + TESTED_OBJECT_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_OBJECT_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // query debugee for indexes of the method local variables
+                log.display("Getting indexes of the tested local variables for methodID: " + methodID);
+                int indexes[] = queryVariableIndexes(classID, methodID);
+                log.display("  got indexes: " + indexes.length);
+
+                // query debuggee for tested objectID value from static field
+                log.display("Getting tested objectID value from static field: "
+                            + TESTED_OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID, TESTED_OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // query debuggee for tested threadID value from static field
+                log.display("Getting tested threadID value from static field: "
+                            + TESTED_THREAD_FIELD_NAME);
+                threadID = queryObjectID(classID, TESTED_THREAD_FIELD_NAME, JDWP.Tag.THREAD);
+                log.display("  got threadID: " + threadID);
+
+                // suspend tested thread into debuggee
+                log.display("Suspending thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+                log.display("  thread suspended");
+
+                // query debuggee for current frameID of the tested thread
+                log.display("Getting current frameID for the threadID: "
+                            + threadID);
+                long frameID = debugee.getCurrentFrameID(threadID);
+                log.display("  got frameID: " + frameID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(frameID, threadID, indexes);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static field of the class.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has expected tag
+        if (value.getTag() != tag) {
+            throw new Failure("Unexpected tag for object value returned: "
+                + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract objectID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Query debugee for indexes of the local method variables.
+     */
+    int[] queryVariableIndexes(long classID, long methodID) {
+        // create array for expected indexes
+        int indexes[] = new int[VARIABLES_COUNT];
+        for (int i = 0; i < VARIABLES_COUNT; i++) {
+            indexes[i] = 0;
+        }
+
+        // obtain variable indexes from debuggee
+        int count = 0;
+        try {
+            CommandPacket command = new CommandPacket(JDWP.Command.Method.VariableTable);
+            command.addReferenceTypeID(classID);
+            command.addMethodID(methodID);
+            command.setLength();
+
+            ReplyPacket reply = debugee.receiveReplyFor(command);
+            reply.resetPosition();
+
+            int argCount = reply.getInt();
+            long slots = reply.getInt();
+            if (slots < VARIABLES_COUNT) {
+                throw new Failure("Too few method local variables returned: " + slots
+                                    + " (expected: at least " + VARIABLES_COUNT + ")");
+            }
+
+            for (int i = 0; i < slots; i++ ) {
+                long codeindex = reply.getLong();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int length = reply.getInt();
+                int slot = reply.getInt();
+
+                for (int j = 0; j < VARIABLES_COUNT; j++) {
+                    if (variables[j][0].equals(name)) {
+                        indexes[j] = slot;
+                        break;
+                    }
+                }
+            }
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract local variable indexes from the reply packet:\n\t"
+                            + e.getMessage());
+            throw new Failure("Error occured while getting local variable indexes for methodID:"
+                            + methodID);
+        }
+
+        return indexes;
+    }
+
+    /**
+     * Check i-th value from the reply packet.
+     */
+    void checkValue(int i, JDWP.Value value) {
+        if (!variables[i][2].equals(value.getValue())) {
+            log.complain("Unexpected value for " + i + " variable ("
+                            + variables[i][0] + ") received: " + value
+                            + " (expected: " + variables[i][2] + ")");
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified frameID.
+     */
+    void testCommand(long frameID, long threadID, int indexes[]) {
+        int slots = indexes.length;
+
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  frameID: " + frameID);
+        command.addFrameID(frameID);
+        log.display("  slots: " + slots);
+        command.addInt(slots);
+
+        // add code indexes of the requested variables
+        for (int i = 0; i < slots; i++) {
+            log.display("    slot #" + i + ":");
+            log.display("      slot: " + indexes[i]);
+            command.addInt(indexes[i]);
+            byte tag = ((Byte)variables[i][3]).byteValue();
+            log.display("      sigbyte: " + tag);
+            command.addByte(tag);
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract and check number of values
+        int values = 0;
+        try {
+            values = reply.getInt();
+            log.display("  values: " + values);
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of values form reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check if number of values are as expected
+        if (values < 0) {
+            log.complain("Negative number of values received:" + values
+                        + " (expected: " + slots + ")");
+            success = false;
+        } else if (values != slots) {
+            log.complain("Unexpected number of values received:" + values
+                        + " (expected: " + slots + ")");
+            success = false;
+        }
+
+        // extract and check each value
+        for (int i = 0; i < values; i++ ) {
+            log.display("  value #" + i + " (variable: " + variables[i][0] + ")");
+
+            // extract value
+            JDWP.Value value = null;
+            try {
+                value = reply.getValue();
+                log.display("    slotValue: " + value);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " slot value:\n\t"
+                            + e.getMessage());
+                success = false;
+                break;
+            }
+
+            // extract and check value by known type tag
+            checkValue(i, value);
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001/TestDescription.java
new file mode 100644
index 00000000000..d2b18104526
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001/TestDescription.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/StackFrame/GetValues/getvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: StackFrame
+ *         command: GetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned values for requested local variables is the same
+ *     as expected.
+ *     Test consists of two compoments:
+ *         debugger: getvalues001
+ *         debuggee: getvalues001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested class
+ *     and object ID and threadID as values of the class static fields.
+ *     Also debugger suspends the thread and gets frameID for the
+ *     current thread frameID and indexes of its local variables.
+ *     Thread is suspended on the invokation of method for the tested object.
+ *     Then, debugger creates command packet for StackFrame.GetValues
+ *     command with the found threadID, frameID and indexes of local variables
+ *     as arguments, writes packet to the transport channel, and waits
+ *     for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts variables values. Also test checks that returned values
+ *     are equals to the expected ones.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.StackFrame.GetValues.getvalues001
+ *        nsk.jdwp.StackFrame.GetValues.getvalues001a
+ * @comment debuggee should be compiled w/ debug info
+ * @clean nsk.jdwp.StackFrame.GetValues.getvalues001a
+ * @compile -g:lines,source,vars ../getvalues001a.java
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.StackFrame.GetValues.getvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001a.java
new file mode 100644
index 00000000000..d2bef481384
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/GetValues/getvalues001a.java
@@ -0,0 +1,177 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.GetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class getvalues001a {
+
+    // name of the tested object and thread classes
+    public static final String OBJECT_CLASS_NAME = "TestedObjectClass";
+    public static final String THREAD_CLASS_NAME = "TestedThreadClass";
+    public static final String THREAD_NAME = "TestedThreadName";
+
+    // name of the static fields with the tested object values
+    public static final String THREAD_FIELD_NAME = "thread";
+    public static final String OBJECT_FIELD_NAME = "object";
+    public static final String OBJECT_METHOD_NAME = "testedMethod";
+
+    // notification object to notify debuggee that thread is ready
+    private static Object threadReady = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        getvalues001a _getvalues001a = new getvalues001a();
+        System.exit(getvalues001.JCK_STATUS_BASE + _getvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread and object
+            log.display("Creating object of tested class");
+            TestedObjectClass.object = new TestedObjectClass();
+            log.display("Creating tested thread");
+            TestedObjectClass.thread = new TestedThreadClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadReady) {
+                TestedObjectClass.thread.start();
+                try {
+                    threadReady.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + getvalues001.READY);
+                    pipe.println(getvalues001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(getvalues001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + getvalues001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(getvalues001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + getvalues001.QUIT + ")");
+                log.complain("Debugee FAILED");
+                return getvalues001.FAILED;
+            }
+
+            // allow started thread to finish
+        }
+
+        // wait for tested thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            TestedObjectClass.thread.join();
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished:\n\t"
+                        + e);
+            log.complain("Debugee FAILED");
+            return getvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return getvalues001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedThreadClass extends Thread {
+
+        TestedThreadClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // invoke tested method for the tested object from the tested thread
+            TestedObjectClass.object.testedMethod();
+
+            log.display("Tested thread finished");
+        }
+
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+
+        // field with the tested thread and object values
+        public static volatile TestedThreadClass thread = null;
+        public static volatile TestedObjectClass object = null;
+
+        public void testedMethod() {
+            // local variables
+            boolean booleanValue = true;
+            byte    byteValue    = (byte)0x0F;
+            char    charValue    = 'Z';
+            int     intValue     = 100;
+            short   shortValue   = (short)10;
+            long    longValue    = (long)1000000;
+            float   floatValue   = (float)3.14;
+            double  doubleValue  = (double)2.8e-12;
+            Object  objectValue  = null;
+
+            log.display("Tested frame entered");
+
+            // notify debuggee that tested thread ready for testing
+            synchronized (threadReady) {
+                threadReady.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested frame dropped");
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java
new file mode 100644
index 00000000000..a896d567eb5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java
@@ -0,0 +1,457 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.PopFrames;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: StackFrame.PopFrames.
+ *
+ * See popframes001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class popframes001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_POP_FRAMES;
+    static final String VM_CAPABILITY_NAME = "canPopFrames";
+
+    // package and classes names
+    static final String PACKAGE_NAME = "nsk.jdwp.StackFrame.PopFrames";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "popframes001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command
+    static final String JDWP_COMMAND_NAME = "StackFrame.PopFrames";
+    static final int JDWP_COMMAND_ID = JDWP.Command.StackFrame.PopFrames;
+
+    // tested class name and signature
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedThreadClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // field and method names
+    static final String TESTED_METHOD_NAME = "testedMethod";
+    static final int BREAKPOINT_LINE_NUMBER = popframes001a.BREAKPOINT_LINE_NUMBER;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // data obtained from debuggee
+    long testedClassID = 0;
+    long testedThreadID = 0;
+    long testedMethodID = 0;
+    long testedFrameID = 0;
+    int breakpointRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new popframes001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();  // minutes
+        timeout = waitTime * 60 * 1000;           // milliseconds
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee VM");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debuggee launched");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for VM_INIT event
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // check for VM capability
+            log.display("\n>>> Checking VM capability \n");
+            log.display("Getting new VM capability: " + VM_CAPABILITY_NAME);
+            boolean capable = debugee.getNewCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME);
+            log.display("  ... got VM capability: " + capable);
+
+            // exit as PASSED if this capability is not supported
+            if (!capable) {
+                out.println("TEST PASSED: unsupported VM capability: "
+                            + VM_CAPABILITY_NAME);
+                return PASSED;
+            }
+
+            // prepare debuggee for testing and obtain required data
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>> Testing JDWP command \n");
+            testCommand();
+
+            // check command results
+            if (success) {
+                log.display("\n>>> Checking result of tested command \n");
+                checkResult();
+            }
+
+            // finish debuggee
+            log.display("\n>> Finishing debuggee \n");
+
+            // clear BREAKPOIN event request
+            log.display("Clearing BREAKPOINT event requestID: " + breakpointRequestID);
+            debugee.clearEventRequest(JDWP.EventKind.BREAKPOINT, breakpointRequestID);
+            log.display("  ... request cleared");
+
+            // resume debuggee after testing command
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for VM_DEATH event
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            log.display("  ... VM_DEATH event received");
+            dead = true;
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            log.display("\n>>> Finishing test \n");
+
+            // disconnect debugee and wait for its exit
+            if (debugee != null) {
+                quitDebugee();
+            }
+        }
+
+        // check result
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+        out.println("TEST PASSED");
+        return PASSED;
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded on debuggee startup and obtain its classID
+        log.display("Waiting for class loaded:\n\t" + TESTED_CLASS_NAME);
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME,
+                                                    JDWP.SuspendPolicy.ALL);
+        log.display("  ... class loaded with classID: " + testedClassID);
+
+        // query debuggee for tested methodID
+        log.display("Getting tested methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+        log.display("");
+
+        // make BREAKPOINT event request
+        log.display("Creating breakpoint requests at: "
+                    + TESTED_METHOD_NAME + ":" +  BREAKPOINT_LINE_NUMBER);
+        breakpointRequestID =
+                debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS,
+                                                testedClassID, testedMethodID,
+                                                BREAKPOINT_LINE_NUMBER,
+                                                JDWP.SuspendPolicy.ALL);
+        log.display("  ... got breakpoint requestID: " + breakpointRequestID);
+
+        // resume debuggee after testing command
+        log.display("Resuming debuggee");
+        debugee.resume();
+        log.display("  ... debuggee resumed");
+        log.display("");
+
+        // wait for BREAKPOINT event
+        log.display("Waiting for BREAKPOINT event for requestID: " + breakpointRequestID);
+        testedThreadID = waitForBreakpointEvent(breakpointRequestID, "first");
+        log.display("  ... breakpoint reached with threadID: " + testedThreadID);
+
+        // query debuggee for top frameID
+        log.display("Getting top frameID for threadID: " + testedThreadID);
+        testedFrameID = queryTopFrameID(testedThreadID);
+        log.display("  ... got frameID: " + testedFrameID);
+        log.display("");
+
+        // tested thread is suspended by an event
+        log.display("Tested thread is suspended by BREAKPOINT event before pop frameID: "
+                    + testedFrameID);
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + testedThreadID);
+        command.addObjectID(testedThreadID);
+        log.display("  frameID: " + testedFrameID);
+        command.addFrameID(testedFrameID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet for tested command:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no reply data to parse
+        log.display("  no reply data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... packed data parsed");
+    }
+
+    /**
+     * Check result of the tested JDWP command.
+     */
+    void checkResult() {
+        // resume debuggee after sending command
+        log.display("Resuming debuggee after command");
+        debugee.resume();
+        log.display("  ... debuggee resumed");
+
+        // wait for BREAKPOINT event
+        log.display("Waiting for second BREAKPOINT event for requestID: " + breakpointRequestID);
+        long threadID = waitForBreakpointEvent(breakpointRequestID, "second");
+        log.display("  ... breakpoint secondly reached with threadID: " + threadID);
+
+        log.display("Tested method was invoked two times as expected");
+    }
+
+    /**
+     * Query debuggee for top frameID value for given threadID.
+     */
+    long queryTopFrameID(long threadID) {
+        String error = "Error occured while getting top frameID for threadID: " + threadID;
+
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Frames);
+        command.addObjectID(threadID);
+        command.addInt(0);        // top frame index
+        command.addInt(1);        // number of frames
+
+        ReplyPacket reply = debugee.receiveReplyFor(command, "ThreadReference.Frames");
+        reply.resetPosition();
+
+        try {
+            int frames = reply.getInt();
+            if (frames != 1) {
+                log.complain("Wrong number of frames returned in reply packet: " + frames
+                            + " (expected: " + 1 + ")");
+                throw new Failure(error);
+            }
+            long frameID = reply.getFrameID();
+            return frameID;
+        } catch (BoundException e) {
+            log.complain("Unable to extract data from reply packet:\n\t"
+                        + e.getMessage());
+            throw new Failure(error);
+        }
+    }
+
+    /**
+     * Wait for BREAKPOINT event made by the given request and return threadID.
+     * Debuggee will be left suspended by the BREAKPOINT event.
+     */
+    public long waitForBreakpointEvent(int requestID, String kind) {
+        String error = "Error occured while waiting for " + kind + " BREAKPOINT event";
+
+        for(;;) {
+            EventPacket event = debugee.receiveEvent();
+            byte eventSuspendPolicy = 0;
+            long eventThreadID = 0;
+            try {
+                eventSuspendPolicy = event.getByte();
+                int events = event.getInt();
+                for (int i = 0; i < events; i++) {
+                    // check event kind
+                    byte eventKind = event.getByte();
+                    if (eventKind == JDWP.EventKind.VM_DEATH) {
+                        log.complain("Unexpected VM_DEATH event received: " + eventKind
+                                    + " (expected: " + JDWP.EventKind.BREAKPOINT +")");
+                        dead = true;
+                        throw new Failure(error);
+                    } else if (eventKind != JDWP.EventKind.BREAKPOINT) {
+                        log.complain("Unexpected event kind received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.BREAKPOINT +")");
+                        throw new Failure(error);
+                    }
+
+                    // extract specific BREAKPOINT event data
+                    int eventRequestID = event.getInt();
+                    eventThreadID = event.getObjectID();
+                    JDWP.Location eventLocation = event.getLocation();
+
+                    if (eventRequestID == requestID) {
+                        return eventThreadID;
+                    } else {
+                        log.complain("Unexpected BREAKPOINT event received with requestID: "
+                                    + eventRequestID + " (expected: " + requestID + ")");
+                    }
+                }
+            } catch (BoundException e) {
+                log.complain("Unable to extract data from event packet while waiting for BREAKPOINT event:\n\t"
+                            + e.getMessage() + "\n" + event);
+                throw new Failure(error);
+            }
+
+            // resume debuggee after unhandled event set
+            debugee.resumeEvent(eventSuspendPolicy, eventThreadID);
+        }
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java
new file mode 100644
index 00000000000..017428623fd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/StackFrame/PopFrames/popframes001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: StackFrame
+ *         command: PopFrames
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     after current frame is popped the tested method is invoked
+ *     second time.
+ *     Test consists of two compoments:
+ *         debugger: popframes001
+ *         debuggee: popframes001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded, requests methodID
+ *     for tested method, sets breakpoint and wait for breakpoint reached.
+ *     After breakpoint event is received with a thread, debugger gets top
+ *     stack frame for this thread.
+ *     Then, debugger creates command packet for StackFrame.PopFrames
+ *     command with the found threadID and frameID, writes this packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks if no reply data returned in the packet.
+ *     Then, checks if the tested method will be invoked second time.
+ *     To do so, it resumes debuggee and waits for BREAKPOINT event
+ *     will be received again. If expected BREAKPOINT event is not received,
+ *     debugger complains an error.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.StackFrame.PopFrames.popframes001
+ *        nsk.jdwp.StackFrame.PopFrames.popframes001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.StackFrame.PopFrames.popframes001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java
new file mode 100644
index 00000000000..20bb707b14f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java
@@ -0,0 +1,119 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.StackFrame.PopFrames;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class popframes001a {
+
+    // name of the tested thread
+    public static final String THREAD_NAME = "testedThread";
+
+    // line nunber for breakpoint
+    public static final int BREAKPOINT_LINE_NUMBER = 113;
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        popframes001a _popframes001a = new popframes001a();
+        System.exit(popframes001.JCK_STATUS_BASE + _popframes001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating testing thread");
+        TestedThreadClass thread = new TestedThreadClass(THREAD_NAME);
+        log.display("  ... thread created");
+
+        // start tested thread
+        log.display("Starting tested thread");
+        thread.start();
+        log.display("  ... thread started");
+
+        // wait for tested thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            thread.join();
+            log.display("  ... thread finished");
+        } catch(InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished:\n\t" + e);
+            log.display("Debugee FAILED");
+            return popframes001.FAILED;
+        }
+
+        log.display("Debugee PASSED");
+        return popframes001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedThreadClass extends Thread {
+
+        // number of invokations of tested method
+        public static volatile int invokations = 0;
+
+        public TestedThreadClass(String name) {
+            super(name);
+        }
+
+        // invoke tested method
+        public void run() {
+            log.display("Tested thread: started");
+
+            // invoke tested method
+            int foo = 100;
+            foo = testedMethod(foo);
+
+            log.display("Tested thread: finished");
+        }
+
+        // tested method to pop frames
+        public int testedMethod(int arg) {
+            invokations++;
+            log.display("Tested method invoked " + invokations + " time");
+            int boo = 0;
+
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            boo = arg * 2; // BREAKPOINT_LINE_NUMBER
+            log.display("Breakpoint line passed");
+
+            return boo;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001.java
new file mode 100644
index 00000000000..58b9c26fae3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001.java
@@ -0,0 +1,599 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.SetValues;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: StackFrame.SetValues.
+ *
+ * See setvalues001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class setvalues001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String RUN = "run";
+    static final String DONE = "done";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.StackFrame.SetValues";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "setvalues001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "StackFrame.SetValues";
+    static final int JDWP_COMMAND_ID = JDWP.Command.StackFrame.SetValues;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + setvalues001a.OBJECT_CLASS_NAME;
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // target values class name and signature constants
+    static final String TARGET_VALUES_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TargetValuesClass";
+    static final String TARGET_VALUES_CLASS_SIGNATURE = "L" + TARGET_VALUES_CLASS_NAME.replace('.', '/') + ";";
+
+    // names of the static fields with the tested thread and object values
+    static final String TESTED_THREAD_FIELD_NAME = setvalues001a.THREAD_FIELD_NAME;
+    static final String TESTED_OBJECT_FIELD_NAME = setvalues001a.OBJECT_FIELD_NAME;
+    static final String TESTED_OBJECT_METHOD_NAME = setvalues001a.OBJECT_METHOD_NAME;
+
+    // list of tested variables names and values
+    static final Object variables[] = {
+                    "booleanValue",
+                    "byteValue",
+                    "charValue",
+                    "intValue",
+                    "shortValue",
+                    "longValue",
+                    "floatValue",
+                    "doubleValue",
+                    "stringValue",
+                    "objectValue"
+                };
+    static final int VARIABLES_COUNT = variables.length;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new setvalues001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // get target values from static fields
+
+                // query debugee for classID for the class with target values
+                log.display("Getting classID for class with target values by signature:\n"
+                            + "  " + TARGET_VALUES_CLASS_SIGNATURE);
+                long targetValuesClassID =
+                            debugee.getReferenceTypeID(TARGET_VALUES_CLASS_SIGNATURE);
+                log.display("  got classID: " + targetValuesClassID);
+
+                // query debugee for fieldIDs of the class static fields
+                log.display("Getting fieldIDs for static fields of the class");
+                long fieldIDs[] = queryClassFieldIDs(targetValuesClassID);
+                log.display("  got fields: " + fieldIDs.length);
+
+                // query debugee for values of the fields
+                log.display("Getting values of the static fields");
+                JDWP.Value values[] =
+                        queryClassFieldValues(targetValuesClassID, fieldIDs);
+                log.display("  got values: " + values.length);
+
+                // get indexes of local variables
+
+                // query debugee for classID of the tested class
+                log.display("Getting tested classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long testedClassID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + testedClassID);
+
+                // query debuggee for tested methodID
+                log.display("Getting tested methodID by name: " + TESTED_OBJECT_METHOD_NAME);
+                long methodID = debugee.getMethodID(testedClassID, TESTED_OBJECT_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // query debugee for indexes of the method local variables
+                log.display("Getting indexes of the tested local variables for methodID: " + methodID);
+                int indexes[] = queryVariableIndexes(testedClassID, methodID);
+                log.display("  got indexes: " + indexes.length);
+
+                // get tested objectID and threadID from static fields
+
+                // query debuggee for tested objectID value from static field
+                log.display("Getting tested objectID value from static field: "
+                            + TESTED_OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(testedClassID, TESTED_OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // query debuggee for tested threadID value from static field
+                log.display("Getting tested threadID value from static field: "
+                            + TESTED_THREAD_FIELD_NAME);
+                threadID = queryObjectID(testedClassID, TESTED_THREAD_FIELD_NAME, JDWP.Tag.THREAD);
+                log.display("  got threadID: " + threadID);
+
+                // suspend tested thread into debuggee
+                log.display("Suspending thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+                log.display("  thread suspended");
+
+                // get current frameID and test JDWP command
+
+                // query debuggee for current frameID of the tested thread
+                log.display("Getting current frameID for the threadID: "
+                            + threadID);
+                long frameID = debugee.getCurrentFrameID(threadID);
+                log.display("  got frameID: " + frameID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(frameID, threadID, indexes, values);
+
+                // check confirmation from debuggee that values have been set correctly
+                log.display("\n>>> Checking that the values have been set correctly \n");
+
+                log.display("Resuming suspended thread");
+                debugee.resumeThread(threadID);
+
+                checkValuesChanged();
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Finally resuming potentially suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static field of the class.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has expected tag
+        if (value.getTag() != tag) {
+            throw new Failure("Unexpected tag for object value returned: "
+                + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract objectID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Query debugee for indexes of the local method variables.
+     */
+    int[] queryVariableIndexes(long classID, long methodID) {
+        // create array for expected indexes
+        int indexes[] = new int[VARIABLES_COUNT];
+        for (int i = 0; i < VARIABLES_COUNT; i++) {
+            indexes[i] = 0;
+        }
+
+        // obtain variable indexes from debuggee
+        int count = 0;
+        try {
+            CommandPacket command = new CommandPacket(JDWP.Command.Method.VariableTable);
+            command.addReferenceTypeID(classID);
+            command.addMethodID(methodID);
+            command.setLength();
+
+            ReplyPacket reply = debugee.receiveReplyFor(command);
+            reply.resetPosition();
+
+            int argCount = reply.getInt();
+            long slots = reply.getInt();
+
+            for (int i = 0; i < slots; i++ ) {
+                long codeindex = reply.getLong();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int length = reply.getInt();
+                int slot = reply.getInt();
+
+                for (int j = 0; j < VARIABLES_COUNT; j++) {
+                    if (variables[j].equals(name)) {
+                        indexes[j] = slot;
+                        break;
+                    }
+                }
+            }
+
+        } catch (BoundException e) {
+            log.complain("Unable to extract local variable indexes from the reply packet:\n\t"
+                            + e.getMessage());
+            throw new Failure("Error occured while getting local variable indexes for methodID:"
+                            + methodID);
+        }
+
+        // check that all expected fieldIDs received
+        int notfound = 0;
+        for (int i = 0; i < VARIABLES_COUNT; i++) {
+            if(indexes[i] == 0) {
+                log.complain("Not found index for local variable: " + variables[i]);
+                notfound++;
+            }
+        }
+        if (notfound > 0) {
+            throw new Failure("Unable to get indexes for " + notfound +
+                            " local variables for methodID: " + methodID);
+        }
+        return indexes;
+    }
+
+    /**
+     * Query debugee for fieldID's of the class static fields.
+     */
+    long[] queryClassFieldIDs(long classID) {
+
+        // create array of fieldID's corresponding to tested variables
+        long[] fieldIDs = new long[VARIABLES_COUNT];
+        for (int i = 0; i < VARIABLES_COUNT; i++) {
+            fieldIDs[i] = 0;
+        }
+
+        // compose ReferenceType.Fields command packet
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+        command.addReferenceTypeID(classID);
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract fieldIDs from the reply packet
+        try {
+            reply.resetPosition();
+
+            int declared = reply.getInt();
+
+            for (int i = 0; i < declared; i++ ) {
+                long fieldID = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                // find variable with the same name
+                for (int j = 0; j < VARIABLES_COUNT; j++) {
+                    if (variables[j].equals(name)) {
+                        fieldIDs[j] = fieldID;
+                    }
+                }
+            }
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.Fields command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fieldIDs for classID: " + classID);
+        }
+
+        // check that all expected fieldIDs received
+        int notfound = 0;
+        for (int i = 0; i < VARIABLES_COUNT; i++) {
+            if(fieldIDs[i] == 0) {
+                log.complain("Not found fieldID for static field: " + variables[i]);
+                notfound++;
+            }
+        }
+        if (notfound > 0) {
+            throw new Failure("Unable to get fiedIDs for " + notfound +
+                            " static fields for classID: " + classID);
+        }
+        return fieldIDs;
+    }
+
+    /**
+     * Query debugee for values of the class fields.
+     */
+    JDWP.Value[] queryClassFieldValues(long classID, long fieldIDs[]) {
+        // compose ReferenceType.Fields command packet
+        int count = fieldIDs.length;
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.GetValues);
+        command.addReferenceTypeID(classID);
+        command.addInt(count);
+        for (int i = 0; i < count; i++) {
+            command.addFieldID(fieldIDs[i]);
+        }
+        command.setLength();
+
+        // send the command and receive reply
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        // extract values from the reply packet
+        try {
+            reply.resetPosition();
+
+            int valuesCount = reply.getInt();
+            if (valuesCount != count) {
+                throw new Failure("Unexpected number of values of static fields returned: "
+                                + valuesCount + " (expected: " + count + ")");
+            }
+
+            JDWP.Value values[] = new JDWP.Value[valuesCount];
+            for (int i = 0; i < valuesCount; i++ ) {
+                JDWP.Value value = reply.getValue();
+                values[i] = value;
+            }
+            return values;
+        } catch (BoundException e) {
+            log.complain("Unable to parse reply packet for ReferenceType.SetValues command:\n\t"
+                        + e);
+            log.complain("Received reply packet:\n"
+                        + reply);
+            throw new Failure("Error occured while getting static fields values for classID: " + classID);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified frameID.
+     */
+    void testCommand(long frameID, long threadID, int indexes[], JDWP.Value values[]) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  frameID: " + frameID);
+        command.addFrameID(frameID);
+        log.display("  slotValues: " + VARIABLES_COUNT);
+        command.addInt(VARIABLES_COUNT);
+
+        // add indexes and new values of the tested variables
+        for (int i = 0; i < VARIABLES_COUNT; i++) {
+            log.display("    slot #" + i + ":");
+            log.display("      slot: " + indexes[i]);
+            command.addInt(indexes[i]);
+            log.display("      slotvalue: " + values[i]);
+            command.addValue(values[i]);
+        }
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no data in the reply packet
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+    /**
+     * Check confiramtion from debuggee that values are changed.
+     */
+    void checkValuesChanged() {
+        // send debugee signal RUN
+        log.display("Sending signal to debugee: " + RUN);
+        pipe.println(RUN);
+
+        // wait for DONE signal from debugee
+        log.display("Waiting for signal from debugee: " + DONE);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        // check received signal
+        if (signal == null) {
+            throw new TestBug("<null> signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        } else if (signal.equals(DONE)) {
+            log.display("All varaible values have been correctly set into debuggee VM");
+        } else if (signal.equals(ERROR)) {
+            log.complain("Not all variables values have been correctly set into debuggee VM");
+            success = false;
+        } else {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + DONE + ")");
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001/TestDescription.java
new file mode 100644
index 00000000000..dc8dea0f9c7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001/TestDescription.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/StackFrame/SetValues/setvalues001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: StackFrame
+ *         command: SetValues
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     new values of the method local variables is the same
+ *     as expected.
+ *     Test consists of two compoments:
+ *         debugger: setvalues001
+ *         debuggee: setvalues001a
+ *     To set values to the method local variables for the current
+ *     thread frame and check that they are set correctly, test defines
+ *     following classes into debuggee VM:
+ *         OriginalValuesClass - class with original values of static fields
+ *         TargetValuesClass - class with target values of static fields
+ *         TestedObjectClass - tested class with tested method with local variables
+ *         TestedThreadClass - thread class with tested frame
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested class
+ *     and object ID and threadID as values of the class static fields.
+ *     Also debugger obtains values of static fields of the class TargetValuesClass
+ *     to use them as new values for local variables from the tested frame.
+ *     Debugger suspends the thread and gets frameID for the current thread
+ *     frameID and indexes of its local variables. Thread is suspended on the
+ *     invokation of the tested method with local variables.
+ *     Then, debugger creates command packet for StackFrame.SetValues
+ *     command with the found threadID, frameID and new values for local
+ *     variables as arguments, writes packet to the transport channel,
+ *     and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts variables values. Debugger checks that no data returmed
+ *     with the reply packet. Also debugger sends debuggee signal RUN to
+ *     to check new values of the local variables. If all values are set
+ *     correctly debuggee replies with the signal DONE.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.StackFrame.SetValues.setvalues001
+ *        nsk.jdwp.StackFrame.SetValues.setvalues001a
+ * @comment debuggee should be compiled w/ debug info
+ * @clean nsk.jdwp.StackFrame.SetValues.setvalues001a
+ * @compile -g:lines,source,vars ../setvalues001a.java
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.StackFrame.SetValues.setvalues001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001a.java
new file mode 100644
index 00000000000..81c9a51b1cf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/SetValues/setvalues001a.java
@@ -0,0 +1,414 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.SetValues;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class setvalues001a {
+
+    // name of the tested object and thread classes
+    public static final String OBJECT_CLASS_NAME = "TestedObjectClass";
+    public static final String THREAD_CLASS_NAME = "TestedThreadClass";
+    public static final String THREAD_NAME = "TestedThreadName";
+
+    // name of the static fields with the tested object values
+    public static final String THREAD_FIELD_NAME = "thread";
+    public static final String OBJECT_FIELD_NAME = "object";
+    public static final String OBJECT_METHOD_NAME = "testedMethod";
+
+    // notification object to notify debuggee that thread is ready
+    private static Object threadReady = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        setvalues001a _setvalues001a = new setvalues001a();
+        System.exit(setvalues001.JCK_STATUS_BASE + _setvalues001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from running further
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread and object
+            log.display("Creating object of tested class");
+            TestedObjectClass.object = new TestedObjectClass();
+            log.display("Creating tested thread");
+            TestedObjectClass.thread = new TestedThreadClass(THREAD_NAME);
+
+            OriginalValuesClass original = new OriginalValuesClass();
+            TargetValuesClass target = new TargetValuesClass();
+
+            // start the thread and wait for notification from it
+            synchronized (threadReady) {
+                TestedObjectClass.thread.start();
+                try {
+                    threadReady.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + setvalues001.READY);
+                    pipe.println(setvalues001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(setvalues001.ERROR);
+                    // exit debuggee
+                    log.complain("Debugee FAILED");
+                    return setvalues001.FAILED;
+                }
+            }
+
+            // wait for signal RUN from debugeer
+            log.display("Waiting for signal from debugger: " + setvalues001.RUN);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(setvalues001.RUN)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + setvalues001.RUN + ")");
+                // skip checking for new values
+                TestedObjectClass.object.checking = false;
+                // exit debuggee
+                log.complain("Debugee FAILED");
+                return setvalues001.FAILED;
+            }
+
+            // allow started thread to run and finish
+        }
+
+        // wait for tested thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            TestedObjectClass.thread.join();
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished:\n\t"
+                        + e);
+            // exit debuggee
+            log.complain("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // confirm that new values of local variables are correct
+        if (TestedObjectClass.object.different == 0) {
+            log.display("Sending signal to debugger: " + setvalues001.DONE);
+            pipe.println(setvalues001.DONE);
+        } else {
+            log.complain("Values of " + TestedObjectClass.object.different +
+                        " local variables have not been set correctly");
+            log.display("Sending signal to debugger: " + setvalues001.ERROR);
+            pipe.println(setvalues001.ERROR);
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + setvalues001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(setvalues001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setvalues001.QUIT + ")");
+            // exit debuggee
+            log.complain("Debugee FAILED");
+            return setvalues001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return setvalues001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedThreadClass extends Thread {
+
+        public TestedThreadClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // invoke tested method for the tested object from the tested thread
+            TestedObjectClass.object.testedMethod();
+
+            log.display("Tested thread finished");
+        }
+
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+
+        // field with the tested thread and object values
+        public static volatile TestedThreadClass thread = null;
+        public static volatile TestedObjectClass object = null;
+
+        // allow to check new values of local variables
+        public volatile boolean checking = true;
+        // number of variables with unexpected new values
+        public volatile int different = 0;
+
+        // tested method with local variables
+        public void testedMethod() {
+
+            // local variables
+            boolean  booleanValue = OriginalValuesClass.booleanValue;
+            byte     byteValue    = OriginalValuesClass.byteValue;
+            char     charValue    = OriginalValuesClass.charValue;
+            int      intValue     = OriginalValuesClass.intValue;
+            short    shortValue   = OriginalValuesClass.shortValue;
+            long     longValue    = OriginalValuesClass.longValue;
+            float    floatValue   = OriginalValuesClass.floatValue;
+            double   doubleValue  = OriginalValuesClass.doubleValue;
+            String   stringValue  = OriginalValuesClass.stringValue;
+            Object   objectValue  = OriginalValuesClass.objectValue;
+
+            log.display("Tested frame entered");
+
+            // notify debuggee that tested thread ready for testing
+            synchronized (threadReady) {
+                threadReady.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Checking that values have been set correctly:");
+            }
+
+            // check new values of local variables
+            if (checking) {
+
+                // check value of the variable
+                if (booleanValue != TargetValuesClass.booleanValue) {
+                    different++;
+                    log.complain("  booleanValue = " + booleanValue + "\n"
+                               + "    setting: " + OriginalValuesClass.booleanValue
+                                        + " -> " + TargetValuesClass.booleanValue);
+                    if (booleanValue == OriginalValuesClass.booleanValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  booleanValue: " + OriginalValuesClass.booleanValue
+                                            + " -> " + TargetValuesClass.booleanValue);
+                }
+
+                // check value of the variable
+                if (byteValue != TargetValuesClass.byteValue) {
+                    different++;
+                    log.complain("  byteValue = " + byteValue + "\n"
+                               + "    setting: " + OriginalValuesClass.byteValue
+                                        + " -> " + TargetValuesClass.byteValue);
+                    if (byteValue == OriginalValuesClass.byteValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  byteValue: " + OriginalValuesClass.byteValue
+                                            + " -> " + TargetValuesClass.byteValue);
+                }
+
+                // check value of the variable
+                if (charValue != TargetValuesClass.charValue) {
+                    different++;
+                    log.complain("  charValue = " + charValue + "\n"
+                               + "    setting: " + OriginalValuesClass.charValue
+                                        + " -> " + TargetValuesClass.charValue);
+                    if (charValue == OriginalValuesClass.charValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  charValue: " + OriginalValuesClass.charValue
+                                            + " -> " + TargetValuesClass.charValue);
+                }
+
+                // check value of the variable
+                if (intValue != TargetValuesClass.intValue) {
+                    different++;
+                    log.complain("  intValue = " + intValue + "\n"
+                               + "    setting: " + OriginalValuesClass.intValue
+                                        + " -> " + TargetValuesClass.intValue);
+                    if (intValue == OriginalValuesClass.intValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  intValue: " + OriginalValuesClass.intValue
+                                            + " -> " + TargetValuesClass.intValue);
+                }
+
+                // check value of the variable
+                if (shortValue != TargetValuesClass.shortValue) {
+                    different++;
+                    log.complain("  shortValue = " + shortValue + "\n"
+                               + "    setting: " + OriginalValuesClass.shortValue
+                                        + " -> " + TargetValuesClass.shortValue);
+                    if (shortValue == OriginalValuesClass.shortValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  shortValue: " + OriginalValuesClass.shortValue
+                                            + " -> " + TargetValuesClass.shortValue);
+                }
+
+                // check value of the variable
+                if (longValue != TargetValuesClass.longValue) {
+                    different++;
+                    log.complain("  longValue = " + longValue + "\n"
+                               + "    setting: " + OriginalValuesClass.longValue
+                                        + " -> " + TargetValuesClass.longValue);
+                    if (longValue == OriginalValuesClass.longValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  longValue: " + OriginalValuesClass.longValue
+                                            + " -> " + TargetValuesClass.longValue);
+                }
+
+                // check value of the variable
+                if (floatValue != TargetValuesClass.floatValue) {
+                    different++;
+                    log.complain("  floatValue = " + floatValue + "\n"
+                               + "    setting: " + OriginalValuesClass.floatValue
+                                        + " -> " + TargetValuesClass.floatValue);
+                    if (floatValue == OriginalValuesClass.floatValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  floatValue: " + OriginalValuesClass.floatValue
+                                            + " -> " + TargetValuesClass.floatValue);
+                }
+
+                // check value of the variable
+                if (doubleValue != TargetValuesClass.doubleValue) {
+                    different++;
+                    log.complain("  doubleValue = " + doubleValue + "\n"
+                               + "    setting: " + OriginalValuesClass.doubleValue
+                                        + " -> " + TargetValuesClass.doubleValue);
+                    if (doubleValue == OriginalValuesClass.doubleValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  doubleValue: " + OriginalValuesClass.doubleValue
+                                            + " -> " + TargetValuesClass.doubleValue);
+                }
+
+                // check value of the variable
+                if (stringValue != TargetValuesClass.stringValue) {
+                    different++;
+                    log.complain("  stringValue = " + stringValue + "\n"
+                               + "    setting: " + OriginalValuesClass.stringValue
+                                        + " -> " + TargetValuesClass.stringValue);
+                    if (stringValue == OriginalValuesClass.stringValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  stringValue: " + OriginalValuesClass.stringValue
+                                            + " -> " + TargetValuesClass.stringValue);
+                }
+
+                // check value of the variable
+                if (objectValue != TargetValuesClass.objectValue) {
+                    different++;
+                    log.complain("  objectValue = " + objectValue + "\n"
+                               + "    setting: " + OriginalValuesClass.objectValue
+                                        + " -> " + TargetValuesClass.objectValue);
+                    if (objectValue == OriginalValuesClass.objectValue) {
+                        log.complain("      not changed!");
+                    } else {
+                        log.complain("      changed incorrectly!");
+                    }
+                } else {
+                    log.display("  objectValue: " + OriginalValuesClass.objectValue
+                                            + " -> " + TargetValuesClass.objectValue);
+                }
+            }
+
+            log.display("Tested frame dropped");
+        }
+
+    }
+
+    // class with the original values of static fields
+    public static class OriginalValuesClass {
+        static final boolean booleanValue = true;
+        static final byte    byteValue    = (byte)0x01;
+        static final char    charValue    = 'Z';
+        static final int     intValue     = 100;
+        static final short   shortValue   = (short)10;
+        static final long    longValue    = (long)1000000;
+        static final float   floatValue   = (float)3.14;
+        static final double  doubleValue  = (double)2.8e-12;
+        static final String  stringValue  = "text";
+        static final Object  objectValue  = new OriginalValuesClass();
+    }
+
+    // class with the original values of static fields
+    public static class TargetValuesClass {
+        static final boolean booleanValue = false;
+        static final byte    byteValue    = (byte)0x0F;
+        static final char    charValue    = 'A';
+        static final int     intValue     = 999;
+        static final short   shortValue   = (short)88;
+        static final long    longValue    = (long)11111111;
+        static final float   floatValue   = (float)7.19;
+        static final double  doubleValue  = (double)4.6e24;
+        static final String  stringValue  = "new text";
+        static final Object  objectValue  = new TargetValuesClass();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001.java
new file mode 100644
index 00000000000..90ab9f6e06b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001.java
@@ -0,0 +1,369 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.ThisObject;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: StackFrame.ThisObject.
+ *
+ * See thisobject001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class thisobject001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.StackFrame.ThisObject";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "thisobject001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "StackFrame.ThisObject";
+    static final int JDWP_COMMAND_ID = JDWP.Command.StackFrame.ThisObject;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + thisobject001a.OBJECT_CLASS_NAME;
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // names of the static fields with the tested thread and object values
+    static final String TESTED_OBJECT_FIELD_NAME = thisobject001a.OBJECT_FIELD_NAME;
+    static final String TESTED_THREAD_FIELD_NAME = thisobject001a.THREAD_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new thisobject001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectID value from static field
+                log.display("Getting objectID value from static field: "
+                            + TESTED_OBJECT_FIELD_NAME);
+                long objectID = queryObjectID(classID, TESTED_OBJECT_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // query debuggee for threadID value from static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_THREAD_FIELD_NAME);
+                threadID = queryObjectID(classID, TESTED_THREAD_FIELD_NAME, JDWP.Tag.THREAD);
+                log.display("  got threadID: " + threadID);
+
+                // suspend tested thread into debuggee
+                log.display("Suspending thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+
+                // query debuggee for current frameID of the tested thread
+                log.display("Getting current frameID for the threadID: "
+                            + threadID);
+                long frameID = debugee.getCurrentFrameID(threadID);
+                log.display("  got frameID: " + frameID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(frameID, threadID, objectID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static field of the class.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has expected tag
+        if (value.getTag() != tag) {
+            throw new Failure("Unexpected tag for object value returned: "
+                + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract objectID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified frameID.
+     */
+    void testCommand(long frameID, long threadID, long expectedObjectID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  frameID: " + frameID);
+        command.addFrameID(frameID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract tag of object value
+        byte tag = (byte)0;
+        try {
+            tag = reply.getByte();
+            log.display("  tag: " + tag);
+        } catch (BoundException e) {
+            log.complain("Unable to extract object tag from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract objectID of object value
+        long objectID = 0;
+        try {
+            objectID = reply.getObjectID();
+            log.display("  objectID: " + objectID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract objectID from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that object tag is as expected
+        if (tag != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected object tag returned: "
+                        + tag + " (expected: " + JDWP.Tag.OBJECT + ")");
+            success = false;
+        }
+
+        // check that objectID is as expected
+        if (objectID < 0) {
+            log.complain("Negative value of objectID retured: "
+                        + objectID + " (expected: " + expectedObjectID + ")");
+            success = false;
+        } else if (objectID != expectedObjectID) {
+            log.complain(" Unexpected objectID retured: "
+                        + objectID + " (expected: " + expectedObjectID + ")");
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001/TestDescription.java
new file mode 100644
index 00000000000..51915459b70
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001/TestDescription.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/StackFrame/ThisObject/thisobject001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: StackFrame
+ *         command: ThisObject
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned objectID for current test frame is the same as expected.
+ *     Test consists of two compoments:
+ *         debugger: thisobject001
+ *         debuggee: thisobject001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested class
+ *     and object ID and threadID as values of the class static fields.
+ *     Also debugger suspends the thread and gets frameID for the
+ *     current thread frameID. Thread is suspended on the invokation
+ *     of method of the tested object.
+ *     Then, debugger creates command packet for StackFrame.ThisObject
+ *     command with the found threadID and frameID as arguments, writes
+ *     packet to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts requested objectID. Also test checks that returned objectID
+ *     has the expected tag and value.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.StackFrame.ThisObject.thisobject001
+ *        nsk.jdwp.StackFrame.ThisObject.thisobject001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.StackFrame.ThisObject.thisobject001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001a.java
new file mode 100644
index 00000000000..42bb065994b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/ThisObject/thisobject001a.java
@@ -0,0 +1,169 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StackFrame.ThisObject;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class thisobject001a {
+
+    // name of the tested object and thread classes
+    public static final String OBJECT_CLASS_NAME = "TestedObjectClass";
+    public static final String THREAD_CLASS_NAME = "TestedThreadClass";
+    public static final String THREAD_NAME = "TestedThreadName";
+
+    // name of the static fields with the tested object values
+    public static final String THREAD_FIELD_NAME = "thread";
+    public static final String OBJECT_FIELD_NAME = "object";
+
+    // notification object to notify debuggee that thread is ready
+    private static Object threadReady = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        thisobject001a _thisobject001a = new thisobject001a();
+        System.exit(thisobject001.JCK_STATUS_BASE + _thisobject001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread and object
+            log.display("Creating object of tested class");
+            TestedObjectClass.object = new TestedObjectClass();
+            log.display("Creating tested thread");
+            TestedObjectClass.thread = new TestedThreadClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadReady) {
+                TestedObjectClass.thread.start();
+                try {
+                    threadReady.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + thisobject001.READY);
+                    pipe.println(thisobject001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(thisobject001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + thisobject001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(thisobject001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + thisobject001.QUIT + ")");
+                log.complain("Debugee FAILED");
+                return thisobject001.FAILED;
+            }
+
+            // allow started thread to finish
+        }
+
+        // wait for tested thread finished
+        try {
+            log.display("Waiting for tested thread finished");
+            TestedObjectClass.thread.join();
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished:\n\t"
+                        + e);
+            log.complain("Debugee FAILED");
+            return thisobject001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return thisobject001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedThreadClass extends Thread {
+
+        TestedThreadClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // invoke tested method for the tested object from the tested thread
+            int foo = 100;
+            TestedObjectClass.object.testedMethod(foo);
+
+            log.display("Tested thread finished");
+        }
+
+    }
+
+    // tested object class
+    public static class TestedObjectClass {
+
+        // field with the tested thread and object values
+        public static volatile TestedThreadClass thread = null;
+        public static volatile TestedObjectClass object = null;
+
+        public void testedMethod(int foo) {
+            log.display("Tested frame entered");
+
+            // local variables
+            int boo = foo;
+
+            // notify debuggee that tested thread ready for testing
+            synchronized (threadReady) {
+                threadReady.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested frame dropped");
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001.java
new file mode 100644
index 00000000000..6a218281473
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001.java
@@ -0,0 +1,214 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StringReference.Value;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+import java.util.*;
+
+public class value001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.StringReference.Value";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "value001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "StringReference.Value";
+    static final int JDWP_COMMAND_ID = JDWP.Command.StringReference.Value;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new value001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                try {
+
+                    // create string in debugee
+
+                    String originalStringValue = "Testing string value";
+                    long stringID = 0;
+
+                    {
+                        // Suspend debuggee to avoid GC
+                        log.display("Suspending debuggee");
+                        debugee.suspend();
+                        log.display("Debuggee suspended");
+
+                        log.display("Create command packet" + "CreateString"
+                                    + " with string value: " + originalStringValue);
+                        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.CreateString);
+                        command.addString(originalStringValue);
+                        command.setLength();
+
+                        log.display("Waiting for reply to command");
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+                        log.display("Valid reply packet received");
+
+                        log.display("Parsing reply packet");
+                        reply.resetPosition();
+
+                        stringID = reply.getObjectID();
+                        log.display("  stringID: " + stringID);
+
+                        // Disable garbage collection of the String
+                        log.display("Disabling collection of String object");
+                        command = new CommandPacket(JDWP.Command.ObjectReference.DisableCollection);
+                        command.addObjectID(stringID);
+                        command.setLength();
+                        reply = debugee.receiveReplyFor(command);
+                        reply.resetPosition();
+                        log.display("Collection disabled");
+
+                        // Resume debugee now that we have disabled collection of the String
+                        log.display("Resuming debuggee");
+                        debugee.resume();
+                        log.display("Debuggee resumed");
+                    }
+
+                    // begint test of JDWP command
+
+                    log.display("Create command packet" + JDWP_COMMAND_NAME
+                                + "with stringID: " + stringID);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addObjectID(stringID);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    String stringValue = reply.getString();
+                    log.display("  stringValue:   " + stringValue);
+
+                    if (! stringValue.equals(originalStringValue)) {
+                        log.complain("Received value does not equals original value:"
+                                        + originalStringValue);
+                        success = false;
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    } else {
+                        log.display("Reply packet parsed successfully");
+                    }
+
+                    // end test of JDWP command
+
+                    // Re-enable garbage collection of the String
+                    log.display("Enabling collection of String object");
+                    command = new CommandPacket(JDWP.Command.ObjectReference.EnableCollection);
+                    command.addObjectID(stringID);
+                    command.setLength();
+                    reply = debugee.receiveReplyFor(command);
+                    reply.resetPosition();
+                    log.display("Collection enabled");
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001/TestDescription.java
new file mode 100644
index 00000000000..78d5a04e5d0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001/TestDescription.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/StringReference/Value/value001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: StringReference
+ *         command: Value
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet. Also test checks that
+ *     returned value of the requested string is equal
+ *     to the expected one.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test queries debugee VM to create string with given vaule
+ *     and saves stringID of created string.
+ *     Then test sends Value command with saved stringID
+ *     as an command argument and waits for a reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracted string value is equal to
+ *     the expected string.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.StringReference.Value.value001
+ *        nsk.jdwp.StringReference.Value.value001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.StringReference.Value.value001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001a.java
new file mode 100644
index 00000000000..58b29f54ee5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StringReference/Value/value001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.StringReference.Value;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class value001a {
+
+    public static void main(String args[]) {
+        value001a _value001a = new value001a();
+        System.exit(value001.JCK_STATUS_BASE + _value001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return value001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001.java
new file mode 100644
index 00000000000..5bcf5132863
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001.java
@@ -0,0 +1,220 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadGroupReference.Children;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class children001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadGroupReference.Children";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "children001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ThreadGroupReference.Children";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadGroupReference.Children;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new children001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+
+                try {
+
+                    // get top level thread groups
+
+                    log.display("Getting IDs for top level thread groups");
+
+                    long[] threadGroupIDs = null;
+                    int groups = 0;
+
+                    {
+                        log.display("Create command packet " + "TopLevelThreadGroups");
+                        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.TopLevelThreadGroups);
+
+                        log.display("Waiting for reply to command");
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+                        log.display("Valid reply packet received");
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        groups = reply.getInt();
+                        log.display("  groups: " + groups);
+
+                        threadGroupIDs = new long[groups];
+
+                        for (int i = 0; i < groups; i++) {
+                            long threadGroupID = reply.getObjectID();
+                            log.display("  " + i + " threadGroupID: " + threadGroupID);
+                            threadGroupIDs[i] = threadGroupID;
+                        }
+
+                        if (groups < 0) {
+                            log.complain("Negative number of thread groups returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                        if (groups == 0) {
+                            log.complain("No thread groups IDs returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                    }
+
+                    // begin test of JDWP command
+
+                    for (int i = 0; i < groups; i++) {
+
+                        long threadGroupID = threadGroupIDs[i];
+
+                        log.display("Getting name for " + i + " group ID: "
+                                        + threadGroupID);
+
+                        log.display("Create command " + JDWP_COMMAND_NAME
+                                        + " with thread group ID: " + threadGroupID);
+                        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                        command.addObjectID(threadGroupID);
+                        command.setLength();
+
+                        log.display("Sending command packet:\n" + command);
+                        transport.write(command);
+
+                        log.display("Waiting for reply packet");
+                        ReplyPacket reply = new ReplyPacket();
+                        transport.read(reply);
+                        log.display("Reply packet received:\n" + reply);
+
+                        log.display("Checking reply packet header");
+                        reply.checkHeader(command.getPacketID());
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        int childThreads = reply.getInt();
+                        log.display("  childThreads: " + childThreads);
+
+                        for (int j = 0; j < childThreads; j++) {
+                            long childThread = reply.getObjectID();
+                            log.display("  " + j + " childThread: " + childThread);
+                        }
+
+                        int childGroups = reply.getInt();
+                        log.display("  childGroups: " + childGroups);
+
+                        for (int j = 0; j < childGroups; j++) {
+                            long childGroup = reply.getObjectID();
+                            log.display("  " + j + " childGroup: " + childGroup);
+                        }
+
+                        if (! reply.isParsed()) {
+                            log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                            success = false;
+                        } else {
+                            log.display("Reply packet parsed successfully");
+                        }
+                    }
+
+                   // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001/TestDescription.java
new file mode 100644
index 00000000000..87ae0121648
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001/TestDescription.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadGroupReference/Children/children001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadGroupReference
+ *         command: Children
+ *     Test checks that debugee accepts command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test queries debugee VM for ThreadGroupReferenceIDs
+ *     of all top level thread groups.
+ *     Then test sends Children command for each ThreadGroupReferenceID
+ *     and waits for a reply packet.
+ *     Test checks if the each received reply packet has proper
+ *     structure and extract childs info of the queried thread group.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadGroupReference.Children.children001
+ *        nsk.jdwp.ThreadGroupReference.Children.children001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadGroupReference.Children.children001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001a.java
new file mode 100644
index 00000000000..70144c94d6b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Children/children001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadGroupReference.Children;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class children001a {
+
+    public static void main(String args[]) {
+        children001a _children001a = new children001a();
+        System.exit(children001.JCK_STATUS_BASE + _children001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return children001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001.java
new file mode 100644
index 00000000000..abb7ed4a59e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001.java
@@ -0,0 +1,207 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadGroupReference.Name;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class name001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadGroupReference.Name";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "name001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ThreadGroupReference.Name";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadGroupReference.Name;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new name001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+
+                try {
+
+                    // get top level thread groups
+
+                    log.display("Getting IDs for top level thread groups");
+
+                    long[] threadGroupIDs = null;
+                    int groups = 0;
+
+                    {
+                        log.display("Create command packet " + "TopLevelThreadGroups");
+                        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.TopLevelThreadGroups);
+
+                        log.display("Waiting for reply to command");
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+                        log.display("Valid reply packet received");
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        groups = reply.getInt();
+                        log.display("  groups: " + groups);
+
+                        threadGroupIDs = new long[groups];
+
+                        for (int i = 0; i < groups; i++) {
+                            long threadGroupID = reply.getObjectID();
+                            log.display("  " + i + " threadGroupID: " + threadGroupID);
+                            threadGroupIDs[i] = threadGroupID;
+                        }
+
+                        if (groups < 0) {
+                            log.complain("Negative number of thread groups returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                        if (groups == 0) {
+                            log.complain("No thread groups IDs returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                    }
+
+                    // begin test of JDWP command
+
+                    for (int i = 0; i < groups; i++) {
+
+                        long threadGroupID = threadGroupIDs[i];
+
+                        log.display("Getting name for " + i + " group ID: "
+                                        + threadGroupID);
+
+                        log.display("Create command " + JDWP_COMMAND_NAME
+                                        + " with thread group ID: " + threadGroupID);
+                        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                        command.addObjectID(threadGroupID);
+                        command.setLength();
+
+                        log.display("Sending command packet:\n" + command);
+                        transport.write(command);
+
+                        log.display("Waiting for reply packet");
+                        ReplyPacket reply = new ReplyPacket();
+                        transport.read(reply);
+                        log.display("Reply packet received:\n" + reply);
+
+                        log.display("Checking reply packet header");
+                        reply.checkHeader(command.getPacketID());
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        String groupName = reply.getString();
+                        log.display("  groupName: " + groupName);
+
+                        if (! reply.isParsed()) {
+                            log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                            success = false;
+                        } else {
+                            log.display("Reply packet parsed successfully");
+                        }
+                    }
+
+                   // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001/TestDescription.java
new file mode 100644
index 00000000000..8490c0d3b1f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001/TestDescription.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadGroupReference/Name/name001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadGroupReference
+ *         command: Name
+ *     Test checks that debugee accepts command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test queries debugee VM for ThreadGroupReferenceIDs
+ *     of all top level thread groups.
+ *     Then test sends Name command for each ThreadGroupReferenceID
+ *     and waits for a reply packet.
+ *     Test checks if the each received reply packet has proper
+ *     structure and extract name of the queried thread group.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadGroupReference.Name.name001
+ *        nsk.jdwp.ThreadGroupReference.Name.name001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadGroupReference.Name.name001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001a.java
new file mode 100644
index 00000000000..c06c96e5638
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Name/name001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadGroupReference.Name;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class name001a {
+
+    public static void main(String args[]) {
+        name001a _name001a = new name001a();
+        System.exit(name001.JCK_STATUS_BASE + _name001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return name001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001.java
new file mode 100644
index 00000000000..bdcdbc1dd2d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001.java
@@ -0,0 +1,212 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadGroupReference.Parent;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class parent001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadGroupReference.Parent";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "parent001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ThreadGroupReference.Parent";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadGroupReference.Parent;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new parent001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+
+                try {
+
+                    // get top level thread groups
+
+                    log.display("Getting IDs for top level thread groups");
+
+                    long[] threadGroupIDs = null;
+                    int groups = 0;
+
+                    {
+                        log.display("Create command packet " + "TopLevelThreadGroups");
+                        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.TopLevelThreadGroups);
+
+                        log.display("Waiting for reply to command");
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+                        log.display("Valid reply packet received");
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        groups = reply.getInt();
+                        log.display("  groups: " + groups);
+
+                        threadGroupIDs = new long[groups];
+
+                        for (int i = 0; i < groups; i++) {
+                            long threadGroupID = reply.getObjectID();
+                            log.display("  " + i + " threadGroupID: " + threadGroupID);
+                            threadGroupIDs[i] = threadGroupID;
+                        }
+
+                        if (groups < 0) {
+                            log.complain("Negative number of thread groups returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                        if (groups == 0) {
+                            log.complain("No thread groups IDs returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                    }
+
+                    // begin test of JDWP command
+
+                    for (int i = 0; i < groups; i++) {
+
+                        long threadGroupID = threadGroupIDs[i];
+
+                        log.display("Getting name for " + i + " group ID: "
+                                        + threadGroupID);
+
+                        log.display("Create command " + JDWP_COMMAND_NAME
+                                        + " with thread group ID: " + threadGroupID);
+                        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                        command.addObjectID(threadGroupID);
+                        command.setLength();
+
+                        log.display("Sending command packet:\n" + command);
+                        transport.write(command);
+
+                        log.display("Waiting for reply packet");
+                        ReplyPacket reply = new ReplyPacket();
+                        transport.read(reply);
+                        log.display("Reply packet received:\n" + reply);
+
+                        log.display("Checking reply packet header");
+                        reply.checkHeader(command.getPacketID());
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        long parentGroup = reply.getObjectID();
+                        log.display("  parentGroup: " + parentGroup);
+
+                        if (parentGroup != 0) {
+                            log.complain("Nonzero ThreadGroupID of parent thread group returned for top-level thread group");
+                            success = false;
+                        }
+
+                        if (! reply.isParsed()) {
+                            log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                            success = false;
+                        } else {
+                            log.display("Reply packet parsed successfully");
+                        }
+                    }
+
+                   // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001/TestDescription.java
new file mode 100644
index 00000000000..f4d7ed72601
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001/TestDescription.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadGroupReference/Parent/parent001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadGroupReference
+ *         command: Parent
+ *     Test checks that debugee accepts command and replies
+ *     with correct reply packet. Also test check that returned
+ *     parent ThreadGroupID for top-level group is equal to zero.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test queries debugee VM for ThreadGroupReferenceIDs
+ *     of all top level thread groups.
+ *     Then test sends Parent command for each ThreadGroupReferenceID
+ *     and waits for a reply packet.
+ *     Test checks if the each received reply packet has proper
+ *     structure and extract childs info of the queried thread group.
+ *     Also test check that extracted parent ThreadGroupID for
+ *     top-level group is equal to zero.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadGroupReference.Parent.parent001
+ *        nsk.jdwp.ThreadGroupReference.Parent.parent001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadGroupReference.Parent.parent001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001a.java
new file mode 100644
index 00000000000..ec06f06e71c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadGroupReference/Parent/parent001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadGroupReference.Parent;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class parent001a {
+
+    public static void main(String args[]) {
+        parent001a _parent001a = new parent001a();
+        System.exit(parent001.JCK_STATUS_BASE + _parent001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return parent001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001.java
new file mode 100644
index 00000000000..3b8219e63b7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001.java
@@ -0,0 +1,379 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.CurrentContendedMonitor;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.CurrentContendedMonitor.
+ *
+ * See curcontmonitor001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class curcontmonitor001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.CurrentContendedMonitor";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "curcontmonitor001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_GET_CURRENT_CONTENDED_MONITOR;
+    static final String VM_CAPABILITY_NAME = "canGetCurrentContendedMonitor";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.CurrentContendedMonitor";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.CurrentContendedMonitor;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_THREAD_NAME = curcontmonitor001a.THREAD_NAME;
+    static final String THREAD_FIELD_NAME = curcontmonitor001a.THREAD_FIELD_NAME;
+    static final String MONITOR_FIELD_NAME = curcontmonitor001a.MONITOR_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new curcontmonitor001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Checking VM capability \n");
+
+                // check for VM capability
+                log.display("Checking VM capability: " + VM_CAPABILITY_NAME);
+                if (!debugee.getCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME)) {
+                    out.println("TEST PASSED: unsupported VM capability: "
+                                + VM_CAPABILITY_NAME);
+                    return PASSED;
+                }
+
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + THREAD_FIELD_NAME);
+                threadID = queryObjectID(classID, THREAD_FIELD_NAME, JDWP.Tag.THREAD);
+                log.display("  got threadID: " + threadID);
+
+                // query debuggee for objectID value for owned monitor from a static field
+                log.display("Getting objectID value for owned monitor from static field: "
+                            + MONITOR_FIELD_NAME);
+                long monitorID = queryObjectID(classID,
+                            MONITOR_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + monitorID);
+
+                // suspend all threads into debuggee
+                log.display("Suspending all threads into debuggee");
+                debugee.suspend();
+                log.display("  debuggee suspended");
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID, monitorID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume all threads into debuggee
+                log.display("resuming all threads into debuggee");
+                debugee.resume();
+                log.display("  debuggee resumed");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID, long monitorID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract object tag
+        byte tag = (byte)0;
+        try {
+            tag = reply.getByte();
+            log.display("    tag: " + tag);
+        } catch (BoundException e) {
+            log.complain("Unable to extract tag for contended monitor object from reply packet:\n\t"
+                    + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract objectID
+        long objectID = 0;
+        try {
+            objectID = reply.getObjectID();
+            log.display("    objectID: " + objectID);
+        } catch (BoundException e) {
+            log.complain("Unable to extract contended monitor objectID from reply packet:\n\t"
+                    + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that tag is an OBJECT tag
+        if (tag != JDWP.Tag.OBJECT) {
+            log.complain("Unexpected tag for monitor object received:" + tag
+                        + " (expected" + JDWP.Tag.OBJECT);
+            success = false;
+        }
+
+        // check that objectID is not negative integer
+        if (objectID < 0) {
+            log.complain("Negative value of objectID received: " + objectID);
+            success = false;
+        }
+
+        // check that objectID is as expected
+        if (objectID != monitorID) {
+            log.display("Unexpected monitor objectID received: " + objectID
+                        + " (expected" + monitorID);
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001/TestDescription.java
new file mode 100644
index 00000000000..98d03ce59d1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001/TestDescription.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: CurrentContendedMonitor
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that the expected objectID of monitor object
+ *     returned for the tested thread.
+ *     Test consists of two compoments:
+ *         debugger: curcontmonitor001
+ *         debuggee: curcontmonitor001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Also debugger
+ *     suspends the thread before sending the tested command. The tested
+ *     thread is waiting for the object at this moment.
+ *     Then, debugger creates command packet for ThreadReference.CurrenContendedMonitor
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts objectID for the thread current contended monitor. Also
+ *     test checks that the extracted objectID is equals to the expected one.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     For JDK 1.4.0-beta3 (build 1.4.0-beta3-b84) and earlier this test passed
+ *     because target VM does not support VM capability: canGetCurrentContendedMonitor
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.CurrentContendedMonitor.curcontmonitor001
+ *        nsk.jdwp.ThreadReference.CurrentContendedMonitor.curcontmonitor001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.CurrentContendedMonitor.curcontmonitor001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001a.java
new file mode 100644
index 00000000000..eb4ebeae8e2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/CurrentContendedMonitor/curcontmonitor001a.java
@@ -0,0 +1,151 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.CurrentContendedMonitor;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class curcontmonitor001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String THREAD_FIELD_NAME = "thread";
+    public static final String MONITOR_FIELD_NAME = "monitor";
+
+    // frames count for tested thread in recursive method invokation
+    public static final int FRAMES_COUNT = 10;
+
+    // notification object to notify debuggee that thread is started
+    private static Object threadStarting = new Object();
+    // object which thread will wait for before being interruted
+    private static Object threadWaiting = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        curcontmonitor001a _curcontmonitor001a = new curcontmonitor001a();
+        System.exit(curcontmonitor001.JCK_STATUS_BASE + _curcontmonitor001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+        long timeout = argumentHandler.getWaitTime() * 60 * 1000; // milliseconds
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.thread = new TestedClass(THREAD_NAME);
+
+        // start the thread and wait for notification from it
+        synchronized (threadStarting) {
+            TestedClass.thread.start();
+            try {
+                threadStarting.wait();
+            } catch (InterruptedException e) {
+                log.complain("Interruption while waiting for thread started:\n\t" + e);
+                pipe.println(curcontmonitor001.ERROR);
+                log.display("Debugee FAILED");
+                return curcontmonitor001.FAILED;
+            }
+
+            // ensure that tested thread is waiting for monitor object
+            synchronized (TestedClass.thread.monitor) {
+                // send debugger signal READY
+                log.display("Sending signal to debugger: " + curcontmonitor001.READY);
+                pipe.println(curcontmonitor001.READY);
+            }
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + curcontmonitor001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // interrupt waiting thread
+        log.display("Interrupting tested thread being waited");
+        TestedClass.thread.interrupt();
+
+        // check received signal
+        if (signal == null || !signal.equals(curcontmonitor001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + curcontmonitor001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return curcontmonitor001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return curcontmonitor001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+        // field with monitor object which thread will infinitively wait for
+        public static volatile Object monitor = new Object();
+
+        public TestedClass(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display("Tested thread started");
+
+            synchronized (monitor) {
+
+                // notify debuggee that thread started
+                synchronized (threadStarting) {
+                    threadStarting.notifyAll();
+                }
+
+                // wait infinitely for monitor object
+                try {
+                    monitor.wait();
+                } catch (InterruptedException e) {
+                    log.display("Tested thread interrupted");
+                }
+            }
+
+            log.display("Tested thread finished");
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java
new file mode 100644
index 00000000000..d9a91a67890
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001.
+ * VM Testbase keywords: [jpda, jdwp, feature_jdk6_jpda, vm6, monitoring, quarantine]
+ * VM Testbase comments: JDK-7199837
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: ForceEarlyReturn
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: forceEarlyReturn001
+ *         debuggee: forceEarlyReturn001a
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Debuggee VM create thread(class nsk.share.jpda.ForceEarlyReturnTestThread is used) which sequentially call
+ *     test methods with different return value's type:
+ *         - void
+ *         - all primitive types
+ *         - all wrappers of primitive types
+ *         - String
+ *         - Object
+ *         - array of java.lang.Object
+ *         - Thread
+ *         - ThreadGroup
+ *         - Class object
+ *         - ClassLoader
+ *     Also test thread class contains static fields with predefined values which should be returned through
+ *     ForceEarlyReturn('expectedXXXValue') and fields with values which can be used to check is ForceEarlyReturn returns
+ *     TYPE_MISMATCH error if value's type in command doesn't match method's return type('invalidXXXValue').
+ *     Debugger set breakpoints in test thread's methods and create instances of 'nsk.share.jdwp.JDWP.Value'
+ *     based on values predefined in ForceEarlyReturnTestThread (both valid and invalid values are created).
+ *     Debugger obtains threadID for test thread.
+ *     Debugger force debugee start test thread and wait while BreakpointEvents occurs. When debuggee's
+ *     test thread stop at breakpoint debugger first creates command packet for ForceEarlyReturn command with the
+ *     found threadID and corresponding instance of invalid 'nsk.share.jdwp.JDWP.Value', writes
+ *     packet to the transport channel, and waits for a reply packet. When reply packet is received, debugger
+ *     parses the packet structure and checks that reply contain TYPE_MISMATCH error. Then debugger send command
+ *     with correct value, checks that reply is empty and resume debuggee VM.
+ *     Test thread in debuggee VM checks that value returned from test methods equals predefined value and no
+ *     instructions was executed in called method after force return (finally blocks are not executed too).
+ *     When all breakpoint events occured debugger sends debuggee signal to finish test thread execution.
+ *     Debuggee waits when test thread finish execution and checks is any errors occured during test.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn001;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+import nsk.share.jdwp.JDWP.Value;
+import nsk.share.jpda.ForceEarlyReturnTestThread;
+
+public class forceEarlyReturn001
+extends TestDebuggerType1
+{
+    // data needed to create JDWP command,
+    // also this class create breakpoint in method which should be forced to return
+    class TestData
+    {
+        public TestData(long classID, String methodName, int lineNumber, long threadID, Value value, Value invalidValue)
+        {
+            breakpointID = debuggee.requestBreakpointEvent(
+                    JDWP.TypeTag.CLASS,
+                    classID,
+                    debuggee.getMethodID(classID, methodName, true),
+                    lineNumber,
+                    JDWP.SuspendPolicy.EVENT_THREAD);
+
+            this.value = value;
+            this.invalidValue = invalidValue;
+            this.threadID = threadID;
+        }
+
+        public int breakpointID;
+        public Value value;
+        public Value invalidValue;
+        public long threadID;
+    }
+
+    protected String getDebugeeClassName()
+    {
+        return "nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a";
+    }
+
+    public static void main (String argv[])
+    {
+        System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out)
+    {
+        return new forceEarlyReturn001().runIt(argv, out);
+    }
+
+    // send command and receive empty reply
+    // all asserts should be done in debuggee
+    private void sendCommand(long threadID, Value value, boolean expectError, int errorCode)
+    {
+        try
+        {
+            int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.ForceEarlyReturn;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("threadID = " + threadID);
+            log.display("Value = " + value);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addObjectID(threadID);
+            command.addValue(value);
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command, expectError, errorCode);
+
+            if(expectError)
+                return;
+
+            log.display("Empty reply");
+
+            if(!reply.isParsed())
+            {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        }
+        catch(Exception e)
+        {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    private TestData[] testData;
+
+    // create Value objects which should be send in command packet and
+    // initialize breapoints in tested methods
+    private void initTestData()
+    {
+        long classID = debuggee.getReferenceTypeID(createTypeSignature(ForceEarlyReturnTestThread.class.getName()));
+
+        Value testValues[] = new Value[ForceEarlyReturnTestThread.testedTypesNames.length + 1];
+        Value testInvalidValues[] = new Value[ForceEarlyReturnTestThread.testedTypesNames.length + 1];
+
+        testValues[0] = new JDWP.Value(JDWP.Tag.VOID, new Long(0));
+
+        for(int i = 1; i < ForceEarlyReturnTestThread.testedTypesNames.length; i++)
+        {
+            testValues[i] = debuggee.getStaticFieldValue(
+                    classID,
+                    debuggee.getClassFieldID(classID, "expected" + ForceEarlyReturnTestThread.testedTypesNames[i] + "Value", true));
+        }
+
+        for(int i = 0; i < ForceEarlyReturnTestThread.testedTypesNames.length; i++)
+        {
+            testInvalidValues[i] = debuggee.getStaticFieldValue(
+                    classID,
+                    debuggee.getClassFieldID(classID, "invalid" + ForceEarlyReturnTestThread.testedTypesNames[i] + "Value", true));
+        }
+
+        long threadID = debuggee.getThreadID(forceEarlyReturn001a.testThreadName);
+
+        testData = new TestData[ForceEarlyReturnTestThread.testedTypesNames.length];
+
+        for(int i = 0; i < ForceEarlyReturnTestThread.testedTypesNames.length; i++)
+        {
+            testData[i] = new TestData(classID,
+                    ForceEarlyReturnTestThread.testedTypesNames[i] + "Method",
+                    ForceEarlyReturnTestThread.breakpointLines[i],
+                    threadID,
+                    testValues[i],
+                    testInvalidValues[i]);
+        }
+    }
+
+    public void doTest()
+    {
+        initTestData();
+
+        pipe.println(forceEarlyReturn001a.COMMAND_START_EXECUTION);
+
+        if(!isDebuggeeReady())
+            return;
+
+        for(int i = 0; i < testData.length; i++)
+        {
+            // wait when tested thread call method with breapoint
+            debuggee.waitForBreakpointEvent(testData[i].breakpointID);
+
+            log.display("Send invalid command: valid value: " + testData[i].value + " invalid value: " + testData[i].invalidValue);
+            // send ForceEarlyReturn command with invalid value
+            sendCommand(testData[i].threadID, testData[i].invalidValue, true, JDWP.Error.TYPE_MISMATCH);
+
+            log.display("Send valid command: valid value: " + testData[i].value);
+            // send ForceEarlyReturn command
+            sendCommand(testData[i].threadID, testData[i].value, false, 0);
+
+            // resume debuggee
+            debuggee.resume();
+        }
+
+        pipe.println(forceEarlyReturn001a.COMMAND_END_EXECUTION);
+
+        if(!isDebuggeeReady())
+            return;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001a.java
new file mode 100644
index 00000000000..e524fe022b0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001a.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn001;
+
+import nsk.share.TestBug;
+import nsk.share.jdwp.*;
+import nsk.share.jpda.ForceEarlyReturnTestThread;
+
+public class forceEarlyReturn001a extends AbstractJDWPDebuggee {
+    public static String testThreadName = "ForceEarlyReturnTestThread";
+
+    private ForceEarlyReturnTestThread testThread;
+
+    protected void init(String args[]) {
+        super.init(args);
+
+        // create instance of ForceEarlyReturnTestThread during initialization
+        // to let debugger obtain threadID for this thread
+        testThread = new ForceEarlyReturnTestThread(log, true, 1);
+        testThread.setName(testThreadName);
+        testThread.start();
+    }
+
+    public static String COMMAND_START_EXECUTION = "startExecution";
+
+    public static String COMMAND_END_EXECUTION = "endExecution";
+
+    public boolean parseCommand(String command) {
+        if (super.parseCommand(command))
+            return true;
+
+        // force ForceEarlyReturnTestThread start execution
+        if (command.equals(COMMAND_START_EXECUTION)) {
+            testThread.startExecuion();
+            return true;
+        } else
+        // wait when ForceEarlyReturnTestThread finish execution and check
+        // is any errors occured during test
+        if (command.equals(COMMAND_END_EXECUTION)) {
+            try {
+                testThread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace(log.getOutStream());
+                throw new TestBug("Unexpected exception: " + e);
+            }
+
+            if (!testThread.getSuccess()) {
+                setSuccess(false);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void main(String args[]) {
+        new forceEarlyReturn001a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
new file mode 100644
index 00000000000..858b80910e8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: ForceEarlyReturn
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: forceEarlyReturn002
+ *         debuggee: forceEarlyReturn002a
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Test performs checks for cases when incorrect data are send in command.
+ *     Following cases are tested:
+ *         - create command with threadID = 1, expect INVALID_OBJECT error
+ *         - debuggee creates test thread which sequentially changes its state in following order:
+ *             - thread not started
+ *             - thread is running
+ *             - thread is sleeping
+ *             - thread in Object.wait()
+ *             - thread wait on java monitor
+ *             - thread is finished
+ *         Debugger try execute command for this thread without thread suspending for states: thread running, thread sleeping,
+ *         thread waiting, thread blocked, THREAD_NOT_SUSPENDED error is expected.
+ *         When test thread has finish execution debugger suspends thread and call command for this thread, INVALID_THREAD
+ *         error is expected, then, debugger resumes test thread and call command again, INVALID_THREAD error should
+ *         be returned in reply.
+ *         - debuggee starts test thread which executes infinite loop in native method, debugger calls command for
+ *         this thread(without suspending) and expects THREAD_NOT_SUSPENDED error. Then, debugger suspends this thread
+ *         and calls command again, OPAQUE_FRAME error is expected.
+ *         - debugger creates ThreadStartEventRequest with suspend policy 'JDWP.SuspendPolicy.ALL' and forces debuggee start new thread.
+ *         When ThreadStartEvent is received debugger obtains threadID from this event and calls command for this thread. Since
+ *         just started thread has no frames yet NO_MORE_FRAMES error is expected.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002
+ * @run main/othervm/native PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn002;
+
+import java.io.*;
+
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+import nsk.share.jdwp.JDWP.Value;
+import nsk.share.jpda.AbstractDebuggeeTest;
+import nsk.share.jpda.StateTestThread;
+
+public class forceEarlyReturn002 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return "nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002a";
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new forceEarlyReturn002().runIt(argv, out);
+    }
+
+    private void sendCommand(long threadID, Value value, boolean expectError, int errorCode) {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.ForceEarlyReturn;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("threadID = " + threadID);
+            log.display("Value = " + value);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addObjectID(threadID);
+            command.addValue(value);
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command, expectError, errorCode);
+
+            if (expectError)
+                return;
+
+            log.display("Empty reply");
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    private int createThreadStartEventRequest() {
+        try {
+            // create command packet and fill requred out data
+            CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+            command.addByte(JDWP.EventKind.THREAD_START);
+            command.addByte(JDWP.SuspendPolicy.ALL);
+            command.addInt(0);
+            command.setLength();
+
+            transport.write(command);
+
+            ReplyPacket reply;
+            reply = getReply(command);
+
+            int requestID = reply.getInt();
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in request reply packet at: " + reply.offsetString());
+                return -1;
+            }
+
+            return requestID;
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+
+            return -1;
+        }
+    }
+
+    public void doTest() {
+        Value value;
+
+        value = new Value(JDWP.Tag.INT, 0);
+        // create command with invalid trheadID, expect INVALID_OBJECT error
+        sendCommand(-1, value, true, JDWP.Error.INVALID_OBJECT);
+
+        // create StateTestThread
+        pipe.println(AbstractDebuggeeTest.COMMAND_CREATE_STATETESTTHREAD);
+
+        if (!isDebuggeeReady())
+            return;
+
+        // switch thread state to RUNNING to get threadID (can't get threadID
+        // when thread not running)
+        pipe.println(AbstractDebuggeeTest.COMMAND_NEXTSTATE_STATETESTTHREAD);
+
+        if (!isDebuggeeReady())
+            return;
+
+        long threadID = debuggee.getThreadID(AbstractDebuggeeTest.stateTestThreadName);
+
+        int state = 2;
+
+        // check following states: "RUNNING", "SLEEPING", "WAIT", "MONITOR"
+        while (state++ < StateTestThread.stateTestThreadStates.length) {
+            sendCommand(threadID, value, true, JDWP.Error.THREAD_NOT_SUSPENDED);
+
+            pipe.println(AbstractDebuggeeTest.COMMAND_NEXTSTATE_STATETESTTHREAD);
+
+            if (!isDebuggeeReady())
+                return;
+        }
+
+        // here thread has exited (state "ZOMBIE")
+        sendCommand(threadID, value, true, JDWP.Error.INVALID_THREAD);
+
+        // suspend thread, but also expect INVALID_THREAD error
+        debuggee.suspendThread(threadID);
+        sendCommand(threadID, value, true, JDWP.Error.INVALID_THREAD);
+
+        // create thread which executes native method
+        pipe.println(forceEarlyReturn002a.COMMAND_STOP_THREAD_IN_NATIVE);
+
+        if (!isDebuggeeReady())
+            return;
+
+        threadID = debuggee.getThreadID(forceEarlyReturn002a.testThreadInNativeName);
+
+        // thread in native not suspended, expect THREAD_NOT_SUSPENDED error
+        sendCommand(threadID, value, true, JDWP.Error.THREAD_NOT_SUSPENDED);
+
+        debuggee.suspendThread(threadID);
+        // suspended thread in native, expect OPAQUE_FRAME error
+        sendCommand(threadID, value, true, JDWP.Error.OPAQUE_FRAME);
+
+        // create request for ThreadStart event
+        int requestID = createThreadStartEventRequest();
+
+        // force debuggee start new thread
+        pipe.println(forceEarlyReturn002a.COMMAND_START_NEW_THREAD);
+
+        // receive ThreadStart event
+        EventPacket eventPacket = receiveSingleEvent(JDWP.EventKind.THREAD_START, requestID);
+
+        try {
+            threadID = eventPacket.getObjectID();
+
+            value = new Value(JDWP.Tag.VOID, 0);
+            // just started thread has no frames, expect NO_MORE_FRAMES error
+            sendCommand(threadID, value, true, JDWP.Error.NO_MORE_FRAMES);
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+
+        clearRequest(JDWP.EventKind.THREAD_START, requestID);
+
+        debuggee.resume();
+
+        if (!isDebuggeeReady())
+            return;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.java
new file mode 100644
index 00000000000..131ab11e8f8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ThreadReference.ForceEarlyReturn.forceEarlyReturn002;
+
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+
+public class forceEarlyReturn002a extends AbstractJDWPDebuggee {
+    static {
+        try {
+            System.loadLibrary("forceEarlyReturn002a");
+        } catch (UnsatisfiedLinkError e) {
+            System.out.println("UnsatisfiedLinkError when load library 'forceEarlyReturn002a'");
+            e.printStackTrace(System.out);
+            System.exit(Consts.JCK_STATUS_BASE + Consts.TEST_FAILED);
+        }
+    }
+
+    public final static String testThreadInNativeName = "forceEarlyReturn002aTestThreadInNative";
+
+    public final static String COMMAND_STOP_THREAD_IN_NATIVE = "stopInNative";
+
+    public final static String COMMAND_START_NEW_THREAD = "startNewThread";
+
+    public boolean parseCommand(String command) {
+        if (super.parseCommand(command))
+            return true;
+
+        if (command.equals(COMMAND_STOP_THREAD_IN_NATIVE)) {
+            stopThreadInNative();
+
+            return true;
+        } else if (command.equals(COMMAND_START_NEW_THREAD)) {
+            Thread thread = new Thread(new Runnable() {
+                public void run() {
+                    log.display("Thread exit");
+                }
+            });
+
+            thread.setName("forceEarlyReturn002a_NewThread");
+            thread.start();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private Thread testThreadInNative;
+
+    private void stopThreadInNative() {
+        testThreadInNative = new Thread(new Runnable() {
+            public void run() {
+                Thread.currentThread().setName(testThreadInNativeName);
+                log.display("Enter native method");
+                nativeMethod(forceEarlyReturn002a.this);
+            }
+        });
+
+        testThreadInNative.start();
+
+        while (!threadInNative)
+            Thread.yield();
+    }
+
+    public volatile boolean threadInNative;
+
+    private static native int nativeMethod(Object object);
+
+    public static void main(String args[]) {
+        new forceEarlyReturn002a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.c b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.c
new file mode 100644
index 00000000000..f2ed359cc5c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2007, 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.
+ */
+
+#include "jni.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef JNI_ENV_PTR
+
+#ifdef __cplusplus
+#define JNI_ENV_ARG_2(x, y) y
+#define JNI_ENV_ARG_3(x, y, z) y, z
+#define JNI_ENV_ARG_4(x, y, z, a) y, z, a
+#define JNI_ENV_PTR(x) x
+#else
+#define JNI_ENV_ARG_2(x,y) x, y
+#define JNI_ENV_ARG_3(x, y, z) x, y, z
+#define JNI_ENV_ARG_4(x, y, z, a) x, y, z, a
+#define JNI_ENV_PTR(x) (*x)
+#endif
+
+#endif
+
+int always_true = 1;
+
+JNIEXPORT jint JNICALL
+Java_nsk_jdwp_ThreadReference_ForceEarlyReturn_forceEarlyReturn002_forceEarlyReturn002a_nativeMethod(JNIEnv *env, jobject classObject, jobject object)
+{
+    int dummy_counter = 0;
+    // notify another thread that thread in native method
+    jclass klass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, object));
+    jfieldID field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, klass, "threadInNative", "Z"));
+    JNI_ENV_PTR(env)->SetBooleanField(JNI_ENV_ARG_4(env, object, field, 1));
+
+    // execute infinite loop to be sure that thread in native method
+    while(always_true)
+    {
+        // Need some dummy code so the optimizer does not remove this loop.
+        dummy_counter = dummy_counter < 1000 ? 0 : dummy_counter + 1;
+    }
+    // The optimizer can be surprisingly clever.
+    // Use dummy_counter so it can never be optimized out.
+    // This statement will always return 0.
+    return dummy_counter >= 0 ? 0 : 1;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001.java
new file mode 100644
index 00000000000..0a6770fe338
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001.java
@@ -0,0 +1,340 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.FrameCount;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.FrameCount.
+ *
+ * See framecnt001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class framecnt001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.FrameCount";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "framecnt001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.FrameCount";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.FrameCount;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = framecnt001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = framecnt001a.THREAD_NAME;
+
+    // expected number of frames count
+    static final int FRAMES_COUNT = framecnt001a.FRAMES_COUNT;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new framecnt001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // suspend tested thread into debyggee
+                log.display("Suspending thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract frames count
+        int frameCount = 0;
+        try {
+            frameCount = reply.getInt();
+            log.display("  frameCount: " + frameCount);
+        } catch (BoundException e) {
+            log.complain("Unable to extract frames count from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that frames count is not negative
+        if (frameCount < 0) {
+            log.complain("Negative value of frames count in reply packet: "
+                        + frameCount);
+            success = false;
+        }
+
+        // check that thread has an expected state
+        if (frameCount != FRAMES_COUNT) {
+            log.complain("Unexpected number of frames count returned: "
+                        + frameCount + " (expected: " + FRAMES_COUNT + ")");
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001/TestDescription.java
new file mode 100644
index 00000000000..087178b0490
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001/TestDescription.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/FrameCount/framecnt001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: FrameCount
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned number of thread frames is the same as expected.
+ *     Test consists of two compoments:
+ *         debugger: framecnt001
+ *         debuggee: framecnt001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Also debugger
+ *     suspends the thread before sending the tested command.
+ *     Then, debugger creates command packet for ThreadReference.FrameCount
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts number of frames in the thread. Also test checks that
+ *     returned frames count is not negative and has the expected value.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.FrameCount.framecnt001
+ *        nsk.jdwp.ThreadReference.FrameCount.framecnt001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.FrameCount.framecnt001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001a.java
new file mode 100644
index 00000000000..eba135fe2b4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/FrameCount/framecnt001a.java
@@ -0,0 +1,154 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.FrameCount;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class framecnt001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    // frames count for tested thread in recursive method invokation
+    public static final int FRAMES_COUNT = 10;
+
+    // notification object to notify debuggee that thread is ready
+    private static Object threadReady = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        framecnt001a _framecnt001a = new framecnt001a();
+        System.exit(framecnt001.JCK_STATUS_BASE + _framecnt001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadReady) {
+                TestedClass.thread.start();
+                try {
+                    threadReady.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + framecnt001.READY);
+                    pipe.println(framecnt001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(framecnt001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + framecnt001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(framecnt001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + framecnt001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return framecnt001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return framecnt001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        int frames = 0;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display("Tested thread started");
+
+            // make remaining frames already having one
+            frames = 1;
+            makeFrames(FRAMES_COUNT - frames);
+        }
+
+        // recursive make thread frames and notify debuggee
+        public void makeFrames(int count) {
+            frames++;
+            count--;
+            int local = frames + count;
+            if (count > 0) {
+                makeFrames(count);
+            } else {
+                log.display("Thread frames made: " + frames);
+
+                // notify debuggee that thread ready for testing
+                synchronized (threadReady) {
+                    threadReady.notifyAll();
+                }
+
+                // wait for lock object released
+                synchronized (threadLock) {
+                    log.display("Tested thread finished");
+                }
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001.java
new file mode 100644
index 00000000000..42ab3aa776e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001.java
@@ -0,0 +1,436 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Frames;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Frames.
+ *
+ * See frames001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class frames001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Frames";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "frames001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Frames";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Frames;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = frames001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = frames001a.THREAD_NAME;
+
+    // names of the methods with frames
+    static final String TESTED_METHOD_NAME = frames001a.METHOD_NAME;
+    static final String RUN_METHOD_NAME = "run";
+
+    // expected number of frames count
+    static final int START_FRAME_INDEX = 2;
+    static final int FRAMES_COUNT = frames001a.FRAMES_COUNT - START_FRAME_INDEX;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new frames001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for methodID of the recursive method
+                log.display("Getting methodID by name: " + TESTED_METHOD_NAME);
+                long methodID = debugee.getMethodID(classID, TESTED_METHOD_NAME, true);
+                log.display("  got methodID: " + methodID);
+
+                // query debuggee for methodID of the run() method
+                log.display("Getting methodID by name: " + RUN_METHOD_NAME);
+                long runMethodID = debugee.getMethodID(classID, RUN_METHOD_NAME, true);
+                log.display("  got methodID: " + runMethodID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // suspend tested thread into debyggee
+                log.display("Suspending thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+                log.display("  thread suspended");
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID, methodID, runMethodID, classID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID, long methodID, long runMethodID, long classID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  startFrame: " + START_FRAME_INDEX);
+        command.addInt(START_FRAME_INDEX);
+        log.display("  length: " + FRAMES_COUNT);
+        command.addInt(FRAMES_COUNT);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract number of frames
+        int frames = 0;
+        try {
+            frames = reply.getInt();
+            log.display("  frames: " + frames);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of frames from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that frames count is not negative
+        if (frames < 0) {
+            log.complain("Negative value of frames count in reply packet: "
+                        + frames);
+            success = false;
+        }
+
+        // check that thread has an expected state
+        if (frames != FRAMES_COUNT) {
+            log.complain("Unexpected number of frames returned: "
+                        + frames + " (expected: " + FRAMES_COUNT + ")");
+            success = false;
+        }
+
+        // use methodID of the recursive method to check all frames except the last one
+        long checkedMethodID = methodID;
+
+        // extarct frame IDs and locations
+        for (int i = 0; i < frames; i++) {
+
+            log.display("  frame #" + i + ":");
+
+            // extract frame ID
+            long frameID = 0;
+            try {
+                frameID = reply.getFrameID();
+                log.display("    frameID: " + frameID);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " frameID from reply packet:\n\t"
+                        + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract frame location
+            JDWP.Location location = null;
+            try {
+                location = reply.getLocation();
+                log.display("    location: " + location);
+            } catch (BoundException e) {
+                e.printStackTrace(log.getOutStream());
+                log.complain("Unable to extract " + i + " frame location from reply packet:\n\t"
+                        + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check that frameID is not negative integer
+            if (frameID < 0) {
+                log.complain("Negative value of " + i + " frameID: "
+                            + frameID);
+                success = false;
+            }
+
+            // check that type tag of location is CLASS tag
+            if (location.getTag() != JDWP.TypeTag.CLASS) {
+                log.complain("Unexpected type tag of " + i + " frame location: "
+                            + location.getTag() + "(expected: " + JDWP.TypeTag.CLASS + ")");
+                success = false;
+            }
+
+            // check that classID of location is equal to original classID
+            if (location.getClassID() != classID) {
+                log.complain("Unexpected classID of " + i + " frame location: "
+                            + location.getClassID() + "(expected: " + classID + ")");
+                success = false;
+            }
+
+            // use methodID of run() method for checking last frame
+            if (i == frames - 1) {
+                checkedMethodID = runMethodID;
+            }
+
+            // check that methodID of location is equal to one of original methodIDs
+            if (location.getMethodID() != checkedMethodID) {
+                log.complain("Unexpected methodID of " + i + " frame location: "
+                            + location.getMethodID() + "(expected: " + checkedMethodID + ")");
+                success = false;
+            }
+
+            // check that code index of location is not negative integer
+            if (location.getIndex() < 0) {
+                log.complain("Negative value of index of " + i + " frame location: "
+                            + location.getIndex());
+                success = false;
+            }
+
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001/TestDescription.java
new file mode 100644
index 00000000000..a12be3c1fe4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001/TestDescription.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Frames/frames001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Frames
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks the following assertions:
+ *         1. Number of returned frames is the same as requested
+ *         2. Location of each frame belongs to the tested class
+ *         3. Location of the last frame belongs to the method run()
+ *         4. Locations of all other frames belogs to the method makeFrames()
+ *         5. Each frameID is a not negative integer value.
+ *     Test consists of two compoments:
+ *         debugger: frames001
+ *         debuggee: frames001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Also debugger
+ *     suspends the thread before sending the tested command.
+ *     Then, debugger creates command packet for ThreadReference.Frames
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts number of frames in the thread. Also test checks above
+ *     mentioned assertions.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Frames.frames001
+ *        nsk.jdwp.ThreadReference.Frames.frames001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Frames.frames001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001a.java
new file mode 100644
index 00000000000..d106259c431
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Frames/frames001a.java
@@ -0,0 +1,157 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Frames;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class frames001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+    public static final String METHOD_NAME = "makeFrames";
+
+    // frames count for tested thread in recursive method invokation
+    public static final int FRAMES_COUNT = 10;
+
+    // notification object to notify debuggee that thread is ready
+    private static Object threadReady = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        frames001a _frames001a = new frames001a();
+        System.exit(frames001.JCK_STATUS_BASE + _frames001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadReady) {
+                TestedClass.thread.start();
+                try {
+                    threadReady.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + frames001.READY);
+                    pipe.println(frames001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(frames001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + frames001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(frames001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + frames001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return frames001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return frames001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        int frames = 0;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display("Tested thread started");
+
+            // make remaining frames already having one
+            frames = 1;
+            makeFrames(FRAMES_COUNT - frames);
+
+        }
+
+        // recursive make thread frames and notify debuggee
+        public void makeFrames(int count) {
+            frames++;
+            count--;
+            int local = frames + count;
+            if (count > 0) {
+                makeFrames(count);
+            } else {
+                log.display("Thread frames made: " + frames);
+
+                // notify debuggee that thread ready for testing
+                synchronized (threadReady) {
+                    threadReady.notifyAll();
+                }
+
+                // wait for lock object released
+                synchronized (threadLock) {
+                    log.display("Tested thread finished");
+                }
+
+            }
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001.java
new file mode 100644
index 00000000000..722543cf8e1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001.java
@@ -0,0 +1,342 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Interrupt;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Interrupt.
+ *
+ * See interrupt001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class interrupt001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String RUN = "run";
+    static final String INTERRUPTED_TRUE = "interrupted/true";
+    static final String INTERRUPTED_FALSE = "interrupted/false";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Interrupt";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "interrupt001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Interrupt";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Interrupt;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = interrupt001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = interrupt001a.THREAD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new interrupt001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+                log.display("\n>>> Checking that tested thread was really interrupted \n");
+
+                // check if the thread was really interrupted
+                confirmThreadInterrupted();
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // there are no data to extract
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+    /**
+     * Wait for signal from debugee that thread was really interrupted
+     */
+    void confirmThreadInterrupted() {
+
+        // send debugee signal to run
+        log.display("Sending signal to debugee: " + RUN);
+        pipe.println(RUN);
+
+        // wait for signal DONE from debuggee
+        log.display("Waiting for signal from debugee: " + INTERRUPTED_TRUE);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        // check received signal
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + INTERRUPTED_TRUE + ")");
+        } else if (signal.equals(INTERRUPTED_TRUE)) {
+            log.display("Tested thread was interrupted into debuggee");
+        } else if (signal.equals(INTERRUPTED_FALSE)) {
+            log.complain("Tested thread was NOT interrupted into debuggee");
+            success = false;
+        } else {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + INTERRUPTED_TRUE + ")");
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001/TestDescription.java
new file mode 100644
index 00000000000..27741d78ec0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001/TestDescription.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Interrupt/interrupt001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Interrupt
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks following assertions:
+ *         1. Tested thread is really interrupted into debuggee VM.
+ *         2. Thread.isInterrupted() for the thread returns true.
+ *     Test consists of two compoments:
+ *         debugger: interrupt001
+ *         debuggee: interrupt001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. The tested thread
+ *     into debuggee is in a waiting state in this time and is ready for
+ *     interruption.
+ *     Then, debugger creates command packet for ThreadReference.Interrupt
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and ensures the packet does not has any data. Then debugger requests
+ *     from debuggee confirmation about thread interruption and checkes
+ *     above mentioned assertions.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     Modified due to fix of:
+ *     4759463 TEST_BUG: tests against ThreadReference.interrupt() should be corrected
+ *     Test fixed due to test bug:
+ *     4960198 TEST_BUG: race in nsk/jdwp/ThreadReference/Interrupt/interrupt001
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Interrupt.interrupt001
+ *        nsk.jdwp.ThreadReference.Interrupt.interrupt001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Interrupt.interrupt001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001a.java
new file mode 100644
index 00000000000..7677411b7d8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001a.java
@@ -0,0 +1,177 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Interrupt;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class interrupt001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    public static volatile boolean interrupted = false;
+
+    // notification object to notify debuggee that thread is started
+    private static Object threadStarting = new Object();
+    // object which thread will wait for before being interruted
+    private static Object threadWaiting = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        interrupt001a _interrupt001a = new interrupt001a();
+        System.exit(interrupt001.JCK_STATUS_BASE + _interrupt001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+        long timeout = argumentHandler.getWaitTime() * 60 * 1000; // milliseconds
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.thread = new TestedClass(THREAD_NAME);
+
+        // start the thread and wait for notification from it
+        synchronized (threadStarting) {
+            TestedClass.thread.start();
+            try {
+                threadStarting.wait();
+            } catch (InterruptedException e) {
+                log.complain("Interruption while waiting for thread started:\n\t" + e);
+                pipe.println(interrupt001.ERROR);
+                log.display("Debugee FAILED");
+                return interrupt001.FAILED;
+            }
+
+            // send debugger signal READY
+            log.display("Sending signal to debugger: " + interrupt001.READY);
+            pipe.println(interrupt001.READY);
+        }
+
+        // wait for signal RUN from debugeer
+        log.display("Waiting for signal from debugger: " + interrupt001.RUN);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(interrupt001.RUN)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + interrupt001.RUN + ")");
+            log.display("Debugee FAILED");
+            return interrupt001.FAILED;
+        }
+
+        // wait for thread finished in a waittime interval
+        if (TestedClass.thread.isAlive()) {
+            log.display("Waiting for tested thread finished for timeout: " + timeout);
+            try {
+                TestedClass.thread.join(timeout);
+            } catch (InterruptedException e) {
+                log.complain("Interruption while waiting for tested thread finished:\n\t" + e);
+                pipe.println(interrupt001.ERROR);
+                log.display("Debugee FAILED");
+                return interrupt001.FAILED;
+            }
+        }
+
+        // test if thread was interrupted by debugger
+        if (interrupt001a.interrupted) {
+            log.display("Sending signal to debugger: " + interrupt001.INTERRUPTED_TRUE);
+            pipe.println(interrupt001.INTERRUPTED_TRUE);
+        } else {
+            log.display("Sending signal to debugger: " + interrupt001.INTERRUPTED_FALSE);
+            pipe.println(interrupt001.INTERRUPTED_FALSE);
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + interrupt001.QUIT);
+        signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(interrupt001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + interrupt001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return interrupt001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return interrupt001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display("Tested thread started");
+
+            synchronized (threadWaiting) {
+
+                // notify debuggee that thread started
+                synchronized (threadStarting) {
+                    threadStarting.notifyAll();
+                }
+
+                // wait infinitely for notification object
+                try {
+                    threadWaiting.wait();
+                    log.complain("Tested thread NOT interrupted");
+                } catch (InterruptedException e) {
+                    log.display("Tested thread interrupted");
+                    interrupt001a.interrupted = true;
+                }
+            }
+
+            log.display("Tested thread finished");
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001.java
new file mode 100644
index 00000000000..5793eb8dc67
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001.java
@@ -0,0 +1,318 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Name;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Name.
+ *
+ * See name001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class name001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Name";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "name001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Name";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Name;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = name001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = name001a.THREAD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new name001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                long threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract thread name
+        String threadName = null;
+        try {
+            threadName = reply.getString();
+            log.display("  threadName: " + threadName);
+        } catch (BoundException e) {
+            log.complain("Unable to extract thread name from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that thread name is equal to the expected one
+        if (!threadName.equals(TESTED_THREAD_NAME)) {
+            log.complain("Unexpected thread name returned in the reply packet: "
+                        + threadName + " (expected: " + TESTED_THREAD_NAME + ")");
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001/TestDescription.java
new file mode 100644
index 00000000000..288b60483fb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Name/name001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Name
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned name of the tested thread is equal to the expected one.
+ *     Test consists of two compoments:
+ *         debugger: name001
+ *         debuggee: name001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field.
+ *     Then, debugger creates command packet for ThreadReference.Name
+ *     command with the found threadID as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts thread name. Also test checks that the name is equal
+ *     to the expected one.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Name.name001
+ *        nsk.jdwp.ThreadReference.Name.name001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Name.name001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001a.java
new file mode 100644
index 00000000000..de88acecf51
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001a.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Name;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class name001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    // notification object to notify debuggee that thread started
+    private static Object threadStarted = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        name001a _name001a = new name001a();
+        System.exit(name001.JCK_STATUS_BASE + _name001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadStarted) {
+                TestedClass.thread.start();
+                try {
+                    threadStarted.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + name001.READY);
+                    pipe.println(name001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(name001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + name001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(name001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + name001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return name001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return name001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // notify debuggee that thread really started
+            synchronized (threadStarted) {
+                threadStarted.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested thread finished");
+            }
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001.java
new file mode 100644
index 00000000000..75f1dc408e6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001.java
@@ -0,0 +1,442 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.OwnedMonitors;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.OwnedMonitors.
+ *
+ * See ownmonitors001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class ownmonitors001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.OwnedMonitors";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "ownmonitors001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_GET_OWNED_MONITOR_INFO;
+    static final String VM_CAPABILITY_NAME = "canGetOwnedMonitorInfo";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.OwnedMonitors";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.OwnedMonitors;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_THREAD_NAME = ownmonitors001a.THREAD_NAME;
+    static final String THREAD_FIELD_NAME = ownmonitors001a.THREAD_FIELD_NAME;
+    static final String OWNED_MONITOR_FIELD_NAME =
+                        ownmonitors001a.OWNED_MONITOR_FIELD_NAME;
+    static final String NOT_OWNED_MONITOR_FIELD_NAME =
+                        ownmonitors001a.NOT_OWNED_MONITOR_FIELD_NAME;
+
+    // expected number of owned monitors
+    static final int OWNED_MONITORS = 1;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new ownmonitors001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            long threadID = 0;
+            try {
+                log.display("\n>>> Checking VM capability \n");
+
+                // check for VM capability
+                log.display("Checking VM capability: " + VM_CAPABILITY_NAME);
+                if (!debugee.getCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME)) {
+                    out.println("TEST PASSED: unsupported VM capability: "
+                                + VM_CAPABILITY_NAME);
+                    return PASSED;
+                }
+
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + THREAD_FIELD_NAME);
+                threadID = queryObjectID(classID, THREAD_FIELD_NAME, JDWP.Tag.THREAD);
+                log.display("  got threadID: " + threadID);
+
+                // query debuggee for objectID value for owned monitor from a static field
+                log.display("Getting objectID value for owned monitor from static field: "
+                            + OWNED_MONITOR_FIELD_NAME);
+                long ownedMonitorID = queryObjectID(classID,
+                            OWNED_MONITOR_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + ownedMonitorID);
+
+                // query debuggee for objectID value for not owned monitor from a static field
+                log.display("Getting objectID value for not owned monitor from static field: "
+                            + NOT_OWNED_MONITOR_FIELD_NAME);
+                long notOwnedMonitorID = queryObjectID(classID,
+                            NOT_OWNED_MONITOR_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + notOwnedMonitorID);
+
+                // suspend tested thread into debyggee
+                log.display("Suspending thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+                log.display("  thread suspended");
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID, ownedMonitorID, notOwnedMonitorID);
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value of static class field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName
+                            + "\": " + value.getTag() + " (expected: " + tag + ")");
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID, long expectedObjectID, long unexpectedObjectID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract number of frames
+        int owned = 0;
+        try {
+            owned = reply.getInt();
+            log.display("  owned: " + owned);
+        } catch (BoundException e) {
+            log.complain("Unable to extract number of owned minitors from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that frames count is not negative
+        if (owned < 0) {
+            log.complain("Negative number of owned monitors in reply packet: "
+                        + owned);
+            success = false;
+        }
+
+        // check that thread has an expected state
+        if (owned != OWNED_MONITORS) {
+            log.complain("Unexpected number of owned monitors returned: "
+                        + owned + " (expected: " + OWNED_MONITORS + ")");
+            success = false;
+        }
+
+        boolean foundExpected = false;
+
+        // extract objectID's for owned monitors
+        for (int i = 0; i < owned; i++) {
+
+            log.display("  monitor #" + i + ":");
+
+            // extract object tag
+            byte tag = (byte)0;
+            try {
+                tag = reply.getByte();
+                log.display("    tag: " + tag);
+            } catch (BoundException e) {
+                log.complain("Unable to extract tag for monitor object from reply packet:\n\t"
+                        + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // extract objectID
+            long objectID = 0;
+            try {
+                objectID = reply.getObjectID();
+                log.display("    objectID: " + objectID);
+            } catch (BoundException e) {
+                log.complain("Unable to extract " + i + " monitor objectID from reply packet:\n\t"
+                        + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check that tag is an OBJECT tag
+            if (tag != JDWP.Tag.OBJECT) {
+                log.complain("Unexpected tag for monitor object received:" + tag
+                            + " (expected" + JDWP.Tag.OBJECT);
+                success = false;
+            }
+
+            // check that objectID is not negative integer
+            if (objectID < 0) {
+                log.complain("Negative value of " + i + " objectID received: "
+                            + objectID);
+                success = false;
+            }
+
+            // check that expected objectID is in the list
+            if (objectID == expectedObjectID) {
+                log.display("Found expected monitor objectID: " + expectedObjectID);
+                foundExpected = true;
+            }
+
+            // check that not expected objectID is in the list
+            if (objectID == unexpectedObjectID) {
+                log.complain("Unexpected objectID found in the list of owned monitors: "
+                            + unexpectedObjectID);
+                success = false;
+            }
+
+        }
+
+        // check if expected owned monitor objectID not found
+        if (!foundExpected) {
+            log.complain("Expected objectID not found in the list of owned monitors: "
+                        + expectedObjectID);
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001/TestDescription.java
new file mode 100644
index 00000000000..67c86da926e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001/TestDescription.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: OwnedMonitors
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Also test checks that only one owned monitor returned
+ *     for the tested thread.
+ *     Test consists of two compoments:
+ *         debugger: ownmonitors001
+ *         debuggee: ownmonitors001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Also debugger
+ *     suspends the thread before sending the tested command. The tested
+ *     thread is owning only one object monitor at this moment.
+ *     Then, debugger creates command packet for ThreadReference.OwnedMonitors
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts list ob objectIDs for thread owned monitors. Also test
+ *     checks above mentioned assertions.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     For JDK 1.4.0-beta3 (build 1.4.0-beta3-b84) and earlier this test passed
+ *     because target VM does not support VM capability: canGetOwnedMonitorInfo
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.OwnedMonitors.ownmonitors001
+ *        nsk.jdwp.ThreadReference.OwnedMonitors.ownmonitors001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.OwnedMonitors.ownmonitors001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001a.java
new file mode 100644
index 00000000000..0f929bcdac4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001a.java
@@ -0,0 +1,147 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.OwnedMonitors;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class ownmonitors001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String THREAD_FIELD_NAME = "thread";
+    public static final String OWNED_MONITOR_FIELD_NAME = "ownedMonitor";
+    public static final String NOT_OWNED_MONITOR_FIELD_NAME = "notOwnedMonitor";
+
+    // notification object to notify debuggee that thread is ready
+    private static Object threadReady = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        ownmonitors001a _ownmonitors001a = new ownmonitors001a();
+        System.exit(ownmonitors001.JCK_STATUS_BASE + _ownmonitors001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadReady) {
+                TestedClass.thread.start();
+                try {
+                    threadReady.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + ownmonitors001.READY);
+                    pipe.println(ownmonitors001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(ownmonitors001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + ownmonitors001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(ownmonitors001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + ownmonitors001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return ownmonitors001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return ownmonitors001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        // field with object whose monitor the tested thread owns
+        public static Object ownedMonitor = new Object();
+
+        // field with object whose monitor the tested thread does not own
+        public static Object notOwnedMonitor = new Object();
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display("Tested thread started");
+
+            // get ownership for the tested monitors
+            synchronized (ownedMonitor) {
+
+                // notify debuggee that thread ready for testing
+                synchronized (threadReady) {
+                    threadReady.notifyAll();
+                }
+
+                // wait for lock object released
+                synchronized (threadLock) {
+                    log.display("Tested thread finished");
+                }
+
+            }
+
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001.java
new file mode 100644
index 00000000000..f267821f511
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: OwnedMonitorsStackDepthInfo
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: ownedMonitorsStackDepthInfo001
+ *         debuggee: ownedMonitorsStackDepthInfo001a
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Debuggee during startup start test thread which acquires 6 different monitors in following ways:
+ *         - entering synchronized method
+ *         - entering synchronized method for thread object itself
+ *         - entering synchronized static method
+ *         - entering synchronized method for thread class itself
+ *         - entering synchronized block on non-static object
+ *         - acquire JNI monitor through JNI MonitorEnter()
+ *     Debuggee save information about acquired monitors(monitor instance and stack depth location
+ *     where monitor was acquired) in static fields with names monitor1, ..., monitor6 and depth1, ..., depth6 to
+ *     simplify access to this information for debugger.
+ *     Debugger obtains threadID for test thread.
+ *     Debugger creates command packet for OwnedMonitorsStackDepthInfo command with the
+ *     found threadID as an argument, writes packet to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure and extract
+ *     monitors ids and stack depth locations.
+ *     Debugger obtains information about acquired monitors from debuggee's static fields monitor1, ..., monitor6 and
+ *     depth1, ..., depth6 and checks that this data and data received via JDWP command are identical.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo001.ownedMonitorsStackDepthInfo001
+ * @run main/othervm/native/timeout=420 PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo001.ownedMonitorsStackDepthInfo001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo001;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+
+public class ownedMonitorsStackDepthInfo001 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo001.ownedMonitorsStackDepthInfo001a.class.getName();
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new ownedMonitorsStackDepthInfo001().runIt(argv, out);
+    }
+
+    // information for acquired monitor
+    static class MonitorInfo {
+        long monitorObjectID;
+
+        int depth;
+
+        public MonitorInfo(long monitorObjectID, int depth) {
+            this.monitorObjectID = monitorObjectID;
+            this.depth = depth;
+        }
+    }
+
+    private void testCommand() {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.OwnedMonitorsStackDepthInfo;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+
+            long threadID = debuggee.getThreadID(ownedMonitorsStackDepthInfo001a.lockingThreadName);
+            log.display("threadID = " + threadID);
+
+            debuggee.suspendThread(threadID);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addObjectID(threadID);
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command);
+
+            MonitorInfo expectedMonitors[] = new MonitorInfo[ownedMonitorsStackDepthInfo001a.expectedMonitorCounts];
+
+            long classID = debuggee.getReferenceTypeID(createTypeSignature(getDebugeeClassName()));
+
+            // obtain information about aquired monitors
+            for (int i = 0; i < ownedMonitorsStackDepthInfo001a.expectedMonitorCounts; i++) {
+                long monitorID = queryObjectID(classID, "monitor" + (i + 1));
+                int depth = ((Integer) debuggee.getStaticFieldValue(classID, "depth" + (i + 1), JDWP.Tag.INT).getValue()).intValue();
+
+                expectedMonitors[i] = new MonitorInfo(monitorID, depth);
+            }
+
+            int owned = reply.getInt();
+
+            log.display("owned = " + owned);
+
+            // check that correct value of 'owned' was received
+            if (owned != expectedMonitors.length) {
+                setSuccess(false);
+                log.complain("Unexpected value of 'owned': " + owned + ", expected value is " + expectedMonitors.length);
+            }
+
+            MonitorInfo receivedMonitors[] = new MonitorInfo[owned];
+
+            for (int i = 0; i < owned; i++) {
+                JDWP.Value value = reply.getValue();
+                log.display("tagged-ObjectID = " + value);
+
+                int stack_depth = reply.getInt();
+                log.display("stack_depth = " + stack_depth);
+
+                receivedMonitors[i] = new MonitorInfo(((Long) value.getValue()).longValue(), stack_depth);
+            }
+
+            // check that correct information about acquired monitors was received
+            for (int i = 0; i < owned; i++) {
+                boolean monitorFound = false;
+
+                for (int j = 0; j < expectedMonitors.length; j++) {
+                    if (receivedMonitors[i].monitorObjectID == expectedMonitors[j].monitorObjectID) {
+                        monitorFound = true;
+
+                        if (receivedMonitors[i].depth != expectedMonitors[j].depth) {
+                            setSuccess(false);
+                            log.complain("Unexpected monitor depth for monitor " + receivedMonitors[i].monitorObjectID + ": "
+                                    + receivedMonitors[i].depth + ", expected value is " + expectedMonitors[j].depth);
+                        }
+
+                        break;
+                    }
+                }
+
+                if (!monitorFound) {
+                    setSuccess(false);
+                    log.complain("Unexpected monitor: monitor" + receivedMonitors[i].monitorObjectID + " stack_depth" + receivedMonitors[i].depth);
+                }
+            }
+
+            if (!getSuccess()) {
+                log.complain("Expected monitors: ");
+                for (int i = 0; i < expectedMonitors.length; i++) {
+                    log.complain("monitor: " + expectedMonitors[i].monitorObjectID + " " + expectedMonitors[i].depth);
+                }
+            }
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        testCommand();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001a.java
new file mode 100644
index 00000000000..311722a5772
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo001/ownedMonitorsStackDepthInfo001a.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo001;
+
+import java.util.*;
+import nsk.share.TestBug;
+import nsk.share.jdwp.*;
+import nsk.share.locks.LockingThread;
+
+public class ownedMonitorsStackDepthInfo001a extends AbstractJDWPDebuggee {
+    public static Object monitor1;
+
+    public static int depth1;
+
+    public static Object monitor2;
+
+    public static int depth2;
+
+    public static Object monitor3;
+
+    public static int depth3;
+
+    public static Object monitor4;
+
+    public static int depth4;
+
+    public static Object monitor5;
+
+    public static int depth5;
+
+    public static Object monitor6;
+
+    public static int depth6;
+
+    public static int expectedMonitorCounts = 6;
+
+    public static String lockingThreadName = "LockingThread";
+
+    public static LockingThread lockingThread;
+
+    protected void init(String args[]) {
+        super.init(args);
+
+        List<String> locksTypes = new ArrayList<String>();
+
+        // LockingThread acquire 6 different monitors
+        locksTypes.add(LockingThread.SYNCHRONIZED_METHOD);
+        locksTypes.add(LockingThread.JNI_MONITOR_ENTER);
+        locksTypes.add(LockingThread.SYNCHRONIZED_THREAD_METHOD);
+        locksTypes.add(LockingThread.SYNCHRONIZED_STATIC_THREAD_METHOD);
+        locksTypes.add(LockingThread.SYNCHRONIZED_OBJECT_BLOCK);
+        locksTypes.add(LockingThread.SYNCHRONIZED_STATIC_METHOD);
+
+        lockingThread = new LockingThread(log, locksTypes);
+        lockingThread.setName(lockingThreadName);
+        lockingThread.start();
+        lockingThread.waitState();
+
+        // get information about acquired monitors and save it in static fields to simplify
+        // access to this information for debugger
+        LockingThread.DebugMonitorInfo monitorsInfo[] = lockingThread.getMonitorsInfo(true);
+
+        if (monitorsInfo.length != 6) {
+            throw new TestBug("Locking thread return invalid monitors count: " + monitorsInfo.length + ", expected value is " + 6);
+        }
+
+        monitor1 = monitorsInfo[0].monitor;
+        depth1 = monitorsInfo[0].stackDepth;
+
+        monitor2 = monitorsInfo[1].monitor;
+        depth2 = monitorsInfo[1].stackDepth;
+
+        monitor3 = monitorsInfo[2].monitor;
+        depth3 = monitorsInfo[2].stackDepth;
+
+        monitor4 = monitorsInfo[3].monitor;
+        depth4 = monitorsInfo[3].stackDepth;
+
+        monitor5 = monitorsInfo[4].monitor;
+        depth5 = monitorsInfo[4].stackDepth;
+
+        monitor6 = monitorsInfo[5].monitor;
+        depth6 = monitorsInfo[5].stackDepth;
+    }
+
+    public static void main(String args[]) {
+        new ownedMonitorsStackDepthInfo001a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo002/ownedMonitorsStackDepthInfo002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo002/ownedMonitorsStackDepthInfo002.java
new file mode 100644
index 00000000000..ada4f8f5900
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo002/ownedMonitorsStackDepthInfo002.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/OwnedMonitorsStackDepthInfo/ownedMonitorsStackDepthInfo002.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: OwnedMonitorsStackDepthInfo
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: ownedMonitorsStackDepthInfo002
+ *         debuggee: nsk.share.jdwp.TestDebuggeeType2
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Test performs checks for cases when incorrect data is sent in command.
+ *     Following cases are tested:
+ *         - create command with -1 as threadID, expect INVALID_OBJECT error
+ *         - create command with referenceID instead of threadID, expect INVALID_THREAD error
+ *         - try execute command for thread wich has finished execution, expect INVALID_THREAD error
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo002.ownedMonitorsStackDepthInfo002
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo002.ownedMonitorsStackDepthInfo002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.ThreadReference.OwnedMonitorsStackDepthInfo.ownedMonitorsStackDepthInfo002;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+import nsk.share.jpda.AbstractDebuggeeTest;
+import nsk.share.jpda.StateTestThread;
+
+public class ownedMonitorsStackDepthInfo002 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return AbstractJDWPDebuggee.class.getName();
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new ownedMonitorsStackDepthInfo002().runIt(argv, out);
+    }
+
+    private void sendCommand(long threadID, boolean trySuspend, int errorCode) {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.OwnedMonitorsStackDepthInfo;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("threadID = " + threadID);
+
+            // suspend thread or not (can't use suspending when create command with invalid threadID)
+            if (trySuspend)
+                debuggee.suspendThread(threadID);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addObjectID(threadID);
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            // in this test always expect reply with error
+            getReply(command, true, errorCode);
+
+            return;
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        // create command with threadID = -1, expect INVALID_OBJECT error
+        sendCommand(-1, false, JDWP.Error.INVALID_OBJECT);
+
+        // create command with referenceTypeID instead of trheadID, expect INVALID_THREAD error
+        sendCommand(debuggee.getReferenceTypeID(createTypeSignature(getDebugeeClassName())), false, JDWP.Error.INVALID_THREAD);
+
+        // create StateTestThread and force this finish execution
+        pipe.println(AbstractDebuggeeTest.COMMAND_CREATE_STATETESTTHREAD);
+
+        if (!isDebuggeeReady())
+            return;
+
+        // skip one state(thread not running), because of can obtain threadID only for running thread
+        pipe.println(AbstractDebuggeeTest.COMMAND_NEXTSTATE_STATETESTTHREAD);
+
+        if (!isDebuggeeReady())
+            return;
+
+        long threadID = debuggee.getThreadID(AbstractDebuggeeTest.stateTestThreadName);
+
+        int state = 2;
+
+        // skip all states
+        while (state++ < StateTestThread.stateTestThreadStates.length) {
+            pipe.println(AbstractDebuggeeTest.COMMAND_NEXTSTATE_STATETESTTHREAD);
+
+            if (!isDebuggeeReady())
+                return;
+        }
+
+        // send command for thread which has exited expect INVALID_THREAD error
+        sendCommand(threadID, true, JDWP.Error.INVALID_THREAD);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001.java
new file mode 100644
index 00000000000..94697452200
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001.java
@@ -0,0 +1,368 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Resume;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Resume.
+ *
+ * See resume001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class resume001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Resume";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "resume001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Resume";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Resume;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = resume001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = resume001a.THREAD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new resume001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            long threadID = 0;
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // request debuggee to suspend tested thread
+                log.display("Suspendig thread into debuggee for threadID: " + threadID);
+                debugee.suspendThread(threadID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+            } finally {
+
+                log.display("\n>>> Finishing test \n");
+
+                // resume suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming potentially suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Query debuggee for suspend status of the thread.
+     */
+    int querySuspendStatus(long threadID) {
+        log.display("Getting suspend status for threadID: " + threadID);
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Status);
+        command.addObjectID(threadID);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        try {
+            reply.resetPosition();
+
+            int threadStatus = reply.getInt();
+            int suspendStatus = reply.getInt();
+            log.display("  got suspendStatus: " + suspendStatusString(suspendStatus));
+            return suspendStatus;
+        } catch (BoundException e) {
+            throw new Failure("Caught BoundException while parsing reply for ThreadReference.Status:\n\t"
+                        + e);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // check that tested thread is not suspended before command sent
+        int suspendStatus = querySuspendStatus(threadID);
+        if (suspendStatus != JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) {
+            throw new Failure("SuspendStatus reports thread is not suspended before sending Resume command: "
+                            + suspendStatusString(suspendStatus));
+        } else {
+            log.display("Thread is suspended");
+        }
+
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that tested thread is suspended after Resume command sent
+        suspendStatus = querySuspendStatus(threadID);
+        if ((suspendStatus & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) != 0) {
+            log.complain("SuspendStatus reports thread is suspended after Resume command sent: "
+                        + suspendStatusString(suspendStatus));
+        } else {
+            log.display("Thread is not suspended");
+        }
+
+    }
+
+    /**
+     * Return string representation of thread suspend status.
+     */
+    private static String suspendStatusString(int status) {
+        String s = null;
+        if ((status & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) != 0) {
+            s = "SUSPEND_STATUS_SUSPENDED";
+        } else  if (status == 0) {
+            s = "NONE";
+        } else {
+            s = "unknown";
+        }
+        return status + "=" + s;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001/TestDescription.java
new file mode 100644
index 00000000000..0d3e49816bb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001/TestDescription.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Resume/resume001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Resume
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     thread becomes "not suspended" status after the command.
+ *     Test consists of two compoments:
+ *         debugger: resume001
+ *         debuggee: resume001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Debugger suspends
+ *     the thread and checks that the thread has "suspended" status before
+ *     sending the tested command.
+ *     Then, debugger creates command packet for ThreadReference.Resume
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and ensures there is no data into the package. Also debugger queries
+ *     debuggee for suspend status of the tested thread and chacks that thread
+ *     has status "not suspended".
+ *     Finally, debugger resumes suspended thread into debuggee, sends debuggee
+ *     signal to quit, waits for it exits and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Resume.resume001
+ *        nsk.jdwp.ThreadReference.Resume.resume001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Resume.resume001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001a.java
new file mode 100644
index 00000000000..689e7693021
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Resume/resume001a.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Resume;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class resume001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    // notification object to notify debuggee that thread started
+    private static Object threadStarted = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        resume001a _resume001a = new resume001a();
+        System.exit(resume001.JCK_STATUS_BASE + _resume001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadStarted) {
+                TestedClass.thread.start();
+                try {
+                    threadStarted.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + resume001.READY);
+                    pipe.println(resume001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(resume001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + resume001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(resume001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + resume001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return resume001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return resume001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // notify debuggee that thread really started
+            synchronized (threadStarted) {
+                threadStarted.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested thread finished");
+            }
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001.java
new file mode 100644
index 00000000000..b7c708570f5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001.java
@@ -0,0 +1,395 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Status;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Status.
+ *
+ * See status001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class status001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Status";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "status001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Status";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Status;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = status001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = status001a.THREAD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new status001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                long threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // extract thread status
+        int threadStatus = 0;
+        try {
+            threadStatus = reply.getInt();
+            log.display("  threadStatus: " + threadStatusString(threadStatus));
+        } catch (BoundException e) {
+            log.complain("Unable to extract thread status from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // extract suspend status
+        int suspendStatus = 0;
+        try {
+            suspendStatus = reply.getInt();
+            log.display("  suspendStatus: " + suspendStatusString(suspendStatus));
+        } catch (BoundException e) {
+            log.complain("Unable to extract thread status from reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check that both status code are not negative values
+        if (threadStatus < 0) {
+            log.complain("Negative value of thread status in reply packet: "
+                        + threadStatusString(threadStatus));
+            success = false;
+        }
+        if (suspendStatus < 0) {
+            log.complain("Negative value of suspend status in reply packet: "
+                        + suspendStatusString(suspendStatus));
+            success = false;
+        }
+
+        // check that thread has an expected state
+        if (!(threadStatus == JDWP.ThreadStatus.RUNNING
+                || threadStatus == JDWP.ThreadStatus.MONITOR)) {
+            log.complain("Unexpected thread status returned in the reply packet: "
+                        + threadStatusString(threadStatus)
+                        + " (expected: " + threadStatusString(JDWP.ThreadStatus.RUNNING)
+                        + " or " + threadStatusString(JDWP.ThreadStatus.MONITOR) + ")");
+            success = false;
+        }
+
+        // check that thread was not suspended
+        if ((suspendStatus & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) != 0) {
+            log.complain("Unexpected suspend status returned in the reply packet: "
+                        + threadStatusString(threadStatus)
+                        + " (expected: " + "not suspended" + ")");
+            success = false;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+    /**
+     * Return string representation of thread status code.
+     */
+    private static String threadStatusString(int status) {
+        String s = null;
+        switch (status) {
+            case JDWP.ThreadStatus.MONITOR:
+                s = "MONITOR";
+                break;
+            case JDWP.ThreadStatus.RUNNING:
+                s = "RUNNING";
+                break;
+            case JDWP.ThreadStatus.SLEEPING:
+                s = "SLEEPING";
+                break;
+            case JDWP.ThreadStatus.WAIT:
+                s = "WAIT";
+                break;
+            case JDWP.ThreadStatus.ZOMBIE:
+                s = "ZOMBIE";
+                break;
+            default:
+                s = "unknown";
+                break;
+        }
+        return status + "=" + s;
+    }
+
+    /**
+     * Return string representation of thread suspend status.
+     */
+    private static String suspendStatusString(int status) {
+        String s = null;
+        if ((status & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) != 0) {
+            s = "SUSPEND_STATUS_SUSPENDED";
+        } else  if (status == 0) {
+            s = "NONE";
+        } else {
+            s = "unknown";
+        }
+        return status + "=" + s;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001/TestDescription.java
new file mode 100644
index 00000000000..179b84c6ffb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Status/status001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Status
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned thread status and suspend status have expected values.
+ *     Test consists of two compoments:
+ *         debugger: status001
+ *         debuggee: status001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field.
+ *     Then, debugger creates command packet for ThreadReference.Status
+ *     command with the found threadID as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts thread name. Also test checks that thread status and
+ *     suspend status have expected values.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Status.status001
+ *        nsk.jdwp.ThreadReference.Status.status001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Status.status001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001a.java
new file mode 100644
index 00000000000..1429a7e4a75
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Status/status001a.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Status;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class status001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    // notification object to notify debuggee that thread started
+    private static Object threadStarted = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        status001a _status001a = new status001a();
+        System.exit(status001.JCK_STATUS_BASE + _status001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadStarted) {
+                TestedClass.thread.start();
+                try {
+                    threadStarted.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + status001.READY);
+                    pipe.println(status001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(status001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + status001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(status001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + status001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return status001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return status001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // notify debuggee that thread really started
+            synchronized (threadStarted) {
+                threadStarted.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested thread finished");
+            }
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001.java
new file mode 100644
index 00000000000..f89d64ae747
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001.java
@@ -0,0 +1,350 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Stop;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Stop.
+ *
+ * See stop001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class stop001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String RUN = "run";
+    static final String STOPPED = "stopped";
+    static final String NOT_STOPPED = "not_stopped";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Stop";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "stop001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Stop";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Stop;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_THREAD_NAME = stop001a.THREAD_NAME;
+    static final String THREAD_FIELD_NAME = stop001a.THREAD_FIELD_NAME;
+    static final String THROWABLE_FIELD_NAME = stop001a.THROWABLE_FIELD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new stop001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + THREAD_FIELD_NAME);
+                long threadID = queryObjectID(classID, THREAD_FIELD_NAME, JDWP.Tag.THREAD);
+                log.display("  got threadID: " + threadID);
+
+                // query debuggee for throwable objectID value from a static field
+                log.display("Getting throwable objectID value from static field: "
+                            + THROWABLE_FIELD_NAME);
+                long objectID = queryObjectID(classID, THROWABLE_FIELD_NAME, JDWP.Tag.OBJECT);
+                log.display("  got objectID: " + objectID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID, objectID);
+
+                log.display("\n>>> Checking that tested thread was really stopped \n");
+
+                // check if the thread was really stopped
+                confirmThreadStopped();
+
+            } finally {
+                log.display("\n>>> Finishing test \n");
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for objectID value from the class static field.
+     */
+    long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != tag) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long objectID = ((Long)value.getValue()).longValue();
+        return objectID;
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID and throwable objectID.
+     */
+    void testCommand(long threadID, long objectID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        log.display("  throwable: " + objectID);
+        command.addObjectID(objectID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // there are no data to extract
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+    }
+
+    /**
+     * Wait for signal from debugee that thread was really stopped
+     */
+    void confirmThreadStopped() {
+
+        // send debugee signal to run
+        log.display("Sending signal to debugee: " + RUN);
+        pipe.println(RUN);
+
+        // wait for signal DONE from debuggee
+        log.display("Waiting for signal from debugee: " + STOPPED);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        // check received signal
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + STOPPED + ")");
+        } else if (signal.equals(STOPPED)) {
+            log.display("Tested thread was really stopped into debuggee");
+        } else if (signal.equals(NOT_STOPPED)) {
+            log.complain("Tested thread was NOT really stopped into debuggee");
+            success = false;
+        } else {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + STOPPED + ")");
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001/TestDescription.java
new file mode 100644
index 00000000000..59683218d72
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001/TestDescription.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Stop/stop001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Stop
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     the thread is really stopped into debuggee VM.
+ *     Test consists of two compoments:
+ *         debugger: stop001
+ *         debuggee: stop001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. The tested thread
+ *     into debuggee is in a waiting state in this time and is ready for
+ *     stopping.
+ *     Then, debugger creates command packet for ThreadReference.Stop
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and ensures the packet does not has any data. Then debugger requests
+ *     from debuggee confirmation about thread stopped and checks above
+ *     mentioned assertions.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Stop.stop001
+ *        nsk.jdwp.ThreadReference.Stop.stop001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Stop.stop001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001a.java
new file mode 100644
index 00000000000..f046041276c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Stop/stop001a.java
@@ -0,0 +1,184 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Stop;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class stop001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String THREAD_FIELD_NAME = "thread";
+    public static final String THROWABLE_FIELD_NAME = "throwable";
+
+    // frames count for tested thread in recursive method invokation
+    public static final int FRAMES_COUNT = 10;
+
+    // notification object to notify debuggee that thread is started
+    private static Object threadStarting = new Object();
+    // object which thread will wait for before being interruted
+    private static Object threadWaiting = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        stop001a _stop001a = new stop001a();
+        System.exit(stop001.JCK_STATUS_BASE + _stop001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+        long timeout = argumentHandler.getWaitTime() * 60 * 1000; // milliseconds
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // load tested class and create tested thread
+        log.display("Creating object of tested class");
+        TestedClass.thread = new TestedClass(THREAD_NAME);
+
+        // start the thread and wait for notification from it
+        synchronized (threadStarting) {
+            TestedClass.thread.start();
+            try {
+                threadStarting.wait();
+            } catch (InterruptedException e) {
+                log.complain("Interruption while waiting for thread started:\n\t" + e);
+                pipe.println(stop001.ERROR);
+                log.display("Debugee FAILED");
+                return stop001.FAILED;
+            }
+
+            // ensure that tested thread is waiting for object
+            synchronized (threadWaiting) {
+                // send debugger signal READY
+                log.display("Sending signal to debugger: " + stop001.READY);
+                pipe.println(stop001.READY);
+            }
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + stop001.RUN);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(stop001.RUN)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + stop001.RUN + ")");
+            log.display("Debugee FAILED");
+            return stop001.FAILED;
+        }
+
+        // wait for thread finished in a waittime interval
+        log.display("Waiting for tested thread finished for timeout: " + timeout);
+        try {
+            TestedClass.thread.join(timeout);
+        } catch (InterruptedException e) {
+            log.complain("Interruption while waiting for tested thread finished:\n\t" + e);
+            pipe.println(stop001.ERROR);
+            log.display("Debugee FAILED");
+            return stop001.FAILED;
+        }
+
+        // test if thread was interrupted by debugger
+        if (TestedClass.thread.isAlive()) {
+            log.display("Sending signal to debugger: " + stop001.NOT_STOPPED);
+            pipe.println(stop001.NOT_STOPPED);
+            // interrupt thread to allow it to finish
+            TestedClass.thread.interrupt();
+        } else {
+            log.display("Sending signal to debugger: " + stop001.STOPPED);
+            pipe.println(stop001.STOPPED);
+        }
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + stop001.QUIT);
+        signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (signal == null || !signal.equals(stop001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + stop001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return stop001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return stop001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        // field with the tested Throwable value
+        public static volatile Throwable throwable = new Throwable("Tested throwable");
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        // start the thread and recursive invoke makeFrames()
+        public void run() {
+            log.display("Tested thread started");
+
+            synchronized (threadWaiting) {
+
+                // notify debuggee that thread started
+                synchronized (threadStarting) {
+                    threadStarting.notifyAll();
+                }
+
+                // wait infinitely for notification object
+                try {
+                    threadWaiting.wait();
+                    log.complain("Tested thread NOT interrupted");
+                } catch (InterruptedException e) {
+                    log.display("Tested thread interrupted");
+                }
+            }
+
+            log.display("Tested thread finished");
+        }
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001.java
new file mode 100644
index 00000000000..9f6ed3db961
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001.java
@@ -0,0 +1,364 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Suspend;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.Suspend.
+ *
+ * See suspend001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class suspend001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.Suspend";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "suspend001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.Suspend";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.Suspend;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = suspend001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = suspend001a.THREAD_NAME;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new suspend001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            long threadID = 0;
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+            } finally {
+
+                log.display("\n>>> Finishing test \n");
+
+                // resumme suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming suspended thread");
+                    debugee.resumeThread(threadID);
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Query debuggee for suspend status of the thread.
+     */
+    int querySuspendStatus(long threadID) {
+        log.display("Getting suspend status for threadID: " + threadID);
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Status);
+        command.addObjectID(threadID);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        try {
+            reply.resetPosition();
+
+            int threadStatus = reply.getInt();
+            int suspendStatus = reply.getInt();
+            log.display("  got suspendStatus: " + suspendStatusString(suspendStatus));
+            return suspendStatus;
+        } catch (BoundException e) {
+            throw new Failure("Caught BoundException while parsing reply for ThreadReference.Status:\n\t"
+                        + e);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // check that tested thread is not suspended before command sent
+        int suspendStatus = querySuspendStatus(threadID);
+        if (suspendStatus == JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) {
+            throw new Failure("SuspendStatus reports thread is suspended before sending Suspend command: "
+                            + suspendStatusString(suspendStatus));
+        } else {
+            log.display("Thread is not suspended");
+        }
+
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        // check that tested thread is suspended after Suspend command sent
+        suspendStatus = querySuspendStatus(threadID);
+        if ((suspendStatus & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) == 0) {
+            log.complain("SuspendStatus reports thread is not suspended after Suspend command sent: "
+                        + suspendStatusString(suspendStatus));
+        } else {
+            log.display("Thread is suspended");
+        }
+
+    }
+
+    /**
+     * Return string representation of thread suspend status.
+     */
+    private static String suspendStatusString(int status) {
+        String s = null;
+        if ((status & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) != 0) {
+            s = "SUSPEND_STATUS_SUSPENDED";
+        } else  if (status == 0) {
+            s = "NONE";
+        } else {
+            s = "unknown";
+        }
+        return status + "=" + s;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001/TestDescription.java
new file mode 100644
index 00000000000..c615cf88c9d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/Suspend/suspend001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: Suspend
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     thread becomes suspended status.
+ *     Test consists of two compoments:
+ *         debugger: suspend001
+ *         debuggee: suspend001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Debugger checks
+ *     that thread has not suspended status before sending tested command.
+ *     Then, debugger creates command packet for ThreadReference.Suspend
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and ensures there is no data into the package. Also debugger queries
+ *     debuggee for suspend status of the tested thread and chacks that thread
+ *     has status suspended.
+ *     Finally, debugger resumes suspended thread into debuggee, sends debuggee
+ *     signal to quit, waits for it exits and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.Suspend.suspend001
+ *        nsk.jdwp.ThreadReference.Suspend.suspend001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.Suspend.suspend001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001a.java
new file mode 100644
index 00000000000..eced97136d6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Suspend/suspend001a.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.Suspend;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class suspend001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    // notification object to notify debuggee that thread started
+    private static Object threadStarted = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        suspend001a _suspend001a = new suspend001a();
+        System.exit(suspend001.JCK_STATUS_BASE + _suspend001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadStarted) {
+                TestedClass.thread.start();
+                try {
+                    threadStarted.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + suspend001.READY);
+                    pipe.println(suspend001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(suspend001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + suspend001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(suspend001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + suspend001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return suspend001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return suspend001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // notify debuggee that thread really started
+            synchronized (threadStarted) {
+                threadStarted.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested thread finished");
+            }
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001.java
new file mode 100644
index 00000000000..cbfe330774e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001.java
@@ -0,0 +1,380 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.SuspendCount;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: ThreadReference.SuspendCount.
+ *
+ * See suspendcnt001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class suspendcnt001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String ERROR = "error";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.SuspendCount";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "suspendcnt001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "ThreadReference.SuspendCount";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.SuspendCount;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of the tested thread and statioc field with thread value
+    static final String TESTED_CLASS_FIELD_NAME = suspendcnt001a.FIELD_NAME;
+    static final String TESTED_THREAD_NAME = suspendcnt001a.THREAD_NAME;
+
+    // expected number od suspend count
+    static final int SUSPEND_COUNT = 5;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new suspendcnt001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            long threadID = 0;
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for threadID value from a static field
+                log.display("Getting threadID value from static field: "
+                            + TESTED_CLASS_FIELD_NAME);
+                threadID = queryThreadID(classID, TESTED_CLASS_FIELD_NAME);
+                log.display("  got threadID: " + threadID);
+
+                // request debuggee to suspend tested thread
+                log.display("Suspendig thread " + SUSPEND_COUNT + " times for threadID: " + threadID);
+                for (int i = 0; i < SUSPEND_COUNT; i++) {
+                    debugee.suspendThread(threadID);
+                }
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(threadID);
+
+            } finally {
+
+                log.display("\n>>> Finishing test \n");
+
+                // resumme suspended thread
+                if (threadID != 0) {
+                    log.display("Resuming " + SUSPEND_COUNT + " times suspended thread: " + threadID);
+                    for (int i = 0; i < SUSPEND_COUNT; i++) {
+                        debugee.resumeThread(threadID);
+                    }
+                }
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (signal == null) {
+            throw new TestBug("Null signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        } else if (signal.equals(ERROR)) {
+            throw new TestBug("Debugee was not able to start tested thread"
+                            + " (received signal: " + signal + ")");
+        } else if (!signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for threadID value of statuic field of the class.
+     */
+    long queryThreadID(long classID, String fieldName) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debugee.getClassFieldID(classID, fieldName, true);
+        // get value of the field
+        JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has THREAD tag
+        if (value.getTag() != JDWP.Tag.THREAD) {
+            throw new Failure("Not threadID value returned from debuggee: " + value);
+        }
+
+        // extract threadID from the value
+        long threadID = ((Long)value.getValue()).longValue();
+        return threadID;
+    }
+
+    /**
+     * Query debuggee for suspend status of the thread.
+     */
+    int querySuspendStatus(long threadID) {
+        log.display("Getting suspend status for threadID: " + threadID);
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Status);
+        command.addObjectID(threadID);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+
+        try {
+            reply.resetPosition();
+
+            int threadStatus = reply.getInt();
+            int suspendStatus = reply.getInt();
+            log.display("  got suspendStatus: " + suspendStatusString(suspendStatus));
+            return suspendStatus;
+        } catch (BoundException e) {
+            throw new Failure("Caught BoundException while parsing reply for ThreadReference.Status:\n\t"
+                        + e);
+        }
+    }
+
+    /**
+     * Perform testing JDWP command for specified threadID.
+     */
+    void testCommand(long threadID) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  threadID: " + threadID);
+        command.addObjectID(threadID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        int suspendCount = 0;
+        try {
+            suspendCount = reply.getInt();
+            log.display("  suspendCount: " + suspendCount);
+        } catch (BoundException e) {
+            log.complain("Unable to extract suspend count number form the reply packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        if (suspendCount < 0) {
+            log.complain("Negative number of suspend count returned: " + suspendCount
+                        + "(expected: " + SUSPEND_COUNT + ")");
+            success = false;
+        }
+
+        if (suspendCount != SUSPEND_COUNT) {
+            log.complain("Unexpected number of suspend count returned: " + suspendCount
+                        + "(expected: " + SUSPEND_COUNT + ")");
+            success = false;
+        }
+
+    }
+
+    /**
+     * Return string representation of thread suspend status.
+     */
+    private static String suspendStatusString(int status) {
+        String s = null;
+        if ((status & JDWP.SuspendStatus.SUSPEND_STATUS_SUSPENDED) != 0) {
+            s = "SUSPEND_STATUS_SUSPENDED";
+        } else  if (status == 0) {
+            s = "NONE";
+        } else {
+            s = "unknown";
+        }
+        return status + "=" + s;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001/TestDescription.java
new file mode 100644
index 00000000000..08c1270ec23
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference
+ *         command: SuspendCount
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned number of suspend count is equal to real number
+ *     of thread suspending attempts.
+ *     Test consists of two compoments:
+ *         debugger: suspendcnt001
+ *         debuggee: suspendcnt001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains from debuggee classID for tested thread class
+ *     and threadID as the value of a class static field. Debugger suspends
+ *     the thread SUSPEND_COUNT times before sending the tested command.
+ *     Then, debugger creates command packet for ThreadReference.SuspendCount
+ *     command with the found threadID as an argument, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts number of suspend count. Also debugger checks that returned
+ *     suspend count is not negative and equal to the expected SUSPEND_COUNT.
+ *     Finally, debugger resumes suspended thread into debuggee, sends debuggee
+ *     signal to quit, waits for it exits and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.SuspendCount.suspendcnt001
+ *        nsk.jdwp.ThreadReference.SuspendCount.suspendcnt001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.SuspendCount.suspendcnt001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001a.java
new file mode 100644
index 00000000000..5c6d77b1b8a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/SuspendCount/suspendcnt001a.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.SuspendCount;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class suspendcnt001a {
+
+    // name for the tested thread
+    public static final String THREAD_NAME = "TestedThreadName";
+    public static final String FIELD_NAME = "thread";
+
+    // notification object to notify debuggee that thread started
+    private static Object threadStarted = new Object();
+    // lock object to prevent thread from exit
+    private static Object threadLock = new Object();
+
+    // scaffold objects
+    private static volatile ArgumentHandler argumentHandler = null;
+    private static volatile Log log = null;
+
+    public static void main(String args[]) {
+        suspendcnt001a _suspendcnt001a = new suspendcnt001a();
+        System.exit(suspendcnt001.JCK_STATUS_BASE + _suspendcnt001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // lock the object to prevent thread from exit
+        synchronized (threadLock) {
+
+            // load tested class and create tested thread
+            log.display("Creating object of tested class");
+            TestedClass.thread = new TestedClass(THREAD_NAME);
+
+            // start the thread and wait for notification from it
+            synchronized (threadStarted) {
+                TestedClass.thread.start();
+                try {
+                    threadStarted.wait();
+                    // send debugger signal READY
+                    log.display("Sending signal to debugger: " + suspendcnt001.READY);
+                    pipe.println(suspendcnt001.READY);
+                } catch (InterruptedException e) {
+                    log.complain("Interruption while waiting for thread started: " + e);
+                    pipe.println(suspendcnt001.ERROR);
+                }
+            }
+
+            // wait for signal QUIT from debugeer
+            log.display("Waiting for signal from debugger: " + suspendcnt001.QUIT);
+            String signal = pipe.readln();
+            log.display("Received signal from debugger: " + signal);
+
+            // check received signal
+            if (signal == null || !signal.equals(suspendcnt001.QUIT)) {
+                log.complain("Unexpected communication signal from debugee: " + signal
+                            + " (expected: " + suspendcnt001.QUIT + ")");
+                log.display("Debugee FAILED");
+                return suspendcnt001.FAILED;
+            }
+
+            // allow started thread to exit
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return suspendcnt001.PASSED;
+    }
+
+    // tested thread class
+    public static class TestedClass extends Thread {
+
+        // field with the tested Thread value
+        public static volatile TestedClass thread = null;
+
+        TestedClass(String name) {
+            super(name);
+        }
+
+        public void run() {
+            log.display("Tested thread started");
+
+            // notify debuggee that thread really started
+            synchronized (threadStarted) {
+                threadStarted.notifyAll();
+            }
+
+            // wait for lock object released
+            synchronized (threadLock) {
+                log.display("Tested thread finished");
+            }
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001.java
new file mode 100644
index 00000000000..c58491cb3d4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001.java
@@ -0,0 +1,267 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.ThreadGroup;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class threadgroup001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.ThreadReference.ThreadGroup";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "threadgroup001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "ThreadReference.ThreadGroup";
+    static final int JDWP_COMMAND_ID = JDWP.Command.ThreadReference.ThreadGroup;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new threadgroup001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+
+                try {
+
+                    // get top level thread groups
+
+                    log.display("Getting IDs for top level thread groups");
+
+                    long[] threadGroupIDs = null;
+                    int groups = 0;
+
+                    {
+                        log.display("Create command packet " + "TopLevelThreadGroups");
+                        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.TopLevelThreadGroups);
+
+                        log.display("Waiting for reply to command");
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+                        log.display("Valid reply packet received");
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        groups = reply.getInt();
+                        log.display("  groups: " + groups);
+
+                        threadGroupIDs = new long[groups];
+
+                        for (int i = 0; i < groups; i++) {
+                            long threadGroupID = reply.getObjectID();
+                            log.display("  #" + i + " threadGroupID: " + threadGroupID);
+                            threadGroupIDs[i] = threadGroupID;
+                        }
+
+                        if (groups < 0) {
+                            log.complain("Negative number of thread groups returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                        if (groups == 0) {
+                            log.complain("No thread groups IDs returned while getting top level thread groups IDs: " + groups);
+                            success = false;
+                        }
+
+                    }
+
+                    // get threads from all thread groups found
+
+                    boolean found = false;
+                    long checkedThreadGroupID = 0;
+
+                    long[] threadIDs = null;
+                    int threads = 0;
+
+                    for (int i = 0; i < groups; i++) {
+                        checkedThreadGroupID = threadGroupIDs[i];
+                        log.display("Getting IDs of the thread from thread group: #" + i);
+
+                        log.display("Create command packet " +
+                                                "ThreadGroupReference.Children");
+                        CommandPacket command = new CommandPacket(JDWP.Command.ThreadGroupReference.Children);
+                        command.addObjectID(checkedThreadGroupID);
+                        command.setLength();
+
+                        log.display("Waiting for reply to command");
+                        ReplyPacket reply = debugee.receiveReplyFor(command);
+                        log.display("Valid reply packet received");
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        threads = reply.getInt();
+                        log.display("  threads: " + threads);
+
+                        threadIDs = new long[threads];
+
+                        for (int j = 0; j < threads; j++) {
+                            long threadID = reply.getObjectID();
+                            log.display("  #" + j + " threadID: " + threadID);
+                            threadIDs[j] = threadID;
+                        }
+
+                        if (threads < 0) {
+                            log.complain("Negative number of threads in the thread group: " + threads);
+                            success = false;
+                        }
+
+                        if (threads > 0) {
+                            log.display("Testing threads from thread group: #" + i);
+                            found = true;
+                        }
+                    }
+
+                    if (!found) {
+                        log.complain("No threads found in all top level thread groups");
+                        success = false;
+                    }
+
+                    // begin test of JDWP command
+
+                    for (int i = 0; i < threads; i++) {
+
+                        long threadID = threadIDs[i];
+
+                        log.display("");
+                        log.display("Getting ThreadGroup ID for " + i + " thread ID: "
+                                        + threadID);
+                        log.display("Create command " + JDWP_COMMAND_NAME
+                                        + " with thread ID: " + threadID);
+                        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                        command.addObjectID(threadID);
+                        command.setLength();
+
+                        log.display("Sending command packet:\n" + command);
+                        transport.write(command);
+
+                        log.display("Waiting for reply packet");
+                        ReplyPacket reply = new ReplyPacket();
+                        transport.read(reply);
+                        log.display("Reply packet received:\n" + reply);
+
+                        log.display("Checking reply packet header");
+                        reply.checkHeader(command.getPacketID());
+
+                        log.display("Parsing reply packet:");
+                        reply.resetPosition();
+
+                        long threadGroupID = reply.getObjectID();
+                        log.display("  group: " + threadGroupID);
+
+                        if (threadGroupID != checkedThreadGroupID) {
+                            log.complain("Unexpected threadGroupID returned for a thread: " + threadGroupID
+                                            + " (expected: " + checkedThreadGroupID + ")");
+                            success = false;
+                        }
+
+                        if (! reply.isParsed()) {
+                            log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+                            success = false;
+                        } else {
+                            log.display("Reply packet parsed successfully");
+                        }
+
+                    }
+
+                   // end test of JDWP command
+
+                } catch (Exception e) {
+                    log.complain("Caught exception while testing JDWP command: " + e);
+                    success = false;
+                } finally {
+                    log.display("");
+                    log.display("Sending command: " + "quit");
+                    pipe.println("quit");
+
+                    log.display("Waiting for debugee exits");
+                    int code = debugee.waitFor();
+                    if (code == JCK_STATUS_BASE + PASSED) {
+                        log.display("Debugee PASSED with exit code: " + code);
+                    } else {
+                        log.complain("Debugee FAILED with exit code: " + code);
+                        success = false;
+                    }
+                }
+
+            } catch (Exception e) {
+                log.complain("Caught unexpected exception while communicating with debugee: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Caught unexpected exception while starting the test: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001/TestDescription.java
new file mode 100644
index 00000000000..895c07a504f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001/TestDescription.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: ThreadReference (11)
+ *         command: ThreadGroup (5)
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     returned threadGroupID of a thread is equal to the expected
+ *     one for all threads from a top level threads group.
+ *     Test consists of two compoments:
+ *         debugger: threadgroup001
+ *         debuggee: threadgroup001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger prepares for testing JDWP command and finds
+ *     top level thread group with a number threads and obtains
+ *     ID's for this ThreadGroup and all its threads.
+ *     Then, for each found thread debugger creates command packet for
+ *     ThreadGroup command with the found checkedThreadGroupID as an argument,
+ *     writes packet to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and extracts threadGroupID from it. Also test checks that extracted
+ *     threadGroupID of a thread is equal to the expected one.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.ThreadReference.ThreadGroup.threadgroup001
+ *        nsk.jdwp.ThreadReference.ThreadGroup.threadgroup001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.ThreadReference.ThreadGroup.threadgroup001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001a.java
new file mode 100644
index 00000000000..33d8f987aa1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ThreadGroup/threadgroup001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.ThreadReference.ThreadGroup;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class threadgroup001a {
+
+    public static void main(String args[]) {
+        threadgroup001a _threadgroup001a = new threadgroup001a();
+        System.exit(threadgroup001.JCK_STATUS_BASE + _threadgroup001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return threadgroup001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001.java
new file mode 100644
index 00000000000..687a56e69fb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001.java
@@ -0,0 +1,195 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.AllClasses;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class allclasses001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.AllClasses";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "allclasses001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.AllClasses";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.AllClasses;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new allclasses001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                String classSignature = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int classes = reply.getInt();
+                    log.display("  classes: " + classes);
+
+                    int found = 0;
+                    for (int i = 0; i < classes; i++) {
+
+                        byte refTypeTag = reply.getByte();
+                        log.display("  " + i + " refTypeTag: " + refTypeTag);
+
+                        long typeID = reply.getReferenceTypeID();
+                        log.display("  " + i + " typeID:     " + typeID);
+
+                        String signature = reply.getString();
+                        log.display("  " + i + " signature:  " + signature);
+
+                        int status = reply.getInt();
+                        log.display("  " + i + " status:     " + status);
+
+                        if (signature.equals(classSignature)) {
+                            found++;
+                            log.display("FOUND: expected class signature: " + found + " time");
+                        }
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                    if (classes < 0) {
+                        log.complain("Negative number of returned classes: " + classes);
+                        success = false;
+                    }
+
+                    if (classes == 0) {
+                        log.complain("No class returned");
+                        success = false;
+                    }
+
+                    if (found <= 0) {
+                        log.complain("No expected class signature found: " + classSignature);
+                        success = false;
+                    }
+
+                    if (found > 1) {
+                        log.complain("Too many classes (" + found + ") found for signature: " + classSignature);
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001/TestDescription.java
new file mode 100644
index 00000000000..2ae07332c03
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001/TestDescription.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/AllClasses/allclasses001.
+ * VM Testbase keywords: [jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: AllClasses
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test sends AllClasses command and waits for a
+ *     reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracts class signatures from the packet data.
+ *     Also test check if debugee class signature is in the
+ *     among the received classes.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee VM exits and exits too
+ *     with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.AllClasses.allclasses001
+ *        nsk.jdwp.VirtualMachine.AllClasses.allclasses001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.AllClasses.allclasses001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001a.java
new file mode 100644
index 00000000000..01bbe3272c1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClasses/allclasses001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.AllClasses;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class allclasses001a {
+
+    public static void main(String args[]) {
+        allclasses001a _allclasses001a = new allclasses001a();
+        System.exit(allclasses001.JCK_STATUS_BASE + _allclasses001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return allclasses001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001.java
new file mode 100644
index 00000000000..c5806ce7b54
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001.java
@@ -0,0 +1,256 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.AllClassesWithGeneric;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * This test checks that the JDWP command <code>AllClassesWithGeneric</code>
+ * from the <code>VirtualMachine</code> command set returns generic signature
+ * information properly.<br>
+ * Debuggee part of the test creates instances of several tested classes. Some
+ * of the classes are generic. Debugger part obtains signature information of
+ * all loaded classes by sending the tested JDWP command. Proper generic
+ * signature should be returned for each tested class which is generic, or
+ * an empty string for non-generic one. All tested classes should be found
+ * in reply packet as well.
+ */
+public class allclswithgeneric001 {
+    static final String DEBUGGEE_CLASS =
+        "nsk.jdwp.VirtualMachine.AllClassesWithGeneric.allclswithgeneric001t";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.AllClassesWithGeneric";
+    static final int JDWP_COMMAND_ID =
+        JDWP.Command.VirtualMachine.AllClassesWithGeneric;
+
+    static final String COMMAND_READY = "ready";
+    static final String COMMAND_QUIT = "quit";
+
+    static final String[][] classes = {
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001t;",
+            "NULL"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001b;",
+            "<L:Ljava/lang/String;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001c;",
+            "<A:Ljava/lang/Object;B:Ljava/lang/Integer;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001d;",
+            "<T:Ljava/lang/Object;>Ljava/lang/Object;Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001if<TT;>;"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001e;",
+            "NULL"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001if;",
+            "<I:Ljava/lang/Object;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001f;",
+            "NULL"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001g;",
+            "<E:Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001e;:Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001if;>Ljava/lang/Object;"},
+
+        {"Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001h;",
+            "<A1:Ljava/lang/Object;B1:Ljava/lang/Object;C1:Ljava/lang/Object;>Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001d<TA1;>;Lnsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001if2<TA1;TB1;TC1;>;"}
+    };
+
+    static final int CLS_NUM = classes.length;
+
+    private int foundClasses[] = new int[CLS_NUM];
+
+    private Log log;
+
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new allclswithgeneric001().runThis(argv, out);
+    }
+
+    public int runThis(String argv[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        boolean result = true;
+
+        try {
+            for(int i=0; i<CLS_NUM; i++)
+                foundClasses[i] = 0;
+
+            Binder binder = new Binder(argumentHandler, log);
+
+            log.display("Starting debuggee VM ...");
+            Debugee debuggee = binder.bindToDebugee(DEBUGGEE_CLASS);
+
+            Transport transport = debuggee.getTransport();
+            IOPipe pipe = debuggee.createIOPipe();
+
+            log.display("Waiting for VM_INIT event ...");
+            debuggee.waitForVMInit();
+
+            log.display("Querying for IDSizes ...");
+            debuggee.queryForIDSizes();
+
+            log.display("Resuming debuggee VM ...");
+            debuggee.resume();
+
+            log.display("Waiting for command: " + COMMAND_READY
+                + " ...");
+            String cmd = pipe.readln();
+            log.display(" ... Received command: " + cmd);
+
+            try {
+                /////// begin test of JDWP command
+                log.display("\n>>>>>> Create command " + JDWP_COMMAND_NAME);
+                CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                log.display("Sending command packet:\n" + command);
+                transport.write(command);
+
+                log.display("\nWaiting for reply packet ...");
+                ReplyPacket reply = new ReplyPacket();
+                transport.read(reply);
+                log.display(" ... Reply packet received:\n" + reply);
+
+                log.display("\nChecking reply packet header");
+                reply.checkHeader(command.getPacketID());
+
+             /* parsing of reply data:
+                int classes - Number of reference types that follow
+
+                ---- Repeated 'classes' times:
+                byte refTypeTag - Kind of following reference type.
+                referenceTypeID typeID - Loaded reference type.
+                string signature - The JNI signature for the loaded reference type.
+                string genericSignature - The generic signature for the loaded reference type
+                                          or an empty string if there is none.
+                int status - The current class status.
+                ----
+             */
+                log.display("\nParsing reply packet:");
+                reply.resetPosition();
+
+                int cls_num = reply.getInt();
+                log.display("\tclasses: " + cls_num);
+
+                for (int i=0; i<cls_num; i++) {
+                    byte refTypeTag = reply.getByte();
+                    long typeID = reply.getReferenceTypeID();
+                    String signature = reply.getString();
+                    String genSignature = reply.getString();
+                    int status = reply.getInt();
+
+                    int idx = findClass(signature);
+                    if (idx != -1) {
+                        foundClasses[idx]++;
+
+                        log.display("\n--> found tested class "
+                            + classes[idx][0] + " :"
+                            + "\n\t\trefTypeTag: " + refTypeTag
+                            + "\n\t\ttypeID: " + typeID
+                            + "\n\t\tsignature: " + signature);
+
+                        if (genSignature.length() == 0) // a non-generic class
+                            genSignature = "NULL";
+                            if (!genSignature.equals(classes[idx][1])) {
+                            log.complain("TEST FAILED: Unexpected generic signature of tested class #"
+                                + (i+1) + " (" + classes[idx][0] + ")"
+                                + " in the reply packet:"
+                                + "\n\tGot: " + genSignature
+                                + "\n\tExpected: " + classes[idx][1] + "\n");
+                            result = false;
+                        }
+                        else
+                            log.display("\t\tgeneric signature: " + genSignature);
+
+                        log.display("\t\tstatus: " + status);
+                    }
+                }
+
+                if (!reply.isParsed()) {
+                    log.complain("TEST FAILED: Extra trailing bytes found in reply packet at: "
+                        + reply.currentPosition());
+                    result = false;
+                } else
+                    log.display("\n<<<<<< Reply packet parsed");
+                /////// end test of JDWP command
+
+                for (int i=0; i<CLS_NUM; i++)
+                    if (foundClasses[i] != 1) {
+                        result = false;
+                        log.complain("TEST FAILED: Unexpected number of reference types for the tested class\n\t"
+                            + classes[i][0] + "\n\tin reply packet on "
+                            + JDWP_COMMAND_NAME
+                            + ":\n\tGot: " + foundClasses[i]
+                            + "\n\tExpected: 1");
+                    }
+
+            } catch (Exception e) {
+                e.printStackTrace(out);
+                log.complain("Caught exception while testing JDWP command: "
+                    + e);
+                result = false;
+            } finally {
+                log.display("Sending command: " + COMMAND_QUIT + " ...");
+                pipe.println(COMMAND_QUIT);
+
+                log.display("Waiting for debuggee exits ...");
+                int code = debuggee.waitFor();
+                if (code == Consts.JCK_STATUS_BASE + Consts.TEST_PASSED) {
+                    log.display(" ... Debuggee PASSED with the exit code: "
+                        + code);
+                } else {
+                    log.complain(" ... Debuggee FAILED with the exit code: "
+                        + code);
+                    result = false;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while communicating with debugee: "
+                + e);
+            result = false;
+        }
+
+        if (!result)
+            return Consts.TEST_FAILED;
+
+        return Consts.TEST_PASSED;
+    }
+
+    private int findClass(String cls) {
+        for (int i=0; i<CLS_NUM; i++)
+            if (cls.equals(classes[i][0]))
+                return i; // the tested class found
+
+        return -1; // the tested class not found
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001/TestDescription.java
new file mode 100644
index 00000000000..8664c155571
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001/TestDescription.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001.
+ * VM Testbase keywords: [jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         JDWP command set: VirtualMachine
+ *         JDWP command: AllClassesWithGeneric
+ *     It checks that the command returns generic signature information
+ *     properly.
+ *     Debuggee part of the test creates instances of several tested classes.
+ *     Some of the classes are generic. Debugger part obtains signature
+ *     information of all loaded classes by sending the tested JDWP command.
+ *     Proper generic signature should be returned for each tested class
+ *     which is generic, or an empty string for non-generic one. All tested
+ *     classes should be found in reply packet as well.
+ * COMMENTS
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.AllClassesWithGeneric.allclswithgeneric001
+ *        nsk.jdwp.VirtualMachine.AllClassesWithGeneric.allclswithgeneric001t
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.AllClassesWithGeneric.allclswithgeneric001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001t.java
new file mode 100644
index 00000000000..b37f0024249
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllClassesWithGeneric/allclswithgeneric001t.java
@@ -0,0 +1,111 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.AllClassesWithGeneric;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class allclswithgeneric001t {
+    public static void main(String args[]) {
+        ArgumentHandler argHandler = new ArgumentHandler(args);
+        Log log = new Log(System.err, argHandler);
+        IOPipe pipe = argHandler.createDebugeeIOPipe(log);
+
+        // load tested classes
+        allclswithgeneric001b<String> _allclswithgeneric001b =
+            new allclswithgeneric001b<String>();
+        allclswithgeneric001c<Boolean, Integer> _allclswithgeneric001c =
+            new allclswithgeneric001c<Boolean, Integer>();
+        allclswithgeneric001e _allclswithgeneric001e =
+            new allclswithgeneric001e();
+        allclswithgeneric001if<Object> _allclswithgeneric001if =
+            new allclswithgeneric001d<Object>();
+        allclswithgeneric001f _allclswithgeneric001f =
+            new allclswithgeneric001f();
+        allclswithgeneric001g<allclswithgeneric001f> _allclswithgeneric001g =
+            new allclswithgeneric001g<allclswithgeneric001f>();
+        allclswithgeneric001h<Byte, Double, Float> _allclswithgeneric001h =
+            new allclswithgeneric001h<Byte, Double, Float>();
+
+        log.display("Debuggee VM started\nSending command: "
+            + allclswithgeneric001.COMMAND_READY);
+        pipe.println(allclswithgeneric001.COMMAND_READY);
+
+        log.display("Waiting for command: "
+            + allclswithgeneric001.COMMAND_QUIT + " ...");
+        String cmd = pipe.readln();
+        log.display(" ... Received command: " + cmd
+            + "\nDebuggee is exiting ...");
+
+        System.exit(Consts.JCK_STATUS_BASE + Consts.TEST_PASSED);
+    }
+}
+
+/*
+ * Dummy classes used only for verifying generic signature information
+ * in a debugger.
+ */
+
+class allclswithgeneric001b<L extends String> {}
+
+class allclswithgeneric001c<A, B extends Integer> {}
+
+interface allclswithgeneric001if<I> {
+    int allclswithgeneric001ifMeth();
+
+    <I> int allclswithgeneric001ifMeth2(I v);
+}
+
+class allclswithgeneric001d<T> implements allclswithgeneric001if<T> {
+    public int allclswithgeneric001ifMeth() {
+        return 1;
+    }
+
+    public <T> int allclswithgeneric001ifMeth2(T v) {
+        return 2;
+    }
+}
+
+class allclswithgeneric001e {}
+
+class allclswithgeneric001f extends allclswithgeneric001e implements allclswithgeneric001if {
+    public int allclswithgeneric001ifMeth() {
+        return 3;
+    }
+
+    public int allclswithgeneric001ifMeth2(Object v) {
+        return 4;
+    }
+}
+
+class allclswithgeneric001g<E extends allclswithgeneric001e & allclswithgeneric001if> {}
+
+interface allclswithgeneric001if2<A, B, C> {}
+
+class allclswithgeneric001h<A1, B1, C1>
+    extends allclswithgeneric001d<A1>
+    implements allclswithgeneric001if2<A1, B1, C1> {}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001.java
new file mode 100644
index 00000000000..e3e291fcdcd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001.java
@@ -0,0 +1,170 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.AllThreads;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class allthreads001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.AllThreads";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "allthreads001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.AllThreads";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.AllThreads;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new allthreads001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                String classSignature = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int threads = reply.getInt();
+                    log.display("  threads: " + threads);
+
+                    if (threads < 0) {
+                        log.complain("Negative number of returned threads: " + threads);
+                        success = false;
+                    }
+
+                    if (threads == 0) {
+                        log.complain("No threads returned");
+                        success = false;
+                    }
+
+                    for (int i = 0; i < threads; i++) {
+                        long threadID = reply.getObjectID();
+                        log.display("  " + i + " threadID: " + threadID);
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: "
+                                                + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001/TestDescription.java
new file mode 100644
index 00000000000..bc20afe4f6a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001/TestDescription.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/AllThreads/allthreads001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: AllThreads
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test sends AllThreads command and waits for a
+ *     reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracts threadIDs list from the packet data.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee VM exits and exits too
+ *     with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.AllThreads.allthreads001
+ *        nsk.jdwp.VirtualMachine.AllThreads.allthreads001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.AllThreads.allthreads001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001a.java
new file mode 100644
index 00000000000..8ccd7b08cb8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/AllThreads/allthreads001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.AllThreads;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class allthreads001a {
+
+    public static void main(String args[]) {
+        allthreads001a _allclasses001a = new allthreads001a();
+        System.exit(allthreads001.JCK_STATUS_BASE + _allclasses001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return allthreads001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001.java
new file mode 100644
index 00000000000..5e05f6406f6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001.java
@@ -0,0 +1,168 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Capabilities;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+import java.util.*;
+
+public class capabilities001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.Capabilities";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "capabilities001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.Capabilities";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.Capabilities;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new capabilities001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    byte canWatchFieldModification = reply.getByte();
+                    log.display("  canWatchFieldModification:     " + canWatchFieldModification);
+
+                    byte canWatchFieldAction = reply.getByte();
+                    log.display("  canWatchFieldAction:           " + canWatchFieldAction);
+
+                    byte canGetBytecodes = reply.getByte();
+                    log.display("  canGetBytecodes:               " + canGetBytecodes);
+
+                    byte canGetSyntheticAttribute = reply.getByte();
+                    log.display("  canGetSyntheticAttribute:      " + canGetSyntheticAttribute);
+
+                    byte canGetOwnedMonitorInfo = reply.getByte();
+                    log.display("  canGetOwnedMonitorInfo:        " + canGetOwnedMonitorInfo);
+
+                    byte canGetCurrentContendedMonitor = reply.getByte();
+                    log.display("  canGetCurrentContendedMonitor: " + canGetCurrentContendedMonitor);
+
+                    byte canGetMonitorInfo = reply.getByte();
+                    log.display("  canGetMonitorInfo:             " + canGetMonitorInfo);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001/TestDescription.java
new file mode 100644
index 00000000000..44fd2fea854
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001/TestDescription.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/Capabilities/capabilities001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: Capabilities
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test sends Capabilities command and waits for a
+ *     reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracts capabilities info from the packet data.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee VM exits and exits too
+ *     with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.Capabilities.capabilities001
+ *        nsk.jdwp.VirtualMachine.Capabilities.capabilities001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.Capabilities.capabilities001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001a.java
new file mode 100644
index 00000000000..6bdd18e8c8d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Capabilities/capabilities001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Capabilities;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class capabilities001a {
+
+    public static void main(String args[]) {
+        capabilities001a _capabilities001a = new capabilities001a();
+        System.exit(capabilities001.JCK_STATUS_BASE + _capabilities001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return capabilities001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001.java
new file mode 100644
index 00000000000..00ffc505034
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001.java
@@ -0,0 +1,214 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.CapabilitiesNew;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+import java.util.*;
+
+public class capabilitiesnew001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.CapabilitiesNew";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "capabilitiesnew001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.CapabilitiesNew";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.CapabilitiesNew;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new capabilitiesnew001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    byte canWatchFieldModification = reply.getByte();
+                    log.display("  canWatchFieldModification:        "
+                                    + canWatchFieldModification);
+
+                    byte canWatchFieldAction = reply.getByte();
+                    log.display("  canWatchFieldAction:              "
+                                    + canWatchFieldAction);
+
+                    byte canGetBytecodes = reply.getByte();
+                    log.display("  canGetBytecodes:                  "
+                                    + canGetBytecodes);
+
+                    byte canGetSyntheticAttribute = reply.getByte();
+                    log.display("  canGetSyntheticAttribute:         "
+                                    + canGetSyntheticAttribute);
+
+                    byte canGetOwnedMonitorInfo = reply.getByte();
+                    log.display("  canGetOwnedMonitorInfo:           "
+                                    + canGetOwnedMonitorInfo);
+
+                    byte canGetCurrentContendedMonitor = reply.getByte();
+                    log.display("  canGetCurrentContendedMonitor:    "
+                                    + canGetCurrentContendedMonitor);
+
+                    byte canGetMonitorInfo = reply.getByte();
+                    log.display("  canGetMonitorInfo:                "
+                                    + canGetMonitorInfo);
+
+                    byte canRedefineClasses = reply.getByte();
+                    log.display("  canRedefineClasses:               "
+                                    + canRedefineClasses);
+
+                    byte canAddMethod = reply.getByte();
+                    log.display("  canAddMethod:                     "
+                                    + canAddMethod);
+
+                    byte canUnrestrictedlyRedefineClasses = reply.getByte();
+                    log.display("  canUnrestrictedlyRedefineClasses: "
+                                    + canUnrestrictedlyRedefineClasses);
+
+                    byte canPopFrames = reply.getByte();
+                    log.display("  canPopFrames:                     "
+                                    + canPopFrames);
+
+                    byte canUseInstanceFilters = reply.getByte();
+                    log.display("  canUseInstanceFilters:            "
+                                    + canUseInstanceFilters);
+
+                    byte canGetSourceDebugExtension = reply.getByte();
+                    log.display("  canGetSourceDebugExtension:       "
+                                    + canGetSourceDebugExtension);
+
+                    byte canRequestVMDeathEvent = reply.getByte();
+                    log.display("  canRequestVMDeathEvent:           "
+                                    + canRequestVMDeathEvent);
+
+                    byte canSetDefaultStratum = reply.getByte();
+                    log.display("  canSetDefaultStratum:             "
+                                    + canSetDefaultStratum);
+
+                    for (int i = 16; i <=32; i++) {
+                        byte reserved = reply.getByte();
+                        log.display("  reserved" + i + ":                       "
+                                    + reserved);
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: "
+                                    + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001/TestDescription.java
new file mode 100644
index 00000000000..1f7d726c2c3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001/TestDescription.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001.
+ * VM Testbase keywords: [quick, jpda, jdwp, redefine]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: CapabilitiesNew
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test sends CapabilitiesNew command and waits for a
+ *     reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure and extracts capabilities info from the packet data.
+ *     After JDWP command has been tested, test sends debugee VM
+ *     signal to quit, waits for debugee VM exits and exits too
+ *     with the proper exit code.
+ * COMMENTS
+ *     This test is for JDK-1.4 or higher.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.CapabilitiesNew.capabilitiesnew001
+ *        nsk.jdwp.VirtualMachine.CapabilitiesNew.capabilitiesnew001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.CapabilitiesNew.capabilitiesnew001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001a.java
new file mode 100644
index 00000000000..f4a0e7ca154
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.CapabilitiesNew;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class capabilitiesnew001a {
+
+    public static void main(String args[]) {
+        capabilitiesnew001a _capabilitiesnew001a = new capabilitiesnew001a();
+        System.exit(capabilitiesnew001.JCK_STATUS_BASE + _capabilitiesnew001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return capabilitiesnew001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001.java
new file mode 100644
index 00000000000..da06f738f93
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001.java
@@ -0,0 +1,166 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ClassPaths;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class classpaths001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.ClassPaths";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "classpaths001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.ClassPaths";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.ClassPaths;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new classpaths001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    String baseDir = reply.getString();
+                    log.display("  baseDir: " + baseDir);
+
+                    int classpaths = reply.getInt();
+                    log.display("  classpaths: " + classpaths);
+
+                    for (int i = 0; i < classpaths; i++) {
+                        String path = reply.getString();
+                        log.display("  " + i + " path: " + path);
+                    }
+
+                    int bootclasspaths = reply.getInt();
+                    log.display("  bootclasspaths: " + bootclasspaths);
+
+                    for (int i = 0; i < bootclasspaths; i++) {
+                        String path = reply.getString();
+                        log.display("  " + i + " path: " + path);
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001/TestDescription.java
new file mode 100644
index 00000000000..28e9fc56f7e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001/TestDescription.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/ClassPaths/classpaths001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: ClassPaths
+ *     Test launches debuggee VM using support classes and sends
+ *     ClassPaths command to it. Then test receives reply for this
+ *     command and prints classpath and bootclasspath value
+ *     from received reply.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.ClassPaths.classpaths001
+ *        nsk.jdwp.VirtualMachine.ClassPaths.classpaths001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.ClassPaths.classpaths001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001a.java
new file mode 100644
index 00000000000..2309ea923d6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassPaths/classpaths001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ClassPaths;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class classpaths001a {
+
+    public static void main(String args[]) {
+        classpaths001a _classpaths001a = new classpaths001a();
+        System.exit(classpaths001.JCK_STATUS_BASE + _classpaths001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return classpaths001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001.java
new file mode 100644
index 00000000000..03fc0c49dca
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001.java
@@ -0,0 +1,186 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ClassesBySignature;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class classbysig001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.ClassesBySignature";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "classbysig001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.ClassesBySignature";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.ClassesBySignature;
+
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME;
+//    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME + ";";
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new classbysig001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                String classSignature = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+                // begin test of JDWP command
+
+                try {
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with class signature: " + classSignature);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addString(classSignature);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int classes = reply.getInt();
+                    log.display("  classes: " + classes);
+
+                    for (int i = 0; i < classes; i++) {
+
+                        byte refTypeTag = reply.getByte();
+                        log.display("  " + i + " refTypeTag: " + refTypeTag);
+
+                        long typeID = reply.getReferenceTypeID();
+                        log.display("  " + i + " typeID:     " + typeID);
+
+                        int status = reply.getInt();
+                        log.display("  " + i + " status:     " + status);
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                    if (classes < 0) {
+                        log.complain("Negative number of returned classes: " + classes);
+                        success = false;
+                    }
+
+                    if (classes == 0) {
+                        log.complain("No class returned for signature: " + classSignature);
+                        success = false;
+                    }
+
+                    if (classes > 1) {
+                        log.complain("Too many classes returned for signature: " + classSignature);
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001/TestDescription.java
new file mode 100644
index 00000000000..c78a71769fc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001/TestDescription.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: ClassBySignature
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet. Also test checks that one
+ *     and only one class will be found for specified class
+ *     signature.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Than test sends ClassByName command with debugee class
+ *     signature as an command argument and waits for a reply.
+ *     Than test checks if the received reply packet has proper
+ *     structure and only one class is found for specified
+ *     class signature.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.ClassesBySignature.classbysig001
+ *        nsk.jdwp.VirtualMachine.ClassesBySignature.classbysig001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.ClassesBySignature.classbysig001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001a.java
new file mode 100644
index 00000000000..9a04b0ee02a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ClassesBySignature/classbysig001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ClassesBySignature;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class classbysig001a {
+
+    public static void main(String args[]) {
+        classbysig001a _classbysig001a = new classbysig001a();
+        System.exit(classbysig001.JCK_STATUS_BASE + _classbysig001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return classbysig001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001.java
new file mode 100644
index 00000000000..5e0a4b8427e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001.java
@@ -0,0 +1,156 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.CreateString;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+import java.util.*;
+
+public class createstr001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.CreateString";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "createstr001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.CreateString";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.CreateString;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new createstr001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                String stringValue = "Testing string value";
+
+                // begin test of JDWP command
+
+                try {
+                    log.display("Create command " + JDWP_COMMAND_NAME
+                                + " with string value: " + stringValue);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addString(stringValue);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    long stringID = reply.getObjectID();
+                    log.display("  stringID:   " + stringID);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001/TestDescription.java
new file mode 100644
index 00000000000..4a7223cdfb6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001/TestDescription.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/CreateString/createstr001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: CreateString
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Than test sends CreateString command and waits for a reply.
+ *     Than test checks if the received reply packet has proper
+ *     structure and returns stringID.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.CreateString.createstr001
+ *        nsk.jdwp.VirtualMachine.CreateString.createstr001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.CreateString.createstr001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001a.java
new file mode 100644
index 00000000000..d44e0527156
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/CreateString/createstr001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.CreateString;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class createstr001a {
+
+    public static void main(String args[]) {
+        createstr001a _createstr001a = new createstr001a();
+        System.exit(createstr001.JCK_STATUS_BASE + _createstr001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return createstr001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001.java
new file mode 100644
index 00000000000..e115fa9e648
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001.java
@@ -0,0 +1,174 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Dispose;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class dispose001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.Dispose";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "dispose001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.Dispose";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.Dispose;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new dispose001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            final ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            final Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                final Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                int bytesToWrite = 1024;
+
+                // begin test of JDWP command
+
+                try {
+                    log.display("Creating command packet for " + JDWP_COMMAND_NAME);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                    log.display("Reply packet parsed successfully");
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+/*
+                // check if transport connection has been actually closed
+
+                if (success) {
+
+                    log.display("Trying to write VirtualMachine.Version command packet "
+                                + "to the closed Transport connection");
+
+                    try {
+                        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.Version);
+                        transport.write(command);
+
+                        log.complain("Command packet successfully written to the closed transport channel\n"
+                                          + "without any I/O exception thrown");
+                        success = false;
+                    } catch (IOException e) {
+                        log.display("Caught expected IOException:\n\t" + e);
+                    }
+
+                }
+*/
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001/TestDescription.java
new file mode 100644
index 00000000000..3e807c14e35
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001/TestDescription.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/Dispose/dispose001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for:
+ *         command set: VirtualMachine
+ *         command: Dispose
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: dispose001
+ *         debuggee: dispose001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Then debugger creates command packet for Dispose command,
+ *     writes packet to the transport channel, and waits for a reply
+ *     packet.
+ *     When reply packet is received debugger parses the packet structure.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.Dispose.dispose001
+ *        nsk.jdwp.VirtualMachine.Dispose.dispose001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.Dispose.dispose001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001a.java
new file mode 100644
index 00000000000..a7224a97def
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Dispose/dispose001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Dispose;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class dispose001a {
+
+    public static void main(String args[]) {
+        dispose001a _dispose001a = new dispose001a();
+        System.exit(dispose001.JCK_STATUS_BASE + _dispose001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return dispose001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001.java
new file mode 100644
index 00000000000..901b69de37a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001.java
@@ -0,0 +1,326 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.DisposeObjects;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.DisposeObjects.
+ *
+ * See disposeobj001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class disposeobj001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.DisposeObjects";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "disposeobj001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.DisposeObjects";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.DisposeObjects;
+
+    // tested class name and signature constants
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // Number of references to free for tested objects
+    static final int REF_COUNT = 3;
+
+    // list of static fields with tested objects
+    static final String fieldsList[] = {
+                            "objectValue",
+                            "stringValue",
+                            "classValue"
+                        };
+    static final int fieldsCount = fieldsList.length;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new disposeobj001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Obtaining requred data from debugee \n");
+
+                // query debuggee for classID of tested class
+                log.display("Getting classID by signature:\n"
+                            + "  " + TESTED_CLASS_SIGNATURE);
+                long classID = debugee.getReferenceTypeID(TESTED_CLASS_SIGNATURE);
+                log.display("  got classID: " + classID);
+
+                // query debuggee for objectIDs values of static fields
+                long objectIDs[] = getObjectIDs(classID);
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand(objectIDs);
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Query debuggee for IDs of objects which are values of static fields.
+     */
+    long[] getObjectIDs(long classID) {
+        long[] objectIDs = new long[fieldsCount];
+
+        for (int i = 0; i < fieldsCount; i++ ) {
+            String name = fieldsList[i];
+
+            log.display("Getting fieldID of static field: " + name);
+            long fieldID = debugee.getClassFieldID(classID, name, true);
+            log.display("  got fieldID: " + fieldID);
+
+            // query for objectID value REF_COUNT times
+            log.display("Getting " + REF_COUNT + " times value of static fieldID: "
+                        + fieldID);
+            for (int j = 0; j < REF_COUNT; j++) {
+                JDWP.Value value = debugee.getStaticFieldValue(classID, fieldID);
+                log.display("  #" + i + ": got value: " + value);
+
+                if (value.getTag() != JDWP.Tag.OBJECT
+                                            && value.getTag() != JDWP.Tag.STRING) {
+                    throw new Failure("Not object value returned for static field \""
+                                + name + "\": " + value);
+                }
+                long objectID = ((Long)value.getValue()).longValue();
+
+                // check that returned objectID is the same
+                if (j > 0) {
+                    if (objectID != objectIDs[i]) {
+                        throw new Failure("Last request for object value returned"
+                                        + " unexpected objectID: " + objectID
+                                        + "(expected: " + objectIDs[i] + ")");
+                    }
+                } else {
+                    objectIDs[i] = objectID;
+                }
+            }
+        }
+        return objectIDs;
+    }
+
+    /**
+     * Perform testing JDWP command for specified TypeID.
+     */
+    void testCommand(long objectIDs[]) {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+        log.display("  requested: " + fieldsCount);
+        command.addInt(fieldsCount);
+
+        for (int i = 0; i < fieldsCount; i++) {
+            log.display("    object: " + objectIDs[i]);
+            command.addObjectID(objectIDs[i]);
+            log.display("      refCnt: " + REF_COUNT);
+            command.addInt(REF_COUNT);
+        }
+
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001/TestDescription.java
new file mode 100644
index 00000000000..203a655e0ad
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001/TestDescription.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: DisposeObjects
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: disposeobj001
+ *         debuggee: disposeobj001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Next, debugger obtains classID and also objectIDs as values of
+ *     the static fields. Debugger queries each objectID value REF_COUNT
+ *     times to increase references count for objects on back-end.
+ *     Then, debugger creates command packet for VirtualMachine.DisposeObjects
+ *     command with the found methodIDs as arguments, writes packet to
+ *     the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks that the received reply packet contains no data.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.DisposeObjects.disposeobj001
+ *        nsk.jdwp.VirtualMachine.DisposeObjects.disposeobj001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.DisposeObjects.disposeobj001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001a.java
new file mode 100644
index 00000000000..b95bb25cf15
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/DisposeObjects/disposeobj001a.java
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.DisposeObjects;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class disposeobj001a {
+
+    public static void main(String args[]) {
+        disposeobj001a _disposeobj001a = new disposeobj001a();
+        System.exit(disposeobj001.JCK_STATUS_BASE + _disposeobj001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // ensure tested class loaded
+        log.display("Creating object of tested class");
+        TestedClass foo = new TestedClass();
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + disposeobj001.READY);
+        pipe.println(disposeobj001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + disposeobj001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(disposeobj001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + disposeobj001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return disposeobj001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return disposeobj001.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+
+        // tested objects
+        static Object objectValue = new Object();
+        static String stringValue = new String();
+        static TestedClass classValue = new TestedClass();
+
+        int foo = 0;
+
+        TestedClass() {
+            foo = 100;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001.java
new file mode 100644
index 00000000000..b9313fc838f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001.java
@@ -0,0 +1,178 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Exit;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class exit001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.Exit";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "exit001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.Exit";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.Exit;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new exit001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            final ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            final Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                final Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+
+                // Linux returns only 8 least significant bits of exit status - see #4459019 bug.
+                int expectedExitCode = 0x0F;
+
+                // begin test of JDWP command
+
+                try {
+                    log.display("Creating command packet for " + JDWP_COMMAND_NAME
+                                + " with exit code: " + expectedExitCode);
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    command.addInt(expectedExitCode);
+                    command.setLength();
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // check if debugee has been actually terminated
+
+                if (success) {
+                    int waittime = argumentHandler.getWaitTime() * 60;  // seconds
+                    int pause = 1;                                      // seconds
+                    int tries = waittime / pause;
+                    success = false;
+
+                    for (int i = 0; i < tries; i++) {
+                        if (debugee.terminated()) {
+                            log.display("Debugee has been terminated successfully");
+                            success = true;
+                            break;
+                        }
+                        try {
+                            Thread.currentThread().sleep(pause * 1000);
+                        } catch (InterruptedException e) {
+                            log.complain("Interrupted exception catched: " + e);
+                        }
+                    }
+                    if (! success) {
+                        log.complain("Debugee has not been terminated by request");
+                    }
+                }
+
+                // check if debugee exit code is as expected
+
+                if (success) {
+                    int exitCode = debugee.getStatus();
+                    log.display("Debugee exit code is: " + exitCode);
+                    if (exitCode != expectedExitCode) {
+                        log.complain("Debugee exit code is not equal to expected: " + expectedExitCode);
+                        success = false;
+                    }
+                }
+
+                // end test of JDWP command
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001/TestDescription.java
new file mode 100644
index 00000000000..c252e23b373
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001/TestDescription.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/Exit/exit001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: Exit
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet. Also test checks that
+ *     debugee is actually resumed by the command.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it.
+ *     Then test sends Exit command with particular exit code
+ *     and waits for a reply packet.
+ *     Then test checks if the received reply packet has proper
+ *     structure. Then test checks if debugee process is actually
+ *     terminated with requested exit code. If debugee is not
+ *     terminated for the specified in WAITTIME timeout test
+ *     complains about an error.
+ *     After JDWP command has been tested, test exits too
+ *     with a proper exit code.
+ * COMMENTS:
+ *     Modified due to fix of the bug:
+ *     4759453 TEST_BUG: tests against VirtualMachine.exit(int) should be corrected for Mantis
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.Exit.exit001
+ *        nsk.jdwp.VirtualMachine.Exit.exit001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.Exit.exit001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001a.java
new file mode 100644
index 00000000000..7abea0574e3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Exit/exit001a.java
@@ -0,0 +1,49 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Exit;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class exit001a {
+
+    public static void main(String args[]) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = argumentHandler.createDebugeeLog();
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        /*
+         * In this test debugger kills debuggee using VirtualMachine.exit, so
+         * standard JDWP tests communication protocol isn't used here
+         */
+        try {
+            Thread.sleep(Long.MAX_VALUE);
+        } catch (Throwable t) {
+            // ignore all exceptions
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001.java
new file mode 100644
index 00000000000..c0b28b905cc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001.java
@@ -0,0 +1,266 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.HoldEvents;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.HoldEvents.
+ *
+ * See holdevents001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class holdevents001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.HoldEvents";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "holdevents001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.HoldEvents";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.HoldEvents;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new holdevents001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand();
+
+            } finally {
+
+                log.display("\n>>> Finishing test \n");
+
+                // finally release events
+                log.display("Releasing events into debuggee");
+                releaseEvents();
+
+                // quit debugee
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Release events into debuggee.
+     */
+    void releaseEvents() {
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.ReleaseEvents);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no data in reply packet
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001/TestDescription.java
new file mode 100644
index 00000000000..2890f66f65a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001/TestDescription.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/HoldEvents/holdevents001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: HoldEvents
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: holdevents001
+ *         debuggee: holdevents001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Then, debugger creates command packet for VirtualMachine.HoldEvents
+ *     command with no out data, writes packet to the transport channel,
+ *     and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks that the received reply packet contains no data.
+ *     Finally, debugger releases debuggee's events, sends debuggee signal
+ *     to quit, waits for it exits and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.HoldEvents.holdevents001
+ *        nsk.jdwp.VirtualMachine.HoldEvents.holdevents001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.HoldEvents.holdevents001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001a.java
new file mode 100644
index 00000000000..673a648d1c2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents001a.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.HoldEvents;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class holdevents001a {
+
+    public static void main(String args[]) {
+        holdevents001a _holdevents001a = new holdevents001a();
+        System.exit(holdevents001.JCK_STATUS_BASE + _holdevents001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + holdevents001.READY);
+        pipe.println(holdevents001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + holdevents001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(holdevents001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + holdevents001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return holdevents001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return holdevents001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002.java
new file mode 100644
index 00000000000..2995beb7979
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002.java
@@ -0,0 +1,409 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.HoldEvents;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.HoldEvents.
+ *
+ * See holdevents002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ *
+ * @see #runIt()
+ */
+public class holdevents002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.HoldEvents";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "holdevents002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.HoldEvents";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.HoldEvents;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.BREAKPOINT;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+    static final byte TESTED_EVENT_MODIFIER = JDWP.EventModifierKind.LOCATION_ONLY;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of field and method of tested class
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = holdevents002a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedMethodID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new holdevents002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Get debuggee prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+
+            log.display("Holding events into debuggee");
+            holdEvents();
+            log.display("  ... events held");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for BREAKPOINT event NOT occured
+            log.display("Waiting for BREAKPOINT event NOT received");
+            waitForBreakpointEvent();
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debuggee for testing.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for breakpoint method
+        log.display("Getting breakpoint methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // make request for BREAKPOINT event
+        log.display("Making request for BREAKPOINT event at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        eventRequestID = debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... got requestID: " + eventRequestID);
+    }
+
+    /**
+     * Hold events into debuggee.
+     */
+    void holdEvents() {
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.HoldEvents);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+    }
+
+    /**
+     * Wait for requested BREAKPOINT event NOT occured.
+     */
+    void waitForBreakpointEvent() {
+
+        EventPacket eventPacket = new EventPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for event packet");
+            transport.setReadTimeout(timeout);
+            transport.read(eventPacket);
+            log.display("  ... event packet received:\n" + eventPacket);
+        } catch (IOException e) {
+            log.display("No event packet received for default timeout:\n\t" + e);
+            log.display("Requested BREAKPOINT event is not received after holding events");
+            return;
+        }
+
+        log.complain("An event received after holding events into debuggee");
+        log.display("");
+
+        // check reply packet header
+        try{
+            log.display("Checking header of event packet");
+            eventPacket.checkHeader();
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Bad header of received event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from received event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from received event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in received event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in received event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from received event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Unexpected VM_DEATH event received intead of BREAKPOINT event");
+                success = false;
+                dead = true;
+                return;
+            }  else if (eventKind == JDWP.EventKind.BREAKPOINT) {
+                log.complain("Hold BREAKPOINT event received in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.BREAKPOINT + ")");
+                success = false;
+            }  else {
+                log.complain("Unexpected eventKind of event " + i + " in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.BREAKPOINT + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in BREAKPOINT event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java
new file mode 100644
index 00000000000..429b89e8ac1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/HoldEvents/holdevents002.
+ * VM Testbase keywords: [jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: HoldEvents
+ *         event kind: BREAKPOINT
+ *     Test checks that no requested BREAKPOINT events received from
+ *     debuggee after holding events.
+ *     Test consists of two compoments:
+ *         debugger: holdevents002
+ *         debuggee: holdevents002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and requests an
+ *     BREAKPOINT event for some location into tested class.
+ *     Then, debugger uses tesed command VirtualMachine.HoldEvents to
+ *     hold events into debuggee and resumes debuggee to allow it to
+ *     reach the breakpoint. Debugger waits for WAITTIME timeout for
+ *     an event packet. If no event packet received, tests passes.
+ *     If requested BREAKPOINT or any other event received? test failed.
+ *     Finally, debugger disconnectes debuggee, waits for it exit
+ *     and exits too with proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.HoldEvents.holdevents002
+ *        nsk.jdwp.VirtualMachine.HoldEvents.holdevents002a
+ * @run main/othervm/timeout=420 PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.HoldEvents.holdevents002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002a.java
new file mode 100644
index 00000000000..32b8ed46437
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002a.java
@@ -0,0 +1,84 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.VirtualMachine.HoldEvents;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class holdevents002a {
+
+    static final int BREAKPOINT_LINE = 80;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        holdevents002a _holdevents002a = new holdevents002a();
+        System.exit(holdevents002.JCK_STATUS_BASE + _holdevents002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass object = new TestedClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        log.display("Invoking method with breakpoint");
+        object.run();
+        log.display("  ... method invoked");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return holdevents002.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+
+        public void run() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001.java
new file mode 100644
index 00000000000..49dbbcd1705
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001.java
@@ -0,0 +1,159 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.IDSizes;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class idsizes001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.IDSizes";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "idsizes001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.IDSizes";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.IDSizes;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new idsizes001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int fieldIDSize = reply.getInt();
+                    log.display("  fieldIDSize:          " + fieldIDSize);
+
+                    int methodIDSize = reply.getInt();
+                    log.display("  methodIDSize:         " + methodIDSize);
+
+                    int objectIDSize = reply.getInt();
+                    log.display("  objectIdSize:         " + objectIDSize);
+
+                    int referenceTypeIDSize = reply.getInt();
+                    log.display("  referenceTypeIDSize:  " + referenceTypeIDSize);
+
+                    int frameIDSize = reply.getInt();
+                    log.display("  frameIdSize:          " + frameIDSize);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001/TestDescription.java
new file mode 100644
index 00000000000..965090b6ac3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001/TestDescription.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/IDSizes/idsizes001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: IDSizes
+ *     Test launches debuggee VM using support classes and sends
+ *     IDSizes command to it. Then test receives reply for this
+ *     command and checks that the returned values of VM dependent
+ *     type sizes are equal to the JDWP predefinite values.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.IDSizes.idsizes001
+ *        nsk.jdwp.VirtualMachine.IDSizes.idsizes001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.IDSizes.idsizes001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001a.java
new file mode 100644
index 00000000000..c68756115bc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/IDSizes/idsizes001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.IDSizes;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class idsizes001a {
+
+    public static void main(String args[]) {
+        idsizes001a _idsizes001a = new idsizes001a();
+        System.exit(idsizes001.JCK_STATUS_BASE + _idsizes001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return idsizes001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001.java
new file mode 100644
index 00000000000..46faa37097a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2007, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001.
+ * VM Testbase keywords: [quick, jpda, jdwp, feature_jdk6_jpda, vm6, monitoring]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: InstanceCounts
+ *     Test checks that debuggee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: instanceCounts001
+ *         debuggee: instanceCounts001a
+ *     Debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with execution commands.
+ *     Debuggee during startup creates instances of 'nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass1'
+ *     and 'nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass2' reachable via references with types
+ *     which should be supported by command VirtualMachine.InstanceCounts:
+ *         - strong reference
+ *         - soft reference
+ *         - weak reference
+ *         - phantom reference
+ *         - JNI global reference
+ *         - JNI local reference
+ *     First, debugger obtains referenceTypeID for 'nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass1'.
+ *     Then, debugger creates command packet for InstanceCounts command with the found referenceTypeID
+ *     as an argument, writes packet to the transport      channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure, extracts number of instances
+ *     and checks that received value is correct.
+ *     Then debugger repeat described above actions, but created command packet contains 2 referenceTypeIDs for
+ *     'nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass1' and 'nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass2'.
+ *         Also, test performs check for case when incorrect data is sent in command:
+ *                 - create command with refTypesCount < 0, expect ILLEGAL_ARGUMENT error
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @requires vm.gc != "Z"
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.instanceCounts001
+ *        nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.instanceCounts001a
+ * @run main/othervm/native PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.instanceCounts001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="-Xmx128M ${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001;
+
+import java.io.*;
+import nsk.share.Consts;
+import nsk.share.jdwp.*;
+import nsk.share.jpda.AbstractDebuggeeTest;
+
+public class instanceCounts001 extends TestDebuggerType1 {
+    protected String getDebugeeClassName() {
+        return "nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.instanceCounts001a";
+    }
+
+    public static void main(String argv[]) {
+        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new instanceCounts001().runIt(argv, out);
+    }
+
+    private void testCommand(long typeIDs[], int refTypesCount, int[] expectedInstanceCounts, boolean expectError, int errorCode) {
+        try {
+            int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.InstanceCounts;
+
+            log.display("Create command: " + JDWP.commandNames.get(JDWP_COMMAND_ID));
+            log.display("refTypesCount = " + refTypesCount);
+            for (long typeID : typeIDs)
+                log.display("refType = " + typeID);
+
+            CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+            command.addInt(refTypesCount);
+
+            for (int i = 0; i < refTypesCount; i++)
+                command.addReferenceTypeID(typeIDs[i]);
+
+            command.setLength();
+
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+
+            ReplyPacket reply;
+
+            reply = getReply(command, expectError, errorCode);
+
+            if (expectError)
+                return;
+
+            int counts = reply.getInt();
+            log.display("counts = " + counts);
+
+            // check received 'counts' value
+            if (counts != refTypesCount) {
+                setSuccess(false);
+                log.complain("Invalid 'counts' value, expected is: " + refTypesCount);
+            }
+
+            // check received 'instanceCount' value for all classes
+            for (int i = 0; i < counts; i++) {
+                long instanceCount = reply.getLong();
+                log.display("instanceCount = " + instanceCount);
+
+                if (instanceCount != expectedInstanceCounts[i]) {
+                    setSuccess(false);
+                    log.complain("Unexpected value 'instanceCount': " + instanceCount + ", expected is " + expectedInstanceCounts[i]);
+                }
+            }
+
+            if (!reply.isParsed()) {
+                setSuccess(false);
+                log.complain("Extra trailing bytes found in reply packet at: " + reply.currentPosition());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    public void doTest() {
+        String testClass1 = nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass1.class.getName();
+        String testClass2 = nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001.TestClass2.class.getName();
+
+        forceGC();
+        pipe.println(instanceCounts001a.COMMAND_CREATE_TEST_INSTANCES);
+
+        if (!isDebuggeeReady())
+            return;
+
+        // Note! This test is broken, in the sense that it incorrectly assumes
+        // that no GC can happen before it walks the heap. In practice, it seems
+        // to only affect this test when using ZGC. However, this test will also
+        // fail when using other GCs if an explicit GC is done here.
+
+        int expectedCount = instanceCounts001a.expectedCount;
+
+        String classNames[];
+
+        classNames = new String[] { createTypeSignature(testClass1) };
+
+        long typeIDs[];
+
+        typeIDs = new long[classNames.length];
+
+        // create valid command for 1 class
+        for (int i = 0; i < classNames.length; i++)
+            typeIDs[i] = debuggee.getReferenceTypeID(classNames[i]);
+
+        testCommand(typeIDs, typeIDs.length, new int[] { expectedCount }, false, 0);
+
+        classNames = new String[] { createTypeSignature(testClass1), createTypeSignature(testClass2) };
+
+        typeIDs = new long[classNames.length];
+
+        // create valid command for 2 classes
+        for (int i = 0; i < classNames.length; i++)
+            typeIDs[i] = debuggee.getReferenceTypeID(classNames[i]);
+
+        testCommand(typeIDs, typeIDs.length, new int[] { expectedCount, expectedCount }, false, 0);
+
+        // create command with refTypesCount < 0, expect ILLEGAL_ARGUMENT error
+        testCommand(typeIDs, -1, new int[] { expectedCount }, true, JDWP.Error.ILLEGAL_ARGUMENT);
+        resetStatusIfGC();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001a.java
new file mode 100644
index 00000000000..7dec61ef3b1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/InstanceCounts/instanceCounts001/instanceCounts001a.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2007, 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 nsk.jdwp.VirtualMachine.InstanceCounts.instanceCounts001;
+
+import java.util.ArrayList;
+import nsk.share.ReferringObjectSet;
+import nsk.share.jdi.HeapwalkingDebuggee;
+import nsk.share.jdwp.*;
+
+class TestClass1 {
+
+}
+
+class TestClass2 {
+
+}
+
+public class instanceCounts001a extends AbstractJDWPDebuggee {
+    public static final int expectedCount = HeapwalkingDebuggee.includedIntoInstancesCountTypes.size();
+
+    public static final String COMMAND_CREATE_TEST_INSTANCES = "COMMAND_CREATE_TEST_INSTANCES";
+
+    private ArrayList<ReferringObjectSet> referrers = new ArrayList<ReferringObjectSet>();
+
+    public boolean parseCommand(String command) {
+        if (super.parseCommand(command))
+            return true;
+
+        if (command.equals(COMMAND_CREATE_TEST_INSTANCES)) {
+            for (String referenceType : HeapwalkingDebuggee.includedIntoInstancesCountTypes) {
+                referrers.add(new ReferringObjectSet(new TestClass1(), 1, referenceType));
+                referrers.add(new ReferringObjectSet(new TestClass2(), 1, referenceType));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void main(String args[]) {
+        new instanceCounts001a().doTest(args);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001.java
new file mode 100644
index 00000000000..0d2f58fea40
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001.java
@@ -0,0 +1,466 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.RedefineClasses;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.RedefineClasses.
+ *
+ * See redefinecls001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class redefinecls001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_REDEFINE_CLASSES;
+    static final String VM_CAPABILITY_NAME = "canRedefineClasses";
+
+    // package and classes names
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.RedefineClasses";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "redefinecls001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.RedefineClasses";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.RedefineClasses;
+
+    // tested class name and signature
+    static final String TESTED_CLASS_NAME = TEST_CLASS_NAME + "b";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // field and method names
+    static final String CONSTRUCTOR_FIELD_NAME = "constructorInvoked";
+    static final String STATIC_METHOD_FIELD_NAME = "staticMethodInvoked";
+    static final String OBJECT_METHOD_FIELD_NAME = "objectMethodInvoked";
+    static final String BREAKPOINT_METHOD_NAME = "runIt";
+    static final int BREAKPOINT_LINE_BEFORE = redefinecls001a.BREAKPOINT_LINE_BEFORE;
+    static final int BREAKPOINT_LINE_AFTER = redefinecls001a.BREAKPOINT_LINE_AFTER;
+
+    // filename for redefined class
+//   4691123 TEST: some jdi tests contain precompiled .klass files undes SCCS
+//   precomiled class was removed
+//    static final String REDEFINED_CLASS_FILE_NAME = "redefinecls001b.klass";
+    static final String REDEFINED_CLASS_FILE_NAME = "newclass"
+                    + File.separator + PACKAGE_NAME.replace('.',File.separatorChar)
+                    + File.separator + "redefinecls001b.class";
+//    static final String REDEFINED_CLASS_DIR = ".";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    String testDir = null;
+    boolean dead = false;
+    boolean success = true;
+
+    // data obtained from debuggee
+    long debugeeClassID = 0;
+    long testedClassID = 0;
+    long breakpointMethodID = 0;
+    ByteBuffer redefinedClassBytes = null;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new redefinecls001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();  // minutes
+        timeout = waitTime * 60 * 1000;           // milliseconds
+
+        // get testDir as first positional parameter
+        String args[] = argumentHandler.getArguments();
+        if (args.length < 1) {
+            log.complain("Test dir required as the first positional argument");
+            return FAILED;
+        }
+        testDir = args[0];
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Loading redefined class \n");
+
+            // load class file for redefined class
+            log.display("Loading bytecode of redefined class from file: " +
+                        REDEFINED_CLASS_FILE_NAME);
+            redefinedClassBytes = loadClassBytes(REDEFINED_CLASS_FILE_NAME, testDir);
+            log.display("   ... loaded bytes: " + redefinedClassBytes.length());
+
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee VM");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debuggee launched");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for VM_INIT event
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // check for VM capability
+            log.display("\n>>> Checking VM capability \n");
+            log.display("Getting new VM capability: " + VM_CAPABILITY_NAME);
+            boolean capable = debugee.getNewCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME);
+            log.display("  ... got VM capability: " + capable);
+
+            // exit as PASSED if this capability is not supported
+            if (!capable) {
+                out.println("TEST PASSED: unsupported VM capability: "
+                            + VM_CAPABILITY_NAME);
+                return PASSED;
+            }
+
+            // prepare debuggee for testing and obtain required data
+            log.display("\n>>> Getting prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>> Testing JDWP command \n");
+            testCommand();
+
+            // check command results
+            if (success) {
+                log.display("\n>>> Checking result of tested command \n");
+                checkResult();
+            }
+
+            // finish debuggee
+            log.display("\n>> Finishing debuggee \n");
+
+            // resume debuggee after testing command
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // wait for VM_DEATH event
+            log.display("Waiting for VM_DEATH event");
+            debugee.waitForVMDeath();
+            log.display("  ... VM_DEATH event received");
+            dead = true;
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            log.display("\n>>> Finishing test \n");
+
+            // disconnect debugee and wait for its exit
+            if (debugee != null) {
+                quitDebugee();
+            }
+        }
+
+        // check result
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+        out.println("TEST PASSED");
+        return PASSED;
+    }
+
+    /**
+     * Get debuggee prepared for testing and obtain required data.
+     */
+    void prepareForTest() {
+        // wait for debuggee and tested classes loaded on debuggee startup
+        log.display("Waiting for classes loaded:"
+                        + "\n\t" + DEBUGEE_CLASS_NAME
+                        + "\n\t" + TESTED_CLASS_NAME);
+        String classNames[] = {DEBUGEE_CLASS_NAME, TESTED_CLASS_NAME};
+        long classIDs[] = debugee.waitForClassesLoaded(classNames,
+                                                    JDWP.SuspendPolicy.ALL);
+        debugeeClassID = classIDs[0];
+        log.display("  ... debuggee class loaded with classID: " + debugeeClassID);
+        testedClassID = classIDs[1];
+        log.display("  ... tested class loaded with classID: " + testedClassID);
+        log.display("");
+
+        // set breakpoint before redefinition and wait for debugee reached it
+        log.display("Waiting for breakpoint before redefiniton reached at: "
+                    + BREAKPOINT_METHOD_NAME + ":" +  BREAKPOINT_LINE_BEFORE);
+        long threadID = debugee.waitForBreakpointReached(debugeeClassID,
+                                                BREAKPOINT_METHOD_NAME,
+                                                BREAKPOINT_LINE_BEFORE,
+                                                JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint before redefinition reached with threadID: " + threadID);
+        log.display("");
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        int length = redefinedClassBytes.length();
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  classes: " + 1);
+        command.addInt(1);
+        log.display("  refTypeID: " + testedClassID);
+        command.addReferenceTypeID(testedClassID);
+        log.display("  classfile: " + length + " bytes");
+        command.addInt(length);
+        log.display("  classbytes:\n" + redefinedClassBytes);
+        command.addBytes(redefinedClassBytes.getBytes(), 0, length);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // receive reply packet from debugee
+        ReplyPacket reply = new ReplyPacket();
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("  ... reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet for tested command:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking header of reply packet");
+            reply.checkHeader(command.getPacketID());
+            log.display("  ... packet header is correct");
+        } catch (BoundException e) {
+            log.complain("Wrong header of reply packet for tested command:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet data:");
+        reply.resetPosition();
+
+        // no reply data to parse
+        log.display("  no reply data");
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+
+        log.display("  ... packed data parsed");
+    }
+
+    /**
+     * Check result of the tested JDWP command.
+     */
+    void checkResult() {
+        // set breakpoint after redefinition and wait for debugee reached it
+        log.display("Waiting for breakpoint after redefiniton reached at: "
+                    + BREAKPOINT_METHOD_NAME + ":" +  BREAKPOINT_LINE_AFTER);
+        long threadID = debugee.waitForBreakpointReached(debugeeClassID,
+                                                BREAKPOINT_METHOD_NAME,
+                                                BREAKPOINT_LINE_AFTER,
+                                                JDWP.SuspendPolicy.ALL);
+        log.display("  ... breakpoint after redefinition reached with threadID: " + threadID);
+        log.display("");
+
+        // check invoked methods
+        log.display("Getting value of static field: " + CONSTRUCTOR_FIELD_NAME);
+        JDWP.Value value = debugee.getStaticFieldValue(testedClassID,
+                                                CONSTRUCTOR_FIELD_NAME, JDWP.Tag.INT);
+        int constructorInvoked = ((Integer)value.getValue()).intValue();
+        log.display("  ... got constructorInvoked:  " + methodKind(constructorInvoked));
+
+        if (constructorInvoked != redefinecls001b.NOT_REDEFINED_METHOD_INVOKED) {
+            log.complain("Constructor has been invoked after class redefinition");
+            success = false;
+        }
+
+        log.display("Getting value of static field: " + STATIC_METHOD_FIELD_NAME);
+        value = debugee.getStaticFieldValue(testedClassID,
+                                                STATIC_METHOD_FIELD_NAME, JDWP.Tag.INT);
+        int staticMethodInvoked = ((Integer)value.getValue()).intValue();
+        log.display("  ... got staticMethodInvoked: " + methodKind(staticMethodInvoked));
+
+        if (staticMethodInvoked != redefinecls001b.REDEFINED_METHOD_INVOKED) {
+            log.complain("Not redefined static method is invoked after class redefinition");
+            success = false;
+        }
+
+        log.display("Getting value of static field: " + OBJECT_METHOD_FIELD_NAME);
+        value = debugee.getStaticFieldValue(testedClassID,
+                                                OBJECT_METHOD_FIELD_NAME, JDWP.Tag.INT);
+        int objectMethodInvoked = ((Integer)value.getValue()).intValue();
+        log.display("  ... got objectMethodInvoked: " + methodKind(objectMethodInvoked));
+
+        if (objectMethodInvoked != redefinecls001b.REDEFINED_METHOD_INVOKED) {
+            log.complain("Not redefined object method is invoked after class redefinition");
+            success = false;
+        }
+    }
+
+    /**
+     * Load class bytes form the given file.
+     */
+    ByteBuffer loadClassBytes(String fileName, String dirName) {
+        String fileSep = System.getProperty("file.separator");
+        String filePath = dirName + fileSep + fileName;
+
+        String error = "Unable to read bytes from class file:\n\t" + filePath;
+
+        int length = 0;
+        byte bytes[] = null;
+        try {
+            File file = new File(filePath);
+            length = (int)file.length();
+            FileInputStream is = new FileInputStream(file);
+            bytes = new byte[length];
+            int number = is.read(bytes);
+            if (number < 0) {
+                log.complain("EOF reached while reading bytes from file");
+                throw new Failure(error);
+            } else if (number != length) {
+                log.complain("Unexpected number of bytes red from file: " + number
+                            + " (expected: " + length + ")");
+                throw new Failure(error);
+            }
+            is.close();
+        } catch ( IOException e ) {
+            log.complain("Caught IOException while reading bytes from file:\n\t" + e);
+            throw new Failure(error);
+        }
+        ByteBuffer byteBuffer = new ByteBuffer(length, 0);
+        byteBuffer.addBytes(bytes, 0, length);
+        return byteBuffer;
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    // return string representation of kind of invoked method
+    private static String methodKind(int kind) {
+        switch (kind) {
+            case redefinecls001b.METHOD_NOT_INVOKED:
+                return "METHOD_NOT_INVOKED";
+            case redefinecls001b.REDEFINED_METHOD_INVOKED:
+                return "REDEFINED_METHOD_INVOKED";
+            case redefinecls001b.NOT_REDEFINED_METHOD_INVOKED:
+                return "NOT_REDEFINED_METHOD_INVOKED";
+            default:
+                return "UNKNOWN_METHOD_KIND";
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/TestDescription.java
new file mode 100644
index 00000000000..9244da3d757
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/TestDescription.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001.
+ * VM Testbase keywords: [quick, jpda, jdwp, redefine]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: RedefineClasses
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet. Also test checks that
+ *     after class redefinition invocation of static and object
+ *     methods resuts in invocation of redefined methods, and
+ *     no constructors are invoked.
+ *     Test consists of two compoments:
+ *         debugger: redefinecls001
+ *         debuggee: redefinecls001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     It also loads bytecode of redefined class from *.klass file.
+ *     Next, debugger waits for tested classes are loaded, and breakpoint
+ *     before class redefinition is reached.
+ *     Then, debugger creates command packet for VirtualMachine.RedefineClasses
+ *     command for the found classID and loaded bytecode, writes this packet
+ *     to the transport channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks if no reply data returned in the packet.
+ *     Then, debugger resumes debuggee to allow methods of redefined class
+ *     to be invoked and waits for second breakpoint is reached.
+ *     Upon their invocation redefined methods puts proper value into
+ *     the special static fields of debuggee class. The debugger then
+ *     checks these fields to verify if the redefined methods were invoked
+ *     and no constructors were invoked.
+ *     Finally, debugger disconnects debuggee, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     First positional argument for the test should be path to the test
+ *     work directory where loaded *.klass file should be located.
+ *     Test was updated according to rfe:
+ *     4691123 TEST: some jdi tests contain precompiled .klass files undes SCCS.
+ *     redefinecl001b.ja was moved into newclass directory and renamed
+ *     to redefinecl001b.java.
+ *     The precompiled class file is created during test base build process.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build ExecDriver
+ * @build nsk.jdwp.VirtualMachine.RedefineClasses.redefinecls001
+ *        nsk.jdwp.VirtualMachine.RedefineClasses.redefinecls001a
+ *        nsk.jdwp.VirtualMachine.RedefineClasses.redefinecls001b
+ * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ *      ${compile.jdk}/bin/javac
+ *      -cp ${test.class.path}
+ *      -d newclass
+ *      newclass/redefinecls001b.java
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.RedefineClasses.redefinecls001
+ *      .
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/newclass/redefinecls001b.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/newclass/redefinecls001b.java
new file mode 100644
index 00000000000..0f157ea486f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/newclass/redefinecls001b.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2002, 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 nsk.jdwp.VirtualMachine.RedefineClasses;
+
+import nsk.share.*;
+
+/**
+ * This class is for class redefinition.
+ */
+public class redefinecls001b {
+
+    // values for tested fields
+    public static final int INITIAL_FIELD_VALUE = 111;
+    public static final int FINAL_FIELD_VALUE = 222;
+
+    // values for method redefinition
+    public static final int METHOD_NOT_INVOKED = 0;
+    public static final int REDEFINED_METHOD_INVOKED = 10;
+    public static final int NOT_REDEFINED_METHOD_INVOKED = 20;
+
+    // static field
+    public static int staticField = INITIAL_FIELD_VALUE;
+    // object field
+    public int objectField = INITIAL_FIELD_VALUE;
+
+    public static Log log;
+    // fields for methods redefinition results
+    public static int constructorInvoked = METHOD_NOT_INVOKED;
+    public static int staticMethodInvoked = METHOD_NOT_INVOKED;
+    public static int objectMethodInvoked = METHOD_NOT_INVOKED;
+
+    // constructor
+    public redefinecls001b(int value) {
+        log.display("Constructor invoked: REDEFINED");
+        constructorInvoked = REDEFINED_METHOD_INVOKED;
+        objectField = value;
+    }
+
+    // static method to be redefined
+    public static void testedStaticMethod() {
+        log.display("Static method invoked: REDEFINED");
+        staticMethodInvoked = REDEFINED_METHOD_INVOKED;
+
+        log.display("Static fields values:");
+        log.display("    staticField: " + staticField
+                                + " (expected: " + FINAL_FIELD_VALUE + ")");
+    }
+
+    // object method to be redefined
+    public void testedObjectMethod() {
+        log.display("Object method invoked: REDEFINED");
+        objectMethodInvoked = REDEFINED_METHOD_INVOKED;
+
+        log.display("Object fields values:");
+        log.display("    objectField: " + objectField
+                                + " (expected: " + FINAL_FIELD_VALUE + ")");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001a.java
new file mode 100644
index 00000000000..8b52ed6776c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001a.java
@@ -0,0 +1,113 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.VirtualMachine.RedefineClasses;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class redefinecls001a {
+
+    // line nunber for breakpoint
+    public static final int BREAKPOINT_LINE_BEFORE = 76;
+    public static final int BREAKPOINT_LINE_AFTER = 86;
+
+    // fields for methods redefinition results
+//    public static Integer constructorInvoked = Integer(redefinecls001.METHOD_NOT_INVOKED);
+//    public static Integer staticMethodInvoked = Integer(redefinecls001.METHOD_NOT_INVOKED);
+//    public static Integer objectMethodInvoked = Integer(redefinecls001.METHOD_NOT_INVOKED);
+
+    // scaffold objects
+    static volatile ArgumentHandler argumentHandler = null;
+    static volatile Log log = null;
+
+    public static void main(String args[]) {
+        System.exit(redefinecls001.JCK_STATUS_BASE + redefinecls001a.runIt(args, System.err));
+    }
+
+    public static int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // create tested thread
+        log.display("Creating object of tested class");
+        redefinecls001b.staticField = redefinecls001b.FINAL_FIELD_VALUE;
+        redefinecls001b.log = log;
+        redefinecls001b object = new redefinecls001b(redefinecls001b.FINAL_FIELD_VALUE);
+        log.display("  ... object created");
+
+        // invoke tested method before redefinition
+        log.display("Invoking tested methods before redefinition");
+        redefinecls001b.testedStaticMethod();
+        object.testedObjectMethod();
+        printInvocationResult();
+
+        log.display("\nBreakpoint line before redefinition reached");
+        // next line is for breakpoint before redefinition
+        int foo = 0; // BREAKPOINT_LINE_BEFORE
+
+        // invoke tested method after redefinition
+        log.display("Invoking tested methods after redefinition");
+        redefinecls001b.testedStaticMethod();
+        object.testedObjectMethod();
+        printInvocationResult();
+
+        log.display("\nBreakpoint line after redefinition reached");
+        // next line is for breakpoint after redefinition
+        foo = 1; // BREAKPOINT_LINE_AFTER
+
+        log.display("Debugee PASSED");
+        return redefinecls001.PASSED;
+    }
+
+    // print information about kind of invoked methods
+    private static void printInvocationResult() {
+        log.display("Result of methods invokation:");
+        log.display("    constructorInvoked:  " + methodKind(redefinecls001b.constructorInvoked));
+        log.display("    staticMethodInvoked: " + methodKind(redefinecls001b.staticMethodInvoked));
+        log.display("    objectMethodInvoked: " + methodKind(redefinecls001b.objectMethodInvoked));
+    }
+
+    // return string representation of kind of invoked method
+    private static String methodKind(int kind) {
+        switch (kind) {
+            case redefinecls001b.METHOD_NOT_INVOKED:
+                return "METHOD_NOT_INVOKED";
+            case redefinecls001b.REDEFINED_METHOD_INVOKED:
+                return "REDEFINED_METHOD_INVOKED";
+            case redefinecls001b.NOT_REDEFINED_METHOD_INVOKED:
+                return "NOT_REDEFINED_METHOD_INVOKED";
+            default:
+                return "UNKNOWN_METHOD_KIND";
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001b.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001b.java
new file mode 100644
index 00000000000..a3ee1f6c011
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001b.java
@@ -0,0 +1,79 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.RedefineClasses;
+
+import nsk.share.*;
+
+/**
+ * This class is to be redefined.
+ */
+public class redefinecls001b {
+
+    // values for tested fields
+    public static final int INITIAL_FIELD_VALUE = 111;
+    public static final int FINAL_FIELD_VALUE = 222;
+
+    // values for method redefinition
+    public static final int METHOD_NOT_INVOKED = 0;
+    public static final int REDEFINED_METHOD_INVOKED = 10;
+    public static final int NOT_REDEFINED_METHOD_INVOKED = 20;
+
+    // static field
+    public static int staticField = INITIAL_FIELD_VALUE;
+    // object field
+    public int objectField = INITIAL_FIELD_VALUE;
+
+    public static Log log;
+    // fields for methods redefinition results
+    public static int constructorInvoked = METHOD_NOT_INVOKED;
+    public static int staticMethodInvoked = METHOD_NOT_INVOKED;
+    public static int objectMethodInvoked = METHOD_NOT_INVOKED;
+
+    // constructor
+    public redefinecls001b(int value) {
+        log.display("Constructor invoked: NOT REDEFINED");
+        constructorInvoked = NOT_REDEFINED_METHOD_INVOKED;
+        objectField = value;
+    }
+
+    // static method to be redefined
+    public static void testedStaticMethod() {
+        log.display("Static method invoked: NOT REDEFINED");
+        staticMethodInvoked = NOT_REDEFINED_METHOD_INVOKED;
+
+        log.display("Static fields values:");
+        log.display("    staticField: " + staticField
+                                + " (expected: " + FINAL_FIELD_VALUE + ")");
+    }
+
+    // object method to be redefined
+    public void testedObjectMethod() {
+        log.display("Object method invoked: NOT REDEFINED");
+        objectMethodInvoked = NOT_REDEFINED_METHOD_INVOKED;
+
+        log.display("Object fields values:");
+        log.display("    objectField: " + objectField
+                                + " (expected: " + FINAL_FIELD_VALUE + ")"); // BREAKPOINT_LINE_BEFORE
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001.java
new file mode 100644
index 00000000000..95bafeb1aff
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001.java
@@ -0,0 +1,265 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ReleaseEvents;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.ReleaseEvents.
+ *
+ * See releaseevents001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class releaseevents001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.ReleaseEvents";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "releaseevents001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.ReleaseEvents";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.ReleaseEvents;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new releaseevents001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+
+                // finally release events
+                log.display("Holding events into debuggee");
+                holdEvents();
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand();
+
+            } finally {
+
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Hold events into debuggee.
+     */
+    void holdEvents() {
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.HoldEvents);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no data in reply packet
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001/TestDescription.java
new file mode 100644
index 00000000000..70ca97bd9aa
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: ReleaseEvents
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: releaseevents001
+ *         debuggee: releaseevents001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Before testing JDWP command debugger holds debuggee's events.
+ *     Then, debugger creates command packet for VirtualMachine.ReleaseEvents
+ *     command with no out data, writes packet to the transport channel,
+ *     and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks that the received reply packet contains no data.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ * COMMENTS
+ *     Test fixed according to test bug:
+ *     4954298 TEST_BUG: typo in nsk/jdwp/VirtualMachine/ReleaseEvents/<*> tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.ReleaseEvents.releaseevents001
+ *        nsk.jdwp.VirtualMachine.ReleaseEvents.releaseevents001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.ReleaseEvents.releaseevents001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001a.java
new file mode 100644
index 00000000000..2dc482ff2d5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents001a.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ReleaseEvents;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class releaseevents001a {
+
+    public static void main(String args[]) {
+        releaseevents001a _releaseevents001a = new releaseevents001a();
+        System.exit(releaseevents001.JCK_STATUS_BASE + _releaseevents001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + releaseevents001.READY);
+        pipe.println(releaseevents001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + releaseevents001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(releaseevents001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + releaseevents001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return releaseevents001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return releaseevents001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002.java
new file mode 100644
index 00000000000..64b6ce1547b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002.java
@@ -0,0 +1,405 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.ReleaseEvents;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.ReleaseEvents.
+ *
+ * See releaseevents002.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ *
+ * @see #runIt()
+ */
+public class releaseevents002 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.ReleaseEvents";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "releaseevents002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.ReleaseEvents";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.ReleaseEvents;
+    static final byte TESTED_EVENT_KIND = JDWP.EventKind.BREAKPOINT;
+    static final byte TESTED_EVENT_SUSPEND_POLICY = JDWP.SuspendPolicy.ALL;
+    static final byte TESTED_EVENT_MODIFIER = JDWP.EventModifierKind.LOCATION_ONLY;
+
+    // name and signature of the tested class
+    static final String TESTED_CLASS_NAME = DEBUGEE_CLASS_NAME + "$" + "TestedClass";
+    static final String TESTED_CLASS_SIGNATURE = "L" + TESTED_CLASS_NAME.replace('.', '/') + ";";
+
+    // name of field and method of tested class
+    static final String TESTED_METHOD_NAME = "run";
+    static final int BREAKPOINT_LINE = releaseevents002a.BREAKPOINT_LINE;
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    int waitTime = 0;  // minutes
+    long timeout = 0;  // milliseconds
+    boolean dead = false;
+    boolean success = true;
+
+    // obtained data
+    long testedClassID = 0;
+    long testedMethodID = 0;
+    int eventRequestID = 0;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main(String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start test from JCK-compilant environment.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new releaseevents002().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+        waitTime = argumentHandler.getWaitTime();
+        timeout = waitTime * 60 * 1000;
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Starting debugee \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            log.display("  ... debugee launched");
+            log.display("");
+
+            // set timeout for debuggee responces
+            log.display("Setting timeout for debuggee responces: " + waitTime + " minute(s)");
+            transport.setReadTimeout(timeout);
+            log.display("  ... timeout set");
+
+            // wait for debuggee started
+            log.display("Waiting for VM_INIT event");
+            debugee.waitForVMInit();
+            log.display("  ... VM_INIT event received");
+
+            // query debugee for VM-dependent ID sizes
+            log.display("Querying for IDSizes");
+            debugee.queryForIDSizes();
+            log.display("  ... size of VM-dependent types adjusted");
+
+            // get debuggee prepared for testing
+            log.display("\n>>> Get debuggee prepared for testing \n");
+            prepareForTest();
+
+            // test JDWP command
+            log.display("\n>>> Testing JDWP command \n");
+
+            // hold events
+            log.display("Holding events into debuggee");
+            holdEvents();
+            log.display("  ... events held");
+
+            // resume debuggee
+            log.display("Resuming debuggee");
+            debugee.resume();
+            log.display("  ... debuggee resumed");
+
+            // release events
+            log.display("Release events into debuggee");
+            releaseEvents();
+            log.display("  ... events released");
+
+            // wait for BREAKPOINT event
+            log.display("Waiting for BREAKPOINT event");
+            waitForBreakpointEvent();
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        } finally {
+            // quit debugee
+            log.display("\n>>> Finishing test \n");
+            quitDebugee();
+        }
+
+        // check test results
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debuggee for testing.
+     */
+    void prepareForTest() {
+        // wait for tested class loaded
+        log.display("Waiting for tested class loaded");
+        testedClassID = debugee.waitForClassLoaded(TESTED_CLASS_NAME, JDWP.SuspendPolicy.ALL);
+        log.display("  ... got classID: " + testedClassID);
+        log.display("");
+
+        // get methodID for breakpoint method
+        log.display("Getting breakpoint methodID by name: " + TESTED_METHOD_NAME);
+        testedMethodID = debugee.getMethodID(testedClassID, TESTED_METHOD_NAME, true);
+        log.display("  ... got methodID: " + testedMethodID);
+
+        // make request for BREAKPOINT event
+        log.display("Making request for BREAKPOINT event at: "
+                    + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE);
+        eventRequestID = debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS, testedClassID,
+                                                        testedMethodID, BREAKPOINT_LINE,
+                                                        JDWP.SuspendPolicy.ALL);
+        log.display("  ... got requestID: " + eventRequestID);
+    }
+
+    /**
+     * Hold events into debuggee.
+     */
+    void holdEvents() {
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.HoldEvents);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+    }
+
+    /**
+     * Release events into debuggee.
+     */
+    void releaseEvents() {
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.ReleaseEvents);
+        ReplyPacket reply = debugee.receiveReplyFor(command);
+    }
+
+    /**
+     * Wait for requested BREAKPOINT event NOT occured.
+     */
+    void waitForBreakpointEvent() {
+
+        // receive event
+        EventPacket eventPacket = null;
+        try {
+            eventPacket = debugee.receiveEvent();
+            log.display("Event received after releasing events into debuggee");
+        } catch (Failure e) {
+            log.complain("No requested event received after releasing events into debuggee:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing event packet:");
+        eventPacket.resetPosition();
+
+        // get suspendPolicy value
+        byte suspendPolicy = 0;
+        try {
+            suspendPolicy = eventPacket.getByte();
+            log.display("    suspendPolicy: " + suspendPolicy);
+        } catch (BoundException e) {
+            log.complain("Unable to get suspendPolicy value from received event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // get events count
+        int events = 0;
+        try {
+            events = eventPacket.getInt();
+            log.display("    events: " + events);
+        } catch (BoundException e) {
+            log.complain("Unable to get events count from received event packet:\n\t"
+                        + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // check events count
+        if (events < 0) {
+            log.complain("Negative value of events number in received event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        } else if (events != 1) {
+            log.complain("Invalid number of events in received event packet: " +
+                        events + " (expected: " + 1 + ")");
+            success = false;
+        }
+
+        // extract each event
+        long eventThreadID = 0;
+        for (int i = 0; i < events; i++) {
+            log.display("    event #" + i + ":");
+
+            // get eventKind
+            byte eventKind = 0;
+            try {
+                eventKind = eventPacket.getByte();
+                log.display("      eventKind: " + eventKind);
+            } catch (BoundException e) {
+                log.complain("Unable to get eventKind of event #" + i + " from received event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check eventKind
+            if (eventKind == JDWP.EventKind.VM_DEATH) {
+                log.display("Unexpected VM_DEATH event received intead of BREAKPOINT event");
+                success = false;
+                dead = true;
+                return;
+            }  else if (eventKind == JDWP.EventKind.BREAKPOINT) {
+                log.display("Expected BREAKPOINT event received in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.BREAKPOINT + ")");
+            }  else {
+                log.complain("Unexpected eventKind of event " + i + " in event packet: " +
+                            eventKind + " (expected: " + JDWP.EventKind.BREAKPOINT + ")");
+                success = false;
+                return;
+            }
+
+            // get requestID
+            int requestID = 0;
+            try {
+                requestID = eventPacket.getInt();
+                log.display("      requestID: " + requestID);
+            } catch (BoundException e) {
+                log.complain("Unable to get requestID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // check requestID
+            if (requestID != eventRequestID) {
+                log.complain("Unexpected requestID of event " + i + " in BREAKPOINT event packet: " +
+                            requestID + " (expected: " + eventRequestID + ")");
+                success = false;
+            }
+
+            // get threadID
+            long threadID = 0;
+            try {
+                threadID = eventPacket.getObjectID();
+                log.display("      threadID: " + threadID);
+            } catch (BoundException e) {
+                log.complain("Unable to get threadID of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+
+            // get location
+            JDWP.Location location = null;
+            try {
+                location = eventPacket.getLocation();
+                log.display("      location: " + location);
+            } catch (BoundException e) {
+                log.complain("Unable to get location of event #" + i + " from BREAKPOINT event packet:\n\t"
+                            + e.getMessage());
+                success = false;
+                return;
+            }
+        }
+
+        // check for extra data in event packet
+        if (!eventPacket.isParsed()) {
+            log.complain("Extra trailing bytes found in event packet at: "
+                        + eventPacket.offsetString());
+            success = false;
+        }
+
+        log.display("  ... event packet parsed");
+    }
+
+    /**
+     * Disconnect debuggee and wait for it exited.
+     */
+    void quitDebugee() {
+        if (debugee == null)
+            return;
+
+        // disconnect debugee if not dead
+        if (!dead) {
+            try {
+                log.display("Disconnecting debuggee");
+                debugee.dispose();
+                log.display("  ... debuggee disconnected");
+            } catch (Failure e) {
+                log.display("Failed to finally disconnect debuggee:\n\t"
+                            + e.getMessage());
+            }
+        }
+
+        // wait for debugee exited
+        log.display("Waiting for debuggee exit");
+        int code = debugee.waitFor();
+        log.display("  ... debuggee exited with exit code: " + code);
+
+        // analize debugee exit status code
+        if (code != JCK_STATUS_BASE + PASSED) {
+            log.complain("Debuggee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002/TestDescription.java
new file mode 100644
index 00000000000..6877cadf527
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002/TestDescription.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: ReleaseEvents
+ *         event kind: BREAKPOINT
+ *     Test checks that requested BREAKPOINT event received from
+ *     debuggee after holding and then releasing events.
+ *     Test consists of two compoments:
+ *         debugger: releaseevents002
+ *         debuggee: releaseevents002a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Next, debugger waits for tested class loaded and requests an
+ *     BREAKPOINT event for some location into tested class.
+ *     Then, debugger holds events into debuggee, resumes debuggee to
+ *     allow it to reach breakpoint, and then releases events using
+ *     tested command VirtualMachine.ReleaseEvents. Debugger waits for
+ *     an event packet is received and checks if this packet is for
+ *     requested BREAKPOINT event.
+ *     Finally, debugger disconnectes debuggee, waits for it exit
+ *     and exits too with proper exit code.
+ * COMMENTS
+ *     Test fixed according to test bug:
+ *     4954298 TEST_BUG: typo in nsk/jdwp/VirtualMachine/ReleaseEvents/<*> tests
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.ReleaseEvents.releaseevents002
+ *        nsk.jdwp.VirtualMachine.ReleaseEvents.releaseevents002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.ReleaseEvents.releaseevents002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002a.java
new file mode 100644
index 00000000000..f5c7b2c7931
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/ReleaseEvents/releaseevents002a.java
@@ -0,0 +1,84 @@
+/*
+ * 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
+ * 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+package nsk.jdwp.VirtualMachine.ReleaseEvents;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class releaseevents002a {
+
+    static final int BREAKPOINT_LINE = 80;
+
+    static ArgumentHandler argumentHandler = null;
+    static Log log = null;
+
+    public static void main(String args[]) {
+        releaseevents002a _releaseevents002a = new releaseevents002a();
+        System.exit(releaseevents002.JCK_STATUS_BASE + _releaseevents002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        argumentHandler = new ArgumentHandler(args);
+        log = new Log(out, argumentHandler);
+
+        // ensure tested class is loaded
+        log.display("Creating object of tested class");
+        TestedClass object = new TestedClass();
+        log.display("  ... object created");
+
+        // invoke method with breakpoint
+        log.display("Invoking method with breakpoint");
+        object.run();
+        log.display("  ... method invoked");
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return releaseevents002.PASSED;
+    }
+
+    // tested class
+    public static class TestedClass {
+        int foo = 0;
+
+        public TestedClass() {
+            foo = 1000;
+        }
+
+        public void run() {
+            log.display("Breakpoint line reached");
+            // next line is for breakpoint
+            foo = 0; // BREAKPOINT_LINE
+            log.display("Breakpoint line passed");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001.java
new file mode 100644
index 00000000000..ed427439edc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001.java
@@ -0,0 +1,184 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Resume;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class resume001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.Resume";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "resume001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.Resume";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.Resume;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+    return new resume001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            final Log log = new Log(out, argumentHandler);
+            long timeout = argumentHandler.getWaitTime() * 60 * 1000; // milliseconds
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                final IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Caught exception: " + e);
+                    success = false;
+                }
+
+                // check if debugee has been actually resumed
+
+                if (success) {
+                    log.display("Waiting for debugee continues execution or timeout exceeds");
+
+                    // separate thread for waiting for reply from debuggee
+                    class TimeoutHandler extends Thread {
+                        boolean success = false;
+                        public void run() {
+                            log.display("Waiting for command: " + "ready");
+                            String cmd = pipe.readln();
+                            log.display("Received command: " + cmd);
+                            if (cmd.equals("ready")) {
+                                success = true;
+                                log.display("Debugee was resumed successfully");
+                            } else {
+                                log.complain("Unexpected command received: " + cmd);
+                            }
+                        }
+                    }
+
+                    // start separate thread
+                    TimeoutHandler timeoutHandler = new TimeoutHandler();
+                    timeoutHandler.start();
+
+                    // wait for thread finished or timeout exceeds
+                    try {
+                        timeoutHandler.join(timeout);
+                        if (timeoutHandler.isAlive()) {
+                            log.display("Interrupting thread because timeout exceeds");
+                            timeoutHandler.interrupt();
+                        }
+                    } catch (InterruptedException e) {
+                        throw new Failure("Main thread interrupted: " + e);
+                    }
+
+                    // check resuts
+                    if (!timeoutHandler.success) {
+                        log.complain("Debugee has not been resumed by command");
+                        success = false;
+                    }
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001/TestDescription.java
new file mode 100644
index 00000000000..6580a449018
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001/TestDescription.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/Resume/resume001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: Resume
+ *     Test checks that debugee accept command and replies
+ *     with correct reply packet. Also test checks that
+ *     debugee is actually resumed by the command.
+ *     First, test launches debuggee VM using support classes
+ *     and connects to it. Debugee is launched in the suspend
+ *     mode by default.
+ *     Then test sends Resume command and waits for a
+ *     reply packet.
+ *     When reply is received test checks if the reply packet
+ *     has proper structure. Then test waits for a signal
+ *     from the resumed debuggee. If signal has not received
+ *     after specified by WAITTIME timeout, test complains
+ *     about an error.
+ *     Finally, test sends debugee VM signal to quit, waits
+ *     for debugee VM exits and exits too with a proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.Resume.resume001
+ *        nsk.jdwp.VirtualMachine.Resume.resume001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.Resume.resume001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001a.java
new file mode 100644
index 00000000000..57ea78061e9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Resume/resume001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Resume;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class resume001a {
+
+    public static void main(String args[]) {
+        resume001a _resume001a = new resume001a();
+        System.exit(resume001.JCK_STATUS_BASE + _resume001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return resume001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001.java
new file mode 100644
index 00000000000..51e8a03487b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001.java
@@ -0,0 +1,269 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.SetDefaultStratum;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+/**
+ * Test for JDWP command: VirtualMachine.SetDefaultStratum.
+ *
+ * See setdefstrat001.README for description of test execution.
+ *
+ * This class represents debugger part of the test.
+ * Test is executed by invoking method runIt().
+ * JDWP command is tested in the method testCommand().
+ *
+ * @see #runIt()
+ * @see #testCommand()
+ */
+public class setdefstrat001 {
+
+    // exit status constants
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+
+    // communication signals constants
+    static final String READY = "ready";
+    static final String QUIT = "quit";
+
+    // package and classes names constants
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.SetDefaultStratum";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "setdefstrat001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    // VM capability constatnts
+    static final int VM_CAPABILITY_NUMBER = JDWP.Capability.CAN_SET_DEFAULT_STRATUM;
+    static final String VM_CAPABILITY_NAME = "canSetDefaultStratum";
+
+    // tested JDWP command constants
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.SetDefaultStratum";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.SetDefaultStratum;
+
+    // new value for default startum
+    static final String NEW_DEFAULT_STRATUM = "test";
+
+    // usual scaffold objects
+    ArgumentHandler argumentHandler = null;
+    Log log = null;
+    Binder binder = null;
+    Debugee debugee = null;
+    Transport transport = null;
+    IOPipe pipe = null;
+
+    // test passed or not
+    boolean success = true;
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Start test from command line.
+     */
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    /**
+     * Start JCK-compilant test.
+     */
+    public static int run(String argv[], PrintStream out) {
+        return new setdefstrat001().runIt(argv, out);
+    }
+
+    // -------------------------------------------------------------------
+
+    /**
+     * Perform test execution.
+     */
+    public int runIt(String argv[], PrintStream out) {
+
+        // make log for debugger messages
+        argumentHandler = new ArgumentHandler(argv);
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debuggee
+            binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+            transport = debugee.getTransport();
+            pipe = debugee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            // work with prepared debuggee
+            try {
+                log.display("\n>>> Checking VM capability \n");
+
+                // check for VM capability
+                log.display("Checking VM capability: " + VM_CAPABILITY_NAME);
+                if (!debugee.getNewCapability(VM_CAPABILITY_NUMBER, VM_CAPABILITY_NAME)) {
+                    out.println("TEST PASSED: unsupported VM capability: "
+                                + VM_CAPABILITY_NAME);
+                    return PASSED;
+                }
+
+                // perform testing JDWP command
+                log.display("\n>>> Testing JDWP command \n");
+                testCommand();
+
+            } finally {
+                // quit debugee
+                log.display("\n>>> Finishing test \n");
+                quitDebugee();
+            }
+
+        } catch (Failure e) {
+            log.complain("TEST FAILED: " + e.getMessage());
+            success = false;
+        } catch (Exception e) {
+            e.printStackTrace(out);
+            log.complain("Caught unexpected exception while running the test:\n\t" + e);
+            success = false;
+        }
+
+        if (!success) {
+            log.complain("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+    /**
+     * Prepare debugee for testing and waiting for ready signal.
+     */
+    void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debugee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debugee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debugee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + READY);
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+        if (! signal.equals(READY)) {
+            throw new TestBug("Unexpected signal received from debugee: " + signal
+                            + " (expected: " + READY + ")");
+        }
+    }
+
+    /**
+     * Sending debugee signal to quit and waiting for it exits.
+     */
+    void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + QUIT);
+        pipe.println(QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debugee.waitFor();
+
+        // analize debugee exit status code
+        if (code == JCK_STATUS_BASE + PASSED) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            log.complain("Debugee FAILED with exit code: " + code);
+            success = false;
+        }
+    }
+
+    /**
+     * Perform testing JDWP command.
+     */
+    void testCommand() {
+        // create command packet and fill requred out data
+        log.display("Create command packet:");
+        log.display("Command: " + JDWP_COMMAND_NAME);
+        CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+        log.display("  stratumID: " + NEW_DEFAULT_STRATUM);
+        command.addString(NEW_DEFAULT_STRATUM);
+        command.setLength();
+
+        // send command packet to debugee
+        try {
+            log.display("Sending command packet:\n" + command);
+            transport.write(command);
+        } catch (IOException e) {
+            log.complain("Unable to send command packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        ReplyPacket reply = new ReplyPacket();
+
+        // receive reply packet from debugee
+        try {
+            log.display("Waiting for reply packet");
+            transport.read(reply);
+            log.display("Reply packet received:\n" + reply);
+        } catch (IOException e) {
+            log.complain("Unable to read reply packet:\n\t" + e);
+            success = false;
+            return;
+        }
+
+        // check reply packet header
+        try{
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            log.complain("Bad header of reply packet:\n\t" + e.getMessage());
+            success = false;
+            return;
+        }
+
+        // start parsing reply packet data
+        log.display("Parsing reply packet:");
+        reply.resetPosition();
+
+        // no data in reply packet
+
+        // check for extra data in reply packet
+        if (!reply.isParsed()) {
+            log.complain("Extra trailing bytes found in reply packet at: "
+                        + reply.offsetString());
+            success = false;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001/TestDescription.java
new file mode 100644
index 00000000000..92b759f56c3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001/TestDescription.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test performs checking for
+ *         command set: VirtualMachine
+ *         command: SetDefaultStratum
+ *     Test checks that debugee accept the command packet and
+ *     replies with correct reply packet.
+ *     Test consists of two compoments:
+ *         debugger: setdefstrat001
+ *         debuggee: setdefstrat001a
+ *     First, debugger uses nsk.share support classes to launch debuggee
+ *     and obtain Transport object, that represents JDWP transport channel.
+ *     Also communication channel (IOPipe) is established between
+ *     debugger and debuggee to exchange with synchronization signals.
+ *     Debugger uses VirtualMachine.CapabilitiesNew command to check
+ *     VM capability canSetDefaultStratum before testing JDWP command.
+ *     Then, debugger creates command packet for VirtualMachine.SetDefaultStratum
+ *     command with new string value, writes packet to the transport
+ *     channel, and waits for a reply packet.
+ *     When reply packet is received, debugger parses the packet structure
+ *     and checks that the received reply packet contains no data.
+ *     Finally, debugger sends debuggee signal to quit, waits for it exits
+ *     and exits too with the proper exit code.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.SetDefaultStratum.setdefstrat001
+ *        nsk.jdwp.VirtualMachine.SetDefaultStratum.setdefstrat001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.SetDefaultStratum.setdefstrat001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001a.java
new file mode 100644
index 00000000000..ee2d28ae6f6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001a.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.SetDefaultStratum;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+/**
+ * This class represents debuggee part in the test.
+ */
+public class setdefstrat001a {
+
+    public static void main(String args[]) {
+        setdefstrat001a _setdefstrat001a = new setdefstrat001a();
+        System.exit(setdefstrat001.JCK_STATUS_BASE + _setdefstrat001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        //make log for debugee messages
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+
+        // make communication pipe to debugger
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+
+        // send debugger signal READY
+        log.display("Sending signal to debugger: " + setdefstrat001.READY);
+        pipe.println(setdefstrat001.READY);
+
+        // wait for signal QUIT from debugeer
+        log.display("Waiting for signal from debugger: " + setdefstrat001.QUIT);
+        String signal = pipe.readln();
+        log.display("Received signal from debugger: " + signal);
+
+        // check received signal
+        if (! signal.equals(setdefstrat001.QUIT)) {
+            log.complain("Unexpected communication signal from debugee: " + signal
+                        + " (expected: " + setdefstrat001.QUIT + ")");
+            log.display("Debugee FAILED");
+            return setdefstrat001.FAILED;
+        }
+
+        // exit debugee
+        log.display("Debugee PASSED");
+        return setdefstrat001.PASSED;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001.java
new file mode 100644
index 00000000000..e04cb45580c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001.java
@@ -0,0 +1,165 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.TopLevelThreadGroups;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class threadgroups001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.TopLevelThreadGroups";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "threadgroups001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.TopLevelThreadGroups";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.TopLevelThreadGroups;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new threadgroups001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    int groups = reply.getInt();
+                    log.display("  groups: " + groups);
+
+                    for (int i = 0; i < groups; i++) {
+                        long threadGroupID = reply.getObjectID();
+                        log.display("  " + i + " threadGroupID: " + threadGroupID);
+                    }
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                    if (groups < 0) {
+                        log.complain("Negative number of returned thread groups: " + groups);
+                        success = false;
+                    }
+
+                    if (groups == 0) {
+                        log.complain("No thread groups returned: " + groups);
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001/TestDescription.java
new file mode 100644
index 00000000000..1891dfb102f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001/TestDescription.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: ClassPaths
+ *     Test launches debuggee VM using support classes and sends
+ *     ClassPaths command to it. Then test receives reply for this
+ *     command and prints classpath and bootclasspath value
+ *     from received reply.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.TopLevelThreadGroups.threadgroups001
+ *        nsk.jdwp.VirtualMachine.TopLevelThreadGroups.threadgroups001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.TopLevelThreadGroups.threadgroups001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001a.java
new file mode 100644
index 00000000000..f43f41889b4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/TopLevelThreadGroups/threadgroups001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.TopLevelThreadGroups;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+import java.io.*;
+
+public class threadgroups001a {
+
+    public static void main(String args[]) {
+        threadgroups001a _threadgroups001a = new threadgroups001a();
+        System.exit(threadgroups001.JCK_STATUS_BASE + _threadgroups001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return threadgroups001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001.java
new file mode 100644
index 00000000000..b89aa3e0ec0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001.java
@@ -0,0 +1,162 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Version;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class version001 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.Version";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "version001";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.Version";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.Version;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new version001().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    String description = reply.getString();
+                    log.display("  description: " + description);
+
+                    int jdwpMajor = reply.getInt();
+                    log.display("  jdwpMajor:   " + jdwpMajor);
+
+                    int jdwpMinor = reply.getInt();
+                    log.display("  jdwpMinor:   " + jdwpMinor);
+
+                    String vmVersion = reply.getString();
+                    log.display("  vmVersion:   " + vmVersion);
+
+                    String vmName = reply.getString();
+                    log.display("  vmName:      " + vmName);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001/TestDescription.java
new file mode 100644
index 00000000000..a3ecb76cfbc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001/TestDescription.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/Version/version001.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: Version
+ *     Test launches debuggee VM using support classes and sends
+ *     Version command to it. Then test receives reply for this
+ *     command and prints version information from that reply.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.Version.version001
+ *        nsk.jdwp.VirtualMachine.Version.version001a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.Version.version001
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001a.java
new file mode 100644
index 00000000000..53ef07de303
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version001a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Version;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class version001a {
+
+    public static void main(String args[]) {
+        version001a _version001a = new version001a();
+        System.exit(version001.JCK_STATUS_BASE + _version001a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return version001.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002.java
new file mode 100644
index 00000000000..5907a8159ff
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002.java
@@ -0,0 +1,187 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Version;
+
+import java.io.*;
+import java.util.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class version002 {
+    static final int JCK_STATUS_BASE = 95;
+    static final int PASSED = 0;
+    static final int FAILED = 2;
+    static final String PACKAGE_NAME = "nsk.jdwp.VirtualMachine.Version";
+    static final String TEST_CLASS_NAME = PACKAGE_NAME + "." + "version002";
+    static final String DEBUGEE_CLASS_NAME = TEST_CLASS_NAME + "a";
+
+    static final String JDWP_COMMAND_NAME = "VirtualMachine.Version";
+    static final int JDWP_COMMAND_ID = JDWP.Command.VirtualMachine.Version;
+
+    public static void main (String argv[]) {
+        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+    }
+
+    public static int run(String argv[], PrintStream out) {
+        return new version002().runIt(argv, out);
+    }
+
+    public int runIt(String argv[], PrintStream out) {
+
+        boolean success = true;
+
+        try {
+            ArgumentHandler argumentHandler = new ArgumentHandler(argv);
+            Log log = new Log(out, argumentHandler);
+
+            try {
+
+                Binder binder = new Binder(argumentHandler, log);
+                log.display("Start debugee VM");
+                Debugee debugee = binder.bindToDebugee(DEBUGEE_CLASS_NAME);
+                Transport transport = debugee.getTransport();
+                IOPipe pipe = debugee.createIOPipe();
+
+                log.display("Waiting for VM_INIT event");
+                debugee.waitForVMInit();
+
+                log.display("Querying for IDSizes");
+                debugee.queryForIDSizes();
+
+                log.display("Resume debugee VM");
+                debugee.resume();
+
+                log.display("Waiting for command: " + "ready");
+                String cmd = pipe.readln();
+                log.display("Received command: " + cmd);
+
+                // begin test of JDWP command
+
+                try {
+                    CommandPacket command = new CommandPacket(JDWP_COMMAND_ID);
+                    // A properly formed CommandPacket has JDWP.Flag.NONE
+                    // for the 'flags' field. Set the 'flags' field to '!'
+                    // simulate a bad value in the printable ASCII range.
+                    // '!' == 0x21 which means the bad value also does not
+                    // have the JDWP.Flag.REPLY_PACKET (0x80) set.
+                    command.setFlags((byte) '!');
+
+                    log.display("Sending command packet:\n" + command);
+                    transport.write(command);
+
+                    log.display("Waiting for reply packet");
+                    ReplyPacket reply = new ReplyPacket();
+                    transport.read(reply);
+
+                    if (true) {
+                        // In this test (compared to version001), we
+                        // should never reach here because the debuggee
+                        // should have thrown an IOException and printed
+                        // this error message:
+                        // ERROR: Received jdwpPacket with flags != 0x0 (actual=0x21) when a jdwpCmdPacket was expected.
+
+                        throw new Failure("Debuggee did not detect bad flags field.");
+                    }
+                    // The code below this point of the try-catch block is
+                    // not reachable and could be deleted. It is left in
+                    // place to ease porting of this test to earlier releases.
+
+                    log.display("Reply packet received:\n" + reply);
+
+                    log.display("Checking reply packet header");
+                    reply.checkHeader(command.getPacketID());
+
+                    log.display("Parsing reply packet:");
+                    reply.resetPosition();
+
+                    String description = reply.getString();
+                    log.display("  description: " + description);
+
+                    int jdwpMajor = reply.getInt();
+                    log.display("  jdwpMajor:   " + jdwpMajor);
+
+                    int jdwpMinor = reply.getInt();
+                    log.display("  jdwpMinor:   " + jdwpMinor);
+
+                    String vmVersion = reply.getString();
+                    log.display("  vmVersion:   " + vmVersion);
+
+                    String vmName = reply.getString();
+                    log.display("  vmName:      " + vmName);
+
+                    if (! reply.isParsed()) {
+                        log.complain("Extra bytes in reply packet at: " + reply.currentPosition());
+                        success = false;
+                    }
+
+                } catch (IOException ie) {
+                    // version001 expects to pass.
+                    // This test expects to fail due to an IOException.
+                    log.display("Expected IOException caught: " + ie);
+                    success = true;
+                } catch (Exception e) {
+                    log.complain("Exception catched: " + e);
+                    success = false;
+                }
+
+                // end test of JDWP command
+
+                log.display("Sending command: " + "quit");
+                pipe.println("quit");
+
+                log.display("Waiting for debugee exits");
+                int code = debugee.waitFor();
+                if (code == JCK_STATUS_BASE + PASSED) {
+                    log.display("Debugee PASSED: " + code);
+                } else {
+                    log.complain("Debugee FAILED: " + code);
+                    success = false;
+                }
+
+            } catch (Exception e) {
+                log.complain("Unexpected exception: " + e);
+                e.printStackTrace(out);
+                success = false;
+            }
+
+            if (!success) {
+                log.complain("TEST FAILED");
+                return FAILED;
+            }
+
+        } catch (Exception e) {
+            out.println("Unexpected exception: " + e);
+            e.printStackTrace(out);
+            out.println("TEST FAILED");
+            return FAILED;
+        }
+
+        out.println("TEST PASSED");
+        return PASSED;
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002/TestDescription.java
new file mode 100644
index 00000000000..d64262bbf71
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002/TestDescription.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase nsk/jdwp/VirtualMachine/Version/version002.
+ * VM Testbase keywords: [quick, jpda, jdwp]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test was derived from the version001 test.
+ *     This test perform checking for
+ *         command set: VirtualMachine
+ *         command: Version
+ *     Test launches debuggee VM using support classes and sends
+ *     a malformed Version command to it. Then test expect the
+ *     command to fail and debuggee VM to exit with an error.
+ *
+ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdwp.VirtualMachine.Version.version002
+ *        nsk.jdwp.VirtualMachine.Version.version002a
+ * @run main/othervm PropertyResolvingWrapper
+ *      nsk.jdwp.VirtualMachine.Version.version002
+ *      -arch=${os.family}-${os.simpleArch}
+ *      -verbose
+ *      -waittime=5
+ *      -debugee.vmkind=java
+ *      -transport.address=dynamic
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002a.java
new file mode 100644
index 00000000000..cf0351d6cdf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/Version/version002a.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 nsk.jdwp.VirtualMachine.Version;
+
+import java.io.*;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdwp.*;
+
+public class version002a {
+
+    public static void main(String args[]) {
+        version002a _version002a = new version002a();
+        System.exit(version002.JCK_STATUS_BASE + _version002a.runIt(args, System.err));
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        ArgumentHandler argumentHandler = new ArgumentHandler(args);
+        Log log = new Log(out, argumentHandler);
+        log.display("Creating pipe");
+        IOPipe pipe = argumentHandler.createDebugeeIOPipe(log);
+        log.display("Sending command: " + "ready");
+        pipe.println("ready");
+        log.display("Waiting for command: " + "quit");
+        String command = pipe.readln();
+        log.display("Received command: " + command);
+        log.display("Debugee PASSED");
+        return version002.PASSED;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java
index c8e93f67249..efc0aa956a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java
@@ -69,9 +69,10 @@ public class TestDriver {
         Boolean isExplicitGCInvokesConcurrentOn = wb.getBooleanVMFlag("ExplicitGCInvokesConcurrent");
         Boolean isUseG1GCon = wb.getBooleanVMFlag("UseG1GC");
         Boolean isUseConcMarkSweepGCon = wb.getBooleanVMFlag("UseConcMarkSweepGC");
+        Boolean isUseZGCon = wb.getBooleanVMFlag("UseZGC");
 
         String keyPhrase;
-        if (isExplicitGCInvokesConcurrentOn && (isUseG1GCon || isUseConcMarkSweepGCon)) {
+        if ((isExplicitGCInvokesConcurrentOn && (isUseG1GCon || isUseConcMarkSweepGCon)) || isUseZGCon) {
             keyPhrase = "GC";
         } else {
             keyPhrase = "Pause Full";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c
index 176c5089978..d7b360d3a66 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c
@@ -364,10 +364,10 @@ Java_nsk_jvmti_unit_timers_JvmtiTest_Analyze(JNIEnv * env, jclass cls) {
           }
 #endif
           if (passed) {
-            debug_printf("Pass: currThreadTime(%ld) >= %2.0f%% of threadTime(%ld)\n",
+            debug_printf("Pass: currThreadTime(" JLONG_FORMAT ") >= %2.0f%% of threadTime(" JLONG_FORMAT ")\n",
                          ctt, 100.0 - VARIANCE_PERCENT, tt);
           } else {
-            printf("FAIL: currThreadTime(%ld) < %2.0f%% of threadTime(%ld)\n",
+            printf("FAIL: currThreadTime(" JLONG_FORMAT ") < %2.0f%% of threadTime(" JLONG_FORMAT ")\n",
                    ctt, 100.0 - VARIANCE_PERCENT, tt);
             iGlobalStatus = 2;
           }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/AbstractJDWPDebuggee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/AbstractJDWPDebuggee.java
new file mode 100644
index 00000000000..394433ca91f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/AbstractJDWPDebuggee.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2007, 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 nsk.share.jdwp;
+
+import nsk.share.jpda.AbstractDebuggeeTest;
+import nsk.share.jpda.DebugeeArgumentHandler;
+
+public class AbstractJDWPDebuggee extends AbstractDebuggeeTest {
+
+    /*
+     * Create argument handler handling options specific for JDWP tests
+     */
+    protected DebugeeArgumentHandler createArgumentHandler(String args[]) {
+        return new ArgumentHandler(args);
+    }
+
+    public static void main(String args[]) {
+        AbstractJDWPDebuggee debuggee = new AbstractJDWPDebuggee();
+        debuggee.init(args);
+        debuggee.doTest();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ArgumentHandler.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ArgumentHandler.java
new file mode 100644
index 00000000000..5dc1d9982d2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ArgumentHandler.java
@@ -0,0 +1,109 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Parser for JDWP test's specific command-line arguments.
+ * <p>
+ * <code>ArgumentHandler</code> handles JDWP test's specific
+ * arguments related to launching debugee VM using JDWP features
+ * in addition to general arguments recognized by
+ * <code>DebugeeArgumentHandler</code> and <code>ArgumentParser</code>.
+ * <p>
+ * Following is the list of specific options recognized by
+ * <code>AgrumentHandler</code>:
+ * <ul>
+ * <li> <code>-connector=[attaching|listening]</code> -
+ *   JDWP connection type
+ * <li> <code>-transport=[socket|shmem]</code> -
+ *   JDWP transport kind
+ * </ul>
+ * <p>
+ * See also list of arguments recognized by the base <code>DebugeeArgumnethandler</code>
+ * and <code>ArgumentParser</code> classes.
+ * <p>
+ * See also description of <code>ArgumentParser</code> how to work with
+ * command line arguments and options.
+ *
+ * @see ArgumentParser
+ * @see DebugeeArgumentHandler
+ */
+public class ArgumentHandler extends DebugeeArgumentHandler {
+
+    /**
+     * Keep a copy of raw command-line arguments and parse them;
+     * but throw an exception on parsing error.
+     *
+     * @param  args  Array of the raw command-line arguments.
+     *
+     * @throws  NullPointerException  If <code>args==null</code>.
+     * @throws  IllegalArgumentException  If Binder or Log options
+     *                                    are set incorrectly.
+     *
+     * @see #setRawArguments(String[])
+     */
+    public ArgumentHandler(String args[]) {
+        super(args);
+    }
+
+    /**
+     * Check if an option is admissible and has proper value.
+     * This method is invoked by <code>parseArguments()</code>
+     *
+     * @param option option name
+     * @param value string representation of value (could be an empty string)
+     *              null if this option has no value
+     * @return <i>true</i> if option is admissible and has proper value
+     *         <i>false</i> if otion is not admissible
+     *
+     * @throws <i>BadOption</i> if option has illegal value
+     *
+     * @see #parseArguments()
+     */
+    protected boolean checkOption(String option, String value) {
+        return super.checkOption(option, value);
+    }
+
+    /**
+     * Check options against inconcistence.
+     * This method is invoked by <code>parseArguments()</code>
+     *
+     * @see #parseArguments()
+     */
+    protected void checkOptions() {
+
+        if (isShmemTransport()) {
+            throw new BadOption("transport: shared memory transport is not supported yet");
+        }
+
+        super.checkOptions();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java
new file mode 100644
index 00000000000..2424a9a56ed
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java
@@ -0,0 +1,453 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+
+import java.io.*;
+
+/**
+ * This class provides debugger with connection to debugee VM
+ * using JDWP protocol.
+ * <p>
+ * This class provides abilities to launch and bind to debugee VM
+ * as described for base <code>DebugeeBinder</code> class,
+ * using raw JDWP protocol.
+ * <p>
+ * When <code>Binder</code> is asked to bind to debugee by invoking
+ * <code>bindToBebugee()</code> method it launches process
+ * with debugee VM and makes connection to it using JDWP transport
+ * corresponding to value of command line options <code>-connector</code>
+ * and <code>-transport</code>.
+ * After debugee is launched and connection is established
+ * <code>Binder</code> constructs <code>Debugee</code> object,
+ * that provides abilities to interact with debugee VM.
+ *
+ * @see Debugee
+ * @see DebugeeBinder
+ */
+final public class Binder extends DebugeeBinder {
+
+    /**
+     * Default message prefix for <code>Binder</code> object.
+     */
+    public static final String LOG_PREFIX = "binder> ";
+
+    /**
+     * Get version string.
+     */
+    public static String getVersion () {
+        return "@(#)Binder.java %I% %E%";
+    }
+
+    // -------------------------------------------------- //
+
+    /**
+     * Handler of command line arguments.
+     */
+    private ArgumentHandler argumentHandler = null;
+
+    /**
+     * Return <code>argumentHandler</code> of this binder.
+     */
+    public ArgumentHandler getArgumentHandler() {
+        return argumentHandler;
+    }
+
+    // -------------------------------------------------- //
+
+    /**
+     * Make new <code>Binder</code> object with specified
+     * <code>argumentHandler</code> and <code>log</code>.
+     */
+    public Binder (ArgumentHandler argumentHandler, Log log) {
+        super(argumentHandler, log);
+        this.argumentHandler = argumentHandler;
+    }
+
+    // -------------------------------------------------- //
+
+    /**
+     * Start debugee VM and establish JDWP connection to it.
+     */
+    public Debugee bindToDebugee (String classToExecute) {
+
+        Debugee debugee = null;
+
+        prepareForPipeConnection(argumentHandler);
+
+        if (argumentHandler.isLaunchedRemotely()) {
+            connectToBindServer(classToExecute);
+            debugee = launchDebugee(classToExecute);
+        } else {
+            debugee = launchDebugee(classToExecute);
+            debugee.redirectOutput(log);
+        }
+
+        Finalizer finalizer = new Finalizer(debugee);
+        finalizer.activate();
+
+        Transport transport = debugee.connect();
+
+        return debugee;
+    }
+
+    /**
+     * Launch debugee VM for specified class.
+     */
+    public Debugee launchDebugee (String classToExecute) {
+
+        try {
+
+            if (argumentHandler.isLaunchedLocally()) {
+                LocalLaunchedDebugee debugee = new LocalLaunchedDebugee(this);
+                String address = debugee.prepareTransport(argumentHandler);
+                if (address == null)
+                    address = makeTransportAddress();
+                String[] argsArray = makeCommandLineArgs(classToExecute, address);
+                debugee.launch(argsArray);
+                return debugee;
+            }
+
+            if (argumentHandler.isLaunchedRemotely()) {
+                RemoteLaunchedDebugee debugee = new RemoteLaunchedDebugee(this);
+                String address = debugee.prepareTransport(argumentHandler);
+                if (address == null)
+                    address = makeTransportAddress();
+                String[] argsArray = makeCommandLineArgs(classToExecute, address);
+                debugee.launch(argsArray);
+                return debugee;
+            }
+
+            if (argumentHandler.isLaunchedManually()) {
+                ManualLaunchedDebugee debugee = new ManualLaunchedDebugee(this);
+                String address = debugee.prepareTransport(argumentHandler);
+                if (address == null)
+                    address = makeTransportAddress();
+                String cmdLine = makeCommandLineString(classToExecute, address, "\"");
+                debugee.launch(cmdLine);
+                return debugee;
+            }
+
+            throw new TestBug("Unexpected launching mode: "
+                            + argumentHandler.getLaunchMode());
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught exception while launching debugee:\n\t" + e);
+        }
+    }
+
+}
+
+/**
+ * Mirror of locally launched debugee.
+ */
+final class LocalLaunchedDebugee extends Debugee {
+
+    /** Enwrap the existing <code>VM</code> mirror. */
+    public LocalLaunchedDebugee (Binder binder) {
+        super(binder);
+        checkTermination = true;
+    }
+
+    // ---------------------------------------------- //
+
+    public void launch(String[] args) throws IOException {
+        String cmdLine = ArgumentHandler.joinArguments(args, "\"");
+        display("Starting java process:\n" + cmdLine);
+        process = binder.launchProcess(args);
+    }
+
+    /** Return exit status of the debugee VM. */
+    public int getStatus () {
+        return process.exitValue();
+    }
+
+    /** Check whether the debugee VM has been terminated. */
+    public boolean terminated () {
+        if (process == null)
+            return true;
+
+        try {
+            int value = process.exitValue();
+            return true;
+        } catch (IllegalThreadStateException e) {
+            return false;
+        }
+    }
+
+    // ---------------------------------------------- //
+
+    /** Kill the debugee VM. */
+    protected void killDebugee () {
+        super.killDebugee();
+        if (!terminated()) {
+            log.display("Killing debugee VM process");
+            process.destroy();
+        }
+    }
+
+    /** Wait until the debugee VM shutdown or crash. */
+    protected int waitForDebugee () throws InterruptedException {
+        return process.waitFor();
+    }
+
+    /** Get a pipe to write to the debugee's stdin stream. */
+    protected OutputStream getInPipe () {
+        return process.getOutputStream();
+    }
+
+    /** Get a pipe to read the debugee's stdout stream. */
+    protected InputStream getOutPipe () {
+        return process.getInputStream();
+    }
+
+    /** Get a pipe to read the debugee's stderr stream. */
+    protected InputStream getErrPipe () {
+        return process.getErrorStream();
+    }
+}
+
+
+/**
+ * Mirror of remotely launched debugee.
+ */
+final class RemoteLaunchedDebugee extends Debugee {
+
+    /** Enwrap the existing <code>VM</code> mirror. */
+    public RemoteLaunchedDebugee (Binder binder) {
+        super(binder);
+    }
+
+    // ---------------------------------------------- //
+
+    public void launch(String[] args) throws IOException {
+        String cmdLine = ArgumentHandler.joinArguments(args, "\"");
+        display("Starting remote java process:\n" + cmdLine);
+        binder.launchRemoteProcess(args);
+    }
+
+    /** Return exit status of the debugee VM. */
+    public int getStatus () {
+        return binder.getRemoteProcessStatus();
+    }
+
+    /** Check whether the debugee VM has been terminated. */
+    public boolean terminated () {
+        return binder.isRemoteProcessTerminated();
+    }
+
+    // ---------------------------------------------- //
+
+    /** Kill the debugee VM. */
+    protected void killDebugee () {
+        super.killDebugee();
+        if (!terminated()) {
+            log.display("Killing debugee VM process");
+            binder.killRemoteProcess();
+        }
+    }
+
+    /** Wait until the debugee VM shutdown or crash. */
+    protected int waitForDebugee () {
+        return binder.waitForRemoteProcess();
+    }
+
+    /** Get a pipe to write to the debugee's stdin stream. */
+    protected OutputStream getInPipe () {
+        return null;
+    }
+
+    /** Get a pipe to read the debugee's stdout stream. */
+    protected InputStream getOutPipe () {
+        return null;
+    }
+
+    /** Get a pipe to read the debugee's stderr stream. */
+    protected InputStream getErrPipe () {
+        return null;
+    }
+
+    public void redirectStdout(OutputStream out) {
+    }
+
+    public void redirectStdout(Log log, String prefix) {
+    }
+
+    public void redirectStderr(OutputStream out) {
+    }
+
+    public void redirectStderr(Log log, String prefix) {
+    }
+}
+
+
+/**
+ * Mirror of manually launched debugee.
+ */
+final class ManualLaunchedDebugee extends Debugee {
+
+    private int exitCode = 0;
+    private boolean finished = false;
+    private static BufferedReader bin = new BufferedReader(new InputStreamReader(System.in));
+
+    /** Enwrap the existing <code>VM</code> mirror. */
+    public ManualLaunchedDebugee (Binder binder) {
+        super(binder);
+    }
+
+    // ---------------------------------------------- //
+
+    public void launch(String commandLine) throws IOException {
+        putMessage("Launch target VM using such command line:\n"
+                    + commandLine);
+        String answer = askQuestion("Has the VM successfully started? (yes/no)", "yes");
+        for ( ; ; ) {
+            if (answer.equals("yes"))
+                break;
+            if (answer.equals("no"))
+                throw new Failure ("Unable to manually launch debugee VM");
+            answer = askQuestion("Wrong answer. Please type yes or no", "yes");
+        }
+    }
+
+    private void putMessage(String msg) {
+        System.out.println("\n>>> " + msg);
+    }
+
+    private String askQuestion(String question, String defaultAnswer) {
+        try {
+            System.out.print("\n>>> " + question);
+            System.out.print(" [" + defaultAnswer + "] ");
+            System.out.flush();
+            String answer = bin.readLine();
+            if (answer.equals(""))
+                return defaultAnswer;
+            return answer;
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught exception while reading answer:\n\t" + e);
+        }
+    }
+
+    /** Return exit status of the debugee VM. */
+    public int getStatus () {
+        if (! terminated()) {
+            throw new Failure("Unable to get status of debugee VM: process still alive");
+        }
+        return exitCode;
+    }
+
+    /** Check whether the debugee VM has been terminated. */
+    public boolean terminated () {
+        if(! finished) {
+            String answer = askQuestion("Has the VM exited?", "no");
+            for ( ; ; ) {
+                if (answer.equals("no"))
+                    return false;
+                if (answer.equals("yes")) {
+                    finished = true;
+                    waitForDebugee();
+                    break;
+                }
+                answer = askQuestion("Wrong answer. Please type yes or no", "yes");
+            }
+        }
+        return finished;
+    }
+
+    // ---------------------------------------------- //
+
+    /** Kill the debugee VM. */
+    protected void killDebugee () {
+        super.killDebugee();
+        if (!terminated()) {
+            putMessage("Kill launched VM");
+            String answer = askQuestion("Has the VM successfully terminated? (yes/no)", "yes");
+            for ( ; ; ) {
+                if (answer.equals("yes")) {
+                    finished = true;
+                    break;
+                }
+                if (answer.equals("no"))
+                    throw new Failure ("Unable to manually kill debugee VM");
+                answer = askQuestion("Wrong answer. Please type yes or no", "yes");
+            }
+        }
+    }
+
+    /** Wait until the debugee VM shutdown or crash. */
+    protected int waitForDebugee () {
+        putMessage("Wait for launched VM to exit.");
+        String answer = askQuestion("What is VM exit code?", "95");
+        for ( ; ; ) {
+            try {
+                exitCode = Integer.parseInt(answer);
+                break;
+            } catch (NumberFormatException e) {
+                answer = askQuestion("Wrong answer. Please type integer value", "95");
+            }
+        }
+        finished = true;
+        return exitCode;
+    }
+
+    /** Get a pipe to write to the debugee's stdin stream. */
+    protected OutputStream getInPipe () {
+        return null;
+    }
+
+    /** Get a pipe to read the debugee's stdout stream. */
+    protected InputStream getOutPipe () {
+        return null;
+    }
+
+    /** Get a pipe to read the debugee's stderr stream. */
+    protected InputStream getErrPipe () {
+        return null;
+    }
+
+    public void redirectStdout(OutputStream out) {
+    }
+
+    public void redirectStdout(Log log, String prefix) {
+    }
+
+    public void redirectStderr(OutputStream out) {
+    }
+
+    public void redirectStderr(Log log, String prefix) {
+    }
+
+    public void close() {
+        try {
+            bin.close();
+        } catch (IOException e) {
+            log.display("WARNING: Caught IOException while closing InputStream");
+        }
+        bin = null;
+        super.close();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/BoundException.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/BoundException.java
new file mode 100644
index 00000000000..d6ecff22810
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/BoundException.java
@@ -0,0 +1,33 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+/**
+ * This exception is thrown when ByteBuffer parse errors are encountered.
+ */
+public class BoundException extends Exception {
+    public BoundException(String message) {
+        super(message);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ByteBuffer.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ByteBuffer.java
new file mode 100644
index 00000000000..2b1b4c269d4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ByteBuffer.java
@@ -0,0 +1,1020 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import java.io.*;
+import nsk.share.*;
+
+/**
+ * This class represents a byte buffer of variable size.
+ */
+public class ByteBuffer {
+
+    /**
+     * Empty byte value (zero).
+     */
+    private static final byte EMPTY_BYTE = (byte)0;
+
+    /**
+     * Current number of bytes in the buffer.
+     */
+    private int CurrentSize;
+
+    /**
+     * Delta to increase buffer size.
+     */
+    private int Delta;
+
+    /**
+     * Current offset from the buffer begin during parsing packet.
+     */
+    int parseOffset;
+
+    /**
+     * Array of bytes in the buffer.
+     */
+    protected byte[] bytes;
+
+    /**
+     * Make an empty <code>ByteBuffer</code> object.
+     */
+    public ByteBuffer() {
+        this(128, 128);
+    }
+
+    /**
+     * Make an empty <code>ByteBuffer</code> object with given initial capacity.
+     * When there is no space for a new byte in a buffer it's capacity
+     * grows by Delta.
+     */
+    public ByteBuffer(int InitialSize, int Delta) {
+        if (Delta <= 0)
+            Delta = 16;
+        this.Delta = Delta;
+        CurrentSize = 0;
+        bytes = new byte[InitialSize];
+        parseOffset = 0;
+    }
+
+    /**
+     * Make a copy of specified byte buffer.
+     */
+    public ByteBuffer(ByteBuffer buffer) {
+        int InitialSize = buffer.bytes.length;
+        Delta = buffer.Delta;
+        CurrentSize = buffer.CurrentSize;
+        bytes = new byte[InitialSize];
+        for (int i = 0; i < CurrentSize; i++ ) {
+            bytes[i] = buffer.bytes[i];
+        }
+        parseOffset = 0;
+    }
+
+    /**
+     * Return number of bytes in this buffer.
+     */
+    public int length() {
+        return CurrentSize;
+    }
+
+    /**
+     * Return array of bytes in this buffer.
+     */
+    public byte[] getBytes() {
+        return bytes;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Replace the byte at the specified offset in this buffer with the
+     * less significant byte from the int value.
+     *
+     * @throws BoundException if specified offset is out of buffer bounds
+     */
+    public void putByte(int off, byte value) throws BoundException {
+
+        if ((off < 0) || (off >= CurrentSize))
+            throw new BoundException("Unable to put one byte at " + offsetString(off));
+
+        bytes[off] = value;
+    }
+
+    /**
+     * Replace len bytes starting at offset off with the bytes from the
+     * given byte array.
+     *
+     * @throws BoundException if offset and length are out of buffer bounds
+     */
+    public void putBytes(int off, byte[] value, int start, int len) throws BoundException {
+        if (len > (CurrentSize - off)) {
+            throw new BoundException("Unable to put " + len + " bytes at " + offsetString(off) +
+                                     " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+        try {
+            for (int i = 0; i < len; i++)
+                putByte(off++, value[start++]);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + len +
+                              "bytes at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Replace count (1 - 8) bytes starting at offset off with the less
+     * significant bytes from the specified ID value.
+     *
+     * @throws BoundException if offset and count are out of buffer bounds
+     */
+    public void putID(int off, long value, int count) throws BoundException {
+
+        if ((count <= 0) || (count > 8))
+            throw new TestBug("Illegal number of bytes of ID value to put: " + count);
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of ID value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            putValueBytes(off, value, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of ID value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Replace four bytes starting at offset off with the bytes from the
+     * specified int value.
+     *
+     * @throws BoundException if offset is out of buffer bounds
+     */
+    public void putInt(int off, int value) throws BoundException {
+        final int count = JDWP.TypeSize.INT;
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of int value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            putValueBytes(off, value, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of int value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Replace two bytes starting at offset off with the bytes
+     * from the specified short value.
+     *
+     * @throws BoundException if offset is out of buffer bounds
+     */
+    public void putShort(int off, short value) throws BoundException {
+        final int count = JDWP.TypeSize.SHORT;
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of short value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            putValueBytes(off, value, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of short value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Replace eight bytes starting at offset off with the bytes
+     * from the specified long value.
+     *
+     * @throws BoundException if offset is out of buffer bounds
+     */
+    public void putLong(int off, long value) throws BoundException {
+        final int count = JDWP.TypeSize.LONG;
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of long value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            putValueBytes(off, value, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of long value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Replace four bytes starting at offset off with the bytes
+     * from the specified float value.
+     *
+     * @throws BoundException if offset is out of buffer bounds
+     */
+    public void putFloat(int off, float value) throws BoundException {
+        final int count = JDWP.TypeSize.FLOAT;
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of float value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            long l = Float.floatToIntBits(value);
+            putValueBytes(off, l, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of float value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Replace eight bytes starting at offset off with the bytes
+     * from the specified double value.
+     *
+     * @throws BoundException if offset is out of buffer bounds
+     */
+    public void putDouble(int off, double value) throws BoundException {
+        final int count = JDWP.TypeSize.DOUBLE;
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of double value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            long l = Double.doubleToLongBits(value);
+            putValueBytes(off, l, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of double value at " + offsetString(off) + ": \n\t" + e);
+        }
+    }
+
+    /**
+     * Replace two bytes starting at offset off with the bytes
+     * from the specified char value.
+     *
+     * @throws BoundException if offset is out of buffer bounds
+     */
+    public void putChar(int off, char value) throws BoundException {
+        final int count = JDWP.TypeSize.CHAR;
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of char value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            long l = (long)value;
+            putValueBytes(off, l, count);
+        } catch (BoundException e) {
+            throw new Failure("Caught unexpected bound exception while putting " + count +
+                              "bytes of char value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Append the specified byte to the end of this buffer.
+     */
+    public void addByte(byte value) {
+        checkSpace(1);
+
+        int where = CurrentSize;
+        CurrentSize++;
+
+        try {
+            putByte(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding one byte:\n\t"
+                            + e);
+        };
+    }
+
+    /**
+     * Append specified byte value repeated count to the end of this buffer.
+     */
+    public void addBytes(byte value, int count) {
+        checkSpace(count);
+        for (int i = 0; i < count; i++) {
+            addByte(value);
+        }
+    }
+
+    /**
+     * Append the bytes from the specified byte array to the end of this buffer.
+     */
+    public void addBytes(byte[] value, int start, int len) {
+        checkSpace(len);
+
+        int where = CurrentSize;
+        CurrentSize = CurrentSize + len;
+
+        try {
+            putBytes(where, value, start, len);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               len + " bytes:\n\t" + e);
+        };
+    }
+
+    /**
+     * Appends the count (1 - 8) less significant bytes from the
+     * specified ID value to the end of this buffer.
+     */
+    public void addID(long value, int count) {
+        if ((count <= 0) || (count > 8))
+            throw new TestBug("Illegal number bytes of ID value to add: " + count);
+
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+
+        try {
+            putID(where, value, count);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of ID value:\n\t" + e);
+        };
+    }
+
+    /**
+     * Append four bytes from the specified int value to the
+     * end of this buffer.
+     */
+    public void addInt(int value) {
+        final int count = JDWP.TypeSize.INT;
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+
+        try {
+            putInt(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of int value:\n\t" + e);
+        };
+    }
+
+    /**
+     * Append two bytes from the specified int value to the
+     * end of this buffer.
+     */
+    public void addShort(short value) {
+        final int count = JDWP.TypeSize.SHORT;
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+        try {
+            putShort(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of short value:\n\t" + e);
+        };
+    }
+
+    /**
+     * Appends eight bytes from the specified long
+     * value to the end of this buffer.
+     */
+    public void addLong(long value) {
+        final int count = JDWP.TypeSize.LONG;
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+        try {
+            putLong(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of long value:\n\t" + e);
+        };
+    }
+
+    /**
+     * Appends four bytes from the specified float
+     * value to the end of this buffer.
+     */
+    public void addFloat(float value) {
+        final int count = JDWP.TypeSize.FLOAT;
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+        try {
+            putFloat(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of float value:\n\t" + e);
+        };
+    }
+
+    /**
+     * Appends eight bytes from the specified double
+     * value to the end of this buffer.
+     */
+    public void addDouble(double value) {
+        final int count = JDWP.TypeSize.DOUBLE;
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+        try {
+            putDouble(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of double value:\n\t" + e);
+        };
+    }
+
+    /**
+     * Appends four bytes from the specified char
+     * value to the end of this buffer.
+     */
+    public void addChar(char value) {
+        final int count = JDWP.TypeSize.CHAR;
+        final int where = CurrentSize;
+        addBytes(EMPTY_BYTE, count);
+        try {
+            putChar(where, value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while adding " +
+                               count + " bytes of float value:\n\t" + e);
+        };
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Read a byte value from this buffer at the specified position.
+     *
+     * @throws BoundException if there are no bytes at this position
+     */
+    public byte getByte(int off) throws BoundException {
+        if (off < 0 || off >= CurrentSize) {
+            throw new BoundException("Unable to get one byte at " + offsetString(off) +
+                                    ": no bytes available");
+        }
+        return bytes[off];
+    }
+
+    /**
+     * Read count bytes (1-8) from this buffer at the specified
+     * position and returns a long value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public long getID(int off, int count) throws BoundException {
+        if ((count <= 0) || (count > 8))
+            throw new TestBug("Illegal number of bytes of ID value to get: " + count);
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of ID value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            return getValueBytes(off, count);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of ID value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Read four bytes from this buffer at the specified
+     * position and returns an integer value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public int getInt(int off) throws BoundException {
+        final int count = JDWP.TypeSize.INT;
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of int value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            return (int)getValueBytes(off, count);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of int value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Read two bytes from this buffer at the specified
+     * position and returns a short value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public short getShort(int off) throws BoundException {
+        final int count = JDWP.TypeSize.SHORT;
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of short value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            return (short)getValueBytes(off, count);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of short value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Read eight bytes from this buffer at the specified
+     * position and returns a long value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public long getLong(int off) throws BoundException {
+        final int count = JDWP.TypeSize.LONG;
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of long value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            return getValueBytes(off, count);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of long value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Read eight bytes from this buffer at the specified
+     * position and returns a double value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public double getDouble(int off) throws BoundException {
+        final int count = JDWP.TypeSize.DOUBLE;
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of double value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            long value = getValueBytes(off, count);
+            return Double.longBitsToDouble(value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of long value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Read four bytes from this buffer at the specified
+     * position and returns a float value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public float getFloat(int off) throws BoundException {
+        final int count = JDWP.TypeSize.FLOAT;
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of float value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            int value = (int)getValueBytes(off, count);
+            return Float.intBitsToFloat(value);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of float value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    /**
+     * Read two bytes from this buffer at the specified
+     * position and returns a char value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes at this position
+     */
+    public char getChar(int off) throws BoundException {
+        final int count = JDWP.TypeSize.CHAR;
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to get " + count + " bytes of char value at " +
+                                     offsetString(off) + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        try {
+            int value = (int)getValueBytes(off, count);
+            return (char)value;
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of char value at " + offsetString(off) + ":\n\t" + e);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set the current parser position to 0.
+     */
+    public void resetPosition() {
+        resetPosition(0);
+    }
+
+    /**
+     * Set the current parser position to the specified value.
+     */
+    public void resetPosition(int i) {
+        parseOffset = i;
+    }
+
+    /**
+     * Return current parser position.
+     */
+    public int currentPosition() {
+        return parseOffset;
+    }
+
+    /**
+     * Return true if the parser pointer is set to the end of buffer.
+     */
+    public boolean isParsed() {
+        return (parseOffset == CurrentSize);
+    }
+
+    /**
+     * Read a byte value from this buffer at the current parser position.
+     *
+     * @throws BoundException if there are no more bytes in the buffer
+     */
+    public byte getByte() throws BoundException {
+        return getByte(parseOffset++);
+    }
+
+    /**
+     * Read count bytes (1-8) from this buffer at the current parser
+     * position and returns a long value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public long getID(int count) throws BoundException {
+        long value = getID(parseOffset, count);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Read four bytes from this buffer at the current parser
+     * position and returns an integer value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public int getInt() throws BoundException {
+        final int count = JDWP.TypeSize.INT;
+        int value = getInt(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Read two bytes from this buffer at the current parser
+     * position and returns a short value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public short getShort() throws BoundException {
+        final int count = JDWP.TypeSize.SHORT;
+        short value = getShort(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Read eight bytes from this buffer at the current parser
+     * position and returns a long value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public long getLong() throws BoundException {
+        final int count = JDWP.TypeSize.LONG;
+        long value = getLong(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Read eight bytes from this buffer at the current parser
+     * position and returns a double value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public double getDouble() throws BoundException {
+        final int count = JDWP.TypeSize.DOUBLE;
+        double value = getDouble(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Read four bytes from this buffer at the current parser
+     * position and returns a float value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public float getFloat() throws BoundException {
+        final int count = JDWP.TypeSize.FLOAT;
+        float value = getFloat(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Read two bytes from this buffer at the current parser
+     * position and returns a char value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public char getChar() throws BoundException {
+        final int count = JDWP.TypeSize.CHAR;
+        char value = getChar(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+
+    /**
+     * Remove at least first count bytes from the buffer.
+     */
+
+    public void deleteBytes(int count) {
+        int j = 0;
+        while (count < CurrentSize)
+            bytes[j++] = bytes[count++];
+
+        CurrentSize = j;
+    }
+
+    /**
+     * Clear the buffer.
+     */
+    public void resetBuffer() {
+        CurrentSize = 0;
+    }
+
+    /**
+     * Return string representation of the buffer starting at given offset.
+     */
+    public String toString(int start) {
+
+        String Result = "", HexLine = "", DisplayLine = "";
+
+        int j = 0;
+
+        for (int i = start; i < length(); i++) {
+
+            HexLine = HexLine + toHexString(bytes[i], 2) + " ";
+
+            String ch = ".";
+            if (bytes[i] >= 0x20 && bytes[i] < 0x80) {
+                try {
+                    ch = new String(bytes, i, 1, "US-ASCII");
+                } catch (UnsupportedEncodingException ignore) {
+                }
+            }
+            DisplayLine = DisplayLine + ch;
+
+            if ((i == length() - 1) || (((i - start) & 0x0F) == 0x0F)) {
+                Result = Result +
+                         "    " +
+                         toHexString(j, 4) + ": " +
+                         PadR(HexLine, 48) + "  " +
+                         DisplayLine + "\n";
+                HexLine = "";
+                DisplayLine = "";
+                j = j + 16;
+            }
+        }
+        return Result;
+    }
+
+    /**
+     * Return string representation of the buffer.
+     */
+    public String toString() {
+        return toString(0);
+    }
+
+    /**
+     * Return string with hexadecimal representation of bytes.
+     */
+    public static String toHexString(long b, int length) {
+        return Right(Long.toHexString(b), length).replace(' ', '0');
+    }
+
+    /**
+     * Return string with hexadecimal representation of bytes.
+     */
+    public static String toHexDecString(long b, int length) {
+        return toHexString(b, length) + " (" + b + ")";
+    }
+
+    // -----
+
+    /**
+     * Return string with hexadecimal representation of offset.
+     */
+    public static String offsetString(int off) {
+        return "0x" + toHexString(off, 4);
+    }
+
+    /**
+     * Return string with hexadecimal representation of the current offset.
+     */
+    public String offsetString() {
+        return offsetString(currentPosition());
+    }
+
+    // -----
+
+    /**
+     * Check if there space for new bytes in the buffer.
+     */
+    protected void checkSpace(int space) {
+
+        int newSize = CurrentSize + space;
+
+        if (bytes.length >= newSize)
+            return;
+
+        byte[] newBytes = new byte[newSize];
+
+        for (int i = 0; i < CurrentSize; i++)
+            newBytes[i] = bytes[i];
+
+        bytes = newBytes;
+    }
+
+    /**
+     * Replace count (1 - 8) bytes starting at offset off with the less
+     * significant bytes from the specified long value.
+     *
+     * @throws BoundException if offset and count are out of buffer bounds
+     */
+    protected void putValueBytes(int off, long value, int count) throws BoundException {
+        if ((count <= 0) || (count > 8))
+            throw new TestBug("Illegal number of bytes of value to put: " + count);
+
+        if (count > CurrentSize - off) {
+            throw new BoundException("Unable to put " + count + " bytes of value at " +
+                                     off + " (available bytes: " + (CurrentSize - off) + ")" );
+        }
+
+        int shift = (count - 1) * 8;
+        for (int i = 0; i < count; i++) {
+            putByte(off++, (byte) ((value >>> shift) & 0xFF));
+            shift = shift - 8;
+        }
+    }
+    /**
+     * Appends the count (1 - 8) less significant bytes from the
+     * specified long value to the end of this buffer.
+     */
+    protected void addValueBytes(long value, int count) throws BoundException {
+        if ((count <= 0) || (count > 8))
+            throw new TestBug("Illegal number of bytes of value to add: " + count);
+
+        checkSpace(count);
+
+        int where = CurrentSize;
+        CurrentSize += count;
+
+        putValueBytes(where, value, count);
+    }
+
+    /**
+     * Read count bytes (1-8) from this buffer at the specified
+     * position and returns a long value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+    public long getValueBytes(int off, int count) throws BoundException {
+        if ((count <= 0) || (count > 8))
+            throw new TestBug("Illegal number of bytes of value to get: " + count);
+
+        long l = 0;
+
+        for (int i = 0; i < count; i++) {
+            l = (l * 0x100) + ((long) getByte(off + i) & 0xFF);
+        }
+
+        return l;
+    }
+
+    /**
+     * Read count bytes (1-8) from this buffer at the current parser
+     * position and returns a long value composed of these bytes.
+     *
+     * @throws BoundException if there are no so many bytes in the buffer
+     */
+/*
+    protected long getValueBytes(int count) throws BoundException {
+        long value = getValueBytes(parseOffset);
+        parseOffset += count;
+        return value;
+    }
+ */
+
+    // ---
+
+    private static String PadL(String source, int length, String what) {
+
+        if (length <= 0)
+            return "";
+
+        if (source.length() > length)
+            return PadL("", length, "*");
+
+        while (source.length() < length)
+            source = what + source;
+
+        return source;
+    }
+
+
+    private static String PadL(String source, int length) {
+        return PadL(source, length, " ");
+    }
+
+    private static String PadR(String source, int length, String what) {
+
+        if (length <= 0)
+            return "";
+
+        if (source.length() > length)
+            return PadR("", length, "*");
+
+        while (source.length() < length)
+            source = source + what;
+
+        return source;
+    }
+
+    private static String PadR(String source, int length) {
+        return PadR(source, length, " ");
+    }
+
+    private static String Left(String source, int length) {
+
+        if (length <= 0)
+            return "";
+
+        if (length <= source.length())
+            return source.substring(0, length);
+        else
+            return PadR(source, length);
+    }
+
+    private static String Right(String source, int length) {
+
+        if (length <= 0)
+            return "";
+
+        if (length <= source.length())
+            return source.substring(source.length() - length, source.length());
+        else
+            return PadL(source, length);
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/CommandPacket.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/CommandPacket.java
new file mode 100644
index 00000000000..c2b97fefc59
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/CommandPacket.java
@@ -0,0 +1,148 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+
+/**
+ * This class represents a JDWP command packet.
+ */
+public class CommandPacket extends Packet {
+
+    /**
+     * Static counter for enumeration of the command packets.
+     */
+    private static int nextID = 1;
+
+    /**
+     * Return next free number for enumeration of the command packets.
+     */
+    public static int getLastID() {
+        return (nextID - 1);
+    }
+
+    /**
+     * Make JDWP command packet for specified command.
+     */
+    public CommandPacket(int fullCommand) {
+        super();
+
+        setPacketID(nextID++);
+        setFlags(JDWP.Flag.NONE);
+        setFullCommand(fullCommand);
+    }
+
+    /**
+     * Make JDWP command packet for specified command.
+     */
+    public CommandPacket(int fullCommand, int id) {
+        super();
+
+        setPacketID(id);
+        setFlags(JDWP.Flag.NONE);
+        setFullCommand(fullCommand);
+    }
+
+    /**
+     * Make command packet with data from the specified byte buffer.
+     */
+//    public CommandPacket(ByteBuffer packet) {
+    public CommandPacket(Packet packet) {
+        super(packet);
+    }
+
+    /**
+     * Return full command number for this packet.
+     */
+    public int getFullCommand() {
+        int id = 0;
+
+        try {
+            id = (int) getID(FullCommandOffset, 2);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting command number from header:\n\t"
+                            + e);
+        }
+
+        return id;
+    }
+
+    /**
+     * Return short command number for this packet.
+     */
+    public byte getCommand() {
+        byte id = 0;
+
+        try {
+            id = getByte(CommandOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting command number from header:\n\t"
+                            + e);
+        }
+
+        return id;
+    }
+
+    /**
+     * Return command set number for this packet.
+     */
+    public byte getCommandSet() {
+        byte id = 0;
+
+        try {
+            id = getByte(CommandSetOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting command number from header:\n\t"
+                            + e);
+        }
+
+        return id;
+    }
+
+    /**
+     * Assign command number for this packet.
+     */
+    public void setFullCommand(int fullCommand) {
+        try {
+            putID(FullCommandOffset, fullCommand, 2);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while setting command number into header: "
+                            + e);
+        }
+    }
+
+    /**
+     * Return string representation of the command packet header.
+     */
+    public String headerToString() {
+        return super.headerToString()
+             + "    " + toHexString(CommandSetOffset, 4) + " (cmd set): 0x" + toHexDecString(getCommandSet(), 2) + "\n"
+             + "    " + toHexString(CommandOffset,    4) + " (command): 0x" + toHexDecString(getCommand(), 2) + "\n";
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Debugee.java
new file mode 100644
index 00000000000..6818364648d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Debugee.java
@@ -0,0 +1,1659 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+
+import java.util.*;
+import java.io.*;
+
+/**
+ * This class is used to interact with debugee VM using JDWP features.
+ * <p>
+ * This class is an mirror of debugee VM that is constructed by
+ * <code>Binder</code> and uses <code>Transport</code> object
+ * to interact with debugee VM.
+ * <p>
+ * In addition to the general abities to control of debugee VM process,
+ * provided by the base class <code>DebugeeProcess</code>, this class
+ * adds some service methods that uses JDWP protocol to simplify interaction
+ * with debugee VM (such as finding classes, setting breakpoints,
+ * handling events, and so on.).
+ *
+ * @see Binder
+ * @see Transport
+ * @see DebugeeProcess
+ */
+abstract public class Debugee extends DebugeeProcess {
+
+    /** Binder that creates this debugee. */
+    protected Binder binder = null;
+
+    protected LinkedList<EventPacket> eventQueue = new LinkedList<EventPacket>();
+
+    protected Transport transport = null;
+
+    /** Make new <code>Debugee</code> object for the given binder. */
+    protected Debugee (Binder binder) {
+        super(binder);
+        this.argumentHandler = binder.getArgumentHandler();
+        this.binder = binder;
+        prefix = "Debugee> ";
+    }
+
+    /** Return <code>Binder</code> of the debugee object. */
+    public Binder getBinder() {
+        return binder;
+    }
+
+    /** Return <code>Transport</code> of the debugee object. */
+    public Transport getTransport() {
+        return transport;
+    }
+
+    /**
+     * Prepare transport object for establishing connection.
+     * This may change connection options in <code>argumentHandler</code>.
+     *
+     * @return specific address string if listening has started or null otherwise
+     */
+    public String prepareTransport(ArgumentHandler argumentHandler) {
+        String address = null;
+        try {
+            if (argumentHandler.isSocketTransport()) {
+                SocketTransport socket_transport = new SocketTransport(log);
+                if (argumentHandler.isListeningConnector()) {
+                    int port = 0;
+                    if (argumentHandler.isTransportAddressDynamic()) {
+                        port = socket_transport.bind(0);
+//                        argumentHandler.setTransportPortNumber(port);
+                    } else {
+                        port = argumentHandler.getTransportPortNumber();
+                        socket_transport.bind(port);
+                    }
+                    address = argumentHandler.getTestHost() + ":" + port;
+                }
+                transport = socket_transport;
+/*
+            } else if (argumentHandler.isShmemTransport()) {
+                ShmemTransport shmem_transport = new ShmemTransport(log);
+                if (argumentHandler.isListeningConnector()) {
+                    String sharedName = agrHandler.getTransportSharedName();
+                    shmem_transport.bind(sharedName);
+                    address = sharedName;
+                }
+                transport = shmem_transport;
+ */
+            } else {
+               throw new TestBug("Unexpected transport type: "
+                               + argumentHandler.getTransportType());
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught IOException while preparing for JDWP transport connection:\n\t"
+                    + e);
+        }
+
+        return address;
+    }
+
+    /**
+     * Establish connection to debugee VM.
+     */
+    public Transport connect() {
+        if (transport == null) {
+            throw new Failure("Attemt to establish JDWP connection for not prepared transport");
+        }
+
+        try {
+            if (argumentHandler.isSocketTransport()) {
+                display("Establishing JDWP socket connection");
+                SocketTransport socket_transport = (SocketTransport)transport;
+                int transportPort = argumentHandler.getTransportPortNumber();
+                if (argumentHandler.isAttachingConnector()) {
+                    String debugeeHost = argumentHandler.getDebugeeHost();
+                    display("Attaching to debugee: " + debugeeHost + ":" + transportPort);
+                    socket_transport.attach(debugeeHost, transportPort);
+                } else if (argumentHandler.isListeningConnector()) {
+                    display("Listening from debugee");
+                    socket_transport.accept();
+                } else {
+                    throw new TestBug("Unexpected connector type: "
+                                    + argumentHandler.getConnectorType());
+                }
+/*
+            } else if (argumentHandler.isShmemTransport()) {
+                display("Establishing JDWP shared-memory connection");
+                ShmemTransport shmem_transport = (ShmemTransport)transport;
+                String sharedName = argumentHandler.getTransportSharedName();
+                if (argumentHandler.isAttachingConnector()) {
+                    display("Attaching to debugee: " + sharedName);
+                    shmem_transport.attach(sharedName);
+                } else if (argumentHandler.isListeningConnector()) {
+                    display("Listening from debugee");
+                    shmem_transport.accept();
+                } else {
+                    throw new TestBug("Unexpected connector type: "
+                                    + argumentHandler.getConnectorType());
+                }
+ */
+            } else {
+               throw new TestBug("Unexpected transport type: "
+                               + argumentHandler.getTransportType());
+            }
+
+            transport.handshake();
+
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught IOException while establishing JDWP transport connection:\n\t"
+                    + e);
+        }
+        return transport;
+    }
+
+    // --------------------------------------------------- //
+
+   /**
+    * Waits for VM_INIT event from debugee VM.
+    */
+    public void waitForVMInit() {
+        String eventName = "VirtualMachine.VM_START";
+        EventPacket packet = receiveEventFor(JDWP.EventKind.VM_START, eventName);
+//        String versionInfo = getVersionInfo();
+//        display("Target VM started:\n" + versionInfo);
+    }
+
+   /**
+    * Waits for VM_DEATH event from debugee VM.
+    */
+    public void waitForVMDeath() {
+        String eventName = "VirtualMachine.VM_DEATH";
+        EventPacket packet = receiveEventFor(JDWP.EventKind.VM_DEATH, eventName);
+    }
+
+    /**
+     * Wait for class loaded on debugee start up and return its classID.
+     * Debuggee should be initially suspended and it will also left suspended
+     * by the CLASS_PREPARE event request.
+     */
+    public long waitForClassLoaded(String className, byte suspendPolicy) {
+        // make request for CLASS_PREPARE_EVENT for this class name
+        int requestID = requestClassPrepareEvent(className, suspendPolicy);
+        // resume initially suspended debugee
+        resume();
+        // wait for CLASS_PREPARE_EVENT
+        return waitForClassPrepareEvent(requestID, className);
+    }
+
+    /**
+     * Wait for classes loaded on debugee start up and return their classIDs.
+     * Debuggee should be initially suspended and it will also left suspended
+     * by the CLASS_PREPARE event request.
+     */
+    public long[] waitForClassesLoaded(String classNames[], byte suspendPolicy) {
+        int count = classNames.length;
+
+        // make requests for CLASS_PREPARE_EVENT for these class names
+        int[] requestIDs = new int[count];
+        for (int i = 0; i < count; i++) {
+            requestIDs[i] = requestClassPrepareEvent(classNames[i], suspendPolicy);
+        }
+
+        // resume initially suspended debugee
+        resume();
+
+        return waitForClassPrepareEvents(requestIDs, classNames);
+    }
+
+    /**
+     * Wait for breakpoint reached and return threadIDs.
+     * Debuggee should be initially suspended and it will also left suspended
+     * by the BREAKPOINT event request.
+     */
+    public long waitForBreakpointReached(long classID, String methodName,
+                                                int line, byte suspendPolicy) {
+        // query debuggee for methodID
+        long methodID = getMethodID(classID, methodName, true);
+        // create BREAKPOINT event request
+        int requestID = requestBreakpointEvent(JDWP.TypeTag.CLASS, classID, methodID,
+                                                                line, suspendPolicy);
+        // resume initially suspended debugee
+        resume();
+        // wait for BREAKPOINT event
+        return waitForBreakpointEvent(requestID);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Wait for CLASS_PREPARE event made by given request received
+     * and return classID.
+     * Debuggee will be left suspended by the CLASS_PREPARE event.
+     */
+    public long waitForClassPrepareEvent(int requestID, String className) {
+        String error = "Error occured while waiting for CLASS_PREPARE event for class:\n\t"
+                        + className;
+
+        String signature = "L" + className.replace('.', '/') + ";";
+        long classID = 0;
+
+        // wait for CLASS_PREPARE event
+        for(;;) {
+            EventPacket event = receiveEvent();
+            byte eventSuspendPolicy = 0;
+            long eventThreadID = 0;
+            try {
+                eventSuspendPolicy = event.getByte();
+                int events = event.getInt();
+                for (int i = 0; i < events; i++) {
+                    // check event kind
+                    byte eventKind = event.getByte();
+                    if (eventKind == JDWP.EventKind.VM_DEATH) {
+                        complain("Unexpected VM_DEATH event received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.CLASS_PREPARE +")");
+                        throw new Failure(error);
+                    } else if (eventKind != JDWP.EventKind.CLASS_PREPARE) {
+                        complain("Unexpected event kind received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.CLASS_PREPARE +")");
+                        throw new Failure(error);
+                    }
+
+                    // extract CLASS_PREPARE event specific data
+                    int eventRequestID = event.getInt();
+                    eventThreadID = event.getObjectID();
+                    byte eventRefTypeTag = event.getByte();
+                    long eventClassID = event.getReferenceTypeID();
+                    String eventClassSignature = event.getString();
+                    int eventClassStatus = event.getInt();
+
+                    // check if event was single
+                    if (events > 1) {
+                        complain("Not single CLASS_PREPARE event received for class:\n\t"
+                                    + eventClassSignature);
+                        throw new Failure(error);
+                    }
+
+                    // check if event is for expected class
+                    if (eventClassSignature.equals(signature)) {
+
+                        // check if event is because of expected request
+                        if (eventRequestID != requestID) {
+                            complain("CLASS_PREPARE event with unexpected requestID ("
+                                    + eventRequestID + ") received for class:\n\t"
+                                    + eventClassSignature);
+                            throw new Failure(error);
+                        }
+
+                        // remove event request
+                        clearEventRequest(JDWP.EventKind.CLASS_PREPARE, requestID);
+
+                        return eventClassID;
+                    } else {
+                        complain("Unexpected CLASS_PREPARE event received with class signature:\n"
+                               + "  " + eventClassSignature);
+                    }
+
+                }
+
+            } catch (BoundException e) {
+                complain("Unable to extract data from event packet while waiting for CLASS_PREPARE event:\n\t"
+                        + e.getMessage() + "\n" + event);
+                throw new Failure(error);
+            }
+
+            // resume debuggee according to event suspend policy
+            resumeEvent(eventSuspendPolicy, eventThreadID);
+        }
+    }
+
+    /**
+     * Wait for CLASS_PREPARE events made by given requests received
+     * and return classIDs.
+     * Debuggee will be left suspended by the CLASS_PREPARE event.
+     */
+    public long[] waitForClassPrepareEvents(int requestIDs[], String classNames[]) {
+        int count = classNames.length;
+        String error = "Error occured while waiting for " + count + " CLASS_PREPARE events";
+
+        // prepare expected class signatures
+        String[] signatures = new String[count];
+        for (int i = 0; i < count; i++) {
+            signatures[i] = "L" + classNames[i].replace('.', '/') + ";";
+        }
+
+        // clear list of classIDs
+        long[] classIDs = new long[count];
+        for (int i = 0; i < count; i++) {
+            classIDs[i] = 0;
+        }
+
+        // wait for all expected CLASS_PREPARE events
+        int received = 0;
+        for(;;) {
+            EventPacket event = receiveEvent();
+            byte eventSuspendPolicy = 0;
+            long eventThreadID = 0;
+            try {
+                eventSuspendPolicy = event.getByte();
+                int events = event.getInt();
+                for (int i = 0; i < events; i++) {
+                    // check event kind
+                    byte eventKind = event.getByte();
+                    if (eventKind == JDWP.EventKind.VM_DEATH) {
+                        complain("Unexpected VM_DEATH event received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.CLASS_PREPARE +")");
+                        throw new Failure(error);
+                    } else if (eventKind != JDWP.EventKind.CLASS_PREPARE) {
+                        complain("Unexpected event kind received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.CLASS_PREPARE +")");
+                        throw new Failure(error);
+                    }
+
+                    // extracy CLASS_PREPARE event specific data
+                    int eventRequestID = event.getInt();
+                    eventThreadID = event.getObjectID();
+                    byte eventRefTypeTag = event.getByte();
+                    long eventClassID = event.getReferenceTypeID();
+                    String eventClassSignature = event.getString();
+                    int eventClassStatus = event.getInt();
+
+                    // check if event was single
+                    if (events > 1) {
+                        complain("Not single CLASS_PREPARE event received for class:\n\t"
+                                + eventClassSignature);
+                    }
+
+                    // find appropriate class by signature
+                    boolean found = false;
+                    for (int j = 0; j < count; j++) {
+                        if (eventClassSignature.equals(signatures[j])) {
+                            found = true;
+
+                            // check if event is not duplicated
+                            if (classIDs[j] != 0) {
+                                complain("Extra CLASS_PREPARE event recieved for class:\n\t"
+                                        + eventClassSignature);
+                            } else {
+                                classIDs[j] = eventClassID;
+                                received ++;
+                            }
+
+                            // check if event is because of expected request
+                            if (eventRequestID != requestIDs[j]) {
+                                complain("CLASS_PREPARE event with unexpected requestID ("
+                                        + requestIDs[j] + ") received for class:\n\t"
+                                        + eventClassSignature);
+                            } else {
+                                clearEventRequest(JDWP.EventKind.CLASS_PREPARE, requestIDs[j]);
+                            }
+                        }
+                    }
+                    if (!found) {
+                        log.complain("Unexpected CLASS_PREPARE event received with class signature:\n"
+                                   + "  " + eventClassSignature);
+                    }
+                }
+            } catch (BoundException e) {
+                complain("Unable to extract data from event packet while waiting for CLASS_PREPARE event:\n\t"
+                            + e.getMessage() + "\n" + event);
+                throw new Failure(error);
+            }
+
+            // if all events received return without resuming
+            if (received >= count)
+                return classIDs;
+
+            // resume debuggee according to events suspend policy
+            resumeEvent(eventSuspendPolicy, eventThreadID);
+        }
+    }
+
+    /**
+     * Wait for BREAKPOINT event made by the given request and return threadID.
+     * Debuggee will be left suspended by the BREAKPOINT event.
+     */
+    public long waitForBreakpointEvent(int requestID) {
+        String error = "Error occured while waiting for BREAKPOINT event for ";
+
+        for(;;) {
+            EventPacket event = receiveEvent();
+            byte eventSuspendPolicy = 0;
+            long eventThreadID = 0;
+            try {
+                eventSuspendPolicy = event.getByte();
+                int events = event.getInt();
+                for (int i = 0; i < events; i++) {
+                    // check event kind
+                    byte eventKind = event.getByte();
+                    if (eventKind == JDWP.EventKind.VM_DEATH) {
+                        complain("Unexpected VM_DEATH event received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.BREAKPOINT +")");
+                        throw new Failure(error);
+                    } else if (eventKind != JDWP.EventKind.BREAKPOINT) {
+                        complain("Unexpected event kind received: " + eventKind
+                                + " (expected: " + JDWP.EventKind.BREAKPOINT +")");
+                        throw new Failure(error);
+                    }
+
+                    // extrack specific BREAKPOINT event data
+                    int eventRequestID = event.getInt();
+                    eventThreadID = event.getObjectID();
+                    JDWP.Location eventLocation = event.getLocation();
+
+                    if (eventRequestID == requestID) {
+                        clearEventRequest(JDWP.EventKind.BREAKPOINT, requestID);
+                        return eventThreadID;
+                    } else {
+                        complain("Unexpected BREAKPOINT event received with requestID: "
+                                + eventRequestID + " (expected: " + requestID + ")");
+                    }
+                }
+            } catch (BoundException e) {
+                complain("Unable to extract data from event packet while waiting for BREAKPOINT event:\n\t"
+                            + e.getMessage() + "\n" + event);
+                throw new Failure(error);
+            }
+
+            resumeEvent(eventSuspendPolicy, eventThreadID);
+        }
+    }
+
+    /**
+     * Resume debuggee according given event suspend policy.
+     */
+    public void resumeEvent(byte suspendPolicy, long threadID) {
+        if (suspendPolicy == JDWP.SuspendPolicy.NONE) {
+            // do nothing
+        } else if (suspendPolicy == JDWP.SuspendPolicy.EVENT_THREAD) {
+            resumeThread(threadID);
+        } else if (suspendPolicy == JDWP.SuspendPolicy.ALL) {
+            resume();
+        } else {
+            throw new Failure("Unexpected event suspend policy while resuming debuggee: "
+                            + suspendPolicy);
+        }
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Query target VM for version info.
+     */
+    public String getVersionInfo() {
+        String commandName = "VirtualMachine.Version";
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.VirtualMachine.Version);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+
+        try {
+            String description = reply.getString();
+            int jdwpMajor = reply.getInt();
+            int jdwpMinor = reply.getInt();
+            String vmVersion = reply.getString();
+            String vmName = reply.getString();
+            return description;
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting JDWP and VM version info");
+        }
+    }
+
+   /**
+    * Query target VM about VM dependent ID sizes.
+    */
+    public void queryForIDSizes() {
+        String commandName = "VirtualMachine.IDSizes";
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.IDSizes);
+        ReplyPacket reply = receiveReplyFor(command);
+        try {
+            reply.resetPosition();
+            JDWP.TypeSize.FIELD_ID = reply.getInt();
+            JDWP.TypeSize.METHOD_ID = reply.getInt();
+            JDWP.TypeSize.OBJECT_ID = reply.getInt();
+            JDWP.TypeSize.REFERENCE_TYPE_ID = reply.getInt();
+            JDWP.TypeSize.FRAME_ID = reply.getInt();
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting VM dependent ID sizes");
+        }
+        JDWP.TypeSize.CalculateSizes();
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Suspend the debugee VM by sending VirtualMachine.Suspend command.
+     */
+    public void suspend() {
+        String commandName = "VirtualMachine.Suspend";
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.Suspend);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    /**
+     * Resume the debugee VM by sending VirtualMachine.Resume command.
+     */
+    public void resume() {
+        String commandName = "VirtualMachine.Resume";
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.Resume);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    /**
+     * Dispose the debugee VM by sending VirtualMachine.Dispose command.
+     */
+    public void dispose() {
+        String commandName = "VirtualMachine.Dispose";
+        CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.Dispose);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Sends JDWP command packet.
+     */
+    public void sendCommand(CommandPacket packet, String commandName) {
+        try {
+            transport.write(packet);
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            complain("Caught IOException while sending command packet for "
+                    + commandName + ":\n\t" + e);
+            display("Command packet:\n" + packet);
+            throw new Failure("Error occured while sending command: " + commandName);
+        }
+    }
+
+    /**
+     * Receive next JDWP packet.
+     */
+/*
+    public Packet receivePacket() {
+        try {
+            ReplyPacket packet = new ReplyPacket();
+            transport.read(packet);
+            return packet;
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught IOException while receiving reply packet:\n\t" + e);
+        }
+    }
+ */
+    /**
+     * Receive next JDWP reply packet.
+     */
+    public ReplyPacket receiveReply() {
+        try {
+            for (;;) {
+                Packet packet = new Packet();
+                transport.read(packet);
+
+                if (packet.getFlags() == JDWP.Flag.REPLY_PACKET) {
+                    ReplyPacket reply = new ReplyPacket(packet);
+                    return reply;
+                }
+
+                EventPacket event = new EventPacket(packet);
+                display("Placing received event packet into queue");
+                eventQueue.add(event);
+            }
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught IOException while receiving reply packet:\n\t" + e);
+        }
+    }
+
+    /**
+     * Get next JDWP event packet by reading from transport or getting stored
+     * event in the event queue.
+     */
+    public EventPacket getEventPacket() throws IOException {
+        // check events queue first
+        if (!eventQueue.isEmpty()) {
+            EventPacket event = (EventPacket)(eventQueue.removeFirst());
+            return event;
+        }
+
+        // read from transport
+        Packet packet = new Packet();
+        transport.read(packet);
+
+        EventPacket event = new EventPacket(packet);
+        return event;
+    }
+
+    /**
+     * Get next JDWP event packet by reading from transport for specified timeout
+     * or getting stored event in the event queue.
+     */
+    public EventPacket getEventPacket(long timeout) throws IOException {
+        transport.setReadTimeout(timeout);
+        return getEventPacket();
+    }
+
+    /**
+     * Receive next JDWP event packet.
+     */
+    public EventPacket receiveEvent() {
+        EventPacket packet = null;
+        try {
+            packet = getEventPacket();
+        } catch (IOException e) {
+            e.printStackTrace(log.getOutStream());
+            throw new Failure("Caught IOException while receiving event packet:\n\t" + e);
+        }
+
+        if (packet.getFlags() == JDWP.Flag.REPLY_PACKET) {
+            ReplyPacket reply = new ReplyPacket(packet);
+            log.complain("Unexpected reply packet received with id: "
+                        + reply.getPacketID());
+            log.display("Reply packet:\n" + reply);
+            throw new Failure("Unexpected reply packet received instead of event packet");
+        }
+
+        return packet;
+    }
+
+    /**
+     * Send specified command packet, receive and check reply packet.
+     *
+     * @throws Failure if exception caught in sending and reading packets
+     */
+    public ReplyPacket receiveReplyFor(CommandPacket command) {
+        return receiveReplyFor(command, Packet.toHexString(command.getCommand(), 4));
+    }
+
+    /**
+     * Send specified command packet, receive and check reply packet.
+     *
+     * @throws Failure if exception caught in sending and reading packets
+     */
+    public ReplyPacket receiveReplyFor(CommandPacket command, String commandName) {
+        ReplyPacket reply = null;
+        sendCommand(command, commandName);
+        reply = receiveReply();
+        try {
+            reply.checkHeader(command.getPacketID());
+        } catch (BoundException e) {
+            complain("Wrong header of reply packet for command "+ commandName + ":\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Wrong reply packet received for command: " + commandName);
+        }
+        return reply;
+    }
+
+    /**
+     * Receive and check event packet for specified event kind.
+     *
+     * @throws Failure if exception caught in sending and reading packets
+     */
+    public EventPacket receiveEventFor(int eventKind, String eventName) {
+        EventPacket event = null;
+        event = receiveEvent();
+        try {
+            event.checkHeader(eventKind);
+        } catch (BoundException e) {
+            complain("Wrong header of event packet for expected "+ eventName + " event:\n\t"
+                    + e.getMessage());
+            display("Event packet:\n" + event);
+            throw new Failure("Wrong event packet received for expected event: " + eventName);
+        }
+        return event;
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Check common VM capability.
+     */
+    public boolean getCapability(int capability, String name) {
+        String commandName = "VirtualMachine.Capabilities";
+
+        int count = JDWP.Capability.CAN_GET_MONITOR_INFO + 1;
+        if (capability < 0 || capability >= count) {
+            throw new TestBug("Illegal capability number (" + capability
+                            + ") while checking for VM capability: " + name);
+        }
+
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.VirtualMachine.Capabilities);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+
+        try {
+            reply.resetPosition();
+
+            for (int i = 0; i < count; i++) {
+                byte value = reply.getByte();
+                if (i == capability) {
+                    return (value != 0);
+                }
+            }
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting VM capability: "
+                                + name);
+        }
+
+        throw new TestBug("Illegal capability number (" + capability
+                        + ") while checking for VM capability: " + name);
+    }
+
+    /**
+     * Check new VM capability (since JDWP version 1.4).
+     */
+    public boolean getNewCapability(int capability, String name) {
+        String commandName = "VirtualMachine.CapabilitiesNew";
+        int count = JDWP.Capability.CAN_SET_DEFAULT_STRATUM + 1;
+
+        if (capability < 0 || capability >= count) {
+            throw new TestBug("Illegal capability number (" + capability
+            + ") while checking for VM new capability: " + name);
+        }
+
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.VirtualMachine.CapabilitiesNew);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+
+        try {
+            reply.resetPosition();
+
+            for (int i = 0; i < count; i++) {
+                byte value = reply.getByte();
+                if (i == capability) {
+                    return (value != 0);
+                }
+            }
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting VM new capability: "
+                                + name);
+        }
+
+        throw new TestBug("Illegal capability number (" + capability
+                        + ") while checking for VM new capability: " + name);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Return ReferenceTypeID for requested class by given signature.
+     */
+    public long getReferenceTypeID(String classSignature) {
+        String commandName = "VirtualMachine.ClassesBySignature";
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.VirtualMachine.ClassesBySignature);
+        command.addString(classSignature);
+        command.setLength();
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+
+        long typeID = 0;
+
+        try {
+            reply.resetPosition();
+
+            int classes = reply.getInt();
+            for (int i = 0; i < classes; i++) {
+                byte refTypeTag = reply.getByte();
+                typeID = reply.getReferenceTypeID();
+                int status = reply.getInt();
+            }
+
+            if (classes < 0) {
+                throw new Failure("Negative number (" + classes
+                                + ") of referenceTypeIDs received for signature: "
+                                + classSignature);
+            }
+
+            if (classes == 0) {
+                throw new Failure("No any referenceTypeID received for signature: "
+                                + classSignature);
+            }
+
+            if (classes > 1) {
+                throw new Failure("Too many (" + classes
+                                + ") referenceTypeIDs received for signature: "
+                                + classSignature);
+            }
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting referenceTypeID for signature: "
+                                + classSignature);
+        }
+
+        return typeID;
+    }
+
+    // --------------------------------------------------- //
+
+
+    /**
+     * Get list of IDs of supertypes (interfaces and classes) for given class.
+     */
+    public long[] getSupertypes(long classID, boolean declared) {
+        Vector<Long> vector = new Vector<Long>();
+        addSupertypes(classID, vector, null, null, false, declared);
+        return makeListOfLongValues(vector);
+    }
+
+    /**
+     * Get list of IDs of superclasses for given class.
+     */
+    public long[] getSuperclasses(long classID, boolean declared) {
+        Vector<Long> vector = new Vector<Long>();
+        addSupertypes(classID, null, null, vector, false, declared);
+        return makeListOfLongValues(vector);
+    }
+
+    /**
+     * Get list of IDs of implemented interfaces for given class.
+     */
+    public long[] getImplementedInterfaces(long classID, boolean declared) {
+        Vector<Long> vector = new Vector<Long>();
+        addSupertypes(classID, null, vector, null, false, declared);
+        return makeListOfLongValues(vector);
+    }
+
+    /**
+     * Get list of IDs of superinterfaces for given interface.
+     */
+    public long[] getSuperinterfaces(long interfaceID, boolean declared) {
+        Vector<Long> vector = new Vector<Long>();
+        addSupertypes(interfaceID, null, vector, null, true, declared);
+        return makeListOfLongValues(vector);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Get list of IDs of methods of given class.
+     */
+    public long[] getMethodIDs(long classID, boolean declared) {
+        Vector<Long> list = new Vector<Long>();
+        addMethods(classID, list, null, null, null, false, declared);
+        return makeListOfLongValues(list);
+    }
+
+    /**
+     * Get list of names of methods of given class.
+     */
+    public String[] getMethodNames(long classID, boolean declared) {
+        Vector<String> list = new Vector<String>();
+        addMethods(classID, null, list, null, null, false, declared);
+        return makeListOfStringValues(list);
+    }
+
+    /**
+     * Get list of signatures of methods of given class.
+     */
+    public String[] getMethodSignatures(long classID, boolean declared) {
+        Vector<String> list = new Vector<String>();
+        addMethods(classID, null, null, list, null, false, declared);
+        return makeListOfStringValues(list);
+    }
+
+    /**
+     * Get ID of a method of given class by name.
+     */
+    public long getMethodID(long classID, String name, boolean declared) {
+        Vector<Long> IDs = new Vector<Long>();
+        Vector<String> names = new Vector<String>();
+        addMethods(classID, IDs, names, null, null, false, declared);
+        int count = names.size();
+        for (int i = 0; i < count; i++) {
+            if (name.equals(names.elementAt(i))) {
+                return (IDs.elementAt(i)).longValue();
+            }
+        }
+        throw new Failure("Method \"" + name + "\" not found for classID: " + classID);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Get list of IDs of static fields of given class.
+     */
+    public long[] getClassFieldIDs(long classID, boolean declared) {
+        Vector<Long> list = new Vector<Long>();
+        addFields(classID, list, null, null, null, false, declared);
+        return makeListOfLongValues(list);
+    }
+
+    /**
+     * Get list of names of static fields of given class.
+     */
+    public String[] getClassFieldNames(long classID, boolean declared) {
+        Vector<String> list = new Vector<String>();
+        addFields(classID, null, list, null, null, false, declared);
+        return makeListOfStringValues(list);
+    }
+
+    /**
+     * Get list of signatures of static fields of given class.
+     */
+    public String[] getClassFieldSignatures(long classID, boolean declared) {
+        Vector<String> list = new Vector<String>();
+        addFields(classID, null, null, list, null, false, declared);
+        return makeListOfStringValues(list);
+    }
+
+    /**
+     * Get ID of a static field of given class by name.
+     */
+    public long getClassFieldID(long classID, String name, boolean declared) {
+        Vector<Long> IDs = new Vector<Long>();
+        Vector<String> names = new Vector<String>();
+        addFields(classID, IDs, names, null, null, false, declared);
+        int count = names.size();
+        for (int i = 0; i < count; i++) {
+            if (name.equals((String)names.elementAt(i))) {
+                return ((Long)IDs.elementAt(i)).longValue();
+            }
+        }
+        throw new Failure("Static field \"" + name + "\" not found for classID: " + classID);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Get value of a static field of given class.
+     */
+    public JDWP.Value getStaticFieldValue(long typeID, long fieldID) {
+        String commandName = "ReferenceType.GetValues";
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.ReferenceType.GetValues);
+        command.addReferenceTypeID(typeID);
+        command.addInt(1);
+        command.addFieldID(fieldID);
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+        JDWP.Value value = null;
+
+        try {
+            reply.resetPosition();
+
+            int count = reply.getInt();
+            if (count < 1) {
+                throw new Failure("No values returned for static fieldID: " + fieldID);
+            }
+            value = reply.getValue();
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName +" command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting value of static field: " +
+                                + fieldID);
+        }
+        return value;
+    }
+
+    /**
+     * Get value of particular type from a static field of given class.
+     */
+    public JDWP.Value getStaticFieldValue(long typeID, String fieldName, byte tag) {
+        long fieldID = getClassFieldID(typeID, fieldName, true);
+        JDWP.Value value = getStaticFieldValue(typeID, fieldID);
+
+        if (value.getTag() != tag) {
+            complain("unexpedted value tag returned from debuggee: " + value.getTag()
+                        + " (expected: " + tag + ")");
+            throw new Failure("Error occured while getting value from static field: "
+                            + fieldName);
+        }
+        return value;
+    }
+
+    /**
+     * Set value of a static field of given class.
+     */
+    public void setStaticFieldValue(long typeID, long fieldID, JDWP.Value value) {
+        String commandName = "ClassType.SetValues";
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.ClassType.SetValues);
+        command.addReferenceTypeID(typeID);
+        command.addInt(1);
+        command.addFieldID(fieldID);
+        command.addUntaggedValue(value, value.getTag());
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    /**
+     * Get value of a field of given object.
+     */
+    public JDWP.Value getObjectFieldValue(long objectID, long fieldID) {
+        String commandName = "ObjectReference.GetValues";
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.ObjectReference.GetValues);
+        command.addObjectID(objectID);
+        command.addInt(1);
+        command.addFieldID(fieldID);
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+        JDWP.Value value = null;
+
+        try {
+            reply.resetPosition();
+
+            int count = reply.getInt();
+            if (count < 1) {
+                throw new Failure("No values returned for object fieldID: " + fieldID);
+            }
+            value = reply.getValue();
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting value of object field: " +
+                                + fieldID);
+        }
+        return value;
+    }
+
+    /**
+     * Set value of a static field of given class.
+     */
+    public void setObjectFieldValue(long objectID, long fieldID, JDWP.Value value) {
+        String commandName = "ObjectReference.SetValues";
+        CommandPacket command =
+            new CommandPacket(JDWP.Command.ObjectReference.SetValues);
+        command.addObjectID(objectID);
+        command.addInt(1);
+        command.addFieldID(fieldID);
+        command.addUntaggedValue(value, value.getTag());
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Find threadID for given thread name among all active threads.
+     */
+    public long getThreadID(String name) {
+        // request list of all threadIDs
+        int threads = 0;
+        long threadIDs[] = null;
+        {
+            String commandName = "VirtualMachine.AllThreads";
+            CommandPacket command = new CommandPacket(JDWP.Command.VirtualMachine.AllThreads);
+            ReplyPacket reply = receiveReplyFor(command, commandName);
+            reply.resetPosition();
+            try {
+                threads = reply.getInt();
+                threadIDs = new long[threads];
+
+                for (int i = 0; i < threads; i++) {
+                    threadIDs[i] = reply.getObjectID();
+                }
+            } catch (BoundException e) {
+                complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                        + e.getMessage());
+                display("Reply packet:\n" + reply);
+                throw new Failure("Error occured while getting threadID for thread name: "
+                                    + name);
+            }
+        }
+
+        // request name for each threadID
+        for (int i = 0; i < threads; i++) {
+            String commandName = "ThreadReference.Name";
+            CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Name);
+            command.addObjectID(threadIDs[i]);
+            ReplyPacket reply = receiveReplyFor(command, commandName);
+            try {
+                reply.resetPosition();
+                String threadName = reply.getString();
+                if (threadName.equals(name)) {
+                    return threadIDs[i];
+                }
+            } catch (BoundException e) {
+                complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                        + e.getMessage());
+                display("Reply packet:\n" + reply);
+                throw new Failure("Error occured while getting name for threadID: "
+                                + threadIDs[i]);
+            }
+        }
+
+        throw new Failure("No threadID found for thread name: " + name);
+    }
+
+    /**
+     * Return thread name for the given threadID.
+     */
+    public String getThreadName(long threadID) {
+        String commandName = "ThreadReference.Name";
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Name);
+        command.addObjectID(threadID);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+        try {
+            reply.resetPosition();
+            String threadName = reply.getString();
+            return threadName;
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting name for threadID: "
+                            + threadID);
+        }
+    }
+
+    /**
+     * Suspend thread for the given threadID.
+     */
+    public void suspendThread(long threadID) {
+        String commandName = "ThreadReference.Suspend";
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Suspend);
+        command.addObjectID(threadID);
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    /**
+     * Resume thread for the given threadID.
+     */
+    public void resumeThread(long threadID) {
+        String commandName = "ThreadReference.resume";
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Resume);
+        command.addObjectID(threadID);
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    /**
+     * Return frameID for the current frame of the thread.
+     * Thread must be suspended.
+     */
+    public long getCurrentFrameID(long threadID) {
+        String commandName = "ThreadReference.Frames";
+        CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Frames);
+        command.addObjectID(threadID);     // threadID
+        command.addInt(0);                 // startFrame
+        command.addInt(1);                 // length
+
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+        try {
+            reply.resetPosition();
+            int frames = reply.getInt();
+            if (frames != 1) {
+                throw new Failure("Not only one current frame returned for threadID "
+                                + threadID + ": " + frames);
+            }
+            long frameID = reply.getFrameID();
+            JDWP.Location location = reply.getLocation();
+            return frameID;
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting current frame for threadID: "
+                            + threadID);
+        }
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Find line number for the given location from the method line table.
+     * If <code>approximate</code> is <it>true</i> the found line should begin
+     * with code index of the given location. Otherwise, the found line will
+     * just cover code index of the given location.
+     */
+    public int getLineNumber(JDWP.Location location, boolean approximate) {
+        String commandName = "Method.LineTable";
+        CommandPacket command = new CommandPacket(JDWP.Command.Method.LineTable);
+        command.addReferenceTypeID(location.getClassID());
+        command.addMethodID(location.getMethodID());
+        long index = location.getIndex();
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+        String msg = "Error occured while getting line number for location: " + location;
+        try {
+            reply.resetPosition();
+            long start = reply.getLong();
+            if (index < start) {
+                complain("Location index (" + index
+                        + ") is less than start method index (" + start);
+                throw new Failure(msg);
+            }
+            long end = reply.getLong();
+            if (index > end) {
+                complain("Location index (" + index
+                        + ") is greater than end method index (" + end);
+                throw new Failure(msg);
+            }
+            int lines = reply.getInt();
+            if (!approximate) {
+                for (int i = 0; i < lines; i++) {
+                    long lineCodeIndex = reply.getLong();
+                    int lineNumber = reply.getInt();
+                    if (lineCodeIndex == index) {
+                        return lineNumber;
+                    }
+                }
+                throw new Failure("No exact line number exactly for location: " + location);
+            } else {
+                int prevLine = -1;
+                for (int i = 0; i < lines; i++) {
+                    long lineCodeIndex = reply.getLong();
+                    int lineNumber = reply.getInt();
+                    if (lineCodeIndex == index) {
+                        return lineNumber;
+                    } else if (lineCodeIndex > index) {
+                        break;
+                    }
+                    prevLine = lineNumber;
+                }
+                if (prevLine < 0)
+                    throw new Failure("No approximate line number found for location: " + location);
+                return prevLine;
+            }
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure(msg);
+        }
+    }
+
+    /**
+     * Find line index for the given line number from the method line table.
+     */
+    public long getCodeIndex(long classID, long methodID, int lineNumber) {
+        String commandName = "Method.LineTable";
+        CommandPacket command = new CommandPacket(JDWP.Command.Method.LineTable);
+        command.addReferenceTypeID(classID);
+        command.addMethodID(methodID);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+        String msg = "Error occured while getting code index for line number: " + lineNumber;
+        try {
+            reply.resetPosition();
+            long start = reply.getLong();
+            long end = reply.getLong();
+            int lines = reply.getInt();
+            for (int i = 0; i < lines; i++) {
+                long lineCodeIndex = reply.getLong();
+                int line = reply.getInt();
+                if (lineNumber == line) {
+                    return lineCodeIndex;
+                }
+            }
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure(msg);
+        }
+
+        throw new Failure("No code index found for line number: " + lineNumber);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Make the specified event request into debuggee.
+     */
+    public int requestEvent(CommandPacket requestCommand, String name) {
+        String commandName = "EventRequest.Set";
+        ReplyPacket reply = receiveReplyFor(requestCommand, name);
+
+        try {
+            reply.resetPosition();
+
+            int requestID = reply.getInt();
+            return requestID;
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Request command packet:\n" + requestCommand);
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while making event request: " + name);
+        }
+    }
+
+    /**
+     * Remove existing event request from debuggee.
+     */
+    public void clearEventRequest(byte eventKind, int requestID) {
+        String commandName = "EventRequest.Clear";
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+        command.addByte(eventKind);
+        command.addInt(requestID);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    /**
+     * Make request for CLASS_PREPARE event for specified class into debuggee.
+     */
+    public int requestClassPrepareEvent(String className, byte suspendPolicy) {
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        command.addByte(JDWP.EventKind.CLASS_PREPARE);
+        command.addByte(suspendPolicy);
+        command.addInt(1);
+            command.addByte(JDWP.EventModifierKind.CLASS_MATCH);
+                command.addString(className);
+
+        return requestEvent(command, "CLASS_PREPARE");
+    }
+
+    /**
+     * Make request for BREAKPOINT event for the specified location into debuggee.
+     */
+    public int requestBreakpointEvent(JDWP.Location location, byte suspendPolicy) {
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Set);
+        command.addByte(JDWP.EventKind.BREAKPOINT);
+        command.addByte(suspendPolicy);
+        command.addInt(1);
+            command.addByte(JDWP.EventModifierKind.LOCATION_ONLY);
+                command.addLocation(location);
+        return requestEvent(command, "BREAKPOINT");
+    }
+
+    /**
+     * Make request for BREAKPOINT event for the specified line of the given method.
+     */
+    public int requestBreakpointEvent(byte typeTag, long classID, long methodID,
+                                            int lineNumber, byte suspendPolicy) {
+        long codeIndex = getCodeIndex(classID, methodID, lineNumber);
+        JDWP.Location location = new JDWP.Location(typeTag, classID, methodID, codeIndex);
+        return requestBreakpointEvent(location, suspendPolicy);
+    }
+
+    /**
+     * Remove all existing BREAKPOINT event requests from debuggee.
+     */
+    public void clearAllBreakpoints() {
+        String commandName = "EventRequest.ClearAllBreakpoints";
+        CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.ClearAllBreakpoints);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Add IDs of supertypes (interfaces and classes) for given class to the lists.
+     */
+    private void addSupertypes(long referenceTypeID, Vector<Long> supertypes,
+                                Vector<Long> interfaces, Vector<Long> superclasses,
+                                boolean interfaceOnly, boolean declared) {
+
+        if (supertypes != null || interfaces != null) {
+
+            // obtain list of direct implemented interfaces
+            String commandName = "ReferenceType.Interfaces";
+            CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Interfaces);
+            command.addReferenceTypeID(referenceTypeID);
+            ReplyPacket reply = receiveReplyFor(command, commandName);
+
+            try {
+                reply.resetPosition();
+
+                int count = reply.getInt();
+                if (count < 0) {
+                    throw new Failure("Negative number (" + count
+                                    + ") of declared interfaces received for referenceTypeID: "
+                                    + referenceTypeID);
+                }
+
+                for (int i = 0; i < count; i++) {
+                    long typeID = reply.getReferenceTypeID();
+                    if (!declared) {
+                        addSupertypes(typeID, supertypes, interfaces, superclasses,
+                                        true, declared);
+                    }
+                    Long value = new Long(typeID);
+                    if (supertypes != null) {
+                        supertypes.add(value);
+                    }
+                    if (interfaces != null) {
+                        interfaces.add(value);
+                    }
+                }
+
+            } catch (BoundException e) {
+                complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                        + e.getMessage());
+                display("Reply packet:\n" + reply);
+                throw new Failure("Error occured while getting interfeceIDs for referenceTypeID: " +
+                                    + referenceTypeID);
+            }
+
+        }
+
+        if (!interfaceOnly) {
+
+            String commandName = "ClassType.Superclasses";
+            CommandPacket command = new CommandPacket(JDWP.Command.ClassType.Superclass);
+            command.addReferenceTypeID(referenceTypeID);
+            ReplyPacket reply = receiveReplyFor(command, commandName);
+
+            try {
+                reply.resetPosition();
+
+                long typeID = reply.getReferenceTypeID();
+                if (typeID != 0) {
+                    if (!declared) {
+                        addSupertypes(typeID, supertypes, interfaces, superclasses,
+                                    false, declared);
+                    }
+                    Long value = new Long(typeID);
+                    if (supertypes != null) {
+                        supertypes.add(value);
+                    }
+                    if (superclasses != null) {
+                        superclasses.add(value);
+                    }
+                }
+            } catch (BoundException e) {
+                complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                        + e.getMessage());
+                display("Reply packet:\n" + reply);
+                throw new Failure("Error occured while getting superclass ID for classID: " +
+                                    + referenceTypeID);
+            }
+
+        }
+    }
+
+    /**
+     * Add attributes of fields of given class to the lists.
+     */
+    private void addFields(long referenceTypeID, Vector<Long> IDs, Vector<String> names,
+                                Vector<String> signatures, Vector<Integer> modifiers,
+                                boolean interfaceOnly, boolean declared) {
+
+        if (!declared) {
+            Vector<Long> supertypes = new Vector<Long>();
+            addSupertypes(referenceTypeID, supertypes, null, null, interfaceOnly, declared);
+            int count = supertypes.size();
+            for (int i = 0; i < count; i++) {
+                long typeID = (supertypes.elementAt(i)).longValue();
+                addFields(typeID, IDs, names, signatures, modifiers,
+                            interfaceOnly, declared);
+            }
+        }
+
+        String commandName = "ReferenceType.Fields";
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Fields);
+        command.addReferenceTypeID(referenceTypeID);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+
+        try {
+            reply.resetPosition();
+
+            int count = reply.getInt();
+            if (count < 0) {
+                throw new Failure("Negative number (" + count
+                                + ") of declared fields received for referenceTypeID: "
+                                + referenceTypeID);
+            }
+
+            for (int i = 0; i < count; i++) {
+                long id = reply.getFieldID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                if (IDs != null)
+                    IDs.add(new Long(id));
+                if (names != null)
+                    names.add(name);
+                if (signatures != null)
+                    signatures.add(signature);
+                if (modifiers != null)
+                    modifiers.add(new Integer(modBits));
+            }
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting fieldIDs for referenceTypeID: " +
+                                + referenceTypeID);
+        }
+    }
+
+    /**
+     * Add attributes of methods of given class to the lists.
+     */
+    private void addMethods(long referenceTypeID, Vector<Long> IDs, Vector<String> names,
+                                Vector<String> signatures, Vector<Integer> modifiers,
+                                boolean interfaceOnly, boolean declared) {
+
+        if (!declared) {
+            Vector<Long> supertypes = new Vector<Long>();
+            addSupertypes(referenceTypeID, supertypes, null, null, interfaceOnly, declared);
+            int count = supertypes.size();
+            for (int i = 0; i < count; i++) {
+                long typeID = (supertypes.elementAt(i)).longValue();
+                addMethods(typeID, IDs, names, signatures, modifiers,
+                            interfaceOnly, declared);
+            }
+        }
+
+        String commandName = "ReferenceType.Methods";
+        CommandPacket command = new CommandPacket(JDWP.Command.ReferenceType.Methods);
+        command.addReferenceTypeID(referenceTypeID);
+        ReplyPacket reply = receiveReplyFor(command, commandName);
+
+        try {
+            reply.resetPosition();
+
+            int count = reply.getInt();
+            if (count < 0) {
+                throw new Failure("Negative number (" + count
+                                + ") of declared fields received for referenceTypeID: "
+                                + referenceTypeID);
+            }
+
+            for (int i = 0; i < count; i++) {
+                long id = reply.getMethodID();
+                String name = reply.getString();
+                String signature = reply.getString();
+                int modBits = reply.getInt();
+
+                if (IDs != null)
+                    IDs.add(new Long(id));
+                if (names != null)
+                    names.add(name);
+                if (signatures != null)
+                    signatures.add(signature);
+                if (modifiers != null)
+                    modifiers.add(new Integer(modBits));
+            }
+
+        } catch (BoundException e) {
+            complain("Unable to parse reply packet for " + commandName + " command:\n\t"
+                    + e.getMessage());
+            display("Reply packet:\n" + reply);
+            throw new Failure("Error occured while getting methodIDs for referenceTypeID: " +
+                                + referenceTypeID);
+        }
+    }
+
+    // --------------------------------------------------- //
+
+    private static long[] makeListOfLongValues(Vector<Long> vector) {
+        int count = vector.size();
+        long[] list = new long[count];
+        for (int i = 0; i < count; i++) {
+            list[i] = (vector.elementAt(i)).longValue();
+        }
+        return list;
+    }
+
+    private static String[] makeListOfStringValues(Vector<String> vector) {
+        int count = vector.size();
+        String[] list = new String[count];
+        for (int i = 0; i < count; i++) {
+            list[i] = vector.elementAt(i);
+        }
+        return list;
+    }
+
+    // --------------------------------------------------- //
+
+    /**
+     * Force debugge VM to exit using JDWP connection if possible.
+     */
+    protected void killDebugee() {
+        // ignore
+    }
+
+    /**
+     * Close transport channel and kill the debugee VM if it is not terminated yet.
+     */
+    public void close() {
+        if (transport != null) {
+            try {
+                transport.close();
+            } catch (IOException e) {
+                log.display("WARNING: Caught IOException while closing JDWP connection:\n\t"
+                            + e);
+            }
+        }
+        super.close();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/EventPacket.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/EventPacket.java
new file mode 100644
index 00000000000..1ab717c6780
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/EventPacket.java
@@ -0,0 +1,156 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+
+import java.util.Vector;
+
+/**
+ * This class represents a JDWP event packet.
+ */
+public class EventPacket extends CommandPacket {
+
+    /** Offset of the "suspendPolicy" field in a JDWP event packet. */
+    public final static int SuspendPolicyOffset = DataOffset;
+
+    /** Offset of the "eventsCount" field in a JDWP event packet. */
+    public final static int EventsCountOffset = SuspendPolicyOffset + JDWP.TypeSize.BYTE;
+
+    /** Offset of the first "eventKind" field in a JDWP event packet. */
+    public final static int FirstEventKindOffset = EventsCountOffset + JDWP.TypeSize.INT;
+
+    /**
+     * Make an empty event packet.
+     */
+    public EventPacket() {
+        super(JDWP.Command.Event.Composite, 0);
+    }
+
+    /**
+     * Make event packet with data from the specified byte buffer.
+     */
+//    public EventPacket(ByteBuffer packet) {
+    public EventPacket(Packet packet) {
+        super(packet);
+    }
+
+    /**
+     * Return suspend policy of the events in the packet.
+     *
+     * throws BoundException if event packet structure is not valid
+     */
+    public byte getSuspendPolicy() {
+        try {
+            return getByte(SuspendPolicyOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting event kind from header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Return number of events in the packet.
+     *
+     * throws BoundException if event packet structure is not valid
+     */
+    public int getEventsCount() {
+        try {
+            return getInt(EventsCountOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting event kind from header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Return constant indicates kind of the first event in the packet.
+     *
+     * throws BoundException if event packet structure is not valid
+     */
+    public int getEventKind() {
+        try {
+            return getByte(FirstEventKindOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting event kind from header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Check event packet header.
+     * This method check if event packet has valid values in the header fields.
+     *
+     * @throws PacketFormatException if packet header fields have error or invalid values
+     */
+    public void checkHeader() throws PacketFormatException {
+        super.checkHeader();
+        if (getFullCommand() != JDWP.Command.Event.Composite) {
+            throw new PacketFormatException("Not Event.Composite command in the event packet header: "
+                                            + "0x" + toHexDecString(getFullCommand(), 4) );
+        }
+        if (getFlags() != JDWP.Flag.EVENT_PACKET) {
+            throw new PacketFormatException("Unexpected flags in the event packet header: "
+                                            + "0x" + toHexDecString(getFlags(), 2));
+        }
+/*
+        if (getPacketID() != 0) {
+            throw new PacketFormatException("Non-zero packet ID in the event packet header: "
+                                            + getPacketID());
+        }
+ */
+    }
+
+    /**
+     * Check event packet header for only one event of specified kind.
+     * This method check if event packet has valid values in the header fields.
+     *
+     * @throws PacketFormatException if packet header fields have error or invalid values
+     */
+    public void checkHeader(int eventKind) throws PacketFormatException {
+        checkHeader();
+        if (getEventsCount() != 1) {
+            throw new PacketFormatException("Not a single event in the event packet: "
+                                            + getEventsCount() + " events");
+        }
+        if (getEventKind() != eventKind) {
+            throw new PacketFormatException("Unexpected event kind in the event packet: "
+                                            + "0x" + toHexDecString(getEventKind(), 2));
+        }
+    }
+
+    /**
+     * Return string representation of the event packet header.
+     */
+    public String headerToString() {
+        return super.headerToString()
+             + "    " + toHexString(SuspendPolicyOffset,  4)  + " (policy):  0x" + toHexDecString(getSuspendPolicy(), 2) + "\n"
+             + "    " + toHexString(EventsCountOffset,  4)    + " (events):  0x" + toHexDecString(getEventsCount(), 8) + "\n"
+             + "    " + toHexString(FirstEventKindOffset,  4) + " (kind):    0x" + toHexDecString(getEventKind(), 2) + "\n";
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/JDWP.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/JDWP.java
new file mode 100644
index 00000000000..a51fd829c25
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/JDWP.java
@@ -0,0 +1,971 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+
+import nsk.share.Failure;
+
+/**
+ * This class contains JDWP constants, types and parameters.
+ */
+public class JDWP {
+
+    public static class Error {
+
+        public static final int NONE                            = 0;
+        public static final int INVALID_THREAD                  = 10;
+        public static final int INVALID_THREAD_GROUP            = 11;
+        public static final int INVALID_PRIORITY                = 12;
+        public static final int THREAD_NOT_SUSPENDED            = 13;
+        public static final int THREAD_SUSPENDED                = 14;
+        public static final int INVALID_OBJECT                  = 20;
+        public static final int INVALID_CLASS                   = 21;
+        public static final int CLASS_NOT_PREPARED              = 22;
+        public static final int INVALID_METHODID                = 23;
+        public static final int INVALID_LOCATION                = 24;
+        public static final int INVALID_FIELDID                 = 25;
+        public static final int INVALID_FRAMEID                 = 30;
+        public static final int NO_MORE_FRAMES                  = 31;
+        public static final int OPAQUE_FRAME                    = 32;
+        public static final int NOT_CURRENT_FRAME               = 33;
+        public static final int TYPE_MISMATCH                   = 34;
+        public static final int INVALID_SLOT                    = 35;
+        public static final int DUPLICATE                       = 40;
+        public static final int NOT_FOUND                       = 41;
+        public static final int INVALID_MONITOR                 = 50;
+        public static final int NOT_MONITOR_OWNER               = 51;
+        public static final int INTERRUPT                       = 52;
+        public static final int INVALID_CLASS_FORMAT            = 60;
+        public static final int CIRCULAR_CLASS_DEFINITION       = 61;
+        public static final int FAILS_VERIFICATION              = 62;
+        public static final int ADD_METHOD_NOT_IMPLEMENTED      = 63;
+        public static final int SCHEMA_CHANGE_NOT_IMPLEMENTED   = 64;
+        public static final int INVALID_TYPESTATE               = 65;
+        public static final int HIERARCHY_CHANGE_NOT_IMPLEMENTED= 66;
+        public static final int DELETE_METHOD_NOT_IMPLEMENTED   = 67;
+        public static final int UNSUPPORTED_VERSION             = 68;
+        public static final int NAMES_DONT_MATCH                = 69;
+        public static final int CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED  = 70;
+        public static final int METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED = 71;
+        public static final int NOT_IMPLEMENTED                 = 99;
+        public static final int NULL_POINTER                    = 100;
+        public static final int ABSENT_INFORMATION              = 101;
+        public static final int INVALID_EVENT_TYPE              = 102;
+        public static final int ILLEGAL_ARGUMENT                = 103;
+        public static final int OUT_OF_MEMORY                   = 110;
+        public static final int ACCESS_DENIED                   = 111;
+        public static final int VM_DEATH                        = 112;
+        public static final int INTERNAL                        = 113;
+        public static final int UNATTACHED_THREAD               = 115;
+        public static final int INVALID_TAG                     = 500;
+        public static final int ALREADY_INVOKING                = 502;
+        public static final int INVALID_INDEX                   = 503;
+        public static final int INVALID_LENGTH                  = 504;
+        public static final int INVALID_STRING                  = 506;
+        public static final int INVALID_CLASS_LOADER            = 507;
+        public static final int INVALID_ARRAY                   = 508;
+        public static final int TRANSPORT_LOAD                  = 509;
+        public static final int TRANSPORT_INIT                  = 510;
+        public static final int NATIVE_METHOD                   = 511;
+        public static final int INVALID_COUNT                   = 512;
+
+    }
+
+    public static class Flag {
+
+        public static final byte NONE           = (byte)0;
+        public static final byte REPLY_PACKET   = (byte)0x80;
+        public static final byte EVENT_PACKET   = NONE;
+
+    }
+
+    public static class EventKind {
+
+        public static final byte VM_INIT         = (byte)90;
+        public static final byte VM_START        = VM_INIT;
+        public static final byte VM_DISCONNECTED = (byte)100;
+        public static final byte VM_DEATH        = (byte)99;
+
+        public static final byte THREAD_START    = (byte)6;
+        public static final byte THREAD_END      = (byte)7;
+        public static final byte THREAD_DEATH    = THREAD_END;
+
+        public static final byte CLASS_PREPARE   = (byte)8;
+        public static final byte CLASS_LOAD      = (byte)10;
+        public static final byte CLASS_UNLOAD    = (byte)9;
+
+        public static final byte METHOD_ENTRY    = (byte)40;
+        public static final byte METHOD_EXIT     = (byte)41;
+
+        public static final byte FIELD_ACCESS    = (byte)20;
+        public static final byte FIELD_MODIFICATION = (byte)21;
+
+        public static final byte EXCEPTION       = (byte)4;
+        public static final byte EXCEPTION_CATCH = (byte)30;
+
+        public static final byte FRAME_POP       = (byte)3;
+
+        public static final byte BREAKPOINT      = (byte)2;
+
+        public static final byte SINGLE_STEP     = (byte)1;
+
+        public static final byte USER_DEFINED    = (byte)5;
+
+    }
+
+    public static class EventModifierKind {
+
+        public static final byte COUNT          = (byte)1;
+        public static final byte CONDITIONAL    = (byte)2;
+        public static final byte THREAD_ONLY    = (byte)3;
+        public static final byte CLASS_ONLY     = (byte)4;
+        public static final byte CLASS_MATCH    = (byte)5;
+        public static final byte CLASS_EXCLUDE  = (byte)6;
+        public static final byte LOCATION_ONLY  = (byte)7;
+        public static final byte EXCEPTION_ONLY = (byte)8;
+        public static final byte FIELD_ONLY     = (byte)9;
+        public static final byte STEP           = (byte)10;
+        public static final byte INSTANCE_ONLY  = (byte)11;
+    };
+
+    public static class ThreadStatus {
+
+        public static final int ZOMBIE          = 0;
+        public static final int RUNNING         = 1;
+        public static final int SLEEPING        = 2;
+        public static final int MONITOR         = 3;
+        public static final int WAIT            = 4;
+
+    }
+
+    public static class SuspendStatus {
+
+        public static final int SUSPEND_STATUS_SUSPENDED = 0x1;
+
+    }
+
+    public static class ClassStatus {
+
+        public static final int PREPARED        = 2;
+        public static final int VERIFIED        = 1;
+        public static final int INITIALIZED     = 4;
+        public static final int ERROR           = 8;
+
+    }
+
+    public static class TypeTag {
+
+        public static final byte CLASS           = (byte)1;
+        public static final byte INTERFACE       = (byte)2;
+        public static final byte ARRAY           = (byte)3;
+
+    }
+
+    public static class Tag {
+
+        public static final byte ARRAY           = (byte)91;
+        public static final byte BYTE            = (byte)66;
+        public static final byte CHAR            = (byte)67;
+        public static final byte OBJECT          = (byte)76;
+        public static final byte FLOAT           = (byte)70;
+        public static final byte DOUBLE          = (byte)68;
+        public static final byte INT             = (byte)73;
+        public static final byte LONG            = (byte)74;
+        public static final byte SHORT           = (byte)83;
+        public static final byte VOID            = (byte)86;
+        public static final byte BOOLEAN         = (byte)90;
+        public static final byte STRING          = (byte)115;
+        public static final byte THREAD          = (byte)116;
+        public static final byte THREAD_GROUP    = (byte)103;
+        public static final byte CLASS_LOADER    = (byte)108;
+        public static final byte CLASS_OBJECT    = (byte)99;
+
+    }
+
+    public static class StepDepth {
+
+        public static final int INTO            = 0;
+        public static final int OVER            = 1;
+        public static final int OUT             = 2;
+
+    }
+
+    public static class StepSize {
+
+        public static final int MIN             = 0;
+        public static final int LINE            = 1;
+
+    }
+
+    public static class SuspendPolicy {
+
+        public static final byte NONE            = (byte)0;
+        public static final byte EVENT_THREAD    = (byte)1;
+        public static final byte ALL             = (byte)2;
+
+    }
+
+    public static class InvokeOptions {
+
+        public static final int INVOKE_SINGLE_THREADED     = 0x01;
+        public static final int INVOKE_NONVIRTUAL          = 0x02;
+
+    }
+
+    public static class TypeSize {
+
+        // VM independent type sizes
+
+        public static final int BYTE              = 1;
+        public static final int BOOLEAN           = 1;
+        public static final int CHAR              = 2;
+        public static final int SHORT             = 2;
+        public static final int FLOAT             = 4;
+        public static final int INT               = 4;
+        public static final int LONG              = 8;
+        public static final int DOUBLE            = 8;
+
+        public static final int TAG               = 1;
+        public static final int LOCATION_INDEX    = 8;
+
+        // basic VM specific type sizes
+
+        public static int OBJECT_ID         = 8;
+        public static int METHOD_ID         = 4;
+        public static int FIELD_ID          = 4;
+        public static int FRAME_ID          = 4;
+
+        // derivative VM specific type sizes
+
+        public static int TAGGED_OBJECT_ID  = TAG + OBJECT_ID;
+
+        public static int THREAD_ID         = OBJECT_ID;
+        public static int THREAD_GROUP_ID   = OBJECT_ID;
+        public static int STRING_ID         = OBJECT_ID;
+        public static int CLASS_LOADER_ID   = OBJECT_ID;
+        public static int CLASS_OBJECT_ID   = OBJECT_ID;
+        public static int REFERENCE_TYPE_ID = OBJECT_ID;
+
+        public static int CLASS_ID          = REFERENCE_TYPE_ID;
+        public static int INTERFACE_ID      = REFERENCE_TYPE_ID;
+        public static int ARRAY_ID          = REFERENCE_TYPE_ID;
+
+        public static int LOCATION          = TAG + CLASS_ID + METHOD_ID + LOCATION_INDEX;
+
+        /**
+         * Calculate type sizes based on VM dependent basic type sizes.
+         */
+        public static void CalculateSizes() {
+
+            TAGGED_OBJECT_ID  = TAG + OBJECT_ID;
+
+            THREAD_ID         = OBJECT_ID;
+            THREAD_GROUP_ID   = OBJECT_ID;
+            STRING_ID         = OBJECT_ID;
+            CLASS_LOADER_ID   = OBJECT_ID;
+            CLASS_OBJECT_ID   = OBJECT_ID;
+            REFERENCE_TYPE_ID = OBJECT_ID;
+
+            CLASS_ID          = REFERENCE_TYPE_ID;
+            INTERFACE_ID      = REFERENCE_TYPE_ID;
+            ARRAY_ID          = REFERENCE_TYPE_ID;
+
+            LOCATION          = TAG + CLASS_ID + METHOD_ID + LOCATION_INDEX;
+        }
+
+    }
+
+    public static class ModifierFlag {
+
+        public static final int PUBLIC                = 0x0001;
+        public static final int PRIVATE               = 0x0002;
+        public static final int PROTECTED             = 0x0004;
+        public static final int STATIC                = 0x0008;
+        public static final int FINAL                 = 0x0010;
+        public static final int SUPER                 = 0x0020;
+        public static final int VOLATILE              = 0x0040;
+        public static final int TRANSIENT             = 0x0080;
+        public static final int SYNCHRONIZED          = 0x0020;
+        public static final int NATIVE                = 0x0100;
+        public static final int INTERFACE             = 0x0200;
+        public static final int ABSTRACT              = 0x0400;
+        public static final int SYNTHETIC             = 0xF0000000;
+
+        public static final int CLASS_MASK            = PUBLIC | FINAL | SUPER | INTERFACE | ABSTRACT;
+        public static final int FIELD_MASK            = PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | VOLATILE | TRANSIENT;
+        public static final int METHOD_MASK           = PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | SYNCHRONIZED | NATIVE | ABSTRACT;
+
+    }
+
+    public static class CommandSet {
+
+        public static final byte VirtualMachine        = (byte)0x01;
+        public static final byte ReferenceType         = (byte)0x02;
+        public static final byte ClassType             = (byte)0x03;
+        public static final byte ArrayType             = (byte)0x04;
+        public static final byte InterfaceType         = (byte)0x05;
+        public static final byte Method                = (byte)0x06;
+        public static final byte Field                 = (byte)0x08;
+        public static final byte ObjectReference       = (byte)0x09;
+        public static final byte StringReference       = (byte)0x0A;
+        public static final byte ThreadReference       = (byte)0x0B;
+        public static final byte ThreadGroupReference  = (byte)0x0C;
+        public static final byte ArrayReferemce        = (byte)0x0D;
+        public static final byte ClassLoaderReference  = (byte)0x0E;
+        public static final byte EventRequest          = (byte)0x0F;
+        public static final byte StackFrame            = (byte)0x10;
+        public static final byte ClassObjectReference  = (byte)0x11;
+        public static final byte Event                 = (byte)0x40;
+
+    }
+
+    // command names, used only for debug output
+    public static HashMap<Integer, String> commandNames = new HashMap<Integer, String>();
+
+    static
+    {
+        commandNames.put(Command.ObjectReference.ReferringObjects, "ObjectReference.ReferringObjects");
+        commandNames.put(Command.ReferenceType.Instances, "ReferenceType.Instances");
+        commandNames.put(Command.ReferenceType.ClassFileVersion, "ReferenceType.ClassFileVersion");
+        commandNames.put(Command.ReferenceType.ConstantPool, "ReferenceType.ConstantPool");
+        commandNames.put(Command.ThreadReference.OwnedMonitorsStackDepthInfo, "ThreadReference.OwnedMonitorsStackDepthInfo");
+        commandNames.put(Command.ThreadReference.ForceEarlyReturn, "ThreadReference.ForceEarlyReturn");
+        commandNames.put(Command.VirtualMachine.InstanceCounts, "VirtualMachine.InstanceCounts");
+    }
+
+    public static class Command {
+
+        public static class VirtualMachine {
+
+            public static final int Version             = 0x0101;
+            public static final int ClassesBySignature  = 0x0102;
+            public static final int AllClasses          = 0x0103;
+            public static final int AllThreads          = 0x0104;
+            public static final int TopLevelThreadGroups  = 0x0105;
+            public static final int Dispose             = 0x0106;
+            public static final int IDSizes             = 0x0107;
+            public static final int Suspend             = 0x0108;
+            public static final int Resume              = 0x0109;
+            public static final int Exit                = 0x010A;
+            public static final int CreateString        = 0x010B;
+            public static final int Capabilities        = 0x010C;
+            public static final int ClassPaths          = 0x010D;
+            public static final int DisposeObjects      = 0x010E;
+            public static final int HoldEvents          = 0x010F;
+            public static final int ReleaseEvents       = 0x0110;
+
+            // since JDK-1.4
+            public static final int CapabilitiesNew     = 0x0111;
+            public static final int RedefineClasses     = 0x0112;
+            public static final int SetDefaultStratum   = 0x0113;
+
+            // since JDK-1.5
+            public static final int AllClassesWithGeneric = 0x0114;
+
+            // since JDK-1.6
+            public static final int InstanceCounts      = 0x0115;
+        }
+
+        public static class ReferenceType {
+
+            public static final int Signature           = 0x0201;
+            public static final int ClassLoader         = 0x0202;
+            public static final int Modifiers           = 0x0203;
+            public static final int Fields              = 0x0204;
+            public static final int Methods             = 0x0205;
+            public static final int GetValues           = 0x0206;
+            public static final int SourceFile          = 0x0207;
+            public static final int NestedTypes         = 0x0208;
+            public static final int Status              = 0x0209;
+            public static final int Interfaces          = 0x020A;
+            public static final int ClassObject         = 0x020B;
+
+            // since JDK-1.4
+            public static final int SourceDebugExtension = 0x020C;
+
+            // since JDK-1.5
+            public static final int SignatureWithGeneric = 0x020D;
+            public static final int FieldsWithGeneric = 0x020E;
+            public static final int MethodsWithGeneric = 0x020F;
+
+            // since JDK-1.6
+            public static final int Instances = 0x0210;
+            public static final int ClassFileVersion = 0x0211;
+            public static final int ConstantPool = 0x0212;
+        }
+
+        public static class ClassType {
+
+            public static final int Superclass          = 0x0301;
+            public static final int SetValues           = 0x0302;
+            public static final int InvokeMethod        = 0x0303;
+            public static final int NewInstance         = 0x0304;
+
+        }
+
+        public static class ArrayType {
+
+            public static final int NewInstance         = 0x0401;
+
+        }
+
+        public static class InterfaceType {
+
+        }
+
+        public static class Method {
+
+            public static final int LineTable           = 0x0601;
+            public static final int VariableTable       = 0x0602;
+            public static final int Bytecodes           = 0x0603;
+
+            // since JDK-1.4
+            public static final int IsObsolete          = 0x0604;
+
+            // since JDK-1.5
+            public static final int VariableTableWithGeneric = 0x0605;
+
+        }
+
+        public static class Field {
+
+        }
+
+        public static class ObjectReference {
+
+            public static final int ReferenceType       = 0x0901;
+            public static final int GetValues           = 0x0902;
+            public static final int SetValues           = 0x0903;
+            public static final int MonitorInfo         = 0x0905;
+            public static final int InvokeMethod        = 0x0906;
+            public static final int DisableCollection   = 0x0907;
+            public static final int EnableCollection    = 0x0908;
+            public static final int IsCollected         = 0x0909;
+
+            // since JDK-1.6
+            public static final int ReferringObjects         = 0x090A;
+        }
+
+        public static class StringReference {
+
+            public static final int Value               = 0x0A01;
+
+        }
+
+        public static class ThreadReference {
+
+            public static final int Name                = 0x0B01;
+            public static final int Suspend             = 0x0B02;
+            public static final int Resume              = 0x0B03;
+            public static final int Status              = 0x0B04;
+            public static final int ThreadGroup         = 0x0B05;
+            public static final int Frames              = 0x0B06;
+            public static final int FrameCount          = 0x0B07;
+            public static final int OwnedMonitors       = 0x0B08;
+            public static final int CurrentContendedMonitor = 0x0B09;
+            public static final int Stop                = 0x0B0A;
+            public static final int Interrupt           = 0x0B0B;
+            public static final int SuspendCount        = 0x0B0C;
+            public static final int PopTopFrame         = 0x0B0D;
+
+            // since JDK-1.6
+            public static final int OwnedMonitorsStackDepthInfo = 0x0B0D;
+            public static final int ForceEarlyReturn = 0x0B0E;
+        }
+
+        public static class ThreadGroupReference {
+
+            public static final int Name                = 0x0C01;
+            public static final int Parent              = 0x0C02;
+            public static final int Children            = 0x0C03;
+
+        }
+
+        public static class ArrayReference {
+
+            public static final int Length              = 0x0D01;
+            public static final int GetValues           = 0x0D02;
+            public static final int SetValues           = 0x0D03;
+
+        }
+
+        public static class ClassLoaderReference {
+
+            public static final int VisibleClasses      = 0x0E01;
+
+        }
+
+        public static class EventRequest {
+
+            public static final int Set                 = 0x0F01;
+            public static final int Clear               = 0x0F02;
+            public static final int ClearAllBreakpoints = 0x0F03;
+
+        }
+
+        public static class StackFrame {
+
+            public static final int GetValues           = 0x1001;
+            public static final int SetValues           = 0x1002;
+            public static final int ThisObject          = 0x1003;
+
+            // since JDK-1.4
+            public static final int PopFrames           = 0x1004;
+
+        }
+
+        public static class ClassObjectReference {
+
+            public static final int ReflectedType       = 0x1101;
+
+        }
+
+        public static class Event {
+
+            public static final int Composite           = 0x4064;
+
+        }
+
+    } // end of class Command
+
+    public static class Capability {
+
+        // common capabilities
+        public static final int CAN_WATCH_FIELD_MODIFICATION        = 0;
+        public static final int CAN_WATCH_FIELD_ACCESS              = 1;
+        public static final int CAN_GET_BYTECODES                   = 2;
+        public static final int CAN_GET_SYNTHETIC_ATTRIBUTE         = 3;
+        public static final int CAN_GET_OWNED_MONITOR_INFO          = 4;
+        public static final int CAN_GET_CURRENT_CONTENDED_MONITOR   = 5;
+        public static final int CAN_GET_MONITOR_INFO                = 6;
+
+        // new capabilities (since JDWP version 1.4)
+        public static final int CAN_REDEFINE_CLASSES                = 7;
+        public static final int CAN_ADD_METHODR_INFO                = 8;
+        public static final int CAN_UNRESTRICTEDLY_REDEFINE_CLASSES = 9;
+        public static final int CAN_POP_FRAMES                      = 10;
+        public static final int CAN_USE_INSTANCE_FILTER             = 11;
+        public static final int CAN_GET_SOURCE_DEBUG_EXTENSION      = 12;
+        public static final int CAN_REQUEST_VMDEATH_EVENT           = 13;
+        public static final int CAN_SET_DEFAULT_STRATUM             = 14;
+    }
+
+    public static class Location extends ByteBuffer {
+
+        public static int TAG_OFFSET = 0;
+        public static int CLASS_ID_OFFSET = TAG_OFFSET + JDWP.TypeSize.TAG;
+        public static int METHOD_ID_OFFSET = CLASS_ID_OFFSET + JDWP.TypeSize.CLASS_ID;
+        public static int INDEX_OFFSET = METHOD_ID_OFFSET + JDWP.TypeSize.METHOD_ID;
+
+        private static void calculateOffsets() {
+            CLASS_ID_OFFSET = TAG_OFFSET + JDWP.TypeSize.TAG;
+            METHOD_ID_OFFSET = CLASS_ID_OFFSET + JDWP.TypeSize.CLASS_ID;
+            INDEX_OFFSET = METHOD_ID_OFFSET + JDWP.TypeSize.METHOD_ID;
+        }
+
+        public Location(byte typeTag, long classID, long methodID, long index) {
+            this();
+            // 1 byte type tag
+            putTag(typeTag);
+            // classID
+            putClassID(classID);
+            // methodID
+            putMethodID(methodID);
+            // 8 bytes index
+            putIndex(index);
+        }
+
+        public Location() {
+            super(JDWP.TypeSize.LOCATION, 0);
+            addBytes((byte)0, TypeSize.LOCATION);
+
+            // calculate offsets for VM-dependent type sizes
+            calculateOffsets();
+        }
+
+        public final byte getTag() {
+            try {
+                return getByte(TAG_OFFSET);
+            } catch (BoundException e) {
+                throw new Failure("Unable to get tag from location:\n\t" + e);
+            }
+        }
+
+        public final long getClassID() {
+            try {
+                return getID(CLASS_ID_OFFSET, JDWP.TypeSize.CLASS_ID);
+            } catch (BoundException e) {
+                throw new Failure("Unable to get classID from location:\n\t" + e);
+            }
+        }
+
+        public final long getMethodID() {
+            try {
+                return getID(METHOD_ID_OFFSET, JDWP.TypeSize.METHOD_ID);
+            } catch (BoundException e) {
+                throw new Failure("Unable to get methodID from location:\n\t" + e);
+            }
+        }
+
+        public final long getIndex() {
+            try {
+                return getID(INDEX_OFFSET, JDWP.TypeSize.LOCATION_INDEX);
+            } catch (BoundException e) {
+                throw new Failure("Unable to get code index from location:\n\t" + e);
+            }
+        }
+
+        public final void putTag(byte tag) {
+            try {
+                putByte(TAG_OFFSET, tag);
+            } catch (BoundException e) {
+                throw new Failure("Unable to put tag into location:\n\t" + e);
+            }
+        }
+
+        public final void putClassID(long classID) {
+            try {
+                putID(CLASS_ID_OFFSET, classID, JDWP.TypeSize.CLASS_ID);
+            } catch (BoundException e) {
+                throw new Failure("Unable to put classID into location:\n\t" + e);
+            }
+        }
+
+        public final void putMethodID(long methodID) {
+            try {
+                putID(METHOD_ID_OFFSET, methodID, JDWP.TypeSize.METHOD_ID);
+            } catch (BoundException e) {
+                throw new Failure("Unable to put methodID into location:\n\t" + e);
+            }
+        }
+
+        public final void putIndex(long index) {
+            try {
+                putID(INDEX_OFFSET, index, JDWP.TypeSize.LOCATION_INDEX);
+            } catch (BoundException e) {
+                throw new Failure("Unable to put code index into location:\n\t" + e);
+            }
+        }
+
+        public String toString() {
+            return "Location("
+            + "tag=" + getTag() + ", "
+            + "classID=" + getClassID() + ", "
+            + "methodID=" + getMethodID() + ", "
+            + "index=" + getIndex()
+            + ")";
+        }
+
+    } // end of class Location
+
+    public static class UntaggedValue {
+
+        public Object value = null;
+
+        public UntaggedValue() {
+        }
+
+        public UntaggedValue(Object value) {
+            this.value = value;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public int length(byte tag) {
+            int valueSize = 0;
+            try {
+                switch (tag) {
+                    case JDWP.Tag.BYTE: {
+                        valueSize = JDWP.TypeSize.BYTE;
+                    } break;
+                    case JDWP.Tag.CHAR: {
+                        valueSize = JDWP.TypeSize.CHAR;
+                    } break;
+                    case JDWP.Tag.FLOAT: {
+                        valueSize = JDWP.TypeSize.FLOAT;
+                    } break;
+                    case JDWP.Tag.DOUBLE: {
+                        valueSize = JDWP.TypeSize.DOUBLE;
+                    } break;
+                    case JDWP.Tag.INT: {
+                        valueSize = JDWP.TypeSize.INT;
+                    } break;
+                    case JDWP.Tag.SHORT: {
+                        valueSize = JDWP.TypeSize.SHORT;
+                    } break;
+                    case JDWP.Tag.BOOLEAN: {
+                        valueSize = JDWP.TypeSize.BYTE;
+                    } break;
+                    case JDWP.Tag.LONG: {
+                        valueSize = JDWP.TypeSize.LONG;
+                    } break;
+                    case JDWP.Tag.VOID: {
+                        valueSize = 0;
+                    } break;
+                    case JDWP.Tag.ARRAY:
+                    case JDWP.Tag.OBJECT:
+                    case JDWP.Tag.STRING:
+                    case JDWP.Tag.THREAD:
+                    case JDWP.Tag.THREAD_GROUP:
+                    case JDWP.Tag.CLASS_LOADER:
+                    case JDWP.Tag.CLASS_OBJECT: {
+                        valueSize = JDWP.TypeSize.OBJECT_ID;
+                    } break;
+                    default: {
+                        throw new Failure("Unknown tag found while putting value into packet: " + tag);
+                    }
+                }
+            } catch (ClassCastException e) {
+                throw new Failure("Wrong tag " + tag + " found while putting value to packet: " + value);
+            }
+            return JDWP.TypeSize.TAG + valueSize;
+        }
+
+        public void addValueTo(Packet packet, byte tag) {
+            if (value == null) {
+                throw new Failure("Unable to put null value into packet: " + this);
+            }
+            try {
+                switch (tag) {
+                    case JDWP.Tag.BYTE: {
+                        byte castedValue = ((Byte)value).byteValue();
+                        packet.addByte(castedValue);
+                    } break;
+                    case JDWP.Tag.CHAR: {
+                        char castedValue = ((Character)value).charValue();
+                        packet.addChar(castedValue);
+                    } break;
+                    case JDWP.Tag.FLOAT: {
+                        float castedValue = ((Float)value).floatValue();
+                        packet.addFloat(castedValue);
+                    } break;
+                    case JDWP.Tag.DOUBLE: {
+                        double castedValue = ((Double)value).doubleValue();
+                        packet.addDouble(castedValue);
+                    } break;
+                    case JDWP.Tag.INT: {
+                        int castedValue = ((Integer)value).intValue();
+                        packet.addInt(castedValue);
+                    } break;
+                    case JDWP.Tag.SHORT: {
+                        short castedValue = ((Short)value).shortValue();
+                        packet.addShort(castedValue);
+                    } break;
+                    case JDWP.Tag.BOOLEAN: {
+                        boolean castedValue = ((Boolean)value).booleanValue();
+                        packet.addByte((byte)(castedValue? 1 : 0));
+                    } break;
+                    case JDWP.Tag.LONG: {
+                        long castedValue = ((Long)value).longValue();
+                        packet.addLong(castedValue);
+                    } break;
+                    case JDWP.Tag.VOID: {
+                    } break;
+                    case JDWP.Tag.ARRAY:
+                    case JDWP.Tag.OBJECT:
+                    case JDWP.Tag.STRING:
+                    case JDWP.Tag.THREAD:
+                    case JDWP.Tag.THREAD_GROUP:
+                    case JDWP.Tag.CLASS_LOADER:
+                    case JDWP.Tag.CLASS_OBJECT: {
+                        long castedValue = ((Long)value).longValue();
+                        packet.addObjectID(castedValue);
+                    } break;
+                    default: {
+                        throw new Failure("Unknown tag found while putting value into packet: " + tag);
+                    }
+                }
+            } catch (ClassCastException e) {
+                throw new Failure("Wrong tag " + tag + " found while putting value to packet: " + value);
+            }
+        }
+
+        public void getValueFrom(Packet packet, byte tag) throws BoundException {
+            switch (tag) {
+                case JDWP.Tag.BYTE: {
+                    byte castedValue = packet.getByte();
+                    value = new Byte(castedValue);
+                } break;
+                case JDWP.Tag.CHAR: {
+                    char castedValue = packet.getChar();
+                    value = new Character(castedValue);
+                } break;
+                case JDWP.Tag.FLOAT: {
+                    float castedValue = packet.getFloat();
+                    value = new Float(castedValue);
+                } break;
+                case JDWP.Tag.DOUBLE: {
+                    double castedValue = packet.getDouble();
+                    value = new Double(castedValue);
+                } break;
+                case JDWP.Tag.INT: {
+                    int castedValue = packet.getInt();
+                    value = new Integer(castedValue);
+                } break;
+                case JDWP.Tag.SHORT: {
+                    short castedValue = packet.getShort();
+                    value = new Short(castedValue);
+                } break;
+                case JDWP.Tag.BOOLEAN: {
+                    byte castedValue = packet.getByte();
+                    value = new Boolean(castedValue != 0);
+                } break;
+                case JDWP.Tag.LONG: {
+                    long castedValue = packet.getLong();
+                    value = new Long(castedValue);
+                } break;
+                case JDWP.Tag.VOID: {
+                    value = new Long(0);
+                } break;
+                case JDWP.Tag.ARRAY:
+                case JDWP.Tag.OBJECT:
+                case JDWP.Tag.STRING:
+                case JDWP.Tag.THREAD:
+                case JDWP.Tag.THREAD_GROUP:
+                case JDWP.Tag.CLASS_LOADER:
+                case JDWP.Tag.CLASS_OBJECT: {
+                    long castedValue = packet.getObjectID();
+                    value = new Long(castedValue);
+                } break;
+                default: {
+                    throw new Failure("Unknown tag found while reading value from packet: " + tag);
+                }
+            }
+        }
+
+        public String toString(byte tag) {
+            if (value == null) {
+                return "null";
+            }
+            String type = null;
+            try {
+                switch (tag) {
+                    case JDWP.Tag.BYTE: {
+                        type = "BYTE";
+                    } break;
+                    case JDWP.Tag.CHAR: {
+                        type = "CHAR";
+                    } break;
+                    case JDWP.Tag.FLOAT: {
+                        type = "FLOAT";
+                    } break;
+                    case JDWP.Tag.DOUBLE: {
+                        type = "DOUBLE";
+                    } break;
+                    case JDWP.Tag.INT: {
+                        type = "INT";
+                    } break;
+                    case JDWP.Tag.SHORT: {
+                        type = "SHORT";
+                    } break;
+                    case JDWP.Tag.BOOLEAN: {
+                        type = "BOOLEAN";
+                    } break;
+                    case JDWP.Tag.LONG: {
+                        type = "LONG";
+                    } break;
+                    case JDWP.Tag.VOID: {
+                        type = "VOID";
+                    } break;
+                    case JDWP.Tag.ARRAY: {
+                        type = "ARRAY_ID";
+                    } break;
+                    case JDWP.Tag.OBJECT: {
+                        type = "OBJECT_ID";
+                    } break;
+                    case JDWP.Tag.STRING: {
+                        type = "STRING_ID";
+                    } break;
+                    case JDWP.Tag.THREAD: {
+                        type = "THREAD_ID";
+                    } break;
+                    case JDWP.Tag.THREAD_GROUP: {
+                        type = "THREAD_GROUP_ID";
+                    } break;
+                    case JDWP.Tag.CLASS_LOADER: {
+                        type = "CLASS_LOADER_ID";
+                    } break;
+                    case JDWP.Tag.CLASS_OBJECT: {
+                        type = "CLASS_OBJECT_ID";
+                    } break;
+                    default: {
+                        throw new Failure("Unknown tag found while converting value into string: " + tag);
+                    }
+                }
+                return "(" + type + ")" + value;
+            } catch (ClassCastException e) {
+                throw new Failure("Wrong tag " + tag + " found while putting value to packet: " + value);
+            }
+        }
+
+    } // end of class Value
+
+    public static class Value extends UntaggedValue {
+
+        public static final int TAG_OFFSET = 0;
+        public static final int VALUE_OFFSET = TAG_OFFSET + TypeSize.TAG;
+
+        public byte tag = 0;
+
+        public Value() {
+        }
+
+        public Value(byte tag, Object value) {
+            super(value);
+            this.tag = tag;
+        }
+
+        public byte getTag() {
+            return tag;
+        }
+
+        public int length() {
+            return super.length(tag);
+        }
+
+        public void addValueTo(Packet packet) {
+            if (value == null) {
+                throw new Failure("Unable to put null value into packet: " + this);
+            }
+            packet.addByte(tag);
+            super.addValueTo(packet, tag);
+        }
+
+        public void getValueFrom(Packet packet) throws BoundException {
+            tag = packet.getByte();
+            super.getValueFrom(packet, tag);
+        }
+
+        public String toString() {
+            return super.toString(tag);
+        }
+
+    } // end of class Value
+
+} // end of class JDWP
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Packet.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Packet.java
new file mode 100644
index 00000000000..f7f4a849c9f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Packet.java
@@ -0,0 +1,522 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+
+import java.util.Vector;
+import java.io.*;
+
+/**
+ * This class represents a JDWP packet.
+ */
+public class Packet extends ByteBuffer {
+
+    /** JDWP packet flags constant. */
+//    public final static byte flNoFlags          = (byte)0x0;
+    /** JDWP packet flags constant. */
+//    public final static byte flReply            = (byte)0x80;
+
+    /** Offset of "length" field of JDWP packet. */
+    public final static int LengthOffset        = 0;
+    /** Offset of "id" field of JDWP packet. */
+    public final static int IdOffset            = LengthOffset + 4;
+    /** Offset of "flags" field of JDWP packet. */
+    public final static int FlagsOffset         = IdOffset + 4;
+    /** Offset of full "command" field of JDWP packet. */
+    public final static int FullCommandOffset   = FlagsOffset + 1;
+    /** Offset of "command" field of JDWP command packet. */
+    public final static int CommandSetOffset    = FullCommandOffset;
+    /** Offset of "command" field of JDWP command packet. */
+    public final static int CommandOffset       = CommandSetOffset + 1;
+    /** Offset of "error" field of JDWP reply packet. */
+    public final static int ErrorCodeOffset     = FlagsOffset + 1;
+    /** Offset of "data" section of JDWP packet. */
+    public final static int DataOffset          = FullCommandOffset + 2;
+
+    /** Size of JDWP packet header. */
+    public final static int PacketHeaderSize    = DataOffset;
+
+    /**
+     * Makes empty JDWP packet.
+     */
+    public Packet() {
+        super();
+        resetBuffer();
+    }
+
+    /**
+     * Makes JDWP packet with data from the specified byte buffer.
+     */
+//    public Packet(ByteBuffer packet) {
+    public Packet(Packet packet) {
+        super(packet);
+        resetPosition();
+    }
+
+    /**
+     * Clear buffer of the packet.
+     */
+    public void resetBuffer() {
+        super.resetBuffer();
+        while (length() < PacketHeaderSize)
+            addByte((byte) 0);
+        setLength();
+        resetPosition();
+    }
+
+    /**
+     * Return current position from begin of packet data area.
+     */
+    public int currentDataPosition() {
+        return currentPosition() - PacketHeaderSize;
+    }
+
+    /**
+     * Return value to the "length" field of JDWP packet.
+     */
+    public int getLength() {
+        try {
+            return getInt(LengthOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting packet length value from header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Assign specified value to the "length" field of JDWP packet.
+     */
+    public void setLength(int length) {
+        try {
+            putInt(LengthOffset, length);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while setting packet length value into header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Assign packet length value to the "length" field of JDWP packet.
+     */
+    public void setLength() {
+        setLength(length());
+    }
+
+    /**
+     * Return value of the "id" field of JDWP packet.
+     */
+    public int getPacketID() {
+        try {
+            return getInt(IdOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting packet ID value from header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Assign value to the "id" field of JDWP packet.
+     */
+    public void setPacketID(int Id) {
+        try {
+            putInt(IdOffset, Id);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while setting packet ID value into header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Return value of the "flags" field of JDWP packet.
+     */
+    public byte getFlags() {
+        try {
+            return getByte(FlagsOffset);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting packet flags value from header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Assign value to the "flags" field of JDWP packet.
+     */
+    public void setFlags(byte flags) {
+        try {
+            putByte(FlagsOffset, flags);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while setting packet flags value into header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Sets the current parser position to "data" field of JDWP packet.
+     */
+    public void resetPosition() {
+        resetPosition(PacketHeaderSize);
+    }
+
+    /**
+     * Return size of the "data" part of JDWP packet.
+     */
+    public int getDataSize() {
+        return length() - PacketHeaderSize;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Append fieldID to the end of this buffer.
+     */
+    public void addFieldID(long b) {
+        addID(b, JDWP.TypeSize.FIELD_ID);
+    }
+
+    /**
+     * Append methodID to the end of this buffer.
+     */
+    public void addMethodID(long b) {
+        addID(b, JDWP.TypeSize.METHOD_ID);
+    }
+
+    /**
+     * Append objectID to the end of this buffer.
+     */
+    public void addObjectID(long b) {
+        addID(b, JDWP.TypeSize.OBJECT_ID);
+    }
+
+    /**
+     * Append referenceID to the end of this buffer.
+     */
+    public void addReferenceTypeID(long b) {
+        addID(b, JDWP.TypeSize.REFERENCE_TYPE_ID);
+    }
+
+    /**
+     * Append frameID to the end of this buffer.
+     */
+    public void addFrameID(long b) {
+        addID(b, JDWP.TypeSize.FRAME_ID);
+    }
+
+    /**
+     * Append string value (an UTF-8 encoded string, not zero terminated,
+     * preceded by a four-byte integer length) to the end of this buffer.
+     */
+    public void addString(String value) {
+        final int count = JDWP.TypeSize.INT + value.length();
+        addInt(value.length());
+        try {
+            addBytes(value.getBytes("UTF-8"), 0, value.length());
+        } catch (UnsupportedEncodingException e) {
+            throw new Failure("Unsupported UTF-8 ecnoding while adding string value to JDWP packet:\n\t"
+                                + e);
+        }
+    }
+
+    /**
+     * Append location value to the end of this buffer.
+     */
+    public void addLocation(JDWP.Location location) {
+        addBytes(location.getBytes(), 0, location.length());
+    }
+
+    /**
+     * Append untagged value to the end of this buffer.
+     */
+    public void addUntaggedValue(JDWP.UntaggedValue value, byte tag) {
+        value.addValueTo(this, tag);
+    }
+
+    /**
+     * Append tagged value to the end of this buffer.
+     */
+    public void addValue(JDWP.Value value) {
+        value.addValueTo(this);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // get packet data
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Read a fieldID value from byte buffer at the current parser position.
+     *
+     * @throws BoundException if there is no valid value bytes at the given position
+     */
+    public long getFieldID() throws BoundException {
+        return getID(JDWP.TypeSize.FIELD_ID);
+    }
+
+    /**
+     * Read a methodID value from byte buffer at the current parser position.
+     *
+     * @throws BoundException if there is no valid value bytes at the given position
+     */
+    public long getMethodID() throws BoundException {
+        return getID(JDWP.TypeSize.METHOD_ID);
+    }
+
+    /**
+     * Read an objectID value from byte buffer at the current parser position.
+     *
+     * @throws BoundException if there is no valid value bytes at the given position
+     */
+    public long getObjectID() throws BoundException {
+        return getID(JDWP.TypeSize.OBJECT_ID);
+    }
+
+    /**
+     * Read a referenceTypeID value from byte buffer at the current parser position.
+     *
+     * @throws BoundException if there is no valid value bytes at the given position
+     */
+    public long getReferenceTypeID() throws BoundException {
+        return getID(JDWP.TypeSize.REFERENCE_TYPE_ID);
+    }
+
+    /**
+     * Read a frameID value from byte buffer at the current parser position.
+     *
+     * @throws BoundException if there is no valid value bytes at the given position
+     */
+    public long getFrameID() throws BoundException {
+        return getID(JDWP.TypeSize.FRAME_ID);
+    }
+
+    /**
+     * Read from this buffer a string value at the current parser
+     * position and returns this value.
+     *
+     * @throws BoundException if there are no valid string bytes in the buffer
+     */
+    public String getString() throws BoundException {
+        final int count = JDWP.TypeSize.INT;
+        int available = length() - currentPosition();
+        if (count > available) {
+            throw new BoundException("Unable to get " + count + " bytes of string length value at " +
+                                      offsetString() + " (available bytes: " + available + ")" );
+        }
+
+        int len = getInt();
+
+        if (len < 0)
+            throw new BoundException("Negative length of string to get: " + len);
+
+        if (len == 0)
+            return "";
+
+        available = length() - currentPosition();
+        if (len > available) {
+            throw new BoundException("Unable to get " + len + " bytes of string value at " +
+                                     offsetString() + " (available bytes: " + available + ")" );
+        }
+
+        byte[] s = new byte[len];
+        for (int i = 0; i < len; i++)
+            s[i] = getByte();
+
+        try {
+            return new String(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new Failure("Unsupported UTF-8 ecnoding while extracting string value from JDWP packet:\n\t"
+                                + e);
+        }
+    }
+
+    /**
+     * Reads from this buffer an location value at the current parser
+     * position and returns this value.
+     *
+     * @throws BoundException if there are no enough bytes in the buffer
+     */
+    public JDWP.Location getLocation() throws BoundException {
+        final int count = JDWP.TypeSize.LOCATION;
+        final int available = length() - currentPosition();
+        if (count > available) {
+            throw new BoundException("Unable to get " + count + " bytes of location value at " +
+                                     offsetString() + " (available bytes: " + available + ")" );
+        }
+
+        JDWP.Location location = new JDWP.Location();
+        try {
+            for (int i = 0; i < JDWP.TypeSize.LOCATION; i++) {
+                location.putByte(i, getByte());
+            }
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               count + " bytes of location value:\n\t" + e);
+        };
+
+        return location;
+    }
+
+    /**
+     * Reads from this buffer an untagged value at the current parser
+     * position and returns this value.
+     *
+     * @throws BoundException if there are no enough bytes in the buffer
+     */
+    public JDWP.UntaggedValue getUntaggedValue(byte tag) throws BoundException {
+        JDWP.UntaggedValue value = new JDWP.UntaggedValue();
+        try {
+            value.getValueFrom(this, tag);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               " bytes of a value:\n\t" + e);
+        };
+
+        return value;
+    }
+
+    /**
+     * Reads from this buffer a tagged value at the current parser
+     * position and returns this value.
+     *
+     * @throws BoundException if there are no enough bytes in the buffer
+     */
+    public JDWP.Value getValue() throws BoundException {
+        JDWP.Value value = new JDWP.Value();
+        try {
+            value.getValueFrom(this);
+        }
+        catch (BoundException e) {
+            throw new TestBug("Caught unexpected bound exception while getting " +
+                               " bytes of a value:\n\t" + e);
+        };
+
+        return value;
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+
+    /**
+     * Read packet bytes from the stream.
+     *
+     * @throws IOException if error occured when reading bytes
+     */
+    public void readFrom(Transport transport) throws IOException {
+        resetBuffer();
+
+//        System.err.println("Reading packet header");
+        try {
+            for (int i = 0; i < PacketHeaderSize; i++) {
+                byte b = transport.read();
+                putByte(i, b);
+            }
+        }
+        catch (BoundException e) {
+            throw new TestBug(e);
+        }
+
+        int length = getLength();
+
+        checkSpace(length - PacketHeaderSize);
+
+//        System.err.println("Packet size: " + length);
+        for (int i = PacketHeaderSize; i < length; i++) {
+            byte b = transport.read();
+            addByte(b);
+        }
+//        System.err.println("Packet read successfully");
+    }
+
+    /**
+     * Write packet bytes to the stream.
+     *
+     * @throws IOException if error occured when reading bytes
+     */
+    public void writeTo(Transport transport) throws IOException {
+        setLength();
+//        System.err.println("Writing packet bytes: " + length());
+        transport.write(bytes, 0, length());
+    }
+
+    /**
+     * Check packet header.
+     * This method check if packet has valid values in header fields.
+     *
+     * @throws PacketFormatException if packet header fields has error or invalid values
+     */
+    public void checkHeader() throws PacketFormatException {
+        if (getLength() != length()) {
+            throw new PacketFormatException("Unexpected packet length value in the header:"
+                                            + getLength());
+        }
+    }
+
+    /**
+     * Check if packet is parsed totally and no trailing bytes left unparsed.
+     * This method check if packet has valid values in header fields.
+     *
+     * @throws PacketFormatException if there are trailing bytes left unparsed
+     */
+    public void checkParsed() throws PacketFormatException {
+        if (! isParsed()) {
+            throw new PacketFormatException("Extra trailing bytes found in the packet at: "
+                                            + offsetString());
+        }
+    }
+
+    /**
+     * Return string representation of the packet header.
+     */
+    public String headerToString() {
+        return "Packet header (" + PacketHeaderSize + " bytes):" + "\n"
+             + "    " + toHexString(LengthOffset, 4) + " (length) : 0x" + toHexDecString(getLength(), 8) + "\n"
+             + "    " + toHexString(IdOffset,     4) + " (id)     : 0x" + toHexDecString(getPacketID(), 8) + "\n"
+             + "    " + toHexString(FlagsOffset,  4) + " (flags)  : 0x" + toHexDecString(getFlags(), 2) + "\n";
+    }
+
+    /**
+     * Return string representation of the packet.
+     */
+    public String toString() {
+        return headerToString()
+             + "Entire packet (" + length() + " bytes): " + "\n"
+             + super.toString(0)
+             + "Packet end";
+    }
+
+    /**
+     * Exception indicated that packet has an ivnalid structure.
+     */
+    class PacketFormatException extends BoundException {
+        PacketFormatException(String message) {
+            super(message);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ReplyPacket.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ReplyPacket.java
new file mode 100644
index 00000000000..6dc1b946f9d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/ReplyPacket.java
@@ -0,0 +1,148 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+import java.util.Vector;
+
+/**
+ * This class represents a JDWP reply packet.
+ */
+public class ReplyPacket extends Packet {
+
+    /** Error code constant. */
+//    public final static int errOk               = JDWP.Error.NONE;
+    /** Error code constant. */
+//    public final static int errWrongPacketSize  = 0x400;
+    /** Error code constant. */
+//    public final static int errNotAvailable     = 0x401;
+    /** Error code constant. */
+//    public final static int errEvent            = 0x4064;
+
+    /**
+     * Make empty reply packet.
+     */
+    public ReplyPacket() {
+        super();
+    }
+
+    /**
+     * Make reply packet with data from the specified byte buffer.
+     */
+//    public ReplyPacket(ByteBuffer packet) {
+    public ReplyPacket(Packet packet) {
+        super(packet);
+    }
+
+    /**
+     * Return value of the "error code" field of JDWP reply packet.
+     */
+    public int getErrorCode() {
+
+        int err = 0;
+        try {
+            err = (int) getID(ErrorCodeOffset, 2);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while getting error code from header:\n\t"
+                            + e);
+        }
+
+        return err;
+    }
+
+    /**
+     * Set value of the "error code" field of JDWP reply packet.
+     */
+    public void setErrorCode(long err) {
+        try {
+            putID(ErrorCodeOffset, err, 2);
+        }
+        catch (BoundException e) {
+            throw new Failure("Caught unexpected exception while setting error code into header:\n\t"
+                            + e);
+        }
+    }
+
+    /**
+     * Check reply packet header.
+     * This method check if reply packet has valid values in the header fields.
+     *
+     * @throws PacketFormatException if packet header fields have error or invalid values
+     */
+/*
+    protected void checkHeaderForReplyOrEvent() throws PacketFormatException {
+        super.checkHeader();
+    }
+ */
+
+    /**
+     * Check reply packet header.
+     * This method check if reply packet has valid values in the header fields.
+     *
+     * @throws PacketFormatException if packet header fields have error or invalid values
+     */
+    public void checkHeader() throws PacketFormatException {
+//        checkHeaderForReplyOrEvent();
+        super.checkHeader();
+        if (getFlags() != JDWP.Flag.REPLY_PACKET) {
+            throw new PacketFormatException("Unexpected flags in reply packet header: "
+                                            + "0x" + toHexDecString(getFlags(), 2));
+        }
+        if (getErrorCode() != JDWP.Error.NONE) {
+            throw new PacketFormatException("Unexpected error code in reply packet header: "
+                                            + "0x" + toHexDecString(getErrorCode(), 4));
+        }
+    }
+
+    /**
+     * Check reply packet header for specified reply ID.
+     * This method check if reply packet has valid values in the header fields.
+     *
+     * @throws PacketFormatException if packet header fields have error or invalid values
+     */
+    public void checkHeader(int id) throws PacketFormatException {
+        checkHeader();
+        if (getPacketID() != id) {
+            throw new PacketFormatException("Unexpected ID in reply packet header: "
+                                            + getPacketID());
+        }
+    }
+
+    /**
+     * Return string representation of the reply packet header.
+     */
+    public String headerToString() {
+        String s;
+
+        if (getFlags() == 0)
+            s = " (command)";
+        else
+            s = " (error)  ";
+
+        return super.headerToString()
+             + "    " + toHexString(CommandOffset,  4) + s + ": 0x" + toHexDecString(getErrorCode(), 4) + "\n";
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/SocketTransport.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/SocketTransport.java
new file mode 100644
index 00000000000..72eb1005ce8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/SocketTransport.java
@@ -0,0 +1,202 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+
+import java.io.*;
+import java.net.*;
+
+/**
+ * This class represents a socket transport for JDWP.
+ */
+public class SocketTransport extends Transport {
+
+    /**
+     * Socket for established JDWP connection.
+     */
+    private Socket socket = null;
+
+    /**
+     * ServerSocket for listening JDWP connection.
+     */
+    private ServerSocket serverSocket = null;
+
+    /**
+     * Input stream of socket.
+     */
+    private InputStream in = null;
+
+    /**
+     * Output stream of socket.
+     */
+    private OutputStream out = null;
+
+    /**
+     * Port to listen to.
+     */
+     int listenPort = 0;
+
+    /**
+     * Make <code>SocketTransport</cose> object with providing specified Log.
+     */
+    public SocketTransport(Log log) {
+        super(log);
+    }
+
+    /**
+     * Bind for connection from target VM to specified port number.
+     * If given port number is 0 then bind to any free port number.
+     *
+     * @return port number which this transport is listening for
+     */
+    public int bind(int port)
+            throws IOException {
+        serverSocket = new ServerSocket();
+        if (port == 0) {
+            // Only need SO_REUSEADDR if we're using a fixed port. If we
+            // start seeing EADDRINUSE due to collisions in free ports
+            // then we should retry the bind() a few times.
+            display("port == 0, disabling SO_REUSEADDR");
+            serverSocket.setReuseAddress(false);
+        }
+        serverSocket.bind(new InetSocketAddress(port));
+        listenPort = serverSocket.getLocalPort();
+        return listenPort;
+    }
+
+    /**
+     * Attach to the target VM for specified host name and port number.
+     */
+    public void attach(String ServerName, int PortNumber)
+            throws UnknownHostException, IOException {
+        for (int i = 0; i < Binder.CONNECT_TRIES; i++ ) {
+            try {
+                socket = new Socket(ServerName, PortNumber);
+                display("JDWP socket connection established");
+//                socket.setTcpNoDelay(true);
+                in = socket.getInputStream();
+                out = socket.getOutputStream();
+                return;
+            } catch (IOException e) {
+                display("Attempt #" + i + " to establish JDWP socket connection failed:\n\t" + e);
+                try {
+                    Thread.currentThread().sleep(Binder.CONNECT_TRY_DELAY);
+                } catch (InterruptedException ie) {
+                    ie.printStackTrace(log.getOutStream());
+                    throw new Failure("Thread interrupted while establishing JDWP connection: \n\t"
+                                    + ie);
+                }
+            }
+        }
+        throw new IOException("Timeout exceeded while establishing JDWP socket connection to "
+                              + ServerName + ":" + PortNumber);
+    }
+
+    /**
+     * Accept connection from target VM for already boud port.
+     */
+    public void accept()
+            throws IOException {
+
+        if (serverSocket == null)
+            throw new Failure("Attempt to accept JDWP socket connection from unbound port");
+
+        socket = serverSocket.accept();
+        serverSocket.close();
+        serverSocket = null;
+
+        in = socket.getInputStream();
+        out = socket.getOutputStream();
+    }
+
+    /**
+     * Close socket and streams.
+     */
+    public void close() throws IOException {
+
+        if (socket == null)
+            return;
+
+        if (out != null) {
+            flush();
+            out.close();
+        }
+
+        if (in != null) {
+            in.close();
+        }
+
+        if (socket != null) {
+            socket.close();
+            socket = null;
+        }
+
+        if (serverSocket != null) {
+            serverSocket.close();
+            serverSocket = null;
+        }
+    }
+
+    /**
+     * Return number of bytes that can be read.
+     */
+    public int available() throws IOException {
+        return in.available();
+    };
+
+    /**
+     * Flush bytes being buffered for writing if any.
+     */
+    public void flush() throws IOException {
+        out.flush();
+    }
+
+    /**
+     * Set timeout for reading data in milliseconds.
+     */
+    public void setReadTimeout(long millisecs) throws IOException {
+        socket.setSoTimeout((int)millisecs);
+    }
+
+    /**
+     * Read the next byte of data from the socket.
+     * The value byte is returned as an int in the range 0 to 255.
+     * If no byte is available, the value -1 is returned.
+     */
+    public byte read() throws IOException {
+        int b = in.read();
+        if (b < 0) {
+            throw new IOException("JDWP socket connection closed by remote host");
+        }
+        return (byte) b;
+    };
+
+    /**
+     * Write the specified byte to the socket.
+     */
+    public void write(int b) throws IOException {
+        out.write(b);
+    };
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/TestDebuggerType1.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/TestDebuggerType1.java
new file mode 100644
index 00000000000..72aa6a36faf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/TestDebuggerType1.java
@@ -0,0 +1,321 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import java.io.*;
+import nsk.share.*;
+import nsk.share.jpda.*;
+
+/*
+ * This class can be used as base for debugger.
+ * Class initialize log, pipe, debuggee, transport.
+ *
+ * Subclasses should implement method doTest() and provide debugee class name via method getDebugeeClassName()
+ */
+abstract public class TestDebuggerType1 {
+    protected ArgumentHandler argumentHandler;
+
+    protected Log log;
+
+    protected IOPipe pipe;
+
+    protected Debugee debuggee;
+
+    protected Transport transport;
+
+    private boolean success = true;
+
+    public static String createTypeSignature(String name) {
+        return "L" + name.replace('.', '/') + ";";
+    }
+
+    protected void setSuccess(boolean value) {
+        success = value;
+    }
+
+    protected boolean getSuccess() {
+        return success;
+    }
+
+    protected String getDebugeeClassName() {
+        return AbstractJDWPDebuggee.class.getName();
+    }
+
+    abstract protected void doTest();
+
+    // receive reply for given command
+    protected ReplyPacket getReply(CommandPacket command, boolean expectError, int errorCode) throws IOException,
+            BoundException {
+        log.display("Waiting for reply packet");
+        ReplyPacket reply = new ReplyPacket();
+        transport.read(reply);
+        log.display("Reply packet received:\n" + reply);
+
+        if (expectError) {
+            if (reply.getErrorCode() != errorCode) {
+                setSuccess(false);
+                log.complain("Reply doesn't contain expected error " + errorCode + ", error code = "
+                        + reply.getErrorCode());
+            } else {
+                log.display("Expected error: " + errorCode);
+            }
+        } else {
+            log.display("Checking reply packet header");
+            reply.checkHeader(command.getPacketID());
+            log.display("Parsing reply packet:");
+            reply.resetPosition();
+        }
+
+        return reply;
+    }
+
+    // receive reply for given command
+    protected ReplyPacket getReply(CommandPacket command) throws IOException, BoundException {
+        return getReply(command, false, 0);
+    }
+
+    // initialize test and remove unsupported by nsk.share.jdwp.ArgumentHandler
+    // arguments
+    // (ArgumentHandler constructor throws BadOption exception if command line
+    // contains unrecognized by ArgumentHandler options)
+    protected String[] doInit(String args[]) {
+        return args;
+    }
+
+    public int runIt(String args[], PrintStream out) {
+        argumentHandler = new ArgumentHandler(doInit(args));
+        // make log for debugger messages
+        log = new Log(out, argumentHandler);
+
+        // execute test and display results
+        try {
+            log.display("\n>>> Preparing debugee for testing \n");
+
+            // launch debugee
+            Binder binder = new Binder(argumentHandler, log);
+            log.display("Launching debugee");
+            debuggee = binder.bindToDebugee(getDebugeeClassName());
+            transport = debuggee.getTransport();
+            pipe = debuggee.createIOPipe();
+
+            // make debuggee ready for testing
+            prepareDebugee();
+
+            doTest();
+        } catch (Throwable t) {
+            setSuccess(false);
+            log.complain("Caught unexpected exception:\n" + t);
+            t.printStackTrace(log.getOutStream());
+        } finally {
+            if (pipe != null)
+                quitDebugee();
+        }
+
+        if (getSuccess()) {
+            log.display("TEST PASSED");
+            return Consts.TEST_PASSED;
+        } else {
+            log.display("TEST FAILED");
+            return Consts.TEST_FAILED;
+        }
+    }
+
+    protected void prepareDebugee() {
+        // wait for VM_INIT event from debugee
+        log.display("Waiting for VM_INIT event");
+        debuggee.waitForVMInit();
+
+        // query debugee for VM-dependent ID sizes
+        log.display("Querying for IDSizes");
+        debuggee.queryForIDSizes();
+
+        // resume initially suspended debugee
+        log.display("Resuming debugee VM");
+        debuggee.resume();
+
+        // wait for READY signal from debugee
+        log.display("Waiting for signal from debugee: " + AbstractDebuggeeTest.COMMAND_READY);
+
+        if (!isDebuggeeReady())
+            return;
+    }
+
+    protected boolean isDebuggeeReady() {
+        String signal = pipe.readln();
+        log.display("Received signal from debugee: " + signal);
+
+        if (!signal.equals(AbstractDebuggeeTest.COMMAND_READY)) {
+            setSuccess(false);
+            log.complain("Unexpected signal received form debugee: " + signal + " (expected: "
+                    + AbstractDebuggeeTest.COMMAND_READY + ")");
+            return false;
+        }
+
+        return true;
+    }
+
+    protected void quitDebugee() {
+        // send debugee signal to quit
+        log.display("Sending signal to debugee: " + AbstractDebuggeeTest.COMMAND_QUIT);
+        pipe.println(AbstractDebuggeeTest.COMMAND_QUIT);
+
+        // wait for debugee exits
+        log.display("Waiting for debugee exits");
+        int code = debuggee.waitFor();
+
+        // analize debugee exit status code
+        if (code == (Consts.JCK_STATUS_BASE + Consts.TEST_PASSED)) {
+            log.display("Debugee PASSED with exit code: " + code);
+        } else {
+            setSuccess(false);
+            log.complain("Debugee FAILED with exit code: " + code);
+        }
+    }
+
+    protected int defaultBreakpointRequestID;
+
+    // query debuggee for objectID value of static class field
+    protected long queryObjectID(long classID, String fieldName, byte tag) {
+        // get fieledID for static field (declared in the class)
+        long fieldID = debuggee.getClassFieldID(classID, fieldName, true);
+
+        // get value of the field
+        JDWP.Value value = debuggee.getStaticFieldValue(classID, fieldID);
+
+        // check that value has correct tag
+        if (value.getTag() != tag) {
+            throw new Failure("Wrong objectID tag received from field \"" + fieldName + "\": " + value.getTag()
+                    + " (expected: " + tag + ")");
+        }
+
+        // extract objectID from the value
+        long objectID = ((Long) value.getValue()).longValue();
+
+        return objectID;
+    }
+
+    // query debuggee for objectID value of static class field
+    protected long queryObjectID(long classID, String fieldName) {
+
+        // get fieledID for static field (declared in the class)
+        long fieldID = debuggee.getClassFieldID(classID, fieldName, true);
+
+        // get value of the field
+        JDWP.Value value = debuggee.getStaticFieldValue(classID, fieldID);
+
+        // extract objectID from the value
+        long objectID = ((Long) value.getValue()).longValue();
+
+        return objectID;
+    }
+
+    protected void clearRequest(byte eventKind, int requestID) {
+        try {
+            CommandPacket command = new CommandPacket(JDWP.Command.EventRequest.Clear);
+            command.addByte(eventKind);
+            command.addInt(requestID);
+            command.setLength();
+            transport.write(command);
+            ReplyPacket reply;
+
+            reply = getReply(command);
+
+            if (!reply.isParsed()) {
+                log.complain("Extra trailing bytes found in request reply packet at: " + reply.offsetString());
+            }
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+        }
+    }
+
+    // receives JDWP event, checks that only one event was received and checks
+    // event kind and event's request id
+    protected EventPacket receiveSingleEvent(byte expectedEventKind, int expectedRequestID) {
+        try {
+            EventPacket eventPacket = debuggee.getEventPacket();
+
+            eventPacket.checkHeader();
+            eventPacket.resetPosition();
+
+            eventPacket.getByte();
+
+            int eventCount = eventPacket.getInt();
+
+            if (eventCount != 1) {
+                setSuccess(false);
+                log.complain("Unexpected event count: " + eventCount + ", expected is " + 1);
+            }
+
+            byte eventKind = eventPacket.getByte();
+
+            if (eventKind != expectedEventKind) {
+                setSuccess(false);
+                log.complain("Unexpected event kind: " + eventKind + ", expected is " + expectedEventKind);
+            }
+
+            int requestID = eventPacket.getInt();
+
+            if (requestID != expectedRequestID) {
+                setSuccess(false);
+                log.complain("Unexpected request id: " + requestID + ", expected is " + expectedRequestID);
+            }
+
+            return eventPacket;
+        } catch (Exception e) {
+            setSuccess(false);
+            log.complain("Caught exception while testing JDWP command: " + e);
+            e.printStackTrace(log.getOutStream());
+
+            return null;
+        }
+    }
+
+
+    private boolean currentSuccess = false;
+    protected void forceGC() {
+        pipe.println(AbstractDebuggeeTest.COMMAND_FORCE_GC);
+        if (!isDebuggeeReady())
+            return;
+        currentSuccess = getSuccess();
+    }
+
+    // Get GC statistics
+    protected void resetStatusIfGC() {
+        pipe.println(AbstractDebuggeeTest.COMMAND_GC_COUNT);
+        String command = pipe.readln();
+        if (command.startsWith(AbstractDebuggeeTest.COMMAND_GC_COUNT)) {
+            if (!isDebuggeeReady()) {
+                return;
+            }
+            if (Integer.valueOf(command.substring(AbstractDebuggeeTest.COMMAND_GC_COUNT.length() + 1)) > 0) {
+                log.display("WARNING: The GC worked during tests. Results are skipped.");
+                setSuccess(currentSuccess);
+            }
+            return;
+        }
+        setSuccess(false);
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Transport.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Transport.java
new file mode 100644
index 00000000000..fb0f342cd62
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Transport.java
@@ -0,0 +1,153 @@
+/*
+ * 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
+ * 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 nsk.share.jdwp;
+
+import nsk.share.*;
+
+import java.io.IOException;
+//import java.util.Vector;
+
+/**
+ * This class represents an abstract transport for JDWP.
+ */
+public abstract class Transport extends Log.Logger {
+
+    public static final String LOG_PREFIX = "transport> ";
+
+    /**
+     * Make base <code>Transport</code> object providing with specified Log.
+     */
+    public Transport(Log log) {
+        super(log, LOG_PREFIX);
+    }
+
+    /**
+     * Return number of bytes that can be received.
+     */
+    public abstract int available() throws IOException;
+
+    /**
+     * Flushe bytes being buffered for writing if any.
+     */
+    public abstract void flush() throws IOException;
+
+    /**
+     * Receive the next byte of data.
+     *
+     * The value byte is returned as an int in the range 0 to 255.
+     * If no byte is available, the value -1 is returned.
+     */
+    public abstract byte read() throws IOException;
+
+    /**
+     * Send the specified byte.
+     */
+    public abstract void write(int b) throws IOException;
+
+    /**
+     * Send the specified bytes.
+     */
+    public void write(byte[] b, int off, int len) throws IOException {
+        for (int i = 0; i < len; i++)
+            write(b[off + i]);
+    }
+
+    /**
+     * Receive bytes of JDWP packet for default timeout.
+     */
+    public void read(Packet packet) throws IOException {
+        packet.readFrom(this);
+    }
+
+    /**
+     * Send and flushe bytes of JDWP packet.
+     */
+    public void write(Packet packet) throws IOException {
+        packet.writeTo(this);
+        flush();
+    }
+
+    /**
+     * Perform JDWP "handshake" procedure.
+     */
+    public void handshake() throws IOException {
+
+        String hs = "JDWP-Handshake";
+        byte[] hsb = hs.getBytes();
+
+        write(hsb, 0, hsb.length);
+        flush();
+
+        try {
+            Thread.currentThread().sleep(500);
+        } catch (InterruptedException e) {
+            throw new Failure(e);
+        }
+
+        int received = 0;
+        for (int i = 0; i < Binder.CONNECT_TRIES; i++) {
+            received = available();
+            if (received < hsb.length) {
+//                System.err.println("Failed to hadshake try #" + i + ", bytes: " + received);
+                try {
+                    Thread.currentThread().sleep(Binder.CONNECT_TRY_DELAY);
+                } catch (InterruptedException e) {
+                    throw new Failure("Thread interrupted while sleeping between connection attempts:\n\t"
+                                    + e);
+                }
+            } else {
+//                System.err.println("Successed to hadshake try #" + i + ", bytes: " + received);
+                for (int j = 0; j < hsb.length; j++) {
+                    byte b = (byte) (read() & 0xFF);
+                    if (b != hsb[j])
+                        throw new IOException("Target VM failed to handshake: unexpected byte #" + j
+                                            + ": " + b + " (expected:" + hsb[j] + ")");
+                }
+                return;
+            }
+        }
+
+        throw new IOException("Target VM failed to handshake: too few bytes in reply: "
+                            + received + "(expected: " + hsb.length + ")");
+    }
+
+    /**
+     * Set timeout for reading data in milliseconds.
+     * Timeout of 0 means wait infinitly.
+     */
+    public abstract void setReadTimeout(long millisecs) throws IOException;
+
+    /**
+     * Close JDWP connection.
+     */
+    public abstract void close() throws IOException;
+
+    /**
+     * Perform finalization of object by closing JDWP connection.
+     */
+    protected void finalize() throws Throwable {
+        close();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h
index 1001a887b58..de3c9f1f6a5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h
@@ -27,9 +27,17 @@
 /*************************************************************/
 
 #include <stdarg.h>
+#include <inttypes.h>
 
 /*************************************************************/
 
+#if defined(_LP64) && defined(__APPLE__)
+#define JLONG_FORMAT "%ld"
+#else  // _LP64 && __APPLE__
+#define JLONG_FORMAT "%" PRId64
+#endif // _LP64 && __APPLE__
+
+
 /**
  * Use examples:
  *
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java
new file mode 100644
index 00000000000..32fa7a54750
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/CodeCacheInfo.
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     Test calls java -version and checks enhanced output format of the
+ *     -XX:+PrintCodeCache vm option.
+ *
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run shell run.sh
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh
new file mode 100644
index 00000000000..fb65f618195
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# 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.
+#
+
+JAVA_OPTS="$TESTJAVAOPTS $TESTVMOPTS"
+TESTED_JAVA_HOME="$TESTJAVA"
+
+digit="[0123456789]"
+number="${digit}*"
+size_pattern="${number}Kb"
+bound_pattern="0x[0123456789abcdef]*"
+s1=" size=${size_pattern} used=${size_pattern} max_used=${size_pattern} free=${size_pattern}"
+s2=" bounds \[${bound_pattern}, ${bound_pattern}, ${bound_pattern}\]"
+s3=" total_blobs=${number} nmethods=${number} adapters=${number}"
+s4=" compilation: enabled"
+summary_pat_nonseg="CodeCache:${s1}${s2}${s3}${s4}"
+summary_pat_seg="((CodeHeap.*):${s1}${s2})+${s3}${s4}"
+
+# check whether SegmentedCodeCache enabled
+segmented=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -XX:+PrintFlagsFinal -version | egrep -c ' +SegmentedCodeCache +:?= +true')
+out=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -XX:+PrintCodeCache -version)
+if [ "${segmented}" = "1" ]; then
+        summary_pat=${summary_pat_seg}
+        status="enabled"
+else
+        summary_pat=${summary_pat_nonseg}
+        status="disabled"
+fi
+echo "INFO: SegmentedCodeCache is ${status}"
+
+res=$(echo ${out} | egrep -c "${summary_pat}")
+if [ "${res}" = "1" ]; then
+        echo "passed"
+        true
+else
+        echo ${summary_pat}
+        echo "did not match for:"
+        echo ${out}
+        false
+fi
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/PrintOnCall.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/PrintOnCall.java
new file mode 100644
index 00000000000..086aec18891
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/PrintOnCall.java
@@ -0,0 +1,34 @@
+/*
+ * 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 vm.compiler.CodeCacheInfoOnCompilation;
+
+public class PrintOnCall {
+    public static void printOnCall() {
+        System.out.println("PrintOnCall");
+    }
+    public static void main(String[] args) {
+        System.out.println("before");
+        printOnCall();
+        System.out.println("after");
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java
new file mode 100644
index 00000000000..a6cebdf33b0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/CodeCacheInfoOnCompilation.
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     Test calls java class with one method call in main. Test checks output
+ *     format of the -XX:+PrintCodeCacheOnCompilation vm option during this method
+ *     call.
+ *
+ *     Test will be skipped if java has not "-Xcomp" option
+ *
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.CodeCacheInfoOnCompilation.PrintOnCall
+ * @run shell run.sh
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh
new file mode 100644
index 00000000000..3c41316d891
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# 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.
+#
+
+JAVA_OPTS="-cp $TESTCLASSPATH $TESTJAVAOPTS $TESTVMOPTS"
+TESTED_JAVA_HOME="$TESTJAVA"
+
+ver=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -version 2>&1)
+isComp=$( echo ${ver} | grep -c "compiled mode")
+if [[ $isComp  != 1 ]]; then
+        echo "skipped. This test works only with -Xcomp"
+        exit
+fi
+
+digit="[0123456789]"
+number="${digit}+"
+size_pattern="${number}Kb"
+pattern="(CodeCache|(CodeHeap.*)): size=${size_pattern} used=${size_pattern} max_used=${size_pattern} free=${size_pattern}"
+
+res=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -XX:+PrintCodeCacheOnCompilation -XX:-Inline vm.compiler.CodeCacheInfoOnCompilation.PrintOnCall | egrep -ce "${pattern}")
+echo "res: " ${res}
+
+if (( "${res}" != "0" )); then
+        echo "passed"
+        true
+else
+        echo $pattern
+        echo " not found"
+        false
+fi
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/Constants.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/Constants.java
new file mode 100644
index 00000000000..30f8efabd63
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/Constants.java
@@ -0,0 +1,28 @@
+/*
+ * 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 vm.compiler.complog.share;
+
+public class Constants {
+    public static final int LOOP_ITERATIONS = 1000000;
+    public static final int RECURSION_DEPTH = 20;
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/LogCompilationParser.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/LogCompilationParser.java
new file mode 100644
index 00000000000..10d1ee7be2a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/LogCompilationParser.java
@@ -0,0 +1,46 @@
+/*
+ * 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 vm.compiler.complog.share;
+
+import java.io.File;
+
+import nsk.share.log.*;
+
+/**
+ * Super-class for all compilation log parsers.
+ * To report an error during parsing exception should be thrown.
+ */
+
+public abstract class LogCompilationParser implements LogAware {
+
+    protected Log log;
+
+    public void setLog(Log log) {
+        this.log = log;
+    }
+
+    public abstract void setOptions(String optionString);
+
+    public abstract void parse(File logFile) throws Throwable;
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/LogCompilationTest.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/LogCompilationTest.java
new file mode 100644
index 00000000000..fc7f8e5ab7e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/LogCompilationTest.java
@@ -0,0 +1,140 @@
+/*
+ * 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 vm.compiler.complog.share;
+
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+import java.lang.reflect.*;
+import java.lang.management.*;
+
+import nsk.share.TestFailure;
+import nsk.share.TestBug;
+import nsk.share.log.*;
+import vm.share.options.*;
+import vm.share.process.*;
+
+/**
+ * Test executor for all tests that require compilation log analysis.
+ * Next options should be passed to LogCompilationTest:
+ * <b>-testClass</b> test to be executed;
+ * <b>-testedJava</b> path to testing java binary;
+ * <b>-options</b> options that should be passed to testing java;
+ * <b>-parserClass</b> parser that will be used for compilation log analysis;
+ * <b>-timeout</b> timeout in secoonds.
+ */
+
+public class LogCompilationTest extends OptionSupport implements Runnable {
+
+    @Option(name="testClass", description="Test to be executed.")
+    protected String testClass;
+
+    @Option(name="parserClass", description="Parser for compilation log.")
+    protected String parserClass;
+
+    @Option(name="timeout", description="Timeout value in seconds.", default_value="1800")
+    protected int timeout;
+
+    @Option(name="testedJava", description="Java binary to be tested.")
+    protected String testedJava;
+
+    @Option(name="parserOptions", description="Options that will be passed to compilation log parser.", default_value="")
+    protected String parserOptions;
+
+    @Option(name="options", description="Options for tested java.")
+    protected String jvmOptions;
+
+    protected Log log = new LogSupport(System.out);
+    protected Log testLog;
+
+    public static final String compilationLog = "hotspot.log";
+
+    public static void main(String args[]) {
+        LogCompilationTest.setupAndRun(new LogCompilationTest(), args);
+    }
+
+    public void run() {
+        execute();
+        parse();
+    }
+
+    private String[] getJVMOptions() {
+        Matcher matcher = Pattern.compile("(\"[^\"]*\")|([^\\s\"]+(\"[^\"]*\")?)").
+            matcher(jvmOptions);
+        List<String> options = new LinkedList<String>();
+        while(matcher.find()) {
+            options.add(matcher.group());
+        }
+        options.add("-XX:+UnlockDiagnosticVMOptions");
+        options.add("-XX:+LogCompilation");
+        options.add("-XX:LogFile="+compilationLog);
+        return options.toArray(new String[0]);
+    }
+
+    private LogCompilationParser getParser() {
+        try {
+            Class parser = Class.forName(parserClass);
+            Constructor ctor = parser.getConstructor();
+            return (LogCompilationParser)ctor.newInstance();
+        } catch (Throwable e) {
+            throw new TestBug("Parser could not be instantiated.",e);
+        }
+    }
+
+    private void execute() {
+        String options[] = getJVMOptions();
+        ProcessExecutor executor = new ProcessExecutor();
+        try {
+            testLog = new LogSupport(new PrintStream(new FileOutputStream("test.log")));
+        } catch (FileNotFoundException e) {
+            throw new TestFailure("Can't create test log file.", e);
+        }
+        executor.logStdOutErr("Test>>",testLog);
+        executor.addArg(testedJava);
+        executor.addArgs(options);
+        executor.addArg(testClass);
+        executor.start();
+        executor.waitFor(timeout*1000);
+
+        if(executor.getResult()!=0) {
+            if(new File("hs_err_pid"+executor.getPid()+".log").exists()) {
+                throw new TestFailure("Test crashed.");
+            } else {
+                throw new TestFailure("Test exited with non-zero code.");
+            }
+        }
+    }
+
+    private void parse() {
+        File hotspotLog = new File(compilationLog);
+        LogCompilationParser parser = getParser();
+        parser.setOptions(parserOptions);
+        parser.setLog(log);
+        try {
+            parser.parse(hotspotLog);
+        } catch (Throwable e) {
+            throw new TestFailure("Error occurred during compilation log parsing.",e);
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/UninitializedTrapCounter.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/UninitializedTrapCounter.java
new file mode 100644
index 00000000000..b27f5626a52
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/UninitializedTrapCounter.java
@@ -0,0 +1,132 @@
+/*
+ * 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 vm.compiler.complog.uninit;
+
+import java.util.*;
+import java.util.regex.*;
+import java.io.*;
+
+import nsk.share.TestFailure;
+import vm.compiler.complog.share.LogCompilationParser;
+
+/**
+ * Parser that finds uninitialized traps for each method and throws
+ * and exception if there are more then 1 uninitialized trap for at least 1 method.
+ *
+ * Parser supports following options:
+ * <ul>
+ * <li>-classFilter=<comma separated list> - list of classes for which uncommon traps will be checked. If option is not presented or list is empty then all uncommon traps for all classes will be checked.
+ * <li>-methodFilter=<comma separated list> - list of methods for which uncommon traps will be checked. If option is not presented or list is empty then all uncommon traps for all methods will be checked.
+ * </ul>
+ * If compilation log contains uncommon trap with reason uninialized that was fired for method M in class K, then it will be checked only if classFilter contains K and methodFilter contains M.
+ */
+public class UninitializedTrapCounter extends LogCompilationParser {
+    private Map<String,Integer> methods = new LinkedHashMap<String,Integer>();
+
+    private static final String JVMS_ELEMENT = "<jvms [^>]*>";
+    private static final String METHOD_INFO = "method='(([^ ']+) ([^ ']+) [^']+)'.*uninitialized_traps='([0-9]+)'";
+    private static final String CLASS_FILTER = "-classFilter=([^ ]+)";
+    private static final String METHOD_FILTER = "-methodFilter=([^ ]+)";
+    private static Pattern pattern = Pattern.compile(METHOD_INFO);
+
+    private List<String> classFilter = new ArrayList<String>();
+    private List<String> methodFilter = new ArrayList<String>();
+
+    public void setOptions(String optionString) {
+        if(optionString == null) return;
+        Matcher methodFilterMatcher = Pattern.compile(METHOD_FILTER).matcher(optionString);
+        Matcher classFilterMatcher = Pattern.compile(CLASS_FILTER).matcher(optionString);
+        if(methodFilterMatcher.find()) {
+            methodFilter = Arrays.asList(methodFilterMatcher.group(1).split(","));
+        }
+        if(classFilterMatcher.find()) {
+            classFilter = Arrays.asList(classFilterMatcher.group(1).split(","));
+        }
+    }
+
+    /**
+     * Find uninitialized traps count.
+     */
+    public void parse(File logFile) throws Throwable {
+        Scanner scanner = new Scanner(logFile);
+        String jvms = scanner.findWithinHorizon(JVMS_ELEMENT,0);
+        while(jvms != null) {
+            parseJVMSElement(jvms);
+            jvms = scanner.findWithinHorizon(JVMS_ELEMENT,0);
+        }
+
+        boolean failed = false;
+        for(Map.Entry<String,Integer> method : methods.entrySet()) {
+            if(method.getValue() > 1) {
+                failed = true;
+                log.error(method.getValue() +
+                          " uninitizlied traps found for method '" +
+                          method.getKey() + "'.");
+
+            }
+        }
+        if(failed) {
+            throw new TestFailure("More than 1 uncommon trap with reason 'uninitialized'"+
+                                  " occurred at least for 1 method.");
+        }
+    }
+
+    private void parseJVMSElement(String jvms) {
+        Matcher matcher = pattern.matcher(jvms);
+        if(!matcher.find()) return;
+
+        String methodID = matcher.group(1);
+        String trapsCountStr = matcher.group(4);
+        Integer trapsCount = 0;
+        Integer oldTrapsCount = 0;
+        String className = matcher.group(2);
+        String methodName = matcher.group(3);
+
+        if((classFilter.size() > 0 && !findMatches(classFilter,className)) ||
+           (methodFilter.size() > 0 && !findMatches(methodFilter,methodName))) {
+            //filtering out uncommon trap we are not interested in
+            return;
+        }
+
+        try {
+            trapsCount = Integer.valueOf(trapsCountStr);
+        } catch (NumberFormatException nfe) {
+            trapsCount = 0;
+        }
+
+        oldTrapsCount = methods.get(methodID);
+        if(oldTrapsCount == null) oldTrapsCount = -1;
+
+        methods.put(methodID, Math.max(trapsCount, oldTrapsCount));
+    }
+
+    private static boolean findMatches(List<String> patterns, String str) {
+        for(String pattern : patterns) {
+            if(Pattern.matches(pattern,str)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit001/uninit001.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit001/uninit001.java
new file mode 100644
index 00000000000..f4d1c850d82
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit001/uninit001.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit001.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit001.uninit001
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit001.uninit001
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit001;
+
+import vm.compiler.complog.share.*;
+
+/**
+ * Provoke osr and compilation of method with
+ * 'new' calls of uninitialized class.
+ */
+
+public class uninit001 {
+
+    static {
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            uninit001 u = new uninit001();
+            Object o = u.copy();
+        }
+    }
+
+    public Object copy() {
+        return new uninit001();
+    }
+
+    public static void main(String args[]) {
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit002/uninit002.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit002/uninit002.java
new file mode 100644
index 00000000000..db507965709
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit002/uninit002.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit002.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit002.uninit002
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit002.uninit002
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit002;
+
+import vm.compiler.complog.share.*;
+
+/**
+ * Provoke OSR for loop with 'new' call of uninitialized class
+ * in method called from initializer.
+ */
+
+public class uninit002 {
+
+    static {
+        uninit002 u = new uninit002();
+        Object o = u.osr();
+    }
+
+    public Object osr() {
+        Object o = null;
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            o = new uninit002();
+        }
+        return o;
+    }
+
+    public static void main(String args[]) {
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit003/uninit003.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit003/uninit003.java
new file mode 100644
index 00000000000..1775f9400ce
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit003/uninit003.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit003.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit003.uninit003
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit003.uninit003
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit003;
+
+import vm.compiler.complog.share.*;
+
+/**
+ * Provoke OSR for loop without 'new' call of uninitialized class
+ * in method class from initializer.
+ */
+
+public class uninit003 {
+
+    static {
+        uninit003 u = new uninit003();
+        Object o = u.osr();
+    }
+
+    public Object osr() {
+        Object o = null;
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            o = new Object();
+        }
+        return o;
+    }
+
+    public static void main(String args[]) {
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit004/uninit004.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit004/uninit004.java
new file mode 100644
index 00000000000..ca2b17de86b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit004/uninit004.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit004.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit004.uninit004
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit004.uninit004
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit004;
+
+import vm.compiler.complog.share.*;
+
+/**
+ * Provoke OSR for loop with method call of uninitialized class.
+ */
+
+public class uninit004 {
+
+    static {
+        uninit004 u = new uninit004();
+        Object o;
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            o = u.copy();
+        }
+    }
+
+    public Object copy() {
+        return new Object();
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit005/uninit005.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit005/uninit005.java
new file mode 100644
index 00000000000..1f2e82b79ad
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit005/uninit005.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit005.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit005.uninit005
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit005.uninit005
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit005;
+
+import vm.compiler.complog.share.*;
+
+/**
+ * Provoke compilation of uninitialized class's method
+ * with 'new' call of the same class.
+ */
+
+public class uninit005 {
+    static {
+        uninit005 u = new uninit005();
+        Object o = u.recursiveMethod(Constants.RECURSION_DEPTH);
+    }
+
+    public Object recursiveMethod(int i) {
+        if(i <= 0) {
+            return new uninit005();
+        } else {
+            Object o = null;
+            o = recursiveMethod(i-1);
+            o = recursiveMethod(i-1);
+            return o;
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit006/uninit006.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit006/uninit006.java
new file mode 100644
index 00000000000..b184d89b822
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit006/uninit006.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit006.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit006.uninit006
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit006.uninit006
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit006;
+
+import vm.compiler.complog.share.*;
+/**
+ * Provoke compilation of uninitialized class's method
+ * without 'new' call of the same class.
+ */
+
+public class uninit006 {
+
+    static {
+        uninit006 u = new uninit006();
+        Object o = u.recursiveMethod(Constants.RECURSION_DEPTH);
+    }
+
+    public Object recursiveMethod(int i ) {
+        if(i <= 0) {
+            return new Object();
+        } else {
+            Object o = null;
+            o = recursiveMethod(i-1);
+            o = recursiveMethod(i-1);
+            return o;
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit007/uninit007.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit007/uninit007.java
new file mode 100644
index 00000000000..51b9bf157eb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit007/uninit007.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit007.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit007.uninit007
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit007.uninit007
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit007;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke OSR in initializer of sub class with it's super class method call.
+ * Super class's method contains 'new' call of it's sub class.
+ */
+
+public class uninit007 extends uninit007s {
+
+    static {
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            uninit007s u = new uninit007s();
+            Object o = u.copy();
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
+
+class uninit007s {
+
+    public Object copy() {
+        return new uninit007();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit008/uninit008.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit008/uninit008.java
new file mode 100644
index 00000000000..ef98cadc6d5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit008/uninit008.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit008.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit008.uninit008
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit008.uninit008
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit008;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke OSR in initializer of sub class with it's super class method call.
+ * Super class's method doesn't contain any calls of sub class's methods.
+ */
+
+public class uninit008 extends uninit008s {
+
+    static {
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            uninit008s u = new uninit008s();
+            Object o = u.copy();
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
+
+class uninit008s {
+
+    public Object copy() {
+        return new Object();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit009/uninit009.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit009/uninit009.java
new file mode 100644
index 00000000000..c4ec32906b9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit009/uninit009.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit009.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit009.uninit009
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit009.uninit009
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit009;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke OSR in initializer of super class with 'new' calls of it's subclass.
+ */
+
+public class uninit009 {
+
+    static {
+        Object o = null;
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            o = new uninit009a();
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
+
+class uninit009a extends uninit009 {
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit010/uninit010.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit010/uninit010.java
new file mode 100644
index 00000000000..3874bf7d8c4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit010/uninit010.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit010.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit010.uninit010
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit010.uninit010
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit010;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke OSR in initializer of class with 'new' calls of
+ * distinct class which calls 'new' of uninitialized class.
+ */
+
+public class uninit010 {
+
+    static {
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            Object o = new uninit010a();
+        }
+    }
+
+    public uninit010() {
+
+    }
+
+    public static void main(String args[]) {
+    }
+
+}
+
+class uninit010a {
+
+    public uninit010a() {
+        Object o = new uninit010();
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit011/uninit011.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit011/uninit011.java
new file mode 100644
index 00000000000..0004dbea5b0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit011/uninit011.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit011.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit011.uninit011
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit011.uninit011
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit011;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke compilation of uninitialized class's static method
+ * without 'new' call of the same class.
+ */
+
+public class uninit011 {
+
+    static {
+        Object o = uninit011.recursiveMethod(Constants.RECURSION_DEPTH);
+    }
+
+    public static Object recursiveMethod(int i ) {
+        if(i <= 0) {
+            return new Object();
+        } else {
+            Object o = null;
+            o = recursiveMethod(i-1);
+            o = recursiveMethod(i-1);
+            return o;
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit012/uninit012.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit012/uninit012.java
new file mode 100644
index 00000000000..5615faebb7b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit012/uninit012.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit012.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit012.uninit012
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit012.uninit012
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit012;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke compilation of uninitialized class's static method
+ * with 'new' call of the same class.
+ */
+
+public class uninit012 {
+
+    static {
+        Object o = uninit012.recursiveMethod(Constants.RECURSION_DEPTH);
+    }
+
+    public static Object recursiveMethod(int i) {
+        if(i <= 0) {
+            return new uninit012();
+        } else {
+            Object o = null;
+            o = recursiveMethod(i-1);
+            o = recursiveMethod(i-1);
+            return o;
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit013/uninit013.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit013/uninit013.java
new file mode 100644
index 00000000000..3dd0861d9f6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit013/uninit013.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase vm/compiler/complog/uninit/uninit013.
+ * VM Testbase keywords: [quick, jit]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build vm.compiler.complog.share.LogCompilationTest
+ *        vm.compiler.complog.uninit.uninit013.uninit013
+ *        vm.compiler.complog.uninit.UninitializedTrapCounter
+ * @run main/othervm PropertyResolvingWrapper
+ *      vm.compiler.complog.share.LogCompilationTest
+ *      -testedJava ${test.jdk}/bin/java
+ *      -options "${test.vm.opts} ${test.java.opts}"
+ *      -testClass vm.compiler.complog.uninit.uninit013.uninit013
+ *      -parserClass vm.compiler.complog.uninit.UninitializedTrapCounter
+ *      -parserOptions "-classFilter=.*uninit.*"
+ */
+
+package vm.compiler.complog.uninit.uninit013;
+import vm.compiler.complog.share.Constants;
+
+/**
+ * Provoke OSR for loop which mutate fields of uninitialized class.
+ */
+
+public class uninit013 {
+
+    Object field = null;
+    static Object staticField = null;
+
+    static {
+        uninit013 u = new uninit013();
+
+        for(int i = 0; i<Constants.LOOP_ITERATIONS; i++) {
+            u.field = new Object();
+            uninit013.staticField = new Object();
+        }
+    }
+
+    public static void main(String args[]) {
+
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/Parentheses.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/Parentheses.java
new file mode 100644
index 00000000000..66546e9b13f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/Parentheses.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses;
+
+import vm.compiler.coverage.parentheses.share.HotspotInstructionsExecutor;
+import vm.share.options.Option;
+import vm.share.options.Options;
+import vm.share.options.OptionSupport;
+
+import nsk.share.Failure;
+import nsk.share.Log;
+import nsk.share.test.StressOptions;
+
+import vm.compiler.coverage.parentheses.share.InstructionSequence;
+import vm.compiler.coverage.parentheses.share.TinyInstructionsExecutor;
+import vm.compiler.coverage.parentheses.share.generation.RandomInstructionsGenerator;
+
+import java.io.IOException;
+
+public class Parentheses {
+
+    private Log log;
+
+    @Option(name = "iterations", default_value = "100", description = "number of iterations")
+    int iterations = 2000;
+
+    @Option(name = "maxStackDepth", default_value = "100",
+        description = "maximal stack depth that can be required by generated instruction sequence")
+    int maxStackDepth = 100;
+
+    @Options
+    StressOptions stressOptions = new StressOptions();
+
+    @Option(name = "verbose", default_value = "false", description = "verbose mode")
+    boolean verbose;
+
+    @Option(name = "loadFrom", default_value = "", description = "path to file that contains instruction sequence")
+    String loadFrom = "";
+
+    @Option(name = "saveTo", default_value = "parentheses",
+        description = "path to file in which will be stored instruction sequence if errors will be occur")
+    String saveTo = "saveTo";
+
+    public static void main(String[] args) throws Exception {
+        Parentheses test = new Parentheses();
+        OptionSupport.setup(test, args);
+        test.run();
+    }
+
+    public void run() throws IOException, ReflectiveOperationException {
+
+        log = new Log(System.out, verbose);
+
+        InstructionSequence instructionSequence = null;
+        for (int i = 0; i < iterations * stressOptions.getIterationsFactor(); i++) {
+            log.display("Iteration " + i);
+            if (loadFrom.isEmpty()) {
+                log.display("generating instructions list");
+                instructionSequence = new RandomInstructionsGenerator(maxStackDepth).generate();
+            } else {
+                if (instructionSequence == null) {
+                    log.display("loading instructions list from file: " + loadFrom);
+                    instructionSequence = InstructionSequence.fromFile(loadFrom);
+                }
+            }
+
+            log.display("executing instructions");
+
+            TinyInstructionsExecutor tinyVM = new TinyInstructionsExecutor(instructionSequence.getMaxStackDepth());
+            int tinyRes = tinyVM.execute(instructionSequence.getInstructions());
+
+            HotspotInstructionsExecutor hotspot = new HotspotInstructionsExecutor(instructionSequence.getMaxStackDepth());
+            int hotspotRes = hotspot.execute(instructionSequence.getInstructions());
+
+            if (tinyRes != hotspotRes) {
+                log.complain("Incorrect results of InstructionsExecutor instructions computations");
+                log.complain("instructions:");
+                log.complain(instructionSequence.toString());
+                log.complain("TinyInstructionsExecutor result: " + tinyRes);
+                log.complain("HotspotInstructionsExecutor result: " + hotspotRes);
+                log.complain("Instruction sequence was written to file: " + saveTo);
+                instructionSequence.saveToFile(saveTo);
+                throw new Failure("Incorrect results of InstructionsExecutor instructions computations");
+            } else {
+                log.display("TinyInstructionsExecutor result: " + tinyRes);
+                log.display("HotspotInstructionsExecutor result: " + hotspotRes);
+                log.display("");
+            }
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java
new file mode 100644
index 00000000000..5b7d5634493
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2017, 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
+ * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.misc:+open
+ *
+ * @summary converted from VM Testbase vm/compiler/coverage/parentheses.
+ * VM Testbase keywords: [quick, stressopt, jit]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test works as follows:
+ *     1. Generates random proper list of following JVM instructions:
+ *     -Integer constants: ICONST_M1, ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4, ICONST_5
+ *     -Integer arithmetics: IADD, ISUB, IMUL, IAND, IOR, IXOR, ISHL, ISHR, INEG
+ *     -Stack operations: DUP, SWAP
+ *     -NOP
+ *     (If loadFrom command line option is setted, test will be use instruction sequence from file.
+ *     It is useful for reproducing failures.)
+ *     2. Executes this sequence in to ways: with TinyInstructionsExecutor and  HotspotInstructionsExecutor.
+ *     3. Checks that results of execution are equals.
+ *     For generation instructions test using right parentheses sequence. Open parenthesis "(" is correspondent to
+ *     stack increasing instructions, ")" is corresponded stack decreasing instructions.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.coverage.parentheses.Parentheses
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java
new file mode 100644
index 00000000000..c5803a3a3a1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share;
+
+import java.lang.reflect.Field;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.misc.Unsafe;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * This class convert instructions sequence to java class file, load it to same JVM and then execute.
+ * This class uses Unsafe.defineAnonymousClass for class loading
+ */
+public class HotspotInstructionsExecutor implements InstructionsExecutor {
+
+    private static final Object[] NO_CP_PATCHES = new Object[0];
+
+    private int stackSize;
+
+    public HotspotInstructionsExecutor(int stackSize) {
+        this.stackSize = stackSize;
+    }
+
+    @Override
+    public int execute(List<Instruction> instructions) throws ReflectiveOperationException {
+        Class execClass = generateClass(instructions);
+        Method execMethod = execClass.getMethod("exec");
+        return (Integer) execMethod.invoke(null);
+    }
+
+    private Class generateClass(List<Instruction> instructions) throws ClassNotFoundException {
+        String classNameForASM = "ExecClass";
+
+        ClassWriter cw = new ClassWriter(0);
+        cw.visit(V1_1, ACC_PUBLIC, classNameForASM, null, "java/lang/Object", null);
+
+        // creates a MethodWriter for the 'main' method
+        MethodVisitor mw = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "exec", "()I", null, null);
+
+        for (Instruction instruction : instructions) {
+            mw.visitInsn(instruction.opCode);
+        }
+
+        mw.visitInsn(IRETURN);
+        mw.visitMaxs(stackSize, 2);
+        mw.visitEnd();
+
+        return getUnsafe().defineAnonymousClass(ClassWriter.class, cw.toByteArray(), NO_CP_PATCHES);
+    }
+
+    private static Unsafe getUnsafe() {
+        return Unsafe.getUnsafe();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/Instruction.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/Instruction.java
new file mode 100644
index 00000000000..1ed6fc5fd25
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/Instruction.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum Instruction {
+
+    //"+1": instructions that increase stack
+    ICONST_M1(2),
+    ICONST_0(3),
+    ICONST_1(4),
+    ICONST_2(5),
+    ICONST_3(6),
+    ICONST_4(7),
+    ICONST_5(8),
+    DUP(89),
+
+    ///"-1": instructions that decrease stack
+    IADD(96),
+    ISUB(100),
+    IMUL(104),
+    IAND(126),
+    IOR(128),
+    IXOR(130),
+    ISHL(120),
+    ISHR(122),
+
+    //"0": instructions that doesn't change stack
+    SWAP(95),
+    INEG(116),
+    NOP(0);
+
+    public static final List<Instruction> stackUp = Arrays.asList(
+        ICONST_M1, ICONST_0, ICONST_1, ICONST_2,
+        ICONST_3, ICONST_4, ICONST_5, DUP
+    );
+
+    public static final List<Instruction> stackDown = Arrays.asList(
+        IADD, ISUB, IMUL, IAND,
+        IOR, IXOR, ISHL, ISHR
+    );
+
+    public static final List<Instruction> neutral = Arrays.asList(SWAP, INEG, NOP);
+
+    public final int opCode;
+
+    Instruction(int opCode) {
+        this.opCode = opCode;
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/InstructionSequence.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/InstructionSequence.java
new file mode 100644
index 00000000000..439593d67b6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/InstructionSequence.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share;
+
+import java.io.*;
+import java.util.List;
+
+public class InstructionSequence implements Serializable {
+
+    private List<Instruction> instructions;
+    private int maxStackDepth;
+
+    public InstructionSequence(List<Instruction> instructions, int maxStackDepth) {
+        this.instructions = instructions;
+        this.maxStackDepth = maxStackDepth;
+    }
+
+    public List<Instruction> getInstructions() {
+        return instructions;
+    }
+
+    public int getMaxStackDepth() {
+        return maxStackDepth;
+    }
+
+    public void saveToFile(String fileName) throws IOException {
+        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(fileName));
+        oos.writeObject(this);
+        oos.close();
+    }
+
+    public static InstructionSequence fromFile(String fileName) throws IOException, ClassNotFoundException {
+        ObjectInputStream objectInputStream = new ObjectInputStream(new FileInputStream(fileName));
+        return (InstructionSequence) objectInputStream.readObject();
+    }
+
+    @Override
+    public String toString() {
+        return instructions + "\n" + "maxStackDepth=" + maxStackDepth + "\n";
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/InstructionsExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/InstructionsExecutor.java
new file mode 100644
index 00000000000..65b820b0d2b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/InstructionsExecutor.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share;
+
+import java.util.List;
+
+/**
+ * Base interface for instructions executors:
+ * classes that could execute list of VM instructions
+ */
+public interface InstructionsExecutor {
+    public int execute(List<Instruction> instructions) throws Exception;
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/TinyInstructionsExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/TinyInstructionsExecutor.java
new file mode 100644
index 00000000000..6c3a43fd737
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/TinyInstructionsExecutor.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share;
+
+import java.util.List;
+
+/**
+ * Tiny stack InstructionsExecutor. This executor verifies HotspotInstructionsExecutor
+ */
+public class TinyInstructionsExecutor implements InstructionsExecutor {
+
+    private int[] stack;
+    private int stackHead = -1;
+
+    public TinyInstructionsExecutor(int stackSize) {
+        stack = new int[stackSize];
+    }
+
+    private void putOnStack(int v) {
+        stack[++stackHead] = v;
+    }
+
+    private void exec(Instruction instruction) {
+        switch (instruction) {
+            case ICONST_M1:
+                putOnStack(-1);
+                break;
+            case ICONST_0:
+                putOnStack(0);
+                break;
+            case ICONST_1:
+                putOnStack(1);
+                break;
+            case ICONST_2:
+                putOnStack(2);
+                break;
+            case ICONST_3:
+                putOnStack(3);
+                break;
+            case ICONST_4:
+                putOnStack(4);
+                break;
+            case ICONST_5:
+                putOnStack(5);
+                break;
+            case DUP:
+                stack[stackHead + 1] = stack[stackHead];
+                stackHead++;
+                break;
+
+            case IADD:
+                stack[stackHead - 1] += stack[stackHead];
+                stackHead--;
+                break;
+            case ISUB:
+                stack[stackHead - 1] -= stack[stackHead];
+                stackHead--;
+                break;
+            case IMUL:
+                stack[stackHead - 1] *= stack[stackHead];
+                stackHead--;
+                break;
+            case IOR:
+                stack[stackHead - 1] |= stack[stackHead];
+                stackHead--;
+                break;
+            case IAND:
+                stack[stackHead - 1] &= stack[stackHead];
+                stackHead--;
+                break;
+            case IXOR:
+                stack[stackHead - 1] ^= stack[stackHead];
+                stackHead--;
+                break;
+            case ISHL:
+                stack[stackHead - 1] <<= stack[stackHead];
+                stackHead--;
+                break;
+            case ISHR:
+                stack[stackHead - 1] >>= stack[stackHead];
+                stackHead--;
+                break;
+
+            case SWAP: {
+                int t = stack[stackHead];
+                stack[stackHead] = stack[stackHead - 1];
+                stack[stackHead - 1] = t;
+                break;
+            }
+            case NOP:
+                break;
+            case INEG:
+                stack[stackHead] = -stack[stackHead];
+                break;
+        }
+    }
+
+    private int top() {
+        return stack[stackHead];
+    }
+
+    @Override
+    public int execute(List<Instruction> instructions) {
+        for (Instruction instruction : instructions) {
+            exec(instruction);
+        }
+        return top();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/generation/ParenthesesGenerator.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/generation/ParenthesesGenerator.java
new file mode 100644
index 00000000000..c1c0722df96
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/generation/ParenthesesGenerator.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share.generation;
+
+import java.util.Random;
+
+
+/**
+ * This class generate rrandom ight parentheses sequence in string representation: "(())", "()(())" etc
+ */
+public class ParenthesesGenerator {
+    private static Random random = new Random();
+
+    public static String generate(int size) {
+        if (size == 0) {
+            return "";
+        }
+        if (random.nextBoolean()) {
+            return "(" + generate(size - 1) + ")";
+        } else {
+            int splitPoint = random.nextInt(size + 1);
+            return generate(splitPoint) + generate(size - splitPoint);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/generation/RandomInstructionsGenerator.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/generation/RandomInstructionsGenerator.java
new file mode 100644
index 00000000000..3dc0a1ebc6a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/generation/RandomInstructionsGenerator.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.coverage.parentheses.share.generation;
+
+import vm.compiler.coverage.parentheses.share.Instruction;
+import vm.compiler.coverage.parentheses.share.InstructionSequence;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Generates random but correct list of JVM instructions
+ */
+public class RandomInstructionsGenerator {
+    private static Random random = new Random();
+
+    private static <E> E choseRandomElement(List<E> list) {
+        return list.get(random.nextInt(list.size()));
+    }
+
+    private int maxStackDepth;
+
+    public RandomInstructionsGenerator(int maxStackDepth) {
+        this.maxStackDepth = maxStackDepth;
+    }
+
+    public InstructionSequence generate() {
+        List<Instruction> instructions = new ArrayList<Instruction>();
+
+        //this head with constants is necessary to avoid stack underflow
+        instructions.add(Instruction.ICONST_1);
+        instructions.add(Instruction.ICONST_2);
+
+
+        String parenthesis = ParenthesesGenerator.generate(maxStackDepth - 2);
+
+        for (char c : parenthesis.toCharArray()) {
+            if (c == '(') {
+                //+1: add op that increase stack
+                instructions.add(choseRandomElement(Instruction.stackUp));
+            } else {
+                //-1
+                instructions.add(choseRandomElement(Instruction.stackDown));
+            }
+
+            //+0: add element that doesn't change stack
+            if (random.nextBoolean()) {
+                instructions.add(choseRandomElement(Instruction.neutral));
+            }
+
+        }
+        return new InstructionSequence(instructions, maxStackDepth);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README
new file mode 100644
index 00000000000..581714bde22
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README
@@ -0,0 +1,25 @@
+Copyright (c) 2002, 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 a combination of optimization techniques that includes redundant expression
+elimination, code motion (including loop invariant hoisting), strength reduction,
+
+motion (including loop invariant hoisting), strength reduction, constant folding, etc.
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/README
new file mode 100644
index 00000000000..ba04a99f231
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/README
@@ -0,0 +1,45 @@
+Copyright (c) 2002, 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.
+
+Constant Propagation
+--------------------
+Constant propagation is a code reduction technique in which values of variables
+which are determined to be constants can be passed to expressions which use
+these constants and can be computed at compile time.
+
+
+Example:
+
+Consider the following segment of an original source program:
+
+      x = 7;
+      y = 2 * x;
+      z = f (x, y);
+
+The value of variable x in the segment's last two lines is the constant number 7.
+This is always true, because of the assignment to x in the segment's first line.
+Therefore, the two instances of x can be substituted by the constant value 7
+(this value propagates through the next two lines). The reduced source program
+is the following:
+
+      x = 7;
+      y = 2 * 7;
+      z = f (7, y);
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java
new file mode 100644
index 00000000000..8d95c92458a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/constprop/constprop01.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.constprop.constprop01.constprop01
+ */
+
+package vm.compiler.jbe.constprop.constprop01;
+
+// constprop01.java
+
+/* Tests the Constant Propagation optimization, including calls to math functions
+   with constant arguments.
+ */
+
+class Starter {
+    int global;
+    int gl_unopt;
+    int gl_opt;
+    int a_one;
+    int zero;
+
+    Starter() {
+        global = 1;
+        gl_unopt = 1;
+        gl_opt = 1;
+        a_one = 1;
+        zero = global - a_one; // really a zero, but compiler doesn't know
+    }
+
+    void increment_unopt() {
+        gl_unopt += a_one;
+    }
+
+    void increment_opt() {
+        gl_opt += a_one;
+    }
+}
+
+
+public class constprop01 {
+    static int err = 0;
+    static final int is = 16386;
+    double a, b, c, d, x, z;
+    double a_opt, b_opt, c_opt, d_opt, x_opt, z_opt;
+    static Starter st = new Starter();
+
+    public static void main(String args[]) {
+        constprop01 cpr = new constprop01();
+
+        cpr.un_optimized();
+        cpr.hand_optimized();
+        if (st.gl_unopt != st.gl_opt) {
+            System.out.println(">>Bad output: gl_unopt is not equal to gl_optimized. gl_unopt = "+st.gl_unopt+"; gl_optimized = "+st.gl_opt);
+            err = 1;
+        }
+        if (cpr.a != cpr.a_opt) {
+            System.out.println(">>Bad output: a_unoptimized="+cpr.a+"; a_optimized="+cpr.a_opt);
+            err = 1;
+        }
+        if (cpr.b != cpr.b_opt) {
+            System.out.println(">>Bad output: b_unoptimized="+cpr.b+"; b_optimized="+cpr.b_opt);
+            err = 1;
+        }
+        if (cpr.c != cpr.c_opt) {
+            System.out.println(">>Bad output: c_unoptimized="+cpr.c+"; c_optimized="+cpr.c_opt);
+            err = 1;
+        }
+        if (cpr.d != cpr.d_opt) {
+            System.out.println(">>Bad output: d_unoptimized="+cpr.d+"; d_optimized="+cpr.d_opt);
+            err = 1;
+        }
+        if (cpr.x != cpr.x_opt) {
+            System.out.println(">>Bad output: x_unoptimized="+cpr.x+"; x_optimized="+cpr.x_opt);
+            err = 1;
+        }
+        if (cpr.z != cpr.z_opt) {
+            System.out.println(">>Bad output: z_unoptimized="+cpr.z+"; z_optimized="+cpr.z_opt);
+            err = 1;
+        }
+
+        if (err == 0) {
+            System.out.println("Test constprop01 Passed.");
+        } else {
+            throw new Error("Test constprop01 Failed.");
+        }
+    }
+
+    void un_optimized() {
+        int k, m;
+
+        a = st.a_one;
+        c = st.a_one;
+        d = st.a_one;
+        x = st.a_one;
+
+        // example 1
+        for(k = 0; k < is; k++) {
+            st.increment_unopt();
+        }
+        System.out.println("gl_unopt = "+st.gl_unopt+" after incrementing it 16386 times.");
+        st.gl_unopt -= 16386;
+        System.out.println("gl_unopt = "+st.gl_unopt+" after subtracting 16386.");
+
+        // example 2
+        m = 32769;
+        b = c * m;
+        System.out.println("c = "+c+"; m = 2; b = "+b);
+
+        // example 3
+        a = Math.E / (a * d * Math.pow(1/Math.PI, 15));
+        c = 2 * Math.E * d;
+        d = 2 * Math.E * a;
+        System.out.println("e = "+Math.E+"; d = "+d+"; a = "+a);
+
+        // example 4
+        System.out.println("x = "+x);
+        x += m;
+        System.out.println("x = "+x+"; m = "+m);
+
+        // example 5
+        z = Math.pow(1/Math.PI, 15) + st.zero/Math.PI;
+        System.out.println("z = "+z);
+    }
+
+
+    void hand_optimized() {
+        int k, m;
+
+        a_opt = st.a_one;
+        c_opt = st.a_one;
+        d_opt = st.a_one;
+        x_opt = st.a_one;
+
+        // example 1
+        for(k = 0; k < 16386; k++) {
+            st.increment_opt();
+        }
+        System.out.println("gl_opt = "+st.gl_opt+" after incrementing it 16386 times.");
+        st.gl_opt -= 16386;
+        System.out.println("gl_opt = "+st.gl_opt+" after subtracting 16386.");
+
+        // example 2
+        m = 32769;
+        b_opt = c_opt * 32769;
+        System.out.println("c_opt = "+c_opt+"; b_opt = "+b_opt);
+
+        // example 3
+        double e = 2.7182818284590452354;
+        a_opt = 2.7182818284590452354 / (a_opt * d_opt * Math.pow(0.3183098861837907, 15));
+        c_opt = 2 * 2.7182818284590452354 * d_opt;
+        d_opt = 2 * 2.7182818284590452354 * a_opt;
+        System.out.println("e = "+2.7182818284590452354+"; d_opt = "+d_opt+"; a_opt = "+a_opt);
+
+        // example 4
+        System.out.println("x_opt = "+x_opt);
+        x_opt += 32769;
+        System.out.println("x_opt = "+x_opt+"; m = "+m);
+
+        // example 5
+        z_opt = 3.4894092627910365E-8 + 0/3.14159265358979323846;
+        System.out.println("z_opt = "+z_opt);
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java
new file mode 100644
index 00000000000..da2ed92ef29
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/constprop/constprop02.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.constprop.constprop02.constprop02
+ */
+
+package vm.compiler.jbe.constprop.constprop02;
+
+// constprop02.java
+
+/* Tests constant propagation by substitute integer, long, and double
+   by constant values.
+ */
+
+public class constprop02 {
+    public static void main(String args[]) {
+        boolean bPass = true;
+        constprop02 cpr = new constprop02();
+
+        bPass &= cpr.verify(cpr.testDiv_un_opt());
+        bPass &= cpr.verify(cpr.testDiv_hand_opt());
+        System.out.println("------------------------");
+        if (!bPass) {
+            throw new Error("Test constprop02 Failed.");
+        }
+        System.out.println("Test constprop02 Passed.");
+    }
+
+    String testDiv_un_opt() {
+        int ia, ib;
+        long lc, ld;
+        double de, df;
+
+        System.out.println("testDiv_un_opt:");
+        ia = ib = 513;         if ( 1 != ia / ib) return "case 1 failed";
+        ia = -ia;              if (-1 != ia / ib) return "case 2 failed";
+        ia = ib = 1073741824;  if ( 1 != ia / ib) return "case 3 failed";
+        ia = -ia;              if (-1 != ia / ib) return "case 4 failed";
+        lc = ld = 8L;          if ( 1 != lc / ld) return "case 5 failed";
+        lc = -lc;              if (-1 != lc / ld) return "case 6 failed";
+        lc = ld = 1073741824L; if ( 1 != lc / ld) return "case 7 failed";
+        lc = -lc;              if (-1 != lc / ld) return "case 8 failed";
+        ib = 0;
+        try {
+            ia = ia / ib;
+            return "case 9 failed";
+        } catch (java.lang.Exception x) {/* good */}
+        ld = 0;
+        try {
+            lc = lc / ld;
+            return "case 10 failed";
+        } catch (java.lang.Exception x) {/* good */}
+        try {
+            lc = lc % ld;
+            return "case 11 failed";
+        } catch (java.lang.Exception x) {/* good */}
+        de = df = 16385.0;
+        if (1.0 != de / df) return "case 12 failed";
+        de = -de;
+        if (-1.0 != de / df) return "case 13 failed";
+        df = 0.0;
+        try {
+            de = de / df;
+        } catch (java.lang.Exception x) {
+            return "case 14 failed";
+        }
+        try {
+            de = de % df;
+            de = 5.66666666666 % df;
+        } catch (java.lang.Exception x) {
+            return "case 15 failed";
+        }
+        return null;
+    }
+
+    String testDiv_hand_opt() {
+        int ia, ib;
+        long lc, ld;
+        double de, df;
+
+        System.out.println("testDiv_hand_opt:");
+        if ( 1 != 513 / 513) return "case 1 failed";
+        if (-1 != -513 / 513) return "case 2 failed";
+        if ( 1 != 1073741824 / 1073741824) return "case 3 failed";
+        if (-1 != 1073741824 / -1073741824) return "case 4 failed";
+        if ( 1 != 8L / 8L) return "case 5 failed";
+        if (-1 != -8L / 8L) return "case 6 failed";
+        if ( 1 != 1073741824L / 1073741824L) return "case 7 failed";
+        if (-1 != 1073741824L / -1073741824L) return "case 8 failed";
+        ib = 0;
+        try {
+            ia = -1073741824 / ib;
+            return "case 9 failed";
+        } catch (java.lang.Exception x) {/* good */}
+        ld = 0L;
+        try {
+            lc = -1073741824L / ld;
+            return "case 10 failed";
+        } catch (java.lang.Exception x) {/* good */}
+        try {
+            lc = -1073741824L % ld;
+            return "case 11 failed";
+        } catch (java.lang.Exception x) {/* good */}
+        if (1.0 != 16385.0 / 16385.0) return "case 12 failed";
+        if (-1.0 != -16385.0 / 16385.0) return "case 13 failed";
+        df = 0.0;
+        try {
+            de = -1073741824L / df;
+        } catch (java.lang.Exception x) {
+            return "case 14 failed";
+        }
+        try {
+            de = -1073741824L % 0.0;
+            de = 5.66666666666 % df;
+        } catch (java.lang.Exception x) {
+            return "cnase 15 failed";
+        }
+        return null;
+    }
+
+    boolean verify(String str) {
+        boolean st = true;
+
+        if (null == str || str.equals(""))
+            System.out.println("OK");
+        else {
+            st = false;
+            System.out.println("** "+str+" **");
+        }
+        return st;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/README
new file mode 100644
index 00000000000..6da56b887e6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/README
@@ -0,0 +1,27 @@
+Copyright (c) 2002, 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.
+
+Dead Code Detection
+-------------------
+A statement that can never be executed or whose execution is irrelevant is considered dead.
+The most obvious form of dead code is an unreachable statement, which has no control flow path from the beginning of the program to the statement. Code can be unreachable either statically, meaning there is no path to the statement, or dynamically, meaning there are no paths that can be executable.
+
+The second form of dead code is the dead definition, which is a definition of a data that is either redefined before it is referenced, or is never referenced. One restriction on this definition is that the execution of the assignment statement does not alter the value of any other data item other than the one being defined (that is, no side-effects).
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead01/dead01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead01/dead01.java
new file mode 100644
index 00000000000..63eb41a2602
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead01/dead01.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead01.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead01.dead01
+ */
+
+package vm.compiler.jbe.dead.dead01;
+
+/* -- Test the elimination of dead assignment to local variables
+In the example below, the value assigned to i is never used, all dead stores to local can be eliminated, and the last return statement in f() is unreachable; Both dead/unused stores and unreachable statement can be eliminated.
+
+ */
+
+public class dead01 {
+
+  public static void main(String args[]) {
+    dead01 dce = new dead01();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead01 Passed.");
+    } else {
+      throw new Error("Test dead01 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    int local;
+    int i;
+
+    i = 1;          /* dead store */
+    local = 8;      /* dead store */
+    local = 7;      /* dead store */
+    local = 6;      /* dead store */
+    local = 5;      /* dead store */
+    local = 4;      /* dead store */
+    local = 3;      /* dead store */
+    local = 2;      /* dead store */
+    local = 1;      /* dead store */
+    local = 0;      /* dead store */
+    local = -1;     /* dead store */
+    local = -2;     /* dead store */
+
+    i = 1;           /* dead store */
+    local = 8;      /* dead store */
+    local = 7;      /* dead store */
+    local = 6;      /* dead store */
+    local = 5;      /* dead store */
+    local = 4;      /* dead store */
+    local = 3;      /* dead store */
+    local = 2;      /* dead store */
+    local = 1;      /* dead store */
+    local = 0;      /* dead store */
+    local = -1;     /* dead store */
+    local = -2;     /* dead store */
+
+    i = 1;           /* dead store */
+    local = 8;      /* dead store */
+    local = 7;      /* dead store */
+    local = 6;      /* dead store */
+    local = 5;      /* dead store */
+    local = 4;      /* dead store */
+    local = 3;      /* dead store */
+    local = 2;      /* dead store */
+    local = 1;      /* dead store */
+    local = 0;      /* dead store */
+    local = -1;     /* dead store */
+    local = -2;
+
+    if (Math.abs(local) >= 0)
+      return local;
+    return local;   /* unreachable */
+  }
+
+  // Code fragment after dead code elimination
+  static int fopt() {
+    int local;
+
+    local = -2;
+    return local;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead02/dead02.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead02/dead02.java
new file mode 100644
index 00000000000..d4e02940a62
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead02/dead02.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead02.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead02.dead02
+ */
+
+package vm.compiler.jbe.dead.dead02;
+
+/* -- Test the elimination of dead assignment to static variables
+In the example below, the value assigned to i is never used, all dead stores to static global can be eliminated, and the last return statement in f() is unreachable; Both dead/unused stores and unreachable statement can be eliminated.
+
+ */
+
+public class dead02 {
+  static int global;
+  static int i;
+
+  public static void main(String args[]) {
+    dead02 dce = new dead02();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead02 Passed.");
+    } else {
+      throw new Error("Test dead02 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+
+  int f() {
+
+    i = 1;           /* dead store */
+    global = 8;      /* dead store */
+    global = 7;      /* dead store */
+    global = 6;      /* dead store */
+    global = 5;      /* dead store */
+    global = 4;      /* dead store */
+    global = 3;      /* dead store */
+    global = 2;      /* dead store */
+    global = 1;      /* dead store */
+    global = 0;      /* dead store */
+    global = -1;     /* dead store */
+    global = -2;     /* dead store */
+
+    i = 1;           /* dead store */
+    global = 8;      /* dead store */
+    global = 7;      /* dead store */
+    global = 6;      /* dead store */
+    global = 5;      /* dead store */
+    global = 4;      /* dead store */
+    global = 3;      /* dead store */
+    global = 2;      /* dead store */
+    global = 1;      /* dead store */
+    global = 0;      /* dead store */
+    global = -1;     /* dead store */
+    global = -2;     /* dead store */
+
+    i = 1;           /* dead store */
+    global = 8;      /* dead store */
+    global = 7;      /* dead store */
+    global = 6;      /* dead store */
+    global = 5;      /* dead store */
+    global = 4;      /* dead store */
+    global = 3;      /* dead store */
+    global = 2;      /* dead store */
+    global = 1;      /* dead store */
+    global = 0;      /* dead store */
+    global = -1;     /* dead store */
+    global = -2;
+
+    if (Math.abs(global) >= 0)  /* always true */
+      return global;
+    return global;   /* unreachable */
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+
+    global = -2;
+    return global;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead03/dead03.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead03/dead03.java
new file mode 100644
index 00000000000..b3dac8aaa61
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead03/dead03.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead03.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead03.dead03
+ */
+
+package vm.compiler.jbe.dead.dead03;
+
+/* -- Test the elimination of dead assignment to global variables
+In the example below, the value assigned to i is never used, all dead stores to global can be eliminated, and the last return statement in f() is unreachable; Both dead/unused stores and unreachable statement can be eliminated.
+
+ */
+
+public class dead03 {
+  int global;
+  int i;
+
+  public static void main(String args[]) {
+    dead03 dce = new dead03();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead03 Passed.");
+    } else {
+      throw new Error("Test dead03 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+
+    i = 1;           /* dead store */
+    global = 8;      /* dead store */
+    global = 7;      /* dead store */
+    global = 6;      /* dead store */
+    global = 5;      /* dead store */
+    global = 4;      /* dead store */
+    global = 3;      /* dead store */
+    global = 2;      /* dead store */
+    global = 1;      /* dead store */
+    global = 0;      /* dead store */
+    global = -1;     /* dead store */
+    global = -2;     /* dead store */
+
+    i = 1;           /* dead store */
+    global = 8;      /* dead store */
+    global = 7;      /* dead store */
+    global = 6;      /* dead store */
+    global = 5;      /* dead store */
+    global = 4;      /* dead store */
+    global = 3;      /* dead store */
+    global = 2;      /* dead store */
+    global = 1;      /* dead store */
+    global = 0;      /* dead store */
+    global = -1;     /* dead store */
+    global = -2;     /* dead store */
+
+    i = 1;           /* dead store */
+    global = 8;      /* dead store */
+    global = 7;      /* dead store */
+    global = 6;      /* dead store */
+    global = 5;      /* dead store */
+    global = 4;      /* dead store */
+    global = 3;      /* dead store */
+    global = 2;      /* dead store */
+    global = 1;      /* dead store */
+    global = 0;      /* dead store */
+    global = -1;     /* dead store */
+    global = -2;
+
+    if (Math.abs(global) >= 0)
+      return global;
+    return global;   /* unreachable */
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+
+    global = -2;
+    return global;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead04/dead04.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead04/dead04.java
new file mode 100644
index 00000000000..045a020672b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead04/dead04.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead04.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead04.dead04
+ */
+
+package vm.compiler.jbe.dead.dead04;
+/* -- Test the elimination of dead assignment to class fields
+In the example below, the values assigned to i1-i7 in struct are never used,thus can be eliminated.
+
+ */
+
+class struct {
+    int i1 = 2;
+    int i2 = 3;
+    int i3 = 4;
+    int i4 = 5;
+    int i5 = 6;
+    int i6 = 7;
+    int i7 = 8;
+    int i8 = 9;
+}
+
+public class dead04 {
+
+  public static void main(String args[]) {
+    dead04 dce = new dead04();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead04 Passed.");
+    } else {
+      throw new Error("Test dead04 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    struct s = new struct();
+
+    s.i1 = 1;
+    s.i2 = 2;
+    s.i3 = 3;
+    s.i4 = 4;
+    s.i5 = 5;
+    s.i6 = 6;
+    s.i7 = 7;
+    s.i8 = 8;
+
+    s.i1 = 1;
+    s.i2 = 2;
+    s.i3 = 3;
+    s.i4 = 4;
+    s.i5 = 5;
+    s.i6 = 6;
+    s.i7 = 7;
+    s.i8 = 8;
+
+    s.i1 = 1;
+    s.i2 = 2;
+    s.i3 = 3;
+    s.i4 = 4;
+    s.i5 = 5;
+    s.i6 = 6;
+    s.i7 = 7;
+    s.i8 = 8;
+
+    return s.i8;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    struct s = new struct();
+
+    s.i8 = 8;
+    return s.i8;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead05/dead05.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead05/dead05.java
new file mode 100644
index 00000000000..a467feb2a53
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead05/dead05.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead05.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead05.dead05
+ */
+
+package vm.compiler.jbe.dead.dead05;
+
+/* -- Test the elimination of dead assignment to static class field
+In the example below, all the values assigned to i in struct except of the last one are never used,thus can be eliminated.
+
+ */
+
+class struct {
+    static int i = 6;
+}
+
+public class dead05 {
+
+  public static void main(String args[]) {
+    dead05 dce = new dead05();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead05 Passed.");
+    } else {
+      throw new Error("Test dead05 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+
+    struct.i = 1;
+    struct.i = 2;
+    struct.i = 3;
+    struct.i = 4;
+    struct.i = 5;
+    struct.i = 6;
+    struct.i = 7;
+    struct.i = 8;
+
+    struct.i = 1;
+    struct.i = 2;
+    struct.i = 3;
+    struct.i = 4;
+    struct.i = 5;
+    struct.i = 6;
+    struct.i = 7;
+    struct.i = 8;
+
+    struct.i = 1;
+    struct.i = 2;
+    struct.i = 3;
+    struct.i = 4;
+    struct.i = 5;
+    struct.i = 6;
+    struct.i = 7;
+    struct.i = 8;
+
+    return struct.i;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+
+    struct.i = 8;
+    return struct.i;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead06/dead06.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead06/dead06.java
new file mode 100644
index 00000000000..8bd9d77d5a3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead06/dead06.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead06.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead06.dead06
+ */
+
+package vm.compiler.jbe.dead.dead06;
+
+/* -- Test the elimination of dead assignment to local variable within an IF statement
+      Example:
+
+      boolean bol;
+      void foo()
+      {
+         int i;
+
+         if (bol) i = 1;
+         if (bol) i = 2;
+      }
+
+The first assignment to i is dead, and can be eliminated.
+
+ */
+
+public class dead06 {
+  boolean bol = true;
+
+  public static void main(String args[]) {
+    dead06 dce = new dead06();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead06 Passed.");
+    } else {
+      throw new Error("Test dead06 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    int i = 0;
+
+    if (bol)
+      i = 1;
+    if (bol)
+      i = 2;
+    if (bol)
+      i = 3;
+    if (bol)
+      i = 4;
+    if (bol)
+      i = 5;
+    if (bol)
+      i = 6;
+    if (bol)
+      i = 7;
+    if (bol)
+      i = 8;
+
+    if (bol)
+      i = 1;
+    if (bol)
+      i = 2;
+    if (bol)
+      i = 3;
+    if (bol)
+      i = 4;
+    if (bol)
+      i = 5;
+    if (bol)
+      i = 6;
+    if (bol)
+      i = 7;
+    if (bol)
+      i = 8;
+
+    if (bol)
+      i = 1;
+    if (bol)
+      i = 2;
+    if (bol)
+      i = 3;
+    if (bol)
+      i = 4;
+    if (bol)
+      i = 5;
+    if (bol)
+      i = 6;
+    if (bol)
+      i = 7;
+    if (bol)
+      i = 8;
+
+    return i;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    int i = 0;
+
+    i = 8;
+    return i;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead07/dead07.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead07/dead07.java
new file mode 100644
index 00000000000..fd80eca0e33
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead07/dead07.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead07.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead07.dead07
+ */
+
+package vm.compiler.jbe.dead.dead07;
+
+/* -- Test the elimination of dead assignment to static variable within an IF statement
+      Example:
+
+      boolean bol;
+      static int i;
+
+      void foo()
+      {
+         if (bol) i = 1;
+         if (bol) i = 2;
+      }
+
+The first assignment to i is dead, and can be eliminated.
+
+ */
+
+public class dead07 {
+  boolean bol = true;
+  static int i = 6;
+
+  public static void main(String args[]) {
+    dead07 dce = new dead07();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead07 Passed.");
+    } else {
+      throw new Error("Test dead07 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+
+    if (bol)
+      i = 1;
+    if (bol)
+      i = 2;
+    if (bol)
+      i = 3;
+    if (bol)
+      i = 4;
+    if (bol)
+      i = 5;
+    if (bol)
+      i = 6;
+    if (bol)
+      i = 7;
+    if (bol)
+      i = 8;
+
+    if (bol)
+      i = 1;
+    if (bol)
+      i = 2;
+    if (bol)
+      i = 3;
+    if (bol)
+      i = 4;
+    if (bol)
+      i = 5;
+    if (bol)
+      i = 6;
+    if (bol)
+      i = 7;
+    if (bol)
+      i = 8;
+
+    if (bol)
+      i = 1;
+    if (bol)
+      i = 2;
+    if (bol)
+      i = 3;
+    if (bol)
+      i = 4;
+    if (bol)
+      i = 5;
+    if (bol)
+      i = 6;
+    if (bol)
+      i = 7;
+    if (bol)
+      i = 8;
+
+    return i;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+
+    i = 8;
+    return i;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead08/dead08.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead08/dead08.java
new file mode 100644
index 00000000000..fffd3cdee29
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead08/dead08.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead08.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead08.dead08
+ */
+
+package vm.compiler.jbe.dead.dead08;
+
+/* -- Test the elimination of dead assignment to class fields within an IF statement
+
+In the example below, the values assigned to i1-i7 in struct within th IF statement are never used,thus can be eliminated.
+
+ */
+
+class struct {
+    int i1 = 2;
+    int i2 = 3;
+    int i3 = 4;
+    int i4 = 5;
+    int i5 = 6;
+    int i6 = 7;
+    int i7 = 8;
+    int i8 = 9;
+}
+
+public class dead08 {
+  boolean bol = true;
+
+  public static void main(String args[]) {
+    dead08 dce = new dead08();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead08 Passed.");
+    } else {
+      throw new Error("Test dead08 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    struct s = new struct();
+
+    if (bol)
+      s.i1 = 1;
+    if (bol)
+      s.i2 = 2;
+    if (bol)
+      s.i3 = 3;
+    if (bol)
+      s.i4 = 4;
+    if (bol)
+      s.i5 = 5;
+    if (bol)
+      s.i6 = 6;
+    if (bol)
+      s.i7 = 7;
+    if (bol)
+      s.i8 = 8;
+
+    if (bol)
+      s.i1 = 1;
+    if (bol)
+      s.i2 = 2;
+    if (bol)
+      s.i3 = 3;
+    if (bol)
+      s.i4 = 4;
+    if (bol)
+      s.i5 = 5;
+    if (bol)
+      s.i6 = 6;
+    if (bol)
+      s.i7 = 7;
+    if (bol)
+      s.i8 = 8;
+
+    if (bol)
+      s.i1 = 1;
+    if (bol)
+      s.i2 = 2;
+    if (bol)
+      s.i3 = 3;
+    if (bol)
+      s.i4 = 4;
+    if (bol)
+      s.i5 = 5;
+    if (bol)
+      s.i6 = 6;
+    if (bol)
+      s.i7 = 7;
+    if (bol)
+      s.i8 = 8;
+
+    return s.i8;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    struct s = new struct();
+
+    s.i8 = 8;
+    return s.i8;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead09/dead09.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead09/dead09.java
new file mode 100644
index 00000000000..673090936cf
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead09/dead09.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead09.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead09.dead09
+ */
+
+package vm.compiler.jbe.dead.dead09;
+
+// dead09.java
+
+/* -- Test the elimination of dead assignment to local variable within an IF-ELSE-IF statement.
+      Example:
+
+      boolean bol;
+      void foo()
+      {
+         int i;
+
+         if (bol) i = 1;
+         else if (bol) i = 2;
+         else if (bol) i = 3;
+      }
+
+All of the assignments to i, but the first one, are dead and can be eliminated.
+
+ */
+
+public class dead09 {
+  boolean bol = true;
+
+  public static void main(String args[]) {
+    dead09 dce = new dead09();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead09 Passed.");
+    } else {
+      throw new Error("Test dead09 Failed: f()=" + dce.f() + " != fopt()=" +dce.fopt());
+    }
+  }
+
+  int f() {
+    int i = 0;
+
+    if (bol)
+      i = 1;
+    else if (bol)
+      i = 2;
+    else if (bol)
+      i = 3;
+    else if (bol)
+      i = 4;
+    else if (bol)
+      i = 5;
+    else if (bol)
+      i = 6;
+    else if (bol)
+      i = 7;
+    else if (bol)
+      i = 8;
+
+    if (bol)
+      i = 1;
+    else if (bol)
+      i = 2;
+    else if (bol)
+      i = 3;
+    else if (bol)
+      i = 4;
+    else if (bol)
+      i = 5;
+    else if (bol)
+      i = 6;
+    else if (bol)
+      i = 7;
+    else if (bol)
+      i = 8;
+
+    if (bol)
+      i = 1;
+    else if (bol)
+      i = 2;
+    else if (bol)
+      i = 3;
+    else if (bol)
+      i = 4;
+    else if (bol)
+      i = 5;
+    else if (bol)
+      i = 6;
+    else if (bol)
+      i = 7;
+    else if (bol)
+      i = 8;
+
+    return i;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    int i = 0;
+
+    i = 1;
+    return i;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead10/dead10.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead10/dead10.java
new file mode 100644
index 00000000000..2886bef44da
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead10/dead10.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead10.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead10.dead10
+ */
+
+package vm.compiler.jbe.dead.dead10;
+
+// dead10.java
+
+/* -- Test the elimination of dead integer and boolean expressions
+      Example:
+
+      int x, y, z;
+      boolean a, b, c;
+      void foo()
+      {
+         int r;
+         r = x + y * z;
+         a = x == y;
+      }
+
+In the example below, the values assigned to i1-i13 are dead in the first couple assignments and can be eliminated. In addition, boolean values assigned to i14-i18 are dead and never come to play, thus can be eliminated. This test tests the elimination of integer expresions with the operators addition, subtraction, negation, multiplication, division, modulus, logical negation, bitwise complement, bitwise and, bitwise or, bitwise xor, logical and logical or, question/colon, comma, right shift, left shift, less than, greater than, equal, and not equal.
+
+
+ */
+
+public class dead10 {
+  int i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13;
+  boolean i14, i15, i16, i17, i18;
+  int j = 21;
+  boolean bol = true;
+
+  public static void main(String args[]) {
+    dead10 dce = new dead10();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead10 Passed.");
+    } else {
+      throw new Error("Test dead10 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    int res;
+
+    i1 = j + 1;
+    i2 = j - 1;
+    i3 = j * 3;
+    i4 = j / 31;
+    i5 = j % 71;
+    i6 = j << 3;
+    i7 = j >> 4;
+    i8 = j >>> 5;
+    i9 = bol ? 7 : 9;
+    i10 = ~j;
+    i11 = j & 3;
+    i12 = j | 4;
+    i13 = j ^ 4;
+    i14 = bol && (j < 3);
+    i15 = bol || (j > 4);
+    i16 = !bol;
+    i17 = j == 9;
+    i18 = j != 10;
+
+    res = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12 + i13;
+    i14 = i14 && i15 && i16 && i17 && i18;
+
+    i1 = j + 1;
+    i2 = j - 1;
+    i3 = j * 3;
+    i4 = j / 31;
+    i5 = j % 71;
+    i6 = j << 3;
+    i7 = j >> 4;
+    i8 = j >>> 5;
+    i9 = bol ? 7 : 9;
+    i10 = ~j;
+    i11 = j & 3;
+    i12 = j | 4;
+    i13 = j ^ 4;
+    i14 = bol && (j < 3);
+    i15 = bol || (j > 4);
+    i16 = !bol;
+    i17 = j == 9;
+    i18 = j != 10;
+
+    res = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12 + i13;
+    i14 = i14 && i15 && i16 && i17 && i18;
+
+    i1 = j + 1;
+    i2 = j - 1;
+    i3 = j * 3;
+    i4 = j / 31;
+    i5 = j % 71;
+    i6 = j << 3;
+    i7 = j >> 4;
+    i8 = j >>> 5;
+    i9 = bol ? 7 : 9;
+    i10 = ~j;
+    i11 = j & 3;
+    i12 = j | 4;
+    i13 = j ^ 4;
+    i14 = bol && (j < 3);
+    i15 = bol || (j > 4);
+    i16 = !bol;
+    i17 = j == 9;
+    i18 = j != 10;
+
+    res = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12 + i13;
+    i14 = i14 && i15 && i16 && i17 && i18;
+
+
+    return res;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    int res;
+
+    i1 = j + 1;
+    i2 = j - 1;
+    i3 = j * 3;
+    i4 = j / 31;
+    i5 = j % 71;
+    i6 = j << 3;
+    i7 = j >> 4;
+    i8 = j >>> 5;
+    i9 = bol ? 7 : 9;
+    i10 = ~j;
+    i11 = j & 3;
+    i12 = j | 4;
+    i13 = j ^ 4;
+
+    res = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12 + i13;
+    return res;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead11/dead11.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead11/dead11.java
new file mode 100644
index 00000000000..2c2fae7a534
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead11/dead11.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead11.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead11.dead11
+ */
+
+package vm.compiler.jbe.dead.dead11;
+
+// dead11.java
+
+/* -- Test the elimination of dead assignments to a local array
+      Example:
+
+      void foo()
+      {
+         int arr[] = new int[SIZE];
+         arr[1] = 3;
+      }
+
+In the example below, most of the assignments to the local array a[] are dead and can be eliminated.
+ */
+
+public class dead11 {
+  int SIZE = 30;
+
+  public static void main(String args[]) {
+    dead11 dce = new dead11();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead11 Passed.");
+    } else {
+      throw new Error("Test dead11 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    int a[] = new int[SIZE];
+
+    a[0] = 0;
+    a[1] = 1;
+    a[2] = 2;
+    a[3] = 3;
+    a[4] = 4;
+    a[5] = 5;
+    a[6] = 6;
+    a[7] = 7;
+    a[8] = 8;
+    a[9] = 9;
+    a[10] = 10;
+    a[11] = 11;
+    a[12] = 12;
+    a[13] = 13;
+    a[14] = 14;
+    a[15] = 15;
+    a[16] = 16;
+    a[17] = 17;
+    a[18] = 18;
+    a[19] = 19;
+    a[20] = 20;
+    a[21] = 21;
+    a[22] = 22;
+    a[23] = 23;
+    a[24] = 24;
+    a[25] = 25;
+    a[26] = 26;
+    a[27] = 27;
+    a[28] = 28;
+    a[29] = 29;
+
+    return a[12];
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    int a[] = new int[SIZE];
+
+    a[12] = 12;
+    return a[12] = 12;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead12/dead12.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead12/dead12.java
new file mode 100644
index 00000000000..100d5e55959
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead12/dead12.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead12.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead12.dead12
+ */
+
+package vm.compiler.jbe.dead.dead12;
+
+// dead12.java
+
+/* -- Test the elimination of dead assignments to a local array within IF statement
+      Example:
+
+      boolean bol = true;
+      void foo()
+      {
+         int arr[] = new int[SIZE];
+         if (bol) arr[1] = 3;
+      }
+
+In the example below, most of the assignments to the local array a[] are dead and can be eliminated.
+ */
+
+public class dead12 {
+  int SIZE = 30;
+  boolean bol = true;
+
+  public static void main(String args[]) {
+    dead12 dce = new dead12();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead12 Passed.");
+    } else {
+      throw new Error("Test dead12 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+
+    int a[] = new int[SIZE];
+
+    if (bol)
+      a[0] = 0;
+    if (bol)
+      a[1] = 1;
+    if (bol)
+      a[2] = 2;
+    if (bol)
+      a[3] = 3;
+    if (bol)
+      a[4] = 4;
+    if (bol)
+      a[5] = 5;
+    if (bol)
+      a[6] = 6;
+    if (bol)
+      a[7] = 7;
+    if (bol)
+      a[8] = 8;
+    if (bol)
+      a[9] = 9;
+    if (bol)
+      a[10] = 10;
+    if (bol)
+      a[11] = 11;
+    if (bol)
+      a[12] = 12;
+    if (bol)
+      a[13] = 13;
+    if (bol)
+      a[14] = 14;
+    if (bol)
+      a[15] = 15;
+    if (bol)
+      a[16] = 16;
+    if (bol)
+      a[17] = 17;
+    if (bol)
+      a[18] = 18;
+    if (bol)
+      a[19] = 19;
+    if (bol)
+      a[20] = 20;
+    if (bol)
+      a[21] = 21;
+    if (bol)
+      a[22] = 22;
+    if (bol)
+      a[23] = 23;
+    if (bol)
+      a[24] = 24;
+    if (bol)
+      a[25] = 25;
+    if (bol)
+      a[26] = 26;
+    if (bol)
+      a[27] = 27;
+     if (bol)
+       a[28] = 28;
+    if (bol)
+      a[29] = 29;
+
+    return a[12];
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    int a[] = new int[SIZE];
+
+    a[12] = 12;
+    return a[12] = 12;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead13/dead13.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead13/dead13.java
new file mode 100644
index 00000000000..a819e2bff42
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead13/dead13.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead13.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead13.dead13
+ */
+
+package vm.compiler.jbe.dead.dead13;
+
+// dead13.java
+
+/* -- Test the elimination of dead assignments to a chain of array references.
+      Example:
+
+      void foo()
+      {
+         int arr[] = new int[SIZE];
+         arr[0] = 0;
+         arr[1] = arr[0];
+         arr[2] = arr[1];
+      }
+
+The assignmnet to arr[2] is dead.  Therefore, arr[1] is not referenced, and the assignment to arr[1] is dead, as is the assignment to arr[0].
+ */
+
+public class dead13 {
+  int SIZE = 30;
+
+  public static void main(String args[]) {
+    dead13 dce = new dead13();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead13 Passed.");
+    } else {
+      throw new Error("Test dead13 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+
+    int a[] = new int[SIZE];
+
+    a[0] = 0;
+    a[1] = a[0] + 1;
+    a[2] = a[1] + 2;
+    a[3] = a[2] + 3;
+    a[4] = a[3] + 4;
+    a[5] = a[4] + 5;
+    a[6] = a[5] + 6;
+    a[7] = a[6] + 7;
+    a[8] = a[7] + 8;
+    a[9] = a[8] + 9;
+    a[10] = a[9] + 10;
+    a[11] = a[10] + 11;
+    a[12] = a[11] + 12;
+    a[13] = a[12] + 13;
+    a[14] = a[13] + 14;
+    a[15] = a[14] + 15;
+    a[16] = a[15] + 16;
+    a[17] = a[16] + 17;
+    a[18] = a[17] + 18;
+    a[19] = a[18] + 19;
+    a[20] = a[19] + 20;
+    a[21] = a[20] + 21;
+    a[22] = a[21] + 22;
+    a[23] = a[22] + 23;
+    a[24] = a[23] + 24;
+    a[25] = a[24] + 25;
+    a[26] = a[25] + 26;
+    a[27] = a[26] + 27;
+    a[28] = a[27] + 28;
+    a[29] = a[28] + 29;
+
+    return a[1];
+  }
+  // Code fragment after dead code elimination
+  int fopt() {
+    int a[] = new int[SIZE];
+
+    a[0] = 0;
+    a[1] = a[0] + 1;
+
+    return a[1];
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead14/dead14.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead14/dead14.java
new file mode 100644
index 00000000000..986c4f5d9ac
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead14/dead14.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead14.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead14.dead14
+ */
+
+package vm.compiler.jbe.dead.dead14;
+
+// dead14.java
+
+/* -- Test the elimination of dead assignments to a chain of array references.
+      Example:
+
+      void foo()
+      {
+         int arr[] = new int[SIZE];
+         boolean bol = true;
+         if (bol) arr[0] = 0;
+         if (bol) arr[1] = arr[0];
+         if (bol) arr[2] = arr[1];
+      }
+
+arr[2] is not referenced, therfore the assignmnet to arr[2] is dead.  Likewise, the assignments to arr[1] and arr[0] are also dead. Thus all this code can be eliminated.
+ */
+
+public class dead14 {
+  int SIZE = 30;
+
+  public static void main(String args[]) {
+    dead14 dce = new dead14();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead14 Passed.");
+    } else {
+      throw new Error("Test dead14 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+  int f() {
+    int a[] = new int[SIZE];
+    int j = 1;
+
+    if (j != 0)
+      a[0] = 0;
+    if (j != 0)
+      a[1] = a[0] + 1;
+    if (j != 0)
+      a[2] = a[1] + 2;
+    if (j != 0)
+      a[3] = a[2] + 3;
+    if (j != 0)
+      a[4] = a[3] + 4;
+    if (j != 0)
+      a[5] = a[4] + 5;
+    if (j != 0)
+      a[6] = a[5] + 6;
+    if (j != 0)
+      a[7] = a[6] + 7;
+    if (j != 0)
+      a[8] = a[7] + 8;
+    if (j != 0)
+       a[9] = a[8] + 9;
+    if (j != 0)
+      a[10] = a[9] + 10;
+    if (j != 0)
+      a[11] = a[10] + 11;
+    if (j != 0)
+      a[12] = a[11] + 12;
+    if (j != 0)
+      a[13] = a[12] + 13;
+    if (j != 0)
+      a[14] = a[13] + 14;
+    if (j != 0)
+      a[15] = a[14] + 15;
+    if (j != 0)
+      a[16] = a[15] + 16;
+    if (j != 0)
+      a[17] = a[16] + 17;
+    if (j != 0)
+      a[18] = a[17] + 18;
+    if (j != 0)
+      a[19] = a[18] + 19;
+    if (j != 0)
+      a[20] = a[19] + 20;
+    if (j != 0)
+      a[21] = a[20] + 21;
+    if (j != 0)
+      a[22] = a[21] + 22;
+    if (j != 0)
+      a[23] = a[22] + 23;
+    if (j != 0)
+      a[24] = a[23] + 24;
+    if (j != 0)
+      a[25] = a[24] + 25;
+    if (j != 0)
+      a[26] = a[25] + 26;
+    if (j != 0)
+      a[27] = a[26] + 27;
+    if (j != 0)
+      a[28] = a[27] + 28;
+    if (j != 0)
+      a[29] = a[28] + 29;
+
+    return a[1];
+  }
+  // Code fragment after dead code elimination
+  int fopt() {
+    int a[] = new int[SIZE];
+    int j = 1;
+
+    if (j != 0)
+      a[0] = 0;
+    if (j != 0)
+      a[1] = a[0] + 1;
+
+    return a[1];
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead15/dead15.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead15/dead15.java
new file mode 100644
index 00000000000..4876deca0b0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead15/dead15.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead15.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead15.dead15
+ */
+
+package vm.compiler.jbe.dead.dead15;
+
+// dead15.java
+
+/* -- Test the elimination of a global variable assignment to itself.
+      Example:
+
+      int bar;
+      void foo()
+      {
+         bar = bar;
+      }
+
+      The assignment to bar can be eliminated. Though assignments of this
+      nature are unlikley to occur in an original code, it can actually
+      happen as a result of other optimizations. For example, consider the
+      following assignments after constant propagation.
+
+      bat = 0;
+      bar = bar + bat;
+
+      After constant propagation, the second statement becomes bar = bar + 0,
+      or bar = bar.  This test ensures that the final transformation, (i.e.
+      the elimination of this assignment) will occur.
+ */
+
+
+public class dead15 {
+  int i00=0, i01=1, i02=2, i03=3, i04=4;
+  int i05=5, i06=6, i07=7, i08=8, i09=9;
+  int i10=10, i11=11, i12=12, i13=13, i14=14;
+  int i15=15, i16=16, i17=17, i18=18, i19=19;
+
+  public static void main(String args[]) {
+    dead15 dce = new dead15();
+
+    System.out.println("f()="+dce.f()+"; fopt()="+dce.fopt());
+    if (dce.f() == dce.fopt()) {
+      System.out.println("Test dead15 Passed.");
+    } else {
+      throw new Error("Test dead15 Failed: f()=" + dce.f() + " != fopt()=" + dce.fopt());
+    }
+  }
+
+
+  int f() {
+    i00 = i00;
+    i01 = i01;
+    i02 = i02;
+    i03 = i03;
+    i04 = i04;
+    i05 = i05;
+    i06 = i06;
+    i07 = i07;
+    i08 = i08;
+    i09 = i09;
+    i10 = i10;
+    i11 = i11;
+    i12 = i12;
+    i13 = i13;
+    i14 = i14;
+    i15 = i15;
+    i16 = i16;
+    i17 = i17;
+    i18 = i18;
+    i19 = i19;
+
+    return i19;
+  }
+
+  // Code fragment after dead code elimination
+  int fopt() {
+    return i19;
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead16/dead16.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead16/dead16.java
new file mode 100644
index 00000000000..7794d988dc2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead16/dead16.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/dead/dead16.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.dead.dead16.dead16
+ */
+
+package vm.compiler.jbe.dead.dead16;
+
+// dead16.java
+
+/* -- Test the elimination of redundant code.
+      Example:
+
+      double x;
+      x = x + 0;
+      x = x + 1;
+      x = x - 1;
+      return x;
+ */
+class doit {
+    static final double pause1(double x) {
+        for(int k = 1; k <= 10000; k++) {
+            x = x + 1.0;
+        }
+        return x;
+    }
+
+    static final double pause2(double x) {
+        for(int k = 1; k <= 10000; k++) {
+            x = x - 1.0;
+        }
+        return x;
+    }
+}
+
+public class dead16 {
+    static double c = 1;
+    static double z = 0;
+    public static void main(String args[]) {
+
+        System.out.println("un_optimized()="+un_optimized()+"; hand_optimized()="+hand_optimized());
+        if (un_optimized() == hand_optimized()) {
+            System.out.println("Test dead16 Passed.");
+        } else {
+            throw new Error("Test dead16 Failed: un_optimized()=" + un_optimized() + " != hand_optimized()=" + hand_optimized());
+        }
+    }
+
+    static double un_optimized() {
+        double x = 1;
+        // example 1
+        x = x + 0;
+        x = x - 0;
+        x = x * 1;
+        x = x / 1;
+
+        // example 2
+        x = x + c;
+        x = x - c;
+        x = x * c;
+        x = x / c;
+
+        // example 3
+        x = x + z;
+        x = x - z;
+        x = x * (z + c);
+
+        // example 4
+        x = doit.pause1(x);
+        x = doit.pause2(x);
+        x = doit.pause2(x);
+        x = doit.pause1(x);
+        x = doit.pause1(x);
+        x = doit.pause1(x);
+        x = doit.pause2(x);
+        x = doit.pause1(x);
+        x = doit.pause2(x);
+        x = doit.pause2(x);
+        x = doit.pause2(x);
+        x = doit.pause1(x);
+
+        return x;
+    }
+
+    // Code fragment after redundent code elimination
+    static double hand_optimized() {
+        int k;
+        double x = 1;
+        // example 1
+
+        // example 2
+
+        // example 3
+
+        // example 4
+        k = 10001;
+
+        return x;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/README
new file mode 100644
index 00000000000..3406fed8102
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/README
@@ -0,0 +1,30 @@
+Copyright (c) 2002, 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.
+
+LOOP INVARIANT COMPUTATIONS
+
+Loop-invariant is any part of a computation within a loop that does not depend
+on the loop variables and whose value does not change as long as control stays
+within the loop. Loop-invarians assignments may be moved out of the loop
+entirely. There may be some situations where you know the value won't vary, but
+the compiler is playing it safe in case of side-effects. "Computation" here
+doesn't mean just arithmetic; array indexing, calls to pure functions are all
+possible candidates for moving out of the loop.
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist01/hoist01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist01/hoist01.java
new file mode 100644
index 00000000000..9fb22639fa9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist01/hoist01.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/hoist/hoist01.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.hoist.hoist01.hoist01
+ */
+
+package vm.compiler.jbe.hoist.hoist01;
+
+// hoist01.java
+
+/* -- Test hoist invariant code of double expression. This eliminates unnecessary recomputations of invariant expressions in loops.
+     Example:
+
+     double a[];
+     double x, y, z;
+     for (i = 0; i < 100; i++)
+        a[i] = (x + y)*z;
+ */
+
+public class hoist01 {
+    final static double PI=3.14159;
+    int LEN = 5000;
+    double a[] = new double[LEN];
+    double aopt[] = new double[LEN];
+    int i1=1, i2=2, i3=3, i4=4, i5=5, i6=6, i7=7, i8=8;
+    int i9=9, i10=10, i11=11, i12=12, i13=13, i14=14, i15=15;
+
+    public static void main(String args[]) {
+        hoist01 hst = new hoist01();
+
+        hst.f();
+        hst.fopt();
+        if (hst.eCheck()) {
+            System.out.println("Test hoist01 Passed.");
+        } else {
+            throw new Error("Test hoist01 Failed.");
+        }
+    }
+
+    void f() {
+        // Non-optimized version: i1 through i15 are invariants
+        for (int i = 1; i < a.length; i++) {
+            a[0] = Math.sin(2 * PI * Math.pow(1/PI,3));
+            a[i] = a[0] + (i1 + i2)*PI + i3 + i4 + i5/i6*i7 +
+                i9%i8 + i10*(i11*i12) + i13 + i14 + i15;
+        }
+    }
+
+    // Code fragment after the invariant expression is hoisted out of the loop.
+    void fopt() {
+        double t;
+
+        aopt[0] = Math.sin(2 * PI * Math.pow(1/PI,3));
+        t = aopt[0] + (i1 + i2)*PI + i3 + i4 + i5/i6*i7 +
+            i9%i8 + i10*(i11*i12) + i13 + i14 + i15;
+
+        for (int i = 1; i < aopt.length; i++) {
+            aopt[i] = t;
+        }
+    }
+
+    // Check Loop Hoisting results
+    boolean eCheck() {
+        for (int i = 0; i < a.length; i++)
+            if (a[i] != aopt[i])
+                return false;
+
+        return true;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist02/hoist02.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist02/hoist02.java
new file mode 100644
index 00000000000..7c3167ba89a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist02/hoist02.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/hoist/hoist02.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.hoist.hoist02.hoist02
+ */
+
+package vm.compiler.jbe.hoist.hoist02;
+
+// hoist02.java
+
+/* -- Test hoist invariant code of integer expression. This eliminates unnecessary recomputations of invariant expressions in loops.
+
+     Example:
+
+     int a[];
+     int x, y, z;
+     for (i = 0; i < 100; i++)
+        a[i] = (x + y)*z;
+ */
+
+public class hoist02 {
+    int LEN = 5000;
+    int a[] = new int[LEN];
+    int aopt[] = new int[LEN];
+    boolean bool_val = true;
+    int i1 = 1, i2 = 2, i3 = 3, i4 = 4, i5 = 5, i6 = 6, i7 = 7, i8 = 8, i9 = 9;
+
+    public static void main(String args[]) {
+        hoist02 hst = new hoist02();
+
+        hst.f();
+        hst.fopt();
+        if (hst.eCheck()) {
+            System.out.println("Test hoist02 Passed.");
+        } else {
+            throw new Error("Test hoist02 Failed.");
+        }
+    }
+
+    void f() {
+        // Non-optimized version: i1 through i9 are invariants
+        int i = 0;
+
+        do
+            a[i++] = bool_val ? (i1+i2+i3+i4+i5+i6+i7+i8+i9) : (i1*i2*i3*i4*i5*i6*i7*i8*i9);
+        while (i < a.length);
+    }
+
+    // Code fragment after the invariant expression is hoisted out of the loop.
+    void fopt() {
+        int i = 0;
+        int t =  bool_val ? (i1+i2+i3+i4+i5+i6+i7+i8+i9) : (i1*i2*i3*i4*i5*i6*i7*i8*i9);
+
+        do
+            aopt[i++] = t;
+        while (i < aopt.length);
+    }
+
+    // Check Loop Hoisting results
+    boolean eCheck() {
+        for (int i = 0; i < a.length; i++)
+            if (a[i] != aopt[i]) {
+                System.out.println("a["+i+"]="+a[i]+"; aopt["+i+"]="+aopt[i]);
+                return false;
+            }
+
+        return true;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist03/hoist03.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist03/hoist03.java
new file mode 100644
index 00000000000..5c87dfbcfa5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist03/hoist03.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/hoist/hoist03.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.hoist.hoist03.hoist03
+ */
+
+package vm.compiler.jbe.hoist.hoist03;
+
+
+// hoist03.java
+
+/* -- Loop invariant if-then code where the "then" branch is always executed.
+      Example:
+
+      double  foo_static[5000];
+      for(i=0 ; i<100 ; i++) {
+         if (i < 0) {
+                foo_static[k] = -1.;
+         }
+         else {
+                foo_static[k] = +1.;
+         }
+      }
+
+      Can the optimizer break the code up to avoid re-checking the conditional assignment      within the loop when it is known that i will never be < 0 during that loop.
+
+ */
+
+public class hoist03 {
+    int LEN = 60000;
+    int a[] = new int[LEN];
+    int aopt[] = new int[LEN];
+
+    public static void main(String args[]) {
+        hoist03 hst = new hoist03();
+
+        hst.f();
+        hst.fopt();
+        if (hst.eCheck()) {
+            System.out.println("Test hoist03 Passed.");
+        } else {
+            throw new Error("Test hoist03 Failed.");
+        }
+    }
+
+    void f() {
+        // i is always > 0, hence the conditional statement i < 0 is loop invariant.
+        int k = 0;
+
+        for (int j = 0; j < 200; j++) {
+            for (int i = 0; i < 300; i++) {
+                if (i < 0) {
+                    a[k++] = -1;
+                }
+                else {
+                    a[k++] = 1;
+                }
+            }
+        }
+    }
+
+
+    // Code fragment after the invariant expression is hoisted out of the loop.
+    void fopt() {
+        int k = 0;
+
+        for (int j = 0; j < 200; j++) {
+            for (int i = 0; i < 300; i++) {
+                aopt[k++] = 1;
+            }
+        }
+    }
+
+
+    // Check Loop Hoisting results
+    boolean eCheck() {
+        for (int i = 0; i < a.length; i++)
+            if (a[i] != aopt[i]) {
+                System.out.println("a["+i+"]="+a[i]+"; aopt["+i+"]="+aopt[i]);
+                return false;
+            }
+
+        return true;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist04/hoist04.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist04/hoist04.java
new file mode 100644
index 00000000000..622118dce6d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist04/hoist04.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/hoist/hoist04.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.hoist.hoist04.hoist04
+ */
+
+package vm.compiler.jbe.hoist.hoist04;
+
+// hoist04.java
+
+/* -- Test hoist invariant code in conversion of integer to double in a do..while loop.
+     Example:
+
+     double a[];
+     int x, y, z;
+     for (i = 0; i < 100; i++)
+        a[i] = (double)(x + y)*z;
+
+     x, y, and z are loop invariants and can be hoisted out of the loop and calculated only once.
+ */
+
+public class hoist04 {
+    int LEN = 5000;
+    double a[] = new double[LEN];
+    double aopt[] = new double[LEN];
+    boolean bool_val = true;
+    int i1 = 1, i2 = 2, i3 = 3, i4 = 4, i5 = 5, i6 = 6, i7 = 7, i8 = 8, i9 = 9;
+
+    public static void main(String args[]) {
+        hoist04 hst = new hoist04();
+
+        hst.f();
+        hst.fopt();
+        if (hst.eCheck()) {
+            System.out.println("Test hoist04 Passed.");
+        } else {
+            throw new Error("Test hoist04 Failed.");
+        }
+    }
+
+    // Non-optimized version: i1 through i9 are the invariants
+    void f() {
+        int i = 0;
+
+        do
+            a[i++] = bool_val ? (double)(i1+i2+i3+i4+i5+i6+i7+i8+i9) : (double)(i1*i2*i3*i4*i5*i6*i7*i8*i9);
+        while (i < a.length);
+    }
+
+    // Code fragment after the invariant expression is hoisted out of the loop.
+    void fopt() {
+        int i = 0;
+        int t =  bool_val ? (i1+i2+i3+i4+i5+i6+i7+i8+i9) : (i1*i2*i3*i4*i5*i6*i7*i8*i9);
+
+        do
+            aopt[i++] = (double)t;
+        while (i < aopt.length);
+    }
+
+    // Check Loop Hoisting results
+    boolean eCheck() {
+        for (int i = 0; i < a.length; i++)
+            if (a[i] != aopt[i]) {
+                System.out.println("a["+i+"]="+a[i]+"; aopt["+i+"]="+aopt[i]);
+                return false;
+            }
+
+        return true;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/strengthreduc/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/strengthreduc/README
new file mode 100644
index 00000000000..428735e61b4
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/strengthreduc/README
@@ -0,0 +1,45 @@
+Copyright (c) 2002, 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.
+
+Strength Reduction
+------------------
+
+Strength reduction replaces an expansive operation by a cheaper one, such as
+multiplication by addition or subtraction, multiplication instead of
+exponentiation; use compound assignment operators such as += wherever possible,
+changing code of the form a[i] = a[i] + x to a[i] += x, since they result in
+fewer bytecode instructions; use shifts instead of multiplication by powers of
+two, etc.
+
+For example:
+
+	x ** 2  = x * x
+	2.0 * x = x + x
+	x / 2   = x * 0.5
+
+
+Induction Variable
+------------------
+
+A variable is called an induction variables of a loop if every time the variable
+changes values it is incremented or decrmented by some constant.
+Basic induction variables i whose only assignments within the loop is of the
+form i += c, where c is a constant.
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/README
new file mode 100644
index 00000000000..9309979a84a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/README
@@ -0,0 +1,111 @@
+Copyright (c) 2002, 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.
+
+Eliminating common sub-expressions
+----------------------------------
+
+An expression E is called a common subexpression if E is previously computed,
+and the values of variables in E have not changed since the previous computation.
+We can then avoid recomputing the expression and use the previously computed value.
+
+Consider the assignment statements below:
+
+     -------------------------------------------
+     |   Normal Code     |    Optimized Code   |
+     -------------------------------------------
+     |   T1 = B + C      |    T1 = B + C       |
+     |   T2 = T1 - D     |    T2 = T1 - D      |
+     |   A  = T2         |    A  = T2          |
+     |   T3 = B + C      |    X  = T2          |
+     |   T4 = T3 - D     |                     |
+     |   X  = T4         |                     |
+     -------------------------------------------
+
+Notice that the expression assigned to T3 has already been computed and assigned
+to T1, hence T3 is not needed, and T1 can be used instead.
+
+Associative laws may also be applied to expose common subexpressions.
+
+Example 1
+---------
+if the source code has the assignments
+
+	a = b + c;
+	e = c + d + b;
+
+the following intermediate code might be generated:
+	a = b + c;
+	t = c + d;
+	e = t + b;
+
+If t is not needed outside of this block, this sequence can be changed to
+	a = b + c;
+	e = a + d;
+
+Using both the associativity and commutativity of +.
+
+Example 2
+---------
+        X = A * LOG(Y) + (LOG(Y) ** 2)
+
+We introduce an explicit temporary variable t:
+
+        t = LOG(Y)
+        X = A * t + (t ** 2)
+
+We saved one 'heavy' function call, by an elimination of
+the common sub-expression LOG(Y), now we will save the
+exponentiation by:
+
+        X = (A + t) * t
+
+which is much better. This is an old optimization trick that compilers are able to
+perform quite well.
+
+Example 3 - computing the value of a polynomial
+-----------------------------------------------
+Eliminating Common Subexpressions may inspire good algorithms like
+the classic 'Horner's rule' for computing the value of a polynomial.
+
+        y = A + B*x + C*(x**2) + D*(x**3)       (canonical form)
+
+It is more efficient (i.e. executes faster) to perform the two
+exponentiations by converting them to multiplications. In this way we
+will get 3 additions and 5 multiplications in all.
+
+The following forms are more efficient to compute, they require less
+operations, and the operations that are saved are the 'heavy' ones
+(multiplication is an operation that takes a lot of CPU time, much more
+than addition).
+
+Stage #1:
+
+        y = A + (B + C*x + D*(x**2))*x
+
+Stage #2 and last:
+
+        y => A + (B + (C + D*x)*x)*x
+
+The last form requires 3 additions and only 3 multiplications!
+
+The algorithm hinted here, can be implemented with one loop to compute
+an arbitrary order polynomial. It may also be better numerically than
+direct computation of the canonical form.
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon01/subcommon01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon01/subcommon01.java
new file mode 100644
index 00000000000..6ab92ef2186
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon01/subcommon01.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/subcommon/subcommon01.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.subcommon.subcommon01.subcommon01
+ */
+
+package vm.compiler.jbe.subcommon.subcommon01;
+
+/* -- Common subexpression elimination testing
+Using both global and local common subexpressions in methods b5()
+and b6() below to test common subexpression.
+ */
+
+import java.io.PrintStream;
+import java.lang.Exception;
+
+public class subcommon01 {
+  static final int LEN = 500;
+
+  public static void main(String args[]) {
+    double a[]  = new double[LEN];
+    double ao[] = new double[LEN];
+
+    Preopt preOptRun = new Preopt();
+    initAr(a);
+    preOptRun.b1(a);
+    preOptRun.b2(a);
+    preOptRun.b3(a);
+    preOptRun.b5(a);
+    preOptRun.b2(a);
+    preOptRun.b6(a);
+
+    Opt optRun = new Opt();
+    initAr(ao);
+    optRun.b1(ao);
+    optRun.b2(ao);
+    optRun.b3(ao);
+    optRun.b5(ao);
+    optRun.b2(ao);
+    optRun.b6(ao);
+
+    eCheck(a, ao);
+  }
+
+  static int getLen() {
+    return LEN;
+  }
+
+  static void initAr(double arr[]) {
+    double r1, r2, r3;
+    for (int r=0; r<LEN; r++) {
+      r1 = LEN/(r+1);
+      r2 = Math.sqrt(r1*r1);
+      r3 = Math.sin(r2);
+      arr[r] = r2/r3;
+    }
+  }
+
+  static void pt(double arr[]) {
+    System.out.println();
+    for (int k=0; k<10; k++)
+      System.out.print("a["+k+"]="+arr[k]);
+  }
+
+  static void eCheck(double b1[], double b2[]) {
+    for (int k = 0; k < LEN; k++) {
+      if (b1[k] != b2[k]) {
+        System.out.println("eCheck fails in a["+k+"]");
+        System.out.println("a ["+k+"]="+b1[k]);
+        System.out.println("ao["+k+"]="+b2[k]);
+        System.out.println("Test subcommon01 Failed.");
+        throw new Error("Test subcommon01 Failed: eCheck fails in a[" + k + "]. a[" + k + "]=" + b1[k] + " != ao[" + k + "]=" + b2[k]);
+      }
+    }
+    System.out.println("Test subcommon01 Passed.");
+  }
+}
+
+class A {
+  int m = 81;
+  int n = 1;
+  int i = 0;
+  int j = 0;
+  double v;
+  double x = 1;
+  double t3 = 0;
+  double t5, t9, t14;
+  int t1, t2, t4;
+  int t6, t7, t8, t10;
+  int t11, t12, t13, t15;
+
+  void b1(double arr[]) {
+    i = m-1;
+    j = n;
+    t1 = 4*n;
+    try {
+      v = arr[t1];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      System.err.println("Bad input to subcommon01.b1. " +
+                         "Expected a smaller number than " + subcommon01.getLen() +
+                         ", got: ->" + t1 + "<-");
+      System.out.println( e );
+      System.exit(1);
+    }
+    //    System.out.println("Finish b1");
+  }
+
+  void b2(double arr[]) {
+      t2 = 4*(++i);
+      try {
+        t3 = arr[t2];
+      }
+      catch (ArrayIndexOutOfBoundsException e) {
+        System.err.println("Bad input to subcommon01.b2. " +
+                           "Expected a smaller number than " + subcommon01.getLen() +
+                           ", got: ->" + t2 + "<-");
+        System.out.println( e );
+        System.exit(1);
+      }
+      //    System.out.println("Finish b2");
+  }
+
+
+  void b3(double arr[]) {
+      t4 = 4*(--j);
+      try {
+        t5 = arr[t4];
+      }
+      catch (ArrayIndexOutOfBoundsException e) {
+        System.err.println("Bad input to subcommon01.b3. " +
+                           "Expected a smaller number than " + subcommon01.getLen() +
+                           ", got: ->" + t4 + "<-");
+        System.out.println( e );
+        System.exit(1);
+      }
+      //    System.out.println("Finish b3");
+  }
+}
+
+
+class Preopt extends A {
+  // Pre-optimized code
+  void b5(double arr[]) {
+    t6 = 4*i;
+    try {
+      x = arr[t6];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      System.err.println("Bad input to subcommon01.b5. " +
+                         "Expected a smaller number than " + subcommon01.getLen() +
+                         ", got: ->" + t6 + "<-");
+      System.out.println( e );
+      System.exit(1);
+    }
+    t7 = 4*i;
+    t8 = 4*j;
+    try {
+      t9 = arr[t8];
+      arr[t7] = t9;
+      t10 = 4*j;
+      arr[t10] = x;
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      System.out.println( e );
+      System.exit(1);
+    }
+    //    System.out.println("Finish b5");
+  }
+
+  void b6(double arr[]) {
+    t11 = 4*i;
+    t12 = 4*i;
+    t13 = 4*n;
+    try {
+      x = arr[t11];
+      t14 = arr[t13];
+      arr[t12] = t14;
+      t15 = 4*n;
+      arr[t15] = x;
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      System.out.println( e );
+      System.exit(1);
+    }
+    //    System.out.println("Finish b6");
+  }
+}
+
+class Opt extends A {
+  // The result of eliminating both global and local common subexpressions
+  // from methods b5() and b6() resides in methods bopt5() and bopt6() respectively.
+  void b5(double arropt[]) {
+    x = t3;
+    try {
+      arropt[t2] = t5;
+      arropt[t4] = x;
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      System.out.println( e );
+      System.exit(1);
+    }
+    //    System.out.println("Finish b5");
+  }
+
+  void b6(double arropt[]) {
+    x = t3;
+    try {
+      t14 = arropt[t1];
+      arropt[t2] = t14;
+      arropt[t1] = x;
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      System.out.println( e );
+      System.exit(1);
+    }
+    //    System.out.println("Finish b6");
+  }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon02/subcommon02.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon02/subcommon02.java
new file mode 100644
index 00000000000..4356bfea8dc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon02/subcommon02.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/subcommon/subcommon02.
+ * VM Testbase keywords: [runtime]
+ * VM Testbase comments: JDK-7190319
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.subcommon.subcommon02.subcommon02
+ */
+
+package vm.compiler.jbe.subcommon.subcommon02;
+
+/* -- Common subexpression elimination testing
+   Using global common subexpression in method fopt() to calculate x**n.
+ */
+import java.io.*;
+
+public class subcommon02 {
+    int LEN = 5000;
+    int WIDTH = 20;
+    int ngrt10000 = 0; // number of elements > 10,000
+    int ngrtO10000 = 0;
+    int ngrt1000 = 0; // number of elements > 1,000
+    int ngrtO1000 = 0;
+    int ngrt100 = 0; // number of elements > 100
+    int ngrtO100 = 0;
+    int nsmet100 = 0; // number of elements <= 100
+    int nsmetO100 = 0;
+    double a[][] = new double[LEN][WIDTH];
+    double aopt[][] = new double[LEN][WIDTH];
+
+    public static void main(String args[]) {
+        subcommon02 sce = new subcommon02();
+
+        sce.f();
+        sce.fopt();
+        if (sce.eCheck()) {
+            System.out.println("Test subcommon02 Passed.");
+        } else {
+            throw new Error("Test subcommon02 Failed.");
+        }
+    }
+
+
+    double nPower(int x, int pwr) {
+        return Math.pow(x, pwr); // x**pwr
+    }
+
+    // non-optimized version
+    void f() {
+        for (int x = 0; x < LEN; x++) {
+            for (int n = 0; n < WIDTH; n++) {
+                if (nPower(x, n) > 10000) {
+                    a[x][n] = nPower(x, n);
+                    ngrt10000++;
+                }
+                else if (nPower(x, n) > 1000) {
+                    a[x][n] = nPower(x, n);
+                    ngrt1000++;
+                }
+                else if (nPower(x, n) > 100) {
+                    a[x][n] = nPower(x, n);
+                    ngrt100++;
+                }
+                else {
+                    a[x][n] = nPower(x, n);
+                    nsmet100++;
+                }
+            }
+        }
+    }
+
+    // hand-optimized version
+    void fopt() {
+        for (int x = 0; x < LEN; x++) {
+            for (int n = 0; n < WIDTH; n++) {
+                double tmp = nPower(x, n);
+
+                aopt[x][n] = tmp;
+                if (tmp > 10000)
+                    ngrtO10000++;
+                else if (tmp > 1000)
+                    ngrtO1000++;
+                else if (tmp > 100)
+                    ngrtO100++;
+                else
+                    nsmetO100++;
+            }
+        }
+    }
+
+    // Compare non-optimized and hand-optimized results
+    boolean eCheck() {
+        boolean r = true;
+
+        for (int i = 0; i < LEN; i++) {
+            for (int j = 0; j < WIDTH; j++) {
+              // if (a[i][j] != aopt[i][j]) {
+              if (ulpDiff(a[i][j], aopt[i][j]) > 1) {
+                    System.out.println("Bad result: a["+i+","+j+"]="+a[i][j]+"; aopt["+i+","+j+"]="+aopt[i][j]);
+                    r = false;
+                }
+            }
+        }
+
+        if ((ngrt10000!=ngrtO10000) || (ngrt1000!=ngrtO1000) || (ngrt100!=ngrtO100) || (nsmetO100!=nsmetO100)) {
+            System.out.println("Bad result: number of elements found is not matching");
+            r = false;
+        }
+        return r;
+    }
+
+    /**
+     * Paired-down nextAfter routine
+     */
+    public  static double nextAfter(double base, double direction) {
+        //first check for NaN values
+        if (Double.isNaN(base) || Double.isNaN(direction)) {
+            // return a NaN dervied from the input NaN(s)
+            return base + direction;
+        } else if (base == direction) {
+            return base;
+        } else  {
+            long doppelganger;
+            double result=0.0;
+
+            doppelganger = Double.doubleToLongBits(base + 0.0);
+            if (direction > base) //next greater value
+            {
+                if (doppelganger >= 0 )
+                    result = Double.longBitsToDouble(++doppelganger);
+                else
+                    result = Double.longBitsToDouble(--doppelganger);
+            } else if (direction < base) { // calculate next lesser value
+                if (doppelganger > 0)
+                    result = Double.longBitsToDouble(--doppelganger);
+                else if (doppelganger < 0)
+                    result = Double.longBitsToDouble(++doppelganger);
+                else
+                    /*
+                     * doppelganger==0L, result is -MIN_VALUE
+                     *
+                     * The transition from zero (implicitly
+                     * positive) to the smallest negative
+                     * signed magnitude value must be done
+                     * explicitly.
+                     */
+                    result = -Double.MIN_VALUE;
+            }
+
+            return result;
+        }
+    }
+
+    /*
+     * return ulp of a floating-point value
+     */
+    static double ulp(double d) {
+        d = Math.abs(d);        // don't worry about negative numbers
+
+        if(Double.isNaN(d))
+            return Double.NaN;
+        else if(Double.isInfinite(d))
+            return Double.POSITIVE_INFINITY;
+        else {
+            // can't represent (Double.MAX_VALUE + ulp) so special case it
+            if(d == Double.MAX_VALUE)
+                return 1.9958403095347198E292; // 2^971
+            else
+                return nextAfter(d, Double.POSITIVE_INFINITY) - d;
+        }
+    }
+
+
+    /*
+     * return signed difference in ulps between two floating-point
+     * values.  ulpDiff(NaN, NaN) is zero.
+     */
+    static double ulpDiff(double ref, double test) {
+        double ulp;
+        // assume ref is "correct" value
+
+        // Infinity, NaN handling
+        if(Double.isInfinite(ref)) {
+            if(ref == test)
+                return 0.0;
+            else
+                return Double.POSITIVE_INFINITY;
+        } else  if(Double.isNaN(ref)) {
+            if(Double.isNaN(test))
+                return 0.0;
+            else
+                return Double.NaN;
+        }
+        else {
+            ulp = ulp(ref);
+            // the expression below can overflow
+            return (test - ref) / ulp;
+        }
+    }
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon03/subcommon03.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon03/subcommon03.java
new file mode 100644
index 00000000000..41f23b47571
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon03/subcommon03.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/subcommon/subcommon03.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.subcommon.subcommon03.subcommon03
+ */
+
+package vm.compiler.jbe.subcommon.subcommon03;
+
+/* Tests the Local Common Sub-expression Elimination optimization, including duplicate
+   calls to math function.
+ */
+
+public class subcommon03 {
+    int k, m, n;
+    float a, b, c, d, x;
+    float arr[] = new float[100];
+    float arr_opt[] = new float[100];
+    float arr1[][] = new float[10][10];
+    float arr1_opt[][] = new float[10][10];
+
+    public static void main(String args[]) {
+        subcommon03 sce = new subcommon03();
+        sce.init();
+        sce.un_optimized();
+        sce.hand_optimized();
+        sce.mat();
+
+        if (sce.eCheck()) {
+            System.out.println("Test subcommon03 Passed.");
+        } else {
+            throw new Error("Test subcommon03 Failed.");
+        }
+    }
+
+    void init() {
+        for(int i = 0; i < 10; i++) {
+            arr[i] = (float)1E-2;
+            arr_opt[i] = (float)1E-2;
+        }
+        for(m = 0; m < 10; m++) {
+            arr1[0][m] = arr[m];
+            arr1_opt[0][m] = arr_opt[m];
+        }
+    }
+
+    void mat() {
+        for(k = 1; k < 10; k++) {
+            n = k*10;
+            for(m = 0; m < 10; m++) {
+                arr[n+m] = (float)Math.exp((double)arr[m]);
+                arr1[k][m] = (float)(arr[m] * 1/Math.PI);
+                arr_opt[n+m] = (float)Math.exp((double)arr_opt[m]);
+                arr1_opt[k][m] = (float)(arr_opt[m] * 1/Math.PI);
+            }
+        }
+    }
+
+    void un_optimized() {
+        c = (float)1.123456789;
+        d = (float)1.010101012;
+        // example 1
+        a = (float)((c * Math.sqrt(d * 2.0)) / (2.0 * d));
+        b = (float)((c / Math.sqrt(d * 2.0)) / (2.0 * d));
+        System.out.print("a="+a+";  b="+b);
+
+        // example 2
+        c = arr[0] / (arr[0] * arr[0] + arr[1] * arr[1]);
+        d = arr[1] * (arr[0] * arr[0] + arr[1] * arr[1]);
+        System.out.println(";  c="+c+";  d="+d);
+
+        // example 3
+        k = 0;
+        float t1 = arr[k];
+        float t2 = arr[k] * 2;
+        arr[2] = a;
+        arr[3] = b;
+        arr[4] = c;
+        arr[5] = d;
+        arr[8] = b / c;
+        arr[9] = c - a;
+
+        // Example -4
+        c = t2 / t1 * b / a;
+        x = (float)(d * 2.0);
+        d = t2 / t1 * b / a;
+        arr[6] = c;
+        arr[7] = d;
+    }
+
+
+    void hand_optimized() {
+        c = (float)1.123456789;
+        d = (float)1.010101012;
+        // example 1
+        x = d * (float)2.0;
+        double t1 = Math.sqrt((double)x);
+        double t2 = 1.0 / (double)x;
+        a = (float)(c * t1 * t2);
+        b = (float)(c / t1 * t2);
+        System.out.print("a_opt="+a+";  b_opt="+b);
+
+        // example 2
+        t1 = (double)arr_opt[0];
+        t2 = (double)arr_opt[1];
+        double t3 = 1.0 / (t1*t1 + t2*t2);
+        c = (float)t1 * (float)t3;
+        d = (float)t2 / (float)t3;
+        System.out.println(";  c_opt="+c+";  d_opt="+d);
+
+        // example 3
+        t2 = t1 * 2;
+        arr_opt[2] = a;
+        arr_opt[3] = b;
+        arr_opt[4] = c;
+        arr_opt[5] = d;
+        arr_opt[8] = b / c;
+        arr_opt[9] = c - a;
+
+        // example 4
+        c = (float)t2 / (float)t1 * b / a;
+        d = c;
+        arr_opt[6] = c;
+        arr_opt[7] = d;
+    }
+
+
+    boolean eCheck() {
+        boolean st = true;
+
+        for (int i = 0; i < arr.length; i++) {
+            if (arr[i] != arr_opt[i]) {
+                System.out.println(">>Bad output: arr["+i+"]="+arr[i]+"; arr_opt["+i+"]="+arr_opt[i]);
+                st = false;
+            }
+        }
+
+        for (int i = 0; i < arr1.length; i++)
+            for (int j = 0; j < arr1[i].length; j++) {
+                if (arr1[i][j] != arr1_opt[i][j]) {
+                    System.out.println(">>Bad output: arr["+i+"]["+j+"]="+arr1[i][j]+"; arr_opt["+i+"]["+j+"]="+arr1_opt[i][j]);
+                    st = false;
+                }
+            }
+        return st;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon04/subcommon04.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon04/subcommon04.java
new file mode 100644
index 00000000000..d31de964453
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon04/subcommon04.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/subcommon/subcommon04.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.subcommon.subcommon04.subcommon04
+ */
+
+package vm.compiler.jbe.subcommon.subcommon04;
+
+/* Tests the Global Common Sub-expression Elimination optimization, including duplicate
+   calls to math function.
+ */
+
+public class subcommon04 {
+    int k, m, n;
+    double a, b, c, d;
+    double arr[] = new double[100];
+    double arr_opt[] = new double[100];
+    double arr1[][] = new double[10][10];
+    double arr1_opt[][] = new double[10][10];
+
+    public static void main(String args[]) {
+        subcommon04 sce = new subcommon04();
+        sce.init();
+        sce.un_optimized();
+        sce.hand_optimized();
+        sce.mat();
+
+        if (sce.eCheck()) {
+            System.out.println("Test subcommon04 Passed.");
+        } else {
+            throw new Error("Test subcommon04 Failed.");
+        }
+    }
+
+    void init() {
+        for(int i = 0; i < arr.length; i++) {
+            arr[i] = 17E-2;
+            arr_opt[i] = 17E-2;
+        }
+        for(m = 0; m < arr1[0].length; m++) {
+            arr1[0][m] = arr[m];
+            arr1_opt[0][m] = arr_opt[m];
+        }
+    }
+
+    void mat() {
+        for(k = 0; k < arr1[0].length; k++) {
+            n = k * arr1[0].length;
+            for(m = 0; m < arr1[0].length; m++) {
+                arr[n+m] = Math.exp(arr[m]);
+                arr_opt[n+m] = Math.exp(arr_opt[m]);
+                arr1[k][m] = (arr[m] * 1/Math.PI);
+                arr1_opt[k][m] = (arr_opt[m] * 1/Math.PI);
+            }
+        }
+    }
+
+    void un_optimized() {
+        c = 1.123456789;
+        d = 1.010101012;
+        b = 1E-8;
+        // example 1
+        if (c == d) {
+            a = d * c * (b * 10.0);
+        }
+        else {
+            a = d / c * (b * 10.0);
+        }
+
+        // example 2
+        if ((a * c) > 9.0) {
+            b = a * c / 10.0;
+            c = 1.0;
+        }
+        else {
+            b = a * c;
+            c = 0.1;
+        }
+
+        // example 3
+        int n = 9;
+        for (k = 0; k < arr.length; k++) {
+            n = n - 1;
+            if (n < 0) n = 9;
+            if (arr1[0][n] == arr[k]) break;
+        }
+        if (arr1[0][n] == b) c += 1.0;
+        arr[2] = a;
+        arr[3] = arr1[0][n];
+        arr[4] = c;
+        arr[5] = d;
+        arr[8] = a / c;
+        arr[9] = c - a;
+
+        // example 4
+        b = d * c;
+        d = d * c;
+        arr[6] = b;
+        arr[7] = d;
+    }
+
+    void hand_optimized() {
+        c = 1.123456789;
+        d = 1.010101012;
+        b = 1E-8;
+        // example 1
+        if (c == d) {
+            a = d * c;
+        }
+        else {
+            a = d / c;
+        }
+        a *= (b * 10.0);
+
+        // example 2
+        b = a * c;
+        if (b > 9.0) {
+            b /= 10.0;
+            c = 1.0;
+        }
+        else {
+            c = 0.1;
+        }
+
+        // example 3
+        double t1 = arr1_opt[0][n];
+        n = 9;
+        for (k = 0; k < arr_opt.length; k++) {
+            n--;
+            if (n < 0) n = 9;
+            if(t1 == arr_opt[k]) break;
+        }
+        if (t1 == b) c++;
+        arr_opt[2] = a;
+        arr_opt[3] = t1;
+        arr_opt[4] = c;
+        arr_opt[5] = d;
+        arr_opt[8] = a / c;
+        arr_opt[9] = c - a;
+
+        // example 4
+        b = d * c;
+        d = b;
+        arr_opt[6] = b;
+        arr_opt[7] = d;
+    }
+
+    boolean eCheck() {
+        boolean st = true;
+
+        for (int i = 0; i < arr.length; i++) {
+            if (arr[i] != arr_opt[i]) {
+                System.out.println(">>Bad output: arr["+i+"]="+arr[i]+"; arr_opt["+i+"]="+arr_opt[i]);
+                st = false;
+            }
+        }
+
+        for (int i = 0; i < arr1.length; i++)
+            for (int j = 0; j < arr1[i].length; j++) {
+                if (arr1[i][j] != arr1_opt[i][j]) {
+                    System.out.println(">>Bad output: arr["+i+"]["+j+"]="+arr1[i][j]+"; arr_opt["+i+"]["+j+"]="+arr1_opt[i][j]);
+                    st = false;
+                }
+            }
+        return st;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon05/subcommon05.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon05/subcommon05.java
new file mode 100644
index 00000000000..5c27054a800
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon05/subcommon05.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2002, 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
+ *
+ * @summary converted from VM Testbase runtime/jbe/subcommon/subcommon05.
+ * VM Testbase keywords: [quick, runtime]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.jbe.subcommon.subcommon05.subcommon05
+ */
+
+package vm.compiler.jbe.subcommon.subcommon05;
+
+/* -- Common subexpression elimination testing
+   This is a test for simple CSE elimination within a basic block.
+ */
+
+public class subcommon05 {
+    int LEN = 1000;
+    double i1, i2, i3, i4, i5, i6;
+    double i7, i8, i9, i10, i11, i12;
+    double a[]= new double[LEN];
+    double aopt[] = new double[LEN];
+
+    public static void main(String args[]) {
+        subcommon05 sce = new subcommon05();
+
+        sce.un_optimized();
+        sce.hand_optimized();
+        if (sce.eCheck()) {
+            System.out.println("Test subcommon05 Passed.");
+        } else {
+            throw new Error("Test subcommon05 Failed.");
+        }
+    }
+
+    void un_optimized() {
+        i1 = 1.0;
+        i2 = 2.0;
+        i3 = 3.0;
+        i4 = 4.0;
+        i5 = 5.0;
+        i6 = 6.0;
+        i7 = 7.0;
+        i8 = 8.0;
+        i9 = 9.0;
+        i10 = 10.0;
+        i11 = 11.0;
+        i12 = 12.0;
+
+        for (int k = 0; k < 150; k++)
+            a[k] = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12;
+        for (int k = 150; k < 300; k++)
+            a[k] = i1 - i2 - i3 - i4 - i5 - i6 - i7 - i8 - i9 - i10 - i11 - i12;
+        for (int k = 300; k < 450; k++)
+            a[k] = i1 * i2 * i3 * i4 * i5 * i6 * i7 * i8 * i9 * i10 * i11 * i12;
+        for (int k = 450; k < 600; k++)
+            a[k] = i1 / i2 / i3 / i4 / i5 / i6 / i7 / i8 / i9 / i10 / i11 / i12;
+        for (int k = 600; k < 750; k++)
+            a[k] = i1 % i2 % i3 % i4 % i5 % i6 % i7 % i8 % i9 % i10 % i11 % i12;
+        for (int k = 750; k < 1000; k++)
+            a[k] = (((i1 + i2 - i3) * i4 / i5) % ((i6 + i7 - i8) * i9 / i10) % i11) % i12;
+   }
+
+    void hand_optimized() {
+        double rega, regs, regm, regd, regr, regc;
+        i1 = 1.0;
+        i2 = 2.0;
+        i3 = 3.0;
+        i4 = 4.0;
+        i5 = 5.0;
+        i6 = 6.0;
+        i7 = 7.0;
+        i8 = 8.0;
+        i9 = 9.0;
+        i10 = 10.0;
+        i11 = 11.0;
+        i12 = 12.0;
+
+        rega = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12;
+        regs = i1 - i2 - i3 - i4 - i5 - i6 - i7 - i8 - i9 - i10 - i11 - i12;
+        regm = i1 * i2 * i3 * i4 * i5 * i6 * i7 * i8 * i9 * i10 * i11 * i12;
+        regd = i1 / i2 / i3 / i4 / i5 / i6 / i7 / i8 / i9 / i10 / i11 / i12;
+        regr = i1 % i2 % i3 % i4 % i5 % i6 % i7 % i8 % i9 % i10 % i11 % i12;
+        regc = (((i1 + i2 - i3) * i4 / i5) % ((i6 + i7 - i8) * i9 / i10) % i11) % i12;
+
+        for (int k = 0; k < 150; k++)
+            aopt[k] = rega;
+        for (int k = 150; k < 300; k++)
+            aopt[k] = regs;
+        for (int k = 300; k < 450; k++)
+            aopt[k] = regm;
+        for (int k = 450; k < 600; k++)
+            aopt[k] = regd;
+        for (int k = 600; k < 750; k++)
+            aopt[k] = regr;
+        for (int k = 750; k < 1000; k++)
+            aopt[k] = regc;
+    }
+
+    // Compare non-optimized and hand-optimized results
+    boolean eCheck() {
+        boolean r = true;
+
+        for (int i = 0; i < LEN; i++) {
+                if (a[i] != aopt[i]) {
+                    System.out.println("Bad result: a["+i+"]="+a[i]+"; aopt["+i+"]="+aopt[i]);
+                    r = false;
+                }
+        }
+        return r;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do.java
new file mode 100644
index 00000000000..a1651b751e7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.partialpeel;
+
+import nsk.share.GoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class Do {
+
+
+    public static void main(String[] args) {
+        GoldChecker goldChecker = new GoldChecker("Do");
+
+        for(CompilerTest test: doTests) {
+            goldChecker.println(test + " = " + CompilerTestLauncher.launch(test));
+        }
+
+        goldChecker.check();
+    }
+
+    private final static int N = 1000;
+    private final static int x0 = 232;
+    private final static int x1 = 562;
+    private final static int x2 = 526;
+    private final static int x3 = 774;
+
+    public static final List<CompilerTest<Integer>> doTests = Arrays.asList(
+        new CompilerTest<Integer>("do1") {
+            @Override
+            public Integer execute(Random random) {
+                int s = random.nextInt(1000);
+                int i = 0;
+                do {
+                    if (s * i > x0) {
+                        break;
+                    }
+                    s++;
+                    i++;
+                } while (i < N);
+                return s + i;
+            }
+        },
+
+        //do + break on sum of inductive vars
+        new CompilerTest<Integer>("do2") {
+            @Override
+            public Integer execute(Random random) {
+                int s = random.nextInt(1000);
+                int i = 0;
+                do {
+                    if (s + i > x0) {
+                        break;
+                    }
+                    s++;
+                    i++;
+                } while (i < N);
+                return s + i;
+            }
+        },
+
+        //do + break on shifted inductive vars
+        new CompilerTest<Integer>("do3") {
+            @Override
+            public Integer execute(Random random) {
+                int s = random.nextInt(1000);
+                int i = 0;
+                do {
+                    if (x3 + s < x0) {
+                        break;
+                    }
+                    s += i;
+                    i++;
+                } while (i < N);
+                return s + i;
+            }
+        },
+
+        //do + break on shifted inductive vars  + invariant condition
+        new CompilerTest<Integer>("do4") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0 + random.nextInt(1000);
+                int j = x1;
+                int k = x2;
+
+                do {
+                    if (x3 + k < x0) {
+                        break;
+                    }
+                    i++;
+                    k++;
+                    if (x2 > x1) {
+                        j += i;
+                        k += j;
+                    }
+
+                } while (i < N);
+                return k + i;
+            }
+        },
+
+        //do + break on shifted inductive vars  + invariant condition
+        new CompilerTest<Integer>("do5") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0 + random.nextInt(1000);
+                int j = x1;
+                int k = x2;
+
+                do {
+                    if (k < x0) {
+                        break;
+                    }
+                    i++;
+                    if (x2 > x1) {
+                        j += i;
+                        k += j;
+                    }
+
+                } while (i < N);
+                return k + i;
+            }
+        },
+
+        //do + break on hidden inductive vars  + invariant condition
+        new CompilerTest<Integer>("do6") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0;
+                int j = x1 + random.nextInt(1000);
+                int k = x2;
+
+                do {
+                    if (k < x0) {
+                        break;
+                    }
+                    i++;
+                    k++;
+                    if (k > x1) {
+                        j += i;
+                        k += j + i;
+                    }
+
+                } while (i < N);
+                return k + i;
+            }
+        }
+
+    );
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do/Do.gold b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do/Do.gold
new file mode 100644
index 00000000000..efe7375b435
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do/Do.gold
@@ -0,0 +1,6 @@
+do1 = 5139262
+do2 = 5406242
+do3 = 715138392
+do4 = 18548796
+do5 = 15617242
+do6 = 616127008
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do/TestDescription.java
new file mode 100644
index 00000000000..c0bd364f0df
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/Do/TestDescription.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/partialpeel/Do.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test triggers Parial Peel C2 optimization for do loop:
+ *     "Partially peel (aka loop rotation) the top portion of a loop
+ *     (called the peel section below) by cloning it and placing one copy
+ *     just before the new loop head and the other copy at the bottom of
+ *     the new loop".
+ *     This optimization is applicable for non-counted loops, that contains
+ *     test (condition) with inductive vars and jumps outside from loop.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.optimizations.partialpeel.Do
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile.java
new file mode 100644
index 00000000000..b0cdc6118ba
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.partialpeel;
+
+import nsk.share.GoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ForWhile {
+
+    public static void main(String[] args) {
+        GoldChecker goldChecker = new GoldChecker("ForWhile");
+
+        for(CompilerTest test: forwhileTests) {
+            goldChecker.println(test + " = " + CompilerTestLauncher.launch(test));
+        }
+
+        goldChecker.check();
+    }
+
+    private final static int N = 1000;
+    static int x0 = 232;
+    static int x1 = 562;
+    static int x2 = 526;
+    static int x3 = 774;
+
+    public static final List<CompilerTest<Integer>> forwhileTests = Arrays.asList(
+        //internal while don't use for counter
+        new CompilerTest<Integer>("forwhile1") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0;
+                int s = x1 + random.nextInt(1000);
+                int j = random.nextInt(1000);
+                for (int i = 0; i < x0; i++) {
+                    j = x0;
+                    while (j < N) {
+                        j++;
+                        if (x2 > x1) {
+                            j += 4;
+                            k += j;
+                        }
+
+                    }
+                }
+                return s + k;
+            }
+        },
+
+        //while with loop condition on for counter + an condition on counter
+        new CompilerTest<Integer>("forwhile2") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0;
+                int s = x1 + random.nextInt(1000);
+                int j = x0;
+                for (int i = 0; i < x0; i++) {
+                    j = x0;
+                    while (j < N + i) {
+                        j++;
+                        if (x2 > x1) {
+                            j += 4;
+                            k += j;
+                        }
+
+                    }
+                }
+                return s + k;
+            }
+        },
+
+        //while with loop condition on for counter + additional condition on counter
+        new CompilerTest<Integer>("forwhile3") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0;
+                int s = x1 + random.nextInt(1000);
+                int j = x0;
+                for (int i = 0; i < x0; i++) {
+                    j = x0;
+                    while (j < N + i) {
+                        j++;
+                        s++;
+                        if (x2 > x1 + i) {
+                            j += 4;
+                            k += j;
+                        }
+
+                    }
+                }
+                return s + k;
+            }
+        },
+
+        //two while with loop condition on for counter
+        new CompilerTest<Integer>("forwhile4") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0;
+                int s = x1 + random.nextInt(1000);
+                int j = x2;
+                for (int i = 0; i < x0; i++) {
+                    while (j < x3 + i) {
+                        j++;
+                        if (x2 > i) {
+                            k += x3;
+                        } else {
+                            break;
+                        }
+                        s++;
+                    }
+                    j = x0;
+                    while (j < N + i) {
+                        j++;
+                        s++;
+                        if (x2 > x1 + i) {
+                            j += 4;
+                            k += j;
+                        }
+
+                    }
+                }
+                return s + k;
+            }
+        }
+    );
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/ForWhile.gold b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/ForWhile.gold
new file mode 100644
index 00000000000..e99216dffb5
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/ForWhile.gold
@@ -0,0 +1,4 @@
+forwhile1 = 13379453
+forwhile2 = 13045688
+forwhile3 = 2062765688
+forwhile4 = -310201608
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/TestDescription.java
new file mode 100644
index 00000000000..9656a87ec4a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/ForWhile/TestDescription.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/partialpeel/ForWhile.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test triggers Parial Peel C2 optimization for inner while loop:
+ *     "Partially peel (aka loop rotation) the top portion of a loop
+ *     (called the peel section below) by cloning it and placing one copy
+ *     just before the new loop head and the other copy at the bottom of
+ *     the new loop".
+ *     This optimization is applicable for non-counted loops, that contains
+ *     test (condition) with inductive vars and jumps outside from loop.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.optimizations.partialpeel.ForWhile
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While.java
new file mode 100644
index 00000000000..6dcad589226
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.partialpeel;
+
+import nsk.share.GoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class While {
+    private final static int N = 1000;
+    static int x0 = 232;
+    static int x1 = 562;
+    static int x2 = 526;
+    static int x3 = 774;
+
+    public static void main(String[] args) {
+        GoldChecker goldChecker = new GoldChecker("While");
+
+        for(CompilerTest test: whileTests) {
+            goldChecker.println(test + " = " + CompilerTestLauncher.launch(test));
+        }
+
+        goldChecker.check();
+    }
+
+    public static final List<CompilerTest<Integer>> whileTests = Arrays.asList(
+
+        //while + invariant condition
+        new CompilerTest<Integer>("while1") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0;
+                int j = x1;
+                int k = x2 + random.nextInt(1000);
+
+                while (i < N) {
+                    i++;
+                    if (x2 > x1) {
+                        j += i;
+                        k += j;
+                    }
+
+                }
+                return k + i;
+            }
+        },
+
+        //while + break on shifted inductive vars  + invariant condition
+        new CompilerTest<Integer>("while2") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0;
+                int j = x1;
+                int k = x2 + random.nextInt(1000);
+
+                while (i < N) {
+                    if (x3 + k < x0) {
+                        break;
+                    }
+                    i++;
+                    if (x2 > x1) {
+                        j += i;
+                        k += j + i;
+                    }
+
+                }
+                return k + i;
+            }
+        },
+
+        //while + break on shifted inductive vars  + invariant condition
+        new CompilerTest<Integer>("while3") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0;
+                int j = x1;
+                int k = x2 + random.nextInt(1000);
+
+                while (i < N) {
+                    if (x3 < x0) {
+                        break;
+                    }
+                    i++;
+                    if (x2 > x1) {
+                        x3 += k;
+                        j += i;
+                        k += i;
+                    }
+
+                }
+                return k + i;
+            }
+        },
+
+        //while + break on hidden inductive vars  + invariant condition
+        new CompilerTest<Integer>("while4") {
+            @Override
+            public Integer execute(Random random) {
+                int i = x0;
+                int j = x1;
+                int k = x2 + random.nextInt(1000);
+
+                while (i < N) {
+                    if (x3 < x0) {
+                        break;
+                    }
+                    k++;
+                    i++;
+                    if (x2 > x1) {
+                        x3 += k;
+                        j += i;
+                        k += j;
+                    }
+
+                }
+                return k + i;
+            }
+        }
+    );
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While/TestDescription.java
new file mode 100644
index 00000000000..8044cba256c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While/TestDescription.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/partialpeel/While.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test triggers Parial Peel C2 optimization for while loop:
+ *     "Partially peel (aka loop rotation) the top portion of a loop
+ *     (called the peel section below) by cloning it and placing one copy
+ *     just before the new loop head and the other copy at the bottom of
+ *     the new loop".
+ *     This optimization is applicable for non-counted loops, that contains
+ *     test (condition) with inductive vars and jumps outside from loop.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.optimizations.partialpeel.While
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While/While.gold b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While/While.gold
new file mode 100644
index 00000000000..c9d3038360b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/While/While.gold
@@ -0,0 +1,4 @@
+while1 = 20365688
+while2 = 20365688
+while3 = 20365688
+while4 = 28045688
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile.java
new file mode 100644
index 00000000000..4812bdef066
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.partialpeel;
+
+import nsk.share.GoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class WhileWhile {
+
+
+    public static void main(String[] args) {
+        GoldChecker goldChecker = new GoldChecker("WhileWhile");
+
+        for (CompilerTest test : whilewhileTests) {
+            goldChecker.println(test + " = " + CompilerTestLauncher.launch(test));
+        }
+
+        goldChecker.check();
+    }
+
+    private final static int N = 1000;
+    static int x0 = 232;
+    static int x1 = 562;
+    static int x2 = 526;
+    static int x3 = 774;
+
+    public static final List<CompilerTest<Integer>> whilewhileTests = Arrays.asList(
+
+        //invariant condition
+        new CompilerTest<Integer>("whilewhile1") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0 + random.nextInt(1000);
+                int i = k + x2;
+                int s = x1;
+                int j = x2;
+
+                while (i < N + x3) {
+                    i++;
+                    while (j < N) {
+                        j++;
+                        s++;
+                        if (x2 > x1) {
+                            k += j;
+                        }
+
+                    }
+                }
+
+                return s + k;
+            }
+        },
+
+
+        //inner while with condition on outer while counter
+        new CompilerTest<Integer>("whilewhile2") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0 + random.nextInt(1000);
+                int i = k + x2;
+                int s = x1;
+                int j = x2;
+
+                while (i < N + x3) {
+                    i++;
+                    while (j < N + i) {
+                        j++;
+                        s++;
+                        if (x2 > x1) {
+                            k += j;
+                        }
+
+                    }
+                }
+                return s + k;
+            }
+        },
+
+        //inner while in if branch
+        new CompilerTest<Integer>("whilewhile3") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0 + random.nextInt(1000);
+                int i = k + x2;
+                int s = x1;
+                int j = x2;
+
+                while (i < N + x3) {
+                    i++;
+                    if (i > x2) {
+                        while (j < N + i) {
+                            j++;
+                            s += k;
+                            if (x2 > x1) {
+                                k += j;
+                            }
+                        }
+                    }
+                }
+                return s + k;
+            }
+        },
+
+        //two inner while
+        new CompilerTest<Integer>("whilewhile4") {
+            @Override
+            public Integer execute(Random random) {
+                int k = x0 + random.nextInt(1000);
+                int i = k + x2;
+                int s = x1;
+                int j = x2;
+
+                while (i < N + x3) {
+                    i++;
+                    s++;
+                    if (i > x2) {
+                        while (j < N + i) {
+                            j++;
+                            s++;
+                            if (x2 > x1) {
+                                k += j;
+                            }
+                        }
+                    }
+
+                    j = x2;
+                    while (j < x2 + x3) {
+                        j++;
+                        if (x2 > x1) {
+                            j += x0;
+                            s++;
+                            k += j;
+                        }
+                    }
+                }
+                return s + k;
+            }
+        }
+    );
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/TestDescription.java
new file mode 100644
index 00000000000..cc23a71880a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/TestDescription.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/partialpeel/WhileWhile.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * DESCRIPTION
+ *     This test triggers Parial Peel C2 optimization for inner while loop:
+ *     "Partially peel (aka loop rotation) the top portion of a loop
+ *     (called the peel section below) by cloning it and placing one copy
+ *     just before the new loop head and the other copy at the bottom of
+ *     the new loop".
+ *     This optimization is applicable for non-counted loops, that contains
+ *     test (condition) with inductive vars and jumps outside from loop.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm vm.compiler.optimizations.partialpeel.WhileWhile
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/WhileWhile.gold b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/WhileWhile.gold
new file mode 100644
index 00000000000..9740e6fbe95
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/partialpeel/WhileWhile/WhileWhile.gold
@@ -0,0 +1,4 @@
+whilewhile1 = 17785688
+whilewhile2 = 35525688
+whilewhile3 = -473876872
+whilewhile4 = 1424747162
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01.java
new file mode 100644
index 00000000000..f97cf27f5fc
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.stringconcat.explicit;
+
+import nsk.share.StringGoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+public class Explicit01 {
+
+    private static final String GOLDEN_HASH = "-914118083";
+
+    private static StringBuilder staticSB = new StringBuilder();
+    private static Random random = new Random(11);
+    private static final String PRE  = "pre\u307E\u3048\u306B";
+    private static final String POST = "post\u3042\u3068\u3067";
+
+    private static void crop(StringBuilder sb) {
+        int max = 100;
+        if (sb.length() > max) {
+            sb.delete(0, 20);
+            sb.delete(60, sb.length());
+        }
+    }
+
+    private static String randomCut(String s, int size) {
+        StringBuilder res = new StringBuilder();
+        for (int i = 0; i < size; i++) {
+            int r = random.nextInt(s.length());
+            res.append(s.charAt(r));
+        }
+        return res.toString();
+    }
+
+    public static void main(String[] args) {
+        StringGoldChecker goldChecker = new StringGoldChecker(GOLDEN_HASH);
+        goldChecker.print(CompilerTestLauncher.launch(test));
+        goldChecker.check();
+    }
+
+    public static String randomString() {
+        int p = random.nextInt(100);
+        StringBuilder prefix = new StringBuilder();
+        prefix.append(p);
+        prefix.append(PRE);
+        prefix.append(random.nextInt(1000));
+        StringBuilder postfix = new StringBuilder();
+        postfix.append(POST);
+        postfix.append(p);
+        if (p > 50) {
+            postfix.append(p);
+        } else {
+            postfix.append(p + 1);
+        }
+        postfix.append(random.nextInt(42));
+        staticSB.append(prefix.toString());
+        crop(staticSB);
+        postfix.append(staticSB.toString());
+        String s = prefix.toString() + postfix.toString();
+
+        return randomCut(s, 10);
+    }
+
+    private static final CompilerTest<Integer> test = new CompilerTest<Integer>("Explicit01") {
+        @Override
+        public Integer execute(Random random) {
+            StringBuilder res = new StringBuilder();
+            int s = 200;
+            while (s > 0) {
+                s -= random.nextInt(50);
+                int p = random.nextInt(1000);
+                if (p > s) {
+                    res.append(s);
+                } else {
+                    res.append(p);
+                }
+                crop(res);
+                res.append(s + "x\u306B");
+                res.append(randomString());
+            }
+
+            return res.toString().hashCode();
+        }
+    };
+
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/README
new file mode 100644
index 00000000000..3a78b539b58
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/README
@@ -0,0 +1,30 @@
+Copyright (c) 2012, 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.
+
+DESCRIPTION
+
+    This test triggers String concat C2 optimization:
+    "Optimize the construction of Strings by StringBuilder".
+    This optimization detects StringBuilder.toString calls and
+    transform it to optimized concatenation code.
+    This test contains a lot of explicit toString calls.
+
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled/TestDescription.java
new file mode 100644
index 00000000000..b547f895169
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.explicit.Explicit01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled/TestDescription.java
new file mode 100644
index 00000000000..9a80bbacb87
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.explicit.Explicit01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01.java
new file mode 100644
index 00000000000..9f929714100
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.stringconcat.explicit;
+
+import nsk.share.StringGoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+public class Merge01 {
+
+    private static final String GOLDEN_HASH = "1618288402";
+
+    private static Random random = new Random(11);
+    private static final String PRE  = "pre\u307E\u3048\u306B";
+    private static final String POST = "post\u3042\u3068\u3067";
+    private static final String TMP = "tmp\u305D\u3046\u304B";
+    private static final String SUF = "suf\u3051\u3069\u3082";
+
+    private static void crop(StringBuilder sb) {
+        int max = 100;
+        if (sb.length() > max) {
+            sb.delete(0, 20);
+            sb.delete(60, sb.length());
+        }
+    }
+
+    private static String randomCut(String s, int size) {
+        StringBuilder res = new StringBuilder();
+        for(int i=0; i<size; i++) {
+            int r = random.nextInt(s.length());
+            res.append(s.charAt(r));
+        }
+        return res.toString();
+    }
+
+    public static void main(String[] args) {
+        StringGoldChecker goldChecker = new StringGoldChecker(GOLDEN_HASH);
+        goldChecker.print(CompilerTestLauncher.launch(test));
+        goldChecker.check();
+    }
+
+    public static String randomString() {
+        int p = random.nextInt(100);
+        StringBuilder prefix = new StringBuilder();
+        prefix.append(p);
+        prefix.append(PRE);
+        prefix.append(random.nextInt(1000));
+
+        StringBuilder suffix = new StringBuilder();
+        StringBuilder t = new StringBuilder();
+        t.append(p);
+        t.append(TMP);
+        suffix.append(p + SUF);
+        //merge:
+        suffix.append(t.toString());
+        suffix.append(t);
+
+        StringBuilder postfix = new StringBuilder();
+        postfix.append(POST);
+        postfix.append(p);
+        if(p>50) {
+            postfix.append(p);
+        } else {
+            postfix.append(p+1);
+        }
+        postfix.append(random.nextInt(42));
+
+        //merge:
+        StringBuilder res = new StringBuilder();
+        res.append(prefix.toString());
+        res.append(suffix.toString());
+        res.append(postfix.toString());
+
+
+        return randomCut(res.toString(), 10);
+    }
+
+
+    private static final CompilerTest<Integer> test = new CompilerTest<Integer>("Merge01") {
+        @Override
+        public Integer execute(Random random) {
+            StringBuilder res = new StringBuilder();
+            int s = 200;
+            while (s>0) {
+                s -= random.nextInt(50);
+                int p = random.nextInt(1000);
+                if(p>s) {
+                    StringBuilder t = new StringBuilder();
+                    t.append("");
+                    //merge:
+                    res.append(t);
+                } else {
+                    res.append(p);
+                }
+                crop(res);
+                StringBuilder t = new StringBuilder();
+                t.append(s);
+                t.append(t);
+                res.append(randomString());
+                //merge:
+                res.append(t.toString());
+            }
+
+            return res.toString().hashCode();
+        }
+    };
+
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/README
new file mode 100644
index 00000000000..2c763e67235
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/README
@@ -0,0 +1,33 @@
+Copyright (c) 2012, 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.
+
+DESCRIPTION
+
+    This test triggers String concat C2 optimization:
+    "Optimize the construction of Strings by StringBuilder".
+    This optimization detects StringBuilder.toString calls and
+    transform it to optimized concatenation code.
+
+    This test contains a lot of explicit toString calls
+    on StringBuilder objects that itself contain results of toString
+    calls. These concatenations will be merged by C2.
+
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled/TestDescription.java
new file mode 100644
index 00000000000..db575f9d86e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.explicit.Merge01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled/TestDescription.java
new file mode 100644
index 00000000000..1b1ca052668
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.explicit.Merge01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01.java
new file mode 100644
index 00000000000..8a81efec0d7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.stringconcat.implicit;
+
+import nsk.share.StringGoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+public class Implicit01 {
+
+    private static final String GOLDEN_HASH = "-1447526817";
+
+    private static String staticS = "";
+    private static Random random = new Random(11);
+
+    private static String crop(String s) {
+        int max = 100;
+        if (s.length() > max) {
+            return s.substring(5, 50);
+        }
+        return s;
+    }
+
+    private static String randomCut(String s, int size) {
+        String res = new String();
+        for (int i = 0; i < size; i++) {
+            int r = random.nextInt(s.length());
+            res += s.charAt(r);
+        }
+        return res;
+    }
+
+    public static void main(String[] args) {
+        StringGoldChecker goldChecker = new StringGoldChecker(GOLDEN_HASH);
+        goldChecker.print(CompilerTestLauncher.launch(test));
+        goldChecker.check();
+    }
+
+    public static String randomString() {
+        int t = random.nextInt(100);
+        String pre = "" + t / 10;
+        String post = "" + t + 'a' + '\u307E' + random.nextInt(20);
+        staticS = crop(staticS + pre + post);
+        int r = pre.hashCode() * post.hashCode() - random.nextInt(1000);
+        return randomCut(pre + "" + r % 50 + "-" + r + "o" + "\u306B" + post + staticS, 10);
+    }
+
+    private static final CompilerTest<Integer> test = new CompilerTest<Integer>("Implicit01") {
+        @Override
+        public Integer execute(Random random) {
+            String res = randomString() + "t\u306B";
+            int t = 200;
+            while (t > 0) {
+                t -= random.nextInt(50);
+                if (t > res.hashCode() % 100) {
+                    res += randomString().hashCode() + randomString();
+                } else {
+                    res += randomString();
+                }
+                res = crop(res);
+            }
+
+            return (res).hashCode();
+        }
+    };
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/README
new file mode 100644
index 00000000000..fa95ff59c89
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/README
@@ -0,0 +1,31 @@
+Copyright (c) 2012, 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.
+
+DESCRIPTION
+
+    This test triggers String concat C2 optimization:
+    "Optimize the construction of Strings by StringBuilder".
+    This optimization detects StringBuilder.toString calls and
+    transform it to optimized concatenation code.
+    This test contains a lot of implicit (they will be generated by javac)
+    toString calls.
+
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled/TestDescription.java
new file mode 100644
index 00000000000..e3f8abcdce7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.implicit.Implicit01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled/TestDescription.java
new file mode 100644
index 00000000000..43efb597671
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.implicit.Implicit01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01.java
new file mode 100644
index 00000000000..0fb9376aa5e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.optimizations.stringconcat.implicit;
+
+import nsk.share.StringGoldChecker;
+import vm.compiler.share.CompilerTest;
+import vm.compiler.share.CompilerTestLauncher;
+import vm.compiler.share.Random;
+
+public class Merge01 {
+
+    private static final String GOLDEN_HASH = "1112689470";
+
+    private static String staticS = "";
+    private static Random random = new Random(11);
+
+    private static String crop(String s) {
+        int max = 100;
+        if (s.length() > max) {
+            return s.substring(5, 50);
+        }
+        return s;
+    }
+
+    private static String randomCut(String s, int size) {
+        String res = new String();
+        for (int i = 0; i < size; i++) {
+            int r = random.nextInt(s.length());
+            res += s.charAt(r);
+        }
+        return res;
+    }
+
+
+    public static void main(String[] args) {
+        StringGoldChecker goldChecker = new StringGoldChecker(GOLDEN_HASH);
+        goldChecker.print(CompilerTestLauncher.launch(test));
+        goldChecker.check();
+    }
+
+    public static String randomString() {
+        int t = random.nextInt(100);
+        String pre = "" + t / 10;
+        String post = "" + t + 'a'  + '\u307E' + random.nextInt(20);
+        //merge:
+        String s = crop(pre + post);
+        staticS = crop(s + staticS);
+
+        int r = pre.hashCode() * post.hashCode() - random.nextInt(1000);
+        return randomCut(pre + "" + r % 50 + "-" + r + "o" + "\u306B" + post + staticS, 10);
+    }
+
+    private static final CompilerTest<Integer> test = new CompilerTest<Integer>("Merge01") {
+        @Override
+        public Integer execute(Random random) {
+            String res = randomString() + "t\u306B";
+            int t = 200;
+            while (t > 0) {
+                t -= random.nextInt(50);
+                int i = res.hashCode() % 100;
+                if (t > i) {
+                    res += i + randomString();
+                } else {
+                    res += randomString();
+                }
+                res = crop(res);
+            }
+
+            return (res).hashCode();
+        }
+    };
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/README
new file mode 100644
index 00000000000..b65d651781f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/README
@@ -0,0 +1,33 @@
+Copyright (c) 2012, 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.
+
+DESCRIPTION
+
+    This test triggers String concat C2 optimization:
+    "Optimize the construction of Strings by StringBuilder".
+    This optimization detects StringBuilder.toString calls and
+    transform it to optimized concatenation code.
+
+    This test contains a lot of implicit (they will be generated by javac)
+    toString calls on StringBuilder objects that itself contain results
+    of toString calls. These concatenations will be merged by C2.
+
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled/TestDescription.java
new file mode 100644
index 00000000000..5dd13aedee0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.implicit.Merge01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled/TestDescription.java
new file mode 100644
index 00000000000..ac94e3b9760
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled.
+ * VM Testbase keywords: [jit, quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.implicit.Merge01
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/share/CompilerTest.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/share/CompilerTest.java
new file mode 100644
index 00000000000..3d7b412a942
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/share/CompilerTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.share;
+
+
+public abstract class CompilerTest<Output> {
+
+    private final String name;
+
+    public CompilerTest(String name) {
+        this.name = name;
+
+    }
+
+    public abstract Output execute(Random random);
+
+    @Override
+    public  String toString() {
+        return name;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/share/CompilerTestLauncher.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/share/CompilerTestLauncher.java
new file mode 100644
index 00000000000..9ef289636a9
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/share/CompilerTestLauncher.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.share;
+
+public class CompilerTestLauncher {
+
+    public final static int ITERATIONS = 10000;
+
+    public static int launch(CompilerTest test) {
+        return launch(test, ITERATIONS);
+    }
+
+
+    public static int launch(CompilerTest test, int iterations) {
+        System.out.println("launching test " + test);
+        int cache = 0;
+        Random random = new Random(42);
+        for(int i=0; i<iterations; i++) {
+            cache += test.execute(random).hashCode();
+        }
+        return cache;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/share/Random.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/share/Random.java
new file mode 100644
index 00000000000..e2751150d80
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/share/Random.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2012, 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 vm.compiler.share;
+
+public class Random {
+    private int current;
+
+    public Random(int init) {
+        this.current =  init;
+    }
+
+    //big prime number
+    private static long BASE = 1003001;
+
+    public int nextInt() {
+        current = (int) ((long) current * current % BASE - 1);
+        return current;
+    }
+
+    public int nextInt(int n) {
+        return nextInt() % n;
+    }
+
+
+    /**
+     * for testing purposes
+     * @param args
+     */
+    public static void main(String[] args) {
+        Random r = new Random(11);
+        int[] a = new int[100];
+
+        for(int i=0; i<1000; i++) {
+            a[r.nextInt(100)]++;
+        }
+
+        for(int i=0; i<100; i++){
+            System.out.println(times(a[i]));
+        }
+
+    }
+
+    public static String times(int n) {
+        StringBuilder sb = new StringBuilder();
+        for(int i=0; i<n; i++) {
+            sb.append("*");
+        }
+        return sb.toString();
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt
new file mode 100644
index 00000000000..b51ca8412b8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt
@@ -0,0 +1,927 @@
+/*
+ * Copyright (c) 2012, 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.
+ */
+
+/* This code generate an LTTest.java and LTTest.c files with corresponding *.cfg files which containt test defenition
+ * for JNI testing.
+ *
+ */
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Random;
+
+//Java and C file generator for JNI tests
+public class JniArmHFTestGenerator {
+
+    private final String JAVA_CLASS_NAME = "LTTest";
+    private final String C_FNC_NAME_PREFIX = "Java_vm_jit_LongTransitions_" + JAVA_CLASS_NAME + "_";
+    private final String JAVA_PACKAGE_NAME = "vm.jit.LongTransitions";
+    private final String TEST_LIST_PREFIX = "vm/jit/LongTransitions";
+    private final String TEST_LIST_NAME = "vm.jit.long.testlist";
+    //Maximal line length for some SRC generation function
+    private final int LINE_LENGTH = 70;
+    //127 is maximal value for JAVA parameters list
+    private final int PARAMS_COUNTER = 127;
+    StringBuilder javaFileSrc;
+    StringBuilder cFileSrc;
+    //StringBuilder cfgFileSrc;
+    private String javaTxtFileName;
+    private String cTxtFileName;
+    private File outputDir;
+    private ArrayList<String> javaFncNames = new ArrayList<String>();
+
+    public static void main(String[] args) throws IOException {
+        new JniArmHFTestGenerator().makeSomeTest();
+    }
+
+    public void makeSomeTest() throws IOException {
+
+        makeJavaIntro(JAVA_CLASS_NAME);
+        makeCIntro();
+        int cnt = PARAMS_COUNTER;
+
+        makeOneTest(cnt, ParamType.EASY_F, TestType.RANDOM, "nativeFnc1");
+        makeOneTest(cnt, ParamType.EASY_D, TestType.RANDOM, "nativeFnc2");
+        makeOneTest(cnt, ParamType.MIXED_FI1, TestType.RANDOM, "nativeFnc3");
+        makeOneTest(cnt, ParamType.MIXED_FB1, TestType.RANDOM, "nativeFnc4");
+        makeOneTest(cnt, ParamType.MIXED_FBI1, TestType.RANDOM, "nativeFnc5");
+        makeOneTest(cnt, ParamType.MIXED_DI1, TestType.RANDOM, "nativeFnc6");
+        makeOneTest(cnt, ParamType.MIXED_DB1, TestType.RANDOM, "nativeFnc7");
+        makeOneTest(cnt, ParamType.MIXED_DBI1, TestType.RANDOM, "nativeFnc8");
+        makeOneTest(cnt, ParamType.MIXED_DFBI1, TestType.RANDOM, "nativeFnc9");
+        makeOneTest(cnt, ParamType.MIXED_DF1, TestType.RANDOM, "nativeFnc10");
+        makeOneTest(cnt, ParamType.MIXED_DFI1, TestType.RANDOM, "nativeFnc11");
+        makeOneTest(cnt, ParamType.MIXED_DFB1, TestType.RANDOM, "nativeFnc12");
+
+        makeOneTest(cnt, ParamType.MIXED_FI2, TestType.RANDOM, "nativeFnc13");
+        makeOneTest(cnt, ParamType.MIXED_FB2, TestType.RANDOM, "nativeFnc14");
+        makeOneTest(cnt, ParamType.MIXED_FBI2, TestType.RANDOM, "nativeFnc15");
+        makeOneTest(cnt, ParamType.MIXED_DI2, TestType.RANDOM, "nativeFnc16");
+        makeOneTest(cnt, ParamType.MIXED_DB2, TestType.RANDOM, "nativeFnc17");
+        makeOneTest(cnt, ParamType.MIXED_DBI2, TestType.RANDOM, "nativeFnc18");
+        makeOneTest(cnt, ParamType.MIXED_DFBI2, TestType.RANDOM, "nativeFnc19");
+        makeOneTest(cnt, ParamType.MIXED_DF2, TestType.RANDOM, "nativeFnc20");
+        makeOneTest(cnt, ParamType.MIXED_DFI2, TestType.RANDOM, "nativeFnc21");
+        makeOneTest(cnt, ParamType.MIXED_DFB2, TestType.RANDOM, "nativeFnc22");
+
+        makeOneTest(cnt, ParamType.MIXED_FI3, TestType.RANDOM, "nativeFnc23");
+        makeOneTest(cnt, ParamType.MIXED_FB3, TestType.RANDOM, "nativeFnc24");
+        makeOneTest(cnt, ParamType.MIXED_FBI3, TestType.RANDOM, "nativeFnc25");
+        makeOneTest(cnt, ParamType.MIXED_DI3, TestType.RANDOM, "nativeFnc26");
+        makeOneTest(cnt, ParamType.MIXED_DB3, TestType.RANDOM, "nativeFnc27");
+        makeOneTest(cnt, ParamType.MIXED_DBI3, TestType.RANDOM, "nativeFnc28");
+        makeOneTest(cnt, ParamType.MIXED_DFBI3, TestType.RANDOM, "nativeFnc29");
+        makeOneTest(cnt, ParamType.MIXED_DF3, TestType.RANDOM, "nativeFnc30");
+        makeOneTest(cnt, ParamType.MIXED_DFI3, TestType.RANDOM, "nativeFnc31");
+        makeOneTest(cnt, ParamType.MIXED_DFB3, TestType.RANDOM, "nativeFnc32");
+
+        makeOneTest(cnt, ParamType.MIXED_FI4, TestType.RANDOM, "nativeFnc33");
+        makeOneTest(cnt, ParamType.MIXED_FB4, TestType.RANDOM, "nativeFnc34");
+        makeOneTest(cnt, ParamType.MIXED_FBI4, TestType.RANDOM, "nativeFnc35");
+        makeOneTest(cnt, ParamType.MIXED_DI4, TestType.RANDOM, "nativeFnc36");
+        makeOneTest(cnt, ParamType.MIXED_DB4, TestType.RANDOM, "nativeFnc37");
+        makeOneTest(cnt, ParamType.MIXED_DBI4, TestType.RANDOM, "nativeFnc38");
+        makeOneTest(cnt, ParamType.MIXED_DFBI4, TestType.RANDOM, "nativeFnc39");
+        makeOneTest(cnt, ParamType.MIXED_DF4, TestType.RANDOM, "nativeFnc40");
+        makeOneTest(cnt, ParamType.MIXED_DFI4, TestType.RANDOM, "nativeFnc41");
+        makeOneTest(cnt, ParamType.MIXED_DFB4, TestType.RANDOM, "nativeFnc42");
+
+        makeOneTest(cnt, ParamType.MIXED_FI5, TestType.RANDOM, "nativeFnc43");
+        makeOneTest(cnt, ParamType.MIXED_FB5, TestType.RANDOM, "nativeFnc44");
+        makeOneTest(cnt, ParamType.MIXED_FBI5, TestType.RANDOM, "nativeFnc45");
+        makeOneTest(cnt, ParamType.MIXED_DI5, TestType.RANDOM, "nativeFnc46");
+        makeOneTest(cnt, ParamType.MIXED_DB5, TestType.RANDOM, "nativeFnc47");
+        makeOneTest(cnt, ParamType.MIXED_DBI5, TestType.RANDOM, "nativeFnc48");
+        makeOneTest(cnt, ParamType.MIXED_DFBI5, TestType.RANDOM, "nativeFnc49");
+        makeOneTest(cnt, ParamType.MIXED_DF5, TestType.RANDOM, "nativeFnc50");
+        makeOneTest(cnt, ParamType.MIXED_DFI5, TestType.RANDOM, "nativeFnc51");
+        makeOneTest(cnt, ParamType.MIXED_DFB5, TestType.RANDOM, "nativeFnc52");
+        makeJavaInvoke();
+        makeJavaOutro();
+
+        writeToJavaFile(JAVA_CLASS_NAME);
+        writeToCFile(JAVA_CLASS_NAME);
+        //writeCmpFile();
+
+        writeTestListFile();
+        writeCfgFile();
+    }
+
+    private void makeJavaInvoke() {
+        appendToJava("    public static void main(String[] args) throws Exception");
+        appendToJava("    {");
+        appendToJava("        if ( System.getProperty(\"os.name\").matches(\".*[Ww][Ii][Nn].*\") )");
+        appendToJava("        {");
+        appendToJava("            System.out.println(\"TEST PASSED! Dummy execution on Windows* OS!\");");
+        appendToJava("            return;");
+        appendToJava("        }");
+
+        appendToJava("        deleteFiles();");
+        appendToJavaN("        PrintStream ps=new PrintStream(new File(\"");
+        appendToJavaN(javaTxtFileName);
+        appendToJava("\"));");
+
+        appendToJava("    if (args.length>0)");
+        appendToJava("        switch(args[0])");
+        appendToJava("        {");
+
+        for (String s : javaFncNames) {
+            appendToJava("        case \"" + s + "\":");
+            appendToJavaN("            ");
+            appendToJavaN(s);
+            appendToJava("_invoke(ps);");
+            appendToJava("            break;");
+
+        }
+        appendToJava("        default:");
+        appendToJava("            throw new Exception(\"FAIL: invalid args!\");");
+        appendToJava("        }");
+        appendToJava("        else");
+        appendToJava("        {");
+        appendToJava("            throw new Exception(\"FAIL: invalid args!\");");
+        appendToJava("        }");
+
+
+    }
+
+    private void makeCIntro() {
+        //appendToC(" //------------------------C----------------------------");
+        //appendToC("#include \""+className+".h\"");
+        appendToC("#include <jni.h>");
+        appendToC("#include <stdio.h>");
+    }
+
+    private void makeJavaIntro(String className) {
+
+        cFileSrc = new StringBuilder();
+        javaFileSrc = new StringBuilder();
+
+
+        File outputDirL1 = new File("vm" + File.separatorChar + "jit" + File.separatorChar + "LongTransitions");
+        //outputDir=new File(outputDirL1,className);
+        outputDir = outputDirL1;
+        outputDir.mkdirs();
+
+        javaTxtFileName = className + "_java.txt";
+        cTxtFileName = className + "_c.txt";
+
+        appendToJava("package " + JAVA_PACKAGE_NAME + ";");
+        appendToJava("import java.io.*;");
+        appendToJava("import java.util.Random;");
+        appendToJava("public class " + className);
+        appendToJava("{");
+        appendToJava("    public static boolean flag = false;");
+        appendToJava("    static Random rnd;");
+        appendToJava("    static{");
+        appendToJava("        rnd=new Random();");
+        appendToJava("        System.loadLibrary(\"" + className + "\");");
+        appendToJava("    }");
+        //Different randoms
+        appendToJava("    public static int getRndInt(){return rnd.nextInt(Integer.MAX_VALUE);}");
+        appendToJava("    public static float getRndFloat(){return rnd.nextFloat()*Float.MAX_VALUE;}");
+        appendToJava("    public static double getRndDouble(){return rnd.nextDouble()*Double.MAX_VALUE;}");
+        appendToJava("    public static byte getRndByte(){return (byte)rnd.nextInt(Byte.MAX_VALUE);}");
+
+        //deleteFiles method
+        appendToJava("    private static void deleteFiles()");
+        appendToJava("    {");
+        appendToJavaN("        File f=new File(\"");
+        appendToJavaN(javaTxtFileName);
+        appendToJava("\");");
+        appendToJava("        if ( f.exists())");
+        appendToJava("        f.delete();");
+        appendToJavaN("        f=new File(\"");
+        appendToJavaN(cTxtFileName);
+        appendToJava("\");");
+        appendToJava("        if ( f.exists())");
+        appendToJava("         f.delete();");
+        appendToJava("    }");
+    }
+
+    private void makeJavaOutro() {
+        appendToJava("        flag=chkFile();");
+        appendToJava("        if(!flag)");
+        appendToJava("            throw new Exception(\"FAIL:Tests failed!\"); ");
+        appendToJava("    }");
+        appendToJava("    private static boolean chkFile()");
+        appendToJava("    {");
+        appendToJava("        File javaFile=new File(\"" + javaTxtFileName + "\");");
+        appendToJava("        if (! javaFile.exists())");
+        appendToJava("        {");
+        appendToJava("            System.out.println(\"FAIL:Failed to open file " + javaTxtFileName + " - file not exists!\");");
+        appendToJava("            return false;");
+        appendToJava("        }");
+        appendToJava("        File cFile=new File(\"" + cTxtFileName + "\");");
+        appendToJava("        if (! cFile.exists())");
+        appendToJava("        {");
+        appendToJava("                System.out.println(\"FAIL:Failed to open file " + cTxtFileName + " - file not exists!\");");
+        appendToJava("                return false;");
+        appendToJava("        }");
+        appendToJava("        if ( cFile.length()!=javaFile.length() )");
+        appendToJava("        {");
+        appendToJava("            System.out.println(\"FAIL:File length not equal!\");");
+        appendToJava("            return false;");
+        appendToJava("        }");
+        appendToJava("        long byteCount=cFile.length();");
+
+
+        appendToJava("        try{");
+        appendToJava("            FileInputStream fisC=new FileInputStream(cFile);");
+        appendToJava("            FileInputStream fisJava=new FileInputStream(javaFile);");
+        appendToJava("            byte[] cData=new byte[fisC.available()];");
+        appendToJava("            fisC.read(cData);");
+        appendToJava("            byte[] javaData=new byte[fisJava.available()];");
+        appendToJava("            fisJava.read(javaData);");
+
+        appendToJava("            for ( int cnt=0;cnt<byteCount;++cnt)");
+        appendToJava("            {");
+        appendToJava("                if ( cData[cnt]!=javaData[cnt] )");
+        appendToJava("                {");
+        appendToJava("                    System.out.println(\"FAIL:Test failed! \"+cnt+\" byte are wrong! C file - \" + cData[cnt] + \" Java file - \"+javaData[cnt] );");
+        appendToJava("                    return false;");
+        appendToJava("                }");
+        appendToJava("            }");
+        appendToJava("        }");
+        appendToJava("        catch (FileNotFoundException ex)");
+        appendToJava("        {");
+        appendToJava("            System.out.println(\"FAIL:Some of files not found!\");");
+        appendToJava("            return false;");
+        appendToJava("        }");
+        appendToJava("        catch (IOException ex)");
+        appendToJava("        {");
+        appendToJava("            System.out.println(\"FAIL:Failed to read files!\");");
+        appendToJava("            return false;");
+        appendToJava("        }");
+        appendToJava("        System.out.println(\"PASS: all data passed correctly!\");");
+        appendToJava("        return true;");
+
+
+
+        appendToJava("    }");
+
+        appendToJava("}");
+
+
+    }
+
+    private void makeOneTest(int paramCounter, ParamType paramType, TestType testType, String fncName) throws IOException {
+
+        javaFncNames.add(fncName);
+        SrcGenerator gen = new SrcGenerator(paramCounter, 1, paramType, testType, fncName, LINE_LENGTH);
+        generateJava(gen);
+        generateCpp(gen);
+
+
+    }
+
+    /*
+     * Create Java file containing code to call C native method. Method
+     * arguments list generated randomly.
+     *
+     */
+    private void generateJava(SrcGenerator srcGen) throws IOException {
+
+        //native method
+        appendToJavaN("    native public static void " + srcGen.getFncName() + "(");
+        //appendToJavaN(srcGen.getJParm().toString());
+        appendToJavaN(srcGen.getJParm().toFormatString("        ", LINE_LENGTH));
+        appendToJava("    );");
+        //main
+        //appendToJava(srcGen.getJExecVarCreation());
+        appendToJava("    private static void " + srcGen.getFncName() + "_invoke(PrintStream ps)");
+        appendToJava(srcGen.getJExec("        "));
+    }
+
+    private void writeToJavaFile(String className) throws IOException {
+
+        File javaFile = new File(outputDir, className + ".java");
+        try (FileWriter javaFileWriter = new FileWriter(javaFile)) {
+            javaFileWriter.write(javaFileSrc.toString());
+        }
+    }
+
+    private void writeToCFile(String className) throws IOException {
+
+        File cFile = new File(outputDir, className + ".c");
+        try (FileWriter cFileWriter = new FileWriter(cFile)) {
+            cFileWriter.write(cFileSrc.toString());
+        }
+    }
+
+    private void writeTestListFile() {
+
+        StringBuilder cfg = new StringBuilder();
+
+        for (String fncName : javaFncNames) {
+            cfg.append(TEST_LIST_PREFIX).append("/").append(fncName);
+            cfg.append(" ").append("execute_positive\n");
+        }
+
+        File cfgFile = new File(outputDir, TEST_LIST_NAME);
+        try (FileWriter fw = new FileWriter(cfgFile)) {
+            fw.write(cfg.toString());
+        } catch (Exception e) {
+        }
+
+    }
+
+    private void writeCfgFile() {
+
+        for (String fncName : javaFncNames) {
+
+            StringBuilder cfg = new StringBuilder();
+
+            cfg.append("LD_LIBRARY_PATH=${COMMON_LIBS_LOCATION}/lib/${ARCH}/vm/jit/LongTransitions${PS}$LD_LIBRARY_PATH\n");
+            cfg.append("export LD_LIBRARY_PATH\n");
+            cfg.append("JAVA_OPTS=${JAVA_OPTS} ${JIT_OPTS}\n");
+            cfg.append("export JAVA_OPTS\n");
+            cfg.append("EXECUTE_CLASS=" + JAVA_PACKAGE_NAME + "." + JAVA_CLASS_NAME + "\n");
+            cfg.append("TEST_ARGS=" + fncName);
+
+            File tdir = new File(outputDir, fncName);
+            tdir.mkdirs();
+            File cfgFile = new File(tdir, fncName + ".cfg");
+            try (FileWriter fw = new FileWriter(cfgFile)) {
+                fw.write(cfg.toString());
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    /*
+     * Generate C file. This file containing instructions to put passed
+     * arguments into output file for further comparsion with java output *
+     */
+    private void generateCpp(SrcGenerator srcGen) throws IOException {
+
+        appendToC("JNIEXPORT void JNICALL " + C_FNC_NAME_PREFIX + srcGen.getFncName() + "(JNIEnv *e, jclass c");
+        appendToCN(srcGen.getCParm().toFormatString("    ", LINE_LENGTH));
+        appendToCN(")");
+        appendToC("\n{");
+
+        appendToCN("    FILE *file=fopen(\"");
+        appendToCN(cTxtFileName);
+        appendToCN("\",\"a\");");
+
+        appendToC(srcGen.getCExec(LINE_LENGTH,"    "));
+        appendToC("    fclose(file);");
+        appendToC("}");
+    }
+
+    private void appendToJava(String s) {
+        javaFileSrc.append(s);
+        javaFileSrc.append("\n");
+        System.out.println(s);
+    }
+
+    private void appendToJavaN(String s) {
+        javaFileSrc.append(s);
+        System.out.print(s);
+    }
+
+    private void appendToC(String s) {
+        cFileSrc.append(s);
+        cFileSrc.append("\n");
+        System.out.println(s);
+    }
+
+    private void appendToCN(String s) {
+        cFileSrc.append(s);
+        System.out.print(s);
+
+    }
+}
+
+enum NumberType {
+
+    INT("int ", "getRndInt()", "jint ", "%d", "%d"),
+    DOUBLE("double ", "getRndDouble()", "jdouble ", "%e", "%e"),
+    FLOAT("float ", "getRndFloat()", "jfloat ", "%e", "%e"),
+    BYTE("byte ", "getRndByte()", "jbyte ", "%d", "%d");
+    private String cType;
+    private String jType;
+    private String cConv;
+    private String jConv;
+    private String rndFnc;
+
+    NumberType(String jType, String rndFnc, String cType, String jConv, String cConv) {
+        this.cType = cType;
+        this.jType = jType;
+        this.cConv = cConv;
+        this.jConv = jConv;
+        this.rndFnc = rndFnc;
+    }
+
+    public String getСType() {
+        return cType;
+    }
+
+    public String getJType() {
+        return jType;
+    }
+
+    public String getСConv() {
+        return cConv;
+    }
+
+    public String getJConv() {
+        return jConv;
+    }
+
+    public String getFnc() {
+        return rndFnc;
+    }
+}
+
+//Types for testing
+enum ParamType {
+    //DFBI
+
+    MIXED_DFBI1(NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_DFBI2(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_DFBI3(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_DFBI4(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_DFBI5(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    //DFB
+    MIXED_DFB1(NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_DFB2(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_DFB3(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_DFB4(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_DFB5(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.BYTE),
+    //DFI
+    MIXED_DFI1(NumberType.DOUBLE, NumberType.FLOAT, NumberType.INT),
+    MIXED_DFI2(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.INT),
+    MIXED_DFI3(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.INT),
+    MIXED_DFI4(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.INT),
+    MIXED_DFI5(NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.DOUBLE, NumberType.FLOAT, NumberType.INT),
+    //
+    MIXED_DF1(NumberType.DOUBLE, NumberType.FLOAT),
+    MIXED_DF2(NumberType.DOUBLE, NumberType.FLOAT, NumberType.FLOAT),
+    MIXED_DF3(NumberType.DOUBLE, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT),
+    MIXED_DF4(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.FLOAT),
+    MIXED_DF5(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.FLOAT),
+    //
+    EASY_D(NumberType.DOUBLE),
+    EASY_F(NumberType.FLOAT),
+    //Not needed
+    EASY_I(NumberType.INT),
+    EASY_B(NumberType.BYTE),
+    MIXED_IB(NumberType.INT, NumberType.BYTE),
+    //
+    MIXED_FBI1(NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_FBI2(NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_FBI3(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_FBI4(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    MIXED_FBI5(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE, NumberType.INT),
+    //
+    MIXED_FB1(NumberType.FLOAT, NumberType.BYTE),
+    MIXED_FB2(NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_FB3(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_FB4(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE),
+    MIXED_FB5(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.BYTE),
+    //
+    MIXED_DBI1(NumberType.DOUBLE, NumberType.BYTE, NumberType.INT),
+    MIXED_DBI2(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE, NumberType.INT),
+    MIXED_DBI3(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE, NumberType.INT),
+    MIXED_DBI4(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE, NumberType.INT),
+    MIXED_DBI5(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE, NumberType.INT),
+    //
+    MIXED_DB1(NumberType.DOUBLE, NumberType.BYTE),
+    MIXED_DB2(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE),
+    MIXED_DB3(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE),
+    MIXED_DB4(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE),
+    MIXED_DB5(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.BYTE),
+    //
+    MIXED_FI1(NumberType.FLOAT, NumberType.INT),
+    MIXED_FI2(NumberType.FLOAT, NumberType.FLOAT, NumberType.INT),
+    MIXED_FI3(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.INT),
+    MIXED_FI4(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.INT),
+    MIXED_FI5(NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.FLOAT, NumberType.INT),
+    //
+    MIXED_DI1(NumberType.DOUBLE, NumberType.INT),
+    MIXED_DI2(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.INT),
+    MIXED_DI3(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.INT),
+    MIXED_DI4(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.INT),
+    MIXED_DI5(NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.DOUBLE, NumberType.INT);
+    ArrayList<NumberType> value = new ArrayList();
+
+    ParamType(NumberType... type) {
+        value.addAll(Arrays.asList(type));
+    }
+
+    public ArrayList<NumberType> getValue() {
+        return value;
+    }
+}
+
+class GeneratorLogic {
+
+    public String generateJava(String fncName, ParameterList parmOut, ParameterList parmType, int maxLength, String prefix) {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("    {\n").append(prefix);
+        int lineLength = 0;
+        for (ParameterItem p : parmType.getList()) {
+            sb.append(p.value1);
+            sb.append(" ");
+            sb.append(p.value2);
+            sb.append("=");
+            sb.append(p.value3);
+            sb.append(";");
+            if (sb.length() - lineLength > maxLength) {
+                sb.append("\n").append(prefix);
+                lineLength = sb.length();
+            }
+        }
+
+        sb.append("\n");
+        sb.append(prefix);
+        for (ParameterItem p : parmOut.getList()) {
+            sb.append("ps.format(\"");
+            sb.append(p.value2);
+            sb.append("=");
+            sb.append(p.value1);
+            sb.append("\\n\",");
+
+
+            sb.append(p.value2);
+            sb.append(");");
+            if (sb.length() - lineLength > maxLength) {
+                sb.append("\n").append(prefix);
+                lineLength = sb.length();
+            }
+
+        }
+
+        sb.append("\n").append(prefix);
+
+        sb.append(fncName);
+        sb.append("(");
+        for (ParameterItem p : parmOut.getList()) {
+            sb.append(p.getDelim());
+            sb.append(p.value2);
+            if (sb.length() - lineLength > maxLength) {
+                sb.append("\n").append(prefix);
+                lineLength = sb.length();
+            }
+        }
+        sb.append(");\n}\n");
+
+        return sb.toString();
+    }
+}
+
+//Test types
+enum TestType {
+
+    RANDOM(new GeneratorLogic());
+    private GeneratorLogic genLogic;
+
+    TestType(GeneratorLogic genLogic) {
+        this.genLogic = genLogic;
+    }
+
+    public GeneratorLogic getLogic() {
+        return genLogic;
+    }
+}
+
+//One item for ParameterList (delimiter and value to build strings)
+class ParameterItem {
+
+    private String delimiter;
+    String value1;
+    String value2;
+    String value3;
+    //private String endVal="";
+
+    public ParameterItem(String delimiter, String value) {
+        this.delimiter = delimiter;
+        this.value1 = value;
+        value2 = "";
+        value3 = "";
+    }
+
+    public ParameterItem(String delimiter, String value1, String value2) {
+        this.delimiter = delimiter;
+        this.value1 = value1;
+        this.value2 = value2;
+        value3 = "";
+    }
+
+    public ParameterItem(String delimiter, String value1, String value2, String value3) {
+        this.delimiter = delimiter;
+        this.value1 = value1;
+        this.value2 = value2;
+        this.value3 = value3;
+    }
+
+    public String toString() {
+        return delimiter + value1 + value2 + value3;
+    }
+
+    public String getDelim() {
+        return delimiter;
+    }
+}
+//Delimiters and values to generate calls, etc.
+class ParameterList {
+
+    ArrayList<ParameterItem> list = new ArrayList();
+    private String initDelim;
+    private String delim;
+    boolean lineBreak;
+
+    public ParameterList(String initialDelimiter, String delimiter, boolean lineBreak) {
+        initDelim = initialDelimiter;
+        delim = delimiter;
+        this.lineBreak = lineBreak;
+    }
+
+    public ArrayList<ParameterItem> getList() {
+        return list;
+    }
+
+    public void add(String value) {
+        list.add(new ParameterItem(initDelim, value));
+        initDelim = delim;
+    }
+
+    public void add(String value1, String value2) {
+        list.add(new ParameterItem(initDelim, value1, value2));
+        initDelim = delim;
+    }
+
+    public void add(String value1, String value2, String value3) {
+        list.add(new ParameterItem(initDelim, value1, value2, value3));
+        initDelim = delim;
+    }
+
+    public ParameterItem get(int id) {
+        return list.get(id);
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (ParameterItem p : list) {
+            sb.append(p.toString());
+            if (lineBreak) {
+                sb.append("\n");
+            }
+
+        }
+        return sb.toString();
+    }
+
+    public String toFormatString(String prefix, int maxLength) {
+        StringBuilder sb = new StringBuilder();
+        int charCount = 0;
+        for (ParameterItem p : list) {
+            sb.append(p.toString());
+            if (sb.length() - charCount > maxLength) {
+                sb.append("\n").append(prefix);
+                charCount = sb.length();
+            }
+        }
+        return sb.toString();
+    }
+
+    public int size() {
+        return list.size();
+    }
+
+    public String getAllItemExclude(int excludeId) {
+        StringBuilder sb = new StringBuilder();
+        int cnt = list.size();
+
+        for (int id = 0; id < cnt; ++id) {
+            ParameterItem p = list.get(id);
+            if (id == excludeId) {
+                sb.append(p.getDelim());
+                sb.append("0");
+            } else {
+                sb.append(p.toString());
+
+            }
+        }
+
+        return sb.toString();
+
+    }
+
+    public String getAllItemExcludeNot(int excludeId) {
+        StringBuilder sb = new StringBuilder();
+        int cnt = list.size();
+
+        for (int id = 0; id < cnt; ++id) {
+            ParameterItem p = list.get(id);
+            if (id != excludeId) {
+                sb.append(p.getDelim());
+                sb.append("0");
+//                sb.append(p.getEnd());
+            } else {
+                sb.append(p.toString());
+
+            }
+        }
+
+        return sb.toString();
+    }
+}
+
+class ParameterListGenerator {
+
+    private ArrayList<NumberType> list = new ArrayList();
+    private Random random;
+    private int typeCnt;
+    ParameterList cParms = new ParameterList(",", ",", true);
+    ParameterList rParms = new ParameterList("", ",", true);
+    ParameterList jParms = new ParameterList("", ",", true);
+    ParameterList cExec = new ParameterList("", "", true);
+    ParameterList jExecParm = new ParameterList("", ",", true);
+    ParameterList jExecOut = new ParameterList("", ",", true);
+
+    public ParameterListGenerator(int length, ParamType paramType) {
+        generateRndTest(paramType, length);
+    }
+
+    private void add(ParameterList list, String s1) {
+        list.add(s1);
+    }
+
+    private void add(ParameterList list, String s1, String s2) {
+        list.add(s1, s2);
+    }
+
+    private void add(ParameterList list, String s1, String s2, String s3) {
+        list.add(s1, s2, s3);
+    }
+
+    private void generateRndTest(ParamType paramType, int length) {
+        generateTypeList(paramType);
+
+        typeCnt = list.size();
+        random = new Random();
+        random.setSeed(System.currentTimeMillis());
+
+        for (int cnt = 0; cnt < length; ++cnt) {
+            int type = random.nextInt(typeCnt);
+
+            String randomVal = list.get(type).getFnc();
+
+            String ctype = list.get(type).getСType();
+            String jtype = list.get(type).getJType();
+            String cconv = list.get(type).getСConv();
+            String jconv = list.get(type).getJConv();
+
+            String varName = "p" + cnt;
+            add(jParms, jtype, varName);
+            //jParmGen.add(jtype + varName);
+
+            //cParms.add(ctype + varName);
+            add(cParms, ctype, varName);
+
+
+            //rParms.add(varName);
+            add(rParms, varName);
+
+            add(cExec, varName, cconv);
+
+            add(jExecParm, jtype, varName, randomVal);
+            //jExecOut.add(new PairString(jconv,varName,jtype));
+            add(jExecOut, jconv, varName, jtype);
+        }
+
+    }
+
+    public ParameterList getCExec() {
+        return cExec;
+    }
+
+    public ParameterList getCParm() {
+        return cParms;
+    }
+
+    //Return generated java text
+    public ParameterList getJExecParameters() {
+        return jExecParm;
+    }
+
+    public ParameterList getJExecOut() {
+        return jExecOut;
+    }
+
+    /*
+     * Return string containing parameters for Java
+     */
+    public ParameterList getJParm() {
+        return jParms;
+    }
+
+    public ParameterList getRParm() {
+        return rParms;
+    }
+
+    private void generateTypeList(ParamType paramType) {
+        list.addAll(paramType.getValue());
+    }
+}
+
+class SrcGenerator {
+
+    ParameterListGenerator parmListGen;
+    GeneratorLogic genLogic;
+    int iterationCounter;
+    int parametersCounter;
+    ParamType paramType;
+    TestType testType;
+    String fncName;
+    //SrcGenerator g1=new SrcGenerator(3,1,ParamType.MIXED_DFIB,TestType.RANDOM,"callRandom");
+    int maxLength;
+
+    public SrcGenerator(int parmCounter, int iterCounter, ParamType parType, TestType testType, String fncName, int maxLength) {
+        this.maxLength = maxLength;
+        parametersCounter = parmCounter;
+        iterationCounter = iterCounter;
+        paramType = parType;
+        this.testType = testType;
+        this.fncName = fncName;
+        parmListGen = new ParameterListGenerator(parametersCounter, paramType);
+        genLogic = testType.getLogic();
+
+    }
+
+    public String getFncName() {
+        return fncName;
+    }
+
+    public ParameterList getJParm() {
+        return parmListGen.getJParm();
+    }
+
+    public ParameterList getCParm() {
+        return parmListGen.getCParm();
+    }
+
+    public String getCExec() {
+
+        StringBuilder sb = new StringBuilder();
+        for (ParameterItem p : parmListGen.getCExec().getList()) {
+            sb.append("fprintf(file,\"");
+            sb.append(p.value1);
+            sb.append("=");
+            sb.append(p.value2);
+            sb.append("\\n\",");
+            sb.append(p.value1);
+            sb.append(");\n");
+        }
+        return sb.toString();
+    }
+
+    public String getCExec(int maxLength,String prefix) {
+
+        int lineLength = 0;
+        StringBuilder sb = new StringBuilder();
+        for (ParameterItem p : parmListGen.getCExec().getList()) {
+            sb.append("fprintf(file,\"");
+            sb.append(p.value1);
+            sb.append("=");
+            sb.append(p.value2);
+            sb.append("\\n\",");
+            sb.append(p.value1);
+            sb.append(");");
+            if (sb.length() - lineLength > maxLength) {
+                lineLength = sb.length();
+                sb.append("\n").append(prefix);
+            }
+        }
+        return sb.toString();
+    }
+
+    public String getJExec(String prefix) {
+        return genLogic.generateJava(fncName, parmListGen.getJExecOut(), parmListGen.getJExecParameters(), maxLength, prefix);
+
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/LTTest.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/LTTest.java
new file mode 100644
index 00000000000..0ff18a8a043
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/LTTest.java
@@ -0,0 +1,6239 @@
+/*
+ * Copyright (c) 2012, 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 vm.jit.LongTransitions;
+import java.io.*;
+import java.util.Random;
+public class LTTest
+{
+    public static boolean flag = false;
+    static Random rnd;
+    static{
+        rnd=new Random();
+        System.loadLibrary("LTTest");
+    }
+    public static int getRndInt(){return rnd.nextInt(Integer.MAX_VALUE);}
+    public static float getRndFloat(){return rnd.nextFloat()*Float.MAX_VALUE;}
+    public static double getRndDouble(){return rnd.nextDouble()*Double.MAX_VALUE;}
+    public static byte getRndByte(){return (byte)rnd.nextInt(Byte.MAX_VALUE);}
+    private static void deleteFiles()
+    {
+        File f=new File("LTTest_java.txt");
+        if ( f.exists())
+        f.delete();
+        f=new File("LTTest_c.txt");
+        if ( f.exists())
+         f.delete();
+    }
+    native public static void nativeFnc1(float p0,float p1,float p2,float p3,float p4,float p5,float p6,float p7
+        ,float p8,float p9,float p10,float p11,float p12,float p13,float p14,float p15
+        ,float p16,float p17,float p18,float p19,float p20,float p21,float p22,float p23
+        ,float p24,float p25,float p26,float p27,float p28,float p29,float p30,float p31
+        ,float p32,float p33,float p34,float p35,float p36,float p37,float p38,float p39
+        ,float p40,float p41,float p42,float p43,float p44,float p45,float p46,float p47
+        ,float p48,float p49,float p50,float p51,float p52,float p53,float p54,float p55
+        ,float p56,float p57,float p58,float p59,float p60,float p61,float p62,float p63
+        ,float p64,float p65,float p66,float p67,float p68,float p69,float p70,float p71
+        ,float p72,float p73,float p74,float p75,float p76,float p77,float p78,float p79
+        ,float p80,float p81,float p82,float p83,float p84,float p85,float p86,float p87
+        ,float p88,float p89,float p90,float p91,float p92,float p93,float p94,float p95
+        ,float p96,float p97,float p98,float p99,float p100,float p101,float p102
+        ,float p103,float p104,float p105,float p106,float p107,float p108,float p109
+        ,float p110,float p111,float p112,float p113,float p114,float p115,float p116
+        ,float p117,float p118,float p119,float p120,float p121,float p122,float p123
+        ,float p124,float p125,float p126    );
+    private static void nativeFnc1_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        float  p6=getRndFloat();float  p7=getRndFloat();float  p8=getRndFloat();
+        float  p9=getRndFloat();float  p10=getRndFloat();float  p11=getRndFloat();
+        float  p12=getRndFloat();float  p13=getRndFloat();float  p14=getRndFloat();
+        float  p15=getRndFloat();float  p16=getRndFloat();float  p17=getRndFloat();
+        float  p18=getRndFloat();float  p19=getRndFloat();float  p20=getRndFloat();
+        float  p21=getRndFloat();float  p22=getRndFloat();float  p23=getRndFloat();
+        float  p24=getRndFloat();float  p25=getRndFloat();float  p26=getRndFloat();
+        float  p27=getRndFloat();float  p28=getRndFloat();float  p29=getRndFloat();
+        float  p30=getRndFloat();float  p31=getRndFloat();float  p32=getRndFloat();
+        float  p33=getRndFloat();float  p34=getRndFloat();float  p35=getRndFloat();
+        float  p36=getRndFloat();float  p37=getRndFloat();float  p38=getRndFloat();
+        float  p39=getRndFloat();float  p40=getRndFloat();float  p41=getRndFloat();
+        float  p42=getRndFloat();float  p43=getRndFloat();float  p44=getRndFloat();
+        float  p45=getRndFloat();float  p46=getRndFloat();float  p47=getRndFloat();
+        float  p48=getRndFloat();float  p49=getRndFloat();float  p50=getRndFloat();
+        float  p51=getRndFloat();float  p52=getRndFloat();float  p53=getRndFloat();
+        float  p54=getRndFloat();float  p55=getRndFloat();float  p56=getRndFloat();
+        float  p57=getRndFloat();float  p58=getRndFloat();float  p59=getRndFloat();
+        float  p60=getRndFloat();float  p61=getRndFloat();float  p62=getRndFloat();
+        float  p63=getRndFloat();float  p64=getRndFloat();float  p65=getRndFloat();
+        float  p66=getRndFloat();float  p67=getRndFloat();float  p68=getRndFloat();
+        float  p69=getRndFloat();float  p70=getRndFloat();float  p71=getRndFloat();
+        float  p72=getRndFloat();float  p73=getRndFloat();float  p74=getRndFloat();
+        float  p75=getRndFloat();float  p76=getRndFloat();float  p77=getRndFloat();
+        float  p78=getRndFloat();float  p79=getRndFloat();float  p80=getRndFloat();
+        float  p81=getRndFloat();float  p82=getRndFloat();float  p83=getRndFloat();
+        float  p84=getRndFloat();float  p85=getRndFloat();float  p86=getRndFloat();
+        float  p87=getRndFloat();float  p88=getRndFloat();float  p89=getRndFloat();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        float  p93=getRndFloat();float  p94=getRndFloat();float  p95=getRndFloat();
+        float  p96=getRndFloat();float  p97=getRndFloat();float  p98=getRndFloat();
+        float  p99=getRndFloat();float  p100=getRndFloat();float  p101=getRndFloat();
+        float  p102=getRndFloat();float  p103=getRndFloat();float  p104=getRndFloat();
+        float  p105=getRndFloat();float  p106=getRndFloat();float  p107=getRndFloat();
+        float  p108=getRndFloat();float  p109=getRndFloat();float  p110=getRndFloat();
+        float  p111=getRndFloat();float  p112=getRndFloat();float  p113=getRndFloat();
+        float  p114=getRndFloat();float  p115=getRndFloat();float  p116=getRndFloat();
+        float  p117=getRndFloat();float  p118=getRndFloat();float  p119=getRndFloat();
+        float  p120=getRndFloat();float  p121=getRndFloat();float  p122=getRndFloat();
+        float  p123=getRndFloat();float  p124=getRndFloat();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc1(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc2(double p0,double p1,double p2,double p3,double p4,double p5,double p6,double p7
+        ,double p8,double p9,double p10,double p11,double p12,double p13,double p14
+        ,double p15,double p16,double p17,double p18,double p19,double p20,double p21
+        ,double p22,double p23,double p24,double p25,double p26,double p27,double p28
+        ,double p29,double p30,double p31,double p32,double p33,double p34,double p35
+        ,double p36,double p37,double p38,double p39,double p40,double p41,double p42
+        ,double p43,double p44,double p45,double p46,double p47,double p48,double p49
+        ,double p50,double p51,double p52,double p53,double p54,double p55,double p56
+        ,double p57,double p58,double p59,double p60,double p61,double p62,double p63
+        ,double p64,double p65,double p66,double p67,double p68,double p69,double p70
+        ,double p71,double p72,double p73,double p74,double p75,double p76,double p77
+        ,double p78,double p79,double p80,double p81,double p82,double p83,double p84
+        ,double p85,double p86,double p87,double p88,double p89,double p90,double p91
+        ,double p92,double p93,double p94,double p95,double p96,double p97,double p98
+        ,double p99,double p100,double p101,double p102,double p103,double p104
+        ,double p105,double p106,double p107,double p108,double p109,double p110
+        ,double p111,double p112,double p113,double p114,double p115,double p116
+        ,double p117,double p118,double p119,double p120,double p121,double p122
+        ,double p123,double p124,double p125,double p126    );
+    private static void nativeFnc2_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        double  p18=getRndDouble();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();double  p22=getRndDouble();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        double  p27=getRndDouble();double  p28=getRndDouble();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();double  p32=getRndDouble();
+        double  p33=getRndDouble();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();double  p37=getRndDouble();double  p38=getRndDouble();
+        double  p39=getRndDouble();double  p40=getRndDouble();double  p41=getRndDouble();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();double  p46=getRndDouble();double  p47=getRndDouble();
+        double  p48=getRndDouble();double  p49=getRndDouble();double  p50=getRndDouble();
+        double  p51=getRndDouble();double  p52=getRndDouble();double  p53=getRndDouble();
+        double  p54=getRndDouble();double  p55=getRndDouble();double  p56=getRndDouble();
+        double  p57=getRndDouble();double  p58=getRndDouble();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();double  p64=getRndDouble();double  p65=getRndDouble();
+        double  p66=getRndDouble();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();double  p70=getRndDouble();double  p71=getRndDouble();
+        double  p72=getRndDouble();double  p73=getRndDouble();double  p74=getRndDouble();
+        double  p75=getRndDouble();double  p76=getRndDouble();double  p77=getRndDouble();
+        double  p78=getRndDouble();double  p79=getRndDouble();double  p80=getRndDouble();
+        double  p81=getRndDouble();double  p82=getRndDouble();double  p83=getRndDouble();
+        double  p84=getRndDouble();double  p85=getRndDouble();double  p86=getRndDouble();
+        double  p87=getRndDouble();double  p88=getRndDouble();double  p89=getRndDouble();
+        double  p90=getRndDouble();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();double  p94=getRndDouble();double  p95=getRndDouble();
+        double  p96=getRndDouble();double  p97=getRndDouble();double  p98=getRndDouble();
+        double  p99=getRndDouble();double  p100=getRndDouble();double  p101=getRndDouble();
+        double  p102=getRndDouble();double  p103=getRndDouble();double  p104=getRndDouble();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();double  p109=getRndDouble();double  p110=getRndDouble();
+        double  p111=getRndDouble();double  p112=getRndDouble();double  p113=getRndDouble();
+        double  p114=getRndDouble();double  p115=getRndDouble();double  p116=getRndDouble();
+        double  p117=getRndDouble();double  p118=getRndDouble();double  p119=getRndDouble();
+        double  p120=getRndDouble();double  p121=getRndDouble();double  p122=getRndDouble();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc2(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc3(float p0,int p1,int p2,int p3,int p4,float p5,int p6,float p7,int p8,float p9
+        ,int p10,int p11,float p12,float p13,float p14,float p15,int p16,int p17
+        ,int p18,float p19,int p20,float p21,float p22,float p23,float p24,int p25
+        ,float p26,int p27,float p28,float p29,float p30,int p31,int p32,float p33
+        ,float p34,float p35,int p36,float p37,int p38,float p39,int p40,float p41
+        ,float p42,float p43,int p44,int p45,float p46,float p47,float p48,float p49
+        ,int p50,int p51,int p52,float p53,int p54,float p55,int p56,float p57,float p58
+        ,float p59,float p60,int p61,int p62,int p63,float p64,float p65,float p66
+        ,float p67,int p68,int p69,float p70,float p71,int p72,int p73,float p74
+        ,int p75,int p76,int p77,float p78,float p79,float p80,int p81,float p82
+        ,int p83,float p84,float p85,float p86,float p87,int p88,int p89,int p90
+        ,float p91,int p92,int p93,float p94,float p95,int p96,float p97,float p98
+        ,float p99,int p100,float p101,float p102,int p103,float p104,float p105
+        ,int p106,float p107,float p108,int p109,float p110,float p111,int p112
+        ,float p113,int p114,float p115,int p116,int p117,float p118,float p119
+        ,int p120,float p121,int p122,float p123,int p124,int p125,float p126    );
+    private static void nativeFnc3_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();int  p1=getRndInt();int  p2=getRndInt();
+        int  p3=getRndInt();int  p4=getRndInt();float  p5=getRndFloat();int  p6=getRndInt();
+        float  p7=getRndFloat();int  p8=getRndInt();float  p9=getRndFloat();int  p10=getRndInt();
+        int  p11=getRndInt();float  p12=getRndFloat();float  p13=getRndFloat();
+        float  p14=getRndFloat();float  p15=getRndFloat();int  p16=getRndInt();
+        int  p17=getRndInt();int  p18=getRndInt();float  p19=getRndFloat();int  p20=getRndInt();
+        float  p21=getRndFloat();float  p22=getRndFloat();float  p23=getRndFloat();
+        float  p24=getRndFloat();int  p25=getRndInt();float  p26=getRndFloat();
+        int  p27=getRndInt();float  p28=getRndFloat();float  p29=getRndFloat();
+        float  p30=getRndFloat();int  p31=getRndInt();int  p32=getRndInt();float  p33=getRndFloat();
+        float  p34=getRndFloat();float  p35=getRndFloat();int  p36=getRndInt();
+        float  p37=getRndFloat();int  p38=getRndInt();float  p39=getRndFloat();
+        int  p40=getRndInt();float  p41=getRndFloat();float  p42=getRndFloat();
+        float  p43=getRndFloat();int  p44=getRndInt();int  p45=getRndInt();float  p46=getRndFloat();
+        float  p47=getRndFloat();float  p48=getRndFloat();float  p49=getRndFloat();
+        int  p50=getRndInt();int  p51=getRndInt();int  p52=getRndInt();float  p53=getRndFloat();
+        int  p54=getRndInt();float  p55=getRndFloat();int  p56=getRndInt();float  p57=getRndFloat();
+        float  p58=getRndFloat();float  p59=getRndFloat();float  p60=getRndFloat();
+        int  p61=getRndInt();int  p62=getRndInt();int  p63=getRndInt();float  p64=getRndFloat();
+        float  p65=getRndFloat();float  p66=getRndFloat();float  p67=getRndFloat();
+        int  p68=getRndInt();int  p69=getRndInt();float  p70=getRndFloat();float  p71=getRndFloat();
+        int  p72=getRndInt();int  p73=getRndInt();float  p74=getRndFloat();int  p75=getRndInt();
+        int  p76=getRndInt();int  p77=getRndInt();float  p78=getRndFloat();float  p79=getRndFloat();
+        float  p80=getRndFloat();int  p81=getRndInt();float  p82=getRndFloat();
+        int  p83=getRndInt();float  p84=getRndFloat();float  p85=getRndFloat();
+        float  p86=getRndFloat();float  p87=getRndFloat();int  p88=getRndInt();
+        int  p89=getRndInt();int  p90=getRndInt();float  p91=getRndFloat();int  p92=getRndInt();
+        int  p93=getRndInt();float  p94=getRndFloat();float  p95=getRndFloat();
+        int  p96=getRndInt();float  p97=getRndFloat();float  p98=getRndFloat();
+        float  p99=getRndFloat();int  p100=getRndInt();float  p101=getRndFloat();
+        float  p102=getRndFloat();int  p103=getRndInt();float  p104=getRndFloat();
+        float  p105=getRndFloat();int  p106=getRndInt();float  p107=getRndFloat();
+        float  p108=getRndFloat();int  p109=getRndInt();float  p110=getRndFloat();
+        float  p111=getRndFloat();int  p112=getRndInt();float  p113=getRndFloat();
+        int  p114=getRndInt();float  p115=getRndFloat();int  p116=getRndInt();int  p117=getRndInt();
+        float  p118=getRndFloat();float  p119=getRndFloat();int  p120=getRndInt();
+        float  p121=getRndFloat();int  p122=getRndInt();float  p123=getRndFloat();
+        int  p124=getRndInt();int  p125=getRndInt();float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%d\n",p1);ps.format("p2=%d\n",p2);ps.format("p3=%d\n",p3);
+        ps.format("p4=%d\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%d\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%d\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%d\n",p10);ps.format("p11=%d\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);
+        ps.format("p16=%d\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%d\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%d\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%d\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%d\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%d\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%d\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);ps.format("p45=%d\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);
+        ps.format("p52=%d\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%d\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);ps.format("p57=%e\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);
+        ps.format("p61=%d\n",p61);ps.format("p62=%d\n",p62);ps.format("p63=%d\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%d\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%d\n",p72);
+        ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%d\n",p75);
+        ps.format("p76=%d\n",p76);ps.format("p77=%d\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%d\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);
+        ps.format("p88=%d\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%d\n",p92);ps.format("p93=%d\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%d\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%d\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%d\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%d\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%d\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%d\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);ps.format("p117=%d\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%d\n",p124);ps.format("p125=%d\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc3(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc4(float p0,float p1,float p2,byte p3,float p4,float p5,float p6,byte p7,float p8
+        ,byte p9,float p10,byte p11,byte p12,byte p13,float p14,float p15,float p16
+        ,float p17,byte p18,byte p19,byte p20,byte p21,float p22,float p23,byte p24
+        ,byte p25,float p26,float p27,float p28,byte p29,float p30,float p31,float p32
+        ,byte p33,byte p34,float p35,byte p36,float p37,byte p38,float p39,float p40
+        ,byte p41,float p42,byte p43,byte p44,float p45,byte p46,float p47,float p48
+        ,byte p49,byte p50,float p51,byte p52,float p53,float p54,byte p55,float p56
+        ,float p57,byte p58,float p59,byte p60,byte p61,byte p62,float p63,byte p64
+        ,byte p65,byte p66,float p67,float p68,float p69,float p70,byte p71,float p72
+        ,float p73,float p74,byte p75,byte p76,float p77,float p78,float p79,float p80
+        ,byte p81,float p82,byte p83,float p84,float p85,byte p86,float p87,byte p88
+        ,float p89,float p90,byte p91,byte p92,byte p93,byte p94,float p95,float p96
+        ,float p97,float p98,float p99,byte p100,byte p101,float p102,float p103
+        ,float p104,byte p105,float p106,float p107,byte p108,float p109,float p110
+        ,byte p111,byte p112,float p113,byte p114,byte p115,float p116,byte p117
+        ,byte p118,byte p119,byte p120,float p121,byte p122,byte p123,byte p124
+        ,byte p125,float p126    );
+    private static void nativeFnc4_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        byte  p3=getRndByte();float  p4=getRndFloat();float  p5=getRndFloat();float  p6=getRndFloat();
+        byte  p7=getRndByte();float  p8=getRndFloat();byte  p9=getRndByte();float  p10=getRndFloat();
+        byte  p11=getRndByte();byte  p12=getRndByte();byte  p13=getRndByte();float  p14=getRndFloat();
+        float  p15=getRndFloat();float  p16=getRndFloat();float  p17=getRndFloat();
+        byte  p18=getRndByte();byte  p19=getRndByte();byte  p20=getRndByte();byte  p21=getRndByte();
+        float  p22=getRndFloat();float  p23=getRndFloat();byte  p24=getRndByte();
+        byte  p25=getRndByte();float  p26=getRndFloat();float  p27=getRndFloat();
+        float  p28=getRndFloat();byte  p29=getRndByte();float  p30=getRndFloat();
+        float  p31=getRndFloat();float  p32=getRndFloat();byte  p33=getRndByte();
+        byte  p34=getRndByte();float  p35=getRndFloat();byte  p36=getRndByte();
+        float  p37=getRndFloat();byte  p38=getRndByte();float  p39=getRndFloat();
+        float  p40=getRndFloat();byte  p41=getRndByte();float  p42=getRndFloat();
+        byte  p43=getRndByte();byte  p44=getRndByte();float  p45=getRndFloat();
+        byte  p46=getRndByte();float  p47=getRndFloat();float  p48=getRndFloat();
+        byte  p49=getRndByte();byte  p50=getRndByte();float  p51=getRndFloat();
+        byte  p52=getRndByte();float  p53=getRndFloat();float  p54=getRndFloat();
+        byte  p55=getRndByte();float  p56=getRndFloat();float  p57=getRndFloat();
+        byte  p58=getRndByte();float  p59=getRndFloat();byte  p60=getRndByte();
+        byte  p61=getRndByte();byte  p62=getRndByte();float  p63=getRndFloat();
+        byte  p64=getRndByte();byte  p65=getRndByte();byte  p66=getRndByte();float  p67=getRndFloat();
+        float  p68=getRndFloat();float  p69=getRndFloat();float  p70=getRndFloat();
+        byte  p71=getRndByte();float  p72=getRndFloat();float  p73=getRndFloat();
+        float  p74=getRndFloat();byte  p75=getRndByte();byte  p76=getRndByte();
+        float  p77=getRndFloat();float  p78=getRndFloat();float  p79=getRndFloat();
+        float  p80=getRndFloat();byte  p81=getRndByte();float  p82=getRndFloat();
+        byte  p83=getRndByte();float  p84=getRndFloat();float  p85=getRndFloat();
+        byte  p86=getRndByte();float  p87=getRndFloat();byte  p88=getRndByte();
+        float  p89=getRndFloat();float  p90=getRndFloat();byte  p91=getRndByte();
+        byte  p92=getRndByte();byte  p93=getRndByte();byte  p94=getRndByte();float  p95=getRndFloat();
+        float  p96=getRndFloat();float  p97=getRndFloat();float  p98=getRndFloat();
+        float  p99=getRndFloat();byte  p100=getRndByte();byte  p101=getRndByte();
+        float  p102=getRndFloat();float  p103=getRndFloat();float  p104=getRndFloat();
+        byte  p105=getRndByte();float  p106=getRndFloat();float  p107=getRndFloat();
+        byte  p108=getRndByte();float  p109=getRndFloat();float  p110=getRndFloat();
+        byte  p111=getRndByte();byte  p112=getRndByte();float  p113=getRndFloat();
+        byte  p114=getRndByte();byte  p115=getRndByte();float  p116=getRndFloat();
+        byte  p117=getRndByte();byte  p118=getRndByte();byte  p119=getRndByte();
+        byte  p120=getRndByte();float  p121=getRndFloat();byte  p122=getRndByte();
+        byte  p123=getRndByte();byte  p124=getRndByte();byte  p125=getRndByte();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%d\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%d\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%d\n",p11);ps.format("p12=%d\n",p12);ps.format("p13=%d\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%d\n",p18);ps.format("p19=%d\n",p19);
+        ps.format("p20=%d\n",p20);ps.format("p21=%d\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%d\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%d\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%d\n",p33);ps.format("p34=%d\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%d\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%d\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%d\n",p43);
+        ps.format("p44=%d\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);
+        ps.format("p50=%d\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%d\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%d\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);ps.format("p61=%d\n",p61);
+        ps.format("p62=%d\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%d\n",p64);
+        ps.format("p65=%d\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%d\n",p75);ps.format("p76=%d\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%d\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%d\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%d\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);
+        ps.format("p92=%d\n",p92);ps.format("p93=%d\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%d\n",p111);ps.format("p112=%d\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%d\n",p114);ps.format("p115=%d\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);ps.format("p118=%d\n",p118);
+        ps.format("p119=%d\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%d\n",p123);ps.format("p124=%d\n",p124);
+        ps.format("p125=%d\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc4(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc5(int p0,float p1,int p2,float p3,byte p4,byte p5,byte p6,float p7,int p8
+        ,byte p9,float p10,byte p11,float p12,byte p13,byte p14,int p15,float p16
+        ,int p17,int p18,int p19,int p20,byte p21,byte p22,byte p23,byte p24,int p25
+        ,int p26,float p27,byte p28,float p29,int p30,float p31,byte p32,float p33
+        ,int p34,int p35,float p36,byte p37,int p38,byte p39,byte p40,float p41
+        ,float p42,byte p43,byte p44,float p45,byte p46,byte p47,int p48,int p49
+        ,int p50,float p51,int p52,float p53,byte p54,int p55,int p56,byte p57,int p58
+        ,byte p59,int p60,float p61,int p62,float p63,int p64,float p65,byte p66
+        ,byte p67,float p68,byte p69,int p70,float p71,byte p72,int p73,int p74
+        ,byte p75,byte p76,byte p77,int p78,byte p79,byte p80,float p81,byte p82
+        ,int p83,byte p84,int p85,int p86,byte p87,int p88,float p89,int p90,int p91
+        ,float p92,byte p93,float p94,byte p95,float p96,int p97,float p98,float p99
+        ,int p100,byte p101,int p102,byte p103,float p104,float p105,float p106
+        ,float p107,float p108,float p109,int p110,int p111,int p112,byte p113,float p114
+        ,float p115,float p116,int p117,float p118,int p119,byte p120,int p121,byte p122
+        ,byte p123,float p124,float p125,float p126    );
+    private static void nativeFnc5_invoke(PrintStream ps)
+    {
+        int  p0=getRndInt();float  p1=getRndFloat();int  p2=getRndInt();
+        float  p3=getRndFloat();byte  p4=getRndByte();byte  p5=getRndByte();byte  p6=getRndByte();
+        float  p7=getRndFloat();int  p8=getRndInt();byte  p9=getRndByte();float  p10=getRndFloat();
+        byte  p11=getRndByte();float  p12=getRndFloat();byte  p13=getRndByte();
+        byte  p14=getRndByte();int  p15=getRndInt();float  p16=getRndFloat();int  p17=getRndInt();
+        int  p18=getRndInt();int  p19=getRndInt();int  p20=getRndInt();byte  p21=getRndByte();
+        byte  p22=getRndByte();byte  p23=getRndByte();byte  p24=getRndByte();int  p25=getRndInt();
+        int  p26=getRndInt();float  p27=getRndFloat();byte  p28=getRndByte();float  p29=getRndFloat();
+        int  p30=getRndInt();float  p31=getRndFloat();byte  p32=getRndByte();float  p33=getRndFloat();
+        int  p34=getRndInt();int  p35=getRndInt();float  p36=getRndFloat();byte  p37=getRndByte();
+        int  p38=getRndInt();byte  p39=getRndByte();byte  p40=getRndByte();float  p41=getRndFloat();
+        float  p42=getRndFloat();byte  p43=getRndByte();byte  p44=getRndByte();
+        float  p45=getRndFloat();byte  p46=getRndByte();byte  p47=getRndByte();
+        int  p48=getRndInt();int  p49=getRndInt();int  p50=getRndInt();float  p51=getRndFloat();
+        int  p52=getRndInt();float  p53=getRndFloat();byte  p54=getRndByte();int  p55=getRndInt();
+        int  p56=getRndInt();byte  p57=getRndByte();int  p58=getRndInt();byte  p59=getRndByte();
+        int  p60=getRndInt();float  p61=getRndFloat();int  p62=getRndInt();float  p63=getRndFloat();
+        int  p64=getRndInt();float  p65=getRndFloat();byte  p66=getRndByte();byte  p67=getRndByte();
+        float  p68=getRndFloat();byte  p69=getRndByte();int  p70=getRndInt();float  p71=getRndFloat();
+        byte  p72=getRndByte();int  p73=getRndInt();int  p74=getRndInt();byte  p75=getRndByte();
+        byte  p76=getRndByte();byte  p77=getRndByte();int  p78=getRndInt();byte  p79=getRndByte();
+        byte  p80=getRndByte();float  p81=getRndFloat();byte  p82=getRndByte();
+        int  p83=getRndInt();byte  p84=getRndByte();int  p85=getRndInt();int  p86=getRndInt();
+        byte  p87=getRndByte();int  p88=getRndInt();float  p89=getRndFloat();int  p90=getRndInt();
+        int  p91=getRndInt();float  p92=getRndFloat();byte  p93=getRndByte();float  p94=getRndFloat();
+        byte  p95=getRndByte();float  p96=getRndFloat();int  p97=getRndInt();float  p98=getRndFloat();
+        float  p99=getRndFloat();int  p100=getRndInt();byte  p101=getRndByte();
+        int  p102=getRndInt();byte  p103=getRndByte();float  p104=getRndFloat();
+        float  p105=getRndFloat();float  p106=getRndFloat();float  p107=getRndFloat();
+        float  p108=getRndFloat();float  p109=getRndFloat();int  p110=getRndInt();
+        int  p111=getRndInt();int  p112=getRndInt();byte  p113=getRndByte();float  p114=getRndFloat();
+        float  p115=getRndFloat();float  p116=getRndFloat();int  p117=getRndInt();
+        float  p118=getRndFloat();int  p119=getRndInt();byte  p120=getRndByte();
+        int  p121=getRndInt();byte  p122=getRndByte();byte  p123=getRndByte();float  p124=getRndFloat();
+        float  p125=getRndFloat();float  p126=getRndFloat();
+        ps.format("p0=%d\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%d\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%d\n",p4);ps.format("p5=%d\n",p5);ps.format("p6=%d\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%d\n",p8);ps.format("p9=%d\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%d\n",p13);ps.format("p14=%d\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%d\n",p18);
+        ps.format("p19=%d\n",p19);ps.format("p20=%d\n",p20);ps.format("p21=%d\n",p21);
+        ps.format("p22=%d\n",p22);ps.format("p23=%d\n",p23);ps.format("p24=%d\n",p24);
+        ps.format("p25=%d\n",p25);ps.format("p26=%d\n",p26);ps.format("p27=%e\n",p27);
+        ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%d\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%d\n",p34);ps.format("p35=%d\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%d\n",p37);ps.format("p38=%d\n",p38);ps.format("p39=%d\n",p39);
+        ps.format("p40=%d\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%d\n",p43);ps.format("p44=%d\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%d\n",p46);ps.format("p47=%d\n",p47);ps.format("p48=%d\n",p48);
+        ps.format("p49=%d\n",p49);ps.format("p50=%d\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%d\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%d\n",p54);
+        ps.format("p55=%d\n",p55);ps.format("p56=%d\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%d\n",p58);ps.format("p59=%d\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%d\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);
+        ps.format("p67=%d\n",p67);ps.format("p68=%e\n",p68);ps.format("p69=%d\n",p69);
+        ps.format("p70=%d\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%d\n",p72);
+        ps.format("p73=%d\n",p73);ps.format("p74=%d\n",p74);ps.format("p75=%d\n",p75);
+        ps.format("p76=%d\n",p76);ps.format("p77=%d\n",p77);ps.format("p78=%d\n",p78);
+        ps.format("p79=%d\n",p79);ps.format("p80=%d\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%d\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%d\n",p84);
+        ps.format("p85=%d\n",p85);ps.format("p86=%d\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%d\n",p88);ps.format("p89=%e\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%d\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%d\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%d\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);ps.format("p102=%d\n",p102);
+        ps.format("p103=%d\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%d\n",p110);ps.format("p111=%d\n",p111);
+        ps.format("p112=%d\n",p112);ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%d\n",p119);ps.format("p120=%d\n",p120);
+        ps.format("p121=%d\n",p121);ps.format("p122=%d\n",p122);ps.format("p123=%d\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc5(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc6(double p0,int p1,int p2,int p3,int p4,double p5,double p6,int p7,int p8
+        ,double p9,double p10,int p11,int p12,double p13,double p14,double p15,double p16
+        ,double p17,double p18,int p19,int p20,double p21,double p22,int p23,double p24
+        ,double p25,double p26,int p27,int p28,int p29,double p30,double p31,double p32
+        ,int p33,int p34,double p35,int p36,int p37,double p38,double p39,double p40
+        ,int p41,double p42,double p43,int p44,int p45,int p46,int p47,double p48
+        ,double p49,double p50,int p51,int p52,int p53,int p54,double p55,int p56
+        ,int p57,double p58,int p59,double p60,double p61,int p62,int p63,double p64
+        ,double p65,int p66,int p67,double p68,double p69,double p70,int p71,int p72
+        ,double p73,int p74,int p75,double p76,double p77,double p78,int p79,int p80
+        ,int p81,int p82,int p83,double p84,double p85,int p86,double p87,double p88
+        ,int p89,double p90,int p91,int p92,double p93,int p94,int p95,double p96
+        ,double p97,int p98,double p99,double p100,double p101,int p102,double p103
+        ,double p104,int p105,int p106,int p107,double p108,int p109,double p110
+        ,double p111,double p112,int p113,int p114,double p115,int p116,double p117
+        ,double p118,int p119,double p120,double p121,int p122,int p123,int p124
+        ,int p125,double p126    );
+    private static void nativeFnc6_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();int  p1=getRndInt();int  p2=getRndInt();
+        int  p3=getRndInt();int  p4=getRndInt();double  p5=getRndDouble();double  p6=getRndDouble();
+        int  p7=getRndInt();int  p8=getRndInt();double  p9=getRndDouble();double  p10=getRndDouble();
+        int  p11=getRndInt();int  p12=getRndInt();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        double  p18=getRndDouble();int  p19=getRndInt();int  p20=getRndInt();double  p21=getRndDouble();
+        double  p22=getRndDouble();int  p23=getRndInt();double  p24=getRndDouble();
+        double  p25=getRndDouble();double  p26=getRndDouble();int  p27=getRndInt();
+        int  p28=getRndInt();int  p29=getRndInt();double  p30=getRndDouble();double  p31=getRndDouble();
+        double  p32=getRndDouble();int  p33=getRndInt();int  p34=getRndInt();double  p35=getRndDouble();
+        int  p36=getRndInt();int  p37=getRndInt();double  p38=getRndDouble();double  p39=getRndDouble();
+        double  p40=getRndDouble();int  p41=getRndInt();double  p42=getRndDouble();
+        double  p43=getRndDouble();int  p44=getRndInt();int  p45=getRndInt();int  p46=getRndInt();
+        int  p47=getRndInt();double  p48=getRndDouble();double  p49=getRndDouble();
+        double  p50=getRndDouble();int  p51=getRndInt();int  p52=getRndInt();int  p53=getRndInt();
+        int  p54=getRndInt();double  p55=getRndDouble();int  p56=getRndInt();int  p57=getRndInt();
+        double  p58=getRndDouble();int  p59=getRndInt();double  p60=getRndDouble();
+        double  p61=getRndDouble();int  p62=getRndInt();int  p63=getRndInt();double  p64=getRndDouble();
+        double  p65=getRndDouble();int  p66=getRndInt();int  p67=getRndInt();double  p68=getRndDouble();
+        double  p69=getRndDouble();double  p70=getRndDouble();int  p71=getRndInt();
+        int  p72=getRndInt();double  p73=getRndDouble();int  p74=getRndInt();int  p75=getRndInt();
+        double  p76=getRndDouble();double  p77=getRndDouble();double  p78=getRndDouble();
+        int  p79=getRndInt();int  p80=getRndInt();int  p81=getRndInt();int  p82=getRndInt();
+        int  p83=getRndInt();double  p84=getRndDouble();double  p85=getRndDouble();
+        int  p86=getRndInt();double  p87=getRndDouble();double  p88=getRndDouble();
+        int  p89=getRndInt();double  p90=getRndDouble();int  p91=getRndInt();int  p92=getRndInt();
+        double  p93=getRndDouble();int  p94=getRndInt();int  p95=getRndInt();double  p96=getRndDouble();
+        double  p97=getRndDouble();int  p98=getRndInt();double  p99=getRndDouble();
+        double  p100=getRndDouble();double  p101=getRndDouble();int  p102=getRndInt();
+        double  p103=getRndDouble();double  p104=getRndDouble();int  p105=getRndInt();
+        int  p106=getRndInt();int  p107=getRndInt();double  p108=getRndDouble();
+        int  p109=getRndInt();double  p110=getRndDouble();double  p111=getRndDouble();
+        double  p112=getRndDouble();int  p113=getRndInt();int  p114=getRndInt();
+        double  p115=getRndDouble();int  p116=getRndInt();double  p117=getRndDouble();
+        double  p118=getRndDouble();int  p119=getRndInt();double  p120=getRndDouble();
+        double  p121=getRndDouble();int  p122=getRndInt();int  p123=getRndInt();
+        int  p124=getRndInt();int  p125=getRndInt();double  p126=getRndDouble();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%d\n",p2);
+        ps.format("p3=%d\n",p3);ps.format("p4=%d\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%d\n",p7);ps.format("p8=%d\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%d\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%d\n",p19);ps.format("p20=%d\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%d\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%d\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%d\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%d\n",p36);ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);
+        ps.format("p45=%d\n",p45);ps.format("p46=%d\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%d\n",p51);ps.format("p52=%d\n",p52);ps.format("p53=%d\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%d\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%d\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);
+        ps.format("p72=%d\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);
+        ps.format("p75=%d\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%d\n",p79);ps.format("p80=%d\n",p80);
+        ps.format("p81=%d\n",p81);ps.format("p82=%d\n",p82);ps.format("p83=%d\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%d\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);ps.format("p92=%d\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);ps.format("p95=%d\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%d\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%d\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%d\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%d\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%d\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%d\n",p124);ps.format("p125=%d\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc6(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc7(double p0,byte p1,double p2,double p3,byte p4,byte p5,byte p6,byte p7,double p8
+        ,double p9,byte p10,byte p11,double p12,double p13,byte p14,byte p15,byte p16
+        ,byte p17,byte p18,double p19,double p20,double p21,double p22,byte p23
+        ,double p24,byte p25,double p26,byte p27,double p28,byte p29,byte p30,double p31
+        ,byte p32,double p33,byte p34,double p35,double p36,double p37,double p38
+        ,byte p39,double p40,double p41,byte p42,double p43,byte p44,double p45
+        ,double p46,double p47,double p48,byte p49,byte p50,double p51,double p52
+        ,double p53,byte p54,double p55,double p56,double p57,double p58,double p59
+        ,byte p60,double p61,double p62,byte p63,byte p64,byte p65,byte p66,byte p67
+        ,byte p68,double p69,double p70,byte p71,double p72,double p73,byte p74
+        ,double p75,byte p76,byte p77,byte p78,byte p79,byte p80,double p81,double p82
+        ,byte p83,byte p84,byte p85,byte p86,double p87,byte p88,double p89,double p90
+        ,double p91,byte p92,byte p93,double p94,byte p95,byte p96,byte p97,byte p98
+        ,double p99,byte p100,byte p101,byte p102,double p103,double p104,byte p105
+        ,double p106,byte p107,byte p108,byte p109,double p110,byte p111,byte p112
+        ,byte p113,byte p114,byte p115,byte p116,double p117,byte p118,double p119
+        ,double p120,byte p121,byte p122,double p123,double p124,byte p125,double p126
+            );
+    private static void nativeFnc7_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();byte  p1=getRndByte();double  p2=getRndDouble();
+        double  p3=getRndDouble();byte  p4=getRndByte();byte  p5=getRndByte();byte  p6=getRndByte();
+        byte  p7=getRndByte();double  p8=getRndDouble();double  p9=getRndDouble();
+        byte  p10=getRndByte();byte  p11=getRndByte();double  p12=getRndDouble();
+        double  p13=getRndDouble();byte  p14=getRndByte();byte  p15=getRndByte();
+        byte  p16=getRndByte();byte  p17=getRndByte();byte  p18=getRndByte();double  p19=getRndDouble();
+        double  p20=getRndDouble();double  p21=getRndDouble();double  p22=getRndDouble();
+        byte  p23=getRndByte();double  p24=getRndDouble();byte  p25=getRndByte();
+        double  p26=getRndDouble();byte  p27=getRndByte();double  p28=getRndDouble();
+        byte  p29=getRndByte();byte  p30=getRndByte();double  p31=getRndDouble();
+        byte  p32=getRndByte();double  p33=getRndDouble();byte  p34=getRndByte();
+        double  p35=getRndDouble();double  p36=getRndDouble();double  p37=getRndDouble();
+        double  p38=getRndDouble();byte  p39=getRndByte();double  p40=getRndDouble();
+        double  p41=getRndDouble();byte  p42=getRndByte();double  p43=getRndDouble();
+        byte  p44=getRndByte();double  p45=getRndDouble();double  p46=getRndDouble();
+        double  p47=getRndDouble();double  p48=getRndDouble();byte  p49=getRndByte();
+        byte  p50=getRndByte();double  p51=getRndDouble();double  p52=getRndDouble();
+        double  p53=getRndDouble();byte  p54=getRndByte();double  p55=getRndDouble();
+        double  p56=getRndDouble();double  p57=getRndDouble();double  p58=getRndDouble();
+        double  p59=getRndDouble();byte  p60=getRndByte();double  p61=getRndDouble();
+        double  p62=getRndDouble();byte  p63=getRndByte();byte  p64=getRndByte();
+        byte  p65=getRndByte();byte  p66=getRndByte();byte  p67=getRndByte();byte  p68=getRndByte();
+        double  p69=getRndDouble();double  p70=getRndDouble();byte  p71=getRndByte();
+        double  p72=getRndDouble();double  p73=getRndDouble();byte  p74=getRndByte();
+        double  p75=getRndDouble();byte  p76=getRndByte();byte  p77=getRndByte();
+        byte  p78=getRndByte();byte  p79=getRndByte();byte  p80=getRndByte();double  p81=getRndDouble();
+        double  p82=getRndDouble();byte  p83=getRndByte();byte  p84=getRndByte();
+        byte  p85=getRndByte();byte  p86=getRndByte();double  p87=getRndDouble();
+        byte  p88=getRndByte();double  p89=getRndDouble();double  p90=getRndDouble();
+        double  p91=getRndDouble();byte  p92=getRndByte();byte  p93=getRndByte();
+        double  p94=getRndDouble();byte  p95=getRndByte();byte  p96=getRndByte();
+        byte  p97=getRndByte();byte  p98=getRndByte();double  p99=getRndDouble();
+        byte  p100=getRndByte();byte  p101=getRndByte();byte  p102=getRndByte();
+        double  p103=getRndDouble();double  p104=getRndDouble();byte  p105=getRndByte();
+        double  p106=getRndDouble();byte  p107=getRndByte();byte  p108=getRndByte();
+        byte  p109=getRndByte();double  p110=getRndDouble();byte  p111=getRndByte();
+        byte  p112=getRndByte();byte  p113=getRndByte();byte  p114=getRndByte();
+        byte  p115=getRndByte();byte  p116=getRndByte();double  p117=getRndDouble();
+        byte  p118=getRndByte();double  p119=getRndDouble();double  p120=getRndDouble();
+        byte  p121=getRndByte();byte  p122=getRndByte();double  p123=getRndDouble();
+        double  p124=getRndDouble();byte  p125=getRndByte();double  p126=getRndDouble();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);ps.format("p5=%d\n",p5);
+        ps.format("p6=%d\n",p6);ps.format("p7=%d\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%d\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%d\n",p14);
+        ps.format("p15=%d\n",p15);ps.format("p16=%d\n",p16);ps.format("p17=%d\n",p17);
+        ps.format("p18=%d\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%d\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%d\n",p29);
+        ps.format("p30=%d\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%d\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%d\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%d\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%d\n",p64);ps.format("p65=%d\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%d\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%d\n",p79);ps.format("p80=%d\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);
+        ps.format("p84=%d\n",p84);ps.format("p85=%d\n",p85);ps.format("p86=%d\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%d\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%d\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);
+        ps.format("p96=%d\n",p96);ps.format("p97=%d\n",p97);ps.format("p98=%d\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%d\n",p108);ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%d\n",p111);ps.format("p112=%d\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%d\n",p114);ps.format("p115=%d\n",p115);ps.format("p116=%d\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%d\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc7(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc8(byte p0,double p1,byte p2,double p3,int p4,int p5,int p6,double p7,double p8
+        ,int p9,double p10,byte p11,int p12,byte p13,double p14,int p15,byte p16
+        ,int p17,double p18,double p19,byte p20,int p21,byte p22,int p23,int p24
+        ,byte p25,double p26,int p27,int p28,byte p29,int p30,int p31,byte p32,double p33
+        ,double p34,byte p35,double p36,int p37,double p38,int p39,byte p40,byte p41
+        ,int p42,int p43,int p44,byte p45,double p46,double p47,int p48,int p49
+        ,byte p50,byte p51,int p52,int p53,byte p54,byte p55,int p56,int p57,int p58
+        ,double p59,byte p60,int p61,double p62,double p63,double p64,int p65,int p66
+        ,double p67,int p68,double p69,int p70,int p71,byte p72,int p73,double p74
+        ,double p75,byte p76,int p77,byte p78,byte p79,int p80,int p81,int p82,double p83
+        ,double p84,int p85,byte p86,byte p87,byte p88,byte p89,int p90,int p91
+        ,double p92,int p93,double p94,double p95,int p96,byte p97,double p98,double p99
+        ,byte p100,byte p101,byte p102,byte p103,double p104,int p105,int p106,byte p107
+        ,byte p108,double p109,double p110,double p111,byte p112,double p113,byte p114
+        ,byte p115,int p116,double p117,int p118,int p119,byte p120,double p121
+        ,byte p122,int p123,int p124,int p125,byte p126    );
+    private static void nativeFnc8_invoke(PrintStream ps)
+    {
+        byte  p0=getRndByte();double  p1=getRndDouble();byte  p2=getRndByte();
+        double  p3=getRndDouble();int  p4=getRndInt();int  p5=getRndInt();int  p6=getRndInt();
+        double  p7=getRndDouble();double  p8=getRndDouble();int  p9=getRndInt();
+        double  p10=getRndDouble();byte  p11=getRndByte();int  p12=getRndInt();
+        byte  p13=getRndByte();double  p14=getRndDouble();int  p15=getRndInt();
+        byte  p16=getRndByte();int  p17=getRndInt();double  p18=getRndDouble();
+        double  p19=getRndDouble();byte  p20=getRndByte();int  p21=getRndInt();
+        byte  p22=getRndByte();int  p23=getRndInt();int  p24=getRndInt();byte  p25=getRndByte();
+        double  p26=getRndDouble();int  p27=getRndInt();int  p28=getRndInt();byte  p29=getRndByte();
+        int  p30=getRndInt();int  p31=getRndInt();byte  p32=getRndByte();double  p33=getRndDouble();
+        double  p34=getRndDouble();byte  p35=getRndByte();double  p36=getRndDouble();
+        int  p37=getRndInt();double  p38=getRndDouble();int  p39=getRndInt();byte  p40=getRndByte();
+        byte  p41=getRndByte();int  p42=getRndInt();int  p43=getRndInt();int  p44=getRndInt();
+        byte  p45=getRndByte();double  p46=getRndDouble();double  p47=getRndDouble();
+        int  p48=getRndInt();int  p49=getRndInt();byte  p50=getRndByte();byte  p51=getRndByte();
+        int  p52=getRndInt();int  p53=getRndInt();byte  p54=getRndByte();byte  p55=getRndByte();
+        int  p56=getRndInt();int  p57=getRndInt();int  p58=getRndInt();double  p59=getRndDouble();
+        byte  p60=getRndByte();int  p61=getRndInt();double  p62=getRndDouble();
+        double  p63=getRndDouble();double  p64=getRndDouble();int  p65=getRndInt();
+        int  p66=getRndInt();double  p67=getRndDouble();int  p68=getRndInt();double  p69=getRndDouble();
+        int  p70=getRndInt();int  p71=getRndInt();byte  p72=getRndByte();int  p73=getRndInt();
+        double  p74=getRndDouble();double  p75=getRndDouble();byte  p76=getRndByte();
+        int  p77=getRndInt();byte  p78=getRndByte();byte  p79=getRndByte();int  p80=getRndInt();
+        int  p81=getRndInt();int  p82=getRndInt();double  p83=getRndDouble();double  p84=getRndDouble();
+        int  p85=getRndInt();byte  p86=getRndByte();byte  p87=getRndByte();byte  p88=getRndByte();
+        byte  p89=getRndByte();int  p90=getRndInt();int  p91=getRndInt();double  p92=getRndDouble();
+        int  p93=getRndInt();double  p94=getRndDouble();double  p95=getRndDouble();
+        int  p96=getRndInt();byte  p97=getRndByte();double  p98=getRndDouble();
+        double  p99=getRndDouble();byte  p100=getRndByte();byte  p101=getRndByte();
+        byte  p102=getRndByte();byte  p103=getRndByte();double  p104=getRndDouble();
+        int  p105=getRndInt();int  p106=getRndInt();byte  p107=getRndByte();byte  p108=getRndByte();
+        double  p109=getRndDouble();double  p110=getRndDouble();double  p111=getRndDouble();
+        byte  p112=getRndByte();double  p113=getRndDouble();byte  p114=getRndByte();
+        byte  p115=getRndByte();int  p116=getRndInt();double  p117=getRndDouble();
+        int  p118=getRndInt();int  p119=getRndInt();byte  p120=getRndByte();double  p121=getRndDouble();
+        byte  p122=getRndByte();int  p123=getRndInt();int  p124=getRndInt();int  p125=getRndInt();
+        byte  p126=getRndByte();
+        ps.format("p0=%d\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%d\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%d\n",p11);ps.format("p12=%d\n",p12);ps.format("p13=%d\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);ps.format("p16=%d\n",p16);
+        ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%d\n",p20);ps.format("p21=%d\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%d\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%d\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);ps.format("p28=%d\n",p28);
+        ps.format("p29=%d\n",p29);ps.format("p30=%d\n",p30);ps.format("p31=%d\n",p31);
+        ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%d\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%d\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%d\n",p39);ps.format("p40=%d\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%d\n",p43);
+        ps.format("p44=%d\n",p44);ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);ps.format("p49=%d\n",p49);
+        ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);ps.format("p52=%d\n",p52);
+        ps.format("p53=%d\n",p53);ps.format("p54=%d\n",p54);ps.format("p55=%d\n",p55);
+        ps.format("p56=%d\n",p56);ps.format("p57=%d\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);ps.format("p61=%d\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%d\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%d\n",p70);
+        ps.format("p71=%d\n",p71);ps.format("p72=%d\n",p72);ps.format("p73=%d\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);
+        ps.format("p77=%d\n",p77);ps.format("p78=%d\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%d\n",p80);ps.format("p81=%d\n",p81);ps.format("p82=%d\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);
+        ps.format("p86=%d\n",p86);ps.format("p87=%d\n",p87);ps.format("p88=%d\n",p88);
+        ps.format("p89=%d\n",p89);ps.format("p90=%d\n",p90);ps.format("p91=%d\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%d\n",p96);ps.format("p97=%d\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%d\n",p102);ps.format("p103=%d\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);ps.format("p106=%d\n",p106);
+        ps.format("p107=%d\n",p107);ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%d\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%d\n",p114);ps.format("p115=%d\n",p115);
+        ps.format("p116=%d\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);
+        ps.format("p119=%d\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%d\n",p123);ps.format("p124=%d\n",p124);
+        ps.format("p125=%d\n",p125);ps.format("p126=%d\n",p126);
+        nativeFnc8(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc9(double p0,byte p1,int p2,byte p3,int p4,byte p5,int p6,float p7,float p8
+        ,int p9,double p10,int p11,float p12,float p13,double p14,int p15,float p16
+        ,byte p17,float p18,int p19,float p20,int p21,float p22,float p23,double p24
+        ,byte p25,byte p26,byte p27,byte p28,float p29,byte p30,byte p31,byte p32
+        ,double p33,int p34,double p35,float p36,int p37,double p38,int p39,double p40
+        ,byte p41,double p42,float p43,float p44,double p45,float p46,int p47,float p48
+        ,int p49,float p50,byte p51,byte p52,int p53,int p54,float p55,double p56
+        ,int p57,int p58,float p59,int p60,byte p61,int p62,double p63,double p64
+        ,int p65,byte p66,double p67,int p68,byte p69,byte p70,int p71,float p72
+        ,float p73,byte p74,int p75,byte p76,double p77,float p78,double p79,byte p80
+        ,int p81,int p82,byte p83,double p84,float p85,double p86,double p87,float p88
+        ,byte p89,byte p90,double p91,double p92,double p93,float p94,double p95
+        ,float p96,double p97,float p98,byte p99,float p100,byte p101,byte p102
+        ,float p103,double p104,byte p105,float p106,double p107,double p108,int p109
+        ,float p110,int p111,int p112,byte p113,double p114,byte p115,double p116
+        ,int p117,double p118,float p119,byte p120,float p121,float p122,float p123
+        ,double p124,int p125,byte p126    );
+    private static void nativeFnc9_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();byte  p1=getRndByte();int  p2=getRndInt();
+        byte  p3=getRndByte();int  p4=getRndInt();byte  p5=getRndByte();int  p6=getRndInt();
+        float  p7=getRndFloat();float  p8=getRndFloat();int  p9=getRndInt();double  p10=getRndDouble();
+        int  p11=getRndInt();float  p12=getRndFloat();float  p13=getRndFloat();
+        double  p14=getRndDouble();int  p15=getRndInt();float  p16=getRndFloat();
+        byte  p17=getRndByte();float  p18=getRndFloat();int  p19=getRndInt();float  p20=getRndFloat();
+        int  p21=getRndInt();float  p22=getRndFloat();float  p23=getRndFloat();
+        double  p24=getRndDouble();byte  p25=getRndByte();byte  p26=getRndByte();
+        byte  p27=getRndByte();byte  p28=getRndByte();float  p29=getRndFloat();
+        byte  p30=getRndByte();byte  p31=getRndByte();byte  p32=getRndByte();double  p33=getRndDouble();
+        int  p34=getRndInt();double  p35=getRndDouble();float  p36=getRndFloat();
+        int  p37=getRndInt();double  p38=getRndDouble();int  p39=getRndInt();double  p40=getRndDouble();
+        byte  p41=getRndByte();double  p42=getRndDouble();float  p43=getRndFloat();
+        float  p44=getRndFloat();double  p45=getRndDouble();float  p46=getRndFloat();
+        int  p47=getRndInt();float  p48=getRndFloat();int  p49=getRndInt();float  p50=getRndFloat();
+        byte  p51=getRndByte();byte  p52=getRndByte();int  p53=getRndInt();int  p54=getRndInt();
+        float  p55=getRndFloat();double  p56=getRndDouble();int  p57=getRndInt();
+        int  p58=getRndInt();float  p59=getRndFloat();int  p60=getRndInt();byte  p61=getRndByte();
+        int  p62=getRndInt();double  p63=getRndDouble();double  p64=getRndDouble();
+        int  p65=getRndInt();byte  p66=getRndByte();double  p67=getRndDouble();
+        int  p68=getRndInt();byte  p69=getRndByte();byte  p70=getRndByte();int  p71=getRndInt();
+        float  p72=getRndFloat();float  p73=getRndFloat();byte  p74=getRndByte();
+        int  p75=getRndInt();byte  p76=getRndByte();double  p77=getRndDouble();
+        float  p78=getRndFloat();double  p79=getRndDouble();byte  p80=getRndByte();
+        int  p81=getRndInt();int  p82=getRndInt();byte  p83=getRndByte();double  p84=getRndDouble();
+        float  p85=getRndFloat();double  p86=getRndDouble();double  p87=getRndDouble();
+        float  p88=getRndFloat();byte  p89=getRndByte();byte  p90=getRndByte();
+        double  p91=getRndDouble();double  p92=getRndDouble();double  p93=getRndDouble();
+        float  p94=getRndFloat();double  p95=getRndDouble();float  p96=getRndFloat();
+        double  p97=getRndDouble();float  p98=getRndFloat();byte  p99=getRndByte();
+        float  p100=getRndFloat();byte  p101=getRndByte();byte  p102=getRndByte();
+        float  p103=getRndFloat();double  p104=getRndDouble();byte  p105=getRndByte();
+        float  p106=getRndFloat();double  p107=getRndDouble();double  p108=getRndDouble();
+        int  p109=getRndInt();float  p110=getRndFloat();int  p111=getRndInt();int  p112=getRndInt();
+        byte  p113=getRndByte();double  p114=getRndDouble();byte  p115=getRndByte();
+        double  p116=getRndDouble();int  p117=getRndInt();double  p118=getRndDouble();
+        float  p119=getRndFloat();byte  p120=getRndByte();float  p121=getRndFloat();
+        float  p122=getRndFloat();float  p123=getRndFloat();double  p124=getRndDouble();
+        int  p125=getRndInt();byte  p126=getRndByte();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%d\n",p1);ps.format("p2=%d\n",p2);ps.format("p3=%d\n",p3);
+        ps.format("p4=%d\n",p4);ps.format("p5=%d\n",p5);ps.format("p6=%d\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%d\n",p25);ps.format("p26=%d\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%d\n",p30);
+        ps.format("p31=%d\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%d\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%d\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%d\n",p51);
+        ps.format("p52=%d\n",p52);ps.format("p53=%d\n",p53);ps.format("p54=%d\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%d\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%d\n",p61);ps.format("p62=%d\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%d\n",p65);ps.format("p66=%d\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%d\n",p69);
+        ps.format("p70=%d\n",p70);ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);ps.format("p75=%d\n",p75);
+        ps.format("p76=%d\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%d\n",p80);ps.format("p81=%d\n",p81);
+        ps.format("p82=%d\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%d\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%d\n",p101);ps.format("p102=%d\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%d\n",p111);
+        ps.format("p112=%d\n",p112);ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%d\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);ps.format("p126=%d\n",p126);
+
+        nativeFnc9(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc10(double p0,double p1,float p2,double p3,float p4,float p5,double p6,float p7
+        ,float p8,double p9,float p10,float p11,float p12,float p13,double p14,float p15
+        ,float p16,double p17,double p18,double p19,double p20,float p21,double p22
+        ,double p23,double p24,double p25,double p26,float p27,float p28,float p29
+        ,double p30,float p31,float p32,float p33,double p34,double p35,double p36
+        ,double p37,float p38,float p39,double p40,float p41,double p42,double p43
+        ,float p44,double p45,double p46,double p47,float p48,double p49,double p50
+        ,float p51,float p52,float p53,float p54,float p55,double p56,float p57
+        ,float p58,double p59,float p60,double p61,double p62,float p63,float p64
+        ,float p65,float p66,double p67,float p68,double p69,double p70,float p71
+        ,double p72,double p73,double p74,float p75,double p76,double p77,float p78
+        ,double p79,float p80,float p81,float p82,float p83,float p84,float p85
+        ,double p86,double p87,float p88,float p89,double p90,double p91,double p92
+        ,double p93,float p94,double p95,float p96,double p97,double p98,float p99
+        ,float p100,float p101,double p102,float p103,float p104,float p105,double p106
+        ,double p107,double p108,float p109,double p110,float p111,double p112,float p113
+        ,float p114,double p115,double p116,double p117,double p118,float p119,double p120
+        ,float p121,double p122,float p123,float p124,float p125,float p126    );
+    private static void nativeFnc10_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();float  p2=getRndFloat();
+        double  p3=getRndDouble();float  p4=getRndFloat();float  p5=getRndFloat();
+        double  p6=getRndDouble();float  p7=getRndFloat();float  p8=getRndFloat();
+        double  p9=getRndDouble();float  p10=getRndFloat();float  p11=getRndFloat();
+        float  p12=getRndFloat();float  p13=getRndFloat();double  p14=getRndDouble();
+        float  p15=getRndFloat();float  p16=getRndFloat();double  p17=getRndDouble();
+        double  p18=getRndDouble();double  p19=getRndDouble();double  p20=getRndDouble();
+        float  p21=getRndFloat();double  p22=getRndDouble();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        float  p27=getRndFloat();float  p28=getRndFloat();float  p29=getRndFloat();
+        double  p30=getRndDouble();float  p31=getRndFloat();float  p32=getRndFloat();
+        float  p33=getRndFloat();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();double  p37=getRndDouble();float  p38=getRndFloat();
+        float  p39=getRndFloat();double  p40=getRndDouble();float  p41=getRndFloat();
+        double  p42=getRndDouble();double  p43=getRndDouble();float  p44=getRndFloat();
+        double  p45=getRndDouble();double  p46=getRndDouble();double  p47=getRndDouble();
+        float  p48=getRndFloat();double  p49=getRndDouble();double  p50=getRndDouble();
+        float  p51=getRndFloat();float  p52=getRndFloat();float  p53=getRndFloat();
+        float  p54=getRndFloat();float  p55=getRndFloat();double  p56=getRndDouble();
+        float  p57=getRndFloat();float  p58=getRndFloat();double  p59=getRndDouble();
+        float  p60=getRndFloat();double  p61=getRndDouble();double  p62=getRndDouble();
+        float  p63=getRndFloat();float  p64=getRndFloat();float  p65=getRndFloat();
+        float  p66=getRndFloat();double  p67=getRndDouble();float  p68=getRndFloat();
+        double  p69=getRndDouble();double  p70=getRndDouble();float  p71=getRndFloat();
+        double  p72=getRndDouble();double  p73=getRndDouble();double  p74=getRndDouble();
+        float  p75=getRndFloat();double  p76=getRndDouble();double  p77=getRndDouble();
+        float  p78=getRndFloat();double  p79=getRndDouble();float  p80=getRndFloat();
+        float  p81=getRndFloat();float  p82=getRndFloat();float  p83=getRndFloat();
+        float  p84=getRndFloat();float  p85=getRndFloat();double  p86=getRndDouble();
+        double  p87=getRndDouble();float  p88=getRndFloat();float  p89=getRndFloat();
+        double  p90=getRndDouble();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();float  p94=getRndFloat();double  p95=getRndDouble();
+        float  p96=getRndFloat();double  p97=getRndDouble();double  p98=getRndDouble();
+        float  p99=getRndFloat();float  p100=getRndFloat();float  p101=getRndFloat();
+        double  p102=getRndDouble();float  p103=getRndFloat();float  p104=getRndFloat();
+        float  p105=getRndFloat();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();float  p109=getRndFloat();double  p110=getRndDouble();
+        float  p111=getRndFloat();double  p112=getRndDouble();float  p113=getRndFloat();
+        float  p114=getRndFloat();double  p115=getRndDouble();double  p116=getRndDouble();
+        double  p117=getRndDouble();double  p118=getRndDouble();float  p119=getRndFloat();
+        double  p120=getRndDouble();float  p121=getRndFloat();double  p122=getRndDouble();
+        float  p123=getRndFloat();float  p124=getRndFloat();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc10(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc11(double p0,float p1,float p2,double p3,int p4,int p5,float p6,double p7,int p8
+        ,int p9,int p10,int p11,int p12,double p13,float p14,float p15,double p16
+        ,float p17,int p18,int p19,double p20,float p21,int p22,int p23,float p24
+        ,int p25,int p26,int p27,float p28,float p29,double p30,double p31,int p32
+        ,double p33,float p34,float p35,float p36,int p37,float p38,double p39,float p40
+        ,double p41,double p42,double p43,double p44,int p45,int p46,float p47,float p48
+        ,float p49,float p50,double p51,double p52,double p53,int p54,float p55
+        ,int p56,double p57,double p58,double p59,double p60,int p61,float p62,int p63
+        ,float p64,double p65,double p66,float p67,double p68,double p69,int p70
+        ,double p71,float p72,double p73,int p74,float p75,float p76,float p77,float p78
+        ,int p79,float p80,int p81,double p82,float p83,double p84,float p85,float p86
+        ,float p87,double p88,float p89,int p90,float p91,double p92,float p93,double p94
+        ,double p95,int p96,int p97,float p98,double p99,float p100,int p101,double p102
+        ,double p103,float p104,double p105,int p106,float p107,float p108,int p109
+        ,double p110,float p111,double p112,int p113,int p114,float p115,float p116
+        ,int p117,double p118,float p119,float p120,float p121,int p122,double p123
+        ,int p124,float p125,double p126    );
+    private static void nativeFnc11_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();float  p1=getRndFloat();float  p2=getRndFloat();
+        double  p3=getRndDouble();int  p4=getRndInt();int  p5=getRndInt();float  p6=getRndFloat();
+        double  p7=getRndDouble();int  p8=getRndInt();int  p9=getRndInt();int  p10=getRndInt();
+        int  p11=getRndInt();int  p12=getRndInt();double  p13=getRndDouble();float  p14=getRndFloat();
+        float  p15=getRndFloat();double  p16=getRndDouble();float  p17=getRndFloat();
+        int  p18=getRndInt();int  p19=getRndInt();double  p20=getRndDouble();float  p21=getRndFloat();
+        int  p22=getRndInt();int  p23=getRndInt();float  p24=getRndFloat();int  p25=getRndInt();
+        int  p26=getRndInt();int  p27=getRndInt();float  p28=getRndFloat();float  p29=getRndFloat();
+        double  p30=getRndDouble();double  p31=getRndDouble();int  p32=getRndInt();
+        double  p33=getRndDouble();float  p34=getRndFloat();float  p35=getRndFloat();
+        float  p36=getRndFloat();int  p37=getRndInt();float  p38=getRndFloat();
+        double  p39=getRndDouble();float  p40=getRndFloat();double  p41=getRndDouble();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        int  p45=getRndInt();int  p46=getRndInt();float  p47=getRndFloat();float  p48=getRndFloat();
+        float  p49=getRndFloat();float  p50=getRndFloat();double  p51=getRndDouble();
+        double  p52=getRndDouble();double  p53=getRndDouble();int  p54=getRndInt();
+        float  p55=getRndFloat();int  p56=getRndInt();double  p57=getRndDouble();
+        double  p58=getRndDouble();double  p59=getRndDouble();double  p60=getRndDouble();
+        int  p61=getRndInt();float  p62=getRndFloat();int  p63=getRndInt();float  p64=getRndFloat();
+        double  p65=getRndDouble();double  p66=getRndDouble();float  p67=getRndFloat();
+        double  p68=getRndDouble();double  p69=getRndDouble();int  p70=getRndInt();
+        double  p71=getRndDouble();float  p72=getRndFloat();double  p73=getRndDouble();
+        int  p74=getRndInt();float  p75=getRndFloat();float  p76=getRndFloat();
+        float  p77=getRndFloat();float  p78=getRndFloat();int  p79=getRndInt();
+        float  p80=getRndFloat();int  p81=getRndInt();double  p82=getRndDouble();
+        float  p83=getRndFloat();double  p84=getRndDouble();float  p85=getRndFloat();
+        float  p86=getRndFloat();float  p87=getRndFloat();double  p88=getRndDouble();
+        float  p89=getRndFloat();int  p90=getRndInt();float  p91=getRndFloat();
+        double  p92=getRndDouble();float  p93=getRndFloat();double  p94=getRndDouble();
+        double  p95=getRndDouble();int  p96=getRndInt();int  p97=getRndInt();float  p98=getRndFloat();
+        double  p99=getRndDouble();float  p100=getRndFloat();int  p101=getRndInt();
+        double  p102=getRndDouble();double  p103=getRndDouble();float  p104=getRndFloat();
+        double  p105=getRndDouble();int  p106=getRndInt();float  p107=getRndFloat();
+        float  p108=getRndFloat();int  p109=getRndInt();double  p110=getRndDouble();
+        float  p111=getRndFloat();double  p112=getRndDouble();int  p113=getRndInt();
+        int  p114=getRndInt();float  p115=getRndFloat();float  p116=getRndFloat();
+        int  p117=getRndInt();double  p118=getRndDouble();float  p119=getRndFloat();
+        float  p120=getRndFloat();float  p121=getRndFloat();int  p122=getRndInt();
+        double  p123=getRndDouble();int  p124=getRndInt();float  p125=getRndFloat();
+        double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%d\n",p8);ps.format("p9=%d\n",p9);ps.format("p10=%d\n",p10);
+        ps.format("p11=%d\n",p11);ps.format("p12=%d\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%d\n",p18);ps.format("p19=%d\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%d\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);
+        ps.format("p26=%d\n",p26);ps.format("p27=%d\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%d\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%d\n",p45);ps.format("p46=%d\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%d\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%d\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%d\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%d\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%d\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%d\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%d\n",p96);ps.format("p97=%d\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%d\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%d\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%d\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc11(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc12(double p0,float p1,double p2,float p3,float p4,byte p5,byte p6,double p7
+        ,double p8,byte p9,byte p10,float p11,byte p12,byte p13,byte p14,byte p15
+        ,byte p16,byte p17,double p18,double p19,byte p20,float p21,byte p22,double p23
+        ,byte p24,float p25,double p26,float p27,byte p28,byte p29,float p30,byte p31
+        ,float p32,float p33,byte p34,byte p35,float p36,double p37,float p38,float p39
+        ,double p40,double p41,float p42,float p43,byte p44,byte p45,double p46
+        ,float p47,double p48,float p49,byte p50,double p51,double p52,float p53
+        ,double p54,byte p55,float p56,byte p57,byte p58,byte p59,float p60,double p61
+        ,float p62,byte p63,double p64,double p65,float p66,float p67,float p68
+        ,float p69,float p70,double p71,float p72,float p73,double p74,byte p75
+        ,float p76,byte p77,byte p78,byte p79,double p80,double p81,byte p82,float p83
+        ,double p84,byte p85,float p86,double p87,float p88,float p89,float p90
+        ,float p91,double p92,byte p93,float p94,byte p95,byte p96,byte p97,float p98
+        ,byte p99,float p100,double p101,float p102,byte p103,byte p104,float p105
+        ,double p106,byte p107,float p108,byte p109,double p110,float p111,float p112
+        ,byte p113,float p114,byte p115,float p116,double p117,double p118,double p119
+        ,float p120,double p121,byte p122,byte p123,float p124,double p125,double p126
+            );
+    private static void nativeFnc12_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();float  p1=getRndFloat();double  p2=getRndDouble();
+        float  p3=getRndFloat();float  p4=getRndFloat();byte  p5=getRndByte();byte  p6=getRndByte();
+        double  p7=getRndDouble();double  p8=getRndDouble();byte  p9=getRndByte();
+        byte  p10=getRndByte();float  p11=getRndFloat();byte  p12=getRndByte();
+        byte  p13=getRndByte();byte  p14=getRndByte();byte  p15=getRndByte();byte  p16=getRndByte();
+        byte  p17=getRndByte();double  p18=getRndDouble();double  p19=getRndDouble();
+        byte  p20=getRndByte();float  p21=getRndFloat();byte  p22=getRndByte();
+        double  p23=getRndDouble();byte  p24=getRndByte();float  p25=getRndFloat();
+        double  p26=getRndDouble();float  p27=getRndFloat();byte  p28=getRndByte();
+        byte  p29=getRndByte();float  p30=getRndFloat();byte  p31=getRndByte();
+        float  p32=getRndFloat();float  p33=getRndFloat();byte  p34=getRndByte();
+        byte  p35=getRndByte();float  p36=getRndFloat();double  p37=getRndDouble();
+        float  p38=getRndFloat();float  p39=getRndFloat();double  p40=getRndDouble();
+        double  p41=getRndDouble();float  p42=getRndFloat();float  p43=getRndFloat();
+        byte  p44=getRndByte();byte  p45=getRndByte();double  p46=getRndDouble();
+        float  p47=getRndFloat();double  p48=getRndDouble();float  p49=getRndFloat();
+        byte  p50=getRndByte();double  p51=getRndDouble();double  p52=getRndDouble();
+        float  p53=getRndFloat();double  p54=getRndDouble();byte  p55=getRndByte();
+        float  p56=getRndFloat();byte  p57=getRndByte();byte  p58=getRndByte();
+        byte  p59=getRndByte();float  p60=getRndFloat();double  p61=getRndDouble();
+        float  p62=getRndFloat();byte  p63=getRndByte();double  p64=getRndDouble();
+        double  p65=getRndDouble();float  p66=getRndFloat();float  p67=getRndFloat();
+        float  p68=getRndFloat();float  p69=getRndFloat();float  p70=getRndFloat();
+        double  p71=getRndDouble();float  p72=getRndFloat();float  p73=getRndFloat();
+        double  p74=getRndDouble();byte  p75=getRndByte();float  p76=getRndFloat();
+        byte  p77=getRndByte();byte  p78=getRndByte();byte  p79=getRndByte();double  p80=getRndDouble();
+        double  p81=getRndDouble();byte  p82=getRndByte();float  p83=getRndFloat();
+        double  p84=getRndDouble();byte  p85=getRndByte();float  p86=getRndFloat();
+        double  p87=getRndDouble();float  p88=getRndFloat();float  p89=getRndFloat();
+        float  p90=getRndFloat();float  p91=getRndFloat();double  p92=getRndDouble();
+        byte  p93=getRndByte();float  p94=getRndFloat();byte  p95=getRndByte();
+        byte  p96=getRndByte();byte  p97=getRndByte();float  p98=getRndFloat();
+        byte  p99=getRndByte();float  p100=getRndFloat();double  p101=getRndDouble();
+        float  p102=getRndFloat();byte  p103=getRndByte();byte  p104=getRndByte();
+        float  p105=getRndFloat();double  p106=getRndDouble();byte  p107=getRndByte();
+        float  p108=getRndFloat();byte  p109=getRndByte();double  p110=getRndDouble();
+        float  p111=getRndFloat();float  p112=getRndFloat();byte  p113=getRndByte();
+        float  p114=getRndFloat();byte  p115=getRndByte();float  p116=getRndFloat();
+        double  p117=getRndDouble();double  p118=getRndDouble();double  p119=getRndDouble();
+        float  p120=getRndFloat();double  p121=getRndDouble();byte  p122=getRndByte();
+        byte  p123=getRndByte();float  p124=getRndFloat();double  p125=getRndDouble();
+        double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);ps.format("p10=%d\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%d\n",p12);ps.format("p13=%d\n",p13);
+        ps.format("p14=%d\n",p14);ps.format("p15=%d\n",p15);ps.format("p16=%d\n",p16);
+        ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%d\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%d\n",p28);
+        ps.format("p29=%d\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%d\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);
+        ps.format("p35=%d\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%d\n",p44);ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%d\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%d\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%d\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%d\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%d\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%d\n",p77);ps.format("p78=%d\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%d\n",p95);ps.format("p96=%d\n",p96);ps.format("p97=%d\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%d\n",p103);
+        ps.format("p104=%d\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%d\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%d\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc12(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc13(float p0,float p1,float p2,float p3,int p4,float p5,int p6,float p7,int p8
+        ,float p9,float p10,float p11,float p12,float p13,int p14,float p15,float p16
+        ,int p17,int p18,float p19,float p20,int p21,int p22,int p23,int p24,int p25
+        ,float p26,int p27,int p28,float p29,int p30,float p31,float p32,float p33
+        ,float p34,int p35,int p36,float p37,float p38,float p39,int p40,float p41
+        ,int p42,float p43,int p44,float p45,float p46,float p47,int p48,float p49
+        ,int p50,int p51,float p52,int p53,float p54,float p55,float p56,float p57
+        ,float p58,float p59,float p60,float p61,int p62,float p63,float p64,float p65
+        ,int p66,int p67,float p68,float p69,float p70,int p71,float p72,float p73
+        ,int p74,float p75,float p76,float p77,int p78,int p79,int p80,float p81
+        ,int p82,int p83,float p84,int p85,int p86,float p87,float p88,float p89
+        ,float p90,int p91,int p92,float p93,float p94,float p95,float p96,float p97
+        ,float p98,int p99,float p100,int p101,float p102,float p103,int p104,float p105
+        ,float p106,float p107,int p108,float p109,float p110,float p111,float p112
+        ,float p113,float p114,float p115,float p116,int p117,int p118,float p119
+        ,float p120,float p121,int p122,float p123,int p124,float p125,float p126
+            );
+    private static void nativeFnc13_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();int  p4=getRndInt();float  p5=getRndFloat();int  p6=getRndInt();
+        float  p7=getRndFloat();int  p8=getRndInt();float  p9=getRndFloat();float  p10=getRndFloat();
+        float  p11=getRndFloat();float  p12=getRndFloat();float  p13=getRndFloat();
+        int  p14=getRndInt();float  p15=getRndFloat();float  p16=getRndFloat();
+        int  p17=getRndInt();int  p18=getRndInt();float  p19=getRndFloat();float  p20=getRndFloat();
+        int  p21=getRndInt();int  p22=getRndInt();int  p23=getRndInt();int  p24=getRndInt();
+        int  p25=getRndInt();float  p26=getRndFloat();int  p27=getRndInt();int  p28=getRndInt();
+        float  p29=getRndFloat();int  p30=getRndInt();float  p31=getRndFloat();
+        float  p32=getRndFloat();float  p33=getRndFloat();float  p34=getRndFloat();
+        int  p35=getRndInt();int  p36=getRndInt();float  p37=getRndFloat();float  p38=getRndFloat();
+        float  p39=getRndFloat();int  p40=getRndInt();float  p41=getRndFloat();
+        int  p42=getRndInt();float  p43=getRndFloat();int  p44=getRndInt();float  p45=getRndFloat();
+        float  p46=getRndFloat();float  p47=getRndFloat();int  p48=getRndInt();
+        float  p49=getRndFloat();int  p50=getRndInt();int  p51=getRndInt();float  p52=getRndFloat();
+        int  p53=getRndInt();float  p54=getRndFloat();float  p55=getRndFloat();
+        float  p56=getRndFloat();float  p57=getRndFloat();float  p58=getRndFloat();
+        float  p59=getRndFloat();float  p60=getRndFloat();float  p61=getRndFloat();
+        int  p62=getRndInt();float  p63=getRndFloat();float  p64=getRndFloat();
+        float  p65=getRndFloat();int  p66=getRndInt();int  p67=getRndInt();float  p68=getRndFloat();
+        float  p69=getRndFloat();float  p70=getRndFloat();int  p71=getRndInt();
+        float  p72=getRndFloat();float  p73=getRndFloat();int  p74=getRndInt();
+        float  p75=getRndFloat();float  p76=getRndFloat();float  p77=getRndFloat();
+        int  p78=getRndInt();int  p79=getRndInt();int  p80=getRndInt();float  p81=getRndFloat();
+        int  p82=getRndInt();int  p83=getRndInt();float  p84=getRndFloat();int  p85=getRndInt();
+        int  p86=getRndInt();float  p87=getRndFloat();float  p88=getRndFloat();
+        float  p89=getRndFloat();float  p90=getRndFloat();int  p91=getRndInt();
+        int  p92=getRndInt();float  p93=getRndFloat();float  p94=getRndFloat();
+        float  p95=getRndFloat();float  p96=getRndFloat();float  p97=getRndFloat();
+        float  p98=getRndFloat();int  p99=getRndInt();float  p100=getRndFloat();
+        int  p101=getRndInt();float  p102=getRndFloat();float  p103=getRndFloat();
+        int  p104=getRndInt();float  p105=getRndFloat();float  p106=getRndFloat();
+        float  p107=getRndFloat();int  p108=getRndInt();float  p109=getRndFloat();
+        float  p110=getRndFloat();float  p111=getRndFloat();float  p112=getRndFloat();
+        float  p113=getRndFloat();float  p114=getRndFloat();float  p115=getRndFloat();
+        float  p116=getRndFloat();int  p117=getRndInt();int  p118=getRndInt();float  p119=getRndFloat();
+        float  p120=getRndFloat();float  p121=getRndFloat();int  p122=getRndInt();
+        float  p123=getRndFloat();int  p124=getRndInt();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%d\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%d\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%d\n",p17);ps.format("p18=%d\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%d\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%d\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);ps.format("p28=%d\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%d\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%d\n",p35);ps.format("p36=%d\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%d\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%d\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%d\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%d\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%d\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%d\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%d\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);
+        ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);
+        ps.format("p86=%d\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);
+        ps.format("p92=%d\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%d\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);ps.format("p118=%d\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%d\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc13(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc14(float p0,float p1,float p2,float p3,byte p4,float p5,float p6,byte p7,float p8
+        ,byte p9,byte p10,byte p11,float p12,float p13,float p14,byte p15,float p16
+        ,byte p17,float p18,float p19,float p20,float p21,byte p22,byte p23,byte p24
+        ,float p25,byte p26,float p27,float p28,float p29,float p30,float p31,float p32
+        ,float p33,float p34,float p35,byte p36,float p37,float p38,float p39,float p40
+        ,float p41,float p42,byte p43,byte p44,float p45,byte p46,float p47,byte p48
+        ,float p49,float p50,float p51,float p52,float p53,float p54,float p55,byte p56
+        ,float p57,byte p58,float p59,byte p60,float p61,byte p62,byte p63,float p64
+        ,float p65,float p66,byte p67,float p68,float p69,float p70,byte p71,float p72
+        ,byte p73,float p74,float p75,float p76,byte p77,float p78,float p79,byte p80
+        ,float p81,float p82,float p83,float p84,byte p85,float p86,byte p87,byte p88
+        ,byte p89,float p90,byte p91,float p92,float p93,byte p94,float p95,float p96
+        ,float p97,float p98,float p99,float p100,float p101,float p102,byte p103
+        ,byte p104,float p105,float p106,float p107,float p108,float p109,float p110
+        ,byte p111,float p112,float p113,byte p114,byte p115,float p116,float p117
+        ,float p118,float p119,byte p120,byte p121,byte p122,byte p123,byte p124
+        ,float p125,float p126    );
+    private static void nativeFnc14_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();byte  p4=getRndByte();float  p5=getRndFloat();float  p6=getRndFloat();
+        byte  p7=getRndByte();float  p8=getRndFloat();byte  p9=getRndByte();byte  p10=getRndByte();
+        byte  p11=getRndByte();float  p12=getRndFloat();float  p13=getRndFloat();
+        float  p14=getRndFloat();byte  p15=getRndByte();float  p16=getRndFloat();
+        byte  p17=getRndByte();float  p18=getRndFloat();float  p19=getRndFloat();
+        float  p20=getRndFloat();float  p21=getRndFloat();byte  p22=getRndByte();
+        byte  p23=getRndByte();byte  p24=getRndByte();float  p25=getRndFloat();
+        byte  p26=getRndByte();float  p27=getRndFloat();float  p28=getRndFloat();
+        float  p29=getRndFloat();float  p30=getRndFloat();float  p31=getRndFloat();
+        float  p32=getRndFloat();float  p33=getRndFloat();float  p34=getRndFloat();
+        float  p35=getRndFloat();byte  p36=getRndByte();float  p37=getRndFloat();
+        float  p38=getRndFloat();float  p39=getRndFloat();float  p40=getRndFloat();
+        float  p41=getRndFloat();float  p42=getRndFloat();byte  p43=getRndByte();
+        byte  p44=getRndByte();float  p45=getRndFloat();byte  p46=getRndByte();
+        float  p47=getRndFloat();byte  p48=getRndByte();float  p49=getRndFloat();
+        float  p50=getRndFloat();float  p51=getRndFloat();float  p52=getRndFloat();
+        float  p53=getRndFloat();float  p54=getRndFloat();float  p55=getRndFloat();
+        byte  p56=getRndByte();float  p57=getRndFloat();byte  p58=getRndByte();
+        float  p59=getRndFloat();byte  p60=getRndByte();float  p61=getRndFloat();
+        byte  p62=getRndByte();byte  p63=getRndByte();float  p64=getRndFloat();
+        float  p65=getRndFloat();float  p66=getRndFloat();byte  p67=getRndByte();
+        float  p68=getRndFloat();float  p69=getRndFloat();float  p70=getRndFloat();
+        byte  p71=getRndByte();float  p72=getRndFloat();byte  p73=getRndByte();
+        float  p74=getRndFloat();float  p75=getRndFloat();float  p76=getRndFloat();
+        byte  p77=getRndByte();float  p78=getRndFloat();float  p79=getRndFloat();
+        byte  p80=getRndByte();float  p81=getRndFloat();float  p82=getRndFloat();
+        float  p83=getRndFloat();float  p84=getRndFloat();byte  p85=getRndByte();
+        float  p86=getRndFloat();byte  p87=getRndByte();byte  p88=getRndByte();
+        byte  p89=getRndByte();float  p90=getRndFloat();byte  p91=getRndByte();
+        float  p92=getRndFloat();float  p93=getRndFloat();byte  p94=getRndByte();
+        float  p95=getRndFloat();float  p96=getRndFloat();float  p97=getRndFloat();
+        float  p98=getRndFloat();float  p99=getRndFloat();float  p100=getRndFloat();
+        float  p101=getRndFloat();float  p102=getRndFloat();byte  p103=getRndByte();
+        byte  p104=getRndByte();float  p105=getRndFloat();float  p106=getRndFloat();
+        float  p107=getRndFloat();float  p108=getRndFloat();float  p109=getRndFloat();
+        float  p110=getRndFloat();byte  p111=getRndByte();float  p112=getRndFloat();
+        float  p113=getRndFloat();byte  p114=getRndByte();byte  p115=getRndByte();
+        float  p116=getRndFloat();float  p117=getRndFloat();float  p118=getRndFloat();
+        float  p119=getRndFloat();byte  p120=getRndByte();byte  p121=getRndByte();
+        byte  p122=getRndByte();byte  p123=getRndByte();byte  p124=getRndByte();
+        float  p125=getRndFloat();float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%d\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%d\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);
+        ps.format("p10=%d\n",p10);ps.format("p11=%d\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%d\n",p22);ps.format("p23=%d\n",p23);ps.format("p24=%d\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%d\n",p26);ps.format("p27=%e\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%d\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%d\n",p43);ps.format("p44=%d\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%d\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);ps.format("p57=%e\n",p57);
+        ps.format("p58=%d\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);ps.format("p63=%d\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%d\n",p67);ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%d\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%d\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%d\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%e\n",p90);
+        ps.format("p91=%d\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%d\n",p103);ps.format("p104=%d\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%d\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%d\n",p114);
+        ps.format("p115=%d\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);
+        ps.format("p121=%d\n",p121);ps.format("p122=%d\n",p122);ps.format("p123=%d\n",p123);
+        ps.format("p124=%d\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc14(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc15(float p0,float p1,byte p2,float p3,float p4,float p5,byte p6,float p7,byte p8
+        ,int p9,float p10,float p11,byte p12,byte p13,byte p14,byte p15,byte p16
+        ,float p17,byte p18,float p19,int p20,byte p21,float p22,int p23,byte p24
+        ,float p25,float p26,byte p27,float p28,int p29,float p30,byte p31,float p32
+        ,float p33,byte p34,float p35,int p36,byte p37,int p38,float p39,float p40
+        ,byte p41,float p42,byte p43,int p44,float p45,float p46,byte p47,int p48
+        ,float p49,int p50,float p51,float p52,int p53,byte p54,int p55,byte p56
+        ,float p57,float p58,float p59,float p60,byte p61,byte p62,byte p63,byte p64
+        ,float p65,int p66,int p67,int p68,float p69,float p70,int p71,float p72
+        ,float p73,float p74,int p75,float p76,float p77,int p78,float p79,int p80
+        ,float p81,float p82,float p83,float p84,byte p85,int p86,byte p87,float p88
+        ,float p89,float p90,int p91,float p92,byte p93,float p94,byte p95,int p96
+        ,float p97,float p98,int p99,float p100,byte p101,byte p102,float p103,byte p104
+        ,byte p105,byte p106,int p107,int p108,float p109,float p110,int p111,float p112
+        ,byte p113,int p114,float p115,byte p116,byte p117,float p118,float p119
+        ,int p120,float p121,float p122,int p123,float p124,byte p125,float p126
+            );
+    private static void nativeFnc15_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();byte  p2=getRndByte();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        byte  p6=getRndByte();float  p7=getRndFloat();byte  p8=getRndByte();int  p9=getRndInt();
+        float  p10=getRndFloat();float  p11=getRndFloat();byte  p12=getRndByte();
+        byte  p13=getRndByte();byte  p14=getRndByte();byte  p15=getRndByte();byte  p16=getRndByte();
+        float  p17=getRndFloat();byte  p18=getRndByte();float  p19=getRndFloat();
+        int  p20=getRndInt();byte  p21=getRndByte();float  p22=getRndFloat();int  p23=getRndInt();
+        byte  p24=getRndByte();float  p25=getRndFloat();float  p26=getRndFloat();
+        byte  p27=getRndByte();float  p28=getRndFloat();int  p29=getRndInt();float  p30=getRndFloat();
+        byte  p31=getRndByte();float  p32=getRndFloat();float  p33=getRndFloat();
+        byte  p34=getRndByte();float  p35=getRndFloat();int  p36=getRndInt();byte  p37=getRndByte();
+        int  p38=getRndInt();float  p39=getRndFloat();float  p40=getRndFloat();
+        byte  p41=getRndByte();float  p42=getRndFloat();byte  p43=getRndByte();
+        int  p44=getRndInt();float  p45=getRndFloat();float  p46=getRndFloat();
+        byte  p47=getRndByte();int  p48=getRndInt();float  p49=getRndFloat();int  p50=getRndInt();
+        float  p51=getRndFloat();float  p52=getRndFloat();int  p53=getRndInt();
+        byte  p54=getRndByte();int  p55=getRndInt();byte  p56=getRndByte();float  p57=getRndFloat();
+        float  p58=getRndFloat();float  p59=getRndFloat();float  p60=getRndFloat();
+        byte  p61=getRndByte();byte  p62=getRndByte();byte  p63=getRndByte();byte  p64=getRndByte();
+        float  p65=getRndFloat();int  p66=getRndInt();int  p67=getRndInt();int  p68=getRndInt();
+        float  p69=getRndFloat();float  p70=getRndFloat();int  p71=getRndInt();
+        float  p72=getRndFloat();float  p73=getRndFloat();float  p74=getRndFloat();
+        int  p75=getRndInt();float  p76=getRndFloat();float  p77=getRndFloat();
+        int  p78=getRndInt();float  p79=getRndFloat();int  p80=getRndInt();float  p81=getRndFloat();
+        float  p82=getRndFloat();float  p83=getRndFloat();float  p84=getRndFloat();
+        byte  p85=getRndByte();int  p86=getRndInt();byte  p87=getRndByte();float  p88=getRndFloat();
+        float  p89=getRndFloat();float  p90=getRndFloat();int  p91=getRndInt();
+        float  p92=getRndFloat();byte  p93=getRndByte();float  p94=getRndFloat();
+        byte  p95=getRndByte();int  p96=getRndInt();float  p97=getRndFloat();float  p98=getRndFloat();
+        int  p99=getRndInt();float  p100=getRndFloat();byte  p101=getRndByte();
+        byte  p102=getRndByte();float  p103=getRndFloat();byte  p104=getRndByte();
+        byte  p105=getRndByte();byte  p106=getRndByte();int  p107=getRndInt();int  p108=getRndInt();
+        float  p109=getRndFloat();float  p110=getRndFloat();int  p111=getRndInt();
+        float  p112=getRndFloat();byte  p113=getRndByte();int  p114=getRndInt();
+        float  p115=getRndFloat();byte  p116=getRndByte();byte  p117=getRndByte();
+        float  p118=getRndFloat();float  p119=getRndFloat();int  p120=getRndInt();
+        float  p121=getRndFloat();float  p122=getRndFloat();int  p123=getRndInt();
+        float  p124=getRndFloat();byte  p125=getRndByte();float  p126=getRndFloat();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%d\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%d\n",p8);
+        ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%d\n",p12);ps.format("p13=%d\n",p13);ps.format("p14=%d\n",p14);
+        ps.format("p15=%d\n",p15);ps.format("p16=%d\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%d\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%d\n",p20);
+        ps.format("p21=%d\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%d\n",p23);
+        ps.format("p24=%d\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%d\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%d\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%d\n",p36);ps.format("p37=%d\n",p37);ps.format("p38=%d\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%d\n",p43);ps.format("p44=%d\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%d\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%d\n",p61);ps.format("p62=%d\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%d\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%d\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%d\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%d\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);ps.format("p86=%d\n",p86);
+        ps.format("p87=%d\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);
+        ps.format("p96=%d\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%d\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%d\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%d\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%d\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);
+        ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc15(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc16(double p0,int p1,double p2,double p3,double p4,double p5,int p6,double p7
+        ,double p8,double p9,double p10,double p11,double p12,double p13,double p14
+        ,double p15,double p16,double p17,int p18,int p19,double p20,double p21
+        ,double p22,double p23,double p24,double p25,int p26,double p27,double p28
+        ,double p29,double p30,int p31,double p32,int p33,int p34,double p35,double p36
+        ,double p37,int p38,double p39,double p40,double p41,double p42,int p43
+        ,double p44,double p45,int p46,double p47,double p48,int p49,double p50
+        ,double p51,int p52,double p53,int p54,double p55,int p56,int p57,double p58
+        ,int p59,int p60,double p61,int p62,int p63,int p64,double p65,int p66,int p67
+        ,int p68,int p69,int p70,double p71,int p72,int p73,double p74,double p75
+        ,double p76,double p77,double p78,double p79,int p80,double p81,double p82
+        ,double p83,double p84,double p85,double p86,double p87,double p88,double p89
+        ,int p90,double p91,double p92,double p93,double p94,double p95,double p96
+        ,double p97,int p98,double p99,int p100,double p101,double p102,double p103
+        ,int p104,double p105,int p106,double p107,int p108,int p109,double p110
+        ,double p111,double p112,int p113,double p114,double p115,int p116,double p117
+        ,int p118,int p119,double p120,double p121,double p122,double p123,double p124
+        ,double p125,int p126    );
+    private static void nativeFnc16_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();int  p1=getRndInt();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        int  p6=getRndInt();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        int  p18=getRndInt();int  p19=getRndInt();double  p20=getRndDouble();double  p21=getRndDouble();
+        double  p22=getRndDouble();double  p23=getRndDouble();double  p24=getRndDouble();
+        double  p25=getRndDouble();int  p26=getRndInt();double  p27=getRndDouble();
+        double  p28=getRndDouble();double  p29=getRndDouble();double  p30=getRndDouble();
+        int  p31=getRndInt();double  p32=getRndDouble();int  p33=getRndInt();int  p34=getRndInt();
+        double  p35=getRndDouble();double  p36=getRndDouble();double  p37=getRndDouble();
+        int  p38=getRndInt();double  p39=getRndDouble();double  p40=getRndDouble();
+        double  p41=getRndDouble();double  p42=getRndDouble();int  p43=getRndInt();
+        double  p44=getRndDouble();double  p45=getRndDouble();int  p46=getRndInt();
+        double  p47=getRndDouble();double  p48=getRndDouble();int  p49=getRndInt();
+        double  p50=getRndDouble();double  p51=getRndDouble();int  p52=getRndInt();
+        double  p53=getRndDouble();int  p54=getRndInt();double  p55=getRndDouble();
+        int  p56=getRndInt();int  p57=getRndInt();double  p58=getRndDouble();int  p59=getRndInt();
+        int  p60=getRndInt();double  p61=getRndDouble();int  p62=getRndInt();int  p63=getRndInt();
+        int  p64=getRndInt();double  p65=getRndDouble();int  p66=getRndInt();int  p67=getRndInt();
+        int  p68=getRndInt();int  p69=getRndInt();int  p70=getRndInt();double  p71=getRndDouble();
+        int  p72=getRndInt();int  p73=getRndInt();double  p74=getRndDouble();double  p75=getRndDouble();
+        double  p76=getRndDouble();double  p77=getRndDouble();double  p78=getRndDouble();
+        double  p79=getRndDouble();int  p80=getRndInt();double  p81=getRndDouble();
+        double  p82=getRndDouble();double  p83=getRndDouble();double  p84=getRndDouble();
+        double  p85=getRndDouble();double  p86=getRndDouble();double  p87=getRndDouble();
+        double  p88=getRndDouble();double  p89=getRndDouble();int  p90=getRndInt();
+        double  p91=getRndDouble();double  p92=getRndDouble();double  p93=getRndDouble();
+        double  p94=getRndDouble();double  p95=getRndDouble();double  p96=getRndDouble();
+        double  p97=getRndDouble();int  p98=getRndInt();double  p99=getRndDouble();
+        int  p100=getRndInt();double  p101=getRndDouble();double  p102=getRndDouble();
+        double  p103=getRndDouble();int  p104=getRndInt();double  p105=getRndDouble();
+        int  p106=getRndInt();double  p107=getRndDouble();int  p108=getRndInt();
+        int  p109=getRndInt();double  p110=getRndDouble();double  p111=getRndDouble();
+        double  p112=getRndDouble();int  p113=getRndInt();double  p114=getRndDouble();
+        double  p115=getRndDouble();int  p116=getRndInt();double  p117=getRndDouble();
+        int  p118=getRndInt();int  p119=getRndInt();double  p120=getRndDouble();
+        double  p121=getRndDouble();double  p122=getRndDouble();double  p123=getRndDouble();
+        double  p124=getRndDouble();double  p125=getRndDouble();int  p126=getRndInt();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%d\n",p18);ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%d\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%d\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%d\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%d\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%d\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%d\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%d\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%d\n",p59);
+        ps.format("p60=%d\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%d\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%d\n",p68);
+        ps.format("p69=%d\n",p69);ps.format("p70=%d\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%d\n",p72);ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%d\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%d\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%d\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%d\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%d\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%d\n",p108);ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);ps.format("p119=%d\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%d\n",p126);
+        nativeFnc16(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc17(double p0,double p1,byte p2,double p3,double p4,double p5,double p6,byte p7
+        ,double p8,byte p9,double p10,byte p11,byte p12,double p13,double p14,double p15
+        ,double p16,byte p17,double p18,double p19,double p20,double p21,double p22
+        ,double p23,double p24,double p25,double p26,double p27,double p28,double p29
+        ,double p30,double p31,double p32,double p33,double p34,double p35,double p36
+        ,double p37,byte p38,double p39,double p40,double p41,double p42,double p43
+        ,double p44,double p45,double p46,byte p47,double p48,byte p49,double p50
+        ,byte p51,double p52,byte p53,byte p54,byte p55,byte p56,double p57,byte p58
+        ,double p59,double p60,byte p61,byte p62,double p63,double p64,byte p65
+        ,byte p66,byte p67,double p68,byte p69,double p70,double p71,byte p72,double p73
+        ,double p74,double p75,byte p76,double p77,double p78,double p79,double p80
+        ,double p81,byte p82,double p83,double p84,byte p85,byte p86,double p87
+        ,double p88,double p89,double p90,double p91,double p92,byte p93,byte p94
+        ,double p95,double p96,double p97,double p98,byte p99,double p100,double p101
+        ,double p102,double p103,double p104,byte p105,double p106,byte p107,double p108
+        ,double p109,double p110,byte p111,double p112,double p113,byte p114,double p115
+        ,double p116,byte p117,byte p118,byte p119,double p120,byte p121,double p122
+        ,byte p123,double p124,byte p125,byte p126    );
+    private static void nativeFnc17_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();byte  p2=getRndByte();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        double  p6=getRndDouble();byte  p7=getRndByte();double  p8=getRndDouble();
+        byte  p9=getRndByte();double  p10=getRndDouble();byte  p11=getRndByte();
+        byte  p12=getRndByte();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();byte  p17=getRndByte();
+        double  p18=getRndDouble();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();double  p22=getRndDouble();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        double  p27=getRndDouble();double  p28=getRndDouble();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();double  p32=getRndDouble();
+        double  p33=getRndDouble();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();double  p37=getRndDouble();byte  p38=getRndByte();
+        double  p39=getRndDouble();double  p40=getRndDouble();double  p41=getRndDouble();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();double  p46=getRndDouble();byte  p47=getRndByte();
+        double  p48=getRndDouble();byte  p49=getRndByte();double  p50=getRndDouble();
+        byte  p51=getRndByte();double  p52=getRndDouble();byte  p53=getRndByte();
+        byte  p54=getRndByte();byte  p55=getRndByte();byte  p56=getRndByte();double  p57=getRndDouble();
+        byte  p58=getRndByte();double  p59=getRndDouble();double  p60=getRndDouble();
+        byte  p61=getRndByte();byte  p62=getRndByte();double  p63=getRndDouble();
+        double  p64=getRndDouble();byte  p65=getRndByte();byte  p66=getRndByte();
+        byte  p67=getRndByte();double  p68=getRndDouble();byte  p69=getRndByte();
+        double  p70=getRndDouble();double  p71=getRndDouble();byte  p72=getRndByte();
+        double  p73=getRndDouble();double  p74=getRndDouble();double  p75=getRndDouble();
+        byte  p76=getRndByte();double  p77=getRndDouble();double  p78=getRndDouble();
+        double  p79=getRndDouble();double  p80=getRndDouble();double  p81=getRndDouble();
+        byte  p82=getRndByte();double  p83=getRndDouble();double  p84=getRndDouble();
+        byte  p85=getRndByte();byte  p86=getRndByte();double  p87=getRndDouble();
+        double  p88=getRndDouble();double  p89=getRndDouble();double  p90=getRndDouble();
+        double  p91=getRndDouble();double  p92=getRndDouble();byte  p93=getRndByte();
+        byte  p94=getRndByte();double  p95=getRndDouble();double  p96=getRndDouble();
+        double  p97=getRndDouble();double  p98=getRndDouble();byte  p99=getRndByte();
+        double  p100=getRndDouble();double  p101=getRndDouble();double  p102=getRndDouble();
+        double  p103=getRndDouble();double  p104=getRndDouble();byte  p105=getRndByte();
+        double  p106=getRndDouble();byte  p107=getRndByte();double  p108=getRndDouble();
+        double  p109=getRndDouble();double  p110=getRndDouble();byte  p111=getRndByte();
+        double  p112=getRndDouble();double  p113=getRndDouble();byte  p114=getRndByte();
+        double  p115=getRndDouble();double  p116=getRndDouble();byte  p117=getRndByte();
+        byte  p118=getRndByte();byte  p119=getRndByte();double  p120=getRndDouble();
+        byte  p121=getRndByte();double  p122=getRndDouble();byte  p123=getRndByte();
+        double  p124=getRndDouble();byte  p125=getRndByte();byte  p126=getRndByte();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%d\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%d\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%d\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%d\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%d\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%d\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%d\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%d\n",p61);ps.format("p62=%d\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%d\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%d\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%d\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);ps.format("p86=%d\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%d\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%d\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%d\n",p117);ps.format("p118=%d\n",p118);ps.format("p119=%d\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);
+        ps.format("p126=%d\n",p126);
+        nativeFnc17(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc18(double p0,double p1,double p2,double p3,int p4,int p5,byte p6,int p7,double p8
+        ,double p9,double p10,double p11,double p12,byte p13,double p14,double p15
+        ,byte p16,double p17,int p18,byte p19,byte p20,double p21,double p22,double p23
+        ,int p24,double p25,double p26,int p27,double p28,double p29,double p30
+        ,double p31,double p32,double p33,byte p34,int p35,byte p36,double p37,double p38
+        ,int p39,int p40,int p41,int p42,double p43,double p44,double p45,byte p46
+        ,byte p47,double p48,int p49,byte p50,byte p51,int p52,int p53,int p54,double p55
+        ,double p56,int p57,int p58,double p59,byte p60,byte p61,int p62,int p63
+        ,double p64,int p65,int p66,double p67,double p68,double p69,int p70,double p71
+        ,double p72,int p73,double p74,double p75,int p76,byte p77,double p78,int p79
+        ,double p80,int p81,double p82,double p83,byte p84,double p85,double p86
+        ,int p87,int p88,byte p89,double p90,double p91,double p92,int p93,byte p94
+        ,byte p95,int p96,double p97,double p98,double p99,double p100,byte p101
+        ,byte p102,double p103,double p104,double p105,int p106,int p107,double p108
+        ,int p109,int p110,double p111,double p112,byte p113,int p114,byte p115
+        ,double p116,double p117,int p118,int p119,int p120,double p121,double p122
+        ,double p123,double p124,double p125,byte p126    );
+    private static void nativeFnc18_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();int  p4=getRndInt();int  p5=getRndInt();byte  p6=getRndByte();
+        int  p7=getRndInt();double  p8=getRndDouble();double  p9=getRndDouble();
+        double  p10=getRndDouble();double  p11=getRndDouble();double  p12=getRndDouble();
+        byte  p13=getRndByte();double  p14=getRndDouble();double  p15=getRndDouble();
+        byte  p16=getRndByte();double  p17=getRndDouble();int  p18=getRndInt();
+        byte  p19=getRndByte();byte  p20=getRndByte();double  p21=getRndDouble();
+        double  p22=getRndDouble();double  p23=getRndDouble();int  p24=getRndInt();
+        double  p25=getRndDouble();double  p26=getRndDouble();int  p27=getRndInt();
+        double  p28=getRndDouble();double  p29=getRndDouble();double  p30=getRndDouble();
+        double  p31=getRndDouble();double  p32=getRndDouble();double  p33=getRndDouble();
+        byte  p34=getRndByte();int  p35=getRndInt();byte  p36=getRndByte();double  p37=getRndDouble();
+        double  p38=getRndDouble();int  p39=getRndInt();int  p40=getRndInt();int  p41=getRndInt();
+        int  p42=getRndInt();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();byte  p46=getRndByte();byte  p47=getRndByte();
+        double  p48=getRndDouble();int  p49=getRndInt();byte  p50=getRndByte();
+        byte  p51=getRndByte();int  p52=getRndInt();int  p53=getRndInt();int  p54=getRndInt();
+        double  p55=getRndDouble();double  p56=getRndDouble();int  p57=getRndInt();
+        int  p58=getRndInt();double  p59=getRndDouble();byte  p60=getRndByte();
+        byte  p61=getRndByte();int  p62=getRndInt();int  p63=getRndInt();double  p64=getRndDouble();
+        int  p65=getRndInt();int  p66=getRndInt();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();int  p70=getRndInt();double  p71=getRndDouble();
+        double  p72=getRndDouble();int  p73=getRndInt();double  p74=getRndDouble();
+        double  p75=getRndDouble();int  p76=getRndInt();byte  p77=getRndByte();
+        double  p78=getRndDouble();int  p79=getRndInt();double  p80=getRndDouble();
+        int  p81=getRndInt();double  p82=getRndDouble();double  p83=getRndDouble();
+        byte  p84=getRndByte();double  p85=getRndDouble();double  p86=getRndDouble();
+        int  p87=getRndInt();int  p88=getRndInt();byte  p89=getRndByte();double  p90=getRndDouble();
+        double  p91=getRndDouble();double  p92=getRndDouble();int  p93=getRndInt();
+        byte  p94=getRndByte();byte  p95=getRndByte();int  p96=getRndInt();double  p97=getRndDouble();
+        double  p98=getRndDouble();double  p99=getRndDouble();double  p100=getRndDouble();
+        byte  p101=getRndByte();byte  p102=getRndByte();double  p103=getRndDouble();
+        double  p104=getRndDouble();double  p105=getRndDouble();int  p106=getRndInt();
+        int  p107=getRndInt();double  p108=getRndDouble();int  p109=getRndInt();
+        int  p110=getRndInt();double  p111=getRndDouble();double  p112=getRndDouble();
+        byte  p113=getRndByte();int  p114=getRndInt();byte  p115=getRndByte();double  p116=getRndDouble();
+        double  p117=getRndDouble();int  p118=getRndInt();int  p119=getRndInt();
+        int  p120=getRndInt();double  p121=getRndDouble();double  p122=getRndDouble();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        byte  p126=getRndByte();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%d\n",p6);ps.format("p7=%d\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%d\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%d\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%d\n",p18);ps.format("p19=%d\n",p19);
+        ps.format("p20=%d\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);
+        ps.format("p35=%d\n",p35);ps.format("p36=%d\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%d\n",p39);ps.format("p40=%d\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);
+        ps.format("p47=%d\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);
+        ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);ps.format("p52=%d\n",p52);
+        ps.format("p53=%d\n",p53);ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%d\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);ps.format("p61=%d\n",p61);
+        ps.format("p62=%d\n",p62);ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%d\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%d\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);
+        ps.format("p77=%d\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%d\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%d\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%d\n",p87);ps.format("p88=%d\n",p88);
+        ps.format("p89=%d\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%d\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%d\n",p95);ps.format("p96=%d\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%d\n",p106);
+        ps.format("p107=%d\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);
+        ps.format("p110=%d\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%d\n",p114);ps.format("p115=%d\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);
+        ps.format("p119=%d\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%d\n",p126);
+        nativeFnc18(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc19(float p0,float p1,float p2,float p3,float p4,int p5,float p6,float p7,double p8
+        ,double p9,int p10,double p11,double p12,float p13,int p14,double p15,float p16
+        ,int p17,float p18,double p19,float p20,byte p21,double p22,float p23,float p24
+        ,double p25,float p26,byte p27,double p28,float p29,float p30,float p31
+        ,byte p32,float p33,float p34,float p35,int p36,int p37,double p38,double p39
+        ,int p40,byte p41,float p42,float p43,byte p44,byte p45,double p46,double p47
+        ,int p48,double p49,double p50,int p51,double p52,float p53,double p54,double p55
+        ,float p56,double p57,double p58,double p59,int p60,int p61,float p62,float p63
+        ,double p64,double p65,int p66,byte p67,float p68,double p69,float p70,float p71
+        ,double p72,float p73,byte p74,int p75,int p76,double p77,float p78,double p79
+        ,double p80,double p81,double p82,int p83,float p84,double p85,byte p86
+        ,byte p87,double p88,byte p89,byte p90,byte p91,int p92,byte p93,float p94
+        ,byte p95,int p96,int p97,int p98,byte p99,double p100,int p101,double p102
+        ,float p103,int p104,float p105,int p106,byte p107,float p108,int p109,float p110
+        ,float p111,float p112,int p113,int p114,float p115,int p116,double p117
+        ,byte p118,float p119,byte p120,byte p121,double p122,float p123,float p124
+        ,byte p125,int p126    );
+    private static void nativeFnc19_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();int  p5=getRndInt();float  p6=getRndFloat();
+        float  p7=getRndFloat();double  p8=getRndDouble();double  p9=getRndDouble();
+        int  p10=getRndInt();double  p11=getRndDouble();double  p12=getRndDouble();
+        float  p13=getRndFloat();int  p14=getRndInt();double  p15=getRndDouble();
+        float  p16=getRndFloat();int  p17=getRndInt();float  p18=getRndFloat();
+        double  p19=getRndDouble();float  p20=getRndFloat();byte  p21=getRndByte();
+        double  p22=getRndDouble();float  p23=getRndFloat();float  p24=getRndFloat();
+        double  p25=getRndDouble();float  p26=getRndFloat();byte  p27=getRndByte();
+        double  p28=getRndDouble();float  p29=getRndFloat();float  p30=getRndFloat();
+        float  p31=getRndFloat();byte  p32=getRndByte();float  p33=getRndFloat();
+        float  p34=getRndFloat();float  p35=getRndFloat();int  p36=getRndInt();
+        int  p37=getRndInt();double  p38=getRndDouble();double  p39=getRndDouble();
+        int  p40=getRndInt();byte  p41=getRndByte();float  p42=getRndFloat();float  p43=getRndFloat();
+        byte  p44=getRndByte();byte  p45=getRndByte();double  p46=getRndDouble();
+        double  p47=getRndDouble();int  p48=getRndInt();double  p49=getRndDouble();
+        double  p50=getRndDouble();int  p51=getRndInt();double  p52=getRndDouble();
+        float  p53=getRndFloat();double  p54=getRndDouble();double  p55=getRndDouble();
+        float  p56=getRndFloat();double  p57=getRndDouble();double  p58=getRndDouble();
+        double  p59=getRndDouble();int  p60=getRndInt();int  p61=getRndInt();float  p62=getRndFloat();
+        float  p63=getRndFloat();double  p64=getRndDouble();double  p65=getRndDouble();
+        int  p66=getRndInt();byte  p67=getRndByte();float  p68=getRndFloat();double  p69=getRndDouble();
+        float  p70=getRndFloat();float  p71=getRndFloat();double  p72=getRndDouble();
+        float  p73=getRndFloat();byte  p74=getRndByte();int  p75=getRndInt();int  p76=getRndInt();
+        double  p77=getRndDouble();float  p78=getRndFloat();double  p79=getRndDouble();
+        double  p80=getRndDouble();double  p81=getRndDouble();double  p82=getRndDouble();
+        int  p83=getRndInt();float  p84=getRndFloat();double  p85=getRndDouble();
+        byte  p86=getRndByte();byte  p87=getRndByte();double  p88=getRndDouble();
+        byte  p89=getRndByte();byte  p90=getRndByte();byte  p91=getRndByte();int  p92=getRndInt();
+        byte  p93=getRndByte();float  p94=getRndFloat();byte  p95=getRndByte();
+        int  p96=getRndInt();int  p97=getRndInt();int  p98=getRndInt();byte  p99=getRndByte();
+        double  p100=getRndDouble();int  p101=getRndInt();double  p102=getRndDouble();
+        float  p103=getRndFloat();int  p104=getRndInt();float  p105=getRndFloat();
+        int  p106=getRndInt();byte  p107=getRndByte();float  p108=getRndFloat();
+        int  p109=getRndInt();float  p110=getRndFloat();float  p111=getRndFloat();
+        float  p112=getRndFloat();int  p113=getRndInt();int  p114=getRndInt();float  p115=getRndFloat();
+        int  p116=getRndInt();double  p117=getRndDouble();byte  p118=getRndByte();
+        float  p119=getRndFloat();byte  p120=getRndByte();byte  p121=getRndByte();
+        double  p122=getRndDouble();float  p123=getRndFloat();float  p124=getRndFloat();
+        byte  p125=getRndByte();int  p126=getRndInt();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%d\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%d\n",p14);ps.format("p15=%e\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%d\n",p36);
+        ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%d\n",p40);ps.format("p41=%d\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);ps.format("p45=%d\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%d\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%d\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);
+        ps.format("p67=%d\n",p67);ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);ps.format("p75=%d\n",p75);
+        ps.format("p76=%d\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%d\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%d\n",p91);ps.format("p92=%d\n",p92);ps.format("p93=%d\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);ps.format("p96=%d\n",p96);
+        ps.format("p97=%d\n",p97);ps.format("p98=%d\n",p98);ps.format("p99=%d\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%d\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%d\n",p106);ps.format("p107=%d\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);ps.format("p114=%d\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);
+        ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);ps.format("p126=%d\n",p126);
+
+        nativeFnc19(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc20(double p0,float p1,float p2,float p3,float p4,float p5,float p6,double p7
+        ,float p8,float p9,float p10,float p11,double p12,double p13,float p14,double p15
+        ,double p16,double p17,float p18,float p19,float p20,float p21,float p22
+        ,double p23,double p24,float p25,float p26,float p27,double p28,float p29
+        ,double p30,float p31,float p32,double p33,float p34,double p35,double p36
+        ,double p37,double p38,float p39,float p40,double p41,float p42,double p43
+        ,double p44,float p45,float p46,double p47,double p48,float p49,double p50
+        ,float p51,float p52,float p53,float p54,double p55,double p56,double p57
+        ,float p58,double p59,float p60,float p61,float p62,float p63,double p64
+        ,float p65,float p66,float p67,float p68,float p69,double p70,double p71
+        ,float p72,float p73,double p74,float p75,float p76,float p77,double p78
+        ,float p79,float p80,float p81,double p82,float p83,double p84,float p85
+        ,double p86,float p87,double p88,float p89,float p90,float p91,float p92
+        ,double p93,double p94,double p95,double p96,float p97,float p98,float p99
+        ,float p100,float p101,float p102,float p103,float p104,float p105,float p106
+        ,double p107,float p108,float p109,float p110,double p111,double p112,float p113
+        ,float p114,float p115,float p116,double p117,float p118,float p119,float p120
+        ,double p121,float p122,double p123,double p124,double p125,float p126    );
+    private static void nativeFnc20_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        float  p6=getRndFloat();double  p7=getRndDouble();float  p8=getRndFloat();
+        float  p9=getRndFloat();float  p10=getRndFloat();float  p11=getRndFloat();
+        double  p12=getRndDouble();double  p13=getRndDouble();float  p14=getRndFloat();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        float  p18=getRndFloat();float  p19=getRndFloat();float  p20=getRndFloat();
+        float  p21=getRndFloat();float  p22=getRndFloat();double  p23=getRndDouble();
+        double  p24=getRndDouble();float  p25=getRndFloat();float  p26=getRndFloat();
+        float  p27=getRndFloat();double  p28=getRndDouble();float  p29=getRndFloat();
+        double  p30=getRndDouble();float  p31=getRndFloat();float  p32=getRndFloat();
+        double  p33=getRndDouble();float  p34=getRndFloat();double  p35=getRndDouble();
+        double  p36=getRndDouble();double  p37=getRndDouble();double  p38=getRndDouble();
+        float  p39=getRndFloat();float  p40=getRndFloat();double  p41=getRndDouble();
+        float  p42=getRndFloat();double  p43=getRndDouble();double  p44=getRndDouble();
+        float  p45=getRndFloat();float  p46=getRndFloat();double  p47=getRndDouble();
+        double  p48=getRndDouble();float  p49=getRndFloat();double  p50=getRndDouble();
+        float  p51=getRndFloat();float  p52=getRndFloat();float  p53=getRndFloat();
+        float  p54=getRndFloat();double  p55=getRndDouble();double  p56=getRndDouble();
+        double  p57=getRndDouble();float  p58=getRndFloat();double  p59=getRndDouble();
+        float  p60=getRndFloat();float  p61=getRndFloat();float  p62=getRndFloat();
+        float  p63=getRndFloat();double  p64=getRndDouble();float  p65=getRndFloat();
+        float  p66=getRndFloat();float  p67=getRndFloat();float  p68=getRndFloat();
+        float  p69=getRndFloat();double  p70=getRndDouble();double  p71=getRndDouble();
+        float  p72=getRndFloat();float  p73=getRndFloat();double  p74=getRndDouble();
+        float  p75=getRndFloat();float  p76=getRndFloat();float  p77=getRndFloat();
+        double  p78=getRndDouble();float  p79=getRndFloat();float  p80=getRndFloat();
+        float  p81=getRndFloat();double  p82=getRndDouble();float  p83=getRndFloat();
+        double  p84=getRndDouble();float  p85=getRndFloat();double  p86=getRndDouble();
+        float  p87=getRndFloat();double  p88=getRndDouble();float  p89=getRndFloat();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        double  p93=getRndDouble();double  p94=getRndDouble();double  p95=getRndDouble();
+        double  p96=getRndDouble();float  p97=getRndFloat();float  p98=getRndFloat();
+        float  p99=getRndFloat();float  p100=getRndFloat();float  p101=getRndFloat();
+        float  p102=getRndFloat();float  p103=getRndFloat();float  p104=getRndFloat();
+        float  p105=getRndFloat();float  p106=getRndFloat();double  p107=getRndDouble();
+        float  p108=getRndFloat();float  p109=getRndFloat();float  p110=getRndFloat();
+        double  p111=getRndDouble();double  p112=getRndDouble();float  p113=getRndFloat();
+        float  p114=getRndFloat();float  p115=getRndFloat();float  p116=getRndFloat();
+        double  p117=getRndDouble();float  p118=getRndFloat();float  p119=getRndFloat();
+        float  p120=getRndFloat();double  p121=getRndDouble();float  p122=getRndFloat();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc20(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc21(float p0,int p1,float p2,float p3,int p4,int p5,double p6,float p7,float p8
+        ,double p9,int p10,double p11,double p12,float p13,double p14,double p15
+        ,float p16,double p17,float p18,double p19,double p20,double p21,float p22
+        ,double p23,double p24,int p25,double p26,int p27,int p28,double p29,float p30
+        ,float p31,float p32,int p33,double p34,float p35,double p36,double p37
+        ,float p38,float p39,float p40,float p41,float p42,float p43,int p44,int p45
+        ,double p46,float p47,float p48,int p49,double p50,double p51,float p52
+        ,double p53,int p54,double p55,int p56,double p57,double p58,float p59,float p60
+        ,int p61,float p62,int p63,float p64,double p65,int p66,float p67,double p68
+        ,double p69,double p70,double p71,double p72,float p73,int p74,int p75,double p76
+        ,int p77,float p78,float p79,double p80,double p81,double p82,int p83,double p84
+        ,double p85,float p86,double p87,int p88,double p89,float p90,float p91
+        ,float p92,double p93,int p94,float p95,int p96,float p97,double p98,int p99
+        ,int p100,int p101,int p102,float p103,float p104,float p105,float p106
+        ,int p107,float p108,double p109,float p110,double p111,double p112,float p113
+        ,float p114,double p115,double p116,float p117,int p118,double p119,float p120
+        ,float p121,double p122,double p123,float p124,int p125,double p126    );
+    private static void nativeFnc21_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();int  p1=getRndInt();float  p2=getRndFloat();
+        float  p3=getRndFloat();int  p4=getRndInt();int  p5=getRndInt();double  p6=getRndDouble();
+        float  p7=getRndFloat();float  p8=getRndFloat();double  p9=getRndDouble();
+        int  p10=getRndInt();double  p11=getRndDouble();double  p12=getRndDouble();
+        float  p13=getRndFloat();double  p14=getRndDouble();double  p15=getRndDouble();
+        float  p16=getRndFloat();double  p17=getRndDouble();float  p18=getRndFloat();
+        double  p19=getRndDouble();double  p20=getRndDouble();double  p21=getRndDouble();
+        float  p22=getRndFloat();double  p23=getRndDouble();double  p24=getRndDouble();
+        int  p25=getRndInt();double  p26=getRndDouble();int  p27=getRndInt();int  p28=getRndInt();
+        double  p29=getRndDouble();float  p30=getRndFloat();float  p31=getRndFloat();
+        float  p32=getRndFloat();int  p33=getRndInt();double  p34=getRndDouble();
+        float  p35=getRndFloat();double  p36=getRndDouble();double  p37=getRndDouble();
+        float  p38=getRndFloat();float  p39=getRndFloat();float  p40=getRndFloat();
+        float  p41=getRndFloat();float  p42=getRndFloat();float  p43=getRndFloat();
+        int  p44=getRndInt();int  p45=getRndInt();double  p46=getRndDouble();float  p47=getRndFloat();
+        float  p48=getRndFloat();int  p49=getRndInt();double  p50=getRndDouble();
+        double  p51=getRndDouble();float  p52=getRndFloat();double  p53=getRndDouble();
+        int  p54=getRndInt();double  p55=getRndDouble();int  p56=getRndInt();double  p57=getRndDouble();
+        double  p58=getRndDouble();float  p59=getRndFloat();float  p60=getRndFloat();
+        int  p61=getRndInt();float  p62=getRndFloat();int  p63=getRndInt();float  p64=getRndFloat();
+        double  p65=getRndDouble();int  p66=getRndInt();float  p67=getRndFloat();
+        double  p68=getRndDouble();double  p69=getRndDouble();double  p70=getRndDouble();
+        double  p71=getRndDouble();double  p72=getRndDouble();float  p73=getRndFloat();
+        int  p74=getRndInt();int  p75=getRndInt();double  p76=getRndDouble();int  p77=getRndInt();
+        float  p78=getRndFloat();float  p79=getRndFloat();double  p80=getRndDouble();
+        double  p81=getRndDouble();double  p82=getRndDouble();int  p83=getRndInt();
+        double  p84=getRndDouble();double  p85=getRndDouble();float  p86=getRndFloat();
+        double  p87=getRndDouble();int  p88=getRndInt();double  p89=getRndDouble();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        double  p93=getRndDouble();int  p94=getRndInt();float  p95=getRndFloat();
+        int  p96=getRndInt();float  p97=getRndFloat();double  p98=getRndDouble();
+        int  p99=getRndInt();int  p100=getRndInt();int  p101=getRndInt();int  p102=getRndInt();
+        float  p103=getRndFloat();float  p104=getRndFloat();float  p105=getRndFloat();
+        float  p106=getRndFloat();int  p107=getRndInt();float  p108=getRndFloat();
+        double  p109=getRndDouble();float  p110=getRndFloat();double  p111=getRndDouble();
+        double  p112=getRndDouble();float  p113=getRndFloat();float  p114=getRndFloat();
+        double  p115=getRndDouble();double  p116=getRndDouble();float  p117=getRndFloat();
+        int  p118=getRndInt();double  p119=getRndDouble();float  p120=getRndFloat();
+        float  p121=getRndFloat();double  p122=getRndDouble();double  p123=getRndDouble();
+        float  p124=getRndFloat();int  p125=getRndInt();double  p126=getRndDouble();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);ps.format("p5=%d\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%d\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);
+        ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%d\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);
+        ps.format("p75=%d\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%d\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%d\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%d\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc21(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc22(double p0,byte p1,double p2,float p3,float p4,float p5,float p6,float p7
+        ,float p8,float p9,float p10,float p11,double p12,double p13,byte p14,float p15
+        ,float p16,double p17,float p18,float p19,double p20,float p21,byte p22
+        ,float p23,float p24,double p25,byte p26,double p27,double p28,double p29
+        ,byte p30,byte p31,byte p32,byte p33,byte p34,double p35,double p36,float p37
+        ,float p38,double p39,float p40,float p41,float p42,float p43,byte p44,float p45
+        ,float p46,double p47,byte p48,byte p49,double p50,double p51,float p52
+        ,float p53,double p54,float p55,double p56,float p57,float p58,float p59
+        ,float p60,float p61,float p62,double p63,double p64,float p65,double p66
+        ,double p67,byte p68,double p69,double p70,double p71,double p72,float p73
+        ,byte p74,float p75,float p76,float p77,float p78,float p79,double p80,double p81
+        ,float p82,double p83,byte p84,float p85,double p86,float p87,double p88
+        ,byte p89,byte p90,double p91,byte p92,float p93,double p94,byte p95,float p96
+        ,float p97,double p98,float p99,byte p100,float p101,double p102,double p103
+        ,byte p104,double p105,float p106,byte p107,float p108,byte p109,float p110
+        ,float p111,double p112,float p113,double p114,double p115,float p116,double p117
+        ,float p118,float p119,float p120,byte p121,double p122,double p123,double p124
+        ,float p125,float p126    );
+    private static void nativeFnc22_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();byte  p1=getRndByte();double  p2=getRndDouble();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        float  p6=getRndFloat();float  p7=getRndFloat();float  p8=getRndFloat();
+        float  p9=getRndFloat();float  p10=getRndFloat();float  p11=getRndFloat();
+        double  p12=getRndDouble();double  p13=getRndDouble();byte  p14=getRndByte();
+        float  p15=getRndFloat();float  p16=getRndFloat();double  p17=getRndDouble();
+        float  p18=getRndFloat();float  p19=getRndFloat();double  p20=getRndDouble();
+        float  p21=getRndFloat();byte  p22=getRndByte();float  p23=getRndFloat();
+        float  p24=getRndFloat();double  p25=getRndDouble();byte  p26=getRndByte();
+        double  p27=getRndDouble();double  p28=getRndDouble();double  p29=getRndDouble();
+        byte  p30=getRndByte();byte  p31=getRndByte();byte  p32=getRndByte();byte  p33=getRndByte();
+        byte  p34=getRndByte();double  p35=getRndDouble();double  p36=getRndDouble();
+        float  p37=getRndFloat();float  p38=getRndFloat();double  p39=getRndDouble();
+        float  p40=getRndFloat();float  p41=getRndFloat();float  p42=getRndFloat();
+        float  p43=getRndFloat();byte  p44=getRndByte();float  p45=getRndFloat();
+        float  p46=getRndFloat();double  p47=getRndDouble();byte  p48=getRndByte();
+        byte  p49=getRndByte();double  p50=getRndDouble();double  p51=getRndDouble();
+        float  p52=getRndFloat();float  p53=getRndFloat();double  p54=getRndDouble();
+        float  p55=getRndFloat();double  p56=getRndDouble();float  p57=getRndFloat();
+        float  p58=getRndFloat();float  p59=getRndFloat();float  p60=getRndFloat();
+        float  p61=getRndFloat();float  p62=getRndFloat();double  p63=getRndDouble();
+        double  p64=getRndDouble();float  p65=getRndFloat();double  p66=getRndDouble();
+        double  p67=getRndDouble();byte  p68=getRndByte();double  p69=getRndDouble();
+        double  p70=getRndDouble();double  p71=getRndDouble();double  p72=getRndDouble();
+        float  p73=getRndFloat();byte  p74=getRndByte();float  p75=getRndFloat();
+        float  p76=getRndFloat();float  p77=getRndFloat();float  p78=getRndFloat();
+        float  p79=getRndFloat();double  p80=getRndDouble();double  p81=getRndDouble();
+        float  p82=getRndFloat();double  p83=getRndDouble();byte  p84=getRndByte();
+        float  p85=getRndFloat();double  p86=getRndDouble();float  p87=getRndFloat();
+        double  p88=getRndDouble();byte  p89=getRndByte();byte  p90=getRndByte();
+        double  p91=getRndDouble();byte  p92=getRndByte();float  p93=getRndFloat();
+        double  p94=getRndDouble();byte  p95=getRndByte();float  p96=getRndFloat();
+        float  p97=getRndFloat();double  p98=getRndDouble();float  p99=getRndFloat();
+        byte  p100=getRndByte();float  p101=getRndFloat();double  p102=getRndDouble();
+        double  p103=getRndDouble();byte  p104=getRndByte();double  p105=getRndDouble();
+        float  p106=getRndFloat();byte  p107=getRndByte();float  p108=getRndFloat();
+        byte  p109=getRndByte();float  p110=getRndFloat();float  p111=getRndFloat();
+        double  p112=getRndDouble();float  p113=getRndFloat();double  p114=getRndDouble();
+        double  p115=getRndDouble();float  p116=getRndFloat();double  p117=getRndDouble();
+        float  p118=getRndFloat();float  p119=getRndFloat();float  p120=getRndFloat();
+        byte  p121=getRndByte();double  p122=getRndDouble();double  p123=getRndDouble();
+        double  p124=getRndDouble();float  p125=getRndFloat();float  p126=getRndFloat();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%d\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%d\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%d\n",p30);ps.format("p31=%d\n",p31);ps.format("p32=%d\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%d\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%d\n",p48);ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%d\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);
+        ps.format("p90=%d\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%d\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%d\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc22(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc23(float p0,float p1,float p2,float p3,float p4,float p5,int p6,float p7,float p8
+        ,float p9,float p10,int p11,float p12,float p13,float p14,int p15,float p16
+        ,float p17,float p18,int p19,float p20,float p21,float p22,float p23,float p24
+        ,float p25,float p26,float p27,float p28,float p29,int p30,float p31,float p32
+        ,float p33,int p34,int p35,int p36,float p37,float p38,float p39,float p40
+        ,float p41,float p42,int p43,float p44,float p45,float p46,float p47,int p48
+        ,float p49,float p50,float p51,float p52,float p53,float p54,int p55,float p56
+        ,float p57,float p58,float p59,float p60,int p61,float p62,float p63,int p64
+        ,float p65,int p66,int p67,int p68,float p69,float p70,float p71,float p72
+        ,int p73,float p74,float p75,float p76,float p77,int p78,float p79,float p80
+        ,float p81,float p82,float p83,float p84,float p85,int p86,float p87,float p88
+        ,float p89,float p90,int p91,int p92,float p93,int p94,float p95,int p96
+        ,float p97,float p98,float p99,float p100,float p101,float p102,float p103
+        ,float p104,float p105,float p106,int p107,float p108,float p109,float p110
+        ,float p111,float p112,int p113,float p114,float p115,float p116,float p117
+        ,float p118,int p119,float p120,float p121,int p122,int p123,float p124
+        ,float p125,float p126    );
+    private static void nativeFnc23_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        int  p6=getRndInt();float  p7=getRndFloat();float  p8=getRndFloat();float  p9=getRndFloat();
+        float  p10=getRndFloat();int  p11=getRndInt();float  p12=getRndFloat();
+        float  p13=getRndFloat();float  p14=getRndFloat();int  p15=getRndInt();
+        float  p16=getRndFloat();float  p17=getRndFloat();float  p18=getRndFloat();
+        int  p19=getRndInt();float  p20=getRndFloat();float  p21=getRndFloat();
+        float  p22=getRndFloat();float  p23=getRndFloat();float  p24=getRndFloat();
+        float  p25=getRndFloat();float  p26=getRndFloat();float  p27=getRndFloat();
+        float  p28=getRndFloat();float  p29=getRndFloat();int  p30=getRndInt();
+        float  p31=getRndFloat();float  p32=getRndFloat();float  p33=getRndFloat();
+        int  p34=getRndInt();int  p35=getRndInt();int  p36=getRndInt();float  p37=getRndFloat();
+        float  p38=getRndFloat();float  p39=getRndFloat();float  p40=getRndFloat();
+        float  p41=getRndFloat();float  p42=getRndFloat();int  p43=getRndInt();
+        float  p44=getRndFloat();float  p45=getRndFloat();float  p46=getRndFloat();
+        float  p47=getRndFloat();int  p48=getRndInt();float  p49=getRndFloat();
+        float  p50=getRndFloat();float  p51=getRndFloat();float  p52=getRndFloat();
+        float  p53=getRndFloat();float  p54=getRndFloat();int  p55=getRndInt();
+        float  p56=getRndFloat();float  p57=getRndFloat();float  p58=getRndFloat();
+        float  p59=getRndFloat();float  p60=getRndFloat();int  p61=getRndInt();
+        float  p62=getRndFloat();float  p63=getRndFloat();int  p64=getRndInt();
+        float  p65=getRndFloat();int  p66=getRndInt();int  p67=getRndInt();int  p68=getRndInt();
+        float  p69=getRndFloat();float  p70=getRndFloat();float  p71=getRndFloat();
+        float  p72=getRndFloat();int  p73=getRndInt();float  p74=getRndFloat();
+        float  p75=getRndFloat();float  p76=getRndFloat();float  p77=getRndFloat();
+        int  p78=getRndInt();float  p79=getRndFloat();float  p80=getRndFloat();
+        float  p81=getRndFloat();float  p82=getRndFloat();float  p83=getRndFloat();
+        float  p84=getRndFloat();float  p85=getRndFloat();int  p86=getRndInt();
+        float  p87=getRndFloat();float  p88=getRndFloat();float  p89=getRndFloat();
+        float  p90=getRndFloat();int  p91=getRndInt();int  p92=getRndInt();float  p93=getRndFloat();
+        int  p94=getRndInt();float  p95=getRndFloat();int  p96=getRndInt();float  p97=getRndFloat();
+        float  p98=getRndFloat();float  p99=getRndFloat();float  p100=getRndFloat();
+        float  p101=getRndFloat();float  p102=getRndFloat();float  p103=getRndFloat();
+        float  p104=getRndFloat();float  p105=getRndFloat();float  p106=getRndFloat();
+        int  p107=getRndInt();float  p108=getRndFloat();float  p109=getRndFloat();
+        float  p110=getRndFloat();float  p111=getRndFloat();float  p112=getRndFloat();
+        int  p113=getRndInt();float  p114=getRndFloat();float  p115=getRndFloat();
+        float  p116=getRndFloat();float  p117=getRndFloat();float  p118=getRndFloat();
+        int  p119=getRndInt();float  p120=getRndFloat();float  p121=getRndFloat();
+        int  p122=getRndInt();int  p123=getRndInt();float  p124=getRndFloat();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%d\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%d\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%d\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);
+        ps.format("p35=%d\n",p35);ps.format("p36=%d\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%d\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%d\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%d\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%d\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);
+        ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%d\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%d\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);
+        ps.format("p92=%d\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%d\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%d\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%d\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc23(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc24(float p0,float p1,byte p2,byte p3,float p4,float p5,byte p6,byte p7,byte p8
+        ,byte p9,float p10,float p11,float p12,float p13,float p14,float p15,float p16
+        ,float p17,float p18,byte p19,float p20,float p21,float p22,float p23,float p24
+        ,float p25,float p26,byte p27,float p28,float p29,float p30,float p31,float p32
+        ,float p33,float p34,float p35,float p36,byte p37,float p38,float p39,float p40
+        ,float p41,byte p42,float p43,float p44,float p45,byte p46,byte p47,float p48
+        ,float p49,float p50,float p51,float p52,float p53,byte p54,float p55,byte p56
+        ,byte p57,float p58,float p59,float p60,float p61,float p62,byte p63,byte p64
+        ,float p65,float p66,float p67,byte p68,float p69,float p70,float p71,float p72
+        ,float p73,byte p74,float p75,float p76,float p77,float p78,float p79,byte p80
+        ,float p81,float p82,byte p83,float p84,byte p85,float p86,byte p87,float p88
+        ,byte p89,byte p90,float p91,float p92,float p93,float p94,byte p95,byte p96
+        ,float p97,byte p98,float p99,float p100,float p101,float p102,float p103
+        ,float p104,float p105,byte p106,float p107,float p108,float p109,float p110
+        ,byte p111,float p112,float p113,float p114,float p115,float p116,float p117
+        ,float p118,float p119,float p120,float p121,float p122,float p123,float p124
+        ,float p125,float p126    );
+    private static void nativeFnc24_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();byte  p2=getRndByte();
+        byte  p3=getRndByte();float  p4=getRndFloat();float  p5=getRndFloat();byte  p6=getRndByte();
+        byte  p7=getRndByte();byte  p8=getRndByte();byte  p9=getRndByte();float  p10=getRndFloat();
+        float  p11=getRndFloat();float  p12=getRndFloat();float  p13=getRndFloat();
+        float  p14=getRndFloat();float  p15=getRndFloat();float  p16=getRndFloat();
+        float  p17=getRndFloat();float  p18=getRndFloat();byte  p19=getRndByte();
+        float  p20=getRndFloat();float  p21=getRndFloat();float  p22=getRndFloat();
+        float  p23=getRndFloat();float  p24=getRndFloat();float  p25=getRndFloat();
+        float  p26=getRndFloat();byte  p27=getRndByte();float  p28=getRndFloat();
+        float  p29=getRndFloat();float  p30=getRndFloat();float  p31=getRndFloat();
+        float  p32=getRndFloat();float  p33=getRndFloat();float  p34=getRndFloat();
+        float  p35=getRndFloat();float  p36=getRndFloat();byte  p37=getRndByte();
+        float  p38=getRndFloat();float  p39=getRndFloat();float  p40=getRndFloat();
+        float  p41=getRndFloat();byte  p42=getRndByte();float  p43=getRndFloat();
+        float  p44=getRndFloat();float  p45=getRndFloat();byte  p46=getRndByte();
+        byte  p47=getRndByte();float  p48=getRndFloat();float  p49=getRndFloat();
+        float  p50=getRndFloat();float  p51=getRndFloat();float  p52=getRndFloat();
+        float  p53=getRndFloat();byte  p54=getRndByte();float  p55=getRndFloat();
+        byte  p56=getRndByte();byte  p57=getRndByte();float  p58=getRndFloat();
+        float  p59=getRndFloat();float  p60=getRndFloat();float  p61=getRndFloat();
+        float  p62=getRndFloat();byte  p63=getRndByte();byte  p64=getRndByte();
+        float  p65=getRndFloat();float  p66=getRndFloat();float  p67=getRndFloat();
+        byte  p68=getRndByte();float  p69=getRndFloat();float  p70=getRndFloat();
+        float  p71=getRndFloat();float  p72=getRndFloat();float  p73=getRndFloat();
+        byte  p74=getRndByte();float  p75=getRndFloat();float  p76=getRndFloat();
+        float  p77=getRndFloat();float  p78=getRndFloat();float  p79=getRndFloat();
+        byte  p80=getRndByte();float  p81=getRndFloat();float  p82=getRndFloat();
+        byte  p83=getRndByte();float  p84=getRndFloat();byte  p85=getRndByte();
+        float  p86=getRndFloat();byte  p87=getRndByte();float  p88=getRndFloat();
+        byte  p89=getRndByte();byte  p90=getRndByte();float  p91=getRndFloat();
+        float  p92=getRndFloat();float  p93=getRndFloat();float  p94=getRndFloat();
+        byte  p95=getRndByte();byte  p96=getRndByte();float  p97=getRndFloat();
+        byte  p98=getRndByte();float  p99=getRndFloat();float  p100=getRndFloat();
+        float  p101=getRndFloat();float  p102=getRndFloat();float  p103=getRndFloat();
+        float  p104=getRndFloat();float  p105=getRndFloat();byte  p106=getRndByte();
+        float  p107=getRndFloat();float  p108=getRndFloat();float  p109=getRndFloat();
+        float  p110=getRndFloat();byte  p111=getRndByte();float  p112=getRndFloat();
+        float  p113=getRndFloat();float  p114=getRndFloat();float  p115=getRndFloat();
+        float  p116=getRndFloat();float  p117=getRndFloat();float  p118=getRndFloat();
+        float  p119=getRndFloat();float  p120=getRndFloat();float  p121=getRndFloat();
+        float  p122=getRndFloat();float  p123=getRndFloat();float  p124=getRndFloat();
+        float  p125=getRndFloat();float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%d\n",p2);ps.format("p3=%d\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%d\n",p6);
+        ps.format("p7=%d\n",p7);ps.format("p8=%d\n",p8);ps.format("p9=%d\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%d\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%d\n",p46);ps.format("p47=%d\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%d\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%d\n",p63);
+        ps.format("p64=%d\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%d\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%d\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);ps.format("p96=%d\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%d\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%d\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%d\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc24(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc25(float p0,int p1,float p2,float p3,float p4,int p5,int p6,byte p7,float p8
+        ,int p9,float p10,float p11,float p12,float p13,int p14,byte p15,float p16
+        ,float p17,float p18,byte p19,float p20,byte p21,float p22,byte p23,float p24
+        ,float p25,float p26,float p27,float p28,int p29,byte p30,float p31,byte p32
+        ,float p33,int p34,int p35,byte p36,byte p37,int p38,int p39,float p40,int p41
+        ,float p42,float p43,float p44,float p45,float p46,int p47,float p48,int p49
+        ,int p50,int p51,float p52,float p53,byte p54,int p55,byte p56,int p57,float p58
+        ,int p59,int p60,byte p61,byte p62,int p63,float p64,float p65,byte p66
+        ,byte p67,byte p68,int p69,byte p70,float p71,byte p72,float p73,float p74
+        ,float p75,float p76,byte p77,float p78,int p79,byte p80,float p81,float p82
+        ,int p83,float p84,byte p85,byte p86,float p87,float p88,byte p89,float p90
+        ,float p91,int p92,float p93,float p94,int p95,float p96,int p97,int p98
+        ,int p99,int p100,int p101,int p102,int p103,float p104,int p105,byte p106
+        ,float p107,float p108,int p109,byte p110,float p111,float p112,float p113
+        ,byte p114,float p115,byte p116,float p117,byte p118,float p119,float p120
+        ,float p121,byte p122,float p123,byte p124,float p125,int p126    );
+    private static void nativeFnc25_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();int  p1=getRndInt();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();int  p5=getRndInt();int  p6=getRndInt();
+        byte  p7=getRndByte();float  p8=getRndFloat();int  p9=getRndInt();float  p10=getRndFloat();
+        float  p11=getRndFloat();float  p12=getRndFloat();float  p13=getRndFloat();
+        int  p14=getRndInt();byte  p15=getRndByte();float  p16=getRndFloat();float  p17=getRndFloat();
+        float  p18=getRndFloat();byte  p19=getRndByte();float  p20=getRndFloat();
+        byte  p21=getRndByte();float  p22=getRndFloat();byte  p23=getRndByte();
+        float  p24=getRndFloat();float  p25=getRndFloat();float  p26=getRndFloat();
+        float  p27=getRndFloat();float  p28=getRndFloat();int  p29=getRndInt();
+        byte  p30=getRndByte();float  p31=getRndFloat();byte  p32=getRndByte();
+        float  p33=getRndFloat();int  p34=getRndInt();int  p35=getRndInt();byte  p36=getRndByte();
+        byte  p37=getRndByte();int  p38=getRndInt();int  p39=getRndInt();float  p40=getRndFloat();
+        int  p41=getRndInt();float  p42=getRndFloat();float  p43=getRndFloat();
+        float  p44=getRndFloat();float  p45=getRndFloat();float  p46=getRndFloat();
+        int  p47=getRndInt();float  p48=getRndFloat();int  p49=getRndInt();int  p50=getRndInt();
+        int  p51=getRndInt();float  p52=getRndFloat();float  p53=getRndFloat();
+        byte  p54=getRndByte();int  p55=getRndInt();byte  p56=getRndByte();int  p57=getRndInt();
+        float  p58=getRndFloat();int  p59=getRndInt();int  p60=getRndInt();byte  p61=getRndByte();
+        byte  p62=getRndByte();int  p63=getRndInt();float  p64=getRndFloat();float  p65=getRndFloat();
+        byte  p66=getRndByte();byte  p67=getRndByte();byte  p68=getRndByte();int  p69=getRndInt();
+        byte  p70=getRndByte();float  p71=getRndFloat();byte  p72=getRndByte();
+        float  p73=getRndFloat();float  p74=getRndFloat();float  p75=getRndFloat();
+        float  p76=getRndFloat();byte  p77=getRndByte();float  p78=getRndFloat();
+        int  p79=getRndInt();byte  p80=getRndByte();float  p81=getRndFloat();float  p82=getRndFloat();
+        int  p83=getRndInt();float  p84=getRndFloat();byte  p85=getRndByte();byte  p86=getRndByte();
+        float  p87=getRndFloat();float  p88=getRndFloat();byte  p89=getRndByte();
+        float  p90=getRndFloat();float  p91=getRndFloat();int  p92=getRndInt();
+        float  p93=getRndFloat();float  p94=getRndFloat();int  p95=getRndInt();
+        float  p96=getRndFloat();int  p97=getRndInt();int  p98=getRndInt();int  p99=getRndInt();
+        int  p100=getRndInt();int  p101=getRndInt();int  p102=getRndInt();int  p103=getRndInt();
+        float  p104=getRndFloat();int  p105=getRndInt();byte  p106=getRndByte();
+        float  p107=getRndFloat();float  p108=getRndFloat();int  p109=getRndInt();
+        byte  p110=getRndByte();float  p111=getRndFloat();float  p112=getRndFloat();
+        float  p113=getRndFloat();byte  p114=getRndByte();float  p115=getRndFloat();
+        byte  p116=getRndByte();float  p117=getRndFloat();byte  p118=getRndByte();
+        float  p119=getRndFloat();float  p120=getRndFloat();float  p121=getRndFloat();
+        byte  p122=getRndByte();float  p123=getRndFloat();byte  p124=getRndByte();
+        float  p125=getRndFloat();int  p126=getRndInt();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);ps.format("p6=%d\n",p6);
+        ps.format("p7=%d\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%d\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%d\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%d\n",p29);ps.format("p30=%d\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%d\n",p34);ps.format("p35=%d\n",p35);ps.format("p36=%d\n",p36);
+        ps.format("p37=%d\n",p37);ps.format("p38=%d\n",p38);ps.format("p39=%d\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%d\n",p49);ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%d\n",p54);
+        ps.format("p55=%d\n",p55);ps.format("p56=%d\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%d\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%d\n",p61);ps.format("p62=%d\n",p62);ps.format("p63=%d\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);
+        ps.format("p67=%d\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%d\n",p69);
+        ps.format("p70=%d\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%d\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%d\n",p79);ps.format("p80=%d\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%d\n",p85);ps.format("p86=%d\n",p86);ps.format("p87=%e\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%e\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%d\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%d\n",p97);ps.format("p98=%d\n",p98);ps.format("p99=%d\n",p99);
+        ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);ps.format("p102=%d\n",p102);
+        ps.format("p103=%d\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);
+        ps.format("p106=%d\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%d\n",p109);ps.format("p110=%d\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%d\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%d\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%d\n",p126);
+
+        nativeFnc25(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc26(double p0,double p1,double p2,double p3,double p4,int p5,double p6,double p7
+        ,double p8,double p9,double p10,double p11,double p12,double p13,double p14
+        ,int p15,double p16,double p17,int p18,double p19,double p20,int p21,double p22
+        ,double p23,double p24,double p25,double p26,double p27,double p28,double p29
+        ,double p30,int p31,int p32,double p33,double p34,double p35,double p36
+        ,double p37,double p38,double p39,double p40,double p41,double p42,int p43
+        ,double p44,double p45,int p46,double p47,int p48,double p49,double p50
+        ,double p51,double p52,int p53,double p54,double p55,double p56,int p57
+        ,int p58,double p59,int p60,double p61,double p62,double p63,double p64
+        ,double p65,double p66,double p67,double p68,double p69,int p70,int p71
+        ,double p72,double p73,int p74,int p75,int p76,double p77,double p78,double p79
+        ,double p80,double p81,double p82,double p83,double p84,double p85,int p86
+        ,double p87,double p88,int p89,double p90,double p91,double p92,double p93
+        ,int p94,double p95,double p96,int p97,double p98,double p99,double p100
+        ,double p101,double p102,double p103,double p104,double p105,double p106
+        ,double p107,double p108,double p109,int p110,int p111,double p112,int p113
+        ,double p114,double p115,double p116,double p117,double p118,double p119
+        ,int p120,int p121,int p122,double p123,double p124,double p125,int p126
+            );
+    private static void nativeFnc26_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();int  p5=getRndInt();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        int  p15=getRndInt();double  p16=getRndDouble();double  p17=getRndDouble();
+        int  p18=getRndInt();double  p19=getRndDouble();double  p20=getRndDouble();
+        int  p21=getRndInt();double  p22=getRndDouble();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        double  p27=getRndDouble();double  p28=getRndDouble();double  p29=getRndDouble();
+        double  p30=getRndDouble();int  p31=getRndInt();int  p32=getRndInt();double  p33=getRndDouble();
+        double  p34=getRndDouble();double  p35=getRndDouble();double  p36=getRndDouble();
+        double  p37=getRndDouble();double  p38=getRndDouble();double  p39=getRndDouble();
+        double  p40=getRndDouble();double  p41=getRndDouble();double  p42=getRndDouble();
+        int  p43=getRndInt();double  p44=getRndDouble();double  p45=getRndDouble();
+        int  p46=getRndInt();double  p47=getRndDouble();int  p48=getRndInt();double  p49=getRndDouble();
+        double  p50=getRndDouble();double  p51=getRndDouble();double  p52=getRndDouble();
+        int  p53=getRndInt();double  p54=getRndDouble();double  p55=getRndDouble();
+        double  p56=getRndDouble();int  p57=getRndInt();int  p58=getRndInt();double  p59=getRndDouble();
+        int  p60=getRndInt();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();double  p64=getRndDouble();double  p65=getRndDouble();
+        double  p66=getRndDouble();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();int  p70=getRndInt();int  p71=getRndInt();double  p72=getRndDouble();
+        double  p73=getRndDouble();int  p74=getRndInt();int  p75=getRndInt();int  p76=getRndInt();
+        double  p77=getRndDouble();double  p78=getRndDouble();double  p79=getRndDouble();
+        double  p80=getRndDouble();double  p81=getRndDouble();double  p82=getRndDouble();
+        double  p83=getRndDouble();double  p84=getRndDouble();double  p85=getRndDouble();
+        int  p86=getRndInt();double  p87=getRndDouble();double  p88=getRndDouble();
+        int  p89=getRndInt();double  p90=getRndDouble();double  p91=getRndDouble();
+        double  p92=getRndDouble();double  p93=getRndDouble();int  p94=getRndInt();
+        double  p95=getRndDouble();double  p96=getRndDouble();int  p97=getRndInt();
+        double  p98=getRndDouble();double  p99=getRndDouble();double  p100=getRndDouble();
+        double  p101=getRndDouble();double  p102=getRndDouble();double  p103=getRndDouble();
+        double  p104=getRndDouble();double  p105=getRndDouble();double  p106=getRndDouble();
+        double  p107=getRndDouble();double  p108=getRndDouble();double  p109=getRndDouble();
+        int  p110=getRndInt();int  p111=getRndInt();double  p112=getRndDouble();
+        int  p113=getRndInt();double  p114=getRndDouble();double  p115=getRndDouble();
+        double  p116=getRndDouble();double  p117=getRndDouble();double  p118=getRndDouble();
+        double  p119=getRndDouble();int  p120=getRndInt();int  p121=getRndInt();
+        int  p122=getRndInt();double  p123=getRndDouble();double  p124=getRndDouble();
+        double  p125=getRndDouble();int  p126=getRndInt();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);ps.format("p18=%d\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%d\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%d\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%d\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%d\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%d\n",p70);ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%d\n",p74);ps.format("p75=%d\n",p75);
+        ps.format("p76=%d\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%d\n",p86);ps.format("p87=%e\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%e\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%d\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%d\n",p110);ps.format("p111=%d\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);
+        ps.format("p121=%d\n",p121);ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%d\n",p126);
+
+        nativeFnc26(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc27(double p0,double p1,double p2,double p3,double p4,double p5,double p6,double p7
+        ,double p8,double p9,double p10,double p11,byte p12,byte p13,byte p14,double p15
+        ,double p16,byte p17,double p18,double p19,double p20,double p21,double p22
+        ,double p23,double p24,double p25,double p26,double p27,double p28,double p29
+        ,byte p30,double p31,double p32,byte p33,double p34,double p35,double p36
+        ,double p37,double p38,double p39,double p40,byte p41,byte p42,double p43
+        ,byte p44,byte p45,double p46,double p47,double p48,byte p49,byte p50,byte p51
+        ,double p52,byte p53,double p54,double p55,double p56,double p57,byte p58
+        ,byte p59,double p60,double p61,double p62,double p63,double p64,double p65
+        ,double p66,double p67,byte p68,double p69,double p70,byte p71,double p72
+        ,double p73,double p74,double p75,double p76,double p77,double p78,double p79
+        ,double p80,double p81,double p82,double p83,double p84,double p85,double p86
+        ,double p87,byte p88,double p89,byte p90,byte p91,byte p92,double p93,byte p94
+        ,byte p95,double p96,byte p97,double p98,double p99,double p100,double p101
+        ,double p102,double p103,double p104,double p105,double p106,double p107
+        ,double p108,double p109,double p110,double p111,double p112,double p113
+        ,double p114,byte p115,double p116,double p117,byte p118,double p119,double p120
+        ,byte p121,double p122,double p123,double p124,byte p125,double p126    );
+    private static void nativeFnc27_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();double  p11=getRndDouble();
+        byte  p12=getRndByte();byte  p13=getRndByte();byte  p14=getRndByte();double  p15=getRndDouble();
+        double  p16=getRndDouble();byte  p17=getRndByte();double  p18=getRndDouble();
+        double  p19=getRndDouble();double  p20=getRndDouble();double  p21=getRndDouble();
+        double  p22=getRndDouble();double  p23=getRndDouble();double  p24=getRndDouble();
+        double  p25=getRndDouble();double  p26=getRndDouble();double  p27=getRndDouble();
+        double  p28=getRndDouble();double  p29=getRndDouble();byte  p30=getRndByte();
+        double  p31=getRndDouble();double  p32=getRndDouble();byte  p33=getRndByte();
+        double  p34=getRndDouble();double  p35=getRndDouble();double  p36=getRndDouble();
+        double  p37=getRndDouble();double  p38=getRndDouble();double  p39=getRndDouble();
+        double  p40=getRndDouble();byte  p41=getRndByte();byte  p42=getRndByte();
+        double  p43=getRndDouble();byte  p44=getRndByte();byte  p45=getRndByte();
+        double  p46=getRndDouble();double  p47=getRndDouble();double  p48=getRndDouble();
+        byte  p49=getRndByte();byte  p50=getRndByte();byte  p51=getRndByte();double  p52=getRndDouble();
+        byte  p53=getRndByte();double  p54=getRndDouble();double  p55=getRndDouble();
+        double  p56=getRndDouble();double  p57=getRndDouble();byte  p58=getRndByte();
+        byte  p59=getRndByte();double  p60=getRndDouble();double  p61=getRndDouble();
+        double  p62=getRndDouble();double  p63=getRndDouble();double  p64=getRndDouble();
+        double  p65=getRndDouble();double  p66=getRndDouble();double  p67=getRndDouble();
+        byte  p68=getRndByte();double  p69=getRndDouble();double  p70=getRndDouble();
+        byte  p71=getRndByte();double  p72=getRndDouble();double  p73=getRndDouble();
+        double  p74=getRndDouble();double  p75=getRndDouble();double  p76=getRndDouble();
+        double  p77=getRndDouble();double  p78=getRndDouble();double  p79=getRndDouble();
+        double  p80=getRndDouble();double  p81=getRndDouble();double  p82=getRndDouble();
+        double  p83=getRndDouble();double  p84=getRndDouble();double  p85=getRndDouble();
+        double  p86=getRndDouble();double  p87=getRndDouble();byte  p88=getRndByte();
+        double  p89=getRndDouble();byte  p90=getRndByte();byte  p91=getRndByte();
+        byte  p92=getRndByte();double  p93=getRndDouble();byte  p94=getRndByte();
+        byte  p95=getRndByte();double  p96=getRndDouble();byte  p97=getRndByte();
+        double  p98=getRndDouble();double  p99=getRndDouble();double  p100=getRndDouble();
+        double  p101=getRndDouble();double  p102=getRndDouble();double  p103=getRndDouble();
+        double  p104=getRndDouble();double  p105=getRndDouble();double  p106=getRndDouble();
+        double  p107=getRndDouble();double  p108=getRndDouble();double  p109=getRndDouble();
+        double  p110=getRndDouble();double  p111=getRndDouble();double  p112=getRndDouble();
+        double  p113=getRndDouble();double  p114=getRndDouble();byte  p115=getRndByte();
+        double  p116=getRndDouble();double  p117=getRndDouble();byte  p118=getRndByte();
+        double  p119=getRndDouble();double  p120=getRndDouble();byte  p121=getRndByte();
+        double  p122=getRndDouble();double  p123=getRndDouble();double  p124=getRndDouble();
+        byte  p125=getRndByte();double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%d\n",p12);
+        ps.format("p13=%d\n",p13);ps.format("p14=%d\n",p14);ps.format("p15=%e\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%d\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);ps.format("p33=%d\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);ps.format("p42=%d\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);ps.format("p45=%d\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%d\n",p49);ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);
+        ps.format("p58=%d\n",p58);ps.format("p59=%d\n",p59);ps.format("p60=%e\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);
+        ps.format("p88=%d\n",p88);ps.format("p89=%e\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%d\n",p91);ps.format("p92=%d\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%d\n",p94);ps.format("p95=%d\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%d\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%d\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc27(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc28(double p0,double p1,byte p2,double p3,double p4,double p5,byte p6,int p7
+        ,byte p8,int p9,int p10,byte p11,double p12,int p13,double p14,double p15
+        ,byte p16,double p17,byte p18,double p19,double p20,byte p21,double p22
+        ,byte p23,double p24,int p25,double p26,double p27,byte p28,double p29,int p30
+        ,int p31,double p32,double p33,byte p34,byte p35,byte p36,byte p37,double p38
+        ,double p39,double p40,double p41,int p42,double p43,double p44,double p45
+        ,double p46,double p47,double p48,double p49,int p50,double p51,double p52
+        ,byte p53,int p54,int p55,double p56,double p57,int p58,double p59,double p60
+        ,double p61,double p62,byte p63,int p64,byte p65,double p66,double p67,int p68
+        ,double p69,double p70,double p71,double p72,byte p73,double p74,double p75
+        ,double p76,byte p77,byte p78,double p79,double p80,double p81,double p82
+        ,double p83,byte p84,double p85,double p86,byte p87,double p88,byte p89
+        ,double p90,double p91,int p92,byte p93,double p94,double p95,double p96
+        ,double p97,double p98,double p99,byte p100,byte p101,double p102,double p103
+        ,byte p104,double p105,double p106,byte p107,int p108,byte p109,byte p110
+        ,byte p111,double p112,int p113,double p114,byte p115,int p116,double p117
+        ,double p118,byte p119,byte p120,int p121,double p122,int p123,byte p124
+        ,double p125,double p126    );
+    private static void nativeFnc28_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();byte  p2=getRndByte();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        byte  p6=getRndByte();int  p7=getRndInt();byte  p8=getRndByte();int  p9=getRndInt();
+        int  p10=getRndInt();byte  p11=getRndByte();double  p12=getRndDouble();
+        int  p13=getRndInt();double  p14=getRndDouble();double  p15=getRndDouble();
+        byte  p16=getRndByte();double  p17=getRndDouble();byte  p18=getRndByte();
+        double  p19=getRndDouble();double  p20=getRndDouble();byte  p21=getRndByte();
+        double  p22=getRndDouble();byte  p23=getRndByte();double  p24=getRndDouble();
+        int  p25=getRndInt();double  p26=getRndDouble();double  p27=getRndDouble();
+        byte  p28=getRndByte();double  p29=getRndDouble();int  p30=getRndInt();
+        int  p31=getRndInt();double  p32=getRndDouble();double  p33=getRndDouble();
+        byte  p34=getRndByte();byte  p35=getRndByte();byte  p36=getRndByte();byte  p37=getRndByte();
+        double  p38=getRndDouble();double  p39=getRndDouble();double  p40=getRndDouble();
+        double  p41=getRndDouble();int  p42=getRndInt();double  p43=getRndDouble();
+        double  p44=getRndDouble();double  p45=getRndDouble();double  p46=getRndDouble();
+        double  p47=getRndDouble();double  p48=getRndDouble();double  p49=getRndDouble();
+        int  p50=getRndInt();double  p51=getRndDouble();double  p52=getRndDouble();
+        byte  p53=getRndByte();int  p54=getRndInt();int  p55=getRndInt();double  p56=getRndDouble();
+        double  p57=getRndDouble();int  p58=getRndInt();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        byte  p63=getRndByte();int  p64=getRndInt();byte  p65=getRndByte();double  p66=getRndDouble();
+        double  p67=getRndDouble();int  p68=getRndInt();double  p69=getRndDouble();
+        double  p70=getRndDouble();double  p71=getRndDouble();double  p72=getRndDouble();
+        byte  p73=getRndByte();double  p74=getRndDouble();double  p75=getRndDouble();
+        double  p76=getRndDouble();byte  p77=getRndByte();byte  p78=getRndByte();
+        double  p79=getRndDouble();double  p80=getRndDouble();double  p81=getRndDouble();
+        double  p82=getRndDouble();double  p83=getRndDouble();byte  p84=getRndByte();
+        double  p85=getRndDouble();double  p86=getRndDouble();byte  p87=getRndByte();
+        double  p88=getRndDouble();byte  p89=getRndByte();double  p90=getRndDouble();
+        double  p91=getRndDouble();int  p92=getRndInt();byte  p93=getRndByte();
+        double  p94=getRndDouble();double  p95=getRndDouble();double  p96=getRndDouble();
+        double  p97=getRndDouble();double  p98=getRndDouble();double  p99=getRndDouble();
+        byte  p100=getRndByte();byte  p101=getRndByte();double  p102=getRndDouble();
+        double  p103=getRndDouble();byte  p104=getRndByte();double  p105=getRndDouble();
+        double  p106=getRndDouble();byte  p107=getRndByte();int  p108=getRndInt();
+        byte  p109=getRndByte();byte  p110=getRndByte();byte  p111=getRndByte();
+        double  p112=getRndDouble();int  p113=getRndInt();double  p114=getRndDouble();
+        byte  p115=getRndByte();int  p116=getRndInt();double  p117=getRndDouble();
+        double  p118=getRndDouble();byte  p119=getRndByte();byte  p120=getRndByte();
+        int  p121=getRndInt();double  p122=getRndDouble();int  p123=getRndInt();
+        byte  p124=getRndByte();double  p125=getRndDouble();double  p126=getRndDouble();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%d\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%d\n",p6);ps.format("p7=%d\n",p7);ps.format("p8=%d\n",p8);
+        ps.format("p9=%d\n",p9);ps.format("p10=%d\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%d\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%d\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%d\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%d\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%d\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%d\n",p30);ps.format("p31=%d\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);ps.format("p35=%d\n",p35);
+        ps.format("p36=%d\n",p36);ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%d\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%d\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%d\n",p64);ps.format("p65=%d\n",p65);
+        ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%d\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%d\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%d\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%d\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%d\n",p108);ps.format("p109=%d\n",p109);ps.format("p110=%d\n",p110);
+        ps.format("p111=%d\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%d\n",p115);ps.format("p116=%d\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%d\n",p119);
+        ps.format("p120=%d\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%d\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc28(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc29(float p0,float p1,double p2,double p3,float p4,float p5,int p6,double p7
+        ,float p8,byte p9,float p10,float p11,float p12,double p13,double p14,int p15
+        ,byte p16,float p17,float p18,byte p19,int p20,double p21,float p22,float p23
+        ,int p24,float p25,float p26,byte p27,double p28,float p29,int p30,int p31
+        ,float p32,float p33,float p34,double p35,double p36,float p37,double p38
+        ,float p39,float p40,float p41,double p42,float p43,double p44,double p45
+        ,double p46,int p47,double p48,float p49,byte p50,double p51,byte p52,double p53
+        ,float p54,double p55,float p56,byte p57,float p58,double p59,float p60
+        ,float p61,double p62,float p63,double p64,byte p65,float p66,float p67
+        ,int p68,float p69,double p70,double p71,float p72,double p73,float p74
+        ,float p75,byte p76,float p77,double p78,double p79,float p80,double p81
+        ,double p82,byte p83,double p84,int p85,float p86,int p87,double p88,float p89
+        ,byte p90,byte p91,float p92,byte p93,double p94,float p95,int p96,double p97
+        ,double p98,float p99,double p100,float p101,float p102,double p103,float p104
+        ,int p105,double p106,int p107,double p108,double p109,float p110,double p111
+        ,float p112,double p113,double p114,int p115,float p116,float p117,int p118
+        ,float p119,double p120,float p121,byte p122,float p123,float p124,float p125
+        ,double p126    );
+    private static void nativeFnc29_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();double  p2=getRndDouble();
+        double  p3=getRndDouble();float  p4=getRndFloat();float  p5=getRndFloat();
+        int  p6=getRndInt();double  p7=getRndDouble();float  p8=getRndFloat();byte  p9=getRndByte();
+        float  p10=getRndFloat();float  p11=getRndFloat();float  p12=getRndFloat();
+        double  p13=getRndDouble();double  p14=getRndDouble();int  p15=getRndInt();
+        byte  p16=getRndByte();float  p17=getRndFloat();float  p18=getRndFloat();
+        byte  p19=getRndByte();int  p20=getRndInt();double  p21=getRndDouble();
+        float  p22=getRndFloat();float  p23=getRndFloat();int  p24=getRndInt();
+        float  p25=getRndFloat();float  p26=getRndFloat();byte  p27=getRndByte();
+        double  p28=getRndDouble();float  p29=getRndFloat();int  p30=getRndInt();
+        int  p31=getRndInt();float  p32=getRndFloat();float  p33=getRndFloat();
+        float  p34=getRndFloat();double  p35=getRndDouble();double  p36=getRndDouble();
+        float  p37=getRndFloat();double  p38=getRndDouble();float  p39=getRndFloat();
+        float  p40=getRndFloat();float  p41=getRndFloat();double  p42=getRndDouble();
+        float  p43=getRndFloat();double  p44=getRndDouble();double  p45=getRndDouble();
+        double  p46=getRndDouble();int  p47=getRndInt();double  p48=getRndDouble();
+        float  p49=getRndFloat();byte  p50=getRndByte();double  p51=getRndDouble();
+        byte  p52=getRndByte();double  p53=getRndDouble();float  p54=getRndFloat();
+        double  p55=getRndDouble();float  p56=getRndFloat();byte  p57=getRndByte();
+        float  p58=getRndFloat();double  p59=getRndDouble();float  p60=getRndFloat();
+        float  p61=getRndFloat();double  p62=getRndDouble();float  p63=getRndFloat();
+        double  p64=getRndDouble();byte  p65=getRndByte();float  p66=getRndFloat();
+        float  p67=getRndFloat();int  p68=getRndInt();float  p69=getRndFloat();
+        double  p70=getRndDouble();double  p71=getRndDouble();float  p72=getRndFloat();
+        double  p73=getRndDouble();float  p74=getRndFloat();float  p75=getRndFloat();
+        byte  p76=getRndByte();float  p77=getRndFloat();double  p78=getRndDouble();
+        double  p79=getRndDouble();float  p80=getRndFloat();double  p81=getRndDouble();
+        double  p82=getRndDouble();byte  p83=getRndByte();double  p84=getRndDouble();
+        int  p85=getRndInt();float  p86=getRndFloat();int  p87=getRndInt();double  p88=getRndDouble();
+        float  p89=getRndFloat();byte  p90=getRndByte();byte  p91=getRndByte();
+        float  p92=getRndFloat();byte  p93=getRndByte();double  p94=getRndDouble();
+        float  p95=getRndFloat();int  p96=getRndInt();double  p97=getRndDouble();
+        double  p98=getRndDouble();float  p99=getRndFloat();double  p100=getRndDouble();
+        float  p101=getRndFloat();float  p102=getRndFloat();double  p103=getRndDouble();
+        float  p104=getRndFloat();int  p105=getRndInt();double  p106=getRndDouble();
+        int  p107=getRndInt();double  p108=getRndDouble();double  p109=getRndDouble();
+        float  p110=getRndFloat();double  p111=getRndDouble();float  p112=getRndFloat();
+        double  p113=getRndDouble();double  p114=getRndDouble();int  p115=getRndInt();
+        float  p116=getRndFloat();float  p117=getRndFloat();int  p118=getRndInt();
+        float  p119=getRndFloat();double  p120=getRndDouble();float  p121=getRndFloat();
+        byte  p122=getRndByte();float  p123=getRndFloat();float  p124=getRndFloat();
+        float  p125=getRndFloat();double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%d\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%d\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%d\n",p16);ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%d\n",p19);ps.format("p20=%d\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%d\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%d\n",p30);
+        ps.format("p31=%d\n",p31);ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%d\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%d\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%d\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%d\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%d\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%d\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%d\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%d\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc29(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc30(float p0,double p1,float p2,float p3,float p4,float p5,double p6,float p7
+        ,double p8,float p9,float p10,float p11,float p12,float p13,float p14,float p15
+        ,double p16,float p17,double p18,float p19,double p20,double p21,double p22
+        ,float p23,float p24,float p25,float p26,float p27,float p28,float p29,float p30
+        ,float p31,float p32,float p33,double p34,float p35,double p36,float p37
+        ,double p38,float p39,float p40,float p41,double p42,float p43,float p44
+        ,float p45,float p46,double p47,double p48,double p49,float p50,double p51
+        ,double p52,float p53,float p54,float p55,double p56,double p57,float p58
+        ,float p59,float p60,float p61,float p62,float p63,float p64,float p65,float p66
+        ,float p67,float p68,double p69,float p70,float p71,float p72,float p73
+        ,float p74,float p75,float p76,double p77,float p78,float p79,float p80
+        ,double p81,float p82,float p83,float p84,double p85,double p86,double p87
+        ,float p88,float p89,float p90,float p91,float p92,double p93,float p94
+        ,float p95,float p96,float p97,float p98,double p99,double p100,float p101
+        ,float p102,double p103,double p104,float p105,double p106,float p107,float p108
+        ,float p109,float p110,double p111,float p112,float p113,float p114,float p115
+        ,float p116,float p117,float p118,float p119,float p120,float p121,float p122
+        ,float p123,double p124,float p125,float p126    );
+    private static void nativeFnc30_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();double  p1=getRndDouble();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        double  p6=getRndDouble();float  p7=getRndFloat();double  p8=getRndDouble();
+        float  p9=getRndFloat();float  p10=getRndFloat();float  p11=getRndFloat();
+        float  p12=getRndFloat();float  p13=getRndFloat();float  p14=getRndFloat();
+        float  p15=getRndFloat();double  p16=getRndDouble();float  p17=getRndFloat();
+        double  p18=getRndDouble();float  p19=getRndFloat();double  p20=getRndDouble();
+        double  p21=getRndDouble();double  p22=getRndDouble();float  p23=getRndFloat();
+        float  p24=getRndFloat();float  p25=getRndFloat();float  p26=getRndFloat();
+        float  p27=getRndFloat();float  p28=getRndFloat();float  p29=getRndFloat();
+        float  p30=getRndFloat();float  p31=getRndFloat();float  p32=getRndFloat();
+        float  p33=getRndFloat();double  p34=getRndDouble();float  p35=getRndFloat();
+        double  p36=getRndDouble();float  p37=getRndFloat();double  p38=getRndDouble();
+        float  p39=getRndFloat();float  p40=getRndFloat();float  p41=getRndFloat();
+        double  p42=getRndDouble();float  p43=getRndFloat();float  p44=getRndFloat();
+        float  p45=getRndFloat();float  p46=getRndFloat();double  p47=getRndDouble();
+        double  p48=getRndDouble();double  p49=getRndDouble();float  p50=getRndFloat();
+        double  p51=getRndDouble();double  p52=getRndDouble();float  p53=getRndFloat();
+        float  p54=getRndFloat();float  p55=getRndFloat();double  p56=getRndDouble();
+        double  p57=getRndDouble();float  p58=getRndFloat();float  p59=getRndFloat();
+        float  p60=getRndFloat();float  p61=getRndFloat();float  p62=getRndFloat();
+        float  p63=getRndFloat();float  p64=getRndFloat();float  p65=getRndFloat();
+        float  p66=getRndFloat();float  p67=getRndFloat();float  p68=getRndFloat();
+        double  p69=getRndDouble();float  p70=getRndFloat();float  p71=getRndFloat();
+        float  p72=getRndFloat();float  p73=getRndFloat();float  p74=getRndFloat();
+        float  p75=getRndFloat();float  p76=getRndFloat();double  p77=getRndDouble();
+        float  p78=getRndFloat();float  p79=getRndFloat();float  p80=getRndFloat();
+        double  p81=getRndDouble();float  p82=getRndFloat();float  p83=getRndFloat();
+        float  p84=getRndFloat();double  p85=getRndDouble();double  p86=getRndDouble();
+        double  p87=getRndDouble();float  p88=getRndFloat();float  p89=getRndFloat();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        double  p93=getRndDouble();float  p94=getRndFloat();float  p95=getRndFloat();
+        float  p96=getRndFloat();float  p97=getRndFloat();float  p98=getRndFloat();
+        double  p99=getRndDouble();double  p100=getRndDouble();float  p101=getRndFloat();
+        float  p102=getRndFloat();double  p103=getRndDouble();double  p104=getRndDouble();
+        float  p105=getRndFloat();double  p106=getRndDouble();float  p107=getRndFloat();
+        float  p108=getRndFloat();float  p109=getRndFloat();float  p110=getRndFloat();
+        double  p111=getRndDouble();float  p112=getRndFloat();float  p113=getRndFloat();
+        float  p114=getRndFloat();float  p115=getRndFloat();float  p116=getRndFloat();
+        float  p117=getRndFloat();float  p118=getRndFloat();float  p119=getRndFloat();
+        float  p120=getRndFloat();float  p121=getRndFloat();float  p122=getRndFloat();
+        float  p123=getRndFloat();double  p124=getRndDouble();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc30(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc31(double p0,double p1,float p2,float p3,float p4,double p5,float p6,float p7
+        ,double p8,double p9,int p10,double p11,double p12,float p13,int p14,double p15
+        ,float p16,float p17,float p18,float p19,float p20,int p21,float p22,double p23
+        ,int p24,float p25,double p26,double p27,double p28,float p29,double p30
+        ,float p31,double p32,float p33,float p34,float p35,double p36,float p37
+        ,double p38,double p39,int p40,int p41,double p42,float p43,float p44,float p45
+        ,double p46,double p47,float p48,float p49,double p50,double p51,double p52
+        ,float p53,int p54,double p55,float p56,double p57,float p58,float p59,float p60
+        ,double p61,float p62,int p63,double p64,int p65,int p66,double p67,double p68
+        ,double p69,float p70,float p71,double p72,int p73,int p74,float p75,double p76
+        ,float p77,float p78,float p79,float p80,double p81,double p82,double p83
+        ,double p84,double p85,float p86,float p87,int p88,double p89,double p90
+        ,float p91,double p92,float p93,int p94,float p95,float p96,double p97,int p98
+        ,int p99,double p100,double p101,float p102,float p103,double p104,double p105
+        ,double p106,double p107,double p108,float p109,float p110,double p111,float p112
+        ,double p113,double p114,float p115,float p116,float p117,float p118,double p119
+        ,int p120,double p121,float p122,double p123,double p124,double p125,float p126
+            );
+    private static void nativeFnc31_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();double  p5=getRndDouble();
+        float  p6=getRndFloat();float  p7=getRndFloat();double  p8=getRndDouble();
+        double  p9=getRndDouble();int  p10=getRndInt();double  p11=getRndDouble();
+        double  p12=getRndDouble();float  p13=getRndFloat();int  p14=getRndInt();
+        double  p15=getRndDouble();float  p16=getRndFloat();float  p17=getRndFloat();
+        float  p18=getRndFloat();float  p19=getRndFloat();float  p20=getRndFloat();
+        int  p21=getRndInt();float  p22=getRndFloat();double  p23=getRndDouble();
+        int  p24=getRndInt();float  p25=getRndFloat();double  p26=getRndDouble();
+        double  p27=getRndDouble();double  p28=getRndDouble();float  p29=getRndFloat();
+        double  p30=getRndDouble();float  p31=getRndFloat();double  p32=getRndDouble();
+        float  p33=getRndFloat();float  p34=getRndFloat();float  p35=getRndFloat();
+        double  p36=getRndDouble();float  p37=getRndFloat();double  p38=getRndDouble();
+        double  p39=getRndDouble();int  p40=getRndInt();int  p41=getRndInt();double  p42=getRndDouble();
+        float  p43=getRndFloat();float  p44=getRndFloat();float  p45=getRndFloat();
+        double  p46=getRndDouble();double  p47=getRndDouble();float  p48=getRndFloat();
+        float  p49=getRndFloat();double  p50=getRndDouble();double  p51=getRndDouble();
+        double  p52=getRndDouble();float  p53=getRndFloat();int  p54=getRndInt();
+        double  p55=getRndDouble();float  p56=getRndFloat();double  p57=getRndDouble();
+        float  p58=getRndFloat();float  p59=getRndFloat();float  p60=getRndFloat();
+        double  p61=getRndDouble();float  p62=getRndFloat();int  p63=getRndInt();
+        double  p64=getRndDouble();int  p65=getRndInt();int  p66=getRndInt();double  p67=getRndDouble();
+        double  p68=getRndDouble();double  p69=getRndDouble();float  p70=getRndFloat();
+        float  p71=getRndFloat();double  p72=getRndDouble();int  p73=getRndInt();
+        int  p74=getRndInt();float  p75=getRndFloat();double  p76=getRndDouble();
+        float  p77=getRndFloat();float  p78=getRndFloat();float  p79=getRndFloat();
+        float  p80=getRndFloat();double  p81=getRndDouble();double  p82=getRndDouble();
+        double  p83=getRndDouble();double  p84=getRndDouble();double  p85=getRndDouble();
+        float  p86=getRndFloat();float  p87=getRndFloat();int  p88=getRndInt();
+        double  p89=getRndDouble();double  p90=getRndDouble();float  p91=getRndFloat();
+        double  p92=getRndDouble();float  p93=getRndFloat();int  p94=getRndInt();
+        float  p95=getRndFloat();float  p96=getRndFloat();double  p97=getRndDouble();
+        int  p98=getRndInt();int  p99=getRndInt();double  p100=getRndDouble();double  p101=getRndDouble();
+        float  p102=getRndFloat();float  p103=getRndFloat();double  p104=getRndDouble();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();float  p109=getRndFloat();float  p110=getRndFloat();
+        double  p111=getRndDouble();float  p112=getRndFloat();double  p113=getRndDouble();
+        double  p114=getRndDouble();float  p115=getRndFloat();float  p116=getRndFloat();
+        float  p117=getRndFloat();float  p118=getRndFloat();double  p119=getRndDouble();
+        int  p120=getRndInt();double  p121=getRndDouble();float  p122=getRndFloat();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%d\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%d\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%d\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%d\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);
+        ps.format("p74=%d\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%d\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%d\n",p98);ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc31(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc32(double p0,float p1,byte p2,float p3,double p4,byte p5,float p6,float p7
+        ,double p8,float p9,float p10,float p11,double p12,float p13,float p14,double p15
+        ,float p16,byte p17,float p18,float p19,float p20,float p21,byte p22,byte p23
+        ,byte p24,float p25,float p26,double p27,byte p28,double p29,float p30,double p31
+        ,double p32,float p33,byte p34,float p35,float p36,double p37,float p38
+        ,double p39,float p40,double p41,byte p42,double p43,float p44,double p45
+        ,byte p46,float p47,byte p48,float p49,float p50,float p51,float p52,double p53
+        ,double p54,double p55,float p56,double p57,double p58,float p59,double p60
+        ,double p61,double p62,double p63,float p64,double p65,double p66,double p67
+        ,byte p68,double p69,float p70,double p71,byte p72,double p73,double p74
+        ,byte p75,double p76,double p77,double p78,byte p79,double p80,double p81
+        ,float p82,double p83,float p84,double p85,byte p86,double p87,double p88
+        ,float p89,double p90,double p91,double p92,double p93,byte p94,float p95
+        ,double p96,double p97,float p98,double p99,float p100,double p101,float p102
+        ,float p103,byte p104,double p105,double p106,double p107,float p108,float p109
+        ,float p110,byte p111,double p112,byte p113,double p114,double p115,float p116
+        ,float p117,float p118,double p119,double p120,double p121,float p122,float p123
+        ,float p124,byte p125,double p126    );
+    private static void nativeFnc32_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();float  p1=getRndFloat();byte  p2=getRndByte();
+        float  p3=getRndFloat();double  p4=getRndDouble();byte  p5=getRndByte();
+        float  p6=getRndFloat();float  p7=getRndFloat();double  p8=getRndDouble();
+        float  p9=getRndFloat();float  p10=getRndFloat();float  p11=getRndFloat();
+        double  p12=getRndDouble();float  p13=getRndFloat();float  p14=getRndFloat();
+        double  p15=getRndDouble();float  p16=getRndFloat();byte  p17=getRndByte();
+        float  p18=getRndFloat();float  p19=getRndFloat();float  p20=getRndFloat();
+        float  p21=getRndFloat();byte  p22=getRndByte();byte  p23=getRndByte();
+        byte  p24=getRndByte();float  p25=getRndFloat();float  p26=getRndFloat();
+        double  p27=getRndDouble();byte  p28=getRndByte();double  p29=getRndDouble();
+        float  p30=getRndFloat();double  p31=getRndDouble();double  p32=getRndDouble();
+        float  p33=getRndFloat();byte  p34=getRndByte();float  p35=getRndFloat();
+        float  p36=getRndFloat();double  p37=getRndDouble();float  p38=getRndFloat();
+        double  p39=getRndDouble();float  p40=getRndFloat();double  p41=getRndDouble();
+        byte  p42=getRndByte();double  p43=getRndDouble();float  p44=getRndFloat();
+        double  p45=getRndDouble();byte  p46=getRndByte();float  p47=getRndFloat();
+        byte  p48=getRndByte();float  p49=getRndFloat();float  p50=getRndFloat();
+        float  p51=getRndFloat();float  p52=getRndFloat();double  p53=getRndDouble();
+        double  p54=getRndDouble();double  p55=getRndDouble();float  p56=getRndFloat();
+        double  p57=getRndDouble();double  p58=getRndDouble();float  p59=getRndFloat();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();float  p64=getRndFloat();double  p65=getRndDouble();
+        double  p66=getRndDouble();double  p67=getRndDouble();byte  p68=getRndByte();
+        double  p69=getRndDouble();float  p70=getRndFloat();double  p71=getRndDouble();
+        byte  p72=getRndByte();double  p73=getRndDouble();double  p74=getRndDouble();
+        byte  p75=getRndByte();double  p76=getRndDouble();double  p77=getRndDouble();
+        double  p78=getRndDouble();byte  p79=getRndByte();double  p80=getRndDouble();
+        double  p81=getRndDouble();float  p82=getRndFloat();double  p83=getRndDouble();
+        float  p84=getRndFloat();double  p85=getRndDouble();byte  p86=getRndByte();
+        double  p87=getRndDouble();double  p88=getRndDouble();float  p89=getRndFloat();
+        double  p90=getRndDouble();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();byte  p94=getRndByte();float  p95=getRndFloat();
+        double  p96=getRndDouble();double  p97=getRndDouble();float  p98=getRndFloat();
+        double  p99=getRndDouble();float  p100=getRndFloat();double  p101=getRndDouble();
+        float  p102=getRndFloat();float  p103=getRndFloat();byte  p104=getRndByte();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        float  p108=getRndFloat();float  p109=getRndFloat();float  p110=getRndFloat();
+        byte  p111=getRndByte();double  p112=getRndDouble();byte  p113=getRndByte();
+        double  p114=getRndDouble();double  p115=getRndDouble();float  p116=getRndFloat();
+        float  p117=getRndFloat();float  p118=getRndFloat();double  p119=getRndDouble();
+        double  p120=getRndDouble();double  p121=getRndDouble();float  p122=getRndFloat();
+        float  p123=getRndFloat();float  p124=getRndFloat();byte  p125=getRndByte();
+        double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%d\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%d\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%d\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%d\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%d\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%d\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%d\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%d\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%d\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc32(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc33(float p0,int p1,int p2,int p3,float p4,float p5,float p6,int p7,float p8
+        ,float p9,float p10,float p11,float p12,float p13,float p14,float p15,float p16
+        ,int p17,float p18,float p19,float p20,float p21,int p22,float p23,float p24
+        ,float p25,float p26,float p27,float p28,float p29,float p30,float p31,float p32
+        ,float p33,float p34,float p35,float p36,float p37,int p38,int p39,int p40
+        ,float p41,float p42,float p43,float p44,int p45,float p46,float p47,int p48
+        ,float p49,float p50,float p51,float p52,int p53,float p54,float p55,float p56
+        ,float p57,float p58,float p59,float p60,int p61,float p62,float p63,float p64
+        ,float p65,int p66,float p67,float p68,float p69,float p70,int p71,float p72
+        ,float p73,float p74,float p75,float p76,float p77,float p78,float p79,float p80
+        ,float p81,float p82,float p83,float p84,float p85,float p86,float p87,float p88
+        ,int p89,int p90,float p91,float p92,float p93,int p94,float p95,float p96
+        ,float p97,float p98,float p99,float p100,int p101,float p102,float p103
+        ,float p104,int p105,int p106,float p107,int p108,float p109,float p110
+        ,float p111,float p112,float p113,float p114,int p115,int p116,float p117
+        ,float p118,int p119,float p120,float p121,float p122,float p123,float p124
+        ,float p125,float p126    );
+    private static void nativeFnc33_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();int  p1=getRndInt();int  p2=getRndInt();
+        int  p3=getRndInt();float  p4=getRndFloat();float  p5=getRndFloat();float  p6=getRndFloat();
+        int  p7=getRndInt();float  p8=getRndFloat();float  p9=getRndFloat();float  p10=getRndFloat();
+        float  p11=getRndFloat();float  p12=getRndFloat();float  p13=getRndFloat();
+        float  p14=getRndFloat();float  p15=getRndFloat();float  p16=getRndFloat();
+        int  p17=getRndInt();float  p18=getRndFloat();float  p19=getRndFloat();
+        float  p20=getRndFloat();float  p21=getRndFloat();int  p22=getRndInt();
+        float  p23=getRndFloat();float  p24=getRndFloat();float  p25=getRndFloat();
+        float  p26=getRndFloat();float  p27=getRndFloat();float  p28=getRndFloat();
+        float  p29=getRndFloat();float  p30=getRndFloat();float  p31=getRndFloat();
+        float  p32=getRndFloat();float  p33=getRndFloat();float  p34=getRndFloat();
+        float  p35=getRndFloat();float  p36=getRndFloat();float  p37=getRndFloat();
+        int  p38=getRndInt();int  p39=getRndInt();int  p40=getRndInt();float  p41=getRndFloat();
+        float  p42=getRndFloat();float  p43=getRndFloat();float  p44=getRndFloat();
+        int  p45=getRndInt();float  p46=getRndFloat();float  p47=getRndFloat();
+        int  p48=getRndInt();float  p49=getRndFloat();float  p50=getRndFloat();
+        float  p51=getRndFloat();float  p52=getRndFloat();int  p53=getRndInt();
+        float  p54=getRndFloat();float  p55=getRndFloat();float  p56=getRndFloat();
+        float  p57=getRndFloat();float  p58=getRndFloat();float  p59=getRndFloat();
+        float  p60=getRndFloat();int  p61=getRndInt();float  p62=getRndFloat();
+        float  p63=getRndFloat();float  p64=getRndFloat();float  p65=getRndFloat();
+        int  p66=getRndInt();float  p67=getRndFloat();float  p68=getRndFloat();
+        float  p69=getRndFloat();float  p70=getRndFloat();int  p71=getRndInt();
+        float  p72=getRndFloat();float  p73=getRndFloat();float  p74=getRndFloat();
+        float  p75=getRndFloat();float  p76=getRndFloat();float  p77=getRndFloat();
+        float  p78=getRndFloat();float  p79=getRndFloat();float  p80=getRndFloat();
+        float  p81=getRndFloat();float  p82=getRndFloat();float  p83=getRndFloat();
+        float  p84=getRndFloat();float  p85=getRndFloat();float  p86=getRndFloat();
+        float  p87=getRndFloat();float  p88=getRndFloat();int  p89=getRndInt();
+        int  p90=getRndInt();float  p91=getRndFloat();float  p92=getRndFloat();
+        float  p93=getRndFloat();int  p94=getRndInt();float  p95=getRndFloat();
+        float  p96=getRndFloat();float  p97=getRndFloat();float  p98=getRndFloat();
+        float  p99=getRndFloat();float  p100=getRndFloat();int  p101=getRndInt();
+        float  p102=getRndFloat();float  p103=getRndFloat();float  p104=getRndFloat();
+        int  p105=getRndInt();int  p106=getRndInt();float  p107=getRndFloat();int  p108=getRndInt();
+        float  p109=getRndFloat();float  p110=getRndFloat();float  p111=getRndFloat();
+        float  p112=getRndFloat();float  p113=getRndFloat();float  p114=getRndFloat();
+        int  p115=getRndInt();int  p116=getRndInt();float  p117=getRndFloat();float  p118=getRndFloat();
+        int  p119=getRndInt();float  p120=getRndFloat();float  p121=getRndFloat();
+        float  p122=getRndFloat();float  p123=getRndFloat();float  p124=getRndFloat();
+        float  p125=getRndFloat();float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%d\n",p1);ps.format("p2=%d\n",p2);ps.format("p3=%d\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%d\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%d\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%d\n",p38);ps.format("p39=%d\n",p39);
+        ps.format("p40=%d\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%d\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%d\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);
+        ps.format("p61=%d\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);ps.format("p90=%d\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);
+        ps.format("p106=%d\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%d\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%d\n",p115);ps.format("p116=%d\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%d\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc33(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc34(float p0,float p1,float p2,float p3,float p4,byte p5,float p6,float p7,float p8
+        ,float p9,float p10,float p11,byte p12,float p13,float p14,byte p15,float p16
+        ,float p17,byte p18,byte p19,float p20,float p21,byte p22,float p23,float p24
+        ,byte p25,byte p26,byte p27,float p28,float p29,float p30,float p31,float p32
+        ,float p33,float p34,float p35,byte p36,float p37,float p38,float p39,float p40
+        ,float p41,float p42,float p43,float p44,byte p45,float p46,byte p47,float p48
+        ,byte p49,float p50,float p51,float p52,float p53,float p54,float p55,float p56
+        ,byte p57,float p58,float p59,float p60,float p61,byte p62,float p63,float p64
+        ,float p65,float p66,float p67,byte p68,byte p69,float p70,float p71,float p72
+        ,float p73,float p74,byte p75,float p76,float p77,byte p78,float p79,float p80
+        ,float p81,float p82,float p83,float p84,float p85,float p86,byte p87,byte p88
+        ,float p89,float p90,float p91,float p92,float p93,float p94,float p95,float p96
+        ,byte p97,float p98,float p99,float p100,float p101,byte p102,float p103
+        ,float p104,byte p105,float p106,float p107,float p108,float p109,float p110
+        ,float p111,float p112,byte p113,float p114,float p115,float p116,float p117
+        ,float p118,float p119,float p120,float p121,float p122,float p123,float p124
+        ,byte p125,byte p126    );
+    private static void nativeFnc34_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();byte  p5=getRndByte();float  p6=getRndFloat();
+        float  p7=getRndFloat();float  p8=getRndFloat();float  p9=getRndFloat();
+        float  p10=getRndFloat();float  p11=getRndFloat();byte  p12=getRndByte();
+        float  p13=getRndFloat();float  p14=getRndFloat();byte  p15=getRndByte();
+        float  p16=getRndFloat();float  p17=getRndFloat();byte  p18=getRndByte();
+        byte  p19=getRndByte();float  p20=getRndFloat();float  p21=getRndFloat();
+        byte  p22=getRndByte();float  p23=getRndFloat();float  p24=getRndFloat();
+        byte  p25=getRndByte();byte  p26=getRndByte();byte  p27=getRndByte();float  p28=getRndFloat();
+        float  p29=getRndFloat();float  p30=getRndFloat();float  p31=getRndFloat();
+        float  p32=getRndFloat();float  p33=getRndFloat();float  p34=getRndFloat();
+        float  p35=getRndFloat();byte  p36=getRndByte();float  p37=getRndFloat();
+        float  p38=getRndFloat();float  p39=getRndFloat();float  p40=getRndFloat();
+        float  p41=getRndFloat();float  p42=getRndFloat();float  p43=getRndFloat();
+        float  p44=getRndFloat();byte  p45=getRndByte();float  p46=getRndFloat();
+        byte  p47=getRndByte();float  p48=getRndFloat();byte  p49=getRndByte();
+        float  p50=getRndFloat();float  p51=getRndFloat();float  p52=getRndFloat();
+        float  p53=getRndFloat();float  p54=getRndFloat();float  p55=getRndFloat();
+        float  p56=getRndFloat();byte  p57=getRndByte();float  p58=getRndFloat();
+        float  p59=getRndFloat();float  p60=getRndFloat();float  p61=getRndFloat();
+        byte  p62=getRndByte();float  p63=getRndFloat();float  p64=getRndFloat();
+        float  p65=getRndFloat();float  p66=getRndFloat();float  p67=getRndFloat();
+        byte  p68=getRndByte();byte  p69=getRndByte();float  p70=getRndFloat();
+        float  p71=getRndFloat();float  p72=getRndFloat();float  p73=getRndFloat();
+        float  p74=getRndFloat();byte  p75=getRndByte();float  p76=getRndFloat();
+        float  p77=getRndFloat();byte  p78=getRndByte();float  p79=getRndFloat();
+        float  p80=getRndFloat();float  p81=getRndFloat();float  p82=getRndFloat();
+        float  p83=getRndFloat();float  p84=getRndFloat();float  p85=getRndFloat();
+        float  p86=getRndFloat();byte  p87=getRndByte();byte  p88=getRndByte();
+        float  p89=getRndFloat();float  p90=getRndFloat();float  p91=getRndFloat();
+        float  p92=getRndFloat();float  p93=getRndFloat();float  p94=getRndFloat();
+        float  p95=getRndFloat();float  p96=getRndFloat();byte  p97=getRndByte();
+        float  p98=getRndFloat();float  p99=getRndFloat();float  p100=getRndFloat();
+        float  p101=getRndFloat();byte  p102=getRndByte();float  p103=getRndFloat();
+        float  p104=getRndFloat();byte  p105=getRndByte();float  p106=getRndFloat();
+        float  p107=getRndFloat();float  p108=getRndFloat();float  p109=getRndFloat();
+        float  p110=getRndFloat();float  p111=getRndFloat();float  p112=getRndFloat();
+        byte  p113=getRndByte();float  p114=getRndFloat();float  p115=getRndFloat();
+        float  p116=getRndFloat();float  p117=getRndFloat();float  p118=getRndFloat();
+        float  p119=getRndFloat();float  p120=getRndFloat();float  p121=getRndFloat();
+        float  p122=getRndFloat();float  p123=getRndFloat();float  p124=getRndFloat();
+        byte  p125=getRndByte();byte  p126=getRndByte();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%d\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%d\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);ps.format("p18=%d\n",p18);
+        ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%d\n",p22);ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%d\n",p25);ps.format("p26=%d\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%d\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%d\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%d\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%e\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%d\n",p69);
+        ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%d\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%d\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%d\n",p88);ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%d\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%d\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%d\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);ps.format("p126=%d\n",p126);
+
+        nativeFnc34(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc35(int p0,byte p1,byte p2,float p3,float p4,float p5,float p6,float p7,int p8
+        ,float p9,int p10,float p11,float p12,byte p13,byte p14,float p15,float p16
+        ,byte p17,byte p18,float p19,float p20,float p21,float p22,float p23,float p24
+        ,float p25,float p26,int p27,float p28,float p29,float p30,byte p31,float p32
+        ,float p33,float p34,float p35,byte p36,float p37,int p38,float p39,byte p40
+        ,byte p41,float p42,float p43,float p44,int p45,float p46,byte p47,byte p48
+        ,int p49,float p50,int p51,float p52,float p53,float p54,byte p55,byte p56
+        ,float p57,float p58,float p59,int p60,int p61,float p62,int p63,byte p64
+        ,float p65,int p66,float p67,float p68,byte p69,float p70,float p71,float p72
+        ,int p73,float p74,float p75,float p76,byte p77,float p78,float p79,float p80
+        ,byte p81,float p82,byte p83,float p84,float p85,byte p86,float p87,float p88
+        ,float p89,float p90,byte p91,float p92,float p93,float p94,float p95,float p96
+        ,float p97,float p98,int p99,float p100,float p101,int p102,float p103,float p104
+        ,byte p105,float p106,int p107,float p108,float p109,float p110,float p111
+        ,float p112,int p113,float p114,float p115,float p116,float p117,byte p118
+        ,float p119,byte p120,float p121,float p122,int p123,float p124,float p125
+        ,float p126    );
+    private static void nativeFnc35_invoke(PrintStream ps)
+    {
+        int  p0=getRndInt();byte  p1=getRndByte();byte  p2=getRndByte();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        float  p6=getRndFloat();float  p7=getRndFloat();int  p8=getRndInt();float  p9=getRndFloat();
+        int  p10=getRndInt();float  p11=getRndFloat();float  p12=getRndFloat();
+        byte  p13=getRndByte();byte  p14=getRndByte();float  p15=getRndFloat();
+        float  p16=getRndFloat();byte  p17=getRndByte();byte  p18=getRndByte();
+        float  p19=getRndFloat();float  p20=getRndFloat();float  p21=getRndFloat();
+        float  p22=getRndFloat();float  p23=getRndFloat();float  p24=getRndFloat();
+        float  p25=getRndFloat();float  p26=getRndFloat();int  p27=getRndInt();
+        float  p28=getRndFloat();float  p29=getRndFloat();float  p30=getRndFloat();
+        byte  p31=getRndByte();float  p32=getRndFloat();float  p33=getRndFloat();
+        float  p34=getRndFloat();float  p35=getRndFloat();byte  p36=getRndByte();
+        float  p37=getRndFloat();int  p38=getRndInt();float  p39=getRndFloat();
+        byte  p40=getRndByte();byte  p41=getRndByte();float  p42=getRndFloat();
+        float  p43=getRndFloat();float  p44=getRndFloat();int  p45=getRndInt();
+        float  p46=getRndFloat();byte  p47=getRndByte();byte  p48=getRndByte();
+        int  p49=getRndInt();float  p50=getRndFloat();int  p51=getRndInt();float  p52=getRndFloat();
+        float  p53=getRndFloat();float  p54=getRndFloat();byte  p55=getRndByte();
+        byte  p56=getRndByte();float  p57=getRndFloat();float  p58=getRndFloat();
+        float  p59=getRndFloat();int  p60=getRndInt();int  p61=getRndInt();float  p62=getRndFloat();
+        int  p63=getRndInt();byte  p64=getRndByte();float  p65=getRndFloat();int  p66=getRndInt();
+        float  p67=getRndFloat();float  p68=getRndFloat();byte  p69=getRndByte();
+        float  p70=getRndFloat();float  p71=getRndFloat();float  p72=getRndFloat();
+        int  p73=getRndInt();float  p74=getRndFloat();float  p75=getRndFloat();
+        float  p76=getRndFloat();byte  p77=getRndByte();float  p78=getRndFloat();
+        float  p79=getRndFloat();float  p80=getRndFloat();byte  p81=getRndByte();
+        float  p82=getRndFloat();byte  p83=getRndByte();float  p84=getRndFloat();
+        float  p85=getRndFloat();byte  p86=getRndByte();float  p87=getRndFloat();
+        float  p88=getRndFloat();float  p89=getRndFloat();float  p90=getRndFloat();
+        byte  p91=getRndByte();float  p92=getRndFloat();float  p93=getRndFloat();
+        float  p94=getRndFloat();float  p95=getRndFloat();float  p96=getRndFloat();
+        float  p97=getRndFloat();float  p98=getRndFloat();int  p99=getRndInt();
+        float  p100=getRndFloat();float  p101=getRndFloat();int  p102=getRndInt();
+        float  p103=getRndFloat();float  p104=getRndFloat();byte  p105=getRndByte();
+        float  p106=getRndFloat();int  p107=getRndInt();float  p108=getRndFloat();
+        float  p109=getRndFloat();float  p110=getRndFloat();float  p111=getRndFloat();
+        float  p112=getRndFloat();int  p113=getRndInt();float  p114=getRndFloat();
+        float  p115=getRndFloat();float  p116=getRndFloat();float  p117=getRndFloat();
+        byte  p118=getRndByte();float  p119=getRndFloat();byte  p120=getRndByte();
+        float  p121=getRndFloat();float  p122=getRndFloat();int  p123=getRndInt();
+        float  p124=getRndFloat();float  p125=getRndFloat();float  p126=getRndFloat();
+
+        ps.format("p0=%d\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%d\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%d\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%d\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%d\n",p13);ps.format("p14=%d\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);
+        ps.format("p18=%d\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%d\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%d\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%d\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%d\n",p40);ps.format("p41=%d\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%d\n",p48);ps.format("p49=%d\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%d\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%d\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%d\n",p60);ps.format("p61=%d\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%d\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%d\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%d\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%d\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc35(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc36(int p0,int p1,double p2,double p3,double p4,double p5,double p6,int p7,double p8
+        ,double p9,double p10,double p11,double p12,double p13,double p14,double p15
+        ,double p16,double p17,int p18,int p19,double p20,double p21,double p22
+        ,double p23,double p24,double p25,double p26,double p27,double p28,double p29
+        ,double p30,double p31,double p32,double p33,double p34,int p35,double p36
+        ,double p37,double p38,double p39,double p40,double p41,double p42,double p43
+        ,int p44,double p45,double p46,int p47,int p48,double p49,double p50,double p51
+        ,double p52,double p53,double p54,double p55,int p56,double p57,double p58
+        ,double p59,double p60,double p61,double p62,double p63,double p64,double p65
+        ,double p66,double p67,double p68,double p69,int p70,double p71,int p72
+        ,double p73,double p74,double p75,double p76,double p77,double p78,double p79
+        ,int p80,double p81,double p82,double p83,double p84,double p85,double p86
+        ,double p87,double p88,double p89,double p90,double p91,int p92,double p93
+        ,double p94,double p95,double p96,double p97,double p98,int p99,int p100
+        ,int p101,int p102,int p103,int p104,int p105,int p106,double p107,double p108
+        ,double p109,int p110,double p111,double p112,double p113,double p114,double p115
+        ,double p116,double p117,double p118,double p119,double p120,double p121
+        ,double p122,double p123,double p124,double p125,double p126    );
+    private static void nativeFnc36_invoke(PrintStream ps)
+    {
+        int  p0=getRndInt();int  p1=getRndInt();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        double  p6=getRndDouble();int  p7=getRndInt();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        int  p18=getRndInt();int  p19=getRndInt();double  p20=getRndDouble();double  p21=getRndDouble();
+        double  p22=getRndDouble();double  p23=getRndDouble();double  p24=getRndDouble();
+        double  p25=getRndDouble();double  p26=getRndDouble();double  p27=getRndDouble();
+        double  p28=getRndDouble();double  p29=getRndDouble();double  p30=getRndDouble();
+        double  p31=getRndDouble();double  p32=getRndDouble();double  p33=getRndDouble();
+        double  p34=getRndDouble();int  p35=getRndInt();double  p36=getRndDouble();
+        double  p37=getRndDouble();double  p38=getRndDouble();double  p39=getRndDouble();
+        double  p40=getRndDouble();double  p41=getRndDouble();double  p42=getRndDouble();
+        double  p43=getRndDouble();int  p44=getRndInt();double  p45=getRndDouble();
+        double  p46=getRndDouble();int  p47=getRndInt();int  p48=getRndInt();double  p49=getRndDouble();
+        double  p50=getRndDouble();double  p51=getRndDouble();double  p52=getRndDouble();
+        double  p53=getRndDouble();double  p54=getRndDouble();double  p55=getRndDouble();
+        int  p56=getRndInt();double  p57=getRndDouble();double  p58=getRndDouble();
+        double  p59=getRndDouble();double  p60=getRndDouble();double  p61=getRndDouble();
+        double  p62=getRndDouble();double  p63=getRndDouble();double  p64=getRndDouble();
+        double  p65=getRndDouble();double  p66=getRndDouble();double  p67=getRndDouble();
+        double  p68=getRndDouble();double  p69=getRndDouble();int  p70=getRndInt();
+        double  p71=getRndDouble();int  p72=getRndInt();double  p73=getRndDouble();
+        double  p74=getRndDouble();double  p75=getRndDouble();double  p76=getRndDouble();
+        double  p77=getRndDouble();double  p78=getRndDouble();double  p79=getRndDouble();
+        int  p80=getRndInt();double  p81=getRndDouble();double  p82=getRndDouble();
+        double  p83=getRndDouble();double  p84=getRndDouble();double  p85=getRndDouble();
+        double  p86=getRndDouble();double  p87=getRndDouble();double  p88=getRndDouble();
+        double  p89=getRndDouble();double  p90=getRndDouble();double  p91=getRndDouble();
+        int  p92=getRndInt();double  p93=getRndDouble();double  p94=getRndDouble();
+        double  p95=getRndDouble();double  p96=getRndDouble();double  p97=getRndDouble();
+        double  p98=getRndDouble();int  p99=getRndInt();int  p100=getRndInt();int  p101=getRndInt();
+        int  p102=getRndInt();int  p103=getRndInt();int  p104=getRndInt();int  p105=getRndInt();
+        int  p106=getRndInt();double  p107=getRndDouble();double  p108=getRndDouble();
+        double  p109=getRndDouble();int  p110=getRndInt();double  p111=getRndDouble();
+        double  p112=getRndDouble();double  p113=getRndDouble();double  p114=getRndDouble();
+        double  p115=getRndDouble();double  p116=getRndDouble();double  p117=getRndDouble();
+        double  p118=getRndDouble();double  p119=getRndDouble();double  p120=getRndDouble();
+        double  p121=getRndDouble();double  p122=getRndDouble();double  p123=getRndDouble();
+        double  p124=getRndDouble();double  p125=getRndDouble();double  p126=getRndDouble();
+
+        ps.format("p0=%d\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%d\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%d\n",p18);ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%d\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%d\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%d\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%d\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%d\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%d\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%d\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%d\n",p103);ps.format("p104=%d\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%d\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%d\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc36(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc37(double p0,double p1,double p2,double p3,double p4,double p5,double p6,double p7
+        ,double p8,double p9,double p10,byte p11,double p12,double p13,double p14
+        ,double p15,double p16,double p17,double p18,double p19,double p20,double p21
+        ,byte p22,byte p23,double p24,double p25,byte p26,double p27,double p28
+        ,double p29,double p30,double p31,double p32,double p33,double p34,double p35
+        ,double p36,double p37,byte p38,byte p39,double p40,double p41,double p42
+        ,double p43,double p44,byte p45,double p46,double p47,double p48,byte p49
+        ,double p50,double p51,double p52,double p53,double p54,double p55,byte p56
+        ,byte p57,double p58,double p59,double p60,double p61,double p62,double p63
+        ,double p64,double p65,byte p66,double p67,double p68,double p69,double p70
+        ,byte p71,double p72,double p73,double p74,double p75,double p76,double p77
+        ,double p78,double p79,double p80,double p81,double p82,double p83,double p84
+        ,double p85,double p86,double p87,double p88,double p89,double p90,double p91
+        ,double p92,double p93,double p94,double p95,byte p96,byte p97,double p98
+        ,double p99,double p100,double p101,double p102,double p103,double p104
+        ,double p105,double p106,double p107,double p108,byte p109,double p110,double p111
+        ,double p112,double p113,double p114,double p115,double p116,double p117
+        ,byte p118,double p119,double p120,double p121,double p122,double p123,byte p124
+        ,double p125,byte p126    );
+    private static void nativeFnc37_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();byte  p11=getRndByte();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        double  p18=getRndDouble();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();byte  p22=getRndByte();byte  p23=getRndByte();
+        double  p24=getRndDouble();double  p25=getRndDouble();byte  p26=getRndByte();
+        double  p27=getRndDouble();double  p28=getRndDouble();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();double  p32=getRndDouble();
+        double  p33=getRndDouble();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();double  p37=getRndDouble();byte  p38=getRndByte();
+        byte  p39=getRndByte();double  p40=getRndDouble();double  p41=getRndDouble();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        byte  p45=getRndByte();double  p46=getRndDouble();double  p47=getRndDouble();
+        double  p48=getRndDouble();byte  p49=getRndByte();double  p50=getRndDouble();
+        double  p51=getRndDouble();double  p52=getRndDouble();double  p53=getRndDouble();
+        double  p54=getRndDouble();double  p55=getRndDouble();byte  p56=getRndByte();
+        byte  p57=getRndByte();double  p58=getRndDouble();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();double  p64=getRndDouble();double  p65=getRndDouble();
+        byte  p66=getRndByte();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();double  p70=getRndDouble();byte  p71=getRndByte();
+        double  p72=getRndDouble();double  p73=getRndDouble();double  p74=getRndDouble();
+        double  p75=getRndDouble();double  p76=getRndDouble();double  p77=getRndDouble();
+        double  p78=getRndDouble();double  p79=getRndDouble();double  p80=getRndDouble();
+        double  p81=getRndDouble();double  p82=getRndDouble();double  p83=getRndDouble();
+        double  p84=getRndDouble();double  p85=getRndDouble();double  p86=getRndDouble();
+        double  p87=getRndDouble();double  p88=getRndDouble();double  p89=getRndDouble();
+        double  p90=getRndDouble();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();double  p94=getRndDouble();double  p95=getRndDouble();
+        byte  p96=getRndByte();byte  p97=getRndByte();double  p98=getRndDouble();
+        double  p99=getRndDouble();double  p100=getRndDouble();double  p101=getRndDouble();
+        double  p102=getRndDouble();double  p103=getRndDouble();double  p104=getRndDouble();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();byte  p109=getRndByte();double  p110=getRndDouble();
+        double  p111=getRndDouble();double  p112=getRndDouble();double  p113=getRndDouble();
+        double  p114=getRndDouble();double  p115=getRndDouble();double  p116=getRndDouble();
+        double  p117=getRndDouble();byte  p118=getRndByte();double  p119=getRndDouble();
+        double  p120=getRndDouble();double  p121=getRndDouble();double  p122=getRndDouble();
+        double  p123=getRndDouble();byte  p124=getRndByte();double  p125=getRndDouble();
+        byte  p126=getRndByte();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%d\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%d\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%d\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%d\n",p38);ps.format("p39=%d\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%d\n",p56);ps.format("p57=%d\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%d\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%d\n",p96);ps.format("p97=%d\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%d\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%d\n",p126);
+        nativeFnc37(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc38(double p0,double p1,double p2,int p3,int p4,double p5,double p6,double p7
+        ,double p8,double p9,double p10,int p11,double p12,double p13,int p14,byte p15
+        ,double p16,double p17,double p18,double p19,int p20,double p21,double p22
+        ,double p23,double p24,int p25,double p26,int p27,byte p28,double p29,byte p30
+        ,double p31,double p32,int p33,double p34,int p35,byte p36,byte p37,double p38
+        ,double p39,double p40,double p41,int p42,double p43,double p44,double p45
+        ,double p46,double p47,int p48,double p49,int p50,int p51,double p52,byte p53
+        ,double p54,double p55,byte p56,double p57,double p58,double p59,double p60
+        ,double p61,byte p62,double p63,double p64,double p65,byte p66,int p67,double p68
+        ,double p69,double p70,double p71,double p72,byte p73,double p74,double p75
+        ,double p76,byte p77,double p78,double p79,double p80,double p81,double p82
+        ,int p83,double p84,double p85,double p86,int p87,double p88,int p89,double p90
+        ,double p91,double p92,double p93,double p94,int p95,byte p96,byte p97,double p98
+        ,int p99,double p100,double p101,double p102,double p103,double p104,double p105
+        ,double p106,double p107,double p108,double p109,double p110,double p111
+        ,int p112,double p113,double p114,double p115,double p116,byte p117,double p118
+        ,double p119,byte p120,int p121,double p122,int p123,double p124,double p125
+        ,byte p126    );
+    private static void nativeFnc38_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        int  p3=getRndInt();int  p4=getRndInt();double  p5=getRndDouble();double  p6=getRndDouble();
+        double  p7=getRndDouble();double  p8=getRndDouble();double  p9=getRndDouble();
+        double  p10=getRndDouble();int  p11=getRndInt();double  p12=getRndDouble();
+        double  p13=getRndDouble();int  p14=getRndInt();byte  p15=getRndByte();
+        double  p16=getRndDouble();double  p17=getRndDouble();double  p18=getRndDouble();
+        double  p19=getRndDouble();int  p20=getRndInt();double  p21=getRndDouble();
+        double  p22=getRndDouble();double  p23=getRndDouble();double  p24=getRndDouble();
+        int  p25=getRndInt();double  p26=getRndDouble();int  p27=getRndInt();byte  p28=getRndByte();
+        double  p29=getRndDouble();byte  p30=getRndByte();double  p31=getRndDouble();
+        double  p32=getRndDouble();int  p33=getRndInt();double  p34=getRndDouble();
+        int  p35=getRndInt();byte  p36=getRndByte();byte  p37=getRndByte();double  p38=getRndDouble();
+        double  p39=getRndDouble();double  p40=getRndDouble();double  p41=getRndDouble();
+        int  p42=getRndInt();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();double  p46=getRndDouble();double  p47=getRndDouble();
+        int  p48=getRndInt();double  p49=getRndDouble();int  p50=getRndInt();int  p51=getRndInt();
+        double  p52=getRndDouble();byte  p53=getRndByte();double  p54=getRndDouble();
+        double  p55=getRndDouble();byte  p56=getRndByte();double  p57=getRndDouble();
+        double  p58=getRndDouble();double  p59=getRndDouble();double  p60=getRndDouble();
+        double  p61=getRndDouble();byte  p62=getRndByte();double  p63=getRndDouble();
+        double  p64=getRndDouble();double  p65=getRndDouble();byte  p66=getRndByte();
+        int  p67=getRndInt();double  p68=getRndDouble();double  p69=getRndDouble();
+        double  p70=getRndDouble();double  p71=getRndDouble();double  p72=getRndDouble();
+        byte  p73=getRndByte();double  p74=getRndDouble();double  p75=getRndDouble();
+        double  p76=getRndDouble();byte  p77=getRndByte();double  p78=getRndDouble();
+        double  p79=getRndDouble();double  p80=getRndDouble();double  p81=getRndDouble();
+        double  p82=getRndDouble();int  p83=getRndInt();double  p84=getRndDouble();
+        double  p85=getRndDouble();double  p86=getRndDouble();int  p87=getRndInt();
+        double  p88=getRndDouble();int  p89=getRndInt();double  p90=getRndDouble();
+        double  p91=getRndDouble();double  p92=getRndDouble();double  p93=getRndDouble();
+        double  p94=getRndDouble();int  p95=getRndInt();byte  p96=getRndByte();
+        byte  p97=getRndByte();double  p98=getRndDouble();int  p99=getRndInt();
+        double  p100=getRndDouble();double  p101=getRndDouble();double  p102=getRndDouble();
+        double  p103=getRndDouble();double  p104=getRndDouble();double  p105=getRndDouble();
+        double  p106=getRndDouble();double  p107=getRndDouble();double  p108=getRndDouble();
+        double  p109=getRndDouble();double  p110=getRndDouble();double  p111=getRndDouble();
+        int  p112=getRndInt();double  p113=getRndDouble();double  p114=getRndDouble();
+        double  p115=getRndDouble();double  p116=getRndDouble();byte  p117=getRndByte();
+        double  p118=getRndDouble();double  p119=getRndDouble();byte  p120=getRndByte();
+        int  p121=getRndInt();double  p122=getRndDouble();int  p123=getRndInt();
+        double  p124=getRndDouble();double  p125=getRndDouble();byte  p126=getRndByte();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%d\n",p3);ps.format("p4=%d\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%d\n",p14);
+        ps.format("p15=%d\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%d\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%d\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%d\n",p35);
+        ps.format("p36=%d\n",p36);ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%d\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%d\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%d\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%d\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);
+        ps.format("p96=%d\n",p96);ps.format("p97=%d\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%d\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%d\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%d\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%d\n",p126);
+        nativeFnc38(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc39(double p0,float p1,double p2,byte p3,double p4,int p5,double p6,float p7
+        ,float p8,double p9,int p10,byte p11,float p12,double p13,int p14,int p15
+        ,float p16,byte p17,double p18,double p19,float p20,float p21,double p22
+        ,float p23,float p24,double p25,float p26,float p27,float p28,float p29
+        ,float p30,double p31,double p32,double p33,float p34,double p35,float p36
+        ,double p37,float p38,float p39,float p40,int p41,byte p42,double p43,float p44
+        ,float p45,int p46,byte p47,float p48,double p49,double p50,float p51,float p52
+        ,float p53,double p54,int p55,float p56,float p57,float p58,float p59,float p60
+        ,double p61,double p62,float p63,float p64,float p65,double p66,float p67
+        ,double p68,double p69,double p70,double p71,double p72,double p73,double p74
+        ,float p75,int p76,float p77,double p78,double p79,double p80,double p81
+        ,byte p82,float p83,float p84,float p85,float p86,double p87,float p88,float p89
+        ,float p90,float p91,float p92,double p93,float p94,double p95,float p96
+        ,double p97,float p98,float p99,double p100,double p101,float p102,float p103
+        ,double p104,double p105,float p106,byte p107,double p108,float p109,float p110
+        ,double p111,double p112,double p113,double p114,double p115,double p116
+        ,float p117,double p118,float p119,float p120,float p121,float p122,float p123
+        ,double p124,float p125,float p126    );
+    private static void nativeFnc39_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();float  p1=getRndFloat();double  p2=getRndDouble();
+        byte  p3=getRndByte();double  p4=getRndDouble();int  p5=getRndInt();double  p6=getRndDouble();
+        float  p7=getRndFloat();float  p8=getRndFloat();double  p9=getRndDouble();
+        int  p10=getRndInt();byte  p11=getRndByte();float  p12=getRndFloat();double  p13=getRndDouble();
+        int  p14=getRndInt();int  p15=getRndInt();float  p16=getRndFloat();byte  p17=getRndByte();
+        double  p18=getRndDouble();double  p19=getRndDouble();float  p20=getRndFloat();
+        float  p21=getRndFloat();double  p22=getRndDouble();float  p23=getRndFloat();
+        float  p24=getRndFloat();double  p25=getRndDouble();float  p26=getRndFloat();
+        float  p27=getRndFloat();float  p28=getRndFloat();float  p29=getRndFloat();
+        float  p30=getRndFloat();double  p31=getRndDouble();double  p32=getRndDouble();
+        double  p33=getRndDouble();float  p34=getRndFloat();double  p35=getRndDouble();
+        float  p36=getRndFloat();double  p37=getRndDouble();float  p38=getRndFloat();
+        float  p39=getRndFloat();float  p40=getRndFloat();int  p41=getRndInt();
+        byte  p42=getRndByte();double  p43=getRndDouble();float  p44=getRndFloat();
+        float  p45=getRndFloat();int  p46=getRndInt();byte  p47=getRndByte();float  p48=getRndFloat();
+        double  p49=getRndDouble();double  p50=getRndDouble();float  p51=getRndFloat();
+        float  p52=getRndFloat();float  p53=getRndFloat();double  p54=getRndDouble();
+        int  p55=getRndInt();float  p56=getRndFloat();float  p57=getRndFloat();
+        float  p58=getRndFloat();float  p59=getRndFloat();float  p60=getRndFloat();
+        double  p61=getRndDouble();double  p62=getRndDouble();float  p63=getRndFloat();
+        float  p64=getRndFloat();float  p65=getRndFloat();double  p66=getRndDouble();
+        float  p67=getRndFloat();double  p68=getRndDouble();double  p69=getRndDouble();
+        double  p70=getRndDouble();double  p71=getRndDouble();double  p72=getRndDouble();
+        double  p73=getRndDouble();double  p74=getRndDouble();float  p75=getRndFloat();
+        int  p76=getRndInt();float  p77=getRndFloat();double  p78=getRndDouble();
+        double  p79=getRndDouble();double  p80=getRndDouble();double  p81=getRndDouble();
+        byte  p82=getRndByte();float  p83=getRndFloat();float  p84=getRndFloat();
+        float  p85=getRndFloat();float  p86=getRndFloat();double  p87=getRndDouble();
+        float  p88=getRndFloat();float  p89=getRndFloat();float  p90=getRndFloat();
+        float  p91=getRndFloat();float  p92=getRndFloat();double  p93=getRndDouble();
+        float  p94=getRndFloat();double  p95=getRndDouble();float  p96=getRndFloat();
+        double  p97=getRndDouble();float  p98=getRndFloat();float  p99=getRndFloat();
+        double  p100=getRndDouble();double  p101=getRndDouble();float  p102=getRndFloat();
+        float  p103=getRndFloat();double  p104=getRndDouble();double  p105=getRndDouble();
+        float  p106=getRndFloat();byte  p107=getRndByte();double  p108=getRndDouble();
+        float  p109=getRndFloat();float  p110=getRndFloat();double  p111=getRndDouble();
+        double  p112=getRndDouble();double  p113=getRndDouble();double  p114=getRndDouble();
+        double  p115=getRndDouble();double  p116=getRndDouble();float  p117=getRndFloat();
+        double  p118=getRndDouble();float  p119=getRndFloat();float  p120=getRndFloat();
+        float  p121=getRndFloat();float  p122=getRndFloat();float  p123=getRndFloat();
+        double  p124=getRndDouble();float  p125=getRndFloat();float  p126=getRndFloat();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%d\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%d\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%d\n",p14);
+        ps.format("p15=%d\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);
+        ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%d\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%d\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc39(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc40(double p0,double p1,float p2,double p3,double p4,float p5,double p6,double p7
+        ,double p8,double p9,double p10,double p11,double p12,float p13,float p14
+        ,double p15,float p16,float p17,double p18,float p19,double p20,double p21
+        ,double p22,double p23,double p24,double p25,double p26,float p27,float p28
+        ,double p29,double p30,double p31,float p32,float p33,float p34,float p35
+        ,double p36,float p37,float p38,float p39,double p40,float p41,double p42
+        ,double p43,float p44,double p45,double p46,double p47,float p48,double p49
+        ,double p50,double p51,double p52,float p53,double p54,double p55,double p56
+        ,double p57,double p58,double p59,double p60,double p61,double p62,float p63
+        ,float p64,float p65,float p66,float p67,double p68,double p69,double p70
+        ,double p71,double p72,double p73,float p74,double p75,double p76,double p77
+        ,double p78,double p79,float p80,double p81,double p82,float p83,double p84
+        ,double p85,double p86,float p87,float p88,double p89,float p90,double p91
+        ,float p92,float p93,float p94,float p95,double p96,float p97,float p98
+        ,double p99,double p100,double p101,double p102,float p103,double p104,double p105
+        ,double p106,double p107,double p108,double p109,float p110,float p111,double p112
+        ,double p113,double p114,double p115,double p116,double p117,double p118
+        ,double p119,float p120,double p121,double p122,double p123,double p124
+        ,double p125,float p126    );
+    private static void nativeFnc40_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();float  p2=getRndFloat();
+        double  p3=getRndDouble();double  p4=getRndDouble();float  p5=getRndFloat();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();float  p13=getRndFloat();float  p14=getRndFloat();
+        double  p15=getRndDouble();float  p16=getRndFloat();float  p17=getRndFloat();
+        double  p18=getRndDouble();float  p19=getRndFloat();double  p20=getRndDouble();
+        double  p21=getRndDouble();double  p22=getRndDouble();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        float  p27=getRndFloat();float  p28=getRndFloat();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();float  p32=getRndFloat();
+        float  p33=getRndFloat();float  p34=getRndFloat();float  p35=getRndFloat();
+        double  p36=getRndDouble();float  p37=getRndFloat();float  p38=getRndFloat();
+        float  p39=getRndFloat();double  p40=getRndDouble();float  p41=getRndFloat();
+        double  p42=getRndDouble();double  p43=getRndDouble();float  p44=getRndFloat();
+        double  p45=getRndDouble();double  p46=getRndDouble();double  p47=getRndDouble();
+        float  p48=getRndFloat();double  p49=getRndDouble();double  p50=getRndDouble();
+        double  p51=getRndDouble();double  p52=getRndDouble();float  p53=getRndFloat();
+        double  p54=getRndDouble();double  p55=getRndDouble();double  p56=getRndDouble();
+        double  p57=getRndDouble();double  p58=getRndDouble();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        float  p63=getRndFloat();float  p64=getRndFloat();float  p65=getRndFloat();
+        float  p66=getRndFloat();float  p67=getRndFloat();double  p68=getRndDouble();
+        double  p69=getRndDouble();double  p70=getRndDouble();double  p71=getRndDouble();
+        double  p72=getRndDouble();double  p73=getRndDouble();float  p74=getRndFloat();
+        double  p75=getRndDouble();double  p76=getRndDouble();double  p77=getRndDouble();
+        double  p78=getRndDouble();double  p79=getRndDouble();float  p80=getRndFloat();
+        double  p81=getRndDouble();double  p82=getRndDouble();float  p83=getRndFloat();
+        double  p84=getRndDouble();double  p85=getRndDouble();double  p86=getRndDouble();
+        float  p87=getRndFloat();float  p88=getRndFloat();double  p89=getRndDouble();
+        float  p90=getRndFloat();double  p91=getRndDouble();float  p92=getRndFloat();
+        float  p93=getRndFloat();float  p94=getRndFloat();float  p95=getRndFloat();
+        double  p96=getRndDouble();float  p97=getRndFloat();float  p98=getRndFloat();
+        double  p99=getRndDouble();double  p100=getRndDouble();double  p101=getRndDouble();
+        double  p102=getRndDouble();float  p103=getRndFloat();double  p104=getRndDouble();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();double  p109=getRndDouble();float  p110=getRndFloat();
+        float  p111=getRndFloat();double  p112=getRndDouble();double  p113=getRndDouble();
+        double  p114=getRndDouble();double  p115=getRndDouble();double  p116=getRndDouble();
+        double  p117=getRndDouble();double  p118=getRndDouble();double  p119=getRndDouble();
+        float  p120=getRndFloat();double  p121=getRndDouble();double  p122=getRndDouble();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc40(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc41(float p0,double p1,int p2,double p3,int p4,float p5,float p6,float p7,int p8
+        ,int p9,float p10,double p11,double p12,double p13,int p14,double p15,double p16
+        ,float p17,double p18,double p19,double p20,int p21,double p22,float p23
+        ,double p24,float p25,double p26,double p27,int p28,double p29,double p30
+        ,int p31,double p32,double p33,float p34,int p35,double p36,int p37,int p38
+        ,double p39,float p40,int p41,double p42,double p43,double p44,double p45
+        ,int p46,double p47,float p48,float p49,float p50,double p51,double p52
+        ,float p53,float p54,double p55,float p56,float p57,double p58,float p59
+        ,double p60,float p61,double p62,float p63,double p64,double p65,double p66
+        ,double p67,double p68,double p69,float p70,float p71,double p72,float p73
+        ,double p74,float p75,int p76,float p77,double p78,int p79,float p80,float p81
+        ,double p82,double p83,double p84,double p85,double p86,float p87,float p88
+        ,float p89,double p90,int p91,float p92,double p93,float p94,float p95,float p96
+        ,float p97,float p98,double p99,float p100,int p101,double p102,float p103
+        ,double p104,double p105,float p106,float p107,double p108,float p109,float p110
+        ,double p111,float p112,double p113,float p114,float p115,float p116,double p117
+        ,int p118,float p119,int p120,double p121,double p122,int p123,double p124
+        ,float p125,float p126    );
+    private static void nativeFnc41_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();double  p1=getRndDouble();int  p2=getRndInt();
+        double  p3=getRndDouble();int  p4=getRndInt();float  p5=getRndFloat();float  p6=getRndFloat();
+        float  p7=getRndFloat();int  p8=getRndInt();int  p9=getRndInt();float  p10=getRndFloat();
+        double  p11=getRndDouble();double  p12=getRndDouble();double  p13=getRndDouble();
+        int  p14=getRndInt();double  p15=getRndDouble();double  p16=getRndDouble();
+        float  p17=getRndFloat();double  p18=getRndDouble();double  p19=getRndDouble();
+        double  p20=getRndDouble();int  p21=getRndInt();double  p22=getRndDouble();
+        float  p23=getRndFloat();double  p24=getRndDouble();float  p25=getRndFloat();
+        double  p26=getRndDouble();double  p27=getRndDouble();int  p28=getRndInt();
+        double  p29=getRndDouble();double  p30=getRndDouble();int  p31=getRndInt();
+        double  p32=getRndDouble();double  p33=getRndDouble();float  p34=getRndFloat();
+        int  p35=getRndInt();double  p36=getRndDouble();int  p37=getRndInt();int  p38=getRndInt();
+        double  p39=getRndDouble();float  p40=getRndFloat();int  p41=getRndInt();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();int  p46=getRndInt();double  p47=getRndDouble();
+        float  p48=getRndFloat();float  p49=getRndFloat();float  p50=getRndFloat();
+        double  p51=getRndDouble();double  p52=getRndDouble();float  p53=getRndFloat();
+        float  p54=getRndFloat();double  p55=getRndDouble();float  p56=getRndFloat();
+        float  p57=getRndFloat();double  p58=getRndDouble();float  p59=getRndFloat();
+        double  p60=getRndDouble();float  p61=getRndFloat();double  p62=getRndDouble();
+        float  p63=getRndFloat();double  p64=getRndDouble();double  p65=getRndDouble();
+        double  p66=getRndDouble();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();float  p70=getRndFloat();float  p71=getRndFloat();
+        double  p72=getRndDouble();float  p73=getRndFloat();double  p74=getRndDouble();
+        float  p75=getRndFloat();int  p76=getRndInt();float  p77=getRndFloat();
+        double  p78=getRndDouble();int  p79=getRndInt();float  p80=getRndFloat();
+        float  p81=getRndFloat();double  p82=getRndDouble();double  p83=getRndDouble();
+        double  p84=getRndDouble();double  p85=getRndDouble();double  p86=getRndDouble();
+        float  p87=getRndFloat();float  p88=getRndFloat();float  p89=getRndFloat();
+        double  p90=getRndDouble();int  p91=getRndInt();float  p92=getRndFloat();
+        double  p93=getRndDouble();float  p94=getRndFloat();float  p95=getRndFloat();
+        float  p96=getRndFloat();float  p97=getRndFloat();float  p98=getRndFloat();
+        double  p99=getRndDouble();float  p100=getRndFloat();int  p101=getRndInt();
+        double  p102=getRndDouble();float  p103=getRndFloat();double  p104=getRndDouble();
+        double  p105=getRndDouble();float  p106=getRndFloat();float  p107=getRndFloat();
+        double  p108=getRndDouble();float  p109=getRndFloat();float  p110=getRndFloat();
+        double  p111=getRndDouble();float  p112=getRndFloat();double  p113=getRndDouble();
+        float  p114=getRndFloat();float  p115=getRndFloat();float  p116=getRndFloat();
+        double  p117=getRndDouble();int  p118=getRndInt();float  p119=getRndFloat();
+        int  p120=getRndInt();double  p121=getRndDouble();double  p122=getRndDouble();
+        int  p123=getRndInt();double  p124=getRndDouble();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%d\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%d\n",p8);ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%d\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%d\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%d\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%d\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%d\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%d\n",p37);
+        ps.format("p38=%d\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%d\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%d\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc41(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc42(float p0,float p1,double p2,double p3,float p4,double p5,double p6,float p7
+        ,double p8,double p9,float p10,double p11,byte p12,float p13,float p14,float p15
+        ,double p16,double p17,float p18,double p19,double p20,double p21,float p22
+        ,float p23,double p24,float p25,double p26,float p27,float p28,float p29
+        ,float p30,float p31,double p32,float p33,byte p34,float p35,double p36
+        ,float p37,double p38,float p39,double p40,byte p41,byte p42,double p43
+        ,float p44,double p45,float p46,float p47,double p48,double p49,float p50
+        ,double p51,double p52,double p53,double p54,float p55,double p56,float p57
+        ,byte p58,double p59,float p60,double p61,double p62,double p63,float p64
+        ,float p65,double p66,double p67,byte p68,float p69,float p70,double p71
+        ,float p72,float p73,double p74,double p75,float p76,float p77,float p78
+        ,double p79,double p80,double p81,byte p82,float p83,double p84,double p85
+        ,double p86,double p87,double p88,double p89,float p90,double p91,float p92
+        ,byte p93,float p94,double p95,double p96,float p97,double p98,float p99
+        ,float p100,float p101,double p102,double p103,double p104,float p105,float p106
+        ,float p107,float p108,double p109,float p110,double p111,double p112,double p113
+        ,float p114,double p115,float p116,byte p117,double p118,float p119,double p120
+        ,float p121,byte p122,float p123,double p124,float p125,float p126    );
+    private static void nativeFnc42_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();double  p2=getRndDouble();
+        double  p3=getRndDouble();float  p4=getRndFloat();double  p5=getRndDouble();
+        double  p6=getRndDouble();float  p7=getRndFloat();double  p8=getRndDouble();
+        double  p9=getRndDouble();float  p10=getRndFloat();double  p11=getRndDouble();
+        byte  p12=getRndByte();float  p13=getRndFloat();float  p14=getRndFloat();
+        float  p15=getRndFloat();double  p16=getRndDouble();double  p17=getRndDouble();
+        float  p18=getRndFloat();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();float  p22=getRndFloat();float  p23=getRndFloat();
+        double  p24=getRndDouble();float  p25=getRndFloat();double  p26=getRndDouble();
+        float  p27=getRndFloat();float  p28=getRndFloat();float  p29=getRndFloat();
+        float  p30=getRndFloat();float  p31=getRndFloat();double  p32=getRndDouble();
+        float  p33=getRndFloat();byte  p34=getRndByte();float  p35=getRndFloat();
+        double  p36=getRndDouble();float  p37=getRndFloat();double  p38=getRndDouble();
+        float  p39=getRndFloat();double  p40=getRndDouble();byte  p41=getRndByte();
+        byte  p42=getRndByte();double  p43=getRndDouble();float  p44=getRndFloat();
+        double  p45=getRndDouble();float  p46=getRndFloat();float  p47=getRndFloat();
+        double  p48=getRndDouble();double  p49=getRndDouble();float  p50=getRndFloat();
+        double  p51=getRndDouble();double  p52=getRndDouble();double  p53=getRndDouble();
+        double  p54=getRndDouble();float  p55=getRndFloat();double  p56=getRndDouble();
+        float  p57=getRndFloat();byte  p58=getRndByte();double  p59=getRndDouble();
+        float  p60=getRndFloat();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();float  p64=getRndFloat();float  p65=getRndFloat();
+        double  p66=getRndDouble();double  p67=getRndDouble();byte  p68=getRndByte();
+        float  p69=getRndFloat();float  p70=getRndFloat();double  p71=getRndDouble();
+        float  p72=getRndFloat();float  p73=getRndFloat();double  p74=getRndDouble();
+        double  p75=getRndDouble();float  p76=getRndFloat();float  p77=getRndFloat();
+        float  p78=getRndFloat();double  p79=getRndDouble();double  p80=getRndDouble();
+        double  p81=getRndDouble();byte  p82=getRndByte();float  p83=getRndFloat();
+        double  p84=getRndDouble();double  p85=getRndDouble();double  p86=getRndDouble();
+        double  p87=getRndDouble();double  p88=getRndDouble();double  p89=getRndDouble();
+        float  p90=getRndFloat();double  p91=getRndDouble();float  p92=getRndFloat();
+        byte  p93=getRndByte();float  p94=getRndFloat();double  p95=getRndDouble();
+        double  p96=getRndDouble();float  p97=getRndFloat();double  p98=getRndDouble();
+        float  p99=getRndFloat();float  p100=getRndFloat();float  p101=getRndFloat();
+        double  p102=getRndDouble();double  p103=getRndDouble();double  p104=getRndDouble();
+        float  p105=getRndFloat();float  p106=getRndFloat();float  p107=getRndFloat();
+        float  p108=getRndFloat();double  p109=getRndDouble();float  p110=getRndFloat();
+        double  p111=getRndDouble();double  p112=getRndDouble();double  p113=getRndDouble();
+        float  p114=getRndFloat();double  p115=getRndDouble();float  p116=getRndFloat();
+        byte  p117=getRndByte();double  p118=getRndDouble();float  p119=getRndFloat();
+        double  p120=getRndDouble();float  p121=getRndFloat();byte  p122=getRndByte();
+        float  p123=getRndFloat();double  p124=getRndDouble();float  p125=getRndFloat();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%d\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%d\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc42(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc43(float p0,int p1,float p2,float p3,float p4,float p5,float p6,int p7,float p8
+        ,float p9,float p10,float p11,float p12,float p13,int p14,float p15,float p16
+        ,float p17,float p18,float p19,float p20,float p21,float p22,float p23,float p24
+        ,float p25,float p26,float p27,float p28,float p29,float p30,float p31,int p32
+        ,float p33,float p34,float p35,float p36,float p37,float p38,float p39,float p40
+        ,float p41,int p42,float p43,float p44,float p45,float p46,float p47,float p48
+        ,int p49,int p50,int p51,float p52,float p53,float p54,float p55,float p56
+        ,float p57,float p58,float p59,float p60,int p61,float p62,int p63,float p64
+        ,float p65,float p66,float p67,float p68,float p69,float p70,float p71,float p72
+        ,float p73,float p74,float p75,float p76,float p77,float p78,int p79,int p80
+        ,int p81,float p82,float p83,float p84,float p85,float p86,float p87,float p88
+        ,float p89,float p90,float p91,float p92,float p93,float p94,float p95,float p96
+        ,float p97,float p98,float p99,float p100,float p101,float p102,float p103
+        ,float p104,float p105,float p106,float p107,float p108,float p109,float p110
+        ,int p111,float p112,float p113,float p114,float p115,float p116,float p117
+        ,float p118,float p119,float p120,float p121,float p122,float p123,float p124
+        ,int p125,float p126    );
+    private static void nativeFnc43_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();int  p1=getRndInt();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();float  p5=getRndFloat();
+        float  p6=getRndFloat();int  p7=getRndInt();float  p8=getRndFloat();float  p9=getRndFloat();
+        float  p10=getRndFloat();float  p11=getRndFloat();float  p12=getRndFloat();
+        float  p13=getRndFloat();int  p14=getRndInt();float  p15=getRndFloat();
+        float  p16=getRndFloat();float  p17=getRndFloat();float  p18=getRndFloat();
+        float  p19=getRndFloat();float  p20=getRndFloat();float  p21=getRndFloat();
+        float  p22=getRndFloat();float  p23=getRndFloat();float  p24=getRndFloat();
+        float  p25=getRndFloat();float  p26=getRndFloat();float  p27=getRndFloat();
+        float  p28=getRndFloat();float  p29=getRndFloat();float  p30=getRndFloat();
+        float  p31=getRndFloat();int  p32=getRndInt();float  p33=getRndFloat();
+        float  p34=getRndFloat();float  p35=getRndFloat();float  p36=getRndFloat();
+        float  p37=getRndFloat();float  p38=getRndFloat();float  p39=getRndFloat();
+        float  p40=getRndFloat();float  p41=getRndFloat();int  p42=getRndInt();
+        float  p43=getRndFloat();float  p44=getRndFloat();float  p45=getRndFloat();
+        float  p46=getRndFloat();float  p47=getRndFloat();float  p48=getRndFloat();
+        int  p49=getRndInt();int  p50=getRndInt();int  p51=getRndInt();float  p52=getRndFloat();
+        float  p53=getRndFloat();float  p54=getRndFloat();float  p55=getRndFloat();
+        float  p56=getRndFloat();float  p57=getRndFloat();float  p58=getRndFloat();
+        float  p59=getRndFloat();float  p60=getRndFloat();int  p61=getRndInt();
+        float  p62=getRndFloat();int  p63=getRndInt();float  p64=getRndFloat();
+        float  p65=getRndFloat();float  p66=getRndFloat();float  p67=getRndFloat();
+        float  p68=getRndFloat();float  p69=getRndFloat();float  p70=getRndFloat();
+        float  p71=getRndFloat();float  p72=getRndFloat();float  p73=getRndFloat();
+        float  p74=getRndFloat();float  p75=getRndFloat();float  p76=getRndFloat();
+        float  p77=getRndFloat();float  p78=getRndFloat();int  p79=getRndInt();
+        int  p80=getRndInt();int  p81=getRndInt();float  p82=getRndFloat();float  p83=getRndFloat();
+        float  p84=getRndFloat();float  p85=getRndFloat();float  p86=getRndFloat();
+        float  p87=getRndFloat();float  p88=getRndFloat();float  p89=getRndFloat();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        float  p93=getRndFloat();float  p94=getRndFloat();float  p95=getRndFloat();
+        float  p96=getRndFloat();float  p97=getRndFloat();float  p98=getRndFloat();
+        float  p99=getRndFloat();float  p100=getRndFloat();float  p101=getRndFloat();
+        float  p102=getRndFloat();float  p103=getRndFloat();float  p104=getRndFloat();
+        float  p105=getRndFloat();float  p106=getRndFloat();float  p107=getRndFloat();
+        float  p108=getRndFloat();float  p109=getRndFloat();float  p110=getRndFloat();
+        int  p111=getRndInt();float  p112=getRndFloat();float  p113=getRndFloat();
+        float  p114=getRndFloat();float  p115=getRndFloat();float  p116=getRndFloat();
+        float  p117=getRndFloat();float  p118=getRndFloat();float  p119=getRndFloat();
+        float  p120=getRndFloat();float  p121=getRndFloat();float  p122=getRndFloat();
+        float  p123=getRndFloat();float  p124=getRndFloat();int  p125=getRndInt();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%d\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%d\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%d\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%d\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%d\n",p49);
+        ps.format("p50=%d\n",p50);ps.format("p51=%d\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%d\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%d\n",p79);
+        ps.format("p80=%d\n",p80);ps.format("p81=%d\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%d\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%d\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc43(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc44(float p0,float p1,float p2,float p3,float p4,byte p5,float p6,float p7,float p8
+        ,float p9,float p10,float p11,float p12,float p13,float p14,byte p15,float p16
+        ,float p17,float p18,byte p19,float p20,float p21,float p22,float p23,float p24
+        ,byte p25,float p26,float p27,float p28,float p29,float p30,float p31,byte p32
+        ,byte p33,float p34,float p35,float p36,float p37,byte p38,float p39,float p40
+        ,byte p41,float p42,float p43,float p44,float p45,float p46,float p47,byte p48
+        ,float p49,byte p50,float p51,float p52,float p53,float p54,float p55,float p56
+        ,float p57,float p58,byte p59,float p60,float p61,float p62,float p63,float p64
+        ,float p65,byte p66,float p67,float p68,float p69,float p70,byte p71,float p72
+        ,byte p73,byte p74,float p75,float p76,byte p77,byte p78,float p79,float p80
+        ,float p81,float p82,float p83,float p84,float p85,float p86,float p87,float p88
+        ,float p89,float p90,float p91,float p92,byte p93,float p94,float p95,float p96
+        ,byte p97,float p98,float p99,float p100,byte p101,float p102,float p103
+        ,float p104,float p105,float p106,float p107,byte p108,float p109,float p110
+        ,float p111,float p112,byte p113,float p114,float p115,float p116,byte p117
+        ,float p118,float p119,float p120,byte p121,float p122,float p123,float p124
+        ,float p125,float p126    );
+    private static void nativeFnc44_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();byte  p5=getRndByte();float  p6=getRndFloat();
+        float  p7=getRndFloat();float  p8=getRndFloat();float  p9=getRndFloat();
+        float  p10=getRndFloat();float  p11=getRndFloat();float  p12=getRndFloat();
+        float  p13=getRndFloat();float  p14=getRndFloat();byte  p15=getRndByte();
+        float  p16=getRndFloat();float  p17=getRndFloat();float  p18=getRndFloat();
+        byte  p19=getRndByte();float  p20=getRndFloat();float  p21=getRndFloat();
+        float  p22=getRndFloat();float  p23=getRndFloat();float  p24=getRndFloat();
+        byte  p25=getRndByte();float  p26=getRndFloat();float  p27=getRndFloat();
+        float  p28=getRndFloat();float  p29=getRndFloat();float  p30=getRndFloat();
+        float  p31=getRndFloat();byte  p32=getRndByte();byte  p33=getRndByte();
+        float  p34=getRndFloat();float  p35=getRndFloat();float  p36=getRndFloat();
+        float  p37=getRndFloat();byte  p38=getRndByte();float  p39=getRndFloat();
+        float  p40=getRndFloat();byte  p41=getRndByte();float  p42=getRndFloat();
+        float  p43=getRndFloat();float  p44=getRndFloat();float  p45=getRndFloat();
+        float  p46=getRndFloat();float  p47=getRndFloat();byte  p48=getRndByte();
+        float  p49=getRndFloat();byte  p50=getRndByte();float  p51=getRndFloat();
+        float  p52=getRndFloat();float  p53=getRndFloat();float  p54=getRndFloat();
+        float  p55=getRndFloat();float  p56=getRndFloat();float  p57=getRndFloat();
+        float  p58=getRndFloat();byte  p59=getRndByte();float  p60=getRndFloat();
+        float  p61=getRndFloat();float  p62=getRndFloat();float  p63=getRndFloat();
+        float  p64=getRndFloat();float  p65=getRndFloat();byte  p66=getRndByte();
+        float  p67=getRndFloat();float  p68=getRndFloat();float  p69=getRndFloat();
+        float  p70=getRndFloat();byte  p71=getRndByte();float  p72=getRndFloat();
+        byte  p73=getRndByte();byte  p74=getRndByte();float  p75=getRndFloat();
+        float  p76=getRndFloat();byte  p77=getRndByte();byte  p78=getRndByte();
+        float  p79=getRndFloat();float  p80=getRndFloat();float  p81=getRndFloat();
+        float  p82=getRndFloat();float  p83=getRndFloat();float  p84=getRndFloat();
+        float  p85=getRndFloat();float  p86=getRndFloat();float  p87=getRndFloat();
+        float  p88=getRndFloat();float  p89=getRndFloat();float  p90=getRndFloat();
+        float  p91=getRndFloat();float  p92=getRndFloat();byte  p93=getRndByte();
+        float  p94=getRndFloat();float  p95=getRndFloat();float  p96=getRndFloat();
+        byte  p97=getRndByte();float  p98=getRndFloat();float  p99=getRndFloat();
+        float  p100=getRndFloat();byte  p101=getRndByte();float  p102=getRndFloat();
+        float  p103=getRndFloat();float  p104=getRndFloat();float  p105=getRndFloat();
+        float  p106=getRndFloat();float  p107=getRndFloat();byte  p108=getRndByte();
+        float  p109=getRndFloat();float  p110=getRndFloat();float  p111=getRndFloat();
+        float  p112=getRndFloat();byte  p113=getRndByte();float  p114=getRndFloat();
+        float  p115=getRndFloat();float  p116=getRndFloat();byte  p117=getRndByte();
+        float  p118=getRndFloat();float  p119=getRndFloat();float  p120=getRndFloat();
+        byte  p121=getRndByte();float  p122=getRndFloat();float  p123=getRndFloat();
+        float  p124=getRndFloat();float  p125=getRndFloat();float  p126=getRndFloat();
+
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%d\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%d\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%d\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%d\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%d\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%d\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);ps.format("p74=%d\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%d\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc44(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc45(byte p0,byte p1,float p2,float p3,float p4,byte p5,int p6,float p7,float p8
+        ,byte p9,float p10,byte p11,byte p12,float p13,float p14,float p15,float p16
+        ,byte p17,float p18,int p19,int p20,float p21,float p22,float p23,byte p24
+        ,byte p25,float p26,float p27,byte p28,float p29,float p30,float p31,float p32
+        ,float p33,float p34,int p35,float p36,int p37,float p38,float p39,float p40
+        ,float p41,float p42,byte p43,float p44,int p45,byte p46,float p47,float p48
+        ,float p49,byte p50,float p51,byte p52,float p53,float p54,float p55,float p56
+        ,float p57,float p58,float p59,int p60,int p61,float p62,byte p63,float p64
+        ,int p65,float p66,float p67,float p68,float p69,float p70,float p71,float p72
+        ,float p73,float p74,int p75,float p76,float p77,byte p78,float p79,float p80
+        ,float p81,float p82,byte p83,int p84,byte p85,float p86,int p87,float p88
+        ,float p89,float p90,float p91,float p92,int p93,float p94,float p95,int p96
+        ,float p97,byte p98,float p99,byte p100,float p101,int p102,float p103,float p104
+        ,int p105,float p106,float p107,int p108,float p109,float p110,float p111
+        ,float p112,int p113,float p114,float p115,float p116,float p117,float p118
+        ,int p119,float p120,byte p121,float p122,float p123,float p124,byte p125
+        ,float p126    );
+    private static void nativeFnc45_invoke(PrintStream ps)
+    {
+        byte  p0=getRndByte();byte  p1=getRndByte();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();byte  p5=getRndByte();int  p6=getRndInt();
+        float  p7=getRndFloat();float  p8=getRndFloat();byte  p9=getRndByte();float  p10=getRndFloat();
+        byte  p11=getRndByte();byte  p12=getRndByte();float  p13=getRndFloat();
+        float  p14=getRndFloat();float  p15=getRndFloat();float  p16=getRndFloat();
+        byte  p17=getRndByte();float  p18=getRndFloat();int  p19=getRndInt();int  p20=getRndInt();
+        float  p21=getRndFloat();float  p22=getRndFloat();float  p23=getRndFloat();
+        byte  p24=getRndByte();byte  p25=getRndByte();float  p26=getRndFloat();
+        float  p27=getRndFloat();byte  p28=getRndByte();float  p29=getRndFloat();
+        float  p30=getRndFloat();float  p31=getRndFloat();float  p32=getRndFloat();
+        float  p33=getRndFloat();float  p34=getRndFloat();int  p35=getRndInt();
+        float  p36=getRndFloat();int  p37=getRndInt();float  p38=getRndFloat();
+        float  p39=getRndFloat();float  p40=getRndFloat();float  p41=getRndFloat();
+        float  p42=getRndFloat();byte  p43=getRndByte();float  p44=getRndFloat();
+        int  p45=getRndInt();byte  p46=getRndByte();float  p47=getRndFloat();float  p48=getRndFloat();
+        float  p49=getRndFloat();byte  p50=getRndByte();float  p51=getRndFloat();
+        byte  p52=getRndByte();float  p53=getRndFloat();float  p54=getRndFloat();
+        float  p55=getRndFloat();float  p56=getRndFloat();float  p57=getRndFloat();
+        float  p58=getRndFloat();float  p59=getRndFloat();int  p60=getRndInt();
+        int  p61=getRndInt();float  p62=getRndFloat();byte  p63=getRndByte();float  p64=getRndFloat();
+        int  p65=getRndInt();float  p66=getRndFloat();float  p67=getRndFloat();
+        float  p68=getRndFloat();float  p69=getRndFloat();float  p70=getRndFloat();
+        float  p71=getRndFloat();float  p72=getRndFloat();float  p73=getRndFloat();
+        float  p74=getRndFloat();int  p75=getRndInt();float  p76=getRndFloat();
+        float  p77=getRndFloat();byte  p78=getRndByte();float  p79=getRndFloat();
+        float  p80=getRndFloat();float  p81=getRndFloat();float  p82=getRndFloat();
+        byte  p83=getRndByte();int  p84=getRndInt();byte  p85=getRndByte();float  p86=getRndFloat();
+        int  p87=getRndInt();float  p88=getRndFloat();float  p89=getRndFloat();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        int  p93=getRndInt();float  p94=getRndFloat();float  p95=getRndFloat();
+        int  p96=getRndInt();float  p97=getRndFloat();byte  p98=getRndByte();float  p99=getRndFloat();
+        byte  p100=getRndByte();float  p101=getRndFloat();int  p102=getRndInt();
+        float  p103=getRndFloat();float  p104=getRndFloat();int  p105=getRndInt();
+        float  p106=getRndFloat();float  p107=getRndFloat();int  p108=getRndInt();
+        float  p109=getRndFloat();float  p110=getRndFloat();float  p111=getRndFloat();
+        float  p112=getRndFloat();int  p113=getRndInt();float  p114=getRndFloat();
+        float  p115=getRndFloat();float  p116=getRndFloat();float  p117=getRndFloat();
+        float  p118=getRndFloat();int  p119=getRndInt();float  p120=getRndFloat();
+        byte  p121=getRndByte();float  p122=getRndFloat();float  p123=getRndFloat();
+        float  p124=getRndFloat();byte  p125=getRndByte();float  p126=getRndFloat();
+
+        ps.format("p0=%d\n",p0);ps.format("p1=%d\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%d\n",p5);
+        ps.format("p6=%d\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%d\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%d\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%d\n",p19);ps.format("p20=%d\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%d\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%d\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%d\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%d\n",p45);ps.format("p46=%d\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%d\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%d\n",p60);ps.format("p61=%d\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%d\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%d\n",p65);
+        ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%d\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);ps.format("p83=%d\n",p83);
+        ps.format("p84=%d\n",p84);ps.format("p85=%d\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%d\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%d\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%d\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%d\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%d\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%d\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc45(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc46(int p0,double p1,double p2,double p3,double p4,double p5,double p6,double p7
+        ,double p8,double p9,double p10,int p11,double p12,double p13,double p14
+        ,double p15,int p16,double p17,double p18,double p19,double p20,double p21
+        ,double p22,double p23,double p24,double p25,double p26,double p27,int p28
+        ,double p29,double p30,double p31,double p32,double p33,double p34,double p35
+        ,int p36,int p37,double p38,int p39,double p40,double p41,double p42,double p43
+        ,double p44,double p45,double p46,double p47,double p48,double p49,double p50
+        ,double p51,int p52,double p53,double p54,double p55,double p56,double p57
+        ,double p58,double p59,double p60,double p61,double p62,double p63,int p64
+        ,double p65,double p66,int p67,int p68,double p69,double p70,double p71
+        ,double p72,double p73,double p74,double p75,double p76,int p77,int p78
+        ,double p79,double p80,double p81,int p82,double p83,double p84,int p85
+        ,double p86,double p87,double p88,int p89,double p90,double p91,double p92
+        ,int p93,double p94,int p95,double p96,double p97,double p98,double p99
+        ,double p100,double p101,int p102,double p103,double p104,double p105,double p106
+        ,double p107,double p108,double p109,double p110,double p111,double p112
+        ,double p113,double p114,double p115,int p116,int p117,double p118,double p119
+        ,double p120,int p121,double p122,int p123,int p124,double p125,double p126
+            );
+    private static void nativeFnc46_invoke(PrintStream ps)
+    {
+        int  p0=getRndInt();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();double  p5=getRndDouble();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        double  p9=getRndDouble();double  p10=getRndDouble();int  p11=getRndInt();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();int  p16=getRndInt();double  p17=getRndDouble();
+        double  p18=getRndDouble();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();double  p22=getRndDouble();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        double  p27=getRndDouble();int  p28=getRndInt();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();double  p32=getRndDouble();
+        double  p33=getRndDouble();double  p34=getRndDouble();double  p35=getRndDouble();
+        int  p36=getRndInt();int  p37=getRndInt();double  p38=getRndDouble();int  p39=getRndInt();
+        double  p40=getRndDouble();double  p41=getRndDouble();double  p42=getRndDouble();
+        double  p43=getRndDouble();double  p44=getRndDouble();double  p45=getRndDouble();
+        double  p46=getRndDouble();double  p47=getRndDouble();double  p48=getRndDouble();
+        double  p49=getRndDouble();double  p50=getRndDouble();double  p51=getRndDouble();
+        int  p52=getRndInt();double  p53=getRndDouble();double  p54=getRndDouble();
+        double  p55=getRndDouble();double  p56=getRndDouble();double  p57=getRndDouble();
+        double  p58=getRndDouble();double  p59=getRndDouble();double  p60=getRndDouble();
+        double  p61=getRndDouble();double  p62=getRndDouble();double  p63=getRndDouble();
+        int  p64=getRndInt();double  p65=getRndDouble();double  p66=getRndDouble();
+        int  p67=getRndInt();int  p68=getRndInt();double  p69=getRndDouble();double  p70=getRndDouble();
+        double  p71=getRndDouble();double  p72=getRndDouble();double  p73=getRndDouble();
+        double  p74=getRndDouble();double  p75=getRndDouble();double  p76=getRndDouble();
+        int  p77=getRndInt();int  p78=getRndInt();double  p79=getRndDouble();double  p80=getRndDouble();
+        double  p81=getRndDouble();int  p82=getRndInt();double  p83=getRndDouble();
+        double  p84=getRndDouble();int  p85=getRndInt();double  p86=getRndDouble();
+        double  p87=getRndDouble();double  p88=getRndDouble();int  p89=getRndInt();
+        double  p90=getRndDouble();double  p91=getRndDouble();double  p92=getRndDouble();
+        int  p93=getRndInt();double  p94=getRndDouble();int  p95=getRndInt();double  p96=getRndDouble();
+        double  p97=getRndDouble();double  p98=getRndDouble();double  p99=getRndDouble();
+        double  p100=getRndDouble();double  p101=getRndDouble();int  p102=getRndInt();
+        double  p103=getRndDouble();double  p104=getRndDouble();double  p105=getRndDouble();
+        double  p106=getRndDouble();double  p107=getRndDouble();double  p108=getRndDouble();
+        double  p109=getRndDouble();double  p110=getRndDouble();double  p111=getRndDouble();
+        double  p112=getRndDouble();double  p113=getRndDouble();double  p114=getRndDouble();
+        double  p115=getRndDouble();int  p116=getRndInt();int  p117=getRndInt();
+        double  p118=getRndDouble();double  p119=getRndDouble();double  p120=getRndDouble();
+        int  p121=getRndInt();double  p122=getRndDouble();int  p123=getRndInt();
+        int  p124=getRndInt();double  p125=getRndDouble();double  p126=getRndDouble();
+
+        ps.format("p0=%d\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);ps.format("p11=%d\n",p11);
+        ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%d\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%e\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%e\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%d\n",p36);ps.format("p37=%d\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%d\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);
+        ps.format("p51=%e\n",p51);ps.format("p52=%d\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%d\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%e\n",p66);ps.format("p67=%d\n",p67);ps.format("p68=%d\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);ps.format("p89=%d\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%d\n",p93);ps.format("p94=%e\n",p94);ps.format("p95=%d\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);
+        ps.format("p102=%d\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%d\n",p116);
+        ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%e\n",p120);ps.format("p121=%d\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%d\n",p123);ps.format("p124=%d\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc46(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc47(double p0,double p1,double p2,double p3,byte p4,double p5,double p6,double p7
+        ,byte p8,byte p9,double p10,double p11,double p12,double p13,double p14
+        ,double p15,double p16,double p17,double p18,double p19,double p20,double p21
+        ,byte p22,double p23,double p24,double p25,double p26,byte p27,double p28
+        ,double p29,double p30,double p31,double p32,double p33,double p34,double p35
+        ,double p36,byte p37,byte p38,double p39,double p40,double p41,double p42
+        ,double p43,double p44,double p45,byte p46,double p47,double p48,double p49
+        ,double p50,double p51,byte p52,double p53,double p54,double p55,double p56
+        ,double p57,double p58,double p59,double p60,double p61,double p62,double p63
+        ,double p64,double p65,double p66,double p67,double p68,double p69,byte p70
+        ,double p71,double p72,double p73,double p74,double p75,double p76,double p77
+        ,double p78,double p79,double p80,double p81,double p82,double p83,double p84
+        ,double p85,double p86,double p87,double p88,double p89,double p90,double p91
+        ,double p92,double p93,byte p94,double p95,double p96,double p97,double p98
+        ,double p99,double p100,byte p101,double p102,double p103,byte p104,double p105
+        ,double p106,double p107,double p108,double p109,double p110,double p111
+        ,double p112,double p113,byte p114,double p115,double p116,double p117,double p118
+        ,double p119,byte p120,double p121,byte p122,double p123,double p124,double p125
+        ,double p126    );
+    private static void nativeFnc47_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();byte  p4=getRndByte();double  p5=getRndDouble();
+        double  p6=getRndDouble();double  p7=getRndDouble();byte  p8=getRndByte();
+        byte  p9=getRndByte();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        double  p18=getRndDouble();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();byte  p22=getRndByte();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();double  p26=getRndDouble();
+        byte  p27=getRndByte();double  p28=getRndDouble();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();double  p32=getRndDouble();
+        double  p33=getRndDouble();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();byte  p37=getRndByte();byte  p38=getRndByte();
+        double  p39=getRndDouble();double  p40=getRndDouble();double  p41=getRndDouble();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();byte  p46=getRndByte();double  p47=getRndDouble();
+        double  p48=getRndDouble();double  p49=getRndDouble();double  p50=getRndDouble();
+        double  p51=getRndDouble();byte  p52=getRndByte();double  p53=getRndDouble();
+        double  p54=getRndDouble();double  p55=getRndDouble();double  p56=getRndDouble();
+        double  p57=getRndDouble();double  p58=getRndDouble();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();double  p64=getRndDouble();double  p65=getRndDouble();
+        double  p66=getRndDouble();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();byte  p70=getRndByte();double  p71=getRndDouble();
+        double  p72=getRndDouble();double  p73=getRndDouble();double  p74=getRndDouble();
+        double  p75=getRndDouble();double  p76=getRndDouble();double  p77=getRndDouble();
+        double  p78=getRndDouble();double  p79=getRndDouble();double  p80=getRndDouble();
+        double  p81=getRndDouble();double  p82=getRndDouble();double  p83=getRndDouble();
+        double  p84=getRndDouble();double  p85=getRndDouble();double  p86=getRndDouble();
+        double  p87=getRndDouble();double  p88=getRndDouble();double  p89=getRndDouble();
+        double  p90=getRndDouble();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();byte  p94=getRndByte();double  p95=getRndDouble();
+        double  p96=getRndDouble();double  p97=getRndDouble();double  p98=getRndDouble();
+        double  p99=getRndDouble();double  p100=getRndDouble();byte  p101=getRndByte();
+        double  p102=getRndDouble();double  p103=getRndDouble();byte  p104=getRndByte();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();double  p109=getRndDouble();double  p110=getRndDouble();
+        double  p111=getRndDouble();double  p112=getRndDouble();double  p113=getRndDouble();
+        byte  p114=getRndByte();double  p115=getRndDouble();double  p116=getRndDouble();
+        double  p117=getRndDouble();double  p118=getRndDouble();double  p119=getRndDouble();
+        byte  p120=getRndByte();double  p121=getRndDouble();byte  p122=getRndByte();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%d\n",p8);ps.format("p9=%d\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%d\n",p37);
+        ps.format("p38=%d\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%d\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%d\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%d\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%d\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%d\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%d\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%d\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc47(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc48(int p0,double p1,double p2,double p3,byte p4,double p5,double p6,double p7
+        ,double p8,byte p9,int p10,double p11,byte p12,int p13,double p14,double p15
+        ,double p16,double p17,double p18,int p19,double p20,double p21,int p22
+        ,double p23,double p24,int p25,double p26,int p27,byte p28,byte p29,double p30
+        ,double p31,double p32,byte p33,double p34,double p35,double p36,double p37
+        ,double p38,double p39,double p40,double p41,byte p42,int p43,double p44
+        ,byte p45,double p46,byte p47,double p48,double p49,byte p50,byte p51,double p52
+        ,double p53,int p54,double p55,double p56,int p57,double p58,double p59
+        ,double p60,double p61,int p62,double p63,double p64,double p65,byte p66
+        ,double p67,double p68,double p69,double p70,double p71,double p72,byte p73
+        ,double p74,double p75,int p76,int p77,int p78,byte p79,double p80,double p81
+        ,byte p82,double p83,double p84,byte p85,double p86,int p87,int p88,double p89
+        ,double p90,double p91,double p92,double p93,int p94,double p95,double p96
+        ,double p97,byte p98,double p99,byte p100,byte p101,double p102,double p103
+        ,double p104,int p105,double p106,double p107,double p108,byte p109,double p110
+        ,double p111,double p112,double p113,double p114,double p115,double p116
+        ,double p117,double p118,double p119,int p120,double p121,double p122,double p123
+        ,double p124,double p125,double p126    );
+    private static void nativeFnc48_invoke(PrintStream ps)
+    {
+        int  p0=getRndInt();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();byte  p4=getRndByte();double  p5=getRndDouble();
+        double  p6=getRndDouble();double  p7=getRndDouble();double  p8=getRndDouble();
+        byte  p9=getRndByte();int  p10=getRndInt();double  p11=getRndDouble();byte  p12=getRndByte();
+        int  p13=getRndInt();double  p14=getRndDouble();double  p15=getRndDouble();
+        double  p16=getRndDouble();double  p17=getRndDouble();double  p18=getRndDouble();
+        int  p19=getRndInt();double  p20=getRndDouble();double  p21=getRndDouble();
+        int  p22=getRndInt();double  p23=getRndDouble();double  p24=getRndDouble();
+        int  p25=getRndInt();double  p26=getRndDouble();int  p27=getRndInt();byte  p28=getRndByte();
+        byte  p29=getRndByte();double  p30=getRndDouble();double  p31=getRndDouble();
+        double  p32=getRndDouble();byte  p33=getRndByte();double  p34=getRndDouble();
+        double  p35=getRndDouble();double  p36=getRndDouble();double  p37=getRndDouble();
+        double  p38=getRndDouble();double  p39=getRndDouble();double  p40=getRndDouble();
+        double  p41=getRndDouble();byte  p42=getRndByte();int  p43=getRndInt();
+        double  p44=getRndDouble();byte  p45=getRndByte();double  p46=getRndDouble();
+        byte  p47=getRndByte();double  p48=getRndDouble();double  p49=getRndDouble();
+        byte  p50=getRndByte();byte  p51=getRndByte();double  p52=getRndDouble();
+        double  p53=getRndDouble();int  p54=getRndInt();double  p55=getRndDouble();
+        double  p56=getRndDouble();int  p57=getRndInt();double  p58=getRndDouble();
+        double  p59=getRndDouble();double  p60=getRndDouble();double  p61=getRndDouble();
+        int  p62=getRndInt();double  p63=getRndDouble();double  p64=getRndDouble();
+        double  p65=getRndDouble();byte  p66=getRndByte();double  p67=getRndDouble();
+        double  p68=getRndDouble();double  p69=getRndDouble();double  p70=getRndDouble();
+        double  p71=getRndDouble();double  p72=getRndDouble();byte  p73=getRndByte();
+        double  p74=getRndDouble();double  p75=getRndDouble();int  p76=getRndInt();
+        int  p77=getRndInt();int  p78=getRndInt();byte  p79=getRndByte();double  p80=getRndDouble();
+        double  p81=getRndDouble();byte  p82=getRndByte();double  p83=getRndDouble();
+        double  p84=getRndDouble();byte  p85=getRndByte();double  p86=getRndDouble();
+        int  p87=getRndInt();int  p88=getRndInt();double  p89=getRndDouble();double  p90=getRndDouble();
+        double  p91=getRndDouble();double  p92=getRndDouble();double  p93=getRndDouble();
+        int  p94=getRndInt();double  p95=getRndDouble();double  p96=getRndDouble();
+        double  p97=getRndDouble();byte  p98=getRndByte();double  p99=getRndDouble();
+        byte  p100=getRndByte();byte  p101=getRndByte();double  p102=getRndDouble();
+        double  p103=getRndDouble();double  p104=getRndDouble();int  p105=getRndInt();
+        double  p106=getRndDouble();double  p107=getRndDouble();double  p108=getRndDouble();
+        byte  p109=getRndByte();double  p110=getRndDouble();double  p111=getRndDouble();
+        double  p112=getRndDouble();double  p113=getRndDouble();double  p114=getRndDouble();
+        double  p115=getRndDouble();double  p116=getRndDouble();double  p117=getRndDouble();
+        double  p118=getRndDouble();double  p119=getRndDouble();int  p120=getRndInt();
+        double  p121=getRndDouble();double  p122=getRndDouble();double  p123=getRndDouble();
+        double  p124=getRndDouble();double  p125=getRndDouble();double  p126=getRndDouble();
+
+        ps.format("p0=%d\n",p0);ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);
+        ps.format("p3=%e\n",p3);ps.format("p4=%d\n",p4);ps.format("p5=%e\n",p5);
+        ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);
+        ps.format("p9=%d\n",p9);ps.format("p10=%d\n",p10);ps.format("p11=%e\n",p11);
+        ps.format("p12=%d\n",p12);ps.format("p13=%d\n",p13);ps.format("p14=%e\n",p14);
+        ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);
+        ps.format("p18=%e\n",p18);ps.format("p19=%d\n",p19);ps.format("p20=%e\n",p20);
+        ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);ps.format("p23=%e\n",p23);
+        ps.format("p24=%e\n",p24);ps.format("p25=%d\n",p25);ps.format("p26=%e\n",p26);
+        ps.format("p27=%d\n",p27);ps.format("p28=%d\n",p28);ps.format("p29=%d\n",p29);
+        ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);ps.format("p32=%e\n",p32);
+        ps.format("p33=%d\n",p33);ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);
+        ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);
+        ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);
+        ps.format("p42=%d\n",p42);ps.format("p43=%d\n",p43);ps.format("p44=%e\n",p44);
+        ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);ps.format("p47=%d\n",p47);
+        ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);ps.format("p50=%d\n",p50);
+        ps.format("p51=%d\n",p51);ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);
+        ps.format("p54=%d\n",p54);ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);
+        ps.format("p57=%d\n",p57);ps.format("p58=%e\n",p58);ps.format("p59=%e\n",p59);
+        ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);ps.format("p62=%d\n",p62);
+        ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);
+        ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);ps.format("p68=%e\n",p68);
+        ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);ps.format("p71=%e\n",p71);
+        ps.format("p72=%e\n",p72);ps.format("p73=%d\n",p73);ps.format("p74=%e\n",p74);
+        ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);ps.format("p77=%d\n",p77);
+        ps.format("p78=%d\n",p78);ps.format("p79=%d\n",p79);ps.format("p80=%e\n",p80);
+        ps.format("p81=%e\n",p81);ps.format("p82=%d\n",p82);ps.format("p83=%e\n",p83);
+        ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);ps.format("p86=%e\n",p86);
+        ps.format("p87=%d\n",p87);ps.format("p88=%d\n",p88);ps.format("p89=%e\n",p89);
+        ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);
+        ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);
+        ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);ps.format("p98=%d\n",p98);
+        ps.format("p99=%e\n",p99);ps.format("p100=%d\n",p100);ps.format("p101=%d\n",p101);
+        ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);
+        ps.format("p105=%d\n",p105);ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);
+        ps.format("p108=%e\n",p108);ps.format("p109=%d\n",p109);ps.format("p110=%e\n",p110);
+        ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);
+        ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);
+        ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);
+        ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);
+        ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);
+        ps.format("p126=%e\n",p126);
+        nativeFnc48(p0,p1,p2,p3,p4,p5,p6,p7
+        ,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26
+        ,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44
+        ,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62
+        ,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80
+        ,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98
+        ,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108,p109,p110,p111,p112,p113
+        ,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc49(float p0,float p1,double p2,float p3,float p4,byte p5,double p6,int p7,double p8
+        ,float p9,byte p10,float p11,double p12,float p13,double p14,double p15
+        ,double p16,float p17,float p18,double p19,float p20,float p21,int p22,float p23
+        ,byte p24,float p25,byte p26,double p27,double p28,double p29,double p30
+        ,double p31,double p32,int p33,float p34,float p35,byte p36,float p37,float p38
+        ,float p39,double p40,byte p41,int p42,float p43,double p44,float p45,double p46
+        ,int p47,byte p48,double p49,float p50,double p51,float p52,float p53,float p54
+        ,float p55,float p56,double p57,byte p58,float p59,float p60,float p61,float p62
+        ,float p63,float p64,float p65,byte p66,double p67,byte p68,float p69,float p70
+        ,double p71,double p72,double p73,int p74,double p75,float p76,float p77
+        ,float p78,float p79,double p80,float p81,double p82,float p83,float p84
+        ,int p85,float p86,double p87,double p88,float p89,int p90,double p91,double p92
+        ,double p93,float p94,float p95,double p96,double p97,float p98,double p99
+        ,float p100,float p101,float p102,float p103,double p104,float p105,double p106
+        ,float p107,double p108,float p109,float p110,double p111,float p112,byte p113
+        ,float p114,double p115,double p116,float p117,double p118,double p119,byte p120
+        ,float p121,float p122,byte p123,double p124,double p125,float p126    );
+    private static void nativeFnc49_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();double  p2=getRndDouble();
+        float  p3=getRndFloat();float  p4=getRndFloat();byte  p5=getRndByte();double  p6=getRndDouble();
+        int  p7=getRndInt();double  p8=getRndDouble();float  p9=getRndFloat();byte  p10=getRndByte();
+        float  p11=getRndFloat();double  p12=getRndDouble();float  p13=getRndFloat();
+        double  p14=getRndDouble();double  p15=getRndDouble();double  p16=getRndDouble();
+        float  p17=getRndFloat();float  p18=getRndFloat();double  p19=getRndDouble();
+        float  p20=getRndFloat();float  p21=getRndFloat();int  p22=getRndInt();
+        float  p23=getRndFloat();byte  p24=getRndByte();float  p25=getRndFloat();
+        byte  p26=getRndByte();double  p27=getRndDouble();double  p28=getRndDouble();
+        double  p29=getRndDouble();double  p30=getRndDouble();double  p31=getRndDouble();
+        double  p32=getRndDouble();int  p33=getRndInt();float  p34=getRndFloat();
+        float  p35=getRndFloat();byte  p36=getRndByte();float  p37=getRndFloat();
+        float  p38=getRndFloat();float  p39=getRndFloat();double  p40=getRndDouble();
+        byte  p41=getRndByte();int  p42=getRndInt();float  p43=getRndFloat();double  p44=getRndDouble();
+        float  p45=getRndFloat();double  p46=getRndDouble();int  p47=getRndInt();
+        byte  p48=getRndByte();double  p49=getRndDouble();float  p50=getRndFloat();
+        double  p51=getRndDouble();float  p52=getRndFloat();float  p53=getRndFloat();
+        float  p54=getRndFloat();float  p55=getRndFloat();float  p56=getRndFloat();
+        double  p57=getRndDouble();byte  p58=getRndByte();float  p59=getRndFloat();
+        float  p60=getRndFloat();float  p61=getRndFloat();float  p62=getRndFloat();
+        float  p63=getRndFloat();float  p64=getRndFloat();float  p65=getRndFloat();
+        byte  p66=getRndByte();double  p67=getRndDouble();byte  p68=getRndByte();
+        float  p69=getRndFloat();float  p70=getRndFloat();double  p71=getRndDouble();
+        double  p72=getRndDouble();double  p73=getRndDouble();int  p74=getRndInt();
+        double  p75=getRndDouble();float  p76=getRndFloat();float  p77=getRndFloat();
+        float  p78=getRndFloat();float  p79=getRndFloat();double  p80=getRndDouble();
+        float  p81=getRndFloat();double  p82=getRndDouble();float  p83=getRndFloat();
+        float  p84=getRndFloat();int  p85=getRndInt();float  p86=getRndFloat();
+        double  p87=getRndDouble();double  p88=getRndDouble();float  p89=getRndFloat();
+        int  p90=getRndInt();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();float  p94=getRndFloat();float  p95=getRndFloat();
+        double  p96=getRndDouble();double  p97=getRndDouble();float  p98=getRndFloat();
+        double  p99=getRndDouble();float  p100=getRndFloat();float  p101=getRndFloat();
+        float  p102=getRndFloat();float  p103=getRndFloat();double  p104=getRndDouble();
+        float  p105=getRndFloat();double  p106=getRndDouble();float  p107=getRndFloat();
+        double  p108=getRndDouble();float  p109=getRndFloat();float  p110=getRndFloat();
+        double  p111=getRndDouble();float  p112=getRndFloat();byte  p113=getRndByte();
+        float  p114=getRndFloat();double  p115=getRndDouble();double  p116=getRndDouble();
+        float  p117=getRndFloat();double  p118=getRndDouble();double  p119=getRndDouble();
+        byte  p120=getRndByte();float  p121=getRndFloat();float  p122=getRndFloat();
+        byte  p123=getRndByte();double  p124=getRndDouble();double  p125=getRndDouble();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%d\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%d\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%d\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%d\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%d\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%d\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%d\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%d\n",p41);ps.format("p42=%d\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%d\n",p47);ps.format("p48=%d\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%d\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%d\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%d\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%d\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%d\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%d\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc49(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc50(double p0,double p1,double p2,double p3,float p4,float p5,double p6,float p7
+        ,double p8,float p9,double p10,double p11,double p12,double p13,double p14
+        ,double p15,float p16,double p17,float p18,double p19,float p20,double p21
+        ,float p22,double p23,double p24,double p25,float p26,double p27,double p28
+        ,double p29,double p30,double p31,float p32,float p33,double p34,double p35
+        ,double p36,double p37,float p38,double p39,double p40,double p41,double p42
+        ,double p43,double p44,double p45,double p46,float p47,double p48,float p49
+        ,double p50,double p51,double p52,double p53,double p54,double p55,double p56
+        ,double p57,double p58,double p59,double p60,double p61,float p62,float p63
+        ,double p64,double p65,double p66,double p67,double p68,double p69,double p70
+        ,float p71,double p72,double p73,float p74,double p75,double p76,double p77
+        ,double p78,double p79,double p80,double p81,double p82,float p83,float p84
+        ,double p85,double p86,float p87,double p88,double p89,float p90,double p91
+        ,double p92,double p93,float p94,double p95,float p96,double p97,double p98
+        ,float p99,double p100,float p101,double p102,double p103,double p104,double p105
+        ,double p106,double p107,double p108,double p109,float p110,double p111
+        ,double p112,double p113,double p114,float p115,double p116,double p117
+        ,double p118,float p119,double p120,double p121,double p122,double p123
+        ,double p124,double p125,double p126    );
+    private static void nativeFnc50_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();float  p4=getRndFloat();float  p5=getRndFloat();
+        double  p6=getRndDouble();float  p7=getRndFloat();double  p8=getRndDouble();
+        float  p9=getRndFloat();double  p10=getRndDouble();double  p11=getRndDouble();
+        double  p12=getRndDouble();double  p13=getRndDouble();double  p14=getRndDouble();
+        double  p15=getRndDouble();float  p16=getRndFloat();double  p17=getRndDouble();
+        float  p18=getRndFloat();double  p19=getRndDouble();float  p20=getRndFloat();
+        double  p21=getRndDouble();float  p22=getRndFloat();double  p23=getRndDouble();
+        double  p24=getRndDouble();double  p25=getRndDouble();float  p26=getRndFloat();
+        double  p27=getRndDouble();double  p28=getRndDouble();double  p29=getRndDouble();
+        double  p30=getRndDouble();double  p31=getRndDouble();float  p32=getRndFloat();
+        float  p33=getRndFloat();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();double  p37=getRndDouble();float  p38=getRndFloat();
+        double  p39=getRndDouble();double  p40=getRndDouble();double  p41=getRndDouble();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        double  p45=getRndDouble();double  p46=getRndDouble();float  p47=getRndFloat();
+        double  p48=getRndDouble();float  p49=getRndFloat();double  p50=getRndDouble();
+        double  p51=getRndDouble();double  p52=getRndDouble();double  p53=getRndDouble();
+        double  p54=getRndDouble();double  p55=getRndDouble();double  p56=getRndDouble();
+        double  p57=getRndDouble();double  p58=getRndDouble();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();float  p62=getRndFloat();
+        float  p63=getRndFloat();double  p64=getRndDouble();double  p65=getRndDouble();
+        double  p66=getRndDouble();double  p67=getRndDouble();double  p68=getRndDouble();
+        double  p69=getRndDouble();double  p70=getRndDouble();float  p71=getRndFloat();
+        double  p72=getRndDouble();double  p73=getRndDouble();float  p74=getRndFloat();
+        double  p75=getRndDouble();double  p76=getRndDouble();double  p77=getRndDouble();
+        double  p78=getRndDouble();double  p79=getRndDouble();double  p80=getRndDouble();
+        double  p81=getRndDouble();double  p82=getRndDouble();float  p83=getRndFloat();
+        float  p84=getRndFloat();double  p85=getRndDouble();double  p86=getRndDouble();
+        float  p87=getRndFloat();double  p88=getRndDouble();double  p89=getRndDouble();
+        float  p90=getRndFloat();double  p91=getRndDouble();double  p92=getRndDouble();
+        double  p93=getRndDouble();float  p94=getRndFloat();double  p95=getRndDouble();
+        float  p96=getRndFloat();double  p97=getRndDouble();double  p98=getRndDouble();
+        float  p99=getRndFloat();double  p100=getRndDouble();float  p101=getRndFloat();
+        double  p102=getRndDouble();double  p103=getRndDouble();double  p104=getRndDouble();
+        double  p105=getRndDouble();double  p106=getRndDouble();double  p107=getRndDouble();
+        double  p108=getRndDouble();double  p109=getRndDouble();float  p110=getRndFloat();
+        double  p111=getRndDouble();double  p112=getRndDouble();double  p113=getRndDouble();
+        double  p114=getRndDouble();float  p115=getRndFloat();double  p116=getRndDouble();
+        double  p117=getRndDouble();double  p118=getRndDouble();float  p119=getRndFloat();
+        double  p120=getRndDouble();double  p121=getRndDouble();double  p122=getRndDouble();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        double  p126=getRndDouble();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%e\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%e\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%e\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%e\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%e\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%e\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%e\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);ps.format("p103=%e\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%e\n",p112);
+        ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc50(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    native public static void nativeFnc51(float p0,float p1,float p2,float p3,float p4,double p5,float p6,float p7
+        ,double p8,double p9,int p10,float p11,double p12,double p13,float p14,double p15
+        ,double p16,double p17,double p18,double p19,float p20,double p21,float p22
+        ,int p23,double p24,double p25,float p26,int p27,double p28,float p29,float p30
+        ,double p31,int p32,int p33,float p34,float p35,double p36,float p37,float p38
+        ,float p39,float p40,float p41,double p42,double p43,double p44,int p45
+        ,double p46,float p47,float p48,double p49,double p50,float p51,float p52
+        ,float p53,double p54,float p55,double p56,float p57,float p58,int p59,int p60
+        ,double p61,double p62,double p63,float p64,float p65,double p66,int p67
+        ,int p68,float p69,int p70,double p71,int p72,float p73,float p74,double p75
+        ,double p76,double p77,float p78,float p79,float p80,double p81,double p82
+        ,float p83,float p84,double p85,float p86,int p87,float p88,float p89,double p90
+        ,float p91,double p92,double p93,int p94,float p95,float p96,float p97,double p98
+        ,double p99,double p100,double p101,float p102,float p103,double p104,float p105
+        ,double p106,double p107,float p108,float p109,double p110,float p111,float p112
+        ,float p113,float p114,float p115,double p116,float p117,double p118,double p119
+        ,double p120,float p121,float p122,float p123,double p124,double p125,float p126
+            );
+    private static void nativeFnc51_invoke(PrintStream ps)
+    {
+        float  p0=getRndFloat();float  p1=getRndFloat();float  p2=getRndFloat();
+        float  p3=getRndFloat();float  p4=getRndFloat();double  p5=getRndDouble();
+        float  p6=getRndFloat();float  p7=getRndFloat();double  p8=getRndDouble();
+        double  p9=getRndDouble();int  p10=getRndInt();float  p11=getRndFloat();
+        double  p12=getRndDouble();double  p13=getRndDouble();float  p14=getRndFloat();
+        double  p15=getRndDouble();double  p16=getRndDouble();double  p17=getRndDouble();
+        double  p18=getRndDouble();double  p19=getRndDouble();float  p20=getRndFloat();
+        double  p21=getRndDouble();float  p22=getRndFloat();int  p23=getRndInt();
+        double  p24=getRndDouble();double  p25=getRndDouble();float  p26=getRndFloat();
+        int  p27=getRndInt();double  p28=getRndDouble();float  p29=getRndFloat();
+        float  p30=getRndFloat();double  p31=getRndDouble();int  p32=getRndInt();
+        int  p33=getRndInt();float  p34=getRndFloat();float  p35=getRndFloat();
+        double  p36=getRndDouble();float  p37=getRndFloat();float  p38=getRndFloat();
+        float  p39=getRndFloat();float  p40=getRndFloat();float  p41=getRndFloat();
+        double  p42=getRndDouble();double  p43=getRndDouble();double  p44=getRndDouble();
+        int  p45=getRndInt();double  p46=getRndDouble();float  p47=getRndFloat();
+        float  p48=getRndFloat();double  p49=getRndDouble();double  p50=getRndDouble();
+        float  p51=getRndFloat();float  p52=getRndFloat();float  p53=getRndFloat();
+        double  p54=getRndDouble();float  p55=getRndFloat();double  p56=getRndDouble();
+        float  p57=getRndFloat();float  p58=getRndFloat();int  p59=getRndInt();
+        int  p60=getRndInt();double  p61=getRndDouble();double  p62=getRndDouble();
+        double  p63=getRndDouble();float  p64=getRndFloat();float  p65=getRndFloat();
+        double  p66=getRndDouble();int  p67=getRndInt();int  p68=getRndInt();float  p69=getRndFloat();
+        int  p70=getRndInt();double  p71=getRndDouble();int  p72=getRndInt();float  p73=getRndFloat();
+        float  p74=getRndFloat();double  p75=getRndDouble();double  p76=getRndDouble();
+        double  p77=getRndDouble();float  p78=getRndFloat();float  p79=getRndFloat();
+        float  p80=getRndFloat();double  p81=getRndDouble();double  p82=getRndDouble();
+        float  p83=getRndFloat();float  p84=getRndFloat();double  p85=getRndDouble();
+        float  p86=getRndFloat();int  p87=getRndInt();float  p88=getRndFloat();
+        float  p89=getRndFloat();double  p90=getRndDouble();float  p91=getRndFloat();
+        double  p92=getRndDouble();double  p93=getRndDouble();int  p94=getRndInt();
+        float  p95=getRndFloat();float  p96=getRndFloat();float  p97=getRndFloat();
+        double  p98=getRndDouble();double  p99=getRndDouble();double  p100=getRndDouble();
+        double  p101=getRndDouble();float  p102=getRndFloat();float  p103=getRndFloat();
+        double  p104=getRndDouble();float  p105=getRndFloat();double  p106=getRndDouble();
+        double  p107=getRndDouble();float  p108=getRndFloat();float  p109=getRndFloat();
+        double  p110=getRndDouble();float  p111=getRndFloat();float  p112=getRndFloat();
+        float  p113=getRndFloat();float  p114=getRndFloat();float  p115=getRndFloat();
+        double  p116=getRndDouble();float  p117=getRndFloat();double  p118=getRndDouble();
+        double  p119=getRndDouble();double  p120=getRndDouble();float  p121=getRndFloat();
+        float  p122=getRndFloat();float  p123=getRndFloat();double  p124=getRndDouble();
+        double  p125=getRndDouble();float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);
+        ps.format("p1=%e\n",p1);ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);
+        ps.format("p4=%e\n",p4);ps.format("p5=%e\n",p5);ps.format("p6=%e\n",p6);
+        ps.format("p7=%e\n",p7);ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);
+        ps.format("p10=%d\n",p10);ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);
+        ps.format("p13=%e\n",p13);ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);
+        ps.format("p16=%e\n",p16);ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);
+        ps.format("p19=%e\n",p19);ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);
+        ps.format("p22=%e\n",p22);ps.format("p23=%d\n",p23);ps.format("p24=%e\n",p24);
+        ps.format("p25=%e\n",p25);ps.format("p26=%e\n",p26);ps.format("p27=%d\n",p27);
+        ps.format("p28=%e\n",p28);ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);
+        ps.format("p31=%e\n",p31);ps.format("p32=%d\n",p32);ps.format("p33=%d\n",p33);
+        ps.format("p34=%e\n",p34);ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);
+        ps.format("p37=%e\n",p37);ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);
+        ps.format("p40=%e\n",p40);ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);
+        ps.format("p43=%e\n",p43);ps.format("p44=%e\n",p44);ps.format("p45=%d\n",p45);
+        ps.format("p46=%e\n",p46);ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);
+        ps.format("p49=%e\n",p49);ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);
+        ps.format("p52=%e\n",p52);ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);
+        ps.format("p55=%e\n",p55);ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);
+        ps.format("p58=%e\n",p58);ps.format("p59=%d\n",p59);ps.format("p60=%d\n",p60);
+        ps.format("p61=%e\n",p61);ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);
+        ps.format("p64=%e\n",p64);ps.format("p65=%e\n",p65);ps.format("p66=%e\n",p66);
+        ps.format("p67=%d\n",p67);ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);
+        ps.format("p70=%d\n",p70);ps.format("p71=%e\n",p71);ps.format("p72=%d\n",p72);
+        ps.format("p73=%e\n",p73);ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);
+        ps.format("p76=%e\n",p76);ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);
+        ps.format("p79=%e\n",p79);ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);
+        ps.format("p82=%e\n",p82);ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);
+        ps.format("p85=%e\n",p85);ps.format("p86=%e\n",p86);ps.format("p87=%d\n",p87);
+        ps.format("p88=%e\n",p88);ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);
+        ps.format("p91=%e\n",p91);ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);
+        ps.format("p94=%d\n",p94);ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);
+        ps.format("p97=%e\n",p97);ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);
+        ps.format("p100=%e\n",p100);ps.format("p101=%e\n",p101);ps.format("p102=%e\n",p102);
+        ps.format("p103=%e\n",p103);ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);
+        ps.format("p106=%e\n",p106);ps.format("p107=%e\n",p107);ps.format("p108=%e\n",p108);
+        ps.format("p109=%e\n",p109);ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);
+        ps.format("p112=%e\n",p112);ps.format("p113=%e\n",p113);ps.format("p114=%e\n",p114);
+        ps.format("p115=%e\n",p115);ps.format("p116=%e\n",p116);ps.format("p117=%e\n",p117);
+        ps.format("p118=%e\n",p118);ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);
+        ps.format("p121=%e\n",p121);ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);
+        ps.format("p124=%e\n",p124);ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+
+        nativeFnc51(p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15
+        ,p16,p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33
+        ,p34,p35,p36,p37,p38,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51
+        ,p52,p53,p54,p55,p56,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69
+        ,p70,p71,p72,p73,p74,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87
+        ,p88,p89,p90,p91,p92,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104
+        ,p105,p106,p107,p108,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119
+        ,p120,p121,p122,p123,p124,p125,p126);
+}
+
+    native public static void nativeFnc52(double p0,double p1,double p2,double p3,double p4,byte p5,float p6,double p7
+        ,float p8,float p9,float p10,float p11,double p12,float p13,double p14,double p15
+        ,double p16,float p17,float p18,double p19,double p20,double p21,double p22
+        ,float p23,double p24,float p25,float p26,double p27,double p28,float p29
+        ,double p30,float p31,float p32,float p33,double p34,double p35,double p36
+        ,float p37,float p38,double p39,double p40,float p41,float p42,float p43
+        ,float p44,byte p45,float p46,double p47,float p48,float p49,double p50
+        ,float p51,byte p52,float p53,float p54,double p55,float p56,double p57
+        ,byte p58,double p59,double p60,double p61,double p62,float p63,double p64
+        ,byte p65,float p66,float p67,byte p68,double p69,byte p70,double p71,double p72
+        ,double p73,float p74,double p75,byte p76,double p77,double p78,double p79
+        ,double p80,float p81,double p82,double p83,double p84,float p85,float p86
+        ,float p87,float p88,double p89,float p90,float p91,float p92,double p93
+        ,byte p94,double p95,float p96,float p97,double p98,double p99,float p100
+        ,double p101,byte p102,byte p103,float p104,float p105,double p106,float p107
+        ,byte p108,float p109,double p110,float p111,byte p112,byte p113,double p114
+        ,double p115,double p116,byte p117,float p118,double p119,double p120,float p121
+        ,double p122,double p123,double p124,double p125,float p126    );
+    private static void nativeFnc52_invoke(PrintStream ps)
+    {
+        double  p0=getRndDouble();double  p1=getRndDouble();double  p2=getRndDouble();
+        double  p3=getRndDouble();double  p4=getRndDouble();byte  p5=getRndByte();
+        float  p6=getRndFloat();double  p7=getRndDouble();float  p8=getRndFloat();
+        float  p9=getRndFloat();float  p10=getRndFloat();float  p11=getRndFloat();
+        double  p12=getRndDouble();float  p13=getRndFloat();double  p14=getRndDouble();
+        double  p15=getRndDouble();double  p16=getRndDouble();float  p17=getRndFloat();
+        float  p18=getRndFloat();double  p19=getRndDouble();double  p20=getRndDouble();
+        double  p21=getRndDouble();double  p22=getRndDouble();float  p23=getRndFloat();
+        double  p24=getRndDouble();float  p25=getRndFloat();float  p26=getRndFloat();
+        double  p27=getRndDouble();double  p28=getRndDouble();float  p29=getRndFloat();
+        double  p30=getRndDouble();float  p31=getRndFloat();float  p32=getRndFloat();
+        float  p33=getRndFloat();double  p34=getRndDouble();double  p35=getRndDouble();
+        double  p36=getRndDouble();float  p37=getRndFloat();float  p38=getRndFloat();
+        double  p39=getRndDouble();double  p40=getRndDouble();float  p41=getRndFloat();
+        float  p42=getRndFloat();float  p43=getRndFloat();float  p44=getRndFloat();
+        byte  p45=getRndByte();float  p46=getRndFloat();double  p47=getRndDouble();
+        float  p48=getRndFloat();float  p49=getRndFloat();double  p50=getRndDouble();
+        float  p51=getRndFloat();byte  p52=getRndByte();float  p53=getRndFloat();
+        float  p54=getRndFloat();double  p55=getRndDouble();float  p56=getRndFloat();
+        double  p57=getRndDouble();byte  p58=getRndByte();double  p59=getRndDouble();
+        double  p60=getRndDouble();double  p61=getRndDouble();double  p62=getRndDouble();
+        float  p63=getRndFloat();double  p64=getRndDouble();byte  p65=getRndByte();
+        float  p66=getRndFloat();float  p67=getRndFloat();byte  p68=getRndByte();
+        double  p69=getRndDouble();byte  p70=getRndByte();double  p71=getRndDouble();
+        double  p72=getRndDouble();double  p73=getRndDouble();float  p74=getRndFloat();
+        double  p75=getRndDouble();byte  p76=getRndByte();double  p77=getRndDouble();
+        double  p78=getRndDouble();double  p79=getRndDouble();double  p80=getRndDouble();
+        float  p81=getRndFloat();double  p82=getRndDouble();double  p83=getRndDouble();
+        double  p84=getRndDouble();float  p85=getRndFloat();float  p86=getRndFloat();
+        float  p87=getRndFloat();float  p88=getRndFloat();double  p89=getRndDouble();
+        float  p90=getRndFloat();float  p91=getRndFloat();float  p92=getRndFloat();
+        double  p93=getRndDouble();byte  p94=getRndByte();double  p95=getRndDouble();
+        float  p96=getRndFloat();float  p97=getRndFloat();double  p98=getRndDouble();
+        double  p99=getRndDouble();float  p100=getRndFloat();double  p101=getRndDouble();
+        byte  p102=getRndByte();byte  p103=getRndByte();float  p104=getRndFloat();
+        float  p105=getRndFloat();double  p106=getRndDouble();float  p107=getRndFloat();
+        byte  p108=getRndByte();float  p109=getRndFloat();double  p110=getRndDouble();
+        float  p111=getRndFloat();byte  p112=getRndByte();byte  p113=getRndByte();
+        double  p114=getRndDouble();double  p115=getRndDouble();double  p116=getRndDouble();
+        byte  p117=getRndByte();float  p118=getRndFloat();double  p119=getRndDouble();
+        double  p120=getRndDouble();float  p121=getRndFloat();double  p122=getRndDouble();
+        double  p123=getRndDouble();double  p124=getRndDouble();double  p125=getRndDouble();
+        float  p126=getRndFloat();
+        ps.format("p0=%e\n",p0);ps.format("p1=%e\n",p1);
+        ps.format("p2=%e\n",p2);ps.format("p3=%e\n",p3);ps.format("p4=%e\n",p4);
+        ps.format("p5=%d\n",p5);ps.format("p6=%e\n",p6);ps.format("p7=%e\n",p7);
+        ps.format("p8=%e\n",p8);ps.format("p9=%e\n",p9);ps.format("p10=%e\n",p10);
+        ps.format("p11=%e\n",p11);ps.format("p12=%e\n",p12);ps.format("p13=%e\n",p13);
+        ps.format("p14=%e\n",p14);ps.format("p15=%e\n",p15);ps.format("p16=%e\n",p16);
+        ps.format("p17=%e\n",p17);ps.format("p18=%e\n",p18);ps.format("p19=%e\n",p19);
+        ps.format("p20=%e\n",p20);ps.format("p21=%e\n",p21);ps.format("p22=%e\n",p22);
+        ps.format("p23=%e\n",p23);ps.format("p24=%e\n",p24);ps.format("p25=%e\n",p25);
+        ps.format("p26=%e\n",p26);ps.format("p27=%e\n",p27);ps.format("p28=%e\n",p28);
+        ps.format("p29=%e\n",p29);ps.format("p30=%e\n",p30);ps.format("p31=%e\n",p31);
+        ps.format("p32=%e\n",p32);ps.format("p33=%e\n",p33);ps.format("p34=%e\n",p34);
+        ps.format("p35=%e\n",p35);ps.format("p36=%e\n",p36);ps.format("p37=%e\n",p37);
+        ps.format("p38=%e\n",p38);ps.format("p39=%e\n",p39);ps.format("p40=%e\n",p40);
+        ps.format("p41=%e\n",p41);ps.format("p42=%e\n",p42);ps.format("p43=%e\n",p43);
+        ps.format("p44=%e\n",p44);ps.format("p45=%d\n",p45);ps.format("p46=%e\n",p46);
+        ps.format("p47=%e\n",p47);ps.format("p48=%e\n",p48);ps.format("p49=%e\n",p49);
+        ps.format("p50=%e\n",p50);ps.format("p51=%e\n",p51);ps.format("p52=%d\n",p52);
+        ps.format("p53=%e\n",p53);ps.format("p54=%e\n",p54);ps.format("p55=%e\n",p55);
+        ps.format("p56=%e\n",p56);ps.format("p57=%e\n",p57);ps.format("p58=%d\n",p58);
+        ps.format("p59=%e\n",p59);ps.format("p60=%e\n",p60);ps.format("p61=%e\n",p61);
+        ps.format("p62=%e\n",p62);ps.format("p63=%e\n",p63);ps.format("p64=%e\n",p64);
+        ps.format("p65=%d\n",p65);ps.format("p66=%e\n",p66);ps.format("p67=%e\n",p67);
+        ps.format("p68=%d\n",p68);ps.format("p69=%e\n",p69);ps.format("p70=%d\n",p70);
+        ps.format("p71=%e\n",p71);ps.format("p72=%e\n",p72);ps.format("p73=%e\n",p73);
+        ps.format("p74=%e\n",p74);ps.format("p75=%e\n",p75);ps.format("p76=%d\n",p76);
+        ps.format("p77=%e\n",p77);ps.format("p78=%e\n",p78);ps.format("p79=%e\n",p79);
+        ps.format("p80=%e\n",p80);ps.format("p81=%e\n",p81);ps.format("p82=%e\n",p82);
+        ps.format("p83=%e\n",p83);ps.format("p84=%e\n",p84);ps.format("p85=%e\n",p85);
+        ps.format("p86=%e\n",p86);ps.format("p87=%e\n",p87);ps.format("p88=%e\n",p88);
+        ps.format("p89=%e\n",p89);ps.format("p90=%e\n",p90);ps.format("p91=%e\n",p91);
+        ps.format("p92=%e\n",p92);ps.format("p93=%e\n",p93);ps.format("p94=%d\n",p94);
+        ps.format("p95=%e\n",p95);ps.format("p96=%e\n",p96);ps.format("p97=%e\n",p97);
+        ps.format("p98=%e\n",p98);ps.format("p99=%e\n",p99);ps.format("p100=%e\n",p100);
+        ps.format("p101=%e\n",p101);ps.format("p102=%d\n",p102);ps.format("p103=%d\n",p103);
+        ps.format("p104=%e\n",p104);ps.format("p105=%e\n",p105);ps.format("p106=%e\n",p106);
+        ps.format("p107=%e\n",p107);ps.format("p108=%d\n",p108);ps.format("p109=%e\n",p109);
+        ps.format("p110=%e\n",p110);ps.format("p111=%e\n",p111);ps.format("p112=%d\n",p112);
+        ps.format("p113=%d\n",p113);ps.format("p114=%e\n",p114);ps.format("p115=%e\n",p115);
+        ps.format("p116=%e\n",p116);ps.format("p117=%d\n",p117);ps.format("p118=%e\n",p118);
+        ps.format("p119=%e\n",p119);ps.format("p120=%e\n",p120);ps.format("p121=%e\n",p121);
+        ps.format("p122=%e\n",p122);ps.format("p123=%e\n",p123);ps.format("p124=%e\n",p124);
+        ps.format("p125=%e\n",p125);ps.format("p126=%e\n",p126);
+        nativeFnc52(p0
+        ,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20
+        ,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32,p33,p34,p35,p36,p37,p38
+        ,p39,p40,p41,p42,p43,p44,p45,p46,p47,p48,p49,p50,p51,p52,p53,p54,p55,p56
+        ,p57,p58,p59,p60,p61,p62,p63,p64,p65,p66,p67,p68,p69,p70,p71,p72,p73,p74
+        ,p75,p76,p77,p78,p79,p80,p81,p82,p83,p84,p85,p86,p87,p88,p89,p90,p91,p92
+        ,p93,p94,p95,p96,p97,p98,p99,p100,p101,p102,p103,p104,p105,p106,p107,p108
+        ,p109,p110,p111,p112,p113,p114,p115,p116,p117,p118,p119,p120,p121,p122,p123
+        ,p124,p125,p126);
+}
+
+    public static void main(String[] args) throws Exception
+    {
+        if ( System.getProperty("os.name").matches(".*[Ww][Ii][Nn].*") )
+        {
+            System.out.println("TEST PASSED! Dummy execution on Windows* OS!");
+            return;
+        }
+        deleteFiles();
+        PrintStream ps=new PrintStream(new File("LTTest_java.txt"));
+    if (args.length>0)
+        switch(args[0])
+        {
+        case "nativeFnc1":
+            nativeFnc1_invoke(ps);
+            break;
+        case "nativeFnc2":
+            nativeFnc2_invoke(ps);
+            break;
+        case "nativeFnc3":
+            nativeFnc3_invoke(ps);
+            break;
+        case "nativeFnc4":
+            nativeFnc4_invoke(ps);
+            break;
+        case "nativeFnc5":
+            nativeFnc5_invoke(ps);
+            break;
+        case "nativeFnc6":
+            nativeFnc6_invoke(ps);
+            break;
+        case "nativeFnc7":
+            nativeFnc7_invoke(ps);
+            break;
+        case "nativeFnc8":
+            nativeFnc8_invoke(ps);
+            break;
+        case "nativeFnc9":
+            nativeFnc9_invoke(ps);
+            break;
+        case "nativeFnc10":
+            nativeFnc10_invoke(ps);
+            break;
+        case "nativeFnc11":
+            nativeFnc11_invoke(ps);
+            break;
+        case "nativeFnc12":
+            nativeFnc12_invoke(ps);
+            break;
+        case "nativeFnc13":
+            nativeFnc13_invoke(ps);
+            break;
+        case "nativeFnc14":
+            nativeFnc14_invoke(ps);
+            break;
+        case "nativeFnc15":
+            nativeFnc15_invoke(ps);
+            break;
+        case "nativeFnc16":
+            nativeFnc16_invoke(ps);
+            break;
+        case "nativeFnc17":
+            nativeFnc17_invoke(ps);
+            break;
+        case "nativeFnc18":
+            nativeFnc18_invoke(ps);
+            break;
+        case "nativeFnc19":
+            nativeFnc19_invoke(ps);
+            break;
+        case "nativeFnc20":
+            nativeFnc20_invoke(ps);
+            break;
+        case "nativeFnc21":
+            nativeFnc21_invoke(ps);
+            break;
+        case "nativeFnc22":
+            nativeFnc22_invoke(ps);
+            break;
+        case "nativeFnc23":
+            nativeFnc23_invoke(ps);
+            break;
+        case "nativeFnc24":
+            nativeFnc24_invoke(ps);
+            break;
+        case "nativeFnc25":
+            nativeFnc25_invoke(ps);
+            break;
+        case "nativeFnc26":
+            nativeFnc26_invoke(ps);
+            break;
+        case "nativeFnc27":
+            nativeFnc27_invoke(ps);
+            break;
+        case "nativeFnc28":
+            nativeFnc28_invoke(ps);
+            break;
+        case "nativeFnc29":
+            nativeFnc29_invoke(ps);
+            break;
+        case "nativeFnc30":
+            nativeFnc30_invoke(ps);
+            break;
+        case "nativeFnc31":
+            nativeFnc31_invoke(ps);
+            break;
+        case "nativeFnc32":
+            nativeFnc32_invoke(ps);
+            break;
+        case "nativeFnc33":
+            nativeFnc33_invoke(ps);
+            break;
+        case "nativeFnc34":
+            nativeFnc34_invoke(ps);
+            break;
+        case "nativeFnc35":
+            nativeFnc35_invoke(ps);
+            break;
+        case "nativeFnc36":
+            nativeFnc36_invoke(ps);
+            break;
+        case "nativeFnc37":
+            nativeFnc37_invoke(ps);
+            break;
+        case "nativeFnc38":
+            nativeFnc38_invoke(ps);
+            break;
+        case "nativeFnc39":
+            nativeFnc39_invoke(ps);
+            break;
+        case "nativeFnc40":
+            nativeFnc40_invoke(ps);
+            break;
+        case "nativeFnc41":
+            nativeFnc41_invoke(ps);
+            break;
+        case "nativeFnc42":
+            nativeFnc42_invoke(ps);
+            break;
+        case "nativeFnc43":
+            nativeFnc43_invoke(ps);
+            break;
+        case "nativeFnc44":
+            nativeFnc44_invoke(ps);
+            break;
+        case "nativeFnc45":
+            nativeFnc45_invoke(ps);
+            break;
+        case "nativeFnc46":
+            nativeFnc46_invoke(ps);
+            break;
+        case "nativeFnc47":
+            nativeFnc47_invoke(ps);
+            break;
+        case "nativeFnc48":
+            nativeFnc48_invoke(ps);
+            break;
+        case "nativeFnc49":
+            nativeFnc49_invoke(ps);
+            break;
+        case "nativeFnc50":
+            nativeFnc50_invoke(ps);
+            break;
+        case "nativeFnc51":
+            nativeFnc51_invoke(ps);
+            break;
+        case "nativeFnc52":
+            nativeFnc52_invoke(ps);
+            break;
+        default:
+            throw new Exception("FAIL: invalid args!");
+        }
+        else
+        {
+            throw new Exception("FAIL: invalid args!");
+        }
+        flag=chkFile();
+        if(!flag)
+            throw new Exception("FAIL:Tests failed!");
+    }
+    private static boolean chkFile()
+    {
+        File javaFile=new File("LTTest_java.txt");
+        if (! javaFile.exists())
+        {
+            System.out.println("FAIL:Failed to open file LTTest_java.txt - file not exists!");
+            return false;
+        }
+        File cFile=new File("LTTest_c.txt");
+        if (! cFile.exists())
+        {
+                System.out.println("FAIL:Failed to open file LTTest_c.txt - file not exists!");
+                return false;
+        }
+        if ( cFile.length()!=javaFile.length() )
+        {
+            System.out.println("FAIL:File length not equal!");
+            return false;
+        }
+        long byteCount=cFile.length();
+        try{
+            FileInputStream fisC=new FileInputStream(cFile);
+            FileInputStream fisJava=new FileInputStream(javaFile);
+            byte[] cData=new byte[fisC.available()];
+            fisC.read(cData);
+            byte[] javaData=new byte[fisJava.available()];
+            fisJava.read(javaData);
+            for ( int cnt=0;cnt<byteCount;++cnt)
+            {
+                if ( cData[cnt]!=javaData[cnt] )
+                {
+                    System.out.println("FAIL:Test failed! "+cnt+" byte are wrong! C file - " + cData[cnt] + " Java file - "+javaData[cnt] );
+                    return false;
+                }
+            }
+        }
+        catch (FileNotFoundException ex)
+        {
+            System.out.println("FAIL:Some of files not found!");
+            return false;
+        }
+        catch (IOException ex)
+        {
+            System.out.println("FAIL:Failed to read files!");
+            return false;
+        }
+        System.out.println("PASS: all data passed correctly!");
+        return true;
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/README b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/README
new file mode 100644
index 00000000000..64b45bcbf82
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/README
@@ -0,0 +1,28 @@
+Copyright (c) 2012, 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.
+
+DESCRIPTION
+
+  The objective of this test is attempts to check correctness
+of arguments transferring from jvm to native code. All passed
+arguments compared with source arguments.
+If there are differences - the test is failed.
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/libLTTest.c b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/libLTTest.c
new file mode 100644
index 00000000000..d37f1e4da03
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/libLTTest.c
@@ -0,0 +1,3460 @@
+/*
+ * Copyright (c) 2012, 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.
+ */
+#include <jni.h>
+#include <stdio.h>
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc1(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jfloat p5,jfloat p6,jfloat p7
+    ,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jfloat p14
+    ,jfloat p15,jfloat p16,jfloat p17,jfloat p18,jfloat p19,jfloat p20,jfloat p21
+    ,jfloat p22,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jfloat p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jfloat p35
+    ,jfloat p36,jfloat p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jfloat p42
+    ,jfloat p43,jfloat p44,jfloat p45,jfloat p46,jfloat p47,jfloat p48,jfloat p49
+    ,jfloat p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54,jfloat p55,jfloat p56
+    ,jfloat p57,jfloat p58,jfloat p59,jfloat p60,jfloat p61,jfloat p62,jfloat p63
+    ,jfloat p64,jfloat p65,jfloat p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jfloat p71,jfloat p72,jfloat p73,jfloat p74,jfloat p75,jfloat p76,jfloat p77
+    ,jfloat p78,jfloat p79,jfloat p80,jfloat p81,jfloat p82,jfloat p83,jfloat p84
+    ,jfloat p85,jfloat p86,jfloat p87,jfloat p88,jfloat p89,jfloat p90,jfloat p91
+    ,jfloat p92,jfloat p93,jfloat p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98
+    ,jfloat p99,jfloat p100,jfloat p101,jfloat p102,jfloat p103,jfloat p104
+    ,jfloat p105,jfloat p106,jfloat p107,jfloat p108,jfloat p109,jfloat p110
+    ,jfloat p111,jfloat p112,jfloat p113,jfloat p114,jfloat p115,jfloat p116
+    ,jfloat p117,jfloat p118,jfloat p119,jfloat p120,jfloat p121,jfloat p122
+    ,jfloat p123,jfloat p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc2(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jdouble p4,jdouble p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jdouble p16,jdouble p17,jdouble p18,jdouble p19
+    ,jdouble p20,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25
+    ,jdouble p26,jdouble p27,jdouble p28,jdouble p29,jdouble p30,jdouble p31
+    ,jdouble p32,jdouble p33,jdouble p34,jdouble p35,jdouble p36,jdouble p37
+    ,jdouble p38,jdouble p39,jdouble p40,jdouble p41,jdouble p42,jdouble p43
+    ,jdouble p44,jdouble p45,jdouble p46,jdouble p47,jdouble p48,jdouble p49
+    ,jdouble p50,jdouble p51,jdouble p52,jdouble p53,jdouble p54,jdouble p55
+    ,jdouble p56,jdouble p57,jdouble p58,jdouble p59,jdouble p60,jdouble p61
+    ,jdouble p62,jdouble p63,jdouble p64,jdouble p65,jdouble p66,jdouble p67
+    ,jdouble p68,jdouble p69,jdouble p70,jdouble p71,jdouble p72,jdouble p73
+    ,jdouble p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78,jdouble p79
+    ,jdouble p80,jdouble p81,jdouble p82,jdouble p83,jdouble p84,jdouble p85
+    ,jdouble p86,jdouble p87,jdouble p88,jdouble p89,jdouble p90,jdouble p91
+    ,jdouble p92,jdouble p93,jdouble p94,jdouble p95,jdouble p96,jdouble p97
+    ,jdouble p98,jdouble p99,jdouble p100,jdouble p101,jdouble p102,jdouble p103
+    ,jdouble p104,jdouble p105,jdouble p106,jdouble p107,jdouble p108,jdouble p109
+    ,jdouble p110,jdouble p111,jdouble p112,jdouble p113,jdouble p114,jdouble p115
+    ,jdouble p116,jdouble p117,jdouble p118,jdouble p119,jdouble p120,jdouble p121
+    ,jdouble p122,jdouble p123,jdouble p124,jdouble p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc3(JNIEnv *e, jclass c
+,jfloat p0,jint p1,jint p2,jint p3,jint p4,jfloat p5,jint p6,jfloat p7,jint p8
+    ,jfloat p9,jint p10,jint p11,jfloat p12,jfloat p13,jfloat p14,jfloat p15
+    ,jint p16,jint p17,jint p18,jfloat p19,jint p20,jfloat p21,jfloat p22,jfloat p23
+    ,jfloat p24,jint p25,jfloat p26,jint p27,jfloat p28,jfloat p29,jfloat p30
+    ,jint p31,jint p32,jfloat p33,jfloat p34,jfloat p35,jint p36,jfloat p37
+    ,jint p38,jfloat p39,jint p40,jfloat p41,jfloat p42,jfloat p43,jint p44
+    ,jint p45,jfloat p46,jfloat p47,jfloat p48,jfloat p49,jint p50,jint p51
+    ,jint p52,jfloat p53,jint p54,jfloat p55,jint p56,jfloat p57,jfloat p58
+    ,jfloat p59,jfloat p60,jint p61,jint p62,jint p63,jfloat p64,jfloat p65
+    ,jfloat p66,jfloat p67,jint p68,jint p69,jfloat p70,jfloat p71,jint p72
+    ,jint p73,jfloat p74,jint p75,jint p76,jint p77,jfloat p78,jfloat p79,jfloat p80
+    ,jint p81,jfloat p82,jint p83,jfloat p84,jfloat p85,jfloat p86,jfloat p87
+    ,jint p88,jint p89,jint p90,jfloat p91,jint p92,jint p93,jfloat p94,jfloat p95
+    ,jint p96,jfloat p97,jfloat p98,jfloat p99,jint p100,jfloat p101,jfloat p102
+    ,jint p103,jfloat p104,jfloat p105,jint p106,jfloat p107,jfloat p108,jint p109
+    ,jfloat p110,jfloat p111,jint p112,jfloat p113,jint p114,jfloat p115,jint p116
+    ,jint p117,jfloat p118,jfloat p119,jint p120,jfloat p121,jint p122,jfloat p123
+    ,jint p124,jint p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc4(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jbyte p3,jfloat p4,jfloat p5,jfloat p6,jbyte p7
+    ,jfloat p8,jbyte p9,jfloat p10,jbyte p11,jbyte p12,jbyte p13,jfloat p14
+    ,jfloat p15,jfloat p16,jfloat p17,jbyte p18,jbyte p19,jbyte p20,jbyte p21
+    ,jfloat p22,jfloat p23,jbyte p24,jbyte p25,jfloat p26,jfloat p27,jfloat p28
+    ,jbyte p29,jfloat p30,jfloat p31,jfloat p32,jbyte p33,jbyte p34,jfloat p35
+    ,jbyte p36,jfloat p37,jbyte p38,jfloat p39,jfloat p40,jbyte p41,jfloat p42
+    ,jbyte p43,jbyte p44,jfloat p45,jbyte p46,jfloat p47,jfloat p48,jbyte p49
+    ,jbyte p50,jfloat p51,jbyte p52,jfloat p53,jfloat p54,jbyte p55,jfloat p56
+    ,jfloat p57,jbyte p58,jfloat p59,jbyte p60,jbyte p61,jbyte p62,jfloat p63
+    ,jbyte p64,jbyte p65,jbyte p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jbyte p71,jfloat p72,jfloat p73,jfloat p74,jbyte p75,jbyte p76,jfloat p77
+    ,jfloat p78,jfloat p79,jfloat p80,jbyte p81,jfloat p82,jbyte p83,jfloat p84
+    ,jfloat p85,jbyte p86,jfloat p87,jbyte p88,jfloat p89,jfloat p90,jbyte p91
+    ,jbyte p92,jbyte p93,jbyte p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98
+    ,jfloat p99,jbyte p100,jbyte p101,jfloat p102,jfloat p103,jfloat p104,jbyte p105
+    ,jfloat p106,jfloat p107,jbyte p108,jfloat p109,jfloat p110,jbyte p111,jbyte p112
+    ,jfloat p113,jbyte p114,jbyte p115,jfloat p116,jbyte p117,jbyte p118,jbyte p119
+    ,jbyte p120,jfloat p121,jbyte p122,jbyte p123,jbyte p124,jbyte p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc5(JNIEnv *e, jclass c
+,jint p0,jfloat p1,jint p2,jfloat p3,jbyte p4,jbyte p5,jbyte p6,jfloat p7
+    ,jint p8,jbyte p9,jfloat p10,jbyte p11,jfloat p12,jbyte p13,jbyte p14,jint p15
+    ,jfloat p16,jint p17,jint p18,jint p19,jint p20,jbyte p21,jbyte p22,jbyte p23
+    ,jbyte p24,jint p25,jint p26,jfloat p27,jbyte p28,jfloat p29,jint p30,jfloat p31
+    ,jbyte p32,jfloat p33,jint p34,jint p35,jfloat p36,jbyte p37,jint p38,jbyte p39
+    ,jbyte p40,jfloat p41,jfloat p42,jbyte p43,jbyte p44,jfloat p45,jbyte p46
+    ,jbyte p47,jint p48,jint p49,jint p50,jfloat p51,jint p52,jfloat p53,jbyte p54
+    ,jint p55,jint p56,jbyte p57,jint p58,jbyte p59,jint p60,jfloat p61,jint p62
+    ,jfloat p63,jint p64,jfloat p65,jbyte p66,jbyte p67,jfloat p68,jbyte p69
+    ,jint p70,jfloat p71,jbyte p72,jint p73,jint p74,jbyte p75,jbyte p76,jbyte p77
+    ,jint p78,jbyte p79,jbyte p80,jfloat p81,jbyte p82,jint p83,jbyte p84,jint p85
+    ,jint p86,jbyte p87,jint p88,jfloat p89,jint p90,jint p91,jfloat p92,jbyte p93
+    ,jfloat p94,jbyte p95,jfloat p96,jint p97,jfloat p98,jfloat p99,jint p100
+    ,jbyte p101,jint p102,jbyte p103,jfloat p104,jfloat p105,jfloat p106,jfloat p107
+    ,jfloat p108,jfloat p109,jint p110,jint p111,jint p112,jbyte p113,jfloat p114
+    ,jfloat p115,jfloat p116,jint p117,jfloat p118,jint p119,jbyte p120,jint p121
+    ,jbyte p122,jbyte p123,jfloat p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%d\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%d\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc6(JNIEnv *e, jclass c
+,jdouble p0,jint p1,jint p2,jint p3,jint p4,jdouble p5,jdouble p6,jint p7
+    ,jint p8,jdouble p9,jdouble p10,jint p11,jint p12,jdouble p13,jdouble p14
+    ,jdouble p15,jdouble p16,jdouble p17,jdouble p18,jint p19,jint p20,jdouble p21
+    ,jdouble p22,jint p23,jdouble p24,jdouble p25,jdouble p26,jint p27,jint p28
+    ,jint p29,jdouble p30,jdouble p31,jdouble p32,jint p33,jint p34,jdouble p35
+    ,jint p36,jint p37,jdouble p38,jdouble p39,jdouble p40,jint p41,jdouble p42
+    ,jdouble p43,jint p44,jint p45,jint p46,jint p47,jdouble p48,jdouble p49
+    ,jdouble p50,jint p51,jint p52,jint p53,jint p54,jdouble p55,jint p56,jint p57
+    ,jdouble p58,jint p59,jdouble p60,jdouble p61,jint p62,jint p63,jdouble p64
+    ,jdouble p65,jint p66,jint p67,jdouble p68,jdouble p69,jdouble p70,jint p71
+    ,jint p72,jdouble p73,jint p74,jint p75,jdouble p76,jdouble p77,jdouble p78
+    ,jint p79,jint p80,jint p81,jint p82,jint p83,jdouble p84,jdouble p85,jint p86
+    ,jdouble p87,jdouble p88,jint p89,jdouble p90,jint p91,jint p92,jdouble p93
+    ,jint p94,jint p95,jdouble p96,jdouble p97,jint p98,jdouble p99,jdouble p100
+    ,jdouble p101,jint p102,jdouble p103,jdouble p104,jint p105,jint p106,jint p107
+    ,jdouble p108,jint p109,jdouble p110,jdouble p111,jdouble p112,jint p113
+    ,jint p114,jdouble p115,jint p116,jdouble p117,jdouble p118,jint p119,jdouble p120
+    ,jdouble p121,jint p122,jint p123,jint p124,jint p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc7(JNIEnv *e, jclass c
+,jdouble p0,jbyte p1,jdouble p2,jdouble p3,jbyte p4,jbyte p5,jbyte p6,jbyte p7
+    ,jdouble p8,jdouble p9,jbyte p10,jbyte p11,jdouble p12,jdouble p13,jbyte p14
+    ,jbyte p15,jbyte p16,jbyte p17,jbyte p18,jdouble p19,jdouble p20,jdouble p21
+    ,jdouble p22,jbyte p23,jdouble p24,jbyte p25,jdouble p26,jbyte p27,jdouble p28
+    ,jbyte p29,jbyte p30,jdouble p31,jbyte p32,jdouble p33,jbyte p34,jdouble p35
+    ,jdouble p36,jdouble p37,jdouble p38,jbyte p39,jdouble p40,jdouble p41,jbyte p42
+    ,jdouble p43,jbyte p44,jdouble p45,jdouble p46,jdouble p47,jdouble p48,jbyte p49
+    ,jbyte p50,jdouble p51,jdouble p52,jdouble p53,jbyte p54,jdouble p55,jdouble p56
+    ,jdouble p57,jdouble p58,jdouble p59,jbyte p60,jdouble p61,jdouble p62,jbyte p63
+    ,jbyte p64,jbyte p65,jbyte p66,jbyte p67,jbyte p68,jdouble p69,jdouble p70
+    ,jbyte p71,jdouble p72,jdouble p73,jbyte p74,jdouble p75,jbyte p76,jbyte p77
+    ,jbyte p78,jbyte p79,jbyte p80,jdouble p81,jdouble p82,jbyte p83,jbyte p84
+    ,jbyte p85,jbyte p86,jdouble p87,jbyte p88,jdouble p89,jdouble p90,jdouble p91
+    ,jbyte p92,jbyte p93,jdouble p94,jbyte p95,jbyte p96,jbyte p97,jbyte p98
+    ,jdouble p99,jbyte p100,jbyte p101,jbyte p102,jdouble p103,jdouble p104
+    ,jbyte p105,jdouble p106,jbyte p107,jbyte p108,jbyte p109,jdouble p110,jbyte p111
+    ,jbyte p112,jbyte p113,jbyte p114,jbyte p115,jbyte p116,jdouble p117,jbyte p118
+    ,jdouble p119,jdouble p120,jbyte p121,jbyte p122,jdouble p123,jdouble p124
+    ,jbyte p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%d\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc8(JNIEnv *e, jclass c
+,jbyte p0,jdouble p1,jbyte p2,jdouble p3,jint p4,jint p5,jint p6,jdouble p7
+    ,jdouble p8,jint p9,jdouble p10,jbyte p11,jint p12,jbyte p13,jdouble p14
+    ,jint p15,jbyte p16,jint p17,jdouble p18,jdouble p19,jbyte p20,jint p21
+    ,jbyte p22,jint p23,jint p24,jbyte p25,jdouble p26,jint p27,jint p28,jbyte p29
+    ,jint p30,jint p31,jbyte p32,jdouble p33,jdouble p34,jbyte p35,jdouble p36
+    ,jint p37,jdouble p38,jint p39,jbyte p40,jbyte p41,jint p42,jint p43,jint p44
+    ,jbyte p45,jdouble p46,jdouble p47,jint p48,jint p49,jbyte p50,jbyte p51
+    ,jint p52,jint p53,jbyte p54,jbyte p55,jint p56,jint p57,jint p58,jdouble p59
+    ,jbyte p60,jint p61,jdouble p62,jdouble p63,jdouble p64,jint p65,jint p66
+    ,jdouble p67,jint p68,jdouble p69,jint p70,jint p71,jbyte p72,jint p73,jdouble p74
+    ,jdouble p75,jbyte p76,jint p77,jbyte p78,jbyte p79,jint p80,jint p81,jint p82
+    ,jdouble p83,jdouble p84,jint p85,jbyte p86,jbyte p87,jbyte p88,jbyte p89
+    ,jint p90,jint p91,jdouble p92,jint p93,jdouble p94,jdouble p95,jint p96
+    ,jbyte p97,jdouble p98,jdouble p99,jbyte p100,jbyte p101,jbyte p102,jbyte p103
+    ,jdouble p104,jint p105,jint p106,jbyte p107,jbyte p108,jdouble p109,jdouble p110
+    ,jdouble p111,jbyte p112,jdouble p113,jbyte p114,jbyte p115,jint p116,jdouble p117
+    ,jint p118,jint p119,jbyte p120,jdouble p121,jbyte p122,jint p123,jint p124
+    ,jint p125,jbyte p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc9(JNIEnv *e, jclass c
+,jdouble p0,jbyte p1,jint p2,jbyte p3,jint p4,jbyte p5,jint p6,jfloat p7
+    ,jfloat p8,jint p9,jdouble p10,jint p11,jfloat p12,jfloat p13,jdouble p14
+    ,jint p15,jfloat p16,jbyte p17,jfloat p18,jint p19,jfloat p20,jint p21,jfloat p22
+    ,jfloat p23,jdouble p24,jbyte p25,jbyte p26,jbyte p27,jbyte p28,jfloat p29
+    ,jbyte p30,jbyte p31,jbyte p32,jdouble p33,jint p34,jdouble p35,jfloat p36
+    ,jint p37,jdouble p38,jint p39,jdouble p40,jbyte p41,jdouble p42,jfloat p43
+    ,jfloat p44,jdouble p45,jfloat p46,jint p47,jfloat p48,jint p49,jfloat p50
+    ,jbyte p51,jbyte p52,jint p53,jint p54,jfloat p55,jdouble p56,jint p57,jint p58
+    ,jfloat p59,jint p60,jbyte p61,jint p62,jdouble p63,jdouble p64,jint p65
+    ,jbyte p66,jdouble p67,jint p68,jbyte p69,jbyte p70,jint p71,jfloat p72
+    ,jfloat p73,jbyte p74,jint p75,jbyte p76,jdouble p77,jfloat p78,jdouble p79
+    ,jbyte p80,jint p81,jint p82,jbyte p83,jdouble p84,jfloat p85,jdouble p86
+    ,jdouble p87,jfloat p88,jbyte p89,jbyte p90,jdouble p91,jdouble p92,jdouble p93
+    ,jfloat p94,jdouble p95,jfloat p96,jdouble p97,jfloat p98,jbyte p99,jfloat p100
+    ,jbyte p101,jbyte p102,jfloat p103,jdouble p104,jbyte p105,jfloat p106,jdouble p107
+    ,jdouble p108,jint p109,jfloat p110,jint p111,jint p112,jbyte p113,jdouble p114
+    ,jbyte p115,jdouble p116,jint p117,jdouble p118,jfloat p119,jbyte p120,jfloat p121
+    ,jfloat p122,jfloat p123,jdouble p124,jint p125,jbyte p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc10(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jfloat p2,jdouble p3,jfloat p4,jfloat p5,jdouble p6
+    ,jfloat p7,jfloat p8,jdouble p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13
+    ,jdouble p14,jfloat p15,jfloat p16,jdouble p17,jdouble p18,jdouble p19,jdouble p20
+    ,jfloat p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jfloat p27,jfloat p28,jfloat p29,jdouble p30,jfloat p31,jfloat p32,jfloat p33
+    ,jdouble p34,jdouble p35,jdouble p36,jdouble p37,jfloat p38,jfloat p39,jdouble p40
+    ,jfloat p41,jdouble p42,jdouble p43,jfloat p44,jdouble p45,jdouble p46,jdouble p47
+    ,jfloat p48,jdouble p49,jdouble p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54
+    ,jfloat p55,jdouble p56,jfloat p57,jfloat p58,jdouble p59,jfloat p60,jdouble p61
+    ,jdouble p62,jfloat p63,jfloat p64,jfloat p65,jfloat p66,jdouble p67,jfloat p68
+    ,jdouble p69,jdouble p70,jfloat p71,jdouble p72,jdouble p73,jdouble p74
+    ,jfloat p75,jdouble p76,jdouble p77,jfloat p78,jdouble p79,jfloat p80,jfloat p81
+    ,jfloat p82,jfloat p83,jfloat p84,jfloat p85,jdouble p86,jdouble p87,jfloat p88
+    ,jfloat p89,jdouble p90,jdouble p91,jdouble p92,jdouble p93,jfloat p94,jdouble p95
+    ,jfloat p96,jdouble p97,jdouble p98,jfloat p99,jfloat p100,jfloat p101,jdouble p102
+    ,jfloat p103,jfloat p104,jfloat p105,jdouble p106,jdouble p107,jdouble p108
+    ,jfloat p109,jdouble p110,jfloat p111,jdouble p112,jfloat p113,jfloat p114
+    ,jdouble p115,jdouble p116,jdouble p117,jdouble p118,jfloat p119,jdouble p120
+    ,jfloat p121,jdouble p122,jfloat p123,jfloat p124,jfloat p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc11(JNIEnv *e, jclass c
+,jdouble p0,jfloat p1,jfloat p2,jdouble p3,jint p4,jint p5,jfloat p6,jdouble p7
+    ,jint p8,jint p9,jint p10,jint p11,jint p12,jdouble p13,jfloat p14,jfloat p15
+    ,jdouble p16,jfloat p17,jint p18,jint p19,jdouble p20,jfloat p21,jint p22
+    ,jint p23,jfloat p24,jint p25,jint p26,jint p27,jfloat p28,jfloat p29,jdouble p30
+    ,jdouble p31,jint p32,jdouble p33,jfloat p34,jfloat p35,jfloat p36,jint p37
+    ,jfloat p38,jdouble p39,jfloat p40,jdouble p41,jdouble p42,jdouble p43,jdouble p44
+    ,jint p45,jint p46,jfloat p47,jfloat p48,jfloat p49,jfloat p50,jdouble p51
+    ,jdouble p52,jdouble p53,jint p54,jfloat p55,jint p56,jdouble p57,jdouble p58
+    ,jdouble p59,jdouble p60,jint p61,jfloat p62,jint p63,jfloat p64,jdouble p65
+    ,jdouble p66,jfloat p67,jdouble p68,jdouble p69,jint p70,jdouble p71,jfloat p72
+    ,jdouble p73,jint p74,jfloat p75,jfloat p76,jfloat p77,jfloat p78,jint p79
+    ,jfloat p80,jint p81,jdouble p82,jfloat p83,jdouble p84,jfloat p85,jfloat p86
+    ,jfloat p87,jdouble p88,jfloat p89,jint p90,jfloat p91,jdouble p92,jfloat p93
+    ,jdouble p94,jdouble p95,jint p96,jint p97,jfloat p98,jdouble p99,jfloat p100
+    ,jint p101,jdouble p102,jdouble p103,jfloat p104,jdouble p105,jint p106
+    ,jfloat p107,jfloat p108,jint p109,jdouble p110,jfloat p111,jdouble p112
+    ,jint p113,jint p114,jfloat p115,jfloat p116,jint p117,jdouble p118,jfloat p119
+    ,jfloat p120,jfloat p121,jint p122,jdouble p123,jint p124,jfloat p125,jdouble p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc12(JNIEnv *e, jclass c
+,jdouble p0,jfloat p1,jdouble p2,jfloat p3,jfloat p4,jbyte p5,jbyte p6,jdouble p7
+    ,jdouble p8,jbyte p9,jbyte p10,jfloat p11,jbyte p12,jbyte p13,jbyte p14
+    ,jbyte p15,jbyte p16,jbyte p17,jdouble p18,jdouble p19,jbyte p20,jfloat p21
+    ,jbyte p22,jdouble p23,jbyte p24,jfloat p25,jdouble p26,jfloat p27,jbyte p28
+    ,jbyte p29,jfloat p30,jbyte p31,jfloat p32,jfloat p33,jbyte p34,jbyte p35
+    ,jfloat p36,jdouble p37,jfloat p38,jfloat p39,jdouble p40,jdouble p41,jfloat p42
+    ,jfloat p43,jbyte p44,jbyte p45,jdouble p46,jfloat p47,jdouble p48,jfloat p49
+    ,jbyte p50,jdouble p51,jdouble p52,jfloat p53,jdouble p54,jbyte p55,jfloat p56
+    ,jbyte p57,jbyte p58,jbyte p59,jfloat p60,jdouble p61,jfloat p62,jbyte p63
+    ,jdouble p64,jdouble p65,jfloat p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jdouble p71,jfloat p72,jfloat p73,jdouble p74,jbyte p75,jfloat p76,jbyte p77
+    ,jbyte p78,jbyte p79,jdouble p80,jdouble p81,jbyte p82,jfloat p83,jdouble p84
+    ,jbyte p85,jfloat p86,jdouble p87,jfloat p88,jfloat p89,jfloat p90,jfloat p91
+    ,jdouble p92,jbyte p93,jfloat p94,jbyte p95,jbyte p96,jbyte p97,jfloat p98
+    ,jbyte p99,jfloat p100,jdouble p101,jfloat p102,jbyte p103,jbyte p104,jfloat p105
+    ,jdouble p106,jbyte p107,jfloat p108,jbyte p109,jdouble p110,jfloat p111
+    ,jfloat p112,jbyte p113,jfloat p114,jbyte p115,jfloat p116,jdouble p117
+    ,jdouble p118,jdouble p119,jfloat p120,jdouble p121,jbyte p122,jbyte p123
+    ,jfloat p124,jdouble p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc13(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jint p4,jfloat p5,jint p6,jfloat p7
+    ,jint p8,jfloat p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jint p14
+    ,jfloat p15,jfloat p16,jint p17,jint p18,jfloat p19,jfloat p20,jint p21
+    ,jint p22,jint p23,jint p24,jint p25,jfloat p26,jint p27,jint p28,jfloat p29
+    ,jint p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jint p35,jint p36
+    ,jfloat p37,jfloat p38,jfloat p39,jint p40,jfloat p41,jint p42,jfloat p43
+    ,jint p44,jfloat p45,jfloat p46,jfloat p47,jint p48,jfloat p49,jint p50
+    ,jint p51,jfloat p52,jint p53,jfloat p54,jfloat p55,jfloat p56,jfloat p57
+    ,jfloat p58,jfloat p59,jfloat p60,jfloat p61,jint p62,jfloat p63,jfloat p64
+    ,jfloat p65,jint p66,jint p67,jfloat p68,jfloat p69,jfloat p70,jint p71
+    ,jfloat p72,jfloat p73,jint p74,jfloat p75,jfloat p76,jfloat p77,jint p78
+    ,jint p79,jint p80,jfloat p81,jint p82,jint p83,jfloat p84,jint p85,jint p86
+    ,jfloat p87,jfloat p88,jfloat p89,jfloat p90,jint p91,jint p92,jfloat p93
+    ,jfloat p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98,jint p99,jfloat p100
+    ,jint p101,jfloat p102,jfloat p103,jint p104,jfloat p105,jfloat p106,jfloat p107
+    ,jint p108,jfloat p109,jfloat p110,jfloat p111,jfloat p112,jfloat p113,jfloat p114
+    ,jfloat p115,jfloat p116,jint p117,jint p118,jfloat p119,jfloat p120,jfloat p121
+    ,jint p122,jfloat p123,jint p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc14(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jbyte p4,jfloat p5,jfloat p6,jbyte p7
+    ,jfloat p8,jbyte p9,jbyte p10,jbyte p11,jfloat p12,jfloat p13,jfloat p14
+    ,jbyte p15,jfloat p16,jbyte p17,jfloat p18,jfloat p19,jfloat p20,jfloat p21
+    ,jbyte p22,jbyte p23,jbyte p24,jfloat p25,jbyte p26,jfloat p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jfloat p35
+    ,jbyte p36,jfloat p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jfloat p42
+    ,jbyte p43,jbyte p44,jfloat p45,jbyte p46,jfloat p47,jbyte p48,jfloat p49
+    ,jfloat p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54,jfloat p55,jbyte p56
+    ,jfloat p57,jbyte p58,jfloat p59,jbyte p60,jfloat p61,jbyte p62,jbyte p63
+    ,jfloat p64,jfloat p65,jfloat p66,jbyte p67,jfloat p68,jfloat p69,jfloat p70
+    ,jbyte p71,jfloat p72,jbyte p73,jfloat p74,jfloat p75,jfloat p76,jbyte p77
+    ,jfloat p78,jfloat p79,jbyte p80,jfloat p81,jfloat p82,jfloat p83,jfloat p84
+    ,jbyte p85,jfloat p86,jbyte p87,jbyte p88,jbyte p89,jfloat p90,jbyte p91
+    ,jfloat p92,jfloat p93,jbyte p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98
+    ,jfloat p99,jfloat p100,jfloat p101,jfloat p102,jbyte p103,jbyte p104,jfloat p105
+    ,jfloat p106,jfloat p107,jfloat p108,jfloat p109,jfloat p110,jbyte p111
+    ,jfloat p112,jfloat p113,jbyte p114,jbyte p115,jfloat p116,jfloat p117,jfloat p118
+    ,jfloat p119,jbyte p120,jbyte p121,jbyte p122,jbyte p123,jbyte p124,jfloat p125
+    ,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc15(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jbyte p2,jfloat p3,jfloat p4,jfloat p5,jbyte p6,jfloat p7
+    ,jbyte p8,jint p9,jfloat p10,jfloat p11,jbyte p12,jbyte p13,jbyte p14,jbyte p15
+    ,jbyte p16,jfloat p17,jbyte p18,jfloat p19,jint p20,jbyte p21,jfloat p22
+    ,jint p23,jbyte p24,jfloat p25,jfloat p26,jbyte p27,jfloat p28,jint p29
+    ,jfloat p30,jbyte p31,jfloat p32,jfloat p33,jbyte p34,jfloat p35,jint p36
+    ,jbyte p37,jint p38,jfloat p39,jfloat p40,jbyte p41,jfloat p42,jbyte p43
+    ,jint p44,jfloat p45,jfloat p46,jbyte p47,jint p48,jfloat p49,jint p50,jfloat p51
+    ,jfloat p52,jint p53,jbyte p54,jint p55,jbyte p56,jfloat p57,jfloat p58
+    ,jfloat p59,jfloat p60,jbyte p61,jbyte p62,jbyte p63,jbyte p64,jfloat p65
+    ,jint p66,jint p67,jint p68,jfloat p69,jfloat p70,jint p71,jfloat p72,jfloat p73
+    ,jfloat p74,jint p75,jfloat p76,jfloat p77,jint p78,jfloat p79,jint p80
+    ,jfloat p81,jfloat p82,jfloat p83,jfloat p84,jbyte p85,jint p86,jbyte p87
+    ,jfloat p88,jfloat p89,jfloat p90,jint p91,jfloat p92,jbyte p93,jfloat p94
+    ,jbyte p95,jint p96,jfloat p97,jfloat p98,jint p99,jfloat p100,jbyte p101
+    ,jbyte p102,jfloat p103,jbyte p104,jbyte p105,jbyte p106,jint p107,jint p108
+    ,jfloat p109,jfloat p110,jint p111,jfloat p112,jbyte p113,jint p114,jfloat p115
+    ,jbyte p116,jbyte p117,jfloat p118,jfloat p119,jint p120,jfloat p121,jfloat p122
+    ,jint p123,jfloat p124,jbyte p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc16(JNIEnv *e, jclass c
+,jdouble p0,jint p1,jdouble p2,jdouble p3,jdouble p4,jdouble p5,jint p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jdouble p16,jdouble p17,jint p18,jint p19,jdouble p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jint p26,jdouble p27
+    ,jdouble p28,jdouble p29,jdouble p30,jint p31,jdouble p32,jint p33,jint p34
+    ,jdouble p35,jdouble p36,jdouble p37,jint p38,jdouble p39,jdouble p40,jdouble p41
+    ,jdouble p42,jint p43,jdouble p44,jdouble p45,jint p46,jdouble p47,jdouble p48
+    ,jint p49,jdouble p50,jdouble p51,jint p52,jdouble p53,jint p54,jdouble p55
+    ,jint p56,jint p57,jdouble p58,jint p59,jint p60,jdouble p61,jint p62,jint p63
+    ,jint p64,jdouble p65,jint p66,jint p67,jint p68,jint p69,jint p70,jdouble p71
+    ,jint p72,jint p73,jdouble p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78
+    ,jdouble p79,jint p80,jdouble p81,jdouble p82,jdouble p83,jdouble p84,jdouble p85
+    ,jdouble p86,jdouble p87,jdouble p88,jdouble p89,jint p90,jdouble p91,jdouble p92
+    ,jdouble p93,jdouble p94,jdouble p95,jdouble p96,jdouble p97,jint p98,jdouble p99
+    ,jint p100,jdouble p101,jdouble p102,jdouble p103,jint p104,jdouble p105
+    ,jint p106,jdouble p107,jint p108,jint p109,jdouble p110,jdouble p111,jdouble p112
+    ,jint p113,jdouble p114,jdouble p115,jint p116,jdouble p117,jint p118,jint p119
+    ,jdouble p120,jdouble p121,jdouble p122,jdouble p123,jdouble p124,jdouble p125
+    ,jint p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc17(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jbyte p2,jdouble p3,jdouble p4,jdouble p5,jdouble p6
+    ,jbyte p7,jdouble p8,jbyte p9,jdouble p10,jbyte p11,jbyte p12,jdouble p13
+    ,jdouble p14,jdouble p15,jdouble p16,jbyte p17,jdouble p18,jdouble p19,jdouble p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jdouble p27,jdouble p28,jdouble p29,jdouble p30,jdouble p31,jdouble p32
+    ,jdouble p33,jdouble p34,jdouble p35,jdouble p36,jdouble p37,jbyte p38,jdouble p39
+    ,jdouble p40,jdouble p41,jdouble p42,jdouble p43,jdouble p44,jdouble p45
+    ,jdouble p46,jbyte p47,jdouble p48,jbyte p49,jdouble p50,jbyte p51,jdouble p52
+    ,jbyte p53,jbyte p54,jbyte p55,jbyte p56,jdouble p57,jbyte p58,jdouble p59
+    ,jdouble p60,jbyte p61,jbyte p62,jdouble p63,jdouble p64,jbyte p65,jbyte p66
+    ,jbyte p67,jdouble p68,jbyte p69,jdouble p70,jdouble p71,jbyte p72,jdouble p73
+    ,jdouble p74,jdouble p75,jbyte p76,jdouble p77,jdouble p78,jdouble p79,jdouble p80
+    ,jdouble p81,jbyte p82,jdouble p83,jdouble p84,jbyte p85,jbyte p86,jdouble p87
+    ,jdouble p88,jdouble p89,jdouble p90,jdouble p91,jdouble p92,jbyte p93,jbyte p94
+    ,jdouble p95,jdouble p96,jdouble p97,jdouble p98,jbyte p99,jdouble p100
+    ,jdouble p101,jdouble p102,jdouble p103,jdouble p104,jbyte p105,jdouble p106
+    ,jbyte p107,jdouble p108,jdouble p109,jdouble p110,jbyte p111,jdouble p112
+    ,jdouble p113,jbyte p114,jdouble p115,jdouble p116,jbyte p117,jbyte p118
+    ,jbyte p119,jdouble p120,jbyte p121,jdouble p122,jbyte p123,jdouble p124
+    ,jbyte p125,jbyte p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc18(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jint p4,jint p5,jbyte p6,jint p7
+    ,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jdouble p12,jbyte p13,jdouble p14
+    ,jdouble p15,jbyte p16,jdouble p17,jint p18,jbyte p19,jbyte p20,jdouble p21
+    ,jdouble p22,jdouble p23,jint p24,jdouble p25,jdouble p26,jint p27,jdouble p28
+    ,jdouble p29,jdouble p30,jdouble p31,jdouble p32,jdouble p33,jbyte p34,jint p35
+    ,jbyte p36,jdouble p37,jdouble p38,jint p39,jint p40,jint p41,jint p42,jdouble p43
+    ,jdouble p44,jdouble p45,jbyte p46,jbyte p47,jdouble p48,jint p49,jbyte p50
+    ,jbyte p51,jint p52,jint p53,jint p54,jdouble p55,jdouble p56,jint p57,jint p58
+    ,jdouble p59,jbyte p60,jbyte p61,jint p62,jint p63,jdouble p64,jint p65
+    ,jint p66,jdouble p67,jdouble p68,jdouble p69,jint p70,jdouble p71,jdouble p72
+    ,jint p73,jdouble p74,jdouble p75,jint p76,jbyte p77,jdouble p78,jint p79
+    ,jdouble p80,jint p81,jdouble p82,jdouble p83,jbyte p84,jdouble p85,jdouble p86
+    ,jint p87,jint p88,jbyte p89,jdouble p90,jdouble p91,jdouble p92,jint p93
+    ,jbyte p94,jbyte p95,jint p96,jdouble p97,jdouble p98,jdouble p99,jdouble p100
+    ,jbyte p101,jbyte p102,jdouble p103,jdouble p104,jdouble p105,jint p106
+    ,jint p107,jdouble p108,jint p109,jint p110,jdouble p111,jdouble p112,jbyte p113
+    ,jint p114,jbyte p115,jdouble p116,jdouble p117,jint p118,jint p119,jint p120
+    ,jdouble p121,jdouble p122,jdouble p123,jdouble p124,jdouble p125,jbyte p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%d\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%d\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc19(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jint p5,jfloat p6,jfloat p7
+    ,jdouble p8,jdouble p9,jint p10,jdouble p11,jdouble p12,jfloat p13,jint p14
+    ,jdouble p15,jfloat p16,jint p17,jfloat p18,jdouble p19,jfloat p20,jbyte p21
+    ,jdouble p22,jfloat p23,jfloat p24,jdouble p25,jfloat p26,jbyte p27,jdouble p28
+    ,jfloat p29,jfloat p30,jfloat p31,jbyte p32,jfloat p33,jfloat p34,jfloat p35
+    ,jint p36,jint p37,jdouble p38,jdouble p39,jint p40,jbyte p41,jfloat p42
+    ,jfloat p43,jbyte p44,jbyte p45,jdouble p46,jdouble p47,jint p48,jdouble p49
+    ,jdouble p50,jint p51,jdouble p52,jfloat p53,jdouble p54,jdouble p55,jfloat p56
+    ,jdouble p57,jdouble p58,jdouble p59,jint p60,jint p61,jfloat p62,jfloat p63
+    ,jdouble p64,jdouble p65,jint p66,jbyte p67,jfloat p68,jdouble p69,jfloat p70
+    ,jfloat p71,jdouble p72,jfloat p73,jbyte p74,jint p75,jint p76,jdouble p77
+    ,jfloat p78,jdouble p79,jdouble p80,jdouble p81,jdouble p82,jint p83,jfloat p84
+    ,jdouble p85,jbyte p86,jbyte p87,jdouble p88,jbyte p89,jbyte p90,jbyte p91
+    ,jint p92,jbyte p93,jfloat p94,jbyte p95,jint p96,jint p97,jint p98,jbyte p99
+    ,jdouble p100,jint p101,jdouble p102,jfloat p103,jint p104,jfloat p105,jint p106
+    ,jbyte p107,jfloat p108,jint p109,jfloat p110,jfloat p111,jfloat p112,jint p113
+    ,jint p114,jfloat p115,jint p116,jdouble p117,jbyte p118,jfloat p119,jbyte p120
+    ,jbyte p121,jdouble p122,jfloat p123,jfloat p124,jbyte p125,jint p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc20(JNIEnv *e, jclass c
+,jdouble p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jfloat p5,jfloat p6
+    ,jdouble p7,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jdouble p12,jdouble p13
+    ,jfloat p14,jdouble p15,jdouble p16,jdouble p17,jfloat p18,jfloat p19,jfloat p20
+    ,jfloat p21,jfloat p22,jdouble p23,jdouble p24,jfloat p25,jfloat p26,jfloat p27
+    ,jdouble p28,jfloat p29,jdouble p30,jfloat p31,jfloat p32,jdouble p33,jfloat p34
+    ,jdouble p35,jdouble p36,jdouble p37,jdouble p38,jfloat p39,jfloat p40,jdouble p41
+    ,jfloat p42,jdouble p43,jdouble p44,jfloat p45,jfloat p46,jdouble p47,jdouble p48
+    ,jfloat p49,jdouble p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54,jdouble p55
+    ,jdouble p56,jdouble p57,jfloat p58,jdouble p59,jfloat p60,jfloat p61,jfloat p62
+    ,jfloat p63,jdouble p64,jfloat p65,jfloat p66,jfloat p67,jfloat p68,jfloat p69
+    ,jdouble p70,jdouble p71,jfloat p72,jfloat p73,jdouble p74,jfloat p75,jfloat p76
+    ,jfloat p77,jdouble p78,jfloat p79,jfloat p80,jfloat p81,jdouble p82,jfloat p83
+    ,jdouble p84,jfloat p85,jdouble p86,jfloat p87,jdouble p88,jfloat p89,jfloat p90
+    ,jfloat p91,jfloat p92,jdouble p93,jdouble p94,jdouble p95,jdouble p96,jfloat p97
+    ,jfloat p98,jfloat p99,jfloat p100,jfloat p101,jfloat p102,jfloat p103,jfloat p104
+    ,jfloat p105,jfloat p106,jdouble p107,jfloat p108,jfloat p109,jfloat p110
+    ,jdouble p111,jdouble p112,jfloat p113,jfloat p114,jfloat p115,jfloat p116
+    ,jdouble p117,jfloat p118,jfloat p119,jfloat p120,jdouble p121,jfloat p122
+    ,jdouble p123,jdouble p124,jdouble p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc21(JNIEnv *e, jclass c
+,jfloat p0,jint p1,jfloat p2,jfloat p3,jint p4,jint p5,jdouble p6,jfloat p7
+    ,jfloat p8,jdouble p9,jint p10,jdouble p11,jdouble p12,jfloat p13,jdouble p14
+    ,jdouble p15,jfloat p16,jdouble p17,jfloat p18,jdouble p19,jdouble p20,jdouble p21
+    ,jfloat p22,jdouble p23,jdouble p24,jint p25,jdouble p26,jint p27,jint p28
+    ,jdouble p29,jfloat p30,jfloat p31,jfloat p32,jint p33,jdouble p34,jfloat p35
+    ,jdouble p36,jdouble p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jfloat p42
+    ,jfloat p43,jint p44,jint p45,jdouble p46,jfloat p47,jfloat p48,jint p49
+    ,jdouble p50,jdouble p51,jfloat p52,jdouble p53,jint p54,jdouble p55,jint p56
+    ,jdouble p57,jdouble p58,jfloat p59,jfloat p60,jint p61,jfloat p62,jint p63
+    ,jfloat p64,jdouble p65,jint p66,jfloat p67,jdouble p68,jdouble p69,jdouble p70
+    ,jdouble p71,jdouble p72,jfloat p73,jint p74,jint p75,jdouble p76,jint p77
+    ,jfloat p78,jfloat p79,jdouble p80,jdouble p81,jdouble p82,jint p83,jdouble p84
+    ,jdouble p85,jfloat p86,jdouble p87,jint p88,jdouble p89,jfloat p90,jfloat p91
+    ,jfloat p92,jdouble p93,jint p94,jfloat p95,jint p96,jfloat p97,jdouble p98
+    ,jint p99,jint p100,jint p101,jint p102,jfloat p103,jfloat p104,jfloat p105
+    ,jfloat p106,jint p107,jfloat p108,jdouble p109,jfloat p110,jdouble p111
+    ,jdouble p112,jfloat p113,jfloat p114,jdouble p115,jdouble p116,jfloat p117
+    ,jint p118,jdouble p119,jfloat p120,jfloat p121,jdouble p122,jdouble p123
+    ,jfloat p124,jint p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc22(JNIEnv *e, jclass c
+,jdouble p0,jbyte p1,jdouble p2,jfloat p3,jfloat p4,jfloat p5,jfloat p6
+    ,jfloat p7,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jdouble p12,jdouble p13
+    ,jbyte p14,jfloat p15,jfloat p16,jdouble p17,jfloat p18,jfloat p19,jdouble p20
+    ,jfloat p21,jbyte p22,jfloat p23,jfloat p24,jdouble p25,jbyte p26,jdouble p27
+    ,jdouble p28,jdouble p29,jbyte p30,jbyte p31,jbyte p32,jbyte p33,jbyte p34
+    ,jdouble p35,jdouble p36,jfloat p37,jfloat p38,jdouble p39,jfloat p40,jfloat p41
+    ,jfloat p42,jfloat p43,jbyte p44,jfloat p45,jfloat p46,jdouble p47,jbyte p48
+    ,jbyte p49,jdouble p50,jdouble p51,jfloat p52,jfloat p53,jdouble p54,jfloat p55
+    ,jdouble p56,jfloat p57,jfloat p58,jfloat p59,jfloat p60,jfloat p61,jfloat p62
+    ,jdouble p63,jdouble p64,jfloat p65,jdouble p66,jdouble p67,jbyte p68,jdouble p69
+    ,jdouble p70,jdouble p71,jdouble p72,jfloat p73,jbyte p74,jfloat p75,jfloat p76
+    ,jfloat p77,jfloat p78,jfloat p79,jdouble p80,jdouble p81,jfloat p82,jdouble p83
+    ,jbyte p84,jfloat p85,jdouble p86,jfloat p87,jdouble p88,jbyte p89,jbyte p90
+    ,jdouble p91,jbyte p92,jfloat p93,jdouble p94,jbyte p95,jfloat p96,jfloat p97
+    ,jdouble p98,jfloat p99,jbyte p100,jfloat p101,jdouble p102,jdouble p103
+    ,jbyte p104,jdouble p105,jfloat p106,jbyte p107,jfloat p108,jbyte p109,jfloat p110
+    ,jfloat p111,jdouble p112,jfloat p113,jdouble p114,jdouble p115,jfloat p116
+    ,jdouble p117,jfloat p118,jfloat p119,jfloat p120,jbyte p121,jdouble p122
+    ,jdouble p123,jdouble p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%d\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc23(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jfloat p5,jint p6,jfloat p7
+    ,jfloat p8,jfloat p9,jfloat p10,jint p11,jfloat p12,jfloat p13,jfloat p14
+    ,jint p15,jfloat p16,jfloat p17,jfloat p18,jint p19,jfloat p20,jfloat p21
+    ,jfloat p22,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jfloat p27,jfloat p28
+    ,jfloat p29,jint p30,jfloat p31,jfloat p32,jfloat p33,jint p34,jint p35
+    ,jint p36,jfloat p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jfloat p42
+    ,jint p43,jfloat p44,jfloat p45,jfloat p46,jfloat p47,jint p48,jfloat p49
+    ,jfloat p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54,jint p55,jfloat p56
+    ,jfloat p57,jfloat p58,jfloat p59,jfloat p60,jint p61,jfloat p62,jfloat p63
+    ,jint p64,jfloat p65,jint p66,jint p67,jint p68,jfloat p69,jfloat p70,jfloat p71
+    ,jfloat p72,jint p73,jfloat p74,jfloat p75,jfloat p76,jfloat p77,jint p78
+    ,jfloat p79,jfloat p80,jfloat p81,jfloat p82,jfloat p83,jfloat p84,jfloat p85
+    ,jint p86,jfloat p87,jfloat p88,jfloat p89,jfloat p90,jint p91,jint p92
+    ,jfloat p93,jint p94,jfloat p95,jint p96,jfloat p97,jfloat p98,jfloat p99
+    ,jfloat p100,jfloat p101,jfloat p102,jfloat p103,jfloat p104,jfloat p105
+    ,jfloat p106,jint p107,jfloat p108,jfloat p109,jfloat p110,jfloat p111,jfloat p112
+    ,jint p113,jfloat p114,jfloat p115,jfloat p116,jfloat p117,jfloat p118,jint p119
+    ,jfloat p120,jfloat p121,jint p122,jint p123,jfloat p124,jfloat p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc24(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jbyte p2,jbyte p3,jfloat p4,jfloat p5,jbyte p6,jbyte p7
+    ,jbyte p8,jbyte p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jfloat p14
+    ,jfloat p15,jfloat p16,jfloat p17,jfloat p18,jbyte p19,jfloat p20,jfloat p21
+    ,jfloat p22,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jbyte p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jfloat p35
+    ,jfloat p36,jbyte p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jbyte p42
+    ,jfloat p43,jfloat p44,jfloat p45,jbyte p46,jbyte p47,jfloat p48,jfloat p49
+    ,jfloat p50,jfloat p51,jfloat p52,jfloat p53,jbyte p54,jfloat p55,jbyte p56
+    ,jbyte p57,jfloat p58,jfloat p59,jfloat p60,jfloat p61,jfloat p62,jbyte p63
+    ,jbyte p64,jfloat p65,jfloat p66,jfloat p67,jbyte p68,jfloat p69,jfloat p70
+    ,jfloat p71,jfloat p72,jfloat p73,jbyte p74,jfloat p75,jfloat p76,jfloat p77
+    ,jfloat p78,jfloat p79,jbyte p80,jfloat p81,jfloat p82,jbyte p83,jfloat p84
+    ,jbyte p85,jfloat p86,jbyte p87,jfloat p88,jbyte p89,jbyte p90,jfloat p91
+    ,jfloat p92,jfloat p93,jfloat p94,jbyte p95,jbyte p96,jfloat p97,jbyte p98
+    ,jfloat p99,jfloat p100,jfloat p101,jfloat p102,jfloat p103,jfloat p104
+    ,jfloat p105,jbyte p106,jfloat p107,jfloat p108,jfloat p109,jfloat p110
+    ,jbyte p111,jfloat p112,jfloat p113,jfloat p114,jfloat p115,jfloat p116
+    ,jfloat p117,jfloat p118,jfloat p119,jfloat p120,jfloat p121,jfloat p122
+    ,jfloat p123,jfloat p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc25(JNIEnv *e, jclass c
+,jfloat p0,jint p1,jfloat p2,jfloat p3,jfloat p4,jint p5,jint p6,jbyte p7
+    ,jfloat p8,jint p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jint p14
+    ,jbyte p15,jfloat p16,jfloat p17,jfloat p18,jbyte p19,jfloat p20,jbyte p21
+    ,jfloat p22,jbyte p23,jfloat p24,jfloat p25,jfloat p26,jfloat p27,jfloat p28
+    ,jint p29,jbyte p30,jfloat p31,jbyte p32,jfloat p33,jint p34,jint p35,jbyte p36
+    ,jbyte p37,jint p38,jint p39,jfloat p40,jint p41,jfloat p42,jfloat p43,jfloat p44
+    ,jfloat p45,jfloat p46,jint p47,jfloat p48,jint p49,jint p50,jint p51,jfloat p52
+    ,jfloat p53,jbyte p54,jint p55,jbyte p56,jint p57,jfloat p58,jint p59,jint p60
+    ,jbyte p61,jbyte p62,jint p63,jfloat p64,jfloat p65,jbyte p66,jbyte p67
+    ,jbyte p68,jint p69,jbyte p70,jfloat p71,jbyte p72,jfloat p73,jfloat p74
+    ,jfloat p75,jfloat p76,jbyte p77,jfloat p78,jint p79,jbyte p80,jfloat p81
+    ,jfloat p82,jint p83,jfloat p84,jbyte p85,jbyte p86,jfloat p87,jfloat p88
+    ,jbyte p89,jfloat p90,jfloat p91,jint p92,jfloat p93,jfloat p94,jint p95
+    ,jfloat p96,jint p97,jint p98,jint p99,jint p100,jint p101,jint p102,jint p103
+    ,jfloat p104,jint p105,jbyte p106,jfloat p107,jfloat p108,jint p109,jbyte p110
+    ,jfloat p111,jfloat p112,jfloat p113,jbyte p114,jfloat p115,jbyte p116,jfloat p117
+    ,jbyte p118,jfloat p119,jfloat p120,jfloat p121,jbyte p122,jfloat p123,jbyte p124
+    ,jfloat p125,jint p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%d\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc26(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jdouble p4,jint p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jdouble p12,jdouble p13
+    ,jdouble p14,jint p15,jdouble p16,jdouble p17,jint p18,jdouble p19,jdouble p20
+    ,jint p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26,jdouble p27
+    ,jdouble p28,jdouble p29,jdouble p30,jint p31,jint p32,jdouble p33,jdouble p34
+    ,jdouble p35,jdouble p36,jdouble p37,jdouble p38,jdouble p39,jdouble p40
+    ,jdouble p41,jdouble p42,jint p43,jdouble p44,jdouble p45,jint p46,jdouble p47
+    ,jint p48,jdouble p49,jdouble p50,jdouble p51,jdouble p52,jint p53,jdouble p54
+    ,jdouble p55,jdouble p56,jint p57,jint p58,jdouble p59,jint p60,jdouble p61
+    ,jdouble p62,jdouble p63,jdouble p64,jdouble p65,jdouble p66,jdouble p67
+    ,jdouble p68,jdouble p69,jint p70,jint p71,jdouble p72,jdouble p73,jint p74
+    ,jint p75,jint p76,jdouble p77,jdouble p78,jdouble p79,jdouble p80,jdouble p81
+    ,jdouble p82,jdouble p83,jdouble p84,jdouble p85,jint p86,jdouble p87,jdouble p88
+    ,jint p89,jdouble p90,jdouble p91,jdouble p92,jdouble p93,jint p94,jdouble p95
+    ,jdouble p96,jint p97,jdouble p98,jdouble p99,jdouble p100,jdouble p101
+    ,jdouble p102,jdouble p103,jdouble p104,jdouble p105,jdouble p106,jdouble p107
+    ,jdouble p108,jdouble p109,jint p110,jint p111,jdouble p112,jint p113,jdouble p114
+    ,jdouble p115,jdouble p116,jdouble p117,jdouble p118,jdouble p119,jint p120
+    ,jint p121,jint p122,jdouble p123,jdouble p124,jdouble p125,jint p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%d\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc27(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jdouble p4,jdouble p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jbyte p12,jbyte p13
+    ,jbyte p14,jdouble p15,jdouble p16,jbyte p17,jdouble p18,jdouble p19,jdouble p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jdouble p27,jdouble p28,jdouble p29,jbyte p30,jdouble p31,jdouble p32,jbyte p33
+    ,jdouble p34,jdouble p35,jdouble p36,jdouble p37,jdouble p38,jdouble p39
+    ,jdouble p40,jbyte p41,jbyte p42,jdouble p43,jbyte p44,jbyte p45,jdouble p46
+    ,jdouble p47,jdouble p48,jbyte p49,jbyte p50,jbyte p51,jdouble p52,jbyte p53
+    ,jdouble p54,jdouble p55,jdouble p56,jdouble p57,jbyte p58,jbyte p59,jdouble p60
+    ,jdouble p61,jdouble p62,jdouble p63,jdouble p64,jdouble p65,jdouble p66
+    ,jdouble p67,jbyte p68,jdouble p69,jdouble p70,jbyte p71,jdouble p72,jdouble p73
+    ,jdouble p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78,jdouble p79
+    ,jdouble p80,jdouble p81,jdouble p82,jdouble p83,jdouble p84,jdouble p85
+    ,jdouble p86,jdouble p87,jbyte p88,jdouble p89,jbyte p90,jbyte p91,jbyte p92
+    ,jdouble p93,jbyte p94,jbyte p95,jdouble p96,jbyte p97,jdouble p98,jdouble p99
+    ,jdouble p100,jdouble p101,jdouble p102,jdouble p103,jdouble p104,jdouble p105
+    ,jdouble p106,jdouble p107,jdouble p108,jdouble p109,jdouble p110,jdouble p111
+    ,jdouble p112,jdouble p113,jdouble p114,jbyte p115,jdouble p116,jdouble p117
+    ,jbyte p118,jdouble p119,jdouble p120,jbyte p121,jdouble p122,jdouble p123
+    ,jdouble p124,jbyte p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc28(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jbyte p2,jdouble p3,jdouble p4,jdouble p5,jbyte p6
+    ,jint p7,jbyte p8,jint p9,jint p10,jbyte p11,jdouble p12,jint p13,jdouble p14
+    ,jdouble p15,jbyte p16,jdouble p17,jbyte p18,jdouble p19,jdouble p20,jbyte p21
+    ,jdouble p22,jbyte p23,jdouble p24,jint p25,jdouble p26,jdouble p27,jbyte p28
+    ,jdouble p29,jint p30,jint p31,jdouble p32,jdouble p33,jbyte p34,jbyte p35
+    ,jbyte p36,jbyte p37,jdouble p38,jdouble p39,jdouble p40,jdouble p41,jint p42
+    ,jdouble p43,jdouble p44,jdouble p45,jdouble p46,jdouble p47,jdouble p48
+    ,jdouble p49,jint p50,jdouble p51,jdouble p52,jbyte p53,jint p54,jint p55
+    ,jdouble p56,jdouble p57,jint p58,jdouble p59,jdouble p60,jdouble p61,jdouble p62
+    ,jbyte p63,jint p64,jbyte p65,jdouble p66,jdouble p67,jint p68,jdouble p69
+    ,jdouble p70,jdouble p71,jdouble p72,jbyte p73,jdouble p74,jdouble p75,jdouble p76
+    ,jbyte p77,jbyte p78,jdouble p79,jdouble p80,jdouble p81,jdouble p82,jdouble p83
+    ,jbyte p84,jdouble p85,jdouble p86,jbyte p87,jdouble p88,jbyte p89,jdouble p90
+    ,jdouble p91,jint p92,jbyte p93,jdouble p94,jdouble p95,jdouble p96,jdouble p97
+    ,jdouble p98,jdouble p99,jbyte p100,jbyte p101,jdouble p102,jdouble p103
+    ,jbyte p104,jdouble p105,jdouble p106,jbyte p107,jint p108,jbyte p109,jbyte p110
+    ,jbyte p111,jdouble p112,jint p113,jdouble p114,jbyte p115,jint p116,jdouble p117
+    ,jdouble p118,jbyte p119,jbyte p120,jint p121,jdouble p122,jint p123,jbyte p124
+    ,jdouble p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%d\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%d\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc29(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jdouble p2,jdouble p3,jfloat p4,jfloat p5,jint p6,jdouble p7
+    ,jfloat p8,jbyte p9,jfloat p10,jfloat p11,jfloat p12,jdouble p13,jdouble p14
+    ,jint p15,jbyte p16,jfloat p17,jfloat p18,jbyte p19,jint p20,jdouble p21
+    ,jfloat p22,jfloat p23,jint p24,jfloat p25,jfloat p26,jbyte p27,jdouble p28
+    ,jfloat p29,jint p30,jint p31,jfloat p32,jfloat p33,jfloat p34,jdouble p35
+    ,jdouble p36,jfloat p37,jdouble p38,jfloat p39,jfloat p40,jfloat p41,jdouble p42
+    ,jfloat p43,jdouble p44,jdouble p45,jdouble p46,jint p47,jdouble p48,jfloat p49
+    ,jbyte p50,jdouble p51,jbyte p52,jdouble p53,jfloat p54,jdouble p55,jfloat p56
+    ,jbyte p57,jfloat p58,jdouble p59,jfloat p60,jfloat p61,jdouble p62,jfloat p63
+    ,jdouble p64,jbyte p65,jfloat p66,jfloat p67,jint p68,jfloat p69,jdouble p70
+    ,jdouble p71,jfloat p72,jdouble p73,jfloat p74,jfloat p75,jbyte p76,jfloat p77
+    ,jdouble p78,jdouble p79,jfloat p80,jdouble p81,jdouble p82,jbyte p83,jdouble p84
+    ,jint p85,jfloat p86,jint p87,jdouble p88,jfloat p89,jbyte p90,jbyte p91
+    ,jfloat p92,jbyte p93,jdouble p94,jfloat p95,jint p96,jdouble p97,jdouble p98
+    ,jfloat p99,jdouble p100,jfloat p101,jfloat p102,jdouble p103,jfloat p104
+    ,jint p105,jdouble p106,jint p107,jdouble p108,jdouble p109,jfloat p110
+    ,jdouble p111,jfloat p112,jdouble p113,jdouble p114,jint p115,jfloat p116
+    ,jfloat p117,jint p118,jfloat p119,jdouble p120,jfloat p121,jbyte p122,jfloat p123
+    ,jfloat p124,jfloat p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc30(JNIEnv *e, jclass c
+,jfloat p0,jdouble p1,jfloat p2,jfloat p3,jfloat p4,jfloat p5,jdouble p6
+    ,jfloat p7,jdouble p8,jfloat p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13
+    ,jfloat p14,jfloat p15,jdouble p16,jfloat p17,jdouble p18,jfloat p19,jdouble p20
+    ,jdouble p21,jdouble p22,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jfloat p27
+    ,jfloat p28,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jdouble p34
+    ,jfloat p35,jdouble p36,jfloat p37,jdouble p38,jfloat p39,jfloat p40,jfloat p41
+    ,jdouble p42,jfloat p43,jfloat p44,jfloat p45,jfloat p46,jdouble p47,jdouble p48
+    ,jdouble p49,jfloat p50,jdouble p51,jdouble p52,jfloat p53,jfloat p54,jfloat p55
+    ,jdouble p56,jdouble p57,jfloat p58,jfloat p59,jfloat p60,jfloat p61,jfloat p62
+    ,jfloat p63,jfloat p64,jfloat p65,jfloat p66,jfloat p67,jfloat p68,jdouble p69
+    ,jfloat p70,jfloat p71,jfloat p72,jfloat p73,jfloat p74,jfloat p75,jfloat p76
+    ,jdouble p77,jfloat p78,jfloat p79,jfloat p80,jdouble p81,jfloat p82,jfloat p83
+    ,jfloat p84,jdouble p85,jdouble p86,jdouble p87,jfloat p88,jfloat p89,jfloat p90
+    ,jfloat p91,jfloat p92,jdouble p93,jfloat p94,jfloat p95,jfloat p96,jfloat p97
+    ,jfloat p98,jdouble p99,jdouble p100,jfloat p101,jfloat p102,jdouble p103
+    ,jdouble p104,jfloat p105,jdouble p106,jfloat p107,jfloat p108,jfloat p109
+    ,jfloat p110,jdouble p111,jfloat p112,jfloat p113,jfloat p114,jfloat p115
+    ,jfloat p116,jfloat p117,jfloat p118,jfloat p119,jfloat p120,jfloat p121
+    ,jfloat p122,jfloat p123,jdouble p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc31(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jfloat p2,jfloat p3,jfloat p4,jdouble p5,jfloat p6
+    ,jfloat p7,jdouble p8,jdouble p9,jint p10,jdouble p11,jdouble p12,jfloat p13
+    ,jint p14,jdouble p15,jfloat p16,jfloat p17,jfloat p18,jfloat p19,jfloat p20
+    ,jint p21,jfloat p22,jdouble p23,jint p24,jfloat p25,jdouble p26,jdouble p27
+    ,jdouble p28,jfloat p29,jdouble p30,jfloat p31,jdouble p32,jfloat p33,jfloat p34
+    ,jfloat p35,jdouble p36,jfloat p37,jdouble p38,jdouble p39,jint p40,jint p41
+    ,jdouble p42,jfloat p43,jfloat p44,jfloat p45,jdouble p46,jdouble p47,jfloat p48
+    ,jfloat p49,jdouble p50,jdouble p51,jdouble p52,jfloat p53,jint p54,jdouble p55
+    ,jfloat p56,jdouble p57,jfloat p58,jfloat p59,jfloat p60,jdouble p61,jfloat p62
+    ,jint p63,jdouble p64,jint p65,jint p66,jdouble p67,jdouble p68,jdouble p69
+    ,jfloat p70,jfloat p71,jdouble p72,jint p73,jint p74,jfloat p75,jdouble p76
+    ,jfloat p77,jfloat p78,jfloat p79,jfloat p80,jdouble p81,jdouble p82,jdouble p83
+    ,jdouble p84,jdouble p85,jfloat p86,jfloat p87,jint p88,jdouble p89,jdouble p90
+    ,jfloat p91,jdouble p92,jfloat p93,jint p94,jfloat p95,jfloat p96,jdouble p97
+    ,jint p98,jint p99,jdouble p100,jdouble p101,jfloat p102,jfloat p103,jdouble p104
+    ,jdouble p105,jdouble p106,jdouble p107,jdouble p108,jfloat p109,jfloat p110
+    ,jdouble p111,jfloat p112,jdouble p113,jdouble p114,jfloat p115,jfloat p116
+    ,jfloat p117,jfloat p118,jdouble p119,jint p120,jdouble p121,jfloat p122
+    ,jdouble p123,jdouble p124,jdouble p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc32(JNIEnv *e, jclass c
+,jdouble p0,jfloat p1,jbyte p2,jfloat p3,jdouble p4,jbyte p5,jfloat p6,jfloat p7
+    ,jdouble p8,jfloat p9,jfloat p10,jfloat p11,jdouble p12,jfloat p13,jfloat p14
+    ,jdouble p15,jfloat p16,jbyte p17,jfloat p18,jfloat p19,jfloat p20,jfloat p21
+    ,jbyte p22,jbyte p23,jbyte p24,jfloat p25,jfloat p26,jdouble p27,jbyte p28
+    ,jdouble p29,jfloat p30,jdouble p31,jdouble p32,jfloat p33,jbyte p34,jfloat p35
+    ,jfloat p36,jdouble p37,jfloat p38,jdouble p39,jfloat p40,jdouble p41,jbyte p42
+    ,jdouble p43,jfloat p44,jdouble p45,jbyte p46,jfloat p47,jbyte p48,jfloat p49
+    ,jfloat p50,jfloat p51,jfloat p52,jdouble p53,jdouble p54,jdouble p55,jfloat p56
+    ,jdouble p57,jdouble p58,jfloat p59,jdouble p60,jdouble p61,jdouble p62
+    ,jdouble p63,jfloat p64,jdouble p65,jdouble p66,jdouble p67,jbyte p68,jdouble p69
+    ,jfloat p70,jdouble p71,jbyte p72,jdouble p73,jdouble p74,jbyte p75,jdouble p76
+    ,jdouble p77,jdouble p78,jbyte p79,jdouble p80,jdouble p81,jfloat p82,jdouble p83
+    ,jfloat p84,jdouble p85,jbyte p86,jdouble p87,jdouble p88,jfloat p89,jdouble p90
+    ,jdouble p91,jdouble p92,jdouble p93,jbyte p94,jfloat p95,jdouble p96,jdouble p97
+    ,jfloat p98,jdouble p99,jfloat p100,jdouble p101,jfloat p102,jfloat p103
+    ,jbyte p104,jdouble p105,jdouble p106,jdouble p107,jfloat p108,jfloat p109
+    ,jfloat p110,jbyte p111,jdouble p112,jbyte p113,jdouble p114,jdouble p115
+    ,jfloat p116,jfloat p117,jfloat p118,jdouble p119,jdouble p120,jdouble p121
+    ,jfloat p122,jfloat p123,jfloat p124,jbyte p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc33(JNIEnv *e, jclass c
+,jfloat p0,jint p1,jint p2,jint p3,jfloat p4,jfloat p5,jfloat p6,jint p7
+    ,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jfloat p14
+    ,jfloat p15,jfloat p16,jint p17,jfloat p18,jfloat p19,jfloat p20,jfloat p21
+    ,jint p22,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jfloat p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jfloat p35
+    ,jfloat p36,jfloat p37,jint p38,jint p39,jint p40,jfloat p41,jfloat p42
+    ,jfloat p43,jfloat p44,jint p45,jfloat p46,jfloat p47,jint p48,jfloat p49
+    ,jfloat p50,jfloat p51,jfloat p52,jint p53,jfloat p54,jfloat p55,jfloat p56
+    ,jfloat p57,jfloat p58,jfloat p59,jfloat p60,jint p61,jfloat p62,jfloat p63
+    ,jfloat p64,jfloat p65,jint p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jint p71,jfloat p72,jfloat p73,jfloat p74,jfloat p75,jfloat p76,jfloat p77
+    ,jfloat p78,jfloat p79,jfloat p80,jfloat p81,jfloat p82,jfloat p83,jfloat p84
+    ,jfloat p85,jfloat p86,jfloat p87,jfloat p88,jint p89,jint p90,jfloat p91
+    ,jfloat p92,jfloat p93,jint p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98
+    ,jfloat p99,jfloat p100,jint p101,jfloat p102,jfloat p103,jfloat p104,jint p105
+    ,jint p106,jfloat p107,jint p108,jfloat p109,jfloat p110,jfloat p111,jfloat p112
+    ,jfloat p113,jfloat p114,jint p115,jint p116,jfloat p117,jfloat p118,jint p119
+    ,jfloat p120,jfloat p121,jfloat p122,jfloat p123,jfloat p124,jfloat p125
+    ,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%d\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc34(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jbyte p5,jfloat p6,jfloat p7
+    ,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jbyte p12,jfloat p13,jfloat p14
+    ,jbyte p15,jfloat p16,jfloat p17,jbyte p18,jbyte p19,jfloat p20,jfloat p21
+    ,jbyte p22,jfloat p23,jfloat p24,jbyte p25,jbyte p26,jbyte p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jfloat p35
+    ,jbyte p36,jfloat p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jfloat p42
+    ,jfloat p43,jfloat p44,jbyte p45,jfloat p46,jbyte p47,jfloat p48,jbyte p49
+    ,jfloat p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54,jfloat p55,jfloat p56
+    ,jbyte p57,jfloat p58,jfloat p59,jfloat p60,jfloat p61,jbyte p62,jfloat p63
+    ,jfloat p64,jfloat p65,jfloat p66,jfloat p67,jbyte p68,jbyte p69,jfloat p70
+    ,jfloat p71,jfloat p72,jfloat p73,jfloat p74,jbyte p75,jfloat p76,jfloat p77
+    ,jbyte p78,jfloat p79,jfloat p80,jfloat p81,jfloat p82,jfloat p83,jfloat p84
+    ,jfloat p85,jfloat p86,jbyte p87,jbyte p88,jfloat p89,jfloat p90,jfloat p91
+    ,jfloat p92,jfloat p93,jfloat p94,jfloat p95,jfloat p96,jbyte p97,jfloat p98
+    ,jfloat p99,jfloat p100,jfloat p101,jbyte p102,jfloat p103,jfloat p104,jbyte p105
+    ,jfloat p106,jfloat p107,jfloat p108,jfloat p109,jfloat p110,jfloat p111
+    ,jfloat p112,jbyte p113,jfloat p114,jfloat p115,jfloat p116,jfloat p117
+    ,jfloat p118,jfloat p119,jfloat p120,jfloat p121,jfloat p122,jfloat p123
+    ,jfloat p124,jbyte p125,jbyte p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc35(JNIEnv *e, jclass c
+,jint p0,jbyte p1,jbyte p2,jfloat p3,jfloat p4,jfloat p5,jfloat p6,jfloat p7
+    ,jint p8,jfloat p9,jint p10,jfloat p11,jfloat p12,jbyte p13,jbyte p14,jfloat p15
+    ,jfloat p16,jbyte p17,jbyte p18,jfloat p19,jfloat p20,jfloat p21,jfloat p22
+    ,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jint p27,jfloat p28,jfloat p29
+    ,jfloat p30,jbyte p31,jfloat p32,jfloat p33,jfloat p34,jfloat p35,jbyte p36
+    ,jfloat p37,jint p38,jfloat p39,jbyte p40,jbyte p41,jfloat p42,jfloat p43
+    ,jfloat p44,jint p45,jfloat p46,jbyte p47,jbyte p48,jint p49,jfloat p50
+    ,jint p51,jfloat p52,jfloat p53,jfloat p54,jbyte p55,jbyte p56,jfloat p57
+    ,jfloat p58,jfloat p59,jint p60,jint p61,jfloat p62,jint p63,jbyte p64,jfloat p65
+    ,jint p66,jfloat p67,jfloat p68,jbyte p69,jfloat p70,jfloat p71,jfloat p72
+    ,jint p73,jfloat p74,jfloat p75,jfloat p76,jbyte p77,jfloat p78,jfloat p79
+    ,jfloat p80,jbyte p81,jfloat p82,jbyte p83,jfloat p84,jfloat p85,jbyte p86
+    ,jfloat p87,jfloat p88,jfloat p89,jfloat p90,jbyte p91,jfloat p92,jfloat p93
+    ,jfloat p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98,jint p99,jfloat p100
+    ,jfloat p101,jint p102,jfloat p103,jfloat p104,jbyte p105,jfloat p106,jint p107
+    ,jfloat p108,jfloat p109,jfloat p110,jfloat p111,jfloat p112,jint p113,jfloat p114
+    ,jfloat p115,jfloat p116,jfloat p117,jbyte p118,jfloat p119,jbyte p120,jfloat p121
+    ,jfloat p122,jint p123,jfloat p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%d\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%d\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%d\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc36(JNIEnv *e, jclass c
+,jint p0,jint p1,jdouble p2,jdouble p3,jdouble p4,jdouble p5,jdouble p6
+    ,jint p7,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jdouble p16,jdouble p17,jint p18,jint p19,jdouble p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jdouble p27,jdouble p28,jdouble p29,jdouble p30,jdouble p31,jdouble p32
+    ,jdouble p33,jdouble p34,jint p35,jdouble p36,jdouble p37,jdouble p38,jdouble p39
+    ,jdouble p40,jdouble p41,jdouble p42,jdouble p43,jint p44,jdouble p45,jdouble p46
+    ,jint p47,jint p48,jdouble p49,jdouble p50,jdouble p51,jdouble p52,jdouble p53
+    ,jdouble p54,jdouble p55,jint p56,jdouble p57,jdouble p58,jdouble p59,jdouble p60
+    ,jdouble p61,jdouble p62,jdouble p63,jdouble p64,jdouble p65,jdouble p66
+    ,jdouble p67,jdouble p68,jdouble p69,jint p70,jdouble p71,jint p72,jdouble p73
+    ,jdouble p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78,jdouble p79
+    ,jint p80,jdouble p81,jdouble p82,jdouble p83,jdouble p84,jdouble p85,jdouble p86
+    ,jdouble p87,jdouble p88,jdouble p89,jdouble p90,jdouble p91,jint p92,jdouble p93
+    ,jdouble p94,jdouble p95,jdouble p96,jdouble p97,jdouble p98,jint p99,jint p100
+    ,jint p101,jint p102,jint p103,jint p104,jint p105,jint p106,jdouble p107
+    ,jdouble p108,jdouble p109,jint p110,jdouble p111,jdouble p112,jdouble p113
+    ,jdouble p114,jdouble p115,jdouble p116,jdouble p117,jdouble p118,jdouble p119
+    ,jdouble p120,jdouble p121,jdouble p122,jdouble p123,jdouble p124,jdouble p125
+    ,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%d\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%d\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%d\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%d\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%d\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc37(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jdouble p4,jdouble p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jbyte p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jdouble p16,jdouble p17,jdouble p18,jdouble p19
+    ,jdouble p20,jdouble p21,jbyte p22,jbyte p23,jdouble p24,jdouble p25,jbyte p26
+    ,jdouble p27,jdouble p28,jdouble p29,jdouble p30,jdouble p31,jdouble p32
+    ,jdouble p33,jdouble p34,jdouble p35,jdouble p36,jdouble p37,jbyte p38,jbyte p39
+    ,jdouble p40,jdouble p41,jdouble p42,jdouble p43,jdouble p44,jbyte p45,jdouble p46
+    ,jdouble p47,jdouble p48,jbyte p49,jdouble p50,jdouble p51,jdouble p52,jdouble p53
+    ,jdouble p54,jdouble p55,jbyte p56,jbyte p57,jdouble p58,jdouble p59,jdouble p60
+    ,jdouble p61,jdouble p62,jdouble p63,jdouble p64,jdouble p65,jbyte p66,jdouble p67
+    ,jdouble p68,jdouble p69,jdouble p70,jbyte p71,jdouble p72,jdouble p73,jdouble p74
+    ,jdouble p75,jdouble p76,jdouble p77,jdouble p78,jdouble p79,jdouble p80
+    ,jdouble p81,jdouble p82,jdouble p83,jdouble p84,jdouble p85,jdouble p86
+    ,jdouble p87,jdouble p88,jdouble p89,jdouble p90,jdouble p91,jdouble p92
+    ,jdouble p93,jdouble p94,jdouble p95,jbyte p96,jbyte p97,jdouble p98,jdouble p99
+    ,jdouble p100,jdouble p101,jdouble p102,jdouble p103,jdouble p104,jdouble p105
+    ,jdouble p106,jdouble p107,jdouble p108,jbyte p109,jdouble p110,jdouble p111
+    ,jdouble p112,jdouble p113,jdouble p114,jdouble p115,jdouble p116,jdouble p117
+    ,jbyte p118,jdouble p119,jdouble p120,jdouble p121,jdouble p122,jdouble p123
+    ,jbyte p124,jdouble p125,jbyte p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc38(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jint p3,jint p4,jdouble p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jint p11,jdouble p12,jdouble p13
+    ,jint p14,jbyte p15,jdouble p16,jdouble p17,jdouble p18,jdouble p19,jint p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jint p25,jdouble p26,jint p27
+    ,jbyte p28,jdouble p29,jbyte p30,jdouble p31,jdouble p32,jint p33,jdouble p34
+    ,jint p35,jbyte p36,jbyte p37,jdouble p38,jdouble p39,jdouble p40,jdouble p41
+    ,jint p42,jdouble p43,jdouble p44,jdouble p45,jdouble p46,jdouble p47,jint p48
+    ,jdouble p49,jint p50,jint p51,jdouble p52,jbyte p53,jdouble p54,jdouble p55
+    ,jbyte p56,jdouble p57,jdouble p58,jdouble p59,jdouble p60,jdouble p61,jbyte p62
+    ,jdouble p63,jdouble p64,jdouble p65,jbyte p66,jint p67,jdouble p68,jdouble p69
+    ,jdouble p70,jdouble p71,jdouble p72,jbyte p73,jdouble p74,jdouble p75,jdouble p76
+    ,jbyte p77,jdouble p78,jdouble p79,jdouble p80,jdouble p81,jdouble p82,jint p83
+    ,jdouble p84,jdouble p85,jdouble p86,jint p87,jdouble p88,jint p89,jdouble p90
+    ,jdouble p91,jdouble p92,jdouble p93,jdouble p94,jint p95,jbyte p96,jbyte p97
+    ,jdouble p98,jint p99,jdouble p100,jdouble p101,jdouble p102,jdouble p103
+    ,jdouble p104,jdouble p105,jdouble p106,jdouble p107,jdouble p108,jdouble p109
+    ,jdouble p110,jdouble p111,jint p112,jdouble p113,jdouble p114,jdouble p115
+    ,jdouble p116,jbyte p117,jdouble p118,jdouble p119,jbyte p120,jint p121
+    ,jdouble p122,jint p123,jdouble p124,jdouble p125,jbyte p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%d\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%d\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%d\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%d\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%d\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc39(JNIEnv *e, jclass c
+,jdouble p0,jfloat p1,jdouble p2,jbyte p3,jdouble p4,jint p5,jdouble p6
+    ,jfloat p7,jfloat p8,jdouble p9,jint p10,jbyte p11,jfloat p12,jdouble p13
+    ,jint p14,jint p15,jfloat p16,jbyte p17,jdouble p18,jdouble p19,jfloat p20
+    ,jfloat p21,jdouble p22,jfloat p23,jfloat p24,jdouble p25,jfloat p26,jfloat p27
+    ,jfloat p28,jfloat p29,jfloat p30,jdouble p31,jdouble p32,jdouble p33,jfloat p34
+    ,jdouble p35,jfloat p36,jdouble p37,jfloat p38,jfloat p39,jfloat p40,jint p41
+    ,jbyte p42,jdouble p43,jfloat p44,jfloat p45,jint p46,jbyte p47,jfloat p48
+    ,jdouble p49,jdouble p50,jfloat p51,jfloat p52,jfloat p53,jdouble p54,jint p55
+    ,jfloat p56,jfloat p57,jfloat p58,jfloat p59,jfloat p60,jdouble p61,jdouble p62
+    ,jfloat p63,jfloat p64,jfloat p65,jdouble p66,jfloat p67,jdouble p68,jdouble p69
+    ,jdouble p70,jdouble p71,jdouble p72,jdouble p73,jdouble p74,jfloat p75
+    ,jint p76,jfloat p77,jdouble p78,jdouble p79,jdouble p80,jdouble p81,jbyte p82
+    ,jfloat p83,jfloat p84,jfloat p85,jfloat p86,jdouble p87,jfloat p88,jfloat p89
+    ,jfloat p90,jfloat p91,jfloat p92,jdouble p93,jfloat p94,jdouble p95,jfloat p96
+    ,jdouble p97,jfloat p98,jfloat p99,jdouble p100,jdouble p101,jfloat p102
+    ,jfloat p103,jdouble p104,jdouble p105,jfloat p106,jbyte p107,jdouble p108
+    ,jfloat p109,jfloat p110,jdouble p111,jdouble p112,jdouble p113,jdouble p114
+    ,jdouble p115,jdouble p116,jfloat p117,jdouble p118,jfloat p119,jfloat p120
+    ,jfloat p121,jfloat p122,jfloat p123,jdouble p124,jfloat p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%d\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%d\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%d\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc40(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jfloat p2,jdouble p3,jdouble p4,jfloat p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jdouble p11,jdouble p12,jfloat p13
+    ,jfloat p14,jdouble p15,jfloat p16,jfloat p17,jdouble p18,jfloat p19,jdouble p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jfloat p27,jfloat p28,jdouble p29,jdouble p30,jdouble p31,jfloat p32,jfloat p33
+    ,jfloat p34,jfloat p35,jdouble p36,jfloat p37,jfloat p38,jfloat p39,jdouble p40
+    ,jfloat p41,jdouble p42,jdouble p43,jfloat p44,jdouble p45,jdouble p46,jdouble p47
+    ,jfloat p48,jdouble p49,jdouble p50,jdouble p51,jdouble p52,jfloat p53,jdouble p54
+    ,jdouble p55,jdouble p56,jdouble p57,jdouble p58,jdouble p59,jdouble p60
+    ,jdouble p61,jdouble p62,jfloat p63,jfloat p64,jfloat p65,jfloat p66,jfloat p67
+    ,jdouble p68,jdouble p69,jdouble p70,jdouble p71,jdouble p72,jdouble p73
+    ,jfloat p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78,jdouble p79
+    ,jfloat p80,jdouble p81,jdouble p82,jfloat p83,jdouble p84,jdouble p85,jdouble p86
+    ,jfloat p87,jfloat p88,jdouble p89,jfloat p90,jdouble p91,jfloat p92,jfloat p93
+    ,jfloat p94,jfloat p95,jdouble p96,jfloat p97,jfloat p98,jdouble p99,jdouble p100
+    ,jdouble p101,jdouble p102,jfloat p103,jdouble p104,jdouble p105,jdouble p106
+    ,jdouble p107,jdouble p108,jdouble p109,jfloat p110,jfloat p111,jdouble p112
+    ,jdouble p113,jdouble p114,jdouble p115,jdouble p116,jdouble p117,jdouble p118
+    ,jdouble p119,jfloat p120,jdouble p121,jdouble p122,jdouble p123,jdouble p124
+    ,jdouble p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc41(JNIEnv *e, jclass c
+,jfloat p0,jdouble p1,jint p2,jdouble p3,jint p4,jfloat p5,jfloat p6,jfloat p7
+    ,jint p8,jint p9,jfloat p10,jdouble p11,jdouble p12,jdouble p13,jint p14
+    ,jdouble p15,jdouble p16,jfloat p17,jdouble p18,jdouble p19,jdouble p20
+    ,jint p21,jdouble p22,jfloat p23,jdouble p24,jfloat p25,jdouble p26,jdouble p27
+    ,jint p28,jdouble p29,jdouble p30,jint p31,jdouble p32,jdouble p33,jfloat p34
+    ,jint p35,jdouble p36,jint p37,jint p38,jdouble p39,jfloat p40,jint p41
+    ,jdouble p42,jdouble p43,jdouble p44,jdouble p45,jint p46,jdouble p47,jfloat p48
+    ,jfloat p49,jfloat p50,jdouble p51,jdouble p52,jfloat p53,jfloat p54,jdouble p55
+    ,jfloat p56,jfloat p57,jdouble p58,jfloat p59,jdouble p60,jfloat p61,jdouble p62
+    ,jfloat p63,jdouble p64,jdouble p65,jdouble p66,jdouble p67,jdouble p68
+    ,jdouble p69,jfloat p70,jfloat p71,jdouble p72,jfloat p73,jdouble p74,jfloat p75
+    ,jint p76,jfloat p77,jdouble p78,jint p79,jfloat p80,jfloat p81,jdouble p82
+    ,jdouble p83,jdouble p84,jdouble p85,jdouble p86,jfloat p87,jfloat p88,jfloat p89
+    ,jdouble p90,jint p91,jfloat p92,jdouble p93,jfloat p94,jfloat p95,jfloat p96
+    ,jfloat p97,jfloat p98,jdouble p99,jfloat p100,jint p101,jdouble p102,jfloat p103
+    ,jdouble p104,jdouble p105,jfloat p106,jfloat p107,jdouble p108,jfloat p109
+    ,jfloat p110,jdouble p111,jfloat p112,jdouble p113,jfloat p114,jfloat p115
+    ,jfloat p116,jdouble p117,jint p118,jfloat p119,jint p120,jdouble p121,jdouble p122
+    ,jint p123,jdouble p124,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%d\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%d\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%d\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%d\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%d\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc42(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jdouble p2,jdouble p3,jfloat p4,jdouble p5,jdouble p6
+    ,jfloat p7,jdouble p8,jdouble p9,jfloat p10,jdouble p11,jbyte p12,jfloat p13
+    ,jfloat p14,jfloat p15,jdouble p16,jdouble p17,jfloat p18,jdouble p19,jdouble p20
+    ,jdouble p21,jfloat p22,jfloat p23,jdouble p24,jfloat p25,jdouble p26,jfloat p27
+    ,jfloat p28,jfloat p29,jfloat p30,jfloat p31,jdouble p32,jfloat p33,jbyte p34
+    ,jfloat p35,jdouble p36,jfloat p37,jdouble p38,jfloat p39,jdouble p40,jbyte p41
+    ,jbyte p42,jdouble p43,jfloat p44,jdouble p45,jfloat p46,jfloat p47,jdouble p48
+    ,jdouble p49,jfloat p50,jdouble p51,jdouble p52,jdouble p53,jdouble p54
+    ,jfloat p55,jdouble p56,jfloat p57,jbyte p58,jdouble p59,jfloat p60,jdouble p61
+    ,jdouble p62,jdouble p63,jfloat p64,jfloat p65,jdouble p66,jdouble p67,jbyte p68
+    ,jfloat p69,jfloat p70,jdouble p71,jfloat p72,jfloat p73,jdouble p74,jdouble p75
+    ,jfloat p76,jfloat p77,jfloat p78,jdouble p79,jdouble p80,jdouble p81,jbyte p82
+    ,jfloat p83,jdouble p84,jdouble p85,jdouble p86,jdouble p87,jdouble p88
+    ,jdouble p89,jfloat p90,jdouble p91,jfloat p92,jbyte p93,jfloat p94,jdouble p95
+    ,jdouble p96,jfloat p97,jdouble p98,jfloat p99,jfloat p100,jfloat p101,jdouble p102
+    ,jdouble p103,jdouble p104,jfloat p105,jfloat p106,jfloat p107,jfloat p108
+    ,jdouble p109,jfloat p110,jdouble p111,jdouble p112,jdouble p113,jfloat p114
+    ,jdouble p115,jfloat p116,jbyte p117,jdouble p118,jfloat p119,jdouble p120
+    ,jfloat p121,jbyte p122,jfloat p123,jdouble p124,jfloat p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%d\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc43(JNIEnv *e, jclass c
+,jfloat p0,jint p1,jfloat p2,jfloat p3,jfloat p4,jfloat p5,jfloat p6,jint p7
+    ,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jint p14
+    ,jfloat p15,jfloat p16,jfloat p17,jfloat p18,jfloat p19,jfloat p20,jfloat p21
+    ,jfloat p22,jfloat p23,jfloat p24,jfloat p25,jfloat p26,jfloat p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jint p32,jfloat p33,jfloat p34,jfloat p35
+    ,jfloat p36,jfloat p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jint p42
+    ,jfloat p43,jfloat p44,jfloat p45,jfloat p46,jfloat p47,jfloat p48,jint p49
+    ,jint p50,jint p51,jfloat p52,jfloat p53,jfloat p54,jfloat p55,jfloat p56
+    ,jfloat p57,jfloat p58,jfloat p59,jfloat p60,jint p61,jfloat p62,jint p63
+    ,jfloat p64,jfloat p65,jfloat p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jfloat p71,jfloat p72,jfloat p73,jfloat p74,jfloat p75,jfloat p76,jfloat p77
+    ,jfloat p78,jint p79,jint p80,jint p81,jfloat p82,jfloat p83,jfloat p84
+    ,jfloat p85,jfloat p86,jfloat p87,jfloat p88,jfloat p89,jfloat p90,jfloat p91
+    ,jfloat p92,jfloat p93,jfloat p94,jfloat p95,jfloat p96,jfloat p97,jfloat p98
+    ,jfloat p99,jfloat p100,jfloat p101,jfloat p102,jfloat p103,jfloat p104
+    ,jfloat p105,jfloat p106,jfloat p107,jfloat p108,jfloat p109,jfloat p110
+    ,jint p111,jfloat p112,jfloat p113,jfloat p114,jfloat p115,jfloat p116,jfloat p117
+    ,jfloat p118,jfloat p119,jfloat p120,jfloat p121,jfloat p122,jfloat p123
+    ,jfloat p124,jint p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%d\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%d\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%d\n",p80);
+    fprintf(file,"p81=%d\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%d\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc44(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jbyte p5,jfloat p6,jfloat p7
+    ,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jfloat p12,jfloat p13,jfloat p14
+    ,jbyte p15,jfloat p16,jfloat p17,jfloat p18,jbyte p19,jfloat p20,jfloat p21
+    ,jfloat p22,jfloat p23,jfloat p24,jbyte p25,jfloat p26,jfloat p27,jfloat p28
+    ,jfloat p29,jfloat p30,jfloat p31,jbyte p32,jbyte p33,jfloat p34,jfloat p35
+    ,jfloat p36,jfloat p37,jbyte p38,jfloat p39,jfloat p40,jbyte p41,jfloat p42
+    ,jfloat p43,jfloat p44,jfloat p45,jfloat p46,jfloat p47,jbyte p48,jfloat p49
+    ,jbyte p50,jfloat p51,jfloat p52,jfloat p53,jfloat p54,jfloat p55,jfloat p56
+    ,jfloat p57,jfloat p58,jbyte p59,jfloat p60,jfloat p61,jfloat p62,jfloat p63
+    ,jfloat p64,jfloat p65,jbyte p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jbyte p71,jfloat p72,jbyte p73,jbyte p74,jfloat p75,jfloat p76,jbyte p77
+    ,jbyte p78,jfloat p79,jfloat p80,jfloat p81,jfloat p82,jfloat p83,jfloat p84
+    ,jfloat p85,jfloat p86,jfloat p87,jfloat p88,jfloat p89,jfloat p90,jfloat p91
+    ,jfloat p92,jbyte p93,jfloat p94,jfloat p95,jfloat p96,jbyte p97,jfloat p98
+    ,jfloat p99,jfloat p100,jbyte p101,jfloat p102,jfloat p103,jfloat p104,jfloat p105
+    ,jfloat p106,jfloat p107,jbyte p108,jfloat p109,jfloat p110,jfloat p111
+    ,jfloat p112,jbyte p113,jfloat p114,jfloat p115,jfloat p116,jbyte p117,jfloat p118
+    ,jfloat p119,jfloat p120,jbyte p121,jfloat p122,jfloat p123,jfloat p124
+    ,jfloat p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%d\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%d\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%d\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc45(JNIEnv *e, jclass c
+,jbyte p0,jbyte p1,jfloat p2,jfloat p3,jfloat p4,jbyte p5,jint p6,jfloat p7
+    ,jfloat p8,jbyte p9,jfloat p10,jbyte p11,jbyte p12,jfloat p13,jfloat p14
+    ,jfloat p15,jfloat p16,jbyte p17,jfloat p18,jint p19,jint p20,jfloat p21
+    ,jfloat p22,jfloat p23,jbyte p24,jbyte p25,jfloat p26,jfloat p27,jbyte p28
+    ,jfloat p29,jfloat p30,jfloat p31,jfloat p32,jfloat p33,jfloat p34,jint p35
+    ,jfloat p36,jint p37,jfloat p38,jfloat p39,jfloat p40,jfloat p41,jfloat p42
+    ,jbyte p43,jfloat p44,jint p45,jbyte p46,jfloat p47,jfloat p48,jfloat p49
+    ,jbyte p50,jfloat p51,jbyte p52,jfloat p53,jfloat p54,jfloat p55,jfloat p56
+    ,jfloat p57,jfloat p58,jfloat p59,jint p60,jint p61,jfloat p62,jbyte p63
+    ,jfloat p64,jint p65,jfloat p66,jfloat p67,jfloat p68,jfloat p69,jfloat p70
+    ,jfloat p71,jfloat p72,jfloat p73,jfloat p74,jint p75,jfloat p76,jfloat p77
+    ,jbyte p78,jfloat p79,jfloat p80,jfloat p81,jfloat p82,jbyte p83,jint p84
+    ,jbyte p85,jfloat p86,jint p87,jfloat p88,jfloat p89,jfloat p90,jfloat p91
+    ,jfloat p92,jint p93,jfloat p94,jfloat p95,jint p96,jfloat p97,jbyte p98
+    ,jfloat p99,jbyte p100,jfloat p101,jint p102,jfloat p103,jfloat p104,jint p105
+    ,jfloat p106,jfloat p107,jint p108,jfloat p109,jfloat p110,jfloat p111,jfloat p112
+    ,jint p113,jfloat p114,jfloat p115,jfloat p116,jfloat p117,jfloat p118,jint p119
+    ,jfloat p120,jbyte p121,jfloat p122,jfloat p123,jfloat p124,jbyte p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%d\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%d\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%d\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%d\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%d\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%d\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%d\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%d\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%d\n",p83);
+    fprintf(file,"p84=%d\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%d\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%d\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%d\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc46(JNIEnv *e, jclass c
+,jint p0,jdouble p1,jdouble p2,jdouble p3,jdouble p4,jdouble p5,jdouble p6
+    ,jdouble p7,jdouble p8,jdouble p9,jdouble p10,jint p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jint p16,jdouble p17,jdouble p18,jdouble p19,jdouble p20
+    ,jdouble p21,jdouble p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jdouble p27,jint p28,jdouble p29,jdouble p30,jdouble p31,jdouble p32,jdouble p33
+    ,jdouble p34,jdouble p35,jint p36,jint p37,jdouble p38,jint p39,jdouble p40
+    ,jdouble p41,jdouble p42,jdouble p43,jdouble p44,jdouble p45,jdouble p46
+    ,jdouble p47,jdouble p48,jdouble p49,jdouble p50,jdouble p51,jint p52,jdouble p53
+    ,jdouble p54,jdouble p55,jdouble p56,jdouble p57,jdouble p58,jdouble p59
+    ,jdouble p60,jdouble p61,jdouble p62,jdouble p63,jint p64,jdouble p65,jdouble p66
+    ,jint p67,jint p68,jdouble p69,jdouble p70,jdouble p71,jdouble p72,jdouble p73
+    ,jdouble p74,jdouble p75,jdouble p76,jint p77,jint p78,jdouble p79,jdouble p80
+    ,jdouble p81,jint p82,jdouble p83,jdouble p84,jint p85,jdouble p86,jdouble p87
+    ,jdouble p88,jint p89,jdouble p90,jdouble p91,jdouble p92,jint p93,jdouble p94
+    ,jint p95,jdouble p96,jdouble p97,jdouble p98,jdouble p99,jdouble p100,jdouble p101
+    ,jint p102,jdouble p103,jdouble p104,jdouble p105,jdouble p106,jdouble p107
+    ,jdouble p108,jdouble p109,jdouble p110,jdouble p111,jdouble p112,jdouble p113
+    ,jdouble p114,jdouble p115,jint p116,jint p117,jdouble p118,jdouble p119
+    ,jdouble p120,jint p121,jdouble p122,jint p123,jint p124,jdouble p125,jdouble p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%d\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%d\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%d\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%d\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%d\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%d\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%d\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%d\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%d\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%d\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc47(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jbyte p4,jdouble p5,jdouble p6
+    ,jdouble p7,jbyte p8,jbyte p9,jdouble p10,jdouble p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jdouble p16,jdouble p17,jdouble p18,jdouble p19
+    ,jdouble p20,jdouble p21,jbyte p22,jdouble p23,jdouble p24,jdouble p25,jdouble p26
+    ,jbyte p27,jdouble p28,jdouble p29,jdouble p30,jdouble p31,jdouble p32,jdouble p33
+    ,jdouble p34,jdouble p35,jdouble p36,jbyte p37,jbyte p38,jdouble p39,jdouble p40
+    ,jdouble p41,jdouble p42,jdouble p43,jdouble p44,jdouble p45,jbyte p46,jdouble p47
+    ,jdouble p48,jdouble p49,jdouble p50,jdouble p51,jbyte p52,jdouble p53,jdouble p54
+    ,jdouble p55,jdouble p56,jdouble p57,jdouble p58,jdouble p59,jdouble p60
+    ,jdouble p61,jdouble p62,jdouble p63,jdouble p64,jdouble p65,jdouble p66
+    ,jdouble p67,jdouble p68,jdouble p69,jbyte p70,jdouble p71,jdouble p72,jdouble p73
+    ,jdouble p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78,jdouble p79
+    ,jdouble p80,jdouble p81,jdouble p82,jdouble p83,jdouble p84,jdouble p85
+    ,jdouble p86,jdouble p87,jdouble p88,jdouble p89,jdouble p90,jdouble p91
+    ,jdouble p92,jdouble p93,jbyte p94,jdouble p95,jdouble p96,jdouble p97,jdouble p98
+    ,jdouble p99,jdouble p100,jbyte p101,jdouble p102,jdouble p103,jbyte p104
+    ,jdouble p105,jdouble p106,jdouble p107,jdouble p108,jdouble p109,jdouble p110
+    ,jdouble p111,jdouble p112,jdouble p113,jbyte p114,jdouble p115,jdouble p116
+    ,jdouble p117,jdouble p118,jdouble p119,jbyte p120,jdouble p121,jbyte p122
+    ,jdouble p123,jdouble p124,jdouble p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%d\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%d\n",p37);fprintf(file,"p38=%d\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%d\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%d\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%d\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%d\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc48(JNIEnv *e, jclass c
+,jint p0,jdouble p1,jdouble p2,jdouble p3,jbyte p4,jdouble p5,jdouble p6
+    ,jdouble p7,jdouble p8,jbyte p9,jint p10,jdouble p11,jbyte p12,jint p13
+    ,jdouble p14,jdouble p15,jdouble p16,jdouble p17,jdouble p18,jint p19,jdouble p20
+    ,jdouble p21,jint p22,jdouble p23,jdouble p24,jint p25,jdouble p26,jint p27
+    ,jbyte p28,jbyte p29,jdouble p30,jdouble p31,jdouble p32,jbyte p33,jdouble p34
+    ,jdouble p35,jdouble p36,jdouble p37,jdouble p38,jdouble p39,jdouble p40
+    ,jdouble p41,jbyte p42,jint p43,jdouble p44,jbyte p45,jdouble p46,jbyte p47
+    ,jdouble p48,jdouble p49,jbyte p50,jbyte p51,jdouble p52,jdouble p53,jint p54
+    ,jdouble p55,jdouble p56,jint p57,jdouble p58,jdouble p59,jdouble p60,jdouble p61
+    ,jint p62,jdouble p63,jdouble p64,jdouble p65,jbyte p66,jdouble p67,jdouble p68
+    ,jdouble p69,jdouble p70,jdouble p71,jdouble p72,jbyte p73,jdouble p74,jdouble p75
+    ,jint p76,jint p77,jint p78,jbyte p79,jdouble p80,jdouble p81,jbyte p82
+    ,jdouble p83,jdouble p84,jbyte p85,jdouble p86,jint p87,jint p88,jdouble p89
+    ,jdouble p90,jdouble p91,jdouble p92,jdouble p93,jint p94,jdouble p95,jdouble p96
+    ,jdouble p97,jbyte p98,jdouble p99,jbyte p100,jbyte p101,jdouble p102,jdouble p103
+    ,jdouble p104,jint p105,jdouble p106,jdouble p107,jdouble p108,jbyte p109
+    ,jdouble p110,jdouble p111,jdouble p112,jdouble p113,jdouble p114,jdouble p115
+    ,jdouble p116,jdouble p117,jdouble p118,jdouble p119,jint p120,jdouble p121
+    ,jdouble p122,jdouble p123,jdouble p124,jdouble p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%d\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%d\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%d\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%d\n",p12);fprintf(file,"p13=%d\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%d\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%d\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%d\n",p28);fprintf(file,"p29=%d\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%d\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%d\n",p50);
+    fprintf(file,"p51=%d\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%d\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%d\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%d\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%d\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%d\n",p77);
+    fprintf(file,"p78=%d\n",p78);fprintf(file,"p79=%d\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%d\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%d\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%d\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%d\n",p100);fprintf(file,"p101=%d\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%d\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%d\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc49(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jdouble p2,jfloat p3,jfloat p4,jbyte p5,jdouble p6
+    ,jint p7,jdouble p8,jfloat p9,jbyte p10,jfloat p11,jdouble p12,jfloat p13
+    ,jdouble p14,jdouble p15,jdouble p16,jfloat p17,jfloat p18,jdouble p19,jfloat p20
+    ,jfloat p21,jint p22,jfloat p23,jbyte p24,jfloat p25,jbyte p26,jdouble p27
+    ,jdouble p28,jdouble p29,jdouble p30,jdouble p31,jdouble p32,jint p33,jfloat p34
+    ,jfloat p35,jbyte p36,jfloat p37,jfloat p38,jfloat p39,jdouble p40,jbyte p41
+    ,jint p42,jfloat p43,jdouble p44,jfloat p45,jdouble p46,jint p47,jbyte p48
+    ,jdouble p49,jfloat p50,jdouble p51,jfloat p52,jfloat p53,jfloat p54,jfloat p55
+    ,jfloat p56,jdouble p57,jbyte p58,jfloat p59,jfloat p60,jfloat p61,jfloat p62
+    ,jfloat p63,jfloat p64,jfloat p65,jbyte p66,jdouble p67,jbyte p68,jfloat p69
+    ,jfloat p70,jdouble p71,jdouble p72,jdouble p73,jint p74,jdouble p75,jfloat p76
+    ,jfloat p77,jfloat p78,jfloat p79,jdouble p80,jfloat p81,jdouble p82,jfloat p83
+    ,jfloat p84,jint p85,jfloat p86,jdouble p87,jdouble p88,jfloat p89,jint p90
+    ,jdouble p91,jdouble p92,jdouble p93,jfloat p94,jfloat p95,jdouble p96,jdouble p97
+    ,jfloat p98,jdouble p99,jfloat p100,jfloat p101,jfloat p102,jfloat p103
+    ,jdouble p104,jfloat p105,jdouble p106,jfloat p107,jdouble p108,jfloat p109
+    ,jfloat p110,jdouble p111,jfloat p112,jbyte p113,jfloat p114,jdouble p115
+    ,jdouble p116,jfloat p117,jdouble p118,jdouble p119,jbyte p120,jfloat p121
+    ,jfloat p122,jbyte p123,jdouble p124,jdouble p125,jfloat p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%d\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%d\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%d\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%d\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%d\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%d\n",p41);
+    fprintf(file,"p42=%d\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%d\n",p47);
+    fprintf(file,"p48=%d\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%d\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%d\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%d\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%d\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%d\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%d\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc50(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jfloat p4,jfloat p5,jdouble p6
+    ,jfloat p7,jdouble p8,jfloat p9,jdouble p10,jdouble p11,jdouble p12,jdouble p13
+    ,jdouble p14,jdouble p15,jfloat p16,jdouble p17,jfloat p18,jdouble p19,jfloat p20
+    ,jdouble p21,jfloat p22,jdouble p23,jdouble p24,jdouble p25,jfloat p26,jdouble p27
+    ,jdouble p28,jdouble p29,jdouble p30,jdouble p31,jfloat p32,jfloat p33,jdouble p34
+    ,jdouble p35,jdouble p36,jdouble p37,jfloat p38,jdouble p39,jdouble p40
+    ,jdouble p41,jdouble p42,jdouble p43,jdouble p44,jdouble p45,jdouble p46
+    ,jfloat p47,jdouble p48,jfloat p49,jdouble p50,jdouble p51,jdouble p52,jdouble p53
+    ,jdouble p54,jdouble p55,jdouble p56,jdouble p57,jdouble p58,jdouble p59
+    ,jdouble p60,jdouble p61,jfloat p62,jfloat p63,jdouble p64,jdouble p65,jdouble p66
+    ,jdouble p67,jdouble p68,jdouble p69,jdouble p70,jfloat p71,jdouble p72
+    ,jdouble p73,jfloat p74,jdouble p75,jdouble p76,jdouble p77,jdouble p78
+    ,jdouble p79,jdouble p80,jdouble p81,jdouble p82,jfloat p83,jfloat p84,jdouble p85
+    ,jdouble p86,jfloat p87,jdouble p88,jdouble p89,jfloat p90,jdouble p91,jdouble p92
+    ,jdouble p93,jfloat p94,jdouble p95,jfloat p96,jdouble p97,jdouble p98,jfloat p99
+    ,jdouble p100,jfloat p101,jdouble p102,jdouble p103,jdouble p104,jdouble p105
+    ,jdouble p106,jdouble p107,jdouble p108,jdouble p109,jfloat p110,jdouble p111
+    ,jdouble p112,jdouble p113,jdouble p114,jfloat p115,jdouble p116,jdouble p117
+    ,jdouble p118,jfloat p119,jdouble p120,jdouble p121,jdouble p122,jdouble p123
+    ,jdouble p124,jdouble p125,jdouble p126)
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%e\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%e\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%e\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%e\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc51(JNIEnv *e, jclass c
+,jfloat p0,jfloat p1,jfloat p2,jfloat p3,jfloat p4,jdouble p5,jfloat p6
+    ,jfloat p7,jdouble p8,jdouble p9,jint p10,jfloat p11,jdouble p12,jdouble p13
+    ,jfloat p14,jdouble p15,jdouble p16,jdouble p17,jdouble p18,jdouble p19
+    ,jfloat p20,jdouble p21,jfloat p22,jint p23,jdouble p24,jdouble p25,jfloat p26
+    ,jint p27,jdouble p28,jfloat p29,jfloat p30,jdouble p31,jint p32,jint p33
+    ,jfloat p34,jfloat p35,jdouble p36,jfloat p37,jfloat p38,jfloat p39,jfloat p40
+    ,jfloat p41,jdouble p42,jdouble p43,jdouble p44,jint p45,jdouble p46,jfloat p47
+    ,jfloat p48,jdouble p49,jdouble p50,jfloat p51,jfloat p52,jfloat p53,jdouble p54
+    ,jfloat p55,jdouble p56,jfloat p57,jfloat p58,jint p59,jint p60,jdouble p61
+    ,jdouble p62,jdouble p63,jfloat p64,jfloat p65,jdouble p66,jint p67,jint p68
+    ,jfloat p69,jint p70,jdouble p71,jint p72,jfloat p73,jfloat p74,jdouble p75
+    ,jdouble p76,jdouble p77,jfloat p78,jfloat p79,jfloat p80,jdouble p81,jdouble p82
+    ,jfloat p83,jfloat p84,jdouble p85,jfloat p86,jint p87,jfloat p88,jfloat p89
+    ,jdouble p90,jfloat p91,jdouble p92,jdouble p93,jint p94,jfloat p95,jfloat p96
+    ,jfloat p97,jdouble p98,jdouble p99,jdouble p100,jdouble p101,jfloat p102
+    ,jfloat p103,jdouble p104,jfloat p105,jdouble p106,jdouble p107,jfloat p108
+    ,jfloat p109,jdouble p110,jfloat p111,jfloat p112,jfloat p113,jfloat p114
+    ,jfloat p115,jdouble p116,jfloat p117,jdouble p118,jdouble p119,jdouble p120
+    ,jfloat p121,jfloat p122,jfloat p123,jdouble p124,jdouble p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%e\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%d\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%d\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%d\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%d\n",p32);
+    fprintf(file,"p33=%d\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%e\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%e\n",p58);fprintf(file,"p59=%d\n",p59);
+    fprintf(file,"p60=%d\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%e\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%d\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%d\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%e\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%d\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%e\n",p102);fprintf(file,"p103=%e\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%e\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%e\n",p112);fprintf(file,"p113=%e\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%e\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
+JNIEXPORT void JNICALL Java_vm_jit_LongTransitions_LTTest_nativeFnc52(JNIEnv *e, jclass c
+,jdouble p0,jdouble p1,jdouble p2,jdouble p3,jdouble p4,jbyte p5,jfloat p6
+    ,jdouble p7,jfloat p8,jfloat p9,jfloat p10,jfloat p11,jdouble p12,jfloat p13
+    ,jdouble p14,jdouble p15,jdouble p16,jfloat p17,jfloat p18,jdouble p19,jdouble p20
+    ,jdouble p21,jdouble p22,jfloat p23,jdouble p24,jfloat p25,jfloat p26,jdouble p27
+    ,jdouble p28,jfloat p29,jdouble p30,jfloat p31,jfloat p32,jfloat p33,jdouble p34
+    ,jdouble p35,jdouble p36,jfloat p37,jfloat p38,jdouble p39,jdouble p40,jfloat p41
+    ,jfloat p42,jfloat p43,jfloat p44,jbyte p45,jfloat p46,jdouble p47,jfloat p48
+    ,jfloat p49,jdouble p50,jfloat p51,jbyte p52,jfloat p53,jfloat p54,jdouble p55
+    ,jfloat p56,jdouble p57,jbyte p58,jdouble p59,jdouble p60,jdouble p61,jdouble p62
+    ,jfloat p63,jdouble p64,jbyte p65,jfloat p66,jfloat p67,jbyte p68,jdouble p69
+    ,jbyte p70,jdouble p71,jdouble p72,jdouble p73,jfloat p74,jdouble p75,jbyte p76
+    ,jdouble p77,jdouble p78,jdouble p79,jdouble p80,jfloat p81,jdouble p82
+    ,jdouble p83,jdouble p84,jfloat p85,jfloat p86,jfloat p87,jfloat p88,jdouble p89
+    ,jfloat p90,jfloat p91,jfloat p92,jdouble p93,jbyte p94,jdouble p95,jfloat p96
+    ,jfloat p97,jdouble p98,jdouble p99,jfloat p100,jdouble p101,jbyte p102
+    ,jbyte p103,jfloat p104,jfloat p105,jdouble p106,jfloat p107,jbyte p108
+    ,jfloat p109,jdouble p110,jfloat p111,jbyte p112,jbyte p113,jdouble p114
+    ,jdouble p115,jdouble p116,jbyte p117,jfloat p118,jdouble p119,jdouble p120
+    ,jfloat p121,jdouble p122,jdouble p123,jdouble p124,jdouble p125,jfloat p126
+    )
+{
+    FILE *file=fopen("LTTest_c.txt","a");fprintf(file,"p0=%e\n",p0);fprintf(file,"p1=%e\n",p1);fprintf(file,"p2=%e\n",p2);
+    fprintf(file,"p3=%e\n",p3);fprintf(file,"p4=%e\n",p4);fprintf(file,"p5=%d\n",p5);
+    fprintf(file,"p6=%e\n",p6);fprintf(file,"p7=%e\n",p7);fprintf(file,"p8=%e\n",p8);
+    fprintf(file,"p9=%e\n",p9);fprintf(file,"p10=%e\n",p10);fprintf(file,"p11=%e\n",p11);
+    fprintf(file,"p12=%e\n",p12);fprintf(file,"p13=%e\n",p13);fprintf(file,"p14=%e\n",p14);
+    fprintf(file,"p15=%e\n",p15);fprintf(file,"p16=%e\n",p16);fprintf(file,"p17=%e\n",p17);
+    fprintf(file,"p18=%e\n",p18);fprintf(file,"p19=%e\n",p19);fprintf(file,"p20=%e\n",p20);
+    fprintf(file,"p21=%e\n",p21);fprintf(file,"p22=%e\n",p22);fprintf(file,"p23=%e\n",p23);
+    fprintf(file,"p24=%e\n",p24);fprintf(file,"p25=%e\n",p25);fprintf(file,"p26=%e\n",p26);
+    fprintf(file,"p27=%e\n",p27);fprintf(file,"p28=%e\n",p28);fprintf(file,"p29=%e\n",p29);
+    fprintf(file,"p30=%e\n",p30);fprintf(file,"p31=%e\n",p31);fprintf(file,"p32=%e\n",p32);
+    fprintf(file,"p33=%e\n",p33);fprintf(file,"p34=%e\n",p34);fprintf(file,"p35=%e\n",p35);
+    fprintf(file,"p36=%e\n",p36);fprintf(file,"p37=%e\n",p37);fprintf(file,"p38=%e\n",p38);
+    fprintf(file,"p39=%e\n",p39);fprintf(file,"p40=%e\n",p40);fprintf(file,"p41=%e\n",p41);
+    fprintf(file,"p42=%e\n",p42);fprintf(file,"p43=%e\n",p43);fprintf(file,"p44=%e\n",p44);
+    fprintf(file,"p45=%d\n",p45);fprintf(file,"p46=%e\n",p46);fprintf(file,"p47=%e\n",p47);
+    fprintf(file,"p48=%e\n",p48);fprintf(file,"p49=%e\n",p49);fprintf(file,"p50=%e\n",p50);
+    fprintf(file,"p51=%e\n",p51);fprintf(file,"p52=%d\n",p52);fprintf(file,"p53=%e\n",p53);
+    fprintf(file,"p54=%e\n",p54);fprintf(file,"p55=%e\n",p55);fprintf(file,"p56=%e\n",p56);
+    fprintf(file,"p57=%e\n",p57);fprintf(file,"p58=%d\n",p58);fprintf(file,"p59=%e\n",p59);
+    fprintf(file,"p60=%e\n",p60);fprintf(file,"p61=%e\n",p61);fprintf(file,"p62=%e\n",p62);
+    fprintf(file,"p63=%e\n",p63);fprintf(file,"p64=%e\n",p64);fprintf(file,"p65=%d\n",p65);
+    fprintf(file,"p66=%e\n",p66);fprintf(file,"p67=%e\n",p67);fprintf(file,"p68=%d\n",p68);
+    fprintf(file,"p69=%e\n",p69);fprintf(file,"p70=%d\n",p70);fprintf(file,"p71=%e\n",p71);
+    fprintf(file,"p72=%e\n",p72);fprintf(file,"p73=%e\n",p73);fprintf(file,"p74=%e\n",p74);
+    fprintf(file,"p75=%e\n",p75);fprintf(file,"p76=%d\n",p76);fprintf(file,"p77=%e\n",p77);
+    fprintf(file,"p78=%e\n",p78);fprintf(file,"p79=%e\n",p79);fprintf(file,"p80=%e\n",p80);
+    fprintf(file,"p81=%e\n",p81);fprintf(file,"p82=%e\n",p82);fprintf(file,"p83=%e\n",p83);
+    fprintf(file,"p84=%e\n",p84);fprintf(file,"p85=%e\n",p85);fprintf(file,"p86=%e\n",p86);
+    fprintf(file,"p87=%e\n",p87);fprintf(file,"p88=%e\n",p88);fprintf(file,"p89=%e\n",p89);
+    fprintf(file,"p90=%e\n",p90);fprintf(file,"p91=%e\n",p91);fprintf(file,"p92=%e\n",p92);
+    fprintf(file,"p93=%e\n",p93);fprintf(file,"p94=%d\n",p94);fprintf(file,"p95=%e\n",p95);
+    fprintf(file,"p96=%e\n",p96);fprintf(file,"p97=%e\n",p97);fprintf(file,"p98=%e\n",p98);
+    fprintf(file,"p99=%e\n",p99);fprintf(file,"p100=%e\n",p100);fprintf(file,"p101=%e\n",p101);
+    fprintf(file,"p102=%d\n",p102);fprintf(file,"p103=%d\n",p103);fprintf(file,"p104=%e\n",p104);
+    fprintf(file,"p105=%e\n",p105);fprintf(file,"p106=%e\n",p106);fprintf(file,"p107=%e\n",p107);
+    fprintf(file,"p108=%d\n",p108);fprintf(file,"p109=%e\n",p109);fprintf(file,"p110=%e\n",p110);
+    fprintf(file,"p111=%e\n",p111);fprintf(file,"p112=%d\n",p112);fprintf(file,"p113=%d\n",p113);
+    fprintf(file,"p114=%e\n",p114);fprintf(file,"p115=%e\n",p115);fprintf(file,"p116=%e\n",p116);
+    fprintf(file,"p117=%d\n",p117);fprintf(file,"p118=%e\n",p118);fprintf(file,"p119=%e\n",p119);
+    fprintf(file,"p120=%e\n",p120);fprintf(file,"p121=%e\n",p121);fprintf(file,"p122=%e\n",p122);
+    fprintf(file,"p123=%e\n",p123);fprintf(file,"p124=%e\n",p124);fprintf(file,"p125=%e\n",p125);
+    fprintf(file,"p126=%e\n",p126);
+    fclose(file);
+}
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java
new file mode 100644
index 00000000000..400aa48ab08
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc1.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc1
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java
new file mode 100644
index 00000000000..bb7e2f0985e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc10.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc10
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java
new file mode 100644
index 00000000000..0095fd26ca7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc11.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc11
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java
new file mode 100644
index 00000000000..f4fb4f9ef9b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc12.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc12
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java
new file mode 100644
index 00000000000..3052eeb7cd6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc13.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc13
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java
new file mode 100644
index 00000000000..ace4ebbb0f3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc14.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc14
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java
new file mode 100644
index 00000000000..cbe206401f6
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc15.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc15
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java
new file mode 100644
index 00000000000..742fe49665e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc16.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc16
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java
new file mode 100644
index 00000000000..0c8ecbd3805
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc17.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc17
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java
new file mode 100644
index 00000000000..37163087d26
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc18.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc18
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java
new file mode 100644
index 00000000000..bab4ed8fb26
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc19.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc19
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java
new file mode 100644
index 00000000000..eef6fc71a89
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc2.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc2
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java
new file mode 100644
index 00000000000..bc6ae0ed3bb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc20.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc20
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java
new file mode 100644
index 00000000000..c2bb495ee08
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc21.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc21
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java
new file mode 100644
index 00000000000..e04889b1906
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc22.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc22
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java
new file mode 100644
index 00000000000..6fd7318556a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc23.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc23
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java
new file mode 100644
index 00000000000..12cbbd6ebb7
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc24.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc24
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java
new file mode 100644
index 00000000000..ff6eba44048
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc25.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc25
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java
new file mode 100644
index 00000000000..67a39c77c5a
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc26.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc26
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java
new file mode 100644
index 00000000000..4a488202134
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc27.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc27
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java
new file mode 100644
index 00000000000..1da8acfbda8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc28.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc28
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java
new file mode 100644
index 00000000000..cc0654489da
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc29.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc29
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java
new file mode 100644
index 00000000000..ef0253e7fbd
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc3.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc3
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java
new file mode 100644
index 00000000000..e5e39032385
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc30.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc30
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java
new file mode 100644
index 00000000000..f76e3fb8d0e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc31.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc31
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java
new file mode 100644
index 00000000000..dbe92b23312
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc32.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc32
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java
new file mode 100644
index 00000000000..403251ce54e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc33.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc33
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java
new file mode 100644
index 00000000000..fd9b5fb543d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc34.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc34
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java
new file mode 100644
index 00000000000..f5f9a04611e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc35.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc35
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java
new file mode 100644
index 00000000000..e0e1f509cfb
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc36.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc36
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java
new file mode 100644
index 00000000000..d954b71b80d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc37.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc37
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java
new file mode 100644
index 00000000000..82e0d4445be
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc38.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc38
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java
new file mode 100644
index 00000000000..a3ac718ebe8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc39.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc39
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java
new file mode 100644
index 00000000000..5c82bcab926
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc4.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc4
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java
new file mode 100644
index 00000000000..a08b453e8e2
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc40.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc40
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java
new file mode 100644
index 00000000000..7a250f36eb0
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc41.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc41
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java
new file mode 100644
index 00000000000..1999338bd29
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc42.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc42
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java
new file mode 100644
index 00000000000..c079716bb27
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc43.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc43
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java
new file mode 100644
index 00000000000..78dd49ba27f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc44.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc44
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java
new file mode 100644
index 00000000000..b0f8e5e63e1
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc45.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc45
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java
new file mode 100644
index 00000000000..fec4d793776
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc46.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc46
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java
new file mode 100644
index 00000000000..8d31e967157
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc47.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc47
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java
new file mode 100644
index 00000000000..2dc0beacfd8
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc48.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc48
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java
new file mode 100644
index 00000000000..6085a8b94a3
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc49.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc49
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java
new file mode 100644
index 00000000000..7a843758657
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc5.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc5
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java
new file mode 100644
index 00000000000..834305b6536
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc50.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc50
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java
new file mode 100644
index 00000000000..b0f2d18b37d
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc51.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc51
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java
new file mode 100644
index 00000000000..f6899386d78
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc52.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc52
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java
new file mode 100644
index 00000000000..178413eac3b
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc6.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc6
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java
new file mode 100644
index 00000000000..b81a59f120c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc7.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc7
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java
new file mode 100644
index 00000000000..4d81babff6f
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc8.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc8
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java
new file mode 100644
index 00000000000..8b598bde28c
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 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
+ *
+ * @summary converted from VM Testbase vm/jit/LongTransitions/nativeFnc9.
+ * VM Testbase keywords: [quick]
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc9
+ */
+
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java
index 4c1a744c268..6e35011f214 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java
@@ -45,6 +45,5 @@
  * @build vm.mlvm.mixed.func.regression.b7127687.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm -Xmx64m vm.mlvm.mixed.func.regression.b7127687.Test
+ * @run main/othervm -Xmx128m vm.mlvm.mixed.func.regression.b7127687.Test
  */
-
diff --git a/test/jdk/ProblemList-graal.txt b/test/jdk/ProblemList-graal.txt
index c31c7d43b6c..7e0c71319da 100644
--- a/test/jdk/ProblemList-graal.txt
+++ b/test/jdk/ProblemList-graal.txt
@@ -68,3 +68,9 @@ java/util/concurrent/tck/JSR166TestCase.java                            8187486
 java/lang/ref/OOMEInReferenceHandler.java                               8196611   generic-all
 java/lang/Runtime/exec/LotsOfOutput.java                                8196611   generic-all
 java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java   8196611   generic-all
+
+# Next JFR tests fail with Graal. Assuming 8193210.
+jdk/jfr/event/compiler/TestCodeSweeper.java              8193210   generic-all
+jdk/jfr/event/compiler/TestCompilerInlining.java         8193210   generic-all
+jdk/jfr/event/compiler/TestCompilerPhase.java            8193210   generic-all
+
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index af1de3bc3c5..697d414b3fc 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -216,6 +216,7 @@ java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java 80
 java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java 8165218 macosx-all
 java/awt/Window/AlwaysOnTop/AutoTestOnTop.java 6847593 macosx-all
 java/awt/Window/GrabSequence/GrabSequence.java 6848409 macosx-all,linux-all
+java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java 8203371 linux-all,solaris-all
 java/awt/font/TextLayout/CombiningPerf.java 8192931 generic-all
 java/awt/font/TextLayout/TextLayoutBounds.java 8169188 generic-all
 java/awt/font/StyledMetrics/BoldSpace.java 8198422 linux-all
@@ -482,7 +483,7 @@ java/awt/Frame/FramesGC/FramesGC.java 8079069 macosx-all
 java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java 8030121 macosx-all
 java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java 8202931 macosx-all,linux-all
 java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html 7124275 macosx-all
-java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all 
+java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all
 java/awt/Component/NativeInLightShow/NativeInLightShow.java 8202932 linux-all
 java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java 8202933 linux-all
 java/awt/grab/MenuDragEvents/MenuDragEvents.html 8202934 linux-all
@@ -491,7 +492,7 @@ java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
-java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 
+java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,solaris-all,windows-all
 java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html 8148041 linux-all
 java/awt/Toolkit/DesktopProperties/rfe4758438.java 8193547 linux-all
 java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java 6847163
@@ -544,7 +545,6 @@ java/io/RandomAccessFile/UnreferencedRAFClosesFd.java           8202292 linux-al
 
 com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
 com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957 aix-all
-sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java    8174734 generic-all
 
 ############################################################################
 
@@ -617,6 +617,65 @@ javax/net/ssl/DTLS/CipherSuite.java                             8202059 macosx-x
 sun/security/krb5/auto/UnboundSSL.java                          8180265 windows-all
 sun/security/provider/KeyStore/DKSTest.sh                       8180266 windows-all
 
+sun/security/pkcs11/Cipher/ReinitCipher.java                    8204203 windows-all
+sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java           8204203 windows-all
+sun/security/pkcs11/Cipher/TestRSACipher.java                   8204203 windows-all
+sun/security/pkcs11/Cipher/TestRSACipherWrap.java               8204203 windows-all 
+sun/security/pkcs11/Cipher/TestRawRSACipher.java                8204203 windows-all 
+sun/security/pkcs11/Cipher/TestSymmCiphers.java                 8204203 windows-all 
+sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java            8204203 windows-all 
+sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java           8204203 windows-all 
+sun/security/pkcs11/KeyAgreement/TestDH.java                    8204203 windows-all 
+sun/security/pkcs11/KeyAgreement/TestInterop.java               8204203 windows-all 
+sun/security/pkcs11/KeyAgreement/TestShort.java                 8204203 windows-all 
+sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java         8204203 windows-all 
+sun/security/pkcs11/KeyGenerator/DESParity.java                 8204203 windows-all 
+sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java          8204203 windows-all 
+sun/security/pkcs11/KeyPairGenerator/TestDH2048.java            8204203 windows-all 
+sun/security/pkcs11/KeyStore/SecretKeysBasic.sh                 8204203 windows-all 
+sun/security/pkcs11/Mac/MacKAT.java                             8204203 windows-all 
+sun/security/pkcs11/Mac/MacSameTest.java                        8204203 windows-all 
+sun/security/pkcs11/Mac/ReinitMac.java                          8204203 windows-all 
+sun/security/pkcs11/MessageDigest/ByteBuffers.java              8204203 windows-all 
+sun/security/pkcs11/MessageDigest/DigestKAT.java                8204203 windows-all 
+sun/security/pkcs11/MessageDigest/ReinitDigest.java             8204203 windows-all 
+sun/security/pkcs11/MessageDigest/TestCloning.java              8204203 windows-all 
+sun/security/pkcs11/Provider/ConfigQuotedString.sh              8204203 windows-all 
+sun/security/pkcs11/Provider/Login.sh                           8204203 windows-all 
+sun/security/pkcs11/SampleTest.java                             8204203 windows-all 
+sun/security/pkcs11/Secmod/AddPrivateKey.java                   8204203 windows-all 
+sun/security/pkcs11/Secmod/Crypto.java                          8204203 windows-all 
+sun/security/pkcs11/Secmod/GetPrivateKey.java                   8204203 windows-all 
+sun/security/pkcs11/Secmod/JksSetPrivateKey.java                8204203 windows-all 
+sun/security/pkcs11/Secmod/LoadKeystore.java                    8204203 windows-all 
+sun/security/pkcs11/Secmod/TestNssDbSqlite.java                 8204203 windows-all 
+sun/security/pkcs11/SecureRandom/Basic.java                     8204203 windows-all 
+sun/security/pkcs11/SecureRandom/TestDeserialization.java       8204203 windows-all 
+sun/security/pkcs11/Serialize/SerializeProvider.java            8204203 windows-all 
+sun/security/pkcs11/Signature/ByteBuffers.java                  8204203 windows-all 
+sun/security/pkcs11/Signature/ReinitSignature.java              8204203 windows-all 
+sun/security/pkcs11/Signature/TestDSA.java                      8204203 windows-all 
+sun/security/pkcs11/Signature/TestDSAKeyLength.java             8204203 windows-all 
+sun/security/pkcs11/Signature/TestRSAKeyLength.java             8204203 windows-all 
+sun/security/pkcs11/ec/ReadCertificates.java                    8204203 windows-all 
+sun/security/pkcs11/ec/ReadPKCS12.java                          8204203 windows-all 
+sun/security/pkcs11/ec/TestCurves.java                          8204203 windows-all 
+sun/security/pkcs11/ec/TestECDH.java                            8204203 windows-all 
+sun/security/pkcs11/ec/TestECDH2.java                           8204203 windows-all 
+sun/security/pkcs11/ec/TestECDSA.java                           8204203 windows-all 
+sun/security/pkcs11/ec/TestECDSA2.java                          8204203 windows-all 
+sun/security/pkcs11/ec/TestECGenSpec.java                       8204203 windows-all 
+sun/security/pkcs11/rsa/KeyWrap.java                            8204203 windows-all 
+sun/security/pkcs11/rsa/TestCACerts.java                        8204203 windows-all 
+sun/security/pkcs11/rsa/TestKeyFactory.java                     8204203 windows-all 
+sun/security/pkcs11/rsa/TestKeyPairGenerator.java               8204203 windows-all 
+sun/security/pkcs11/rsa/TestSignatures.java                     8204203 windows-all 
+sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8204203 windows-all 
+sun/security/pkcs11/tls/TestLeadingZeroesP11.java               8204203 windows-all 
+sun/security/pkcs11/tls/TestMasterSecret.java                   8204203 windows-all 
+sun/security/pkcs11/tls/TestPRF.java                            8204203 windows-all 
+sun/security/pkcs11/tls/TestPremaster.java                      8204203 windows-all
+
 ############################################################################
 
 # jdk_sound
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 555ad920ac6..78faa90b50e 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -18,7 +18,7 @@ keys=2d dnd headful i18n intermittent printer randomness jfr
 
 # Tests that must run in othervm mode
 othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/swing javax/print \
-sun/applet com/apple/laf com/sun/java/accessibility com/sun/java/swing sanity/client demo/jfc \
+com/apple/laf com/sun/java/accessibility com/sun/java/swing sanity/client demo/jfc \
 javax/management com/sun/awt sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle
 
 # Tests that cannot run concurrently
@@ -37,6 +37,7 @@ requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
 requires.properties= \
     sun.arch.data.model \
     java.runtime.name \
+    vm.gc.Z \
     vm.graal.enabled \
     vm.cds \
     docker.support
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 5ba5bb36dc1..6e13e2bbd3b 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -30,7 +30,7 @@ tier1 = \
     :tier1_part1 \
     :tier1_part2 \
     :tier1_part3
-    
+
 tier1_part1 = \
     :jdk_lang
 
@@ -74,7 +74,7 @@ tier2_part2 = \
 
 tier2_part3 = \
     :jdk_net
-   
+
 tier3 = \
     :jdk_rmi \
     :jdk_beans \
@@ -354,8 +354,7 @@ jdk_awt = \
     com/sun/awt \
     com/apple/eawt \
     com/apple/laf \
-    sun/awt \
-    sun/applet
+    sun/awt
 
 jdk_2d = \
     javax/print \
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java
new file mode 100644
index 00000000000..613085ed239
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java
@@ -0,0 +1,498 @@
+/*
+ * 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 8153029
+ * @library /test/lib
+ * @build jdk.test.lib.Convert
+ * @run main ChaCha20KAT
+ * @summary ChaCha20 Cipher Implementation (KAT)
+ */
+
+import java.util.*;
+import java.security.GeneralSecurityException;
+import javax.crypto.Cipher;
+import javax.crypto.spec.ChaCha20ParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.AEADBadTagException;
+import java.nio.ByteBuffer;
+import jdk.test.lib.Convert;
+
+public class ChaCha20KAT {
+    public static class TestData {
+        public TestData(String name, String keyStr, String nonceStr, int ctr,
+                int dir, String inputStr, String aadStr, String outStr) {
+            testName = Objects.requireNonNull(name);
+            key = Convert.hexStringToByteArray(Objects.requireNonNull(keyStr));
+            nonce = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(nonceStr));
+            if ((counter = ctr) < 0) {
+                throw new IllegalArgumentException(
+                        "counter must be 0 or greater");
+            }
+            direction = dir;
+            if ((direction != Cipher.ENCRYPT_MODE) &&
+                    (direction != Cipher.DECRYPT_MODE)) {
+                throw new IllegalArgumentException(
+                        "Direction must be ENCRYPT_MODE or DECRYPT_MODE");
+            }
+            input = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(inputStr));
+            aad = (aadStr != null) ?
+                Convert.hexStringToByteArray(aadStr) : null;
+            expOutput = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(outStr));
+        }
+
+        public final String testName;
+        public final byte[] key;
+        public final byte[] nonce;
+        public final int counter;
+        public final int direction;
+        public final byte[] input;
+        public final byte[] aad;
+        public final byte[] expOutput;
+    }
+
+    public static final List<TestData> testList = new LinkedList<TestData>() {{
+        add(new TestData("RFC 7539 Sample Test Vector",
+            "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+            "000000000000004a00000000",
+            1, Cipher.ENCRYPT_MODE,
+            "4c616469657320616e642047656e746c656d656e206f662074686520636c6173" +
+            "73206f66202739393a204966204920636f756c64206f6666657220796f75206f" +
+            "6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73" +
+            "637265656e20776f756c642062652069742e",
+            null,
+            "6e2e359a2568f98041ba0728dd0d6981e97e7aec1d4360c20a27afccfd9fae0b" +
+            "f91b65c5524733ab8f593dabcd62b3571639d624e65152ab8f530c359f0861d8" +
+            "07ca0dbf500d6a6156a38e088a22b65e52bc514d16ccf806818ce91ab7793736" +
+            "5af90bbf74a35be6b40b8eedf2785e42874d"));
+        add(new TestData("RFC 7539 Test Vector 1 (all zeroes)",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "000000000000000000000000",
+            0, Cipher.ENCRYPT_MODE,
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            null,
+            "76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7" +
+            "da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586"));
+        add(new TestData("RFC 7539 Test Vector 2",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "000000000000000000000002",
+            1, Cipher.ENCRYPT_MODE,
+            "416e79207375626d697373696f6e20746f20746865204945544620696e74656e" +
+            "6465642062792074686520436f6e7472696275746f7220666f72207075626c69" +
+            "636174696f6e20617320616c6c206f722070617274206f6620616e2049455446" +
+            "20496e7465726e65742d4472616674206f722052464320616e6420616e792073" +
+            "746174656d656e74206d6164652077697468696e2074686520636f6e74657874" +
+            "206f6620616e204945544620616374697669747920697320636f6e7369646572" +
+            "656420616e20224945544620436f6e747269627574696f6e222e205375636820" +
+            "73746174656d656e747320696e636c756465206f72616c2073746174656d656e" +
+            "747320696e20494554462073657373696f6e732c2061732077656c6c20617320" +
+            "7772697474656e20616e6420656c656374726f6e696320636f6d6d756e696361" +
+            "74696f6e73206d61646520617420616e792074696d65206f7220706c6163652c" +
+            "207768696368206172652061646472657373656420746f",
+            null,
+            "a3fbf07df3fa2fde4f376ca23e82737041605d9f4f4f57bd8cff2c1d4b7955ec" +
+            "2a97948bd3722915c8f3d337f7d370050e9e96d647b7c39f56e031ca5eb6250d" +
+            "4042e02785ececfa4b4bb5e8ead0440e20b6e8db09d881a7c6132f420e527950" +
+            "42bdfa7773d8a9051447b3291ce1411c680465552aa6c405b7764d5e87bea85a" +
+            "d00f8449ed8f72d0d662ab052691ca66424bc86d2df80ea41f43abf937d3259d" +
+            "c4b2d0dfb48a6c9139ddd7f76966e928e635553ba76c5c879d7b35d49eb2e62b" +
+            "0871cdac638939e25e8a1e0ef9d5280fa8ca328b351c3c765989cbcf3daa8b6c" +
+            "cc3aaf9f3979c92b3720fc88dc95ed84a1be059c6499b9fda236e7e818b04b0b" +
+            "c39c1e876b193bfe5569753f88128cc08aaa9b63d1a16f80ef2554d7189c411f" +
+            "5869ca52c5b83fa36ff216b9c1d30062bebcfd2dc5bce0911934fda79a86f6e6" +
+            "98ced759c3ff9b6477338f3da4f9cd8514ea9982ccafb341b2384dd902f3d1ab" +
+            "7ac61dd29c6f21ba5b862f3730e37cfdc4fd806c22f221"));
+        add(new TestData("RFC 7539 Test Vector 3",
+            "1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0",
+            "000000000000000000000002",
+            42, Cipher.ENCRYPT_MODE,
+            "2754776173206272696c6c69672c20616e642074686520736c6974687920746f" +
+            "7665730a446964206779726520616e642067696d626c6520696e207468652077" +
+            "6162653a0a416c6c206d696d737920776572652074686520626f726f676f7665" +
+            "732c0a416e6420746865206d6f6d65207261746873206f757467726162652e",
+            null,
+            "62e6347f95ed87a45ffae7426f27a1df5fb69110044c0d73118effa95b01e5cf" +
+            "166d3df2d721caf9b21e5fb14c616871fd84c54f9d65b283196c7fe4f60553eb" +
+            "f39c6402c42234e32a356b3e764312a61a5532055716ead6962568f87d3f3f77" +
+            "04c6a8d1bcd1bf4d50d6154b6da731b187b58dfd728afa36757a797ac188d1"));
+    }};
+
+    public static final List<TestData> aeadTestList =
+            new LinkedList<TestData>() {{
+        add(new TestData("RFC 7539 Sample AEAD Test Vector",
+            "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
+            "070000004041424344454647",
+            1, Cipher.ENCRYPT_MODE,
+            "4c616469657320616e642047656e746c656d656e206f662074686520636c6173" +
+            "73206f66202739393a204966204920636f756c64206f6666657220796f75206f" +
+            "6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73" +
+            "637265656e20776f756c642062652069742e",
+            "50515253c0c1c2c3c4c5c6c7",
+            "d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d6" +
+            "3dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b36" +
+            "92ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc" +
+            "3ff4def08e4b7a9de576d26586cec64b61161ae10b594f09e26a7e902ecbd060" +
+            "0691"));
+        add(new TestData("RFC 7539 A.5 Sample Decryption",
+            "1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0",
+            "000000000102030405060708",
+            1, Cipher.DECRYPT_MODE,
+            "64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb2" +
+            "4c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf" +
+            "332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c855" +
+            "9797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4" +
+            "b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523e" +
+            "af4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a" +
+            "0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a10" +
+            "49e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29" +
+            "a6ad5cb4022b02709beead9d67890cbb22392336fea1851f38",
+            "f33388860000000000004e91",
+            "496e7465726e65742d4472616674732061726520647261667420646f63756d65" +
+            "6e74732076616c696420666f722061206d6178696d756d206f6620736978206d" +
+            "6f6e74687320616e64206d617920626520757064617465642c207265706c6163" +
+            "65642c206f72206f62736f6c65746564206279206f7468657220646f63756d65" +
+            "6e747320617420616e792074696d652e20497420697320696e617070726f7072" +
+            "6961746520746f2075736520496e7465726e65742d4472616674732061732072" +
+            "65666572656e6365206d6174657269616c206f7220746f206369746520746865" +
+            "6d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67" +
+            "726573732e2fe2809d"));
+    }};
+
+
+    public static void main(String args[]) throws Exception {
+        int testsPassed = 0;
+        int testNumber = 0;
+
+        System.out.println("----- Single-part (byte[]) Tests -----");
+        for (TestData test : testList) {
+            System.out.println("*** Test " + ++testNumber + ": " +
+                    test.testName);
+            if (runSinglePartTest(test)) {
+                testsPassed++;
+            }
+        }
+        System.out.println();
+
+        System.out.println("----- Single-part (ByteBuffer) Tests -----");
+        for (TestData test : testList) {
+            System.out.println("*** Test " + ++testNumber + ": " +
+                    test.testName);
+            if (runByteBuffer(test)) {
+                testsPassed++;
+            }
+        }
+        System.out.println();
+
+        System.out.println("----- Multi-part Tests -----");
+        for (TestData test : testList) {
+            System.out.println("*** Test " + ++testNumber + ": " +
+                    test.testName);
+            if (runMultiPartTest(test)) {
+                testsPassed++;
+            }
+        }
+        System.out.println();
+
+        System.out.println("----- AEAD Tests -----");
+        for (TestData test : aeadTestList) {
+            System.out.println("*** Test " + ++testNumber + ": " +
+                    test.testName);
+            if (runAEADTest(test)) {
+                testsPassed++;
+            }
+        }
+        System.out.println();
+
+        System.out.println("Total tests: " + testNumber +
+                ", Passed: " + testsPassed + ", Failed: " +
+                (testNumber - testsPassed));
+        if (testsPassed != testNumber) {
+            throw new RuntimeException("One or more tests failed.  " +
+                    "Check output for details");
+        }
+    }
+
+    private static boolean runSinglePartTest(TestData testData)
+            throws GeneralSecurityException {
+        boolean encRes = false;
+        boolean decRes = false;
+        byte[] encryptedResult;
+        byte[] decryptedResult;
+
+        // Get a Cipher instance and set up the parameters
+        Cipher mambo = Cipher.getInstance("ChaCha20");
+        SecretKeySpec mamboKey = new SecretKeySpec(testData.key, "ChaCha20");
+        ChaCha20ParameterSpec mamboSpec = new ChaCha20ParameterSpec(
+                testData.nonce, testData.counter);
+
+        // Encrypt our input
+        mambo.init(Cipher.ENCRYPT_MODE, mamboKey, mamboSpec);
+        encryptedResult = mambo.doFinal(testData.input);
+
+        if (!Arrays.equals(encryptedResult, testData.expOutput)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(testData.expOutput, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(encryptedResult, 16, "\n", " "));
+            System.out.println();
+        } else {
+            encRes = true;
+        }
+
+        // Decrypt the result of the encryption operation
+        mambo = Cipher.getInstance("ChaCha20");
+        mambo.init(Cipher.DECRYPT_MODE, mamboKey, mamboSpec);
+        decryptedResult = mambo.doFinal(encryptedResult);
+
+        if (!Arrays.equals(decryptedResult, testData.input)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(testData.input, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(decryptedResult, 16, "\n", " "));
+            System.out.println();
+        } else {
+            decRes = true;
+        }
+
+        return (encRes && decRes);
+    }
+
+    private static boolean runMultiPartTest(TestData testData)
+            throws GeneralSecurityException {
+        boolean encRes = false;
+        boolean decRes = false;
+
+        // Get a cipher instance and initialize it
+        Cipher mambo = Cipher.getInstance("ChaCha20");
+        SecretKeySpec mamboKey = new SecretKeySpec(testData.key, "ChaCha20");
+        ChaCha20ParameterSpec mamboSpec = new ChaCha20ParameterSpec(
+                testData.nonce, testData.counter);
+
+        byte[] encryptedResult = new byte[testData.input.length];
+        mambo.init(Cipher.ENCRYPT_MODE, mamboKey, mamboSpec);
+        System.out.print("Encrypt - ");
+        doMulti(mambo, testData.input, encryptedResult);
+
+        if (!Arrays.equals(encryptedResult, testData.expOutput)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(testData.expOutput, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(encryptedResult, 16, "\n", " "));
+            System.out.println();
+        } else {
+            encRes = true;
+        }
+
+        // Decrypt the result of the encryption operation
+        mambo = Cipher.getInstance("ChaCha20");
+        byte[] decryptedResult = new byte[encryptedResult.length];
+        mambo.init(Cipher.DECRYPT_MODE, mamboKey, mamboSpec);
+        System.out.print("Decrypt - ");
+        doMulti(mambo, encryptedResult, decryptedResult);
+
+        if (!Arrays.equals(decryptedResult, testData.input)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(testData.input, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(decryptedResult, 16, "\n", " "));
+            System.out.println();
+        } else {
+            decRes = true;
+        }
+
+        return (encRes && decRes);
+    }
+
+    private static void doMulti(Cipher c, byte[] input, byte[] output)
+            throws GeneralSecurityException {
+        int offset = 0;
+        boolean done = false;
+        Random randIn = new Random(System.currentTimeMillis());
+
+        // Send small updates between 1 - 8 bytes in length until we get
+        // 8 or less bytes from the end of the input, then finalize.
+        System.out.println("Input length: " + input.length);
+        System.out.print("Multipart (bytes in/out): ");
+        while (!done) {
+            int mPartLen = randIn.nextInt(8) + 1;
+            int bytesLeft = input.length - offset;
+            int processed;
+            if (mPartLen < bytesLeft) {
+                System.out.print(mPartLen + "/");
+                processed = c.update(input, offset, mPartLen,
+                        output, offset);
+                offset += processed;
+                System.out.print(processed + " ");
+            } else {
+                processed = c.doFinal(input, offset, bytesLeft,
+                        output, offset);
+                System.out.print(bytesLeft + "/" + processed + " ");
+                done = true;
+            }
+        }
+        System.out.println();
+    }
+
+    private static boolean runByteBuffer(TestData testData)
+            throws GeneralSecurityException {
+        boolean encRes = false;
+        boolean decRes = false;
+
+        // Get a cipher instance and initialize it
+        Cipher mambo = Cipher.getInstance("ChaCha20");
+        SecretKeySpec mamboKey = new SecretKeySpec(testData.key, "ChaCha20");
+        ChaCha20ParameterSpec mamboSpec = new ChaCha20ParameterSpec(
+                testData.nonce, testData.counter);
+        mambo.init(Cipher.ENCRYPT_MODE, mamboKey, mamboSpec);
+
+        ByteBuffer bbIn = ByteBuffer.wrap(testData.input);
+        ByteBuffer bbEncOut = ByteBuffer.allocate(
+                mambo.getOutputSize(testData.input.length));
+        ByteBuffer bbExpOut = ByteBuffer.wrap(testData.expOutput);
+
+        mambo.doFinal(bbIn, bbEncOut);
+        bbIn.rewind();
+        bbEncOut.rewind();
+
+        if (bbEncOut.compareTo(bbExpOut) != 0) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(bbExpOut, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(bbEncOut, 16, "\n", " "));
+            System.out.println();
+        } else {
+            encRes = true;
+        }
+
+        // Decrypt the result of the encryption operation
+        mambo = Cipher.getInstance("ChaCha20");
+        mambo.init(Cipher.DECRYPT_MODE, mamboKey, mamboSpec);
+        System.out.print("Decrypt - ");
+        ByteBuffer bbDecOut = ByteBuffer.allocate(
+                mambo.getOutputSize(bbEncOut.remaining()));
+
+        mambo.doFinal(bbEncOut, bbDecOut);
+        bbEncOut.rewind();
+        bbDecOut.rewind();
+
+        if (bbDecOut.compareTo(bbIn) != 0) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(bbIn, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(bbDecOut, 16, "\n", " "));
+            System.out.println();
+        } else {
+            decRes = true;
+        }
+
+        return (encRes && decRes);
+    }
+
+    private static boolean runAEADTest(TestData testData)
+            throws GeneralSecurityException {
+        boolean result = false;
+
+        Cipher mambo = Cipher.getInstance("ChaCha20-Poly1305");
+        SecretKeySpec mamboKey = new SecretKeySpec(testData.key, "ChaCha20");
+        IvParameterSpec mamboSpec = new IvParameterSpec(testData.nonce);
+
+        mambo.init(testData.direction, mamboKey, mamboSpec);
+
+        byte[] out = new byte[mambo.getOutputSize(testData.input.length)];
+        int outOff = 0;
+        try {
+            mambo.updateAAD(testData.aad);
+            outOff += mambo.update(testData.input, 0, testData.input.length,
+                    out, outOff);
+            outOff += mambo.doFinal(out, outOff);
+        } catch (AEADBadTagException abte) {
+            // If we get a bad tag or derive a tag mismatch, log it
+            // and register it as a failure
+            System.out.println("FAIL: " + abte);
+            return false;
+        }
+
+        if (!Arrays.equals(out, testData.expOutput)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(testData.expOutput, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(out, 16, "\n", " "));
+            System.out.println();
+        } else {
+            result = true;
+        }
+
+        return result;
+    }
+
+    /**
+     * Dump the hex bytes of a buffer into string form.
+     *
+     * @param data The array of bytes to dump to stdout.
+     * @param itemsPerLine The number of bytes to display per line
+     *      if the {@code lineDelim} character is blank then all bytes
+     *      will be printed on a single line.
+     * @param lineDelim The delimiter between lines
+     * @param itemDelim The delimiter between bytes
+     *
+     * @return The hexdump of the byte array
+     */
+    private static String dumpHexBytes(byte[] data, int itemsPerLine,
+            String lineDelim, String itemDelim) {
+        return dumpHexBytes(ByteBuffer.wrap(data), itemsPerLine, lineDelim,
+                itemDelim);
+    }
+
+    private static String dumpHexBytes(ByteBuffer data, int itemsPerLine,
+            String lineDelim, String itemDelim) {
+        StringBuilder sb = new StringBuilder();
+        if (data != null) {
+            data.mark();
+            int i = 0;
+            while (data.remaining() > 0) {
+                if (i % itemsPerLine == 0 && i != 0) {
+                    sb.append(lineDelim);
+                }
+                sb.append(String.format("%02X", data.get())).append(itemDelim);
+                i++;
+            }
+            data.reset();
+        }
+
+        return sb.toString();
+    }
+}
+
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java
new file mode 100644
index 00000000000..773c77be4c9
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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 8153029
+ * @summary ChaCha20 key generator test.
+ * @library /test/lib
+ */
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.ChaCha20ParameterSpec;
+
+import jdk.test.lib.Utils;
+
+public class ChaCha20KeyGeneratorTest {
+
+    public static void main(String[] args) throws Exception {
+        KeyGenerator generator = KeyGenerator.getInstance("ChaCha20");
+
+        try {
+            generator.init(new ChaCha20ParameterSpec(
+                    Utils.toByteArray("100000000000000000000000"), 0));
+            throw new RuntimeException(
+                    "ChaCha20 key generation should not consume AlgorithmParameterSpec");
+        } catch (InvalidAlgorithmParameterException e) {
+            System.out.println("Expected InvalidAlgorithmParameterException: "
+                    + e.getMessage());
+        }
+
+        for (int keySize : new int[] { 32, 64, 128, 512, 1024 }) {
+            try {
+                generator.init(keySize);
+                throw new RuntimeException("The key size for ChaCha20 must be 256");
+            } catch (InvalidParameterException e) {
+                System.out.println(
+                        "Expected InvalidParameterException: " + keySize);
+            }
+        }
+
+        generator.init(256);
+        SecretKey key = generator.generateKey();
+        byte[] keyValue = key.getEncoded();
+        System.out.println("Key: " + Utils.toHexString(keyValue));
+        if (keyValue.length != 32) {
+            throw new RuntimeException("The size of generated key must be 256");
+        }
+    }
+}
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java
new file mode 100644
index 00000000000..b6300f6f884
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java
@@ -0,0 +1,625 @@
+/*
+ * 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 8153029
+ * @library /test/lib
+ * @build jdk.test.lib.Convert
+ * @run main ChaCha20NoReuse
+ * @summary ChaCha20 Cipher Implementation (key/nonce reuse protection)
+ */
+
+import java.util.*;
+import javax.crypto.Cipher;
+import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.spec.ChaCha20ParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.AEADBadTagException;
+import javax.crypto.SecretKey;
+import java.security.InvalidKeyException;
+import jdk.test.lib.Convert;
+
+public class ChaCha20NoReuse {
+
+    private static final String ALG_CC20 = "ChaCha20";
+    private static final String ALG_CC20_P1305 = "ChaCha20-Poly1305";
+
+    /**
+     * Basic TestMethod interface definition.
+     */
+    public interface TestMethod {
+        /**
+         * Runs the actual test case
+         *
+         * @param algorithm the algorithm to use (e.g. ChaCha20, etc.)
+         *
+         * @return true if the test passes, false otherwise.
+         */
+        boolean run(String algorithm);
+
+        /**
+         * Check if this TestMethod can be run for this algorithm.  Some tests
+         * are specific to ChaCha20 or ChaCha20-Poly1305, so this method
+         * can be used to determine if a given Cipher type is appropriate.
+         *
+         * @param algorithm the algorithm to use.
+         *
+         * @return true if this test can be run on this algorithm,
+         * false otherwise.
+         */
+        boolean isValid(String algorithm);
+    }
+
+    public static class TestData {
+        public TestData(String name, String keyStr, String nonceStr, int ctr,
+                int dir, String inputStr, String aadStr, String outStr) {
+            testName = Objects.requireNonNull(name);
+            key = Convert.hexStringToByteArray(Objects.requireNonNull(keyStr));
+            nonce = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(nonceStr));
+            if ((counter = ctr) < 0) {
+                throw new IllegalArgumentException(
+                        "counter must be 0 or greater");
+            }
+            direction = dir;
+            if ((direction != Cipher.ENCRYPT_MODE) &&
+                    (direction != Cipher.DECRYPT_MODE)) {
+                throw new IllegalArgumentException(
+                        "Direction must be ENCRYPT_MODE or DECRYPT_MODE");
+            }
+            input = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(inputStr));
+            aad = (aadStr != null) ?
+                Convert.hexStringToByteArray(aadStr) : null;
+            expOutput = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(outStr));
+        }
+
+        public final String testName;
+        public final byte[] key;
+        public final byte[] nonce;
+        public final int counter;
+        public final int direction;
+        public final byte[] input;
+        public final byte[] aad;
+        public final byte[] expOutput;
+    }
+
+    public static final List<TestData> testList = new LinkedList<TestData>() {{
+        add(new TestData("RFC 7539 Sample Test Vector [ENCRYPT]",
+            "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+            "000000000000004a00000000",
+            1, Cipher.ENCRYPT_MODE,
+            "4c616469657320616e642047656e746c656d656e206f662074686520636c6173" +
+            "73206f66202739393a204966204920636f756c64206f6666657220796f75206f" +
+            "6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73" +
+            "637265656e20776f756c642062652069742e",
+            null,
+            "6e2e359a2568f98041ba0728dd0d6981e97e7aec1d4360c20a27afccfd9fae0b" +
+            "f91b65c5524733ab8f593dabcd62b3571639d624e65152ab8f530c359f0861d8" +
+            "07ca0dbf500d6a6156a38e088a22b65e52bc514d16ccf806818ce91ab7793736" +
+            "5af90bbf74a35be6b40b8eedf2785e42874d"));
+        add(new TestData("RFC 7539 Sample Test Vector [DECRYPT]",
+            "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+            "000000000000004a00000000",
+            1, Cipher.DECRYPT_MODE,
+            "6e2e359a2568f98041ba0728dd0d6981e97e7aec1d4360c20a27afccfd9fae0b" +
+            "f91b65c5524733ab8f593dabcd62b3571639d624e65152ab8f530c359f0861d8" +
+            "07ca0dbf500d6a6156a38e088a22b65e52bc514d16ccf806818ce91ab7793736" +
+            "5af90bbf74a35be6b40b8eedf2785e42874d",
+            null,
+            "4c616469657320616e642047656e746c656d656e206f662074686520636c6173" +
+            "73206f66202739393a204966204920636f756c64206f6666657220796f75206f" +
+            "6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73" +
+            "637265656e20776f756c642062652069742e"));
+    }};
+
+    public static final List<TestData> aeadTestList =
+            new LinkedList<TestData>() {{
+        add(new TestData("RFC 7539 Sample AEAD Test Vector",
+            "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
+            "070000004041424344454647",
+            1, Cipher.ENCRYPT_MODE,
+            "4c616469657320616e642047656e746c656d656e206f662074686520636c6173" +
+            "73206f66202739393a204966204920636f756c64206f6666657220796f75206f" +
+            "6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73" +
+            "637265656e20776f756c642062652069742e",
+            "50515253c0c1c2c3c4c5c6c7",
+            "d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d6" +
+            "3dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b36" +
+            "92ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc" +
+            "3ff4def08e4b7a9de576d26586cec64b61161ae10b594f09e26a7e902ecbd060" +
+            "0691"));
+        add(new TestData("RFC 7539 A.5 Sample Decryption",
+            "1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0",
+            "000000000102030405060708",
+            1, Cipher.DECRYPT_MODE,
+            "64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb2" +
+            "4c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf" +
+            "332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c855" +
+            "9797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4" +
+            "b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523e" +
+            "af4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a" +
+            "0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a10" +
+            "49e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29" +
+            "a6ad5cb4022b02709beead9d67890cbb22392336fea1851f38",
+            "f33388860000000000004e91",
+            "496e7465726e65742d4472616674732061726520647261667420646f63756d65" +
+            "6e74732076616c696420666f722061206d6178696d756d206f6620736978206d" +
+            "6f6e74687320616e64206d617920626520757064617465642c207265706c6163" +
+            "65642c206f72206f62736f6c65746564206279206f7468657220646f63756d65" +
+            "6e747320617420616e792074696d652e20497420697320696e617070726f7072" +
+            "6961746520746f2075736520496e7465726e65742d4472616674732061732072" +
+            "65666572656e6365206d6174657269616c206f7220746f206369746520746865" +
+            "6d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67" +
+            "726573732e2fe2809d"));
+    }};
+
+    /**
+     * Make sure we do not use this Cipher object without initializing it
+     * at all
+     */
+    public static final TestMethod noInitTest = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return true;        // Valid for all algs
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println("----- No Init Test [" + algorithm +
+                    "] -----");
+            try {
+                Cipher cipher = Cipher.getInstance(algorithm);
+                TestData testData;
+                switch (algorithm) {
+                    case ALG_CC20:
+                        testData = testList.get(0);
+                        break;
+                    case ALG_CC20_P1305:
+                        testData = aeadTestList.get(0);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported cipher type: " + algorithm);
+                }
+
+                // Attempting to use the cipher without initializing it
+                // should throw an IllegalStateException
+                try {
+                    if (algorithm.equals(ALG_CC20_P1305)) {
+                        cipher.updateAAD(testData.aad);
+                    }
+                    cipher.doFinal(testData.input);
+                    throw new RuntimeException(
+                            "Expected IllegalStateException not thrown");
+                } catch (IllegalStateException ise) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    /**
+     * Make sure we don't allow a double init using the same parameters
+     */
+    public static final TestMethod doubleInitTest = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return true;        // Valid for all algs
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println("----- Double Init Test [" + algorithm +
+                    "] -----");
+            try {
+                AlgorithmParameterSpec spec;
+                Cipher cipher = Cipher.getInstance(algorithm);
+                TestData testData;
+                switch (algorithm) {
+                    case ALG_CC20:
+                        testData = testList.get(0);
+                        spec = new ChaCha20ParameterSpec(testData.nonce,
+                                testData.counter);
+                        break;
+                    case ALG_CC20_P1305:
+                        testData = aeadTestList.get(0);
+                        spec = new IvParameterSpec(testData.nonce);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported cipher type: " + algorithm);
+                }
+                SecretKey key = new SecretKeySpec(testData.key, ALG_CC20);
+
+                // Initialize the first time, this should work.
+                cipher.init(testData.direction, key, spec);
+
+                // Immediately initializing a second time with the same
+                // parameters should fail
+                try {
+                    cipher.init(testData.direction, key, spec);
+                    throw new RuntimeException(
+                            "Expected InvalidKeyException not thrown");
+                } catch (InvalidKeyException ike) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    /**
+     * Attempt to run two full encryption operations without an init in
+     * between.
+     */
+    public static final TestMethod encTwiceNoInit = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return true;        // Valid for all algs
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println("----- Encrypt second time without init [" +
+                    algorithm + "] -----");
+            try {
+                AlgorithmParameterSpec spec;
+                Cipher cipher = Cipher.getInstance(algorithm);
+                TestData testData;
+                switch (algorithm) {
+                    case ALG_CC20:
+                        testData = testList.get(0);
+                        spec = new ChaCha20ParameterSpec(testData.nonce,
+                                testData.counter);
+                        break;
+                    case ALG_CC20_P1305:
+                        testData = aeadTestList.get(0);
+                        spec = new IvParameterSpec(testData.nonce);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported cipher type: " + algorithm);
+                }
+                SecretKey key = new SecretKeySpec(testData.key, ALG_CC20);
+
+                // Initialize and encrypt
+                cipher.init(testData.direction, key, spec);
+                if (algorithm.equals(ALG_CC20_P1305)) {
+                    cipher.updateAAD(testData.aad);
+                }
+                cipher.doFinal(testData.input);
+                System.out.println("First encryption complete");
+
+                // Now attempt to encrypt again without changing the key/IV
+                // This should fail.
+                try {
+                    if (algorithm.equals(ALG_CC20_P1305)) {
+                       cipher.updateAAD(testData.aad);
+                    }
+                    cipher.doFinal(testData.input);
+                    throw new RuntimeException(
+                            "Expected IllegalStateException not thrown");
+                } catch (IllegalStateException ise) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    /**
+     * Attempt to run two full decryption operations without an init in
+     * between.
+     */
+    public static final TestMethod decTwiceNoInit = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return true;        // Valid for all algs
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println("----- Decrypt second time without init [" +
+                    algorithm + "] -----");
+            try {
+                AlgorithmParameterSpec spec;
+                Cipher cipher = Cipher.getInstance(algorithm);
+                TestData testData;
+                switch (algorithm) {
+                    case ALG_CC20:
+                        testData = testList.get(1);
+                        spec = new ChaCha20ParameterSpec(testData.nonce,
+                                testData.counter);
+                        break;
+                    case ALG_CC20_P1305:
+                        testData = aeadTestList.get(1);
+                        spec = new IvParameterSpec(testData.nonce);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported cipher type: " + algorithm);
+                }
+                SecretKey key = new SecretKeySpec(testData.key, ALG_CC20);
+
+                // Initialize and encrypt
+                cipher.init(testData.direction, key, spec);
+                if (algorithm.equals(ALG_CC20_P1305)) {
+                    cipher.updateAAD(testData.aad);
+                }
+                cipher.doFinal(testData.input);
+                System.out.println("First decryption complete");
+
+                // Now attempt to encrypt again without changing the key/IV
+                // This should fail.
+                try {
+                    if (algorithm.equals(ALG_CC20_P1305)) {
+                        cipher.updateAAD(testData.aad);
+                    }
+                    cipher.doFinal(testData.input);
+                    throw new RuntimeException(
+                            "Expected IllegalStateException not thrown");
+                } catch (IllegalStateException ise) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    /**
+     * Perform an AEAD decryption with corrupted data so the tag does not
+     * match.  Then attempt to reuse the cipher without initialization.
+     */
+    public static final TestMethod decFailNoInit = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return algorithm.equals(ALG_CC20_P1305);
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println(
+                    "----- Fail decryption, try again with no init [" +
+                    algorithm + "] -----");
+            try {
+                TestData testData = aeadTestList.get(1);
+                AlgorithmParameterSpec spec =
+                        new IvParameterSpec(testData.nonce);
+                byte[] corruptInput = testData.input.clone();
+                corruptInput[0]++;      // Corrupt the ciphertext
+                SecretKey key = new SecretKeySpec(testData.key, ALG_CC20);
+                Cipher cipher = Cipher.getInstance(algorithm);
+
+                try {
+                    // Initialize and encrypt
+                    cipher.init(testData.direction, key, spec);
+                    cipher.updateAAD(testData.aad);
+                    cipher.doFinal(corruptInput);
+                    throw new RuntimeException(
+                            "Expected AEADBadTagException not thrown");
+                } catch (AEADBadTagException abte) {
+                    System.out.println("Expected decryption failure occurred");
+                }
+
+                // Make sure that despite the exception, the Cipher object is
+                // not in a state that would leave it initialized and able
+                // to process future decryption operations without init.
+                try {
+                    cipher.updateAAD(testData.aad);
+                    cipher.doFinal(testData.input);
+                    throw new RuntimeException(
+                            "Expected IllegalStateException not thrown");
+                } catch (IllegalStateException ise) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    /**
+     * Encrypt once successfully, then attempt to init with the same
+     * key and nonce.
+     */
+    public static final TestMethod encTwiceInitSameParams = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return true;        // Valid for all algs
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println("----- Encrypt, then init with same params [" +
+                    algorithm + "] -----");
+            try {
+                AlgorithmParameterSpec spec;
+                Cipher cipher = Cipher.getInstance(algorithm);
+                TestData testData;
+                switch (algorithm) {
+                    case ALG_CC20:
+                        testData = testList.get(0);
+                        spec = new ChaCha20ParameterSpec(testData.nonce,
+                                testData.counter);
+                        break;
+                    case ALG_CC20_P1305:
+                        testData = aeadTestList.get(0);
+                        spec = new IvParameterSpec(testData.nonce);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported cipher type: " + algorithm);
+                }
+                SecretKey key = new SecretKeySpec(testData.key, ALG_CC20);
+
+                // Initialize then encrypt
+                cipher.init(testData.direction, key, spec);
+                if (algorithm.equals(ALG_CC20_P1305)) {
+                    cipher.updateAAD(testData.aad);
+                }
+                cipher.doFinal(testData.input);
+                System.out.println("First encryption complete");
+
+                // Initializing after the completed encryption with
+                // the same key and nonce should fail.
+                try {
+                    cipher.init(testData.direction, key, spec);
+                    throw new RuntimeException(
+                            "Expected InvalidKeyException not thrown");
+                } catch (InvalidKeyException ike) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    /**
+     * Decrypt once successfully, then attempt to init with the same
+     * key and nonce.
+     */
+    public static final TestMethod decTwiceInitSameParams = new TestMethod() {
+        @Override
+        public boolean isValid(String algorithm) {
+            return true;        // Valid for all algs
+        }
+
+        @Override
+        public boolean run(String algorithm) {
+            System.out.println("----- Decrypt, then init with same params [" +
+                    algorithm + "] -----");
+            try {
+                AlgorithmParameterSpec spec;
+                Cipher cipher = Cipher.getInstance(algorithm);
+                TestData testData;
+                switch (algorithm) {
+                    case ALG_CC20:
+                        testData = testList.get(1);
+                        spec = new ChaCha20ParameterSpec(testData.nonce,
+                                testData.counter);
+                        break;
+                    case ALG_CC20_P1305:
+                        testData = aeadTestList.get(1);
+                        spec = new IvParameterSpec(testData.nonce);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported cipher type: " + algorithm);
+                }
+                SecretKey key = new SecretKeySpec(testData.key, ALG_CC20);
+
+                // Initialize then decrypt
+                cipher.init(testData.direction, key, spec);
+                if (algorithm.equals(ALG_CC20_P1305)) {
+                    cipher.updateAAD(testData.aad);
+                }
+                cipher.doFinal(testData.input);
+                System.out.println("First decryption complete");
+
+                // Initializing after the completed decryption with
+                // the same key and nonce should fail.
+                try {
+                    cipher.init(testData.direction, key, spec);
+                    throw new RuntimeException(
+                            "Expected InvalidKeyException not thrown");
+                } catch (InvalidKeyException ike) {
+                    // Do nothing, this is what we expected to happen
+                }
+            } catch (Exception exc) {
+                System.out.println("Unexpected exception: " + exc);
+                exc.printStackTrace();
+                return false;
+            }
+
+            return true;
+        }
+    };
+
+    public static final List<String> algList =
+            Arrays.asList(ALG_CC20, ALG_CC20_P1305);
+
+    public static final List<TestMethod> testMethodList =
+            Arrays.asList(noInitTest, doubleInitTest, encTwiceNoInit,
+                    decTwiceNoInit, decFailNoInit, encTwiceInitSameParams,
+                    decTwiceInitSameParams);
+
+    public static void main(String args[]) throws Exception {
+        int testsPassed = 0;
+        int testNumber = 0;
+
+        for (TestMethod tm : testMethodList) {
+            for (String alg : algList) {
+                if (tm.isValid(alg)) {
+                    testNumber++;
+                    boolean result = tm.run(alg);
+                    System.out.println("Result: " + (result ? "PASS" : "FAIL"));
+                    if (result) {
+                        testsPassed++;
+                    }
+                }
+            }
+        }
+
+        System.out.println("Total Tests: " + testNumber +
+                ", Tests passed: " + testsPassed);
+        if (testsPassed < testNumber) {
+            throw new RuntimeException(
+                    "Not all tests passed.  See output for failure info");
+        }
+    }
+}
+
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java
new file mode 100644
index 00000000000..caad610e149
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java
@@ -0,0 +1,414 @@
+/*
+ * 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 8153029
+ * @library /test/lib
+ * @build jdk.test.lib.Convert
+ * @run main ChaCha20Poly1305ParamTest
+ * @summary ChaCha20 Cipher Implementation (parameters)
+ */
+
+import java.util.*;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.ChaCha20ParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.AEADBadTagException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.AlgorithmParameters;
+import java.security.NoSuchAlgorithmException;
+import java.nio.ByteBuffer;
+import jdk.test.lib.Convert;
+
+public class ChaCha20Poly1305ParamTest {
+    public static class TestData {
+        public TestData(String name, String keyStr, String nonceStr, int ctr,
+                int dir, String inputStr, String aadStr, String outStr) {
+            testName = Objects.requireNonNull(name);
+            key = Convert.hexStringToByteArray(Objects.requireNonNull(keyStr));
+            nonce = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(nonceStr));
+            if ((counter = ctr) < 0) {
+                throw new IllegalArgumentException(
+                        "counter must be 0 or greater");
+            }
+            direction = dir;
+            if ((direction != Cipher.ENCRYPT_MODE) &&
+                    (direction != Cipher.DECRYPT_MODE)) {
+                throw new IllegalArgumentException(
+                        "Direction must be ENCRYPT_MODE or DECRYPT_MODE");
+            }
+            input = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(inputStr));
+            aad = (aadStr != null) ?
+                Convert.hexStringToByteArray(aadStr) : null;
+            expOutput = Convert.hexStringToByteArray(
+                    Objects.requireNonNull(outStr));
+        }
+
+        public final String testName;
+        public final byte[] key;
+        public final byte[] nonce;
+        public final int counter;
+        public final int direction;
+        public final byte[] input;
+        public final byte[] aad;
+        public final byte[] expOutput;
+    }
+
+    public static final List<TestData> aeadTestList =
+            new LinkedList<TestData>() {{
+        add(new TestData("RFC 7539 Sample AEAD Test Vector",
+            "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
+            "070000004041424344454647",
+            1, Cipher.ENCRYPT_MODE,
+            "4c616469657320616e642047656e746c656d656e206f662074686520636c6173" +
+            "73206f66202739393a204966204920636f756c64206f6666657220796f75206f" +
+            "6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73" +
+            "637265656e20776f756c642062652069742e",
+            "50515253c0c1c2c3c4c5c6c7",
+            "d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d6" +
+            "3dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b36" +
+            "92ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc" +
+            "3ff4def08e4b7a9de576d26586cec64b61161ae10b594f09e26a7e902ecbd060" +
+            "0691"));
+        add(new TestData("RFC 7539 A.5 Sample Decryption",
+            "1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0",
+            "000000000102030405060708",
+            1, Cipher.DECRYPT_MODE,
+            "64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb2" +
+            "4c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf" +
+            "332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c855" +
+            "9797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4" +
+            "b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523e" +
+            "af4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a" +
+            "0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a10" +
+            "49e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29" +
+            "a6ad5cb4022b02709beead9d67890cbb22392336fea1851f38",
+            "f33388860000000000004e91",
+            "496e7465726e65742d4472616674732061726520647261667420646f63756d65" +
+            "6e74732076616c696420666f722061206d6178696d756d206f6620736978206d" +
+            "6f6e74687320616e64206d617920626520757064617465642c207265706c6163" +
+            "65642c206f72206f62736f6c65746564206279206f7468657220646f63756d65" +
+            "6e747320617420616e792074696d652e20497420697320696e617070726f7072" +
+            "6961746520746f2075736520496e7465726e65742d4472616674732061732072" +
+            "65666572656e6365206d6174657269616c206f7220746f206369746520746865" +
+            "6d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67" +
+            "726573732e2fe2809d"));
+    }};
+
+    // 12-byte nonce DER-encoded as an OCTET_STRING
+    public static final byte[] NONCE_OCTET_STR_12 = {
+        4, 12, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8
+    };
+
+    // Invalid 16-byte nonce DER-encoded as an OCTET_STRING
+    public static final byte[] NONCE_OCTET_STR_16 = {
+        4, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+    };
+
+    // Throwaway key for default init tests
+    public static final SecretKey DEF_KEY = new SecretKeySpec(new byte[]
+        {
+             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+        }, "ChaCha20");
+
+    public static void main(String args[]) throws Exception {
+        int testsPassed = 0;
+        int testNumber = 0;
+
+        // Try some default initializations
+        testDefaultAlgParams("ChaCha20", Cipher.ENCRYPT_MODE, true);
+        testDefaultAlgParams("ChaCha20-Poly1305", Cipher.ENCRYPT_MODE, true);
+        testDefaultAlgParamSpec("ChaCha20", Cipher.ENCRYPT_MODE, true);
+        testDefaultAlgParamSpec("ChaCha20-Poly1305", Cipher.ENCRYPT_MODE, true);
+        testDefaultAlgParams("ChaCha20", Cipher.DECRYPT_MODE, false);
+        testDefaultAlgParams("ChaCha20-Poly1305", Cipher.DECRYPT_MODE, false);
+        testDefaultAlgParamSpec("ChaCha20", Cipher.DECRYPT_MODE, false);
+        testDefaultAlgParamSpec("ChaCha20-Poly1305", Cipher.DECRYPT_MODE,
+                false);
+
+        // Try (and hopefully fail) to create a ChaCha20 AlgorithmParameterSpec
+        System.out.println(
+                "*** Test: Try to make ChaCha20 AlgorithmParameterSpec");
+        try {
+            ChaCha20ParameterSpec badChaCha20Spec =
+                    new ChaCha20ParameterSpec(NONCE_OCTET_STR_16, 1);
+            throw new RuntimeException("ChaCha20 AlgorithmParameterSpec " +
+                    "with 16 byte nonce should fail");
+        } catch (IllegalArgumentException iae) {
+            System.out.println("Caught expected exception: " + iae);
+        }
+
+        // Try (and hopefully fail) to create a ChaCha20 AlgorithmParameters
+        System.out.println(
+                "*** Test: Try to make ChaCha20 AlgorithmParameters");
+        try {
+            AlgorithmParameters apsNoChaCha20 =
+                    AlgorithmParameters.getInstance("ChaCha20");
+            throw new RuntimeException(
+                    "ChaCha20 AlgorithmParameters should fail");
+        } catch (NoSuchAlgorithmException nsae) {
+            System.out.println("Caught expected exception: " + nsae);
+        }
+
+        // Create the AlgorithmParameters object from a valid encoding
+        System.out.println("*** Test: Create and init ChaCha20-Poly1305 APS");
+        AlgorithmParameters apsGood =
+                AlgorithmParameters.getInstance("ChaCha20-Poly1305");
+        apsGood.init(NONCE_OCTET_STR_12);
+        System.out.println("Test Passed");
+
+        // Pull an AlgorithmParameters object out of the initialized cipher
+        // and compare its value against the original.
+        System.out.println("*** Test: Init ChaCha20-Poly1305 Cipher using " +
+                "AP, retrieve AP and compare");
+        Cipher cc20p1305 = Cipher.getInstance("ChaCha20-Poly1305");
+        cc20p1305.init(Cipher.ENCRYPT_MODE, DEF_KEY, apsGood);
+        AlgorithmParameters pulledParams = cc20p1305.getParameters();
+        byte[] apsGoodData = apsGood.getEncoded();
+        byte[] pulledParamsData = pulledParams.getEncoded();
+        if (!Arrays.equals(apsGoodData, pulledParamsData)) {
+            throw new RuntimeException(
+                "Retrieved parameters do not match those used to init cipher");
+        }
+        System.out.println("Test Passed");
+
+        // Try the same test with ChaCha20.  It should always be null.
+        System.out.println("*** Test: Init ChaCha20 Cipher using " +
+                "AP, retrieve AP and compare");
+        Cipher cc20 = Cipher.getInstance("ChaCha20");
+        cc20.init(Cipher.ENCRYPT_MODE, DEF_KEY);
+        pulledParams = cc20.getParameters();
+        if (pulledParams != null) {
+            throw new RuntimeException("Unexpected non-null " +
+                    "AlgorithmParameters from ChaCha20 cipiher");
+        }
+        System.out.println("Test Passed");
+
+        // Create and try to init using invalid encoding
+        AlgorithmParameters apsBad =
+                AlgorithmParameters.getInstance("ChaCha20-Poly1305");
+        System.out.println("*** Test: Use invalid encoding scheme");
+        try {
+            apsBad.init(NONCE_OCTET_STR_12, "OraclePrivate");
+            throw new RuntimeException("Allowed unsupported encoding scheme: " +
+                    apsBad.getAlgorithm());
+        } catch (IOException iae) {
+            System.out.println("Caught expected exception: " + iae);
+        }
+
+        // Try to init using supported scheme but invalid length
+        System.out.println("*** Test: Use supported scheme, nonce too large");
+        try {
+            apsBad.init(NONCE_OCTET_STR_16, "ASN.1");
+            throw new RuntimeException("Allowed invalid encoded length");
+        } catch (IOException ioe) {
+            System.out.println("Caught expected exception: " + ioe);
+        }
+
+        System.out.println("----- AEAD Tests -----");
+        for (TestData test : aeadTestList) {
+            System.out.println("*** Test " + ++testNumber + ": " +
+                    test.testName);
+            if (runAEADTest(test)) {
+                testsPassed++;
+            }
+        }
+        System.out.println();
+
+        System.out.println("Total tests: " + testNumber +
+                ", Passed: " + testsPassed + ", Failed: " +
+                (testNumber - testsPassed));
+        if (testsPassed != testNumber) {
+            throw new RuntimeException("One or more tests failed.  " +
+                    "Check output for details");
+        }
+    }
+
+    /**
+     * Attempt default inits with null AlgorithmParameters
+     *
+     * @param alg the algorithm (ChaCha20, ChaCha20-Poly1305)
+     * @param mode the Cipher mode (ENCRYPT_MODE, etc.)
+     */
+    private static void testDefaultAlgParams(String alg, int mode,
+            boolean shouldPass) {
+        byte[] ivOne = null, ivTwo = null;
+        System.out.println("Test default AlgorithmParameters: Cipher = " +
+                alg + ", mode = " + mode);
+        try {
+            AlgorithmParameters params = null;
+            Cipher cipher = Cipher.getInstance(alg);
+            cipher.init(mode, DEF_KEY, params, null);
+            ivOne = cipher.getIV();
+            cipher.init(mode, DEF_KEY, params, null);
+            ivTwo = cipher.getIV();
+            if (!shouldPass) {
+                throw new RuntimeException(
+                        "Did not receive expected exception");
+            }
+        } catch (GeneralSecurityException gse) {
+            if (shouldPass) {
+                throw new RuntimeException(gse);
+            }
+            System.out.println("Caught expected exception: " + gse);
+            return;
+        }
+        if (Arrays.equals(ivOne, ivTwo)) {
+            throw new RuntimeException(
+                    "FAIL! Two inits generated same nonces");
+        } else {
+            System.out.println("IV 1:\n" + dumpHexBytes(ivOne, 16, "\n", " "));
+            System.out.println("IV 1:\n" + dumpHexBytes(ivTwo, 16, "\n", " "));
+        }
+    }
+
+    /**
+     * Attempt default inits with null AlgorithmParameters
+     *
+     * @param alg the algorithm (ChaCha20, ChaCha20-Poly1305)
+     * @param mode the Cipher mode (ENCRYPT_MODE, etc.)
+     */
+    private static void testDefaultAlgParamSpec(String alg, int mode,
+            boolean shouldPass) {
+        byte[] ivOne = null, ivTwo = null;
+        System.out.println("Test default AlgorithmParameterSpec: Cipher = " +
+                alg + ", mode = " + mode);
+        try {
+            AlgorithmParameterSpec params = null;
+            Cipher cipher = Cipher.getInstance(alg);
+            cipher.init(mode, DEF_KEY, params, null);
+            ivOne = cipher.getIV();
+            cipher.init(mode, DEF_KEY, params, null);
+            ivTwo = cipher.getIV();
+            if (!shouldPass) {
+                throw new RuntimeException(
+                        "Did not receive expected exception");
+            }
+        } catch (GeneralSecurityException gse) {
+            if (shouldPass) {
+                throw new RuntimeException(gse);
+            }
+            System.out.println("Caught expected exception: " + gse);
+            return;
+        }
+        if (Arrays.equals(ivOne, ivTwo)) {
+            throw new RuntimeException(
+                    "FAIL! Two inits generated same nonces");
+        } else {
+            System.out.println("IV 1:\n" + dumpHexBytes(ivOne, 16, "\n", " "));
+            System.out.println("IV 2:\n" + dumpHexBytes(ivTwo, 16, "\n", " "));
+        }
+    }
+
+    private static boolean runAEADTest(TestData testData)
+            throws GeneralSecurityException, IOException {
+        boolean result = false;
+
+        Cipher mambo = Cipher.getInstance("ChaCha20-Poly1305");
+        SecretKeySpec mamboKey = new SecretKeySpec(testData.key, "ChaCha20");
+        AlgorithmParameters mamboParams =
+                AlgorithmParameters.getInstance("ChaCha20-Poly1305");
+
+        // Put the nonce into ASN.1 ChaCha20-Poly1305 parameter format
+        byte[] derNonce = new byte[testData.nonce.length + 2];
+        derNonce[0] = 0x04;
+        derNonce[1] = (byte)testData.nonce.length;
+        System.arraycopy(testData.nonce, 0, derNonce, 2,
+                testData.nonce.length);
+        mamboParams.init(derNonce);
+
+        mambo.init(testData.direction, mamboKey, mamboParams);
+
+        byte[] out = new byte[mambo.getOutputSize(testData.input.length)];
+        int outOff = 0;
+        try {
+            mambo.updateAAD(testData.aad);
+            outOff += mambo.update(testData.input, 0, testData.input.length,
+                    out, outOff);
+            outOff += mambo.doFinal(out, outOff);
+        } catch (AEADBadTagException abte) {
+            // If we get a bad tag or derive a tag mismatch, log it
+            // and register it as a failure
+            System.out.println("FAIL: " + abte);
+            return false;
+        }
+
+        if (!Arrays.equals(out, testData.expOutput)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected:\n" +
+                    dumpHexBytes(testData.expOutput, 16, "\n", " "));
+            System.out.println("Actual:\n" +
+                    dumpHexBytes(out, 16, "\n", " "));
+            System.out.println();
+        } else {
+            result = true;
+        }
+
+        return result;
+    }
+
+    /**
+     * Dump the hex bytes of a buffer into string form.
+     *
+     * @param data The array of bytes to dump to stdout.
+     * @param itemsPerLine The number of bytes to display per line
+     *      if the {@code lineDelim} character is blank then all bytes
+     *      will be printed on a single line.
+     * @param lineDelim The delimiter between lines
+     * @param itemDelim The delimiter between bytes
+     *
+     * @return The hexdump of the byte array
+     */
+    private static String dumpHexBytes(byte[] data, int itemsPerLine,
+            String lineDelim, String itemDelim) {
+        return dumpHexBytes(ByteBuffer.wrap(data), itemsPerLine, lineDelim,
+                itemDelim);
+    }
+
+    private static String dumpHexBytes(ByteBuffer data, int itemsPerLine,
+            String lineDelim, String itemDelim) {
+        StringBuilder sb = new StringBuilder();
+        if (data != null) {
+            data.mark();
+            int i = 0;
+            while (data.remaining() > 0) {
+                if (i % itemsPerLine == 0 && i != 0) {
+                    sb.append(lineDelim);
+                }
+                sb.append(String.format("%02X", data.get())).append(itemDelim);
+                i++;
+            }
+            data.reset();
+        }
+
+        return sb.toString();
+    }
+}
+
diff --git a/test/jdk/com/sun/jdi/OomDebugTest.java b/test/jdk/com/sun/jdi/OomDebugTest.java
index 144691accc9..6828800479c 100644
--- a/test/jdk/com/sun/jdi/OomDebugTest.java
+++ b/test/jdk/com/sun/jdi/OomDebugTest.java
@@ -29,6 +29,7 @@
  *
  *  @author Severin Gehwolf <sgehwolf@redhat.com>
  *
+ *  @requires vm.gc != "Z"
  *  @library ..
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g OomDebugTest.java
diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
index f2b03d72360..9937d18ae08 100644
--- a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, 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
@@ -25,6 +25,8 @@
  * @test
  * @bug 8028994
  * @author Staffan Larsen
+ * @comment Graal does not support CMS
+ * @requires !vm.graal.enabled
  * @library /lib/testlibrary
  * @modules jdk.attach/sun.tools.attach
  *          jdk.management
diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java
index b4f08ceb2ce..3098687c8d2 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java
@@ -25,6 +25,7 @@
  * @test
  * @bug     4858522 6191542
  * @summary Basic unit test of OperatingSystemMXBean.getCommittedVirtualMemorySize()
+ * @requires vm.gc != "Z"
  * @author  Steve Bohne
  */
 
diff --git a/src/java.desktop/share/classes/sun/applet/AppletListener.java b/test/jdk/java/awt/Desktop/DefaultPermissions/DefaultPermissions.java
similarity index 55%
rename from src/java.desktop/share/classes/sun/applet/AppletListener.java
rename to test/jdk/java/awt/Desktop/DefaultPermissions/DefaultPermissions.java
index 728060326ad..cca9b07a433 100644
--- a/src/java.desktop/share/classes/sun/applet/AppletListener.java
+++ b/test/jdk/java/awt/Desktop/DefaultPermissions/DefaultPermissions.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ * 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
@@ -23,21 +21,19 @@
  * questions.
  */
 
-package sun.applet;
-
-import java.util.EventListener;
+import java.awt.Desktop;
 
 /**
- * Applet Listener interface.  This interface is to be implemented
- * by objects interested in AppletEvents.
- *
- * @author  Sunita Mani
- *
- * @deprecated The Applet API is deprecated. See the
- * <a href="../../java/applet/package-summary.html"> java.applet package
- * documentation</a> for further information.
+ * @test
+ * @bug 8195624
+ * @summary Desktop.getDesktop() should work without permissions
+ * @run main/othervm/policy=java.policy -Djava.security.manager DefaultPermissions
  */
-@Deprecated(since = "9")
-public interface AppletListener extends EventListener {
-    public void appletStateChanged(AppletEvent e);
+public final class DefaultPermissions {
+
+    public static void main(final String[] args) {
+        if (Desktop.isDesktopSupported()) {
+            Desktop.getDesktop();
+        }
+    }
 }
diff --git a/test/jdk/java/awt/Desktop/DefaultPermissions/java.policy b/test/jdk/java/awt/Desktop/DefaultPermissions/java.policy
new file mode 100644
index 00000000000..1c8a0e79762
--- /dev/null
+++ b/test/jdk/java/awt/Desktop/DefaultPermissions/java.policy
@@ -0,0 +1 @@
+;
\ No newline at end of file
diff --git a/test/jdk/java/awt/Desktop/DesktopEventsExceptions/DesktopEventsExceptions.java b/test/jdk/java/awt/Desktop/DesktopEventsExceptions/DesktopEventsExceptions.java
new file mode 100644
index 00000000000..2a1b88d7d73
--- /dev/null
+++ b/test/jdk/java/awt/Desktop/DesktopEventsExceptions/DesktopEventsExceptions.java
@@ -0,0 +1,95 @@
+/*
+ * 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 java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.desktop.AboutEvent;
+import java.awt.desktop.AppForegroundEvent;
+import java.awt.desktop.AppHiddenEvent;
+import java.awt.desktop.AppReopenedEvent;
+import java.awt.desktop.OpenFilesEvent;
+import java.awt.desktop.OpenURIEvent;
+import java.awt.desktop.PreferencesEvent;
+import java.awt.desktop.PrintFilesEvent;
+import java.awt.desktop.QuitEvent;
+import java.awt.desktop.ScreenSleepEvent;
+import java.awt.desktop.SystemSleepEvent;
+import java.awt.desktop.UserSessionEvent;
+import java.awt.desktop.UserSessionEvent.Reason;
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @test
+ * @bug 8203224
+ * @summary tests that the correct exceptions are thrown by the events classes
+ *          in {code java.awt.desktop} package
+ * @run main/othervm DesktopEventsExceptions
+ * @run main/othervm -Djava.awt.headless=true DesktopEventsExceptions
+ */
+public final class DesktopEventsExceptions {
+
+    public static void main(final String[] args) {
+        // Each element of the list will creates one object to test
+        final List<Runnable> constructors = List.of(
+                AboutEvent::new,
+                AppForegroundEvent::new,
+                AppHiddenEvent::new,
+                AppReopenedEvent::new,
+                QuitEvent::new,
+                ScreenSleepEvent::new,
+                SystemSleepEvent::new,
+                PreferencesEvent::new,
+                () -> new PrintFilesEvent(Collections.emptyList()),
+                () -> new UserSessionEvent(Reason.UNSPECIFIED),
+                () -> new OpenFilesEvent(Collections.emptyList(), ""),
+                () -> new OpenURIEvent(new File("").toURI())
+        );
+
+        for (final Runnable test : constructors) {
+            try {
+                test.run();
+                checkHeadless(true);
+                checkSupported(true);
+            } catch (HeadlessException ex) {
+                checkHeadless(false);
+            } catch (UnsupportedOperationException ex) {
+                checkSupported(false);
+            }
+        }
+    }
+
+    private static void checkSupported(final boolean isSupported) {
+        if (isSupported != Desktop.isDesktopSupported()) {
+            throw new RuntimeException();
+        }
+    }
+
+    private static void checkHeadless(final boolean isHeadless) {
+        if (isHeadless == GraphicsEnvironment.isHeadless()) {
+            throw new RuntimeException();
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Robot/MouseLocationOnScreen/MouseLocationOnScreen.java b/test/jdk/java/awt/Robot/MouseLocationOnScreen/MouseLocationOnScreen.java
new file mode 100644
index 00000000000..6558f16cb2b
--- /dev/null
+++ b/test/jdk/java/awt/Robot/MouseLocationOnScreen/MouseLocationOnScreen.java
@@ -0,0 +1,131 @@
+/*
+ * 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 java.awt.AWTException;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.MouseInfo;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+
+/**
+ * @test
+ * @key headful
+ * @bug 8196030
+ * @summary checks that Robot and MouseInfo use the same coordinates
+ */
+public final class MouseLocationOnScreen {
+
+    public static void main(final String[] args) throws AWTException {
+        GraphicsEnvironment lge =
+                GraphicsEnvironment.getLocalGraphicsEnvironment();
+
+        for (final GraphicsDevice device : lge.getScreenDevices()) {
+            GraphicsConfiguration dc = device.getDefaultConfiguration();
+            Robot robot = new Robot(device);
+
+            Rectangle bounds = dc.getBounds();
+            int x1 = bounds.x;
+            int x2 = x1 + bounds.width - 1;
+            int y1 = bounds.y;
+            int y2 = y1 + bounds.height - 1;
+
+            // We'll check all edge (two pixels in a width) of the each screen
+            edge(robot, device, x1, y1, x2, y1);         // top
+            edge(robot, device, x1, y1 + 1, x2, y1 + 1); // top
+
+            edge(robot, device, x2, y1, x2, y2);         // right
+            edge(robot, device, x2 - 1, y1, x2 - 1, y2); // right
+
+            edge(robot, device, x1, y1, x1, y2);         // left
+            edge(robot, device, x1 + 1, y1, x1 + 1, y2); // left
+
+            edge(robot, device, x1, y2, x2, y2);         // bottom
+            edge(robot, device, x1, y2 - 1, x2, y2 - 1); // bottom
+
+            // We'll check crossing of diagonals of each screen
+            cross(robot, device, x1, y1, x2, y2); // cross left-bottom
+            cross(robot, device, x1, y2, x2, y1); // cross left-top
+        }
+    }
+
+    /**
+     * This method checks the coordinates which were passed to robot and
+     * returned by MouseInfo. Note that this method will be called for each
+     * pixel and for performance reasons we try will try to skip waitForIdle()
+     * a few times.
+     */
+    static void validate(Robot robot, GraphicsDevice device, int x, int y) {
+        int attempt = 0;
+        while (true) {
+            attempt++;
+            Point actLoc = MouseInfo.getPointerInfo().getLocation();
+            GraphicsDevice actDevice = MouseInfo.getPointerInfo().getDevice();
+
+            if (actLoc.x != x || actLoc.y != y || actDevice != device) {
+                if (attempt <= 10) {
+                    if (attempt >= 8) {
+                        robot.waitForIdle();
+                    }
+                    continue;
+                }
+                System.err.println("Expected device: " + device);
+                System.err.println("Actual device: " + actDevice);
+                System.err.println("Expected X: " + x);
+                System.err.println("Actual X: " + actLoc.x);
+                System.err.println("Expected Y: " + y);
+                System.err.println("Actual Y: " + actLoc.y);
+                throw new RuntimeException();
+            }
+            return;
+        }
+    }
+
+    private static void edge(Robot robot, GraphicsDevice device,
+                             int x1, int y1, int x2, int y2) {
+        for (int x = x1; x <= x2; x++) {
+            for (int y = y1; y <= y2; y++) {
+                robot.mouseMove(x, y);
+                validate(robot, device, x, y);
+            }
+        }
+    }
+
+    private static void cross(Robot robot, GraphicsDevice device,
+                              int x0, int y0, int x1, int y1) {
+        float dmax = (float) Math.max(Math.abs(x1 - x0), Math.abs(y1 - y0));
+        float dx = (x1 - x0) / dmax;
+        float dy = (y1 - y0) / dmax;
+
+        robot.mouseMove(x0, y0);
+        validate(robot, device, x0, y0);
+        for (int i = 1; i <= dmax; i++) {
+            int x = (int) (x0 + dx * i);
+            int y = (int) (y0 + dy * i);
+            robot.mouseMove(x, y);
+            validate(robot, device, x, y);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java b/test/jdk/java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java
new file mode 100644
index 00000000000..6573fc69569
--- /dev/null
+++ b/test/jdk/java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java
@@ -0,0 +1,91 @@
+/*
+ * 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 java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+
+/**
+ * @test
+ * @key headful
+ * @bug 8201364
+ * @summary Component.getLocation() should returns correct location if
+ *          Component.setBounds() was ignored by the OS
+ */
+public final class LocationAtScreenCorner {
+
+    public static void main(final String[] args) throws Exception {
+        Robot robot = new Robot();
+        Frame frame = new Frame();
+        frame.setSize(200, 200);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        robot.waitForIdle();
+
+        GraphicsEnvironment lge =
+                GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice[] devices = lge.getScreenDevices();
+
+        // The Component.setBounds() for corners of the screen can be ignored by
+        // OS because of menubar, taskbar, dock etc. But in this case
+        // getLocation() and getLocationOnScreen() should always return the same
+        // coordinates.
+        for (GraphicsDevice device : devices) {
+            Rectangle bounds = device.getDefaultConfiguration().getBounds();
+            test(robot, frame, bounds.x, bounds.y);
+            test(robot, frame, bounds.width, bounds.y);
+            test(robot, frame, bounds.x, bounds.height);
+            test(robot, frame, bounds.width, bounds.height);
+        }
+        frame.dispose();
+    }
+
+    private static void test(Robot robot, Frame frame, int x, int y) {
+        for (int i = 0; i < 10; ++i) {
+            // intentionally set the same coordinates a few times
+            frame.setLocation(x, y); // x and y are cached in the frame
+            int attempt = 0;
+            while (true) {
+                robot.waitForIdle();
+                // location was cached in the frame and should be updated to the
+                // real location by the native callback some time later.
+                // this is why we make a few attempts
+                Point location = frame.getLocation();
+                // locationOnScreen is fetched from the peer
+                Point locationOnScreen = frame.getLocationOnScreen();
+                if (location.equals(locationOnScreen)) {
+                    break;
+                }
+                if (attempt++ > 10) {
+                    frame.dispose();
+                    System.err.println("Location: " + location);
+                    System.err.println("Location on screen: " + locationOnScreen);
+                    throw new RuntimeException("Wrong location");
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java b/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java
new file mode 100644
index 00000000000..cc7b2434f08
--- /dev/null
+++ b/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java
@@ -0,0 +1,409 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @key headful
+ * @bug 8194327
+ * @summary [macosx] AWT windows have incorrect main/key window behaviors
+ * @author Alan Snyder
+ * @run main/othervm/native TestMainKeyWindow
+ * @requires (os.family == "mac")
+ */
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
+import javax.swing.*;
+
+public class TestMainKeyWindow
+{
+    static TestMainKeyWindow theTest;
+
+    KeyStroke commandT = KeyStroke.getKeyStroke(KeyEvent.VK_T, KeyEvent.META_DOWN_MASK);
+
+    int nextX = 130;
+
+    private final MyFrame frame1;
+    private final MyFrame frame2;
+    private final Object COLOR_PANEL = "Color Panel";
+    private final Object NATIVE_WINDOW = "Native Window";
+
+    // these bounds must agree with the native code that creates the windows
+    private Rectangle colorPanelBounds = new Rectangle(130, 300, 225, 400);  // approximate is OK
+    private Rectangle nativeWindowBounds = new Rectangle(130, 200, 200, 100);
+
+    private Robot robot;
+
+    private int actionCounter;
+    private Object actionTarget;
+
+    private int failureCount;
+    private boolean isApplicationOpened;
+
+    public TestMainKeyWindow()
+    {
+        System.loadLibrary("testMainKeyWindow");
+
+        JMenuBar defaultMenuBar = createMenuBar("Application", true);
+        Desktop.getDesktop().setDefaultMenuBar(defaultMenuBar);
+
+        setup();
+
+        frame1 = new MyFrame("Frame 1");
+        frame2 = new MyFrame("Frame 2");
+        frame1.setVisible(true);
+        frame2.setVisible(true);
+
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(50);
+        } catch (AWTException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    class MyFrame
+        extends JFrame
+    {
+        public MyFrame(String title)
+            throws HeadlessException
+        {
+            super(title);
+
+            JMenuBar mainMenuBar = createMenuBar(title, true);
+            setJMenuBar(mainMenuBar);
+            setBounds(nextX, 60, 200, 90);
+            nextX += 250;
+            JComponent contentPane = new JPanel();
+            setContentPane(contentPane);
+            contentPane.setLayout(new FlowLayout());
+            contentPane.add(new JCheckBox("foo", true));
+            InputMap inputMap = contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+            inputMap.put(commandT, "test");
+            ActionMap actionMap = contentPane.getActionMap();
+            actionMap.put("test", new MyAction(title + " Key"));
+        }
+    }
+
+    private void runTest()
+    {
+        failureCount = 0;
+        robot.waitForIdle();
+        performTest(frame1, false);
+        performTest(frame1, true);
+        performTest(frame2, false);
+        performTest(frame2, true);
+        performTest(NATIVE_WINDOW, false);
+        performTest(NATIVE_WINDOW, true);
+        performTest(COLOR_PANEL, false);
+        if (failureCount > 0) {
+            throw new RuntimeException("Test failed: " + failureCount + " failure(s)");
+        }
+    }
+
+    private void performTest(Object windowIdentification, boolean selectColorPanel)
+    {
+        setupWindows(windowIdentification, selectColorPanel);
+
+        performMenuShortcutTest(windowIdentification, selectColorPanel);
+        performMenuItemTest(windowIdentification, selectColorPanel);
+
+        // test deactivating and reactivating the application
+        // the window state and behavior should be restored
+
+        openOtherApplication();
+        activateApplication();
+        robot.delay(1000);
+
+        performMenuShortcutTest(windowIdentification, selectColorPanel);
+        performMenuItemTest(windowIdentification, selectColorPanel);
+    }
+
+    private void openOtherApplication() {
+        try {
+            String[] cmd = { "/usr/bin/open", "/Applications/System Preferences.app" };
+            Runtime.getRuntime().exec(cmd);
+            if (!isApplicationOpened) {
+                String[] cmd2 = { "/usr/bin/osascript", "-e",
+                    "tell application \"System Preferences\" to set bounds of window 1 to {400, 180, 1068, 821}" };
+                Runtime.getRuntime().exec(cmd2);
+            }
+            isApplicationOpened = true;
+        } catch (IOException ex) {
+            throw new RuntimeException("Unable to deactivate test application");
+        }
+        robot.delay(1000);
+    }
+
+    private void performMenuShortcutTest(Object windowIdentification, boolean selectColorPanel)
+    {
+        int currentActionCount = actionCounter;
+
+        // Perform the menu shortcut
+        robot.keyPress(KeyEvent.VK_META);
+        robot.keyPress(KeyEvent.VK_T);
+        robot.keyRelease(KeyEvent.VK_T);
+        robot.keyRelease(KeyEvent.VK_META);
+        robot.waitForIdle();
+
+        Object target = waitForAction(currentActionCount + 1);
+        boolean isDirectKey = windowIdentification instanceof Window && !selectColorPanel;
+        Object expectedTarget = getExpectedTarget(windowIdentification, isDirectKey);
+        if (!Objects.equals(target, expectedTarget)) {
+            failureCount++;
+            String configuration = getConfigurationName(windowIdentification, selectColorPanel);
+            System.err.println("***** Menu shortcut test failed for " + configuration + ". Expected: " + expectedTarget + ", Actual: " + target);
+        }
+    }
+
+    private void performMenuItemTest(Object windowIdentification, boolean selectColorPanel)
+    {
+        int currentActionCount = actionCounter;
+
+        // Find the menu on the screen menu bar
+        // The location depends upon the application name which is the name of the first menu.
+        // Unfortunately, the application name can vary based on how the application is run.
+        // The work around is to make the menu and the menu item names very long.
+
+        int menuBarX = 250;
+        int menuBarY = 11;
+        int menuItemX = menuBarX;
+        int menuItemY = 34;
+
+        robot.mouseMove(menuBarX, menuBarY);
+        robot.delay(100);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.delay(100);
+        robot.mouseMove(menuItemX, menuItemY);
+        robot.delay(100);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+
+        Object target = waitForAction(currentActionCount + 1);
+        Object expectedTarget = getExpectedTarget(windowIdentification, false);
+        if (!Objects.equals(target, expectedTarget)) {
+            failureCount++;
+            String configuration = getConfigurationName(windowIdentification, selectColorPanel);
+            System.err.println("***** Menu item test failed for " + configuration + ". Expected: " + expectedTarget + ", Actual: " + target);
+        }
+    }
+
+    private String getConfigurationName(Object windowIdentification, boolean selectColorPanel)
+    {
+        String name = "Unknown";
+        if (windowIdentification instanceof Window) {
+            Window w = (Window) windowIdentification;
+            name = getWindowTitle(w);
+        } else if (windowIdentification == NATIVE_WINDOW) {
+            name = "Native Window";
+        } else if (windowIdentification == COLOR_PANEL) {
+            name = "Color Panel";
+        }
+        if (selectColorPanel) {
+            return name + " with color panel";
+        } else {
+            return name;
+        }
+    }
+
+    private Object getExpectedTarget(Object windowIdentification, boolean isDirectKey)
+    {
+        if (windowIdentification instanceof Window) {
+            Window w = (Window) windowIdentification;
+            String title = getWindowTitle(w);
+            if (isDirectKey) {
+                title = title + " Key";
+            }
+            return title;
+        }
+        return "Application";
+    }
+
+    private String getWindowTitle(Window w)
+    {
+        if (w instanceof Frame) {
+            Frame f = (Frame) w;
+            return f.getTitle();
+        }
+        if (w instanceof Dialog) {
+            Dialog d = (Dialog) w;
+            return d.getTitle();
+        }
+        throw new IllegalStateException();
+    }
+
+    private synchronized void registerAction(Object target)
+    {
+        actionCounter++;
+        actionTarget = target;
+    }
+
+    private synchronized Object waitForAction(int count)
+    {
+        try {
+            for (int i = 0; i < 10; i++) {
+                if (actionCounter == count) {
+                    return actionTarget;
+                }
+                if (actionCounter > count) {
+                    throw new IllegalStateException();
+                }
+                wait(100);
+            }
+        } catch (InterruptedException ex) {
+        }
+        return "No Action";
+    }
+
+    private void setupWindows(Object windowIdentification, boolean selectColorPanel)
+    {
+        clickOnWindowTitleBar(windowIdentification);
+        if (selectColorPanel) {
+            clickOnWindowTitleBar(COLOR_PANEL);
+        }
+    }
+
+    private void clickOnWindowTitleBar(Object windowIdentification)
+    {
+        Rectangle bounds = getWindowBounds(windowIdentification);
+        int x = bounds.x + 70;  // to the right of the stoplight buttons
+        int y = bounds.y + 12;  // in the title bar
+        robot.mouseMove(x, y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+    }
+
+    private Rectangle getWindowBounds(Object windowIdentification)
+    {
+        if (windowIdentification instanceof Window) {
+            Window w = (Window) windowIdentification;
+            return w.getBounds();
+        }
+        if (windowIdentification == COLOR_PANEL) {
+            return colorPanelBounds;
+        }
+        if (windowIdentification == NATIVE_WINDOW) {
+            return nativeWindowBounds;
+        }
+        throw new IllegalArgumentException();
+    }
+
+    JMenuBar createMenuBar(String text, boolean isEnabled)
+    {
+        JMenuBar mb = new JMenuBar();
+        // A very long name makes it more likely that the robot will hit the menu
+        JMenu menu = new JMenu("TestTestTestTestTestTestTestTestTestTest");
+        mb.add(menu);
+        JMenuItem item = new JMenuItem("TestTestTestTestTestTestTestTestTestTest");
+        item.setAccelerator(commandT);
+        item.setEnabled(isEnabled);
+        item.addActionListener(ev -> {
+            registerAction(text);
+        });
+        menu.add(item);
+        return mb;
+    }
+
+    void dispose()
+    {
+        frame1.setVisible(false);
+        frame2.setVisible(false);
+        frame1.dispose();
+        frame2.dispose();
+        takedown();
+        Desktop.getDesktop().setDefaultMenuBar(null);
+        if (isApplicationOpened) {
+            try {
+                String[] cmd = { "/usr/bin/osascript", "-e", "tell application \"System Preferences\" to close window 1" };
+                Process p = Runtime.getRuntime().exec(cmd);
+                p.waitFor();
+            } catch (IOException | InterruptedException ex) {
+            }
+        }
+    }
+
+    class MyAction
+        extends AbstractAction
+    {
+        String text;
+
+        public MyAction(String text)
+        {
+            super("Test");
+
+            this.text = text;
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e)
+        {
+            registerAction(text);
+        }
+    }
+
+    private static native void setup();
+    private static native void takedown();
+    private static native void activateApplication();
+
+    public static void main(String[] args)
+    {
+        if (!System.getProperty("os.name").contains("OS X")) {
+            System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
+            return;
+        }
+
+        System.setProperty("apple.laf.useScreenMenuBar", "true");
+
+        try {
+            runSwing(() -> {
+                theTest = new TestMainKeyWindow();
+            });
+            theTest.runTest();
+        } finally {
+            if (theTest != null) {
+                runSwing(() -> {
+                    theTest.dispose();
+                });
+            }
+        }
+    }
+
+    private static void runSwing(Runnable r)
+    {
+        try {
+            SwingUtilities.invokeAndWait(r);
+        } catch (InterruptedException e) {
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Window/MainKeyWindowTest/libTestMainKeyWindow.c b/test/jdk/java/awt/Window/MainKeyWindowTest/libTestMainKeyWindow.c
new file mode 100644
index 00000000000..44c778a10c5
--- /dev/null
+++ b/test/jdk/java/awt/Window/MainKeyWindowTest/libTestMainKeyWindow.c
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <JavaNativeFoundation/JavaNativeFoundation.h>
+
+static NSWindow *testWindow;
+static NSColorPanel *colorPanel;
+
+/*
+ * Class:     TestMainKeyWindow
+ * Method:    setup
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_TestMainKeyWindow_setup(JNIEnv *env, jclass cl)
+{
+    JNF_COCOA_ENTER(env);
+
+    void (^block)() = ^(){
+        NSScreen *mainScreen = [NSScreen mainScreen];
+        NSRect screenFrame = [mainScreen frame];
+        NSRect frame = NSMakeRect(130, screenFrame.size.height - 280, 200, 100);
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
+        NSWindowStyleMask style = NSWindowStyleMaskTitled;
+#else
+        NSInteger style = NSTitledWindowMask;
+#endif
+
+        NSRect rect = [NSWindow contentRectForFrameRect:frame styleMask:style];
+        NSBackingStoreType bt = NSBackingStoreBuffered;
+        testWindow = [[[NSWindow alloc] initWithContentRect:rect styleMask:style backing:bt defer:NO] retain];
+        testWindow.title = @"NSWindow";
+        [testWindow setBackgroundColor:[NSColor blueColor]];
+        [testWindow makeKeyAndOrderFront:nil];
+        // Java coordinates are 100, 200
+
+        colorPanel = [[NSColorPanel sharedColorPanel] retain];
+        [colorPanel setReleasedWhenClosed: YES];
+        colorPanel.restorable = NO;
+        [colorPanel setFrameTopLeftPoint: NSMakePoint(130, screenFrame.size.height - 300)];
+        // Java coordinates are 100, 400
+        [colorPanel makeKeyAndOrderFront: nil];
+    };
+
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        [JNFRunLoop performOnMainThreadWaiting:YES withBlock:block];
+    }
+
+    JNF_COCOA_EXIT(env);
+}
+
+/*
+ * Class:     TestMainKeyWindow
+ * Method:    takedown
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_TestMainKeyWindow_takedown(JNIEnv *env, jclass cl)
+{
+    JNF_COCOA_ENTER(env);
+
+    void (^block)() = ^(){
+        if (testWindow != nil) {
+            [testWindow close];
+            testWindow = nil;
+        }
+        if (colorPanel != nil) {
+            [colorPanel orderOut:nil];
+            colorPanel = nil;
+        }
+    };
+
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        [JNFRunLoop performOnMainThreadWaiting:YES withBlock:block];
+    }
+
+    JNF_COCOA_EXIT(env);
+}
+
+/*
+ * Class:     TestMainKeyWindow
+ * Method:    activateApplication
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_TestMainKeyWindow_activateApplication
+  (JNIEnv *env, jclass cl)
+{
+    JNF_COCOA_ENTER(env);
+
+    void (^block)() = ^(){
+        [NSApp activateIgnoringOtherApps:YES];
+    };
+
+    [JNFRunLoop performOnMainThreadWaiting:YES withBlock:block];
+
+  JNF_COCOA_EXIT(env);
+}
diff --git a/test/jdk/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java b/test/jdk/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java
index a1529503185..236ce16cc2f 100644
--- a/test/jdk/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java
+++ b/test/jdk/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java
@@ -22,10 +22,11 @@
  */
 
 /* @test
- * @bug 8073400 8198412
+ * @bug 8073400 8198412 8204126
  * @summary Some Monospaced logical fonts have a different width
  * @author Dmitry Markov
  * @run main MonospacedGlyphWidthTest
+ * @requires (os.family == "windows" | os.family == "mac")
  */
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
diff --git a/test/jdk/java/awt/font/Rotate/RotatedTextTest.java b/test/jdk/java/awt/font/Rotate/RotatedTextTest.java
new file mode 100644
index 00000000000..5bb8594656f
--- /dev/null
+++ b/test/jdk/java/awt/font/Rotate/RotatedTextTest.java
@@ -0,0 +1,140 @@
+/*
+ * 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 RotatedTextTest
+ * @bug 8203485
+ * @summary This test verifies that rotated text preserves the width.
+ * @run main RotatedTextTest
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.imageio.ImageIO;
+
+public class RotatedTextTest
+{
+    static final int size = 720;
+    static final Font fnt = new Font(Font.SERIF, Font.PLAIN, 12);
+    static final String text = "The quick brown fox jumps over the lazy dog";
+
+    static void drawRotatedText(Graphics g) {
+        Graphics2D g2d = (Graphics2D)g;
+
+        g2d.setFont(fnt);
+
+        FontMetrics metrics = g2d.getFontMetrics();
+        Rectangle2D bounds = metrics.getStringBounds(text, g2d);
+
+
+        g2d.setColor(Color.black);
+        g2d.fillRect(0, 0, size, size);
+
+        g2d.setColor(Color.white);
+
+        float[] angles = new float[] { 0, 15, 45, 60, 90, -45, -90, -135, -180, 135, };
+
+        for (float a : angles) {
+            Graphics2D rotated = (Graphics2D)g2d.create();
+
+            rotated.translate(size/2, size/2);
+            rotated.rotate(Math.toRadians(a));
+            rotated.translate(30, 0);
+
+            int width_original = metrics.stringWidth(text);
+            int width_rotated = rotated.getFontMetrics().stringWidth(text);
+
+            rotated.drawString(text, 0, 0);
+            rotated.drawString(String.format("  %.0f", a), width_original, 0);
+
+            rotated.setColor(Color.green);
+            rotated.draw(bounds);
+
+            System.out.printf("Angle: %.0f, width diff: %d\n", a, (width_rotated - width_original));
+
+            rotated.dispose();
+
+            if (width_rotated != width_original) {
+                throw new RuntimeException("Test failed for angle " + a);
+            }
+        }
+    }
+
+    public static void main(String args[])
+    {
+        final BufferedImage dst = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
+        Graphics g = dst.createGraphics();
+
+        try {
+            drawRotatedText(g);
+        } finally {
+            g.dispose();
+            writeToFile(dst);
+        }
+    }
+
+    static final String title;
+    static final String file;
+
+    static {
+        String vendorName = System.getProperty("java.vendor");
+        String version = System.getProperty("java.version");
+        String runtimeName = System.getProperty("java.runtime.name");
+
+
+        int index = runtimeName.indexOf(" Runtime Environment");
+        runtimeName = runtimeName.substring(0, index).trim();
+
+        title = vendorName + ", " + runtimeName + ", " + version;
+        file = "rotated-text-" + title.replace(", ", "-")
+                .replace(" ", "-") + ".png";
+    }
+
+    private static void writeToFile(final BufferedImage bi) {
+        File imageFile = new File(file);
+        FileOutputStream imageOutStream;
+        BufferedOutputStream imageBOS = null;
+        try {
+            imageOutStream = new FileOutputStream(imageFile);
+            imageBOS = new BufferedOutputStream(imageOutStream);
+
+            ImageIO.setUseCache(false);
+            ImageIO.write(bi, "png", imageBOS);
+
+            imageBOS.close();
+            imageOutStream.close();
+        }
+        catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+    }
+}
diff --git a/test/jdk/java/awt/font/StyledMetrics/BoldSpace.java b/test/jdk/java/awt/font/StyledMetrics/BoldSpace.java
index bbdff5feebe..df5f2236555 100644
--- a/test/jdk/java/awt/font/StyledMetrics/BoldSpace.java
+++ b/test/jdk/java/awt/font/StyledMetrics/BoldSpace.java
@@ -46,7 +46,6 @@ public class BoldSpace {
         // in point.
         int errorMargin = 4;
         g.setFont(new Font("monospaced", Font.BOLD, 14));
-        //g.setFont(new Font("Lucida Sans Regular", Font.BOLD, 14));
         FontMetrics fm = g.getFontMetrics();
         System.out.println("Bold: " + fm.charWidth('\u200b'));
         int cwid = fm.charWidth('\u200b');
diff --git a/test/jdk/java/awt/font/TextLayout/LigatureCaretTest.java b/test/jdk/java/awt/font/TextLayout/LigatureCaretTest.java
index e59bccac996..d26571fd417 100644
--- a/test/jdk/java/awt/font/TextLayout/LigatureCaretTest.java
+++ b/test/jdk/java/awt/font/TextLayout/LigatureCaretTest.java
@@ -35,6 +35,7 @@ import java.awt.Font;
 import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
 import java.awt.font.TextAttribute;
 import java.awt.font.TextLayout;
 import java.awt.font.TextHitInfo;
@@ -51,19 +52,27 @@ public class LigatureCaretTest {
 
     public static void main(String[] args) {
 
-        //testBidiWithNumbers();
+        testBidiWithNumbers();
         testLamAlef();
         System.out.println("LigatureCaretTest PASSED");
     }
 
-    // These values are for TextLayout constructors
-    private static final Hashtable map = new Hashtable();
-    static {
-      map.put(TextAttribute.FONT, new Font("Lucida Sans", Font.PLAIN, 24));
-    }
     private static final FontRenderContext frc =
                                 new FontRenderContext(null, false, false);
 
+    private static Font getFontForText(String s) {
+        GraphicsEnvironment ge =
+           GraphicsEnvironment.getLocalGraphicsEnvironment();
+        Font[] fonts = ge.getAllFonts();
+
+        for (Font f : fonts) {
+           if (f.canDisplayUpTo(s) == -1) {
+               return f.deriveFont(Font.PLAIN, 24);
+           }
+        }
+        return null;
+    }
+
     /**
      * Caret through text mixed-direction text and check the results.
      * If the test fails an Error is thrown.
@@ -72,6 +81,13 @@ public class LigatureCaretTest {
     public static void testBidiWithNumbers() {
 
         String bidiWithNumbers = "abc\u05D0\u05D1\u05D2123abc";
+        Font font = getFontForText(bidiWithNumbers);
+        if (font == null) {
+            return;
+        }
+        Hashtable map = new Hashtable();
+        map.put(TextAttribute.FONT, font);
+
         // visual order for the text:
         // abc123<gimel><bet><aleph>abc
 
@@ -116,6 +132,13 @@ public class LigatureCaretTest {
         final String lamAlef = "\u0644\u0627";
         final String ltrText = "abcd";
 
+        Font font = getFontForText(lamAlef+ltrText);
+        if (font == null) {
+            return;
+        }
+        Hashtable map = new Hashtable();
+        map.put(TextAttribute.FONT, font);
+
         // Create a TextLayout with just a lam-alef sequence.  There
         // should only be two valid caret positions:  one at
         // insertion offset 0 and the other at insertion offset 2.
diff --git a/test/jdk/java/awt/font/TextLayout/TestHebrewMark.java b/test/jdk/java/awt/font/TextLayout/TestHebrewMark.java
index 5a390c381e7..87b907c3f26 100644
--- a/test/jdk/java/awt/font/TextLayout/TestHebrewMark.java
+++ b/test/jdk/java/awt/font/TextLayout/TestHebrewMark.java
@@ -33,7 +33,7 @@ public class TestHebrewMark {
 
     public static void main(String args[]) {
        FontRenderContext frc = new FontRenderContext(null,false,false);
-       final String fonts[] = { "Arial", "Arial Hebrew", "Arial Unicode", "Lucida Sans", "Lucida Sans Regular" };
+       final String fonts[] = { "Arial", "Arial Hebrew", "Arial Unicode" };
        final char ALEF = '\u05D0';  // a letter
        final char QAMATS = '\u05B8';  // a combining mark, should show up UNDER the alef (no advance)
        final String string1 = "\u05DE\u05B8\u05E9\u05C1\u05B0\u05DB\u05B5\u05E0\u05B4\u05D9\u05D0\u05B7\u05D7\u05B2\u05E8\u05B6\u05D9\u05DA\u05B8\u05E0\u05BC\u05B8\u05E8\u05D5\u05BC\u05E6\u05B8\u05D4\u05D4\u05B1\u05D1\u05B4\u05D9\u05D0\u05B7\u05E0\u05B4\u05D9\u05D4\u05B7\u05DE\u05BC\u05B6\u05DC\u05B6\u05DA\u05B0\u05D7\u05B2\u05D3\u05B8\u05E8\u05B8\u05D9\u05D5\u05E0\u05B8\u05D2\u05B4\u05D9\u05DC\u05B8\u05D4\u05D5\u05B0\u05E0\u05B4\u05E9\u05C2\u05B0\u05DE\u05B0\u05D7\u05B8\u05D4\u0020\u05D1\u05BC\u05B8\u05DA\u05B0\u05E0\u05B7\u05D6\u05B0\u05DB\u05BC\u05B4\u05D9\u05E8\u05B8\u05D4\u05D3\u05B9\u05D3\u05B6\u05D9\u05DA\u05B8\u05DE\u05B4\u05D9\u05BC\u05B7\u05D9\u05B4\u05DF\u05DE\u05B5\u05D9\u05E9\u05C1\u05B8\u05E8\u05B4\u05D9\u05DD\u05D0\u05B2\u05D4\u05B5\u05D1\u05D5\u05BC\u05DA\u05B8";
diff --git a/test/jdk/java/awt/font/TextLayout/TestSinhalaChar.java b/test/jdk/java/awt/font/TextLayout/TestSinhalaChar.java
index 6197fcf12b5..2d934c87dbf 100644
--- a/test/jdk/java/awt/font/TextLayout/TestSinhalaChar.java
+++ b/test/jdk/java/awt/font/TextLayout/TestSinhalaChar.java
@@ -50,7 +50,7 @@ public class TestSinhalaChar {
         final JLabel label = new JLabel("(empty)");
         label.setSize(400, 100);
         label.setBorder(new LineBorder(Color.black));
-        label.setFont(new Font("Lucida Bright", Font.PLAIN, 12));
+        label.setFont(new Font(Font.DIALOG, Font.PLAIN, 12));
         if(AUTOMATIC_TEST) {  /* run the test automatically (else, manually) */
            label.setText(Character.toString('\u0DDD'));
         } else {
diff --git a/test/jdk/java/awt/font/Underline/UnderlineTest.java b/test/jdk/java/awt/font/Underline/UnderlineTest.java
index e9983c10c77..2ac67df3a69 100644
--- a/test/jdk/java/awt/font/Underline/UnderlineTest.java
+++ b/test/jdk/java/awt/font/Underline/UnderlineTest.java
@@ -90,7 +90,7 @@ public class UnderlineTest {
     }
 
     public static void main(String args[]) {
-        String fontName = "Lucida Sans";
+        String fontName = Font.DIALOG;
         if (args.length > 0) {
             fontName = args[0];
         }
diff --git a/test/jdk/java/awt/geom/AffineTransform/QuadRotInverseBug.java b/test/jdk/java/awt/geom/AffineTransform/QuadRotInverseBug.java
new file mode 100644
index 00000000000..d200cfaa42d
--- /dev/null
+++ b/test/jdk/java/awt/geom/AffineTransform/QuadRotInverseBug.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2000, 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 4388199
+ * @summary Tests inverse transform of an array of points with
+ *          shearing and translation components in the AffineTransform
+ */
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.NoninvertibleTransformException;
+import java.awt.geom.Point2D;
+
+/*
+ * The AffineTransform method
+ * inverseTransform(double[],int,double[],int,int) produces incorrect
+ * results for pure shearing transformations or for shearing and
+ * translation transformations.  The simpliest example of which is a
+ * rotation by 90 degrees.
+ */
+public class QuadRotInverseBug {
+    public static void main(String[] args) {
+        // First test a transform which rotates the coordinate system by 90
+        // degrees.
+        System.out.println("Using 90 degree rotation:");
+        AffineTransform xform = AffineTransform.getRotateInstance(Math.PI/2);
+        boolean test1failed = test(xform);
+        // Next test the transform with an added translation component
+        System.out.println("Using 90 degree rotation with translation:");
+        xform.translate(2,2);
+        boolean test2failed = test(xform);
+        if (test1failed || test2failed) {
+            throw new RuntimeException("test failed, see printout");
+        }
+    }
+
+    public static boolean test(AffineTransform xform) {
+        // Make needed arrays.
+        double[] originalPoint = new double[2];
+        double[] transformedPoint = new double[2];
+        double[] inverseFromOriginalXForm = new double[2];
+
+        Point2D originalPoint2D = new Point2D.Double();
+        Point2D transformedPoint2D = new Point2D.Double();
+        Point2D inverseFromOriginalPoint2D = new Point2D.Double();
+
+        // Make the original point to check (x,y)=(1,1).
+        originalPoint[0] = 1.;
+        originalPoint[1] = 1.;
+
+        try {
+
+            originalPoint2D.setLocation(originalPoint[0], originalPoint[1]);
+
+            // Make the transformed point.
+            xform.transform(originalPoint,0,transformedPoint,0,1);
+            xform.transform(originalPoint2D, transformedPoint2D);
+
+            // Transform the point back using the original transformation.
+            xform.inverseTransform(transformedPoint,0,
+                                   inverseFromOriginalXForm,0,1);
+            xform.inverseTransform(transformedPoint2D,
+                                   inverseFromOriginalPoint2D);
+        } catch (NoninvertibleTransformException e) {
+            throw new InternalError("transform wasn't invertible!");
+        }
+
+        System.out.println("Both points should be identical:");
+        System.out.println("Original Point: "+
+                           originalPoint[0]+" "+
+                           originalPoint[1]);
+        System.out.println("inverseTransform method used: "+
+                           inverseFromOriginalXForm[0]+" "+
+                           inverseFromOriginalXForm[1]);
+        System.out.println("Original Point2D: "+ originalPoint2D);
+        System.out.println("inverseTransform method used: "+
+                           inverseFromOriginalPoint2D);
+        return (originalPoint[0] != inverseFromOriginalXForm[0] ||
+                originalPoint[1] != inverseFromOriginalXForm[1] ||
+                !originalPoint2D.equals(inverseFromOriginalPoint2D));
+    }
+}
diff --git a/test/jdk/java/awt/geom/Arc2D/Arc2DIntersectsTest.java b/test/jdk/java/awt/geom/Arc2D/Arc2DIntersectsTest.java
new file mode 100644
index 00000000000..eb5636d6f37
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/Arc2DIntersectsTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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
+ * 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 4724569
+ * @summary Arc2D "contains" and "intersects" problems, part II: fix enclosed.
+ */
+
+import java.awt.Shape;
+import java.awt.geom.Arc2D;
+import java.awt.geom.Rectangle2D;
+
+public class Arc2DIntersectsTest {
+
+    static Shape[][] trues = {
+        {
+            new Arc2D.Double(0, 0, 100, 100, -45, 90, Arc2D.PIE),
+            new Rectangle2D.Double(0, 0, 100, 100),
+        },
+        {
+            new Arc2D.Double(0, 0, 100, 100, -45, 90, Arc2D.PIE),
+            new Rectangle2D.Double(25, 25, 50, 50)
+        },
+        {
+            new Arc2D.Double(0, 0, 100, 100, -45, 90, Arc2D.PIE),
+            new Rectangle2D.Double(60, 0, 20, 100)
+        },
+        {
+            new Arc2D.Double(0, 0, 100, 100, -135, 270, Arc2D.CHORD),
+            new Rectangle2D.Double(20, 0, 20, 100)
+        }
+    };
+    static Shape[][] falses = {
+        {
+            new Arc2D.Double(0, 0, 100, 100, 0, 360, Arc2D.PIE),
+            new Rectangle2D.Double(0, 100, 100, 100)
+        },
+        {
+            new Arc2D.Double(0, 0, 100, 100, 45, 20, Arc2D.PIE),
+            new Rectangle2D.Double(75, 75, 100, 100)
+        },
+        {
+            new Arc2D.Double(0, 0, 100, 100, -10, 10, Arc2D.PIE),
+            new Rectangle2D.Double(50, 75, 50, 100)
+        },
+        {
+            new Arc2D.Double(0, 0, 100, 100, -10, 10, Arc2D.CHORD),
+            new Rectangle2D.Double(60, 0, 10, 100)
+        }
+    };
+
+    public static void main(String[] args) {
+
+        for (int i = 0; i < trues.length; i++) {
+            checkPair((Arc2D)trues[i][0], (Rectangle2D)trues[i][1], true);
+        }
+
+        for (int i = 0; i < falses.length; i++) {
+            checkPair((Arc2D)falses[i][0], (Rectangle2D)falses[i][1], false);
+        }
+    }
+
+    public static void checkPair(Arc2D arc, Rectangle2D rect, boolean expect) {
+
+        if (arc.intersects(rect) != expect) {
+            String errMsg = "Intersection of Arc(" +
+                            arc.getX() + ", " + arc.getY() + ", " +
+                            arc.getWidth() + ", " + arc.getHeight() + ", " +
+                            "start = " + arc.getAngleStart() + ", " +
+                            "extent = " + arc.getAngleExtent() + ", " +
+                            typeName(arc.getArcType()) + ") and Rectangle(" +
+                            rect.getX() + ", " + rect.getY() + ", " +
+                            rect.getWidth() + ", " + rect.getHeight() + ") " +
+                            "should be " + expect + ", BUT IT IS NOT.";
+            throw new RuntimeException(errMsg);
+        }
+    }
+
+    public static String typeName(int type) {
+
+        if (type == Arc2D.OPEN)
+            return "Open";
+        if (type == Arc2D.CHORD)
+            return "Chord";
+        if (type == Arc2D.PIE)
+            return "Pie";
+        return null;
+    }
+}
diff --git a/test/jdk/java/awt/geom/Arc2D/ChordContainsTest.java b/test/jdk/java/awt/geom/Arc2D/ChordContainsTest.java
new file mode 100644
index 00000000000..5a49f924428
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/ChordContainsTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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 4724563
+ * @summary Test the points out of arc to recognize as not containing.
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.Point2D;
+
+public class ChordContainsTest {
+
+    public void runTest() {
+
+        Arc2D a = new Arc2D.Double(-20, -20, 40, 40, -60, 120, Arc2D.CHORD);
+
+        // this point is surely out of chorded arc,
+        // it's closer to center
+        Point2D p = new Point2D.Double( a.getWidth() / 6, 0);
+
+        if (a.contains(p.getX(), p.getY())) {
+            throw new RuntimeException("Point out of arc recognized as containing");
+        }
+    }
+
+    public static void main(String[] args) {
+        ChordContainsTest test = new ChordContainsTest();
+        test.runTest();
+    }
+}
diff --git a/test/jdk/java/awt/geom/Arc2D/NotConvexPieTest.java b/test/jdk/java/awt/geom/Arc2D/NotConvexPieTest.java
new file mode 100644
index 00000000000..0903d2fef67
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/NotConvexPieTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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
+ * 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 4725016
+ * @summary Tests the contains() method for not a convex pie with negative ext
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.Rectangle2D;
+
+public class NotConvexPieTest {
+
+    Arc2D aNegative = new Arc2D.Double(-100, -100, 200, 200,
+                                       -45, -270, Arc2D.PIE);
+    // this rectangle surely have all vertices inside the
+    // arc above but intersects the pie slices
+    Rectangle2D rect = new Rectangle2D.Double(-20, -40, 40, 80);
+
+    String failText = "Test failed: rect should not be contained in arc due to "
+            + "intersections with radii";
+
+    public void runTest() {
+
+        boolean contains = aNegative.contains(rect.getX(),
+                                              rect.getY(),
+                                              rect.getWidth(),
+                                              rect.getHeight());
+        if (contains) {
+            // test failed
+            throw new RuntimeException(failText);
+        }
+    }
+
+    public static void main(String[] args) {
+        NotConvexPieTest test = new NotConvexPieTest();
+        test.runTest();
+    }
+}
diff --git a/test/jdk/java/awt/geom/Arc2D/SetAnglesTest.java b/test/jdk/java/awt/geom/Arc2D/SetAnglesTest.java
new file mode 100644
index 00000000000..368ba8e17e9
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/SetAnglesTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * 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 4724580
+ * @summary Pie slices should be colinear with vectors used to set angles.
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.Point2D;
+
+public class SetAnglesTest {
+
+    public void runTest() {
+
+        Arc2D arc = new Arc2D.Double(-10, -40, 20, 80, 0, 0, Arc2D.PIE);
+        Point2D p1 = new Point2D.Double(10, 10);
+        Point2D p2 = new Point2D.Double(10, -10);
+        double threshold = 1.0E-10;
+
+        arc.setAngles(p1.getX(), p1.getY(), p2.getX(), p2.getY());
+
+        Point2D start = arc.getStartPoint();
+        Point2D end   = arc.getEndPoint();
+
+        checkColinear(start.getX(), start.getY(), p1.getX(), p1.getY());
+        checkColinear(end.getX(), end.getY(), p2.getX(), p2.getY());
+    }
+
+    void checkColinear(double dx1, double dy1, double dx2, double dy2) {
+
+        double threshold = 1.0E-10;
+
+        if (!(dx1 * dx2 >= 0 &&
+              dy1 * dy2 >= 0 &&
+              Math.abs(dx1 * dy2 - dx2 * dy1) <= threshold)) {
+            throw new RuntimeException("Angles difference is too much");
+        }
+    }
+
+    public static void main(String[] args) {
+        SetAnglesTest test = new SetAnglesTest();
+        test.runTest();
+    }
+}
diff --git a/test/jdk/java/awt/geom/Arc2D/SmallExtAngleTest.java b/test/jdk/java/awt/geom/Arc2D/SmallExtAngleTest.java
new file mode 100644
index 00000000000..77e7ba25673
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/SmallExtAngleTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * 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 4836495
+ * @summary Very small ext angle of arc should not give NaNs in SEG_CUBICTO
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Rectangle2D;
+
+public class SmallExtAngleTest {
+
+    public static void main(String[] args) {
+
+        String errorMsg = "NaN occured in coordinates of SEG_CUBICTO";
+        Rectangle2D bounds = new Rectangle2D.Double(-100, -100, 200, 200);
+        Arc2D arc = new Arc2D.Double(bounds, 90, -1.0E-7, Arc2D.PIE);
+        double[] coords = new double[6];
+
+        PathIterator p = arc.getPathIterator(null);
+        while (!p.isDone()) {
+
+            if (p.currentSegment(coords) == PathIterator.SEG_CUBICTO) {
+
+                for (int i = 0; i < 6; i++) {
+                    if (coords[i] != coords[i]) {
+                        throw new RuntimeException(errorMsg);
+                    }
+                }
+            }
+            p.next();
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/ArcSubtractEllipseBug.java b/test/jdk/java/awt/geom/Area/ArcSubtractEllipseBug.java
new file mode 100644
index 00000000000..f2210c38bb3
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/ArcSubtractEllipseBug.java
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * 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 6356485
+ * @summary Checks that subtracting a particular ellipse from an Arc
+ *          does not cause an InternalError to be thrown.
+ */
+import java.awt.geom.Arc2D;
+import java.awt.geom.Area;
+import java.awt.geom.Ellipse2D;
+
+public class ArcSubtractEllipseBug {
+    public static void main(String[] args) {
+        double x = -4.250000000000002;
+        double y = 0.0;
+        double width = 8.5;
+        double height = 8.5;
+        double start = -450.0;
+        double extent = 180.0;
+
+        Arc2D outerArc = new Arc2D.Double(x, y, width, height,
+                                          start, extent, Arc2D.PIE);
+
+        Area tmp = new Area(outerArc);
+
+        x = -4.000000000000002;
+        y = 0.25;
+        width = 8.0;
+        height = 8.0;
+
+        Ellipse2D innerArc = new Ellipse2D.Double(x, y, width, height);
+
+        tmp.subtract(new Area(innerArc));
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/AreaNaNBug.java b/test/jdk/java/awt/geom/Area/AreaNaNBug.java
new file mode 100644
index 00000000000..c09d8b5fc86
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/AreaNaNBug.java
@@ -0,0 +1,61 @@
+/*
+ * 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
+ * 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 6398602
+ * @summary Checks that problems finding the roots of curves does not
+ *          cause the Area class to end up with NaN coordinates after
+ *          being constructed from an otherwise normal and unremarkable
+ *          path.
+ */
+
+import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Rectangle2D;
+
+public class AreaNaNBug {
+    public static void main(String argv[]) {
+        GeneralPath gp = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+        gp.moveTo(-38.05311f, 75.25694f);
+        gp.curveTo(-48.18971f, 71.23722f,
+                   -46.495422f, -113.844574f,
+                   124.16219f, 87.604744f);
+        gp.quadTo(105.644554f, 114.52495f,
+                  72.98282f, -78.52084f);
+        gp.lineTo(107.358795f, 29.33548f);
+        gp.quadTo(-16.562698f, -43.91586f,
+                  51.50203f, 38.51295f);
+        gp.lineTo(20.715876f, 44.4093f);
+        gp.closePath();
+        Area a = new Area(gp);
+        Rectangle2D r2d = a.getBounds2D();
+        if (Double.isNaN(r2d.getX()) ||
+            Double.isNaN(r2d.getY()) ||
+            Double.isNaN(r2d.getWidth()) ||
+            Double.isNaN(r2d.getHeight()))
+        {
+            throw new RuntimeException("Area bounds have NaN");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/AreaTransformTest.java b/test/jdk/java/awt/geom/Area/AreaTransformTest.java
new file mode 100644
index 00000000000..d30818d741e
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/AreaTransformTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 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 6385010
+ * @summary Checks that transform does not fail with exception
+ */
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
+
+/* Minimized testcase from bug report */
+
+public class AreaTransformTest {
+
+    public static void main(String[] args) {
+        AffineTransform t = AffineTransform.getRotateInstance(Math.PI/8);
+        GeneralPath path = new GeneralPath();
+
+        path.moveTo(-4516.23223633003f,10983.71557514126f);
+        path.lineTo(-1451.4908513919768f, 13100.559659959084f);
+        path.quadTo(-54.38163118565376f, 13679.261247085042f,
+                    1470.6331984752403f, 13679.261247085042f);
+        path.closePath();
+
+        Area area = new Area(path);
+
+        for (int i = 0; i < 8; i++) {
+            area.transform(t);
+        }
+    }
+
+}
diff --git a/test/jdk/java/awt/geom/Area/BoundsCache.java b/test/jdk/java/awt/geom/Area/BoundsCache.java
new file mode 100644
index 00000000000..025407c62c3
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/BoundsCache.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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 4188529 4240423
+ * @summary Verifies that the Area methods do not cache the bounds
+ *          across operations.
+ */
+
+import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.Ellipse2D;
+
+public class BoundsCache {
+
+    public static void main(String s[]) {
+        Ellipse2D cir = new Ellipse2D.Double(110.0,100.0, 50.0, 50.0);
+        Ellipse2D cir2 = new Ellipse2D.Double(110.0,100.0, 50.0, 50.0);
+        Area area_cir = new Area (cir);
+
+        System.out.println("before operation (bounds should be non-empty):");
+        System.out.println("   bounds are "+area_cir.getBounds());
+        System.out.println("   2D bounds are "+area_cir.getBounds2D());
+        System.out.println("   isEmpty returns "+area_cir.isEmpty());
+        area_cir.subtract(new Area (cir2));
+        System.out.println("after operation (bounds should be empty):");
+        System.out.println("   bounds are "+area_cir.getBounds());
+        System.out.println("   2D bounds are "+area_cir.getBounds2D());
+        System.out.println("   isEmpty returns "+area_cir.isEmpty());
+        if (!area_cir.isEmpty() ||
+            !area_cir.getBounds().isEmpty() ||
+            !area_cir.getBounds2D().isEmpty())
+        {
+            throw new RuntimeException("result was not empty!");
+        }
+
+        Area area = new Area(cir);
+        area.getBounds();
+        area.reset();
+        if (!area.getBounds().isEmpty()) {
+            throw new RuntimeException("result was not empty!");
+        }
+
+        area = new Area(cir);
+        Rectangle r = area.getBounds();
+        area.transform(new AffineTransform(1, 0, 0, 1, 10, 0));
+        if (area.getBounds().equals(r)) {
+            throw new RuntimeException("bounds not updated in transform!");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/EqualsNull.java b/test/jdk/java/awt/geom/Area/EqualsNull.java
new file mode 100644
index 00000000000..2bdf0e4b0ca
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/EqualsNull.java
@@ -0,0 +1,38 @@
+/*
+ * 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
+ * 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 4245905
+ * @summary Verifies that the Area.equals(null) returns false
+ */
+
+import java.awt.geom.Area;
+
+public class EqualsNull {
+    public static void main(String argv[]) {
+        if (new Area().equals(null)) {
+            throw new RuntimeException("Area object equaled null");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/NPETests.java b/test/jdk/java/awt/geom/Area/NPETests.java
new file mode 100644
index 00000000000..17741be6b21
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/NPETests.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2005, 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 6304542
+ * @summary Verifies that various Area methods throw NPE for null arguments
+ */
+
+import java.awt.geom.Area;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+public class NPETests {
+    static boolean verbose;
+    static int numfailures = 0;
+
+    public static void main(String argv[]) {
+        verbose = (argv.length > 0);
+        test(new Runnable() {
+            public void run() { new Area(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().add(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().subtract(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().intersect(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().exclusiveOr(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().transform(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().createTransformedArea(null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().contains((Point2D) null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().contains((Rectangle2D) null); }
+        });
+        test(new Runnable() {
+            public void run() { new Area().intersects((Rectangle2D) null); }
+        });
+        if (numfailures > 0) {
+            throw new RuntimeException(numfailures+
+                                       " methods failed to throw NPE");
+        }
+    }
+
+    public static void test(Runnable r) {
+        try {
+            r.run();
+            numfailures++;
+            if (verbose) {
+                new RuntimeException(r+" failed to throw NPE")
+                    .printStackTrace();
+            }
+        } catch (NullPointerException e) {
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/PolygonAdd.java b/test/jdk/java/awt/geom/Area/PolygonAdd.java
new file mode 100644
index 00000000000..42a965a0eb3
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/PolygonAdd.java
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * 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 4286894
+ * @summary Verifies that a particular case of Polygon addition
+ *          correctly calculates the ordering of the Polygon edges.
+ */
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+
+public class PolygonAdd {
+    public static void main(String argv[]) {
+        // Original shapes: 4 touching rectangles
+        // (area works correctly with them if not transformed)
+        Shape b = new Rectangle(0,0,100,10);
+        Shape t = new Rectangle(0,90,100,10);
+        Shape l = new Rectangle(0,10,10,80);
+        Shape r = new Rectangle(90,10,10,80);
+
+        // Create a transform to rotate them by 10 degrees
+        AffineTransform M = new AffineTransform();
+        M.translate(-50,-50);
+        M.scale(3,3);
+        M.rotate(Math.toRadians(10));
+        M.translate(70,40);
+
+        Area area = new Area();
+        area.add(new Area(M.createTransformedShape(b)));
+        area.add(new Area(M.createTransformedShape(l)));
+        area.add(new Area(M.createTransformedShape(t)));
+        area.add(new Area(M.createTransformedShape(r)));
+
+        if (!area.contains(295, 145, 5, 5)) {
+            throw new RuntimeException("Area addition failed!");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/PolygonSubtract.java b/test/jdk/java/awt/geom/Area/PolygonSubtract.java
new file mode 100644
index 00000000000..9566a685f1e
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/PolygonSubtract.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 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 4217589
+ * @summary Verifies that a particular case of Polygon subtraction
+ *          correctly calculates the ordering of the Polygon edges.
+ */
+
+import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
+
+public class PolygonSubtract {
+    public static void main(String argv[]) {
+        Area area = new Area();
+
+        GeneralPath ring1 = new GeneralPath();
+
+        ring1.moveTo(0, 45);
+        ring1.lineTo(90, 0);
+        ring1.lineTo(60, -45);
+        ring1.lineTo(-60, -45);
+        ring1.lineTo(-90, 0);
+
+        ring1.closePath();
+
+        area.add(new Area(ring1));
+
+        GeneralPath ring2 = new GeneralPath();
+
+        ring2.moveTo(0, 20);
+        ring2.lineTo(100, 0);
+        ring2.lineTo(30, -20);
+        ring2.lineTo(-30, -20);
+        ring2.lineTo(-100, 0);
+        ring2.closePath();
+
+        area.subtract(new Area(ring2));
+
+        if (!area.contains(50, 13, 2, 2)) {
+            throw new RuntimeException("Area subtraction failed!");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/QuadCurveOOMBug.java b/test/jdk/java/awt/geom/Area/QuadCurveOOMBug.java
new file mode 100644
index 00000000000..57f665a1ff7
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/QuadCurveOOMBug.java
@@ -0,0 +1,340 @@
+/*
+ * 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
+ * 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 6372340
+ * @summary Checks for infinite loop and OOM bugs dealing with Quad curves.
+ * @run main/timeout=20/othervm QuadCurveOOMBug
+ */
+
+import java.awt.Shape;
+import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.PathIterator;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class QuadCurveOOMBug {
+    public static final String SEG_CLOSE = " SEG_CLOSE";
+    public static final String SEG_CUBICTO = " SEG_CUBICTO";
+    public static final String SEG_LINETO = " SEG_LINETO";
+    public static final String SEG_MOVETO = " SEG_MOVETO";
+    public static final String SEG_QUADTO = " SEG_QUADTO";
+
+    public static final byte[] strokedLineToSubtract = {
+        0,  11,  32,  83,  69,  71,  95,  77,  79,  86,
+        69,  84,  79,  68,  117,  7,  -63,  67,  15,  6,
+        87,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  117,  31,  16,  67,  15,
+        23,  5,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  117,  68,  -12,  67,
+        15,  50,  54,  68,  117,  103,  16,  67,  15,  50,
+        59,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  117,  110,  14,  67,  15,
+        50,  59,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  117,  -56,  26,  67,
+        15,  48,  -15,  68,  118,  22,  75,  67,  14,  112,
+        95,  0,  11,  32,  83,  69,  71,  95,  81,  85,
+        65,  68,  84,  79,  68,  118,  61,  115,  67,  14,
+        15,  10,  68,  118,  94,  93,  67,  13,  127,  -74,
+        0,  11,  32,  83,  69,  71,  95,  76,  73,  78,
+        69,  84,  79,  68,  118,  103,  -80,  67,  13,  87,
+        15,  0,  11,  32,  83,  69,  71,  95,  81,  85,
+        65,  68,  84,  79,  68,  118,  21,  -76,  67,  14,
+        -81,  -105,  68,  117,  -100,  -84,  67,  14,  -72,  72,
+        0,  11,  32,  83,  69,  71,  95,  76,  73,  78,
+        69,  84,  79,  68,  117,  -88,  84,  67,  14,  -72,
+        72,  0,  11,  32,  83,  69,  71,  95,  81,  85,
+        65,  68,  84,  79,  68,  117,  108,  85,  67,  14,
+        -73,  106,  68,  117,  53,  117,  67,  14,  74,
+        -61,  0,  11,  32,  83,  69,  71,  95,  76,  73,  78,
+        69,  84,  79,  68,  117,  72,  27,  67,  14,  112,
+        14,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  118,  87,  -51,  67,  5,
+        -16,  100,  0,  11,  32,  83,  69,  71,  95,  76,
+        73,  78,  69,  84,  79,  68,  118,  69,  39,  67,
+        5,  -53,  25,  0,  11,  32,  83,  69,  71,  95,
+        81,  85,  65,  68,  84,  79,  68,  117,  -5,  -93,
+        67,  5,  57,  38,  68,  117,  -88,  84,  67,  5,
+        56,  72,  0,  11,  32,  83,  69,  71,  95,  76,
+        73,  78,  69,  84,  79,  68,  117,  -100,  -84,  67,
+        5,  56,  72,  0,  11,  32,  83,  69,  71,  95,
+        81,  85,  65,  68,  84,  79,  68,  117,  12,  86,
+        67,  5,  64,  -7,  68,  116,  -89,  -76,  67,
+        6,  -22,  -51,  0,  11,  32,  83,  69,  71,  95,  76,
+        73,  78,  69,  84,  79,  68,  116,  -98,  97,  67,
+        7,  19,  116,  0,  11,  32,  83,  69,  71,  95,
+        81,  85,  65,  68,  84,  79,  68,  116,  -75,  -100,
+        67,  6,  -83,  -7,  68,  116,  -44,  -9,  67,  6,
+        95,  -59,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  117,  26,  -119,  67,
+        5,  -76,  14,  68,  117,  110,  14,  67,  5,  -78,
+        59,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  117,  103,  16,  67,  5,
+        -78,  59,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  117,  122,  -71,  67,
+        5,  -78,  22,  68,  117,  -119,  -60,  67,  5,  -68,
+        -61,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  117,  114,  117,  67,  5,
+        -84,  21,  0,  11,  32,  83,  69,  71,  95,  76,
+        73,  78,  69,  84,  79,  68,  117,  7,  -63,  67,
+        15,  6,  87,  0,  10,  32,  83,  69,  71,  95,
+        67,  76,  79,  83,  69,
+    };
+
+    public static final byte[] negSpace = {
+        0,  11,  32,  83,  69,  71,  95,  77,  79,  86,
+        69,  84,  79,  68,  116,  -33,  -12,  67,  4,  30,
+        -23,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  118,  59,  73,  67,  6,
+        -43,  -109,  0,  11,  32,  83,  69,  71,  95,  76,
+        73,  78,  69,  84,  79,  68,  117,  100,  -97,  67,
+        13,  -118,  -32,  0,  11,  32,  83,  69,  71,  95,
+        76,  73,  78,  69,  84,  79,  68,  116,  9,  75,
+        67,  10,  -44,  54,  0,  10,  32,  83,  69,  71,
+        95,  67,  76,  79,  83,  69,
+    };
+
+    public static final byte[] strokedLineToAdd = {
+        0,  11,  32,  83,  69,  71,  95,  77,  79,  86,
+        69,  84,  79,  68,  98,  -100,  -76,  67,  -85,  -36,
+        6,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  98,  -76,  4,  67,  -85,
+        -48,  21,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  98,  -102,  -29,  67,
+        -85,  -36,  -5,  68,  98,  -112,  107,  67,  -85,
+        -35,  5,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  98,  -84,  99,  67,  -85,
+        -35,  5,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  98,  -87,  1,  67,
+        -85,  -35,  1,  68,  98,  -107,  -10,  67,  -85,  -43,
+        23,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  98,  -95,  -98,  67,  -85,
+        -39,  -11,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  98,  -53,  -8,  67,
+        -85,  -21,  -99,  68,  98,  -10,  -6,  67,  -85,
+        -21,  -95,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  99,  2,  -94,  67,  -85,
+        -21,  -95,  0,  11,  32,  83,  69,  71,  95,  81,
+        85,  65,  68,  84,  79,  68,  98,  -56,  -104, 67,
+        -85,  -21,  61,  68,  98,  -109,  28,  67,  -85,  -73,
+        -35,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  98,  -91,  -62,  67,  -85,
+        -55,  -22,  0,  11,  32,  83,  69,  71,  95,  76,
+        73,  78,  69,  84,  79,  68,  99,  -82,  -62,  67,
+        -89,  -125,  126,  0,  11,  32,  83,  69,  71,  95,
+        76,  73,  78,  69,  84,  79,  68,  99,  -100,  28,
+        67,  -89,  113,  113,  0,  11,  32,  83,  69,  71,
+        95,  81,  85,  65,  68,  84,  79,  68,  99,  83,
+        -6,  67,  -89,  44,  5,  68,  99,  2,  -94,  67,
+        -89,  43,  -95,  0,  11,  32,  83,  69,  71,  95,
+        76,  73,  78,  69,  84,  79,  68,  98,  -10,  -6,
+        67,  -89,  43,  -95,  0,  11,  32,  83,  69,  71,
+        95,  81,  85,  65,  68,  84,  79,  68,  99,  10,
+        -82,  67,  -89,  43,  -91,  68,  99,  29,  -72,  67,
+        -89,  51,  -113,  0,  11,  32,  83,  69,  71,  95,
+        76,  73,  78,  69,  84,  79,  68,  99,  18,  16,
+        67,  -89,  46,  -79,  0,  11,  32,  83,  69,  71,
+        95,  81,  85,  65,  68,  84,  79,  68,  98,  -25,
+        -73,  67,  -89,  29,  9,  68,  98,  -84,  99,  67,
+        -89,  29,  5,  0,  11,  32,  83,  69,  71,  95,
+        76,  73,  78,  69,  84,  79,  68,  98,  -112,  107,
+        67,  -89,  29,  5,  0,  11,  32,  83,  69,  71,
+        95,  81,  85,  65,  68,  84,  79,  68,  98,  78,
+        121,  67,  -89,  28,  -15,  68,  98,  29,  -110,  67,
+        -89,  53,  -27,  0,  11,  32,  83,  69,  71,  95,
+        76,  73,  78,  69,  84,  79,  68,  98,  6,  66,
+        67,  -89,  65,  -42,  0,  11,  32,  83,  69,  71,
+        95,  76,  73,  78,  69,  84,  79,  68,  98,  -100,
+        -76,  67,  -85,  -36,  6,  0,  10,  32,  83,  69,
+        71,  95,  67,  76,  79,  83,  69,
+    };
+
+    public static final byte[] shapeAdded = {
+        0,  11,  32,  83,  69,  71,  95,  77,  79,  86,
+        69,  84,  79,  68,  102,  54,  -63,  67,  -84,  -102,
+        29,  0,  11,  32,  83,  69,  71,  95,  76,  73,  78,
+        69,  84,  79,  68,  96,  -120,  114,  67,  -94,
+        2,  48,  0,  11,  32,  83,  69,  71,  95,  76,  73,
+        78,  69,  84,  79,  68,  94,  -119,  0,  67,
+        -86,  67,  -25,  0,  10,  32,  83,  69,  71,  95,
+        67,  76,  79,  83,  69,
+    };
+
+    public static void main(String[] args) {
+        // Reversing the order of these try blocks has no effect.
+        try {
+            testAdd();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+
+        try {
+            testSubtract();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void testSubtract() throws IOException
+    {
+        Shape lineShape = loadShape(strokedLineToSubtract, "Line");
+        Shape negShape = loadShape(negSpace, "Space");
+        Area lineArea = new Area(lineShape);
+        Area negArea = new Area(negShape);
+        System.err.println("Attempting to subtract ... ");
+        lineArea.subtract(negArea); // This is what throws the OutOfMemoryError
+        System.err.println("Subtraction succeeded.");
+    }
+
+    private static void testAdd() throws IOException
+    {
+        Shape lineShape = loadShape(strokedLineToAdd, "Line");
+        Shape negShape = loadShape(shapeAdded, "Space");
+        Area lineArea = new Area(lineShape);
+        Area negArea = new Area(negShape);
+        System.err.println("Attempting to add ... ");
+        lineArea.add(negArea); // This is what throws the OutOfMemoryError
+        System.err.println("Addition succeeded.");
+    }
+
+    /**
+     * Although this method isn't used by this test case, this is the method
+     * used to create the two data sets that the test case uses.
+     * @param name The name to give to the variable
+     * @param shape
+     */
+    public static void saveShapeData(Shape shape, String name)
+    {
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        DataOutputStream os = new DataOutputStream(byteStream);
+        try {
+            saveShapeToStream(shape, os);
+            System.out.println("\npublic static final byte[] " +
+                               name + " = {\n");
+            byte[] data = byteStream.toByteArray();
+            int ii=0;
+            for (byte bt : data)
+                System.out.print("  " + Byte.toString(bt) + "," +
+                                 ((++ii)%20==0? "\n":""));
+            System.out.println("};");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void saveShapeToStream(Shape shape, DataOutputStream pOs)
+        throws IOException
+    {
+        PathIterator iter = shape.getPathIterator(null);
+        float[] coords = new float[6];
+        while(!iter.isDone()) {
+            int type = iter.currentSegment(coords);
+            switch(type) {
+            case PathIterator.SEG_CLOSE:
+                pOs.writeUTF(SEG_CLOSE);
+                break;
+            case PathIterator.SEG_CUBICTO:
+                pOs.writeUTF(SEG_CUBICTO);
+                for (float coord : coords)
+                    pOs.writeFloat(coord);
+                break;
+            case PathIterator.SEG_LINETO:
+                pOs.writeUTF(SEG_LINETO);
+                pOs.writeFloat(coords[0]);
+                pOs.writeFloat(coords[1]);
+                break;
+            case PathIterator.SEG_MOVETO:
+                pOs.writeUTF(SEG_MOVETO);
+                pOs.writeFloat(coords[0]);
+                pOs.writeFloat(coords[1]);
+                break;
+            case PathIterator.SEG_QUADTO:
+                pOs.writeUTF(SEG_QUADTO);
+                for (int ii=0; ii<4; ++ii)
+                    pOs.writeFloat(coords[ii]);
+                break;
+            default:
+                System.err.print(" UNKNOWN:" + type);
+                break;
+            }
+            iter.next();
+        }
+    }
+
+
+    public static Shape loadShape(byte[] fileData, String name)
+        throws IOException
+    {
+        System.out.println("\n\n" + name + ":");
+        GeneralPath path = new GeneralPath();
+        path.setWindingRule(GeneralPath.WIND_NON_ZERO);
+        DataInputStream is=null;
+        is = new DataInputStream(new ByteArrayInputStream(fileData));
+        float[] coords = new float[6];
+        while (is.available()>0)
+        {
+            String type = is.readUTF();
+            System.out.print("\n" + type + "\n   ");
+            if (type.equals(SEG_CLOSE)) {
+                path.closePath();
+            } else if (type.equals(SEG_CUBICTO)) {
+                for (int ii=0; ii<6; ++ii)
+                    coords[ii] = readFloat(is);
+                path.curveTo(coords[0], coords[1],
+                             coords[2], coords[3],
+                             coords[4], coords[5]);
+            } else if (type.equals(SEG_LINETO)) {
+                for (int ii=0; ii<2; ++ii)
+                    coords[ii] = readFloat(is);
+                path.lineTo(coords[0], coords[1]);
+            } else if (type.equals(SEG_MOVETO)) {
+                for (int ii=0; ii<2; ++ii)
+                    coords[ii] = readFloat(is);
+                path.moveTo(coords[0], coords[1]);
+            } else if (type.equals(SEG_QUADTO)) {
+                for (int ii=0; ii<4; ++ii)
+                    coords[ii] = readFloat(is);
+                path.quadTo(coords[0], coords[1], coords[2], coords[3]);
+            }
+        }
+        return path;
+    }
+
+    /**
+     * This call reads all the float values and prints them out.
+     * @param is
+     * @return
+     * @throws IOException
+     */
+    private static float readFloat(DataInputStream is) throws IOException
+    {
+        float ft = is.readFloat();
+        System.out.print("" + ft + ", ");
+        return ft;
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/TightBBox.java b/test/jdk/java/awt/geom/Area/TightBBox.java
new file mode 100644
index 00000000000..5beb28e0e8c
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/TightBBox.java
@@ -0,0 +1,146 @@
+/*
+ * 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
+ * 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 4276812
+ * @summary Verifies that the Area.getBounds2D() method returns a very tight
+ *          bounding box
+ */
+
+import java.awt.geom.Area;
+import java.awt.geom.CubicCurve2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
+import java.awt.geom.QuadCurve2D;
+import java.awt.geom.Rectangle2D;
+
+public class TightBBox {
+    public static void main(String argv[]) {
+        Point2D points[] = {
+            new Point2D.Double(0.0, 0.0),
+            new Point2D.Double(1.0, 0.0),
+            new Point2D.Double(1.0, 1.0),
+            new Point2D.Double(0.0, 1.0),
+        };
+        for (int i = 0; i < 4; i++) {
+            testCubic(points);
+            testQuad(points);
+            testLines(points);
+            rotate(points);
+        }
+    }
+
+    public static void testCubic(Point2D points[]) {
+        CubicCurve2D cubic =
+            new CubicCurve2D.Double(points[0].getX(), points[0].getY(),
+                                    points[1].getX(), points[1].getY(),
+                                    points[2].getX(), points[2].getY(),
+                                    points[3].getX(), points[3].getY());
+        Area a = new Area(cubic);
+        if (!cubic.getBounds2D().contains(a.getBounds2D())) {
+            throw new RuntimeException("Area bbox is larger than cubic");
+        }
+        double x = (points[0].getX() +
+                    (points[1].getX() + points[2].getX()) * 3.0 +
+                    points[3].getX()) / 8.0;
+        double y = (points[0].getY() +
+                    (points[1].getY() + points[2].getY()) * 3.0 +
+                    points[3].getY()) / 8.0;
+        Rectangle2D r =
+            new Rectangle2D.Double(points[0].getX(), points[0].getY(), 0, 0);
+        r.add(points[3].getX(), points[3].getY());
+        r.add(x, y);
+        checkBox(r, a.getBounds2D());
+    }
+
+    public static void testQuad(Point2D points[]) {
+        QuadCurve2D quad =
+            new QuadCurve2D.Double(points[0].getX(), points[0].getY(),
+                                   (points[1].getX() + points[2].getX()) / 2.0,
+                                   (points[1].getY() + points[2].getY()) / 2.0,
+                                   points[3].getX(), points[3].getY());
+        Area a = new Area(quad);
+        if (!quad.getBounds2D().contains(a.getBounds2D())) {
+            throw new RuntimeException("Area bbox is larger than quad");
+        }
+        // p0 + 2cp + p1 == p0 + 2(cp0+cp1)/2 + p1 == p0 + cp0 + cp1 + p1
+        double x = (points[0].getX() +
+                    points[1].getX() + points[2].getX() +
+                    points[3].getX()) / 4.0;
+        double y = (points[0].getY() +
+                    points[1].getY() + points[2].getY() +
+                    points[3].getY()) / 4.0;
+        Rectangle2D r =
+            new Rectangle2D.Double(points[0].getX(), points[0].getY(), 0, 0);
+        r.add(points[3].getX(), points[3].getY());
+        r.add(x, y);
+        checkBox(r, a.getBounds2D());
+    }
+
+    public static void testLines(Point2D points[]) {
+        GeneralPath gp = new GeneralPath();
+        gp.moveTo((float) points[0].getX(), (float) points[0].getY());
+        gp.lineTo((float) points[2].getX(), (float) points[2].getY());
+        gp.lineTo((float) points[1].getX(), (float) points[1].getY());
+        gp.lineTo((float) points[3].getX(), (float) points[3].getY());
+        gp.closePath();
+        Area a = new Area(gp);
+        if (!gp.getBounds2D().contains(a.getBounds2D())) {
+            throw new RuntimeException("Area bbox is larger than poly");
+        }
+        Rectangle2D r =
+            new Rectangle2D.Double(points[3].getX(), points[3].getY(), 0, 0);
+        for (int i = 0; i < 3; i++) {
+            r.add(points[i].getX(), points[i].getY());
+        }
+        checkBox(r, a.getBounds2D());
+    }
+
+    public static void checkBox(Rectangle2D r1, Rectangle2D r2) {
+        checkVal(r1.getMinX(), r2.getMinX());
+        checkVal(r1.getMinY(), r2.getMinY());
+        checkVal(r2.getMaxX(), r1.getMaxX());
+        checkVal(r2.getMaxY(), r1.getMaxY());
+    }
+
+    /*
+     * v1 and v2 should be roughly equal.  The amount of computation
+     * involved in calculating bounding boxes is complex enough that
+     * you might expect the values to be slightly off and this should
+     * perhaps be a loose comparison, but our runtime seems to produce
+     * values that are exactly equal (even with double arithmetic),
+     * so this test will enforce exact equality for now.
+     */
+    public static void checkVal(double v1, double v2) {
+        if (v1 != v2) {
+            throw new RuntimeException("bounding box not minimal");
+        }
+    }
+
+    public static void rotate(Point2D[] points) {
+        Point2D p = points[0];
+        System.arraycopy(points, 1, points, 0, 3);
+        points[3] = p;
+    }
+}
diff --git a/test/jdk/java/awt/geom/Area/TransformPrecision.java b/test/jdk/java/awt/geom/Area/TransformPrecision.java
new file mode 100644
index 00000000000..8bafbf11d37
--- /dev/null
+++ b/test/jdk/java/awt/geom/Area/TransformPrecision.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 4632108
+ * @summary Verifies that the Area transform methods maintain double precision
+ */
+
+import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+
+public class TransformPrecision {
+    public static void main(String argv[]) {
+        int x = 1 << 27;
+        int y = 1 << 26;
+
+        AffineTransform tx = AffineTransform.getTranslateInstance(x, y);
+        AffineTransform untx = AffineTransform.getTranslateInstance(-x, -y);
+
+        Rectangle r = new Rectangle(10, 10, 20, 20);
+        Area a = new Area(r);
+
+        Area b = new Area(r);
+        b.transform(tx);
+        b.transform(untx);
+        if (!a.equals(b)) {
+            throw new RuntimeException("large translation hurt precision!");
+        }
+
+        b = a.createTransformedArea(tx);
+        b = b.createTransformedArea(untx);
+        if (!a.equals(b)) {
+            throw new RuntimeException("large translation hurt precision!");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/CubicCurve2D/ContainsHang.java b/test/jdk/java/awt/geom/CubicCurve2D/ContainsHang.java
new file mode 100644
index 00000000000..a24255ffd6c
--- /dev/null
+++ b/test/jdk/java/awt/geom/CubicCurve2D/ContainsHang.java
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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 4246661
+ * @summary Verifies that the CubicCurve2D.contains method does not hang
+ * @run main/timeout=5 ContainsHang
+ */
+
+import java.awt.geom.CubicCurve2D;
+
+public class ContainsHang {
+    public static void main(String args[]) {
+        CubicCurve2D curve =
+            new CubicCurve2D.Double(83.0, 101.0,
+                                    -5.3919918959078075, 94.23530547506019,
+                                    71.0, 39.0,
+                                    122.0, 44.0);
+
+        System.out.println("Checking contains() >>>");
+        curve.contains(71.0, 44.0);
+        System.out.println("Check complete!!");
+    }
+}
diff --git a/test/jdk/java/awt/geom/CubicCurve2D/ContainsPoint.java b/test/jdk/java/awt/geom/CubicCurve2D/ContainsPoint.java
new file mode 100644
index 00000000000..9d444f2c6ca
--- /dev/null
+++ b/test/jdk/java/awt/geom/CubicCurve2D/ContainsPoint.java
@@ -0,0 +1,44 @@
+/*
+ * 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
+ * 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 6396047
+ * @summary tests the CubicCurve2D.contains(x, y) method
+ */
+
+import java.awt.geom.CubicCurve2D;
+
+public class ContainsPoint {
+    public static void main(String args[]) {
+        CubicCurve2D curve =
+            new CubicCurve2D.Double(100.0, 100.0,
+                                    200.0, 100.0,
+                                    200.0, 200.0,
+                                    100.0, 200.0);
+        if (curve.contains(0.0, 100.0)) {
+            throw new RuntimeException("contains point clearly "+
+                                       "outside of curve");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/EqualsHashcode.java b/test/jdk/java/awt/geom/EqualsHashcode.java
new file mode 100644
index 00000000000..10f018fdffd
--- /dev/null
+++ b/test/jdk/java/awt/geom/EqualsHashcode.java
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2005, 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 6210287
+ * @summary Verifies that the various utility shapes implement
+ *          the equals(Object) and hashCode methods adequately
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+import java.util.Vector;
+
+public class EqualsHashcode {
+    public static final int NUMTESTS = 1000;
+
+    public static void main(String argv[]) {
+        new FloatRectangleTester().test();
+        new DoubleRectangleTester().test();
+
+        new FloatEllipseTester().test();
+        new DoubleEllipseTester().test();
+
+        new FloatArcTester().test();
+        new DoubleArcTester().test();
+
+        new FloatRoundRectTester().test();
+        new DoubleRoundRectTester().test();
+    }
+
+    /**
+     * Base utility class for random parameters for testing
+     */
+    public static abstract class Val {
+        protected String name;
+
+        protected Val(String name) {
+            this.name = name;
+        }
+
+        public abstract Object save();
+        public abstract void restore(Object save);
+
+        public abstract void randomize();
+        public abstract void perturb();
+    }
+
+    /**
+     * Base subclass for parameters with "special" values (Infinity, NaN, etc.)
+     */
+    public static abstract class SpecialVal extends Val {
+        protected SpecialVal(String name) {
+            super(name);
+        }
+
+        public abstract void setSpecial();
+
+        public abstract boolean isNaN();
+    }
+
+    /**
+     * Floating point parameter
+     */
+    public static class FloatVal extends SpecialVal {
+        private float v;
+
+        public FloatVal(String name) {
+            super(name);
+        }
+
+        public float getVal() {
+            return v;
+        }
+
+        public String toString() {
+            return name+" = "+v+" (flt)";
+        }
+
+        public Object save() {
+            return new Float(v);
+        }
+
+        public void restore(Object o) {
+            v = ((Float) o).floatValue();
+        }
+
+        public void randomize() {
+            v = (float) (Math.random() * 100);
+        }
+
+        public void perturb() {
+            v = v + 1;
+        }
+
+        public boolean hasSpecialCases() {
+            return true;
+        }
+
+        public void setSpecial() {
+            switch ((int) (Math.random() * 3)) {
+            case 0:
+                v = Float.NaN;
+                break;
+            case 1:
+                v = Float.POSITIVE_INFINITY;
+                break;
+            case 2:
+                v = Float.NEGATIVE_INFINITY;
+                break;
+            default:
+                throw new InternalError();
+            }
+        }
+
+        public boolean isNaN() {
+            return (v != v);
+        }
+    }
+
+    /**
+     * Double precision parameter
+     */
+    public static class DoubleVal extends SpecialVal {
+        private double v;
+
+        public DoubleVal(String name) {
+            super(name);
+        }
+
+        public double getVal() {
+            return v;
+        }
+
+        public String toString() {
+            return name+" = "+v+" (dbl)";
+        }
+
+        public Object save() {
+            return new Double(v);
+        }
+
+        public void restore(Object o) {
+            v = ((Double) o).doubleValue();
+        }
+
+        public void randomize() {
+            v = Math.random() * 100;
+        }
+
+        public void perturb() {
+            v = v + 1;
+        }
+
+        public boolean hasSpecialCases() {
+            return true;
+        }
+
+        public void setSpecial() {
+            switch ((int) (Math.random() * 3)) {
+            case 0:
+                v = Double.NaN;
+                break;
+            case 1:
+                v = Double.POSITIVE_INFINITY;
+                break;
+            case 2:
+                v = Double.NEGATIVE_INFINITY;
+                break;
+            default:
+                throw new InternalError();
+            }
+        }
+
+        public boolean isNaN() {
+            return (v != v);
+        }
+    }
+
+    /**
+     * Integer value with a specified min/max range.
+     */
+    public static class IntRangeVal extends Val {
+        public int v;
+        public int min;
+        public int max;
+
+        public IntRangeVal(String name, int min, int max) {
+            super(name);
+            this.min = min;
+            this.max = max;
+        }
+
+        public int getVal() {
+            return v;
+        }
+
+        public String toString() {
+            return name+" = "+v;
+        }
+
+        public Object save() {
+            return new Integer(v);
+        }
+
+        public void restore(Object o) {
+            v = ((Integer) o).intValue();
+        }
+
+        public void randomize() {
+            v = min + (int) (Math.random() * (max-min+1));
+        }
+
+        public void perturb() {
+            v = v + 1;
+            if (v > max) {
+                v = min;
+            }
+        }
+    }
+
+    /**
+     * Base class for testing a given type of shape.
+     * Subclasses must register all of their "parameters" which
+     * need to be randomized, specialized, and perturbed for
+     * testing.
+     * Subclasses must also implement makeShape() which makes
+     * a new shape object according to the current values of
+     * all of their parameters.
+     */
+    public static abstract class ShapeTester {
+        public Vector params = new Vector();
+
+        public void addParam(Val v) {
+            params.add(v);
+        }
+
+        public Val[] getParamArray() {
+            Val ret[] = new Val[params.size()];
+            for (int i = 0; i < params.size(); i++) {
+                ret[i] = (Val) params.get(i);
+            }
+            return ret;
+        }
+
+        public void error(String desc) {
+            Val params[] = getParamArray();
+            for (int j = 0; j < params.length; j++) {
+                System.err.println(params[j]);
+            }
+            throw new RuntimeException(desc);
+        }
+
+        public abstract Object makeShape();
+
+        public void test() {
+            Val params[] = getParamArray();
+            for (int i = 0; i < NUMTESTS; i++) {
+                // First, randomize all parameters
+                for (int j = 0; j < params.length; j++) {
+                    params[j].randomize();
+                }
+
+                // Now make 2 copies from the same params and verify equals()
+                Object o1 = makeShape();
+                if (!o1.equals(o1)) {
+                    error("Shapes not equal to itself!");
+                }
+                Object o2 = makeShape();
+                if (!o1.equals(o2)) {
+                    error("Identical shapes not equal!");
+                }
+                if (o1.hashCode() != o2.hashCode()) {
+                    error("Identical hashes not equal!");
+                }
+
+                // Now perturb the params 1 by 1 and verify !equals()
+                for (int j = 0; j < params.length; j++) {
+                    Val param = params[j];
+                    Object save = param.save();
+
+                    param.perturb();
+                    Object o3 = makeShape();
+                    if (o1.equals(o3)) {
+                        error("Perturbed shape still equal!");
+                    }
+
+                    // If param has "special values", test them as well
+                    if (param instanceof SpecialVal) {
+                        SpecialVal sparam = (SpecialVal) param;
+                        sparam.setSpecial();
+                        Object o4 = makeShape();
+                        if (o1.equals(o4)) {
+                            error("Specialized shape still equal!");
+                        }
+                        Object o5 = makeShape();
+                        // objects equal iff param is not a NaN
+                        if (o4.equals(o5) == sparam.isNaN()) {
+                            error("Identical specialized shapes not equal!");
+                        }
+                        // hash codes always equal, even if NaN
+                        // (Note: equals()/hashCode() contract allows this)
+                        if (o4.hashCode() != o5.hashCode()) {
+                            error("Identical specialized hashes not equal!");
+                        }
+                    }
+
+                    // Restore original value of param and make sure
+                    param.restore(save);
+                    Object o6 = makeShape();
+                    if (!o1.equals(o6)) {
+                        error("Restored shape not equal!");
+                    }
+                    if (o1.hashCode() != o6.hashCode()) {
+                        error("Restored hash not equal!");
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Base tester class for objects with floating point xywh bounds
+     */
+    public static abstract class FloatBoundedShape extends ShapeTester {
+        public FloatVal x = new FloatVal("x");
+        public FloatVal y = new FloatVal("y");
+        public FloatVal w = new FloatVal("w");
+        public FloatVal h = new FloatVal("h");
+
+        public FloatBoundedShape() {
+            addParam(x);
+            addParam(y);
+            addParam(w);
+            addParam(h);
+        }
+    }
+
+    /**
+     * Base tester class for objects with double precision xywh bounds
+     */
+    public static abstract class DoubleBoundedShape extends ShapeTester {
+        public DoubleVal x = new DoubleVal("x");
+        public DoubleVal y = new DoubleVal("y");
+        public DoubleVal w = new DoubleVal("w");
+        public DoubleVal h = new DoubleVal("h");
+
+        public DoubleBoundedShape() {
+            addParam(x);
+            addParam(y);
+            addParam(w);
+            addParam(h);
+        }
+    }
+
+    public static class FloatRectangleTester extends FloatBoundedShape {
+        public Object makeShape() {
+            return new Rectangle2D.Float(x.getVal(), y.getVal(),
+                                         w.getVal(), h.getVal());
+        }
+    }
+
+    public static class DoubleRectangleTester extends DoubleBoundedShape {
+        public Object makeShape() {
+            return new Rectangle2D.Double(x.getVal(), y.getVal(),
+                                          w.getVal(), h.getVal());
+        }
+    }
+
+    public static class FloatEllipseTester extends FloatBoundedShape {
+        public Object makeShape() {
+            return new Ellipse2D.Float(x.getVal(), y.getVal(),
+                                       w.getVal(), h.getVal());
+        }
+    }
+
+    public static class DoubleEllipseTester extends DoubleBoundedShape {
+        public Object makeShape() {
+            return new Ellipse2D.Double(x.getVal(), y.getVal(),
+                                        w.getVal(), h.getVal());
+        }
+    }
+
+    public static class FloatArcTester extends FloatBoundedShape {
+        public FloatVal start = new FloatVal("start");
+        public FloatVal extent = new FloatVal("extent");
+        public IntRangeVal type = new IntRangeVal("type", 0, 2);
+
+        public FloatArcTester() {
+            addParam(start);
+            addParam(extent);
+            addParam(type);
+        }
+
+        public Object makeShape() {
+            return new Arc2D.Float(x.getVal(), y.getVal(),
+                                   w.getVal(), h.getVal(),
+                                   start.getVal(), extent.getVal(),
+                                   type.getVal());
+        }
+    }
+
+    public static class DoubleArcTester extends DoubleBoundedShape {
+        public DoubleVal start = new DoubleVal("start");
+        public DoubleVal extent = new DoubleVal("extent");
+        public IntRangeVal type = new IntRangeVal("type", 0, 2);
+
+        public DoubleArcTester() {
+            addParam(start);
+            addParam(extent);
+            addParam(type);
+        }
+
+        public Object makeShape() {
+            return new Arc2D.Double(x.getVal(), y.getVal(),
+                                    w.getVal(), h.getVal(),
+                                    start.getVal(), extent.getVal(),
+                                    type.getVal());
+        }
+    }
+
+    public static class FloatRoundRectTester extends FloatBoundedShape {
+        public FloatVal arcw = new FloatVal("arcw");
+        public FloatVal arch = new FloatVal("arch");
+
+        public FloatRoundRectTester() {
+            addParam(arcw);
+            addParam(arch);
+        }
+
+        public Object makeShape() {
+            return new RoundRectangle2D.Float(x.getVal(), y.getVal(),
+                                              w.getVal(), h.getVal(),
+                                              arcw.getVal(), arch.getVal());
+        }
+    }
+
+    public static class DoubleRoundRectTester extends DoubleBoundedShape {
+        public DoubleVal arcw = new DoubleVal("arcw");
+        public DoubleVal arch = new DoubleVal("arch");
+
+        public DoubleRoundRectTester() {
+            addParam(arcw);
+            addParam(arch);
+        }
+
+        public Object makeShape() {
+            return new RoundRectangle2D.Double(x.getVal(), y.getVal(),
+                                               w.getVal(), h.getVal(),
+                                               arcw.getVal(), arch.getVal());
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/GeneralPath/ContainsNaN.java b/test/jdk/java/awt/geom/GeneralPath/ContainsNaN.java
new file mode 100644
index 00000000000..abf3a3fe73a
--- /dev/null
+++ b/test/jdk/java/awt/geom/GeneralPath/ContainsNaN.java
@@ -0,0 +1,43 @@
+/*
+ * 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
+ * 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 6409478
+ * @summary Tests all hit testing methods of GeneralPath and Path2D
+ *          for graceful (i.e. non-infinite-loop) returns when any
+ *          of the path coordinates or test coordinates are
+ *          NaN or Infinite or even very large numbers.
+ * @run main/timeout=15 ContainsNaN
+ */
+
+import java.awt.geom.GeneralPath;
+
+public class ContainsNaN {
+    public static void main(String argv[]) {
+        GeneralPath gp = new GeneralPath();
+        gp.moveTo(0, 0);
+        gp.quadTo(100, 0, 100, 100);
+        gp.contains(Double.NaN, Double.NaN);
+    }
+}
diff --git a/test/jdk/java/awt/geom/GeneralPath/ContainsPoint.java b/test/jdk/java/awt/geom/GeneralPath/ContainsPoint.java
new file mode 100644
index 00000000000..3fe67a947ec
--- /dev/null
+++ b/test/jdk/java/awt/geom/GeneralPath/ContainsPoint.java
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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 6396047
+ * @summary tests the GeneralPath.contains(x, y) method
+ */
+
+import java.awt.geom.GeneralPath;
+
+public class ContainsPoint {
+    public static void main(String args[]) {
+        GeneralPath gp = new GeneralPath(GeneralPath.WIND_NON_ZERO);
+        gp.moveTo(46.69187927246094f, 95.8778305053711f);
+        gp.curveTo(-122.75305938720703f, 14.31462574005127f,
+                   66.84117889404297f, 26.061769485473633f,
+                   -62.62519073486328f, -13.041547775268555f);
+        gp.closePath();
+        if (gp.contains(-122.75305938720703, -13.041547775268555)) {
+            throw new RuntimeException("contains point clearly "+
+                                       "outside of curve");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/GeneralPath/CreateTxReturnsGP.java b/test/jdk/java/awt/geom/GeneralPath/CreateTxReturnsGP.java
new file mode 100644
index 00000000000..faa34b16b1a
--- /dev/null
+++ b/test/jdk/java/awt/geom/GeneralPath/CreateTxReturnsGP.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * 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 6404847
+ * @summary Tests that GeneralPath.createTransformedShape() returns
+ *          a GeneralPath object for backwards compatibility.
+ */
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.GeneralPath;
+
+public class CreateTxReturnsGP {
+    public static void main(String argv[]) {
+        GeneralPath gp = new GeneralPath();
+        gp.moveTo(0, 0);
+        gp.lineTo(10, 10);
+        Shape s1 = gp.createTransformedShape(null);
+        Shape s2 = gp.createTransformedShape(new AffineTransform());
+        if (!(s1 instanceof GeneralPath) || !(s2 instanceof GeneralPath)) {
+            throw new RuntimeException("GeneralPath.createTransformedShape() "+
+                                       "did not return a GeneralPath");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/GeneralPath/EmptyRectHitTest.java b/test/jdk/java/awt/geom/GeneralPath/EmptyRectHitTest.java
new file mode 100644
index 00000000000..54a927e550a
--- /dev/null
+++ b/test/jdk/java/awt/geom/GeneralPath/EmptyRectHitTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * 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 6284484
+ * @summary Verifies that GeneralPath objects do not "contain" or "intersect"
+ *          empty rectangles
+ */
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.GeneralPath;
+
+public class EmptyRectHitTest {
+    public static int numerrors;
+
+    public static void main(String argv[]) {
+        Rectangle select1 = new Rectangle(1, 1, 1, 1);
+        Rectangle select2 = new Rectangle(1, 1, 0, 0);
+        Rectangle select3 = new Rectangle(100, 100, 1, 1);
+        Rectangle select4 = new Rectangle(100, 100, 0, 0);
+
+        Rectangle rect = new Rectangle(-5, -5, 10, 10);
+        test(rect, select1, true,  true);
+        test(rect, select2, false, false);
+        test(rect, select3, false, false);
+        test(rect, select4, false, false);
+
+        GeneralPath gp = new GeneralPath(rect);
+        test(gp, select1, true,  true);
+        test(gp, select2, false, false);
+        test(gp, select3, false, false);
+        test(gp, select4, false, false);
+
+        AffineTransform xform = new AffineTransform();
+        xform.setToRotation(Math.PI / 4);
+        Shape shape = xform.createTransformedShape(rect);
+        test(shape, select1, true,  true);
+        test(shape, select2, false, false);
+        test(shape, select3, false, false);
+        test(shape, select4, false, false);
+
+        if (numerrors > 0) {
+            throw new RuntimeException(numerrors+" errors in tests");
+        }
+    }
+
+    public static void test(Shape testshape, Rectangle rect,
+                            boolean shouldcontain, boolean shouldintersect)
+    {
+        if (testshape.contains(rect) != shouldcontain) {
+            error(testshape, rect, "contains", !shouldcontain);
+        }
+        if (testshape.intersects(rect) != shouldintersect) {
+            error(testshape, rect, "intersects", !shouldintersect);
+        }
+    }
+
+    public static void error(Shape t, Rectangle r, String type, boolean res) {
+        numerrors++;
+        System.err.println(t+type+"("+r+") == "+res);
+    }
+}
diff --git a/test/jdk/java/awt/geom/GeneralPath/IntersectsRect.java b/test/jdk/java/awt/geom/GeneralPath/IntersectsRect.java
new file mode 100644
index 00000000000..2544970fcd1
--- /dev/null
+++ b/test/jdk/java/awt/geom/GeneralPath/IntersectsRect.java
@@ -0,0 +1,53 @@
+/*
+ * 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
+ * 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 6396047
+ * @summary tests the GeneralPath.intersects(x, y, w, h) method
+ */
+
+import java.awt.geom.GeneralPath;
+
+public class IntersectsRect {
+    public static void main(String args[]) {
+        GeneralPath gp = new GeneralPath(GeneralPath.WIND_NON_ZERO);
+        gp.moveTo(-12.820351600646973f, 22.158836364746094f);
+        gp.quadTo(-26.008909225463867f, 83.72308349609375f,
+                  84.20527648925781f, 13.218562126159668f);
+        gp.quadTo(107.0041275024414f, 38.3076171875f,
+                  -55.382022857666016f, -113.43235778808594f);
+        gp.lineTo(-43.795501708984375f, 52.847373962402344f);
+        gp.curveTo(37.72114944458008f, 70.46839141845703f,
+                   -26.205299377441406f, -103.99849700927734f,
+                   108.40007781982422f, 101.23545837402344f);
+        gp.closePath();
+
+        if (gp.intersects(34.614093600596874, 22.15252370704289,
+                          0.5, 0.5) != false)
+        {
+            throw new RuntimeException("intersects rect clearly "+
+                                       "outside of path");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Line2D/AALineTest.java b/test/jdk/java/awt/geom/Line2D/AALineTest.java
new file mode 100644
index 00000000000..e91fb070a78
--- /dev/null
+++ b/test/jdk/java/awt/geom/Line2D/AALineTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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
+ * 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 5089985
+ * @summary Test checks that drawing AA lines don't crash the VM
+ */
+
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.GeneralPath;
+import java.awt.image.BufferedImage;
+
+public class AALineTest {
+
+    /* Pairs of endpoints which cause VM crash */
+
+    public static int xBound [][] = {
+        {634,25,640,33},
+        {634,57,640,65},
+        {634,89,640,97},
+        {634,121,640,129},
+        {634,153,640,161},
+        {634,185,640,193},
+        {634,217,640,225},
+        {634,249,640,257},
+        {634,281,640,289},
+        {634,313,640,321},
+        {634,345,640,353},
+        {634,377,640,385},
+        {634,409,640,417},
+        {634,441,640,449}
+    };
+
+    public static int yBound [][] = {
+        {25, 634,33, 640},
+        {57, 634,65, 640},
+        {89, 634,97, 640},
+        {121,634,129,640},
+        {153,634,161,640},
+        {185,634,193,640},
+        {217,634,225,640},
+        {249,634,257,640},
+        {281,634,289,640},
+        {313,634,321,640},
+        {345,634,353,640},
+        {377,634,385,640},
+        {409,634,417,640},
+        {441,634,449,640}
+    };
+
+    public static void main(String[] args) {
+        BufferedImage image =
+            new BufferedImage(640, 480, BufferedImage.TYPE_INT_ARGB);
+
+        Graphics2D graphics = image.createGraphics();
+        graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                                  RenderingHints.VALUE_ANTIALIAS_ON);
+
+        GeneralPath path = new GeneralPath();
+        for(int i=0; i < xBound.length; i++) {
+            path.reset();
+            path.moveTo(0, 0);
+            path.lineTo(xBound[i][0],xBound[i][1]);
+            path.lineTo(xBound[i][2],xBound[i][3]);
+            path.closePath();
+            graphics.draw(path);
+        }
+
+        image = new BufferedImage(480, 640, BufferedImage.TYPE_INT_ARGB);
+
+        graphics = image.createGraphics();
+        graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                                  RenderingHints.VALUE_ANTIALIAS_ON);
+
+        for(int i=0; i < yBound.length; i++) {
+            path.reset();
+            path.moveTo(0, 0);
+            path.lineTo(yBound[i][0],yBound[i][1]);
+            path.lineTo(yBound[i][2],yBound[i][3]);
+            path.closePath();
+            graphics.draw(path);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Line2D/NegLineDistSqBug.java b/test/jdk/java/awt/geom/Line2D/NegLineDistSqBug.java
new file mode 100644
index 00000000000..c4ec9398692
--- /dev/null
+++ b/test/jdk/java/awt/geom/Line2D/NegLineDistSqBug.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2002, 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 4335024
+ * @summary Verifies that the ptXXXDistSq methods return non-negative numbers
+ */
+
+import java.awt.geom.Line2D;
+
+public class NegLineDistSqBug {
+    static int errored;
+
+    public static void main (String[] args) {
+        // First a sanity check
+        test(1, 2, 3, 4, 15, 19, 21, 32);
+        // Next, the test numbers from bug report 4335024
+        test(-313.0, 241.0, -97.0, 75.0,
+             126.15362619253153, -96.49769420351959, -97.0, 75.0);
+        // Next test 100 points along the line from bug report 4335024
+        for (double fract = 0.0; fract <= 0.5; fract += 0.01) {
+            test(-313.0, 241.0, -97.0, 75.0,
+                 interp(-313.0, -97.0, fract), interp(241.0, 75.0, fract),
+                 interp(-313.0, -97.0, 1-fract), interp(241.0, 75.0, 1-fract));
+        }
+        if (errored > 0) {
+            throw new RuntimeException(errored+" negative distances!");
+        }
+    }
+
+    public static double interp(double v1, double v2, double t) {
+        return (v1 * (1-t) + v2 * t);
+    }
+
+    public static void test(double l1x1, double l1y1,
+                            double l1x2, double l1y2,
+                            double l2x1, double l2y1,
+                            double l2x2, double l2y2)
+    {
+        Line2D l1 = new Line2D.Double(l1x1, l1y1, l1x2, l1y2);
+        Line2D l2 = new Line2D.Double(l2x1, l2y1, l2x2, l2y2);
+        System.out.println("Line distances:");
+        verify(l1.ptLineDistSq(l2.getP1()));
+        verify(l1.ptLineDistSq(l2.getP2()));
+        System.out.println("Segment distances:");
+        verify(l1.ptSegDistSq(l2.getP1()));
+        verify(l1.ptSegDistSq(l2.getP2()));
+    }
+
+    public static void verify(double distSq) {
+        System.out.println(distSq);
+        if (distSq < 0) {
+            errored++;
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Path2D/CreateTxReturnsSame.java b/test/jdk/java/awt/geom/Path2D/CreateTxReturnsSame.java
new file mode 100644
index 00000000000..aab64d38147
--- /dev/null
+++ b/test/jdk/java/awt/geom/Path2D/CreateTxReturnsSame.java
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * 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 6404847
+ * @summary Tests that Path2D.createTransformedShape() returns
+ *          the same kind of object as the source.
+ */
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
+
+public class CreateTxReturnsSame {
+    public static void main(String argv[]) {
+        test(new GeneralPath());
+        test(new Path2D.Float());
+        test(new Path2D.Double());
+    }
+
+    public static void test(Path2D p2d) {
+        p2d.moveTo(0, 0);
+        p2d.lineTo(10, 10);
+        Shape s1 = p2d.createTransformedShape(null);
+        Shape s2 = p2d.createTransformedShape(new AffineTransform());
+        if (s1.getClass() != p2d.getClass() ||
+            s2.getClass() != p2d.getClass())
+        {
+            throw new RuntimeException(p2d.getClass().getName()+
+                                       ".createTransformedShape() "+
+                                       "did not return a "+
+                                       p2d.getClass().getName());
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Path2D/NonFiniteTests.java b/test/jdk/java/awt/geom/Path2D/NonFiniteTests.java
new file mode 100644
index 00000000000..3c7f48e70ac
--- /dev/null
+++ b/test/jdk/java/awt/geom/Path2D/NonFiniteTests.java
@@ -0,0 +1,264 @@
+/*
+ * 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
+ * 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 6409478
+ * @summary Tests all hit testing methods of GeneralPath and Path2D
+ *          for graceful (i.e. non-infinite-loop) returns when any
+ *          of the path coordinates or test coordinates are
+ *          NaN or Infinite or even very large numbers.
+ * @run main/timeout=15 NonFiniteTests
+ */
+
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
+import java.awt.geom.PathIterator;
+
+public class NonFiniteTests {
+    public static final double DBL_NaN = Double.NaN;
+    public static final double DBL_POS_INF = Double.POSITIVE_INFINITY;
+    public static final double DBL_NEG_INF = Double.NEGATIVE_INFINITY;
+    public static final double DBL_MAX = Double.MAX_VALUE;
+    public static final double DBL_MIN = -Double.MAX_VALUE;
+    public static final double FLT_MAX = Float.MAX_VALUE;
+    public static final double FLT_MIN = -Float.MAX_VALUE;
+
+    public static final int SEG_MOVETO = PathIterator.SEG_MOVETO;
+    public static final int SEG_LINETO = PathIterator.SEG_LINETO;
+    public static final int SEG_QUADTO = PathIterator.SEG_QUADTO;
+    public static final int SEG_CUBICTO = PathIterator.SEG_CUBICTO;
+    public static final int SEG_CLOSE = PathIterator.SEG_CLOSE;
+
+    public static int types[] = {
+        SEG_MOVETO,
+        SEG_LINETO,
+        SEG_QUADTO,
+        SEG_CUBICTO,
+        SEG_CLOSE,
+    };
+
+    public static double coords[] = {
+        // SEG_MOVETO coords
+          0.0,    0.0,
+
+        // SEG_LINETO coords
+         50.0,   10.0,
+
+        // SEG_QUADTO coords
+        100.0,   20.0,
+        100.0,  100.0,
+
+        // SEG_CUBICTO coords
+         50.0,  150.0,
+          0.0,  100.0,
+        -50.0,   50.0,
+
+        // SEG_CLOSE coords
+    };
+
+    public static double testpoints[] = {
+               -100,        -100,
+                  0,           0,
+                 50,          50,
+            DBL_NaN,     DBL_NaN,
+        DBL_POS_INF, DBL_POS_INF,
+        DBL_NEG_INF, DBL_NEG_INF,
+        DBL_POS_INF, DBL_NEG_INF,
+        DBL_NEG_INF, DBL_POS_INF,
+    };
+
+    public static double testrects[] = {
+               -100,        -100,          10,          10,
+                  0,           0,          10,          10,
+                 50,          50,          10,          10,
+            DBL_NaN,     DBL_NaN,          10,          10,
+                 10,          10,     DBL_NaN,     DBL_NaN,
+            DBL_NaN,     DBL_NaN,     DBL_NaN,     DBL_NaN,
+                 10,          10, DBL_POS_INF, DBL_POS_INF,
+                 10,          10, DBL_NEG_INF, DBL_NEG_INF,
+                 10,          10, DBL_POS_INF, DBL_NEG_INF,
+                 10,          10, DBL_NEG_INF, DBL_POS_INF,
+        DBL_NEG_INF, DBL_NEG_INF, DBL_POS_INF, DBL_POS_INF,
+        DBL_POS_INF, DBL_POS_INF,          10,          10,
+        DBL_NEG_INF, DBL_NEG_INF,          10,          10,
+        DBL_POS_INF, DBL_NEG_INF,          10,          10,
+        DBL_NEG_INF, DBL_POS_INF,          10,          10,
+    };
+
+    public static double replacecoords[] = {
+        DBL_NEG_INF,
+        DBL_MIN,
+        FLT_MIN,
+        DBL_NaN,
+        FLT_MAX,
+        DBL_MAX,
+        DBL_POS_INF,
+    };
+
+    public static void main(String argv[]) {
+        test(types, coords);
+        testNonFinites(types, coords, 2);
+    }
+
+    public static void testNonFinites(int types[], double coords[],
+                                      int numvalues)
+    {
+        if (numvalues == 0) {
+            test(types, coords);
+            return;
+        }
+        numvalues--;
+        for (int i = 0; i < coords.length; i++) {
+            double savedval = coords[i];
+
+            //System.out.println("replacing coord #"+i);
+            for (int j = 0; j < replacecoords.length; j++) {
+                coords[i] = replacecoords[j];
+                testNonFinites(types, coords, numvalues);
+            }
+
+            coords[i] = savedval;
+        }
+    }
+
+    public static void test(int types[], double coords[]) {
+        testGP(new GeneralPath(), types, coords);
+        try {
+            P2DTest.test(types, coords);
+        } catch (NoClassDefFoundError e) {
+            // Skip Path2D tests on older runtimes...
+        }
+    }
+
+    public static void testGP(GeneralPath gp, int types[], double coords[]) {
+        int ci = 0;
+        for (int i = 0; i < types.length; i++) {
+            switch (types[i]) {
+            case SEG_MOVETO:
+                gp.moveTo((float) coords[ci++], (float) coords[ci++]);
+                break;
+            case SEG_LINETO:
+                gp.lineTo((float) coords[ci++], (float) coords[ci++]);
+                break;
+            case SEG_QUADTO:
+                gp.quadTo((float) coords[ci++], (float) coords[ci++],
+                          (float) coords[ci++], (float) coords[ci++]);
+                break;
+            case SEG_CUBICTO:
+                gp.curveTo((float) coords[ci++], (float) coords[ci++],
+                           (float) coords[ci++], (float) coords[ci++],
+                           (float) coords[ci++], (float) coords[ci++]);
+                break;
+            case SEG_CLOSE:
+                gp.closePath();
+                break;
+            }
+        }
+        testGP(gp);
+    }
+
+    public static void testGP(GeneralPath gp) {
+        for (int i = 0; i < testpoints.length; i += 2) {
+            gp.contains(testpoints[i+0], testpoints[i+1]);
+        }
+
+        for (int i = 0; i < testrects.length; i += 4) {
+            gp.contains(testrects[i+0], testrects[i+1],
+                        testrects[i+2], testrects[i+3]);
+            gp.intersects(testrects[i+0], testrects[i+1],
+                          testrects[i+2], testrects[i+3]);
+        }
+    }
+
+    public static class P2DTest {
+        public static void test(int types[], double coords[]) {
+            testPath(new Path2D.Float(), types, coords);
+            testPath(new Path2D.Double(), types, coords);
+        }
+
+        public static void testPath(Path2D p2d, int types[], double coords[]) {
+            int ci = 0;
+            for (int i = 0; i < types.length; i++) {
+                switch (types[i]) {
+                case SEG_MOVETO:
+                    p2d.moveTo(coords[ci++], coords[ci++]);
+                    break;
+                case SEG_LINETO:
+                    p2d.lineTo(coords[ci++], coords[ci++]);
+                    break;
+                case SEG_QUADTO:
+                    p2d.quadTo(coords[ci++], coords[ci++],
+                               coords[ci++], coords[ci++]);
+                    break;
+                case SEG_CUBICTO:
+                    p2d.curveTo(coords[ci++], coords[ci++],
+                                coords[ci++], coords[ci++],
+                                coords[ci++], coords[ci++]);
+                    break;
+                case SEG_CLOSE:
+                    p2d.closePath();
+                    break;
+                }
+            }
+            testPath(p2d);
+        }
+
+        public static void testPath(Path2D p2d) {
+            // contains point
+            for (int i = 0; i < testpoints.length; i += 2) {
+                p2d.contains(testpoints[i+0], testpoints[i+1]);
+                contains(p2d, testpoints[i+0], testpoints[i+1]);
+            }
+
+            for (int i = 0; i < testrects.length; i += 4) {
+                p2d.contains(testrects[i+0], testrects[i+1],
+                             testrects[i+2], testrects[i+3]);
+                contains(p2d,
+                         testrects[i+0], testrects[i+1],
+                         testrects[i+2], testrects[i+3]);
+                p2d.intersects(testrects[i+0], testrects[i+1],
+                               testrects[i+2], testrects[i+3]);
+                intersects(p2d,
+                           testrects[i+0], testrects[i+1],
+                           testrects[i+2], testrects[i+3]);
+            }
+        }
+
+        public static boolean contains(Path2D p2d, double x, double y) {
+            return Path2D.contains(p2d.getPathIterator(null), x, y);
+        }
+
+        public static boolean contains(Path2D p2d,
+                                       double x, double y, double w, double h)
+        {
+            return Path2D.contains(p2d.getPathIterator(null), x, y, w, h);
+        }
+
+        public static boolean intersects(Path2D p2d,
+                                         double x, double y, double w, double h)
+        {
+            return Path2D.intersects(p2d.getPathIterator(null), x, y, w, h);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Path2D/UnitTest.java b/test/jdk/java/awt/geom/Path2D/UnitTest.java
new file mode 100644
index 00000000000..a3a78ba3e3e
--- /dev/null
+++ b/test/jdk/java/awt/geom/Path2D/UnitTest.java
@@ -0,0 +1,1350 @@
+/*
+ * 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
+ * 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 4172661
+ * @summary Tests all public methods of Path2D classes on all 3 variants
+ *          Path2D.Float, Path2D.Double, and GeneralPath.
+ *          REMIND: Note that the hit testing tests will fail
+ *          occasionally due to precision bugs in the various hit
+ *          testing methods in the geometry classes.
+ *          (Failure rates vary from 1 per 100 runs to 1 per thousands).
+ *          See bug 6396047 to track progress on these failures.
+ */
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Arc2D;
+import java.awt.geom.Area;
+import java.awt.geom.CubicCurve2D;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.FlatteningPathIterator;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Point2D;
+import java.awt.geom.QuadCurve2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+import java.util.NoSuchElementException;
+
+public class UnitTest {
+    public static boolean verbose;
+
+    public static final int WIND_NON_ZERO = PathIterator.WIND_NON_ZERO;
+    public static final int WIND_EVEN_ODD = PathIterator.WIND_EVEN_ODD;
+
+    public static int CoordsForType[] = { 2, 2, 4, 6, 0 };
+
+    public static AffineTransform TxIdentity = new AffineTransform();
+    public static AffineTransform TxComplex = makeAT();
+
+    public static Shape TestShapes[];
+    public static SampleShape ShortSampleNonZero;
+    public static SampleShape ShortSampleEvenOdd;
+    public static SampleShape LongSampleNonZero;
+    public static SampleShape LongSampleEvenOdd;
+
+    public static Shape EmptyShapeNonZero =
+        new EmptyShape(WIND_NON_ZERO);
+    public static Shape EmptyShapeEvenOdd =
+        new EmptyShape(WIND_EVEN_ODD);
+
+    // Note: We pick a shape that is not anywhere near any of
+    // our test shapes so that the Path2D does not try to collapse
+    // out the connecting segment - an optimization that is too
+    // difficult to account for in the AppendedShape code.
+    public static Shape AppendShape = new Arc2D.Double(1000, 1000, 40, 40,
+                                                       Math.PI/4, Math.PI,
+                                                       Arc2D.CHORD);
+
+    public static AffineTransform makeAT() {
+        AffineTransform at = new AffineTransform();
+        at.scale(0.66, 0.23);
+        at.rotate(Math.toRadians(35.0));
+        at.shear(0.78, 1.32);
+        return at;
+    }
+
+    public static void init() {
+        TestShapes = new Shape[] {
+            EmptyShapeNonZero,
+            EmptyShapeEvenOdd,
+            new Line2D.Double(),
+            new Line2D.Double(rpc(), rpc(), rpc(), rpc()),
+            new Line2D.Double(rnc(), rnc(), rnc(), rnc()),
+            new Rectangle2D.Double(),
+            new Rectangle2D.Double(rpc(), rpc(), -1, -1),
+            new Rectangle2D.Double(rpc(), rpc(), rd(), rd()),
+            new Rectangle2D.Double(rnc(), rnc(), rd(), rd()),
+            new Ellipse2D.Double(),
+            new Ellipse2D.Double(rpc(), rpc(), -1, -1),
+            new Ellipse2D.Double(rpc(), rpc(), rd(), rd()),
+            new Ellipse2D.Double(rnc(), rnc(), rd(), rd()),
+            new Arc2D.Double(Arc2D.OPEN),
+            new Arc2D.Double(Arc2D.CHORD),
+            new Arc2D.Double(Arc2D.PIE),
+            new Arc2D.Double(rpc(), rpc(), -1, -1, rt(), rt(), Arc2D.OPEN),
+            new Arc2D.Double(rpc(), rpc(), -1, -1, rt(), rt(), Arc2D.CHORD),
+            new Arc2D.Double(rpc(), rpc(), -1, -1, rt(), rt(), Arc2D.PIE),
+            new Arc2D.Double(rpc(), rpc(), rd(), rd(), rt(), rt(), Arc2D.OPEN),
+            new Arc2D.Double(rpc(), rpc(), rd(), rd(), rt(), rt(), Arc2D.CHORD),
+            new Arc2D.Double(rpc(), rpc(), rd(), rd(), rt(), rt(), Arc2D.PIE),
+            new Arc2D.Double(rnc(), rnc(), rd(), rd(), rt(), rt(), Arc2D.OPEN),
+            new Arc2D.Double(rnc(), rnc(), rd(), rd(), rt(), rt(), Arc2D.CHORD),
+            new Arc2D.Double(rnc(), rnc(), rd(), rd(), rt(), rt(), Arc2D.PIE),
+            new RoundRectangle2D.Double(),
+            new RoundRectangle2D.Double(rpc(), rpc(), -1, -1, ra(), ra()),
+            new RoundRectangle2D.Double(rpc(), rpc(), rd(), rd(), ra(), ra()),
+            new RoundRectangle2D.Double(rnc(), rnc(), rd(), rd(), ra(), ra()),
+            new QuadCurve2D.Double(),
+            new QuadCurve2D.Double(rpc(), rpc(), rpc(), rpc(), rpc(), rpc()),
+            new QuadCurve2D.Double(rnc(), rnc(), rnc(), rnc(), rnc(), rnc()),
+            new CubicCurve2D.Double(),
+            new CubicCurve2D.Double(rpc(), rpc(), rpc(), rpc(),
+                                    rpc(), rpc(), rpc(), rpc()),
+            new CubicCurve2D.Double(rnc(), rnc(), rnc(), rnc(),
+                                    rnc(), rnc(), rnc(), rnc()),
+            makeGeneralPath(WIND_NON_ZERO, 1.0),
+            makeGeneralPath(WIND_EVEN_ODD, 1.0),
+            makeGeneralPath(WIND_NON_ZERO, -1.0),
+            makeGeneralPath(WIND_EVEN_ODD, -1.0),
+        };
+
+        int types[] = new int[100];
+        int i = 0;
+        types[i++] = PathIterator.SEG_MOVETO;
+        types[i++] = PathIterator.SEG_LINETO;
+        types[i++] = PathIterator.SEG_QUADTO;
+        types[i++] = PathIterator.SEG_CUBICTO;
+        types[i++] = PathIterator.SEG_CLOSE;
+        int shortlen = i;
+        int prevt = types[i-1];
+        while (i < types.length) {
+            int t;
+            do {
+                t = (int) (Math.random() * 5);
+            } while (t == prevt &&
+                     (t == PathIterator.SEG_MOVETO ||
+                      t == PathIterator.SEG_CLOSE));
+            types[i++] = t;
+            prevt = t;
+        }
+
+        int numcoords = 0;
+        int numshortcoords = 0;
+        for (i = 0; i < types.length; i++) {
+            if (i == shortlen) {
+                numshortcoords = numcoords;
+            }
+            numcoords += CoordsForType[types[i]];
+        }
+        double coords[] = new double[numcoords];
+        for (i = 0; i < coords.length; i++) {
+            coords[i] = rpc();
+        }
+        ShortSampleNonZero = new SampleShape(WIND_NON_ZERO,
+                                             types, coords,
+                                             shortlen, numshortcoords);
+        ShortSampleEvenOdd = new SampleShape(WIND_EVEN_ODD,
+                                             types, coords,
+                                             shortlen, numshortcoords);
+        LongSampleNonZero = new SampleShape(WIND_NON_ZERO,
+                                            types, coords,
+                                            types.length, numcoords);
+        LongSampleEvenOdd = new SampleShape(WIND_EVEN_ODD,
+                                            types, coords,
+                                            types.length, numcoords);
+    }
+
+    public static GeneralPath makeGeneralPath(int windingrule, double sign) {
+        GeneralPath gp = new GeneralPath(windingrule);
+        gp.moveTo((float) (sign * rpc()), (float) (sign * rpc()));
+        gp.lineTo((float) (sign * rpc()), (float) (sign * rpc()));
+        gp.quadTo((float) (sign * rpc()), (float) (sign * rpc()),
+                  (float) (sign * rpc()), (float) (sign * rpc()));
+        gp.curveTo((float) (sign * rpc()), (float) (sign * rpc()),
+                   (float) (sign * rpc()), (float) (sign * rpc()),
+                   (float) (sign * rpc()), (float) (sign * rpc()));
+        gp.closePath();
+        return gp;
+    }
+
+    // Due to odd issues with the sizes of errors when the values
+    // being manipulated are near zero, we try to avoid values
+    // near zero by ensuring that both the rpc (positive coords)
+    // stay away from zero and also by ensuring that the rpc+rd
+    // (positive coords + dimensions) stay away from zero.  We
+    // also ensure that rnc+rd (negative coords + dimension) stay
+    // suitably negative without approaching zero.
+
+    // Random positive coordinate (10 -> 110)
+    // rpc + rd gives a total range of (30 -> 170)
+    public static double rpc() {
+        return (Math.random() * 100.0) + 10.0;
+    }
+
+    // Random negative coordinate (-200 -> -100)
+    // rnc + rd gives a total range of (-180 -> -40)
+    public static double rnc() {
+        return (Math.random() * 100.0) - 200.0;
+    }
+
+    // Random dimension (20 -> 60)
+    public static double rd() {
+        return (Math.random() * 40.0) + 20.0;
+    }
+
+    // Random arc width/height (0.1 -> 5.1)
+    public static double ra() {
+        return (Math.random() * 5.0) + 0.1;
+    }
+
+    // Random arc angle (theta) (PI/4 => 5PI/4)
+    public static double rt() {
+        return (Math.random() * Math.PI) + Math.PI/4;
+    }
+
+    public static int fltulpdiff(double v1, double v2) {
+        if (v1 == v2) {
+            return 0;
+        }
+        float vf1 = (float) v1;
+        float vf2 = (float) v2;
+        if (vf1 == vf2) {
+            return 0;
+        }
+        float diff = Math.abs(vf1-vf2);
+        //float ulp = Math.ulp((float) ((vf1 + vf2)/2f));
+        float ulp = Math.max(Math.ulp(vf1), Math.ulp(vf2));
+        if (verbose && diff > ulp) {
+            System.out.println("v1 = "+vf1+", ulp = "+Math.ulp(vf1));
+            System.out.println("v2 = "+vf2+", ulp = "+Math.ulp(vf2));
+            System.out.println((diff/ulp)+" ulps");
+        }
+        return (int) (diff/ulp);
+    }
+
+    public static int fltulpless(double v1, double v2) {
+        if (v1 >= v2) {
+            return 0;
+        }
+        float vf1 = (float) v1;
+        float vf2 = (float) v2;
+        if (vf1 >= vf2) {
+            return 0;
+        }
+        float diff = Math.abs(vf1-vf2);
+        //float ulp = Math.ulp((float) ((vf1 + vf2)/2f));
+        float ulp = Math.max(Math.ulp(vf1), Math.ulp(vf2));
+        if (verbose && diff > ulp) {
+            System.out.println("v1 = "+vf1+", ulp = "+Math.ulp(vf1));
+            System.out.println("v2 = "+vf2+", ulp = "+Math.ulp(vf2));
+            System.out.println((diff/ulp)+" ulps");
+        }
+        return (int) (diff/ulp);
+    }
+
+    public static int dblulpdiff(double v1, double v2) {
+        if (v1 == v2) {
+            return 0;
+        }
+        double diff = Math.abs(v1-v2);
+        //double ulp = Math.ulp((v1 + v2)/2.0);
+        double ulp = Math.max(Math.ulp(v1), Math.ulp(v2));
+        if (verbose && diff > ulp) {
+            System.out.println("v1 = "+v1+", ulp = "+Math.ulp(v1));
+            System.out.println("v2 = "+v2+", ulp = "+Math.ulp(v2));
+            System.out.println((diff/ulp)+" ulps");
+        }
+        return (int) (diff/ulp);
+    }
+
+    public static abstract class Creator {
+        public abstract Path2D makePath();
+        public abstract Path2D makePath(int windingrule);
+        public abstract Path2D makePath(int windingrule, int capacity);
+        public abstract Path2D makePath(Shape s);
+        public abstract Path2D makePath(Shape s, AffineTransform at);
+
+        public abstract boolean supportsFloatCompose();
+        public abstract int getRecommendedTxMaxUlp();
+
+        public abstract void compare(PathIterator testpi,
+                                     PathIterator refpi,
+                                     AffineTransform at,
+                                     int maxulp);
+    }
+
+    public static class FltCreator extends Creator {
+        public Path2D makePath() {
+            return new Path2D.Float();
+        }
+        public Path2D makePath(int windingrule) {
+            return new Path2D.Float(windingrule);
+        }
+        public Path2D makePath(int windingrule, int capacity) {
+            return new Path2D.Float(windingrule, capacity);
+        }
+        public Path2D makePath(Shape s) {
+            return new Path2D.Float(s);
+        }
+        public Path2D makePath(Shape s, AffineTransform at) {
+            return new Path2D.Float(s, at);
+        }
+
+        public boolean supportsFloatCompose() {
+            return true;
+        }
+        public int getRecommendedTxMaxUlp() {
+            return 5;
+        }
+
+        public void compare(PathIterator testpi,
+                            PathIterator refpi,
+                            AffineTransform at,
+                            int maxulp)
+        {
+            if (testpi.getWindingRule() != refpi.getWindingRule()) {
+                throw new RuntimeException("wrong winding rule");
+            }
+            float testcoords[] = new float[6];
+            float refcoords[] = new float[6];
+            while (!testpi.isDone()) {
+                if (refpi.isDone()) {
+                    throw new RuntimeException("too many segments");
+                }
+                int testtype = testpi.currentSegment(testcoords);
+                int reftype = refpi.currentSegment(refcoords);
+                if (testtype != reftype) {
+                    throw new RuntimeException("different segment types");
+                }
+                if (at != null) {
+                    at.transform(refcoords, 0, refcoords, 0,
+                                 CoordsForType[reftype]/2);
+                }
+                for (int i = 0; i < CoordsForType[testtype]; i++) {
+                    int ulps = fltulpdiff(testcoords[i], refcoords[i]);
+                    if (ulps > maxulp) {
+                        throw new RuntimeException("coords are different: "+
+                                                   testcoords[i]+" != "+
+                                                   refcoords[i]+
+                                                   " ("+ulps+" ulps)");
+                    }
+                }
+                testpi.next();
+                refpi.next();
+            }
+            if (!refpi.isDone()) {
+                throw new RuntimeException("not enough segments");
+            }
+        }
+    }
+
+    public static class DblCreator extends Creator {
+        public Path2D makePath() {
+            return new Path2D.Double();
+        }
+        public Path2D makePath(int windingrule) {
+            return new Path2D.Double(windingrule);
+        }
+        public Path2D makePath(int windingrule, int capacity) {
+            return new Path2D.Double(windingrule, capacity);
+        }
+        public Path2D makePath(Shape s) {
+            return new Path2D.Double(s);
+        }
+        public Path2D makePath(Shape s, AffineTransform at) {
+            return new Path2D.Double(s, at);
+        }
+
+        public boolean supportsFloatCompose() {
+            return false;
+        }
+        public int getRecommendedTxMaxUlp() {
+            return 3;
+        }
+
+        public void compare(PathIterator testpi,
+                            PathIterator refpi,
+                            AffineTransform at,
+                            int maxulp)
+        {
+            if (testpi.getWindingRule() != refpi.getWindingRule()) {
+                throw new RuntimeException("wrong winding rule");
+            }
+            double testcoords[] = new double[6];
+            double refcoords[] = new double[6];
+            while (!testpi.isDone()) {
+                if (refpi.isDone()) {
+                    throw new RuntimeException("too many segments");
+                }
+                int testtype = testpi.currentSegment(testcoords);
+                int reftype = refpi.currentSegment(refcoords);
+                if (testtype != reftype) {
+                    throw new RuntimeException("different segment types");
+                }
+                if (at != null) {
+                    at.transform(refcoords, 0, refcoords, 0,
+                                 CoordsForType[reftype]/2);
+                }
+                for (int i = 0; i < CoordsForType[testtype]; i++) {
+                    int ulps = dblulpdiff(testcoords[i], refcoords[i]);
+                    if (ulps > maxulp) {
+                        throw new RuntimeException("coords are different: "+
+                                                   testcoords[i]+" != "+
+                                                   refcoords[i]+
+                                                   " ("+ulps+" ulps)");
+                    }
+                }
+                testpi.next();
+                refpi.next();
+            }
+            if (!refpi.isDone()) {
+                throw new RuntimeException("not enough segments");
+            }
+        }
+
+    }
+
+    public static class GPCreator extends FltCreator {
+        public Path2D makePath() {
+            return new GeneralPath();
+        }
+        public Path2D makePath(int windingrule) {
+            return new GeneralPath(windingrule);
+        }
+        public Path2D makePath(int windingrule, int capacity) {
+            return new GeneralPath(windingrule, capacity);
+        }
+        public Path2D makePath(Shape s) {
+            return new GeneralPath(s);
+        }
+        public Path2D makePath(Shape s, AffineTransform at) {
+            GeneralPath gp = new GeneralPath();
+            PathIterator pi = s.getPathIterator(at);
+            gp.setWindingRule(pi.getWindingRule());
+            gp.append(pi, false);
+            return gp;
+        }
+
+        public boolean supportsFloatCompose() {
+            return true;
+        }
+    }
+
+    public static class EmptyShape implements Shape {
+        private int windingrule;
+
+        public EmptyShape(int windingrule) {
+            this.windingrule = windingrule;
+        }
+
+        public Rectangle getBounds() {
+            return new Rectangle();
+        }
+        public Rectangle2D getBounds2D() {
+            return new Rectangle();
+        }
+        public boolean contains(double x, double y) {
+            return false;
+        }
+        public boolean contains(Point2D p) {
+            return false;
+        }
+        public boolean intersects(double x, double y, double w, double h) {
+            return false;
+        }
+        public boolean intersects(Rectangle2D r) {
+            return false;
+        }
+        public boolean contains(double x, double y, double w, double h) {
+            return false;
+        }
+        public boolean contains(Rectangle2D r) {
+            return false;
+        }
+        public PathIterator getPathIterator(AffineTransform at) {
+            return new PathIterator() {
+                public int getWindingRule() {
+                    return windingrule;
+                }
+                public boolean isDone() {
+                    return true;
+                }
+                public void next() {}
+                public int currentSegment(float[] coords) {
+                    throw new NoSuchElementException();
+                }
+                public int currentSegment(double[] coords) {
+                    throw new NoSuchElementException();
+                }
+            };
+        }
+        public PathIterator getPathIterator(AffineTransform at,
+                                            double flatness)
+        {
+            return getPathIterator(at);
+        }
+    }
+
+    public static class SampleShape implements Shape {
+        int windingrule;
+        int theTypes[];
+        double theCoords[];
+        int numTypes;
+        int numCoords;
+
+        public SampleShape(int windingrule,
+                           int types[], double coords[],
+                           int numtypes, int numcoords)
+        {
+            this.windingrule = windingrule;
+            this.theTypes = types;
+            this.theCoords = coords;
+            this.numTypes = numtypes;
+            this.numCoords = numcoords;
+        }
+
+        private Shape testshape;
+
+        public Shape getTestShape() {
+            if (testshape == null) {
+                testshape = new Area(this);
+            }
+            return testshape;
+        }
+
+        private Rectangle2D cachedBounds;
+        public Rectangle2D getCachedBounds2D() {
+            if (cachedBounds == null) {
+                double xmin, ymin, xmax, ymax;
+                int ci = 0;
+                xmin = xmax = theCoords[ci++];
+                ymin = ymax = theCoords[ci++];
+                while (ci < numCoords) {
+                    double c = theCoords[ci++];
+                    if (xmin > c) xmin = c;
+                    if (xmax < c) xmax = c;
+                    c = theCoords[ci++];
+                    if (ymin > c) ymin = c;
+                    if (ymax < c) ymax = c;
+                }
+                cachedBounds = new Rectangle2D.Double(xmin, ymin,
+                                                      xmax - xmin,
+                                                      ymax - ymin);
+            }
+            return cachedBounds;
+        }
+
+        public Rectangle getBounds() {
+            return getCachedBounds2D().getBounds();
+        }
+        public Rectangle2D getBounds2D() {
+            return getCachedBounds2D().getBounds2D();
+        }
+        public boolean contains(double x, double y) {
+            return getTestShape().contains(x, y);
+        }
+        public boolean contains(Point2D p) {
+            return getTestShape().contains(p);
+        }
+        public boolean intersects(double x, double y, double w, double h) {
+            return getTestShape().intersects(x, y, w, h);
+        }
+        public boolean intersects(Rectangle2D r) {
+            return getTestShape().intersects(r);
+        }
+        public boolean contains(double x, double y, double w, double h) {
+            return getTestShape().contains(x, y, w, h);
+        }
+        public boolean contains(Rectangle2D r) {
+            return getTestShape().contains(r);
+        }
+        public PathIterator getPathIterator(final AffineTransform at) {
+            return new PathIterator() {
+                int tindex;
+                int cindex;
+                public int getWindingRule() {
+                    return windingrule;
+                }
+                public boolean isDone() {
+                    return (tindex >= numTypes);
+                }
+                public void next() {
+                    cindex += CoordsForType[theTypes[tindex]];
+                    tindex++;
+                }
+                public int currentSegment(float[] coords) {
+                    int t = theTypes[tindex];
+                    int n = CoordsForType[t];
+                    if (n > 0) {
+                        // Cast to float first, then transform
+                        // to match accuracy of float paths
+                        for (int i = 0; i < n; i++) {
+                            coords[i] = (float) theCoords[cindex+i];
+                        }
+                        if (at != null) {
+                            at.transform(coords, 0, coords, 0, n/2);
+                        }
+                    }
+                    return t;
+                }
+                public int currentSegment(double[] coords) {
+                    int t = theTypes[tindex];
+                    int n = CoordsForType[t];
+                    if (n > 0) {
+                        if (at == null) {
+                            System.arraycopy(theCoords, cindex,
+                                             coords, 0, n);
+                        } else {
+                            at.transform(theCoords, cindex,
+                                         coords, 0, n/2);
+                        }
+                    }
+                    return t;
+                }
+            };
+        }
+        public PathIterator getPathIterator(AffineTransform at,
+                                            double flatness)
+        {
+            return new FlatteningPathIterator(getPathIterator(at), flatness);
+        }
+
+        public String toString() {
+            Rectangle2D r2d = getBounds2D();
+            double xmin = r2d.getMinX();
+            double ymin = r2d.getMinY();
+            double xmax = r2d.getMaxX();
+            double ymax = r2d.getMaxY();
+            return ("SampleShape["+
+                    (windingrule == WIND_NON_ZERO
+                     ? "NonZero"
+                     : "EvenOdd")+
+                    ", nsegments = "+numTypes+
+                    ", ncoords = "+numCoords+
+                    ", bounds["+(r2d.getMinX()+", "+r2d.getMinY()+", "+
+                                 r2d.getMaxX()+", "+r2d.getMaxY())+"]"+
+                    "]");
+        }
+
+        public Path2D makeFloatPath(Creator c) {
+            Path2D.Float p2df = (Path2D.Float) c.makePath(windingrule);
+            int ci = 0;
+            for (int i = 0; i < numTypes; i++) {
+                int t = theTypes[i];
+                switch (t) {
+                case PathIterator.SEG_MOVETO:
+                    p2df.moveTo((float) theCoords[ci++],
+                                (float) theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_LINETO:
+                    p2df.lineTo((float) theCoords[ci++],
+                                (float) theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_QUADTO:
+                    p2df.quadTo((float) theCoords[ci++],
+                                (float) theCoords[ci++],
+                                (float) theCoords[ci++],
+                                (float) theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_CUBICTO:
+                    p2df.curveTo((float) theCoords[ci++],
+                                 (float) theCoords[ci++],
+                                 (float) theCoords[ci++],
+                                 (float) theCoords[ci++],
+                                 (float) theCoords[ci++],
+                                 (float) theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_CLOSE:
+                    p2df.closePath();
+                    break;
+                default:
+                    throw new InternalError("unrecognized path type: "+t);
+                }
+                if (t != PathIterator.SEG_CLOSE) {
+                    Point2D curpnt = p2df.getCurrentPoint();
+                    if (((float) curpnt.getX()) != ((float) theCoords[ci-2]) ||
+                        ((float) curpnt.getY()) != ((float) theCoords[ci-1]))
+                    {
+                        throw new RuntimeException("currentpoint failed");
+                    }
+                }
+            }
+            if (ci != numCoords) {
+                throw new InternalError("numcoords did not match");
+            }
+            return p2df;
+        }
+
+        public Path2D makeDoublePath(Creator c) {
+            Path2D p2d = c.makePath(windingrule);
+            int ci = 0;
+            for (int i = 0; i < numTypes; i++) {
+                int t = theTypes[i];
+                switch (t) {
+                case PathIterator.SEG_MOVETO:
+                    p2d.moveTo(theCoords[ci++], theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_LINETO:
+                    p2d.lineTo(theCoords[ci++], theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_QUADTO:
+                    p2d.quadTo(theCoords[ci++], theCoords[ci++],
+                               theCoords[ci++], theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_CUBICTO:
+                    p2d.curveTo(theCoords[ci++], theCoords[ci++],
+                                theCoords[ci++], theCoords[ci++],
+                                theCoords[ci++], theCoords[ci++]);
+                    break;
+                case PathIterator.SEG_CLOSE:
+                    p2d.closePath();
+                    break;
+                default:
+                    throw new InternalError("unrecognized path type: "+t);
+                }
+                if (t != PathIterator.SEG_CLOSE) {
+                    Point2D curpnt = p2d.getCurrentPoint();
+                    if (((float) curpnt.getX()) != ((float) theCoords[ci-2]) ||
+                        ((float) curpnt.getY()) != ((float) theCoords[ci-1]))
+                    {
+                        throw new RuntimeException("currentpoint failed");
+                    }
+                }
+            }
+            if (ci != numCoords) {
+                throw new InternalError("numcoords did not match");
+            }
+            return p2d;
+        }
+    }
+
+    public static class AppendedShape implements Shape {
+        Shape s1;
+        Shape s2;
+        boolean connect;
+
+        public AppendedShape(Shape s1, Shape s2, boolean connect) {
+            this.s1 = s1;
+            this.s2 = s2;
+            this.connect = connect;
+        }
+
+        public Rectangle getBounds() {
+            return getBounds2D().getBounds();
+        }
+
+        public Rectangle2D getBounds2D() {
+            return s1.getBounds2D().createUnion(s2.getBounds2D());
+        }
+
+        private Shape testshape;
+        private Shape getTestShape() {
+            if (testshape == null) {
+                testshape = new GeneralPath(this);
+            }
+            return testshape;
+        }
+
+        public boolean contains(double x, double y) {
+            return getTestShape().contains(x, y);
+        }
+
+        public boolean contains(Point2D p) {
+            return getTestShape().contains(p);
+        }
+
+        public boolean intersects(double x, double y, double w, double h) {
+            return getTestShape().intersects(x, y, w, h);
+        }
+
+        public boolean intersects(Rectangle2D r) {
+            return getTestShape().intersects(r);
+        }
+
+        public boolean contains(double x, double y, double w, double h) {
+            return getTestShape().contains(x, y, w, h);
+        }
+
+        public boolean contains(Rectangle2D r) {
+            return getTestShape().contains(r);
+        }
+
+        public PathIterator getPathIterator(final AffineTransform at) {
+            return new AppendingPathIterator(s1, s2, connect, at);
+        }
+
+        public PathIterator getPathIterator(AffineTransform at,
+                                            double flatness)
+        {
+            return new FlatteningPathIterator(getPathIterator(at), flatness);
+        }
+
+        public static class AppendingPathIterator implements PathIterator {
+            AffineTransform at;
+            PathIterator pi;
+            Shape swaiting;
+            int windingrule;
+            boolean connectrequested;
+            boolean canconnect;
+            boolean converttoline;
+
+            public AppendingPathIterator(Shape s1, Shape s2,
+                                         boolean connect,
+                                         AffineTransform at)
+            {
+                this.at = at;
+                this.pi = s1.getPathIterator(at);
+                this.swaiting = s2;
+                this.windingrule = pi.getWindingRule();
+                this.connectrequested = connect;
+
+                if (pi.isDone()) {
+                    chain();
+                }
+            }
+
+            public void chain() {
+                if (swaiting != null) {
+                    pi = swaiting.getPathIterator(at);
+                    swaiting = null;
+                    converttoline = (connectrequested && canconnect);
+                }
+            }
+
+            public int getWindingRule() {
+                return windingrule;
+            }
+
+            public boolean isDone() {
+                return (pi.isDone());
+            }
+
+            public void next() {
+                converttoline = false;
+                pi.next();
+                if (pi.isDone()) {
+                    chain();
+                }
+                canconnect = true;
+            }
+
+            public int currentSegment(float[] coords) {
+                int type = pi.currentSegment(coords);
+                if (converttoline) {
+                    type = SEG_LINETO;
+                }
+                return type;
+            }
+
+            public int currentSegment(double[] coords) {
+                int type = pi.currentSegment(coords);
+                if (converttoline) {
+                    type = SEG_LINETO;
+                }
+                return type;
+            }
+        }
+    }
+
+    public static void checkEmpty(Path2D p2d, int windingrule) {
+        checkEmpty2(p2d, windingrule);
+        p2d.setWindingRule(PathIterator.WIND_NON_ZERO);
+        checkEmpty2(p2d, PathIterator.WIND_NON_ZERO);
+        p2d.setWindingRule(PathIterator.WIND_EVEN_ODD);
+        checkEmpty2(p2d, PathIterator.WIND_EVEN_ODD);
+    }
+
+    public static void checkEmpty2(Path2D p2d, int windingrule) {
+        if (p2d.getWindingRule() != windingrule) {
+            throw new RuntimeException("wrong winding rule in Path2D");
+        }
+        PathIterator pi = p2d.getPathIterator(null);
+        if (pi.getWindingRule() != windingrule) {
+            throw new RuntimeException("wrong winding rule in iterator");
+        }
+        if (!pi.isDone()) {
+            throw new RuntimeException("path not empty");
+        }
+    }
+
+    public static void compare(Creator c, Path2D p2d, Shape ref, int maxulp) {
+        compare(c, p2d, (Shape) p2d.clone(), null, 0);
+        compare(c, p2d, ref, null, 0);
+        compare(c, p2d, ref, TxIdentity, 0);
+        p2d.transform(TxIdentity);
+        compare(c, p2d, ref, null, 0);
+        compare(c, p2d, ref, TxIdentity, 0);
+        Shape s2 = p2d.createTransformedShape(TxIdentity);
+        compare(c, s2, ref, null, 0);
+        compare(c, s2, ref, TxIdentity, 0);
+        s2 = p2d.createTransformedShape(TxComplex);
+        compare(c, s2, ref, TxComplex, maxulp);
+        p2d.transform(TxComplex);
+        compare(c, p2d, (Shape) p2d.clone(), null, 0);
+        compare(c, p2d, ref, TxComplex, maxulp);
+    }
+
+    public static void compare(Creator c,
+                               Shape p2d, Shape s,
+                               AffineTransform at, int maxulp)
+    {
+        c.compare(p2d.getPathIterator(null), s.getPathIterator(at),
+                  null, maxulp);
+        c.compare(p2d.getPathIterator(null), s.getPathIterator(null),
+                  at, maxulp);
+    }
+
+    public static void checkBounds(Shape stest, Shape sref) {
+        checkBounds(stest.getBounds2D(), sref.getBounds2D(),
+                    "2D bounds too small");
+        /*
+        checkBounds(stest.getBounds(), sref.getBounds(),
+                    "int bounds too small");
+        */
+        checkBounds(stest.getBounds(), stest.getBounds2D(),
+                    "int bounds too small for 2D bounds");
+    }
+
+    public static void checkBounds(Rectangle2D tBounds,
+                                   Rectangle2D rBounds,
+                                   String faildesc)
+    {
+        if (rBounds.isEmpty()) {
+            if (!tBounds.isEmpty()) {
+                throw new RuntimeException("bounds not empty");
+            }
+            return;
+        } else if (tBounds.isEmpty()) {
+            throw new RuntimeException("bounds empty");
+        }
+        double rxmin = rBounds.getMinX();
+        double rymin = rBounds.getMinY();
+        double rxmax = rBounds.getMaxX();
+        double rymax = rBounds.getMaxY();
+        double txmin = tBounds.getMinX();
+        double tymin = tBounds.getMinY();
+        double txmax = tBounds.getMaxX();
+        double tymax = tBounds.getMaxY();
+        if (txmin > rxmin || tymin > rymin ||
+            txmax < rxmax || tymax < rymax)
+        {
+            if (verbose) System.out.println("test bounds = "+tBounds);
+            if (verbose) System.out.println("ref bounds = "+rBounds);
+            // Allow fudge room of a couple of single precision ulps
+            double ltxmin = txmin - 5 * Math.max(Math.ulp((float) rxmin),
+                                                 Math.ulp((float) txmin));
+            double ltymin = tymin - 5 * Math.max(Math.ulp((float) rymin),
+                                                 Math.ulp((float) tymin));
+            double ltxmax = txmax + 5 * Math.max(Math.ulp((float) rxmax),
+                                                 Math.ulp((float) txmax));
+            double ltymax = tymax + 5 * Math.max(Math.ulp((float) rymax),
+                                                 Math.ulp((float) tymax));
+            if (ltxmin > rxmin || ltymin > rymin ||
+                ltxmax < rxmax || ltymax < rymax)
+            {
+                if (!verbose) System.out.println("test bounds = "+tBounds);
+                if (!verbose) System.out.println("ref bounds = "+rBounds);
+                System.out.println("xmin: "+
+                                   txmin+" + "+fltulpless(txmin, rxmin)+" = "+
+                                   rxmin+" + "+fltulpless(rxmin, txmin));
+                System.out.println("ymin: "+
+                                   tymin+" + "+fltulpless(tymin, rymin)+" = "+
+                                   rymin+" + "+fltulpless(rymin, tymin));
+                System.out.println("xmax: "+
+                                   txmax+" + "+fltulpless(txmax, rxmax)+" = "+
+                                   rxmax+" + "+fltulpless(rxmax, txmax));
+                System.out.println("ymax: "+
+                                   tymax+" + "+fltulpless(tymax, rymax)+" = "+
+                                   rymax+" + "+fltulpless(rymax, tymax));
+                System.out.println("flt tbounds = ["+
+                                   ((float) txmin)+", "+((float) tymin)+", "+
+                                   ((float) txmax)+", "+((float) tymax)+"]");
+                System.out.println("flt rbounds = ["+
+                                   ((float) rxmin)+", "+((float) rymin)+", "+
+                                   ((float) rxmax)+", "+((float) rymax)+"]");
+                System.out.println("xmin ulp = "+fltulpless(rxmin, txmin));
+                System.out.println("ymin ulp = "+fltulpless(rymin, tymin));
+                System.out.println("xmax ulp = "+fltulpless(txmax, rxmax));
+                System.out.println("ymax ulp = "+fltulpless(tymax, rymax));
+                throw new RuntimeException(faildesc);
+            }
+        }
+    }
+
+    public static void checkHits(Shape stest, Shape sref) {
+        for (int i = 0; i < 10; i++) {
+            double px = Math.random() * 500 - 250;
+            double py = Math.random() * 500 - 250;
+            Point2D pnt = new Point2D.Double(px, py);
+
+            double rw = Math.random()*10+0.4;
+            double rh = Math.random()*10+0.4;
+            double rx = px - rw/2;
+            double ry = py - rh/2;
+            Rectangle2D rect = new Rectangle2D.Double(rx, ry, rw, rh);
+            Rectangle2D empty = new Rectangle2D.Double(rx, ry, 0, 0);
+
+            if (!rect.contains(pnt)) {
+                throw new InternalError("test point not inside test rect!");
+            }
+
+            if (stest.contains(rx, ry, 0, 0)) {
+                throw new RuntimeException("contains 0x0 rect");
+            }
+            if (stest.contains(empty)) {
+                throw new RuntimeException("contains empty rect");
+            }
+            if (stest.intersects(rx, ry, 0, 0)) {
+                throw new RuntimeException("intersects 0x0 rect");
+            }
+            if (stest.intersects(empty)) {
+                throw new RuntimeException("intersects empty rect");
+            }
+
+            boolean tContainsXY = stest.contains(px, py);
+            boolean tContainsPnt = stest.contains(pnt);
+            boolean tContainsXYWH = stest.contains(rx, ry, rw, rh);
+            boolean tContainsRect = stest.contains(rect);
+            boolean tIntersectsXYWH = stest.intersects(rx, ry, rw, rh);
+            boolean tIntersectsRect = stest.intersects(rect);
+
+            if (tContainsXY != tContainsPnt) {
+                throw new RuntimeException("contains(x,y) != "+
+                                           "contains(pnt)");
+            }
+            if (tContainsXYWH != tContainsRect) {
+                throw new RuntimeException("contains(x,y,w,h) != "+
+                                           "contains(rect)");
+            }
+            if (tIntersectsXYWH != tIntersectsRect) {
+                throw new RuntimeException("intersects(x,y,w,h) != "+
+                                           "intersects(rect)");
+            }
+
+            boolean uContainsXY =
+                Path2D.contains(stest.getPathIterator(null), px, py);
+            boolean uContainsXYWH =
+                Path2D.contains(stest.getPathIterator(null), rx, ry, rw, rh);
+            boolean uIntersectsXYWH =
+                Path2D.intersects(stest.getPathIterator(null), rx, ry, rw, rh);
+
+            if (tContainsXY != uContainsXY) {
+                throw new RuntimeException("contains(x,y) "+
+                                           "does not match utility");
+            }
+            if (tContainsXYWH != uContainsXYWH) {
+                throw new RuntimeException("contains(x,y,w,h) "+
+                                           "does not match utility");
+            }
+            if (tIntersectsXYWH != uIntersectsXYWH) {
+                throw new RuntimeException("intersects(x,y,w,h) "+
+                                           "does not match utility");
+            }
+
+            // Make rect slightly smaller to be more conservative for rContains
+            double srx = rx + 0.1;
+            double sry = ry + 0.1;
+            double srw = rw - 0.2;
+            double srh = rh - 0.2;
+            Rectangle2D srect = new Rectangle2D.Double(srx, sry, srw, srh);
+            // Make rect slightly larger to be more liberal for rIntersects
+            double lrx = rx - 0.1;
+            double lry = ry - 0.1;
+            double lrw = rw + 0.2;
+            double lrh = rh + 0.2;
+            Rectangle2D lrect = new Rectangle2D.Double(lrx, lry, lrw, lrh);
+
+            if (srect.isEmpty()) {
+                throw new InternalError("smaller rect too small (empty)");
+            }
+            if (!lrect.contains(rect)) {
+                throw new InternalError("test rect not inside larger rect!");
+            }
+            if (!rect.contains(srect)) {
+                throw new InternalError("smaller rect not inside test rect!");
+            }
+
+            boolean rContainsSmaller;
+            boolean rIntersectsLarger;
+            boolean rContainsPnt;
+
+            if (sref instanceof SampleShape ||
+                sref instanceof QuadCurve2D ||
+                sref instanceof CubicCurve2D)
+            {
+                // REMIND
+                // Some of the source shapes are not proving reliable
+                // enough to do reference verification of the hit
+                // testing results.
+                // Quad/CubicCurve2D have spaghetti test methods that could
+                // very likely contain some bugs.  They return a conflicting
+                // answer in maybe 1 out of 20,000 tests.
+                // Area causes a conflicting answer maybe 1 out of
+                // 100 to 1000 runs and it infinite loops maybe 1
+                // out of 10,000 runs or so.
+                // So, we use some conservative "safe" answers for
+                // these shapes and avoid their hit testing methods.
+                rContainsSmaller = tContainsRect;
+                rIntersectsLarger = tIntersectsRect;
+                rContainsPnt = tContainsPnt;
+            } else {
+                rContainsSmaller = sref.contains(srect);
+                rIntersectsLarger = sref.intersects(lrect);
+                rContainsPnt = sref.contains(px, py);
+            }
+
+            if (tIntersectsRect) {
+                if (tContainsRect) {
+                    if (!tContainsPnt) {
+                        System.out.println("reference shape = "+sref);
+                        System.out.println("pnt = "+pnt);
+                        System.out.println("rect = "+rect);
+                        System.out.println("tbounds = "+stest.getBounds2D());
+                        throw new RuntimeException("test contains rect, "+
+                                                   "but not center point");
+                    }
+                }
+                // Note: (tContainsPnt || tContainsRect) is same as
+                // tContainsPnt because of the test above...
+                if (tContainsPnt) {
+                    if (!rIntersectsLarger) {
+                        System.out.println("reference shape = "+sref);
+                        System.out.println("pnt = "+pnt);
+                        System.out.println("rect = "+rect);
+                        System.out.println("lrect = "+lrect);
+                        System.out.println("tbounds = "+stest.getBounds2D());
+                        System.out.println("rbounds = "+sref.getBounds2D());
+                        throw new RuntimeException("test claims containment, "+
+                                                   "but no ref intersection");
+                    }
+                }
+            } else {
+                if (tContainsRect) {
+                    throw new RuntimeException("test contains rect, "+
+                                               "with no intersection");
+                }
+                if (tContainsPnt) {
+                    System.out.println("reference shape = "+sref);
+                    System.out.println("rect = "+rect);
+                    throw new RuntimeException("test contains point, "+
+                                               "with no intersection");
+                }
+                if (rContainsPnt || rContainsSmaller) {
+                    System.out.println("pnt = "+pnt);
+                    System.out.println("rect = "+rect);
+                    System.out.println("srect = "+lrect);
+                    throw new RuntimeException("test did not intersect, "+
+                                               "but ref claims containment");
+                }
+            }
+        }
+    }
+
+    public static void test(Creator c) {
+        testConstructors(c);
+        testPathConstruction(c);
+        testAppend(c);
+        testBounds(c);
+        testHits(c);
+    }
+
+    public static void testConstructors(Creator c) {
+        checkEmpty(c.makePath(), WIND_NON_ZERO);
+        checkEmpty(c.makePath(WIND_NON_ZERO), WIND_NON_ZERO);
+        checkEmpty(c.makePath(WIND_EVEN_ODD), WIND_EVEN_ODD);
+        checkEmpty(c.makePath(EmptyShapeNonZero), WIND_NON_ZERO);
+        checkEmpty(c.makePath(EmptyShapeNonZero, null), WIND_NON_ZERO);
+        checkEmpty(c.makePath(EmptyShapeNonZero, TxIdentity), WIND_NON_ZERO);
+        checkEmpty(c.makePath(EmptyShapeEvenOdd), WIND_EVEN_ODD);
+        checkEmpty(c.makePath(EmptyShapeEvenOdd, null), WIND_EVEN_ODD);
+        checkEmpty(c.makePath(EmptyShapeEvenOdd, TxIdentity), WIND_EVEN_ODD);
+        try {
+            c.makePath(null);
+            throw new RuntimeException(c+" allowed null Shape in constructor");
+        } catch (NullPointerException npe) {
+            // passes
+        }
+        try {
+            c.makePath(null, TxIdentity);
+            throw new RuntimeException(c+" allowed null Shape in constructor");
+        } catch (NullPointerException npe) {
+            // passes
+        }
+
+        for (int i = 0; i < TestShapes.length; i++) {
+            Shape sref = TestShapes[i];
+            if (verbose) System.out.println("construct testing "+sref);
+            compare(c, c.makePath(sref), sref, null, 0);
+            compare(c, c.makePath(sref), sref, TxIdentity, 0);
+            compare(c, c.makePath(sref, null), sref, null, 0);
+            compare(c, c.makePath(sref, null), sref, TxIdentity, 0);
+            compare(c, c.makePath(sref, TxIdentity), sref, null, 0);
+            compare(c, c.makePath(sref, TxIdentity), sref, TxIdentity, 0);
+            compare(c, c.makePath(sref, TxComplex), sref, TxComplex,
+                    c.getRecommendedTxMaxUlp());
+        }
+    }
+
+    public static void testPathConstruction(Creator c) {
+        testPathConstruction(c, LongSampleNonZero);
+        testPathConstruction(c, LongSampleEvenOdd);
+    }
+
+    public static void testPathConstruction(Creator c, SampleShape ref) {
+        if (c.supportsFloatCompose()) {
+            compare(c, ref.makeFloatPath(c), ref, c.getRecommendedTxMaxUlp());
+        }
+        compare(c, ref.makeDoublePath(c), ref, c.getRecommendedTxMaxUlp());
+    }
+
+    public static void testAppend(Creator c) {
+        for (int i = 0; i < TestShapes.length; i++) {
+            Shape sref = TestShapes[i];
+            if (verbose) System.out.println("append testing "+sref);
+            PathIterator spi = sref.getPathIterator(null);
+            Path2D stest = c.makePath(spi.getWindingRule());
+            stest.append(spi, false);
+            compare(c, stest, sref, null, 0);
+            stest.reset();
+            stest.append(sref, false);
+            compare(c, stest, sref, null, 0);
+            stest.reset();
+            stest.append(sref.getPathIterator(TxComplex), false);
+            compare(c, stest, sref, TxComplex, 0);
+            // multiple shape append testing...
+            if (sref.getBounds2D().isEmpty()) {
+                // If the first shape is empty, then we really
+                // are not testing multiple appended shapes,
+                // we are just testing appending the AppendShape
+                // to a null path over and over.
+                // Also note that some empty shapes will spit out
+                // a single useless SEG_MOVETO that has no affect
+                // on the outcome, but it makes duplicating the
+                // behavior that Path2D has in that case difficult
+                // when the AppenedShape utility class has to
+                // iterate the exact same segments.  So, we will
+                // just ignore all empty shapes here.
+                continue;
+            }
+            stest.reset();
+            stest.append(sref, false);
+            stest.append(AppendShape, false);
+            compare(c, stest,
+                    new AppendedShape(sref, AppendShape, false),
+                    null, 0);
+            stest.reset();
+            stest.append(sref, false);
+            stest.append(AppendShape, true);
+            compare(c, stest,
+                    new AppendedShape(sref, AppendShape, true),
+                    null, 0);
+            stest.reset();
+            stest.append(sref.getPathIterator(null), false);
+            stest.append(AppendShape.getPathIterator(null), false);
+            compare(c, stest,
+                    new AppendedShape(sref, AppendShape, false),
+                    null, 0);
+            stest.reset();
+            stest.append(sref.getPathIterator(null), false);
+            stest.append(AppendShape.getPathIterator(null), true);
+            compare(c, stest,
+                    new AppendedShape(sref, AppendShape, true),
+                    null, 0);
+            stest.reset();
+            stest.append(sref.getPathIterator(TxComplex), false);
+            stest.append(AppendShape.getPathIterator(TxComplex), false);
+            compare(c, stest,
+                    new AppendedShape(sref, AppendShape, false),
+                    TxComplex, 0);
+            stest.reset();
+            stest.append(sref.getPathIterator(TxComplex), false);
+            stest.append(AppendShape.getPathIterator(TxComplex), true);
+            compare(c, stest,
+                    new AppendedShape(sref, AppendShape, true),
+                    TxComplex, 0);
+        }
+    }
+
+    public static void testBounds(Creator c) {
+        for (int i = 0; i < TestShapes.length; i++) {
+            Shape sref = TestShapes[i];
+            if (verbose) System.out.println("bounds testing "+sref);
+            Shape stest = c.makePath(sref);
+            checkBounds(c.makePath(sref), sref);
+        }
+        testBounds(c, ShortSampleNonZero);
+        testBounds(c, ShortSampleEvenOdd);
+        testBounds(c, LongSampleNonZero);
+        testBounds(c, LongSampleEvenOdd);
+    }
+
+    public static void testBounds(Creator c, SampleShape ref) {
+        if (verbose) System.out.println("bounds testing "+ref);
+        if (c.supportsFloatCompose()) {
+            checkBounds(ref.makeFloatPath(c), ref);
+        }
+        checkBounds(ref.makeDoublePath(c), ref);
+    }
+
+    public static void testHits(Creator c) {
+        for (int i = 0; i < TestShapes.length; i++) {
+            Shape sref = TestShapes[i];
+            if (verbose) System.out.println("hit testing "+sref);
+            Shape stest = c.makePath(sref);
+            checkHits(c.makePath(sref), sref);
+        }
+        testHits(c, ShortSampleNonZero);
+        testHits(c, ShortSampleEvenOdd);
+        // These take too long to construct the Area for reference testing
+        //testHits(c, LongSampleNonZero);
+        //testHits(c, LongSampleEvenOdd);
+    }
+
+    public static void testHits(Creator c, SampleShape ref) {
+        if (verbose) System.out.println("hit testing "+ref);
+        if (c.supportsFloatCompose()) {
+            checkHits(ref.makeFloatPath(c), ref);
+        }
+        checkHits(ref.makeDoublePath(c), ref);
+    }
+
+    public static void main(String argv[]) {
+        int limit = (argv.length > 0) ? 10000 : 1;
+        verbose = (argv.length > 1);
+        for (int i = 0; i < limit; i++) {
+            if (limit > 1) {
+                System.out.println("loop #"+(i+1));
+            }
+            init();
+            test(new GPCreator());
+            test(new FltCreator());
+            test(new DblCreator());
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/QuadCurve2D/Quad2DContainsTest.java b/test/jdk/java/awt/geom/QuadCurve2D/Quad2DContainsTest.java
new file mode 100644
index 00000000000..5b1f5d133e1
--- /dev/null
+++ b/test/jdk/java/awt/geom/QuadCurve2D/Quad2DContainsTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ * 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 4682078
+ * @summary QuadCurve2D contains() returns true for far away point
+ */
+
+import java.awt.geom.Point2D;
+import java.awt.geom.QuadCurve2D;
+
+public class Quad2DContainsTest {
+
+    static Object[][] trues = {
+        {
+            new QuadCurve2D.Double(0, 0, 50, 200, 100, 0),
+            new Point2D.Double(50, 50)
+        },
+        {
+            new QuadCurve2D.Double(0, 100, 100, 100, 100, 0),
+            new Point2D.Double(50, 50)
+        }
+    };
+    static Object[][] falses = {
+        {
+            new QuadCurve2D.Double(0, 0, 50, 200, 100, 0),
+            new Point2D.Double(0, 50)
+        },
+        {
+            new QuadCurve2D.Double(0, 0, 50, 200, 100, 0),
+            new Point2D.Double(100, 50)
+        },
+        {
+            new QuadCurve2D.Double(0, 0, 0, 100, 100, 100),
+            new Point2D.Double(0, 100)
+        },
+        {
+            new QuadCurve2D.Double(0, 0, 60, 60, 100, 100),
+            new Point2D.Double(30, 30)
+        }
+    };
+
+    public static void main(String[] args) {
+
+        for (int i = 0; i < trues.length; i++) {
+            checkPair((QuadCurve2D)trues[i][0], (Point2D)trues[i][1], true);
+        }
+
+        for (int i = 0; i < falses.length; i++) {
+            checkPair((QuadCurve2D)falses[i][0], (Point2D)falses[i][1], false);
+        }
+    }
+
+    public static void checkPair(QuadCurve2D q, Point2D p, boolean expect) {
+
+        if (q.contains(p.getX(), p.getY()) != expect) {
+            String errMsg = "QuadCurve2D " +
+                            "p1 = (" + q.getX1() + ", " + q.getY1() + ") " +
+                            "p2 = (" + q.getX2() + ", " + q.getY2() + ") " +
+                            "control = (" + q.getCtrlX() + ", " +
+                                            q.getCtrlY() + ") " +
+                            "should " + (expect ? "" : "not ") +
+                            "contain the point (" +
+                            p.getX() + ", " + p.getY() + "), " +
+                            "but method returns wrong value!";
+            throw new RuntimeException(errMsg);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/Rectangle2D/CreateIntersectBug.java b/test/jdk/java/awt/geom/Rectangle2D/CreateIntersectBug.java
new file mode 100644
index 00000000000..7621b4acbf7
--- /dev/null
+++ b/test/jdk/java/awt/geom/Rectangle2D/CreateIntersectBug.java
@@ -0,0 +1,133 @@
+/*
+ * 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
+ * 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 4374642
+ * @summary Verifies that the Rectangle2D.createIntersection method produces
+ *          an empty result rectangle if the two source rects did not intersect
+ */
+
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.geom.Rectangle2D;
+
+public class CreateIntersectBug extends Canvas {
+    public static boolean showresults = false;
+
+    public static RuntimeException t = null;
+
+    public static void main(String[] args) {
+        showresults = (args.length > 0);
+        test(50, 50, 20, 20, 100, 100, 100, 100);
+        test(-100, -100, 50, 50, 100, 100, 50, 50);
+        if (t != null) {
+            throw t;
+        }
+    }
+
+    public static void test(int x1, int y1, int w1, int h1,
+                            int x2, int y2, int w2, int h2)
+    {
+        Rectangle2D r1 = new Rectangle2D.Double(x1, y1, w1, h1);
+        Rectangle2D r2 = new Rectangle2D.Double(x2, y2, w2, h2);
+
+        write(r1, "R1");
+        write(r2, "R2");
+        if (r1.intersects(r2)) {
+            System.out.println("r1 and r2 intersect");
+        } else {
+            System.out.println("r1 and r2 don't intersect");
+        }
+        Rectangle2D r3 = r1.createIntersection(r2);
+        write(r3, "intersect");
+
+        Rectangle2D r4 = r1.createUnion(r2);
+        write(r4, "union");
+
+        if (showresults) {
+            new CreateIntersectBug(r1, r2, r3, r4);
+        }
+        if (!r1.intersects(r2) && !r3.isEmpty()) {
+            String s = ("Intersection of non-intersecting "+
+                        "rectangles is not empty!");
+            t = new RuntimeException(s);
+            System.out.println(s);
+        }
+    }
+
+    private Rectangle2D r1, r2, r3, r4;
+
+    public CreateIntersectBug(Rectangle2D r1, Rectangle2D r2,
+                              Rectangle2D r3, Rectangle2D r4)
+    {
+        this.r1 = r1;
+        this.r2 = r2;
+        this.r3 = r3;
+        this.r4 = r4;
+
+        Frame f = new Frame();
+        f.add(this);
+        f.addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {System.exit(0);}
+        });
+        f.pack();
+        f.show();
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(500, 500);
+    }
+
+
+    public void paint(Graphics g){
+        Graphics2D g2 = (Graphics2D) g;
+
+        // graphic aids to understanding - these have no
+        // effect on the problem.
+        if (!r1.intersects(r2) && !r3.isEmpty()) {
+            g2.setColor(Color.red);
+        } else {
+            g2.setColor(Color.green);
+        }
+        g2.draw(r3);
+        g2.setColor(Color.yellow);
+        g2.draw(r4);
+        g2.setColor(Color.blue);
+        g2.draw(r1);
+        g2.draw(r2);
+    }
+
+    public static void write(Rectangle2D r, String s) {
+        System.out.println(s + ": (" +
+                           (int)r.getX() + "," + (int)r.getY() + ","
+                           + (int)r.getWidth() + "," + (int)r.getHeight() +
+                           ")");
+    }
+}
diff --git a/test/jdk/java/awt/geom/Rectangle2D/IntersectsLineHang.java b/test/jdk/java/awt/geom/Rectangle2D/IntersectsLineHang.java
new file mode 100644
index 00000000000..30bd80478ab
--- /dev/null
+++ b/test/jdk/java/awt/geom/Rectangle2D/IntersectsLineHang.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2000, 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 4320890
+ * @summary Verifies that the Rectangle2D.intersectsLine method does not hang
+ *          or return bad results due to inaccuracies in the outcode methods
+ * @run main/timeout=5 IntersectsLineHang
+ */
+
+import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
+
+public class IntersectsLineHang {
+    static public void main(String args[]) {
+        Rectangle r = new Rectangle(0x70000000, 0x70000000,
+                                    0x20000000, 0x0f000000);
+        double v = 0x78000000;
+        System.out.println("Point alpha");
+        boolean result = r.intersectsLine(v, v, v+v, v+v);
+        System.out.println(result);
+        Rectangle2D rect = new Rectangle2D.Float(29.790712356567383f,
+                                                 362.3290710449219f,
+                                                 267.40679931640625f,
+                                                 267.4068298339844f);
+        System.out.println("Point A");
+        System.out.println(rect.intersectsLine(431.39777, 551.3534,
+                                               26.391, 484.71542));
+        System.out.println("Point A2");
+        System.out.println(rect.intersectsLine(431.39777, 551.3534,
+                                               268.391, 484.71542));
+        System.out.println("Point B: Never gets here!");
+        if (!result) {
+            // failure of integer rectangle intersection test
+            throw new RuntimeException("integer rectangle "+
+                                       "failed intersection test");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/SerialTest.java b/test/jdk/java/awt/geom/SerialTest.java
new file mode 100644
index 00000000000..2e97eac62a8
--- /dev/null
+++ b/test/jdk/java/awt/geom/SerialTest.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2005, 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 4263142 4172661
+ * @summary First run verifies that objects serialize and deserialize
+ *          correctly against the current release.
+ *          Second run verifies that objects from previous releases
+ *          still deserialize correctly.  The serial_1_6.out file was
+ *          created using the "write" option under release 1.6.
+ *          The test was modified after fixing 4172661 to add testing
+ *          of Path2D serialization (and to recut the test file with
+ *          the new serialVersionUID of GeneralPath).
+ * @run main SerialTest
+ * @run main SerialTest read serial_1_6.out
+ */
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Arc2D;
+import java.awt.geom.CubicCurve2D;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Point2D;
+import java.awt.geom.QuadCurve2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+
+public class SerialTest {
+    public static Object testobjects[] = {
+        // non-shapes...
+        new Point2D.Float(37, 42),
+        new Point2D.Double(85, 63),
+        new AffineTransform(10, 20, 30, 40, 50, 60),
+
+        // shapes...
+        new QuadCurve2D.Float(10f, 10f, 50f, 50f, 100f, 10f),
+        new QuadCurve2D.Double(20f, 20f, 50f, 50f, 100f, 20f),
+        new CubicCurve2D.Float(10f, 10f, 50f, 10f, 10f, 50f, 50f, 50f),
+        new CubicCurve2D.Double(0.0, 0.0, 50.0, 0.0, 0.0, 50.0, 50.0, 50.0),
+        new GeneralPath(),
+        new GeneralPath(PathIterator.WIND_NON_ZERO),
+        new GeneralPath(PathIterator.WIND_EVEN_ODD),
+        makeGeneralPath(PathIterator.WIND_NON_ZERO, 5f),
+        makeGeneralPath(PathIterator.WIND_EVEN_ODD, 23f),
+        new Line2D.Float(20f, 20f, 25f, 50f),
+        new Line2D.Double(20.0, 20.0, 35.0, 50.0),
+        new Rectangle2D.Float(100f, 100f, 50f, 25f),
+        new Rectangle2D.Double(200.0, 200.0, 75.0, 35.0),
+        new RoundRectangle2D.Float(120f, 120f, 50f, 35f, 5f, 7f),
+        new RoundRectangle2D.Double(220.0, 220.0, 85.0, 45.0, 3.0, 9.0),
+        new Ellipse2D.Float(110f, 110f, 50f, 55f),
+        new Ellipse2D.Double(210.0, 210.0, 75.0, 45.0),
+        new Arc2D.Float(10f, 10f, 50f, 40f, 45f, 72f, Arc2D.OPEN),
+        new Arc2D.Float(10f, 10f, 40f, 50f, 135f, 72f, Arc2D.PIE),
+        new Arc2D.Float(10f, 10f, 40f, 60f, 225f, 72f, Arc2D.CHORD),
+        new Arc2D.Double(10.0, 20.0, 50.0, 40.0, 45.0, 72.0, Arc2D.OPEN),
+        new Arc2D.Double(10.0, 20.0, 40.0, 50.0, 135.0, 72.0, Arc2D.PIE),
+        new Arc2D.Double(10.0, 20.0, 40.0, 60.0, 225.0, 72.0, Arc2D.CHORD),
+
+        // Paths
+        new Path2D.Float(),
+        new Path2D.Float(PathIterator.WIND_NON_ZERO),
+        new Path2D.Float(PathIterator.WIND_EVEN_ODD),
+        makePath2DFloat(PathIterator.WIND_NON_ZERO, 5f),
+        makePath2DFloat(PathIterator.WIND_EVEN_ODD, 23f),
+        new Path2D.Double(),
+        new Path2D.Double(PathIterator.WIND_NON_ZERO),
+        new Path2D.Double(PathIterator.WIND_EVEN_ODD),
+        makePath2DDouble(PathIterator.WIND_NON_ZERO, 5f),
+        makePath2DDouble(PathIterator.WIND_EVEN_ODD, 23f),
+    };
+
+    public static Shape makeGeneralPath(int winding, float off) {
+        return fill(new GeneralPath(winding), off);
+    }
+
+    public static Shape makePath2DFloat(int winding, float off) {
+        return fill(new Path2D.Float(winding), off);
+    }
+
+    public static Shape makePath2DDouble(int winding, float off) {
+        return fill(new Path2D.Double(winding), off);
+    }
+
+    public static Path2D fill(Path2D p2d, float off) {
+        p2d.moveTo(off+10, off+10);
+        p2d.lineTo(off+100, off+50);
+        p2d.quadTo(off+50, off+100, off+200, off+100);
+        p2d.curveTo(off+400, off+20, off+20, off+400, off+100, off+100);
+        p2d.closePath();
+        return p2d;
+    }
+
+    static int numerrors;
+
+    public static void error(Object o1, Object o2, String reason) {
+        System.err.println("Failed comparing: "+o1+" to "+o2);
+        System.err.println(reason);
+        numerrors++;
+    }
+
+    public static void usage(int exitcode) {
+        System.err.println("usage: java SerialTest [read|write] <filename>");
+        System.exit(exitcode);
+    }
+
+    public static void main(String argv[]) {
+        if (argv.length > 0) {
+            if (argv.length < 2) {
+                usage(1);
+            }
+
+            String arg = argv[0].toLowerCase();
+            if (arg.equals("write")) {
+                serializeTo(argv[1]);
+            } else if (arg.equals("read")) {
+                testFrom(argv[1]);
+            } else {
+                usage(1);
+            }
+        } else {
+            testSerial();
+        }
+    }
+
+    public static File makeFile(String filename) {
+        return new File(System.getProperty("test.src", "."), filename);
+    }
+
+    public static void serializeTo(String filename) {
+        FileOutputStream fos;
+        try {
+            fos = new FileOutputStream(makeFile(filename));
+        } catch (IOException ioe) {
+            throw new InternalError("bad output filename: "+filename);
+        }
+        serializeTo(fos);
+    }
+
+    public static void testFrom(String filename) {
+        FileInputStream fis;
+        try {
+            fis = new FileInputStream(makeFile(filename));
+        } catch (IOException ioe) {
+            throw new InternalError("bad input filename: "+filename);
+        }
+        testFrom(fis);
+    }
+
+    public static void testSerial() {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        serializeTo(baos);
+
+        byte buf[] = baos.toByteArray();
+        ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+
+        testFrom(bais);
+    }
+
+    public static void serializeTo(OutputStream os) {
+        try {
+            ObjectOutputStream oos = new ObjectOutputStream(os);
+
+            for (Object o1: testobjects) {
+                oos.writeObject(o1);
+            }
+
+            oos.close();
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
+        }
+    }
+
+    public static void testFrom(InputStream is) {
+        try {
+            ObjectInputStream ois = new ObjectInputStream(is);
+
+            for (Object o1: testobjects) {
+                Object o2 = ois.readObject();
+                if (o1 instanceof Shape) {
+                    compareShapes((Shape) o1, (Shape) o2);
+                } else {
+                    if (!o1.equals(o2)) {
+                        error(o1, o2, "objects not equal");
+                    }
+                }
+            }
+
+            try {
+                ois.readObject();
+                throw new RuntimeException("extra data in stream");
+            } catch (IOException ioe2) {
+            }
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
+        } catch (ClassNotFoundException cnfe) {
+            throw new RuntimeException(cnfe);
+        }
+    }
+
+    public static void compareShapes(Shape s1, Shape s2) {
+        PathIterator pi1 = s1.getPathIterator(null);
+        PathIterator pi2 = s2.getPathIterator(null);
+
+        if (pi1.getWindingRule() != pi2.getWindingRule()) {
+            error(s1, s2, "winding rules are different");
+        }
+
+        double coords1[] = new double[6];
+        double coords2[] = new double[6];
+
+        while (!pi1.isDone()) {
+            if (pi2.isDone()) {
+                error(s1, s2, "Shape 2 ended prematurely");
+                return;
+            }
+
+            int t1 = pi1.currentSegment(coords1);
+            int t2 = pi2.currentSegment(coords2);
+
+            if (t1 != t2) {
+                error(s1, s2, "different segment types");
+            }
+
+            int ncoords;
+            switch (t1) {
+            case PathIterator.SEG_MOVETO:  ncoords = 2; break;
+            case PathIterator.SEG_LINETO:  ncoords = 2; break;
+            case PathIterator.SEG_QUADTO:  ncoords = 4; break;
+            case PathIterator.SEG_CUBICTO: ncoords = 6; break;
+            case PathIterator.SEG_CLOSE:   ncoords = 0; break;
+
+            default:
+                throw new RuntimeException("unknown segment type");
+            }
+
+            for (int i = 0; i < ncoords; i++) {
+                if (coords1[i] != coords2[i]) {
+                    error(s1, s2, "coordinates differ");
+                }
+            }
+            pi1.next();
+            pi2.next();
+        }
+
+        if (!pi2.isDone()) {
+            error(s1, s2, "Shape 1 ended prematurely");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/serial_1_6.out b/test/jdk/java/awt/geom/serial_1_6.out
new file mode 100644
index 00000000000..88df92b60d1
Binary files /dev/null and b/test/jdk/java/awt/geom/serial_1_6.out differ
diff --git a/test/jdk/java/awt/print/Dialog/DialogOwnerTest.java b/test/jdk/java/awt/print/Dialog/DialogOwnerTest.java
new file mode 100644
index 00000000000..45156e8590a
--- /dev/null
+++ b/test/jdk/java/awt/print/Dialog/DialogOwnerTest.java
@@ -0,0 +1,289 @@
+/*
+ * 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 8203796
+   @run main/manual DialogOwnerTest
+   @summary Test DialogOwner API
+*/
+
+import java.util.ArrayList;
+import java.util.List;
+import java.awt.GraphicsConfiguration;
+import java.awt.GridLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.print.PrinterJob;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.ServiceUI;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.DialogOwner;
+import javax.print.attribute.standard.DialogTypeSelection;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+public class DialogOwnerTest extends JPanel {
+
+    static final int NONE      =     0x0;
+    static final int PRINT     =     0x1;
+    static final int PAGE      =     0x2;
+    static final int SWING2D   =     0x4;
+    static final int NATIVE2D  =     0x8;
+    static final int SERVICEUI =    0x10;
+
+    static final int ONTOP      =   0x20;
+    static final int OWNED      =   0x40;
+
+    static PrintService[] services =
+        PrintServiceLookup.lookupPrintServices(null, null);
+
+    public static void main(String[] args) {
+        if (services.length == 0) {
+            System.out.println("No printers, exiting");
+            return;
+        } else {
+           service = PrinterJob.getPrinterJob().getPrintService();
+        }
+        SwingUtilities.invokeLater(() -> {
+            createUI();
+        });
+        while (!testFinished) {
+           try {
+                Thread.sleep(1000);
+           } catch (InterruptedException e){
+           }
+        }
+        if (!testPassed) {
+            throw new RuntimeException("TEST FAILED.");
+        }
+    }
+
+
+    static final String otherText =
+       "This window is used to test on top behaviour\n" +
+       "For tests that are 'Owned' or 'On Top' the dialog\n" +
+       "must always stay above this window. Verify this\n " +
+       "by moving the dialog so that it partially obscures\n" +
+       "this window and then trying to raise this window.";
+
+    static final String instructions =
+       " Instructions\n" +
+       "This tests that a print dialog stays on top of either another\n" +
+       "window, or on top of all windows.\n" +
+       "For Owned tests the window titled 'Owner Window' should always \n" +
+       "stay behind the print dialog.\n" +
+       "For On Top tests all windows should stay behind the owner window.\n" +
+       "This test tracks if you have checked all the scenarios and will\n" +
+       "not allow the test to pass unless you have visited them all.\n";
+
+    static PrintService service;
+
+    public DialogOwnerTest() {
+       super();
+       //setLayout(new GridLayout(24, 1));
+    }
+
+    static boolean isNative(int flags) {
+        return (flags & NATIVE2D) != 0;
+    }
+
+    static boolean isCommon(int flags) {
+        return (flags & SWING2D) != 0;
+    }
+
+    static boolean is2D(int flags) {
+        return (flags & SWING2D|NATIVE2D) != 0;
+    }
+
+    static boolean isPage(int flags) {
+        return (flags & PAGE ) != 0;
+    }
+
+    static JFrame frame;
+    static JFrame other;
+    static JButton pass;
+    static ArrayList<JPanel> panelList = new ArrayList<JPanel>();
+    static volatile boolean testPassed, testFinished;
+
+    int testCount = 0;
+    List<String> testList = new ArrayList<String>();
+
+    static void createUI() {
+        other = new JFrame("Owner Window");
+        JTextArea otherTextArea = new JTextArea(otherText, 10, 40);
+        other.add(otherTextArea);
+        other.pack();
+        other.setVisible(true);
+        other.setLocation(800, 100);
+
+        frame = new JFrame("Test Dialog Owner");
+        frame.pack();
+        JTextArea instructionsPanel = new JTextArea(instructions, 10, 50);
+        instructionsPanel.setEditable(false);
+        frame.add("North", instructionsPanel);
+        DialogOwnerTest test = new DialogOwnerTest();
+
+        test.addTest("Owned Swing Print", OWNED, frame, PRINT|SWING2D);
+        test.addTest("On Top Swing Print", ONTOP, null, PRINT|SWING2D);
+
+        test.addTest("Owned Swing Page", OWNED, frame, PAGE|SWING2D);
+        test.addTest("On Top Swing Page", ONTOP, null, PAGE|SWING2D);
+
+        test.addTest("Owned javax.print", OWNED, frame, PRINT|SERVICEUI);
+        test.addTest("On Top javax.print", OWNED, null, PRINT|SERVICEUI);
+
+        test.addTest("Owned Native Print", OWNED, frame, PRINT|NATIVE2D);
+        test.addTest("On Top Native Print", OWNED, null, PRINT|NATIVE2D);
+
+        test.addTest("Owned Native Page", OWNED, frame, PAGE|NATIVE2D);
+        test.addTest("On Top Native Page", OWNED, null, PAGE|NATIVE2D);
+
+        test.setLayout(new GridLayout(panelList.size()+2, 1));
+
+        pass = new JButton("Pass");
+        pass.setEnabled(false);
+        pass.addActionListener((ActionEvent e) -> {
+            if (test.testList.size() > 0) {
+                return;
+            }
+            frame.dispose();
+            other.dispose();
+            System.out.println("User says test passed.");
+            testPassed = true;
+            testFinished = true;
+        });
+
+        JButton fail = new JButton("Fail");
+        fail.addActionListener((ActionEvent e) -> {
+            frame.dispose();
+            other.dispose();
+            System.out.println("User says test failed.");
+            testPassed = false;
+            testFinished = true;
+        });
+
+        JPanel p = new JPanel();
+        p.add(pass);
+        p.add(fail);
+        test.add(p);
+
+
+        for (JPanel panel : panelList) {
+            test.add(panel);
+        }
+
+        frame.add("Center", test);
+        frame.pack();
+        frame.setLocation(0,0);
+        frame.setVisible(true);
+     }
+
+   boolean isSupported(PrintRequestAttributeSet aset,
+                     int ownerFlags, Window owner, int dlgFlags) {
+
+       boolean supported = true;
+       DialogOwner ownerAttr = null;
+       if (ownerFlags != NONE) {
+           if (ownerFlags == ONTOP) {
+               ownerAttr = new DialogOwner();
+           } else if (ownerFlags == OWNED) {
+               ownerAttr = new DialogOwner(owner);
+           }
+           aset.add(ownerAttr);
+        }
+        if (is2D(dlgFlags)) {
+           DialogTypeSelection dst = null;
+           if (isNative(dlgFlags)) {
+               dst = DialogTypeSelection.NATIVE;
+           } else if (isCommon(dlgFlags)) {
+               dst = DialogTypeSelection.COMMON;
+           }
+           if (dst != null &&
+               !service.isAttributeValueSupported(dst, null, aset)) {
+               //System.out.println("This DialogType not supported");
+               supported = false;
+           }
+           if (dst != null) {
+               aset.add(dst);
+           }
+           if (ownerAttr != null &&
+               !service.isAttributeValueSupported(ownerAttr, null, aset)) {
+               //System.out.println("This DialogOwner not supported");
+               supported = false;
+           }
+        }
+        return supported;
+   }
+
+   void addTest(String title, int ownerFlags, Window owner, int dlgFlags) {
+
+        PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
+        if (!isSupported(aset, ownerFlags, owner, dlgFlags)) {
+            return;
+        }
+
+        // if we are here then this is supportable and worth testing
+        // and the attribute set is configured.
+
+        String label = title + " Dialog";
+        JButton button = new JButton(label);
+        JCheckBox tested = new JCheckBox("Tested");
+        tested.setEnabled(false);
+        JPanel panel = new JPanel();
+        panel.add(tested);
+        panel.add(button);
+        panelList.add(panel);
+        //add(panel);
+        testList.add(title);
+        if (++testCount != testList.size()) {
+            throw new RuntimeException("Test titles must be unique");
+        }
+
+        button.addActionListener((ActionEvent e) -> {
+            tested.setSelected(true);
+            testList.remove(title);
+            if (testList.isEmpty()) {
+              pass.setEnabled(true);
+            }
+
+            if (is2D(dlgFlags)) {
+               PrinterJob job = PrinterJob.getPrinterJob();
+               if (isPage(dlgFlags)) {
+                   job.pageDialog(aset);
+               } else {
+                   job.printDialog(aset);
+               }
+            } else {
+               GraphicsConfiguration gc = null;
+               int x = 0, y = 0;
+               ServiceUI.printDialog(gc, x, y, services, services[0], null,aset);
+            }
+        });
+    }
+}
diff --git a/test/jdk/java/awt/print/PrinterJob/PaintText.java b/test/jdk/java/awt/print/PrinterJob/PaintText.java
index dd760bdb805..dc39a9a85be 100644
--- a/test/jdk/java/awt/print/PrinterJob/PaintText.java
+++ b/test/jdk/java/awt/print/PrinterJob/PaintText.java
@@ -120,7 +120,7 @@ public class PaintText extends Component implements Printable {
 
         Graphics2D g2d = (Graphics2D)g;
 
-        Font f = new Font("Lucida Sans", Font.PLAIN, 40);
+        Font f = new Font(Font.DIALOG, Font.PLAIN, 40);
         Color c = new Color(0,0,255,96);
         Paint p = new GradientPaint(0f, 0f, Color.green,
                                     10f, 10f, Color.red,
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java b/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java
index b3d24bdfdb7..5f5a6fa69d6 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java
@@ -44,7 +44,7 @@ import java.awt.geom.*;
 import java.awt.print.*;
 
 public class PrintRotatedText extends Frame implements ActionListener {
- static String fontname="Lucida Sans Regular"; // our font
+ static String fontname=Font.SERIF;
  private TextCanvas c;
 
  public static void main(String args[]) {
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintTextLayout.java b/test/jdk/java/awt/print/PrinterJob/PrintTextLayout.java
index 3738095f2d3..2dfd10ccd32 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintTextLayout.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintTextLayout.java
@@ -44,9 +44,6 @@ import javax.print.attribute.standard.*;
 
 public class PrintTextLayout implements Printable {
     static String[] fontnames = {
-        "Lucida Sans",
-        "Lucida Bright",
-        "Lucida Sans Typewriter",
         "SansSerif",
         "Serif",
         "Monospaced",
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
index 6ad45dd6f4f..c7d9c984b64 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
@@ -97,14 +97,14 @@ public class PrintTextTest extends Component implements Printable {
         book.append(ptt, portrait);
         book.append(ptt, landscape);
 
-        font = new Font("Lucida Sans", Font.PLAIN, 18);
+        font = getPhysicalFont();
         name = "Page " + new Integer(page++);
         ptt = new PrintTextTest(name, font, null, false);
         p.add(name, ptt);
         book.append(ptt, portrait);
         book.append(ptt, landscape);
 
-        font = new Font("Lucida Sans", Font.PLAIN, 18);
+        font = getPhysicalFont();
         AffineTransform rotTx = AffineTransform.getRotateInstance(0.15);
         rotTx.translate(60,0);
         name = "Page " + new Integer(page++);
@@ -209,6 +209,36 @@ public class PrintTextTest extends Component implements Printable {
         }
     }
 
+    // The test needs a physical font that supports Latin.
+    private static Font physicalFont;
+    private static Font getPhysicalFont() {
+        if (physicalFont != null) {
+            return physicalFont;
+        }
+        GraphicsEnvironment ge =
+            GraphicsEnvironment.getLocalGraphicsEnvironment();
+        String[] names = ge.getAvailableFontFamilyNames();
+
+        for (String n : names) {
+            switch (n.toLowerCase()) {
+                case "dialog":
+                case "dialoginput":
+                case "serif":
+                case "sansserif":
+                case "monospaced":
+                     break;
+                default:
+                    Font f = new Font(n, Font.PLAIN, 18);
+                    if (f.canDisplayUpTo("AZaz09") == -1) {
+                        physicalFont = f;
+                        return f;
+                    }
+             }
+        }
+        physicalFont = new Font(Font.DIALOG, Font.PLAIN, 18);
+        return physicalFont;
+    }
+
     public PrintTextTest(String page, Font font, AffineTransform gxTx,
                          boolean fm) {
         this.page = page;
diff --git a/test/jdk/java/beans/Introspector/GenericPropertyType.java b/test/jdk/java/beans/Introspector/GenericPropertyType.java
new file mode 100644
index 00000000000..3907fe9147d
--- /dev/null
+++ b/test/jdk/java/beans/Introspector/GenericPropertyType.java
@@ -0,0 +1,148 @@
+/*
+ * 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 java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+
+/**
+ * @test
+ * @bug 8196373
+ * @summary Introspector should work when generics are used
+ */
+public final class GenericPropertyType {
+
+    /// Nothing is overridden
+    static class ParentNo<T> {
+        public T getValue() {return null;}
+        public void setValue(T value) {}
+    }
+
+    static class ChildNoO extends ParentNo<Object> {}
+    static class ChildNoA extends ParentNo<ArithmeticException> {}
+    static class ChildNoS extends ParentNo<String> {}
+
+    /// no get(), set is overridden
+    static class ParentNoGet<T> {
+        protected void setValue(T value) {}
+    }
+
+    static class ChildNoGetO extends ParentNoGet<Object> {
+        @Override
+        public void setValue(Object value) {}
+    }
+
+    static class ChildNoGetA extends ParentNoGet<ArithmeticException> {
+        @Override
+        public void setValue(ArithmeticException value) {}
+    }
+
+    static class ChildNoGetS extends ParentNoGet<String> {
+        @Override
+        public void setValue(String value) {}
+    }
+
+    /// get() exists, set is overridden
+    static class ParentGet<T> {
+        public final T getValue() {return null;}
+        protected void setValue(T value) {}
+    }
+
+    static class ChildGetO extends ParentGet<Object> {
+        @Override
+        public void setValue(Object value) {}
+    }
+
+    static class ChildGetA extends ParentGet<ArithmeticException> {
+        @Override
+        public void setValue(ArithmeticException value) {}
+    }
+
+    static class ChildGetS extends ParentGet<String> {
+        @Override
+        public void setValue(String value) {}
+    }
+
+    /// Both set/get are overridden
+    static class ParentAll<T> {
+        protected T getValue() {return null;}
+        protected void setValue(T value) {}
+    }
+
+    static class ChildAllO extends ParentAll<Object> {
+        @Override
+        public void setValue(Object value) {}
+        @Override
+        public Object getValue() {return null;}
+    }
+
+    static class ChildAllA extends ParentAll<ArithmeticException> {
+        @Override
+        public void setValue(ArithmeticException value) {}
+        @Override
+        public ArithmeticException getValue() {return null;}
+    }
+
+    static class ChildAllS extends ParentAll<String> {
+        @Override
+        public void setValue(String value) {}
+        @Override
+        public String getValue() {return null;}
+    }
+
+    public static void main(String[] args) throws Exception {
+        testProperty(ChildNoGetA.class, ArithmeticException.class);
+        testProperty(ChildNoGetO.class, Object.class);
+        testProperty(ChildNoGetS.class, String.class);
+
+        testProperty(ChildGetA.class, ArithmeticException.class);
+        testProperty(ChildGetO.class, Object.class);
+        testProperty(ChildGetS.class, String.class);
+
+        testProperty(ChildAllA.class, ArithmeticException.class);
+        testProperty(ChildAllO.class, Object.class);
+        testProperty(ChildAllS.class, String.class);
+
+        testProperty(ChildNoA.class, ArithmeticException.class);
+        testProperty(ChildNoO.class, Object.class);
+        testProperty(ChildNoS.class, String.class);
+    }
+
+    private static void testProperty(Class<?> beanClass, Class<?> type) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
+        PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+        if (pds.length != 1) {
+            throw new RuntimeException("Wrong number of properties");
+        }
+        PropertyDescriptor pd = pds[0];
+        System.out.println("pd = " + pd);
+        String name = pd.getName();
+        if (!name.equals("value")) {
+            throw new RuntimeException("Wrong name: " + name);
+        }
+        Class<?> propertyType = pd.getPropertyType();
+        if (propertyType != type) {
+            throw new RuntimeException("Wrong property type: " + propertyType);
+        }
+    }
+}
diff --git a/test/jdk/java/beans/Introspector/OverloadedSetter.java b/test/jdk/java/beans/Introspector/OverloadedSetter.java
new file mode 100644
index 00000000000..1bbe2cdbdac
--- /dev/null
+++ b/test/jdk/java/beans/Introspector/OverloadedSetter.java
@@ -0,0 +1,138 @@
+/*
+ * 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 java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * @test
+ * @bug 8196373
+ * @summary behavior of this class is not specified, but it can be used to check
+ *          our implementation for accidental changes
+ */
+public final class OverloadedSetter {
+
+    class AAA {}
+    class CCC extends AAA {}
+    class BBB extends CCC {}
+    class DDD extends CCC {}
+
+    class ZZZ {}
+
+    // DDD will be selected because it is most specific type.
+    class ParentADC<T> {
+        public void setValue(AAA value) {}
+        public void setValue(DDD value) {}
+        public void setValue(CCC value) {}
+    }
+    // DDD will be selected because it is most specific type.
+    class ParentACD<T> {
+        public void setValue(AAA value) {}
+        public void setValue(CCC value) {}
+        public void setValue(DDD value) {}
+    }
+    // DDD will be selected because it is most specific type.
+    class ParentDAC<T> {
+        public void setValue(DDD value) {}
+        public void setValue(AAA value) {}
+        public void setValue(CCC value) {}
+    }
+    // DDD will be selected because it is most specific type.
+    class ParentDCA<T> {
+        public void setValue(DDD value) {}
+        public void setValue(CCC value) {}
+        public void setValue(AAA value) {}
+    }
+    // DDD will be selected because it is most specific type.
+    class ParentCAD<T> {
+        public void setValue(CCC value) {}
+        public void setValue(AAA value) {}
+        public void setValue(DDD value) {}
+    }
+    // DDD will be selected because it is most specific type.
+    class ParentCDA<T> {
+        public void setValue(CCC value) {}
+        public void setValue(DDD value) {}
+        public void setValue(AAA value) {}
+    }
+    // DDD will be selected because it is most specific type and ZZZ will be
+    // skipped because it will be placed at the end of the methods list.
+    class ParentCDAZ<T> {
+        public void setValue(CCC value) {}
+        public void setValue(DDD value) {}
+        public void setValue(AAA value) {}
+        public void setValue(ZZZ value) {}
+    }
+    // DDD will be selected because it is most specific type which related to
+    // the type of getValue(); BBB will be skipped because it is not a type or
+    // subclass of the type returned by getValue();
+    class ParentDACB<T> {
+        public DDD getValue(){return null;}
+        public void setValue(AAA value) {}
+        public void setValue(DDD value) {}
+        public void setValue(CCC value) {}
+        public void setValue(BBB value) {}
+    }
+
+    public static void main(String[] args) throws Exception {
+        test(ParentADC.class);
+        test(ParentACD.class);
+        test(ParentDAC.class);
+        test(ParentDCA.class);
+        test(ParentCAD.class);
+        test(ParentCDA.class);
+        test(ParentCDAZ.class);
+        test(ParentDACB.class);
+    }
+
+    private static void test(Class<?> beanClass) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
+        PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+        if (pds.length != 1) {
+            throw new RuntimeException("Wrong number of properties");
+        }
+        PropertyDescriptor pd = pds[0];
+        String name = pd.getName();
+        if (!name.equals("value")) {
+            throw new RuntimeException("Wrong name: " + name);
+        }
+
+        Class<?> propertyType = pd.getPropertyType();
+        if (propertyType != DDD.class) {
+            throw new RuntimeException("Wrong property type: " + propertyType);
+        }
+        Method writeMethod = pd.getWriteMethod();
+        if (writeMethod == null) {
+            throw new RuntimeException("Write method is null");
+        }
+        Class<?>[] parameterTypes = writeMethod.getParameterTypes();
+        if (parameterTypes.length != 1) {
+            throw new RuntimeException("Wrong parameters " + parameterTypes);
+        }
+        if (parameterTypes[0] != DDD.class) {
+            throw new RuntimeException("Wrong type: " + parameterTypes[0]);
+        }
+    }
+}
diff --git a/test/jdk/java/beans/Introspector/OverriddenGenericGetter.java b/test/jdk/java/beans/Introspector/OverriddenGenericGetter.java
new file mode 100644
index 00000000000..842d83a2eb6
--- /dev/null
+++ b/test/jdk/java/beans/Introspector/OverriddenGenericGetter.java
@@ -0,0 +1,124 @@
+/*
+ * 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 java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * @test
+ * @bug 8196373
+ * @summary Introspector should work with overridden generic getter method
+ */
+public final class OverriddenGenericGetter {
+
+    static class Parent<T> {
+        private T value;
+        public T getValue() {return value;}
+        public final void setValue(T value) {this.value = value;}
+    }
+
+    static class ChildO extends Parent<Object> {
+        public ChildO() {}
+        @Override
+        public Object getValue() {return super.getValue();}
+    }
+
+    static class ChildA extends Parent<ArithmeticException> {
+        public ChildA() {}
+        @Override
+        public ArithmeticException getValue() {return super.getValue();}
+    }
+
+    static class ChildS extends Parent<String> {
+        public ChildS() {}
+        @Override
+        public String getValue() {return super.getValue();}
+    }
+
+    public static void main(String[] args) throws Exception {
+        testBehaviour(ChildA.class);
+        testBehaviour(ChildO.class);
+        testBehaviour(ChildS.class);
+        test(ChildA.class, ArithmeticException.class);
+        test(ChildO.class, Object.class);
+        test(ChildS.class, String.class);
+    }
+
+    private static void testBehaviour(Class<?> beanClass) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
+        PropertyDescriptor pd = beanInfo.getPropertyDescriptors()[0];
+        Object bean = beanClass.getConstructor().newInstance();
+        Method readMethod = pd.getReadMethod();
+        Method writeMethod = pd.getWriteMethod();
+
+        // check roundtrip for default null values
+        writeMethod.invoke(bean,readMethod.invoke(bean));
+        writeMethod.invoke(bean,readMethod.invoke(bean));
+
+        // set property to non-default value
+        // check roundtrip for non-default values
+        Object param = pd.getPropertyType().getConstructor().newInstance();
+        writeMethod.invoke(bean, param);
+        writeMethod.invoke(bean, readMethod.invoke(bean));
+        writeMethod.invoke(bean, readMethod.invoke(bean));
+    }
+
+    private static void test(Class<?> beanClass, Class<?> type) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
+        PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+        if (pds.length != 1) {
+            throw new RuntimeException("Wrong number of properties");
+        }
+        PropertyDescriptor pd = pds[0];
+        String name = pd.getName();
+        if (!name.equals("value")) {
+            throw new RuntimeException("Wrong name: " + name);
+        }
+
+        Class<?> propertyType = pd.getPropertyType();
+        if (propertyType != type) {
+            throw new RuntimeException("Wrong property type: " + propertyType);
+        }
+        Method readMethod = pd.getReadMethod();
+        if (readMethod == null) {
+            throw new RuntimeException("Read method is null");
+        }
+        Class<?> returnType = readMethod.getReturnType();
+        if (returnType != type) {
+            throw new RuntimeException("Wrong return type; " + returnType);
+        }
+        Method writeMethod = pd.getWriteMethod();
+        if (writeMethod == null) {
+            throw new RuntimeException("Write method is null");
+        }
+        Class<?>[] parameterTypes = writeMethod.getParameterTypes();
+        if (parameterTypes.length != 1) {
+            throw new RuntimeException("Wrong parameters " + parameterTypes);
+        }
+        if (parameterTypes[0] != Object.class) {
+            throw new RuntimeException("Wrong type: " + parameterTypes[0]);
+        }
+    }
+}
diff --git a/test/jdk/java/beans/Introspector/OverriddenGenericSetter.java b/test/jdk/java/beans/Introspector/OverriddenGenericSetter.java
new file mode 100644
index 00000000000..98134758d5e
--- /dev/null
+++ b/test/jdk/java/beans/Introspector/OverriddenGenericSetter.java
@@ -0,0 +1,127 @@
+/*
+ * 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 java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * @test
+ * @bug 8196373
+ * @summary Introspector should work with overridden generic setter method
+ */
+public final class OverriddenGenericSetter {
+
+    static class Parent<T> {
+        private T value;
+        public final T getValue() {return value;}
+        protected void setValue(T value) {this.value = value;}
+    }
+
+    static class ChildO extends Parent<Object> {
+        public ChildO() {}
+        @Override
+        public void setValue(Object value) {super.setValue(value);}
+    }
+
+    // For overridden setXXX javac will generate the "synthetic bridge" method
+    // setValue(Ljava/lang/Object). We will use two different types which may be
+    // placed before/after bridge method.
+    static class ChildA extends Parent<ArithmeticException> {
+        public ChildA() {}
+        @Override
+        public void setValue(ArithmeticException value) {super.setValue(value);}
+    }
+
+    static class ChildS extends Parent<String> {
+        public ChildS() {}
+        @Override
+        public void setValue(String value) {super.setValue(value);}
+    }
+
+    public static void main(String[] args) throws Exception {
+        testBehaviour(ChildA.class);
+        testBehaviour(ChildO.class);
+        testBehaviour(ChildS.class);
+        testProperty(ChildA.class, ArithmeticException.class);
+        testProperty(ChildO.class, Object.class);
+        testProperty(ChildS.class, String.class);
+    }
+
+    private static void testBehaviour(Class<?> beanClass) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
+        PropertyDescriptor pd = beanInfo.getPropertyDescriptors()[0];
+        Object bean = beanClass.getConstructor().newInstance();
+        Method readMethod = pd.getReadMethod();
+        Method writeMethod = pd.getWriteMethod();
+
+        // check roundtrip for default null values
+        writeMethod.invoke(bean,readMethod.invoke(bean));
+        writeMethod.invoke(bean,readMethod.invoke(bean));
+
+        // set property to non-default value
+        // check roundtrip for non-default values
+        Object param = pd.getPropertyType().getConstructor().newInstance();
+        writeMethod.invoke(bean, param);
+        writeMethod.invoke(bean, readMethod.invoke(bean));
+        writeMethod.invoke(bean, readMethod.invoke(bean));
+    }
+
+    private static void testProperty(Class<?> beanClass, Class<?> type) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
+        PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+        if (pds.length != 1) {
+            throw new RuntimeException("Wrong number of properties");
+        }
+        PropertyDescriptor pd = pds[0];
+        System.out.println("pd = " + pd);
+        String name = pd.getName();
+        if (!name.equals("value")) {
+            throw new RuntimeException("Wrong name: " + name);
+        }
+        Class<?> propertyType = pd.getPropertyType();
+        if (propertyType != type) {
+            throw new RuntimeException("Wrong property type: " + propertyType);
+        }
+        Method readMethod = pd.getReadMethod();
+        if (readMethod == null) {
+            throw new RuntimeException("Read method is null");
+        }
+        Class<?> returnType = readMethod.getReturnType();
+        if (returnType != Object.class) {
+            throw new RuntimeException("Wrong return type; " + returnType);
+        }
+        Method writeMethod = pd.getWriteMethod();
+        if (writeMethod == null) {
+            throw new RuntimeException("Write method is null");
+        }
+        Class<?>[] parameterTypes = writeMethod.getParameterTypes();
+        if (parameterTypes.length != 1) {
+            throw new RuntimeException("Wrong parameters " + parameterTypes);
+        }
+        if (parameterTypes[0] != type) {
+            throw new RuntimeException("Wrong type: " + parameterTypes[0]);
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Package/PackageFromManifest.java b/test/jdk/java/lang/Package/PackageFromManifest.java
new file mode 100644
index 00000000000..117dce8e17d
--- /dev/null
+++ b/test/jdk/java/lang/Package/PackageFromManifest.java
@@ -0,0 +1,300 @@
+/*
+ * 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 8201528
+ * @summary The test will create JAR file(s) with the manifest file
+ *          that customized package versioning information (different info for
+ *          same package if multiple jars). Then verify package versioning info
+ * @library /lib/testlibrary
+ * @library /test/lib
+ * @run main PackageFromManifest setup test
+ * @run main PackageFromManifest runJar test1.jar
+ * @run main PackageFromManifest runJar test1.jar test2.jar foo.Foo1
+ * @run main PackageFromManifest runJar test1.jar test2.jar foo.Foo2
+ * @run main/othervm PackageFromManifest runUrlLoader test1.jar
+ * @run main/othervm PackageFromManifest runUrlLoader test1.jar test2.jar foo.Foo1
+ * @run main/othervm PackageFromManifest runUrlLoader test1.jar test2.jar foo.Foo2
+ */
+
+import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.jar.Manifest;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * This test accept at least two input parameters, first one is run type like
+ * 'setup', 'runJar', 'runTest', 'runUrlLoader', the rest parameters are options
+ * to each run type. 'setup' run type should be placed at first since it will
+ * create necessary jars for the rest tests. 'runTest' will be called in test
+ * logic only, it should not be used in @run
+ *
+ * #1 test will do setup only to generate required jars before other tests run
+ * PackageFromManifest setup test
+ *
+ * #2 test will run against single jar file to verify package versioning
+ * PackageFromManifest runJar test1.jar
+ *
+ * #4 test will run against two jar files, load class foo.Foo1 first, then
+ * verify package versioning
+ * PackageFromManifest runJar test1.jar test2.jar foo.Foo1
+ *
+ * #5 test will run against two jar files, load class foo.Foo2 first, then
+ * verify package versioning
+ * PackageFromManifest runJar test1.jar test2.jar foo.Foo2
+ *
+ * #3 test will use URLCLassLoader to load single jar file, then verify
+ * package versioning
+ * PackageFromManifest runUrlLoader test1.jar
+ *
+ * #6 test will use URLCLassLoader to load two jars, load class foo.Foo1 first,
+ * then verify package versioning
+ * PackageFromManifest runUrlLoader test1.jar test2.jar foo.Foo1
+ *
+ * #7 test will use URLCLassLoader to load two jars, load class foo.Foo2 first,
+ * then verify package versioning
+ * PackageFromManifest runUrlLoader test1.jar test2.jar foo.Foo2
+ */
+public class PackageFromManifest {
+
+    private static final String PACKAGE_NAME = "foo";
+    private static final String TEST_JAR_FILE1 = "test1.jar";
+    private static final String TEST_JAR_FILE2 = "test2.jar";
+    private static final String TEST_SUFFIX1 = "1";
+    private static final String TEST_SUFFIX2 = "2";
+    private static final String TEST_CLASS_PREFIX = "Foo";
+    private static final String TEST_CLASS_NAME1 =
+            TEST_CLASS_PREFIX + TEST_SUFFIX1;
+    private static final String TEST_CLASS_NAME2 =
+            TEST_CLASS_PREFIX + TEST_SUFFIX2;
+    private static final String MANIFEST_FILE = "test.mf";
+    private static final String SPEC_TITLE = "testSpecTitle";
+    private static final String SPEC_VENDOR = "testSpecVendor";
+    private static final String IMPL_TITLE = "testImplTitle";
+    private static final String IMPL_VENDOR = "testImplVendor";
+    private static final Path WORKING_PATH = Paths.get(".");
+
+    public static void main(String[] args) throws Exception {
+        if (args != null && args.length > 1) {
+            String runType = args[0];
+            String[] options = Arrays.copyOfRange(args, 1, args.length);
+            switch (runType) {
+                case "setup":
+                    setup();
+                    break;
+                case "runTest":
+                    runTest(options);
+                    break;
+                case "runJar":
+                    runJar(options);
+                    break;
+                case "runUrlLoader":
+                    testUrlLoader(options);
+                    break;
+                default:
+                    throw new RuntimeException("Invalid run type : " + runType);
+            }
+        } else {
+            throw new RuntimeException("Invalid input arguments");
+        }
+    }
+
+    private static void createTestClass(String name) throws IOException {
+        List<String> content = new ArrayList<>();
+        content.add("package " + PACKAGE_NAME + ";");
+        content.add("public class " + name + " {");
+        content.add("}");
+
+        Path javaFile = WORKING_PATH.resolve(name + ".java");
+
+        Files.write(javaFile, content);
+
+        CompilerUtils.compile(WORKING_PATH, WORKING_PATH);
+
+        // clean up created java file
+        Files.delete(javaFile);
+    }
+
+    private static void createManifest(String suffix) throws IOException {
+        List<String> content = new ArrayList<>();
+        content.add("Manifest-version: 1.1");
+        content.add("Name: " + PACKAGE_NAME + "/");
+        content.add("Specification-Title: " + SPEC_TITLE + suffix);
+        content.add("Specification-Version: " + suffix);
+        content.add("Specification-Vendor: " + SPEC_VENDOR + suffix);
+        content.add("Implementation-Title: " + IMPL_TITLE + suffix);
+        content.add("Implementation-Version: " + suffix);
+        content.add("Implementation-Vendor: " + IMPL_VENDOR + suffix);
+
+        Files.write(WORKING_PATH.resolve(MANIFEST_FILE), content);
+    }
+
+    private static void buildJar(String jarFileName, boolean isIncludeSelf)
+            throws IOException {
+        try (InputStream is = Files.newInputStream(Paths.get(MANIFEST_FILE))) {
+            if (isIncludeSelf) {
+                Path selfPath = WORKING_PATH
+                        .resolve("PackageFromManifest.class");
+                if (!Files.exists(selfPath)) {
+                    Files.copy(Paths.get(System.getProperty("test.classes"))
+                            .resolve("PackageFromManifest.class"), selfPath);
+                }
+                JarUtils.createJarFile(Paths.get(jarFileName), new Manifest(is),
+                        WORKING_PATH, selfPath,
+                        WORKING_PATH.resolve(PACKAGE_NAME));
+            } else {
+                JarUtils.createJarFile(Paths.get(jarFileName), new Manifest(is),
+                        WORKING_PATH, WORKING_PATH.resolve(PACKAGE_NAME));
+            }
+        }
+
+        // clean up build files
+        FileUtils.deleteFileTreeWithRetry(WORKING_PATH.resolve(PACKAGE_NAME));
+        Files.delete(WORKING_PATH.resolve(MANIFEST_FILE));
+    }
+
+    private static void runJar(String[] options) throws Exception {
+        String[] cmds;
+        String classPath = Stream.of(options).takeWhile(s -> s.endsWith(".jar"))
+                .collect(Collectors.joining(File.pathSeparator));
+        if (options.length == 1) {
+            cmds = new String[] { "-cp", classPath, "PackageFromManifest",
+                    "runTest", "single" };
+        } else {
+            cmds = new String[] { "-cp", classPath, "PackageFromManifest",
+                    "runTest", options[options.length - 1] };
+        }
+
+        ProcessTools.executeTestJava(cmds).outputTo(System.out)
+                .errorTo(System.err).shouldHaveExitValue(0);
+    }
+
+    private static void runTest(String[] options)
+            throws ClassNotFoundException {
+        String option = options[0];
+        if (option.equalsIgnoreCase("single")) {
+            runTest(Class.forName(PACKAGE_NAME + "." + TEST_CLASS_NAME1)
+                    .getPackage(), TEST_SUFFIX1);
+        } else {
+            // Load one specified class first
+            System.out.println("Load " + Class.forName(option) + " first");
+
+            String suffix = option.endsWith(TEST_SUFFIX1) ?
+                    TEST_SUFFIX1 :
+                    TEST_SUFFIX2;
+
+            runTest(Class.forName(PACKAGE_NAME + "." + TEST_CLASS_NAME1)
+                    .getPackage(), suffix);
+            runTest(Class.forName(PACKAGE_NAME + "." + TEST_CLASS_NAME2)
+                    .getPackage(), suffix);
+        }
+    }
+
+    private static void runTest(Package testPackage, String suffix) {
+        checkValue("Package Name", PACKAGE_NAME, testPackage.getName());
+        checkValue("Spec Title", SPEC_TITLE + suffix,
+                testPackage.getSpecificationTitle());
+        checkValue("Spec Vendor", SPEC_VENDOR + suffix,
+                testPackage.getSpecificationVendor());
+        checkValue("Spec Version", suffix,
+                testPackage.getSpecificationVersion());
+        checkValue("Impl Title", IMPL_TITLE + suffix,
+                testPackage.getImplementationTitle());
+        checkValue("Impl Vendor", IMPL_VENDOR + suffix,
+                testPackage.getImplementationVendor());
+        checkValue("Impl Version", suffix,
+                testPackage.getImplementationVersion());
+    }
+
+    private static void checkValue(String name, String expect, String actual) {
+        if (!expect.equals(actual)) {
+            throw new RuntimeException(
+                    "Failed, unexpected value for " + name + ", expect: "
+                            + expect + ", actual: " + actual);
+        } else {
+            System.out.println(name + " : " + actual);
+        }
+    }
+
+    private static void setup() throws IOException {
+        if (!Files.exists(WORKING_PATH.resolve(TEST_JAR_FILE1))) {
+            createTestClass(TEST_CLASS_NAME1);
+            createManifest(TEST_SUFFIX1);
+            buildJar(TEST_JAR_FILE1, true);
+        }
+
+        if (!Files.exists(WORKING_PATH.resolve(TEST_JAR_FILE2))) {
+            createTestClass(TEST_CLASS_NAME2);
+            createManifest(TEST_SUFFIX2);
+            buildJar(TEST_JAR_FILE2, false);
+        }
+    }
+
+    private static void testUrlLoader(String[] options)
+            throws ClassNotFoundException {
+        URLClassLoader cl = new URLClassLoader(
+                Stream.of(options).takeWhile(s -> s.endsWith(".jar")).map(s -> {
+                    try {
+                        return WORKING_PATH.resolve(s).toUri().toURL();
+                    } catch (MalformedURLException e) {
+                        return null;
+                    }
+                }).toArray(URL[]::new));
+        if (options.length == 1) {
+            runTest(Class
+                    .forName(PACKAGE_NAME + "." + TEST_CLASS_NAME1, true, cl)
+                    .getPackage(), TEST_SUFFIX1);
+        } else {
+            // Load one specified class first
+            System.out.println("Load " + Class
+                    .forName(options[options.length - 1], true, cl) + " first");
+
+            String suffix = options[options.length - 1].endsWith(TEST_SUFFIX1) ?
+                    TEST_SUFFIX1 :
+                    TEST_SUFFIX2;
+
+            runTest(Class
+                    .forName(PACKAGE_NAME + "." + TEST_CLASS_NAME1, true, cl)
+                    .getPackage(), suffix);
+            runTest(Class
+                    .forName(PACKAGE_NAME + "." + TEST_CLASS_NAME2, true, cl)
+                    .getPackage(), suffix);
+        }
+    }
+}
diff --git a/test/jdk/java/lang/String/concat/ImplicitStringConcatAssignLHS.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatAssignLHS.java
new file mode 100644
index 00000000000..b2d89c8642b
--- /dev/null
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatAssignLHS.java
@@ -0,0 +1,232 @@
+/*
+ * 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
+ * @summary "+=" applied to String operands can provoke side effects
+ * @bug 8204322
+ *
+ * @compile ImplicitStringConcatAssignLHS.java
+ * @run main/othervm -Xverify:all ImplicitStringConcatAssignLHS
+ *
+ * @compile -XDstringConcat=inline ImplicitStringConcatAssignLHS.java
+ * @run main/othervm -Xverify:all ImplicitStringConcatAssignLHS
+ *
+ * @compile -XDstringConcat=indy ImplicitStringConcatAssignLHS.java
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                                                              ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED                                                        ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED                                                        ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT                                                  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT                                                  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT                                              ImplicitStringConcatAssignLHS
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                  -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT  -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                                                              -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED                                                        -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED                                                        -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT                                                  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT                                                  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT                                              -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                  -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT  -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ *
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatAssignLHS.java
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                                                              ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED                                                        ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED                                                        ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT                                                  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT                                                  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT                                              ImplicitStringConcatAssignLHS
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                  -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT  -Djava.lang.invoke.stringConcat.debug=true  ImplicitStringConcatAssignLHS
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                                                              -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED                                                        -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED                                                        -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT                                                  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT                                                  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT                                              -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ *
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB                  -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED            -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT      -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+ * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT  -Djava.lang.invoke.stringConcat.debug=true  -Djava.lang.invoke.stringConcat.cache=true  ImplicitStringConcatAssignLHS
+*/
+import java.lang.StringBuilder;
+
+public class ImplicitStringConcatAssignLHS {
+
+    static final int ARR_SIZE = 10; // enough padding to capture ill offsets
+
+    static int x;
+
+    public static void main(String[] args) throws Exception {
+        {
+          x = 0;
+            Object[] arr = new Object[ARR_SIZE];
+            arr[x++] += "foo";
+            check(1, "plain-plain Object[]");
+        }
+
+        {
+          x = 0;
+            getObjArray()[x++] += "foo";
+            check(2, "method-plain Object[]");
+        }
+
+        {
+          x = 0;
+            getObjArray()[getIndex()] += "foo";
+            check(2, "method-method Object[]");
+        }
+
+        {
+            x = 0;
+            String[] arr = new String[ARR_SIZE];
+            arr[x++] += "foo";
+            check(1, "plain-plain String[]");
+    }
+
+        {
+            x = 0;
+            getStringArray()[x++] += "foo";
+            check(2, "method-plain String[]");
+        }
+
+        {
+            x = 0;
+            getStringArray()[getIndex()] += "foo";
+            check(2, "method-method String[]");
+        }
+
+        {
+            x = 0;
+            CharSequence[] arr = new CharSequence[ARR_SIZE];
+            arr[x++] += "foo";
+            check(1, "plain-plain CharSequence[]");
+        }
+
+        {
+            x = 0;
+            getCharSequenceArray()[x++] += "foo";
+            check(2, "method-plain CharSequence[]");
+        }
+
+        {
+            x = 0;
+            getCharSequenceArray()[getIndex()] += "foo";
+            check(2, "method-method CharSequence[]");
+        }
+
+        {
+            x = 0;
+            new MyClass().s += "foo";
+            check(1, "MyClass::new (String)");
+        }
+
+        {
+            x = 0;
+            getMyClass().s += "foo";
+            check(1, "method MyClass::new (String)");
+        }
+
+        {
+            x = 0;
+            new MyClass().o += "foo";
+            check(1, "MyClass::new (object)");
+        }
+
+        {
+            x = 0;
+            getMyClass().o += "foo";
+            check(1, "method MyClass::new (object)");
+        }
+    }
+
+    public static void check(int expected, String label) {
+        if (x != expected) {
+           StringBuilder sb = new StringBuilder();
+           sb.append(label);
+           sb.append(": ");
+           sb.append("Expected = ");
+           sb.append(expected);
+           sb.append("actual = ");
+           sb.append(x);
+           throw new IllegalStateException(sb.toString());
+        }
+    }
+
+    public static int getIndex() {
+       return x++;
+    }
+
+    public static class MyClass {
+        Object o;
+        String s;
+
+        public MyClass() {
+       x++;
+        }
+    }
+
+    public static MyClass getMyClass() {
+        return new MyClass();
+}
+
+    public static Object[] getObjArray() {
+        x++;
+        return new Object[ARR_SIZE];
+    }
+
+    public static String[] getStringArray() {
+        x++;
+        return new String[ARR_SIZE];
+    }
+
+    public static CharSequence[] getCharSequenceArray() {
+        x++;
+        return new String[ARR_SIZE];
+    }
+
+}
+
diff --git a/test/jdk/java/lang/System/Versions.java b/test/jdk/java/lang/System/Versions.java
index 3ba41e1b1f3..41041acd188 100644
--- a/test/jdk/java/lang/System/Versions.java
+++ b/test/jdk/java/lang/System/Versions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, 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
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 4989690 6259855 6706299
+ * @bug 4989690 6259855 6706299 8204565
  * @summary Check that version-related system property invariants hold.
  * @author Martin Buchholz
  */
@@ -72,13 +72,17 @@ public class Versions {
     public static void main(String [] args) throws Exception {
         String classVersion   = getProperty("java.class.version");
         String javaVersion    = getProperty("java.version");
-        String VMVersion      = getProperty("java.vm.version");
         String runtimeVersion = getProperty("java.runtime.version");
         String specVersion    = getProperty("java.specification.version");
+        String vmSpecVersion  = getProperty("java.vm.specification.version");
+        String featureVersion = Integer.toString(Runtime.version().feature());
 
         if (! (javaVersion.startsWith(specVersion) &&
-               runtimeVersion.startsWith(specVersion)))
+               runtimeVersion.startsWith(specVersion) &&
+               specVersion.equals(featureVersion) &&
+               vmSpecVersion.equals(featureVersion))) {
             throw new Exception("Invalid version-related system properties");
+        }
 
         //----------------------------------------------------------------
         // Check that java.class.version is correct.
diff --git a/test/jdk/java/lang/Thread/StopThrowable.java b/test/jdk/java/lang/Thread/StopThrowable.java
deleted file mode 100644
index edc3a8d50a8..00000000000
--- a/test/jdk/java/lang/Thread/StopThrowable.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 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 7059085
- * @summary Check that Thread.stop(Throwable) throws UOE
- * @run testng StopThrowable
- */
-
-import org.testng.annotations.Test;
-
-import java.util.concurrent.CountDownLatch;
-
-public class StopThrowable {
-
-    @Test(expectedExceptions=UnsupportedOperationException.class)
-    public void testStopSelf() {
-        Thread.currentThread().stop(new ThreadDeath());
-    }
-
-    private static void awaitUnchecked(CountDownLatch latch) {
-        try {
-            latch.await();
-        } catch (InterruptedException e) {
-            // should not happen
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Test(expectedExceptions=UnsupportedOperationException.class)
-    public void testStopOther() throws Throwable {
-        CountDownLatch ready = new CountDownLatch(1);
-        CountDownLatch done = new CountDownLatch(1);
-        Thread t = new Thread( () ->  { ready.countDown(); awaitUnchecked(done); } );
-        t.start();
-        try {
-            ready.await();
-            t.stop(new ThreadDeath());
-        } finally {
-            done.countDown();
-        }
-    }
-
-    @Test(expectedExceptions=UnsupportedOperationException.class)
-    public void testNull() {
-        Thread.currentThread().stop(null);
-    }
-}
diff --git a/test/jdk/java/lang/invoke/MethodHandlesInsertArgumentsTest.java b/test/jdk/java/lang/invoke/MethodHandlesInsertArgumentsTest.java
index a40876c6206..4245ce29ec6 100644
--- a/test/jdk/java/lang/invoke/MethodHandlesInsertArgumentsTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandlesInsertArgumentsTest.java
@@ -42,6 +42,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static java.lang.invoke.MethodType.methodType;
+
 import static org.junit.Assert.*;
 
 public class MethodHandlesInsertArgumentsTest extends MethodHandlesTest {
@@ -88,4 +90,43 @@ public class MethodHandlesInsertArgumentsTest extends MethodHandlesTest {
             System.out.println("result: "+res2List);
         assertEquals(resList, res2List);
     }
+
+    private static MethodHandle methodHandle = null;
+    static {
+        try {
+            methodHandle = MethodHandles.lookup().findVirtual(
+                                               MethodHandlesInsertArgumentsTest.class,
+                                               "testMethod",
+                                               methodType(void.class, String.class, String.class));
+        } catch(ReflectiveOperationException ex) {
+            throw new InternalError(ex);
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInsertArgumentsInvalidPos() {
+        countTest();
+        MethodHandles.insertArguments(methodHandle, -1, "First", "Second");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInsertArgumentsTooManyParams() {
+        countTest();
+        MethodHandles.insertArguments(methodHandle, 1, "First", "Second", "Third");
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void testInsertArgumentsPosZero() {
+        countTest();
+        MethodHandles.insertArguments(methodHandle, 0, "First");
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void testInsertArgumentsIncorrectParam() {
+        countTest();
+        MethodHandles.insertArguments(methodHandle, 1, "First", new Object());
+    }
+
+    void testMethod(String a, String b) {
+    }
 }
diff --git a/test/jdk/java/lang/invoke/condy/CondyNestedResolution.jcod b/test/jdk/java/lang/invoke/condy/CondyNestedResolution.jcod
new file mode 100644
index 00000000000..ce1f1faa44a
--- /dev/null
+++ b/test/jdk/java/lang/invoke/condy/CondyNestedResolution.jcod
@@ -0,0 +1,427 @@
+/*
+ * 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.
+ */
+
+/*
+Pseudo Java code:
+
+class CondyNestedResolution {
+    public static Object bsm1arg(MethodHandles$Lookup p1, String p2, Object p3, Object p4) {
+        System.out.println("In bsm1arg");
+        System.out.println(p4);
+        return p4;
+    }
+    public static Object bsm2arg(MethodHandles$Lookup p1, String p2, Object p3, Object p4, Object p5) {
+        System.out.println("In bsm2arg");
+        System.out.println(p4);
+        System.out.println(p5);
+        return p4;
+    }
+    public static Object bsm3arg(MethodHandles$Lookup p1, String p2, Object p3, Object p4, Object p5, Object p6) {
+        System.out.println("In bsm3arg");
+        System.out.println(p4);
+        System.out.println(p5);
+        System.out.println(p6);
+        return p4;
+    }
+    public static Object bsm4arg(MethodHandles$Lookup p1, String p2, Object p3, Object p4, Object p5, Object p6, Object p7) {
+        System.out.println("In bsm4arg");
+        System.out.println(p4);
+        System.out.println(p5);
+        System.out.println(p6);
+        System.out.println(p7);
+        return p4;
+    }
+
+    public static void test_condy() {
+        // The following condy of BSM#8 results in the invocation of bootstrap method bsm4arg with the following
+        // parameters:
+        // bsm4arg(bsm1arg("hello1"),
+        //         bsm1arg("hello2"),
+        //         bsm3arg(bsm1arg("hello4"), bsm2arg(bsm1arg("hello6"), (circular reference to BSM#8)), bsm1arg("hello5")),
+        //         bsm1arg("hello3"));
+        // JVMS 5.4.3.6 Dynamically-Computed Constant and Call Site Resolution
+        // Ensure that calls to bsm1arg("hello5") and bsm1arg("hello3") are never resolved due to the nested condy circularity
+        // which results in a StackOverflowError.
+        //
+        ldc Dynamic BSM#8;
+    }
+    public static void main(String args[]) {
+        CondyNestedResolution.test_condy();
+    }
+}
+
+BootstrapMethods:
+  BSM0=invokestatic CondyNestedResolution.bsm1arg("hello1");
+  BSM1=invokestatic CondyNestedResolution.bsm1arg("hello2");
+  BSM2=invokestatic CondyNestedResolution.bsm1arg("hello4");
+  BSM3=invokestatic CondyNestedResolution.bsm1arg("hello6");
+  BSM4=invokestatic CondyNestedResolution.bsm2arg(BSM#3, BSM#8);
+  BSM5=invokestatic CondyNestedResolution.bsm1arg("hello5");
+  BSM6=invokestatic CondyNestedResolution.bsm3arg(BSM#2, BSM#4, BSM#5);
+  BSM7=invokestatic CondyNestedResolution.bsm1arg("hello3");
+  BSM8=invokestatic CondyNestedResolution.bsm4arg(BSM#0, BSM#1, BSM#6, BSM#7);
+
+Expected output:
+  In bsm1arg
+  hello1
+  In bsm1arg
+  hello2
+  In bsm1arg
+  hello4
+  In bsm1arg
+  hello6
+  Exception in thread "main" java.lang.StackOverflowError
+          at java.base/java.lang.invoke.MethodHandleNatives.copyOutBootstrapArguments(Native Method)
+*/
+
+
+class CondyNestedResolution {
+  0xCAFEBABE;
+  0; // minor version
+  55; // version
+  [85] { // Constant Pool
+    ; // first element is empty
+    String #22; // #1     at 0x0A
+    String #61; // #2     at 0x0D
+    String #11; // #3     at 0x10
+    Dynamic 8s #12; // #4     at 0x13
+    Method #51 #10; // #5     at 0x18
+    Method #13 #39; // #6     at 0x1D
+    Field #50 #81; // #7     at 0x22
+    Method #84 #45; // #8     at 0x27
+    Utf8 "java/io/PrintStream"; // #9     at 0x2C
+    NameAndType #71 #47; // #10     at 0x42
+    Utf8 "In bsm1arg"; // #11     at 0x47
+    NameAndType #18 #17; // #12     at 0x54
+    class #9; // #13     at 0x59
+    Utf8 "SourceFile"; // #14     at 0x5C
+    Utf8 "bsm3arg"; // #15     at 0x69
+    Utf8 "CondyNestedResolution.jasm"; // #16     at 0x73
+    Utf8 "Ljava/lang/String;"; // #17     at 0x90
+    Utf8 "name"; // #18     at 0xA5
+    Utf8 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"; // #19     at 0xAC
+    Utf8 "test_condy"; // #20     at 0x0144
+    NameAndType #15 #19; // #21     at 0x0151
+    Utf8 "In bsm2arg"; // #22     at 0x0156
+    Utf8 "Code"; // #23     at 0x0163
+    Utf8 "([Ljava/lang/String;)V"; // #24     at 0x016A
+    Utf8 "bsm4arg"; // #25     at 0x0183
+    Utf8 "out"; // #26     at 0x018D
+    NameAndType #69 #55; // #27     at 0x0193
+    Utf8 "BootstrapMethods"; // #28     at 0x0198
+    MethodHandle 6b #44; // #29     at 0x01AB
+    Method #84 #63; // #30     at 0x01AF
+    Utf8 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"; // #31     at 0x01B4
+    Method #84 #27; // #32     at 0x0228
+    MethodHandle 6b #30; // #33     at 0x022D
+    MethodHandle 6b #30; // #34     at 0x0231
+    MethodHandle 6b #30; // #35     at 0x0235
+    MethodHandle 6b #30; // #36     at 0x0239
+    MethodHandle 6b #30; // #37     at 0x023D
+    MethodHandle 6b #30; // #38     at 0x0241
+    NameAndType #40 #41; // #39     at 0x0245
+    Utf8 "println"; // #40     at 0x024A
+    Utf8 "(Ljava/lang/Object;)V"; // #41     at 0x0254
+    Utf8 "java/lang/Object"; // #42     at 0x026C
+    Utf8 "java/lang/System"; // #43     at 0x027F
+    Method #84 #21; // #44     at 0x0292
+    NameAndType #20 #47; // #45     at 0x0297
+    MethodHandle 6b #82; // #46     at 0x029C
+    Utf8 "()V"; // #47     at 0x02A0
+    String #62; // #48     at 0x02A6
+    String #64; // #49     at 0x02A9
+    class #43; // #50     at 0x02AC
+    class #42; // #51     at 0x02AF
+    String #65; // #52     at 0x02B2
+    String #66; // #53     at 0x02B5
+    String #67; // #54     at 0x02B8
+    Utf8 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"; // #55     at 0x02BB
+    Utf8 "main"; // #56     at 0x0341
+    String #68; // #57     at 0x0348
+    MethodHandle 6b #32; // #58     at 0x034B
+    Utf8 "bsm1arg"; // #59     at 0x034F
+    NameAndType #25 #83; // #60     at 0x0359
+    Utf8 "In bsm4arg"; // #61     at 0x035E
+    Utf8 "hello6"; // #62     at 0x036B
+    NameAndType #59 #31; // #63     at 0x0374
+    Utf8 "hello5"; // #64     at 0x0379
+    Utf8 "hello4"; // #65     at 0x0382
+    Utf8 "hello3"; // #66     at 0x038B
+    Utf8 "hello2"; // #67     at 0x0394
+    Utf8 "hello1"; // #68     at 0x039D
+    Utf8 "bsm2arg"; // #69     at 0x03A6
+    Utf8 "Ljava/io/PrintStream;"; // #70     at 0x03B0
+    Utf8 "<init>"; // #71     at 0x03C8
+    Utf8 "CondyNestedResolution"; // #72     at 0x03D1
+    Dynamic 7s #12; // #73     at 0x03E9
+    Dynamic 6s #12; // #74     at 0x03EE
+    Dynamic 5s #12; // #75     at 0x03F3
+    Dynamic 4s #12; // #76     at 0x03F8
+    Dynamic 3s #12; // #77     at 0x03FD
+    Dynamic 0s #12; // #78     at 0x0402
+    Dynamic 1s #12; // #79     at 0x0407
+    Dynamic 2s #12; // #80     at 0x040C
+    NameAndType #26 #70; // #81     at 0x0411
+    Method #84 #60; // #82     at 0x0416
+    Utf8 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"; // #83     at 0x041B
+    class #72; // #84     at 0x04C5
+  } // Constant Pool
+
+  0x0000; // access [ ]
+  #84;// this_cpx
+  #51;// super_cpx
+
+  [0] { // Interfaces
+  } // Interfaces
+
+  [0] { // fields
+  } // fields
+
+  [7] { // methods
+    { // Member at 0x04D4
+      0x0001; // access
+      #71; // name_cpx
+      #47; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 17) { // Code at 0x04DC
+          1; // max_stack
+          1; // max_locals
+          Bytes[5]{
+            0x2AB70005B1;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member at 0x04F3
+      0x0009; // access
+      #59; // name_cpx
+      #31; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 29) { // Code at 0x04FB
+          4; // max_stack
+          4; // max_locals
+          Bytes[17]{
+            0xB200071203B60006;
+            0xB200072DB600062D;
+            0xB0;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member at 0x051E
+      0x0009; // access
+      #69; // name_cpx
+      #55; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 37) { // Code at 0x0526
+          8; // max_stack
+          8; // max_locals
+          Bytes[25]{
+            0xB200071201B60006;
+            0xB200072DB60006B2;
+            0x00071904B600062D;
+            0xB0;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member at 0x0551
+      0x0009; // access
+      #15; // name_cpx
+      #19; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 45) { // Code at 0x0559
+          19; // max_stack
+          19; // max_locals
+          Bytes[33]{
+            0xB200071202B60006;
+            0xB200072DB60006B2;
+            0x00071904B60006B2;
+            0x00071905B600062D;
+            0xB0;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member at 0x058C
+      0x0009; // access
+      #25; // name_cpx
+      #83; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 53) { // Code at 0x0594
+          19; // max_stack
+          19; // max_locals
+          Bytes[41]{
+            0xB200071202B60006;
+            0xB200072DB60006B2;
+            0x00071904B60006B2;
+            0x00071905B60006B2;
+            0x00071906B600062D;
+            0xB0;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member at 0x05CF
+      0x0009; // access
+      #20; // name_cpx
+      #47; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 15) { // Code at 0x05D7
+          12; // max_stack
+          12; // max_locals
+          Bytes[3]{
+            0x1204B1;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member at 0x05EC
+      0x0009; // access
+      #56; // name_cpx
+      #24; // sig_cpx
+      [1] { // Attributes
+        Attr(#23, 16) { // Code at 0x05F4
+          2; // max_stack
+          2; // max_locals
+          Bytes[4]{
+            0xB80008B1;
+          }
+          [0] { // Traps
+          } // end Traps
+          [0] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+  } // methods
+
+  [2] { // Attributes
+    Attr(#14, 2) { // SourceFile at 0x060C
+      #16;
+    } // end SourceFile
+    ;
+    Attr(#28, 68) { // BootstrapMethods at 0x0614
+      [9] { // bootstrap_methods
+        {  //  bootstrap_method
+          #36; // bootstrap_method_ref
+          [1] { // bootstrap_arguments
+            #57; //  at 0x0622
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #37; // bootstrap_method_ref
+          [1] { // bootstrap_arguments
+            #54; //  at 0x0628
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #38; // bootstrap_method_ref
+          [1] { // bootstrap_arguments
+            #52; //  at 0x062E
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #35; // bootstrap_method_ref
+          [1] { // bootstrap_arguments
+            #48; //  at 0x0634
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #58; // bootstrap_method_ref
+          [2] { // bootstrap_arguments
+            #77; //  at 0x063A
+            #4; //  at 0x063C
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #34; // bootstrap_method_ref
+          [1] { // bootstrap_arguments
+            #49; //  at 0x0642
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #29; // bootstrap_method_ref
+          [3] { // bootstrap_arguments
+            #80; //  at 0x0648
+            #76; //  at 0x064A
+            #75; //  at 0x064C
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #33; // bootstrap_method_ref
+          [1] { // bootstrap_arguments
+            #53; //  at 0x0652
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+        ;
+        {  //  bootstrap_method
+          #46; // bootstrap_method_ref
+          [4] { // bootstrap_arguments
+            #78; //  at 0x0658
+            #79; //  at 0x065A
+            #74; //  at 0x065C
+            #73; //  at 0x065E
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+      }
+    } // end BootstrapMethods
+  } // Attributes
+} // end class CondyNestedResolution
diff --git a/test/jdk/java/lang/invoke/condy/CondyNestedResolutionTest.java b/test/jdk/java/lang/invoke/condy/CondyNestedResolutionTest.java
new file mode 100644
index 00000000000..b5dd8befa48
--- /dev/null
+++ b/test/jdk/java/lang/invoke/condy/CondyNestedResolutionTest.java
@@ -0,0 +1,62 @@
+/*
+ * 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 8203435
+ * @summary Test JVMs 5.4.3.6 with respect to a dynamically-computed constant and circularity.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @compile CondyNestedResolution.jcod
+ * @run main/othervm CondyNestedResolutionTest
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+
+/*
+ * JVMs section 5.4.3.6 Dynamically-Computed Constant and Call Site Resolution
+ *     "Let X be the symbolic reference currently being resolved, and let Y be a static argument of X
+ *      to be resolved as described above. If X and Y are both dynamically-computed constants, and if Y
+ *      is either the same as X or has a static argument that references X through its static arguments,
+ *      directly or indirectly, resolution fails with a StackOverflowError.
+ */
+public class CondyNestedResolutionTest {
+    public static void main(String args[]) throws Throwable {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("CondyNestedResolution");
+        OutputAnalyzer oa = new OutputAnalyzer(pb.start());
+        oa.shouldContain("StackOverflowError");
+        oa.shouldContain("bsm1arg");
+        oa.shouldContain("hello1");
+        oa.shouldContain("hello2");
+        oa.shouldContain("hello4");
+        oa.shouldContain("hello6");
+        oa.shouldNotContain("hello3");
+        oa.shouldNotContain("hello5");
+        oa.shouldNotContain("bsm2arg");
+        oa.shouldNotContain("bsm3arg");
+        oa.shouldNotContain("bsm4arg");
+        oa.shouldHaveExitValue(1);
+    }
+}
diff --git a/test/jdk/java/lang/management/ManagementFactory/MXBeanException.java b/test/jdk/java/lang/management/ManagementFactory/MXBeanException.java
index 40ec878914e..6e9d1526387 100644
--- a/test/jdk/java/lang/management/ManagementFactory/MXBeanException.java
+++ b/test/jdk/java/lang/management/ManagementFactory/MXBeanException.java
@@ -27,6 +27,7 @@
  * @summary Check if a RuntimeException is wrapped by RuntimeMBeanException
  *          only once.
  *
+ * @requires vm.gc != "Z"
  * @author  Mandy Chung
  *
  * @build MXBeanException
diff --git a/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java b/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
index 894d7a7855e..a081aacca0c 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, 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
@@ -30,11 +30,13 @@
  *
  * @author  Mandy Chung
  *
- * @library /lib/testlibrary/
+ * @library /lib/testlibrary/ /test/lib
  * @modules jdk.management
  * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil
  * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null"
- * @run main/timeout=300 CollectionUsageThreshold
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. CollectionUsageThreshold
  */
 
 import java.util.*;
@@ -46,6 +48,8 @@ import java.lang.management.*;
 import static java.lang.management.MemoryNotificationInfo.*;;
 import static java.lang.management.ManagementFactory.*;
 
+import sun.hotspot.code.Compiler;
+
 public class CollectionUsageThreshold {
     private static final MemoryMXBean mm = getMemoryMXBean();
     private static final Map<String, PoolRecord> result = new HashMap<>();
@@ -72,7 +76,9 @@ public class CollectionUsageThreshold {
         RunUtil.runTestClearGcOpts(main, "-XX:+UseSerialGC");
         RunUtil.runTestClearGcOpts(main, "-XX:+UseParallelGC");
         RunUtil.runTestClearGcOpts(main, "-XX:+UseG1GC");
-        RunUtil.runTestClearGcOpts(main, "-XX:+UseConcMarkSweepGC");
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            RunUtil.runTestClearGcOpts(main, "-XX:+UseConcMarkSweepGC");
+        }
     }
 
     static class PoolRecord {
diff --git a/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java
index da30cf34170..2348b51cc68 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -32,10 +32,12 @@
  * @requires vm.gc == "null"
  * @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
  * @requires vm.opt.DisableExplicitGC != "true"
- * @library /lib/testlibrary/
+ * @library /lib/testlibrary/ /test/lib
  *
  * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil
- * @run main/timeout=600 LowMemoryTest
+ * @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
  */
 
 import java.lang.management.*;
@@ -47,6 +49,8 @@ import jdk.testlibrary.ProcessTools;
 import jdk.testlibrary.JDKToolFinder;
 import jdk.testlibrary.Utils;
 
+import sun.hotspot.code.Compiler;
+
 public class LowMemoryTest {
     private static final MemoryMXBean mm = ManagementFactory.getMemoryMXBean();
     private static final List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
@@ -80,7 +84,9 @@ public class LowMemoryTest {
         traceTest(classMain + ", -XX:+UseSerialGC", nmFlag, lpFlag, "-XX:+UseSerialGC");
         traceTest(classMain + ", -XX:+UseParallelGC", nmFlag, lpFlag, "-XX:+UseParallelGC");
         traceTest(classMain + ", -XX:+UseG1GC", nmFlag, lpFlag, "-XX:+UseG1GC", g1Flag);
-        traceTest(classMain + ", -XX:+UseConcMarkSweepGC", nmFlag, lpFlag, "-XX:+UseConcMarkSweepGC");
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            traceTest(classMain + ", -XX:+UseConcMarkSweepGC", nmFlag, lpFlag, "-XX:+UseConcMarkSweepGC");
+        }
     }
 
     /*
diff --git a/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh
index 563ffe326f0..883783b3d74 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh
+++ b/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2015, 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
@@ -27,7 +27,7 @@
 # @summary Run MemoryManagement test with concurrent mark sweep GC
 # @author  Mandy Chung
 #
-# @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+# @requires (vm.gc=="ConcMarkSweep" | vm.gc=="null") & !vm.graal.enabled
 #
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementConcMarkSweepGC.sh
diff --git a/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java b/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
index 340c1b6e636..84434ad5829 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
@@ -26,10 +26,11 @@
  * @bug     4530538
  * @summary Basic unit test of MemoryMXBean.getMemoryPools() and
  *          MemoryMXBean.getMemoryManager().
+ * @requires vm.gc != "Z"
  * @author  Mandy Chung
  *
  * @modules jdk.management
- * @run main MemoryTest 2
+ * @run main MemoryTest 2 3
  */
 
 /*
@@ -65,17 +66,24 @@ public class MemoryTest {
     // - Code cache (between one and three depending on the -XX:SegmentedCodeCache option)
     // - Metaspace
     // - Compressed Class Space (if compressed class pointers are used)
-    private static int[] expectedMinNumPools = {3, 2};
-    private static int[] expectedMaxNumPools = {3, 5};
-    private static int expectedNumGCMgrs = 2;
-    private static int expectedNumMgrs = expectedNumGCMgrs + 2;
+
+    private static int[] expectedMinNumPools = new int[2];
+    private static int[] expectedMaxNumPools = new int[2];
+    private static int expectedNumGCMgrs;
+    private static int expectedNumMgrs;
     private static String[] types = { "heap", "non-heap" };
 
     public static void main(String args[]) throws Exception {
-        Integer value = new Integer(args[0]);
-        expectedNumGCMgrs = value.intValue();
+        expectedNumGCMgrs = Integer.valueOf(args[0]);
         expectedNumMgrs = expectedNumGCMgrs + 2;
 
+        int expectedNumPools = Integer.valueOf(args[1]);
+        expectedMinNumPools[HEAP] = expectedNumPools;
+        expectedMaxNumPools[HEAP] = expectedNumPools;
+
+        expectedMinNumPools[NONHEAP] = 2;
+        expectedMaxNumPools[NONHEAP] = 5;
+
         checkMemoryPools();
         checkMemoryManagers();
         if (testFailed)
diff --git a/test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh
index d66ba73b4c0..ed330b2840e 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh
+++ b/test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh
@@ -49,10 +49,10 @@ runOne()
 }
 
 # Test MemoryTest with default collector
-runOne MemoryTest 2
+runOne MemoryTest 2 3
 
 # Test MemoryTest with parallel scavenger collector
-runOne -XX:+UseParallelGC MemoryTest 2
+runOne -XX:+UseParallelGC MemoryTest 2 3
 
 
 exit 0
diff --git a/test/jdk/java/lang/management/MemoryMXBean/MemoryTestZGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryTestZGC.sh
new file mode 100644
index 00000000000..7126ca5d0e8
--- /dev/null
+++ b/test/jdk/java/lang/management/MemoryMXBean/MemoryTestZGC.sh
@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2003, 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.
+#
+
+#
+# @test
+# @requires vm.gc.Z
+# @run compile MemoryTest.java
+# @run shell MemoryTestZGC.sh
+#
+
+#Set appropriate jdk
+
+if [ ! -z "${TESTJAVA}" ] ; then
+     jdk="$TESTJAVA"
+else
+     echo "--Error: TESTJAVA must be defined as the pathname of a jdk to test."
+     exit 1
+fi
+
+runOne()
+{
+   echo "runOne $@"
+   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2
+}
+
+# Test MemoryTest with ZGC. ZGC is a single generation GC, which means
+# it has one memory manager and one memory pool.
+runOne -XX:+UnlockExperimentalVMOptions -XX:+UseZGC MemoryTest 1 1
+
+exit 0
diff --git a/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java b/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
index 8e86042ac6d..9427c17b54b 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -34,17 +34,21 @@
  *
  * @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
  * @requires vm.opt.DisableExplicitGC != "true"
- * @library /lib/testlibrary/
+ * @library /lib/testlibrary/ /test/lib
  * @modules jdk.management
  *
  * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
- * @run main ResetPeakMemoryUsage
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. ResetPeakMemoryUsage
  */
 
 import java.lang.management.*;
 import java.lang.ref.WeakReference;
 import java.util.*;
 
+import sun.hotspot.code.Compiler;
+
 public class ResetPeakMemoryUsage {
     private static MemoryMXBean mbean = ManagementFactory.getMemoryMXBean();
     // make public so that it can't be optimized away easily
@@ -59,7 +63,9 @@ public class ResetPeakMemoryUsage {
         final String main = "ResetPeakMemoryUsage$TestMain";
         final String ms = "-Xms256m";
         final String mn = "-Xmn8m";
-        RunUtil.runTestClearGcOpts(main, ms, mn, "-XX:+UseConcMarkSweepGC");
+        if (!Compiler.isGraalEnabled()) { // Graal does not support CMS
+            RunUtil.runTestClearGcOpts(main, ms, mn, "-XX:+UseConcMarkSweepGC");
+        }
         RunUtil.runTestClearGcOpts(main, ms, mn, "-XX:+UseParallelGC");
         RunUtil.runTestClearGcOpts(main, ms, mn, "-XX:+UseG1GC", "-XX:G1HeapRegionSize=1m");
         RunUtil.runTestClearGcOpts(main, ms, mn, "-XX:+UseSerialGC",
diff --git a/test/jdk/java/net/Socket/ReadAfterReset.java b/test/jdk/java/net/Socket/ReadAfterReset.java
new file mode 100644
index 00000000000..7c2e09bc965
--- /dev/null
+++ b/test/jdk/java/net/Socket/ReadAfterReset.java
@@ -0,0 +1,140 @@
+/*
+ * 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
+ * @requires (os.family == "linux" | os.family == "mac")
+ * @bug 8203937
+ * @summary Test reading bytes from a socket after the connection has been
+ *          reset by the peer
+ */
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+/**
+ * This test exercises platform specific and unspecified behavior. It exists
+ * only to ensure that the behavior doesn't change between JDK releases.
+ */
+
+public class ReadAfterReset {
+    private static final PrintStream out = System.out;
+
+    // number of bytes to write before the connection reset
+    private static final int NUM_BYTES_TO_WRITE = 1000;
+
+    public static void main(String[] args) throws IOException {
+        try (ServerSocket ss = new ServerSocket()) {
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+
+            /**
+             * Connect to the server which will write some bytes and reset the
+             * connection. The client then attempts to read the bytes sent by
+             * the server before it closed the connection.
+             */
+            out.println("Test connection ...");
+            try (Socket s = new Socket()) {
+                s.connect(ss.getLocalSocketAddress());
+                int nwrote = acceptAndResetConnection(ss);
+                int nread = readUntilIOException(s);
+                if (nread != nwrote) {
+                    throw new RuntimeException("Client read " + nread + ", expected " + nwrote);
+                }
+            }
+
+            /**
+             * Connect to the server which will write some bytes and reset the
+             * connection. The client then writes to its end of the connection,
+             * failing as the connection is reset. It then attempts to read the
+             * bytes sent by the server before it closed the connection.
+             */
+            out.println();
+            out.println("Test connection ...");
+            try (Socket s = new Socket()) {
+                s.connect(ss.getLocalSocketAddress());
+                int nwrote = acceptAndResetConnection(ss);
+                writeUntilIOException(s);
+                int nread = readUntilIOException(s);
+                if (nread != nwrote) {
+                    throw new RuntimeException("Client read " + nread + ", expected " + nwrote);
+                }
+            }
+        }
+    }
+
+    /**
+     * Accept a connection, write bytes, and then reset the connection
+     */
+    static int acceptAndResetConnection(ServerSocket ss) throws IOException {
+        int count = NUM_BYTES_TO_WRITE;
+        try (Socket peer = ss.accept()) {
+            peer.getOutputStream().write(new byte[count]);
+            peer.setSoLinger(true, 0);
+            out.format("Server wrote %d bytes and reset connection%n", count);
+        }
+        return count;
+    }
+
+    /**
+     * Write bytes to a socket until I/O exception is thrown
+     */
+    static void writeUntilIOException(Socket s) {
+        try {
+            byte[] bytes = new byte[100];
+            while (true) {
+                s.getOutputStream().write(bytes);
+                out.format("Client wrote %d bytes%n", bytes.length);
+            }
+        } catch (IOException ioe) {
+            out.format("Client write failed: %s (expected)%n", ioe);
+        }
+    }
+
+    /**
+     * Read bytes from a socket until I/O exception is thrown.
+     *
+     * @return the number of bytes read before the I/O exception was thrown
+     */
+    static int readUntilIOException(Socket s) {
+        int nread = 0;
+        try {
+            byte[] bytes = new byte[100];
+            while (true) {
+                int n = s.getInputStream().read(bytes);
+                if (n < 0) {
+                    out.println("Client read EOF");
+                    break;
+                } else {
+                    out.format("Client read %s bytes%n", n);
+                    nread += n;
+                }
+            }
+        } catch (IOException ioe) {
+            out.format("Client read failed: %s (expected)%n", ioe);
+        }
+        return nread;
+    }
+}
diff --git a/test/jdk/java/net/SocketOption/TcpKeepAliveTest.java b/test/jdk/java/net/SocketOption/TcpKeepAliveTest.java
new file mode 100644
index 00000000000..6ee8b78b9a3
--- /dev/null
+++ b/test/jdk/java/net/SocketOption/TcpKeepAliveTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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 8194298
+ * @summary Add support for per Socket configuration of TCP keepalive
+ * @modules jdk.net
+ * @run main TcpKeepAliveTest
+ */
+import java.io.IOException;
+import java.net.DatagramSocket;
+import java.net.MulticastSocket;
+import java.net.ServerSocket;
+import java.net.Socket;
+import jdk.net.ExtendedSocketOptions;
+
+public class TcpKeepAliveTest {
+
+    private static final String LOCAL_HOST = "127.0.0.1";
+    private static final int DEFAULT_KEEP_ALIVE_PROBES = 7;
+    private static final int DEFAULT_KEEP_ALIVE_TIME = 1973;
+    private static final int DEFAULT_KEEP_ALIVE_INTVL = 53;
+
+    public static void main(String args[]) throws IOException {
+
+        try (ServerSocket ss = new ServerSocket(0);
+                Socket s = new Socket(LOCAL_HOST, ss.getLocalPort());
+                DatagramSocket ds = new DatagramSocket(0);
+                MulticastSocket mc = new MulticastSocket(0)) {
+            if (ss.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPIDLE)) {
+                ss.setOption(ExtendedSocketOptions.TCP_KEEPIDLE, DEFAULT_KEEP_ALIVE_TIME);
+                if (ss.getOption(ExtendedSocketOptions.TCP_KEEPIDLE) != DEFAULT_KEEP_ALIVE_TIME) {
+                    throw new RuntimeException("Test failed, TCP_KEEPIDLE should have been " + DEFAULT_KEEP_ALIVE_TIME);
+                }
+            }
+            if (ss.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPCOUNT)) {
+                ss.setOption(ExtendedSocketOptions.TCP_KEEPCOUNT, DEFAULT_KEEP_ALIVE_PROBES);
+                if (ss.getOption(ExtendedSocketOptions.TCP_KEEPCOUNT) != DEFAULT_KEEP_ALIVE_PROBES) {
+                    throw new RuntimeException("Test failed, TCP_KEEPCOUNT should have been " + DEFAULT_KEEP_ALIVE_PROBES);
+                }
+            }
+            if (ss.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPINTERVAL)) {
+                ss.setOption(ExtendedSocketOptions.TCP_KEEPINTERVAL, DEFAULT_KEEP_ALIVE_INTVL);
+                if (ss.getOption(ExtendedSocketOptions.TCP_KEEPINTERVAL) != DEFAULT_KEEP_ALIVE_INTVL) {
+                    throw new RuntimeException("Test failed, TCP_KEEPINTERVAL should have been " + DEFAULT_KEEP_ALIVE_INTVL);
+                }
+            }
+            if (s.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPIDLE)) {
+                s.setOption(ExtendedSocketOptions.TCP_KEEPIDLE, DEFAULT_KEEP_ALIVE_TIME);
+                if (s.getOption(ExtendedSocketOptions.TCP_KEEPIDLE) != DEFAULT_KEEP_ALIVE_TIME) {
+                    throw new RuntimeException("Test failed, TCP_KEEPIDLE should have been " + DEFAULT_KEEP_ALIVE_TIME);
+                }
+            }
+            if (s.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPCOUNT)) {
+                s.setOption(ExtendedSocketOptions.TCP_KEEPCOUNT, DEFAULT_KEEP_ALIVE_PROBES);
+                if (s.getOption(ExtendedSocketOptions.TCP_KEEPCOUNT) != DEFAULT_KEEP_ALIVE_PROBES) {
+                    throw new RuntimeException("Test failed, TCP_KEEPCOUNT should have been " + DEFAULT_KEEP_ALIVE_PROBES);
+                }
+            }
+            if (s.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPINTERVAL)) {
+                s.setOption(ExtendedSocketOptions.TCP_KEEPINTERVAL, DEFAULT_KEEP_ALIVE_INTVL);
+                if (s.getOption(ExtendedSocketOptions.TCP_KEEPINTERVAL) != DEFAULT_KEEP_ALIVE_INTVL) {
+                    throw new RuntimeException("Test failed, TCP_KEEPINTERVAL should have been " + DEFAULT_KEEP_ALIVE_INTVL);
+                }
+            }
+            if (ds.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPCOUNT)) {
+                throw new RuntimeException("Test failed, TCP_KEEPCOUNT is applicable"
+                        + " for TCP Sockets only.");
+            }
+            if (ds.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPIDLE)) {
+                throw new RuntimeException("Test failed, TCP_KEEPIDLE is applicable"
+                        + " for TCP Sockets only.");
+            }
+            if (ds.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPINTERVAL)) {
+                throw new RuntimeException("Test failed, TCP_KEEPINTERVAL is applicable"
+                        + " for TCP Sockets only.");
+            }
+            if (mc.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPCOUNT)) {
+                throw new RuntimeException("Test failed, TCP_KEEPCOUNT is applicable"
+                        + " for TCP Sockets only");
+            }
+            if (mc.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPIDLE)) {
+                throw new RuntimeException("Test failed, TCP_KEEPIDLE is applicable"
+                        + " for TCP Sockets only");
+            }
+            if (mc.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPINTERVAL)) {
+                throw new RuntimeException("Test failed, TCP_KEEPINTERVAL is applicable"
+                        + " for TCP Sockets only");
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
index c3450df7d23..aeb83f132dd 100644
--- a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
+++ b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4607272 6842687
  * @summary Unit test for AsynchronousServerSocketChannel
+ * @modules jdk.net
  * @run main/timeout=180 Basic
  */
 
@@ -31,10 +32,14 @@ import java.nio.channels.*;
 import java.net.*;
 import static java.net.StandardSocketOptions.*;
 import java.io.IOException;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicReference;
+import static jdk.net.ExtendedSocketOptions.TCP_KEEPCOUNT;
+import static jdk.net.ExtendedSocketOptions.TCP_KEEPIDLE;
+import static jdk.net.ExtendedSocketOptions.TCP_KEEPINTERVAL;
 
 public class Basic {
 
@@ -166,6 +171,16 @@ public class Basic {
                 ch.setOption(SO_REUSEPORT, false);
                 checkOption(ch, SO_REUSEPORT, false);
             }
+            List<? extends SocketOption> extOptions = List.of(TCP_KEEPCOUNT,
+                    TCP_KEEPIDLE, TCP_KEEPINTERVAL);
+            if (options.containsAll(extOptions)) {
+                ch.setOption(TCP_KEEPIDLE, 1234);
+                checkOption(ch, TCP_KEEPIDLE, 1234);
+                ch.setOption(TCP_KEEPINTERVAL, 123);
+                checkOption(ch, TCP_KEEPINTERVAL, 123);
+                ch.setOption(TCP_KEEPCOUNT, 7);
+                checkOption(ch, TCP_KEEPCOUNT, 7);
+            }
         } finally {
             ch.close();
         }
diff --git a/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java
index 2b67f4ee7d9..3d512e3bafd 100644
--- a/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java
+++ b/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java
@@ -25,9 +25,10 @@
  * @bug 4607272 6842687 6878369 6944810 7023403
  * @summary Unit test for AsynchronousSocketChannel(use -Dseed=X to set PRNG seed)
  * @library /test/lib
+ * @modules jdk.net
+ * @key randomness intermittent
  * @build jdk.test.lib.RandomFactory jdk.test.lib.Utils
  * @run main/othervm/timeout=600 Basic -skipSlowConnectTest
- * @key randomness intermittent
  */
 
 import java.io.Closeable;
@@ -41,6 +42,10 @@ import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import jdk.test.lib.RandomFactory;
+import java.util.List;
+import static jdk.net.ExtendedSocketOptions.TCP_KEEPCOUNT;
+import static jdk.net.ExtendedSocketOptions.TCP_KEEPIDLE;
+import static jdk.net.ExtendedSocketOptions.TCP_KEEPINTERVAL;
 
 public class Basic {
     private static final Random RAND = RandomFactory.getRandom();
@@ -183,9 +188,26 @@ public class Basic {
                 if (!ch.setOption(SO_REUSEPORT, true).getOption(SO_REUSEPORT))
                     throw new RuntimeException("SO_REUSEPORT did not change");
             }
+            List<? extends SocketOption> extOptions = List.of(TCP_KEEPCOUNT,
+                    TCP_KEEPIDLE, TCP_KEEPINTERVAL);
+            if (options.containsAll(extOptions)) {
+                ch.setOption(TCP_KEEPIDLE, 1234);
+                checkOption(ch, TCP_KEEPIDLE, 1234);
+                ch.setOption(TCP_KEEPINTERVAL, 123);
+                checkOption(ch, TCP_KEEPINTERVAL, 123);
+                ch.setOption(TCP_KEEPCOUNT, 7);
+                checkOption(ch, TCP_KEEPCOUNT, 7);
+            }
         }
     }
 
+    static void checkOption(AsynchronousSocketChannel sc, SocketOption name, Object expectedValue)
+            throws IOException {
+        Object value = sc.getOption(name);
+        if (!value.equals(expectedValue)) {
+            throw new RuntimeException("value not as expected");
+        }
+    }
     static void testConnect() throws Exception {
         System.out.println("-- connect --");
 
diff --git a/test/jdk/java/nio/channels/SelectionKey/AtomicUpdates.java b/test/jdk/java/nio/channels/SelectionKey/AtomicUpdates.java
new file mode 100644
index 00000000000..aa986c1d976
--- /dev/null
+++ b/test/jdk/java/nio/channels/SelectionKey/AtomicUpdates.java
@@ -0,0 +1,186 @@
+/*
+ * 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.
+ */
+
+/* @test
+ * @bug 6350055
+ * @run testng AtomicUpdates
+ * @summary Unit test for SelectionKey interestOpsOr and interestOpsAnd
+ */
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import org.testng.annotations.Test;
+
+import static java.nio.channels.SelectionKey.OP_READ;
+import static java.nio.channels.SelectionKey.OP_WRITE;
+import static java.nio.channels.SelectionKey.OP_CONNECT;
+import static java.nio.channels.SelectionKey.OP_ACCEPT;
+import static org.testng.Assert.*;
+
+@Test
+public class AtomicUpdates {
+
+    private SelectionKey keyFor(SocketChannel sc) {
+        return new SelectionKey() {
+            private int ops;
+            private boolean invalid;
+            private void ensureValid() {
+                if (!isValid())
+                    throw new CancelledKeyException();
+            }
+            @Override
+            public SelectableChannel channel() {
+                return sc;
+            }
+            @Override
+            public Selector selector() {
+                throw new RuntimeException();
+            }
+            @Override
+            public boolean isValid() {
+                return !invalid;
+            }
+            @Override
+            public void cancel() {
+                invalid = true;
+            }
+            @Override
+            public int interestOps() {
+                ensureValid();
+                return ops;
+            }
+            @Override
+            public SelectionKey interestOps(int ops) {
+                ensureValid();
+                if ((ops & ~channel().validOps()) != 0)
+                    throw new IllegalArgumentException();
+                this.ops = ops;
+                return this;
+            }
+            @Override
+            public int readyOps() {
+                ensureValid();
+                return 0;
+            }
+        };
+    }
+
+    private void test(SelectionKey key) {
+        assertTrue(key.channel() instanceof SocketChannel);
+        key.interestOps(0);
+
+        // 0 -> 0
+        int previous = key.interestOpsOr(0);
+        assertTrue(previous == 0);
+        assertTrue(key.interestOps() == 0);
+
+        // 0 -> OP_CONNECT
+        previous = key.interestOpsOr(OP_CONNECT);
+        assertTrue(previous == 0);
+        assertTrue(key.interestOps() == OP_CONNECT);
+
+        // OP_CONNECT -> OP_CONNECT
+        previous = key.interestOpsOr(0);
+        assertTrue(previous == OP_CONNECT);
+        assertTrue(key.interestOps() == OP_CONNECT);
+
+        // OP_CONNECT -> OP_CONNECT | OP_READ | OP_WRITE
+        previous = key.interestOpsOr(OP_READ | OP_WRITE);
+        assertTrue(previous == OP_CONNECT);
+        assertTrue(key.interestOps() == (OP_CONNECT | OP_READ | OP_WRITE));
+
+        // OP_CONNECT | OP_READ | OP_WRITE -> OP_CONNECT
+        previous = key.interestOpsAnd(~(OP_READ | OP_WRITE));
+        assertTrue(previous == (OP_CONNECT | OP_READ | OP_WRITE));
+        assertTrue(key.interestOps() == OP_CONNECT);
+
+        // OP_CONNECT -> 0
+        previous = key.interestOpsAnd(~OP_CONNECT);
+        assertTrue(previous == OP_CONNECT);
+        assertTrue(key.interestOps() == 0);
+
+        // OP_READ | OP_WRITE -> OP_READ | OP_WRITE
+        key.interestOps(OP_READ | OP_WRITE);
+        previous = key.interestOpsAnd(~OP_ACCEPT);
+        assertTrue(previous == (OP_READ | OP_WRITE));
+        assertTrue(key.interestOps() == (OP_READ | OP_WRITE));
+
+        // OP_READ | OP_WRITE -> 0
+        previous = key.interestOpsAnd(0);
+        assertTrue(previous == (OP_READ | OP_WRITE));
+        assertTrue(key.interestOps() == 0);
+
+        // 0 -> 0
+        previous = key.interestOpsAnd(0);
+        assertTrue(previous == 0);
+        assertTrue(key.interestOps() == 0);
+
+        try {
+            key.interestOpsOr(OP_ACCEPT);
+            fail("IllegalArgumentException expected");
+        } catch (IllegalArgumentException expected) { }
+
+        key.cancel();
+        try {
+            key.interestOpsOr(OP_READ);
+            fail("CancelledKeyException expected");
+        } catch (CancelledKeyException expected) { }
+        try {
+            key.interestOpsAnd(~OP_READ);
+            fail("CancelledKeyException expected");
+        } catch (CancelledKeyException expected) { }
+    }
+
+    /**
+     * Test default implementation of interestOpsOr/interestOpsAnd
+     */
+    public void testDefaultImplementation() throws Exception {
+        try (SocketChannel sc = SocketChannel.open()) {
+            SelectionKey key = keyFor(sc);
+            test(key);
+        }
+    }
+
+    /**
+     * Test the default provider implementation of SelectionKey.
+     */
+    public void testNioImplementation() throws Exception {
+        try (SocketChannel sc = SocketChannel.open();
+             Selector sel = Selector.open()) {
+            sc.configureBlocking(false);
+            SelectionKey key = sc.register(sel, 0);
+            test(key);
+        }
+    }
+}
+
diff --git a/test/jdk/java/nio/channels/Selector/SelectAndClose.java b/test/jdk/java/nio/channels/Selector/SelectAndClose.java
index 747afbedbae..e3b8cc25a2b 100644
--- a/test/jdk/java/nio/channels/Selector/SelectAndClose.java
+++ b/test/jdk/java/nio/channels/Selector/SelectAndClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2017, 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
@@ -22,63 +22,68 @@
  */
 
 /* @test
- * @bug 5004077
+ * @bug 5004077 8203765
  * @summary Check blocking of select and close
  */
 
-import java.nio.channels.*;
 import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MonitorInfo;
+import java.lang.management.ThreadInfo;
+import java.nio.channels.Selector;
 
 public class SelectAndClose {
     static Selector selector;
     static volatile boolean awakened = false;
-    static volatile boolean closed = false;
+
+    private static boolean mightHoldLock(Thread t, Object lock) {
+        long tid = t.getId();
+        int hash = System.identityHashCode(lock);
+        ThreadInfo ti = ManagementFactory.getThreadMXBean().
+            getThreadInfo(new long[]{ tid} , true, false, 100)[0];
+        if (ti != null) {
+            for (MonitorInfo mi : ti.getLockedMonitors()) {
+                if (mi.getIdentityHashCode() == hash)
+                    return true;
+            }
+        }
+        return false;
+    }
 
     public static void main(String[] args) throws Exception {
         selector = Selector.open();
 
         // Create and start a selector in a separate thread.
-        final CountDownLatch selectLatch = new CountDownLatch(1);
-        new Thread(new Runnable() {
+        Thread selectThread = new Thread(new Runnable() {
                 public void run() {
                     try {
-                        selectLatch.countDown();
                         selector.select();
                         awakened = true;
                     } catch (IOException e) {
-                        System.err.println(e);
-                    }
-                }
-            }).start();
-
-        // Wait for above thread to get to select() before we call close.
-        selectLatch.await();
-        Thread.sleep(2000);
-
-        // Try to close. This should wakeup select.
-        Thread closeThread = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        selector.close();
-                        closed = true;
-                    } catch (IOException e) {
-                        System.err.println(e);
+                        e.printStackTrace();
                     }
                 }
             });
-        closeThread.start();
+        selectThread.start();
 
-        // Wait for select() to be awakened, which should be done by close.
-        closeThread.join();
+        // Spin until the monitor of the selected-key set is likely held
+        // as selected operations are specified to synchronize on the
+        // selected-key set.
+        while (!mightHoldLock(selectThread, selector.selectedKeys())) {
+            Thread.sleep(50);
+        }
+
+        // Close the selector.
+        selector.close();
 
         if (!awakened)
             selector.wakeup();
 
-        // Correct result is true and true
-        if (!awakened)
-            throw new RuntimeException("Select did not wake up");
-        if (!closed)
-            throw new RuntimeException("Selector did not close");
+        // Wait for select() thread to finish.
+        selectThread.join();
+
+        if (!awakened) {
+            throw new RuntimeException("Select did not awaken!");
+        }
     }
 }
diff --git a/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java b/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java
index 126d669d4c2..16363194d99 100644
--- a/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java
+++ b/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,20 +25,25 @@
  * @bug 4640544 8044773
  * @summary Unit test for ServerSocketChannel setOption/getOption/options
  *          methods.
+ * @modules jdk.net
  * @requires !vm.graal.enabled
  * @run main SocketOptionTests
  * @run main/othervm --limit-modules=java.base SocketOptionTests
  */
 
-import java.nio.*;
 import java.nio.channels.*;
 import java.net.*;
 import java.io.IOException;
 import java.util.*;
 import static java.net.StandardSocketOptions.*;
+import static jdk.net.ExtendedSocketOptions.*;
 
 public class SocketOptionTests {
 
+    private static final int DEFAULT_KEEP_ALIVE_PROBES = 7;
+    private static final int DEFAULT_KEEP_ALIVE_TIME = 1973;
+    private static final int DEFAULT_KEEP_ALIVE_INTVL = 53;
+
     static void checkOption(ServerSocketChannel ssc, SocketOption name, Object expectedValue)
         throws IOException
     {
@@ -76,6 +81,16 @@ public class SocketOptionTests {
             ssc.setOption(SO_REUSEPORT, false);
             checkOption(ssc, SO_REUSEPORT, false);
         }
+        if (ssc.supportedOptions().containsAll(List.of(TCP_KEEPCOUNT,
+                TCP_KEEPIDLE, TCP_KEEPINTERVAL))) {
+            ssc.setOption(TCP_KEEPCOUNT, DEFAULT_KEEP_ALIVE_PROBES);
+            checkOption(ssc, TCP_KEEPCOUNT, DEFAULT_KEEP_ALIVE_PROBES);
+            ssc.setOption(TCP_KEEPIDLE, DEFAULT_KEEP_ALIVE_TIME);
+            checkOption(ssc, TCP_KEEPIDLE, DEFAULT_KEEP_ALIVE_TIME);
+            ssc.setOption(TCP_KEEPINTERVAL, DEFAULT_KEEP_ALIVE_INTVL);
+            checkOption(ssc, TCP_KEEPINTERVAL, DEFAULT_KEEP_ALIVE_INTVL);
+
+        }
 
         // NullPointerException
         try {
diff --git a/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java b/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java
index 38b242bb4d3..4307f39f939 100644
--- a/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java
+++ b/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,17 +25,21 @@
  * @bug 4640544 8044773
  * @summary Unit test to check SocketChannel setOption/getOption/options
  *          methods.
+ * @modules java.base/sun.net.ext
+ *          jdk.net
  * @requires !vm.graal.enabled
  * @run main SocketOptionTests
  * @run main/othervm --limit-modules=java.base SocketOptionTests
  */
 
-import java.nio.*;
 import java.nio.channels.*;
 import java.net.*;
 import java.io.IOException;
 import java.util.*;
 import static java.net.StandardSocketOptions.*;
+import static jdk.net.ExtendedSocketOptions.*;
+import static sun.net.ext.ExtendedSocketOptions.SOCK_STREAM;
+import sun.net.ext.ExtendedSocketOptions;
 
 public class SocketOptionTests {
 
@@ -52,8 +56,20 @@ public class SocketOptionTests {
 
         // check supported options
         Set<SocketOption<?>> options = sc.supportedOptions();
-        List<? extends SocketOption> expected = Arrays.asList(SO_SNDBUF, SO_RCVBUF,
-            SO_KEEPALIVE, SO_REUSEADDR, SO_LINGER, TCP_NODELAY);
+
+        List<? extends SocketOption> extOptions = List.of(TCP_KEEPCOUNT,
+                TCP_KEEPIDLE, TCP_KEEPINTERVAL);
+        List<? extends SocketOption> expected;
+        boolean keepAliveOptsupported;
+        if (keepAliveOptsupported=ExtendedSocketOptions.options(SOCK_STREAM)
+                .containsAll(extOptions)) {
+            expected = Arrays.asList(SO_SNDBUF, SO_RCVBUF, SO_KEEPALIVE,
+                    SO_REUSEADDR, SO_LINGER, TCP_NODELAY, TCP_KEEPCOUNT,
+                    TCP_KEEPIDLE, TCP_KEEPINTERVAL);
+        } else {
+            expected = Arrays.asList(SO_SNDBUF, SO_RCVBUF, SO_KEEPALIVE,
+                    SO_REUSEADDR, SO_LINGER, TCP_NODELAY);
+        }
         for (SocketOption opt: expected) {
             if (!options.contains(opt))
                 throw new RuntimeException(opt.name() + " should be supported");
@@ -117,7 +133,14 @@ public class SocketOptionTests {
             throw new RuntimeException("expected linger to be disabled");
         sc.setOption(TCP_NODELAY, true);        // can't check
         sc.setOption(TCP_NODELAY, false);       // can't check
-
+        if (keepAliveOptsupported) {
+            sc.setOption(TCP_KEEPIDLE, 1234);
+            checkOption(sc, TCP_KEEPIDLE, 1234);
+            sc.setOption(TCP_KEEPINTERVAL, 123);
+            checkOption(sc, TCP_KEEPINTERVAL, 123);
+            sc.setOption(TCP_KEEPCOUNT, 7);
+            checkOption(sc, TCP_KEEPCOUNT, 7);
+        }
         // NullPointerException
         try {
             sc.setOption(null, "value");
diff --git a/test/jdk/java/nio/file/Files/CopyAndMove.java b/test/jdk/java/nio/file/Files/CopyAndMove.java
index ce9f681d4f7..1b7362fe93f 100644
--- a/test/jdk/java/nio/file/Files/CopyAndMove.java
+++ b/test/jdk/java/nio/file/Files/CopyAndMove.java
@@ -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
@@ -22,24 +22,25 @@
  */
 
 /* @test
- * @bug 4313887 6838333 6917021 7006126 6950237 8006645
+ * @bug 4313887 6838333 6917021 7006126 6950237 8006645 8201407
  * @summary Unit test for java.nio.file.Files copy and move methods (use -Dseed=X to set PRNG seed)
  * @library .. /test/lib
- * @build jdk.test.lib.RandomFactory
+ * @build jdk.test.lib.Platform jdk.test.lib.RandomFactory
  *        CopyAndMove PassThroughFileSystem
  * @run main/othervm CopyAndMove
  * @key randomness
  */
 
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.file.*;
 import static java.nio.file.Files.*;
 import static java.nio.file.StandardCopyOption.*;
 import static java.nio.file.LinkOption.*;
 import java.nio.file.attribute.*;
-import java.io.*;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import jdk.test.lib.Platform;
 import jdk.test.lib.RandomFactory;
 
 public class CopyAndMove {
@@ -169,8 +170,7 @@ public class CopyAndMove {
         Map<String,ByteBuffer> namedAttributes = null;
 
         // get file attributes of source file
-        String os = System.getProperty("os.name");
-        if (os.startsWith("Windows")) {
+        if (Platform.isWindows()) {
             dosAttributes = readAttributes(source, DosFileAttributes.class, NOFOLLOW_LINKS);
             basicAttributes = dosAttributes;
         } else {
@@ -448,6 +448,10 @@ public class CopyAndMove {
                 moveAndVerify(source, target);
                 throw new RuntimeException("IOException expected");
             } catch (IOException x) {
+                if (!(x instanceof DirectoryNotEmptyException)) {
+                    throw new RuntimeException
+                        ("DirectoryNotEmptyException expected", x);
+                }
             }
             delete(source.resolve("foo"));
             delete(source);
@@ -653,17 +657,14 @@ public class CopyAndMove {
             if (source.getFileSystem().provider() == target.getFileSystem().provider()) {
 
                 // check POSIX attributes are copied
-                String os = System.getProperty("os.name");
-                if ((os.equals("SunOS") || os.equals("Linux")) &&
-                    testPosixAttributes)
-                {
+                if (!Platform.isWindows() && testPosixAttributes) {
                     checkPosixAttributes(
                         readAttributes(source, PosixFileAttributes.class, linkOptions),
                         readAttributes(target, PosixFileAttributes.class, linkOptions));
                 }
 
                 // check DOS attributes are copied
-                if (os.startsWith("Windows")) {
+                if (Platform.isWindows()) {
                     checkDosAttributes(
                         readAttributes(source, DosFileAttributes.class, linkOptions),
                         readAttributes(target, DosFileAttributes.class, linkOptions));
@@ -921,9 +922,7 @@ public class CopyAndMove {
         /**
          * Test: Copy link to UNC (Windows only)
          */
-        if (supportsLinks &&
-            System.getProperty("os.name").startsWith("Windows"))
-        {
+        if (supportsLinks && Platform.isWindows()) {
             Path unc = Paths.get("\\\\rialto\\share\\file");
             link = dir1.resolve("link");
             createSymbolicLink(link, unc);
@@ -1156,12 +1155,14 @@ public class CopyAndMove {
 
     // "randomize" the file attributes of the given file.
     static void randomizeAttributes(Path file) throws IOException {
-        String os = System.getProperty("os.name");
-        boolean isWindows = os.startsWith("Windows");
-        boolean isUnix = os.equals("SunOS") || os.equals("Linux");
         boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
 
-        if (isUnix) {
+        if (Platform.isWindows()) {
+            DosFileAttributeView view =
+                getFileAttributeView(file, DosFileAttributeView.class, NOFOLLOW_LINKS);
+            // only set or unset the hidden attribute
+            view.setHidden(heads());
+        } else {
             Set<PosixFilePermission> perms =
                 getPosixFilePermissions(file, NOFOLLOW_LINKS);
             PosixFilePermission[] toChange = {
@@ -1182,18 +1183,12 @@ public class CopyAndMove {
             setPosixFilePermissions(file, perms);
         }
 
-        if (isWindows) {
-            DosFileAttributeView view =
-                getFileAttributeView(file, DosFileAttributeView.class, NOFOLLOW_LINKS);
-            // only set or unset the hidden attribute
-            view.setHidden(heads());
-        }
-
         boolean addUserDefinedFileAttributes = heads() &&
             getFileStore(file).supportsFileAttributeView("xattr");
 
         // remove this when copying a direcory copies its named streams
-        if (isWindows && isDirectory) addUserDefinedFileAttributes = false;
+        if (Platform.isWindows() && isDirectory)
+            addUserDefinedFileAttributes = false;
 
         if (addUserDefinedFileAttributes) {
             UserDefinedFileAttributeView view =
diff --git a/test/jdk/java/text/Format/DateFormat/WeekDateTest.java b/test/jdk/java/text/Format/DateFormat/WeekDateTest.java
index f38336be690..afa2bf84475 100644
--- a/test/jdk/java/text/Format/DateFormat/WeekDateTest.java
+++ b/test/jdk/java/text/Format/DateFormat/WeekDateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -137,20 +137,28 @@ public class WeekDateTest {
         Calendar jcal = Calendar.getInstance(TimeZone.getTimeZone("GMT"),
                                              new Locale("ja", "JP", "JP"));
 
+        String format = "2-W01-2"; // 2019-12-31 == N1-12-31
+        int expectedYear = 2019;
+        // Check the current era, Heisei or NewEra
+        if (System.currentTimeMillis() < 1556668800000L) {
+            format = "21-W01-3"; // 2008-12-31 == H20-12-31
+            expectedYear = 2008;
+        }
         jcal.setFirstDayOfWeek(MONDAY);
         jcal.setMinimalDaysInFirstWeek(4);
         SimpleDateFormat sdf = new SimpleDateFormat("Y-'W'ww-u");
         sdf.setCalendar(jcal);
-        Date d = sdf.parse("21-W01-3"); // 2008-12-31 == H20-12-31
+        Date d = sdf.parse(format);
         GregorianCalendar gcal = newCalendar();
         gcal.setTime(d);
-        if (gcal.get(YEAR) != 2008
+        if (gcal.get(YEAR) != expectedYear
             || gcal.get(MONTH) != DECEMBER
             || gcal.get(DAY_OF_MONTH) != 31) {
-            String s = String.format("noWeekDateSupport: got %04d-%02d-%02d, expected 2008-12-31%n",
+            String s = String.format("noWeekDateSupport: got %04d-%02d-%02d, expected %4d-12-31%n",
                                      gcal.get(YEAR),
                                      gcal.get(MONTH)+1,
-                                     gcal.get(DAY_OF_MONTH));
+                                     gcal.get(DAY_OF_MONTH),
+                                     expectedYear);
             throw new RuntimeException(s);
         }
     }
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
index 2bc1f4c8ce7..fbec5920f61 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ o Copyright (c) 2012, 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
@@ -111,6 +111,7 @@ import org.testng.annotations.Test;
  */
 @Test
 public class TCKJapaneseChronology {
+    private static final int YDIFF_NEWERA = 2018;
     private static final int YDIFF_HEISEI = 1988;
     private static final int YDIFF_MEIJI = 1867;
     private static final int YDIFF_SHOWA = 1925;
@@ -173,6 +174,7 @@ public class TCKJapaneseChronology {
     @DataProvider(name="createByEra")
     Object[][] data_createByEra() {
         return new Object[][] {
+                {JapaneseEra.of(3), 2020 - YDIFF_NEWERA, 2, 29, 60, LocalDate.of(2020, 2, 29)}, // NEWERA
                 {JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(1996, 2, 29)},
                 {JapaneseEra.HEISEI, 2000 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(2000, 2, 29)},
                 {JapaneseEra.MEIJI, 1874 - YDIFF_MEIJI, 2, 28, 59, LocalDate.of(1874, 2, 28)},
@@ -365,8 +367,11 @@ public class TCKJapaneseChronology {
     @DataProvider(name="prolepticYear")
     Object[][] data_prolepticYear() {
         return new Object[][] {
+                {3, JapaneseEra.of(3), 1, 1 + YDIFF_NEWERA, false}, // NEWERA
+                {3, JapaneseEra.of(3), 102, 102 + YDIFF_NEWERA, true}, // NEWERA
+
                 {2, JapaneseEra.HEISEI, 1, 1 + YDIFF_HEISEI, false},
-                {2, JapaneseEra.HEISEI, 100, 100 + YDIFF_HEISEI, true},
+                {2, JapaneseEra.HEISEI, 4, 4 + YDIFF_HEISEI, true},
 
                 {-1, JapaneseEra.MEIJI, 9, 9 + YDIFF_MEIJI, true},
                 {-1, JapaneseEra.MEIJI, 10, 10 + YDIFF_MEIJI, false},
@@ -548,6 +553,7 @@ public class TCKJapaneseChronology {
             { JapaneseEra.TAISHO, 0, "Taisho"},
             { JapaneseEra.SHOWA, 1, "Showa"},
             { JapaneseEra.HEISEI, 2, "Heisei"},
+            { JapaneseEra.of(3), 3, "NewEra"}, // NEWERA
         };
     }
 
@@ -562,7 +568,7 @@ public class TCKJapaneseChronology {
 
     @Test
     public void test_Japanese_badEras() {
-        int badEras[] = {-1000, -998, -997, -2, 3, 4, 1000};
+        int badEras[] = {-1000, -998, -997, -2, 4, 5, 1000};
         for (int badEra : badEras) {
             try {
                 Era era = JapaneseChronology.INSTANCE.eraOf(badEra);
@@ -683,6 +689,7 @@ public class TCKJapaneseChronology {
             {JapaneseChronology.INSTANCE.date(1989,  1,  7), "Japanese Showa 64-01-07"},
             {JapaneseChronology.INSTANCE.date(1989,  1,  8), "Japanese Heisei 1-01-08"},
             {JapaneseChronology.INSTANCE.date(2012, 12,  6), "Japanese Heisei 24-12-06"},
+            {JapaneseChronology.INSTANCE.date(2020,  1,  6), "Japanese NewEra 2-01-06"},
         };
     }
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java
index 8e2d341aaa5..f10770196bc 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -79,6 +79,7 @@ public class TCKJapaneseEra {
     @DataProvider(name = "JapaneseEras")
     Object[][] data_of_eras() {
         return new Object[][] {
+                    {JapaneseEra.of(3), "NewEra", 3}, // NEWERA
                     {JapaneseEra.HEISEI, "Heisei", 2},
                     {JapaneseEra.SHOWA, "Showa", 1},
                     {JapaneseEra.TAISHO, "Taisho", 0},
@@ -91,7 +92,7 @@ public class TCKJapaneseEra {
         return new Object[][] {
                 {-2},
                 {-3},
-                {3},
+                {4},
                 {Integer.MIN_VALUE},
                 {Integer.MAX_VALUE},
         };
diff --git a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java
index 3fbf8532318..08883cf2811 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 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
@@ -58,6 +58,8 @@ public class TestJapaneseChronology {
             { JapaneseEra.SHOWA,      1, 12, 25, 1926 },
             { JapaneseEra.SHOWA,     64,  1,  7, 1989 },
             { JapaneseEra.HEISEI,     1,  1,  8, 1989 },
+            { JapaneseEra.HEISEI,    31,  4, 30, 2019 },
+            { JapaneseEra.of(3),      1,  5,  1, 2019 }, // NEWERA
         };
     }
 
@@ -74,6 +76,8 @@ public class TestJapaneseChronology {
             { JapaneseEra.SHOWA,  64,    7,  1,  7 },
             { JapaneseEra.HEISEI,  1,    1,  1,  8 },
             { JapaneseEra.HEISEI,  2,    8,  1,  8 },
+            { JapaneseEra.HEISEI, 31,  120,  4, 30 },
+            { JapaneseEra.of(3),   1,    1,  5,  1 }, // NEWERA
         };
     }
 
@@ -81,8 +85,8 @@ public class TestJapaneseChronology {
     Object[][] rangeData() {
         return new Object[][] {
             // field, minSmallest, minLargest, maxSmallest, maxLargest
-            { ChronoField.ERA,         -1, -1, 2, 2},
-            { ChronoField.YEAR_OF_ERA, 1, 1, 15, 999999999-1989 }, // depends on the current era
+            { ChronoField.ERA,         -1, -1, 3, 3},
+            { ChronoField.YEAR_OF_ERA, 1, 1, 15, 999999999-2019}, // depends on the current era
             { ChronoField.DAY_OF_YEAR, 1, 1, 7, 366},
             { ChronoField.YEAR, 1873, 1873, 999999999, 999999999},
         };
@@ -105,7 +109,9 @@ public class TestJapaneseChronology {
             { JapaneseEra.SHOWA,     65,  1,  1 },
             { JapaneseEra.HEISEI,     1,  1,  7 },
             { JapaneseEra.HEISEI,     1,  2, 29 },
-            { JapaneseEra.HEISEI, Year.MAX_VALUE,  12, 31 },
+            { JapaneseEra.HEISEI,    31,  5,  1 },
+            { JapaneseEra.of(3),      1,  4, 30 }, // NEWERA
+            { JapaneseEra.of(3), Year.MAX_VALUE,  12, 31 }, // NEWERA
         };
     }
 
@@ -124,7 +130,10 @@ public class TestJapaneseChronology {
             { JapaneseEra.SHOWA,     65 },
             { JapaneseEra.HEISEI,    -1 },
             { JapaneseEra.HEISEI,     0 },
-            { JapaneseEra.HEISEI, Year.MAX_VALUE },
+            { JapaneseEra.HEISEI,    32 },
+            { JapaneseEra.of(3),     -1 }, // NEWERA
+            { JapaneseEra.of(3),      0 }, // NEWERA
+            { JapaneseEra.of(3), Year.MAX_VALUE }, // NEWERA
         };
     }
 
@@ -141,6 +150,9 @@ public class TestJapaneseChronology {
             { JapaneseEra.SHOWA,  64,   8 },
             { JapaneseEra.HEISEI,  1, 360 },
             { JapaneseEra.HEISEI,  2, 366 },
+            { JapaneseEra.HEISEI, 31, 121 },
+            { JapaneseEra.of(3),   1, 246 }, // NEWERA
+            { JapaneseEra.of(3),   2, 367 }, // NEWERA
         };
     }
 
diff --git a/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java b/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
index 0a596e9d129..f10a0da03b9 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
@@ -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
@@ -775,8 +775,10 @@ public class TestUmmAlQuraChronology {
             {HijrahDate.of(1350,5,15), "Japanese Showa 6-09-28"},
             {HijrahDate.of(1434,5,1), "Japanese Heisei 25-03-13"},
             {HijrahDate.of(1436,1,1), "Japanese Heisei 26-10-25"},
-            {HijrahDate.of(1500,6,12), "Japanese Heisei 89-05-05"},
-            {HijrahDate.of(1550,3,11), "Japanese Heisei 137-08-11"},
+            {HijrahDate.of(1440,8,25), "Japanese Heisei 31-04-30"},
+            {HijrahDate.of(1440,8,26), "Japanese NewEra 1-05-01"},
+            {HijrahDate.of(1500,6,12), "Japanese NewEra 59-05-05"},
+            {HijrahDate.of(1550,3,11), "Japanese NewEra 107-08-11"},
         };
     }
 
diff --git a/test/jdk/java/util/Calendar/Bug8007038.java b/test/jdk/java/util/Calendar/Bug8007038.java
index 80313e53f8b..64a59d379c3 100644
--- a/test/jdk/java/util/Calendar/Bug8007038.java
+++ b/test/jdk/java/util/Calendar/Bug8007038.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 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
@@ -46,7 +46,7 @@ public class Bug8007038 {
     private static final int[][] eraMinMax = {
         {GregorianCalendar.BC, GregorianCalendar.AD},
         {0, 1},
-        {0, 4},
+        {0, 5},
         {0, 1},
         {0, 1},
         {0, 1},
diff --git a/test/jdk/java/util/Calendar/Builder/BuilderTest.java b/test/jdk/java/util/Calendar/Builder/BuilderTest.java
index 13036d43999..e78bddb2dd7 100644
--- a/test/jdk/java/util/Calendar/Builder/BuilderTest.java
+++ b/test/jdk/java/util/Calendar/Builder/BuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 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
@@ -27,6 +27,7 @@
  * @summary Unit test for Calendar.Builder.
  */
 
+import java.time.LocalDateTime;
 import java.util.*;
 import static java.util.Calendar.*;
 
@@ -132,7 +133,11 @@ public class BuilderTest {
                 .setFields(YEAR, 1, DAY_OF_YEAR, 1).build();
             expected = Calendar.getInstance(jaJPJP);
             expected.clear();
-            expected.set(1, JANUARY, 8);
+            if (LocalDateTime.now().isBefore(LocalDateTime.of(2019, 5, 1, 0, 0))) {
+                expected.set(1, JANUARY, 8);
+            } else {
+                expected.set(1, MAY, 1);
+            }
             check(cal, expected);
             // setLocale
             calb = builder();
diff --git a/test/jdk/java/util/Calendar/JapaneseEraNameTest.java b/test/jdk/java/util/Calendar/JapaneseEraNameTest.java
new file mode 100644
index 00000000000..ce643106f80
--- /dev/null
+++ b/test/jdk/java/util/Calendar/JapaneseEraNameTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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 8202088
+ * @summary Test the localized Japanese new era name (May 1st. 2019-)
+ *      is retrieved no matter CLDR provider contains the name or not.
+ * @modules jdk.localedata
+ * @run testng/othervm JapaneseEraNameTest
+ * @run testng/othervm -Djava.locale.providers=CLDR JapaneseEraNameTest
+ */
+
+import static java.util.Calendar.*;
+import static java.util.Locale.*;
+import java.util.Calendar;
+import java.util.Locale;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+@Test
+public class JapaneseEraNameTest {
+    static final Calendar c = new Calendar.Builder()
+            .setCalendarType("japanese")
+            .setFields(ERA, 5, YEAR, 1, MONTH, MAY, DAY_OF_MONTH, 1)
+            .build();
+
+    @DataProvider(name="names")
+    Object[][] names() {
+        return new Object[][] {
+            // type,    locale,  name
+            { LONG,     JAPAN,   "\u65b0\u5143\u53f7" }, // NewEra
+            { LONG,     US,      "NewEra" },
+            { SHORT,    JAPAN,   "N" },
+            { SHORT,    US,      "N" },
+        };
+    }
+
+    @Test(dataProvider="names")
+    public void testJapaneseNewEraName(int type, Locale locale, String expected) {
+        assertEquals(c.getDisplayName(ERA, type, locale), expected);
+    }
+}
diff --git a/test/jdk/java/util/Calendar/NarrowNamesTest.java b/test/jdk/java/util/Calendar/NarrowNamesTest.java
index c6266e29e67..58877fda997 100644
--- a/test/jdk/java/util/Calendar/NarrowNamesTest.java
+++ b/test/jdk/java/util/Calendar/NarrowNamesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import java.time.LocalDateTime;
 import java.util.*;
 import static java.util.GregorianCalendar.*;
 
@@ -49,7 +50,9 @@ public class NarrowNamesTest {
              HOUR_OF_DAY, 10);
         test(US, AM_PM, "p",
              HOUR_OF_DAY, 23);
-        test(JAJPJP, DAY_OF_WEEK, "\u65e5",
+        test(JAJPJP, DAY_OF_WEEK,
+             LocalDateTime.now().isBefore(LocalDateTime.of(2019, 5, 1, 0, 0)) ?
+                "\u65e5" : "\u706b", // "Sun" for HEISEI, "Tue" for NEWERA
              YEAR, 24, MONTH, DECEMBER, DAY_OF_MONTH, 23);
         test(THTH, MONTH, NARROW_STANDALONE, "\u0e18.\u0e04.",
              YEAR, 2555, MONTH, DECEMBER, DAY_OF_MONTH, 5);
diff --git a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java
index ca0ca664fff..15ef0bf8523 100644
--- a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java
+++ b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java
@@ -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
@@ -50,8 +50,8 @@ import java.util.TimeZone;
 
 public class SupplementalJapaneseEraTest {
     private static final Locale WAREKI_LOCALE = Locale.forLanguageTag("ja-JP-u-ca-japanese");
-    private static final String NEW_ERA_NAME = "NewEra";
-    private static final String NEW_ERA_ABBR = "N.E.";
+    private static final String SUP_ERA_NAME = "SupEra";
+    private static final String SUP_ERA_ABBR = "S.E.";
     private static int errors = 0;
 
     public static void main(String[] args) {
@@ -62,6 +62,7 @@ public class SupplementalJapaneseEraTest {
             Calendar cal = new Calendar.Builder()
                 .setCalendarType("japanese")
                 .setTimeZone(TimeZone.getTimeZone("GMT"))
+                .setFields(ERA, 5)
                 .setDate(200, FEBRUARY, 11)
                 .build();
             System.out.println(cal.getTimeInMillis());
@@ -95,10 +96,9 @@ public class SupplementalJapaneseEraTest {
     private static void testProperty() {
         Calendar jcal = new Calendar.Builder()
             .setCalendarType("japanese")
-            .setFields(YEAR, 1, DAY_OF_YEAR, 1)
+            .setFields(ERA, 6, YEAR, 1, DAY_OF_YEAR, 1)
             .build();
         Date firstDayOfEra = jcal.getTime();
-
         jcal.set(ERA, jcal.get(ERA) - 1); // previous era
         jcal.set(YEAR, 1);
         jcal.set(DAY_OF_YEAR, 1);
@@ -113,7 +113,7 @@ public class SupplementalJapaneseEraTest {
         // test long era name
         sdf = new SimpleDateFormat("GGGG y-MM-dd", WAREKI_LOCALE);
         got = sdf.format(firstDayOfEra);
-        expected = NEW_ERA_NAME + " 1-02-11";
+        expected = SUP_ERA_NAME + " 1-02-11";
         if (!expected.equals(got)) {
             System.err.printf("GGGG y-MM-dd: got=\"%s\", expected=\"%s\"%n", got, expected);
             errors++;
@@ -122,7 +122,7 @@ public class SupplementalJapaneseEraTest {
         // test era abbreviation
         sdf = new SimpleDateFormat("G y-MM-dd", WAREKI_LOCALE);
         got = sdf.format(firstDayOfEra);
-        expected = NEW_ERA_ABBR+" 1-02-11";
+        expected = SUP_ERA_ABBR + " 1-02-11";
         if (!expected.equals(got)) {
             System.err.printf("G y-MM-dd: got=\"%s\", expected=\"%s\"%n", got, expected);
             errors++;
@@ -139,30 +139,30 @@ public class SupplementalJapaneseEraTest {
         // test java.time.chrono.JapaneseEra
         JapaneseDate jdate = JapaneseDate.of(year, 2, 11);
         got = jdate.toString();
-        expected = "Japanese " + NEW_ERA_NAME + " 1-02-11";
+        expected = "Japanese " + SUP_ERA_NAME + " 1-02-11";
         if (!expected.equals(got)) {
             System.err.printf("JapaneseDate: got=\"%s\", expected=\"%s\"%n", got, expected);
             errors++;
         }
         JapaneseEra jera = jdate.getEra();
         got = jera.getDisplayName(TextStyle.FULL, Locale.US);
-        if (!NEW_ERA_NAME.equals(got)) {
-            System.err.printf("JapaneseEra (FULL): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_NAME);
+        if (!SUP_ERA_NAME.equals(got)) {
+            System.err.printf("JapaneseEra (FULL): got=\"%s\", expected=\"%s\"%n", got, SUP_ERA_NAME);
             errors++;
         }
         got = jera.getDisplayName(TextStyle.SHORT, Locale.US);
-        if (!NEW_ERA_NAME.equals(got)) {
-            System.err.printf("JapaneseEra (SHORT): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_NAME);
+        if (!SUP_ERA_NAME.equals(got)) {
+            System.err.printf("JapaneseEra (SHORT): got=\"%s\", expected=\"%s\"%n", got, SUP_ERA_NAME);
             errors++;
         }
         got = jera.getDisplayName(TextStyle.NARROW, Locale.US);
-        if (!NEW_ERA_ABBR.equals(got)) {
-            System.err.printf("JapaneseEra (NARROW): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_ABBR);
+        if (!SUP_ERA_ABBR.equals(got)) {
+            System.err.printf("JapaneseEra (NARROW): got=\"%s\", expected=\"%s\"%n", got, SUP_ERA_ABBR);
             errors++;
         }
         got = jera.getDisplayName(TextStyle.NARROW_STANDALONE, Locale.US);
-        if (!NEW_ERA_ABBR.equals(got)) {
-            System.err.printf("JapaneseEra (NARROW_STANDALONE): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_ABBR);
+        if (!SUP_ERA_ABBR.equals(got)) {
+            System.err.printf("JapaneseEra (NARROW_STANDALONE): got=\"%s\", expected=\"%s\"%n", got, SUP_ERA_ABBR);
             errors++;
         }
 
@@ -172,7 +172,7 @@ public class SupplementalJapaneseEraTest {
             .withLocale(Locale.US)
             .withChronology(JapaneseChronology.INSTANCE)
             .format(jdate);
-        expected = NEW_ERA_NAME + " " + NEW_ERA_NAME + " " + NEW_ERA_ABBR;
+        expected = SUP_ERA_NAME + " " + SUP_ERA_NAME + " " + SUP_ERA_ABBR;
         if (!expected.equals(got)) {
             System.err.printf("java.time formatter full/short/narrow names: got=\"%s\", expected=\"%s\"%n", got, expected);
             errors++;
diff --git a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.sh b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.sh
index 9f8af39af36..92537a1d8cf 100644
--- a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.sh
+++ b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.sh
@@ -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
@@ -34,8 +34,8 @@ STATUS=0
 SINCE=`${TESTJAVA}/bin/java -cp "${TESTCLASSES}" SupplementalJapaneseEraTest -s`
 
 echo "Tests with valid property values..."
-for P in "name=NewEra,abbr=N.E.,since=$SINCE" \
-         "name = NewEra, abbr = N.E., since = $SINCE"
+for P in "name=SupEra,abbr=S.E.,since=$SINCE" \
+         "name = SupEra, abbr = S.E., since = $SINCE"
 do
     if ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp "${TESTCLASSES}" \
            -D$PROPERTY="$P" SupplementalJapaneseEraTest -t; then
@@ -51,17 +51,17 @@ done
 ERA=`${TESTJAVA}/bin/java -cp "${TESTCLASSES}" SupplementalJapaneseEraTest -e`
 
 echo "Tests with invalid property values..."
-for P in "foo=Bar,name=NewEra,abbr=N.E.,since=$SINCE" \
-         "=NewEra,abbr=N.E.,since=$SINCE" \
-         "=,abbr=N.E.,since=$SINCE" \
-         "name,abbr=N.E.,since=$SINCE" \
-         "abbr=N.E.,since=$SINCE" \
-         "name=NewEra,since=$SINCE" \
-         "name=,abbr=N.E.,since=$SINCE" \
-         "name=NewEra,abbr=,since=$SINCE" \
-         "name=NewEra,abbr=N.E." \
-         "name=NewEra,abbr=N.E.,since=0" \
-         "name=NewEra,abbr=N.E.,since=9223372036854775808" # Long.MAX_VALUE+1
+for P in "foo=Bar,name=SupEra,abbr=S.E.,since=$SINCE" \
+         "=SupEra,abbr=S.E.,since=$SINCE" \
+         "=,abbr=S.E.,since=$SINCE" \
+         "name,abbr=S.E.,since=$SINCE" \
+         "abbr=S.E.,since=$SINCE" \
+         "name=SupEra,since=$SINCE" \
+         "name=,abbr=S.E.,since=$SINCE" \
+         "name=SupEra,abbr=,since=$SINCE" \
+         "name=SupEra,abbr=S.E." \
+         "name=SupEra,abbr=S.E.,since=0" \
+         "name=SupEra,abbr=S.E.,since=9223372036854775808" # Long.MAX_VALUE+1
 do
     if ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp "${TESTCLASSES}" \
            -D$PROPERTY="$P" SupplementalJapaneseEraTest -b "$ERA"; then
diff --git a/test/jdk/java/util/Calendar/ZoneOffsets.java b/test/jdk/java/util/Calendar/ZoneOffsets.java
index a0ddfde625c..d63f096565e 100644
--- a/test/jdk/java/util/Calendar/ZoneOffsets.java
+++ b/test/jdk/java/util/Calendar/ZoneOffsets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -192,6 +192,7 @@ public class ZoneOffsets {
         cal2.setTimeZone(tz2);
         cal2.clear();
         cal2.set(2005, MARCH, 11);
+        adjustJapaneseEra(cal2);
         // test5: set only ZONE_OFFSET in non-lenient
         cal2.set(ZONE_OFFSET, gmtOffset);
         if (t1 != cal2.getTime().getTime() || dst != cal2.get(DST_OFFSET)) {
@@ -201,6 +202,7 @@ public class ZoneOffsets {
         cal2.setTimeZone(tz3);
         cal2.clear();
         cal2.set(2005, MARCH, 11);
+        adjustJapaneseEra(cal2);
         // test6: set only DST_OFFSET in non-lenient
         cal2.set(DST_OFFSET, dstOffset);
         if (t1 != cal2.getTime().getTime() || gmt != cal2.get(ZONE_OFFSET)) {
@@ -210,6 +212,7 @@ public class ZoneOffsets {
         cal2.setTimeZone(tz2);
         cal2.clear();
         cal2.set(2005, MARCH, 11);
+        adjustJapaneseEra(cal2);
         // test7: set both ZONE_OFFSET and DST_OFFSET in non-lenient
         cal2.set(ZONE_OFFSET, gmtOffset);
         cal2.set(DST_OFFSET, dstOffset);
@@ -220,6 +223,7 @@ public class ZoneOffsets {
         cal2.setTimeZone(tz3);
         cal2.clear();
         cal2.set(2005, MARCH, 11);
+        adjustJapaneseEra(cal2);
         // test8: set both ZONE_OFFSET and DST_OFFSET in non-lenient
         cal2.set(ZONE_OFFSET, gmtOffset);
         cal2.set(DST_OFFSET, dstOffset);
@@ -234,4 +238,16 @@ public class ZoneOffsets {
                 + ", gmtOffset=" + gmtOffset + ", dstOffset=" + dstOffset
                 + ", cal1 time=" + t1 + ", cal2 time=" + cal2.getTime().getTime());
     }
+
+    private static void adjustJapaneseEra(Calendar cal) {
+        // In case of Japanese calendar, explicitly set the last era; NEWERA so that
+        // year 2005 won't throw exception
+        if (!cal.isLenient() &&
+                cal.getCalendarType().equals("japanese") &&
+                System.currentTimeMillis() < 1556668800000L) { // Current time not in NEWERA
+            cal.set(Calendar.ERA, 5);
+            cal.add(Calendar.YEAR, -30); // -30: Subtract year-length of HEISEI era
+        }
+        return;
+    }
 }
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index bc929fc39ef..ef25d117f3a 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -23,7 +23,7 @@
 /*
  * @test
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
- *      8039317 8074350 8074351 8145952 8187946
+ *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
@@ -96,7 +96,7 @@ public class ValidateISO4217 {
     /* Codes that are obsolete, do not have related country */
     static final String otherCodes =
         "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
-        + "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-"
+        + "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
         + "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-"
         + "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
         + "YUM-ZMK-ZWD-ZWN-ZWR";
diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt
index 491e15dcb96..cff8463d1a4 100644
--- a/test/jdk/java/util/Currency/tablea1.txt
+++ b/test/jdk/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 164
-#   (As of 22 September 2017)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 167
+#   (As of 4 June 2018)
 #
 
 # Version
 FILEVERSION=3
-DATAVERSION=164
+DATAVERSION=167
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -135,14 +135,14 @@ KR	KRW	410	0
 KW	KWD	414	3
 KG	KGS	417	2
 LA	LAK	418	2
-LV	LVL	428	2	2013-12-31-22-00-00	EUR	978	2
+LV	EUR	978	2
 LB	LBP	422	2
 #LS	ZAR	710	2
 LS	LSL	426	2
 LR	LRD	430	2
 LY	LYD	434	3
 LI	CHF	756	2
-LT	LTL	440	2	2014-12-31-22-00-00	EUR	978	2
+LT	EUR	978	2
 LU	EUR	978	2
 MO	MOP	446	2
 MK	MKD	807	2
@@ -154,7 +154,7 @@ ML	XOF	952	0
 MT	EUR	978	2
 MH	USD	840	2
 MQ	EUR	978	2
-MR	MRO	478	2
+MR	MRU	929	2
 MU	MUR	480	2
 YT	EUR	978	2
 MX	MXN	484	2
diff --git a/test/jdk/java/util/Formatter/Basic-X.java.template b/test/jdk/java/util/Formatter/Basic-X.java.template
index d885ac404ed..5dbd9abc0f8 100644
--- a/test/jdk/java/util/Formatter/Basic-X.java.template
+++ b/test/jdk/java/util/Formatter/Basic-X.java.template
@@ -1792,6 +1792,15 @@ public class Basic$Type$ extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/Basic.java b/test/jdk/java/util/Formatter/Basic.java
index 4d5f5b58d69..935c5d107af 100644
--- a/test/jdk/java/util/Formatter/Basic.java
+++ b/test/jdk/java/util/Formatter/Basic.java
@@ -26,7 +26,7 @@
  * @bug 4906370 4962433 4973103 4989961 5005818 5031150 4970931 4989491 5002937
  *      5005104 5007745 5061412 5055180 5066788 5088703 6317248 6318369 6320122
  *      6344623 6369500 6534606 6282094 6286592 6476425 5063507 6469160 6476168
- *      8059175
+ *      8059175 8204229
  *
  * @modules java.base
  * @run shell/timeout=240 Basic.sh
diff --git a/test/jdk/java/util/Formatter/BasicBigDecimal.java b/test/jdk/java/util/Formatter/BasicBigDecimal.java
index c485da4077b..206c0fe5015 100644
--- a/test/jdk/java/util/Formatter/BasicBigDecimal.java
+++ b/test/jdk/java/util/Formatter/BasicBigDecimal.java
@@ -1792,6 +1792,15 @@ public class BasicBigDecimal extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicBigInteger.java b/test/jdk/java/util/Formatter/BasicBigInteger.java
index 65e938b4d4d..30ffcf3c8a0 100644
--- a/test/jdk/java/util/Formatter/BasicBigInteger.java
+++ b/test/jdk/java/util/Formatter/BasicBigInteger.java
@@ -1792,6 +1792,15 @@ public class BasicBigInteger extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicBoolean.java b/test/jdk/java/util/Formatter/BasicBoolean.java
index 3ea99cb1886..f3db99331b3 100644
--- a/test/jdk/java/util/Formatter/BasicBoolean.java
+++ b/test/jdk/java/util/Formatter/BasicBoolean.java
@@ -1792,6 +1792,15 @@ public class BasicBoolean extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicBooleanObject.java b/test/jdk/java/util/Formatter/BasicBooleanObject.java
index 3d2b3dd61c8..a928b9f74ce 100644
--- a/test/jdk/java/util/Formatter/BasicBooleanObject.java
+++ b/test/jdk/java/util/Formatter/BasicBooleanObject.java
@@ -1792,6 +1792,15 @@ public class BasicBooleanObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicByte.java b/test/jdk/java/util/Formatter/BasicByte.java
index 6c6ca04c4b0..2fd80a4c8cc 100644
--- a/test/jdk/java/util/Formatter/BasicByte.java
+++ b/test/jdk/java/util/Formatter/BasicByte.java
@@ -1792,6 +1792,15 @@ public class BasicByte extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicByteObject.java b/test/jdk/java/util/Formatter/BasicByteObject.java
index 70e2e927fc7..f1d615f0888 100644
--- a/test/jdk/java/util/Formatter/BasicByteObject.java
+++ b/test/jdk/java/util/Formatter/BasicByteObject.java
@@ -1792,6 +1792,15 @@ public class BasicByteObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicChar.java b/test/jdk/java/util/Formatter/BasicChar.java
index 2a996d4e9bd..06865c24a63 100644
--- a/test/jdk/java/util/Formatter/BasicChar.java
+++ b/test/jdk/java/util/Formatter/BasicChar.java
@@ -1792,6 +1792,15 @@ public class BasicChar extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicCharObject.java b/test/jdk/java/util/Formatter/BasicCharObject.java
index 485a517447e..0bafba726a9 100644
--- a/test/jdk/java/util/Formatter/BasicCharObject.java
+++ b/test/jdk/java/util/Formatter/BasicCharObject.java
@@ -1792,6 +1792,15 @@ public class BasicCharObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicDateTime.java b/test/jdk/java/util/Formatter/BasicDateTime.java
index bb4611d2806..72f446625b2 100644
--- a/test/jdk/java/util/Formatter/BasicDateTime.java
+++ b/test/jdk/java/util/Formatter/BasicDateTime.java
@@ -1792,6 +1792,15 @@ public class BasicDateTime extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicDouble.java b/test/jdk/java/util/Formatter/BasicDouble.java
index e4b1de20683..4489a5c1f29 100644
--- a/test/jdk/java/util/Formatter/BasicDouble.java
+++ b/test/jdk/java/util/Formatter/BasicDouble.java
@@ -1792,6 +1792,15 @@ public class BasicDouble extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicDoubleObject.java b/test/jdk/java/util/Formatter/BasicDoubleObject.java
index 228b6e3eca3..4c26b794679 100644
--- a/test/jdk/java/util/Formatter/BasicDoubleObject.java
+++ b/test/jdk/java/util/Formatter/BasicDoubleObject.java
@@ -1792,6 +1792,15 @@ public class BasicDoubleObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicFloat.java b/test/jdk/java/util/Formatter/BasicFloat.java
index afdcea003c7..79eedf37dc7 100644
--- a/test/jdk/java/util/Formatter/BasicFloat.java
+++ b/test/jdk/java/util/Formatter/BasicFloat.java
@@ -1792,6 +1792,15 @@ public class BasicFloat extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicFloatObject.java b/test/jdk/java/util/Formatter/BasicFloatObject.java
index 4d94d8919df..91faf4ad37b 100644
--- a/test/jdk/java/util/Formatter/BasicFloatObject.java
+++ b/test/jdk/java/util/Formatter/BasicFloatObject.java
@@ -1792,6 +1792,15 @@ public class BasicFloatObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicInt.java b/test/jdk/java/util/Formatter/BasicInt.java
index a933a8ccc82..2ebf11f1433 100644
--- a/test/jdk/java/util/Formatter/BasicInt.java
+++ b/test/jdk/java/util/Formatter/BasicInt.java
@@ -1792,6 +1792,15 @@ public class BasicInt extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicIntObject.java b/test/jdk/java/util/Formatter/BasicIntObject.java
index d5f68bed668..808b40e7832 100644
--- a/test/jdk/java/util/Formatter/BasicIntObject.java
+++ b/test/jdk/java/util/Formatter/BasicIntObject.java
@@ -1792,6 +1792,15 @@ public class BasicIntObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicLong.java b/test/jdk/java/util/Formatter/BasicLong.java
index 1ffb9847afd..4afbe5730c6 100644
--- a/test/jdk/java/util/Formatter/BasicLong.java
+++ b/test/jdk/java/util/Formatter/BasicLong.java
@@ -1792,6 +1792,15 @@ public class BasicLong extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicLongObject.java b/test/jdk/java/util/Formatter/BasicLongObject.java
index fee981c2bc0..606d725d365 100644
--- a/test/jdk/java/util/Formatter/BasicLongObject.java
+++ b/test/jdk/java/util/Formatter/BasicLongObject.java
@@ -1792,6 +1792,15 @@ public class BasicLongObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicShort.java b/test/jdk/java/util/Formatter/BasicShort.java
index 5cea5b07216..37d4b97f948 100644
--- a/test/jdk/java/util/Formatter/BasicShort.java
+++ b/test/jdk/java/util/Formatter/BasicShort.java
@@ -1792,6 +1792,15 @@ public class BasicShort extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/BasicShortObject.java b/test/jdk/java/util/Formatter/BasicShortObject.java
index 88c437392d5..d522a163944 100644
--- a/test/jdk/java/util/Formatter/BasicShortObject.java
+++ b/test/jdk/java/util/Formatter/BasicShortObject.java
@@ -1792,6 +1792,15 @@ public class BasicShortObject extends Basic {
         //---------------------------------------------------------------------
         test("%%", "%", (Object)null);
         test("%%", "%", "");
+
+        test("%5%", "    %", (Object)null);
+        test("%5%", "    %", "");
+        test("%-5%", "%    ", (Object)null);
+        test("%-5%", "%    ", "");
+
+        tryCatch("%.5%", IllegalFormatPrecisionException.class);
+        tryCatch("%5.5%", IllegalFormatPrecisionException.class);
+
         tryCatch("%%%", UnknownFormatConversionException.class);
         // perhaps an IllegalFormatArgumentIndexException should be defined?
         tryCatch("%<%", IllegalFormatFlagsException.class);
diff --git a/test/jdk/java/util/Formatter/genBasic.sh b/test/jdk/java/util/Formatter/genBasic.sh
index 24bd5f786e0..de7f4662f0d 100644
--- a/test/jdk/java/util/Formatter/genBasic.sh
+++ b/test/jdk/java/util/Formatter/genBasic.sh
@@ -23,7 +23,7 @@
 # questions.
 #
 
-javac -d . ../../../../make/src/classes/build/tools/spp/Spp.java
+javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java
 
 gen() {
 #  if [ $3 = "true" ]
diff --git a/test/jdk/java/util/Locale/Bug8040211.java b/test/jdk/java/util/Locale/Bug8040211.java
index e03436c6aac..a131dfd65e8 100644
--- a/test/jdk/java/util/Locale/Bug8040211.java
+++ b/test/jdk/java/util/Locale/Bug8040211.java
@@ -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
@@ -23,9 +23,9 @@
 
 /*
  * @test
- * @bug 8040211 8191404
- * @summary Checks the IANA language subtag registry data updation
- *          (LSR Revision: 2017-08-15) with Locale and Locale.LanguageRange
+ * @bug 8040211 8191404 8203872
+ * @summary Checks the IANA language subtag registry data update
+ *          (LSR Revision: 2018-04-23) with Locale and Locale.LanguageRange
  *          class methods.
  * @run main Bug8040211
  */
@@ -67,8 +67,8 @@ public class Bug8040211 {
     private static void test_parse() {
         boolean error = false;
         String str = "Accept-Language: aam, adp, aue, bcg, cqu, ema,"
-                + " en-gb-oed, gti, koj, kwq, kxe, lii, lmm, mtm, ngv,"
-                + " oyb, phr, pub, suj, taj;q=0.9, yug;q=0.5, gfx;q=0.4";
+                + " en-gb-oed, gti, kdz, koj, kwq, kxe, lii, lmm, mtm, ngv,"
+                + " oyb, phr, pub, suj, taj;q=0.9, ar-hyw;q=0.8, yug;q=0.5, gfx;q=0.4";
         ArrayList<LanguageRange> expected = new ArrayList<>();
         expected.add(new LanguageRange("aam", 1.0));
         expected.add(new LanguageRange("aas", 1.0));
@@ -86,6 +86,8 @@ public class Bug8040211 {
         expected.add(new LanguageRange("en-gb-oxendict", 1.0));
         expected.add(new LanguageRange("gti", 1.0));
         expected.add(new LanguageRange("nyc", 1.0));
+        expected.add(new LanguageRange("kdz", 1.0));
+        expected.add(new LanguageRange("ncp", 1.0));
         expected.add(new LanguageRange("koj", 1.0));
         expected.add(new LanguageRange("kwv", 1.0));
         expected.add(new LanguageRange("kwq", 1.0));
@@ -112,6 +114,8 @@ public class Bug8040211 {
         expected.add(new LanguageRange("xsj", 1.0));
         expected.add(new LanguageRange("taj", 0.9));
         expected.add(new LanguageRange("tsf", 0.9));
+        expected.add(new LanguageRange("ar-hyw", 0.8));
+        expected.add(new LanguageRange("ar-arevmda", 0.8));
         expected.add(new LanguageRange("yug", 0.5));
         expected.add(new LanguageRange("yuu", 0.5));
         expected.add(new LanguageRange("gfx", 0.4));
@@ -176,15 +180,15 @@ public class Bug8040211 {
     private static void test_filter() {
         boolean error = false;
 
-        String ranges = "mtm-RU, en-gb-oed, coy";
-        String tags = "de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP, pij, nts";
+        String ranges = "mtm-RU, en-gb-oed, coy, ar-HY";
+        String tags = "de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP, pij, nts, ar-arevela";
         FilteringMode mode = EXTENDED_FILTERING;
 
         List<LanguageRange> priorityList = LanguageRange.parse(ranges);
         List<Locale> tagList = generateLocales(tags);
         String actualLocales
                 = showLocales(Locale.filter(priorityList, tagList, mode));
-        String expectedLocales = "mtm-RU, ymt-RU, en-GB-oxendict, nts, pij";
+        String expectedLocales = "mtm-RU, ymt-RU, en-GB-oxendict, nts, pij, ar-arevela";
 
         if (!expectedLocales.equals(actualLocales)) {
             error = true;
diff --git a/test/jdk/java/util/concurrent/tck/TimeUnit8Test.java b/test/jdk/java/util/concurrent/tck/TimeUnit8Test.java
index b5fa1813cb2..acca0b0943d 100644
--- a/test/jdk/java/util/concurrent/tck/TimeUnit8Test.java
+++ b/test/jdk/java/util/concurrent/tck/TimeUnit8Test.java
@@ -40,8 +40,12 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.LongStream;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -100,4 +104,85 @@ public class TimeUnit8Test extends JSR166TestCase {
         }
     }
 
+    /**
+     * convert(Duration) roundtrips with Duration.ofXXXX and Duration.of(long, ChronoUnit)
+     */
+    public void testConvertDuration_roundtripDurationOf() {
+        long n = ThreadLocalRandom.current().nextLong();
+
+        assertEquals(n, NANOSECONDS.convert(Duration.ofNanos(n)));
+        assertEquals(n, NANOSECONDS.convert(Duration.of(n, ChronoUnit.NANOS)));
+        assertEquals(n, MILLISECONDS.convert(Duration.ofMillis(n)));
+        assertEquals(n, MILLISECONDS.convert(Duration.of(n, ChronoUnit.MILLIS)));
+        assertEquals(n, SECONDS.convert(Duration.ofSeconds(n)));
+        assertEquals(n, SECONDS.convert(Duration.of(n, ChronoUnit.SECONDS)));
+        n /= 60;
+        assertEquals(n, MINUTES.convert(Duration.ofMinutes(n)));
+        assertEquals(n, MINUTES.convert(Duration.of(n, ChronoUnit.MINUTES)));
+        n /= 60;
+        assertEquals(n, HOURS.convert(Duration.ofHours(n)));
+        assertEquals(n, HOURS.convert(Duration.of(n, ChronoUnit.HOURS)));
+        n /= 24;
+        assertEquals(n, DAYS.convert(Duration.ofDays(n)));
+        assertEquals(n, DAYS.convert(Duration.of(n, ChronoUnit.DAYS)));
+    }
+
+    /**
+     * convert(Duration.ofNanos(n)) agrees with convert(n, NANOSECONDS)
+     */
+    public void testConvertDuration_roundtripDurationOfNanos() {
+        // Test values near unit transitions and near overflow.
+        LongStream.concat(
+                Arrays.stream(TimeUnit.values()).mapToLong(u -> u.toNanos(1)),
+                LongStream.of(Long.MAX_VALUE, Long.MIN_VALUE))
+            .flatMap(n -> LongStream.of(n, n + 1, n - 1))
+            .flatMap(n -> LongStream.of(n, n + 1_000_000_000, n - 1_000_000_000))
+            .flatMap(n -> LongStream.of(n, -n))
+            // .peek(System.err::println)
+            .forEach(n -> Arrays.stream(TimeUnit.values()).forEach(
+                u -> assertEquals(u.convert(n, NANOSECONDS),
+                                  u.convert(Duration.ofNanos(n)))));
+    }
+
+    /**
+     * convert(Duration) doesn't misbehave near Long.MAX_VALUE and Long.MIN_VALUE.
+     */
+    public void testConvertDuration_nearOverflow() {
+        ChronoUnit NANOS = ChronoUnit.NANOS;
+        Duration maxDuration = Duration.ofSeconds(Long.MAX_VALUE, 999_999_999);
+        Duration minDuration = Duration.ofSeconds(Long.MIN_VALUE, 0);
+
+        for (TimeUnit u : TimeUnit.values()) {
+            ChronoUnit cu = u.toChronoUnit();
+            long r;
+            if (u.toNanos(1) > SECONDS.toNanos(1)) {
+                r = u.toNanos(1) / SECONDS.toNanos(1);
+
+                assertThrows(ArithmeticException.class,
+                             () -> Duration.of(Long.MAX_VALUE, cu),
+                             () -> Duration.of(Long.MIN_VALUE, cu));
+            } else {
+                r = 1;
+
+                Duration max = Duration.of(Long.MAX_VALUE, cu);
+                Duration min = Duration.of(Long.MIN_VALUE, cu);
+                assertEquals(Long.MAX_VALUE, u.convert(max));
+                assertEquals(Long.MAX_VALUE - 1, u.convert(max.minus(1, NANOS)));
+                assertEquals(Long.MAX_VALUE - 1, u.convert(max.minus(1, cu)));
+                assertEquals(Long.MIN_VALUE, u.convert(min));
+                assertEquals(Long.MIN_VALUE + 1, u.convert(min.plus(1, NANOS)));
+                assertEquals(Long.MIN_VALUE + 1, u.convert(min.plus(1, cu)));
+                assertEquals(Long.MAX_VALUE, u.convert(max.plus(1, NANOS)));
+                if (u != SECONDS) {
+                    assertEquals(Long.MAX_VALUE, u.convert(max.plus(1, cu)));
+                    assertEquals(Long.MIN_VALUE, u.convert(min.minus(1, NANOS)));
+                    assertEquals(Long.MIN_VALUE, u.convert(min.minus(1, cu)));
+                }
+            }
+
+            assertEquals(Long.MAX_VALUE / r, u.convert(maxDuration));
+            assertEquals(Long.MIN_VALUE / r, u.convert(minDuration));
+        }
+    }
+
 }
diff --git a/test/jdk/java/util/function/PredicateNotTest.java b/test/jdk/java/util/function/PredicateNotTest.java
new file mode 100644
index 00000000000..043344c5fa8
--- /dev/null
+++ b/test/jdk/java/util/function/PredicateNotTest.java
@@ -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.
+ *
+ * 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 8050818
+ * @run testng PredicateNotTest
+ */
+
+import java.util.List;
+import java.util.function.Predicate;
+import org.testng.annotations.Test;
+import static java.util.function.Predicate.not;
+import static java.util.stream.Collectors.joining;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+@Test(groups = "unit")
+public class PredicateNotTest {
+    static class IsEmptyPredicate implements Predicate<String> {
+        @Override
+        public boolean test(String s) {
+            return s.isEmpty();
+        }
+    }
+
+    public void test() {
+        List<String> test = List.of(
+           "A non-empty line",
+           "",
+           "A non-empty line",
+           "",
+           "A non-empty line",
+           "",
+           "A non-empty line",
+           ""
+        );
+        String expected = "A non-empty line\nA non-empty line\nA non-empty line\nA non-empty line";
+
+        assertEquals(test.stream().filter(not(String::isEmpty)).collect(joining("\n")), expected);
+        assertEquals(test.stream().filter(not(s -> s.isEmpty())).collect(joining("\n")), expected);
+        assertEquals(test.stream().filter(not(new IsEmptyPredicate())).collect(joining("\n")), expected);
+        assertEquals(test.stream().filter(not(not(not(String::isEmpty)))).collect(joining("\n")), expected);
+        assertEquals(test.stream().filter(not(not(not(s -> s.isEmpty())))).collect(joining("\n")), expected);
+        assertEquals(test.stream().filter(not(not(not(new IsEmptyPredicate())))).collect(joining("\n")), expected);
+    }
+}
+
diff --git a/test/jdk/java/util/jar/Attributes/TestAttrsNL.java b/test/jdk/java/util/jar/Attributes/TestAttrsNL.java
new file mode 100644
index 00000000000..34f7e4c4502
--- /dev/null
+++ b/test/jdk/java/util/jar/Attributes/TestAttrsNL.java
@@ -0,0 +1,123 @@
+/*
+ * 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 8200530
+ * @summary Test Attributes newline
+ */
+
+import java.util.jar.Manifest;
+import java.util.jar.Attributes;
+import java.util.jar.Attributes.Name;
+import java.io.ByteArrayInputStream;
+import java.util.Map;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class TestAttrsNL {
+
+    public static void main(String[] args) throws Throwable {
+
+        String manifestStr =
+            "Manifest-Version: 1.0\r\n" +
+            "Created-By: 11 (Oracle Corporation)\r\n" +
+            "key1: value1\r\n" +
+            "key2: value2\r\n END\r\n" +
+            "key3: value3\r\n \r\n" +
+            "key4: value4\r\n" +
+            "\r\n\r\n" +
+            "Name: Hello\r\n" +
+            "key11: value11\r\n" +
+            "key22: value22\r\n END\r\n" +
+            "key33: value33\r\n \r\n" +
+            "key44: value44\r\n";
+
+        Map<Name, String> mainAttrsExped = Map.of(
+                new Name("Manifest-Version"), "1.0",
+                new Name("Created-By"), "11 (Oracle Corporation)",
+                new Name("key1"), "value1",
+                new Name("key2"), "value2END",
+                new Name("key3"), "value3",
+                new Name("key4"), "value4"
+        );
+
+        Map<Name, String> attrsExped = Map.of(
+                new Name("key11"), "value11",
+                new Name("key22"), "value22END",
+                new Name("key33"), "value33",
+                new Name("key44"), "value44"
+        );
+
+        test(new Manifest(new ByteArrayInputStream(manifestStr.getBytes(UTF_8))),
+             mainAttrsExped, attrsExped);
+
+        test(new Manifest(new ByteArrayInputStream(
+                    manifestStr.replaceAll("\r\n", "\r").getBytes(UTF_8))),
+             mainAttrsExped, attrsExped);
+
+        test(new Manifest(new ByteArrayInputStream(
+                    manifestStr.replaceAll("\r\n", "\n").getBytes(UTF_8))),
+             mainAttrsExped, attrsExped);
+
+        // mixed
+        manifestStr =
+            "Manifest-Version: 1.0\r\n" +
+            "Created-By: 11 (Oracle Corporation)\n" +
+            "key1: value1\r" +
+            "key2: value2\r\n END\r" +
+            "key3: value3\n \r\n" +
+            "key4: value4\r" +
+            "\r\n\n" +
+            "Name: Hello\r\n" +
+            "key11: value11\r" +
+            "key22: value22\n END\r\n" +
+            "key33: value33\r \n" +
+            "key44: value44\n";
+        test(new Manifest(new ByteArrayInputStream(manifestStr.getBytes(UTF_8))),
+             mainAttrsExped, attrsExped);
+
+
+    }
+
+    private static void test(Manifest m,
+                             Map<Name, String> mainAttrsExped,
+                             Map<Name, String> attrsExped) {
+        Attributes mainAttrs = m.getMainAttributes();
+        mainAttrsExped.forEach( (k, v) -> {
+            if (!mainAttrs.containsKey(k) || !mainAttrs.get(k).equals(v)) {
+                System.out.printf(" containsKey(%s) : %b%n", k, mainAttrs.containsKey(k));
+                System.out.printf("         get(%s) : %s%n", k, mainAttrs.get(k));
+                throw new RuntimeException("expected attr: k=<" + k + ">, v=<" + v + ">");
+            }
+        });
+
+        Attributes attrs = m.getAttributes("Hello");
+        attrs.forEach( (k, v) -> {
+            if (!attrs.containsKey(k) || !attrs.get(k).equals(v)) {
+                System.out.printf(" containsKey(%s) : %b%n", k, attrs.containsKey(k));
+                System.out.printf("         get(%s) : %s%n", k, attrs.get(k));
+                throw new RuntimeException("expected attr: k=<" + k + ">, v=<" + v + ">");
+            }
+        });
+    }
+}
diff --git a/test/jdk/java/util/zip/ZipFile/TestCleaner.java b/test/jdk/java/util/zip/ZipFile/TestCleaner.java
index cdeea7ebf23..82c6209dccc 100644
--- a/test/jdk/java/util/zip/ZipFile/TestCleaner.java
+++ b/test/jdk/java/util/zip/ZipFile/TestCleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -22,8 +22,8 @@
  */
 
 /* @test
- * @bug 8185582
- * @modules java.base/java.util.zip:open
+ * @bug 8185582 8197989
+ * @modules java.base/java.util.zip:open java.base/jdk.internal.vm.annotation
  * @summary Check the resources of Inflater, Deflater and ZipFile are always
  *          cleaned/released when the instance is not unreachable
  */
@@ -34,6 +34,7 @@ import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.*;
+import jdk.internal.vm.annotation.DontInline;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
 public class TestCleaner {
@@ -163,10 +164,8 @@ public class TestCleaner {
         }
     }
 
-    private static void testZipFile() throws Throwable {
-        File dir = new File(System.getProperty("test.dir", "."));
-        File zip = File.createTempFile("testzf", "zip", dir);
-        Object zsrc = null;
+    @DontInline
+    private static Object openAndCloseZipFile(File zip) throws Throwable {
         try {
             try (var fos = new FileOutputStream(zip);
                  var zos = new ZipOutputStream(fos)) {
@@ -193,12 +192,39 @@ public class TestCleaner {
             if (!fieldZsrc.trySetAccessible()) {
                 throw new RuntimeException("'ZipFile.zsrc' is not accesible");
             }
-            zsrc = fieldZsrc.get(zfRes);
-
+            return fieldZsrc.get(zfRes);
         } finally {
             zip.delete();
         }
+    }
 
+    @DontInline
+    private static void openAndCloseSubZipFile(File zip, CountDownLatch closeCountDown)
+        throws Throwable {
+        try {
+            try (var fos = new FileOutputStream(zip);
+                 var zos = new ZipOutputStream(fos)) {
+                zos.putNextEntry(new ZipEntry("hello"));
+                zos.write("hello".getBytes(US_ASCII));
+                zos.closeEntry();
+            }
+            var zf = new SubclassedZipFile(zip, closeCountDown);
+            var es = zf.entries();
+            while (es.hasMoreElements()) {
+                zf.getInputStream(es.nextElement()).read();
+            }
+            es = null;
+            zf = null;
+        } finally {
+            zip.delete();
+        }
+    }
+
+    private static void testZipFile() throws Throwable {
+        File dir = new File(System.getProperty("test.dir", "."));
+        File zip = File.createTempFile("testzf", "zip", dir);
+
+        Object zsrc = openAndCloseZipFile(zip);
         if (zsrc != null) {
             Field zfileField = zsrc.getClass().getDeclaredField("zfile");
             if (!zfileField.trySetAccessible()) {
@@ -219,23 +245,7 @@ public class TestCleaner {
         // test subclassed ZipFile, for behavioral compatibility.
         // should be removed if the finalize() method is finally removed.
         var closeCountDown = new CountDownLatch(1);
-        try {
-            try (var fos = new FileOutputStream(zip);
-                 var zos = new ZipOutputStream(fos)) {
-                zos.putNextEntry(new ZipEntry("hello"));
-                zos.write("hello".getBytes(US_ASCII));
-                zos.closeEntry();
-            }
-            var zf = new SubclassedZipFile(zip, closeCountDown);
-            var es = zf.entries();
-            while (es.hasMoreElements()) {
-                zf.getInputStream(es.nextElement()).read();
-            }
-            es = null;
-            zf = null;
-        } finally {
-            zip.delete();
-        }
+        openAndCloseSubZipFile(zip, closeCountDown);
         while (!closeCountDown.await(10, TimeUnit.MILLISECONDS)) {
             System.gc();
         }
diff --git a/test/jdk/javax/crypto/CipherSpi/TestGCMWithByteBuffer.java b/test/jdk/javax/crypto/CipherSpi/TestGCMWithByteBuffer.java
new file mode 100644
index 00000000000..0c07fcb35bf
--- /dev/null
+++ b/test/jdk/javax/crypto/CipherSpi/TestGCMWithByteBuffer.java
@@ -0,0 +1,165 @@
+/*
+ * 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 8178374
+ * @summary Test GCM decryption with various types of input/output
+ *     ByteBuffer objects
+ * @key randomness
+ */
+
+import java.nio.ByteBuffer;
+import java.security.*;
+import java.util.Random;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.AEADBadTagException;
+import javax.crypto.spec.*;
+
+public class TestGCMWithByteBuffer {
+
+    private static Random random = new SecureRandom();
+    private static int dataSize = 4096; // see javax.crypto.CipherSpi
+    private static int multiples = 3;
+
+    public static void main(String args[]) throws Exception {
+        Provider[] provs = Security.getProviders();
+        for (Provider p : provs) {
+            try {
+                Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding", p);
+                test(cipher);
+            } catch (NoSuchAlgorithmException nsae) {
+                // skip testing due to no support
+                continue;
+            }
+        }
+    }
+
+    private static void test(Cipher cipher) throws Exception {
+        System.out.println("Testing " + cipher.getProvider());
+
+        boolean failedOnce = false;
+        Exception failedReason = null;
+
+        int tagLen = 96; // in bits
+        byte[] keyBytes = new byte[16];
+        random.nextBytes(keyBytes);
+        byte[] dataChunk = new byte[dataSize];
+        random.nextBytes(dataChunk);
+
+        SecretKey key = new SecretKeySpec(keyBytes, "AES");
+        // re-use key bytes as IV as the real test is buffer calculation
+        GCMParameterSpec s = new GCMParameterSpec(tagLen, keyBytes);
+
+        /*
+         * Iterate through various sizes to make sure that the code works with
+         * internal temp buffer size 4096.
+         */
+        for (int t = 1; t <= multiples; t++) {
+            int size = t * dataSize;
+
+            System.out.println("\nTesting data size: " + size);
+
+            try {
+                decrypt(cipher, key, s, dataChunk, t,
+                        ByteBuffer.allocate(dataSize),
+                        ByteBuffer.allocate(size),
+                        ByteBuffer.allocateDirect(dataSize),
+                        ByteBuffer.allocateDirect(size));
+            } catch (Exception e) {
+                System.out.println("\tFailed with data size " + size);
+                failedOnce = true;
+                failedReason = e;
+            }
+        }
+        if (failedOnce) {
+            throw failedReason;
+        }
+        System.out.println("\n=> Passed...");
+    }
+
+    private enum TestVariant {
+        HEAP_HEAP, HEAP_DIRECT, DIRECT_HEAP, DIRECT_DIRECT
+    };
+
+    private static void decrypt(Cipher cipher, SecretKey key,
+            GCMParameterSpec s, byte[] dataChunk, int multiples,
+            ByteBuffer heapIn, ByteBuffer heapOut, ByteBuffer directIn,
+            ByteBuffer directOut) throws Exception {
+
+        ByteBuffer inBB = null;
+        ByteBuffer outBB = null;
+
+        // try various combinations of input/output
+        for (TestVariant tv : TestVariant.values()) {
+            System.out.println(" " + tv);
+
+            switch (tv) {
+            case HEAP_HEAP:
+                inBB = heapIn;
+                outBB = heapOut;
+                break;
+            case HEAP_DIRECT:
+                inBB = heapIn;
+                outBB = directOut;
+                break;
+            case DIRECT_HEAP:
+                inBB = directIn;
+                outBB = heapOut;
+                break;
+            case DIRECT_DIRECT:
+                inBB = directIn;
+                outBB = directOut;
+                break;
+            }
+
+            // prepare input and output buffers
+            inBB.clear();
+            inBB.put(dataChunk);
+
+            outBB.clear();
+
+            try {
+                // Always re-init the Cipher object so cipher is in
+                // a good state for future testing
+                cipher.init(Cipher.DECRYPT_MODE, key, s);
+
+                for (int i = 0; i < multiples; i++) {
+                    inBB.flip();
+                    cipher.update(inBB, outBB);
+                    if (inBB.hasRemaining()) {
+                        throw new Exception("buffer not empty");
+                    }
+                }
+                // finish decryption and process all data buffered
+                cipher.doFinal(inBB, outBB);
+                throw new RuntimeException("Error: doFinal completed without exception");
+            } catch (AEADBadTagException ex) {
+                System.out.println("Expected AEADBadTagException thrown");
+                continue;
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/imageio/plugins/jpeg/TestWriteARGBJPEG.java b/test/jdk/javax/imageio/plugins/jpeg/TestWriteARGBJPEG.java
new file mode 100644
index 00000000000..ccbec3b42ae
--- /dev/null
+++ b/test/jdk/javax/imageio/plugins/jpeg/TestWriteARGBJPEG.java
@@ -0,0 +1,86 @@
+/*
+ * 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     8204187
+ * @run     main TestWriteARGBJPEG
+ * @summary verify JPEG Alpha support is as reported.
+ */
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.io.ByteArrayOutputStream;
+import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriter;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.spi.ImageWriterSpi;
+import javax.imageio.stream.MemoryCacheImageOutputStream;
+
+public class TestWriteARGBJPEG {
+    public static void main(String args[]) throws IOException {
+
+        BufferedImage bi =
+            new BufferedImage(10,10,BufferedImage.TYPE_INT_ARGB);
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+    // There should be no exception from the next line
+    // which internally should be relying on the canEncodeImage
+    // method which we'll also test directly.
+    boolean ret = ImageIO.write(bi, "jpeg", baos);
+    System.out.println("ImageIO.write(..) returned " + ret);
+
+    ImageTypeSpecifier its = new ImageTypeSpecifier(bi);
+    Iterator<ImageWriter> writers = ImageIO.getImageWriters(its, "jpeg");
+    boolean hasWriter = writers.hasNext();
+    // If this can't write it, an exception will be thrown.
+    if (writers.hasNext()) {
+        System.out.println("A writer was found.");
+        ImageWriter iw = writers.next();
+        MemoryCacheImageOutputStream mos =
+            new MemoryCacheImageOutputStream(baos);
+        iw.setOutput(mos);
+        iw.write(bi);
+    }
+
+    // Now Let's also ask the default JPEG writer's SPI if it
+    // can write an ARGB image.
+    ImageWriter iw = ImageIO.getImageWritersByFormatName("jpeg").next();
+    ImageWriterSpi iwSpi = iw.getOriginatingProvider();
+    boolean canEncode = iwSpi.canEncodeImage(bi);
+    System.out.println("SPI canEncodeImage returned " + canEncode);
+
+    // Now let's see if it is telling the truth.
+    try {
+        MemoryCacheImageOutputStream mos =
+            new MemoryCacheImageOutputStream(baos);
+        iw.setOutput(mos);
+        iw.write(bi);
+    } catch (IOException e) {
+         if (canEncode) {
+           throw e;
+         }
+    }
+  }
+}
diff --git a/test/jdk/javax/imageio/plugins/png/VerifyRGBValuesFromBKGDChunk.java b/test/jdk/javax/imageio/plugins/png/VerifyRGBValuesFromBKGDChunk.java
index 61293d70d71..38dd90e85da 100644
--- a/test/jdk/javax/imageio/plugins/png/VerifyRGBValuesFromBKGDChunk.java
+++ b/test/jdk/javax/imageio/plugins/png/VerifyRGBValuesFromBKGDChunk.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     6574555
+ * @bug     6574555 5109146
  * @summary Test verifies that PNGImageWriter encodes the R, G, B
  *          values of bKGD chunk properly.
  * @run     main VerifyRGBValuesFromBKGDChunk
@@ -37,6 +37,7 @@ import javax.imageio.ImageWriter;
 import javax.imageio.ImageReader;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
+import javax.imageio.metadata.IIOInvalidTreeException;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataNode;
 import javax.imageio.IIOImage;
@@ -48,30 +49,42 @@ import java.io.InputStream;
 
 public class VerifyRGBValuesFromBKGDChunk {
 
-    public static void main(String[] args) throws IOException {
-        int width = 1;
-        int height = 1;
-        BufferedImage img = new
-            BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
-        Iterator<ImageWriter> iterWriter =
-            ImageIO.getImageWritersBySuffix("png");
-        ImageWriter writer = iterWriter.next();
+    private static IIOMetadata encodeMetadata;
+    private static ImageWriter writer;
+    private static ImageReader reader;
+    private static BufferedImage img;
+    private static ImageWriteParam param;
+    private static boolean nativeBKGDFail, standardBKGDFail;
+    private static IIOMetadataNode bKGD_RGBNode;
+    private static final String BKGDRED = "100";
+    private static final String BKGDGREEN = "150";
+    private static final String BKGDBLUE = "200";
+
+    private static void mergeStandardMetadata() throws IIOInvalidTreeException {
+        IIOMetadataNode background_rgb = new IIOMetadataNode("BackgroundColor");
+
+        background_rgb.setAttribute("red", BKGDRED);
+        background_rgb.setAttribute("green", BKGDGREEN);
+        background_rgb.setAttribute("blue", BKGDBLUE);
+
+        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");
+        chroma.appendChild(background_rgb);
+        IIOMetadataNode encodeRoot = new IIOMetadataNode("javax_imageio_1.0");
+        encodeRoot.appendChild(chroma);
 
-        ImageWriteParam param = writer.getDefaultWriteParam();
         ImageTypeSpecifier specifier =
             ImageTypeSpecifier.
                 createFromBufferedImageType(BufferedImage.TYPE_INT_BGR);
-        IIOMetadata encodeMetadata =
-            writer.getDefaultImageMetadata(specifier, param);
+        encodeMetadata = writer.getDefaultImageMetadata(specifier, param);
+        encodeMetadata.mergeTree("javax_imageio_1.0", encodeRoot);
+    }
 
-        // Write png image with bKGD chunk
+    private static void mergeNativeMetadata() throws IIOInvalidTreeException {
         IIOMetadataNode bKGD_rgb = new IIOMetadataNode("bKGD_RGB");
-        String red = "100";
-        String green = "150";
-        String blue = "200";
-        bKGD_rgb.setAttribute("red", red);
-        bKGD_rgb.setAttribute("green", green);
-        bKGD_rgb.setAttribute("blue", blue);
+
+        bKGD_rgb.setAttribute("red", BKGDRED);
+        bKGD_rgb.setAttribute("green", BKGDGREEN);
+        bKGD_rgb.setAttribute("blue", BKGDBLUE);
 
         IIOMetadataNode bKGD = new IIOMetadataNode("bKGD");
         bKGD.appendChild(bKGD_rgb);
@@ -79,15 +92,20 @@ public class VerifyRGBValuesFromBKGDChunk {
             new IIOMetadataNode("javax_imageio_png_1.0");
         encodeRoot.appendChild(bKGD);
 
+        ImageTypeSpecifier specifier =
+            ImageTypeSpecifier.
+                createFromBufferedImageType(BufferedImage.TYPE_INT_BGR);
+        encodeMetadata = writer.getDefaultImageMetadata(specifier, param);
         encodeMetadata.mergeTree("javax_imageio_png_1.0", encodeRoot);
+    }
 
+    private static void writeAndReadMetadata() throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
         writer.setOutput(ios);
 
         writer.write(encodeMetadata,
                      new IIOImage(img, null, encodeMetadata), param);
-        writer.dispose();
 
         baos.flush();
         byte[] imageByteArray = baos.toByteArray();
@@ -96,24 +114,63 @@ public class VerifyRGBValuesFromBKGDChunk {
         // Get bKGD chunk from image and verify the values
         InputStream input= new ByteArrayInputStream(imageByteArray);
         ImageInputStream iis = ImageIO.createImageInputStream(input);
-        Iterator<ImageReader> iterReader =
-            ImageIO.getImageReadersBySuffix("png");
-        ImageReader reader = iterReader.next();
         reader.setInput(iis, false, false);
 
         IIOMetadata decodeMetadata = reader.getImageMetadata(0);
         IIOMetadataNode decodeRoot =
             (IIOMetadataNode) decodeMetadata.
                 getAsTree("javax_imageio_png_1.0");
-        bKGD_rgb = (IIOMetadataNode)
+        bKGD_RGBNode = (IIOMetadataNode)
             decodeRoot.getElementsByTagName("bKGD_RGB").item(0);
+    }
+
+    private static boolean verifyRGBValues() {
+        return (!(BKGDRED.equals(bKGD_RGBNode.getAttribute("red")) &&
+                  BKGDGREEN.equals(bKGD_RGBNode.getAttribute("green")) &&
+                  BKGDBLUE.equals(bKGD_RGBNode.getAttribute("blue"))));
+    }
+
+    private static void VerifyNativeRGBValuesFromBKGDChunk()
+        throws IOException {
+
+        mergeNativeMetadata();
+        writeAndReadMetadata();
+        nativeBKGDFail = verifyRGBValues();
+    }
+
+    private static void VerifyStandardRGBValuesFromBKGDChunk()
+        throws IOException {
+
+        mergeStandardMetadata();
+        writeAndReadMetadata();
+        standardBKGDFail = verifyRGBValues();
+    }
+
+    public static void main(String[] args) throws IOException {
+        int width = 1;
+        int height = 1;
+        img = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
+        Iterator<ImageWriter> iterWriter =
+            ImageIO.getImageWritersBySuffix("png");
+        writer = iterWriter.next();
+
+        param = writer.getDefaultWriteParam();
+
+        Iterator<ImageReader> iterReader =
+            ImageIO.getImageReadersBySuffix("png");
+        reader = iterReader.next();
+        // Verify bKGD RGB values after merging metadata using native tree
+        VerifyNativeRGBValuesFromBKGDChunk();
+
+        // Verify bKGD RGB values after merging metadata using standard tree
+        VerifyStandardRGBValuesFromBKGDChunk();
+
+        writer.dispose();
         reader.dispose();
 
-        if (!(red.equals(bKGD_rgb.getAttribute("red")) &&
-              green.equals(bKGD_rgb.getAttribute("green")) &&
-              blue.equals(bKGD_rgb.getAttribute("blue")))) {
+        if (nativeBKGDFail || standardBKGDFail) {
             throw new RuntimeException("bKGD RGB values are not stored" +
-            " properly");
+                " properly");
         }
     }
 }
diff --git a/test/jdk/javax/imageio/plugins/shared/BitDepth.java b/test/jdk/javax/imageio/plugins/shared/BitDepth.java
index 754400b46ce..9e6064aaa4e 100644
--- a/test/jdk/javax/imageio/plugins/shared/BitDepth.java
+++ b/test/jdk/javax/imageio/plugins/shared/BitDepth.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug     4413109 4418221 6607198 8147448
+ * @bug     4413109 4418221 6607198 8147448 8204187
  * @run     main BitDepth
  * @summary Checks that ImageIO writers for standard formats can handle
  *          various BufferedImage RGB types. An optional list of arguments
@@ -197,6 +197,7 @@ public class BitDepth {
         if (!writers.hasNext()) {
             System.out.println("\tNo writers available for type " + biTypeNames[type]
                                + " BufferedImage!");
+            return null;
         } else {
             ImageWriter writer = writers.next();
             try (ImageOutputStream out = ImageIO.createImageOutputStream(file)) {
@@ -205,7 +206,7 @@ public class BitDepth {
             } catch (Exception e) {
                 System.out.println("\tCan't write a type " +  biTypeNames[type]
                            + " BufferedImage!");
-                return null;
+                throw new RuntimeException(e);
             }
         }
 
diff --git a/test/jdk/javax/management/Introspector/ClassLeakTest.java b/test/jdk/javax/management/Introspector/ClassLeakTest.java
index c6136333493..9a08c04b0c2 100644
--- a/test/jdk/javax/management/Introspector/ClassLeakTest.java
+++ b/test/jdk/javax/management/Introspector/ClassLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4909536
  * @summary Ensure that the Introspector does not retain refs to classes
+ * @requires vm.opt.final.ClassUnloading
  * @author Eamonn McManus
  *
  * @run clean ClassLeakTest
diff --git a/test/jdk/javax/management/mxbean/LeakTest.java b/test/jdk/javax/management/mxbean/LeakTest.java
index a715d0ea210..5e929871c82 100644
--- a/test/jdk/javax/management/mxbean/LeakTest.java
+++ b/test/jdk/javax/management/mxbean/LeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 6482247
  * @summary Test that creating MXBeans does not introduce memory leaks.
+ * @requires vm.opt.final.ClassUnloading
  * @author Eamonn McManus
  *
  * @run build LeakTest RandomMXBeanTest MerlinMXBean TigerMXBean
diff --git a/test/jdk/javax/management/mxbean/MXBeanLoadingTest1.java b/test/jdk/javax/management/mxbean/MXBeanLoadingTest1.java
index bcfc6fc00fc..3a02ea262b5 100644
--- a/test/jdk/javax/management/mxbean/MXBeanLoadingTest1.java
+++ b/test/jdk/javax/management/mxbean/MXBeanLoadingTest1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8058865
  * @summary Checks correct collection of MXBean's class after unregistration
+ * @requires vm.opt.final.ClassUnloading
  * @author Olivier Lagneau
  *
  * @library /lib/testlibrary
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java
similarity index 93%
rename from test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java
rename to test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java
index 6cae34826e7..7ffaf5d7ad0 100644
--- a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java
+++ b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, 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
@@ -21,16 +21,17 @@
  * questions.
  */
 
-import java.io.File;
+import java.nio.file.Paths;
 
 import com.sun.media.sound.JDK13Services;
 
 /**
  * @test
- * @bug 4776511
+ * @bug 4776511 8201279
  * @summary RFE: Setting the default MixerProvider. Test the retrieving and
  *          parsing of properties. This is a part of the test for 4776511.
  * @run main/othervm DefaultProperties
+ * @run main/othervm/policy=java.policy DefaultProperties
  * @modules java.desktop/com.sun.media.sound
  */
 public class DefaultProperties {
@@ -44,8 +45,10 @@ public class DefaultProperties {
 
     public static void main(String[] args) throws Exception {
         boolean allOk = true;
-        File file = new File(System.getProperty("test.src", "."), "testdata");
-        System.setProperty("java.home", file.getCanonicalPath());
+        String path = Paths.get(System.getProperty("test.src", "."),
+                                "testdata", "conf", "sound.properties")
+                           .toAbsolutePath().normalize().toString();
+        System.setProperty("javax.sound.config.file", path);
 
         for (int i = 0; i < lineTypeClasses.length; i++) {
             Class cls = lineTypeClasses[i];
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultPropertiesNegative.java b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultPropertiesNegative.java
new file mode 100644
index 00000000000..bf5c984f69f
--- /dev/null
+++ b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultPropertiesNegative.java
@@ -0,0 +1,79 @@
+/*
+ * 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 java.nio.file.Paths;
+
+import com.sun.media.sound.JDK13Services;
+
+/**
+ * @test
+ * @bug 8201279
+ * @summary this test checks that "javax.sound.config.file" will be ignored if
+ *          the user has no access to the properties file
+ * @run main/othervm/policy=negative.policy DefaultPropertiesNegative
+ * @modules java.desktop/com.sun.media.sound
+ */
+public class DefaultPropertiesNegative {
+
+    private static final Class[] lineTypeClasses = {
+        javax.sound.midi.Receiver.class,
+        javax.sound.midi.Transmitter.class,
+        javax.sound.midi.Sequencer.class,
+        javax.sound.midi.Synthesizer.class,
+    };
+
+    public static void main(String[] args) throws Exception {
+        boolean allOk = true;
+        String path = Paths.get(System.getProperty("test.src", "."),
+                                "testdata", "conf", "sound.properties")
+                           .toAbsolutePath().normalize().toString();
+        System.setProperty("javax.sound.config.file", path);
+
+        for (int i = 0; i < lineTypeClasses.length; i++) {
+            Class cls = lineTypeClasses[i];
+            // properties file, both provider class name and instance name
+            String result = JDK13Services.getDefaultProviderClassName(cls);
+            if (result != null) {
+                out("type " + cls + " failed: provider class should be 'null' "
+                            + "but is '" + result + "'!");
+                allOk = false;
+            }
+            result = JDK13Services.getDefaultInstanceName(cls);
+            if (result != null) {
+                out("type " + cls + " failed: instance name should be 'null' "
+                            + "but is '" + result + "'!");
+                allOk = false;
+            }
+        }
+        if (! allOk) {
+            throw new Exception("Test failed");
+        } else {
+            out("Test passed");
+        }
+    }
+
+    private static void out(String message) {
+        System.out.println(message);
+    }
+}
+
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/java.policy b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/java.policy
new file mode 100644
index 00000000000..4682e51106b
--- /dev/null
+++ b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/java.policy
@@ -0,0 +1,10 @@
+grant {
+    permission java.util.PropertyPermission "javax.sound.config.file", "write";
+    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "javax.sound.midi.Receiver", "write";
+    permission java.util.PropertyPermission "javax.sound.midi.Transmitter", "write";
+    permission java.util.PropertyPermission "javax.sound.midi.Sequencer", "write";
+    permission java.util.PropertyPermission "javax.sound.midi.Synthesizer", "write";
+    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
+    permission java.io.FilePermission "${test.src}/testdata/conf/sound.properties", "read";
+};
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/negative.policy b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/negative.policy
new file mode 100644
index 00000000000..2c6f048a46a
--- /dev/null
+++ b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/negative.policy
@@ -0,0 +1,5 @@
+grant {
+    permission java.util.PropertyPermission "javax.sound.config.file", "write";
+    permission java.util.PropertyPermission "test.src", "read";
+    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
+};
diff --git a/test/jdk/javax/sound/midi/MidiSystem/testdata/conf/sound.properties b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/testdata/conf/sound.properties
similarity index 100%
rename from test/jdk/javax/sound/midi/MidiSystem/testdata/conf/sound.properties
rename to test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/testdata/conf/sound.properties
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultProperties.java
similarity index 93%
rename from test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java
rename to test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultProperties.java
index 1e383297dd5..d8e86392c47 100644
--- a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java
+++ b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, 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
@@ -21,15 +21,15 @@
  * questions.
  */
 
-import java.io.File;
+import java.nio.file.Paths;
 
 import com.sun.media.sound.JDK13Services;
 
 /**
  * @test
- * @bug 4776511
- * @build DefaultProperties
+ * @bug 4776511 8201279
  * @run main/othervm DefaultProperties
+ * @run main/othervm/policy=java.policy DefaultProperties
  * @summary RFE: Setting the default MixerProvider. Test the retrieving and
  *          parsing of properties.
  * @modules java.desktop/com.sun.media.sound
@@ -45,8 +45,10 @@ public class DefaultProperties {
 
     public static void main(String[] args) throws Exception {
         boolean allOk = true;
-        File file = new File(System.getProperty("test.src", "."), "testdata");
-        System.setProperty("java.home", file.getCanonicalPath());
+        String path = Paths.get(System.getProperty("test.src", "."),
+                                "testdata", "conf", "sound.properties")
+                           .toAbsolutePath().normalize().toString();
+        System.setProperty("javax.sound.config.file", path);
 
         for (int i = 0; i < lineTypeClasses.length; i++) {
             Class cls = lineTypeClasses[i];
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultPropertiesNegative.java b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultPropertiesNegative.java
new file mode 100644
index 00000000000..5f4007d405c
--- /dev/null
+++ b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultPropertiesNegative.java
@@ -0,0 +1,78 @@
+/*
+ * 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 java.nio.file.Paths;
+
+import com.sun.media.sound.JDK13Services;
+
+/**
+ * @test
+ * @bug 8201279
+ * @run main/othervm/policy=negative.policy DefaultPropertiesNegative
+ * @summary this test checks that "javax.sound.config.file" will be ignored if
+ *          the user has no access to the properties file
+ * @modules java.desktop/com.sun.media.sound
+ */
+public class DefaultPropertiesNegative {
+
+    private static final Class[] lineTypeClasses = {
+        javax.sound.sampled.SourceDataLine.class,
+        javax.sound.sampled.TargetDataLine.class,
+        javax.sound.sampled.Clip.class,
+        javax.sound.sampled.Port.class,
+    };
+
+    public static void main(String[] args) throws Exception {
+        boolean allOk = true;
+        String path = Paths.get(System.getProperty("test.src", "."),
+                                "testdata", "conf", "sound.properties")
+                           .toAbsolutePath().normalize().toString();
+        System.setProperty("javax.sound.config.file", path);
+
+        for (int i = 0; i < lineTypeClasses.length; i++) {
+            Class cls = lineTypeClasses[i];
+            // properties file, both provider class name and instance name
+            String result = JDK13Services.getDefaultProviderClassName(cls);
+            if (result != null) {
+                out("type " + cls + " failed: provider class should be 'null' "
+                            + "but is '" + result + "'!");
+                allOk = false;
+            }
+            result = JDK13Services.getDefaultInstanceName(cls);
+            if (result != null) {
+                out("type " + cls + " failed: instance name should be 'null' "
+                            + "but is '" + result + "'!");
+                allOk = false;
+            }
+        }
+        if (! allOk) {
+            throw new Exception("Test failed");
+        } else {
+            out("Test passed");
+        }
+    }
+
+    private static void out(String message) {
+        System.out.println(message);
+    }
+}
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/java.policy b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/java.policy
new file mode 100644
index 00000000000..a1046c08867
--- /dev/null
+++ b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/java.policy
@@ -0,0 +1,10 @@
+grant {
+    permission java.util.PropertyPermission "javax.sound.config.file", "write";
+    permission java.util.PropertyPermission "test.src", "read";
+    permission java.util.PropertyPermission "javax.sound.sampled.SourceDataLine", "write";
+    permission java.util.PropertyPermission "javax.sound.sampled.TargetDataLine", "write";
+    permission java.util.PropertyPermission "javax.sound.sampled.Clip", "write";
+    permission java.util.PropertyPermission "javax.sound.sampled.Port", "write";
+    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
+    permission java.io.FilePermission "${test.src}/testdata/conf/sound.properties", "read";
+};
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/negative.policy b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/negative.policy
new file mode 100644
index 00000000000..2c6f048a46a
--- /dev/null
+++ b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/negative.policy
@@ -0,0 +1,5 @@
+grant {
+    permission java.util.PropertyPermission "javax.sound.config.file", "write";
+    permission java.util.PropertyPermission "test.src", "read";
+    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
+};
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/testdata/conf/sound.properties
similarity index 100%
rename from test/jdk/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties
rename to test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/testdata/conf/sound.properties
diff --git a/test/jdk/javax/swing/JLayer/8041982/bug8041982.java b/test/jdk/javax/swing/JLayer/8041982/bug8041982.java
index df15f9c45b3..8c2196bcfff 100644
--- a/test/jdk/javax/swing/JLayer/8041982/bug8041982.java
+++ b/test/jdk/javax/swing/JLayer/8041982/bug8041982.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -53,7 +53,7 @@ public class bug8041982 extends JFrame {
 
     private class BusyLayer extends LayerUI<JComponent> {
         private volatile boolean animated = true;
-        private Icon icon = new ImageIcon(bug8041982.class.getResource("cupanim.gif"));
+        private Icon icon = new ImageIcon(bug8041982.class.getResource("duke.gif"));
         private int imageUpdateCount;
 
         @Override
diff --git a/test/jdk/javax/swing/JLayer/8041982/cupanim.gif b/test/jdk/javax/swing/JLayer/8041982/cupanim.gif
deleted file mode 100644
index 934d093c580..00000000000
Binary files a/test/jdk/javax/swing/JLayer/8041982/cupanim.gif and /dev/null differ
diff --git a/test/jdk/javax/swing/JLayer/8041982/duke.gif b/test/jdk/javax/swing/JLayer/8041982/duke.gif
new file mode 100644
index 00000000000..d5938b191e3
Binary files /dev/null and b/test/jdk/javax/swing/JLayer/8041982/duke.gif differ
diff --git a/test/jdk/javax/swing/JSlider/4987336/bug4987336.html b/test/jdk/javax/swing/JSlider/4987336/bug4987336.html
index 3050143a340..606810da887 100644
--- a/test/jdk/javax/swing/JSlider/4987336/bug4987336.html
+++ b/test/jdk/javax/swing/JSlider/4987336/bug4987336.html
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 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
@@ -24,7 +24,7 @@
 <html>
 <body>
 <applet  code="bug4987336.class" width=600 height=400></applet>
-There are four Sliders. Each of them has a label with animated gif (a cup of coffee)
+There are four Sliders. Each of them has a label with animated gif (a waving duke)
 and a label with static image.
 
 Check that for every LAF animation works for all Sliders. 
diff --git a/test/jdk/javax/swing/JSlider/4987336/bug4987336.java b/test/jdk/javax/swing/JSlider/4987336/bug4987336.java
index 9b30d6a7501..3671a9a30eb 100644
--- a/test/jdk/javax/swing/JSlider/4987336/bug4987336.java
+++ b/test/jdk/javax/swing/JSlider/4987336/bug4987336.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -37,7 +37,7 @@ import java.util.Hashtable;
 public class bug4987336 extends JApplet {
     private static final String IMAGE_RES = "box.gif";
 
-    private static final String ANIM_IMAGE_RES = "cupanim.gif";
+    private static final String ANIM_IMAGE_RES = "duke.gif";
 
     public void init() {
         JPanel pnLafs = new JPanel();
diff --git a/test/jdk/javax/swing/JSlider/4987336/cupanim.gif b/test/jdk/javax/swing/JSlider/4987336/cupanim.gif
deleted file mode 100644
index 934d093c580..00000000000
Binary files a/test/jdk/javax/swing/JSlider/4987336/cupanim.gif and /dev/null differ
diff --git a/test/jdk/javax/swing/JSlider/4987336/duke.gif b/test/jdk/javax/swing/JSlider/4987336/duke.gif
new file mode 100644
index 00000000000..d5938b191e3
Binary files /dev/null and b/test/jdk/javax/swing/JSlider/4987336/duke.gif differ
diff --git a/test/jdk/javax/swing/text/DefaultCaret/HidingSelection/MultiSelectionTest.java b/test/jdk/javax/swing/text/DefaultCaret/HidingSelection/MultiSelectionTest.java
new file mode 100644
index 00000000000..b718f1c034a
--- /dev/null
+++ b/test/jdk/javax/swing/text/DefaultCaret/HidingSelection/MultiSelectionTest.java
@@ -0,0 +1,170 @@
+/*
+ * 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.swing.*;
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.image.BufferedImage;
+
+/**
+ * @test
+ * @bug 8188081 8194135
+ * @summary  The content in textArea can not be pasted after clicking "Copy" button.
+ * @requires (os.family == "linux") | (os.family == "solaris")
+ * @key headful
+ * @run main MultiSelectionTest
+ */
+
+public class MultiSelectionTest {
+
+    private static JTextField field1;
+    private static JTextField field2;
+    private static JFrame frame;
+    private static Rectangle bounds;
+    private static JMenu menu;
+    private static JTextField anotherWindow;
+    private static Point menuLoc;
+    private static JFrame frame2;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            frame = new JFrame();
+            field1 = new JTextField("field1                       ");
+            field2 = new JTextField("field2                       ");
+            field1.setEditable(false);
+            field2.setEditable(false);
+            frame.getContentPane().setLayout(new FlowLayout());
+            frame.getContentPane().add(field1);
+            frame.getContentPane().add(field2);
+            JMenuBar menuBar = new JMenuBar();
+            menu = new JMenu("menu");
+            menu.add(new JMenuItem("item"));
+            menuBar.add(menu);
+            frame.setJMenuBar(menuBar);
+            frame.pack();
+            frame.setVisible(true);
+        });
+
+        Robot robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(200);
+        SwingUtilities.invokeAndWait(() -> {
+            bounds = field2.getBounds();
+            bounds.setLocation(field2.getLocationOnScreen());
+        });
+        BufferedImage nosel = robot.createScreenCapture(bounds);
+
+        SwingUtilities.invokeAndWait(field2::requestFocus);
+        SwingUtilities.invokeAndWait(field2::selectAll);
+        robot.waitForIdle();
+        robot.delay(200);
+        BufferedImage sel = robot.createScreenCapture(bounds);
+
+        SwingUtilities.invokeAndWait(() -> {
+            menuLoc = menu.getLocationOnScreen();
+            menuLoc.translate(10, 10);
+        });
+        robot.mouseMove(menuLoc.x, menuLoc.y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.delay(50);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (!biEqual(robot.createScreenCapture(bounds), sel)) {
+            throw new RuntimeException("Test fails: menu hides selection");
+        }
+
+        SwingUtilities.invokeAndWait(
+                      MenuSelectionManager.defaultManager()::clearSelectedPath);
+        SwingUtilities.invokeAndWait(field1::requestFocus);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (!biEqual(robot.createScreenCapture(bounds), sel)) {
+            throw new RuntimeException(
+                    "Test fails: focus lost hides single selection");
+        }
+
+        SwingUtilities.invokeAndWait(field1::selectAll);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (!biEqual(robot.createScreenCapture(bounds), nosel)) {
+            throw new RuntimeException(
+                    "Test fails: focus lost doesn't hide selection upon multi selection");
+        }
+
+        SwingUtilities.invokeAndWait(field2::requestFocus);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (!biEqual(robot.createScreenCapture(bounds), sel)) {
+            throw new RuntimeException(
+                    "Test fails: focus gain hides selection upon multi selection");
+        }
+
+        SwingUtilities.invokeAndWait(field2::requestFocus);
+        robot.waitForIdle();
+        SwingUtilities.invokeAndWait(() ->{
+            frame2 = new JFrame();
+            Point loc = frame.getLocationOnScreen();
+            loc.translate(0, frame.getHeight());
+            frame2.setLocation(loc);
+            anotherWindow = new JTextField("textField3");
+            frame2.add(anotherWindow);
+            frame2.pack();
+            frame2.setVisible(true);
+        });
+        robot.waitForIdle();
+        SwingUtilities.invokeAndWait(anotherWindow::requestFocus);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (biEqual(robot.createScreenCapture(bounds), nosel)) {
+            throw new RuntimeException(
+                    "Test fails: switch window hides selection");
+        }
+
+        SwingUtilities.invokeAndWait(anotherWindow::selectAll);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (biEqual(robot.createScreenCapture(bounds), sel)) {
+            throw new RuntimeException(
+                "Test fails: selection ownership is lost selection is shown");
+        }
+
+        SwingUtilities.invokeLater(frame2::dispose);
+        SwingUtilities.invokeLater(frame::dispose);
+    }
+
+    static boolean biEqual(BufferedImage i1, BufferedImage i2) {
+        if (i1.getWidth() == i2.getWidth() &&
+                                         i1.getHeight() == i2.getHeight()) {
+            for (int x = 0; x < i1.getWidth(); x++) {
+                for (int y = 0; y < i1.getHeight(); y++) {
+                    if (i1.getRGB(x, y) != i2.getRGB(x, y)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/test/jdk/jdk/internal/jline/console/StripAnsiTest.java b/test/jdk/jdk/internal/jline/console/StripAnsiTest.java
index 7d13864872c..d32c6cdbf3e 100644
--- a/test/jdk/jdk/internal/jline/console/StripAnsiTest.java
+++ b/test/jdk/jdk/internal/jline/console/StripAnsiTest.java
@@ -24,16 +24,11 @@
 /**
  * @test
  * @bug 8080679 8131913
- * @modules jdk.internal.le/jdk.internal.jline
- *          jdk.internal.le/jdk.internal.jline.console:+open
+ * @modules jdk.internal.le/jdk.internal.jline.internal
  * @summary Verify ConsoleReader.stripAnsi strips escape sequences from its input correctly.
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
-import jdk.internal.jline.UnsupportedTerminal;
-import jdk.internal.jline.console.ConsoleReader;
+import jdk.internal.jline.internal.Ansi;
 
 public class StripAnsiTest {
     public static void main(String... args) throws Exception {
@@ -41,16 +36,10 @@ public class StripAnsiTest {
     }
 
     void run() throws Exception {
-        ByteArrayInputStream in = new ByteArrayInputStream(new byte[0]);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ConsoleReader reader = new ConsoleReader(in, out, new UnsupportedTerminal());
-
         String withAnsi = "0\033[s1\033[2J2\033[37;4m3";
         String expected = "0123";
 
-        Method stripAnsi = ConsoleReader.class.getDeclaredMethod("stripAnsi", String.class);
-        stripAnsi.setAccessible(true);
-        String actual = (String) stripAnsi.invoke(reader, withAnsi);
+        String actual = Ansi.stripAnsi(withAnsi);
 
         if (!expected.equals(actual)) {
             throw new IllegalStateException("Did not correctly strip escape sequences: " + actual);
diff --git a/test/jdk/jdk/internal/jline/extra/AnsiInterpretingOutputStreamTest.java b/test/jdk/jdk/internal/jline/extra/AnsiInterpretingOutputStreamTest.java
new file mode 100644
index 00000000000..906576951c8
--- /dev/null
+++ b/test/jdk/jdk/internal/jline/extra/AnsiInterpretingOutputStreamTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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 8203827
+ * @summary Verify that escape sequences intepretation (used by Windows Terminal) works properly.
+ * @modules jdk.internal.le/jdk.internal.jline.extra
+ * @build AnsiInterpretingOutputStreamTest
+ * @run testng AnsiInterpretingOutputStreamTest
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import jdk.internal.jline.extra.AnsiInterpretingOutputStream;
+import jdk.internal.jline.extra.AnsiInterpretingOutputStream.BufferState;
+import jdk.internal.jline.extra.AnsiInterpretingOutputStream.Performer;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+@Test
+public class AnsiInterpretingOutputStreamTest {
+
+    public void testAnsiInterpretation() throws IOException {
+        BufferState[] state = new BufferState[] {new BufferState(5, 5, 10, 10)};
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        OutputStream test = new AnsiInterpretingOutputStream("UTF-8", result, new Performer() {
+            @Override
+            public BufferState getBufferState() {
+                return state[0];
+            }
+            @Override
+            public void setCursorPosition(int cursorX, int cursorY) {
+                state[0] = new BufferState(cursorX, cursorY, state[0].sizeX, state[0].sizeY);
+                try {
+                    result.write(("<setCursorPosition(" + cursorX + ", " + cursorY + ")>").getBytes("UTF-8"));
+                } catch (IOException ex) {
+                    throw new AssertionError(ex);
+                }
+            }
+        });
+
+        Writer testWriter = new OutputStreamWriter(test, "UTF-8");
+
+        //cursor move:
+        testWriter.write("\033[A\033[3A\033[15A\n");
+        testWriter.write("\033[B\033[3B\033[15B\n");
+        testWriter.write("\033[D\033[3D\033[15D\n");
+        testWriter.write("\033[C\033[3C\033[15C\n");
+
+        //clearing line:
+        testWriter.write("\033[5D\n");
+        testWriter.write("\033[K\n");
+        testWriter.write("\033[1K\n");
+        testWriter.write("\033[2K\n");
+
+        testWriter.flush();
+
+        String expected = "<setCursorPosition(5, 4)><setCursorPosition(5, 1)><setCursorPosition(5, 0)>\n" +
+                          "<setCursorPosition(5, 1)><setCursorPosition(5, 4)><setCursorPosition(5, 9)>\n" +
+                          "<setCursorPosition(4, 9)><setCursorPosition(1, 9)><setCursorPosition(0, 9)>\n" +
+                          "<setCursorPosition(1, 9)><setCursorPosition(4, 9)><setCursorPosition(9, 9)>\n" +
+                          "<setCursorPosition(4, 9)>\n" +
+                          "     <setCursorPosition(4, 9)>\n" +
+                          "<setCursorPosition(0, 9)>    \n" +
+                          "         <setCursorPosition(0, 9)>\n";
+        String actual = new String(result.toByteArray(), "UTF-8");
+
+        assertEquals(actual, expected);
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
index 5f7caa924ea..ab939ee579d 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
@@ -29,7 +29,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires vm.gc == "ConcMarkSweep" | vm.gc == null
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @requires vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithCMSConcurrent
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
index 9d423f3e432..66deb271706 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
@@ -30,7 +30,7 @@ import jdk.test.lib.jfr.GCHelper;
  * @test
  * @key jfr
  *
- * @requires vm.gc == "ConcMarkSweep" | vm.gc == null
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithCMSMarkSweep
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
index 6d6ef361440..7ff54ffc763 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
@@ -29,7 +29,7 @@ package jdk.jfr.event.gc.collection;
  * @test
  * @key jfr
  *
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
  *
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
index 0c7d250ce37..875f70606b4 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
@@ -29,7 +29,7 @@ package jdk.jfr.event.gc.collection;
  * @test
  * @key jfr
  *
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
  *
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
index 6290e7105fe..ba2603e195c 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
@@ -29,7 +29,7 @@ package jdk.jfr.event.gc.collection;
  * @test
  * @key jfr
  *
- * @requires vm.gc == "ConcMarkSweep" | vm.gc == null
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -Xmx32m -Xmn8m -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC jdk.jfr.event.gc.collection.TestGCEventMixedWithParNew
  * good debug flags: -Xlog:gc*=debug
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java b/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
index 91822c8b4d7..9e6b21a262a 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
@@ -28,7 +28,7 @@ package jdk.jfr.event.gc.collection;
 /*
  * @test
  * @key jfr
- * @requires vm.gc == "ConcMarkSweep" | vm.gc == null
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseConcMarkSweepGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithParNew
  */
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
index 2ebb89545f4..9bcf29a7573 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
@@ -42,7 +42,7 @@ import jdk.test.lib.jfr.EventNames;
  * @test
  * @key jfr
  *
- * @requires vm.gc == "ConcMarkSweep" | vm.gc == null
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
  *
  * @run main jdk.jfr.event.gc.detailed.TestCMSConcurrentModeFailureEvent
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
index 54126020f0e..f6351485499 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
@@ -27,7 +27,7 @@ package jdk.jfr.event.gc.detailed;
 /*
  * @test
  * @key jfr
- * @requires vm.gc == "ConcMarkSweep" | vm.gc == null
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm  jdk.jfr.event.gc.detailed.TestPromotionFailedEventWithParNew
  */
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
index ac93d0b8ff9..bbd2ee39fd5 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
@@ -26,7 +26,7 @@ package jdk.jfr.event.gc.detailed;
 
 /*
  * @test
- * @requires vm.gc == "null" | vm.gc == "ConcMarkSweep"
+ * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithCMS
  */
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
index 1338dd98bd7..70e8684592b 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
@@ -26,7 +26,7 @@ package jdk.jfr.event.gc.detailed;
 
 /*
  * @test
- * @requires vm.gc == "null"
+ * @requires vm.gc == "null" & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithParNew
  */
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
index abd62373dee..c2271dbfc49 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
@@ -26,7 +26,7 @@ package jdk.jfr.event.gc.detailed;
 
 /*
  * @test
- * @requires vm.gc == "null" | vm.gc == "ConcMarkSweep"
+ * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithCMS 1048576
  */
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
index cee8139cd29..0a0474c6a1b 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
@@ -26,7 +26,7 @@ package jdk.jfr.event.gc.detailed;
 
 /*
  * @test
- * @requires vm.gc == "null"
+ * @requires vm.gc == "null" & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithParNew 1048576
  */
diff --git a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
index af664387066..cfa10084449 100644
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
@@ -38,7 +38,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventConcurrentCMS
diff --git a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
index 53838b39aea..ee6b65dc003 100644
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
@@ -29,7 +29,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventParNewCMS
diff --git a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
index 3b0822dcb81..1b1fe2fa57a 100644
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
@@ -29,7 +29,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithCMSConcurrent
diff --git a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
index 62b88cc926d..99302312f01 100644
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
@@ -29,7 +29,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithCMSMarkSweep
diff --git a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
index 96b56e5c05a..a3a31e0869a 100644
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
@@ -29,7 +29,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.refstat.TestRefStatEventWithCMSConcurrent
diff --git a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
index 090e93d5173..4095421751b 100644
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
@@ -29,7 +29,7 @@ import jdk.test.lib.jfr.GCHelper;
 /*
  * @test
  * @key jfr
- * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null)
+ * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
  * @run main/othervm  -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -XX:+UseConcMarkSweepGC jdk.jfr.event.gc.refstat.TestRefStatEventWithCMSMarkSweep
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
index 9e80f08f76b..2344dc97414 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
@@ -28,7 +28,7 @@ package jdk.jfr.event.gc.stacktrace;
  * @test
  * @key jfr
  *
- * @requires vm.gc == "null" | vm.gc == "ConcMarkSweep"
+ * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseConcMarkSweepGC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestConcMarkSweepAllocationPendingStackTrace
  */
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
index ded1a09f7c5..8435d3d8168 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
@@ -28,7 +28,7 @@ package jdk.jfr.event.gc.stacktrace;
  * @test
  * @key jfr
  *
- * @requires vm.gc == "null" | vm.gc == "ConcMarkSweep"
+ * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @requires !(vm.compMode == "Xcomp" & os.arch == "aarch64")
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:MaxMetaspaceSize=64M -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
index edb90c76af5..889b8574529 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
@@ -28,7 +28,7 @@ package jdk.jfr.event.gc.stacktrace;
  * @test
  * @key jfr
  *
- * @requires vm.gc == "null" | vm.gc == "ConcMarkSweep"
+ * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xlog:gc* -XX:+FlightRecorder jdk.jfr.event.gc.stacktrace.TestParNewAllocationPendingStackTrace
  */
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestCMS.java b/test/jdk/jdk/jfr/event/oldobject/TestCMS.java
index 45a4c29925a..69f63ba3bb2 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestCMS.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestCMS.java
@@ -37,7 +37,7 @@ import jdk.test.lib.jfr.Events;
 /*
  * @test
  * @key jfr
- * @requires vm.gc == "null"
+ * @requires vm.gc == "null" & !vm.graal.enabled
  * @summary Test leak profiler with CMS GC
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
diff --git a/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java b/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java
index dc12e6ec2f0..201ed1d4803 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java
@@ -33,9 +33,9 @@ import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.process.OutputAnalyzer;
 
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.FutureTask;
+import java.util.stream.Collectors;
 
 /*
  * @test
@@ -99,6 +99,14 @@ public class TestBiasedLockRevocationEvents {
         validateStackTrace(stackTrace, "touch");
     }
 
+    // Retrieve all biased lock revocation events related to the provided lock class, sorted by start time
+    static List<RecordedEvent> getRevocationEvents(Recording recording, String fieldName, Class<?> lockClass) throws Throwable {
+        return Events.fromRecording(recording).stream()
+                .filter(e -> ((RecordedClass)e.getValue(fieldName)).getName().equals(lockClass.getName()))
+                .sorted(Comparator.comparing(RecordedEvent::getStartTime))
+                .collect(Collectors.toList());
+    }
+
     static void testSingleRevocation() throws Throwable {
         class MyLock {};
 
@@ -110,11 +118,8 @@ public class TestBiasedLockRevocationEvents {
         Thread biasBreaker = triggerRevocation(1, MyLock.class);
 
         recording.stop();
-
-        List<RecordedEvent> events = Events.fromRecording(recording);
-
-        // We may or may not catch a second revocation from the biasBreaker thread exiting
-        Asserts.assertGreaterThanOrEqual(events.size(), 1);
+        List<RecordedEvent> events = getRevocationEvents(recording, "lockClass", MyLock.class);
+        Asserts.assertEQ(events.size(), 1);
 
         RecordedEvent event = events.get(0);
         Events.assertEventThread(event, biasBreaker);
@@ -137,7 +142,7 @@ public class TestBiasedLockRevocationEvents {
         Thread biasBreaker = triggerRevocation(BULK_REVOKE_THRESHOLD, MyLock.class);
 
         recording.stop();
-        List<RecordedEvent> events = Events.fromRecording(recording);
+        List<RecordedEvent> events = getRevocationEvents(recording, "revokedClass", MyLock.class);
         Asserts.assertEQ(events.size(), 1);
 
         RecordedEvent event = events.get(0);
@@ -163,8 +168,7 @@ public class TestBiasedLockRevocationEvents {
         Thread.holdsLock(l);
 
         recording.stop();
-
-        List<RecordedEvent> events = Events.fromRecording(recording);
+        List<RecordedEvent> events = getRevocationEvents(recording, "lockClass", MyLock.class);
         Asserts.assertEQ(events.size(), 1);
 
         RecordedEvent event = events.get(0);
@@ -206,25 +210,18 @@ public class TestBiasedLockRevocationEvents {
         touch(l);
 
         recording.stop();
-        List<RecordedEvent> events = Events.fromRecording(recording);
-        Events.hasEvents(events);
+        List<RecordedEvent> events = getRevocationEvents(recording, "lockClass", MyLock.class);
+        Asserts.assertEQ(events.size(), 1);
 
-        // Joining the locker thread can cause revocations as well, search for the interesting one
-        for (RecordedEvent event : events) {
-            RecordedClass lockClass = event.getValue("lockClass");
-            if (lockClass.getName().equals(MyLock.class.getName())) {
-                Events.assertEventThread(event, Thread.currentThread());
-                // Previous owner will usually be null, but can also be a thread that
-                // was created after the BiasLocker thread exited due to address reuse.
-                RecordedThread prevOwner = event.getValue("previousOwner");
-                if (prevOwner != null) {
-                    Asserts.assertNE(prevOwner.getJavaName(), "BiasLocker");
-                }
-                validateStackTrace(event.getStackTrace());
-                return;
-            }
+        RecordedEvent event = events.get(0);
+        Events.assertEventThread(event, Thread.currentThread());
+        // Previous owner will usually be null, but can also be a thread that
+        // was created after the BiasLocker thread exited due to address reuse.
+        RecordedThread prevOwner = event.getValue("previousOwner");
+        if (prevOwner != null) {
+            Asserts.assertNE(prevOwner.getJavaName(), "BiasLocker");
         }
-        Asserts.fail("Did not find any revocation event for MyLock");
+        validateStackTrace(event.getStackTrace());
     }
 
     static void testBulkRevocationNoRebias() throws Throwable {
@@ -239,12 +236,12 @@ public class TestBiasedLockRevocationEvents {
         Thread biasBreaker1 = triggerRevocation(BULK_REVOKE_THRESHOLD, MyLock.class);
 
         recording.stop();
-        List<RecordedEvent> events = Events.fromRecording(recording);
+        List<RecordedEvent> events = getRevocationEvents(recording, "revokedClass", MyLock.class);
         Asserts.assertEQ(events.size(), 2);
 
         // The rebias event should occur before the noRebias one
-        RecordedEvent eventRebias = events.get(0).getStartTime().isBefore(events.get(1).getStartTime()) ? events.get(0) : events.get(1);
-        RecordedEvent eventNoRebias = events.get(0).getStartTime().isBefore(events.get(1).getStartTime()) ? events.get(1) : events.get(0);
+        RecordedEvent eventRebias = events.get(0);
+        RecordedEvent eventNoRebias = events.get(1);
 
         Events.assertEventThread(eventRebias, biasBreaker0);
         Events.assertField(eventRebias, "disableBiasing").equal(false);
@@ -276,12 +273,20 @@ public class TestBiasedLockRevocationEvents {
         recording.stop();
         List<RecordedEvent> events = Events.fromRecording(recording);
 
-        // Find all biased locking related VMOperation events
-        HashMap<Integer, RecordedEvent> vmOperations = new HashMap<Integer, RecordedEvent>();
+        // Determine which safepoints included single and bulk revocation VM operations
+        Set<Integer> vmOperationsSingle = new HashSet<>();
+        Set<Integer> vmOperationsBulk = new HashSet<>();
+
         for (RecordedEvent event : events) {
-            if ((event.getEventType().getName().equals(EventNames.ExecuteVMOperation)) &&
-                    (event.getValue("operation").toString().contains("Bias"))) {
-                vmOperations.put(event.getValue("safepointId"), event);
+            if (event.getEventType().getName().equals(EventNames.ExecuteVMOperation)) {
+                String operation = event.getValue("operation");
+                Integer safepointId = event.getValue("safepointId");
+
+                if (operation.equals("RevokeBias")) {
+                    vmOperationsSingle.add(safepointId);
+                } else if (operation.equals("BulkRevokeBias")) {
+                    vmOperationsBulk.add(safepointId);
+                }
             }
         }
 
@@ -291,23 +296,22 @@ public class TestBiasedLockRevocationEvents {
         // Match all revoke events to a corresponding VMOperation event
         for (RecordedEvent event : events) {
             if (event.getEventType().getName().equals(EventNames.BiasedLockRevocation)) {
-                RecordedEvent vmOpEvent = vmOperations.remove(event.getValue("safepointId"));
-                if (event.getValue("safepointId").toString().equals("-1")) {
-                    Asserts.assertEquals(vmOpEvent, null);
-                } else {
-                    Events.assertField(vmOpEvent, "operation").equal("RevokeBias");
+                Integer safepointId = event.getValue("safepointId");
+                String lockClass = ((RecordedClass)event.getValue("lockClass")).getName();
+                if (lockClass.equals(MyLock.class.getName())) {
+                    Asserts.assertTrue(vmOperationsSingle.contains(safepointId));
                     revokeCount++;
                 }
             } else if (event.getEventType().getName().equals(EventNames.BiasedLockClassRevocation)) {
-                RecordedEvent vmOpEvent = vmOperations.remove(event.getValue("safepointId"));
-                Events.assertField(vmOpEvent, "operation").equal("BulkRevokeBias");
-                bulkRevokeCount++;
+                Integer safepointId = event.getValue("safepointId");
+                String lockClass = ((RecordedClass)event.getValue("revokedClass")).getName();
+                if (lockClass.toString().equals(MyLock.class.getName())) {
+                    Asserts.assertTrue(vmOperationsBulk.contains(safepointId));
+                    bulkRevokeCount++;
+                }
             }
         }
 
-        // All VMOperations should have had a matching revoke event
-        Asserts.assertEQ(vmOperations.size(), 0);
-
         Asserts.assertGT(bulkRevokeCount, 0);
         Asserts.assertGT(revokeCount, bulkRevokeCount);
     }
diff --git a/test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java b/test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java
index 5366a8b22d6..baee30b3b14 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java
@@ -40,6 +40,7 @@ import jdk.test.lib.jfr.Events;
  * @test
  * @summary Tests the JFR events related to modules
  * @key jfr
+ * @requires !vm.graal.enabled
  * @library /test/lib
  * @run main/othervm --limit-modules java.base,jdk.jfr jdk.jfr.event.runtime.TestModuleEvents
  */
diff --git a/test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java b/test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java
index eda96bc9ca9..af15080c4e6 100644
--- a/test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java
+++ b/test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java
@@ -43,9 +43,8 @@ import jdk.test.lib.process.ProcessTools;
 public class TestJfrJavaBase {
 
     private static void checkOutput(OutputAnalyzer output) {
-        output.shouldContain("jdk.jfr not found.");
+        output.shouldContain("Module jdk.jfr not found.");
         output.shouldContain("Flight Recorder can not be enabled.");
-        output.shouldContain("To use Flight Recorder, you might need to add \"--add-modules jdk.jfr\" to the VM command-line options.");
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/test/jdk/lib/security/cacerts/VerifyCACerts.java b/test/jdk/lib/security/cacerts/VerifyCACerts.java
index c5b1512396d..33b53e376b5 100644
--- a/test/jdk/lib/security/cacerts/VerifyCACerts.java
+++ b/test/jdk/lib/security/cacerts/VerifyCACerts.java
@@ -19,11 +19,12 @@
  * 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 8189131 8198240 8191844
+ * @bug 8189131 8198240 8191844 8189949 8191031 8196141
  * @requires java.runtime.name ~= "OpenJDK.*"
  * @summary Check root CA entries in cacerts file
  */
@@ -41,7 +42,7 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 79;
+    private static final int COUNT = 74;
 
     // map of cert alias to SHA-256 fingerprint
     private static final Map<String, String> FINGERPRINT_MAP
@@ -89,8 +90,6 @@ public class VerifyCACerts {
                     "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16");
             put("baltimorecybertrustca [jdk]",
                     "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
-            put("baltimorecodesigningca [jdk]",
-                    "A9:15:45:DB:D2:E1:9C:4C:CD:F9:09:AA:71:90:0D:18:C7:35:1C:89:B3:15:F0:F1:3D:05:C1:3A:8F:FB:46:87");
             put("digicertglobalrootca [jdk]",
                     "43:48:A0:E9:44:4C:78:CB:26:5E:05:8D:5E:89:44:B4:D8:4F:96:62:BD:26:DB:25:7F:89:34:A4:43:C7:01:61");
             put("digicertglobalrootg2 [jdk]",
@@ -107,12 +106,6 @@ public class VerifyCACerts {
                     "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
             put("digicerthighassuranceevrootca [jdk]",
                     "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF");
-            put("equifaxsecureca [jdk]",
-                    "08:29:7A:40:47:DB:A2:36:80:C7:31:DB:6E:31:76:53:CA:78:48:E1:BE:BD:3A:0B:01:79:A7:07:F9:2C:F1:78");
-            put("equifaxsecureebusinessca1 [jdk]",
-                    "2E:3A:2B:B5:11:25:05:83:6C:A8:96:8B:E2:CB:37:27:CE:9B:56:84:5C:6E:E9:8E:91:85:10:4A:FB:9A:F5:96");
-            put("equifaxsecureglobalebusinessca1 [jdk]",
-                    "86:AB:5A:65:71:D3:32:9A:BC:D2:E4:E6:37:66:8B:A8:9C:73:1E:C2:93:B6:CB:A6:0F:71:63:40:A0:91:CE:AE");
             put("geotrustglobalca [jdk]",
                     "FF:85:6A:2D:25:1D:CD:88:D3:66:56:F4:50:12:67:98:CF:AB:AA:DE:40:79:9C:72:2D:E4:D2:B5:DB:36:A7:3A");
             put("geotrustprimaryca [jdk]",
@@ -135,16 +128,6 @@ public class VerifyCACerts {
                     "3F:9F:27:D5:83:20:4B:9E:09:C8:A3:D2:06:6C:4B:57:D3:A2:47:9C:36:93:65:08:80:50:56:98:10:5D:BC:E9");
             put("verisigntsaca [jdk]",
                     "CB:6B:05:D9:E8:E5:7C:D8:82:B1:0B:4D:B7:0D:E4:BB:1D:E4:2B:A4:8A:7B:D0:31:8B:63:5B:F6:E7:78:1A:9D");
-            put("verisignclass1ca [jdk]",
-                    "51:84:7C:8C:BD:2E:9A:72:C9:1E:29:2D:2A:E2:47:D7:DE:1E:3F:D2:70:54:7A:20:EF:7D:61:0F:38:B8:84:2C");
-            put("verisignclass1g2ca [jdk]",
-                    "34:1D:E9:8B:13:92:AB:F7:F4:AB:90:A9:60:CF:25:D4:BD:6E:C6:5B:9A:51:CE:6E:D0:67:D0:0E:C7:CE:9B:7F");
-            put("verisignclass1g3ca [jdk]",
-                    "CB:B5:AF:18:5E:94:2A:24:02:F9:EA:CB:C0:ED:5B:B8:76:EE:A3:C1:22:36:23:D0:04:47:E4:F3:BA:55:4B:65");
-            put("verisignclass2g2ca [jdk]",
-                    "3A:43:E2:20:FE:7F:3E:A9:65:3D:1E:21:74:2E:AC:2B:75:C2:0F:D8:98:03:05:BC:50:2C:AF:8C:2D:9B:41:A1");
-            put("verisignclass2g3ca [jdk]",
-                    "92:A9:D9:83:3F:E1:94:4D:B3:66:E8:BF:AE:7A:95:B6:48:0C:2D:6C:6C:2A:1B:E6:5D:42:36:B6:08:FC:A1:BB");
             put("verisignclass3ca [jdk]",
                     "A4:B6:B3:99:6F:C2:F3:06:B3:FD:86:81:BD:63:41:3D:8C:50:09:CC:4F:A3:29:C2:CC:F0:E2:FA:1B:14:03:05");
             put("verisignclass3g2ca [jdk]",
@@ -205,14 +188,21 @@ public class VerifyCACerts {
                     "F1:C1:B5:0A:E5:A2:0D:D8:03:0E:C9:F6:BC:24:82:3D:D3:67:B5:25:57:59:B4:E7:1B:61:FC:E9:F7:37:5D:73");
             put("xrampglobalca [jdk]",
                     "CE:CD:DC:90:50:99:D8:DA:DF:C5:B1:D2:09:B7:37:CB:E2:C1:8C:FB:2C:10:C0:FF:0B:CF:0D:32:86:FC:1A:A2");
+            put("godaddyrootg2ca [jdk]",
+                    "45:14:0B:32:47:EB:9C:C8:C5:B4:F0:D7:B5:30:91:F7:32:92:08:9E:6E:5A:63:E2:74:9D:D3:AC:A9:19:8E:DA");
+            put("godaddyclass2ca [jdk]",
+                    "C3:84:6B:F2:4B:9E:93:CA:64:27:4C:0E:C6:7C:1E:CC:5E:02:4F:FC:AC:D2:D7:40:19:35:0E:81:FE:54:6A:E4");
+            put("starfieldclass2ca [jdk]",
+                    "14:65:FA:20:53:97:B8:76:FA:A6:F0:A9:95:8E:55:90:E4:0F:CC:7F:AA:4F:B7:C2:C8:67:75:21:FB:5F:B6:58");
+            put("starfieldrootg2ca [jdk]",
+                    "2C:E1:CB:0B:F9:D2:F9:E1:02:99:3F:BE:21:51:52:C3:B2:DD:0C:AB:DE:1C:68:E5:31:9B:83:91:54:DB:B7:F5");
         }
     };
 
     // Exception list to 90 days expiry policy
     private static final HashSet<String> EXPIRY_EXC_ENTRIES
             = new HashSet<String>(Arrays.asList(
-                    "gtecybertrustglobalca [jdk]",
-                    "equifaxsecureca [jdk]"
+                    "gtecybertrustglobalca [jdk]"
             ));
 
     // Ninety days in milliseconds
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java
new file mode 100644
index 00000000000..e8971b987ca
--- /dev/null
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java
@@ -0,0 +1,346 @@
+/*
+ * 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 8196141
+ * @summary Interoperability tests with GoDaddy/Starfield CA
+ * @build ValidatePathWithParams
+ * @run main/othervm -Djava.security.debug=certpath GoDaddyCA OCSP
+ * @run main/othervm -Djava.security.debug=certpath GoDaddyCA CRL
+ */
+
+/*
+ * Obtain test artifacts for GoDaddy/Starfield CAs from:
+ *
+ * Go Daddy Root Certificate Authority - G2:
+ *    valid: https://valid.gdig2.catest.godaddy.com/
+ *    expired: https://expired.gdig2.catest.godaddy.com/
+ *    revoked: https://revoked.gdig2.catest.godaddy.com/
+ *
+ * Starfield Root Certificate Authority - G2:
+ *    valid: https://valid.sfig2.catest.starfieldtech.com/
+ *    expired: https://expired.sfig2.catest.starfieldtech.com/
+ *    revoked: https://revoked.sfig2.catest.starfieldtech.com/
+ */
+public class GoDaddyCA {
+
+    public static void main(String[] args) throws Exception {
+
+        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
+
+        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
+            // CRL check
+            pathValidator.enableCRLCheck();
+        } else {
+            // OCSP check by default
+            pathValidator.enableOCSPCheck();
+        }
+
+        new GoDaddyGdig2().runTest(pathValidator);
+        new GoDaddySfig2().runTest(pathValidator);
+    }
+}
+
+class GoDaddyGdig2 {
+
+    // Owner: CN=Go Daddy Secure Certificate Authority - G2,
+    // OU=http://certs.godaddy.com/repository/, O="GoDaddy.com, Inc.",
+    // L=Scottsdale, ST=Arizona, C=US
+    // Issuer: CN=Go Daddy Root Certificate Authority - G2, O="GoDaddy.com, Inc.",
+    // L=Scottsdale, ST=Arizona, C=US
+    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
+            + "MIIE0DCCA7igAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx\n"
+            + "EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT\n"
+            + "EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp\n"
+            + "ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTExMDUwMzA3MDAwMFoXDTMxMDUwMzA3\n"
+            + "MDAwMFowgbQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH\n"
+            + "EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UE\n"
+            + "CxMkaHR0cDovL2NlcnRzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQD\n"
+            + "EypHbyBEYWRkeSBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwggEi\n"
+            + "MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC54MsQ1K92vdSTYuswZLiBCGzD\n"
+            + "BNliF44v/z5lz4/OYuY8UhzaFkVLVat4a2ODYpDOD2lsmcgaFItMzEUz6ojcnqOv\n"
+            + "K/6AYZ15V8TPLvQ/MDxdR/yaFrzDN5ZBUY4RS1T4KL7QjL7wMDge87Am+GZHY23e\n"
+            + "cSZHjzhHU9FGHbTj3ADqRay9vHHZqm8A29vNMDp5T19MR/gd71vCxJ1gO7GyQ5HY\n"
+            + "pDNO6rPWJ0+tJYqlxvTV0KaudAVkV4i1RFXULSo6Pvi4vekyCgKUZMQWOlDxSq7n\n"
+            + "eTOvDCAHf+jfBDnCaQJsY1L6d8EbyHSHyLmTGFBUNUtpTrw700kuH9zB0lL7AgMB\n"
+            + "AAGjggEaMIIBFjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV\n"
+            + "HQ4EFgQUQMK9J47MNIMwojPX+2yz8LQsgM4wHwYDVR0jBBgwFoAUOpqFBxBnKLbv\n"
+            + "9r0FQW4gwZTaD94wNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8v\n"
+            + "b2NzcC5nb2RhZGR5LmNvbS8wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5n\n"
+            + "b2RhZGR5LmNvbS9nZHJvb3QtZzIuY3JsMEYGA1UdIAQ/MD0wOwYEVR0gADAzMDEG\n"
+            + "CCsGAQUFBwIBFiVodHRwczovL2NlcnRzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkv\n"
+            + "MA0GCSqGSIb3DQEBCwUAA4IBAQAIfmyTEMg4uJapkEv/oV9PBO9sPpyIBslQj6Zz\n"
+            + "91cxG7685C/b+LrTW+C05+Z5Yg4MotdqY3MxtfWoSKQ7CC2iXZDXtHwlTxFWMMS2\n"
+            + "RJ17LJ3lXubvDGGqv+QqG+6EnriDfcFDzkSnE3ANkR/0yBOtg2DZ2HKocyQetawi\n"
+            + "DsoXiWJYRBuriSUBAA/NxBti21G00w9RKpv0vHP8ds42pM3Z2Czqrpv1KrKQ0U11\n"
+            + "GIo/ikGQI31bS/6kA1ibRrLDYGCD+H1QQc7CoZDDu+8CL9IVVO5EFdkKrqeKM+2x\n"
+            + "LXY2JtwE65/3YR8V3Idv7kaWKK2hJn0KCacuBKONvPi8BDAB\n"
+            + "-----END CERTIFICATE-----";
+
+    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Delaware/businessCategory=Private
+    // Organization/serialNumber=5510922, C=US, ST=Arizona, L=Scottsdale, O=GoDaddy INC., CN=valid.gdig2.catest.godaddy.com
+    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIHbzCCBlegAwIBAgIIC3Go9uPeseowDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV\n" +
+            "BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow\n" +
+            "GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz\n" +
+            "LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1\n" +
+            "cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTcwOTE1MjMyMzAyWhcN\n" +
+            "MTkwOTE1MjMyMzAyWjCB1TETMBEGCysGAQQBgjc8AgEDEwJVUzEZMBcGCysGAQQB\n" +
+            "gjc8AgECEwhEZWxhd2FyZTEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
+            "EDAOBgNVBAUTBzU1MTA5MjIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25h\n" +
+            "MRMwEQYDVQQHEwpTY290dHNkYWxlMRUwEwYDVQQKEwxHb0RhZGR5IElOQy4xJzAl\n" +
+            "BgNVBAMTHnZhbGlkLmdkaWcyLmNhdGVzdC5nb2RhZGR5LmNvbTCCASIwDQYJKoZI\n" +
+            "hvcNAQEBBQADggEPADCCAQoCggEBAO3xTbLfdIHiG1MIsBCz0oIg5vBxlzZyK5Rw\n" +
+            "DM6A/TWUDelFWyYj6fZDXYyHby4nAK9ibfhiT2f+q+5lEslye5Mt9gC39pZbpHE2\n" +
+            "eyJgmtNgmPGq15pf/87JE697BRwp9CWJP3yNYeamFl/F2THZOqlXCiSRbIGZ5TsZ\n" +
+            "sVb1vjFPmh249Ujw1zSThY9hA669Cyp3xb4iTowjCqdNYqbn22Jbk0SEXPYzLMf0\n" +
+            "mlY8xZ/e/8NxzJgev3N1LR3bPEijLYDZeZJ6WKc75pqNvgo8A+dEeX9bxFkCnstY\n" +
+            "6Iq0HTJua0TTD6V585YXNm4Z5OxjBE5kPkkFfwW0bb5dRZp86HUCAwEAAaOCA2Aw\n" +
+            "ggNcMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\n" +
+            "MA4GA1UdDwEB/wQEAwIFoDA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLmdv\n" +
+            "ZGFkZHkuY29tL2dkaWcyczMtOS5jcmwwXAYDVR0gBFUwUzBIBgtghkgBhv1tAQcX\n" +
+            "AzA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29t\n" +
+            "L3JlcG9zaXRvcnkvMAcGBWeBDAEBMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcw\n" +
+            "AYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8v\n" +
+            "Y2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8G\n" +
+            "A1UdIwQYMBaAFEDCvSeOzDSDMKIz1/tss/C0LIDOME0GA1UdEQRGMESCHnZhbGlk\n" +
+            "LmdkaWcyLmNhdGVzdC5nb2RhZGR5LmNvbYIid3d3LnZhbGlkLmdkaWcyLmNhdGVz\n" +
+            "dC5nb2RhZGR5LmNvbTAdBgNVHQ4EFgQUKSs41O+5SnkjAEaNyHk6sxq5sn8wggF/\n" +
+            "BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB3AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFc\n" +
+            "wO+UmFXWidDdAAABXofbjGMAAAQDAEgwRgIhAPZEqPZAlYpSTx+R/+7mOUa+BcBz\n" +
+            "U1JHZDpcy98am0glAiEA1u2FxjgAa4L5HVGYV2LSQZIltGRJ8mBT8V0JVsdm3dsA\n" +
+            "dgDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAV6H25ASAAAEAwBH\n" +
+            "MEUCIQCFowkRXyR8gkX8cL7RbPSwiKCHy/1I1WVzpinmrHlZFQIgE5nShGeK7cqT\n" +
+            "j2C9FfrPc/Axe3/pzAFxD/BNQD1RO5sAdgCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb\n" +
+            "37jjd80OyA3cEAAAAV6H25GdAAAEAwBHMEUCIBQrE+FqILUhI0wdp2X+lf/e3UG1\n" +
+            "gyxHmSVeN2+CkrXPAiEA1mIIVmLNURGyI8wnZ5KRnBPOKYM2MC54RJ8CFrEHIz4w\n" +
+            "DQYJKoZIhvcNAQELBQADggEBADInvf3eS6SgQ1qxPx4RT2hPeU5frlWJWcOWUdZB\n" +
+            "6mVNcmUQMkYnjkg8+PQ782HGP0DvAfcIRDhSfXdIqzEk8MPUq1XHEOfwRzLpTiCN\n" +
+            "FQDQIt1LXnzESCUurJS8r4mxgaVLAwHFytOTDrQn0Xfs93dm0tnRGAg7iBg+N33V\n" +
+            "zOR4aqojdDUWa1Rr4WFqZMkZIxzREQCYC8HXSYqLA1oPuoMMog8dId7XSalBmGJ4\n" +
+            "KQVsZ0/Hpi0y9k/Zw5obGcEYJWMbuU1iaEkvdtXOiXEQfJ1WS+Yy55J4GSjpIiop\n" +
+            "qDZD88xA9r7ttzM/khao7jfIpVWG2HuX0JlHWdh3y9aegiw=\n" +
+            "-----END CERTIFICATE-----";
+
+    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Delaware/businessCategory=Private
+    // Organization/serialNumber=5510922, C=US, ST=Arizona, L=Scottsdale, O=GoDaddy INC., CN=revoked.gdig2.catest.godaddy.com
+    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIHdDCCBlygAwIBAgIIEBJV3vmogM8wDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV\n" +
+            "BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow\n" +
+            "GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz\n" +
+            "LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1\n" +
+            "cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTcwOTE1MjMyMzAzWhcN\n" +
+            "MTkwOTE1MjMyMzAzWjCB1zETMBEGCysGAQQBgjc8AgEDEwJVUzEZMBcGCysGAQQB\n" +
+            "gjc8AgECEwhEZWxhd2FyZTEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
+            "EDAOBgNVBAUTBzU1MTA5MjIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25h\n" +
+            "MRMwEQYDVQQHEwpTY290dHNkYWxlMRUwEwYDVQQKEwxHb0RhZGR5IElOQy4xKTAn\n" +
+            "BgNVBAMTIHJldm9rZWQuZ2RpZzIuY2F0ZXN0LmdvZGFkZHkuY29tMIIBIjANBgkq\n" +
+            "hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCuBsAR2XGf05mYOuag+0aS4lBuLO5/f\n" +
+            "kEO7KNo7BcdY7J78yXYRYW0jGnV29bjrQZJfu5yv5bU+OjTIDVbCWZAwtBXEKrJj\n" +
+            "riIOUXi3hXphtlyMMAaiXQoA84jwS634DsD0w6XUUP2Lem8jC3RudjvmkDQHoY3M\n" +
+            "uhhS7jLxKnYKnXbLwlqxpdwmEgbqIb5DN5snLAyinTkALLVWZ6RneIuSjhKWbuef\n" +
+            "cEKFScHm6SFsKraltV/T17SWi6zQd/AypKA8JeWXD9WZcsSR9z/41VMJbvTeuP+d\n" +
+            "ZBA4dqPsBTl4N4i54rNEyzMyxDwdvIGrJJ+FVRMKoYjuUi5wY9zO4QIDAQABo4ID\n" +
+            "YzCCA18wDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH\n" +
+            "AwIwDgYDVR0PAQH/BAQDAgWgMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwu\n" +
+            "Z29kYWRkeS5jb20vZ2RpZzJzMy05LmNybDBcBgNVHSAEVTBTMEgGC2CGSAGG/W0B\n" +
+            "BxcDMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\n" +
+            "b20vcmVwb3NpdG9yeS8wBwYFZ4EMAQEwdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUF\n" +
+            "BzABhhhodHRwOi8vb2NzcC5nb2RhZGR5LmNvbS8wQAYIKwYBBQUHMAKGNGh0dHA6\n" +
+            "Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS9nZGlnMi5jcnQw\n" +
+            "HwYDVR0jBBgwFoAUQMK9J47MNIMwojPX+2yz8LQsgM4wUQYDVR0RBEowSIIgcmV2\n" +
+            "b2tlZC5nZGlnMi5jYXRlc3QuZ29kYWRkeS5jb22CJHd3dy5yZXZva2VkLmdkaWcy\n" +
+            "LmNhdGVzdC5nb2RhZGR5LmNvbTAdBgNVHQ4EFgQUCJELlWq8+ntmR5JTjmZMG+HI\n" +
+            "e5EwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB1AFYUBpov18Ls0/XhvUSyPsdG\n" +
+            "drm8mRFcwO+UmFXWidDdAAABXofbk3cAAAQDAEYwRAIgHo8UllsN8FcaF16xx7kT\n" +
+            "vQU1wM7qUKnhN38/z8dU4QUCIFrzGJyajoVPQ2fzOTb9ygzA7T3wqsnT3ML5/KJ6\n" +
+            "+6+CAHYA7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/csAAAFeh9uXHQAA\n" +
+            "BAMARzBFAiEA5DENZZT7SBxNRvo9yFHNNeWqH2d4uqGUwc1rKILrMGsCIHZ3N4dZ\n" +
+            "zv/J+7fbLP1nrAmdUT92ow1bhtMPuq2PfXsAAHcApLkJkLQYWBSHuxOizGdwCjw1\n" +
+            "mAT5G9+443fNDsgN3BAAAAFeh9uYjAAABAMASDBGAiEAyY8ylnGHiH5L3yXE7BsH\n" +
+            "v75ja2RtuuYbMADAlDK/ZDoCIQDwuCq3x+egpB/GISxTnwkrDwhNhhIJNyk5F4j1\n" +
+            "/J8A0DANBgkqhkiG9w0BAQsFAAOCAQEAMGot6gBZ77HIDMb1n/HPrKdSHN0ngq7Z\n" +
+            "rhrkgbp+mH1Cs1lZA3qldMDxKXgNiodFqU/e4VewasQ9tJMmDXrTZIHualJGmIvq\n" +
+            "ISvV0ZUfSW/sJmo0ZDw8iBM993LDkA4wSc6SunhjOwu3LBfl9aKkeq6IhUEAG8X7\n" +
+            "54oO4iApt+APLMyeV9lZ/T7MGVbAjwdm+T1RMa/Ca99BahaRWN7hiM+zS3Ly+l6G\n" +
+            "7kqAkBFuJWbbZImADZ2RPldY6hBzTk6MT2hLCV40UD8JqwJo+qq7nGfJdTaFyZI6\n" +
+            "nJvrVATO7jL64YFP3xlVi8EQaCeKdZdn+BCCNA/ja0mWMj8EU9Islg==\n" +
+            "-----END CERTIFICATE-----";
+
+    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
+        // Validate valid
+        pathValidator.validate(new String[]{VALID, INT},
+                ValidatePathWithParams.Status.GOOD, null, System.out);
+
+        // Validate Revoked
+        pathValidator.validate(new String[]{REVOKED, INT},
+                ValidatePathWithParams.Status.REVOKED, null, System.out);
+    }
+}
+
+class GoDaddySfig2 {
+
+    // Owner: CN=Starfield Secure Certificate Authority - G2,
+    // OU=http://certs.starfieldtech.com/repository/, O="Starfield Technologies, Inc.",
+    // L=Scottsdale, ST=Arizona, C=US
+    // Issuer: CN=Starfield Root Certificate Authority - G2,
+    // O="Starfield Technologies, Inc.", L=Scottsdale, ST=Arizona, C=US
+    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
+            + "MIIFADCCA+igAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx\n"
+            + "EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT\n"
+            + "HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs\n"
+            + "ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTExMDUwMzA3MDAw\n"
+            + "MFoXDTMxMDUwMzA3MDAwMFowgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6\n"
+            + "b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj\n"
+            + "aG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxk\n"
+            + "dGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUg\n"
+            + "Q2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IB\n"
+            + "DwAwggEKAoIBAQDlkGZL7PlGcakgg77pbL9KyUhpgXVObST2yxcT+LBxWYR6ayuF\n"
+            + "pDS1FuXLzOlBcCykLtb6Mn3hqN6UEKwxwcDYav9ZJ6t21vwLdGu4p64/xFT0tDFE\n"
+            + "3ZNWjKRMXpuJyySDm+JXfbfYEh/JhW300YDxUJuHrtQLEAX7J7oobRfpDtZNuTlV\n"
+            + "Bv8KJAV+L8YdcmzUiymMV33a2etmGtNPp99/UsQwxaXJDgLFU793OGgGJMNmyDd+\n"
+            + "MB5FcSM1/5DYKp2N57CSTTx/KgqT3M0WRmX3YISLdkuRJ3MUkuDq7o8W6o0OPnYX\n"
+            + "v32JgIBEQ+ct4EMJddo26K3biTr1XRKOIwSDAgMBAAGjggEsMIIBKDAPBgNVHRMB\n"
+            + "Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJUWBaFAmOD07LSy+\n"
+            + "zWrZtj2zZmMwHwYDVR0jBBgwFoAUfAwyH6fZMH/EfWijYqihzqsHWycwOgYIKwYB\n"
+            + "BQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNo\n"
+            + "LmNvbS8wOwYDVR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zdGFyZmllbGR0ZWNo\n"
+            + "LmNvbS9zZnJvb3QtZzIuY3JsMEwGA1UdIARFMEMwQQYEVR0gADA5MDcGCCsGAQUF\n"
+            + "BwIBFitodHRwczovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkv\n"
+            + "MA0GCSqGSIb3DQEBCwUAA4IBAQBWZcr+8z8KqJOLGMfeQ2kTNCC+Tl94qGuc22pN\n"
+            + "QdvBE+zcMQAiXvcAngzgNGU0+bE6TkjIEoGIXFs+CFN69xpk37hQYcxTUUApS8L0\n"
+            + "rjpf5MqtJsxOYUPl/VemN3DOQyuwlMOS6eFfqhBJt2nk4NAfZKQrzR9voPiEJBjO\n"
+            + "eT2pkb9UGBOJmVQRDVXFJgt5T1ocbvlj2xSApAer+rKluYjdkf5lO6Sjeb6JTeHQ\n"
+            + "sPTIFwwKlhR8Cbds4cLYVdQYoKpBaXAko7nv6VrcPuuUSvC33l8Odvr7+2kDRUBQ\n"
+            + "7nIMpBKGgc0T0U7EPMpODdIm8QC3tKai4W56gf0wrHofx1l7\n"
+            + "-----END CERTIFICATE-----";
+
+    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Arizona/businessCategory=Private
+    // Organization/serialNumber=R17247416, C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, LLC,
+    // CN=valid.sfig2.catest.starfieldtech.com
+    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIHuzCCBqOgAwIBAgIIaZoUcUIjkGwwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNV\n" +
+            "BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUw\n" +
+            "IwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypo\n" +
+            "dHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNV\n" +
+            "BAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIw\n" +
+            "HhcNMTcwOTE3MDM0ODAxWhcNMTkwOTE3MDM0ODAxWjCB6zETMBEGCysGAQQBgjc8\n" +
+            "AgEDEwJVUzEYMBYGCysGAQQBgjc8AgECEwdBcml6b25hMR0wGwYDVQQPExRQcml2\n" +
+            "YXRlIE9yZ2FuaXphdGlvbjESMBAGA1UEBRMJUjE3MjQ3NDE2MQswCQYDVQQGEwJV\n" +
+            "UzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEkMCIGA1UE\n" +
+            "ChMbU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgTExDMS0wKwYDVQQDEyR2YWxpZC5z\n" +
+            "ZmlnMi5jYXRlc3Quc3RhcmZpZWxkdGVjaC5jb20wggEiMA0GCSqGSIb3DQEBAQUA\n" +
+            "A4IBDwAwggEKAoIBAQDVxhI45IQtNrJuun7HU8v2CKg/h/euysft2VrRsaGSMAln\n" +
+            "V6TtpWj2UGm7OmzE2NNzOhD9JJQSc1W6aHEsCTVJ148sgldFFmP39cboBFoLCFlJ\n" +
+            "DxsVGeyKu+KlDKq7Vp2+ty3TeFNOBXEVtEc8SsC8mVjsk2VWW7X/fCVFYEzzyPUI\n" +
+            "sJPWahNOW2wVxNWKeW5jwzeNMOFVQiT9+YpZVQnV06uK3rPd9tVYU5SfdfPVpScY\n" +
+            "/O/tyZyflTGuXZ+YXn1CYRsOq3VypVFfhXunV5prQ/vTnyjddVWce1wwoUT5DvFO\n" +
+            "/0vcWolHktiOAJkmAiGRfHvjhxW8mkjKqaMnstKRAgMBAAGjggOEMIIDgDAMBgNV\n" +
+            "HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8B\n" +
+            "Af8EBAMCBaAwOwYDVR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zdGFyZmllbGR0\n" +
+            "ZWNoLmNvbS9zZmlnMnMzLTEuY3JsMGIGA1UdIARbMFkwTgYLYIZIAYb9bgEHFwMw\n" +
+            "PzA9BggrBgEFBQcCARYxaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNo\n" +
+            "LmNvbS9yZXBvc2l0b3J5LzAHBgVngQwBATCBggYIKwYBBQUHAQEEdjB0MCoGCCsG\n" +
+            "AQUFBzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNoLmNvbS8wRgYIKwYBBQUH\n" +
+            "MAKGOmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3Np\n" +
+            "dG9yeS9zZmlnMi5jcnQwHwYDVR0jBBgwFoAUJUWBaFAmOD07LSy+zWrZtj2zZmMw\n" +
+            "WQYDVR0RBFIwUIIkdmFsaWQuc2ZpZzIuY2F0ZXN0LnN0YXJmaWVsZHRlY2guY29t\n" +
+            "gih3d3cudmFsaWQuc2ZpZzIuY2F0ZXN0LnN0YXJmaWVsZHRlY2guY29tMB0GA1Ud\n" +
+            "DgQWBBTxiYdHMn55sMWTFgp7xif7ludWTjCCAX4GCisGAQQB1nkCBAIEggFuBIIB\n" +
+            "agFoAHcAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFejfR7OAAA\n" +
+            "BAMASDBGAiEA/s7a5OGhtaCutT1l4KNE7dUbM3WGUExG/ZJ+Y6IH3nUCIQCvpVJf\n" +
+            "Y0XBInIUv391hNzSEhv6nvIBEjZtKdvGcP8/5QB2AO5Lvbd1zmC64UJpH6vhnmaj\n" +
+            "D35fsHLYgwDEe4l6qP3LAAABXo30fxEAAAQDAEcwRQIhANqG9yfi3ax0pTnwr4Ti\n" +
+            "wVfUrZclJDS06ePkTHppLkLTAiBTRKkVf1df4Irvmd7neT1wdS2fhDxmnVIYAN5J\n" +
+            "6tOGDQB1AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABXo30gFsA\n" +
+            "AAQDAEYwRAIgb8Xc54M+QD4wfSWLj5Ae/wrSEgRp7Kbf4Lf4vT4W0usCIGAShkJI\n" +
+            "CRxoudQDRxooNJhfXgsTB8QhwFC9PUPo3ZV+MA0GCSqGSIb3DQEBCwUAA4IBAQBt\n" +
+            "TqvwxqrkPYm/ssbN9cpVWlrQPw3DblsAEV6gnrrTJMd7HB042H3HLUiitddRjO40\n" +
+            "0EJM/tUOSGcWfqnJHWFDKoWzdrF5lHAzSRkMjdXgY9TTN5K5tUMEpfRjtink/zoY\n" +
+            "pNyc5ua4SXn94KfMZcOYGRvUM+0q6vLRBBMH541E3M6q6JbEBqZJFY8gBWwYqHH0\n" +
+            "xNGahm5++v4trFFCJzSfvfV1v+rnqy8tRivi7ZFLXWCcSyAqMH+T9Q36lKeFtaw4\n" +
+            "Sapf+dh2yrd2IBLW5eaAD13nCAjO/W0GuC7zw4+4mhW5+DTVJXrCkK5XddkVLhML\n" +
+            "k5pMoIv5EsFIm0Cs+DfF\n" +
+            "-----END CERTIFICATE-----";
+
+    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Arizona/businessCategory=Private
+    // Organization/serialNumber=R17247416, C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, LLC,
+    // CN=revoked.sfig2.catest.starfieldtech.com
+    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIHwTCCBqmgAwIBAgIJAPc1qVz+WDxpMA0GCSqGSIb3DQEBCwUAMIHGMQswCQYD\n" +
+            "VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEl\n" +
+            "MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEzMDEGA1UECxMq\n" +
+            "aHR0cDovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMTQwMgYD\n" +
+            "VQQDEytTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy\n" +
+            "MB4XDTE3MDkxOTEzMDkwMVoXDTE5MDkxOTEzMDkwMVowge0xEzARBgsrBgEEAYI3\n" +
+            "PAIBAxMCVVMxGDAWBgsrBgEEAYI3PAIBAhMHQXJpem9uYTEdMBsGA1UEDxMUUHJp\n" +
+            "dmF0ZSBPcmdhbml6YXRpb24xEjAQBgNVBAUTCVIxNzI0NzQxNjELMAkGA1UEBhMC\n" +
+            "VVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJDAiBgNV\n" +
+            "BAoTG1N0YXJmaWVsZCBUZWNobm9sb2dpZXMsIExMQzEvMC0GA1UEAxMmcmV2b2tl\n" +
+            "ZC5zZmlnMi5jYXRlc3Quc3RhcmZpZWxkdGVjaC5jb20wggEiMA0GCSqGSIb3DQEB\n" +
+            "AQUAA4IBDwAwggEKAoIBAQCWsAZC9goWW6yzg9HiLjCG4Gv2PCHlUIQGqyhc1y9a\n" +
+            "YZVXUI27/NhHjNNMTwP9TKmncrxnGaTZ9+ZCS1JlSgsNYQcLKKZW+SiEOzwpOfwV\n" +
+            "dOCSWrt/EDyJHktx3VIbfi+mD7dvzH3B/iGxMrmdCGIy3xiVAc7MkfsWzcLlPUP3\n" +
+            "oUpPBYyzWqZ2tVsBDigoirERFqZNfHZ7ZNMnn8FcmAt7udKjAAewNRlwzR7ZVp5s\n" +
+            "f5pbnRlRikF30msSHVJoPBICEYmzCxUI+zFlDBjf4vlJojwV0/Rfq85it2yhN/MV\n" +
+            "we2IBC+z9FAAogYo+JFw7Uxq8nsLCKX1tTPsqxGXWNonAgMBAAGjggOHMIIDgzAM\n" +
+            "BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNV\n" +
+            "HQ8BAf8EBAMCBaAwOwYDVR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zdGFyZmll\n" +
+            "bGR0ZWNoLmNvbS9zZmlnMnMzLTEuY3JsMGIGA1UdIARbMFkwTgYLYIZIAYb9bgEH\n" +
+            "FwMwPzA9BggrBgEFBQcCARYxaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0\n" +
+            "ZWNoLmNvbS9yZXBvc2l0b3J5LzAHBgVngQwBATCBggYIKwYBBQUHAQEEdjB0MCoG\n" +
+            "CCsGAQUFBzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNoLmNvbS8wRgYIKwYB\n" +
+            "BQUHMAKGOmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVw\n" +
+            "b3NpdG9yeS9zZmlnMi5jcnQwHwYDVR0jBBgwFoAUJUWBaFAmOD07LSy+zWrZtj2z\n" +
+            "ZmMwXQYDVR0RBFYwVIImcmV2b2tlZC5zZmlnMi5jYXRlc3Quc3RhcmZpZWxkdGVj\n" +
+            "aC5jb22CKnd3dy5yZXZva2VkLnNmaWcyLmNhdGVzdC5zdGFyZmllbGR0ZWNoLmNv\n" +
+            "bTAdBgNVHQ4EFgQU9hCSl7QoQ8KdsGgwMDwlvSurKNcwggF9BgorBgEEAdZ5AgQC\n" +
+            "BIIBbQSCAWkBZwB1AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAAB\n" +
+            "XppC0cEAAAQDAEYwRAIgIO8sIG88JlA73P2myZ7EshemxaR8qBgf3wlYZpg5aZEC\n" +
+            "IGtlcUL7Il1uOLN0LTAzNTQ7pfb7oFYbr0R4LWe2ZvBIAHYA7ku9t3XOYLrhQmkf\n" +
+            "q+GeZqMPfl+wctiDAMR7iXqo/csAAAFemkLVbwAABAMARzBFAiEAmWkzcotxZSwb\n" +
+            "xPS3MG13TVXGu2+MiXXjOIf42DR8zJQCIBL4cSOJh+LX5kpPub6KOiEOn7TVE1Zv\n" +
+            "IQUxuf+vyAD4AHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFe\n" +
+            "mkLXRQAABAMARzBFAiBX8foh/KrYr34O2c9cH6uyWW2XjBHNLsYX1mr+8VuNaAIh\n" +
+            "AObDQwpDYh/bNp6k547gDxnR73LeU3kvl1Y76GjgxLAhMA0GCSqGSIb3DQEBCwUA\n" +
+            "A4IBAQDJ5vlagzOH8/ORUMgT33muSDFXCe5el/sQzVg8dridw9qjnxOpkGibdCiT\n" +
+            "b9Il1bdi7UnG8MlA3XpDjGgp6J/mUTijD9WcFx4lp5JnPaIbShHWCyIlRVZJzrZc\n" +
+            "UYhR56xXOKDYKYOIvM6qTqegXyEynJrIVTArMk7jQf0oNQLLHzXE1fVS1zut0H5l\n" +
+            "GE+TBgjasMEa1o1e/H/heSytb2zFNsZr8oxojzGBmlKyfCoIIcCv3PxX2ur57zJE\n" +
+            "9ADWoYK/7gYVba0JmLV4nQltDPp06nOYT9imxBWTrFahgPx1jOQDLgIpitkjyCy4\n" +
+            "xpmxUk8L6yc3O3aSD9OU/fzk/t/d\n" +
+            "-----END CERTIFICATE-----";
+
+    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
+        // Validate valid
+        pathValidator.validate(new String[]{VALID, INT},
+                ValidatePathWithParams.Status.GOOD, null, System.out);
+
+        // Validate Revoked
+        pathValidator.validate(new String[]{REVOKED, INT},
+                ValidatePathWithParams.Status.REVOKED, null, System.out);
+    }
+}
+
diff --git a/test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java b/test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
deleted file mode 100644
index 27cf0330389..00000000000
--- a/test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2016, 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 java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-/**
- * @test
- * @bug 8074165
- * @modules java.desktop/sun.applet
- * @run main/othervm -Duser.language=en DeprecatedAppletViewer
- */
-public final class DeprecatedAppletViewer {
-
-    private static final String TEXT
-            = "Warning: Applet API and AppletViewer are deprecated.";
-
-    public static void main(final String[] args) {
-        final PrintStream old = System.err;
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
-        final PrintStream ps = new PrintStream(baos);
-        try {
-            System.setErr(ps);
-            sun.applet.Main.main(new String[]{});
-        } finally {
-            System.setErr(old);
-        }
-
-        final String text = new String(baos.toByteArray());
-        if (!text.contains(TEXT)) {
-            System.err.println("The text should contain: \"" + TEXT + "\"");
-            System.err.println("But the current text is: ");
-            System.err.println(text);
-            throw new RuntimeException("Error");
-        }
-    }
-}
diff --git a/test/jdk/sun/applet/TEST.properties b/test/jdk/sun/applet/TEST.properties
deleted file mode 100644
index 3032a5cf793..00000000000
--- a/test/jdk/sun/applet/TEST.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-modules=java.desktop
-
diff --git a/test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java b/test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java
index 7b25aaf81b0..1e60e70d6dd 100644
--- a/test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java
+++ b/test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     4858522
+ * @bug     4858522 8174734
  * @summary Basic unit test of HotspotRuntimeMBean.getSafepointSyncTime()
  * @author  Steve Bohne
  *
@@ -43,50 +43,71 @@ public class GetSafepointSyncTime {
 
     private static final long NUM_THREAD_DUMPS = 300;
 
-    // Careful with these values.
-    private static final long MIN_VALUE_FOR_PASS = 1;
-    private static final long MAX_VALUE_FOR_PASS = Long.MAX_VALUE;
+    static void checkPositive(long value, String label) {
+        if (value < 0)
+            throw new RuntimeException(label + " had a negative value of "
+                                       + value);
+    }
+
+    static void validate(long count1, long count2, long time1, long time2,
+                         String label) {
+        checkPositive(count1, label + ":count1");
+        checkPositive(count2, label + ":count2");
+        checkPositive(time1, label + ":time1");
+        checkPositive(time2, label + ":time2");
+
+        long countDiff = count2 - count1;
+        long timeDiff = time2 - time1;
+
+        if (countDiff < NUM_THREAD_DUMPS) {
+            throw new RuntimeException(label +
+                                       ": Expected at least " + NUM_THREAD_DUMPS +
+                                       " safepoints but only got " + countDiff);
+        }
+
+        // getSafepointSyncTime is the accumulated time spent getting to a
+        // safepoint, so each safepoint will add a little to this, but the
+        // resolution is only milliseconds so we may not see it.
+        if (timeDiff < 0) {
+            throw new RuntimeException(label + ": Safepoint sync time " +
+                                       "decreased unexpectedly " +
+                                       "(time1 = " + time1 + "; " +
+                                       "time2 = " + time2 + ")");
+        }
+
+        System.out.format("%s: Safepoint count=%d (diff=%d), sync time=%d ms (diff=%d)%n",
+                          label, count2, countDiff, time2, timeDiff);
+
+    }
 
     public static void main(String args[]) throws Exception {
         long count = mbean.getSafepointCount();
-        long value = mbean.getSafepointSyncTime();
+        long time = mbean.getSafepointSyncTime();
+
+        checkPositive(count, "count");
+        checkPositive(time, "time");
+
+        // Thread.getAllStackTraces() should cause a safepoint.
 
-        // Thread.getAllStackTraces() should cause safepoints.
-        // If this test is failing because it doesn't,
-        // MIN_VALUE_FOR_PASS should be reset to 0
         for (int i = 0; i < NUM_THREAD_DUMPS; i++) {
             Thread.getAllStackTraces();
         }
 
         long count1 = mbean.getSafepointCount();
-        long value1 = mbean.getSafepointSyncTime();
+        long time1 = mbean.getSafepointSyncTime();
 
-        System.out.format("Safepoint count=%d (diff=%d), sync time=%d ms (diff=%d)%n",
-                          count1, count1-count, value1, value1-value);
+        validate(count, count1, time, time1, "Pass 1");
 
-        if (value1 < MIN_VALUE_FOR_PASS || value1 > MAX_VALUE_FOR_PASS) {
-            throw new RuntimeException("Safepoint sync time " +
-                                       "illegal value: " + value1 + " ms " +
-                                       "(MIN = " + MIN_VALUE_FOR_PASS + "; " +
-                                       "MAX = " + MAX_VALUE_FOR_PASS + ")");
-        }
+        // repeat the experiment
 
         for (int i = 0; i < NUM_THREAD_DUMPS; i++) {
             Thread.getAllStackTraces();
         }
 
         long count2 = mbean.getSafepointCount();
-        long value2 = mbean.getSafepointSyncTime();
+        long time2 = mbean.getSafepointSyncTime();
 
-        System.out.format("Safepoint count=%d (diff=%d), sync time=%d ms (diff=%d)%n",
-                          count2, count2-count1, value2, value2-value1);
-
-        if (value2 <= value1) {
-            throw new RuntimeException("Safepoint sync time " +
-                                       "did not increase " +
-                                       "(value1 = " + value1 + "; " +
-                                       "value2 = " + value2 + ")");
-        }
+        validate(count1, count2, time1, time2, "Pass 2");
 
         System.out.println("Test passed.");
     }
diff --git a/test/jdk/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData
index ffe048fadeb..73b8ea62caa 100644
--- a/test/jdk/sun/text/resources/LocaleData
+++ b/test/jdk/sun/text/resources/LocaleData
@@ -8317,3 +8317,6 @@ CurrencyNames//stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
 CurrencyNames//lak=Lao Kip
 CurrencyNames//php=Philippine Piso
 CurrencyNames//azn=Azerbaijan Manat
+
+# bug $8193552
+CurrencyNames//mru=Mauritanian Ouguiya
diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
index 44df3d317b9..c11b68a1148 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java
@@ -38,7 +38,7 @@
  *      7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
  *      8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
- *      8187946 8195478 8181157 8179071
+ *      8187946 8195478 8181157 8179071 8193552 8202026 8204269
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata
diff --git a/test/jdk/tools/jmod/JmodNegativeTest.java b/test/jdk/tools/jmod/JmodNegativeTest.java
index 30205067b0e..e150d447f39 100644
--- a/test/jdk/tools/jmod/JmodNegativeTest.java
+++ b/test/jdk/tools/jmod/JmodNegativeTest.java
@@ -100,7 +100,7 @@ public class JmodNegativeTest {
         jmod("--badOption")
             .assertFailure()
             .resultChecker(r ->
-                assertContains(r.output, "Error: 'badOption' is not a recognized option")
+                assertContains(r.output, "Error: badOption is not a recognized option")
             );
     }
 
diff --git a/test/jdk/tools/jmod/JmodTest.java b/test/jdk/tools/jmod/JmodTest.java
index 5038dea0465..ca489634a70 100644
--- a/test/jdk/tools/jmod/JmodTest.java
+++ b/test/jdk/tools/jmod/JmodTest.java
@@ -111,7 +111,7 @@ public class JmodTest {
 
         Path jmod = MODS_DIR.resolve("apa.jmod");
         jmod("create",
-             "--libs=", libDir.toString(),
+             "--libs=" + libDir.toString(),
              "--class-path", classesDir.toString(),
              jmod.toString())
             .assertSuccess();
@@ -310,7 +310,7 @@ public class JmodTest {
         Path lp = EXPLODED_DIR.resolve("foo").resolve("lib");
 
         jmod("create",
-             "--libs=", lp.toString(),
+             "--libs=" + lp.toString(),
              "--class-path", cp.toString(),
              jmod.toString())
             .assertSuccess()
@@ -335,8 +335,8 @@ public class JmodTest {
 
         jmod("create",
              "--conf", cf.toString(),
-             "--cmds=", bp.toString(),
-             "--libs=", lp.toString(),
+             "--cmds=" + bp.toString(),
+             "--libs=" + lp.toString(),
              "--class-path", cp.toString(),
              jmod.toString())
             .assertSuccess()
@@ -361,7 +361,7 @@ public class JmodTest {
         Path lp = EXPLODED_DIR.resolve("foo").resolve("lib");
 
         jmod("create",
-             "--libs=", lp.toString(),
+             "--libs=" + lp.toString(),
              "--class-path", cp.toString(),
              "--exclude", "**internal**",
              "--exclude", "first.so",
diff --git a/test/jdk/tools/launcher/SourceMode.java b/test/jdk/tools/launcher/SourceMode.java
new file mode 100644
index 00000000000..2cb07e87ace
--- /dev/null
+++ b/test/jdk/tools/launcher/SourceMode.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright (c) 2017, 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 8192920 8204588
+ * @summary Test source mode
+ * @modules jdk.compiler
+ * @run main SourceMode
+ */
+
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class SourceMode extends TestHelper {
+
+    public static void main(String... args) throws Exception {
+        new SourceMode().run(args);
+    }
+
+    // to reduce the chance of creating shebang lines that are too long,
+    // we use a relative path to the java command if that is shorter
+    private final Path shortJavaCmd;
+
+    private final PrintStream log;
+
+    private final boolean skipShebangTest;
+
+    SourceMode() {
+        Path cwd = Paths.get(System.getProperty("user.dir"));
+        Path cmd = Paths.get(javaCmd);
+
+        if (isWindows) {
+            // Skip shebang tests on Windows, because that requires Cygwin.
+            shortJavaCmd = cmd;
+            skipShebangTest = true;
+        } else {
+            // Skip shebang tests if the path to the Java launcher is too long,
+            // because that will cause tests to overflow the mostly undocumented
+            // limit of 120 characters for a shebang line.
+            Path p = cwd.relativize(cmd);
+            shortJavaCmd = (p.toString().length() < cmd.toString().length()) ? p : cmd;
+            // skipShebangTest = shortJavaCmd.toString().length() > 100;
+            skipShebangTest = true;
+        }
+
+        log = System.err;
+    }
+
+    // java Simple.java 1 2 3
+    @Test
+    void testSimpleJava() throws IOException {
+        starting("testSimpleJava");
+        Path file = getSimpleFile("Simple.java", false);
+        TestResult tr = doExec(javaCmd, file.toString(), "1", "2", "3");
+        if (!tr.isOK())
+            error(tr, "Bad exit code: " + tr.exitValue);
+        if (!tr.contains("[1, 2, 3]"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java --source 10 simple 1 2 3
+    @Test
+    void testSimple() throws IOException {
+        starting("testSimple");
+        Path file = getSimpleFile("simple", false);
+        TestResult tr = doExec(javaCmd, "--source", "10", file.toString(), "1", "2", "3");
+        if (!tr.isOK())
+            error(tr, "Bad exit code: " + tr.exitValue);
+        if (!tr.contains("[1, 2, 3]"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // execSimple 1 2 3
+    @Test
+    void testExecSimple() throws IOException {
+        starting("testExecSimple");
+        if (skipShebangTest) {
+            log.println("SKIPPED");
+            return;
+        }
+        Path file = setExecutable(getSimpleFile("execSimple", true));
+        TestResult tr = doExec(file.toAbsolutePath().toString(), "1", "2", "3");
+        if (!tr.isOK())
+            error(tr, "Bad exit code: " + tr.exitValue);
+        if (!tr.contains("[1, 2, 3]"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java @simpleJava.at  (contains Simple.java 1 2 3)
+    @Test
+    void testSimpleJavaAtFile() throws IOException {
+        starting("testSimpleJavaAtFile");
+        Path file = getSimpleFile("Simple.java", false);
+        Path atFile = Paths.get("simpleJava.at");
+        createFile(atFile, List.of(file + " 1 2 3"));
+        TestResult tr = doExec(javaCmd, "@" + atFile);
+        if (!tr.isOK())
+            error(tr, "Bad exit code: " + tr.exitValue);
+        if (!tr.contains("[1, 2, 3]"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java @simple.at  (contains --source 10 simple 1 2 3)
+    @Test
+    void testSimpleAtFile() throws IOException {
+        starting("testSimpleAtFile");
+        Path file = getSimpleFile("simple", false);
+        Path atFile = Paths.get("simple.at");
+        createFile(atFile, List.of("--source 10 " + file + " 1 2 3"));
+        TestResult tr = doExec(javaCmd, "@" + atFile);
+        if (!tr.isOK())
+            error(tr, "Bad exit code: " + tr.exitValue);
+        if (!tr.contains("[1, 2, 3]"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java -cp classes Main.java 1 2 3
+    @Test
+    void testClasspath() throws IOException {
+        starting("testClasspath");
+        Path base = Files.createDirectories(Paths.get("testClasspath"));
+        Path otherJava = base.resolve("Other.java");
+        createFile(otherJava, List.of(
+            "public class Other {",
+            "  public static String join(String[] args) {",
+            "    return String.join(\"-\", args);",
+            "  }",
+            "}"
+        ));
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        Path mainJava = base.resolve("Main.java");
+        createFile(mainJava, List.of(
+            "class Main {",
+            "  public static void main(String[] args) {",
+            "    System.out.println(Other.join(args));",
+            "  }}"
+        ));
+        compile("-d", classes.toString(), otherJava.toString());
+        TestResult tr = doExec(javaCmd, "-cp", classes.toString(),
+                mainJava.toString(), "1", "2", "3");
+        if (!tr.isOK())
+            error(tr, "Bad exit code: " + tr.exitValue);
+        if (!tr.contains("1-2-3"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java --add-exports=... Export.java --help
+    @Test
+    void testAddExports() throws IOException {
+        starting("testAddExports");
+        Path exportJava = Paths.get("Export.java");
+        createFile(exportJava, List.of(
+            "public class Export {",
+            "  public static void main(String[] args) {",
+            "    new com.sun.tools.javac.main.Main(\"demo\").compile(args);",
+            "  }",
+            "}"
+        ));
+        // verify access fails without --add-exports
+        TestResult tr1 = doExec(javaCmd, exportJava.toString(), "--help");
+        if (tr1.isOK())
+            error(tr1, "Compilation succeeded unexpectedly");
+        show(tr1);
+        // verify access succeeds with --add-exports
+        TestResult tr2 = doExec(javaCmd,
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+            exportJava.toString(), "--help");
+        if (!tr2.isOK())
+            error(tr2, "Bad exit code: " + tr2.exitValue);
+        if (!(tr2.contains("demo") && tr2.contains("Usage")))
+            error(tr2, "Expected output not found");
+        show(tr2);
+    }
+
+    // java -cp ... HelloWorld.java  (for a class "java" in package "HelloWorld")
+    @Test
+    void testClassNamedJava() throws IOException {
+        starting("testClassNamedJava");
+        Path base = Files.createDirectories(Paths.get("testClassNamedJava"));
+        Path src = Files.createDirectories(base.resolve("src"));
+        Path srcfile = src.resolve("java.java");
+        createFile(srcfile, List.of(
+                "package HelloWorld;",
+                "class java {",
+                "    public static void main(String... args) {",
+                "        System.out.println(HelloWorld.java.class.getName());",
+                "    }",
+                "}"
+        ));
+        Path classes = base.resolve("classes");
+        compile("-d", classes.toString(), srcfile.toString());
+        TestResult tr =
+            doExec(javaCmd, "-cp", classes.toString(), "HelloWorld.java");
+        if (!tr.isOK())
+            error(tr, "Command failed");
+        if (!tr.contains("HelloWorld.java"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java --source
+    @Test
+    void testSourceNoArg() throws IOException {
+        starting("testSourceNoArg");
+        TestResult tr = doExec(javaCmd, "--source");
+        if (tr.isOK())
+            error(tr, "Command succeeded unexpectedly");
+        if (!tr.contains("--source requires source version"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java --source 10 -jar simple.jar
+    @Test
+    void testSourceJarConflict() throws IOException {
+        starting("testSourceJarConflict");
+        Path base = Files.createDirectories(Paths.get("testSourceJarConflict"));
+        Path file = getSimpleFile("Simple.java", false);
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        compile("-d", classes.toString(), file.toString());
+        Path simpleJar = base.resolve("simple.jar");
+        createJar("cf", simpleJar.toString(), "-C", classes.toString(), ".");
+        TestResult tr =
+            doExec(javaCmd, "--source", "10", "-jar", simpleJar.toString());
+        if (tr.isOK())
+            error(tr, "Command succeeded unexpectedly");
+        if (!tr.contains("Option -jar is not allowed with --source"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // java --source 10 -m jdk.compiler
+    @Test
+    void testSourceModuleConflict() throws IOException {
+        starting("testSourceModuleConflict");
+        TestResult tr = doExec(javaCmd, "--source", "10", "-m", "jdk.compiler");
+        if (tr.isOK())
+            error(tr, "Command succeeded unexpectedly");
+        if (!tr.contains("Option -m is not allowed with --source"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // #!.../java --source 10 -version
+    @Test
+    void testTerminalOptionInShebang() throws IOException {
+        starting("testTerminalOptionInShebang");
+        if (skipShebangTest) {
+            log.println("SKIPPED");
+            return;
+        }
+        Path base = Files.createDirectories(
+            Paths.get("testTerminalOptionInShebang"));
+        Path bad = base.resolve("bad");
+        createFile(bad, List.of(
+            "#!" + shortJavaCmd + " --source 10 -version"));
+        setExecutable(bad);
+        TestResult tr = doExec(bad.toString());
+        if (!tr.contains("Option -version is not allowed in this context"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // #!.../java --source 10 @bad.at  (contains -version)
+    @Test
+    void testTerminalOptionInShebangAtFile() throws IOException {
+        starting("testTerminalOptionInShebangAtFile");
+        if (skipShebangTest) {
+            log.println("SKIPPED");
+            return;
+        }
+        // Use a short directory name, to avoid line length limitations
+        Path base = Files.createDirectories(Paths.get("testBadAtFile"));
+        Path bad_at = base.resolve("bad.at");
+        createFile(bad_at, List.of("-version"));
+        Path bad = base.resolve("bad");
+        createFile(bad, List.of(
+            "#!" + shortJavaCmd + " --source 10 @" + bad_at));
+        setExecutable(bad);
+        TestResult tr = doExec(bad.toString());
+        if (!tr.contains("Option -version in @testBadAtFile/bad.at is "
+                + "not allowed in this context"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    // #!.../java --source 10 HelloWorld
+    @Test
+    void testMainClassInShebang() throws IOException {
+        starting("testMainClassInShebang");
+        if (skipShebangTest) {
+            log.println("SKIPPED");
+            return;
+        }
+        Path base = Files.createDirectories(Paths.get("testMainClassInShebang"));
+        Path bad = base.resolve("bad");
+        createFile(bad, List.of(
+            "#!" + shortJavaCmd + " --source 10 HelloWorld"));
+        setExecutable(bad);
+        TestResult tr = doExec(bad.toString());
+        if (!tr.contains("Cannot specify main class in this context"))
+            error(tr, "Expected output not found");
+        show(tr);
+    }
+
+    //--------------------------------------------------------------------------
+
+    private void starting(String label) {
+        System.out.println();
+        System.out.println("*** Starting: " + label + " (stdout)");
+
+        System.err.println();
+        System.err.println("*** Starting: " + label + " (stderr)");
+    }
+
+    private void show(TestResult tr) {
+        log.println("*** Test Output:");
+        for (String line: tr.testOutput) {
+            log.println(line);
+        }
+        log.println("*** End Of Test Output:");
+    }
+
+    private Map<String,String> getLauncherDebugEnv() {
+        return Map.of("_JAVA_LAUNCHER_DEBUG", "1");
+    }
+
+    private Path getSimpleFile(String name, boolean shebang) throws IOException {
+        Path file = Paths.get(name);
+        if (!Files.exists(file)) {
+            createFile(file, List.of(
+                (shebang ? "#!" + shortJavaCmd + " --source 10" : ""),
+                "public class Simple {",
+                "  public static void main(String[] args) {",
+                "    System.out.println(java.util.Arrays.toString(args));",
+                "  }}"));
+        }
+        return file;
+    }
+
+    private void createFile(Path file, List<String> lines) throws IOException {
+        lines.stream()
+            .filter(line -> line.length() > 128)
+            .forEach(line -> {
+                    log.println("*** Warning: long line ("
+                                        + line.length()
+                                        + " chars) in file " + file);
+                    log.println("*** " + line);
+                });
+        log.println("*** File: " + file);
+        lines.stream().forEach(log::println);
+        log.println("*** End Of File");
+        createFile(file.toFile(), lines);
+    }
+
+    private Path setExecutable(Path file) throws IOException {
+        Set<PosixFilePermission> perms = Files.getPosixFilePermissions(file);
+        perms.add(PosixFilePermission.OWNER_EXECUTE);
+        Files.setPosixFilePermissions(file, perms);
+        return file;
+    }
+
+    private void error(TestResult tr, String message) {
+        show(tr);
+        throw new RuntimeException(message);
+    }
+}
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 8b7e6f41d8a..53337110427 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import sun.hotspot.code.Compiler;
 import sun.hotspot.cpuinfo.CPUInfo;
 import sun.hotspot.gc.GC;
 import sun.hotspot.WhiteBox;
@@ -80,6 +81,7 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("vm.graal.enabled", isGraalEnabled());
         map.put("docker.support", dockerSupport());
         vmGC(map); // vm.gc.X = true/false
+        vmOptFinalFlags(map);
 
         VMProps.dump(map);
         return map;
@@ -235,6 +237,25 @@ public class VMProps implements Callable<Map<String, String>> {
         }
     }
 
+    /**
+     * Selected final flag.
+     * @param map - property-value pairs
+     * @param flagName - flag name
+     */
+    private void vmOptFinalFlag(Map<String, String> map, String flagName) {
+        String value = WB.getBooleanVMFlag(flagName) ? "true" : "false";
+        map.put("vm.opt.final." + flagName, value);
+    }
+
+    /**
+     * Selected sets of final flags.
+     * @param map -property-value pairs
+     */
+    protected void vmOptFinalFlags(Map<String, String> map) {
+        vmOptFinalFlag(map, "ClassUnloading");
+        vmOptFinalFlag(map, "UseCompressedOops");
+    }
+
     /**
      * @return true if VM runs RTM supported OS and false otherwise.
      */
@@ -260,9 +281,7 @@ public class VMProps implements Callable<Map<String, String>> {
      * @return true if VM runs RTM supported CPU and false otherwise.
      */
     protected String vmRTMCPU() {
-        boolean vmRTMCPU = (Platform.isPPC() ? CPUInfo.hasFeature("tcheck") : CPUInfo.hasFeature("rtm"));
-
-        return "" + vmRTMCPU;
+        return "" + CPUInfo.hasFeature("rtm");
     }
 
     /**
@@ -326,33 +345,7 @@ public class VMProps implements Callable<Map<String, String>> {
      * @return true if Graal is used as JIT compiler.
      */
     protected String isGraalEnabled() {
-        // Graal is enabled if following conditions are true:
-        // - we are not in Interpreter mode
-        // - UseJVMCICompiler flag is true
-        // - jvmci.Compiler variable is equal to 'graal'
-        // - TieredCompilation is not used or TieredStopAtLevel is greater than 3
-
-        Boolean useCompiler = WB.getBooleanVMFlag("UseCompiler");
-        if (useCompiler == null || !useCompiler)
-            return "false";
-
-        Boolean useJvmciComp = WB.getBooleanVMFlag("UseJVMCICompiler");
-        if (useJvmciComp == null || !useJvmciComp)
-            return "false";
-
-        // This check might be redundant but let's keep it for now.
-        String jvmciCompiler = System.getProperty("jvmci.Compiler");
-        if (jvmciCompiler == null || !jvmciCompiler.equals("graal")) {
-            return "false";
-        }
-
-        Boolean tieredCompilation = WB.getBooleanVMFlag("TieredCompilation");
-        Long compLevel = WB.getIntxVMFlag("TieredStopAtLevel");
-        // if TieredCompilation is enabled and compilation level is <= 3 then no Graal is used
-        if (tieredCompilation != null && tieredCompilation && compLevel != null && compLevel <= 3)
-            return "false";
-
-        return "true";
+        return Compiler.isGraalEnabled() ? "true" : "false";
     }
 
 
diff --git a/test/langtools/ProblemList.txt b/test/langtools/ProblemList.txt
index f6ecdb0f64c..1ca93245d58 100644
--- a/test/langtools/ProblemList.txt
+++ b/test/langtools/ProblemList.txt
@@ -56,6 +56,7 @@ tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
 tools/javac/warnings/suppress/TypeAnnotations.java                              8057683    generic-all    improve ordering of errors with type annotations
 tools/javac/modules/SourceInSymlinkTest.java                                    8180263    windows-all    fails when run on a subst drive
 tools/javac/options/release/ReleaseOptionUnsupported.java                       8193784    generic-all    temporary until support for --release 11 is worked out
+tools/javac/importscope/T8193717.java                                           8203925    generic-all    the test requires too much memory
 
 ###########################################################################
 #
diff --git a/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java b/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java
index 70a7637ca41..64e4ee6495e 100644
--- a/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java
+++ b/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4636655
+ * @bug 4636655 8196202
  * @summary  Add title attribute to <FRAME> tags for accessibility
  * @author dkramer
  * @library ../lib
@@ -42,6 +42,7 @@ public class AccessFrameTitle extends JavadocTester {
     @Test
     void test() {
         javadoc("-d", "out",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java b/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java
index 14e3508f82b..1d86c4d026c 100644
--- a/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java
+++ b/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4636667 7052425 8016549
+ * @bug 4636667 7052425 8016549 8196202
  * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
  * @author dkramer
  * @library ../lib
@@ -44,6 +44,7 @@ public class AccessH1 extends JavadocTester {
     void test() {
         javadoc("-d", "out",
                 "-doctitle", "Document Title",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java b/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java
index 2fa5487ba71..6926b9ddf06 100644
--- a/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java
+++ b/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4637604 4775148 8183037 8182765
+ * @bug      4637604 4775148 8183037 8182765 8196202
  * @summary  Test the tables for summary attribute
  * @author   dkramer
  * @library ../lib
@@ -45,7 +45,10 @@ public class AccessSummary extends JavadocTester {
 
     @Test
     void testAccessSummary() {
-        javadoc("-d", "out", "-sourcepath", testSrc, "p1", "p2");
+        javadoc("-d", "out",
+                "--frames",
+                "-sourcepath", testSrc,
+                "p1", "p2");
         checkExit(Exit.OK);
         checkSummary(false);
     }
@@ -54,6 +57,7 @@ public class AccessSummary extends JavadocTester {
     void testAccessSummary_html4() {
         javadoc("-d", "out-html4",
                 "-html4",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java
index 15e3028d41f..1b5d3765c39 100644
--- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java
+++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4524350 4662945 4633447
+ * @bug 4524350 4662945 4633447 8196202
  * @summary stddoclet: {@docRoot} inserts an extra trailing "/"
  * @author dkramer
  * @library ../lib
@@ -56,6 +56,7 @@ public class DocRootSlash extends JavadocTester {
         javadoc("-d", "out",
                 "-Xdoclint:none",
                 "-overview", (srcdir + "/overview.html"),
+                "--frames",
                 "-header", "<A HREF=\"{@docroot}/package-list\">{&#064;docroot}</A> <A HREF=\"{@docRoot}/help-doc\">{&#064;docRoot}</A>",
                 "-sourcepath", srcdir,
                 "p1", "p2");
diff --git a/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java
index 4423ca2e616..e04f1e487d9 100644
--- a/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java
+++ b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4645058 4747738 4855054 8024756 8141492
+ * @bug 4645058 4747738 4855054 8024756 8141492 8196202
  * @summary  Javascript IE load error when linked by -linkoffline
  *           Window title shouldn't change when loading left frames (javascript)
  * @author dkramer
@@ -43,6 +43,7 @@ public class JavascriptWinTitle extends JavadocTester {
     @Test
     void test() {
         javadoc("-d", "out",
+                "--frames",
                 "-doctitle", "Document Title",
                 "-windowtitle", "Window Title",
                 "-overview", testSrc("overview.html"),
diff --git a/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java b/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java
index ebf01a95f76..5ebb11da952 100644
--- a/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java
+++ b/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4034096 4764726 6235799 8182765
+ * @bug      4034096 4764726 6235799 8182765 8196202
  * @summary  Add support for HTML keywords via META tag for
  *           class and member names to improve API search
  * @author   dkramer
@@ -53,6 +53,7 @@ public class MetaTag extends JavadocTester {
         javadoc("-d", "out-1",
                 "-sourcepath", testSrc,
                 "-keywords",
+                "--frames",
                 "-doctitle", "Sample Packages",
                 "p1", "p2");
 
@@ -66,6 +67,7 @@ public class MetaTag extends JavadocTester {
         javadoc("-d", "out-2",
                 "-sourcepath", testSrc,
                 "-notimestamp",
+                "--frames",
                 "-doctitle", "Sample Packages",
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -80,6 +82,7 @@ public class MetaTag extends JavadocTester {
                 "-html4",
                 "-sourcepath", testSrc,
                 "-keywords",
+                "--frames",
                 "-doctitle", "Sample Packages",
                 "p1", "p2");
 
@@ -94,6 +97,7 @@ public class MetaTag extends JavadocTester {
                 "-html4",
                 "-sourcepath", testSrc,
                 "-notimestamp",
+                "--frames",
                 "-doctitle", "Sample Packages",
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java b/test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java
index 9f1bd009330..557354049d2 100644
--- a/test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java
+++ b/test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4766385
+ * @bug      4766385 8196202
  * @summary  Test that the header option for upper left frame
  *           is present for three sets of options: (1) -header,
  *           (2) -packagesheader, and (3) -header -packagesheader
@@ -46,6 +46,7 @@ public class PackagesHeader extends JavadocTester {
         // First test with -header only
         javadoc("-d", "out-header",
                 "-header", "Main Frame Header",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -60,6 +61,7 @@ public class PackagesHeader extends JavadocTester {
         // Second test with -packagesheader only
         javadoc("-d", "out-packages-header",
                 "-packagesheader", "Packages Frame Header",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -76,6 +78,7 @@ public class PackagesHeader extends JavadocTester {
         javadoc("-d", "out-both",
                 "-packagesheader", "Packages Frame Header",
                 "-header", "Main Frame Header",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java b/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java
index 44ffdb4c977..5d444ff96dc 100644
--- a/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java
+++ b/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4275630 4749453 4625400 4753048 4415270 8074521 8182765
+ * @bug 4275630 4749453 4625400 4753048 4415270 8074521 8182765 8196202
  * @summary  Generated HTML is invalid with frames.
  *           Displays unnecessary horizontal scroll bars.
  *           Missing whitespace in DOCTYPE declaration
@@ -49,6 +49,7 @@ public class ValidHtml extends JavadocTester {
                     "-doctitle", "Document Title",
                     "-windowtitle", "Window Title",
                     "-use",
+                    "--frames",
                     "-overview", testSrc("overview.html"),
                     "-sourcepath", testSrc,
                     "p1", "p2");
@@ -72,6 +73,7 @@ public class ValidHtml extends JavadocTester {
                 "-doctitle", "Document Title",
                 "-windowtitle", "Window Title",
                 "-use",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
                 "p1", "p2");
diff --git a/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java b/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java
index 94a51a4986c..4d10ccc318e 100644
--- a/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java
+++ b/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4530730
+ * @bug 4530730 8196202
  * @summary stddoclet: With frames off, window titles have "()" appended
  * @author dkramer
  * @library ../lib
@@ -47,6 +47,7 @@ public class WindowTitles extends JavadocTester {
         // Test for all cases except the split index page
         javadoc("-d", "out-1",
                 "-use",
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java
index 20af78f593e..710f2a3dfbb 100644
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java
+++ b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8071982
+ * @bug 8071982 8196202
  * @summary Test for package-frame.html.
  * @library ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -41,6 +41,7 @@ public class TestClassDocCatalog extends JavadocTester {
     @Test
     void test() {
         javadoc("-d", "out",
+                "--frames",
                 testSrc("pkg1/EmptyAnnotation.java"),
                 testSrc("pkg1/EmptyClass.java"),
                 testSrc("pkg1/EmptyEnum.java"),
diff --git a/test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java b/test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java
index b89ab6404af..84ce35687b0 100644
--- a/test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java
+++ b/test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8162353 8164747 8173707
+ * @bug 8162353 8164747 8173707 8196202 8204303
  * @summary javadoc should provide a way to disable use of frames
  * @library /tools/lib ../lib
  * @modules
@@ -226,6 +226,11 @@ public class TestFramesNoFrames extends JavadocTester {
 
         private boolean frames;
         private boolean overview;
+        private static final String framesWarning
+                = "javadoc: warning - You have specified to generate frames, by using the --frames option.\n"
+                + "The default is currently to not generate frames and the support for \n"
+                + "frames will be removed in a future release.\n"
+                + "To suppress this warning, remove the --frames option and avoid the use of frames.";
 
         Checker(FrameKind fKind, OverviewKind oKind, HtmlKind hKind) {
             this.fKind = fKind;
@@ -240,11 +245,11 @@ public class TestFramesNoFrames extends JavadocTester {
 
         void check() throws IOException {
             switch (fKind) {
-                case DEFAULT:
                 case FRAMES:
                     frames = true;
                     break;
 
+                case DEFAULT:
                 case NO_FRAMES:
                     frames = false;
                     break;
@@ -264,6 +269,9 @@ public class TestFramesNoFrames extends JavadocTester {
                     break;
             }
 
+            out.println("Checker: " + fKind + " " + oKind + " " + hKind
+                + ": frames:" + frames + " overview:" + overview);
+
             checkAllClassesFiles();
             checkFrameFiles();
             checkOverviewSummary();
@@ -272,6 +280,8 @@ public class TestFramesNoFrames extends JavadocTester {
             checkNavBar();
             checkHelpDoc();
 
+            checkWarning();
+
         }
 
         private void checkAllClassesFiles() {
@@ -373,10 +383,23 @@ public class TestFramesNoFrames extends JavadocTester {
         }
 
         private void checkOverviewSummary() {
-            // the overview-summary.html file only appears if
-            // in frames mode and (overview requested or multiple packages)
-            checkFiles(frames && overview,
+            // To accommodate the historical behavior of generating
+            // overview-summary.html in frames mode, the file
+            // will still be generated in no-frames mode,
+            // but will be a redirect to index.html
+            checkFiles(overview,
                     "overview-summary.html");
+            if (overview) {
+                checkOutput("overview-summary.html",  !frames,
+                        "<link rel=\"canonical\" href=\"index.html\">",
+                        "<script type=\"text/javascript\">window.location.replace('index.html')</script>",
+                        "<meta http-equiv=\"Refresh\" content=\"0;index.html\">",
+                        "<p><a href=\"index.html\">index.html</a></p>");
+            }
+        }
+
+        private void checkWarning() {
+            checkOutput(Output.OUT, frames, framesWarning);
         }
 
         private long getPackageCount() {
diff --git a/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java b/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java
index 6e6220d1d0e..4db98d31671 100644
--- a/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java
+++ b/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8000418 8024288
+ * @bug 8000418 8024288 8196202
  * @summary Verify that files use a common Generated By string
  * @library ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -41,6 +41,7 @@ public class TestGeneratedBy extends JavadocTester {
     @Test
     void testTimestamp() {
         javadoc("-d", "out-timestamp",
+                "--frames",
             "-sourcepath", testSrc,
             "pkg");
         checkExit(Exit.OK);
@@ -52,6 +53,7 @@ public class TestGeneratedBy extends JavadocTester {
     void testNoTimestamp() {
         javadoc("-d", "out-notimestamp",
             "-notimestamp",
+                "--frames",
             "-sourcepath", testSrc,
             "pkg");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java b/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
index e563a654443..f36a6fb9dde 100644
--- a/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
+++ b/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8190003 8196201
+ * @bug 8190003 8196201 8196202
  * @summary Special characters in group names should be escaped
  * @library /tools/lib ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -58,6 +58,7 @@ public class TestGroupName extends JavadocTester {
                 "package p3; public class C3 { }");
 
         javadoc("-d", base.resolve("out").toString(),
+                "--frames",
                 "-sourcepath", src.toString(),
                 "-group", "abc < & > def", "p1",
                 "p1", "p2", "p3");
@@ -90,6 +91,7 @@ public class TestGroupName extends JavadocTester {
                 "package pc3; public class CC3 { }");
 
         javadoc("-d", base.resolve("out").toString(),
+                "--frames",
                 "--module-source-path", src.toString(),
                 "-group", "abc < & > def", "ma",
                 "--module", "ma,mb,mc");
diff --git a/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java
index 246aa79be84..5f97716907d 100644
--- a/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4924383 8149402
+ * @bug      4924383 8149402 8196202
  * @summary  Test to make sure the -group option works correctly
  *           with the given pattern usages.
  * @author   jamieh
@@ -60,6 +60,7 @@ public class TestGroupOption extends JavadocTester {
     // Make sure that the headers of group that is defined using patterns are printed.
     void test2() {
         javadoc("-d", "out-2",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-group", "Group pkg*", "pkg*",
                 "-group", "Group abc*", "abc*",
diff --git a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java
index c7811ce5843..b364378553d 100644
--- a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java
+++ b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4905786 6259611 8162363
+ * @bug      4905786 6259611 8162363 8196202
  * @summary  Make sure that headings use the TH tag instead of the TD tag.
  * @author   jamieh
  * @library ../lib
@@ -62,6 +62,7 @@ public class TestHeadings extends JavadocTester {
         javadoc("-d", "out",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "-header", "Test Files",
                 "pkg1", "pkg2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java
index 603d17c6dc7..999efbd8bec 100644
--- a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8073100 8182765
+ * @bug 8073100 8182765 8196202
  * @summary ensure the hidden tag works as intended
  * @library ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -44,6 +44,7 @@ public class TestHiddenTag extends JavadocTester {
     @Test
     public void test1() {
         javadoc("-d", "out1",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-package",
                 "pkg1");
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
index e9849ccc8cb..ae1bf51cfb1 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8008164 8169819 8183037 8182765
+ * @bug 8008164 8169819 8183037 8182765 8196202
  * @summary Test styles on HTML tables generated by javadoc.
  * @author Bhavesh Patel
  * @library ../lib
@@ -44,6 +44,7 @@ public class TestHtmlTableStyles extends JavadocTester {
         javadoc("-d", "out",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg1", "pkg2");
         checkExit(Exit.ERROR);
         checkOutput(Output.OUT, true,
@@ -81,6 +82,7 @@ public class TestHtmlTableStyles extends JavadocTester {
                 "-html4",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg1", "pkg2");
         checkExit(Exit.OK);
 
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
index 00ef6492012..e5650de8f6b 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
@@ -50,6 +50,7 @@ public class TestHtmlTableTags extends JavadocTester {
         javadoc("-d", "out",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg1", "pkg2");
         checkExit(Exit.OK);
 
@@ -64,6 +65,7 @@ public class TestHtmlTableTags extends JavadocTester {
                 "-html4",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg1", "pkg2");
         checkExit(Exit.OK);
 
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
index da0cb945a0f..a2fe4783cf2 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765
+ * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202
  * @summary Test the version of HTML generated by the javadoc tool.
  * @author bpatel
  * @library ../lib
@@ -45,6 +45,7 @@ public class TestHtmlVersion extends JavadocTester {
         javadoc("-d", "out-1",
                 "-private",
                 "-linksource",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg", "pkg1", "pkg2", "pkg3");
@@ -62,6 +63,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "-html4",
                 "-private",
                 "-linksource",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg", "pkg1", "pkg2", "pkg3");
@@ -79,6 +81,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "-html4",
                 "-private",
                 "-linksource",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg", "pkg1", "pkg2", "pkg3");
diff --git a/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
index 85999da058d..695d88d4bf5 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4852280 4517115 4973608 4994589 8026567 8071982
+ * @bug      4852280 4517115 4973608 4994589 8026567 8071982 8196202
  * @summary  Perform tests on index.html file.
  *           Also test that index-all.html has the appropriate output.
  *           Test for unnamed package in index.
@@ -44,6 +44,7 @@ public class TestIndex extends JavadocTester {
     @Test
     void test() {
         javadoc("-d", "out",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg", testSrc("NoPackage.java"));
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java b/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java
new file mode 100644
index 00000000000..6c353b91b9e
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java
@@ -0,0 +1,190 @@
+/*
+ * 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 8190875
+ * @summary modules not listed in overview/index page
+ * @library /tools/lib ../lib
+ * @modules
+ *      jdk.javadoc/jdk.javadoc.internal.tool
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ * @build JavadocTester
+ * @run main TestIndexWithModules
+ */
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import builder.ClassBuilder;
+import toolbox.ModuleBuilder;
+import toolbox.ToolBox;
+
+
+public class TestIndexWithModules extends JavadocTester {
+
+    final ToolBox tb;
+    private final Path src;
+
+    public static void main(String... args) throws Exception {
+        TestIndexWithModules tester = new TestIndexWithModules();
+        tester.runTests(m -> new Object[]{Paths.get(m.getName())});
+    }
+
+    TestIndexWithModules() throws Exception{
+        tb = new ToolBox();
+        src = Paths.get("src");
+        initModules();
+    }
+
+    @Test
+    void testIndexWithOverviewPath(Path base) throws Exception {
+        Path out = base.resolve("out");
+
+        tb.writeFile("overview.html",
+                "<html><body>The overview summary page header</body></html>");
+
+        javadoc("-d", out.toString(),
+                "-overview", "overview.html",
+                "--module-source-path", src.toString(),
+                "--module", "m1");
+
+        checkExit(Exit.OK);
+        checkOrder("index.html",
+                "The overview summary page header",
+                "Modules",
+                "<a href=\"m1/module-summary.html\">m1</a>");
+
+    }
+
+    //multiple modules with frames
+    @Test
+    void testIndexWithMultipleModules1(Path base) throws Exception {
+        Path out = base.resolve("out");
+        javadoc("-d", out.toString(),
+                "--module-source-path", src.toString(),
+                "--module", "m1,m3,m4",
+                "--frames");
+
+        checkExit(Exit.OK);
+
+        checkOutput("index.html", true,
+                "window.location.replace('overview-summary.html')");
+        checkOrder("overview-summary.html",
+                "Modules",
+                "<a href=\"m1/module-summary.html\">m1</a>",
+                "<a href=\"m3/module-summary.html\">m3</a>",
+                "<a href=\"m4/module-summary.html\">m4</a>");
+    }
+
+    //multiple modules with out frames
+    @Test
+    void testIndexWithMultipleModules2(Path base) throws Exception {
+        Path out = base.resolve("out");
+        javadoc("-d", out.toString(),
+                "--module-source-path", src.toString(),
+                "--module", "m1,m3,m4",
+                "--no-frames");
+
+        checkExit(Exit.OK);
+        checkOrder("index.html",
+                "Modules",
+                "<a href=\"m1/module-summary.html\">m1</a>",
+                "<a href=\"m3/module-summary.html\">m3</a>",
+                "<a href=\"m4/module-summary.html\">m4</a>");
+    }
+
+    @Test
+    void testIndexWithSingleModule(Path base) throws Exception {
+        Path out = base.resolve("out");
+        javadoc("-d", out.toString(),
+                "--module-source-path", src.toString(),
+                "--module", "m2");
+
+        checkExit(Exit.OK);
+        checkOutput("index.html", true,
+                "window.location.replace('m2/module-summary.html')");
+    }
+
+    //no modules and multiple packages
+    @Test
+    void testIndexWithNoModules1(Path base) throws Exception{
+        Path out = base.resolve("out");
+        new ClassBuilder(tb, "P1.A1")
+                .setModifiers("public","class")
+                .write(src);
+
+        new ClassBuilder(tb, "P2.A2")
+                .setModifiers("public","class")
+                .write(src);
+
+        javadoc("-d", out.toString(),
+                "--no-frames",
+                "-sourcepath", src.toString(),
+                "P1","P2");
+
+        checkExit(Exit.OK);
+        checkOrder("index.html",
+                "Packages",
+                "<a href=\"P1/package-summary.html\">P1</a>",
+                "<a href=\"P2/package-summary.html\">P2</a>");
+
+    }
+
+    //no modules and one package
+    @Test
+    void testIndexWithNoModules2(Path base) throws Exception{
+        Path out = base.resolve("out");
+        new ClassBuilder(tb, "P1.A1")
+                .setModifiers("public","class")
+                .write(src);
+
+        javadoc("-d", out.toString(),
+                "--no-frames",
+                "-sourcepath", src.toString(),
+                "P1");
+
+        checkExit(Exit.OK);
+        checkOrder("index.html",
+                "window.location.replace('P1/package-summary.html')");
+    }
+
+    void initModules() throws Exception {
+        new ModuleBuilder(tb, "m1")
+                .exports("p1")
+                .classes("package p1; public class c1{}")
+                .write(src);
+
+        new ModuleBuilder(tb, "m2")
+                .exports("p1")
+                .exports("p2")
+                .classes("package p1; public class c1{}")
+                .classes("package p2; public class c2{}")
+                .write(src);
+
+        new ModuleBuilder(tb, "m3").write(src);
+
+        new ModuleBuilder(tb, "m4").write(src);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java b/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java
index 4b27ccd34a5..db1e3c94bd3 100644
--- a/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java
+++ b/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2017, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8148985 8151921 8151743
+ * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8148985 8151921 8151743 8196202
  * @summary  Verify that the output has the right javascript.
  * @author   jamieh
  * @library  ../lib
@@ -42,6 +42,7 @@ public class TestJavascript extends JavadocTester {
     @Test
     void test() {
         javadoc("-d", "out",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg", testSrc("TestJavascript.java"));
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java b/test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java
new file mode 100644
index 00000000000..011c2c5e831
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java
@@ -0,0 +1,117 @@
+/*
+ * 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 8202627
+ * @summary javadoc generates broken links to deprecated items when -nodeprecated is used
+ * @library /tools/lib ../lib
+ * @modules
+ *      jdk.javadoc/jdk.javadoc.internal.tool
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ * @build JavadocTester
+ * @run main TestLinksWithNoDeprecatedOption
+ */
+
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import builder.ClassBuilder;
+import builder.ClassBuilder.FieldBuilder;
+import builder.ClassBuilder.MethodBuilder;
+import toolbox.ToolBox;
+
+public class TestLinksWithNoDeprecatedOption extends JavadocTester {
+
+    final ToolBox tb;
+
+    public static void main(String... args) throws Exception {
+        TestLinksWithNoDeprecatedOption tester = new TestLinksWithNoDeprecatedOption();
+        tester.runTests(m -> new Object[]{Paths.get(m.getName())});
+    }
+
+    TestLinksWithNoDeprecatedOption() {
+        tb = new ToolBox();
+    }
+
+    @Test
+    void test(Path base) throws Exception {
+        Path srcDir = base.resolve("src");
+        createTestClass(base, srcDir);
+
+        Path outDir = base.resolve("out");
+        javadoc("-d", outDir.toString(),
+                "-nodeprecated",
+                "-use",
+                "-sourcepath", srcDir.toString(),
+                "pkg");
+
+        checkExit(Exit.OK);
+
+        checkOutput("pkg/class-use/A.html", true,
+                "<span class=\"memberNameLink\">"
+                + "<a href=\"../B.html#a2\">a2</a></span>");
+
+        //links for deprecated items will not be found
+        checkOutput("pkg/class-use/A.html", false,
+                "<span class=\"memberNameLink\">"
+                + "<a href=\"../B.html#deprecatedField\">deprecatedField</a></span>");
+
+        checkOutput("pkg/class-use/A.html", false,
+                "<span class=\"memberNameLink\">"
+                + "<a href=\"../B.html#deprecatedMethod(pkg.A)\">deprecatedMethod</a></span>");
+
+        checkOutput("pkg/class-use/A.html",false,
+                "<span class=\"memberNameLink\">"
+                + "<a href=\"../B.html#%3Cinit%3E(pkg.A)\">B</a></span>");
+
+    }
+
+    void createTestClass(Path base, Path srcDir) throws Exception {
+        new ClassBuilder(tb, "pkg.A")
+                .setModifiers("public", "class")
+                .write(srcDir);
+
+        MethodBuilder method = MethodBuilder
+                .parse("public void deprecatedMethod(A a) {}")
+                .setComments(
+                    "@deprecated",
+                    "@param A a param");
+
+        MethodBuilder constructor = MethodBuilder
+                .parse("public B(A a) {}")
+                .setComments("@deprecated");
+
+
+        new ClassBuilder(tb, "pkg.B")
+                .setModifiers("public", "class")
+                .addMembers(
+                        constructor,
+                        method,
+                        FieldBuilder.parse("public A deprecatedField").setComments("@deprecated"),
+                        FieldBuilder.parse("public A a2"))
+                .write(srcDir);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java b/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java
index c9d502643d2..0bae1859c5e 100644
--- a/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java
+++ b/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8195795 8201396
+ * @bug 8195795 8201396 8196202
  * @summary test the use of module directories in output,
  *          and the --no-module-directories option
  * @modules jdk.javadoc/jdk.javadoc.internal.api
@@ -82,6 +82,7 @@ public class TestModuleDirs extends JavadocTester {
 
         javadoc("-d", base.resolve("api").toString(),
                 "-quiet",
+                "--frames",
                 "--module-source-path", src.toString(),
                 "--no-module-directories",
                 "--module", "ma,mb");
@@ -125,6 +126,7 @@ public class TestModuleDirs extends JavadocTester {
 
         javadoc("-d", base.resolve("api").toString(),
                 "-quiet",
+                "--frames",
                 "--module-source-path", src.toString(),
                 "--module", "ma,mb");
 
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 325eefc0be9..bd4d310be99 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -26,7 +26,7 @@
  * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
  *      8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218
  *      8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464
-        8164407 8192007 8182765 8196200 8196201
+        8164407 8192007 8182765 8196200 8196201 8196202 8196202
  * @summary Test modules support in javadoc.
  * @author bpatel
  * @library ../lib
@@ -51,6 +51,7 @@ public class TestModules extends JavadocTester {
                 "-use",
                 "-Xdoclint:none",
                 "-overview", testSrc("overview.html"),
+                "--frames",
                 "--module-source-path", testSrc,
                 "--module", "moduleA,moduleB",
                 "testpkgmdlA", "testpkgmdlB");
@@ -76,6 +77,7 @@ public class TestModules extends JavadocTester {
                 "-use",
                 "-Xdoclint:none",
                 "-overview", testSrc("overview.html"),
+                "--frames",
                 "--module-source-path", testSrc,
                 "--module", "moduleA,moduleB",
                 "testpkgmdlA", "testpkgmdlB");
@@ -102,6 +104,7 @@ public class TestModules extends JavadocTester {
                 "-nocomment",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "--module-source-path", testSrc,
                 "--module", "moduleA,moduleB",
@@ -123,6 +126,7 @@ public class TestModules extends JavadocTester {
                 "-nocomment",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "--module-source-path", testSrc,
                 "--module", "moduleA,moduleB",
@@ -143,6 +147,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-nomodule",
                 "-html4",
                 "-use",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
                 "testpkgnomodule", "testpkgnomodule1");
@@ -161,6 +166,7 @@ public class TestModules extends JavadocTester {
     void testHtml5UnnamedModule() {
         javadoc("-d", "out-html5-nomodule",
                 "-use",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
                 "testpkgnomodule", "testpkgnomodule1");
@@ -264,6 +270,7 @@ public class TestModules extends JavadocTester {
     void testModuleFilesAndLinks() {
         javadoc("-d", "out-modulelinks",
                 "-Xdoclint:none",
+                "--frames",
                 "--module-source-path", testSrc,
                 "--module", "moduleA,moduleB",
                 "testpkgmdlA", "testpkgmdlB");
@@ -328,6 +335,7 @@ public class TestModules extends JavadocTester {
                 "-author",
                 "-version",
                 "-Xdoclint:none",
+                "--frames",
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
@@ -352,6 +360,7 @@ public class TestModules extends JavadocTester {
                 "-author",
                 "-version",
                 "-Xdoclint:none",
+                "--frames",
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
@@ -377,6 +386,7 @@ public class TestModules extends JavadocTester {
                 "-author",
                 "-version",
                 "-Xdoclint:none",
+                "--frames",
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
@@ -453,6 +463,7 @@ public class TestModules extends JavadocTester {
     @Test
     void testSingleModuleSinglePkg() {
         javadoc("-d", "out-singlemod",
+                "--frames",
                 "--module-source-path", testSrc,
                 "--module", "moduleC",
                 "testpkgmdlC");
@@ -468,6 +479,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-singlemodmultiplepkg",
                 "--show-module-contents=all",
                 "-Xdoclint:none",
+                "--frames",
                 "--module-source-path", testSrc,
                 "--module", "moduleB",
                 "testpkg2mdlB", "testpkgmdlB");
@@ -483,6 +495,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-group",
                 "--show-module-contents=all",
                 "-Xdoclint:none",
+                "--frames",
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
@@ -505,6 +518,7 @@ public class TestModules extends JavadocTester {
                 "-html4",
                 "--show-module-contents=all",
                 "-Xdoclint:none",
+                "--frames",
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
@@ -528,6 +542,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-groupOrder",
                 "--show-module-contents=all",
                 "-Xdoclint:none",
+                "--frames",
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
@@ -550,6 +565,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-groupnomodule",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
                 "-group", "Package Group 0", "testpkgnomodule",
@@ -568,6 +584,7 @@ public class TestModules extends JavadocTester {
                 "-html4",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
                 "-group", "Package Group 0", "testpkgnomodule",
@@ -587,6 +604,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-groupPkgOrder",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
                 "-group", "Z Group", "testpkgnomodule",
@@ -604,6 +622,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-groupsinglemodule",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "--module-source-path", testSrc,
                 "-group", "Module Group B", "moduleB*",
                 "--module", "moduleB",
@@ -621,6 +640,7 @@ public class TestModules extends JavadocTester {
                 "-html4",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "--module-source-path", testSrc,
                 "-group", "Module Group B", "moduleB*",
                 "--module", "moduleB",
@@ -637,6 +657,7 @@ public class TestModules extends JavadocTester {
         javadoc("-d", "out-modulename",
                 "-use",
                 "-Xdoclint:none",
+                "--frames",
                 "--module-source-path", testSrc,
                 "--module", "moduleB,test.moduleFullName",
                 "testpkg2mdlB", "testpkgmdlB", "testpkgmdlfullname");
@@ -1553,23 +1574,13 @@ public class TestModules extends JavadocTester {
     }
 
     void checkGroupOptionSingleModule() {
-        checkOutput("overview-summary.html", true,
-                "<div class=\"contentContainer\">\n"
-                + "<table class=\"overviewSummary\">\n"
-                + "<caption><span>Module Group B</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-        checkOutput("overview-summary.html", false,
-                "<table class=\"overviewSummary\">\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+        checkOutput("index.html", true,
+                "window.location.replace('moduleB/module-summary.html')");
     }
 
     void checkGroupOptionSingleModule_html4() {
-        checkOutput("overview-summary.html", true,
-                "<div class=\"contentContainer\">\n"
-                + "<table class=\"overviewSummary\" summary=\"Module Summary table, listing modules, and an explanation\">\n"
-                + "<caption><span>Module Group B</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-        checkOutput("overview-summary.html", false,
-                "<table class=\"overviewSummary\" summary=\"Module Summary table, listing modules, and an explanation\">\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+        checkOutput("index.html", true,
+                "window.location.replace('moduleB/module-summary.html')");
     }
 
     void checkModuleName(boolean found) {
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java
index 3a95d070885..5f209c91abc 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8196027
+ * @bug 8196027 8196202
  * @summary test navigation links
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -74,6 +74,7 @@ public class TestModuleNavigation extends JavadocTester {
 
         javadoc("-d", base.resolve("out").toString(), "-use",
                 "-quiet",
+                "--frames",
                 "--module-source-path", src.toString(),
                 "--module", "m,m2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
index 2bdda855a62..d078e5a34c2 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188 8151743 8196027 8182765
- *           8196200
+ *           8196200 8196202
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @author   jamieh
@@ -56,6 +56,7 @@ public class TestNavigation extends JavadocTester {
     void test(Path ignore) {
         javadoc("-d", "out",
                 "-overview", testSrc("overview.html"),
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
@@ -112,6 +113,7 @@ public class TestNavigation extends JavadocTester {
         javadoc("-d", "out-html4",
                 "-html4",
                 "-overview", testSrc("overview.html"),
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
@@ -150,6 +152,7 @@ public class TestNavigation extends JavadocTester {
     void test1(Path ignore) {
         javadoc("-d", "out-1",
                 "-html5",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
@@ -182,6 +185,7 @@ public class TestNavigation extends JavadocTester {
     void test2(Path ignore) {
         javadoc("-d", "out-2",
                 "-nonavbar",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
@@ -213,6 +217,7 @@ public class TestNavigation extends JavadocTester {
         javadoc("-d", "out-3",
                 "-html5",
                 "-nonavbar",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
index 3cd2886dfbe..ab0c2087af1 100644
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567 8162363
- *           8175200 8186332 8182765
+ *           8175200 8186332 8182765 8196202
  * @summary  Run Javadoc on a set of source files that demonstrate new
  *           language features.  Check the output to ensure that the new
  *           language features are properly documented.
@@ -47,6 +47,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
         javadoc("-Xdoclint:none",
                 "-d", "out",
                 "-use",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg", "pkg1", "pkg2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
index d7fe590c274..4f2c1f32603 100644
--- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
+++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8039410 8042601 8042829 8049393 8050031 8155061 8155995 8167967 8169813 8182765
+ * @bug 8039410 8042601 8042829 8049393 8050031 8155061 8155995 8167967 8169813 8182765 8196202
  * @summary test to determine if members are ordered correctly
  * @library ../lib/
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -129,6 +129,7 @@ public class TestOrdering extends JavadocTester {
             tester.javadoc("-d", "out-1",
                     "-sourcepath", tester.testSrc,
                     "-use",
+                    "--frames",
                     "pkg1");
             tester.checkExit(Exit.OK);
 
@@ -383,6 +384,7 @@ public class TestOrdering extends JavadocTester {
             List<String> cmdArgs = new ArrayList();
             cmdArgs.add("-d");
             cmdArgs.add("out-2");
+            cmdArgs.add("--frames");
             cmdArgs.add("-sourcepath");
             cmdArgs.add("src");
             cmdArgs.add("-package");
diff --git a/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java b/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java
index 1615e777148..410a10dc2b2 100644
--- a/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java
+++ b/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8173302 8182765
+ * @bug 8173302 8182765 8196202
  * @summary make sure the overview-summary and module-summary pages don't
  *          don't have the See link, and the overview is copied correctly.
  * @library ../lib
@@ -45,6 +45,7 @@ public class TestOverview extends JavadocTester {
                     "-doctitle", "Document Title",
                     "-windowtitle", "Window Title",
                     "-overview", testSrc("overview.html"),
+                    "--frames",
                     "-sourcepath", testSrc("src"),
                     "p1", "p2");
         checkExit(Exit.OK);
@@ -58,6 +59,7 @@ public class TestOverview extends JavadocTester {
                 "-doctitle", "Document Title",
                 "-windowtitle", "Window Title",
                 "-overview", testSrc("overview.html"),
+                "--frames",
                 "-sourcepath", testSrc("src"),
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -70,6 +72,7 @@ public class TestOverview extends JavadocTester {
                     "-doctitle", "Document Title",
                     "-windowtitle", "Window Title",
                     "-overview", testSrc("overview.html"),
+                    "--frames",
                     "-sourcepath", testSrc("msrc"),
                     "p1", "p2");
         checkExit(Exit.OK);
@@ -83,6 +86,7 @@ public class TestOverview extends JavadocTester {
                 "-doctitle", "Document Title",
                 "-windowtitle", "Window Title",
                 "-overview", testSrc("overview.html"),
+                "--frames",
                 "-sourcepath", testSrc("msrc"),
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java
index cefefca26f3..1e97ef43322 100644
--- a/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java
+++ b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      6492694 8026567 8048351 8162363 8183511 8169819 8074407
+ * @bug      6492694 8026567 8048351 8162363 8183511 8169819 8074407 8196202
  * @summary  Test package deprecation.
  * @author   bpatel
  * @library  ../lib/
@@ -45,6 +45,7 @@ public class TestPackageDeprecation extends JavadocTester {
         javadoc("-d", "out-default",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", testSrc("C2.java"), testSrc("FooDepr.java"));
         checkExit(Exit.OK);
 
@@ -64,6 +65,7 @@ public class TestPackageDeprecation extends JavadocTester {
                 "-sourcepath", testSrc,
                 "-use",
                 "-nodeprecated",
+                "--frames",
                 "pkg", "pkg1", testSrc("C2.java"), testSrc("FooDepr.java"));
         checkExit(Exit.OK);
 
diff --git a/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java
index f1089bef0a4..3081f345ef2 100644
--- a/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java
+++ b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4074234
+ * @bug 4074234 8196202
  * @summary Make Javadoc capable of traversing/recursing all of given subpackages.
  * @author jamieh
  * @library ../lib
@@ -42,6 +42,7 @@ public class TestRecurseSubPackages extends JavadocTester {
     @Test
     void test() {
         javadoc("-d", "out",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-subpackages", "pkg1",
                 "-exclude", "pkg1.pkg2.packageToExclude");
diff --git a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java
index bce2c4c174c..a04c8e8a2a8 100644
--- a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4460354 8014636 8043186 8195805 8182765
+ * @bug      4460354 8014636 8043186 8195805 8182765 8196202
  * @summary  Test to make sure that relative paths are redirected in the
  *           output so that they are not broken.
  * @author   jamieh
@@ -44,6 +44,7 @@ public class TestRelativeLinks extends JavadocTester {
     void test() {
         javadoc("-d", "out",
                 "-use",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg", "pkg2");
         checkExit(Exit.ERROR);
diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
index 4a986bf3413..ea62ca6f702 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8141492 8071982 8141636 8147890 8166175 8168965 8176794 8175218 8147881
- *      8181622 8182263 8074407 8187521 8198522 8182765 8199278 8196201
+ *      8181622 8182263 8074407 8187521 8198522 8182765 8199278 8196201 8196202
  * @summary Test the search feature of javadoc.
  * @author bpatel
  * @library ../lib
@@ -67,6 +67,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkInvalidUsageIndexTag();
@@ -105,6 +106,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:all",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.ERROR);
         checkDocLintErrors();
@@ -142,6 +144,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkSearchOutput(false);
@@ -167,6 +170,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkSearchOutput(true);
@@ -193,6 +197,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkSearchOutput(false);
@@ -216,6 +221,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkSearchOutput(true);
@@ -235,14 +241,14 @@ public class TestSearch extends JavadocTester {
 
     @Test
     void test7() {
-        setAutomaticCheckLinks(false); // @ignore JDK-8202627
         javadoc("-d", "out-7",
                 "-nodeprecated",
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
-        setAutomaticCheckLinks(true); // @ignore JDK-8202627
+
         checkExit(Exit.OK);
         checkSearchOutput(true);
         checkIndexNoDeprecated();
@@ -266,6 +272,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkInvalidUsageIndexTag();
@@ -293,6 +300,7 @@ public class TestSearch extends JavadocTester {
                 "--disable-javafx-strict-checks",
                 "-package",
                 "-use",
+                "--frames",
                 "pkgfx", "pkg3");
         checkExit(Exit.OK);
         checkSearchOutput(true);
@@ -318,6 +326,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkSearchOutput(true, false);
@@ -345,6 +354,7 @@ public class TestSearch extends JavadocTester {
                 "-Xdoclint:none",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg", "pkg1", "pkg2", "pkg3");
         checkExit(Exit.OK);
         checkSearchJS();
@@ -389,7 +399,7 @@ public class TestSearch extends JavadocTester {
                 "<!--[if IE]>\n",
                 "<script type=\"text/javascript\" src=\"jquery/jszip-utils/dist/jszip-utils-ie.min.js\"></script>\n",
                 "<![endif]-->\n",
-                "<script type=\"text/javascript\" src=\"jquery/jquery-1.10.2.js\"></script>\n",
+                "<script type=\"text/javascript\" src=\"jquery/jquery-1.12.4.js\"></script>\n",
                 "<script type=\"text/javascript\" src=\"jquery/jquery-ui.js\"></script>",
                 "var pathtoroot = \"./\";\n"
                 + "var useModuleDirectories = " + moduleDirectoriesVar + ";\n"
@@ -581,7 +591,7 @@ public class TestSearch extends JavadocTester {
     void checkJqueryAndImageFiles(boolean expectedOutput) {
         checkFiles(expectedOutput,
                 "search.js",
-                "jquery/jquery-1.10.2.js",
+                "jquery/jquery-1.12.4.js",
                 "jquery/jquery-ui.js",
                 "jquery/jquery-ui.css",
                 "jquery/jquery-ui.min.js",
diff --git a/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java b/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
index 73855b06186..9b7360ed7d0 100644
--- a/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
@@ -25,7 +25,7 @@
 
 /*
  * @test
- * @bug      8173425 8186332 8182765
+ * @bug      8173425 8186332 8182765 8196202
  * @summary  tests for the summary tag behavior
  * @library  ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -157,6 +157,7 @@ public class TestSummaryTag extends JavadocTester {
     @Test
     void test3() {
         javadoc("-d", "out3",
+                "--frames",
                 "-sourcepath", testSrc,
                 "-overview", testSrc("p3/overview.html"),
                 "p3");
diff --git a/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java b/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java
index b418c77048e..fb8c7eb36df 100644
--- a/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      6227616 8043186
+ * @bug      6227616 8043186 8196202
  * @summary  Test the new -top option.
  * @author   jamieh
  * @library  ../lib
@@ -45,6 +45,7 @@ public class TestTopOption extends JavadocTester {
                 "-use",
                 "-top", "TOP TEXT",
                 "-d", "out-1",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
@@ -68,6 +69,7 @@ public class TestTopOption extends JavadocTester {
                 "-use",
                 "-top", "\u0130{@docroot}TOP TEXT",
                 "-d", "out-2",
+                "--frames",
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java b/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java
index c4b463edc91..841276d0616 100644
--- a/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200 8186332
- *      8182765
+ *      8182765 8196202
  * @summary A simple test to ensure class-use files are correct.
  * @author jamieh
  * @library ../lib
@@ -46,6 +46,7 @@ public class TestUseOption extends JavadocTester {
         javadoc("-d", "out-1",
                 "-sourcepath", testSrc,
                 "-use",
+                "--frames",
                 "pkg1", "pkg2");
         checkExit(Exit.OK);
 
diff --git a/test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java b/test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java
index 5e34d40c280..e147c3bf8c4 100644
--- a/test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java
+++ b/test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java
@@ -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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8016675 8026736
+ * @bug 8016675 8026736 8196202
  * @summary Test for window title.
  * @author Bhavesh Patel
  * @library ../lib
@@ -48,6 +48,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-js-chars",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -72,6 +73,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-script",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -105,6 +107,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-html-tags",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -128,6 +131,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-html-entities",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
 
@@ -148,6 +152,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-empty-tags",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
 
@@ -167,6 +172,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-unicode",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
@@ -188,6 +194,7 @@ public class TestWindowTitle extends JavadocTester {
         String title = "";
         javadoc("-d", "out-empty",
                 "-windowtitle", title,
+                "--frames",
                 "-sourcepath", testSrc, "p1", "p2");
         checkExit(Exit.OK);
 
@@ -205,6 +212,7 @@ public class TestWindowTitle extends JavadocTester {
 
         javadoc("-d", "out-doctitle",
                 "-doctitle", title,
+                "--frames",
                 "-sourcepath", testSrc,
                 "p1", "p2");
         checkExit(Exit.OK);
diff --git a/test/langtools/jdk/javadoc/tool/TestScriptInComment.java b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java
index 674a29e551c..2b404fc8a2b 100644
--- a/test/langtools/jdk/javadoc/tool/TestScriptInComment.java
+++ b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 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
@@ -242,6 +242,7 @@ public class TestScriptInComment {
         opts.add(srcDir.getPath());
         opts.add("-d");
         opts.add(outDir.getPath());
+        opts.add("--frames");
         if (option.text != null)
             opts.add(option.text);
         for (String opt: template.getOpts(srcDir)) {
diff --git a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
index 81c8abf2593..9b2c10dc2e4 100644
--- a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
+++ b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
@@ -190,16 +190,15 @@ class APITest {
      * Standard files generated by processing a documented class pkg.C.
      */
     protected static Set<String> standardExpectFiles = new HashSet<>(Arrays.asList(
-            "allclasses-frame.html",
+            "allclasses.html",
             "allclasses-index.html",
-            "allclasses-noframe.html",
             "allpackages-index.html",
             "constant-values.html",
             "deprecated-list.html",
             "help-doc.html",
             "index-all.html",
             "index.html",
-            "jquery/jquery-1.10.2.js",
+            "jquery/jquery-1.12.4.js",
             "jquery/jquery-ui.js",
             "jquery/jquery-ui.css",
             "jquery/jquery-ui.min.js",
@@ -233,7 +232,6 @@ class APITest {
             "package-search-index.js",
             "package-search-index.zip",
             "pkg/C.html",
-            "pkg/package-frame.html",
             "pkg/package-summary.html",
             "pkg/package-tree.html",
             "resources/glass.png",
diff --git a/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java b/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java
index 36b78f72f31..3410c6dbfe6 100644
--- a/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java
+++ b/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java
@@ -49,7 +49,6 @@ import org.testng.annotations.Test;
 public class PasteAndMeasurementsUITest extends UITesting {
 
     public void testPrevNextSnippet() throws Exception {
-        System.setProperty(ANSI_SUPPORTED_PROPERTY, "true");
         Field cons = System.class.getDeclaredField("cons");
         cons.setAccessible(true);
         Constructor console = Console.class.getDeclaredConstructor();
@@ -69,6 +68,5 @@ public class PasteAndMeasurementsUITest extends UITesting {
                             PROMPT + "\u001b\\[6n");
         });
     }
-        private static final String ANSI_SUPPORTED_PROPERTY = "test.terminal.ansi.supported";
         private static final String LOC = "\033[12;1R";
 }
diff --git a/test/langtools/jdk/jshell/ToolTabSnippetTest.java b/test/langtools/jdk/jshell/ToolTabSnippetTest.java
index 507a6415ff9..9f1c21357cf 100644
--- a/test/langtools/jdk/jshell/ToolTabSnippetTest.java
+++ b/test/langtools/jdk/jshell/ToolTabSnippetTest.java
@@ -83,7 +83,7 @@ public class ToolTabSnippetTest extends UITesting {
                             resource("jshell.console.see.documentation") +
                             REDRAW_PROMPT + "new JShellTest");
             inputSink.write(TAB);
-            waitOutput(out, "jshelltest.JShellTest\n" +
+            waitOutput(out, "\\u001B\\[1mjshelltest.JShellTest\\u001B\\[0m\n" +
                             "JShellTest 0" +
                             REDRAW_PROMPT + "new JShellTest");
             inputSink.write(TAB);
@@ -105,7 +105,7 @@ public class ToolTabSnippetTest extends UITesting {
                             resource("jshell.console.see.documentation") +
                             REDRAW_PROMPT + "new JShellTest\\(");
             inputSink.write(TAB);
-            waitOutput(out, "JShellTest\\(String str\\)\n" +
+            waitOutput(out, "\\u001B\\[1mJShellTest\\(String str\\)\\u001B\\[0m\n" +
                             "JShellTest 1\n" +
                             "1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n" +
                             "\n" +
@@ -117,7 +117,7 @@ public class ToolTabSnippetTest extends UITesting {
                             resource("jshell.console.see.next.javadoc") +
                             REDRAW_PROMPT + "new JShellTest\\(");
             inputSink.write(TAB);
-            waitOutput(out, "JShellTest\\(String str, int i\\)\n" +
+            waitOutput(out, "\\u001B\\[1mJShellTest\\(String str, int i\\)\\u001B\\[0m\n" +
                             "JShellTest 2\n" +
                             "\n" +
                             getMessage("jshell.console.completion.all.completions.number", "[0-9]+") +
@@ -140,7 +140,7 @@ public class ToolTabSnippetTest extends UITesting {
                             resource("jshell.console.see.documentation") +
                             REDRAW_PROMPT + "new JShellTest\\(");
             inputSink.write(TAB);
-            waitOutput(out, "JShellTest\\(String str\\)\n" +
+            waitOutput(out, "\\u001B\\[1mJShellTest\\(String str\\)\\u001B\\[0m\n" +
                             "JShellTest 1\n" +
                             "1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n" +
                             "\n" +
@@ -152,7 +152,7 @@ public class ToolTabSnippetTest extends UITesting {
                             resource("jshell.console.see.next.javadoc") +
                             REDRAW_PROMPT + "new JShellTest\\(");
             inputSink.write(TAB);
-            waitOutput(out, "JShellTest\\(String str, int i\\)\n" +
+            waitOutput(out, "\\u001B\\[1mJShellTest\\(String str, int i\\)\\u001B\\[0m\n" +
                             "JShellTest 2\n" +
                             "\n" +
                             getMessage("jshell.console.completion.all.completions.number", "[0-9]+") +
diff --git a/test/langtools/jdk/jshell/UITesting.java b/test/langtools/jdk/jshell/UITesting.java
index f2629835eec..b6999abaaf0 100644
--- a/test/langtools/jdk/jshell/UITesting.java
+++ b/test/langtools/jdk/jshell/UITesting.java
@@ -192,7 +192,7 @@ public class UITesting {
     }
 
     protected String clearOut(String what) {
-        return backspace(what.length()) + space(what.length()) + backspace(what.length());
+        return backspace(what.length()) + "\\u001B\\[K";
     }
 
     protected String backspace(int n) {
@@ -222,7 +222,7 @@ public class UITesting {
     }
 
     protected String resource(String key) {
-        return Pattern.quote(getResource(key).replaceAll("\t", "    "));
+        return Pattern.quote(getResource(key));
     }
 
     protected String getMessage(String key, Object... args) {
diff --git a/test/langtools/tools/javac/6330997/T6330997.java b/test/langtools/tools/javac/6330997/T6330997.java
index fdaf5db698e..0b69382032a 100644
--- a/test/langtools/tools/javac/6330997/T6330997.java
+++ b/test/langtools/tools/javac/6330997/T6330997.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2017, 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
@@ -44,7 +44,7 @@ import java.nio.channels.*;
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.code.ClassFinder.BadClassFile;
 import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.util.Names;
 import javax.tools.ToolProvider;
 
 public class T6330997 {
@@ -53,17 +53,17 @@ public class T6330997 {
         increaseMajor("T2.class", 2);
         javax.tools.JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
         JavacTaskImpl task = (JavacTaskImpl)tool.getTask(null, null, null, null, null, null);
-        JavaCompiler compiler = JavaCompiler.instance(task.getContext());
         Symtab syms = Symtab.instance(task.getContext());
+        Names names = Names.instance(task.getContext());
         task.ensureEntered();
         try {
-            compiler.resolveIdent(syms.unnamedModule, "T1").complete();
+            syms.enterClass(syms.unnamedModule, names.fromString("T1")).complete();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("Failed: unexpected exception while reading class T1");
         }
         try {
-            compiler.resolveIdent(syms.unnamedModule, "T2").complete();
+            syms.enterClass(syms.unnamedModule, names.fromString("T2")).complete();
         } catch (BadClassFile e) {
             System.err.println("Passed: expected completion failure " + e.getClass().getName());
             return;
diff --git a/test/langtools/tools/javac/DefiniteAssignment/T8204610.java b/test/langtools/tools/javac/DefiniteAssignment/T8204610.java
new file mode 100644
index 00000000000..2827b37038d
--- /dev/null
+++ b/test/langtools/tools/javac/DefiniteAssignment/T8204610.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8204610
+ * @summary Compiler confused by parenthesized "this" in final fields assignments
+ * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build combo.ComboTestHelper
+
+ * @run main T8204610
+ */
+
+import combo.ComboInstance;
+import combo.ComboParameter;
+import combo.ComboTask.Result;
+import combo.ComboTestHelper;
+
+public class T8204610 extends ComboInstance<T8204610> {
+
+    enum ParenKind implements ComboParameter {
+        NONE(""),
+        ONE("#P"),
+        TWO("#P#P"),
+        THREE("#P#P#P");
+
+        String parensTemplate;
+
+        ParenKind(String parensTemplate) {
+            this.parensTemplate = parensTemplate;
+        }
+
+        @Override
+        public String expand(String optParameter) {
+            return parensTemplate.replaceAll("#P", optParameter.equals("OPEN") ? "(" : ")");
+        }
+    }
+
+    public static void main(String... args) {
+        new ComboTestHelper<T8204610>()
+                .withArrayDimension("PAREN", (x, pk, idx) -> x.parenKinds[idx] = pk, 3, ParenKind.values())
+                .run(T8204610::new);
+    }
+
+    ParenKind[] parenKinds = new ParenKind[3];
+
+    @Override
+    public void doWork() {
+        newCompilationTask()
+                .withSourceFromTemplate(bodyTemplate)
+                .analyze(this::check);
+    }
+
+    String bodyTemplate = "class Test {\n" +
+                          "   final int x;\n" +
+                          "   Test() {\n" +
+                          "      #{PAREN[0].OPEN} #{PAREN[1].OPEN} this #{PAREN[1].CLOSE} . #{PAREN[2].OPEN} x #{PAREN[2].CLOSE} #{PAREN[0].CLOSE} = 1;\n" +
+                          "   } }";
+
+    void check(Result<?> res) {
+        boolean expectedFail = parenKinds[2] != ParenKind.NONE;
+        if (expectedFail != res.hasErrors()) {
+            fail("unexpected compilation result for source:\n" +
+                res.compilationInfo());
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/T6435291/T6435291.java b/test/langtools/tools/javac/T6435291/T6435291.java
index 3bd60980032..33c6038b697 100644
--- a/test/langtools/tools/javac/T6435291/T6435291.java
+++ b/test/langtools/tools/javac/T6435291/T6435291.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, 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
@@ -38,7 +38,7 @@
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.code.ClassFinder.BadClassFile;
 import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.util.Names;
 import javax.tools.ToolProvider;
 
 public class T6435291 {
@@ -46,10 +46,10 @@ public class T6435291 {
         javax.tools.JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
         JavacTaskImpl task = (JavacTaskImpl)tool.getTask(null, null, null, null, null, null);
         Symtab syms = Symtab.instance(task.getContext());
+        Names names = Names.instance(task.getContext());
         task.ensureEntered();
-        JavaCompiler compiler = JavaCompiler.instance(task.getContext());
         try {
-            compiler.resolveIdent(syms.unnamedModule, "T").complete();
+            syms.enterClass(syms.unnamedModule, names.fromString("T")).complete();
         } catch (BadClassFile e) {
             System.err.println("Passed: expected completion failure " + e.getClass().getName());
             return;
diff --git a/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java b/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java
new file mode 100644
index 00000000000..7315f61e34e
--- /dev/null
+++ b/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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 8203892
+ * @summary Target interface added as marker interface in calls to altMetafactory
+ * @library /tools/lib
+ * @modules jdk.jdeps/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.jdeps/com.sun.tools.javap
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main CheckTargetIsNotAddedAsMarkerInterfaceTest
+ */
+
+import java.io.File;
+import java.nio.file.Paths;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.BootstrapMethods_attribute;
+import com.sun.tools.classfile.BootstrapMethods_attribute.BootstrapMethodSpecifier;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPool.*;
+import com.sun.tools.javac.util.Assert;
+
+import toolbox.JavacTask;
+import toolbox.ToolBox;
+
+public class CheckTargetIsNotAddedAsMarkerInterfaceTest {
+
+    static final String testSource =
+        "import java.util.*;\n" +
+        "import java.util.function.*;\n" +
+        "import java.io.*;\n" +
+
+        "class Test {\n" +
+        "    public static <T> Comparator<T> comparingInt(ToIntFunction<? super T> keyExtractor) {\n" +
+        "        Objects.requireNonNull(keyExtractor);\n" +
+        "        return (Comparator<T> & Serializable)\n" +
+        "            (c1, c2) -> Integer.compare(keyExtractor.applyAsInt(c1), keyExtractor.applyAsInt(c2));\n" +
+        "    }\n" +
+        "}";
+
+    public static void main(String[] args) throws Exception {
+        new CheckTargetIsNotAddedAsMarkerInterfaceTest().run();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    void run() throws Exception {
+        compileTestClass();
+        checkClassFile(new File(Paths.get(System.getProperty("user.dir"), "Test.class").toUri()));
+    }
+
+    void compileTestClass() throws Exception {
+        new JavacTask(tb)
+                .sources(testSource)
+                .run();
+    }
+
+    void checkClassFile(final File cfile) throws Exception {
+        ClassFile classFile = ClassFile.read(cfile);
+        for (Attribute attr : classFile.attributes) {
+            if (attr.getName(classFile.constant_pool).equals("BootstrapMethods")) {
+                BootstrapMethods_attribute bsmAttr = (BootstrapMethods_attribute)attr;
+                BootstrapMethodSpecifier bsmSpecifier = bsmAttr.bootstrap_method_specifiers[0];
+                Assert.check(classFile.constant_pool.get(bsmSpecifier.bootstrap_arguments[0]) instanceof CONSTANT_MethodType_info);
+                Assert.check(classFile.constant_pool.get(bsmSpecifier.bootstrap_arguments[1]) instanceof CONSTANT_MethodHandle_info);
+                Assert.check(classFile.constant_pool.get(bsmSpecifier.bootstrap_arguments[2]) instanceof CONSTANT_MethodType_info);
+                Assert.check(classFile.constant_pool.get(bsmSpecifier.bootstrap_arguments[3]) instanceof CONSTANT_Integer_info);
+                Assert.check(classFile.constant_pool.get(bsmSpecifier.bootstrap_arguments[4]) instanceof CONSTANT_Integer_info);
+                break;
+            }
+        }
+    }
+}
diff --git a/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/generatedInRepeating/GeneratedInRepeating.java
similarity index 58%
rename from src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
rename to test/langtools/tools/javac/annotations/repeatingAnnotations/generatedInRepeating/GeneratedInRepeating.java
index 7cf319f6941..a336e27f092 100644
--- a/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
+++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/generatedInRepeating/GeneratedInRepeating.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ * 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
@@ -24,19 +22,25 @@
  */
 
 /*
- * AppletViewerFactory.java
+ * @test
+ * @bug 8200166
+ * @summary Check that repeating annotations whose attributes are not-yet-generated classes work.
+ * @compile Processor.java
+ * @compile -processor Processor GeneratedInRepeating.java
  */
 
-package sun.applet;
+import java.lang.annotation.Repeatable;
 
-import java.util.Hashtable;
-import java.net.URL;
-import java.awt.MenuBar;
-
-@Deprecated(since = "9")
-public interface AppletViewerFactory {
-        public AppletViewer createAppletViewer(int x, int y, URL doc,
-                                               Hashtable<String, String> atts);
-        public MenuBar getBaseMenuBar();
-        public boolean isStandalone();
+@Annot(Gen.class)
+@Annot(Gen.class)
+public class GeneratedInRepeating {
+}
+
+@Repeatable(AnnotContainer.class)
+@interface Annot {
+    public Class<?> value();
+}
+
+@interface AnnotContainer {
+    public Annot[] value();
 }
diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/generatedInRepeating/Processor.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/generatedInRepeating/Processor.java
new file mode 100644
index 00000000000..433ef753f12
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/generatedInRepeating/Processor.java
@@ -0,0 +1,56 @@
+/*
+ * 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 java.io.IOException;
+import java.io.Writer;
+import java.util.Set;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+
+@SupportedAnnotationTypes("*")
+public class Processor extends AbstractProcessor {
+
+    int round;
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latestSupported();
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (round == 0) {
+            try (Writer w = processingEnv.getFiler().createSourceFile("Gen").openWriter()) {
+                w.write("class Gen {}");
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+        round++;
+        return false;
+    }
+}
diff --git a/test/langtools/tools/javac/api/6400303/T6400303.java b/test/langtools/tools/javac/api/6400303/T6400303.java
index 4feeb994fc4..06e9b419cfe 100644
--- a/test/langtools/tools/javac/api/6400303/T6400303.java
+++ b/test/langtools/tools/javac/api/6400303/T6400303.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, 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
@@ -41,17 +41,17 @@ import javax.tools.ToolProvider;
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
 import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.util.Names;
 
 public class T6400303 {
     public static void main(String... args) {
         javax.tools.JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
         JavacTaskImpl task = (JavacTaskImpl)tool.getTask(null, null, null, null, null, null);
+        Names names = Names.instance(task.getContext());
         Symtab syms = Symtab.instance(task.getContext());
         task.ensureEntered();
-        JavaCompiler compiler = JavaCompiler.instance(task.getContext());
         try {
-            compiler.resolveIdent(syms.unnamedModule, "Test$1").complete();
+            syms.enterClass(syms.unnamedModule, names.fromString("Test$1")).complete();
         } catch (CompletionFailure ex) {
             System.err.println("Got expected completion failure: " + ex.getLocalizedMessage());
             return;
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java
new file mode 100644
index 00000000000..198da373610
--- /dev/null
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java
@@ -0,0 +1,79 @@
+/*
+ * 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 8189335
+ * @summary Synthetic anonymous class used as access constructor tag conflicting with a top level class.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.classfile
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build toolbox.ToolBox InMemoryFileManager TestResult
+ * @build AccessToPrivateInnerClassConstructorsTest SyntheticTestDriver ExpectedClass ExpectedClasses
+ * @run main SyntheticTestDriver AccessToPrivateInnerClassConstructorsTest 1
+ * @run main AccessToPrivateInnerClassConstructorsTest
+ */
+
+@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest",
+        expectedMethods = {"<init>()", "main(java.lang.String[])", "f()", "g()"})
+@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$1",
+        expectedMethods = {"<init>()"})
+@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$A",
+        expectedMethods = {
+                "<init>(AccessToPrivateInnerClassConstructorsTest)",
+                "<init>(AccessToPrivateInnerClassConstructorsTest, " +
+                       "AccessToPrivateInnerClassConstructorsTest$1)"},
+        expectedNumberOfSyntheticFields = 1,
+        expectedNumberOfSyntheticMethods = 2)
+@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$1Local",
+        expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"},
+        expectedNumberOfSyntheticFields = 1)
+@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$2Local",
+        expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"},
+        expectedNumberOfSyntheticFields = 1)
+public class AccessToPrivateInnerClassConstructorsTest {
+
+    public static void main(String... args) {
+        new AccessToPrivateInnerClassConstructorsTest().f();
+    }
+
+    private class A {
+        private A() { }
+        private A(AccessToPrivateInnerClassConstructorsTest$1 o) { }
+    }
+
+    void f() {
+        new A();
+        new A(null);
+
+        class Local {};
+        new Local();
+    }
+
+    void g() {
+        class Local {};
+        new Local();
+    }
+}
+class AccessToPrivateInnerClassConstructorsTest$1 {}
diff --git a/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java
index b49e0889475..19d167db707 100644
--- a/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java
+++ b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java
@@ -37,11 +37,8 @@
  * @run main BadConstantValue
  */
 
-import com.sun.tools.classfile.Attribute;
 import com.sun.tools.classfile.ClassFile;
 import com.sun.tools.classfile.ClassWriter;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Integer_info;
-import com.sun.tools.classfile.ConstantValue_attribute;
 import com.sun.tools.classfile.Field;
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.code.ClassFinder.BadClassFile;
@@ -49,6 +46,7 @@ import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.Names;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -169,12 +167,11 @@ public class BadConstantValue {
         JavaCompiler c = ToolProvider.getSystemJavaCompiler();
         JavacTaskImpl task = (JavacTaskImpl) c.getTask(null, null, null,
                 Arrays.asList("-classpath", classesdir.getPath()), null, null);
+        Names names = Names.instance(task.getContext());
         Symtab syms = Symtab.instance(task.getContext());
         task.ensureEntered();
-        BadClassFile badClassFile;
         try {
-            com.sun.tools.javac.main.JavaCompiler.instance(task.getContext())
-                    .resolveIdent(syms.unnamedModule, className).complete();
+            syms.enterClass(syms.unnamedModule, names.fromString(className)).complete();
         } catch (BadClassFile e) {
             return e;
         }
diff --git a/test/langtools/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java
index d7965c21b4b..8ce93dc8aa8 100644
--- a/test/langtools/tools/javac/diags/CheckResourceKeys.java
+++ b/test/langtools/tools/javac/diags/CheckResourceKeys.java
@@ -118,7 +118,8 @@ public class CheckResourceKeys {
     void findDeadKeys(Set<String> codeStrings, Set<String> resourceKeys) {
         String[] prefixes = {
             "compiler.err.", "compiler.warn.", "compiler.note.", "compiler.misc.",
-            "javac."
+            "javac.",
+            "launcher.err."
         };
         for (String rk: resourceKeys) {
             // some keys are used directly, without a prefix.
@@ -395,7 +396,7 @@ public class CheckResourceKeys {
     Set<String> getResourceKeys() {
         Module jdk_compiler = ModuleLayer.boot().findModule("jdk.compiler").get();
         Set<String> results = new TreeSet<String>();
-        for (String name : new String[]{"javac", "compiler"}) {
+        for (String name : new String[]{"javac", "compiler", "launcher"}) {
             ResourceBundle b =
                     ResourceBundle.getBundle("com.sun.tools.javac.resources." + name, jdk_compiler);
             results.addAll(b.keySet());
diff --git a/test/langtools/tools/javac/importscope/BadClassFileDuringImport.java b/test/langtools/tools/javac/importscope/BadClassFileDuringImport.java
new file mode 100644
index 00000000000..a4b751fea41
--- /dev/null
+++ b/test/langtools/tools/javac/importscope/BadClassFileDuringImport.java
@@ -0,0 +1,157 @@
+/*
+ * 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 8198378
+ * @summary Verify that BadClassFile related to imports are handled properly.
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main BadClassFileDuringImport
+ */
+
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class BadClassFileDuringImport {
+    public static void main(String... args) throws Exception {
+        new BadClassFileDuringImport().run();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    void run() throws Exception {
+        new JavacTask(tb)
+          .outdir(".")
+          .sources("package p; public class A { }",
+                   "package p; public class B { public static class I { } }")
+          .run()
+          .writeAll();
+
+        try (OutputStream out = Files.newOutputStream(Paths.get(".", "p", "A.class"))) {
+            out.write("broken".getBytes("UTF-8"));
+        }
+
+        try (OutputStream out = Files.newOutputStream(Paths.get(".", "p", "B$I.class"))) {
+            out.write("broken".getBytes("UTF-8"));
+        }
+
+        doTest("import p.A;",
+               "",
+               "Test.java:2:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import p.A;",
+               "A a;",
+               "Test.java:2:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
+               "Test.java:2:33: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
+               "2 errors");
+        doTest("import p.A;",
+               "void test() { A a; }",
+               "Test.java:2:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
+               "Test.java:2:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
+               "2 errors");
+        doTest("import p.*;",
+               "",
+               (String[]) null);
+        doTest("import p.*;",
+               "A a;",
+               "Test.java:2:33: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import p.*;",
+               "void test() { A a; }",
+               "Test.java:2:47: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+
+        doTest("import p.B.I;",
+               "",
+               "Test.java:2:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import p.B.I;",
+               "I i;",
+               "Test.java:2:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import p.B.I;",
+               "void test() { I i; }",
+               "Test.java:2:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import p.B.*;",
+               "",
+               (String[]) null);
+        doTest("import p.B.*;",
+               "I i;",
+               "Test.java:2:35: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import p.B.*;",
+               "void test() { I i; }",
+               "Test.java:2:49: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+
+        doTest("import static p.B.I;",
+               "",
+               "Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import static p.B.I;",
+               "I i;",
+               "Test.java:2:42: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import static p.B.I;",
+               "void test() { I i; }",
+               "Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import static p.B.*;",
+               "",
+               "Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import static p.B.*;",
+               "I i;",
+               "Test.java:2:42: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+        doTest("import static p.B.*;",
+               "void test() { I i; }",
+               "Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
+               "1 error");
+    }
+
+    void doTest(String importText, String useText, String... expectedOutput) {
+        List<String> log = new JavacTask(tb)
+                .classpath(".")
+                .sources("\n" + importText + " public class Test { " + useText + " }")
+                .options("-XDrawDiagnostics")
+                .run(expectedOutput != null ? Task.Expect.FAIL : Task.Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        if (expectedOutput != null && !log.equals(Arrays.asList(expectedOutput))) {
+            throw new AssertionError("Unexpected output: " + log);
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
new file mode 100644
index 00000000000..d67e7d15927
--- /dev/null
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -0,0 +1,544 @@
+/*
+ * 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 8192920 8204588
+ * @summary Test source launcher
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.launcher
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.JavaTask toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox
+ * @run main SourceLauncherTest
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import com.sun.tools.javac.launcher.Main;
+
+import toolbox.JavaTask;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class SourceLauncherTest extends TestRunner {
+    public static void main(String... args) throws Exception {
+        SourceLauncherTest t = new SourceLauncherTest();
+        t.runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    SourceLauncherTest() {
+        super(System.err);
+        tb = new ToolBox();
+        System.err.println("version: " + thisVersion);
+    }
+
+    private final ToolBox tb;
+    private static final String thisVersion = System.getProperty("java.specification.version");
+
+    /*
+     * Positive tests.
+     */
+
+    @Test
+    public void testHelloWorld(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        testSuccess(base.resolve("HelloWorld.java"), "Hello World! [1, 2, 3]\n");
+    }
+
+    @Test
+    public void testHelloWorldInPackage(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "package hello;\n" +
+            "import java.util.Arrays;\n" +
+            "class World {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        testSuccess(base.resolve("hello").resolve("World.java"), "Hello World! [1, 2, 3]\n");
+    }
+
+    @Test
+    public void testHelloWorldWithAux(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        Aux.write(args);\n" +
+            "    }\n" +
+            "}\n" +
+            "class Aux {\n" +
+            "    static void write(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        testSuccess(base.resolve("HelloWorld.java"), "Hello World! [1, 2, 3]\n");
+    }
+
+    @Test
+    public void testHelloWorldWithShebang(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "#!/usr/bin/java --source 11\n" +
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        Files.copy(base.resolve("HelloWorld.java"), base.resolve("HelloWorld"));
+        testSuccess(base.resolve("HelloWorld"), "Hello World! [1, 2, 3]\n");
+    }
+
+    @Test
+    public void testNoAnnoProcessing(Path base) throws IOException {
+        Path annoSrc = base.resolve("annoSrc");
+        tb.writeJavaFiles(annoSrc,
+            "import java.util.*;\n" +
+            "import javax.annotation.processing.*;\n" +
+            "import javax.lang.model.element.*;\n" +
+            "@SupportedAnnotationTypes(\"*\")\n" +
+            "public class AnnoProc extends AbstractProcessor {\n" +
+            "    public boolean process(Set<? extends TypeElement> annos, RoundEnvironment rEnv) {\n" +
+            "        throw new Error(\"Annotation processor should not be invoked\");\n" +
+            "    }\n" +
+            "}\n");
+        Path annoClasses = Files.createDirectories(base.resolve("classes"));
+        new JavacTask(tb)
+                .outdir(annoClasses)
+                .files(annoSrc.resolve("AnnoProc.java").toString())
+                .run();
+        Path serviceFile = annoClasses.resolve("META-INF").resolve("services")
+                .resolve("javax.annotation.processing.Processor");
+        tb.writeFile(serviceFile, "AnnoProc");
+
+        Path mainSrc = base.resolve("mainSrc");
+        tb.writeJavaFiles(mainSrc,
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+
+        List<String> javacArgs = List.of("-classpath", annoClasses.toString());
+        List<String> classArgs = List.of("1", "2", "3");
+        String expect = "Hello World! [1, 2, 3]\n";
+        Result r = run(mainSrc.resolve("HelloWorld.java"), javacArgs, classArgs);
+        checkEqual("stdout", r.stdOut, expect);
+        checkEmpty("stderr", r.stdErr);
+        checkNull("exception", r.exception);
+    }
+
+    @Test
+    public void testEnablePreview(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+
+        String log = new JavaTask(tb)
+                .vmOptions("--enable-preview", "--source", thisVersion)
+                .className(base.resolve("HelloWorld.java").toString())
+                .classArgs("1", "2", "3")
+                .run(Task.Expect.SUCCESS)
+                .getOutput(Task.OutputKind.STDOUT);
+        checkEqual("stdout", log.trim(), "Hello World! [1, 2, 3]");
+    }
+
+    void testSuccess(Path file, String expect) throws IOException {
+        Result r = run(file, Collections.emptyList(), List.of("1", "2", "3"));
+        checkEqual("stdout", r.stdOut, expect);
+        checkEmpty("stderr", r.stdErr);
+        checkNull("exception", r.exception);
+    }
+
+    /*
+     * Negative tests: such as cannot find or execute main method.
+     */
+
+    @Test
+    public void testHelloWorldWithShebangJava(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "#!/usr/bin/java --source 11\n" +
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        Path file = base.resolve("HelloWorld.java");
+        testError(file,
+            file + ":1: error: illegal character: '#'\n" +
+            "#!/usr/bin/java --source 11\n" +
+            "^\n" +
+            file + ":1: error: class, interface, or enum expected\n" +
+            "#!/usr/bin/java --source 11\n" +
+            "  ^\n" +
+            "2 errors\n",
+            "error: compilation failed");
+    }
+
+    @Test
+    public void testNoClass(Path base) throws IOException {
+        Files.createDirectories(base);
+        Path file = base.resolve("NoClass.java");
+        Files.write(file, List.of("package p;"));
+        testError(file, "", "error: no class declared in file");
+    }
+
+    @Test
+    public void testWrongClass(Path base) throws IOException {
+        Path src = base.resolve("src");
+        Path file = src.resolve("WrongClass.java");
+        tb.writeJavaFiles(src, "class WrongClass { }");
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        new JavacTask(tb)
+                .outdir(classes)
+                .files(file)
+                .run();
+        String log = new JavaTask(tb)
+                .classpath(classes.toString())
+                .className(file.toString())
+                .run(Task.Expect.FAIL)
+                .getOutput(Task.OutputKind.STDERR);
+        checkEqual("stderr", log.trim(),
+                "error: class found on application class path: WrongClass");
+    }
+
+    @Test
+    public void testSyntaxErr(Path base) throws IOException {
+        tb.writeJavaFiles(base, "class SyntaxErr {");
+        Path file = base.resolve("SyntaxErr.java");
+        testError(file,
+                file + ":1: error: reached end of file while parsing\n" +
+                "class SyntaxErr {\n" +
+                "                 ^\n" +
+                "1 error\n",
+                "error: compilation failed");
+    }
+
+    @Test
+    public void testNoSourceOnClassPath(Path base) throws IOException {
+        Path auxSrc = base.resolve("auxSrc");
+        tb.writeJavaFiles(auxSrc,
+            "public class Aux {\n" +
+            "    static final String MESSAGE = \"Hello World\";\n" +
+            "}\n");
+
+        Path mainSrc = base.resolve("mainSrc");
+        tb.writeJavaFiles(mainSrc,
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(Aux.MESSAGE + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+
+        List<String> javacArgs = List.of("-classpath", auxSrc.toString());
+        List<String> classArgs = List.of("1", "2", "3");
+        String FS = File.separator;
+        String expectStdErr =
+            "testNoSourceOnClassPath" + FS + "mainSrc" + FS + "HelloWorld.java:4: error: cannot find symbol\n" +
+            "        System.out.println(Aux.MESSAGE + Arrays.toString(args));\n" +
+            "                           ^\n" +
+            "  symbol:   variable Aux\n" +
+            "  location: class HelloWorld\n" +
+            "1 error\n";
+        Result r = run(mainSrc.resolve("HelloWorld.java"), javacArgs, classArgs);
+        checkEmpty("stdout", r.stdOut);
+        checkEqual("stderr", r.stdErr, expectStdErr);
+        checkFault("exception", r.exception, "error: compilation failed");
+
+    }
+
+    // For any source file that is invoked through the OS shebang mechanism, invalid shebang
+    // lines will be caught and handled by the OS, before the launcher is even invoked.
+    // However, if such a file is passed directly to the launcher, perhaps using the --source
+    // option, a well-formed shebang line will be removed but a badly-formed one will be not be
+    // removed and will cause compilation errors.
+    @Test
+    public void testBadShebang(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "#/usr/bin/java --source 11\n" +
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        Path file = base.resolve("HelloWorld.java");
+        testError(file,
+            file + ":1: error: illegal character: '#'\n" +
+            "#/usr/bin/java --source 11\n" +
+            "^\n" +
+            file + ":1: error: class, interface, or enum expected\n" +
+            "#/usr/bin/java --source 11\n" +
+            "  ^\n" +
+            "2 errors\n",
+            "error: compilation failed");
+    }
+
+    @Test
+    public void testBadSourceOpt(Path base) throws IOException {
+        Files.createDirectories(base);
+        Path file = base.resolve("DummyClass.java");
+        Files.write(file, List.of("class DummyClass { }"));
+        Properties sysProps = System.getProperties();
+        Properties p = new Properties(sysProps);
+        p.setProperty("jdk.internal.javac.source", "<BAD>");
+        System.setProperties(p);
+        try {
+            testError(file, "", "error: invalid value for --source option: <BAD>");
+        } finally {
+            System.setProperties(sysProps);
+        }
+    }
+
+    @Test
+    public void testEnablePreviewNoSource(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "import java.util.Arrays;\n" +
+            "class HelloWorld {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+
+        String log = new JavaTask(tb)
+                .vmOptions("--enable-preview")
+                .className(base.resolve("HelloWorld.java").toString())
+                .run(Task.Expect.FAIL)
+                .getOutput(Task.OutputKind.STDERR);
+        checkEqual("stderr", log.trim(),
+                "error: --enable-preview must be used with --source");
+    }
+
+    @Test
+    public void testNoMain(Path base) throws IOException {
+        tb.writeJavaFiles(base, "class NoMain { }");
+        testError(base.resolve("NoMain.java"), "",
+                "error: can't find main(String[]) method in class: NoMain");
+    }
+
+    @Test
+    public void testMainBadParams(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                "class BadParams { public static void main() { } }");
+        testError(base.resolve("BadParams.java"), "",
+                "error: can't find main(String[]) method in class: BadParams");
+    }
+
+    @Test
+    public void testMainNotPublic(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                "class NotPublic { static void main(String... args) { } }");
+        testError(base.resolve("NotPublic.java"), "",
+                "error: 'main' method is not declared 'public static'");
+    }
+
+    @Test
+    public void testMainNotStatic(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                "class NotStatic { public void main(String... args) { } }");
+        testError(base.resolve("NotStatic.java"), "",
+                "error: 'main' method is not declared 'public static'");
+    }
+
+    @Test
+    public void testMainNotVoid(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                "class NotVoid { public static int main(String... args) { return 0; } }");
+        testError(base.resolve("NotVoid.java"), "",
+                "error: 'main' method is not declared with a return type of 'void'");
+    }
+
+    @Test
+    public void testClassInModule(Path base) throws IOException {
+        tb.writeJavaFiles(base, "package java.net; class InModule { }");
+        Path file = base.resolve("java").resolve("net").resolve("InModule.java");
+        testError(file,
+                file + ":1: error: package exists in another module: java.base\n" +
+                "package java.net; class InModule { }\n" +
+                "^\n" +
+                "1 error\n",
+                "error: compilation failed");
+    }
+
+    void testError(Path file, String expectStdErr, String expectFault) throws IOException {
+        Result r = run(file, Collections.emptyList(), List.of("1", "2", "3"));
+        checkEmpty("stdout", r.stdOut);
+        checkEqual("stderr", r.stdErr, expectStdErr);
+        checkFault("exception", r.exception, expectFault);
+    }
+
+    /*
+     * Tests in which main throws an exception.
+     */
+    @Test
+    public void testTargetException1(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "import java.util.Arrays;\n" +
+            "class Thrower {\n" +
+            "    public static void main(String... args) {\n" +
+            "        throwWhenZero(Integer.parseInt(args[0]));\n" +
+            "    }\n" +
+            "    static void throwWhenZero(int arg) {\n" +
+            "        if (arg == 0) throw new Error(\"zero!\");\n" +
+            "        throwWhenZero(arg - 1);\n" +
+            "    }\n" +
+            "}");
+        Path file = base.resolve("Thrower.java");
+        Result r = run(file, Collections.emptyList(), List.of("3"));
+        checkEmpty("stdout", r.stdOut);
+        checkEmpty("stderr", r.stdErr);
+        checkTrace("exception", r.exception,
+                "java.lang.Error: zero!",
+                "at Thrower.throwWhenZero(Thrower.java:7)",
+                "at Thrower.throwWhenZero(Thrower.java:8)",
+                "at Thrower.throwWhenZero(Thrower.java:8)",
+                "at Thrower.throwWhenZero(Thrower.java:8)",
+                "at Thrower.main(Thrower.java:4)");
+    }
+
+    Result run(Path file, List<String> runtimeArgs, List<String> appArgs) {
+        List<String> args = new ArrayList<>();
+        args.add(file.toString());
+        args.addAll(appArgs);
+
+        PrintStream prev = System.out;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (PrintStream out = new PrintStream(baos, true)) {
+            System.setOut(out);
+            StringWriter sw = new StringWriter();
+            try (PrintWriter err = new PrintWriter(sw, true)) {
+                Main m = new Main(err);
+                m.run(toArray(runtimeArgs), toArray(args));
+                return new Result(baos.toString(), sw.toString(), null);
+            } catch (Throwable t) {
+                return new Result(baos.toString(), sw.toString(), t);
+            }
+        } finally {
+            System.setOut(prev);
+        }
+    }
+
+    void checkEqual(String name, String found, String expect) {
+        expect = expect.replace("\n", tb.lineSeparator);
+        out.println(name + ": " + found);
+        out.println(name + ": " + found);
+        if (!expect.equals(found)) {
+            error("Unexpected output; expected: " + expect);
+        }
+    }
+
+    void checkEmpty(String name, String found) {
+        out.println(name + ": " + found);
+        if (!found.isEmpty()) {
+            error("Unexpected output; expected empty string");
+        }
+    }
+
+    void checkNull(String name, Throwable found) {
+        out.println(name + ": " + found);
+        if (found != null) {
+            error("Unexpected exception; expected null");
+        }
+    }
+
+    void checkFault(String name, Throwable found, String expect) {
+        expect = expect.replace("\n", tb.lineSeparator);
+        out.println(name + ": " + found);
+        if (found == null) {
+            error("No exception thrown; expected Main.Fault");
+        } else {
+            if (!(found instanceof Main.Fault)) {
+                error("Unexpected exception; expected Main.Fault");
+            }
+            if (!(found.getMessage().equals(expect))) {
+                error("Unexpected detail message; expected: " + expect);
+            }
+        }
+    }
+
+    void checkTrace(String name, Throwable found, String... expect) {
+        if (!(found instanceof InvocationTargetException)) {
+            error("Unexpected exception; expected InvocationTargetException");
+            out.println("Found:");
+            found.printStackTrace(out);
+        }
+        StringWriter sw = new StringWriter();
+        try (PrintWriter pw = new PrintWriter(sw)) {
+            ((InvocationTargetException) found).getTargetException().printStackTrace(pw);
+        }
+        String trace = sw.toString();
+        out.println(name + ":\n" + trace);
+        String[] traceLines = trace.trim().split("[\r\n]+\\s+");
+        try {
+            tb.checkEqual(List.of(traceLines), List.of(expect));
+        } catch (Error e) {
+            error(e.getMessage());
+        }
+    }
+
+    String[] toArray(List<String> list) {
+        return list.toArray(new String[list.size()]);
+    }
+
+    class Result {
+        private final String stdOut;
+        private final String stdErr;
+        private final Throwable exception;
+
+        Result(String stdOut, String stdErr, Throwable exception) {
+            this.stdOut = stdOut;
+            this.stdErr = stdErr;
+            this.exception = exception;
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/tree/VarTree.java b/test/langtools/tools/javac/tree/VarTree.java
index 7d1f9f2204c..2b286b7f29b 100644
--- a/test/langtools/tools/javac/tree/VarTree.java
+++ b/test/langtools/tools/javac/tree/VarTree.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8188225
+ * @bug 8188225 8204674
  * @summary Check that variables of type var have a consistent model
  * @modules jdk.compiler/com.sun.tools.javac.api
  */
@@ -42,6 +42,7 @@ import javax.tools.SimpleJavaFileObject;
 import javax.tools.ToolProvider;
 
 import com.sun.source.tree.VariableTree;
+import com.sun.source.util.JavacTask;
 import com.sun.source.util.TreeScanner;
 import com.sun.source.util.Trees;
 
@@ -64,6 +65,10 @@ public class VarTree {
                  "java.lang.String testVar");
         test.run("java.util.function.Consumer<String> c = (|testVar|) -> {};",
                  "java.lang.String testVar");
+        test.run("java.util.function.Consumer<String> c = (|var testVar|) -> {};",
+                 "java.lang.String testVar");
+        test.run("java.util.function.IntBinaryOperator c = (var x, |testType|) -> 1;",
+                 "testType ");
     }
 
     void run(String code, String expected) throws IOException {
@@ -81,9 +86,12 @@ public class VarTree {
                                                         null, Arrays.asList(new MyFileObject(src)));
 
         Iterable<? extends CompilationUnitTree> units = ct.parse();
+
+        runSpanCheck(ct, units, src, prefix.length() + parts[0].length(), prefix.length() + parts[0].length() + parts[1].length());
+
         ct.analyze();
 
-        Trees trees = Trees.instance(ct);
+        runSpanCheck(ct, units, src, prefix.length() + parts[0].length(), prefix.length() + parts[0].length() + parts[1].length());
 
         for (CompilationUnitTree cut : units) {
             new TreeScanner<Void, Void>() {
@@ -93,13 +101,34 @@ public class VarTree {
                         if (!expected.equals(node.toString())) {
                             throw new AssertionError("Unexpected tree: " + node.toString());
                         }
+                    }
+                    if (String.valueOf(node.getType()).equals("testType")) {
+                        if (!expected.equals(node.toString())) {
+                            throw new AssertionError("Unexpected tree: " + node.toString());
+                        }
+                    }
+                    return super.visitVariable(node, p);
+                }
 
+            }.scan(cut, null);
+        }
+    }
+
+    private void runSpanCheck(JavacTask ct, Iterable<? extends CompilationUnitTree> units, String src, int spanStart, int spanEnd) {
+        Trees trees = Trees.instance(ct);
+        boolean[] found = new boolean[1];
+
+        for (CompilationUnitTree cut : units) {
+            new TreeScanner<Void, Void>() {
+                @Override
+                public Void visitVariable(VariableTree node, Void p) {
+                    if (node.getName().contentEquals("testVar")) {
                         int start = (int) trees.getSourcePositions().getStartPosition(cut, node);
                         int end   = (int) trees.getSourcePositions().getEndPosition(cut, node);
 
                         String snip = src.substring(start, end);
 
-                        if (start != prefix.length() + parts[0].length() || end != prefix.length() + parts[0].length() + parts[1].length()) {
+                        if (start != spanStart || end != spanEnd) {
                             throw new AssertionError("Unexpected span: " + snip);
                         }
 
@@ -109,13 +138,32 @@ public class VarTree {
                         if (typeStart != (-1) && typeEnd != (-1)) {
                             throw new AssertionError("Unexpected type position: " + typeStart + ", " + typeEnd);
                         }
+
+                        found[0] = true;
+                    }
+                    if (String.valueOf(node.getType()).equals("testType")) {
+                        int start = (int) trees.getSourcePositions().getStartPosition(cut, node);
+                        int end   = (int) trees.getSourcePositions().getEndPosition(cut, node);
+
+                        String snip = src.substring(start, end);
+
+                        if (start != spanStart || end != spanEnd) {
+                            throw new AssertionError("Unexpected span: " + snip);
+                        }
+
+                        found[0] = true;
                     }
                     return super.visitVariable(node, p);
                 }
 
             }.scan(cut, null);
         }
+
+        if (!found[0]) {
+            throw new AssertionError("Didn't find the test variable.");
+        }
     }
+
     class MyFileObject extends SimpleJavaFileObject {
 
         private String text;
diff --git a/test/langtools/tools/javadoc/api/basic/APITest.java b/test/langtools/tools/javadoc/api/basic/APITest.java
index 81c8abf2593..9b2c10dc2e4 100644
--- a/test/langtools/tools/javadoc/api/basic/APITest.java
+++ b/test/langtools/tools/javadoc/api/basic/APITest.java
@@ -190,16 +190,15 @@ class APITest {
      * Standard files generated by processing a documented class pkg.C.
      */
     protected static Set<String> standardExpectFiles = new HashSet<>(Arrays.asList(
-            "allclasses-frame.html",
+            "allclasses.html",
             "allclasses-index.html",
-            "allclasses-noframe.html",
             "allpackages-index.html",
             "constant-values.html",
             "deprecated-list.html",
             "help-doc.html",
             "index-all.html",
             "index.html",
-            "jquery/jquery-1.10.2.js",
+            "jquery/jquery-1.12.4.js",
             "jquery/jquery-ui.js",
             "jquery/jquery-ui.css",
             "jquery/jquery-ui.min.js",
@@ -233,7 +232,6 @@ class APITest {
             "package-search-index.js",
             "package-search-index.zip",
             "pkg/C.html",
-            "pkg/package-frame.html",
             "pkg/package-summary.html",
             "pkg/package-tree.html",
             "resources/glass.png",
diff --git a/test/lib/jdk/test/lib/Utils.java b/test/lib/jdk/test/lib/Utils.java
index dedf677d3f9..8368ab717f6 100644
--- a/test/lib/jdk/test/lib/Utils.java
+++ b/test/lib/jdk/test/lib/Utils.java
@@ -401,19 +401,35 @@ public final class Utils {
      * Returns hex view of byte array
      *
      * @param bytes byte array to process
-     * @return Space separated hexadecimal string representation of bytes
+     * @return space separated hexadecimal string representation of bytes
      */
+     public static String toHexString(byte[] bytes) {
+         char[] hexView = new char[bytes.length * 3 - 1];
+         for (int i = 0; i < bytes.length - 1; i++) {
+             hexView[i * 3] = hexArray[(bytes[i] >> 4) & 0x0F];
+             hexView[i * 3 + 1] = hexArray[bytes[i] & 0x0F];
+             hexView[i * 3 + 2] = ' ';
+         }
+         hexView[hexView.length - 2] = hexArray[(bytes[bytes.length - 1] >> 4) & 0x0F];
+         hexView[hexView.length - 1] = hexArray[bytes[bytes.length - 1] & 0x0F];
+         return new String(hexView);
+     }
 
-    public static String toHexString(byte[] bytes) {
-        char[] hexView = new char[bytes.length * 3];
-        int i = 0;
-        for (byte b : bytes) {
-            hexView[i++] = hexArray[(b >> 4) & 0x0F];
-            hexView[i++] = hexArray[b & 0x0F];
-            hexView[i++] = ' ';
-        }
-        return new String(hexView);
-    }
+     /**
+      * Returns byte array of hex view
+      *
+      * @param hex hexadecimal string representation
+      * @return byte array
+      */
+     public static byte[] toByteArray(String hex) {
+         int length = hex.length();
+         byte[] bytes = new byte[length / 2];
+         for (int i = 0; i < length; i += 2) {
+             bytes[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4)
+                     + Character.digit(hex.charAt(i + 1), 16));
+         }
+         return bytes;
+     }
 
     /**
      * Returns {@link java.util.Random} generator initialized with particular seed.
@@ -793,4 +809,3 @@ public final class Utils {
         return Files.createTempFile(dir, prefix, suffix);
     }
 }
-
diff --git a/test/lib/jdk/test/lib/jfr/CommonHelper.java b/test/lib/jdk/test/lib/jfr/CommonHelper.java
index 61d7152ed4e..10ae4dffaf8 100644
--- a/test/lib/jdk/test/lib/jfr/CommonHelper.java
+++ b/test/lib/jdk/test/lib/jfr/CommonHelper.java
@@ -106,7 +106,7 @@ public final class CommonHelper {
 
     public static void waitForSystemCurrentMillisToChange() {
         long t = System.currentTimeMillis();
-        while (t != System.currentTimeMillis()) {
+        while (t == System.currentTimeMillis()) {
             try {
                 Thread.sleep(2);
             } catch (InterruptedException e) {
diff --git a/test/lib/sun/hotspot/code/Compiler.java b/test/lib/sun/hotspot/code/Compiler.java
new file mode 100644
index 00000000000..ae359531faf
--- /dev/null
+++ b/test/lib/sun/hotspot/code/Compiler.java
@@ -0,0 +1,136 @@
+/*
+ * 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 sun.hotspot.code;
+
+import sun.hotspot.WhiteBox;
+
+/**
+ * API to obtain information about enabled JIT compilers
+ * retrieved from the VM with the WhiteBox API.
+ */
+public class Compiler {
+
+    private static final WhiteBox WB = WhiteBox.getWhiteBox();
+
+    /**
+     * Check if Graal is used as JIT compiler.
+     *
+     * Graal is enabled if following conditions are true:
+     * - we are not in Interpreter mode
+     * - UseJVMCICompiler flag is true
+     * - jvmci.Compiler variable is equal to 'graal'
+     * - TieredCompilation is not used or TieredStopAtLevel is greater than 3
+     * No need to check client mode because it set UseJVMCICompiler to false.
+     *
+     * @return true if Graal is used as JIT compiler.
+     */
+    public static boolean isGraalEnabled() {
+        Boolean useCompiler = WB.getBooleanVMFlag("UseCompiler");
+        if (useCompiler == null || !useCompiler) {
+            return false;
+        }
+        Boolean useJvmciComp = WB.getBooleanVMFlag("UseJVMCICompiler");
+        if (useJvmciComp == null || !useJvmciComp) {
+            return false;
+        }
+        // This check might be redundant but let's keep it for now.
+        String jvmciCompiler = System.getProperty("jvmci.Compiler");
+        if (jvmciCompiler == null || !jvmciCompiler.equals("graal")) {
+            return false;
+        }
+
+        Boolean tieredCompilation = WB.getBooleanVMFlag("TieredCompilation");
+        Long compLevel = WB.getIntxVMFlag("TieredStopAtLevel");
+        // if TieredCompilation is enabled and compilation level is <= 3 then no Graal is used
+        if (tieredCompilation != null && tieredCompilation &&
+            compLevel != null && compLevel <= 3) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Check if C2 is used as JIT compiler.
+     *
+     * C2 is enabled if following conditions are true:
+     * - we are not in Interpreter mode
+     * - we are in Server compilation mode
+     * - TieredCompilation is not used or TieredStopAtLevel is greater than 3
+     * - Graal is not used
+     *
+     * @return true if C2 is used as JIT compiler.
+     */
+    public static boolean isC2Enabled() {
+        Boolean useCompiler = WB.getBooleanVMFlag("UseCompiler");
+        if (useCompiler == null || !useCompiler) {
+            return false;
+        }
+        Boolean serverMode = WB.getBooleanVMFlag("ProfileInterpreter");
+        if (serverMode == null || !serverMode) {
+            return false;
+        }
+
+        Boolean tieredCompilation = WB.getBooleanVMFlag("TieredCompilation");
+        Long compLevel = WB.getIntxVMFlag("TieredStopAtLevel");
+        // if TieredCompilation is enabled and compilation level is <= 3 then no Graal is used
+        if (tieredCompilation != null && tieredCompilation &&
+            compLevel != null && compLevel <= 3) {
+            return false;
+        }
+
+        if (isGraalEnabled()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /*
+     * Check if C1 is used as JIT compiler.
+     *
+     * C1 is enabled if following conditions are true:
+     * - we are not in Interpreter mode
+     * - we are not in Server compilation mode
+     * - TieredCompilation is used in Server mode
+     *
+     * @return true if C1 is used as JIT compiler.
+     */
+    public static boolean isC1Enabled() {
+        Boolean useCompiler = WB.getBooleanVMFlag("UseCompiler");
+        if (useCompiler == null || !useCompiler) {
+            return false;
+        }
+        Boolean serverMode = WB.getBooleanVMFlag("ProfileInterpreter");
+        if (serverMode == null || !serverMode) {
+            return true; // Client mode
+        }
+
+        Boolean tieredCompilation = WB.getBooleanVMFlag("TieredCompilation");
+        // C1 is not used in server mode if TieredCompilation is off.
+        if (tieredCompilation != null && !tieredCompilation) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/test/lib/sun/hotspot/cpuinfo/CPUInfo.java b/test/lib/sun/hotspot/cpuinfo/CPUInfo.java
index 0c4f96b286d..ae740884de6 100644
--- a/test/lib/sun/hotspot/cpuinfo/CPUInfo.java
+++ b/test/lib/sun/hotspot/cpuinfo/CPUInfo.java
@@ -36,7 +36,7 @@ import sun.hotspot.WhiteBox;
  *
  * CPUInfo uses WhiteBox to gather information,
  * so WhiteBox class should be added to bootclasspath
- * and option -XX:+WhiteBoxAPI should expclicetly
+ * and option -XX:+WhiteBoxAPI should be explicitly
  * specified on command line.
  */
 public class CPUInfo {
diff --git a/test/lib/sun/hotspot/gc/GC.java b/test/lib/sun/hotspot/gc/GC.java
index 900346a6ac4..5b36d6a860d 100644
--- a/test/lib/sun/hotspot/gc/GC.java
+++ b/test/lib/sun/hotspot/gc/GC.java
@@ -36,7 +36,9 @@ public enum GC {
     Serial(1),
     Parallel(2),
     ConcMarkSweep(3),
-    G1(4);
+    G1(4),
+    Epsilon(5),
+    Z(6);
 
     private static final WhiteBox WB = WhiteBox.getWhiteBox();
 
diff --git a/test/nashorn/script/basic/JDK-8204288.js b/test/nashorn/script/basic/JDK-8204288.js
new file mode 100644
index 00000000000..2d325782bd3
--- /dev/null
+++ b/test/nashorn/script/basic/JDK-8204288.js
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8204288: Matching the end of a string followed by an empty greedy regex and a word boundary fails
+ *
+ * @test
+ * @run
+ */
+
+
+Assert.assertEquals(new RegExp("c.*\\b").exec("abc")[0], "c");
+Assert.assertEquals(new RegExp("abc.*\\b").exec("abc")[0], "abc");
+Assert.assertEquals(new RegExp("\\b.*abc.*\\b").exec("abc")[0], "abc");
+
diff --git a/test/nashorn/script/basic/JDK-8204290.js b/test/nashorn/script/basic/JDK-8204290.js
new file mode 100644
index 00000000000..57193b61cfb
--- /dev/null
+++ b/test/nashorn/script/basic/JDK-8204290.js
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8204290: Add check to limit number of capture groups
+ *
+ * @test
+ * @run
+ */
+
+try {
+    new RegExp("()".repeat(0x8001));
+    fail("Expected exception");
+} catch (e) {
+    Assert.assertTrue(e instanceof SyntaxError);
+    Assert.assertEquals(e.message, "too many capture groups");
+}
+